diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0d7d4d27b..90fb6ac06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,10 +23,10 @@ jobs:
 
             - uses: pnpm/action-setup@v3
 
-            - name: Use Node.js 20
+            - name: Use Node.js 24
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 24
                   cache: "pnpm"
 
             - name: Install dependencies
@@ -68,17 +68,20 @@ jobs:
                   rm release/*.map
 
             - name: Upload Equicord Stable
+              if: ${{ !vars.ACT }}
               run: |
                   gh release upload latest --clobber dist/release/*
 
             - name: Upload Plugin JSONs to Equibored repo
+              if: github.repository == 'Equicord/Equicord' && !vars.ACT
               run: |
                   git config --global user.name "GitHub-Actions"
                   git config --global user.email actions@github.com
                   git clone https://$USERNAME:$GITHUB_TOKEN@github.com/$REPO.git plugins
                   cd plugins
 
-                  cp ../dist/release/*.json .
+                  cp ../dist/release/*plugins.json .
+                  cp ../dist/release/devs.json .
                   git add -A
 
                   git commit -m "Plugins for https://github.com/$GITHUB_REPOSITORY/commit/$GITHUB_SHA"
diff --git a/.github/workflows/buildDev.yml b/.github/workflows/buildBranches.yml
similarity index 94%
rename from .github/workflows/buildDev.yml
rename to .github/workflows/buildBranches.yml
index 6ae23fef9..f321da1f0 100644
--- a/.github/workflows/buildDev.yml
+++ b/.github/workflows/buildBranches.yml
@@ -1,9 +1,10 @@
-name: Build
+name: Build Branches
 
 on:
     push:
         branches:
             - "**"
+            - "!pr-**"
     workflow_dispatch:
         inputs:
             branch:
@@ -28,6 +29,7 @@ jobs:
     Build:
         name: Build Equicord
         runs-on: ubuntu-latest
+        if: github.repository == 'Equicord/Equicord'
 
         steps:
             - uses: actions/checkout@v4
@@ -37,11 +39,11 @@ jobs:
             - uses: pnpm/action-setup@v3
               if: github.ref_name != 'bun'
 
-            - name: Use Node.js 20
+            - name: Use Node.js 24
               if: github.ref_name != 'bun'
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 24
                   cache: "pnpm"
 
             - name: Install dependencies
@@ -64,9 +66,8 @@ jobs:
                   pnpm generateVencordPluginJson dist/vencordplugins.json
                   pnpm generateDevsList dist/devs.json
 
-            - uses: actions/checkout@v4
-              if: github.ref_name == 'bun'
             - uses: oven-sh/setup-bun@v2
+              if: github.ref_name == 'bun'
               with:
                   bun-version: latest
             - name: Install dependencies
@@ -90,6 +91,7 @@ jobs:
                   bun run generateDevsList dist/devs.json
 
             - name: Upload to Equibuilds repo
+              if: ${{ !vars.ACT }}
               run: |
                   BRANCH="${{ github.event.inputs.branch || github.ref_name }}"
                   COMMIT_SHA=$(git rev-parse --short HEAD)
diff --git a/.github/workflows/nixosBuild.yml b/.github/workflows/nixosBuild.yml
index 2ea5a91b9..cc32abb10 100644
--- a/.github/workflows/nixosBuild.yml
+++ b/.github/workflows/nixosBuild.yml
@@ -20,10 +20,10 @@ jobs:
 
             - uses: pnpm/action-setup@v3
 
-            - name: Use Node.js 20
+            - name: Use Node.js 24
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 24
                   cache: "pnpm"
 
             - name: Install dependencies
@@ -50,7 +50,7 @@ jobs:
                   cp browser/browser.* release
                   cp Equicord.user.{js,js.LEGAL.txt} release
 
-                  # copy the plugin data jsons, the extension zips and the desktop/vesktop asars
+                  # copy the plugin data jsons, the extension zips and the desktop/equibop asars
                   cp *.{json,zip,asar} release
 
                   # legacy un-asared files
@@ -69,6 +69,7 @@ jobs:
               run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
 
             - name: Upload Equicord Stable
+              if: ${{ !vars.ACT }}
               run: |
                   gh release create ${{ steps.date.outputs.date }} --latest=false
                   gh release upload ${{ steps.date.outputs.date }} --clobber dist/release/*
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2452e5fc8..4e8ea71b3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -62,11 +62,11 @@ jobs:
               if: steps.check.outputs.release == 'true'
               uses: pnpm/action-setup@v3
 
-            - name: Use Node.js 20
+            - name: Use Node.js 24
               if: steps.check.outputs.release == 'true'
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 24
                   cache: "pnpm"
 
             - name: Install dependencies
@@ -79,12 +79,16 @@ jobs:
 
             - name: Create sources zip
               if: steps.check.outputs.release == 'true'
-              run: zip -r dist/extension-sources.zip . -x "node_modules/*" -x "dist/*" -x ".git/*"
+              run: zip -r dist/extension-sources.zip . -x "node_modules/*" -x "dist/*" -x
+                  ".git/*"
 
             - name: Publish extension
-              if: steps.check.outputs.release == 'true'
-              run: pnpx @equicord/publish-browser-extension@latest --chrome-zip dist/extension-chrome.zip --firefox-zip dist/extension-firefox.zip --firefox-sources-zip dist/extension-sources.zip --edge-zip dist/extension-chrome.zip
-
+              if: steps.check.outputs.release == 'true' && !vars.ACT
+              run: pnpx @equicord/publish-browser-extension@latest --chrome-zip
+                  dist/extension-chrome.zip --firefox-zip
+                  dist/extension-firefox.zip --firefox-sources-zip
+                  dist/extension-sources.zip --edge-zip
+                  dist/extension-chrome.zip
               env:
                   CHROME_EXTENSION_ID: ${{ secrets.CHROME_EXTENSION_ID }}
                   CHROME_PUBLISHER_ID: ${{ secrets.CHROME_PUBLISHER_ID }}
diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index 117a9a70c..ef0225a1f 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -33,10 +33,10 @@ jobs:
 
             - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
-            - name: Use Node.js 20
+            - name: Use Node.js 24
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 24
                   cache: "pnpm"
 
             - name: Install dependencies
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 708974e68..21d7e8b6c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,10 +18,10 @@ jobs:
             - uses: actions/checkout@v4
             - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
-            - name: Use Node.js 20
+            - name: Use Node.js 24
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 24
                   cache: "pnpm"
 
             - name: Install dependencies
diff --git a/.gitignore b/.gitignore
index 34faacbfa..26295f97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 dist
 node_modules
 .VSCodeCounter
+.vars
+.secrets
+.input
 
 *.exe
 vencord_installer
diff --git a/eslint.config.mjs b/eslint.config.mjs
index c0602e84e..7fcd15014 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -136,6 +136,8 @@ export default defineConfig(
             "use-isnan": "error",
             "prefer-const": ["error", { destructuring: "all" }],
             "prefer-spread": "error",
+            // These are old deprecated browser globals which may be used by mistake, e.g. `addEventListener(e => console.log(event))`
+            "no-restricted-globals": ["error", "event", "name"],
 
             // Plugin Rules
             "simple-import-sort/imports": "error",
diff --git a/package.json b/package.json
index ba30c00f3..f01640ad1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "equicord",
     "private": "true",
-    "version": "1.14.6.2",
+    "version": "1.14.12.0",
     "description": "The other cutest Discord client mod",
     "homepage": "https://github.com/Equicord/Equicord#readme",
     "bugs": {
@@ -54,47 +54,47 @@
         "gifenc": "github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3",
         "idb": "8.0.3",
         "jsqr": "1.4.0",
-        "monaco-editor": "^0.54.0",
+        "monaco-editor": "^0.55.1",
         "nanoid": "^5.1.6",
         "native-file-system-adapter": "^3.0.1",
         "usercss-meta": "^0.12.0",
-        "virtual-merge": "^1.0.1"
+        "virtual-merge": "^1.0.1",
+        "yaml-js": "^0.3.1"
     },
     "devDependencies": {
-        "@electron/asar": "^4.0.1",
-        "@stylistic/eslint-plugin": "^5.6.0",
-        "@types/adm-zip": "^0.5.7",
-        "@types/chrome": "^0.1.30",
-        "@types/diff": "^7.0.2",
-        "@types/lodash": "^4.17.20",
-        "@types/node": "^24.10.1",
+        "@electron/asar": "^4.2.0",
+        "@stylistic/eslint-plugin": "^5.10.0",
+        "@types/chrome": "^0.1.40",
+        "@types/lodash": "^4.17.24",
+        "@types/node": "^25.6.0",
         "@types/react": "^19.0.10",
         "@types/react-dom": "^19.0.4",
-        "@types/yazl": "^3.3.0",
+        "@types/yazl": "^3.3.1",
         "@vencord/discord-types": "link:packages/discord-types",
-        "diff": "^8.0.2",
-        "esbuild": "^0.27.0",
-        "eslint": "9.39.1",
+        "diff": "^9.0.0",
+        "esbuild": "^0.28.0",
+        "eslint": "10.2.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-react": "^7.37.5",
         "eslint-plugin-simple-header": "^1.2.1",
-        "eslint-plugin-simple-import-sort": "^12.1.1",
-        "eslint-plugin-unused-imports": "^4.3.0",
+        "eslint-plugin-simple-import-sort": "^13.0.0",
+        "eslint-plugin-unused-imports": "^4.4.1",
         "highlight.js": "11.11.1",
         "html-minifier-terser": "^7.2.0",
         "moment": "^2.22.2",
         "p-limit": "^7.3.0",
-        "puppeteer-core": "^24.30.0",
-        "standalone-electron-types": "^34.2.0",
-        "stylelint": "^16.25.0",
-        "stylelint-config-standard": "^39.0.1",
+        "puppeteer-core": "^24.41.0",
+        "standalone-electron-types": "^41.2.1",
+        "stylelint": "^17.8.0",
+        "stylelint-config-standard": "^40.0.0",
+        "svgo": "^4.0.1",
         "ts-patch": "^3.3.0",
-        "ts-pattern": "^5.6.0",
-        "tsx": "^4.20.6",
-        "type-fest": "^5.2.0",
-        "typescript": "^5.9.3",
-        "typescript-eslint": "^8.47.0",
-        "typescript-transform-paths": "^3.5.5",
+        "ts-pattern": "^5.9.0",
+        "tsx": "^4.21.0",
+        "type-fest": "^5.5.0",
+        "typescript": "^6.0.2",
+        "typescript-eslint": "^8.58.2",
+        "typescript-transform-paths": "^3.5.6",
         "zip-local": "^0.3.5"
     },
     "packageManager": "pnpm@10.33.0",
@@ -125,4 +125,4 @@
     "engines": {
         "node": ">=18"
     }
-}
+}
\ No newline at end of file
diff --git a/packages/discord-types/src/components.d.ts b/packages/discord-types/src/components.d.ts
index 8d0aa0ed4..c7d01e481 100644
--- a/packages/discord-types/src/components.d.ts
+++ b/packages/discord-types/src/components.d.ts
@@ -331,6 +331,15 @@ declare enum PopoutAnimation {
 
 type PopoutPosition = "top" | "bottom" | "left" | "right" | "center" | "window_center";
 
+export interface PopoutProps {
+    position: PopoutPosition;
+    nudge: number;
+    isPositioned: boolean;
+    setPopoutRef(ref: any): void;
+    closePopout(): void;
+    updatePosition(): void;
+}
+
 export type Popout = ComponentType<{
     children(
         thing: {
@@ -347,14 +356,8 @@ export type Popout = ComponentType<{
     ): ReactNode;
     shouldShow?: boolean;
     targetElementRef: RefObject<any>;
-    renderPopout(args: {
-        closePopout(): void;
-        isPositioned: boolean;
-        nudge: number;
-        position: PopoutPosition;
-        setPopoutRef(ref: any): void;
-        updatePosition(): void;
-    }): ReactNode;
+    renderPopout(props: PopoutProps): ReactNode;
+    preload?(): Promise<any>;
 
     onRequestOpen?(): void;
     onRequestClose?(): void;
@@ -536,4 +539,5 @@ export type ColorPicker = ComponentType<{
     suggestedColors?: string[];
     label?: ReactNode;
     onChange(value: number | null): void;
+    disabled?: boolean;
 }>;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index eb2eba634..53ca76f94 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@ importers:
         version: 0.1.2
       '@song-spotlight/api':
         specifier: ^2.1.3
-        version: 2.1.3(typescript@5.9.3)
+        version: 2.1.3(typescript@6.0.2)
       '@streamparser/json':
         specifier: ^0.0.22
         version: 0.0.22
@@ -59,8 +59,8 @@ importers:
         specifier: 1.4.0
         version: 1.4.0
       monaco-editor:
-        specifier: ^0.54.0
-        version: 0.54.0
+        specifier: ^0.55.1
+        version: 0.55.1
       nanoid:
         specifier: ^5.1.6
         version: 5.1.6
@@ -73,28 +73,25 @@ importers:
       virtual-merge:
         specifier: ^1.0.1
         version: 1.0.2
+      yaml-js:
+        specifier: ^0.3.1
+        version: 0.3.1
     devDependencies:
       '@electron/asar':
-        specifier: ^4.0.1
-        version: 4.0.1
+        specifier: ^4.2.0
+        version: 4.2.0
       '@stylistic/eslint-plugin':
-        specifier: ^5.6.0
-        version: 5.6.0(eslint@9.39.1)
-      '@types/adm-zip':
-        specifier: ^0.5.7
-        version: 0.5.7
+        specifier: ^5.10.0
+        version: 5.10.0(eslint@10.2.0)
       '@types/chrome':
-        specifier: ^0.1.30
-        version: 0.1.30
-      '@types/diff':
-        specifier: ^7.0.2
-        version: 7.0.2
+        specifier: ^0.1.40
+        version: 0.1.40
       '@types/lodash':
-        specifier: ^4.17.20
-        version: 4.17.20
+        specifier: ^4.17.24
+        version: 4.17.24
       '@types/node':
-        specifier: ^24.10.1
-        version: 24.10.1
+        specifier: ^25.6.0
+        version: 25.6.0
       '@types/react':
         specifier: ^19.0.10
         version: 19.0.12
@@ -102,35 +99,35 @@ importers:
         specifier: ^19.0.4
         version: 19.0.4(@types/react@19.0.12)
       '@types/yazl':
-        specifier: ^3.3.0
-        version: 3.3.0
+        specifier: ^3.3.1
+        version: 3.3.1
       '@vencord/discord-types':
         specifier: link:packages/discord-types
         version: link:packages/discord-types
       diff:
-        specifier: ^8.0.2
-        version: 8.0.2
+        specifier: ^9.0.0
+        version: 9.0.0
       esbuild:
-        specifier: ^0.27.0
-        version: 0.27.0
+        specifier: ^0.28.0
+        version: 0.28.0
       eslint:
-        specifier: 9.39.1
-        version: 9.39.1
+        specifier: 10.2.0
+        version: 10.2.0
       eslint-import-resolver-alias:
         specifier: ^1.1.2
-        version: 1.1.2(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1))
+        version: 1.1.2(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0))
       eslint-plugin-react:
         specifier: ^7.37.5
-        version: 7.37.5(eslint@9.39.1)
+        version: 7.37.5(eslint@10.2.0)
       eslint-plugin-simple-header:
         specifier: ^1.2.1
-        version: 1.2.2(eslint@9.39.1)
+        version: 1.2.2(eslint@10.2.0)
       eslint-plugin-simple-import-sort:
-        specifier: ^12.1.1
-        version: 12.1.1(eslint@9.39.1)
+        specifier: ^13.0.0
+        version: 13.0.0(eslint@10.2.0)
       eslint-plugin-unused-imports:
-        specifier: ^4.3.0
-        version: 4.3.0(@typescript-eslint/eslint-plugin@8.47.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1)
+        specifier: ^4.4.1
+        version: 4.4.1(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0)
       highlight.js:
         specifier: 11.11.1
         version: 11.11.1
@@ -144,38 +141,41 @@ importers:
         specifier: ^7.3.0
         version: 7.3.0
       puppeteer-core:
-        specifier: ^24.30.0
-        version: 24.30.0
+        specifier: ^24.41.0
+        version: 24.41.0
       standalone-electron-types:
-        specifier: ^34.2.0
-        version: 34.2.0
+        specifier: ^41.2.1
+        version: 41.2.1
       stylelint:
-        specifier: ^16.25.0
-        version: 16.25.0(typescript@5.9.3)
+        specifier: ^17.8.0
+        version: 17.8.0(typescript@6.0.2)
       stylelint-config-standard:
-        specifier: ^39.0.1
-        version: 39.0.1(stylelint@16.25.0(typescript@5.9.3))
+        specifier: ^40.0.0
+        version: 40.0.0(stylelint@17.8.0(typescript@6.0.2))
+      svgo:
+        specifier: ^4.0.1
+        version: 4.0.1
       ts-patch:
         specifier: ^3.3.0
         version: 3.3.0
       ts-pattern:
-        specifier: ^5.6.0
-        version: 5.6.2
+        specifier: ^5.9.0
+        version: 5.9.0
       tsx:
-        specifier: ^4.20.6
-        version: 4.20.6
+        specifier: ^4.21.0
+        version: 4.21.0
       type-fest:
-        specifier: ^5.2.0
-        version: 5.2.0
+        specifier: ^5.5.0
+        version: 5.5.0
       typescript:
-        specifier: ^5.9.3
-        version: 5.9.3
+        specifier: ^6.0.2
+        version: 6.0.2
       typescript-eslint:
-        specifier: ^8.47.0
-        version: 8.47.0(eslint@9.39.1)(typescript@5.9.3)
+        specifier: ^8.58.2
+        version: 8.58.2(eslint@10.2.0)(typescript@6.0.2)
       typescript-transform-paths:
-        specifier: ^3.5.5
-        version: 3.5.5(typescript@5.9.3)
+        specifier: ^3.5.6
+        version: 3.5.6(typescript@6.0.2)
       zip-local:
         specifier: ^0.3.5
         version: 0.3.5
@@ -246,40 +246,58 @@ packages:
     resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==}
     engines: {node: '>=6.9.0'}
 
-  '@cacheable/memory@2.0.5':
-    resolution: {integrity: sha512-fkiAxCvssEyJZ5fxX4tcdZFRmW9JehSTGvvqmXn6rTzG5cH6V/3C4ad8yb01vOjp2xBydHkHrgpW0qeGtzt6VQ==}
+  '@cacheable/memory@2.0.8':
+    resolution: {integrity: sha512-FvEb29x5wVwu/Kf93IWwsOOEuhHh6dYCJF3vcKLzXc0KXIW181AOzv6ceT4ZpBHDvAfG60eqb+ekmrnLHIy+jw==}
 
-  '@cacheable/utils@2.3.1':
-    resolution: {integrity: sha512-38NJXjIr4W1Sghun8ju+uYWD8h2c61B4dKwfnQHVDFpAJ9oS28RpfqZQJ6Dgd3RceGkILDY9YT+72HJR3LoeSQ==}
+  '@cacheable/utils@2.4.1':
+    resolution: {integrity: sha512-eiFgzCbIneyMlLOmNG4g9xzF7Hv3Mga4LjxjcSC/ues6VYq2+gUbQI8JqNuw/ZM8tJIeIaBGpswAsqV2V7ApgA==}
 
-  '@csstools/css-parser-algorithms@3.0.5':
-    resolution: {integrity: sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==}
-    engines: {node: '>=18'}
+  '@csstools/css-calc@3.2.0':
+    resolution: {integrity: sha512-bR9e6o2BDB12jzN/gIbjHa5wLJ4UjD1CB9pM7ehlc0ddk6EBz+yYS1EV2MF55/HUxrHcB/hehAyt5vhsA3hx7w==}
+    engines: {node: '>=20.19.0'}
     peerDependencies:
-      '@csstools/css-tokenizer': ^3.0.4
+      '@csstools/css-parser-algorithms': ^4.0.0
+      '@csstools/css-tokenizer': ^4.0.0
 
-  '@csstools/css-tokenizer@3.0.4':
-    resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
-    engines: {node: '>=18'}
-
-  '@csstools/media-query-list-parser@4.0.3':
-    resolution: {integrity: sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==}
-    engines: {node: '>=18'}
+  '@csstools/css-parser-algorithms@4.0.0':
+    resolution: {integrity: sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==}
+    engines: {node: '>=20.19.0'}
     peerDependencies:
-      '@csstools/css-parser-algorithms': ^3.0.5
-      '@csstools/css-tokenizer': ^3.0.4
+      '@csstools/css-tokenizer': ^4.0.0
 
-  '@csstools/selector-specificity@5.0.0':
-    resolution: {integrity: sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==}
-    engines: {node: '>=18'}
+  '@csstools/css-syntax-patches-for-csstree@1.1.3':
+    resolution: {integrity: sha512-SH60bMfrRCJF3morcdk57WklujF4Jr/EsQUzqkarfHXEFcAR1gg7fS/chAE922Sehgzc1/+Tz5H3Ypa1HiEKrg==}
     peerDependencies:
-      postcss-selector-parser: ^7.0.0
+      css-tree: ^3.2.1
+    peerDependenciesMeta:
+      css-tree:
+        optional: true
 
-  '@dual-bundle/import-meta-resolve@4.2.1':
-    resolution: {integrity: sha512-id+7YRUgoUX6CgV0DtuhirQWodeeA7Lf4i2x71JS/vtA5pRb/hIGWlw+G6MeXvsM+MXrz0VAydTGElX1rAfgPg==}
+  '@csstools/css-tokenizer@4.0.0':
+    resolution: {integrity: sha512-QxULHAm7cNu72w97JUNCBFODFaXpbDg+dP8b/oWFAZ2MTRppA3U00Y2L1HqaS4J6yBqxwa/Y3nMBaxVKbB/NsA==}
+    engines: {node: '>=20.19.0'}
 
-  '@electron/asar@4.0.1':
-    resolution: {integrity: sha512-F4Ykm1jiBGY1WV/o8Q8oFW8Nq0u+S2/vPujzNJtdSJ6C4LHC4CiGLn7c17s7SolZ23gcvCebMncmZtNc+MkxPQ==}
+  '@csstools/media-query-list-parser@5.0.0':
+    resolution: {integrity: sha512-T9lXmZOfnam3eMERPsszjY5NK0jX8RmThmmm99FZ8b7z8yMaFZWKwLWGZuTwdO3ddRY5fy13GmmEYZXB4I98Eg==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^4.0.0
+      '@csstools/css-tokenizer': ^4.0.0
+
+  '@csstools/selector-resolve-nested@4.0.0':
+    resolution: {integrity: sha512-9vAPxmp+Dx3wQBIUwc1v7Mdisw1kbbaGqXUM8QLTgWg7SoPGYtXBsMXvsFs/0Bn5yoFhcktzxNZGNaUt0VjgjA==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      postcss-selector-parser: ^7.1.1
+
+  '@csstools/selector-specificity@6.0.0':
+    resolution: {integrity: sha512-4sSgl78OtOXEX/2d++8A83zHNTgwCJMaR24FvsYL7Uf/VS8HZk9PTwR51elTbGqMuwH3szLvvOXEaVnqn0Z3zA==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      postcss-selector-parser: ^7.1.1
+
+  '@electron/asar@4.2.0':
+    resolution: {integrity: sha512-npW1NW5yy8EB9XY/vEw9sUdgmq0sJEhmSBb6bqyFOAw1CSkrhvAvO6QWlW8CdIMo8VN1lkdF345l/MeW0LrY0Q==}
     engines: {node: '>=22.12.0'}
     hasBin: true
 
@@ -295,6 +313,12 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.28.0':
+    resolution: {integrity: sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
   '@esbuild/android-arm64@0.25.1':
     resolution: {integrity: sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==}
     engines: {node: '>=18'}
@@ -307,6 +331,12 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm64@0.28.0':
+    resolution: {integrity: sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm@0.25.1':
     resolution: {integrity: sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==}
     engines: {node: '>=18'}
@@ -319,6 +349,12 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.28.0':
+    resolution: {integrity: sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-x64@0.25.1':
     resolution: {integrity: sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==}
     engines: {node: '>=18'}
@@ -331,6 +367,12 @@ packages:
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.28.0':
+    resolution: {integrity: sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/darwin-arm64@0.25.1':
     resolution: {integrity: sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==}
     engines: {node: '>=18'}
@@ -343,6 +385,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.28.0':
+    resolution: {integrity: sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.25.1':
     resolution: {integrity: sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==}
     engines: {node: '>=18'}
@@ -355,6 +403,12 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.28.0':
+    resolution: {integrity: sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/freebsd-arm64@0.25.1':
     resolution: {integrity: sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==}
     engines: {node: '>=18'}
@@ -367,6 +421,12 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-arm64@0.28.0':
+    resolution: {integrity: sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.25.1':
     resolution: {integrity: sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==}
     engines: {node: '>=18'}
@@ -379,6 +439,12 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.28.0':
+    resolution: {integrity: sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/linux-arm64@0.25.1':
     resolution: {integrity: sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==}
     engines: {node: '>=18'}
@@ -391,6 +457,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.28.0':
+    resolution: {integrity: sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm@0.25.1':
     resolution: {integrity: sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==}
     engines: {node: '>=18'}
@@ -403,6 +475,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.28.0':
+    resolution: {integrity: sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.25.1':
     resolution: {integrity: sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==}
     engines: {node: '>=18'}
@@ -415,6 +493,12 @@ packages:
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.28.0':
+    resolution: {integrity: sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.25.1':
     resolution: {integrity: sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==}
     engines: {node: '>=18'}
@@ -427,6 +511,12 @@ packages:
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.28.0':
+    resolution: {integrity: sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.25.1':
     resolution: {integrity: sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==}
     engines: {node: '>=18'}
@@ -439,6 +529,12 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.28.0':
+    resolution: {integrity: sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.25.1':
     resolution: {integrity: sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==}
     engines: {node: '>=18'}
@@ -451,6 +547,12 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.28.0':
+    resolution: {integrity: sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.25.1':
     resolution: {integrity: sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==}
     engines: {node: '>=18'}
@@ -463,6 +565,12 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.28.0':
+    resolution: {integrity: sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.25.1':
     resolution: {integrity: sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==}
     engines: {node: '>=18'}
@@ -475,6 +583,12 @@ packages:
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.28.0':
+    resolution: {integrity: sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-x64@0.25.1':
     resolution: {integrity: sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==}
     engines: {node: '>=18'}
@@ -487,6 +601,12 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.28.0':
+    resolution: {integrity: sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
   '@esbuild/netbsd-arm64@0.25.1':
     resolution: {integrity: sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==}
     engines: {node: '>=18'}
@@ -499,6 +619,12 @@ packages:
     cpu: [arm64]
     os: [netbsd]
 
+  '@esbuild/netbsd-arm64@0.28.0':
+    resolution: {integrity: sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.25.1':
     resolution: {integrity: sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==}
     engines: {node: '>=18'}
@@ -511,6 +637,12 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.28.0':
+    resolution: {integrity: sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
   '@esbuild/openbsd-arm64@0.25.1':
     resolution: {integrity: sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==}
     engines: {node: '>=18'}
@@ -523,6 +655,12 @@ packages:
     cpu: [arm64]
     os: [openbsd]
 
+  '@esbuild/openbsd-arm64@0.28.0':
+    resolution: {integrity: sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.25.1':
     resolution: {integrity: sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==}
     engines: {node: '>=18'}
@@ -535,12 +673,24 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.28.0':
+    resolution: {integrity: sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/openharmony-arm64@0.27.0':
     resolution: {integrity: sha512-nyvsBccxNAsNYz2jVFYwEGuRRomqZ149A39SHWk4hV0jWxKM0hjBPm3AmdxcbHiFLbBSwG6SbpIcUbXjgyECfA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
+  '@esbuild/openharmony-arm64@0.28.0':
+    resolution: {integrity: sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@esbuild/sunos-x64@0.25.1':
     resolution: {integrity: sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==}
     engines: {node: '>=18'}
@@ -553,6 +703,12 @@ packages:
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.28.0':
+    resolution: {integrity: sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/win32-arm64@0.25.1':
     resolution: {integrity: sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==}
     engines: {node: '>=18'}
@@ -565,6 +721,12 @@ packages:
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.28.0':
+    resolution: {integrity: sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.25.1':
     resolution: {integrity: sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==}
     engines: {node: '>=18'}
@@ -577,6 +739,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.28.0':
+    resolution: {integrity: sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-x64@0.25.1':
     resolution: {integrity: sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==}
     engines: {node: '>=18'}
@@ -589,43 +757,47 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@esbuild/win32-x64@0.28.0':
+    resolution: {integrity: sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@eslint-community/eslint-utils@4.9.0':
     resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
 
-  '@eslint-community/regexpp@4.12.1':
-    resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
+  '@eslint-community/eslint-utils@4.9.1':
+    resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+  '@eslint-community/regexpp@4.12.2':
+    resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
-  '@eslint/config-array@0.21.1':
-    resolution: {integrity: sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  '@eslint/config-array@0.23.5':
+    resolution: {integrity: sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  '@eslint/config-helpers@0.4.2':
-    resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  '@eslint/config-helpers@0.5.5':
+    resolution: {integrity: sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  '@eslint/core@0.17.0':
-    resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  '@eslint/core@1.2.1':
+    resolution: {integrity: sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  '@eslint/eslintrc@3.3.1':
-    resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  '@eslint/object-schema@3.0.5':
+    resolution: {integrity: sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  '@eslint/js@9.39.1':
-    resolution: {integrity: sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/object-schema@2.1.7':
-    resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/plugin-kit@0.4.1':
-    resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  '@eslint/plugin-kit@0.7.1':
+    resolution: {integrity: sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
   '@ffmpeg/ffmpeg@0.12.10':
     resolution: {integrity: sha512-lVtk8PW8e+NUzGZhPTWj2P1J4/NyuCrbDD3O9IGpSeLYtUZKBqZO8CNj1WYGghep/MXoM8e1qVY1GztTkf8YYQ==}
@@ -662,18 +834,6 @@ packages:
   '@intrnl/xxhash64@0.1.2':
     resolution: {integrity: sha512-1+lx7j99fdph+uy3EnjQyr39KQZ7LP56+aWOr6finJWpgYpvb7XrhFUqDwnEk/wpPC98nCjAT6RulpW3crWjlg==}
 
-  '@isaacs/balanced-match@4.0.1':
-    resolution: {integrity: sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==}
-    engines: {node: 20 || >=22}
-
-  '@isaacs/brace-expansion@5.0.0':
-    resolution: {integrity: sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==}
-    engines: {node: 20 || >=22}
-
-  '@isaacs/cliui@8.0.2':
-    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
-    engines: {node: '>=12'}
-
   '@jridgewell/gen-mapping@0.3.5':
     resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
     engines: {node: '>=6.0.0'}
@@ -695,11 +855,11 @@ packages:
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
-  '@keyv/bigmap@1.3.0':
-    resolution: {integrity: sha512-KT01GjzV6AQD5+IYrcpoYLkCu1Jod3nau1Z7EsEuViO3TZGRacSbO9MfHmbJ1WaOXFtWLxPVj169cn2WNKPkIg==}
+  '@keyv/bigmap@1.3.1':
+    resolution: {integrity: sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==}
     engines: {node: '>= 18'}
     peerDependencies:
-      keyv: ^5.5.4
+      keyv: ^5.6.0
 
   '@keyv/serialize@1.1.1':
     resolution: {integrity: sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==}
@@ -716,14 +876,18 @@ packages:
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
 
-  '@puppeteer/browsers@2.10.13':
-    resolution: {integrity: sha512-a9Ruw3j3qlnB5a/zHRTkruppynxqaeE4H9WNj5eYGRWqw0ZauZ23f4W2ARf3hghF5doozyD+CRtt7XSYuYRI/Q==}
+  '@puppeteer/browsers@2.13.0':
+    resolution: {integrity: sha512-46BZJYJjc/WwmKjsvDFykHtXrtomsCIrwYQPOP7VfMJoZY2bsDF9oROBABR3paDjDcmkUye1Pb1BqdcdiipaWA==}
     engines: {node: '>=18'}
     hasBin: true
 
   '@rtsao/scc@1.1.0':
     resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
 
+  '@sindresorhus/merge-streams@4.0.0':
+    resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
+    engines: {node: '>=18'}
+
   '@song-spotlight/api@2.1.3':
     resolution: {integrity: sha512-Wai7JHd9lrHtM/lkhfWQIFjIWKtP8iD+zj4Lnwbs/ykELR0MB2k56TDnQaRAelvu8XOygt27wfDBDQSEepPqdA==}
     peerDependencies:
@@ -732,27 +896,27 @@ packages:
   '@streamparser/json@0.0.22':
     resolution: {integrity: sha512-b6gTSBjJ8G8SuO3Gbbj+zXbVx8NSs1EbpbMKpzGLWMdkR+98McH9bEjSz3+0mPJf68c5nxa3CrJHp5EQNXM6zQ==}
 
-  '@stylistic/eslint-plugin@5.6.0':
-    resolution: {integrity: sha512-owEc4B8ME+O/xyZOkLVyLqPMsUgJXIM4XzCm5Vt3WvRXpyoOfYxgA+JkEiFqXPCI8+Nc2BzAT+KGAK7QleGs8Q==}
+  '@stylistic/eslint-plugin@5.10.0':
+    resolution: {integrity: sha512-nPK52ZHvot8Ju/0A4ucSX1dcPV2/1clx0kLcH5wDmrE4naKso7TUC/voUyU1O9OTKTrR6MYip6LP0ogEMQ9jPQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: '>=9.0.0'
+      eslint: ^9.0.0 || ^10.0.0
 
   '@tootallnate/quickjs-emscripten@0.23.0':
     resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==}
 
-  '@types/adm-zip@0.5.7':
-    resolution: {integrity: sha512-DNEs/QvmyRLurdQPChqq0Md4zGvPwHerAJYWk9l2jCbD1VPpnzRJorOdiq4zsw09NFbYnhfsoEhWtxIzXpn2yw==}
+  '@types/chrome@0.1.40':
+    resolution: {integrity: sha512-UnfyRAe8ORu9HSuTH0EqyOEUin3JrWW9Nl/gDXezNfTUrfIoxw+WRZgKOxGz0t5BnjbfXBnS2eCYfW2PxH1wcA==}
 
-  '@types/chrome@0.1.30':
-    resolution: {integrity: sha512-rcP14i+ip4s3SLG6JzNOWIDd+0i8Bg+kBslHl8d4g6m/e2kEbWnR90AtlOPUZj9ONVRbKxnQUqsInxFzXyqLdA==}
-
-  '@types/diff@7.0.2':
-    resolution: {integrity: sha512-JSWRMozjFKsGlEjiiKajUjIJVKuKdE3oVy2DNtK+fUo8q82nhFZ2CPQwicAIkXrofahDXrWJ7mjelvZphMS98Q==}
+  '@types/esrecurse@4.3.1':
+    resolution: {integrity: sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==}
 
   '@types/estree@1.0.7':
     resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==}
 
+  '@types/estree@1.0.8':
+    resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
+
   '@types/filesystem@0.0.36':
     resolution: {integrity: sha512-vPDXOZuannb9FZdxgHnqSwAG/jvdGM8Wq+6N4D/d80z+D4HWH+bItqsZaVRQykAn6WEVeEkLm2oQigyHtgb0RA==}
 
@@ -780,14 +944,14 @@ packages:
   '@types/lodash@4.17.15':
     resolution: {integrity: sha512-w/P33JFeySuhN6JLkysYUK2gEmy9kHHFN7E8ro0tkfmlDOgxBDzWEZ/J8cWA+fHqFevpswDTFZnDx+R9lbL6xw==}
 
-  '@types/lodash@4.17.20':
-    resolution: {integrity: sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==}
+  '@types/lodash@4.17.24':
+    resolution: {integrity: sha512-gIW7lQLZbue7lRSWEFql49QJJWThrTFFeIMJdp3eH4tKoxm1OvEPg02rm4wCCSHS0cL3/Fizimb35b7k8atwsQ==}
 
   '@types/node@22.13.13':
     resolution: {integrity: sha512-ClsL5nMwKaBRwPcCvH8E7+nU4GxHVx1axNvMZTFHMEfNI7oahimt26P5zjVCRrjiIWj6YFXfE1v3dEp94wLcGQ==}
 
-  '@types/node@24.10.1':
-    resolution: {integrity: sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==}
+  '@types/node@25.6.0':
+    resolution: {integrity: sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==}
 
   '@types/react-dom@19.0.4':
     resolution: {integrity: sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==}
@@ -803,69 +967,72 @@ packages:
   '@types/tinycolor2@1.4.6':
     resolution: {integrity: sha512-iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw==}
 
+  '@types/trusted-types@2.0.7':
+    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
+
   '@types/yauzl@2.10.3':
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
 
-  '@types/yazl@3.3.0':
-    resolution: {integrity: sha512-mFL6lGkk2N5u5nIxpNV/K5LW3qVSbxhJrMxYGOOxZndWxMgCamr/iCsq/1t9kd8pEwhuNP91LC5qZm/qS9pOEw==}
+  '@types/yazl@3.3.1':
+    resolution: {integrity: sha512-DIWfCKpsTp6hE5BDBHV3+fIL/bLUF9Bv13iDrWnMlmhQpH67buNvI291ZauQ1xcccxK3FqQ9honnXpq4R8NMuQ==}
 
-  '@typescript-eslint/eslint-plugin@8.47.0':
-    resolution: {integrity: sha512-fe0rz9WJQ5t2iaLfdbDc9T80GJy0AeO453q8C3YCilnGozvOyCG5t+EZtg7j7D88+c3FipfP/x+wzGnh1xp8ZA==}
+  '@typescript-eslint/eslint-plugin@8.58.2':
+    resolution: {integrity: sha512-aC2qc5thQahutKjP+cl8cgN9DWe3ZUqVko30CMSZHnFEHyhOYoZSzkGtAI2mcwZ38xeImDucI4dnqsHiOYuuCw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.47.0
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <6.0.0'
+      '@typescript-eslint/parser': ^8.58.2
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/parser@8.47.0':
-    resolution: {integrity: sha512-lJi3PfxVmo0AkEY93ecfN+r8SofEqZNGByvHAI3GBLrvt1Cw6H5k1IM02nSzu0RfUafr2EvFSw0wAsZgubNplQ==}
+  '@typescript-eslint/parser@8.58.2':
+    resolution: {integrity: sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <6.0.0'
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/project-service@8.47.0':
-    resolution: {integrity: sha512-2X4BX8hUeB5JcA1TQJ7GjcgulXQ+5UkNb0DL8gHsHUHdFoiCTJoYLTpib3LtSDPZsRET5ygN4qqIWrHyYIKERA==}
+  '@typescript-eslint/project-service@8.58.2':
+    resolution: {integrity: sha512-Cq6UfpZZk15+r87BkIh5rDpi38W4b+Sjnb8wQCPPDDweS/LRCFjCyViEbzHk5Ck3f2QDfgmlxqSa7S7clDtlfg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      typescript: '>=4.8.4 <6.0.0'
+      typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/scope-manager@8.47.0':
-    resolution: {integrity: sha512-a0TTJk4HXMkfpFkL9/WaGTNuv7JWfFTQFJd6zS9dVAjKsojmv9HT55xzbEpnZoY+VUb+YXLMp+ihMLz/UlZfDg==}
+  '@typescript-eslint/scope-manager@8.58.2':
+    resolution: {integrity: sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/tsconfig-utils@8.47.0':
-    resolution: {integrity: sha512-ybUAvjy4ZCL11uryalkKxuT3w3sXJAuWhOoGS3T/Wu+iUu1tGJmk5ytSY8gbdACNARmcYEB0COksD2j6hfGK2g==}
+  '@typescript-eslint/tsconfig-utils@8.58.2':
+    resolution: {integrity: sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      typescript: '>=4.8.4 <6.0.0'
+      typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/type-utils@8.47.0':
-    resolution: {integrity: sha512-QC9RiCmZ2HmIdCEvhd1aJELBlD93ErziOXXlHEZyuBo3tBiAZieya0HLIxp+DoDWlsQqDawyKuNEhORyku+P8A==}
+  '@typescript-eslint/type-utils@8.58.2':
+    resolution: {integrity: sha512-Z7EloNR/B389FvabdGeTo2XMs4W9TjtPiO9DAsmT0yom0bwlPyRjkJ1uCdW1DvrrrYP50AJZ9Xc3sByZA9+dcg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <6.0.0'
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/types@8.47.0':
-    resolution: {integrity: sha512-nHAE6bMKsizhA2uuYZbEbmp5z2UpffNrPEqiKIeN7VsV6UY/roxanWfoRrf6x/k9+Obf+GQdkm0nPU+vnMXo9A==}
+  '@typescript-eslint/types@8.58.2':
+    resolution: {integrity: sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.47.0':
-    resolution: {integrity: sha512-k6ti9UepJf5NpzCjH31hQNLHQWupTRPhZ+KFF8WtTuTpy7uHPfeg2NM7cP27aCGajoEplxJDFVCEm9TGPYyiVg==}
+  '@typescript-eslint/typescript-estree@8.58.2':
+    resolution: {integrity: sha512-ELGuoofuhhoCvNbQjFFiobFcGgcDCEm0ThWdmO4Z0UzLqPXS3KFvnEZ+SHewwOYHjM09tkzOWXNTv9u6Gqtyuw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      typescript: '>=4.8.4 <6.0.0'
+      typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/utils@8.47.0':
-    resolution: {integrity: sha512-g7XrNf25iL4TJOiPqatNuaChyqt49a/onq5YsJ9+hXeugK+41LVg7AxikMfM02PC6jbNtZLCJj6AUcQXJS/jGQ==}
+  '@typescript-eslint/utils@8.58.2':
+    resolution: {integrity: sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <6.0.0'
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/visitor-keys@8.47.0':
-    resolution: {integrity: sha512-SIV3/6eftCy1bNzCQoPmbWsRLujS8t5iDIZ4spZOBHqrM+yfX2ogg8Tt3PDTAVKw3sSCiUgg30uOAvK2r9zGjQ==}
+  '@typescript-eslint/visitor-keys@8.58.2':
+    resolution: {integrity: sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@vap/core@0.0.12':
@@ -894,12 +1061,17 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  acorn@8.16.0:
+    resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   agent-base@7.1.3:
     resolution: {integrity: sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==}
     engines: {node: '>= 14'}
 
-  ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+  ajv@6.14.0:
+    resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==}
 
   ajv@8.17.1:
     resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
@@ -920,10 +1092,6 @@ packages:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
 
-  ansi-styles@6.2.3:
-    resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
-    engines: {node: '>=12'}
-
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
@@ -939,10 +1107,6 @@ packages:
     resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==}
     engines: {node: '>= 0.4'}
 
-  array-union@2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
-    engines: {node: '>=8'}
-
   array.prototype.findlast@1.2.5:
     resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
     engines: {node: '>= 0.4'}
@@ -996,8 +1160,9 @@ packages:
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
-  balanced-match@2.0.0:
-    resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
+  balanced-match@4.0.4:
+    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
+    engines: {node: 18 || 20 || >=22}
 
   bare-events@2.5.4:
     resolution: {integrity: sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==}
@@ -1032,7 +1197,10 @@ packages:
   basic-ftp@5.0.5:
     resolution: {integrity: sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==}
     engines: {node: '>=10.0.0'}
-    deprecated: Security vulnerability fixed in 5.2.0, please upgrade
+    deprecated: Security vulnerability fixed in 5.2.1, please upgrade
+
+  boolbase@1.0.0:
+    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
 
   brace-expansion@1.1.12:
     resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
@@ -1040,6 +1208,10 @@ packages:
   brace-expansion@2.0.2:
     resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
 
+  brace-expansion@5.0.5:
+    resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==}
+    engines: {node: 18 || 20 || >=22}
+
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
@@ -1050,8 +1222,8 @@ packages:
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
-  cacheable@2.2.0:
-    resolution: {integrity: sha512-LEJxRqfeomiiRd2t0uON6hxAtgOoWDfY3fugebbz+J3vDLO+SkdfFChQcOHTZhj9SYa9iwE9MGYNX72dKiOE4w==}
+  cacheable@2.3.4:
+    resolution: {integrity: sha512-djgxybDbw9fL/ZWMI3+CE8ZilNxcwFkVtDc1gJ+IlOSSWkSMPQabhV/XCHTQ6pwwN6aivXPZ43omTooZiX06Ew==}
 
   call-bind-apply-helpers@1.0.2:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
@@ -1080,8 +1252,8 @@ packages:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
 
-  chromium-bidi@11.0.0:
-    resolution: {integrity: sha512-cM3DI+OOb89T3wO8cpPSro80Q9eKYJ7hGVXoGS3GkDPxnYSqiv+6xwpIf6XERyJ9Tdsl09hmNmY94BkgZdVekw==}
+  chromium-bidi@14.0.0:
+    resolution: {integrity: sha512-9gYlLtS6tStdRWzrtXaTMnqcM4dudNegMXJxkR0I/CXObHalYeYcAMPrL19eroNZHtJ8DQmu1E+ZNOYu/IXMXw==}
     peerDependencies:
       devtools-protocol: '*'
 
@@ -1113,6 +1285,10 @@ packages:
     resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
     engines: {node: '>=14'}
 
+  commander@11.1.0:
+    resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
+    engines: {node: '>=16'}
+
   commander@13.1.0:
     resolution: {integrity: sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==}
     engines: {node: '>=18'}
@@ -1123,8 +1299,8 @@ packages:
   concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-  cosmiconfig@9.0.0:
-    resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==}
+  cosmiconfig@9.0.1:
+    resolution: {integrity: sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ==}
     engines: {node: '>=14'}
     peerDependencies:
       typescript: '>=4.9.5'
@@ -1136,19 +1312,38 @@ packages:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
 
-  css-functions-list@3.2.3:
-    resolution: {integrity: sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==}
-    engines: {node: '>=12 || >=16'}
+  css-functions-list@3.3.3:
+    resolution: {integrity: sha512-8HFEBPKhOpJPEPu70wJJetjKta86Gw9+CCyCnB3sui2qQfOvRyqBy4IKLKKAwdMpWb2lHXWk9Wb4Z6AmaUT1Pg==}
+    engines: {node: '>=12'}
+
+  css-select@5.2.2:
+    resolution: {integrity: sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==}
+
+  css-tree@2.2.1:
+    resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
 
   css-tree@3.1.0:
     resolution: {integrity: sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
 
+  css-tree@3.2.1:
+    resolution: {integrity: sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
+  css-what@6.2.2:
+    resolution: {integrity: sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==}
+    engines: {node: '>= 6'}
+
   cssesc@3.0.0:
     resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
     engines: {node: '>=4'}
     hasBin: true
 
+  csso@5.0.5:
+    resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
+
   csstype@3.1.3:
     resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
 
@@ -1176,15 +1371,6 @@ packages:
       supports-color:
         optional: true
 
-  debug@4.4.1:
-    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
   debug@4.4.3:
     resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
     engines: {node: '>=6.0'}
@@ -1209,23 +1395,32 @@ packages:
     resolution: {integrity: sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==}
     engines: {node: '>= 14'}
 
-  devtools-protocol@0.0.1521046:
-    resolution: {integrity: sha512-vhE6eymDQSKWUXwwA37NtTTVEzjtGVfDr3pRbsWEQ5onH/Snp2c+2xZHWJJawG/0hCCJLRGt4xVtEVUVILol4w==}
+  devtools-protocol@0.0.1595872:
+    resolution: {integrity: sha512-kRfgp8vWVjBu/fbYCiVFiOqsCk3CrMKEo3WbgGT2NXK2dG7vawWPBljixajVgGK9II8rDO9G0oD0zLt3I1daRg==}
 
-  diff@8.0.2:
-    resolution: {integrity: sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==}
+  diff@9.0.0:
+    resolution: {integrity: sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw==}
     engines: {node: '>=0.3.1'}
 
-  dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: '>=8'}
-
   doctrine@2.1.0:
     resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
     engines: {node: '>=0.10.0'}
 
-  dompurify@3.1.7:
-    resolution: {integrity: sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==}
+  dom-serializer@2.0.0:
+    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+
+  domelementtype@2.3.0:
+    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+
+  domhandler@5.0.3:
+    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
+    engines: {node: '>= 4'}
+
+  dompurify@3.2.7:
+    resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==}
+
+  domutils@3.2.2:
+    resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==}
 
   dot-case@3.0.4:
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
@@ -1234,15 +1429,9 @@ packages:
     resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
     engines: {node: '>= 0.4'}
 
-  eastasianwidth@0.2.0:
-    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
-
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
-  emoji-regex@9.2.2:
-    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
-
   end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
 
@@ -1303,6 +1492,11 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
+  esbuild@0.28.0:
+    resolution: {integrity: sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escalade@3.1.2:
     resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
     engines: {node: '>=6'}
@@ -1371,23 +1565,23 @@ packages:
     peerDependencies:
       eslint: '>=8.41.0'
 
-  eslint-plugin-simple-import-sort@12.1.1:
-    resolution: {integrity: sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==}
+  eslint-plugin-simple-import-sort@13.0.0:
+    resolution: {integrity: sha512-McAc+/Nlvcg4byY/CABGH8kqnefWBj8s3JA2okEtz8ixbECQgU46p0HkTUKa4YS7wvgGceimlc34p1nXqbWqtA==}
     peerDependencies:
       eslint: '>=5.0.0'
 
-  eslint-plugin-unused-imports@4.3.0:
-    resolution: {integrity: sha512-ZFBmXMGBYfHttdRtOG9nFFpmUvMtbHSjsKrS20vdWdbfiVYsO3yA2SGYy9i9XmZJDfMGBflZGBCm70SEnFQtOA==}
+  eslint-plugin-unused-imports@4.4.1:
+    resolution: {integrity: sha512-oZGYUz1X3sRMGUB+0cZyK2VcvRX5lm/vB56PgNNcU+7ficUCKm66oZWKUubXWnOuPjQ8PvmXtCViXBMONPe7tQ==}
     peerDependencies:
       '@typescript-eslint/eslint-plugin': ^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0
-      eslint: ^9.0.0 || ^8.0.0
+      eslint: ^10.0.0 || ^9.0.0 || ^8.0.0
     peerDependenciesMeta:
       '@typescript-eslint/eslint-plugin':
         optional: true
 
-  eslint-scope@8.4.0:
-    resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  eslint-scope@9.1.2:
+    resolution: {integrity: sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
   eslint-visitor-keys@3.4.3:
     resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
@@ -1397,9 +1591,13 @@ packages:
     resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  eslint@9.39.1:
-    resolution: {integrity: sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  eslint-visitor-keys@5.0.1:
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
+  eslint@10.2.0:
+    resolution: {integrity: sha512-+L0vBFYGIpSNIt/KWTpFonPrqYvgKw1eUI5Vn7mEogrQcWtWYtNQ7dNqC+px/J0idT3BAkiWrhfS7k+Tum8TUA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
     hasBin: true
     peerDependencies:
       jiti: '*'
@@ -1411,13 +1609,17 @@ packages:
     resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  espree@11.2.0:
+    resolution: {integrity: sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
     hasBin: true
 
-  esquery@1.6.0:
-    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
+  esquery@1.7.0:
+    resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
     engines: {node: '>=0.10'}
 
   esrecurse@4.3.0:
@@ -1469,6 +1671,15 @@ packages:
   fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
 
+  fdir@6.5.0:
+    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
   fetch-blob@3.2.0:
     resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
     engines: {node: ^12.20 || >= 14.13}
@@ -1476,8 +1687,8 @@ packages:
   fflate@0.8.2:
     resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
 
-  file-entry-cache@10.1.4:
-    resolution: {integrity: sha512-5XRUFc0WTtUbjfGzEwXc42tiGxQHBmtbUG1h9L2apu4SulCGN3Hqm//9D6FAolf8MYNL7f/YlJl9vy08pj5JuA==}
+  file-entry-cache@11.1.2:
+    resolution: {integrity: sha512-N2WFfK12gmrK1c1GXOqiAJ1tc5YE+R53zvQ+t5P8S5XhnmKYVB5eZEiLNZKDSmoG8wqqbF9EXYBBW/nef19log==}
 
   file-entry-cache@8.0.0:
     resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
@@ -1495,20 +1706,19 @@ packages:
     resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
     engines: {node: '>=16'}
 
-  flat-cache@6.1.19:
-    resolution: {integrity: sha512-l/K33newPTZMTGAnnzaiqSl6NnH7Namh8jBNjrgjprWxGmZUuxx/sJNIRaijOh3n7q7ESbhNZC+pvVZMFdeU4A==}
+  flat-cache@6.1.22:
+    resolution: {integrity: sha512-N2dnzVJIphnNsjHcrxGW7DePckJ6haPrSFqpsBUhHYgwtKGVq4JrBGielEGD2fCVnsGm1zlBVZ8wGhkyuetgug==}
 
   flatted@3.3.3:
     resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==}
 
+  flatted@3.4.2:
+    resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==}
+
   for-each@0.3.5:
     resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
     engines: {node: '>= 0.4'}
 
-  foreground-child@3.3.1:
-    resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==}
-    engines: {node: '>=14'}
-
   fs-extra@11.3.0:
     resolution: {integrity: sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==}
     engines: {node: '>=14.14'}
@@ -1532,6 +1742,10 @@ packages:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
+  get-east-asian-width@1.5.0:
+    resolution: {integrity: sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==}
+    engines: {node: '>=18'}
+
   get-intrinsic@1.3.0:
     resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
     engines: {node: '>= 0.4'}
@@ -1567,10 +1781,9 @@ packages:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
 
-  glob@11.0.3:
-    resolution: {integrity: sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==}
-    engines: {node: 20 || >=22}
-    hasBin: true
+  glob@13.0.6:
+    resolution: {integrity: sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==}
+    engines: {node: 18 || 20 || >=22}
 
   global-modules@2.0.0:
     resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==}
@@ -1584,17 +1797,13 @@ packages:
     resolution: {integrity: sha512-w0Uf9Y9/nyHinEk5vMJKRie+wa4kR5hmDbEhGGds/kG1PwGLLHKRoNMeJOyCQjjBkANlnScqgzcFwGHgmgLkVA==}
     engines: {node: '>=16'}
 
-  globals@14.0.0:
-    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
-    engines: {node: '>=18'}
-
   globalthis@1.0.4:
     resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
     engines: {node: '>= 0.4'}
 
-  globby@11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
-    engines: {node: '>=10'}
+  globby@16.2.0:
+    resolution: {integrity: sha512-QrJia2qDf5BB/V6HYlDTs0I0lBahyjLzpGQg3KT7FnCdTonAyPy2RtY802m2k4ALx6Dp752f82WsOczEVr3l6Q==}
+    engines: {node: '>=20'}
 
   globjoin@0.1.4:
     resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
@@ -1606,9 +1815,6 @@ packages:
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
-  graphemer@1.4.0:
-    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
-
   has-bigints@1.0.2:
     resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
 
@@ -1620,6 +1826,10 @@ packages:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
 
+  has-flag@5.0.1:
+    resolution: {integrity: sha512-CsNUt5x9LUdx6hnk/E2SZLsDyvfqANZSUq4+D3D8RzDJ2M+HDTIkF60ibS1vHaK55vzgiZw1bEPFG9yH7l33wA==}
+    engines: {node: '>=12'}
+
   has-property-descriptors@1.0.2:
     resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
 
@@ -1635,8 +1845,8 @@ packages:
     resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
     engines: {node: '>= 0.4'}
 
-  hashery@1.2.0:
-    resolution: {integrity: sha512-43XJKpwle72Ik5Zpam7MuzRWyNdwwdf6XHlh8wCj2PggvWf+v/Dm5B0dxGZOmddidgeO6Ofu9As/o231Ti/9PA==}
+  hashery@1.5.1:
+    resolution: {integrity: sha512-iZyKG96/JwPz1N55vj2Ie2vXbhu440zfUfJvSwEqEbeLluk7NnapfGqa7LH0mOsnDxTF85Mx8/dyR6HfqcbmbQ==}
     engines: {node: '>=20'}
 
   hasown@2.0.2:
@@ -1647,17 +1857,20 @@ packages:
     resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==}
     engines: {node: '>=12.0.0'}
 
-  hookified@1.13.0:
-    resolution: {integrity: sha512-6sPYUY8olshgM/1LDNW4QZQN0IqgKhtl/1C8koNZBJrKLBk3AZl6chQtNwpNztvfiApHMEwMHek5rv993PRbWw==}
+  hookified@1.15.1:
+    resolution: {integrity: sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg==}
+
+  hookified@2.1.1:
+    resolution: {integrity: sha512-AHb76R16GB5EsPBE2J7Ko5kiEyXwviB9P5SMrAKcuAu4vJPZttViAbj9+tZeaQE5zjDme+1vcHP78Yj/WoAveA==}
 
   html-minifier-terser@7.2.0:
     resolution: {integrity: sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==}
     engines: {node: ^14.13.1 || >=16.0.0}
     hasBin: true
 
-  html-tags@3.3.1:
-    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
-    engines: {node: '>=8'}
+  html-tags@5.1.0:
+    resolution: {integrity: sha512-n6l5uca7/y5joxZ3LUePhzmBFUJ+U2YWzhMa8XUTecSeSlQiZdF5XAd/Q3/WUl0VsXgUwWi8I7CNIwdI5WN1SQ==}
+    engines: {node: '>=20.10'}
 
   http-proxy-agent@7.0.2:
     resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
@@ -1674,10 +1887,6 @@ packages:
     resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
     engines: {node: '>= 4'}
 
-  ignore@7.0.3:
-    resolution: {integrity: sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==}
-    engines: {node: '>= 4'}
-
   ignore@7.0.5:
     resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
     engines: {node: '>= 4'}
@@ -1686,6 +1895,9 @@ packages:
     resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
     engines: {node: '>=6'}
 
+  import-meta-resolve@4.2.0:
+    resolution: {integrity: sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==}
+
   imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
@@ -1776,6 +1988,10 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
+  is-path-inside@4.0.0:
+    resolution: {integrity: sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==}
+    engines: {node: '>=12'}
+
   is-plain-object@5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
@@ -1830,10 +2046,6 @@ packages:
     resolution: {integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==}
     engines: {node: '>= 0.4'}
 
-  jackspeak@4.1.1:
-    resolution: {integrity: sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==}
-    engines: {node: 20 || >=22}
-
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
@@ -1882,16 +2094,13 @@ packages:
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
-  keyv@5.5.4:
-    resolution: {integrity: sha512-eohl3hKTiVyD1ilYdw9T0OiB4hnjef89e3dMYKz+mVKDzj+5IteTseASUsOB+EU9Tf6VNTCjDePcP6wkDGmLKQ==}
+  keyv@5.6.0:
+    resolution: {integrity: sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==}
 
   kind-of@6.0.3:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}
 
-  known-css-properties@0.37.0:
-    resolution: {integrity: sha512-JCDrsP4Z1Sb9JwG0aJ8Eo2r7k4Ou5MwmThS/6lcIe1ICyb7UBJKGRIUUdqc2ASdE/42lgz6zFUnzAIhtXnBVrQ==}
-
   levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
@@ -1903,9 +2112,6 @@ packages:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
 
-  lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
-
   lodash.truncate@4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
 
@@ -1916,8 +2122,8 @@ packages:
   lower-case@2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
 
-  lru-cache@11.2.1:
-    resolution: {integrity: sha512-r8LA6i4LP4EeWOhqBaZZjDWwehd1xUJPCJd9Sv300H0ZmcUER4+JPh7bqqZeqs1o5pgtgvXm+d9UGrB5zZGDiQ==}
+  lru-cache@11.3.5:
+    resolution: {integrity: sha512-NxVFwLAnrd9i7KUBxC4DrUhmgjzOs+1Qm50D3oF1/oL+r1NpZ4gA7xvG0/zJ8evR7zIKn4vLf7qTNduWFtCrRw==}
     engines: {node: 20 || >=22}
 
   lru-cache@7.18.3:
@@ -1933,15 +2139,21 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mathml-tag-names@2.1.3:
-    resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
+  mathml-tag-names@4.0.0:
+    resolution: {integrity: sha512-aa6AU2Pcx0VP/XWnh8IGL0SYSgQHDT6Ucror2j2mXeFAlN3ahaNs8EZtG1YiticMkSLj3Gt6VPFfZogt7G5iFQ==}
+
+  mdn-data@2.0.28:
+    resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==}
 
   mdn-data@2.12.2:
     resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
 
-  meow@13.2.0:
-    resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==}
-    engines: {node: '>=18'}
+  mdn-data@2.27.1:
+    resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==}
+
+  meow@14.1.0:
+    resolution: {integrity: sha512-EDYo6VlmtnumlcBCbh1gLJ//9jvM/ndXHfVXIFrZVr6fGcwTUyCTFNTLCKuY3ffbK8L/+3Mzqnd58RojiZqHVw==}
+    engines: {node: '>=20'}
 
   merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
@@ -1951,9 +2163,9 @@ packages:
     resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
     engines: {node: '>=8.6'}
 
-  minimatch@10.0.3:
-    resolution: {integrity: sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==}
-    engines: {node: 20 || >=22}
+  minimatch@10.2.5:
+    resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
+    engines: {node: 18 || 20 || >=22}
 
   minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
@@ -1968,8 +2180,8 @@ packages:
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
-  minipass@7.1.2:
-    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+  minipass@7.1.3:
+    resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}
     engines: {node: '>=16 || 14 >=14.17'}
 
   mitt@3.0.1:
@@ -1978,8 +2190,8 @@ packages:
   moment@2.30.1:
     resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
 
-  monaco-editor@0.54.0:
-    resolution: {integrity: sha512-hx45SEUoLatgWxHKCmlLJH81xBo0uXP4sRkESUpmDQevfi+e7K1VuiSprK6UpQ8u4zOcKNiH0pMvHvlMWA/4cw==}
+  monaco-editor@0.55.1:
+    resolution: {integrity: sha512-jz4x+TJNFHwHtwuV9vA9rMujcZRb0CEilTEwG2rRSpe/A7Jdkuj8xPKttCgOh+v/lkHy7HsZ64oj+q3xoAFl9A==}
 
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
@@ -2017,6 +2229,9 @@ packages:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
 
+  nth-check@2.1.1:
+    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
+
   object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
@@ -2080,9 +2295,6 @@ packages:
     resolution: {integrity: sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==}
     engines: {node: '>= 14'}
 
-  package-json-from-dist@1.0.1:
-    resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
-
   pako@1.0.11:
     resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
 
@@ -2111,13 +2323,9 @@ packages:
   path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
-  path-scurry@2.0.0:
-    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
-    engines: {node: 20 || >=22}
-
-  path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: '>=8'}
+  path-scurry@2.0.2:
+    resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==}
+    engines: {node: 18 || 20 || >=22}
 
   pend@1.2.0:
     resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
@@ -2133,28 +2341,29 @@ packages:
     resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
     engines: {node: '>=12'}
 
+  picomatch@4.0.4:
+    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
+    engines: {node: '>=12'}
+
   possible-typed-array-names@1.1.0:
     resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
     engines: {node: '>= 0.4'}
 
-  postcss-resolve-nested-selector@0.1.6:
-    resolution: {integrity: sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==}
-
   postcss-safe-parser@7.0.1:
     resolution: {integrity: sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==}
     engines: {node: '>=18.0'}
     peerDependencies:
       postcss: ^8.4.31
 
-  postcss-selector-parser@7.1.0:
-    resolution: {integrity: sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==}
+  postcss-selector-parser@7.1.1:
+    resolution: {integrity: sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==}
     engines: {node: '>=4'}
 
   postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
-  postcss@8.5.6:
-    resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
+  postcss@8.5.10:
+    resolution: {integrity: sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==}
     engines: {node: ^10 || ^12 || >=14}
 
   prelude-ls@1.2.1:
@@ -2182,8 +2391,8 @@ packages:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
 
-  puppeteer-core@24.30.0:
-    resolution: {integrity: sha512-2S3Smy0t0W4wJnNvDe7W0bE7wDmZjfZ3ljfMgJd6hn2Hq/f0jgN+x9PULZo2U3fu5UUIJ+JP8cNUGllu8P91Pg==}
+  puppeteer-core@24.41.0:
+    resolution: {integrity: sha512-rLIUri7E/NQ3APSEYCCozaSJx0u8Tu9wxO6BJwnvXmIgILSK3L0TombaVh3izp1njAGrO6H2ru0hcIrLF+gWLw==}
     engines: {node: '>=18'}
 
   q@1.5.1:
@@ -2194,8 +2403,8 @@ packages:
 
       (For a CapTP with native promises, see @endo/eventual-send and @endo/captp)
 
-  qified@0.5.2:
-    resolution: {integrity: sha512-7gJ6mxcQb9vUBOtbKm5mDevbe2uRcOEVp1g4gb/Q+oLntB3HY8eBhOYRxFI2mlDFlY1e4DOSCptzxarXRvzxCA==}
+  qified@0.9.1:
+    resolution: {integrity: sha512-n7mar4T0xQ+39dE2vGTAlbxUEpndwPANH0kDef1/MYsB8Bba9wshkybIRx74qgcvKQPEWErf9AqAdYjhzY2Ilg==}
     engines: {node: '>=20'}
 
   queue-microtask@1.2.3:
@@ -2228,10 +2437,6 @@ packages:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
 
-  resolve-from@5.0.0:
-    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
-    engines: {node: '>=8'}
-
   resolve-pkg-maps@1.0.0:
     resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
 
@@ -2267,6 +2472,10 @@ packages:
     resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
     engines: {node: '>= 0.4'}
 
+  sax@1.6.0:
+    resolution: {integrity: sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==}
+    engines: {node: '>=11.0.0'}
+
   semver@6.3.1:
     resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
@@ -2276,13 +2485,13 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.7.2:
-    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
+  semver@7.7.3:
+    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.7.3:
-    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
+  semver@7.7.4:
+    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -2326,9 +2535,9 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
-  slash@3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
-    engines: {node: '>=8'}
+  slash@5.1.0:
+    resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==}
+    engines: {node: '>=14.16'}
 
   slice-ansi@4.0.0:
     resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
@@ -2360,8 +2569,8 @@ packages:
   sprintf-js@1.1.3:
     resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
 
-  standalone-electron-types@34.2.0:
-    resolution: {integrity: sha512-+BIrNe0TdZBBBRS3G/F7cPbuBipSZylSjSrJu9+sjw84+vz36a5oZ7l9NeH7aXgMWmPzPZKsTm+K0nOIvhENJQ==}
+  standalone-electron-types@41.2.1:
+    resolution: {integrity: sha512-0NAQpGYvxpqZ87SNaWyJhmgmIZ3vkPkES01j3etqSoRepINU/LpNy9bk4Pyp/4me6rCs11jPoWqzQCEn+e+d6Q==}
 
   stop-iteration-iterator@1.1.0:
     resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
@@ -2374,9 +2583,9 @@ packages:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
 
-  string-width@5.1.2:
-    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
-    engines: {node: '>=12'}
+  string-width@8.2.0:
+    resolution: {integrity: sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==}
+    engines: {node: '>=20'}
 
   string.prototype.matchall@4.0.12:
     resolution: {integrity: sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==}
@@ -2409,27 +2618,27 @@ packages:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
     engines: {node: '>=4'}
 
-  strip-json-comments@3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
-    engines: {node: '>=8'}
-
-  stylelint-config-recommended@17.0.0:
-    resolution: {integrity: sha512-WaMSdEiPfZTSFVoYmJbxorJfA610O0tlYuU2aEwY33UQhSPgFbClrVJYWvy3jGJx+XW37O+LyNLiZOEXhKhJmA==}
-    engines: {node: '>=18.12.0'}
+  stylelint-config-recommended@18.0.0:
+    resolution: {integrity: sha512-mxgT2XY6YZ3HWWe3Di8umG6aBmWmHTblTgu/f10rqFXnyWxjKWwNdjSWkgkwCtxIKnqjSJzvFmPT5yabVIRxZg==}
+    engines: {node: '>=20.19.0'}
     peerDependencies:
-      stylelint: ^16.23.0
+      stylelint: ^17.0.0
 
-  stylelint-config-standard@39.0.1:
-    resolution: {integrity: sha512-b7Fja59EYHRNOTa3aXiuWnhUWXFU2Nfg6h61bLfAb5GS5fX3LMUD0U5t4S8N/4tpHQg3Acs2UVPR9jy2l1g/3A==}
-    engines: {node: '>=18.12.0'}
+  stylelint-config-standard@40.0.0:
+    resolution: {integrity: sha512-EznGJxOUhtWck2r6dJpbgAdPATIzvpLdK9+i5qPd4Lx70es66TkBPljSg4wN3Qnc6c4h2n+WbUrUynQ3fanjHw==}
+    engines: {node: '>=20.19.0'}
     peerDependencies:
-      stylelint: ^16.23.0
+      stylelint: ^17.0.0
 
-  stylelint@16.25.0:
-    resolution: {integrity: sha512-Li0avYWV4nfv1zPbdnxLYBGq4z8DVZxbRgx4Kn6V+Uftz1rMoF1qiEI3oL4kgWqyYgCgs7gT5maHNZ82Gk03vQ==}
-    engines: {node: '>=18.12.0'}
+  stylelint@17.8.0:
+    resolution: {integrity: sha512-oHkld9T60LDSaUQ4CSVc+tlt9eUoDlxhaGWShsUCKyIL14boZfmK5bSphZqx64aiC5tCqX+BsQMTMoSz8D1zIg==}
+    engines: {node: '>=20.19.0'}
     hasBin: true
 
+  supports-color@10.2.2:
+    resolution: {integrity: sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==}
+    engines: {node: '>=18'}
+
   supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
@@ -2438,9 +2647,9 @@ packages:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
 
-  supports-hyperlinks@3.2.0:
-    resolution: {integrity: sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig==}
-    engines: {node: '>=14.18'}
+  supports-hyperlinks@4.4.0:
+    resolution: {integrity: sha512-UKbpT93hN5Nr9go5UY7bopIB9YQlMz9nm/ct4IXt/irb5YRkn9WaqrOBJGZ5Pwvsd5FQzSVeYlGdXoCAPQZrPg==}
+    engines: {node: '>=20'}
 
   supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
@@ -2449,6 +2658,11 @@ packages:
   svg-tags@1.0.0:
     resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
 
+  svgo@4.0.1:
+    resolution: {integrity: sha512-XDpWUOPC6FEibaLzjfe0ucaV0YrOjYotGJO1WpF0Zd+n6ZGEQUsSugaoLq9QkEZtAfQIxT42UChcssDVPP3+/w==}
+    engines: {node: '>=16'}
+    hasBin: true
+
   table@6.9.0:
     resolution: {integrity: sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==}
     engines: {node: '>=10.0.0'}
@@ -2471,12 +2685,16 @@ packages:
   text-decoder@1.1.1:
     resolution: {integrity: sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==}
 
+  tinyglobby@0.2.16:
+    resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
+    engines: {node: '>=12.0.0'}
+
   to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
 
-  ts-api-utils@2.1.0:
-    resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==}
+  ts-api-utils@2.5.0:
+    resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
     engines: {node: '>=18.12'}
     peerDependencies:
       typescript: '>=4.8.4'
@@ -2488,6 +2706,9 @@ packages:
   ts-pattern@5.6.2:
     resolution: {integrity: sha512-d4IxJUXROL5NCa3amvMg6VQW2HVtZYmUTPfvVtO7zJWGYLJ+mry9v2OmYm+z67aniQoQ8/yFNadiEwtNS9qQiw==}
 
+  ts-pattern@5.9.0:
+    resolution: {integrity: sha512-6s5V71mX8qBUmlgbrfL33xDUwO0fq48rxAu2LBE11WBeGdpCPOsXksQbZJHvHwhrd3QjUusd3mAOM5Gg0mFBLg==}
+
   tsconfig-paths@3.15.0:
     resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
 
@@ -2502,8 +2723,8 @@ packages:
     engines: {node: '>=18.0.0'}
     hasBin: true
 
-  tsx@4.20.6:
-    resolution: {integrity: sha512-ytQKuwgmrrkDTFP4LjR0ToE2nqgy886GpvRSpU0JAnrdBYppuY5rLkRUYPU1yCryb24SsKBTL/hlDQAEFVwtZg==}
+  tsx@4.21.0:
+    resolution: {integrity: sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
@@ -2519,8 +2740,8 @@ packages:
     resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
     engines: {node: '>=16'}
 
-  type-fest@5.2.0:
-    resolution: {integrity: sha512-xxCJm+Bckc6kQBknN7i9fnP/xobQRsRQxR01CztFkp/h++yfVxUUcmMgfR2HttJx/dpWjS9ubVuyspJv24Q9DA==}
+  type-fest@5.5.0:
+    resolution: {integrity: sha512-PlBfpQwiUvGViBNX84Yxwjsdhd1TUlXr6zjX7eoirtCPIr08NAmxwa+fcYBTeRQxHo9YC9wwF3m9i700sHma8g==}
     engines: {node: '>=20'}
 
   typed-array-buffer@1.0.3:
@@ -2539,23 +2760,23 @@ packages:
     resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==}
     engines: {node: '>= 0.4'}
 
-  typed-query-selector@2.12.0:
-    resolution: {integrity: sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==}
+  typed-query-selector@2.12.1:
+    resolution: {integrity: sha512-uzR+FzI8qrUEIu96oaeBJmd9E7CFEiQ3goA5qCVgc4s5llSubcfGHq9yUstZx/k4s9dXHVKsE35YWoFyvEqEHA==}
 
-  typescript-eslint@8.47.0:
-    resolution: {integrity: sha512-Lwe8i2XQ3WoMjua/r1PHrCTpkubPYJCAfOurtn+mtTzqB6jNd+14n9UN1bJ4s3F49x9ixAm0FLflB/JzQ57M8Q==}
+  typescript-eslint@8.58.2:
+    resolution: {integrity: sha512-V8iSng9mRbdZjl54VJ9NKr6ZB+dW0J3TzRXRGcSbLIej9jV86ZRtlYeTKDR/QLxXykocJ5icNzbsl2+5TzIvcQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <6.0.0'
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
 
-  typescript-transform-paths@3.5.5:
-    resolution: {integrity: sha512-RMK86wKe/4+ad+3kMT9SKAs3K0tUHLe7hF+MLbD6VpC9VUmFuKorhf3pHz+qO5GdS4mUp2ncNUo14j6ws9UvBQ==}
+  typescript-transform-paths@3.5.6:
+    resolution: {integrity: sha512-3eQTG6Ogt+pgPEh45uX2s9OwcfAVjWnyNO+osjYcOqYaWDVMIFUkqW8e0O1cOaVwdMqQFQf6alDT+76xmeS2Ag==}
     peerDependencies:
       typescript: '>=3.6.5'
 
-  typescript@5.9.3:
-    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+  typescript@6.0.2:
+    resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -2566,8 +2787,12 @@ packages:
   undici-types@6.20.0:
     resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
 
-  undici-types@7.16.0:
-    resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
+  undici-types@7.19.2:
+    resolution: {integrity: sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==}
+
+  unicorn-magic@0.4.0:
+    resolution: {integrity: sha512-wH590V9VNgYH9g3lH9wWjTrUoKsjLF6sGLjhR4sH1LWpLmCOH0Zf7PukhDA8BiS7KHe4oPNkcTHqYkj7SOGUOw==}
+    engines: {node: '>=20'}
 
   universalify@2.0.1:
     resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
@@ -2596,8 +2821,8 @@ packages:
     resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
     engines: {node: '>= 8'}
 
-  webdriver-bidi-protocol@0.3.8:
-    resolution: {integrity: sha512-21Yi2GhGntMc671vNBCjiAeEVknXjVRoyu+k+9xOMShu+ZQfpGQwnBqbNz/Sv4GXZ6JmutlPAi2nIJcrymAWuQ==}
+  webdriver-bidi-protocol@0.4.1:
+    resolution: {integrity: sha512-ARrjNjtWRRs2w4Tk7nqrf2gBI0QXWuOmMCx2hU+1jUt6d00MjMxURrhxhGbrsoiZKJrhTSTzbIrc554iKI10qw==}
 
   which-boxed-primitive@1.1.1:
     resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
@@ -2641,19 +2866,15 @@ packages:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
 
-  wrap-ansi@8.1.0:
-    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
-    engines: {node: '>=12'}
-
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  write-file-atomic@5.0.1:
-    resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  write-file-atomic@7.0.1:
+    resolution: {integrity: sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg==}
+    engines: {node: ^20.17.0 || >=22.9.0}
 
-  ws@8.18.3:
-    resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
+  ws@8.20.0:
+    resolution: {integrity: sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -2668,6 +2889,10 @@ packages:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
 
+  yaml-js@0.3.1:
+    resolution: {integrity: sha512-LjoIFHCtSfkGzPsmYmfDsW+TShtQBcY7lwH1yLQ5brJHXRhjteUnVE2ThCbz1madq8JUZIAjFiavfnIFeTO8CQ==}
+    engines: {node: '>=8'}
+
   yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
@@ -2712,40 +2937,51 @@ snapshots:
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
-  '@cacheable/memory@2.0.5':
+  '@cacheable/memory@2.0.8':
     dependencies:
-      '@cacheable/utils': 2.3.1
-      '@keyv/bigmap': 1.3.0(keyv@5.5.4)
-      hookified: 1.13.0
-      keyv: 5.5.4
+      '@cacheable/utils': 2.4.1
+      '@keyv/bigmap': 1.3.1(keyv@5.6.0)
+      hookified: 1.15.1
+      keyv: 5.6.0
 
-  '@cacheable/utils@2.3.1':
+  '@cacheable/utils@2.4.1':
     dependencies:
-      hashery: 1.2.0
-      keyv: 5.5.4
+      hashery: 1.5.1
+      keyv: 5.6.0
 
-  '@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4)':
+  '@csstools/css-calc@3.2.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
     dependencies:
-      '@csstools/css-tokenizer': 3.0.4
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-tokenizer': 4.0.0
 
-  '@csstools/css-tokenizer@3.0.4': {}
-
-  '@csstools/media-query-list-parser@4.0.3(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
+  '@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0)':
     dependencies:
-      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
-      '@csstools/css-tokenizer': 3.0.4
+      '@csstools/css-tokenizer': 4.0.0
 
-  '@csstools/selector-specificity@5.0.0(postcss-selector-parser@7.1.0)':
+  '@csstools/css-syntax-patches-for-csstree@1.1.3(css-tree@3.2.1)':
+    optionalDependencies:
+      css-tree: 3.2.1
+
+  '@csstools/css-tokenizer@4.0.0': {}
+
+  '@csstools/media-query-list-parser@5.0.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
     dependencies:
-      postcss-selector-parser: 7.1.0
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-tokenizer': 4.0.0
 
-  '@dual-bundle/import-meta-resolve@4.2.1': {}
+  '@csstools/selector-resolve-nested@4.0.0(postcss-selector-parser@7.1.1)':
+    dependencies:
+      postcss-selector-parser: 7.1.1
 
-  '@electron/asar@4.0.1':
+  '@csstools/selector-specificity@6.0.0(postcss-selector-parser@7.1.1)':
+    dependencies:
+      postcss-selector-parser: 7.1.1
+
+  '@electron/asar@4.2.0':
     dependencies:
       commander: 13.1.0
-      glob: 11.0.3
-      minimatch: 10.0.3
+      glob: 13.0.6
+      minimatch: 10.2.5
 
   '@esbuild/aix-ppc64@0.25.1':
     optional: true
@@ -2753,197 +2989,264 @@ snapshots:
   '@esbuild/aix-ppc64@0.27.0':
     optional: true
 
+  '@esbuild/aix-ppc64@0.28.0':
+    optional: true
+
   '@esbuild/android-arm64@0.25.1':
     optional: true
 
   '@esbuild/android-arm64@0.27.0':
     optional: true
 
+  '@esbuild/android-arm64@0.28.0':
+    optional: true
+
   '@esbuild/android-arm@0.25.1':
     optional: true
 
   '@esbuild/android-arm@0.27.0':
     optional: true
 
+  '@esbuild/android-arm@0.28.0':
+    optional: true
+
   '@esbuild/android-x64@0.25.1':
     optional: true
 
   '@esbuild/android-x64@0.27.0':
     optional: true
 
+  '@esbuild/android-x64@0.28.0':
+    optional: true
+
   '@esbuild/darwin-arm64@0.25.1':
     optional: true
 
   '@esbuild/darwin-arm64@0.27.0':
     optional: true
 
+  '@esbuild/darwin-arm64@0.28.0':
+    optional: true
+
   '@esbuild/darwin-x64@0.25.1':
     optional: true
 
   '@esbuild/darwin-x64@0.27.0':
     optional: true
 
+  '@esbuild/darwin-x64@0.28.0':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.25.1':
     optional: true
 
   '@esbuild/freebsd-arm64@0.27.0':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.28.0':
+    optional: true
+
   '@esbuild/freebsd-x64@0.25.1':
     optional: true
 
   '@esbuild/freebsd-x64@0.27.0':
     optional: true
 
+  '@esbuild/freebsd-x64@0.28.0':
+    optional: true
+
   '@esbuild/linux-arm64@0.25.1':
     optional: true
 
   '@esbuild/linux-arm64@0.27.0':
     optional: true
 
+  '@esbuild/linux-arm64@0.28.0':
+    optional: true
+
   '@esbuild/linux-arm@0.25.1':
     optional: true
 
   '@esbuild/linux-arm@0.27.0':
     optional: true
 
+  '@esbuild/linux-arm@0.28.0':
+    optional: true
+
   '@esbuild/linux-ia32@0.25.1':
     optional: true
 
   '@esbuild/linux-ia32@0.27.0':
     optional: true
 
+  '@esbuild/linux-ia32@0.28.0':
+    optional: true
+
   '@esbuild/linux-loong64@0.25.1':
     optional: true
 
   '@esbuild/linux-loong64@0.27.0':
     optional: true
 
+  '@esbuild/linux-loong64@0.28.0':
+    optional: true
+
   '@esbuild/linux-mips64el@0.25.1':
     optional: true
 
   '@esbuild/linux-mips64el@0.27.0':
     optional: true
 
+  '@esbuild/linux-mips64el@0.28.0':
+    optional: true
+
   '@esbuild/linux-ppc64@0.25.1':
     optional: true
 
   '@esbuild/linux-ppc64@0.27.0':
     optional: true
 
+  '@esbuild/linux-ppc64@0.28.0':
+    optional: true
+
   '@esbuild/linux-riscv64@0.25.1':
     optional: true
 
   '@esbuild/linux-riscv64@0.27.0':
     optional: true
 
+  '@esbuild/linux-riscv64@0.28.0':
+    optional: true
+
   '@esbuild/linux-s390x@0.25.1':
     optional: true
 
   '@esbuild/linux-s390x@0.27.0':
     optional: true
 
+  '@esbuild/linux-s390x@0.28.0':
+    optional: true
+
   '@esbuild/linux-x64@0.25.1':
     optional: true
 
   '@esbuild/linux-x64@0.27.0':
     optional: true
 
+  '@esbuild/linux-x64@0.28.0':
+    optional: true
+
   '@esbuild/netbsd-arm64@0.25.1':
     optional: true
 
   '@esbuild/netbsd-arm64@0.27.0':
     optional: true
 
+  '@esbuild/netbsd-arm64@0.28.0':
+    optional: true
+
   '@esbuild/netbsd-x64@0.25.1':
     optional: true
 
   '@esbuild/netbsd-x64@0.27.0':
     optional: true
 
+  '@esbuild/netbsd-x64@0.28.0':
+    optional: true
+
   '@esbuild/openbsd-arm64@0.25.1':
     optional: true
 
   '@esbuild/openbsd-arm64@0.27.0':
     optional: true
 
+  '@esbuild/openbsd-arm64@0.28.0':
+    optional: true
+
   '@esbuild/openbsd-x64@0.25.1':
     optional: true
 
   '@esbuild/openbsd-x64@0.27.0':
     optional: true
 
+  '@esbuild/openbsd-x64@0.28.0':
+    optional: true
+
   '@esbuild/openharmony-arm64@0.27.0':
     optional: true
 
+  '@esbuild/openharmony-arm64@0.28.0':
+    optional: true
+
   '@esbuild/sunos-x64@0.25.1':
     optional: true
 
   '@esbuild/sunos-x64@0.27.0':
     optional: true
 
+  '@esbuild/sunos-x64@0.28.0':
+    optional: true
+
   '@esbuild/win32-arm64@0.25.1':
     optional: true
 
   '@esbuild/win32-arm64@0.27.0':
     optional: true
 
+  '@esbuild/win32-arm64@0.28.0':
+    optional: true
+
   '@esbuild/win32-ia32@0.25.1':
     optional: true
 
   '@esbuild/win32-ia32@0.27.0':
     optional: true
 
+  '@esbuild/win32-ia32@0.28.0':
+    optional: true
+
   '@esbuild/win32-x64@0.25.1':
     optional: true
 
   '@esbuild/win32-x64@0.27.0':
     optional: true
 
-  '@eslint-community/eslint-utils@4.9.0(eslint@9.39.1)':
+  '@esbuild/win32-x64@0.28.0':
+    optional: true
+
+  '@eslint-community/eslint-utils@4.9.0(eslint@10.2.0)':
     dependencies:
-      eslint: 9.39.1
+      eslint: 10.2.0
       eslint-visitor-keys: 3.4.3
 
-  '@eslint-community/regexpp@4.12.1': {}
-
-  '@eslint/config-array@0.21.1':
+  '@eslint-community/eslint-utils@4.9.1(eslint@10.2.0)':
     dependencies:
-      '@eslint/object-schema': 2.1.7
-      debug: 4.4.1
-      minimatch: 3.1.2
+      eslint: 10.2.0
+      eslint-visitor-keys: 3.4.3
+
+  '@eslint-community/regexpp@4.12.2': {}
+
+  '@eslint/config-array@0.23.5':
+    dependencies:
+      '@eslint/object-schema': 3.0.5
+      debug: 4.4.3
+      minimatch: 10.2.5
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/config-helpers@0.4.2':
+  '@eslint/config-helpers@0.5.5':
     dependencies:
-      '@eslint/core': 0.17.0
+      '@eslint/core': 1.2.1
 
-  '@eslint/core@0.17.0':
+  '@eslint/core@1.2.1':
     dependencies:
       '@types/json-schema': 7.0.15
 
-  '@eslint/eslintrc@3.3.1':
+  '@eslint/object-schema@3.0.5': {}
+
+  '@eslint/plugin-kit@0.7.1':
     dependencies:
-      ajv: 6.12.6
-      debug: 4.4.1
-      espree: 10.4.0
-      globals: 14.0.0
-      ignore: 5.3.1
-      import-fresh: 3.3.1
-      js-yaml: 4.1.0
-      minimatch: 3.1.2
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-
-  '@eslint/js@9.39.1': {}
-
-  '@eslint/object-schema@2.1.7': {}
-
-  '@eslint/plugin-kit@0.4.1':
-    dependencies:
-      '@eslint/core': 0.17.0
+      '@eslint/core': 1.2.1
       levn: 0.4.1
 
   '@ffmpeg/ffmpeg@0.12.10':
@@ -2969,21 +3272,6 @@ snapshots:
 
   '@intrnl/xxhash64@0.1.2': {}
 
-  '@isaacs/balanced-match@4.0.1': {}
-
-  '@isaacs/brace-expansion@5.0.0':
-    dependencies:
-      '@isaacs/balanced-match': 4.0.1
-
-  '@isaacs/cliui@8.0.2':
-    dependencies:
-      string-width: 5.1.2
-      string-width-cjs: string-width@4.2.3
-      strip-ansi: 7.1.2
-      strip-ansi-cjs: strip-ansi@6.0.1
-      wrap-ansi: 8.1.0
-      wrap-ansi-cjs: wrap-ansi@7.0.0
-
   '@jridgewell/gen-mapping@0.3.5':
     dependencies:
       '@jridgewell/set-array': 1.2.1
@@ -3006,11 +3294,11 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  '@keyv/bigmap@1.3.0(keyv@5.5.4)':
+  '@keyv/bigmap@1.3.1(keyv@5.6.0)':
     dependencies:
-      hashery: 1.2.0
-      hookified: 1.13.0
-      keyv: 5.5.4
+      hashery: 1.5.1
+      hookified: 1.15.1
+      keyv: 5.6.0
 
   '@keyv/serialize@1.1.1': {}
 
@@ -3026,13 +3314,13 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.19.1
 
-  '@puppeteer/browsers@2.10.13':
+  '@puppeteer/browsers@2.13.0':
     dependencies:
       debug: 4.4.3
       extract-zip: 2.0.1
       progress: 2.0.3
       proxy-agent: 6.5.0
-      semver: 7.7.3
+      semver: 7.7.4
       tar-fs: 3.1.1
       yargs: 17.7.2
     transitivePeerDependencies:
@@ -3041,19 +3329,21 @@ snapshots:
 
   '@rtsao/scc@1.1.0': {}
 
-  '@song-spotlight/api@2.1.3(typescript@5.9.3)':
+  '@sindresorhus/merge-streams@4.0.0': {}
+
+  '@song-spotlight/api@2.1.3(typescript@6.0.2)':
     dependencies:
-      typescript: 5.9.3
+      typescript: 6.0.2
     optionalDependencies:
       zod: 4.3.6
 
   '@streamparser/json@0.0.22': {}
 
-  '@stylistic/eslint-plugin@5.6.0(eslint@9.39.1)':
+  '@stylistic/eslint-plugin@5.10.0(eslint@10.2.0)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1)
-      '@typescript-eslint/types': 8.47.0
-      eslint: 9.39.1
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.0)
+      '@typescript-eslint/types': 8.58.2
+      eslint: 10.2.0
       eslint-visitor-keys: 4.2.1
       espree: 10.4.0
       estraverse: 5.3.0
@@ -3061,19 +3351,17 @@ snapshots:
 
   '@tootallnate/quickjs-emscripten@0.23.0': {}
 
-  '@types/adm-zip@0.5.7':
-    dependencies:
-      '@types/node': 24.10.1
-
-  '@types/chrome@0.1.30':
+  '@types/chrome@0.1.40':
     dependencies:
       '@types/filesystem': 0.0.36
       '@types/har-format': 1.2.15
 
-  '@types/diff@7.0.2': {}
+  '@types/esrecurse@4.3.1': {}
 
   '@types/estree@1.0.7': {}
 
+  '@types/estree@1.0.8': {}
+
   '@types/filesystem@0.0.36':
     dependencies:
       '@types/filewriter': 0.0.33
@@ -3099,15 +3387,15 @@ snapshots:
 
   '@types/lodash@4.17.15': {}
 
-  '@types/lodash@4.17.20': {}
+  '@types/lodash@4.17.24': {}
 
   '@types/node@22.13.13':
     dependencies:
       undici-types: 6.20.0
 
-  '@types/node@24.10.1':
+  '@types/node@25.6.0':
     dependencies:
-      undici-types: 7.16.0
+      undici-types: 7.19.2
 
   '@types/react-dom@19.0.4(@types/react@19.0.12)':
     dependencies:
@@ -3119,111 +3407,112 @@ snapshots:
 
   '@types/stylus@0.48.42':
     dependencies:
-      '@types/node': 24.10.1
+      '@types/node': 25.6.0
 
   '@types/tinycolor2@1.4.6': {}
 
-  '@types/yauzl@2.10.3':
-    dependencies:
-      '@types/node': 24.10.1
+  '@types/trusted-types@2.0.7':
     optional: true
 
-  '@types/yazl@3.3.0':
+  '@types/yauzl@2.10.3':
     dependencies:
-      '@types/node': 24.10.1
+      '@types/node': 25.6.0
+    optional: true
 
-  '@typescript-eslint/eslint-plugin@8.47.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1)(typescript@5.9.3)':
+  '@types/yazl@3.3.1':
     dependencies:
-      '@eslint-community/regexpp': 4.12.1
-      '@typescript-eslint/parser': 8.47.0(eslint@9.39.1)(typescript@5.9.3)
-      '@typescript-eslint/scope-manager': 8.47.0
-      '@typescript-eslint/type-utils': 8.47.0(eslint@9.39.1)(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.47.0(eslint@9.39.1)(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.47.0
-      eslint: 9.39.1
-      graphemer: 1.4.0
-      ignore: 7.0.3
+      '@types/node': 25.6.0
+
+  '@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0)(typescript@6.0.2)':
+    dependencies:
+      '@eslint-community/regexpp': 4.12.2
+      '@typescript-eslint/parser': 8.58.2(eslint@10.2.0)(typescript@6.0.2)
+      '@typescript-eslint/scope-manager': 8.58.2
+      '@typescript-eslint/type-utils': 8.58.2(eslint@10.2.0)(typescript@6.0.2)
+      '@typescript-eslint/utils': 8.58.2(eslint@10.2.0)(typescript@6.0.2)
+      '@typescript-eslint/visitor-keys': 8.58.2
+      eslint: 10.2.0
+      ignore: 7.0.5
       natural-compare: 1.4.0
-      ts-api-utils: 2.1.0(typescript@5.9.3)
-      typescript: 5.9.3
+      ts-api-utils: 2.5.0(typescript@6.0.2)
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3)':
+  '@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.47.0
-      '@typescript-eslint/types': 8.47.0
-      '@typescript-eslint/typescript-estree': 8.47.0(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.47.0
-      debug: 4.4.1
-      eslint: 9.39.1
-      typescript: 5.9.3
+      '@typescript-eslint/scope-manager': 8.58.2
+      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.2)
+      '@typescript-eslint/visitor-keys': 8.58.2
+      debug: 4.4.3
+      eslint: 10.2.0
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.47.0(typescript@5.9.3)':
+  '@typescript-eslint/project-service@8.58.2(typescript@6.0.2)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.47.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.47.0
-      debug: 4.4.1
-      typescript: 5.9.3
+      '@typescript-eslint/tsconfig-utils': 8.58.2(typescript@6.0.2)
+      '@typescript-eslint/types': 8.58.2
+      debug: 4.4.3
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/scope-manager@8.47.0':
+  '@typescript-eslint/scope-manager@8.58.2':
     dependencies:
-      '@typescript-eslint/types': 8.47.0
-      '@typescript-eslint/visitor-keys': 8.47.0
+      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/visitor-keys': 8.58.2
 
-  '@typescript-eslint/tsconfig-utils@8.47.0(typescript@5.9.3)':
+  '@typescript-eslint/tsconfig-utils@8.58.2(typescript@6.0.2)':
     dependencies:
-      typescript: 5.9.3
+      typescript: 6.0.2
 
-  '@typescript-eslint/type-utils@8.47.0(eslint@9.39.1)(typescript@5.9.3)':
+  '@typescript-eslint/type-utils@8.58.2(eslint@10.2.0)(typescript@6.0.2)':
     dependencies:
-      '@typescript-eslint/types': 8.47.0
-      '@typescript-eslint/typescript-estree': 8.47.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.47.0(eslint@9.39.1)(typescript@5.9.3)
-      debug: 4.4.1
-      eslint: 9.39.1
-      ts-api-utils: 2.1.0(typescript@5.9.3)
-      typescript: 5.9.3
+      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.2)
+      '@typescript-eslint/utils': 8.58.2(eslint@10.2.0)(typescript@6.0.2)
+      debug: 4.4.3
+      eslint: 10.2.0
+      ts-api-utils: 2.5.0(typescript@6.0.2)
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@8.47.0': {}
+  '@typescript-eslint/types@8.58.2': {}
 
-  '@typescript-eslint/typescript-estree@8.47.0(typescript@5.9.3)':
+  '@typescript-eslint/typescript-estree@8.58.2(typescript@6.0.2)':
     dependencies:
-      '@typescript-eslint/project-service': 8.47.0(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.47.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.47.0
-      '@typescript-eslint/visitor-keys': 8.47.0
-      debug: 4.4.1
-      fast-glob: 3.3.3
-      is-glob: 4.0.3
-      minimatch: 9.0.5
-      semver: 7.7.2
-      ts-api-utils: 2.1.0(typescript@5.9.3)
-      typescript: 5.9.3
+      '@typescript-eslint/project-service': 8.58.2(typescript@6.0.2)
+      '@typescript-eslint/tsconfig-utils': 8.58.2(typescript@6.0.2)
+      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/visitor-keys': 8.58.2
+      debug: 4.4.3
+      minimatch: 10.2.5
+      semver: 7.7.3
+      tinyglobby: 0.2.16
+      ts-api-utils: 2.5.0(typescript@6.0.2)
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.47.0(eslint@9.39.1)(typescript@5.9.3)':
+  '@typescript-eslint/utils@8.58.2(eslint@10.2.0)(typescript@6.0.2)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1)
-      '@typescript-eslint/scope-manager': 8.47.0
-      '@typescript-eslint/types': 8.47.0
-      '@typescript-eslint/typescript-estree': 8.47.0(typescript@5.9.3)
-      eslint: 9.39.1
-      typescript: 5.9.3
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.0)
+      '@typescript-eslint/scope-manager': 8.58.2
+      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.2)
+      eslint: 10.2.0
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/visitor-keys@8.47.0':
+  '@typescript-eslint/visitor-keys@8.58.2':
     dependencies:
-      '@typescript-eslint/types': 8.47.0
-      eslint-visitor-keys: 4.2.1
+      '@typescript-eslint/types': 8.58.2
+      eslint-visitor-keys: 5.0.1
 
   '@vap/core@0.0.12':
     dependencies:
@@ -3245,13 +3534,19 @@ snapshots:
     dependencies:
       acorn: 8.15.0
 
+  acorn-jsx@5.3.2(acorn@8.16.0):
+    dependencies:
+      acorn: 8.16.0
+
   acorn@8.14.1: {}
 
   acorn@8.15.0: {}
 
+  acorn@8.16.0: {}
+
   agent-base@7.1.3: {}
 
-  ajv@6.12.6:
+  ajv@6.14.0:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-json-stable-stringify: 2.1.0
@@ -3277,8 +3572,6 @@ snapshots:
     dependencies:
       color-convert: 2.0.1
 
-  ansi-styles@6.2.3: {}
-
   argparse@2.0.1: {}
 
   array-buffer-byte-length@1.0.2:
@@ -3306,8 +3599,6 @@ snapshots:
       is-string: 1.1.1
       math-intrinsics: 1.1.0
 
-  array-union@2.1.0: {}
-
   array.prototype.findlast@1.2.5:
     dependencies:
       call-bind: 1.0.8
@@ -3384,7 +3675,7 @@ snapshots:
 
   balanced-match@1.0.2: {}
 
-  balanced-match@2.0.0: {}
+  balanced-match@4.0.4: {}
 
   bare-events@2.5.4:
     optional: true
@@ -3413,6 +3704,8 @@ snapshots:
 
   basic-ftp@5.0.5: {}
 
+  boolbase@1.0.0: {}
+
   brace-expansion@1.1.12:
     dependencies:
       balanced-match: 1.0.2
@@ -3422,6 +3715,10 @@ snapshots:
     dependencies:
       balanced-match: 1.0.2
 
+  brace-expansion@5.0.5:
+    dependencies:
+      balanced-match: 4.0.4
+
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
@@ -3430,13 +3727,13 @@ snapshots:
 
   buffer-from@1.1.2: {}
 
-  cacheable@2.2.0:
+  cacheable@2.3.4:
     dependencies:
-      '@cacheable/memory': 2.0.5
-      '@cacheable/utils': 2.3.1
-      hookified: 1.13.0
-      keyv: 5.5.4
-      qified: 0.5.2
+      '@cacheable/memory': 2.0.8
+      '@cacheable/utils': 2.4.1
+      hookified: 1.15.1
+      keyv: 5.6.0
+      qified: 0.9.1
 
   call-bind-apply-helpers@1.0.2:
     dependencies:
@@ -3473,9 +3770,9 @@ snapshots:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
-  chromium-bidi@11.0.0(devtools-protocol@0.0.1521046):
+  chromium-bidi@14.0.0(devtools-protocol@0.0.1595872):
     dependencies:
-      devtools-protocol: 0.0.1521046
+      devtools-protocol: 0.0.1595872
       mitt: 3.0.1
       zod: 3.24.2
 
@@ -3505,20 +3802,22 @@ snapshots:
 
   commander@10.0.1: {}
 
+  commander@11.1.0: {}
+
   commander@13.1.0: {}
 
   commander@2.20.3: {}
 
   concat-map@0.0.1: {}
 
-  cosmiconfig@9.0.0(typescript@5.9.3):
+  cosmiconfig@9.0.1(typescript@6.0.2):
     dependencies:
       env-paths: 2.2.1
       import-fresh: 3.3.1
       js-yaml: 4.1.0
       parse-json: 5.2.0
     optionalDependencies:
-      typescript: 5.9.3
+      typescript: 6.0.2
 
   cross-spawn@7.0.6:
     dependencies:
@@ -3526,15 +3825,39 @@ snapshots:
       shebang-command: 2.0.0
       which: 2.0.2
 
-  css-functions-list@3.2.3: {}
+  css-functions-list@3.3.3: {}
+
+  css-select@5.2.2:
+    dependencies:
+      boolbase: 1.0.0
+      css-what: 6.2.2
+      domhandler: 5.0.3
+      domutils: 3.2.2
+      nth-check: 2.1.1
+
+  css-tree@2.2.1:
+    dependencies:
+      mdn-data: 2.0.28
+      source-map-js: 1.2.1
 
   css-tree@3.1.0:
     dependencies:
       mdn-data: 2.12.2
       source-map-js: 1.2.1
 
+  css-tree@3.2.1:
+    dependencies:
+      mdn-data: 2.27.1
+      source-map-js: 1.2.1
+
+  css-what@6.2.2: {}
+
   cssesc@3.0.0: {}
 
+  csso@5.0.5:
+    dependencies:
+      css-tree: 2.2.1
+
   csstype@3.1.3: {}
 
   data-uri-to-buffer@6.0.2: {}
@@ -3561,10 +3884,6 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
-  debug@4.4.1:
-    dependencies:
-      ms: 2.1.3
-
   debug@4.4.3:
     dependencies:
       ms: 2.1.3
@@ -3589,19 +3908,35 @@ snapshots:
       escodegen: 2.1.0
       esprima: 4.0.1
 
-  devtools-protocol@0.0.1521046: {}
+  devtools-protocol@0.0.1595872: {}
 
-  diff@8.0.2: {}
-
-  dir-glob@3.0.1:
-    dependencies:
-      path-type: 4.0.0
+  diff@9.0.0: {}
 
   doctrine@2.1.0:
     dependencies:
       esutils: 2.0.3
 
-  dompurify@3.1.7: {}
+  dom-serializer@2.0.0:
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      entities: 4.5.0
+
+  domelementtype@2.3.0: {}
+
+  domhandler@5.0.3:
+    dependencies:
+      domelementtype: 2.3.0
+
+  dompurify@3.2.7:
+    optionalDependencies:
+      '@types/trusted-types': 2.0.7
+
+  domutils@3.2.2:
+    dependencies:
+      dom-serializer: 2.0.0
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
 
   dot-case@3.0.4:
     dependencies:
@@ -3614,12 +3949,8 @@ snapshots:
       es-errors: 1.3.0
       gopd: 1.2.0
 
-  eastasianwidth@0.2.0: {}
-
   emoji-regex@8.0.0: {}
 
-  emoji-regex@9.2.2: {}
-
   end-of-stream@1.4.4:
     dependencies:
       once: 1.4.0
@@ -3844,6 +4175,35 @@ snapshots:
       '@esbuild/win32-ia32': 0.27.0
       '@esbuild/win32-x64': 0.27.0
 
+  esbuild@0.28.0:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.28.0
+      '@esbuild/android-arm': 0.28.0
+      '@esbuild/android-arm64': 0.28.0
+      '@esbuild/android-x64': 0.28.0
+      '@esbuild/darwin-arm64': 0.28.0
+      '@esbuild/darwin-x64': 0.28.0
+      '@esbuild/freebsd-arm64': 0.28.0
+      '@esbuild/freebsd-x64': 0.28.0
+      '@esbuild/linux-arm': 0.28.0
+      '@esbuild/linux-arm64': 0.28.0
+      '@esbuild/linux-ia32': 0.28.0
+      '@esbuild/linux-loong64': 0.28.0
+      '@esbuild/linux-mips64el': 0.28.0
+      '@esbuild/linux-ppc64': 0.28.0
+      '@esbuild/linux-riscv64': 0.28.0
+      '@esbuild/linux-s390x': 0.28.0
+      '@esbuild/linux-x64': 0.28.0
+      '@esbuild/netbsd-arm64': 0.28.0
+      '@esbuild/netbsd-x64': 0.28.0
+      '@esbuild/openbsd-arm64': 0.28.0
+      '@esbuild/openbsd-x64': 0.28.0
+      '@esbuild/openharmony-arm64': 0.28.0
+      '@esbuild/sunos-x64': 0.28.0
+      '@esbuild/win32-arm64': 0.28.0
+      '@esbuild/win32-ia32': 0.28.0
+      '@esbuild/win32-x64': 0.28.0
+
   escalade@3.1.2: {}
 
   escape-string-regexp@1.0.5: {}
@@ -3858,9 +4218,9 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
-  eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1)):
+  eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0)):
     dependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0)
 
   eslint-import-resolver-node@0.3.9:
     dependencies:
@@ -3870,17 +4230,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1):
+  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint-import-resolver-node@0.3.9)(eslint@10.2.0):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
-      '@typescript-eslint/parser': 8.47.0(eslint@9.39.1)(typescript@5.9.3)
-      eslint: 9.39.1
+      '@typescript-eslint/parser': 8.58.2(eslint@10.2.0)(typescript@6.0.2)
+      eslint: 10.2.0
       eslint-import-resolver-node: 0.3.9
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1):
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -3889,9 +4249,9 @@ snapshots:
       array.prototype.flatmap: 1.3.3
       debug: 3.2.7
       doctrine: 2.1.0
-      eslint: 9.39.1
+      eslint: 10.2.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1)
+      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint-import-resolver-node@0.3.9)(eslint@10.2.0)
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3
@@ -3903,13 +4263,13 @@ snapshots:
       string.prototype.trimend: 1.0.9
       tsconfig-paths: 3.15.0
     optionalDependencies:
-      '@typescript-eslint/parser': 8.47.0(eslint@9.39.1)(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.58.2(eslint@10.2.0)(typescript@6.0.2)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-react@7.37.5(eslint@9.39.1):
+  eslint-plugin-react@7.37.5(eslint@10.2.0):
     dependencies:
       array-includes: 3.1.8
       array.prototype.findlast: 1.2.5
@@ -3917,7 +4277,7 @@ snapshots:
       array.prototype.tosorted: 1.1.4
       doctrine: 2.1.0
       es-iterator-helpers: 1.2.1
-      eslint: 9.39.1
+      eslint: 10.2.0
       estraverse: 5.3.0
       hasown: 2.0.2
       jsx-ast-utils: 3.3.5
@@ -3931,22 +4291,24 @@ snapshots:
       string.prototype.matchall: 4.0.12
       string.prototype.repeat: 1.0.0
 
-  eslint-plugin-simple-header@1.2.2(eslint@9.39.1):
+  eslint-plugin-simple-header@1.2.2(eslint@10.2.0):
     dependencies:
-      eslint: 9.39.1
+      eslint: 10.2.0
 
-  eslint-plugin-simple-import-sort@12.1.1(eslint@9.39.1):
+  eslint-plugin-simple-import-sort@13.0.0(eslint@10.2.0):
     dependencies:
-      eslint: 9.39.1
+      eslint: 10.2.0
 
-  eslint-plugin-unused-imports@4.3.0(@typescript-eslint/eslint-plugin@8.47.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1):
+  eslint-plugin-unused-imports@4.4.1(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0):
     dependencies:
-      eslint: 9.39.1
+      eslint: 10.2.0
     optionalDependencies:
-      '@typescript-eslint/eslint-plugin': 8.47.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1)(typescript@5.9.3)
+      '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0)(typescript@6.0.2)
 
-  eslint-scope@8.4.0:
+  eslint-scope@9.1.2:
     dependencies:
+      '@types/esrecurse': 4.3.1
+      '@types/estree': 1.0.8
       esrecurse: 4.3.0
       estraverse: 5.3.0
 
@@ -3954,29 +4316,28 @@ snapshots:
 
   eslint-visitor-keys@4.2.1: {}
 
-  eslint@9.39.1:
+  eslint-visitor-keys@5.0.1: {}
+
+  eslint@10.2.0:
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1)
-      '@eslint-community/regexpp': 4.12.1
-      '@eslint/config-array': 0.21.1
-      '@eslint/config-helpers': 0.4.2
-      '@eslint/core': 0.17.0
-      '@eslint/eslintrc': 3.3.1
-      '@eslint/js': 9.39.1
-      '@eslint/plugin-kit': 0.4.1
+      '@eslint-community/eslint-utils': 4.9.0(eslint@10.2.0)
+      '@eslint-community/regexpp': 4.12.2
+      '@eslint/config-array': 0.23.5
+      '@eslint/config-helpers': 0.5.5
+      '@eslint/core': 1.2.1
+      '@eslint/plugin-kit': 0.7.1
       '@humanfs/node': 0.16.6
       '@humanwhocodes/module-importer': 1.0.1
       '@humanwhocodes/retry': 0.4.2
       '@types/estree': 1.0.7
-      ajv: 6.12.6
-      chalk: 4.1.2
+      ajv: 6.14.0
       cross-spawn: 7.0.6
-      debug: 4.4.1
+      debug: 4.4.3
       escape-string-regexp: 4.0.0
-      eslint-scope: 8.4.0
-      eslint-visitor-keys: 4.2.1
-      espree: 10.4.0
-      esquery: 1.6.0
+      eslint-scope: 9.1.2
+      eslint-visitor-keys: 5.0.1
+      espree: 11.2.0
+      esquery: 1.7.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 8.0.0
@@ -3986,8 +4347,7 @@ snapshots:
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       json-stable-stringify-without-jsonify: 1.0.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
+      minimatch: 10.2.5
       natural-compare: 1.4.0
       optionator: 0.9.4
     transitivePeerDependencies:
@@ -3999,9 +4359,15 @@ snapshots:
       acorn-jsx: 5.3.2(acorn@8.15.0)
       eslint-visitor-keys: 4.2.1
 
+  espree@11.2.0:
+    dependencies:
+      acorn: 8.16.0
+      acorn-jsx: 5.3.2(acorn@8.16.0)
+      eslint-visitor-keys: 5.0.1
+
   esprima@4.0.1: {}
 
-  esquery@1.6.0:
+  esquery@1.7.0:
     dependencies:
       estraverse: 5.3.0
 
@@ -4053,6 +4419,10 @@ snapshots:
     dependencies:
       pend: 1.2.0
 
+  fdir@6.5.0(picomatch@4.0.4):
+    optionalDependencies:
+      picomatch: 4.0.4
+
   fetch-blob@3.2.0:
     dependencies:
       node-domexception: 1.0.0
@@ -4061,9 +4431,9 @@ snapshots:
 
   fflate@0.8.2: {}
 
-  file-entry-cache@10.1.4:
+  file-entry-cache@11.1.2:
     dependencies:
-      flat-cache: 6.1.19
+      flat-cache: 6.1.22
 
   file-entry-cache@8.0.0:
     dependencies:
@@ -4083,23 +4453,20 @@ snapshots:
       flatted: 3.3.3
       keyv: 4.5.4
 
-  flat-cache@6.1.19:
+  flat-cache@6.1.22:
     dependencies:
-      cacheable: 2.2.0
-      flatted: 3.3.3
-      hookified: 1.13.0
+      cacheable: 2.3.4
+      flatted: 3.4.2
+      hookified: 1.15.1
 
   flatted@3.3.3: {}
 
+  flatted@3.4.2: {}
+
   for-each@0.3.5:
     dependencies:
       is-callable: 1.2.7
 
-  foreground-child@3.3.1:
-    dependencies:
-      cross-spawn: 7.0.6
-      signal-exit: 4.1.0
-
   fs-extra@11.3.0:
     dependencies:
       graceful-fs: 4.2.11
@@ -4124,6 +4491,8 @@ snapshots:
 
   get-caller-file@2.0.5: {}
 
+  get-east-asian-width@1.5.0: {}
+
   get-intrinsic@1.3.0:
     dependencies:
       call-bind-apply-helpers: 1.0.2
@@ -4175,14 +4544,11 @@ snapshots:
     dependencies:
       is-glob: 4.0.3
 
-  glob@11.0.3:
+  glob@13.0.6:
     dependencies:
-      foreground-child: 3.3.1
-      jackspeak: 4.1.1
-      minimatch: 10.0.3
-      minipass: 7.1.2
-      package-json-from-dist: 1.0.1
-      path-scurry: 2.0.0
+      minimatch: 10.2.5
+      minipass: 7.1.3
+      path-scurry: 2.0.2
 
   global-modules@2.0.0:
     dependencies:
@@ -4200,21 +4566,19 @@ snapshots:
       kind-of: 6.0.3
       which: 4.0.0
 
-  globals@14.0.0: {}
-
   globalthis@1.0.4:
     dependencies:
       define-properties: 1.2.1
       gopd: 1.2.0
 
-  globby@11.1.0:
+  globby@16.2.0:
     dependencies:
-      array-union: 2.1.0
-      dir-glob: 3.0.1
+      '@sindresorhus/merge-streams': 4.0.0
       fast-glob: 3.3.3
-      ignore: 5.3.1
-      merge2: 1.4.1
-      slash: 3.0.0
+      ignore: 7.0.5
+      is-path-inside: 4.0.0
+      slash: 5.1.0
+      unicorn-magic: 0.4.0
 
   globjoin@0.1.4: {}
 
@@ -4222,14 +4586,14 @@ snapshots:
 
   graceful-fs@4.2.11: {}
 
-  graphemer@1.4.0: {}
-
   has-bigints@1.0.2: {}
 
   has-flag@3.0.0: {}
 
   has-flag@4.0.0: {}
 
+  has-flag@5.0.1: {}
+
   has-property-descriptors@1.0.2:
     dependencies:
       es-define-property: 1.0.1
@@ -4244,9 +4608,9 @@ snapshots:
     dependencies:
       has-symbols: 1.1.0
 
-  hashery@1.2.0:
+  hashery@1.5.1:
     dependencies:
-      hookified: 1.13.0
+      hookified: 1.15.1
 
   hasown@2.0.2:
     dependencies:
@@ -4254,7 +4618,9 @@ snapshots:
 
   highlight.js@11.11.1: {}
 
-  hookified@1.13.0: {}
+  hookified@1.15.1: {}
+
+  hookified@2.1.1: {}
 
   html-minifier-terser@7.2.0:
     dependencies:
@@ -4266,7 +4632,7 @@ snapshots:
       relateurl: 0.2.7
       terser: 5.39.0
 
-  html-tags@3.3.1: {}
+  html-tags@5.1.0: {}
 
   http-proxy-agent@7.0.2:
     dependencies:
@@ -4286,8 +4652,6 @@ snapshots:
 
   ignore@5.3.1: {}
 
-  ignore@7.0.3: {}
-
   ignore@7.0.5: {}
 
   import-fresh@3.3.1:
@@ -4295,6 +4659,8 @@ snapshots:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
+  import-meta-resolve@4.2.0: {}
+
   imurmurhash@0.1.4: {}
 
   ini@1.3.8: {}
@@ -4384,6 +4750,8 @@ snapshots:
 
   is-number@7.0.0: {}
 
+  is-path-inside@4.0.0: {}
+
   is-plain-object@5.0.0: {}
 
   is-regex@1.2.1:
@@ -4440,10 +4808,6 @@ snapshots:
       has-symbols: 1.1.0
       set-function-name: 2.0.2
 
-  jackspeak@4.1.1:
-    dependencies:
-      '@isaacs/cliui': 8.0.2
-
   js-tokens@4.0.0: {}
 
   js-yaml@4.1.0:
@@ -4491,14 +4855,12 @@ snapshots:
     dependencies:
       json-buffer: 3.0.1
 
-  keyv@5.5.4:
+  keyv@5.6.0:
     dependencies:
       '@keyv/serialize': 1.1.1
 
   kind-of@6.0.3: {}
 
-  known-css-properties@0.37.0: {}
-
   levn@0.4.1:
     dependencies:
       prelude-ls: 1.2.1
@@ -4510,8 +4872,6 @@ snapshots:
     dependencies:
       p-locate: 5.0.0
 
-  lodash.merge@4.6.2: {}
-
   lodash.truncate@4.4.2: {}
 
   loose-envify@1.4.0:
@@ -4522,7 +4882,7 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
-  lru-cache@11.2.1: {}
+  lru-cache@11.3.5: {}
 
   lru-cache@7.18.3: {}
 
@@ -4530,11 +4890,15 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mathml-tag-names@2.1.3: {}
+  mathml-tag-names@4.0.0: {}
+
+  mdn-data@2.0.28: {}
 
   mdn-data@2.12.2: {}
 
-  meow@13.2.0: {}
+  mdn-data@2.27.1: {}
+
+  meow@14.1.0: {}
 
   merge2@1.4.1: {}
 
@@ -4543,9 +4907,9 @@ snapshots:
       braces: 3.0.3
       picomatch: 2.3.1
 
-  minimatch@10.0.3:
+  minimatch@10.2.5:
     dependencies:
-      '@isaacs/brace-expansion': 5.0.0
+      brace-expansion: 5.0.5
 
   minimatch@3.1.2:
     dependencies:
@@ -4561,15 +4925,15 @@ snapshots:
 
   minimist@1.2.8: {}
 
-  minipass@7.1.2: {}
+  minipass@7.1.3: {}
 
   mitt@3.0.1: {}
 
   moment@2.30.1: {}
 
-  monaco-editor@0.54.0:
+  monaco-editor@0.55.1:
     dependencies:
-      dompurify: 3.1.7
+      dompurify: 3.2.7
       marked: 14.0.0
 
   ms@2.1.3: {}
@@ -4596,6 +4960,10 @@ snapshots:
 
   normalize-path@3.0.0: {}
 
+  nth-check@2.1.1:
+    dependencies:
+      boolbase: 1.0.0
+
   object-assign@4.1.1: {}
 
   object-inspect@1.13.4: {}
@@ -4687,8 +5055,6 @@ snapshots:
       degenerator: 5.0.1
       netmask: 2.0.2
 
-  package-json-from-dist@1.0.1: {}
-
   pako@1.0.11: {}
 
   param-case@3.0.4:
@@ -4718,12 +5084,10 @@ snapshots:
 
   path-parse@1.0.7: {}
 
-  path-scurry@2.0.0:
+  path-scurry@2.0.2:
     dependencies:
-      lru-cache: 11.2.1
-      minipass: 7.1.2
-
-  path-type@4.0.0: {}
+      lru-cache: 11.3.5
+      minipass: 7.1.3
 
   pend@1.2.0: {}
 
@@ -4733,22 +5097,22 @@ snapshots:
 
   picomatch@4.0.3: {}
 
+  picomatch@4.0.4: {}
+
   possible-typed-array-names@1.1.0: {}
 
-  postcss-resolve-nested-selector@0.1.6: {}
-
-  postcss-safe-parser@7.0.1(postcss@8.5.6):
+  postcss-safe-parser@7.0.1(postcss@8.5.10):
     dependencies:
-      postcss: 8.5.6
+      postcss: 8.5.10
 
-  postcss-selector-parser@7.1.0:
+  postcss-selector-parser@7.1.1:
     dependencies:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
 
   postcss-value-parser@4.2.0: {}
 
-  postcss@8.5.6:
+  postcss@8.5.10:
     dependencies:
       nanoid: 3.3.11
       picocolors: 1.1.1
@@ -4786,15 +5150,15 @@ snapshots:
 
   punycode@2.3.1: {}
 
-  puppeteer-core@24.30.0:
+  puppeteer-core@24.41.0:
     dependencies:
-      '@puppeteer/browsers': 2.10.13
-      chromium-bidi: 11.0.0(devtools-protocol@0.0.1521046)
+      '@puppeteer/browsers': 2.13.0
+      chromium-bidi: 14.0.0(devtools-protocol@0.0.1595872)
       debug: 4.4.3
-      devtools-protocol: 0.0.1521046
-      typed-query-selector: 2.12.0
-      webdriver-bidi-protocol: 0.3.8
-      ws: 8.18.3
+      devtools-protocol: 0.0.1595872
+      typed-query-selector: 2.12.1
+      webdriver-bidi-protocol: 0.4.1
+      ws: 8.20.0
     transitivePeerDependencies:
       - bare-buffer
       - bufferutil
@@ -4803,9 +5167,9 @@ snapshots:
 
   q@1.5.1: {}
 
-  qified@0.5.2:
+  qified@0.9.1:
     dependencies:
-      hookified: 1.13.0
+      hookified: 2.1.1
 
   queue-microtask@1.2.3: {}
 
@@ -4839,8 +5203,6 @@ snapshots:
 
   resolve-from@4.0.0: {}
 
-  resolve-from@5.0.0: {}
-
   resolve-pkg-maps@1.0.0: {}
 
   resolve@1.22.11:
@@ -4886,14 +5248,16 @@ snapshots:
       es-errors: 1.3.0
       is-regex: 1.2.1
 
+  sax@1.6.0: {}
+
   semver@6.3.1: {}
 
   semver@7.7.1: {}
 
-  semver@7.7.2: {}
-
   semver@7.7.3: {}
 
+  semver@7.7.4: {}
+
   set-function-length@1.2.2:
     dependencies:
       define-data-property: 1.1.4
@@ -4952,7 +5316,7 @@ snapshots:
 
   signal-exit@4.1.0: {}
 
-  slash@3.0.0: {}
+  slash@5.1.0: {}
 
   slice-ansi@4.0.0:
     dependencies:
@@ -4986,7 +5350,7 @@ snapshots:
 
   sprintf-js@1.1.3: {}
 
-  standalone-electron-types@34.2.0:
+  standalone-electron-types@41.2.1:
     dependencies:
       '@types/node': 22.13.13
 
@@ -5008,10 +5372,9 @@ snapshots:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
-  string-width@5.1.2:
+  string-width@8.2.0:
     dependencies:
-      eastasianwidth: 0.2.0
-      emoji-regex: 9.2.2
+      get-east-asian-width: 1.5.0
       strip-ansi: 7.1.2
 
   string.prototype.matchall@4.0.12:
@@ -5068,61 +5431,59 @@ snapshots:
 
   strip-bom@3.0.0: {}
 
-  strip-json-comments@3.1.1: {}
-
-  stylelint-config-recommended@17.0.0(stylelint@16.25.0(typescript@5.9.3)):
+  stylelint-config-recommended@18.0.0(stylelint@17.8.0(typescript@6.0.2)):
     dependencies:
-      stylelint: 16.25.0(typescript@5.9.3)
+      stylelint: 17.8.0(typescript@6.0.2)
 
-  stylelint-config-standard@39.0.1(stylelint@16.25.0(typescript@5.9.3)):
+  stylelint-config-standard@40.0.0(stylelint@17.8.0(typescript@6.0.2)):
     dependencies:
-      stylelint: 16.25.0(typescript@5.9.3)
-      stylelint-config-recommended: 17.0.0(stylelint@16.25.0(typescript@5.9.3))
+      stylelint: 17.8.0(typescript@6.0.2)
+      stylelint-config-recommended: 18.0.0(stylelint@17.8.0(typescript@6.0.2))
 
-  stylelint@16.25.0(typescript@5.9.3):
+  stylelint@17.8.0(typescript@6.0.2):
     dependencies:
-      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
-      '@csstools/css-tokenizer': 3.0.4
-      '@csstools/media-query-list-parser': 4.0.3(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
-      '@csstools/selector-specificity': 5.0.0(postcss-selector-parser@7.1.0)
-      '@dual-bundle/import-meta-resolve': 4.2.1
-      balanced-match: 2.0.0
+      '@csstools/css-calc': 3.2.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-syntax-patches-for-csstree': 1.1.3(css-tree@3.2.1)
+      '@csstools/css-tokenizer': 4.0.0
+      '@csstools/media-query-list-parser': 5.0.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/selector-resolve-nested': 4.0.0(postcss-selector-parser@7.1.1)
+      '@csstools/selector-specificity': 6.0.0(postcss-selector-parser@7.1.1)
       colord: 2.9.3
-      cosmiconfig: 9.0.0(typescript@5.9.3)
-      css-functions-list: 3.2.3
-      css-tree: 3.1.0
+      cosmiconfig: 9.0.1(typescript@6.0.2)
+      css-functions-list: 3.3.3
+      css-tree: 3.2.1
       debug: 4.4.3
       fast-glob: 3.3.3
       fastest-levenshtein: 1.0.16
-      file-entry-cache: 10.1.4
+      file-entry-cache: 11.1.2
       global-modules: 2.0.0
-      globby: 11.1.0
+      globby: 16.2.0
       globjoin: 0.1.4
-      html-tags: 3.3.1
+      html-tags: 5.1.0
       ignore: 7.0.5
-      imurmurhash: 0.1.4
+      import-meta-resolve: 4.2.0
       is-plain-object: 5.0.0
-      known-css-properties: 0.37.0
-      mathml-tag-names: 2.1.3
-      meow: 13.2.0
+      mathml-tag-names: 4.0.0
+      meow: 14.1.0
       micromatch: 4.0.8
       normalize-path: 3.0.0
       picocolors: 1.1.1
-      postcss: 8.5.6
-      postcss-resolve-nested-selector: 0.1.6
-      postcss-safe-parser: 7.0.1(postcss@8.5.6)
-      postcss-selector-parser: 7.1.0
+      postcss: 8.5.10
+      postcss-safe-parser: 7.0.1(postcss@8.5.10)
+      postcss-selector-parser: 7.1.1
       postcss-value-parser: 4.2.0
-      resolve-from: 5.0.0
-      string-width: 4.2.3
-      supports-hyperlinks: 3.2.0
+      string-width: 8.2.0
+      supports-hyperlinks: 4.4.0
       svg-tags: 1.0.0
       table: 6.9.0
-      write-file-atomic: 5.0.1
+      write-file-atomic: 7.0.1
     transitivePeerDependencies:
       - supports-color
       - typescript
 
+  supports-color@10.2.2: {}
+
   supports-color@5.5.0:
     dependencies:
       has-flag: 3.0.0
@@ -5131,15 +5492,25 @@ snapshots:
     dependencies:
       has-flag: 4.0.0
 
-  supports-hyperlinks@3.2.0:
+  supports-hyperlinks@4.4.0:
     dependencies:
-      has-flag: 4.0.0
-      supports-color: 7.2.0
+      has-flag: 5.0.1
+      supports-color: 10.2.2
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
   svg-tags@1.0.0: {}
 
+  svgo@4.0.1:
+    dependencies:
+      commander: 11.1.0
+      css-select: 5.2.2
+      css-tree: 3.1.0
+      css-what: 6.2.2
+      csso: 5.0.5
+      picocolors: 1.1.1
+      sax: 1.6.0
+
   table@6.9.0:
     dependencies:
       ajv: 8.17.1
@@ -5177,13 +5548,18 @@ snapshots:
     dependencies:
       b4a: 1.6.6
 
+  tinyglobby@0.2.16:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
+
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
 
-  ts-api-utils@2.1.0(typescript@5.9.3):
+  ts-api-utils@2.5.0(typescript@6.0.2):
     dependencies:
-      typescript: 5.9.3
+      typescript: 6.0.2
 
   ts-patch@3.3.0:
     dependencies:
@@ -5196,6 +5572,8 @@ snapshots:
 
   ts-pattern@5.6.2: {}
 
+  ts-pattern@5.9.0: {}
+
   tsconfig-paths@3.15.0:
     dependencies:
       '@types/json5': 0.0.29
@@ -5214,9 +5592,9 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
-  tsx@4.20.6:
+  tsx@4.21.0:
     dependencies:
-      esbuild: 0.25.1
+      esbuild: 0.27.0
       get-tsconfig: 4.10.0
     optionalDependencies:
       fsevents: 2.3.3
@@ -5229,7 +5607,7 @@ snapshots:
 
   type-fest@4.41.0: {}
 
-  type-fest@5.2.0:
+  type-fest@5.5.0:
     dependencies:
       tagged-tag: 1.0.0
 
@@ -5266,25 +5644,25 @@ snapshots:
       possible-typed-array-names: 1.1.0
       reflect.getprototypeof: 1.0.10
 
-  typed-query-selector@2.12.0: {}
+  typed-query-selector@2.12.1: {}
 
-  typescript-eslint@8.47.0(eslint@9.39.1)(typescript@5.9.3):
+  typescript-eslint@8.58.2(eslint@10.2.0)(typescript@6.0.2):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.47.0(@typescript-eslint/parser@8.47.0(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1)(typescript@5.9.3)
-      '@typescript-eslint/parser': 8.47.0(eslint@9.39.1)(typescript@5.9.3)
-      '@typescript-eslint/typescript-estree': 8.47.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.47.0(eslint@9.39.1)(typescript@5.9.3)
-      eslint: 9.39.1
-      typescript: 5.9.3
+      '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.2))(eslint@10.2.0)(typescript@6.0.2)
+      '@typescript-eslint/parser': 8.58.2(eslint@10.2.0)(typescript@6.0.2)
+      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.2)
+      '@typescript-eslint/utils': 8.58.2(eslint@10.2.0)(typescript@6.0.2)
+      eslint: 10.2.0
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
-  typescript-transform-paths@3.5.5(typescript@5.9.3):
+  typescript-transform-paths@3.5.6(typescript@6.0.2):
     dependencies:
       minimatch: 9.0.5
-      typescript: 5.9.3
+      typescript: 6.0.2
 
-  typescript@5.9.3: {}
+  typescript@6.0.2: {}
 
   unbox-primitive@1.1.0:
     dependencies:
@@ -5295,7 +5673,9 @@ snapshots:
 
   undici-types@6.20.0: {}
 
-  undici-types@7.16.0: {}
+  undici-types@7.19.2: {}
+
+  unicorn-magic@0.4.0: {}
 
   universalify@2.0.1: {}
 
@@ -5316,7 +5696,7 @@ snapshots:
   web-streams-polyfill@3.3.3:
     optional: true
 
-  webdriver-bidi-protocol@0.3.8: {}
+  webdriver-bidi-protocol@0.4.1: {}
 
   which-boxed-primitive@1.1.1:
     dependencies:
@@ -5389,23 +5769,18 @@ snapshots:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
-  wrap-ansi@8.1.0:
-    dependencies:
-      ansi-styles: 6.2.3
-      string-width: 5.1.2
-      strip-ansi: 7.1.2
-
   wrappy@1.0.2: {}
 
-  write-file-atomic@5.0.1:
+  write-file-atomic@7.0.1:
     dependencies:
-      imurmurhash: 0.1.4
       signal-exit: 4.1.0
 
-  ws@8.18.3: {}
+  ws@8.20.0: {}
 
   y18n@5.0.8: {}
 
+  yaml-js@0.3.1: {}
+
   yargs-parser@21.1.1: {}
 
   yargs@17.7.2:
diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs
index 748553645..b722e5837 100644
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@@ -77,7 +77,7 @@ const globNativesPlugin = {
         });
 
         build.onLoad({ filter, namespace: "import-natives" }, async () => {
-            const pluginDirs = ["plugins", "userplugins", "equicordplugins"];
+            const pluginDirs = ["plugins", "equicordplugins", "userplugins"];
             let code = "";
             let natives = "\n";
             let i = 0;
diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index 8138fc0cf..a009f0f0b 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -147,7 +147,7 @@ export const globPlugins = kind => ({
         });
 
         build.onLoad({ filter, namespace: "import-plugins" }, async () => {
-            const pluginDirs = ["plugins/_api", "plugins/_core", "plugins", "userplugins", "equicordplugins", "equicordplugins/_api"];
+            const pluginDirs = ["plugins/_api", "plugins/_core", "plugins", "equicordplugins/_api", "equicordplugins/_core", "equicordplugins", "userplugins"];
             let code = "";
             let pluginsCode = "\n";
             let metaCode = "\n";
diff --git a/scripts/generatePluginList.ts b/scripts/generatePluginList.ts
index 76a03bd60..d4cb347e9 100644
--- a/scripts/generatePluginList.ts
+++ b/scripts/generatePluginList.ts
@@ -31,11 +31,11 @@ import { getEntryPoint, isPluginFile, parseDevs, parseEquicordDevs, parseFile, P
     let dirs: string[];
 
     if (equicordFlag) {
-        dirs = ["src/equicordplugins"];
+        dirs = ["src/equicordplugins/_core", "src/equicordplugins"];
     } else if (vencordFlag) {
         dirs = ["src/plugins", "src/plugins/_core"];
     } else {
-        dirs = ["src/plugins", "src/plugins/_core", "src/equicordplugins"];
+        dirs = ["src/plugins", "src/plugins/_core", "src/equicordplugins/_core", "src/equicordplugins"];
     }
 
     const outputPath = args.find(a => !a.startsWith("--")) ?? null;
diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index d6373e99f..22fc571b1 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -81,7 +81,9 @@ const IGNORED_DISCORD_ERRORS = [
     "Downloading the full bad domains file",
     /\[GatewaySocket\].{0,110}Cannot access '/,
     "search for 'name' in undefined",
-    "Attempting to set fast connect zstd when unsupported"
+    "Attempting to set fast connect zstd when unsupported",
+    /Cannot read properties of undefined \(reading 'call'\)/,
+    "Could not complete Remote Auth login, trying to restart with a new Remote Auth session."
 ] as Array<string | RegExp>;
 
 function toCodeBlock(s: string, indentation = 0, isDiscord = false) {
diff --git a/scripts/utils.ts b/scripts/utils.ts
index 701919c8a..2727f5447 100644
--- a/scripts/utils.ts
+++ b/scripts/utils.ts
@@ -38,6 +38,7 @@ export interface PluginData {
     name: string;
     description: string;
     tags: string[];
+    searchTerms: string[];
     authors: Dev[];
     dependencies: string[];
     hasPatches: boolean;
@@ -152,7 +153,8 @@ export async function parseFile(fileName: string) {
             enabledByDefault: false,
             required: false,
             isModified: false,
-            tags: [] as string[]
+            tags: [] as string[],
+            searchTerms: [] as string[],
         } as PluginData;
 
         for (const prop of pluginObj.properties) {
@@ -208,9 +210,10 @@ export async function parseFile(fileName: string) {
                     });
                     break;
                 case "tags":
-                    if (!isArrayLiteralExpression(value)) throw fail("tags is not an array literal");
-                    data.tags = value.elements.map(e => {
-                        if (!isStringLiteral(e)) throw fail("tags array contains non-string literals");
+                case "searchTerms":
+                    if (!isArrayLiteralExpression(value)) throw fail(`${key} is not an array literal`);
+                    data[key] = value.elements.map(e => {
+                        if (!isStringLiteral(e)) throw fail(`${key} array contains non-string literals`);
                         return e.text;
                     });
                     break;
diff --git a/src/Vencord.ts b/src/Vencord.ts
index e5bac2972..04cfe9d67 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -41,8 +41,7 @@ import { showNotice } from "./api/Notices";
 import { NotificationData, showNotification } from "./api/Notifications";
 import { initPluginManager, PMLogger, startAllPlugins } from "./api/PluginManager";
 import { PlainSettings, Settings, SettingsStore } from "./api/Settings";
-import { getCloudSettings, putCloudSettings, shouldCloudSync } from "./api/SettingsSync/cloudSync";
-import { localStorage } from "./utils/localStorage";
+import { areLocalSettingsDirty, getCloudSettings, getCloudSyncDirection, markLocalSettingsDirty, putCloudSettings, shouldCloudSync } from "./api/SettingsSync/cloudSync";
 import { relaunch } from "./utils/native";
 import { checkForUpdates, update, UpdateLogger } from "./utils/updater";
 import { onceReady } from "./webpack";
@@ -53,11 +52,6 @@ if (IS_REPORTER) {
 }
 
 async function syncSettings() {
-    // Check if cloud auth exists for current user before attempting sync
-    if (localStorage.Vencord_cloudSyncDirection === undefined) {
-        // by default, sync bi-directionally
-        localStorage.Vencord_cloudSyncDirection = "both";
-    }
     const hasCloudAuth = await dsGet("Vencord_cloudSecret");
     if (!hasCloudAuth) {
         if (Settings.cloud.authenticated) {
@@ -93,9 +87,9 @@ async function syncSettings() {
     if (
         Settings.cloud.settingsSync && // if it's enabled
         Settings.cloud.authenticated && // if cloud integrations are enabled
-        localStorage.Vencord_cloudSyncDirection !== "manual" // if we're not in manual mode
+        getCloudSyncDirection() !== "manual" // if we're not in manual mode
     ) {
-        if (localStorage.Vencord_settingsDirty && shouldCloudSync("push")) {
+        if (areLocalSettingsDirty() && shouldCloudSync("push")) {
             await putCloudSettings();
         } else if (shouldCloudSync("pull") && await getCloudSettings(false)) { // if we synchronized something (false means no sync)
             // we show a notification here instead of allowing getCloudSettings() to show one to declutter the amount of
@@ -118,7 +112,7 @@ async function syncSettings() {
     }, 60_000);
 
     SettingsStore.addGlobalChangeListener(() => {
-        localStorage.Vencord_settingsDirty = true;
+        markLocalSettingsDirty();
         saveSettingsOnFrequentAction();
     });
 }
diff --git a/src/api/AudioPlayer.ts b/src/api/AudioPlayer.ts
index 53d6c0614..d106d26b8 100644
--- a/src/api/AudioPlayer.ts
+++ b/src/api/AudioPlayer.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { findByCodeLazy, findLazy } from "webpack";
+import { findByCodeLazy, findLazy } from "@webpack";
 
 let defaultSounds: null | string[] = null;
 const findDefaultSounds = findLazy(module => module.resolve && module.id && module.keys().some(key => key.endsWith(".mp3")), false);
diff --git a/src/api/Badges.ts b/src/api/Badges.ts
index e343a9930..88e3c9bd9 100644
--- a/src/api/Badges.ts
+++ b/src/api/Badges.ts
@@ -29,6 +29,10 @@ export const enum BadgePosition {
 }
 
 export interface ProfileBadge {
+    /**
+     * Badge id, unused by vencord, required by discord
+     */
+    id: string,
     /** The tooltip to show on hover. Required for image badges */
     description?: string;
     /** Custom component for the badge (tooltip not included) */
diff --git a/src/api/ChatButtons.tsx b/src/api/ChatButtons.tsx
index 4288c6f8b..a04725386 100644
--- a/src/api/ChatButtons.tsx
+++ b/src/api/ChatButtons.tsx
@@ -190,3 +190,22 @@ addContextMenuPatch("textarea-context", (children, args) => {
         </Menu.MenuItem>
     );
 });
+
+// Wrapper stuff is down here to avoid conflicts with above
+export type ChatBarButtonWrapper = (buttons: ReactNode) => ReactNode;
+
+/**
+ * Registry for plugins that need to wrap the entire chat bar button container
+ */
+export const ChatBarButtonWrappers = new Map<string, ChatBarButtonWrapper>();
+
+export const addChatBarButtonWrapper = (id: string, wrapper: ChatBarButtonWrapper) => ChatBarButtonWrappers.set(id, wrapper);
+export const removeChatBarButtonWrapper = (id: string) => ChatBarButtonWrappers.delete(id);
+
+export function _wrapButtons(buttons: ReactNode) {
+    let wrapped = buttons;
+    for (const wrapper of ChatBarButtonWrappers.values()) {
+        wrapped = wrapper(wrapped);
+    }
+    return wrapped;
+}
diff --git a/src/api/ContextMenu.ts b/src/api/ContextMenu.ts
index a632aea6f..cee43ae60 100644
--- a/src/api/ContextMenu.ts
+++ b/src/api/ContextMenu.ts
@@ -131,6 +131,8 @@ interface ContextMenuProps {
 }
 
 export function _usePatchContextMenu(props: ContextMenuProps) {
+    if (!Menu.MenuItem) return props; // Prevent crashes in case we fail to acquire menu items for some reason
+
     props = {
         ...props,
         children: cloneMenuChildren(props.children),
diff --git a/src/api/DataStore/index.ts b/src/api/DataStore/index.ts
index 3cdb50c7e..80ebb065f 100644
--- a/src/api/DataStore/index.ts
+++ b/src/api/DataStore/index.ts
@@ -18,97 +18,31 @@
  * limitations under the License.
  */
 
-import { Logger } from "@utils/Logger";
-
-const logger = new Logger("DataStore");
-let loggedFailure = false;
-const memoryDatabases = new Map<string, Map<string, Map<IDBValidKey, unknown>>>();
-
-interface MemoryStore {
-    __memoryStore: true;
-    get<T>(key: IDBValidKey): T | undefined;
-    put(value: unknown, key: IDBValidKey): void;
-    delete(key: IDBValidKey): void;
-    clear(): void;
-    getAllKeys<KeyType extends IDBValidKey>(): KeyType[];
-    getAll<T>(): T[];
-    entries<KeyType extends IDBValidKey, ValueType>(): [KeyType, ValueType][];
-}
-
-type StoreLike = IDBObjectStore | MemoryStore;
-
-function handleFailure(error: unknown) {
-    if (loggedFailure) return;
-    loggedFailure = true;
-    logger.error("IndexedDB unavailable, using empty storage.", error);
-}
-
-function withFailureFallback<T>(promise: Promise<T>, fallback: T): Promise<T> {
-    return promise.catch(error => {
-        handleFailure(error);
-        return fallback;
-    });
-}
-
-function getMemoryStore(dbName: string, storeName: string): MemoryStore {
-    let database = memoryDatabases.get(dbName);
-    if (!database) {
-        database = new Map();
-        memoryDatabases.set(dbName, database);
-    }
-
-    let data = database.get(storeName);
-    if (!data) {
-        data = new Map<IDBValidKey, unknown>();
-        database.set(storeName, data);
-    }
-
-    return {
-        __memoryStore: true,
-        get: <T>(key: IDBValidKey) => data.get(key) as T | undefined,
-        put: (value, key) => { data.set(key, value); },
-        delete: key => { data.delete(key); },
-        clear: () => { data.clear(); },
-        getAllKeys: <KeyType extends IDBValidKey>() => Array.from(data.keys()) as KeyType[],
-        getAll: <T>() => Array.from(data.values()) as T[],
-        entries: <KeyType extends IDBValidKey, ValueType>() => Array.from(data.entries()) as [KeyType, ValueType][]
-    };
-}
-
-function isMemoryStore(store: StoreLike): store is MemoryStore {
-    return "__memoryStore" in store;
-}
-
 export function promisifyRequest<T = undefined>(
     request: IDBRequest<T> | IDBTransaction,
 ): Promise<T> {
     return new Promise<T>((resolve, reject) => {
-        const target = request as IDBRequest<T> & IDBTransaction;
-        target.oncomplete = target.onsuccess = () => resolve(target.result);
-        target.onabort = target.onerror = () => reject(target.error);
+        // @ts-expect-error - file size hacks
+        request.oncomplete = request.onsuccess = () => resolve(request.result);
+        // @ts-expect-error - file size hacks
+        request.onabort = request.onerror = () => reject(request.error);
     });
 }
 
 export function createStore(dbName: string, storeName: string): UseStore {
     const request = indexedDB.open(dbName);
     request.onupgradeneeded = () => request.result.createObjectStore(storeName);
-    const dbp = promisifyRequest(request).catch(error => {
-        handleFailure(error);
-        return null;
-    });
-    const memoryStore = getMemoryStore(dbName, storeName);
+    const dbp = promisifyRequest(request);
 
-    return async (txMode, callback) => {
-        const db = await dbp;
-        if (!db) return callback(memoryStore);
-
-        return callback(db.transaction(storeName, txMode).objectStore(storeName));
-    };
+    return (txMode, callback) =>
+        dbp.then(db =>
+            callback(db.transaction(storeName, txMode).objectStore(storeName)),
+        );
 }
 
 export type UseStore = <T>(
     txMode: IDBTransactionMode,
-    callback: (store: StoreLike) => T | PromiseLike<T>,
+    callback: (store: IDBObjectStore) => T | PromiseLike<T>,
 ) => Promise<T>;
 
 let defaultGetStoreFunc: UseStore | undefined;
@@ -120,68 +54,88 @@ function defaultGetStore() {
     return defaultGetStoreFunc;
 }
 
+/**
+ * Get a value by its key.
+ *
+ * @param key
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function get<T = any>(
     key: IDBValidKey,
     customStore = defaultGetStore(),
 ): Promise<T | undefined> {
-    return withFailureFallback(customStore("readonly", store => {
-        if (isMemoryStore(store)) return store.get(key) as T | undefined;
-        return promisifyRequest(store.get(key));
-    }), undefined);
+    return customStore("readonly", store => promisifyRequest(store.get(key)));
 }
 
+/**
+ * Set a value with a key.
+ *
+ * @param key
+ * @param value
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function set(
     key: IDBValidKey,
     value: any,
     customStore = defaultGetStore(),
 ): Promise<void> {
-    return withFailureFallback(customStore("readwrite", store => {
+    return customStore("readwrite", store => {
         store.put(value, key);
-        if (isMemoryStore(store)) return;
-
         return promisifyRequest(store.transaction);
-    }), undefined);
+    });
 }
 
+/**
+ * Set multiple values at once. This is faster than calling set() multiple times.
+ * It's also atomic – if one of the pairs can't be added, none will be added.
+ *
+ * @param entries Array of entries, where each entry is an array of `[key, value]`.
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function setMany(
     entries: [IDBValidKey, any][],
     customStore = defaultGetStore(),
 ): Promise<void> {
-    return withFailureFallback(customStore("readwrite", store => {
+    return customStore("readwrite", store => {
         entries.forEach(entry => store.put(entry[1], entry[0]));
-        if (isMemoryStore(store)) return;
-
         return promisifyRequest(store.transaction);
-    }), undefined);
+    });
 }
 
+/**
+ * Get multiple values by their keys
+ *
+ * @param keys
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function getMany<T = any>(
     keys: IDBValidKey[],
     customStore = defaultGetStore(),
 ): Promise<T[]> {
-    return withFailureFallback(customStore("readonly", store => {
-        if (isMemoryStore(store)) {
-            return keys.map(key => store.get(key) as T | undefined);
-        }
-
-        return Promise.all(keys.map(key => promisifyRequest(store.get(key))));
-    }), []);
+    return customStore("readonly", store =>
+        Promise.all(keys.map(key => promisifyRequest(store.get(key)))),
+    );
 }
 
+/**
+ * Update a value. This lets you see the old value and update it as an atomic operation.
+ *
+ * @param key
+ * @param updater A callback that takes the old value and returns a new value.
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function update<T = any>(
     key: IDBValidKey,
     updater: (oldValue: T | undefined) => T,
     customStore = defaultGetStore(),
 ): Promise<void> {
-    return withFailureFallback(customStore(
+    return customStore(
         "readwrite",
-        store => {
-            if (isMemoryStore(store)) {
-                store.put(updater(store.get(key) as T | undefined), key);
-                return;
-            }
-
-            return new Promise((resolve, reject) => {
+        store =>
+            // Need to create the promise manually.
+            // If I try to chain promises, the transaction closes in browsers
+            // that use a promise polyfill (IE10/11).
+            new Promise((resolve, reject) => {
                 store.get(key).onsuccess = function () {
                     try {
                         store.put(updater(this.result), key);
@@ -190,42 +144,52 @@ export function update<T = any>(
                         reject(err);
                     }
                 };
-            });
-        },
-    ), undefined);
+            }),
+    );
 }
 
+/**
+ * Delete a particular key from the store.
+ *
+ * @param key
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function del(
     key: IDBValidKey,
     customStore = defaultGetStore(),
 ): Promise<void> {
-    return withFailureFallback(customStore("readwrite", store => {
+    return customStore("readwrite", store => {
         store.delete(key);
-        if (isMemoryStore(store)) return;
-
         return promisifyRequest(store.transaction);
-    }), undefined);
+    });
 }
 
+/**
+ * Delete multiple keys at once.
+ *
+ * @param keys List of keys to delete.
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function delMany(
     keys: IDBValidKey[],
     customStore = defaultGetStore(),
 ): Promise<void> {
-    return withFailureFallback(customStore("readwrite", store => {
-        keys.forEach(key => store.delete(key));
-        if (isMemoryStore(store)) return;
-
+    return customStore("readwrite", (store: IDBObjectStore) => {
+        keys.forEach((key: IDBValidKey) => store.delete(key));
         return promisifyRequest(store.transaction);
-    }), undefined);
+    });
 }
 
+/**
+ * Clear all values in the store.
+ *
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function clear(customStore = defaultGetStore()): Promise<void> {
-    return withFailureFallback(customStore("readwrite", store => {
+    return customStore("readwrite", store => {
         store.clear();
-        if (isMemoryStore(store)) return;
-
         return promisifyRequest(store.transaction);
-    }), undefined);
+    });
 }
 
 function eachCursor(
@@ -240,12 +204,16 @@ function eachCursor(
     return promisifyRequest(store.transaction);
 }
 
+/**
+ * Get all keys in the store.
+ *
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function keys<KeyType extends IDBValidKey>(
     customStore = defaultGetStore(),
 ): Promise<KeyType[]> {
-    return withFailureFallback(customStore("readonly", store => {
-        if (isMemoryStore(store)) return store.getAllKeys<KeyType>();
-
+    return customStore("readonly", store => {
+        // Fast path for modern browsers
         if (store.getAllKeys) {
             return promisifyRequest(
                 store.getAllKeys() as unknown as IDBRequest<KeyType[]>,
@@ -253,45 +221,59 @@ export function keys<KeyType extends IDBValidKey>(
         }
 
         const items: KeyType[] = [];
+
         return eachCursor(store, cursor =>
             items.push(cursor.key as KeyType),
         ).then(() => items);
-    }), [] as KeyType[]);
+    });
 }
 
+/**
+ * Get all values in the store.
+ *
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function values<T = any>(customStore = defaultGetStore()): Promise<T[]> {
-    return withFailureFallback(customStore("readonly", store => {
-        if (isMemoryStore(store)) return store.getAll<T>();
-
+    return customStore("readonly", store => {
+        // Fast path for modern browsers
         if (store.getAll) {
             return promisifyRequest(store.getAll() as IDBRequest<T[]>);
         }
 
         const items: T[] = [];
+
         return eachCursor(store, cursor => items.push(cursor.value as T)).then(
             () => items,
         );
-    }), [] as T[]);
+    });
 }
 
+/**
+ * Get all entries in the store. Each entry is an array of `[key, value]`.
+ *
+ * @param customStore Method to get a custom store. Use with caution (see the docs).
+ */
 export function entries<KeyType extends IDBValidKey, ValueType = any>(
     customStore = defaultGetStore(),
 ): Promise<[KeyType, ValueType][]> {
-    return withFailureFallback(customStore("readonly", store => {
-        if (isMemoryStore(store)) return store.entries<KeyType, ValueType>();
-
+    return customStore("readonly", store => {
+        // Fast path for modern browsers
+        // (although, hopefully we'll get a simpler path some day)
         if (store.getAll && store.getAllKeys) {
             return Promise.all([
                 promisifyRequest(
                     store.getAllKeys() as unknown as IDBRequest<KeyType[]>,
                 ),
                 promisifyRequest(store.getAll() as IDBRequest<ValueType[]>),
-            ]).then(([keys, values]) => keys.map((key, i) => [key, values[i]] as [KeyType, ValueType]));
+            ]).then(([keys, values]) => keys.map((key, i) => [key, values[i]]));
         }
 
         const items: [KeyType, ValueType][] = [];
-        return eachCursor(store, cursor =>
-            items.push([cursor.key as KeyType, cursor.value]),
-        ).then(() => items);
-    }), [] as [KeyType, ValueType][]);
+
+        return customStore("readonly", store =>
+            eachCursor(store, cursor =>
+                items.push([cursor.key as KeyType, cursor.value]),
+            ).then(() => items),
+        );
+    });
 }
diff --git a/src/api/MessageAccessories.tsx b/src/api/MessageAccessories.tsx
index d2bc081e7..5ac7c9531 100644
--- a/src/api/MessageAccessories.tsx
+++ b/src/api/MessageAccessories.tsx
@@ -17,6 +17,7 @@
 */
 
 import ErrorBoundary from "@components/ErrorBoundary";
+import { Logger } from "@utils/Logger";
 import { JSX, ReactNode } from "react";
 
 export type MessageAccessoryFactory = (props: Record<string, any>) => ReactNode;
@@ -46,23 +47,28 @@ export function _modifyAccessories(
     elements: JSX.Element[],
     props: Record<string, any>
 ) {
-    for (const [key, accessory] of accessories.entries()) {
-        const res = (
-            <ErrorBoundary noop message={`Failed to render ${key} Message Accessory`} key={key}>
-                <accessory.render {...props} />
-            </ErrorBoundary>
-        );
+    try {
+        for (const [key, accessory] of accessories.entries()) {
+            const res = (
+                <ErrorBoundary noop message={`Failed to render ${key} Message Accessory`} key={key}>
+                    <accessory.render {...props} />
+                </ErrorBoundary>
+            );
 
-        elements.splice(
-            accessory.position != null
-                ? accessory.position < 0
-                    ? elements.length + accessory.position
-                    : accessory.position
-                : elements.length,
-            0,
-            res
-        );
+            elements.splice(
+                accessory.position != null
+                    ? accessory.position < 0
+                        ? elements.length + accessory.position
+                        : accessory.position
+                    : elements.length,
+                0,
+                res
+            );
+        }
+
+        return elements;
+    } catch (e) {
+        new Logger("MessageAccessories").error("Failed to modify message accessories", e);
+        return elements;
     }
-
-    return elements;
 }
diff --git a/src/api/Notifications/styles.css b/src/api/Notifications/styles.css
index 400fb7d4a..e15e01a7d 100644
--- a/src/api/Notifications/styles.css
+++ b/src/api/Notifications/styles.css
@@ -15,7 +15,7 @@
     position: absolute;
     z-index: 2147483647;
     right: 1rem;
-    width: 25vw;
+    width: min(25vw, 400px);
     min-height: 10vh;
 }
 
diff --git a/src/api/PluginManager.ts b/src/api/PluginManager.ts
index 0721b4d20..b15b6848f 100644
--- a/src/api/PluginManager.ts
+++ b/src/api/PluginManager.ts
@@ -17,7 +17,7 @@
 */
 
 import { addProfileBadge, removeProfileBadge } from "@api/Badges";
-import { addChatBarButton, removeChatBarButton } from "@api/ChatButtons";
+import { addChatBarButton, addChatBarButtonWrapper, removeChatBarButton, removeChatBarButtonWrapper } from "@api/ChatButtons";
 import { registerCommand, unregisterCommand } from "@api/Commands";
 import { addContextMenuPatch, removeContextMenuPatch } from "@api/ContextMenu";
 import { addMemberListDecorator, removeMemberListDecorator } from "@api/MemberListDecorators";
@@ -28,10 +28,11 @@ import { addMessagePopoverButton, removeMessagePopoverButton } from "@api/Messag
 import { addNicknameIcon, removeNicknameIcon } from "@api/NicknameIcons";
 import { Settings, SettingsStore } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
+import { traceFunction } from "@debug/Tracer";
 import { Logger } from "@utils/Logger";
 import { onlyOnce } from "@utils/onlyOnce";
 import { canonicalizeFind, canonicalizeReplacement } from "@utils/patches";
-import { Patch, Plugin, PluginDef, ReporterTestable, StartAt } from "@utils/types";
+import { DefinedSettings, Patch, Plugin, PluginDef, PluginSettingDef, ReporterTestable, StartAt } from "@utils/types";
 import { FluxEvents } from "@vencord/discord-types";
 import { FluxDispatcher } from "@webpack/common";
 import { patches } from "@webpack/patcher";
@@ -39,10 +40,10 @@ import { patches } from "@webpack/patcher";
 import Plugins from "~plugins";
 export { Plugins as plugins };
 
-import { traceFunction } from "../debug/Tracer";
 import { addAudioProcessor, removeAudioProcessor } from "./AudioPlayer";
 import { addChannelToolbarButton, addHeaderBarButton, removeChannelToolbarButton, removeHeaderBarButton } from "./HeaderBar";
 import { addProfileCollection, removeProfileCollection } from "./ProfileCollections";
+import { addProfileSection, removeProfileSection } from "./ProfileSections";
 import { addUserAreaButton, removeUserAreaButton } from "./UserArea";
 
 const logger = new Logger("PluginManager", "#a6d189");
@@ -60,14 +61,37 @@ export function isPluginEnabled(p: string) {
         Settings.plugins[p]?.enabled
     ) ?? false;
 }
-
 export function isPluginRequired(p: string) {
     return (
         Plugins[p]?.required
     ) ?? false;
 }
 
+export function isSettingHidden(settings: DefinedSettings, setting: PluginSettingDef) {
+    if (!("hidden" in setting)) return false;
+
+    return typeof setting.hidden === "function"
+        ? setting.hidden.call(settings)
+        : Boolean(setting.hidden);
+}
+
+export function isSettingDisabled(settings: DefinedSettings, setting: PluginSettingDef) {
+    if (!("disabled" in setting)) return false;
+
+    return typeof setting.disabled === "function"
+        ? setting.disabled.call(settings)
+        : Boolean(setting.disabled);
+}
+
+export function hasAnyVisibleSettings({ settings }: Plugin) {
+    return !!settings && Object.values(settings.def).some(s => !isSettingHidden(settings, s));
+}
+
 export function addPatch(newPatch: Omit<Patch, "plugin">, pluginName: string, pluginPath = `Vencord.Plugins.plugins[${JSON.stringify(pluginName)}]`) {
+    // TODO: this causes crashes
+    if (pluginName === "Vesktop" && newPatch.find === ".STREAMING_AUTO_STREAMER_MODE,") return;
+    if (pluginName === "Equibop" && newPatch.find === ".STREAMING_AUTO_STREAMER_MODE,") return;
+
     const patch = newPatch as Patch;
     patch.plugin = pluginName;
 
@@ -197,7 +221,8 @@ export const startPlugin = traceFunction("startPlugin", function startPlugin(p:
         onBeforeMessageEdit, onBeforeMessageSend, onMessageClick,
         chatBarButton, renderMemberListDecorator, renderMessageAccessory, renderMessageDecoration, messagePopoverButton,
         // Custom
-        renderNicknameIcon, headerBarButton, audioProcessor, userAreaButton, renderProfileCollection
+        renderNicknameIcon, headerBarButton, audioProcessor, userAreaButton, renderProfileCollection, chatBarButtonWrapper,
+        renderProfileSection
     } = p;
 
     if (p.start) {
@@ -265,6 +290,8 @@ export const startPlugin = traceFunction("startPlugin", function startPlugin(p:
     if (audioProcessor) addAudioProcessor(name, audioProcessor);
     if (userAreaButton) addUserAreaButton(name, userAreaButton.render, userAreaButton.priority);
     if (renderProfileCollection) addProfileCollection(name, renderProfileCollection);
+    if (chatBarButtonWrapper) addChatBarButtonWrapper(name, chatBarButtonWrapper);
+    if (renderProfileSection) addProfileSection(name, renderProfileSection);
 
     return true;
 }, p => `startPlugin ${p.name}`);
@@ -275,7 +302,8 @@ export const stopPlugin = traceFunction("stopPlugin", function stopPlugin(p: Plu
         onBeforeMessageEdit, onBeforeMessageSend, onMessageClick,
         chatBarButton, renderMemberListDecorator, renderMessageAccessory, renderMessageDecoration, messagePopoverButton,
         // Custom
-        renderNicknameIcon, headerBarButton, audioProcessor, userAreaButton, renderProfileCollection
+        renderNicknameIcon, headerBarButton, audioProcessor, userAreaButton, renderProfileCollection, chatBarButtonWrapper,
+        renderProfileSection
     } = p;
 
     if (p.stop) {
@@ -341,6 +369,8 @@ export const stopPlugin = traceFunction("stopPlugin", function stopPlugin(p: Plu
     if (audioProcessor) removeAudioProcessor(name);
     if (userAreaButton) removeUserAreaButton(name);
     if (renderProfileCollection) removeProfileCollection(name);
+    if (chatBarButtonWrapper) removeChatBarButtonWrapper(name);
+    if (renderProfileSection) removeProfileSection(name);
 
     return true;
 }, p => `stopPlugin ${p.name}`);
@@ -396,6 +426,8 @@ export const initPluginManager = onlyOnce(function init() {
         if (p.audioProcessor) neededApiPlugins.add("AudioPlayerAPI");
         if (p.userAreaButton) neededApiPlugins.add("UserAreaAPI");
         if (p.renderProfileCollection) neededApiPlugins.add("ProfileCollectionsAPI");
+        if (p.chatBarButtonWrapper) neededApiPlugins.add("ChatInputButtonAPI");
+        if (p.renderProfileSection) neededApiPlugins.add("ProfileSectionsAPI");
 
         for (const key of pluginKeysToBind) {
             p[key] &&= p[key].bind(p) as any;
@@ -409,22 +441,11 @@ export const initPluginManager = onlyOnce(function init() {
 
     for (const p of pluginsValues) {
         if (p.settings) {
-            p.options ??= {};
-
             p.settings.pluginName = p.name;
-            for (const name in p.settings.def) {
-                const def = p.settings.def[name];
-                const checks = p.settings.checks?.[name];
-                p.options[name] = { ...def, ...checks };
-            }
-        }
 
-        if (p.options) {
-            for (const name in p.options) {
-                const opt = p.options[name];
-                if (opt.onChange != null) {
-                    SettingsStore.addChangeListener(`plugins.${p.name}.${name}`, opt.onChange);
-                }
+            for (const [key, def] of Object.entries(p.settings.def)) {
+                if (def.onChange)
+                    SettingsStore.addChangeListener(`plugins.${p.name}.${key}`, def.onChange);
             }
         }
 
diff --git a/src/api/ProfileCollections.tsx b/src/api/ProfileCollections.tsx
index 2a8a16783..07afef0cb 100644
--- a/src/api/ProfileCollections.tsx
+++ b/src/api/ProfileCollections.tsx
@@ -6,12 +6,13 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Logger } from "@utils/Logger";
+import { User } from "@vencord/discord-types";
 import { useEffect, useState } from "@webpack/common";
 import type { ReactNode } from "react";
 
 const logger = new Logger("ProfileCollectionAPI");
 
-export type ProfileCollectionFactory = (props: any) => ReactNode | null;
+export type ProfileCollectionFactory = (props: { user: User; isSideBar: boolean; }) => ReactNode | Promise<ReactNode> | null;
 
 interface CollectionEntry {
     render: ProfileCollectionFactory;
diff --git a/src/api/ProfileSections.tsx b/src/api/ProfileSections.tsx
new file mode 100644
index 000000000..ecf52ae9c
--- /dev/null
+++ b/src/api/ProfileSections.tsx
@@ -0,0 +1,73 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Logger } from "@utils/Logger";
+import { useEffect, useState } from "@webpack/common";
+import type { ReactNode } from "react";
+
+const logger = new Logger("ProfileSectionsAPI");
+
+export type ProfileSectionFactory = (props: { userId: string; isSideBar: boolean; }) => ReactNode | Promise<ReactNode> | null;
+
+interface SectionEntry {
+    render: ProfileSectionFactory;
+    priority: number;
+}
+
+const profileSections = new Map<string, SectionEntry>();
+const profileSectionListeners = new Set<() => void>();
+
+/**
+ * Adds a section to the user profile panel near the 'Member Since' area.
+ *
+ * @param id       - Unique identifier for the section (e.g., "my-plugin-profile-section")
+ * @param render   - Function that returns the section JSX.
+ *                   Receives `{ userId, isSideBar }` so you can style accordingly.
+ * @param priority - Higher values appear first. Default: 0
+ *
+ * @example
+ * addProfileSection("my-section", ({ userId, isSideBar }) => (
+ *     <div>Custom content for {userId}</div>
+ * ));
+ */
+export function addProfileSection(id: string, render: ProfileSectionFactory, priority = 0) {
+    profileSections.set(id, { render, priority });
+    profileSectionListeners.forEach(listener => listener());
+}
+
+/**
+ * Removes a section from the user profile panel.
+ *
+ * @param id - The identifier used when adding the section
+ */
+export function removeProfileSection(id: string) {
+    profileSections.delete(id);
+    profileSectionListeners.forEach(listener => listener());
+}
+
+function ProfileSections({ userId, isSideBar }: { userId: string; isSideBar: boolean; }) {
+    const [, forceUpdate] = useState(0);
+
+    useEffect(() => {
+        const listener = () => forceUpdate(n => n + 1);
+        profileSectionListeners.add(listener);
+        return () => { profileSectionListeners.delete(listener); };
+    }, []);
+
+    return Array.from(profileSections)
+        .sort(([, a], [, b]) => b.priority - a.priority)
+        .map(([id, { render: Section }]) => (
+            <ErrorBoundary noop key={id} onError={e => logger.error(`Failed to render profile section: ${id}`, e.error)}>
+                <Section userId={userId} isSideBar={isSideBar} />
+            </ErrorBoundary>
+        ));
+}
+
+/** @internal Injected by ProfileSectionsAPI patch (do NOT call directly) */
+export function renderProfileSections(props: { userId: string; isSideBar: boolean; }) {
+    return <ProfileSections {...props} />;
+}
diff --git a/src/api/ServerList.tsx b/src/api/ServerList.tsx
index 39d8b5da4..0bf5f6155 100644
--- a/src/api/ServerList.tsx
+++ b/src/api/ServerList.tsx
@@ -25,11 +25,11 @@ export const enum ServerListRenderPosition {
     Below,
 }
 
-const componentsIn = new Set<ComponentType>();
-const componentsAbove = new Set<ComponentType>();
-const componentsBelow = new Set<ComponentType>();
+const componentsIn = new Map<ComponentType, number>();
+const componentsAbove = new Map<ComponentType, number>();
+const componentsBelow = new Map<ComponentType, number>();
 
-function getRenderFunctions(position: ServerListRenderPosition) {
+function getRenderMap(position: ServerListRenderPosition) {
     switch (position) {
         case ServerListRenderPosition.Above:
             return componentsAbove;
@@ -40,21 +40,20 @@ function getRenderFunctions(position: ServerListRenderPosition) {
     }
 }
 
-export function addServerListElement(position: ServerListRenderPosition, renderFunction: ComponentType) {
-    getRenderFunctions(position).add(renderFunction);
+export function addServerListElement(position: ServerListRenderPosition, renderFunction: ComponentType, priority = 0) {
+    getRenderMap(position).set(renderFunction, priority);
 }
 
 export function removeServerListElement(position: ServerListRenderPosition, renderFunction: ComponentType) {
-    getRenderFunctions(position).delete(renderFunction);
+    getRenderMap(position).delete(renderFunction);
 }
 
 export const renderAll = (position: ServerListRenderPosition) => {
-    return Array.from(
-        getRenderFunctions(position),
-        (Component, i) => (
+    return Array.from(getRenderMap(position).entries())
+        .sort((a, b) => b[1] - a[1])
+        .map(([Component], i) => (
             <ErrorBoundary noop key={i}>
                 <Component />
             </ErrorBoundary>
-        )
-    );
+        ));
 };
diff --git a/src/api/Settings.ts b/src/api/Settings.ts
index 1951a2a3e..ea9e23088 100644
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@@ -113,7 +113,7 @@ const DefaultSettings: Settings = {
     autoUpdateNotification: true,
     useQuickCss: true,
     themeLinks: [],
-    eagerPatches: IS_REPORTER,
+    eagerPatches: false, // Eagerly patching no longer works due to module factories with the same id being able to have different sources now.
     enabledThemes: [],
     enabledThemeLinks: [],
     enableOnlineThemes: true,
@@ -178,7 +178,7 @@ export const SettingsStore = new SettingsStoreClass(settings, {
         if (path.startsWith("plugins.")) {
             const plugin = path.slice("plugins.".length);
             if (plugin in plugins) {
-                const setting = plugins[plugin].options?.[key];
+                const setting = plugins[plugin].settings?.def[key];
                 if (!setting) return v;
 
                 if ("default" in setting)
@@ -208,7 +208,7 @@ if (!IS_REPORTER) {
  * Same as {@link Settings} but unproxied. You should treat this as readonly,
  * as modifying properties on this will not save to disk or call settings
  * listeners.
- * WARNING: default values specified in plugin.options will not be ensured here. In other words,
+ * WARNING: default values specified in plugin.settings will not be ensured here. In other words,
  * settings for which you specified a default value may be uninitialised. If you need proper
  * handling for default values, use {@link Settings}
  */
@@ -353,7 +353,13 @@ export function definePluginSettings<
     Checks extends SettingsChecks<Def>,
     PrivateSettings extends object = {}
 >(def: Def, checks?: Checks) {
-    const definedSettings: DefinedSettings<Def, Checks, PrivateSettings> = {
+    if (checks) {
+        for (const [name, check] of Object.entries(checks)) {
+            Object.assign(def[name], check);
+        }
+    }
+
+    const definedSettings: DefinedSettings<Def, PrivateSettings> = {
         get store() {
             if (!definedSettings.pluginName) throw new Error("Cannot access settings before plugin is initialized");
             return Settings.plugins[definedSettings.pluginName] as any;
@@ -368,11 +374,10 @@ export function definePluginSettings<
                 : [`plugins.${definedSettings.pluginName}.*`]
         ) as UseSettings<Settings>[]).plugins[definedSettings.pluginName] as any,
         def,
-        checks: checks ?? {} as any,
         pluginName: "",
 
         withPrivateSettings<T extends object>() {
-            return this as DefinedSettings<Def, Checks, T>;
+            return this as DefinedSettings<Def, T>;
         }
     };
 
diff --git a/src/api/SettingsSync/cloudSync.ts b/src/api/SettingsSync/cloudSync.ts
index 4d3ef986e..b1f0f5785 100644
--- a/src/api/SettingsSync/cloudSync.ts
+++ b/src/api/SettingsSync/cloudSync.ts
@@ -20,17 +20,33 @@ import { ManifestEntry, SyncRequest, SyncResponse } from "./types";
 const logger = new Logger("SettingsSync:Cloud", "#39b7e0");
 
 const MANIFEST_STORE_KEY = "Vencord_cloudManifest";
+const API_VERSION_STORE_KEY = "Vencord_cloudApiVersions";
 
 type ApiVersion = "v2" | "v1";
 
-let apiVersion: ApiVersion = "v2";
+const SYNC_DIRECTION_KEY = "Vencord_cloudSyncDirection";
+const SETTINGS_DIRTY_KEY = "Vencord_settingsDirty";
+export const getCloudSyncDirection = () => localStorage.getItem(SYNC_DIRECTION_KEY) || "both";
+export const setCloudSyncDirection = (direction: "push" | "pull" | "both" | "manual") => localStorage.setItem(SYNC_DIRECTION_KEY, direction);
+export const areLocalSettingsDirty = () => localStorage.getItem(SETTINGS_DIRTY_KEY) === "true";
+export const markLocalSettingsDirty = () => localStorage.setItem(SETTINGS_DIRTY_KEY, "true");
+export const markLocalSettingsClean = () => localStorage.removeItem(SETTINGS_DIRTY_KEY);
+
+async function loadApiVersionMap(): Promise<Record<string, ApiVersion>> {
+    return await DataStore.get<Record<string, ApiVersion>>(API_VERSION_STORE_KEY) ?? {};
+}
 
 async function getApiVersion(): Promise<ApiVersion> {
-    return apiVersion;
+    const map = await loadApiVersionMap();
+    return map[getCloudUrl().origin] ?? "v2";
 }
 
 async function setApiVersion(version: ApiVersion) {
-    apiVersion = version;
+    await DataStore.update<Record<string, ApiVersion>>(API_VERSION_STORE_KEY, map => {
+        map ??= {};
+        map[getCloudUrl().origin] = version;
+        return map;
+    });
 }
 
 function toBase64(data: Uint8Array): string {
diff --git a/src/api/index.ts b/src/api/index.ts
index eb1d32335..585cb3dbb 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -35,6 +35,7 @@ import * as $Notifications from "./Notifications";
 import * as $UserArea from "./UserArea";
 export * as PluginManager from "./PluginManager";
 import * as $ProfileCollections from "./ProfileCollections";
+import * as $ProfileSections from "./ProfileSections";
 import * as $ServerList from "./ServerList";
 import * as $Settings from "./Settings";
 import * as $Styles from "./Styles";
@@ -176,3 +177,8 @@ export const isEquicord = true;
  * An API allowing you to add other collections where discords game collection is.
  */
 export const ProfileCollections = $ProfileCollections;
+
+/**
+ * An API allowing you to add sections near the 'Member Since' area of user profile panels.
+ */
+export const ProfileSections = $ProfileSections;
diff --git a/src/components/CheckedTextInput.tsx b/src/components/CheckedTextInput.tsx
index 027dd51fa..cb2015f94 100644
--- a/src/components/CheckedTextInput.tsx
+++ b/src/components/CheckedTextInput.tsx
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { React, TextInput } from "@webpack/common";
+import { React, TextInput, useState } from "@webpack/common";
 
 interface TextInputProps {
     /**
      * WARNING: Changing this between renders will have no effect!
      */
-    value: string;
+    initialValue: string;
     /**
      * This will only be called if the new value passed validate()
      */
@@ -41,13 +41,15 @@ interface TextInputProps {
  * A very simple wrapper around Discord's TextInput that validates input and shows
  * the user an error message and only calls your onChange when the input is valid
  */
-export function CheckedTextInput({ value: initialValue, onChange, validate, placeholder }: TextInputProps) {
-    const [value, setValue] = React.useState(initialValue);
-    const [error, setError] = React.useState<string>();
+export function CheckedTextInput({ initialValue, onChange, validate, placeholder }: TextInputProps) {
+    const [value, setValue] = useState(initialValue);
+    const [error, setError] = useState<string>();
 
     function handleChange(v: string) {
         setValue(v);
+
         const res = validate(v);
+
         if (res === true) {
             setError(void 0);
             onChange(v);
diff --git a/src/components/Icons.tsx b/src/components/Icons.tsx
index 16f1e2bcf..afee7b18a 100644
--- a/src/components/Icons.tsx
+++ b/src/components/Icons.tsx
@@ -730,6 +730,34 @@ export function ClockIcon(props: IconProps) {
     );
 }
 
+export function ChevronSmallDownIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                d="M5.3 9.3a1 1 0 0 1 1.4 0l5.3 5.29 5.3-5.3a1 1 0 1 1 1.4 1.42l-6 6a1 1 0 0 1-1.4 0l-6-6a1 1 0 0 1 0-1.42Z"
+            />
+        </Icon>
+    );
+}
+
+export function ChevronSmallUpIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                d="M5.3 14.7a1 1 0 0 0 1.4 0l5.3-5.29 5.3 5.3a1 1 0 1 0 1.4-1.42l-6-6a1 1 0 0 0-1.4 0l-6 6a1 1 0 0 0 0 1.42Z"
+            />
+        </Icon>
+    );
+}
+
 export function DownArrow(props: IconProps) {
     return (
         <Icon
@@ -797,3 +825,171 @@ export const ComponentsIcon = (props?: any) => {
         </Icon>
     );
 };
+
+export const LogsIcon = (props?: any) => {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fillRule="evenodd"
+                clipRule="evenodd"
+                fill={props.fill || "currentColor"}
+                d="M21 21.93V2.07a1 1 0 0 0-1.27-.97l-2.5.7a3 3 0 0 1-1.46.04l-3.12-.7a3 3 0 0 0-1.3 0l-3.12.7a3 3 0 0 1-1.45-.04l-2.51-.7A1 1 0 0 0 3 2.07v19.86a1 1 0 0 0 1.27.97l2.5-.7a3 3 0 0 1 1.46-.04l3.12.7a3 3 0 0 0 1.3 0l3.12-.7a3 3 0 0 1 1.45.04l2.51.7a1 1 0 0 0 1.27-.97ZM7 8a1 1 0 0 1 1-1h8a1 1 0 1 1 0 2H8a1 1 0 0 1-1-1Zm1 3a1 1 0 0 0 0 2h8a1 1 0 1 0 0-2H8Zm-1 5a1 1 0 0 1 1-1h3a1 1 0 0 1 0 2H8a1 1 0 0 1-1-1Zm8-1a1 1 0 0 0 0 2h1a1 1 0 1 0 0-2h-1Z"
+            />
+        </Icon>
+    );
+};
+
+export const BookmarkIcon = (props?: any) => {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                d="M4 5a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v16a1 1 0 0 1-1.67.74l-5.66-5.13a1 1 0 0 0-1.34 0l-5.66 5.13A1 1 0 0 1 4 20.99V5Z"
+            />
+        </Icon>
+    );
+};
+
+export function RobotIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                d="M7.89 13.46a1 1 0 0 1-1.78-.9L7 13l-.9-.45.01-.01.01-.02a2.24 2.24 0 0 1 .14-.23c.1-.14.23-.31.4-.5.37-.36.98-.79 1.84-.79.86 0 1.47.43 1.83.8a3.28 3.28 0 0 1 .55.72v.02h.01v.01L10 13l.9-.45a1 1 0 0 1-1.79.9 1.28 1.28 0 0 0-.19-.25c-.14-.13-.28-.2-.42-.2-.14 0-.28.07-.42.2a1.28 1.28 0 0 0-.19.25ZM13.55 13.9a1 1 0 0 0 1.34-.44c0-.02.02-.04.04-.06.03-.05.08-.13.15-.2.14-.13.28-.2.42-.2.14 0 .28.07.42.2a1.28 1.28 0 0 1 .19.25 1 1 0 0 0 1.78-.9L17 13l.9-.45-.01-.01-.01-.02a2.1 2.1 0 0 0-.14-.23 3.28 3.28 0 0 0-.4-.5c-.37-.36-.98-.79-1.84-.79-.86 0-1.47.43-1.83.8a3.28 3.28 0 0 0-.55.72v.02h-.01v.01L14 13l-.9-.45a1 1 0 0 0 .45 1.34Z"
+            />
+            <path
+                fill={props.fill || "currentColor"}
+                fillRule="evenodd"
+                d="M12 21c5.52 0 10-1.86 10-6 0-5.59-2.8-10.07-4.26-11.67a1 1 0 1 0-1.48 1.34 14.8 14.8 0 0 1 2.35 3.86A10.23 10.23 0 0 0 12 6C9.47 6 7.15 7.02 5.4 8.53a14.8 14.8 0 0 1 2.34-3.86 1 1 0 1 0-1.48-1.34A18.65 18.65 0 0 0 2 15c0 4.14 4.48 6 10 6Zm0-12c3.87 0 7 2 7 4.2S15.87 17 12 17s-7-1.6-7-3.8C5 11 8.13 9 12 9Z"
+                clipRule="evenodd"
+            />
+        </Icon>
+    );
+}
+
+export function HeadphonesIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                d="M12 3a9 9 0 0 0-8.95 10h1.87a5 5 0 0 1 4.1 2.13l1.37 1.97a3.1 3.1 0 0 1-.17 3.78 2.85 2.85 0 0 1-3.55.74 11 11 0 1 1 10.66 0c-1.27.71-2.73.23-3.55-.74a3.1 3.1 0 0 1-.17-3.78l1.38-1.97a5 5 0 0 1 4.1-2.13h1.86A9 9 0 0 0 12 3Z"
+            />
+        </Icon>
+    );
+}
+
+export function ShieldIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                d="M17.05 8.76a4.7 4.7 0 0 1-1.29-.88c-.36-.33-.7-.73-.88-1.13-.33-.73-.16-.77-1.08-.77h-3.64c-.91 0-.74.04-1.08.77a4.94 4.94 0 0 1-2.17 2.01c-.74.33-.85.14-.86.82 0 .88-.22 3.34 1.78 5.19a13.68 13.68 0 0 0 3.98 2.47c.09.03.08.04.17.04.09 0 .08 0 .17-.04.76-.25 2.67-1.25 3.98-2.47 2-1.85 1.78-4.3 1.78-5.19-.01-.68-.12-.49-.86-.82Z"
+            />
+            <path
+                fill={props.fill || "currentColor"}
+                d="M19.91 5.41c-.84 0-1.52-.65-1.52-1.46v-.3c0-.9-.77-1.65-1.71-1.65H7.31c-.94 0-1.71.74-1.71 1.65v.3c0 .81-.68 1.46-1.52 1.46H3.7c-.94 0-1.7.73-1.7 1.64v3.52l.01.49c.05 3.11.94 4.69 2.92 6.63C6.72 19.46 11.58 22 11.99 22c.41 0 5.27-2.54 7.06-4.31 1.98-1.95 2.92-3.53 2.92-6.63L22 7.05c0-.9-.76-1.64-1.7-1.64h-.39Zm-2.18 10.74a21.76 21.76 0 0 1-5.58 3.38c-.1.03-.2.03-.31 0a21.76 21.76 0 0 1-5.58-3.38c-1.15-1.08-2.12-2.37-2.12-5.29v-.33l.03-2.57c0-.31.26-.57.59-.57a2.88 2.88 0 0 0 2.89-2.8v-.03c0-.3.26-.55.59-.55h7.56c.32 0 .59.25.59.55v.03c0 1.53 1.3 2.77 2.89 2.8.32 0 .59.26.59.57l.03 2.57v.34c0 2.92-.98 4.2-2.14 5.28h-.03Z"
+            />
+        </Icon>
+    );
+}
+
+export function CircleQuestionIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <circle
+                cx="12"
+                cy="12"
+                r="10"
+                fill="transparent"
+            />
+            <path
+                fill={props.fill || "currentColor"}
+                fillRule="evenodd"
+                d="M12 23a11 11 0 1 0 0-22 11 11 0 0 0 0 22Zm-.28-16c-.98 0-1.81.47-2.27 1.14A1 1 0 1 1 7.8 7.01 4.73 4.73 0 0 1 11.72 5c2.5 0 4.65 1.88 4.65 4.38 0 2.1-1.54 3.77-3.52 4.24l.14 1a1 1 0 0 1-1.98.27l-.28-2a1 1 0 0 1 .99-1.14c1.54 0 2.65-1.14 2.65-2.38 0-1.23-1.1-2.37-2.65-2.37ZM13 17.88a1.13 1.13 0 1 1-2.25 0 1.13 1.13 0 0 1 2.25 0Z"
+                clipRule="evenodd"
+            />
+        </Icon>
+    );
+}
+
+export function AttachmentIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                d="M10.57 4.01a6.97 6.97 0 0 1 9.86 0l.54.55a6.99 6.99 0 0 1 0 9.88l-7.26 7.27a1 1 0 0 1-1.42-1.42l7.27-7.26a4.99 4.99 0 0 0 0-7.06L19 5.43a4.97 4.97 0 0 0-7.02 0l-8.02 8.02a3.24 3.24 0 1 0 4.58 4.58l6.24-6.24a1.12 1.12 0 0 0-1.58-1.58l-3.5 3.5a1 1 0 0 1-1.42-1.42l3.5-3.5a3.12 3.12 0 1 1 4.42 4.42l-6.24 6.24a5.24 5.24 0 0 1-7.42-7.42l8.02-8.02Z"
+            />
+        </Icon>
+    );
+}
+
+export function StickerIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                fillRule="evenodd"
+                d="M6 2h12a4 4 0 0 1 4 4v7.5a.5.5 0 0 1-.5.5H19a5 5 0 0 0-5 5v2.5a.5.5 0 0 1-.5.5H6a4 4 0 0 1-4-4V6a4 4 0 0 1 4-4Zm.5 8a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM19 8.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm-9.91 2.94a1 1 0 0 0-1.66 1.12 5.5 5.5 0 0 0 9.14 0 1 1 0 0 0-1.66-1.12 3.5 3.5 0 0 1-5.82 0Z"
+                clipRule="evenodd"
+            />
+            <path
+                fill={props.fill || "currentColor"}
+                d="M21.66 16c.03 0 .05.03.04.06a3 3 0 0 1-.58.82l-4.24 4.24a3 3 0 0 1-.82.58.04.04 0 0 1-.06-.04V19a3 3 0 0 1 3-3h2.66Z"
+            />
+        </Icon>
+    );
+}
+
+export function GifIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                fillRule="evenodd"
+                d="M5 2a3 3 0 0 0-3 3v14a3 3 0 0 0 3 3h14a3 3 0 0 0 3-3V5a3 3 0 0 0-3-3H5Zm2.18 13.87a2.9 2.9 0 0 1-1.66-.49 3.18 3.18 0 0 1-1.12-1.35A4.88 4.88 0 0 1 4 12c0-.75.14-1.42.42-2 .29-.59.7-1.04 1.24-1.37a3.7 3.7 0 0 1 1.95-.5c.64 0 1.21.14 1.72.4.5.28.89.67 1.15 1.16l-1.22.88a1.76 1.76 0 0 0-1.64-1.02c-.66 0-1.17.22-1.52.65a2.74 2.74 0 0 0-.53 1.8c0 .78.18 1.39.53 1.81.35.42.86.64 1.52.64.3 0 .57-.06.81-.16.25-.12.45-.27.58-.47v-.93H7.3v-1.4h3.24v4.23H9.27l-.2-.71c-.43.57-1.06.86-1.89.86Zm6.34-.15h-1.57V8.28h1.57v7.44Zm1.51 0h1.57v-2.83h2.76v-1.42H16.6V9.7H20V8.28h-4.97v7.44Z"
+                clipRule="evenodd"
+            />
+        </Icon>
+    );
+}
+
+export function VideoIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                d="M4 4a3 3 0 0 0-3 3v10a3 3 0 0 0 3 3h11a3 3 0 0 0 3-3v-2.12a1 1 0 0 0 .55.9l3 1.5a1 1 0 0 0 1.45-.9V7.62a1 1 0 0 0-1.45-.9l-3 1.5a1 1 0 0 0-.55.9V7a3 3 0 0 0-3-3H4Z"
+            />
+        </Icon>
+    );
+}
diff --git a/src/components/ThemeSettings/components/SettingColorComponent.tsx b/src/components/ThemeSettings/components/SettingColorComponent.tsx
index e01228c5f..9f3e00fd2 100644
--- a/src/components/ThemeSettings/components/SettingColorComponent.tsx
+++ b/src/components/ThemeSettings/components/SettingColorComponent.tsx
@@ -9,6 +9,7 @@ import "./colorStyles.css";
 import { classNameFactory } from "@utils/css";
 import { findByCodeLazy } from "@webpack";
 import { ColorPicker, useMemo } from "@webpack/common";
+import type tinycolor from "tinycolor2";
 
 // TinyColor is completely unmangled and it's duplicated in two modules! Fun!
 const TinyColor: tinycolor.Constructor = findByCodeLazy("this._gradientType=");
diff --git a/src/components/settings/tabs/BaseTab.tsx b/src/components/settings/tabs/BaseTab.tsx
index b4c0ebb53..17a2e8025 100644
--- a/src/components/settings/tabs/BaseTab.tsx
+++ b/src/components/settings/tabs/BaseTab.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { BaseText } from "@components/BaseText";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { handleComponentFailed } from "@components/handleComponentFailed";
-import { ModalCloseButton, ModalContent, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { onlyOnce } from "@utils/onlyOnce";
 import type { ComponentType, PropsWithChildren } from "react";
 
@@ -43,13 +44,17 @@ export function wrapTab(component: ComponentType<any>, tab: string) {
 export function openSettingsTabModal(Tab: ComponentType<any>) {
     try {
         openModal(wrapTab((modalProps: ModalProps) => (
-            <ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
+            <ModalRoot {...modalProps} size={ModalSize.MEDIUM} className="vc-settings-modal-root">
+                <ModalHeader>
+                    <BaseText size="lg" weight="semibold" style={{ flexGrow: 1 }}>{Tab.displayName?.replace("SettingsTab", "") || "Settings"}</BaseText>
+                    <ModalCloseButton onClick={modalProps.onClose} />
+                </ModalHeader>
+
                 <ModalContent className="vc-settings-modal">
-                    <ModalCloseButton onClick={modalProps.onClose} className="vc-settings-modal-close" />
                     <Tab />
                 </ModalContent>
             </ModalRoot>
-        ), Tab.displayName || "Settings Tab"));
+        ), Tab.displayName || "SettingsTab"));
     } catch {
         handleSettingsTabError();
     }
diff --git a/src/components/settings/tabs/plugins/PluginCard.tsx b/src/components/settings/tabs/plugins/PluginCard.tsx
index 140498249..72507ab1e 100644
--- a/src/components/settings/tabs/plugins/PluginCard.tsx
+++ b/src/components/settings/tabs/plugins/PluginCard.tsx
@@ -5,14 +5,14 @@
  */
 
 import { showNotice } from "@api/Notices";
-import { isPluginEnabled, pluginRequiresRestart, startDependenciesRecursive, startPlugin, stopPlugin } from "@api/PluginManager";
+import { hasAnyVisibleSettings, isPluginEnabled, pluginRequiresRestart, startDependenciesRecursive, startPlugin, stopPlugin } from "@api/PluginManager";
+import { Settings } from "@api/Settings";
 import { CogWheel, InfoIcon } from "@components/Icons";
 import { AddonCard } from "@components/settings/AddonCard";
 import { classNameFactory } from "@utils/css";
 import { Logger } from "@utils/Logger";
-import { OptionType, Plugin } from "@utils/types";
+import { Plugin } from "@utils/types";
 import { React, showToast, Toasts } from "@webpack/common";
-import { Settings } from "Vencord";
 
 import { PluginMeta } from "~plugins";
 
@@ -146,7 +146,7 @@ export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, on
                     onClick={() => openPluginModal(plugin, onRestartNeeded)}
                     className={cl("info-button")}
                 >
-                    {plugin.settings?.def && Object.values(plugin.settings.def).some(s => s.type !== OptionType.CUSTOM && !s.hidden)
+                    {hasAnyVisibleSettings(plugin)
                         ? <CogWheel className={cl("info-icon")} />
                         : <InfoIcon className={cl("info-icon")} />
                     }
diff --git a/src/components/settings/tabs/plugins/PluginModal.css b/src/components/settings/tabs/plugins/PluginModal.css
index 90620c665..bdd35c80c 100644
--- a/src/components/settings/tabs/plugins/PluginModal.css
+++ b/src/components/settings/tabs/plugins/PluginModal.css
@@ -60,5 +60,25 @@
 }
 
 .vc-plugin-modal-info {
+    display: flex;
+    gap: 1em;
+    justify-content: space-between;
+    align-items: start;
+}
+
+.vc-plugin-modal-tags {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px;
+    margin-block: 8px 16px;
+}
+
+.vc-plugin-modal-tag {
     align-items: center;
-}
\ No newline at end of file
+    border: 1px solid var(--border-normal);
+    border-radius: 9999px;
+    display: flex;
+    justify-content: center;
+    padding: 6px 12px;
+    color: var(--text-default);
+}
diff --git a/src/components/settings/tabs/plugins/PluginModal.tsx b/src/components/settings/tabs/plugins/PluginModal.tsx
index cf3379ee9..186f2be1f 100644
--- a/src/components/settings/tabs/plugins/PluginModal.tsx
+++ b/src/components/settings/tabs/plugins/PluginModal.tsx
@@ -19,6 +19,7 @@
 import "./PluginModal.css";
 
 import { generateId } from "@api/Commands";
+import { hasAnyVisibleSettings, isSettingHidden } from "@api/PluginManager";
 import { useSettings } from "@api/Settings";
 import { BaseText } from "@components/BaseText";
 import { Button } from "@components/Button";
@@ -32,7 +33,7 @@ import { proxyLazy } from "@utils/lazy";
 import { Margins } from "@utils/margins";
 import { classes, isObjectEmpty } from "@utils/misc";
 import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { OptionType, Plugin } from "@utils/types";
+import { OptionType, Plugin, PluginTag } from "@utils/types";
 import { User } from "@vencord/discord-types";
 import { findComponentByCodeLazy, findCssClassesLazy } from "@webpack";
 import { Clickable, FluxDispatcher, React, Toasts, Tooltip, useEffect, useMemo, UserStore, UserSummaryItem, UserUtils, useState } from "@webpack/common";
@@ -74,9 +75,19 @@ export function makeDummyUser(user: { username: string; id?: string; avatar?: st
     return newUser;
 }
 
+function PluginTags({ tags }: { tags: PluginTag[]; }) {
+    return (
+        <div className={cl("tags")}>
+            {tags.map(tag => (
+                <div key={tag} className={cl("tag")}>{tag}</div>
+            ))}
+        </div>
+    );
+}
+
 export default function PluginModal({ plugin, onRestartNeeded, onClose, transitionState }: PluginModalProps) {
     const pluginSettings = useSettings([`plugins.${plugin.name}.*`]).plugins[plugin.name];
-    const hasSettings = Boolean(pluginSettings && plugin.options && !isObjectEmpty(plugin.options));
+    const hasSettings = hasAnyVisibleSettings(plugin);
 
     // avoid layout shift by showing dummy users while loading users
     const fallbackAuthors = useMemo(() => [makeDummyUser({ username: "Loading...", id: "-1465912127305809920" })], []);
@@ -104,14 +115,17 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
     }
 
     function renderSettings() {
-        if (!hasSettings || !plugin.options)
+        const { settings } = plugin;
+        if (!hasSettings || !settings)
             return <Paragraph>There are no settings for this plugin.</Paragraph>;
 
-        const options = Object.entries(plugin.options).map(([key, setting]) => {
-            if (setting.type === OptionType.CUSTOM || setting.hidden) return null;
+        const options = Object.entries(settings.def).map(([key, setting]) => {
+            if (setting.type === OptionType.CUSTOM) return null;
+
+            if (isSettingHidden(settings, setting)) return null;
 
             function onChange(newValue: any) {
-                const option = plugin.options?.[key];
+                const option = plugin.settings!.def[key];
                 if (!option || option.type === OptionType.CUSTOM) return;
 
                 pluginSettings[key] = newValue;
@@ -124,10 +138,10 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                 <ErrorBoundary noop key={key}>
                     <Component
                         id={key}
-                        option={setting}
+                        setting={setting}
                         onChange={debounce(onChange)}
                         pluginSettings={pluginSettings}
-                        definedSettings={plugin.settings}
+                        definedSettings={settings}
                     />
                 </ErrorBoundary>
             );
@@ -167,6 +181,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                 <div className={cl("header-content")}>
                     <BaseText size="lg" weight="semibold" className={cl("title")}>{plugin.name}</BaseText>
                     <BaseText size="sm" className={cl("description")}>{plugin.description}</BaseText>
+                    {!!plugin.tags?.length && <PluginTags tags={plugin.tags} />}
                     {!!plugin.settingsAboutComponent && (
                         <div className={Margins.top8}>
                             <ErrorBoundary message="An error occurred while rendering this plugin's custom Info Component">
diff --git a/src/components/settings/tabs/plugins/components/BooleanSetting.tsx b/src/components/settings/tabs/plugins/components/BooleanSetting.tsx
index 51cef49d3..22596c3ba 100644
--- a/src/components/settings/tabs/plugins/components/BooleanSetting.tsx
+++ b/src/components/settings/tabs/plugins/components/BooleanSetting.tsx
@@ -16,20 +16,21 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { isSettingDisabled } from "@api/PluginManager";
 import { Switch } from "@components/Switch";
-import { PluginOptionBoolean } from "@utils/types";
+import { PluginSettingBooleanDef } from "@utils/types";
 import { React, useState } from "@webpack/common";
 
 import { resolveError, SettingProps, SettingsSection } from "./Common";
 
-export function BooleanSetting({ option, pluginSettings, definedSettings, id, onChange }: SettingProps<PluginOptionBoolean>) {
-    const def = pluginSettings[id] ?? option.default;
+export function BooleanSetting({ setting, pluginSettings, definedSettings, id, onChange }: SettingProps<PluginSettingBooleanDef>) {
+    const def = pluginSettings[id] ?? setting.default;
 
     const [state, setState] = useState(def ?? false);
     const [error, setError] = useState<string | null>(null);
 
     function handleChange(newValue: boolean): void {
-        const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
+        const isValid = setting.isValid?.call(definedSettings, newValue) ?? true;
 
         setState(newValue);
         setError(resolveError(isValid));
@@ -40,11 +41,11 @@ export function BooleanSetting({ option, pluginSettings, definedSettings, id, on
     }
 
     return (
-        <SettingsSection tag="label" name={id} description={option.description} error={error} inlineSetting>
+        <SettingsSection tag="label" name={id} description={setting.description} error={error} inlineSetting>
             <Switch
                 checked={state}
                 onChange={handleChange}
-                disabled={option.disabled?.call(definedSettings) ?? false}
+                disabled={isSettingDisabled(definedSettings, setting)}
             />
         </SettingsSection>
     );
diff --git a/src/components/settings/tabs/plugins/components/Common.tsx b/src/components/settings/tabs/plugins/components/Common.tsx
index 56bb24f10..d5f0ac69c 100644
--- a/src/components/settings/tabs/plugins/components/Common.tsx
+++ b/src/components/settings/tabs/plugins/components/Common.tsx
@@ -8,24 +8,24 @@ import { BaseText } from "@components/BaseText";
 import { classNameFactory } from "@utils/css";
 import { classes } from "@utils/misc";
 import { wordsFromCamel, wordsToTitle } from "@utils/text";
-import { DefinedSettings, PluginOptionBase } from "@utils/types";
+import { DefinedSettings, PluginSettingDefCommon } from "@utils/types";
 import { PropsWithChildren } from "react";
 
 export const cl = classNameFactory("vc-plugins-setting-");
 
 interface SettingBaseProps<T> {
-    option: T;
+    setting: T;
     onChange(newValue: any): void;
     pluginSettings: {
         [setting: string]: any;
         enabled: boolean;
     };
     id: string;
-    definedSettings?: DefinedSettings;
+    definedSettings: DefinedSettings;
 }
 
-export type SettingProps<T extends PluginOptionBase> = SettingBaseProps<T>;
-export type ComponentSettingProps<T extends Omit<PluginOptionBase, "description" | "placeholder">> = SettingBaseProps<T>;
+export type SettingProps<T extends PluginSettingDefCommon> = SettingBaseProps<T>;
+export type ComponentSettingProps<T extends Omit<PluginSettingDefCommon, "description" | "placeholder">> = SettingBaseProps<T>;
 
 export function resolveError(isValidResult: boolean | string) {
     if (typeof isValidResult === "string") return isValidResult;
diff --git a/src/components/settings/tabs/plugins/components/ComponentSetting.tsx b/src/components/settings/tabs/plugins/components/ComponentSetting.tsx
index c43b72768..e1521f02a 100644
--- a/src/components/settings/tabs/plugins/components/ComponentSetting.tsx
+++ b/src/components/settings/tabs/plugins/components/ComponentSetting.tsx
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PluginOptionComponent } from "@utils/types";
+import { PluginSettingComponentDef } from "@utils/types";
 
 import { ComponentSettingProps } from "./Common";
 
-export function ComponentSetting({ option, onChange }: ComponentSettingProps<PluginOptionComponent>) {
-    return option.component({ setValue: onChange, option });
+export function ComponentSetting({ setting, onChange }: ComponentSettingProps<PluginSettingComponentDef>) {
+    return setting.component({ setValue: onChange, option: setting });
 }
diff --git a/src/components/settings/tabs/plugins/components/NumberSetting.tsx b/src/components/settings/tabs/plugins/components/NumberSetting.tsx
index 108ddc3e4..fa348a108 100644
--- a/src/components/settings/tabs/plugins/components/NumberSetting.tsx
+++ b/src/components/settings/tabs/plugins/components/NumberSetting.tsx
@@ -16,24 +16,25 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { OptionType, PluginOptionNumber } from "@utils/types";
+import { isSettingDisabled } from "@api/PluginManager";
+import { OptionType, PluginSettingBigIntDef, PluginSettingNumberDef } from "@utils/types";
 import { React, TextInput, useState } from "@webpack/common";
 
 import { resolveError, SettingProps, SettingsSection } from "./Common";
 
 const MAX_SAFE_NUMBER = BigInt(Number.MAX_SAFE_INTEGER);
 
-export function NumberSetting({ option, pluginSettings, definedSettings, id, onChange }: SettingProps<PluginOptionNumber>) {
+export function NumberSetting({ setting, pluginSettings, definedSettings, id, onChange }: SettingProps<PluginSettingNumberDef | PluginSettingBigIntDef>) {
     function serialize(value: any) {
-        if (option.type === OptionType.BIGINT) return BigInt(value);
+        if (setting.type === OptionType.BIGINT) return BigInt(value);
         return Number(value);
     }
 
-    const [state, setState] = useState<any>(`${pluginSettings[id] ?? option.default ?? 0}`);
+    const [state, setState] = useState<any>(`${pluginSettings[id] ?? setting.default ?? 0}`);
     const [error, setError] = useState<string | null>(null);
 
     function handleChange(newValue: any) {
-        const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
+        const isValid = setting.isValid?.call(definedSettings, newValue) ?? true;
 
         setError(resolveError(isValid));
 
@@ -41,7 +42,7 @@ export function NumberSetting({ option, pluginSettings, definedSettings, id, onC
             onChange(serialize(newValue));
         }
 
-        if (option.type === OptionType.NUMBER && BigInt(newValue) >= MAX_SAFE_NUMBER) {
+        if (setting.type === OptionType.NUMBER && BigInt(newValue) >= MAX_SAFE_NUMBER) {
             setState(`${Number.MAX_SAFE_INTEGER}`);
         } else {
             setState(newValue);
@@ -49,15 +50,15 @@ export function NumberSetting({ option, pluginSettings, definedSettings, id, onC
     }
 
     return (
-        <SettingsSection name={id} description={option.description} error={error}>
+        <SettingsSection name={id} description={setting.description} error={error}>
             <TextInput
                 type="number"
                 pattern="-?[0-9]+"
-                placeholder={option.placeholder ?? "Enter a number"}
+                placeholder={setting.placeholder ?? "Enter a number"}
                 value={state}
                 onChange={handleChange}
-                disabled={option.disabled?.call(definedSettings) ?? false}
-                {...option.componentProps}
+                disabled={isSettingDisabled(definedSettings, setting)}
+                {...setting.componentProps}
             />
         </SettingsSection>
     );
diff --git a/src/components/settings/tabs/plugins/components/SelectSetting.tsx b/src/components/settings/tabs/plugins/components/SelectSetting.tsx
index 4c912c515..89f652e7a 100644
--- a/src/components/settings/tabs/plugins/components/SelectSetting.tsx
+++ b/src/components/settings/tabs/plugins/components/SelectSetting.tsx
@@ -16,19 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PluginOptionSelect } from "@utils/types";
+import { isSettingDisabled } from "@api/PluginManager";
+import { PluginSettingSelectDef } from "@utils/types";
 import { React, Select, useState } from "@webpack/common";
 
 import { resolveError, SettingProps, SettingsSection } from "./Common";
 
-export function SelectSetting({ option, pluginSettings, definedSettings, onChange, id }: SettingProps<PluginOptionSelect>) {
-    const def = pluginSettings[id] ?? option.options?.find(o => o.default)?.value;
+export function SelectSetting({ setting, pluginSettings, definedSettings, onChange, id }: SettingProps<PluginSettingSelectDef>) {
+    const def = pluginSettings[id] ?? setting.options?.find(o => o.default)?.value;
 
     const [state, setState] = useState<any>(def ?? null);
     const [error, setError] = useState<string | null>(null);
 
     function handleChange(newValue: any) {
-        const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
+        const isValid = setting.isValid?.call(definedSettings, newValue) ?? true;
 
         setState(newValue);
         setError(resolveError(isValid));
@@ -39,17 +40,17 @@ export function SelectSetting({ option, pluginSettings, definedSettings, onChang
     }
 
     return (
-        <SettingsSection name={id} description={option.description} error={error}>
+        <SettingsSection name={id} description={setting.description} error={error}>
             <Select
-                placeholder={option.placeholder ?? "Select an option"}
-                options={option.options}
+                placeholder={setting.placeholder ?? "Select an option"}
+                options={setting.options}
                 maxVisibleItems={5}
                 closeOnSelect={true}
                 select={handleChange}
                 isSelected={v => v === state}
                 serialize={v => String(v)}
-                isDisabled={option.disabled?.call(definedSettings) ?? false}
-                {...option.componentProps}
+                isDisabled={isSettingDisabled(definedSettings, setting)}
+                {...setting.componentProps}
             />
         </SettingsSection>
     );
diff --git a/src/components/settings/tabs/plugins/components/SliderSetting.tsx b/src/components/settings/tabs/plugins/components/SliderSetting.tsx
index 847cb7b53..1f0a61cd4 100644
--- a/src/components/settings/tabs/plugins/components/SliderSetting.tsx
+++ b/src/components/settings/tabs/plugins/components/SliderSetting.tsx
@@ -16,18 +16,19 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PluginOptionSlider } from "@utils/types";
+import { isSettingDisabled } from "@api/PluginManager";
+import { PluginSettingSliderDef } from "@utils/types";
 import { React, Slider, useState } from "@webpack/common";
 
 import { resolveError, SettingProps, SettingsSection } from "./Common";
 
-export function SliderSetting({ option, pluginSettings, definedSettings, id, onChange }: SettingProps<PluginOptionSlider>) {
-    const def = pluginSettings[id] ?? option.default;
+export function SliderSetting({ setting, pluginSettings, definedSettings, id, onChange }: SettingProps<PluginSettingSliderDef>) {
+    const def = pluginSettings[id] ?? setting.default;
 
     const [error, setError] = useState<string | null>(null);
 
     function handleChange(newValue: number): void {
-        const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
+        const isValid = setting.isValid?.call(definedSettings, newValue) ?? true;
 
         setError(resolveError(isValid));
 
@@ -37,17 +38,17 @@ export function SliderSetting({ option, pluginSettings, definedSettings, id, onC
     }
 
     return (
-        <SettingsSection name={id} description={option.description} error={error}>
+        <SettingsSection name={id} description={setting.description} error={error}>
             <Slider
-                markers={option.markers}
-                minValue={option.markers[0]}
-                maxValue={option.markers[option.markers.length - 1]}
+                markers={setting.markers}
+                minValue={setting.markers[0]}
+                maxValue={setting.markers[setting.markers.length - 1]}
                 initialValue={def}
                 onValueChange={handleChange}
                 onValueRender={(v: number) => String(v.toFixed(2))}
-                stickToMarkers={option.stickToMarkers ?? true}
-                disabled={option.disabled?.call(definedSettings) ?? false}
-                {...option.componentProps}
+                stickToMarkers={setting.stickToMarkers ?? true}
+                disabled={isSettingDisabled(definedSettings, setting)}
+                {...setting.componentProps}
             />
         </SettingsSection>
     );
diff --git a/src/components/settings/tabs/plugins/components/TextSetting.tsx b/src/components/settings/tabs/plugins/components/TextSetting.tsx
index ad60a1111..cd61a3b8e 100644
--- a/src/components/settings/tabs/plugins/components/TextSetting.tsx
+++ b/src/components/settings/tabs/plugins/components/TextSetting.tsx
@@ -16,17 +16,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PluginOptionString } from "@utils/types";
+import { isSettingDisabled } from "@api/PluginManager";
+import { PluginSettingStringDef } from "@utils/types";
 import { React, TextArea, TextInput, useState } from "@webpack/common";
 
 import { resolveError, SettingProps, SettingsSection } from "./Common";
 
-export function TextSetting({ option, pluginSettings, definedSettings, id, onChange }: SettingProps<PluginOptionString>) {
-    const [state, setState] = useState(pluginSettings[id] ?? option.default ?? null);
+export function TextSetting({ setting, pluginSettings, definedSettings, id, onChange }: SettingProps<PluginSettingStringDef>) {
+    const [state, setState] = useState(pluginSettings[id] ?? setting.default ?? null);
     const [error, setError] = useState<string | null>(null);
 
     function handleChange(newValue: string) {
-        const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
+        const isValid = setting.isValid?.call(definedSettings, newValue) ?? true;
 
         setState(newValue);
         setError(resolveError(isValid));
@@ -37,22 +38,22 @@ export function TextSetting({ option, pluginSettings, definedSettings, id, onCha
     }
 
     return (
-        <SettingsSection name={id} description={option.description} error={error}>
-            {option.multiline
+        <SettingsSection name={id} description={setting.description} error={error}>
+            {setting.multiline
                 ? <TextArea
-                    placeholder={option.placeholder ?? "Enter a value"}
+                    placeholder={setting.placeholder ?? "Enter a value"}
                     value={state}
                     onChange={handleChange}
-                    disabled={option.disabled?.call(definedSettings) ?? false}
-                    {...option.componentProps} />
+                    disabled={isSettingDisabled(definedSettings, setting)}
+                    {...setting.componentProps} />
                 : <TextInput
                     type="text"
-                    placeholder={option.placeholder ?? "Enter a value"}
+                    placeholder={setting.placeholder ?? "Enter a value"}
                     value={state}
                     onChange={handleChange}
                     maxLength={null}
-                    disabled={option.disabled?.call(definedSettings) ?? false}
-                    {...option.componentProps}
+                    disabled={isSettingDisabled(definedSettings, setting)}
+                    {...setting.componentProps}
                 />
             }
         </SettingsSection>
diff --git a/src/components/settings/tabs/plugins/index.tsx b/src/components/settings/tabs/plugins/index.tsx
index 66a35a346..8417fc726 100644
--- a/src/components/settings/tabs/plugins/index.tsx
+++ b/src/components/settings/tabs/plugins/index.tsx
@@ -36,7 +36,8 @@ import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { useAwaiter, useIntersection } from "@utils/react";
-import { Alerts, lodash, Parser, React, Select, TextInput, Toasts, Tooltip, useCallback, useMemo, useState } from "@webpack/common";
+import { PluginTag, PluginTags } from "@utils/types";
+import { Alerts, lodash, Parser, React, SearchableSelect, Select, TextInput, Toasts, Tooltip, useCallback, useMemo, useRef, useState } from "@webpack/common";
 import { JSX } from "react";
 
 import Plugins, { ExcludedPlugins, PluginMeta } from "~plugins";
@@ -143,7 +144,8 @@ function ExcludedPluginsList({ search }: { search: string; }) {
 
 export default function PluginSettings() {
     const settings = useSettings();
-    const changes = React.useMemo(() => new ChangeList<string>(), []);
+    const changeRef = useRef<ChangeList<string>>(null);
+    const changes = changeRef.current ??= new ChangeList<string>();
 
     React.useEffect(() => {
         return () => {
@@ -194,33 +196,20 @@ export default function PluginSettings() {
 
     const hasUserPlugins = useMemo(() => !IS_STANDALONE && Object.values(PluginMeta).some(m => m.userPlugin), []);
 
-    const [searchValue, setSearchValue] = useState({ value: "", status: SearchStatus.ALL });
-    const [searchInput, setSearchInput] = useState("");
-
-    const debouncedSetSearch = useMemo(
-        () => debounce((query: string) => setSearchValue(prev => ({ ...prev, value: query })), 150),
-        []
-    );
+    const [searchValue, setSearchValue] = useState({ value: "", tags: [] as PluginTag[], status: SearchStatus.ALL });
 
     const search = searchValue.value.toLowerCase();
-    const onSearch = useCallback((query: string) => {
-        setSearchInput(query);
-        debouncedSetSearch(query);
-    }, [debouncedSetSearch]);
-    const onStatusChange = useCallback((status: SearchStatus) => {
-        setSearchValue(prev => ({ ...prev, status }));
-    }, []);
+    const onSearch = (query: string) => setSearchValue(prev => ({ ...prev, value: query }));
 
     const pluginFilter = useCallback((plugin: typeof Plugins[keyof typeof Plugins], newPluginsSet: Set<string> | null) => {
-        const { status } = searchValue;
-        const enabled = isPluginEnabled(plugin.name);
+        const { status, tags } = searchValue;
 
         switch (status) {
             case SearchStatus.DISABLED:
-                if (enabled) return false;
+                if (isPluginEnabled(plugin.name)) return false;
                 break;
             case SearchStatus.ENABLED:
-                if (!enabled) return false;
+                if (!isPluginEnabled(plugin.name)) return false;
                 break;
             case SearchStatus.EQUICORD:
                 if (!PluginMeta[plugin.name].folderName.startsWith("src/equicordplugins/")) return false;
@@ -239,12 +228,15 @@ export default function PluginSettings() {
                 break;
         }
 
+        if (tags.length && tags.some(t => !plugin.tags?.includes(t))) return false;
+
         if (!search.length) return true;
 
         return (
             plugin.name.toLowerCase().includes(search.replace(/\s+/g, "")) ||
+            plugin.name.match(/[A-Z]/g)?.join("").toLowerCase().includes(search) || // acronyms like BF for BetterFolders
             plugin.description.toLowerCase().includes(search) ||
-            plugin.tags?.some(t => t.toLowerCase().includes(search))
+            plugin.searchTerms?.some(t => t.toLowerCase().includes(search))
         );
     }, [searchValue, search]);
 
@@ -406,31 +398,45 @@ export default function PluginSettings() {
                 Filters
             </HeadingTertiary>
 
-            <div className={classes(Margins.bottom20, cl("filter-controls"))}>
-                <ErrorBoundary noop>
-                    <TextInput autoFocus value={searchInput} placeholder="Search for a plugin..." onChange={onSearch} />
-                </ErrorBoundary>
-                <div>
-                    <ErrorBoundary noop>
-                        <Select
-                            options={[
-                                { label: "Show All", value: SearchStatus.ALL, default: true },
-                                { label: "Show Enabled", value: SearchStatus.ENABLED },
-                                { label: "Show Disabled", value: SearchStatus.DISABLED },
-                                { label: "Show Equicord", value: SearchStatus.EQUICORD },
-                                { label: "Show Vencord", value: SearchStatus.VENCORD },
-                                { label: "Show New", value: SearchStatus.NEW },
-                                hasUserPlugins && { label: "Show UserPlugins", value: SearchStatus.USER_PLUGINS },
-                                { label: "Show API Plugins", value: SearchStatus.API_PLUGINS },
-                            ].filter(isTruthy)}
-                            serialize={String}
-                            select={onStatusChange}
-                            isSelected={v => v === searchValue.status}
-                            closeOnSelect={true}
-                        />
-                    </ErrorBoundary>
+            <ErrorBoundary noop>
+                <TextInput
+                    inputClassName={cl("filter-control")}
+                    placeholder="Search for a plugin..."
+                    value={searchValue.value}
+                    onChange={onSearch}
+                    autoFocus
+                />
+            </ErrorBoundary>
+
+            <ErrorBoundary noop>
+                <div className={classes(Margins.bottom20, Margins.top8, cl("filter-controls"))}>
+                    <Select
+                        options={[
+                            { label: "Show All", value: SearchStatus.ALL, default: true },
+                            { label: "Show Enabled", value: SearchStatus.ENABLED },
+                            { label: "Show Disabled", value: SearchStatus.DISABLED },
+                            { label: "Show Equicord", value: SearchStatus.EQUICORD },
+                            { label: "Show Vencord", value: SearchStatus.VENCORD },
+                            { label: "Show New", value: SearchStatus.NEW },
+                            hasUserPlugins && { label: "Show UserPlugins", value: SearchStatus.USER_PLUGINS },
+                            { label: "Show API Plugins", value: SearchStatus.API_PLUGINS },
+                        ].filter(isTruthy)}
+                        serialize={String}
+                        select={status => setSearchValue(prev => ({ ...prev, status }))}
+                        isSelected={v => v === searchValue.status}
+                        closeOnSelect={true}
+                        placeholder="Filter by Type"
+                    />
+                    <SearchableSelect
+                        options={PluginTags.map(tag => ({ label: tag, value: tag }))}
+                        value={searchValue.tags}
+                        onChange={tags => setSearchValue(prev => ({ ...prev, tags }))}
+                        closeOnSelect={false}
+                        placeholder="Filter by Tags"
+                        multi
+                    />
                 </div>
-            </div>
+            </ErrorBoundary>
 
             <HeadingTertiary className={Margins.top20}>Plugins</HeadingTertiary>
 
@@ -456,6 +462,7 @@ export default function PluginSettings() {
             <HeadingTertiary className={classes(Margins.top20, Margins.bottom8)}>
                 Required Plugins
             </HeadingTertiary>
+
             <div className={cl("grid")}>
                 {requiredPlugins.length
                     ? requiredPlugins
diff --git a/src/components/settings/tabs/plugins/styles.css b/src/components/settings/tabs/plugins/styles.css
index 27e512395..0f531b126 100644
--- a/src/components/settings/tabs/plugins/styles.css
+++ b/src/components/settings/tabs/plugins/styles.css
@@ -45,7 +45,12 @@
     display: grid;
     height: 40px;
     gap: 10px;
-    grid-template-columns: 1fr 150px;
+    grid-template-columns: 1fr 1fr;
+    align-items: center;
+}
+
+.vc-plugins-filter-control {
+    height: 40px;
 }
 
 .vc-plugins-dep-name {
diff --git a/src/components/settings/tabs/styles.css b/src/components/settings/tabs/styles.css
index f28bc39db..318bb3215 100644
--- a/src/components/settings/tabs/styles.css
+++ b/src/components/settings/tabs/styles.css
@@ -90,10 +90,10 @@
     height: 1.25em;
 }
 
-.vc-settings-modal {
-    padding: 1.5em !important;
+.vc-settings-modal-root {
+    background: var(--background-base-low);
 }
 
-.vc-settings-modal-close {
-    float: right;
+.vc-settings-modal {
+    padding-bottom: 1em;
 }
\ No newline at end of file
diff --git a/src/components/settings/tabs/sync/CloudTab.tsx b/src/components/settings/tabs/sync/CloudTab.tsx
index e848106c8..c66fde69a 100644
--- a/src/components/settings/tabs/sync/CloudTab.tsx
+++ b/src/components/settings/tabs/sync/CloudTab.tsx
@@ -137,7 +137,7 @@ function CloudTab() {
                 <div style={{ flex: 1 }}>
                     <CheckedTextInput
                         key={`backendUrl-${inputKey}`}
-                        value={cloud.url}
+                        initialValue={cloud.url}
                         onChange={async v => {
                             cloud.url = v;
                             cloud.authenticated = false;
diff --git a/src/components/settings/tabs/updater/Components.tsx b/src/components/settings/tabs/updater/Components.tsx
index d6f38bf4f..22f830eb9 100644
--- a/src/components/settings/tabs/updater/Components.tsx
+++ b/src/components/settings/tabs/updater/Components.tsx
@@ -142,7 +142,7 @@ export function Updatable(props: CommonProps) {
             ) : isOutdated ? (
                 <>
                     <Paragraph>
-                        There {updates.length === 1 ? "is 1 update" : `are ${updates.length} updates`} available. Click the button below to download and install.
+                        There {updates.length === 1 ? "is 1 update" : `are ${updates.length} updates`} available. Click the button above to download and install.
                     </Paragraph>
                     <Changes updates={updates} {...props} />
                 </>
diff --git a/src/components/settings/tabs/vencord/index.tsx b/src/components/settings/tabs/vencord/index.tsx
index 37901be6d..45314324b 100644
--- a/src/components/settings/tabs/vencord/index.tsx
+++ b/src/components/settings/tabs/vencord/index.tsx
@@ -20,14 +20,14 @@ import { Paragraph } from "@components/Paragraph";
 import { openContributorModal, openPluginModal, SettingsTab, wrapTab } from "@components/settings";
 import { QuickAction, QuickActionCard } from "@components/settings/QuickAction";
 import { SpecialCard } from "@components/settings/SpecialCard";
+import BadgeAPI from "@plugins/_api/badges";
 import { gitRemote } from "@shared/vencordUserAgent";
 import { DONOR_ROLE_ID, GUILD_ID, IS_MAC, IS_WINDOWS, VC_DONOR_ROLE_ID, VC_GUILD_ID } from "@utils/constants";
 import { classNameFactory } from "@utils/css";
 import { Margins } from "@utils/margins";
 import { identity, isAnyPluginDev } from "@utils/misc";
 import { relaunch } from "@utils/native";
-import { GuildMemberStore, React, Select, UserStore } from "@webpack/common";
-import BadgeAPI from "plugins/_api/badges";
+import { Alerts, GuildMemberStore, React, Select, UserStore } from "@webpack/common";
 
 import { DonateButtonComponent } from "./DonateButton";
 import { openNotificationSettingsModal } from "./NotificationSettings";
@@ -64,45 +64,38 @@ function EquicordSettings() {
         title: string;
         description?: string;
         restartRequired?: boolean;
-        warning: { enabled: boolean; message?: string; };
-    }
-    > = [
+        warning?: string;
+    }>
+        = [
             {
                 key: "useQuickCss",
                 title: "Enable Custom CSS",
                 description: "Load custom CSS from the QuickCSS editor. This allows you to customize Discord's appearance with your own styles.",
-                restartRequired: true,
-                warning: { enabled: false },
             },
             !IS_WEB && {
                 key: "enableReactDevtools",
                 title: "Enable React Developer Tools",
                 description: "Enable the React Developer Tools extension for debugging Discord's React components. Useful for plugin development.",
                 restartRequired: true,
-                warning: { enabled: false },
             },
             (!IS_WEB && !IS_DISCORD_DESKTOP || !IS_WINDOWS) && {
                 key: "mainWindowFrameless",
                 title: "Disable the Main Window Frame",
                 description: "Remove the native window frame for a cleaner look. You can still move the window by dragging the title bar area.",
                 restartRequired: true,
-                warning: { enabled: false },
             },
-            !IS_WEB &&
-            (!IS_DISCORD_DESKTOP || !IS_WINDOWS
+            !IS_WEB && (!IS_DISCORD_DESKTOP || !IS_WINDOWS
                 ? {
                     key: "frameless",
                     title: "Disable All Window Frames",
                     description: "Remove the native window frame for a cleaner look. You can still move the window by dragging the title bar area.",
                     restartRequired: true,
-                    warning: { enabled: false },
                 }
                 : {
                     key: "winNativeTitleBar",
                     title: "Use Windows' native title bar instead of Discord's custom one",
                     description: "Replace Discord's custom title bar with the standard Windows title bar. This may improve compatibility with some window management tools.",
                     restartRequired: true,
-                    warning: { enabled: false },
                 }
             ),
             !IS_WEB && {
@@ -110,27 +103,21 @@ function EquicordSettings() {
                 title: "Enable Window Transparency",
                 description: "Make the Discord window transparent. A theme that supports transparency is required or this will do nothing.",
                 restartRequired: true,
-                warning: {
-                    enabled: true,
-                    message: IS_WINDOWS
-                        ? "This will stop the window from being resizable and prevents you from snapping the window to screen edges."
-                        : "This will stop the window from being resizable.",
-                },
+                warning: IS_WINDOWS
+                    ? "This will stop the window from being resizable and prevents you from snapping the window to screen edges."
+                    : "This will stop the window from being resizable.",
             },
             IS_DISCORD_DESKTOP && {
                 key: "disableMinSize",
                 title: "Disable Minimum Window Size",
                 description: "Allow the Discord window to be resized smaller than its default minimum size. Useful for tiling window managers or small screens.",
                 restartRequired: true,
-                warning: { enabled: false },
             },
-            !IS_WEB &&
-            IS_WINDOWS && {
+            !IS_WEB && IS_WINDOWS && {
                 key: "winCtrlQ",
                 title: "Register Ctrl+Q as shortcut to close Discord",
                 description: "Add Ctrl+Q as a keyboard shortcut to close Discord. This provides an alternative to Alt+F4 for quickly closing the application.",
                 restartRequired: true,
-                warning: { enabled: false },
             },
         ];
 
@@ -249,14 +236,26 @@ function EquicordSettings() {
                     <FormSwitch
                         key={s.key}
                         value={settings[s.key]}
-                        onChange={v => (settings[s.key] = v)}
+                        onChange={v => {
+                            settings[s.key] = v;
+
+                            if (s.restartRequired) {
+                                Alerts.show({
+                                    title: "Restart Required",
+                                    body: "A restart is required to apply this change",
+                                    confirmText: "Restart now",
+                                    cancelText: "Later!",
+                                    onConfirm: relaunch
+                                });
+                            }
+                        }}
                         title={s.title}
                         description={
-                            s.warning.enabled ? (
+                            s.warning ? (
                                 <>
                                     {s.description}
                                     <Notice.Warning className={Margins.top8} style={{ width: "100%" }}>
-                                        {s.warning.message}
+                                        {s.warning}
                                     </Notice.Warning>
                                 </>
                             ) : (
diff --git a/src/debug/loadLazyChunks.ts b/src/debug/loadLazyChunks.ts
index 44e483faf..72ded48bb 100644
--- a/src/debug/loadLazyChunks.ts
+++ b/src/debug/loadLazyChunks.ts
@@ -9,16 +9,16 @@ import { canonicalizeMatch } from "@utils/patches";
 import { ModuleFactory } from "@vencord/discord-types/webpack";
 import * as Webpack from "@webpack";
 import { wreq } from "@webpack";
+import { AnyModuleFactory } from "@webpack/types";
 import pLimit from "p-limit";
-import { AnyModuleFactory } from "webpack";
 
 function getWebpackChunkMap() {
     const sym = Symbol();
-    let v: Record<PropertyKey, string> | null = null;
+    let chunksMap: unknown;
 
     Object.defineProperty(Object.prototype, sym, {
         get() {
-            v = this;
+            chunksMap = this;
             return "";
         },
         configurable: true
@@ -27,7 +27,7 @@ function getWebpackChunkMap() {
     wreq.u(sym);
     delete Object.prototype[sym];
 
-    return v;
+    return chunksMap as Record<PropertyKey, string> | null;
 }
 
 export async function loadLazyChunks() {
@@ -54,7 +54,10 @@ export async function loadLazyChunks() {
 
         async function searchAndLoadLazyChunks(factoryCode: string) {
             // Workaround to avoid loading the CSS debugging chunk which turns the app pink
-            const hasCssDebuggingLoad = foundCssDebuggingLoad ? false : (foundCssDebuggingLoad = factoryCode.includes(".cssDebuggingEnabled&&"));
+            // const hasCssDebuggingLoad = foundCssDebuggingLoad ? false : (foundCssDebuggingLoad = factoryCode.includes(".cssDebuggingEnabled&&"));
+
+            // Disabled for now since this causes lots of chunks concatenated into the same module get marked as invalid, and thus not loaded.
+            const hasCssDebuggingLoad = foundCssDebuggingLoad = false;
 
             const lazyChunks = factoryCode.matchAll(hasCssDebuggingLoad ? CompleteLazyChunkRegex : PartialLazyChunkRegex);
             const validChunkGroups = new Set<[chunkIds: PropertyKey[], entryPoint: PropertyKey]>();
@@ -66,7 +69,7 @@ export async function loadLazyChunks() {
                     ?.matchAll(Webpack.ChunkIdsRegex)
                     .map(m => {
                         const numChunkId = Number(m[1]);
-                        return Number.isNaN(numChunkId) ? m[1] : numChunkId;
+                        return Number.isNaN(numChunkId) ? m[1] : String(numChunkId);
                     })
                     .toArray()
                     ?? [];
@@ -107,7 +110,7 @@ export async function loadLazyChunks() {
 
                 if (!invalidChunkGroup) {
                     const numEntryPoint = Number(entryPoint);
-                    validChunkGroups.add([chunkIds, Number.isNaN(numEntryPoint) ? entryPoint : numEntryPoint]);
+                    validChunkGroups.add([chunkIds, Number.isNaN(numEntryPoint) ? entryPoint : String(numEntryPoint)]);
                 }
             }));
 
@@ -178,10 +181,10 @@ export async function loadLazyChunks() {
         }
 
         // All chunks Discord has mapped to asset files, even if they are not used anymore
-        const chunkMap = getWebpackChunkMap();
-        if (!chunkMap) throw new Error("Failed to get chunk map");
+        const chunksMap = getWebpackChunkMap();
+        if (!chunksMap) throw new Error("Failed to get chunk map");
 
-        const allChunks = Object.keys(chunkMap).map(id => Number.isNaN(Number(id)) ? id : Number(id));
+        const allChunks = Object.keys(chunksMap);
         if (allChunks.length === 0) throw new Error("Failed to get all chunks");
 
         // Chunks which our regex could not catch to load
diff --git a/src/debug/reporterData.ts b/src/debug/reporterData.ts
index 0fd261c0f..e713521e5 100644
--- a/src/debug/reporterData.ts
+++ b/src/debug/reporterData.ts
@@ -26,6 +26,7 @@ export interface ReporterData {
     };
     failedWebpack: Record<TypeWebpackSearchHistory, string[][]>;
 }
+
 export const reporterData: ReporterData = {
     failedPatches: {
         foundNoModule: [],
diff --git a/src/debug/runReporter.ts b/src/debug/runReporter.ts
index 339edbbee..484eb67b4 100644
--- a/src/debug/runReporter.ts
+++ b/src/debug/runReporter.ts
@@ -25,8 +25,8 @@ async function runReporter() {
         addPatch({
             find: '"Could not find app-mount"',
             replacement: {
-                match: /(?<="use strict";)/,
-                replace: "Vencord.Webpack._initReporter();"
+                match: /"Could not find app-mount"/,
+                replace: "(Vencord.Webpack._initReporter(),$&)"
             }
         }, "Equicord Reporter");
 
@@ -39,6 +39,13 @@ async function runReporter() {
 
         await loadLazyChunksDone;
 
+        // Manually require all modules to make sure all lazily required modules are patched
+        for (const moduleId of Object.keys(Webpack.wreq.m)) {
+            try {
+                Webpack.wreq(moduleId);
+            } catch { }
+        }
+
         if (IS_REPORTER && IS_WEB && !IS_VESKTOP && !IS_EQUIBOP) {
             console.log("[REPORTER_META]", {
                 buildNumber: getBuildNumber(),
@@ -55,7 +62,7 @@ async function runReporter() {
         }
 
         for (const [plugin, moduleId, match, totalTime] of patchTimings) {
-            if (totalTime > 5) {
+            if (totalTime > 10) {
                 new Logger("WebpackPatcher").warn(`Patch by ${plugin} took ${Math.round(totalTime * 100) / 100}ms (Module id is ${String(moduleId)}): ${match}`);
             }
         }
@@ -70,7 +77,6 @@ async function runReporter() {
                 else method = "find";
             }
             if (searchType === "waitForStore") method = "findStore";
-            if (searchType === "waitForStore" && args[0] === "PermissionStore") continue;
 
             let result: any;
             try {
diff --git a/src/equicordplugins/_api/profileCollections.ts b/src/equicordplugins/_api/profileCollections.ts
index 388a76ad8..bbc51a840 100644
--- a/src/equicordplugins/_api/profileCollections.ts
+++ b/src/equicordplugins/_api/profileCollections.ts
@@ -13,7 +13,7 @@ export default definePlugin({
     authors: [Devs.thororen],
     patches: [
         {
-            find: /\.POPOUT,onClose:\i}\),nicknameIcons:.+?\.isProvisional/,
+            find: "#{intl::USER_PROFILE_FRIEND_REQUEST_TOAST}",
             replacement: {
                 match: /user:\i,widgets:.{0,100}?\}\),/,
                 replace: "$&Vencord.Api.ProfileCollections.renderProfileCollections(arguments[0]),",
diff --git a/src/equicordplugins/_api/profileSections.ts b/src/equicordplugins/_api/profileSections.ts
new file mode 100644
index 000000000..1d7520c79
--- /dev/null
+++ b/src/equicordplugins/_api/profileSections.ts
@@ -0,0 +1,40 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "ProfileSectionsAPI",
+    description: "API to add sections near the 'Member Since' area of user profile panels.",
+    authors: [Devs.thororen],
+    patches: [
+        // DM User Sidebar
+        {
+            find: "#{intl::PREMIUM_GIFTING_BUTTON}),action:",
+            replacement: {
+                match: /(#{intl::USER_PROFILE_MEMBER_SINCE}\),.{0,100}userId:(\i\.id)}\)}\))/,
+                replace: "$1,Vencord.Api.ProfileSections.renderProfileSections({userId:$2,isSideBar:true})",
+            }
+        },
+        // User Profile Modal
+        {
+            find: ",applicationRoleConnection:",
+            replacement: {
+                match: /(#{intl::USER_PROFILE_MEMBER_SINCE}\),.{0,100}userId:(\i\.id),.{0,100}}\)}\)),/,
+                replace: "$1,Vencord.Api.ProfileSections.renderProfileSections({userId:$2,isSideBar:false}),",
+            }
+        },
+        // User Profile Modal v2
+        {
+            find: ".MODAL_V2,onClose:",
+            replacement: {
+                match: /(#{intl::USER_PROFILE_MEMBER_SINCE}\),.{0,100}userId:(\i\.id),.{0,100}}\)}\)),/,
+                replace: "$1,Vencord.Api.ProfileSections.renderProfileSections({userId:$2,isSideBar:false}),",
+            }
+        }
+    ]
+});
diff --git a/src/equicordplugins/_api/userArea.ts b/src/equicordplugins/_api/userArea.ts
index 112ac9bce..6fbefa328 100644
--- a/src/equicordplugins/_api/userArea.ts
+++ b/src/equicordplugins/_api/userArea.ts
@@ -22,8 +22,8 @@ export default definePlugin({
             find: ".DISPLAY_NAME_STYLES_COACHMARK)",
             replacement: [
                 {
-                    match: /(?<=className:(\i)\.\i,style:\i,)children:\[/,
-                    replace: "children:[...$self.renderButtons(arguments[0],$1),"
+                    match: /children:\[(?=.{0,50}accountContainerRef:\i)/,
+                    replace: "children:[...$self.renderButtons(arguments[0]),"
                 },
                 // fix discord weird shrink with extra buttons
                 {
diff --git a/src/equicordplugins/_core/concatenatedModules.tsx b/src/equicordplugins/_core/concatenatedModules.tsx
new file mode 100644
index 000000000..0cde5f7be
--- /dev/null
+++ b/src/equicordplugins/_core/concatenatedModules.tsx
@@ -0,0 +1,32 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { IconsDef } from "@equicordplugins/iconViewer/types";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export let iconsModule: IconsDef;
+
+export default definePlugin({
+    name: "ConcatenatedModules",
+    description: "Extract modules that have been concatenated by the bundler",
+    authors: [Devs.thororen],
+
+    required: true,
+
+    patches: [
+        {
+            find: "AngleBracketsIcon",
+            replacement: {
+                match: /\i\.\i\((\i)\),\i\.\i\(\i,\{AIcon/,
+                replace: "$self.iconsModule($1),$&"
+            }
+        }
+    ],
+    iconsModule(value: IconsDef) {
+        iconsModule = value;
+    },
+});
diff --git a/src/equicordplugins/altKrispSwitch/index.tsx b/src/equicordplugins/altKrispSwitch/index.tsx
index a55216aa3..8f05a8e43 100644
--- a/src/equicordplugins/altKrispSwitch/index.tsx
+++ b/src/equicordplugins/altKrispSwitch/index.tsx
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "AltKrispSwitch",
     description: "Makes the Noise Suppression Popout switch between None and Krisp instead of Krisp and Standard",
+    tags: ["Customisation", "Voice"],
     authors: [Devs.newwares],
     patches: [
         {
diff --git a/src/equicordplugins/alwaysExpandProfiles/index.ts b/src/equicordplugins/alwaysExpandProfiles/index.ts
index c78baea4f..acbfca3fb 100644
--- a/src/equicordplugins/alwaysExpandProfiles/index.ts
+++ b/src/equicordplugins/alwaysExpandProfiles/index.ts
@@ -5,24 +5,21 @@
  */
 
 import { Devs } from "@utils/constants";
-import { openUserProfile } from "@utils/discord";
 import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "AlwaysExpandProfiles",
     description: "Always expands profile popouts to the full modal",
+    tags: ["Appearance", "Utility"],
     authors: [Devs.thororen],
     patches: [
         {
             find: '"view-profile"',
             replacement: {
-                match: /("PRESS_VIEW_PROFILE".{0,200})return(?<=userId:(\i\.id).*?)/,
-                replace: "$1return $self.openUserModal($2);"
+                match: /(\i)=.{0,45}\(0,\i\.openUserProfileModal.{0,300}(?=return)/,
+                replace: "$&return $1();"
             },
             all: true
         },
     ],
-    openUserModal(userId: string) {
-        openUserProfile(userId);
-    }
 });
diff --git a/src/equicordplugins/animalese/index.ts b/src/equicordplugins/animalese/index.ts
index 1f8ccb568..a63bc44dc 100644
--- a/src/equicordplugins/animalese/index.ts
+++ b/src/equicordplugins/animalese/index.ts
@@ -193,6 +193,7 @@ async function playSound(buffer: AudioBuffer, volume: number) {
 export default definePlugin({
     name: "Animalese",
     description: "Plays animal crossing animalese for every message sent (they yap a lot)",
+    tags: ["Customisation", "Fun"],
     authors: [EquicordDevs.ryanamay, EquicordDevs.Mocha],
     settings,
 
diff --git a/src/equicordplugins/atSomeone/index.ts b/src/equicordplugins/atSomeone/index.ts
index 40902e6c4..15a094059 100644
--- a/src/equicordplugins/atSomeone/index.ts
+++ b/src/equicordplugins/atSomeone/index.ts
@@ -13,6 +13,7 @@ export default definePlugin({
     name: "AtSomeone",
     authors: [Devs.Joona],
     description: "Mention someone randomly",
+    tags: ["Chat", "Fun"],
     patches: [
         {
             find: ".LAUNCHABLE_APPLICATIONS;",
diff --git a/src/equicordplugins/autoZipper/index.ts b/src/equicordplugins/autoZipper/index.ts
index ab0f2335f..a2b0a1d24 100644
--- a/src/equicordplugins/autoZipper/index.ts
+++ b/src/equicordplugins/autoZipper/index.ts
@@ -209,6 +209,7 @@ function handlePaste(event: ClipboardEvent) {
 export default definePlugin({
     name: "AutoZipper",
     description: "Automatically zips specified file types and folders before uploading to Discord",
+    tags: ["Chat", "Organisation"],
     authors: [EquicordDevs.SSnowly],
     settings,
 
diff --git a/src/equicordplugins/bannersEverywhere/index.tsx b/src/equicordplugins/bannersEverywhere/index.tsx
index 5959a4022..6aea3cfe6 100644
--- a/src/equicordplugins/bannersEverywhere/index.tsx
+++ b/src/equicordplugins/bannersEverywhere/index.tsx
@@ -44,6 +44,7 @@ const DATASTORE_KEY = "bannersEverywhere";
 export default definePlugin({
     name: "BannersEverywhere",
     description: "Displays banners in the member list ",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.ImLvna, Devs.AutumnVN],
     settings,
     patches: [
diff --git a/src/equicordplugins/baseDecoder/index.tsx b/src/equicordplugins/baseDecoder/index.tsx
index 35ba3d701..9ecb51a9e 100644
--- a/src/equicordplugins/baseDecoder/index.tsx
+++ b/src/equicordplugins/baseDecoder/index.tsx
@@ -107,6 +107,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "DecodeBase64",
     description: "Decode base64 content of any message and copy the decoded content.",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Appearance", "Customisation", "Chat"],
     authors: [EquicordDevs.ThePirateStoner],
     settings,
     messagePopoverButton: {
diff --git a/src/equicordplugins/betterActivities/components/CarouselControls.tsx b/src/equicordplugins/betterActivities/components/CarouselControls.tsx
index b4188d83e..18e614525 100644
--- a/src/equicordplugins/betterActivities/components/CarouselControls.tsx
+++ b/src/equicordplugins/betterActivities/components/CarouselControls.tsx
@@ -11,7 +11,7 @@ import { cl } from "../utils";
 import { Caret } from "./Caret";
 
 export function CarouselControls({ activities, currentActivity, onActivityChange }: CarouselControlsProps) {
-    const currentIndex = activities.indexOf(currentActivity);
+    const currentIndex = activities.findIndex(a => a.id === currentActivity.id);
 
     return (
         <div
@@ -48,7 +48,7 @@ export function CarouselControls({ activities, currentActivity, onActivityChange
                     <div
                         key={"dot--" + index}
                         onClick={() => onActivityChange(activity)}
-                        className={cl("controls-dot", currentActivity === activity && "controls-selected")} />
+                        className={cl("controls-dot", currentActivity.id === activity.id && "controls-selected")} />
                 ))}
             </div>
 
diff --git a/src/equicordplugins/betterActivities/index.tsx b/src/equicordplugins/betterActivities/index.tsx
index bea8c1136..384e1261d 100644
--- a/src/equicordplugins/betterActivities/index.tsx
+++ b/src/equicordplugins/betterActivities/index.tsx
@@ -20,7 +20,7 @@ export default definePlugin({
     name: "BetterActivities",
     description: "Shows activity icons in the member list and allows showing all activities",
     authors: [Devs.D3SOX, Devs.Arjix, Devs.AutumnVN, Devs.thororen],
-    tags: ["activity"],
+    tags: ["Activity"],
     settings,
     patchActivityList,
     showAllActivitiesComponent,
@@ -30,7 +30,12 @@ export default definePlugin({
             find: '"ActivityStatus"),',
             replacement: [
                 {
-                    match: /(?<=className:\i,children:\[).*?(?=\i\(\),\i&&)/g,
+                    match: /(?<=className:\i,children:\[).*?(?=\i\(\),\i&&)/,
+                    replace: "",
+                    predicate: () => settings.store.removeGameActivityStatus,
+                },
+                {
+                    match: /(?<=className:\i,children:\[\i\(\),)null.*?tooltipClassName:\i\}\),/,
                     replace: "",
                     predicate: () => settings.store.removeGameActivityStatus,
                 },
@@ -45,7 +50,7 @@ export default definePlugin({
             // Show all activities in the user popout/sidebar
             find: /onOpenUserProfileModal:\i,onClose:\i\}\),null/,
             replacement: {
-                match: /((\i)=.{0,10}(\i)\.id\).*?,onInteraction:\i\}\),).{0,250}onClose:\i\}\)/,
+                match: /((\i)=.{0,10}(\i)\.id\).*?,onOpenUserProfileModal:\i\}\),).{0,250}onClose:\i\}\)/,
                 replace: "$1$self.showAllActivitiesComponent({ activity: $2, user: $3 })"
             },
             predicate: () => settings.store.userPopout
diff --git a/src/equicordplugins/betterActivities/patch-helpers/activityList.tsx b/src/equicordplugins/betterActivities/patch-helpers/activityList.tsx
index aad18d8d8..bb63e80d3 100644
--- a/src/equicordplugins/betterActivities/patch-helpers/activityList.tsx
+++ b/src/equicordplugins/betterActivities/patch-helpers/activityList.tsx
@@ -5,6 +5,7 @@
  */
 
 import ErrorBoundary from "@components/ErrorBoundary";
+import { Activity } from "@vencord/discord-types";
 import { findComponentByCodeLazy } from "@webpack";
 import { React, Tooltip } from "@webpack/common";
 import { JSX } from "react";
@@ -18,11 +19,12 @@ import { cl, getApplicationIcons } from "../utils";
 // Discord no longer shows an icon here by default but we use the one from the popout now here
 const DefaultActivityIcon = findComponentByCodeLazy("M5 2a3 3 0 0 0-3 3v14a3 3 0 0 0 3 3h14a3 3 0 0 0 3-3V5a3 3 0 0 0-3-3H5Zm6.81 7c-.54 0-1 .26-1.23.61A1 1 0 0 1 8.92 8.5 3.49 3.49 0 0 1 11.82 7c1.81 0 3.43 1.38 3.43 3.25 0 1.45-.98 2.61-2.27 3.06a1 1 0 0 1-1.96.37l-.19-1a1 1 0 0 1 .98-1.18c.87 0 1.44-.63 1.44-1.25S12.68 9 11.81 9ZM13 16a1 1 0 1 1-2 0 1 1 0 0 1 2 0Zm7-10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0ZM18.5 20a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM7 18.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0ZM5.5 7a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z");
 
-export function patchActivityList({ activities, user, hideTooltip }: ActivityListProps): JSX.Element | null {
+export function patchActivityList({ activities: rawActivities, user, hideTooltip }: ActivityListProps): JSX.Element | null {
     const icons: ActivityListIcon[] = [];
 
     if (user.bot || settings.store.hideTooltip && hideTooltip) return null;
 
+    const activities = rawActivities.filter((a): a is Activity => a != null);
     const applicationIcons = getApplicationIcons(activities);
     if (applicationIcons.length) {
         const compareImageSource = (a: ApplicationIcon, b: ApplicationIcon) => {
diff --git a/src/equicordplugins/betterActivities/patch-helpers/popout.tsx b/src/equicordplugins/betterActivities/patch-helpers/popout.tsx
index 54a2e9bae..dc8c29daf 100644
--- a/src/equicordplugins/betterActivities/patch-helpers/popout.tsx
+++ b/src/equicordplugins/betterActivities/patch-helpers/popout.tsx
@@ -24,7 +24,7 @@ export function showAllActivitiesComponent({ activity, user, ...props }: Readonl
 
     const activities = useStateFromStores(
         [PresenceStore],
-        () => PresenceStore.getActivities(user.id).filter((activity: Activity) => activity.type !== 4)
+        () => PresenceStore.getActivities(user.id).filter((activity: Activity) => activity != null && activity.type !== 4)
     );
 
     useEffect(() => {
@@ -33,8 +33,12 @@ export function showAllActivitiesComponent({ activity, user, ...props }: Readonl
             return;
         }
 
-        if (!currentActivity || !activities.includes(currentActivity))
+        const existing = currentActivity && activities.find(a => a.id === currentActivity.id);
+        if (!existing) {
             setCurrentActivity(activities[0]);
+        } else if (existing !== currentActivity) {
+            setCurrentActivity(existing);
+        }
     }, [activities]);
 
     // we use these for other activities, it would be better to somehow get the corresponding activity props
@@ -47,6 +51,7 @@ export function showAllActivitiesComponent({ activity, user, ...props }: Readonl
     if (!activities.length) return null;
 
     if (settings.store.allActivitiesStyle === "carousel") {
+        if (!currentActivity) return null;
         return (
             <ErrorBoundary noop>
                 <div style={{ display: "flex", flexDirection: "column" }}>
diff --git a/src/equicordplugins/betterActivities/utils.tsx b/src/equicordplugins/betterActivities/utils.tsx
index e01ca488b..61fb0bf58 100644
--- a/src/equicordplugins/betterActivities/utils.tsx
+++ b/src/equicordplugins/betterActivities/utils.tsx
@@ -40,7 +40,7 @@ export function getActivityApplication(activity: Activity | null) {
 
 export function getApplicationIcons(activities: Activity[], preferSmall = false): ApplicationIcon[] {
     const applicationIcons: ApplicationIcon[] = [];
-    const applications = activities.filter(activity => activity.application_id || activity.platform || activity?.id?.startsWith("spotify:"));
+    const applications = activities.filter(activity => activity != null && (activity.application_id || activity.platform || activity.id?.startsWith("spotify:")));
 
     for (const activity of applications) {
         const { assets, application_id, platform, id } = activity;
diff --git a/src/equicordplugins/betterAudioPlayer/index.tsx b/src/equicordplugins/betterAudioPlayer/index.tsx
index 1692b2d85..94c3d9770 100644
--- a/src/equicordplugins/betterAudioPlayer/index.tsx
+++ b/src/equicordplugins/betterAudioPlayer/index.tsx
@@ -274,6 +274,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "BetterAudioPlayer",
     description: "Adds a spectrograph and oscilloscope visualizer to audio attachment players.",
+    tags: ["Appearance", "Media", "Voice"],
     authors: [EquicordDevs.creations],
     settings,
 
diff --git a/src/equicordplugins/betterBanReasons/index.tsx b/src/equicordplugins/betterBanReasons/index.tsx
index 68e849e1c..179ab8004 100644
--- a/src/equicordplugins/betterBanReasons/index.tsx
+++ b/src/equicordplugins/betterBanReasons/index.tsx
@@ -9,48 +9,82 @@ import "./styles.css";
 import { definePluginSettings } from "@api/Settings";
 import { Heading } from "@components/Heading";
 import { DeleteIcon, PlusIcon } from "@components/Icons";
-import { Devs } from "@utils/constants";
+import { Devs, EquicordDevs } from "@utils/constants";
 import { classNameFactory } from "@utils/css";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, TextInput } from "@webpack/common";
+import { Button, Select, TextInput, useState } from "@webpack/common";
 
 const cl = classNameFactory("vc-bbr-");
 
+interface BanReason {
+    text: string;
+    deleteSeconds?: number;
+}
+
+const DELETE_DURATION_OPTIONS = [
+    { label: "Discord default", value: null },
+    { label: "Don't delete any", value: 0 },
+    { label: "Previous hour", value: 3600 },
+    { label: "Previous 6 hours", value: 21600 },
+    { label: "Previous 12 hours", value: 43200 },
+    { label: "Previous 24 hours", value: 86400 },
+    { label: "Previous 3 days", value: 259200 },
+    { label: "Previous 7 days", value: 604800 },
+];
+
+function normalizeReason(r: BanReason | string): BanReason {
+    return typeof r === "string" ? { text: r } : r;
+}
+
+function getStoredReasons(): BanReason[] {
+    return (settings.store.reasons as (BanReason | string)[]).map(normalizeReason);
+}
+
 function ReasonsComponent() {
-    const { reasons } = settings.store;
+    const [reasons, setReasons] = useState<BanReason[]>(getStoredReasons);
+
+    const update = (next: BanReason[]) => {
+        setReasons(next);
+        settings.store.reasons = next;
+    };
 
     return (
         <section>
             <Heading>Reasons</Heading>
             {reasons.map((r, i) => (
-                <div
-                    key={i}
-                    className={cl("reason-wrapper")}
-                >
+                <div key={i} className={cl("reason-wrapper")}>
                     <TextInput
-                        value={r}
-                        onChange={v => {
-                            reasons[i] = v;
-                            settings.store.reasons = reasons;
-                        }}
+                        value={r.text}
+                        onChange={v => update(reasons.map((x, j) => j === i ? { ...x, text: v } : x))}
                         placeholder="Reason"
                     />
                     <Button
                         className={cl("remove-button")}
                         color={Button.Colors.TRANSPARENT}
-                        onClick={() => {
-                            reasons.splice(i, 1);
-                            settings.store.reasons = reasons;
-                        }}
+                        onClick={() => update(reasons.filter((_, j) => j !== i))}
                         look={Button.Looks.FILLED}
                         size={Button.Sizes.MIN}
                     >
                         <DeleteIcon />
                     </Button>
+                    <div className={cl("duration-row")}>
+                        <span className="vc-text-base vc-text-sm vc-text-normal vc-text-defaultColor vc-plugins-setting-description">Message Auto-delete duration</span>
+                        <Select
+                            options={DELETE_DURATION_OPTIONS}
+                            select={v => update(reasons.map((x, j) => j === i ? { ...x, deleteSeconds: v === null ? undefined : v } : x))}
+                            isSelected={v => (v ?? null) === (r.deleteSeconds ?? null)}
+                            serialize={v => v == null ? "default" : String(v)}
+                        />
+                    </div>
                 </div>
             ))}
             <div className={cl("reason-wrapper")}>
-                <Button onClick={() => settings.store.reasons.push("")} className={cl("add-button")} size={Button.Sizes.LARGE} color={Button.Colors.TRANSPARENT}>
+                <Button
+                    onClick={() => update([...reasons, { text: "" }])}
+                    className={cl("add-button")}
+                    size={Button.Sizes.LARGE}
+                    color={Button.Colors.TRANSPARENT}
+                >
                     <PlusIcon /> Add another reason
                 </Button>
             </div>
@@ -62,7 +96,7 @@ const settings = definePluginSettings({
     reasons: {
         description: "Your custom reasons",
         type: OptionType.COMPONENT,
-        default: [] as string[],
+        default: [] as BanReason[],
         component: ReasonsComponent,
     },
     isTextInputDefault: {
@@ -74,30 +108,57 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "BetterBanReasons",
     description: "Create custom reasons to use in the Discord ban modal, and/or show a text input by default instead of the options.",
-    authors: [Devs.Inbestigator],
+    tags: ["Appearance", "Customisation"],
+    authors: [Devs.Inbestigator, EquicordDevs.yonn2222],
+
+    durationSetter: null as ((v: number) => void) | null,
+
     patches: [
         {
             find: "#{intl::BAN_REASON_OPTION_SPAM_ACCOUNT}",
-            replacement: [{
-                match: /(\[\{name:\i\.\i\.\i\(\i\.\i\.\i\),.+?"other"\}\])/,
-                replace: "$self.getReasons($1)"
-            },
-            {
-                match: /useState\(null\)(?=.{0,300}targetUserId:)/,
-                replace: "useState($self.getDefaultState())"
-            }]
+            replacement: [
+                {
+                    match: /(\[\{name:\i\.\i\.\i\(\i\.\i\.\i\),.+?"other"\}\])/,
+                    replace: "$self.getReasons($1)"
+                },
+                {
+                    match: /useState\(null\)(?=.{0,300}targetUserId:)/,
+                    replace: "useState($self.getDefaultState())"
+                },
+                {
+                    match: /(\[\i,\i\])=(\i)\.useState\((null!=\i\?\i:\i)\)/,
+                    replace: "$1=$self.captureDeleteState($2.useState,$3)"
+                },
+                {
+                    match: /\i=\i\.useCallback\((\i)=>\{.{0,10},\i\(null\)(?=\},\[\]\))/,
+                    replace: "$&,$self.onReasonSelect($1)"
+                }
+            ]
         }
     ],
-    getReasons(defaults) {
-        const storedReasons = settings.store.reasons.filter((r: string) => r.trim());
-        const reasons: string[] = storedReasons.length
-            ? storedReasons
-            : [];
+
+    getReasons(defaults: { name: string; value: string; }[]) {
+        const stored = getStoredReasons().filter(r => r.text.trim());
         return [
-            ...reasons.map(s => ({ name: s, value: s })),
-            ...defaults
+            ...stored.map(r => ({ name: r.text, value: r.text })),
+            ...defaults,
         ];
     },
+
     getDefaultState: () => settings.store.isTextInputDefault ? 1 : 0,
+
+    captureDeleteState(hook: (initial: number) => [number, (v: number) => void], initial: number) {
+        const result = hook(initial);
+        this.durationSetter = result[1];
+        return result;
+    },
+
+    onReasonSelect(value: string) {
+        const reason = getStoredReasons().find(r => r.text === value);
+        if (reason?.deleteSeconds !== undefined) {
+            this.durationSetter?.(reason.deleteSeconds);
+        }
+    },
+
     settings,
 });
diff --git a/src/equicordplugins/betterBanReasons/styles.css b/src/equicordplugins/betterBanReasons/styles.css
index 7a0c8e9ed..a335440d4 100644
--- a/src/equicordplugins/betterBanReasons/styles.css
+++ b/src/equicordplugins/betterBanReasons/styles.css
@@ -8,6 +8,13 @@
 
 .vc-bbr-remove-button {
     color: var(--text-muted);
+    align-self: start;
+}
+
+.vc-bbr-duration-row {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
 }
 
 .vc-bbr-remove-button:hover {
diff --git a/src/equicordplugins/betterBlockedUsers/index.tsx b/src/equicordplugins/betterBlockedUsers/index.tsx
index ce936edb0..dc1ecae54 100644
--- a/src/equicordplugins/betterBlockedUsers/index.tsx
+++ b/src/equicordplugins/betterBlockedUsers/index.tsx
@@ -17,21 +17,23 @@ let updateFunc = (v: any) => { };
 export default definePlugin({
     name: "BetterBlockedUsers",
     description: "Allows you to search in blocked users list and makes names selectable in settings.",
+    tags: ["Appearance", "Shortcuts"],
     authors: [EquicordDevs.TheArmagan],
     patches: [
         {
             find: '"],{numberOfBlockedUsers:',
+            group: true,
             replacement: [
                 {
-                    match: /(?<=\}=(\i).*?\]\}\))/,
-                    replace: ",$1.listType==='blocked'?$self.renderSearchInput():null"
+                    match: /(?<=\(0,\i\.jsx\)\(\i,\{listType:(\i),numberOfUsers:\i\.length\}\),)/,
+                    replace: "$1==='blocked'?$self.renderSearchInput():null,"
                 },
                 {
-                    match: /(?<=userId:(\i).*?\}\)\]\}\),)(\(.*?loading:\i\}\))/,
+                    match: /(?<=\{userId:(\i).*?\.globalName.{0,25}\}\)\]\}\),)(\(.*?loading:\i\}\))/,
                     replace: "$self.renderUser($1,$2)",
                 },
                 {
-                    match: /(?<=\}=(\i).{0,10}(\i).useState.{0,5};)/,
+                    match: /(?<=userIds:\i,listType:\i\}=(\i).{0,30}(\i)\.useState\(\d+\);)/,
                     replace: "let [searchResults,setSearchResults]=$2.useState([]);$self.setUpdateFunc($1,setSearchResults);"
                 },
                 {
@@ -49,17 +51,19 @@ export default definePlugin({
             updateFunc(searchResults);
         }, []);
 
-        return <TextInput
-            placeholder="Search users..."
-            style={{ width: "200px" }}
-            onInput={e => {
-                const search = (e.target as HTMLInputElement).value.toLowerCase().trim();
-                setValue(search);
-                lastSearch = search;
-                const searchResults = this.getFilteredUsers(search);
-                updateFunc(searchResults);
-            }} value={value}
-        ></TextInput>;
+        return <div className="vc-bbu-search">
+            <TextInput
+                placeholder="Search users..."
+                style={{ width: "200px" }}
+                onInput={e => {
+                    const search = (e.target as HTMLInputElement).value.toLowerCase().trim();
+                    setValue(search);
+                    lastSearch = search;
+                    const searchResults = this.getFilteredUsers(search);
+                    updateFunc(searchResults);
+                }} value={value}
+            />
+        </div>;
     },
     renderUser(userId: string, rest: any) {
         return (
diff --git a/src/equicordplugins/betterBlockedUsers/styles.css b/src/equicordplugins/betterBlockedUsers/styles.css
index 467e184f8..1f5408738 100644
--- a/src/equicordplugins/betterBlockedUsers/styles.css
+++ b/src/equicordplugins/betterBlockedUsers/styles.css
@@ -1,3 +1,8 @@
 [class*="usersList"] [class*="text"] {
     user-select: text !important;
+}
+
+.vc-bbu-search,
+.vc-bbu-search * {
+    border-radius: 0 !important;
 }
\ No newline at end of file
diff --git a/src/equicordplugins/betterCommands/index.ts b/src/equicordplugins/betterCommands/index.ts
index 6c7df169f..b405fdd52 100644
--- a/src/equicordplugins/betterCommands/index.ts
+++ b/src/equicordplugins/betterCommands/index.ts
@@ -33,6 +33,8 @@ function fetchIndex(target: object) {
 export default definePlugin({
     name: "BetterCommands",
     description: "Enhances the command system with miscellaneous improvements.",
+    dependencies: ["CommandsAPI"],
+    tags: ["Appearance", "Commands", "Shortcuts"],
     authors: [Devs.thororen],
     settings,
     patches: [
diff --git a/src/equicordplugins/betterInvites/index.tsx b/src/equicordplugins/betterInvites/index.tsx
index 76b2facfa..30cb929cd 100644
--- a/src/equicordplugins/betterInvites/index.tsx
+++ b/src/equicordplugins/betterInvites/index.tsx
@@ -34,13 +34,14 @@ function lurk(id: string) {
 export default definePlugin({
     name: "BetterInvites",
     description: "See invites expiration date, view inviter profile and preview servers before joining by clicking the name",
+    tags: ["Appearance", "Customisation", "Chat", "Servers"],
     authors: [EquicordDevs.iamme, Devs.thororen],
     patches: [
         {
             find: "#{intl::xdCLeM::raw}",
             replacement: [
                 {
-                    match: /profile:\i\}\),.{0,15}profile:\i/,
+                    match: /profile:\i\}\),.{0,20}profile:\i(?=.{0,20}profile:\i)/,
                     replace: "$&,invite:arguments[0].invite"
                 }
             ]
@@ -85,8 +86,11 @@ export default definePlugin({
         );
     },
     Header(inviter: User | undefined, guildName: string) {
+        if (!inviter) return null;
+
         const userId = UserStore.getCurrentUser().id;
-        if (!inviter || userId === inviter.id) return null;
+        const isSelf = userId === inviter.id;
+
         return (
             <div className="vc-bi-header-inner">
                 <img
@@ -98,7 +102,9 @@ export default definePlugin({
                         : "/assets/1f0bfc0865d324c2587920a7d80c609b.png?size=128"}
                 />
                 <div className="vc-bi-header-text">
-                    {inviter.global_name || inviter.username} invited you to {guildName}
+                    {isSelf
+                        ? `You sent an invite to join ${guildName}`
+                        : `${inviter.global_name || inviter.username} invited you to ${guildName}`}
                 </div>
             </div>
         );
diff --git a/src/equicordplugins/betterInvites/style.css b/src/equicordplugins/betterInvites/style.css
index 0436b9d0d..156c9946d 100644
--- a/src/equicordplugins/betterInvites/style.css
+++ b/src/equicordplugins/betterInvites/style.css
@@ -1,7 +1,7 @@
 .vc-bi-inviter-avatar {
     margin: 0;
-    height: 14px;
-    width: 14px;
+    height: 18px;
+    width: 18px;
     position: static;
     flex-shrink: 0;
 }
@@ -10,10 +10,10 @@
     display: flex;
     flex-wrap: wrap;
     align-items: center;
-    gap: 8px;
+    gap: 4px;
     margin: 0;
     margin-bottom: 5px;
-    font-size: 12px;
+    font-size: 14px;
 }
 
 .vc-bi-header-text {
@@ -24,7 +24,7 @@
 
 .vc-bi-tooltip-icon {
     color: var(--text-muted);
-    width: 16px;
-    height: 16px;
-    margin-top: 1px;
-}
+    width: 18px;
+    height: 18px;
+    margin-top: 1.5px;
+}
\ No newline at end of file
diff --git a/src/equicordplugins/betterPlusReacts/index.ts b/src/equicordplugins/betterPlusReacts/index.ts
index 2e3f84d2b..995a759a5 100644
--- a/src/equicordplugins/betterPlusReacts/index.ts
+++ b/src/equicordplugins/betterPlusReacts/index.ts
@@ -12,6 +12,7 @@ export default definePlugin({
     name: "BetterPlusReacts",
     authors: [Devs.Joona],
     description: "The amount of plus before :emoji: is the message to add it to",
+    tags: ["Chat", "Emotes"],
     patches: [
         {
             find: ".SLASH_COMMAND_USED,",
diff --git a/src/equicordplugins/blockKeywords/index.ts b/src/equicordplugins/blockKeywords/index.ts
index 3f7504373..bbe146b46 100644
--- a/src/equicordplugins/blockKeywords/index.ts
+++ b/src/equicordplugins/blockKeywords/index.ts
@@ -70,6 +70,7 @@ export function containsBlockedKeywords(message: Message) {
 export default definePlugin({
     name: "BlockKeywords",
     description: "Blocks messages containing specific user-defined keywords, as if the user sending them was blocked.",
+    tags: ["Appearance", "Customisation", "Privacy"],
     authors: [EquicordDevs.catcraft],
     patches: [
         {
@@ -80,19 +81,26 @@ export default definePlugin({
                 replace: "$&$1=$self.blockMessagesWithKeywords($1);"
             }
         },
-        ...[
-            '"MessageStore"',
-            '"ReadStateStore"'
-        ].map(find => ({
-            find,
+        {
+            find: '"MessageStore"',
             predicate: () => settings.store.ignoreBlockedMessages && settings.store.blockedWords !== "",
             replacement: [
                 {
-                    match: /(?<=function (\i)\((\i)\){)(?=.*MESSAGE_CREATE:\1)/,
-                    replace: (_, _funcName, props) => `if($self.containsBlockedKeywords(${props}.message))return;`
+                    match: /(?<=MESSAGE_CREATE:function\((\i)\){)/,
+                    replace: (_, props) => `if($self.containsBlockedKeywords(${props}.message))return;`
                 }
             ]
-        })),
+        },
+        {
+            find: '"ReadStateStore"',
+            predicate: () => settings.store.ignoreBlockedMessages && settings.store.blockedWords !== "",
+            replacement: [
+                {
+                    match: /(?<=MESSAGE_CREATE:function\((\i)\){)/,
+                    replace: (_, props) => `if($self.containsBlockedKeywords(${props}.message))return;`
+                }
+            ]
+        },
     ],
 
     settings,
diff --git a/src/equicordplugins/blockKrisp/index.ts b/src/equicordplugins/blockKrisp/index.ts
index 28f6791ea..2b621b4d6 100644
--- a/src/equicordplugins/blockKrisp/index.ts
+++ b/src/equicordplugins/blockKrisp/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "BlockKrisp",
     description: "Prevent Krisp from loading",
+    tags: ["Privacy", "Utility", "Voice"],
     authors: [Devs.D3SOX],
     patches: [
         // Block loading modules on Desktop
@@ -24,8 +25,8 @@ export default definePlugin({
         {
             find: "krisp_browser_models",
             replacement: {
-                match: /(\i,\{\i:\(\)=>)\i/,
-                replace: "$1null"
+                match: /if\(this._noiseCancellation\)/,
+                replace: "if(false)"
             }
         },
         // Set Krisp to not supported
diff --git a/src/equicordplugins/bypassPinPrompt/index.ts b/src/equicordplugins/bypassPinPrompt/index.ts
index 6c1503cd2..c90c44b93 100644
--- a/src/equicordplugins/bypassPinPrompt/index.ts
+++ b/src/equicordplugins/bypassPinPrompt/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "BypassPinPrompt",
     description: "Bypass the pin prompt when using the pin functions",
+    tags: ["Shortcuts"],
     authors: [Devs.thororen],
     patches: [
         ...[
diff --git a/src/equicordplugins/bypassStatus/index.tsx b/src/equicordplugins/bypassStatus/index.tsx
index ac9d635d0..04d6861a2 100644
--- a/src/equicordplugins/bypassStatus/index.tsx
+++ b/src/equicordplugins/bypassStatus/index.tsx
@@ -157,6 +157,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "BypassStatus",
     description: "Still get notifications from specific sources when in do not disturb mode. Right-click on users/channels/guilds to set them to bypass do not disturb mode.",
+    tags: ["Activity", "Customisation", "Notifications", "Servers"],
     authors: [Devs.Inbestigator],
     dependencies: ["AudioPlayerAPI"],
     flux: {
diff --git a/src/equicordplugins/channelBadges/index.tsx b/src/equicordplugins/channelBadges/index.tsx
index 25096a123..ba65fc47a 100644
--- a/src/equicordplugins/channelBadges/index.tsx
+++ b/src/equicordplugins/channelBadges/index.tsx
@@ -32,6 +32,7 @@ function renderBadge(id: number, title: string) {
 export default definePlugin({
     name: "ChannelBadges",
     description: "Adds badges to channels based on their type",
+    tags: ["Appearance", "Customisation", "Servers"],
     authors: [EquicordDevs.creations, Devs.thororen],
     settings,
     patches: [
diff --git a/src/equicordplugins/channelTabs/components/ChannelTab.tsx b/src/equicordplugins/channelTabs/components/ChannelTab.tsx
index 5660eec76..5bec9dc1a 100644
--- a/src/equicordplugins/channelTabs/components/ChannelTab.tsx
+++ b/src/equicordplugins/channelTabs/components/ChannelTab.tsx
@@ -7,7 +7,7 @@
 import { BaseText } from "@components/BaseText";
 import { ChannelTabsProps, closeTab, ensureUnreadFallbackCountsLoaded, getNotificationDotState, getUnreadFallbackCounts, isTabSelected, moveDraggedTabs, moveToTab, openedTabs, settings, updateUnreadFallbackCounts } from "@equicordplugins/channelTabs/util";
 import { ActivityIcon, CircleQuestionIcon, DiscoveryIcon, EnvelopeIcon, FriendsIcon, ICYMIIcon, NitroIcon, QuestIcon, ShopIcon } from "@equicordplugins/channelTabs/util/icons";
-import { activeQuestIntervals } from "@equicordplugins/questify"; // sorry murphy!
+import { getActiveAutoCompletes } from "@equicordplugins/questify/utils/completion";
 import { classNameFactory } from "@utils/css";
 import { getGuildAcronym, getIntlMessage, getUniqueUsername } from "@utils/discord";
 import { classes } from "@utils/misc";
@@ -467,20 +467,19 @@ export default function ChannelTab(props: ChannelTabsProps & { index: number; })
     }), []);
     drag(drop(ref));
 
-    // check if quests running (questify momentLet)
-    const hasActiveQuests = activeQuestIntervals.size > 0;
+    const hasActiveQuests = getActiveAutoCompletes().length > 0;
     return <div
         className={cl("tab", {
-                "tab-compact": compact,
-                "tab-selected": isTabSelected(id),
-                "tab-entering": isEntering,
-                "tab-closing": isClosing,
-                "tab-dragging": isDragging,
-                "tab-drop-target": isDropTarget,
-                "tab-nitro": channelId === "__nitro__",
-                "tab-quests-active": channelId === "__quests__" && hasActiveQuests,
-                wider: settings.store.widerTabsAndBookmarks
-            })}
+            "tab-compact": compact,
+            "tab-selected": isTabSelected(id),
+            "tab-entering": isEntering,
+            "tab-closing": isClosing,
+            "tab-dragging": isDragging,
+            "tab-drop-target": isDropTarget,
+            "tab-nitro": channelId === "__nitro__",
+            "tab-quests-active": channelId === "__quests__" && hasActiveQuests,
+            wider: settings.store.widerTabsAndBookmarks
+        })}
         key={index}
         ref={ref}
         onMouseEnter={() => setIsHovered(true)}
diff --git a/src/equicordplugins/channelTabs/components/ChannelTabsContainer.tsx b/src/equicordplugins/channelTabs/components/ChannelTabsContainer.tsx
index d878f1c49..c2eb7a0ac 100644
--- a/src/equicordplugins/channelTabs/components/ChannelTabsContainer.tsx
+++ b/src/equicordplugins/channelTabs/components/ChannelTabsContainer.tsx
@@ -33,6 +33,7 @@ export default function ChannelsTabsContainer(props: BasicChannelTabsProps) {
         showBookmarkBar,
         widerTabsAndBookmarks,
         tabWidthScale,
+        tabHeightScale,
         enableNumberKeySwitching,
         numberKeySwitchCount,
         enableCloseTabShortcut,
@@ -65,6 +66,7 @@ export default function ChannelsTabsContainer(props: BasicChannelTabsProps) {
         "showBookmarkBar",
         "widerTabsAndBookmarks",
         "tabWidthScale",
+        "tabHeightScale",
         "enableNumberKeySwitching",
         "numberKeySwitchCount",
         "enableCloseTabShortcut",
@@ -288,6 +290,16 @@ export default function ChannelsTabsContainer(props: BasicChannelTabsProps) {
 
     if (isFullscreen) return null;
 
+    const shouldFollowNewTabButton = newTabButtonBehavior && !tabsOverflow;
+    const newTabButton = (
+        <button
+            onClick={() => createTab(props, true)}
+            className={cl("button", "new-button", "hoverable")}
+        >
+            <PlusSmallIcon />
+        </button>
+    );
+
     return (
         <div
             className={classes(
@@ -312,7 +324,7 @@ export default function ChannelsTabsContainer(props: BasicChannelTabsProps) {
                 !compactAutoExpandOnHover && cl("no-compact-hover-expand")
             )}
             ref={ref}
-            style={{ "--tab-width-scale": tabWidthScale / 100 } as React.CSSProperties}
+            style={{ "--tab-width-scale": tabWidthScale / 100, "--tab-height-scale": tabHeightScale / 100 } as React.CSSProperties}
             onContextMenu={e => ContextMenuApi.openContextMenu(e, () => <BasicContextMenu />)}
         >
             {showBookmarkBar && <>
@@ -322,20 +334,16 @@ export default function ChannelsTabsContainer(props: BasicChannelTabsProps) {
             <div className={cl("tab-container")}>
                 <HorizontalScroller
                     customRef={node => { scrollerRef.current = node; }}
-                    className={cl("tab-scroller", newTabButtonBehavior && !tabsOverflow && "tab-scroller-following")}
+                    className={cl("tab-scroller", shouldFollowNewTabButton && "tab-scroller-following")}
                 >
                     {openedTabs.filter(tab => tab != null).map((tab, i) =>
                         <ChannelTab {...tab} index={i} key={tab.id} />
                     )}
                     {GhostTabs}
+                    {shouldFollowNewTabButton && newTabButton}
                 </HorizontalScroller>
 
-                <button
-                    onClick={() => createTab(props, true)}
-                    className={cl("button", "new-button", "hoverable")}
-                >
-                    <PlusSmallIcon />
-                </button>
+                {!shouldFollowNewTabButton && newTabButton}
             </div >
 
         </div>
diff --git a/src/equicordplugins/channelTabs/index.tsx b/src/equicordplugins/channelTabs/index.tsx
index 35e6888a3..b536a216c 100644
--- a/src/equicordplugins/channelTabs/index.tsx
+++ b/src/equicordplugins/channelTabs/index.tsx
@@ -15,8 +15,8 @@ import { ChannelStore, Menu } from "@webpack/common";
 import { JSX } from "react";
 
 import ChannelsTabsContainer from "./components/ChannelTabsContainer";
-import { BasicChannelTabsProps, createTab, handleChannelSwitch, settings } from "./util";
 import * as ChannelTabsUtils from "./util";
+import { BasicChannelTabsProps, createTab, handleChannelSwitch, settings } from "./util";
 
 const contextMenuPatch: NavContextMenuPatchCallback = (children, props: { channel: Channel, messageId?: string; }) => {
     const { channel, messageId } = props;
@@ -47,7 +47,8 @@ const contextMenuPatch: NavContextMenuPatchCallback = (children, props: { channe
 export default definePlugin({
     name: "ChannelTabs",
     description: "Group your commonly visited channels in tabs, like a browser",
-    authors: [Devs.TheSun, Devs.TheKodeToad, EquicordDevs.keifufu, Devs.Nickyux, EquicordDevs.DiabeloDEV, EquicordDevs.justjxke],
+    tags: ["Appearance", "Customisation", "Organisation", "Servers"],
+    authors: [Devs.TheSun, Devs.TheKodeToad, EquicordDevs.keifufu, Devs.Nickyux, EquicordDevs.DiabeloDEV, EquicordDevs.justjxke, EquicordDevs.keircn],
     dependencies: ["ContextMenuAPI"],
     contextMenus: {
         "channel-mention-context": contextMenuPatch,
diff --git a/src/equicordplugins/channelTabs/style.css b/src/equicordplugins/channelTabs/style.css
index 83f4b3761..5e82d29a5 100644
--- a/src/equicordplugins/channelTabs/style.css
+++ b/src/equicordplugins/channelTabs/style.css
@@ -212,7 +212,8 @@
         border-color 0.15s ease,
         box-shadow 0.15s ease,
         opacity 0.15s ease;
-    padding: 6px 8px;
+    min-height: calc(38px * var(--tab-height-scale, 1));
+    padding: calc(6px * var(--tab-height-scale, 1)) 8px;
     position: relative;
     cursor: grab;
     flex-shrink: 0;
@@ -1338,4 +1339,4 @@
 /* disable transitions when compact expand animation is disabled */
 .vc-channeltabs-no-compact-animation .vc-channeltabs-tab-number-badge {
     transition: none !important;
-}
\ No newline at end of file
+}
diff --git a/src/equicordplugins/channelTabs/util/constants.tsx b/src/equicordplugins/channelTabs/util/constants.tsx
index a27a010a5..b4fab165e 100644
--- a/src/equicordplugins/channelTabs/util/constants.tsx
+++ b/src/equicordplugins/channelTabs/util/constants.tsx
@@ -39,11 +39,9 @@ function AnimationSettings(): JSX.Element {
         { label: "Active Quests Gradient", value: "quests-active", selected: settings.store.animationQuestsActive }
     ];
 
-    const [currentValue, setCurrentValue] = useState(animationOptions.filter(option => option.selected));
-
-    function updateSettingsTruthy(enabled: DynamicDropdownSettingOption[]) {
-        const enabledValues = enabled.map(option => option.value);
+    const [currentValue, setCurrentValue] = useState(animationOptions.filter(option => option.selected).map(option => option.value));
 
+    function updateSettingsTruthy(enabledValues: string[]) {
         animationOptions.forEach(option => {
             option.selected = enabledValues.includes(option.value);
         });
@@ -64,23 +62,24 @@ function AnimationSettings(): JSX.Element {
         settings.store.animationResizeHandle = enabledValues.includes("resize-handle");
         settings.store.animationQuestsActive = enabledValues.includes("quests-active");
 
-        setCurrentValue(enabled);
+        setCurrentValue(enabledValues);
     }
 
     function handleChange(values: Array<DynamicDropdownSettingOption | string>) {
-        if (values.length === 0) {
-            updateSettingsTruthy([]);
+        const valueStrings = values.map(v => typeof v === "string" ? v : v.value);
+        const toggled = valueStrings.length > currentValue.length
+            ? valueStrings.find(v => !currentValue.includes(v))
+            : currentValue.find(v => !valueStrings.includes(v));
+
+        if (toggled == null) {
+            updateSettingsTruthy(valueStrings);
             return;
         }
 
-        const stringlessValues = values.filter(v => typeof v !== "string") as DynamicDropdownSettingOption[];
-        const selectedOption = values.find(v => typeof v === "string") as string;
-        const option = animationOptions.find(option => option.value === selectedOption) as DynamicDropdownSettingOption;
-
-        if (option.selected) {
-            updateSettingsTruthy(stringlessValues.filter(v => v.value !== selectedOption));
+        if (currentValue.includes(toggled)) {
+            updateSettingsTruthy(currentValue.filter(v => v !== toggled));
         } else {
-            updateSettingsTruthy([...stringlessValues, option]);
+            updateSettingsTruthy([...currentValue, toggled]);
         }
     }
 
@@ -179,6 +178,12 @@ export const settings = definePluginSettings({
         hidden: true,
         restartNeeded: false
     },
+    tabHeightScale: {
+        type: OptionType.NUMBER,
+        description: "Tab height scale (percentage).",
+        default: 100,
+        restartNeeded: false
+    },
     renderAllTabs: {
         type: OptionType.BOOLEAN,
         description: "Keep all tabs cached in memory for faster switching (caches scroll position and state)",
diff --git a/src/equicordplugins/channelTabs/util/folderIcons.tsx b/src/equicordplugins/channelTabs/util/folderIcons.tsx
index 9519f46de..2858b1027 100644
--- a/src/equicordplugins/channelTabs/util/folderIcons.tsx
+++ b/src/equicordplugins/channelTabs/util/folderIcons.tsx
@@ -4,10 +4,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { iconsModule } from "@equicordplugins/_core/concatenatedModules";
 import { Icon } from "@vencord/discord-types";
-import { findByPropsLazy } from "@webpack";
-
-const iconsModule = findByPropsLazy("AngleBracketsIcon", "StaffBadgeIcon") as Record<string, Icon>;
 
 let iconNames: string[] | undefined;
 
diff --git a/src/equicordplugins/cleanChannelName/index.ts b/src/equicordplugins/cleanChannelName/index.ts
index 822d5b5d2..c0e02e27e 100644
--- a/src/equicordplugins/cleanChannelName/index.ts
+++ b/src/equicordplugins/cleanChannelName/index.ts
@@ -7,38 +7,75 @@
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { Channel } from "@vencord/discord-types";
+import { ChannelStore } from "@webpack/common";
+
+const SMALL_CAPS: Record<string, string> = {
+    "ᴀ": "a", "ʙ": "b", "ᴄ": "c", "ᴅ": "d", "ᴇ": "e", "ꜰ": "f", "ɢ": "g", "ʜ": "h", "ɪ": "i", "ᴊ": "j",
+    "ᴋ": "k", "ʟ": "l", "ᴍ": "m", "ɴ": "n", "ᴏ": "o", "ᴘ": "p", "ǫ": "q", "ʀ": "r", "ꜱ": "s", "ᴛ": "t",
+    "ᴜ": "u", "ᴠ": "v", "ᴡ": "w", "x": "x", "ʏ": "y", "ᴢ": "z",
+};
+
+const ORIGINAL_NAME = Symbol("cleanChannelName.original");
+
+let editingChannelId: string | null = null;
+
+function computeClean(name: string, type: number): string {
+    const cleaned = name
+        .normalize("NFKC")
+        .replace(/[ᴀʙᴄᴅᴇꜰɢʜɪᴊᴋʟᴍɴᴏᴘǫʀꜱᴛᴜᴠᴡxʏᴢ]/g, m => SMALL_CAPS[m])
+        .replace(/[^ -~]?\p{Extended_Pictographic}[^ -~]?/ug, "")
+        .replace(/-?[^\p{Letter} -~]-?/ug, [2, 4].includes(type) ? " " : "-")
+        .replace(/(^-|-$)/g, "")
+        .replace(/-+/g, "-");
+    return cleaned || name;
+}
 
 export default definePlugin({
     name: "CleanChannelName",
     authors: [Devs.AutumnVN],
-    description: "remove all emoji and decor shit from channel names",
+    description: "Remove emoji and decoration from channel names. Reverts to the original while you're editing the channel.",
+    tags: ["Appearance", "Customisation", "Chat", "Emotes", "Servers"],
     patches: [
         {
             find: "loadAllGuildAndPrivateChannelsFromDisk(){",
             replacement: {
                 match: /(?<=getChannel\(\i\)\{if\(null!=\i\)return )\i\(\i\)/,
                 replace: "$self.cleanChannelName($&)",
-            }
-        }
+            },
+        },
     ],
 
+    flux: {
+        CHANNEL_SETTINGS_INIT({ channelId }: { channelId: string; }) {
+            editingChannelId = channelId;
+            (ChannelStore as any).emitChange?.();
+        },
+        CHANNEL_SETTINGS_CLOSE() {
+            editingChannelId = null;
+            (ChannelStore as any).emitChange?.();
+        },
+    },
+
     cleanChannelName(channel?: Channel) {
-        if (channel) {
-            channel.name = channel.name
-                .normalize("NFKC")
-                .replace(/[ᴀʙᴄᴅᴇꜰɢʜɪᴊᴋʟᴍɴᴏᴘǫʀꜱᴛᴜᴠᴡxʏᴢ]/g, match => {
-                    const smallCapsToNormal = {
-                        "ᴀ": "a", "ʙ": "b", "ᴄ": "c", "ᴅ": "d", "ᴇ": "e", "ꜰ": "f", "ɢ": "g", "ʜ": "h", "ɪ": "i", "ᴊ": "j",
-                        "ᴋ": "k", "ʟ": "l", "ᴍ": "m", "ɴ": "n", "ᴏ": "o", "ᴘ": "p", "ǫ": "q", "ʀ": "r", "ꜱ": "s", "ᴛ": "t",
-                        "ᴜ": "u", "ᴠ": "v", "ᴡ": "w", "x": "x", "ʏ": "y", "ᴢ": "z"
-                    };
-                    return smallCapsToNormal[match];
-                })
-                .replace(/[^\u0020-\u007E]?\p{Extended_Pictographic}[^\u0020-\u007E]?/ug, "")
-                .replace(/-?[^\p{Letter}\u0020-\u007E]-?/ug, [2, 4].includes(channel.type) ? " " : "-")
-                .replace(/(^-|-$)/g, "")
-                .replace(/-+/g, "-");
-        }
+        if (channel == null) return channel;
+        const c = channel as any;
+
+        if (c[ORIGINAL_NAME] !== undefined) return channel;
+
+        c[ORIGINAL_NAME] = channel.name;
+
+        Object.defineProperty(channel, "name", {
+            configurable: true,
+            enumerable: true,
+            get() {
+                if (editingChannelId === channel.id) return c[ORIGINAL_NAME];
+                return computeClean(c[ORIGINAL_NAME], channel.type);
+            },
+            set(value: string) {
+                c[ORIGINAL_NAME] = value;
+            },
+        });
+
         return channel;
-    }
+    },
 });
diff --git a/src/equicordplugins/cleanerChannelGroups/index.ts b/src/equicordplugins/cleanerChannelGroups/index.ts
index 73f5ba4ce..05c80840c 100644
--- a/src/equicordplugins/cleanerChannelGroups/index.ts
+++ b/src/equicordplugins/cleanerChannelGroups/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "CleanerChannelGroups",
     description: "Hides all channels in collapsed categories, even if they have unread messages.",
+    tags: ["Appearance", "Customisation", "Chat", "Organisation", "Servers"],
     authors: [EquicordDevs.justjxke],
     patches: [
         {
diff --git a/src/equicordplugins/clickableRoles/index.tsx b/src/equicordplugins/clickableRoles/index.tsx
index 6f4005e58..a199fdd51 100644
--- a/src/equicordplugins/clickableRoles/index.tsx
+++ b/src/equicordplugins/clickableRoles/index.tsx
@@ -146,13 +146,14 @@ const WrappedClickableRole = ErrorBoundary.wrap(ClickableRole, { noop: true });
 export default definePlugin({
     name: "ClickableRoles",
     description: "Click on roles in user profiles and the member list to see which members have them.",
+    tags: ["Appearance", "Roles"],
     authors: [Devs.prism],
 
     patches: [
         {
-            find: "#{intl::T+3Adg::raw}",
+            find: "#{intl::zr0Y5R::raw}",
             replacement: {
-                match: /(colors:\i\}\);)return(.*?enableTooltip:!1\}\):null,\i\]\}\))/,
+                match: /(\.colorString\?\?\i;)return(.*?enableTooltip:!1\}\):null,\i\]\}\))/,
                 replace: "$1return $self.wrapRolePill(arguments[0],()=>$2)",
             },
         },
diff --git a/src/equicordplugins/clientSideBlock/index.tsx b/src/equicordplugins/clientSideBlock/index.tsx
index 19c971c96..fa04cc14b 100644
--- a/src/equicordplugins/clientSideBlock/index.tsx
+++ b/src/equicordplugins/clientSideBlock/index.tsx
@@ -142,7 +142,8 @@ function activeNowView(cards) {
 export default definePlugin({
     name: "ClientSideBlock",
     description: "Allows you to locally hide almost all content from any user",
-    tags: ["blocked", "block", "hide", "hidden", "noblockedmessages"],
+    tags: ["Utility"],
+    searchTerms: ["blocked", "block", "hide", "hidden", "noblockedmessages"],
     authors: [Devs.Samwich, EquicordDevs.KamiRu],
     settings,
     activeNowView,
@@ -224,8 +225,8 @@ export default definePlugin({
         {
             find: "ACTIVE_NOW_COLUMN)",
             replacement: {
-                match: /(\i\.\i),\{(?=\}\)\])/,
-                replace: '"div",{children:$self.activeNowView($1())'
+                match: /(__invalid_consentCard.{0,40}\()(\i),\{/,
+                replace: '$1"div",{children:$self.activeNowView($2())'
             }
         },
         // mutual friends list in user profile
diff --git a/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx b/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx
index 91320746e..bc9afcf2e 100644
--- a/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx
+++ b/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx
@@ -37,6 +37,12 @@ const settings = definePluginSettings({
         default: true,
         restartNeeded: true
     },
+    enableSpeakingIndicators: {
+        type: OptionType.BOOLEAN,
+        description: "Enable speaking indicators",
+        default: true,
+        restartNeeded: true
+    },
     enableAdvancedSignals: {
         type: OptionType.BOOLEAN,
         description: "Enable advanced clip signals (auto-clip triggers)",
@@ -72,6 +78,7 @@ migratePluginSettings("ClipsEnhancements", "TimelessClips");
 export default definePlugin({
     name: "ClipsEnhancements",
     description: "Add more Clip FPS and duration options, custom clip length, RPC tagging and more",
+    tags: ["Activity", "Media", "Utility"],
     authors: [Devs.niko, Devs.Joona, EquicordDevs.keircn],
     settings,
     patches: [
@@ -100,8 +107,8 @@ export default definePlugin({
         {
             find: "2026-03-clips-experiment",
             replacement: {
-                match: /defaultConfig:\{enableClips:!\d,ignorePlatformRestriction:!\d,showClipsHeaderEntrypoint:!\d,enableScreenshotKeybind:!\d,enableVoiceOnlyClips:!\d,enableAdvancedSignals:!\d\}/,
-                replace: "defaultConfig:{enableClips:!0,ignorePlatformRestriction:$self.settings.store.ignorePlatformRestriction,showClipsHeaderEntrypoint:!0,enableScreenshotKeybind:$self.settings.store.enableScreenshotKeybind,enableVoiceOnlyClips:$self.settings.store.enableVoiceOnlyClips,enableAdvancedSignals:$self.settings.store.enableAdvancedSignals}"
+                match: /defaultConfig:\{enableClips:!\d,ignorePlatformRestriction:!\d,enableScreenshotKeybind:!\d,enableVoiceOnlyClips:!\d,enableSpeakingIndicators:!\d,enableAdvancedSignals:!\d\}/,
+                replace: "defaultConfig:{enableClips:!0,ignorePlatformRestriction:$self.settings.store.ignorePlatformRestriction,enableScreenshotKeybind:$self.settings.store.enableScreenshotKeybind,enableVoiceOnlyClips:$self.settings.store.enableVoiceOnlyClips,enableSpeakingIndicators:$self.settings.store.enableSpeakingIndicators,enableAdvancedSignals:$self.settings.store.enableAdvancedSignals}"
             }
         }
     ],
diff --git a/src/equicordplugins/collapsibleUi/index.tsx b/src/equicordplugins/collapsibleUi/index.tsx
new file mode 100644
index 000000000..7893bcb3e
--- /dev/null
+++ b/src/equicordplugins/collapsibleUi/index.tsx
@@ -0,0 +1,142 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { ChannelToolbarButton } from "@api/HeaderBar";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { EquicordDevs } from "@utils/constants";
+import { classNameFactory } from "@utils/css";
+import { classes } from "@utils/misc";
+import definePlugin from "@utils/types";
+import { ContextMenuApi, Menu } from "@webpack/common";
+import type { ReactNode, SVGProps } from "react";
+
+import { PanelId, panelRegistry, settings, toolbarPanelOrder } from "./settings";
+import managedStyle from "./style.css?managed";
+
+const cl = classNameFactory("vc-collapsible-ui-");
+
+type StateStore = ReturnType<typeof settings.use>;
+
+function PanelsIcon(props: SVGProps<SVGSVGElement>) {
+    return (
+        <svg viewBox="0 0 24 24" fill="none" {...props}>
+            <path fill="currentColor" d="M3 5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v3H3V5Zm0 5h6v11H5a2 2 0 0 1-2-2V10Zm8 0h10v9a2 2 0 0 1-2 2H11V10Zm2-5h8v3h-8V5Z" />
+        </svg>
+    );
+}
+
+function getStateClasses(store: StateStore) {
+    const classNames = [cl("state"), cl(`collapsed-size-${store.collapsedSize}`), cl(`transition-${store.transitionMs}`)];
+
+    for (const panelId of toolbarPanelOrder) {
+        const panel = panelRegistry[panelId];
+        if (store[panel.collapsedKey]) classNames.push(cl(`${panel.classId}-collapsed`));
+    }
+
+    return classes(...classNames);
+}
+
+function togglePanel(panelId: PanelId) {
+    const key = panelRegistry[panelId].collapsedKey;
+    settings.store[key] = !settings.store[key];
+}
+
+const ToolbarMenu = ErrorBoundary.wrap(({ onClose }: { onClose(): void; }) => {
+    const store = settings.use();
+
+    return (
+        <Menu.Menu navId="vc-collapsible-ui-toolbar-menu" onClose={onClose} aria-label="Collapsible UI">
+            {toolbarPanelOrder.map(panelId => {
+                const panel = panelRegistry[panelId];
+                const collapsed = store[panel.collapsedKey];
+
+                return (
+                    <Menu.MenuCheckboxItem
+                        key={panelId}
+                        id={`vc-collapsible-ui-${panel.classId}`}
+                        label={panel.label}
+                        checked={!collapsed}
+                        action={() => togglePanel(panelId)}
+                    />
+                );
+            })}
+        </Menu.Menu>
+    );
+}, { noop: true });
+
+const ToolbarButtons = ErrorBoundary.wrap(() => {
+    const store = settings.use();
+    const anyCollapsed = toolbarPanelOrder.some(panelId => store[panelRegistry[panelId].collapsedKey]);
+
+    return (
+        <>
+            <span aria-hidden className={getStateClasses(store)} style={{ display: "none" }} />
+            <ChannelToolbarButton
+                icon={PanelsIcon}
+                tooltip="Collapsible UI"
+                aria-label="Collapsible UI"
+                selected={anyCollapsed}
+                onClick={event => ContextMenuApi.openContextMenu(event, () => <ToolbarMenu onClose={ContextMenuApi.closeContextMenu} />)}
+                onContextMenu={event => ContextMenuApi.openContextMenu(event, () => <ToolbarMenu onClose={ContextMenuApi.closeContextMenu} />)}
+            />
+        </>
+    );
+}, { noop: true });
+
+const ChatButtonsRow = ErrorBoundary.wrap(({ buttons }: { buttons: ReactNode[]; }) => {
+    const { chatButtonsCollapsed } = settings.use();
+
+    if (buttons.length === 0) return <>{buttons}</>;
+
+    return (
+        <div
+            className={classes(
+                cl("chat-buttons"),
+                chatButtonsCollapsed && cl("chat-buttons-collapsed")
+            )}
+        >
+            <div className={cl("chat-buttons-items")}>
+                {buttons}
+            </div>
+        </div>
+    );
+}, { noop: true });
+
+export default definePlugin({
+    name: "CollapsibleUI",
+    description: "Native collapsible channel, member, chat button, and user area surfaces.",
+    tags: ["Appearance", "Customisation", "Chat", "Servers"],
+    dependencies: ["HeaderBarAPI", "ChatInputButtonAPI"],
+    authors: [EquicordDevs.benjii],
+    searchTerms: ["ui", "sidebar", "layout"],
+    managedStyle,
+    settings,
+
+    headerBarButton: {
+        icon: PanelsIcon,
+        location: "channeltoolbar",
+        priority: 25,
+        render: () => <ToolbarButtons />,
+    },
+
+    patches: [
+        {
+            find: ".DISPLAY_NAME_STYLES_COACHMARK)",
+            replacement: {
+                match: /className:(\i\.\i),(?=style:(\i),children:\[)/,
+                replace: "className:$self.userAreaControlsClass($1),"
+            }
+        },
+    ],
+    chatBarButtonWrapper: (buttons: ReactNode) => {
+        if (!Array.isArray(buttons) || buttons.length === 0) return buttons;
+        return <ChatButtonsRow buttons={buttons} />;
+    },
+
+    userAreaControlsClass(className: string) {
+        return classes(className, cl("user-area-controls"));
+    },
+});
diff --git a/src/equicordplugins/collapsibleUi/settings.ts b/src/equicordplugins/collapsibleUi/settings.ts
new file mode 100644
index 000000000..84be9d54e
--- /dev/null
+++ b/src/equicordplugins/collapsibleUi/settings.ts
@@ -0,0 +1,110 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { OptionType } from "@utils/types";
+
+export const transitionMarkers = [0, 80, 120, 160, 200, 260, 320];
+export const collapsedSizeMarkers = [8, 12, 16, 20, 24, 28, 32, 40, 48];
+
+export const panelRegistry = {
+    guildBar: {
+        id: "guildBar",
+        classId: "guild-bar",
+        label: "Guild Bar",
+        collapsedKey: "guildBarCollapsed",
+    },
+    channelList: {
+        id: "channelList",
+        classId: "channel-list",
+        label: "Channel List",
+        collapsedKey: "channelListCollapsed",
+    },
+    membersList: {
+        id: "membersList",
+        classId: "members-list",
+        label: "Members List",
+        collapsedKey: "membersListCollapsed",
+    },
+    chatButtons: {
+        id: "chatButtons",
+        classId: "chat-buttons",
+        label: "Message Buttons",
+        collapsedKey: "chatButtonsCollapsed",
+    },
+    titleBar: {
+        id: "titleBar",
+        classId: "title-bar",
+        label: "Title Bar",
+        collapsedKey: "titleBarCollapsed",
+    },
+    headerBar: {
+        id: "headerBar",
+        classId: "header-bar",
+        label: "Header Bar",
+        collapsedKey: "headerBarCollapsed",
+    },
+    userArea: {
+        id: "userArea",
+        classId: "user-area",
+        label: "User Area",
+        collapsedKey: "userAreaCollapsed",
+    },
+} as const;
+
+export type PanelId = keyof typeof panelRegistry;
+
+export const toolbarPanelOrder = ["guildBar", "channelList", "membersList", "chatButtons", "titleBar", "headerBar", "userArea"] as const satisfies readonly PanelId[];
+
+export const settings = definePluginSettings({
+    collapsedSize: {
+        type: OptionType.SLIDER,
+        description: "Collapsed hover area size in pixels.",
+        default: 12,
+        markers: collapsedSizeMarkers,
+    },
+    transitionMs: {
+        type: OptionType.SLIDER,
+        description: "Panel transition speed in milliseconds.",
+        default: 160,
+        markers: transitionMarkers,
+    },
+    guildBarCollapsed: {
+        type: OptionType.BOOLEAN,
+        description: "Persist the guild bar as collapsed.",
+        default: false,
+    },
+    channelListCollapsed: {
+        type: OptionType.BOOLEAN,
+        description: "Persist the channel list as collapsed.",
+        default: false,
+    },
+    membersListCollapsed: {
+        type: OptionType.BOOLEAN,
+        description: "Persist the members list as collapsed.",
+        default: false,
+    },
+    chatButtonsCollapsed: {
+        type: OptionType.BOOLEAN,
+        description: "Persist the message button row as collapsed.",
+        default: false,
+    },
+    titleBarCollapsed: {
+        type: OptionType.BOOLEAN,
+        description: "Persist the title bar as collapsed.",
+        default: false,
+    },
+    headerBarCollapsed: {
+        type: OptionType.BOOLEAN,
+        description: "Persist the header bar as collapsed.",
+        default: false,
+    },
+    userAreaCollapsed: {
+        type: OptionType.BOOLEAN,
+        description: "Persist the user area as collapsed.",
+        default: false,
+    },
+});
diff --git a/src/equicordplugins/collapsibleUi/style.css b/src/equicordplugins/collapsibleUi/style.css
new file mode 100644
index 000000000..c2a0b619f
--- /dev/null
+++ b/src/equicordplugins/collapsibleUi/style.css
@@ -0,0 +1,416 @@
+@property --vc-cui-collapsed-size {
+    syntax: "<length>";
+    inherits: true;
+    initial-value: 12px;
+}
+
+@property --vc-cui-transition {
+    syntax: "<time>";
+    inherits: true;
+    initial-value: 160ms;
+}
+
+:root {
+    --vc-cui-chat-buttons-width: min(320px, 36vw);
+    --vc-cui-hover-peek: var(--vc-cui-collapsed-size);
+    --vc-cui-hover-delay: 120ms;
+    --vc-cui-header-bar-height: 32px;
+    --vc-cui-user-area-collapsed-width: 52px;
+    --vc-cui-ease: cubic-bezier(.2, 0, 0, 1);
+    --vc-cui-fade-transition: opacity var(--vc-cui-transition) var(--vc-cui-ease);
+    --vc-cui-inline-transition:
+        width var(--vc-cui-transition) var(--vc-cui-ease),
+        inline-size var(--vc-cui-transition) var(--vc-cui-ease),
+        min-width var(--vc-cui-transition) var(--vc-cui-ease),
+        min-inline-size var(--vc-cui-transition) var(--vc-cui-ease),
+        max-width var(--vc-cui-transition) var(--vc-cui-ease),
+        max-inline-size var(--vc-cui-transition) var(--vc-cui-ease),
+        flex-basis var(--vc-cui-transition) var(--vc-cui-ease);
+    --vc-cui-block-transition:
+        height var(--vc-cui-transition) var(--vc-cui-ease),
+        block-size var(--vc-cui-transition) var(--vc-cui-ease),
+        min-height var(--vc-cui-transition) var(--vc-cui-ease),
+        min-block-size var(--vc-cui-transition) var(--vc-cui-ease),
+        max-height var(--vc-cui-transition) var(--vc-cui-ease),
+        max-block-size var(--vc-cui-transition) var(--vc-cui-ease),
+        padding var(--vc-cui-transition) var(--vc-cui-ease)
+}
+
+body:has(.vc-collapsible-ui-collapsed-size-8) {
+    --vc-cui-collapsed-size: 8px
+}
+
+body:has(.vc-collapsible-ui-collapsed-size-12) {
+    --vc-cui-collapsed-size: 12px
+}
+
+body:has(.vc-collapsible-ui-collapsed-size-16) {
+    --vc-cui-collapsed-size: 16px
+}
+
+body:has(.vc-collapsible-ui-collapsed-size-20) {
+    --vc-cui-collapsed-size: 20px
+}
+
+body:has(.vc-collapsible-ui-collapsed-size-24) {
+    --vc-cui-collapsed-size: 24px
+}
+
+body:has(.vc-collapsible-ui-collapsed-size-28) {
+    --vc-cui-collapsed-size: 28px
+}
+
+body:has(.vc-collapsible-ui-collapsed-size-32) {
+    --vc-cui-collapsed-size: 32px
+}
+
+body:has(.vc-collapsible-ui-collapsed-size-40) {
+    --vc-cui-collapsed-size: 40px
+}
+
+body:has(.vc-collapsible-ui-collapsed-size-48) {
+    --vc-cui-collapsed-size: 48px
+}
+
+body:has(.vc-collapsible-ui-transition-0) {
+    --vc-cui-transition: 0ms
+}
+
+body:has(.vc-collapsible-ui-transition-80) {
+    --vc-cui-transition: 80ms
+}
+
+body:has(.vc-collapsible-ui-transition-120) {
+    --vc-cui-transition: 120ms
+}
+
+body:has(.vc-collapsible-ui-transition-160) {
+    --vc-cui-transition: 160ms
+}
+
+body:has(.vc-collapsible-ui-transition-200) {
+    --vc-cui-transition: 200ms
+}
+
+body:has(.vc-collapsible-ui-transition-260) {
+    --vc-cui-transition: 260ms
+}
+
+body:has(.vc-collapsible-ui-transition-320) {
+    --vc-cui-transition: 320ms
+}
+
+body:has(.vc-collapsible-ui-guild-bar-collapsed) nav[class*="guilds_"]:not(:is(.vc-betterFolders-sidebar nav[class*="guilds_"])) {
+    position: relative;
+    z-index: 1;
+    overflow: hidden !important;
+    transition: var(--vc-cui-inline-transition) !important
+}
+
+body:has(.vc-collapsible-ui-guild-bar-collapsed) nav[class*="guilds_"]:not(:is(.vc-betterFolders-sidebar nav[class*="guilds_"])):is(:hover, :focus-within) {
+    z-index: 3
+}
+
+body:has(.vc-collapsible-ui-guild-bar-collapsed) nav[class*="guilds_"]:not(:is(.vc-betterFolders-sidebar nav[class*="guilds_"]), :is(:hover, :focus-within), :is(.vc-betterFolders-sidebar-grid:has(.vc-betterFolders-sidebar:is(:hover, :focus-within)) nav[class*="guilds_"])) {
+    background: var(--background-gradient-low, var(--background-base-lowest)) !important;
+    border-start-end-radius: var(--radius-sm, 8px);
+    width: var(--vc-cui-collapsed-size) !important;
+    inline-size: var(--vc-cui-collapsed-size) !important;
+    min-width: var(--vc-cui-collapsed-size) !important;
+    min-inline-size: var(--vc-cui-collapsed-size) !important;
+    max-width: var(--vc-cui-collapsed-size) !important;
+    max-inline-size: var(--vc-cui-collapsed-size) !important;
+    flex: 0 0 var(--vc-cui-collapsed-size) !important
+}
+
+body:has(.vc-collapsible-ui-guild-bar-collapsed) .vc-betterFolders-sidebar {
+    position: relative;
+    z-index: 1;
+    overflow: hidden !important;
+    transition: var(--vc-cui-inline-transition) !important
+}
+
+body:has(.vc-collapsible-ui-guild-bar-collapsed) .vc-betterFolders-sidebar-grid:has(nav[class*="guilds_"]:is(:hover, :focus-within), .vc-betterFolders-sidebar:is(:hover, :focus-within)) .vc-betterFolders-sidebar {
+    z-index: 3;
+    transition-delay: var(--vc-cui-hover-delay)
+}
+
+body:has(.vc-collapsible-ui-guild-bar-collapsed) .vc-betterFolders-sidebar-grid:not(:has(nav[class*="guilds_"]:is(:hover, :focus-within), .vc-betterFolders-sidebar:is(:hover, :focus-within))) .vc-betterFolders-sidebar {
+    width: 0 !important;
+    inline-size: 0 !important;
+    min-width: 0 !important;
+    min-inline-size: 0 !important;
+    max-width: 0 !important;
+    max-inline-size: 0 !important;
+    flex: 0 0 0 !important
+}
+
+body:has(.vc-collapsible-ui-channel-list-collapsed) [class*="sidebarList_"] {
+    overflow: hidden !important;
+    transition: var(--vc-cui-inline-transition) !important
+}
+
+body:has(.vc-collapsible-ui-channel-list-collapsed) [class*="sidebarList_"]:is(:hover, :focus-within) {
+    transition-delay: var(--vc-cui-hover-delay)
+}
+
+body:has(.vc-collapsible-ui-channel-list-collapsed) [class*="sidebarList_"]:is(:hover, :focus-within) > * {
+    opacity: 1;
+    pointer-events: auto;
+    transition: var(--vc-cui-fade-transition);
+    transition-delay: var(--vc-cui-hover-delay)
+}
+
+body:has(.vc-collapsible-ui-channel-list-collapsed):not(:has([class*="sidebar_"] > [class*="panels_"]:is(:hover, :focus-within))) [class*="sidebarList_"]:not(:is(:hover, :focus-within)) {
+    width: var(--vc-cui-collapsed-size) !important;
+    inline-size: var(--vc-cui-collapsed-size) !important;
+    min-width: var(--vc-cui-collapsed-size) !important;
+    min-inline-size: var(--vc-cui-collapsed-size) !important;
+    max-width: var(--vc-cui-collapsed-size) !important;
+    max-inline-size: var(--vc-cui-collapsed-size) !important;
+    flex: 0 0 var(--vc-cui-collapsed-size) !important
+}
+
+body:has(.vc-collapsible-ui-channel-list-collapsed) [class*="sidebar_"] > [class*="panels_"] {
+    overflow: hidden !important;
+    transition: var(--vc-cui-inline-transition) !important
+}
+
+body:has(.vc-collapsible-ui-channel-list-collapsed) [class*="sidebar_"] > [class*="panels_"]:not(:is(:hover, :focus-within)) {
+    width: var(--vc-cui-user-area-collapsed-width) !important;
+    inline-size: var(--vc-cui-user-area-collapsed-width) !important;
+    min-width: var(--vc-cui-user-area-collapsed-width) !important;
+    min-inline-size: var(--vc-cui-user-area-collapsed-width) !important;
+    max-width: var(--vc-cui-user-area-collapsed-width) !important;
+    max-inline-size: var(--vc-cui-user-area-collapsed-width) !important
+}
+
+body:has(.vc-collapsible-ui-channel-list-collapsed) [class*="sidebar_"] > [class*="panels_"]:not(:is(:hover, :focus-within)) .vc-collapsible-ui-user-area-controls {
+    max-width: 0 !important;
+    min-width: 0 !important;
+    overflow: hidden !important;
+    opacity: 0;
+    pointer-events: none;
+    transition:
+        max-width var(--vc-cui-transition) var(--vc-cui-ease),
+        opacity var(--vc-cui-transition) var(--vc-cui-ease) !important
+}
+
+body:has(.vc-collapsible-ui-channel-list-collapsed) [class*="sidebar_"] > [class*="panels_"]:is(:hover, :focus-within) .vc-collapsible-ui-user-area-controls {
+    opacity: 1;
+    pointer-events: auto
+}
+
+body:has(.vc-collapsible-ui-members-list-collapsed) [class*="membersWrap"] {
+    overflow: hidden !important;
+    transition: var(--vc-cui-inline-transition) !important
+}
+
+body:has(.vc-collapsible-ui-members-list-collapsed) [class*="membersWrap"]:is(:hover, :focus-within) {
+    transition-delay: var(--vc-cui-hover-delay)
+}
+
+body:has(.vc-collapsible-ui-members-list-collapsed) [class*="membersWrap"]:is(:hover, :focus-within) > * {
+    opacity: 1;
+    pointer-events: auto;
+    transition: var(--vc-cui-fade-transition);
+    transition-delay: var(--vc-cui-hover-delay)
+}
+
+body:has(.vc-collapsible-ui-members-list-collapsed) [class*="membersWrap"]:not(:is(:hover, :focus-within)) {
+    width: var(--vc-cui-collapsed-size) !important;
+    min-width: var(--vc-cui-collapsed-size) !important;
+    max-width: var(--vc-cui-collapsed-size) !important
+}
+
+body:has(.vc-collapsible-ui-members-list-collapsed) [class*="membersWrap"]:not(:is(:hover, :focus-within)) > * {
+    opacity: 0;
+    pointer-events: none;
+    transition: var(--vc-cui-fade-transition)
+}
+
+body:has(.vc-collapsible-ui-user-area-collapsed) [class*="sidebar_"] > [class*="panels_"]:is(:hover, :focus-within) > * {
+    opacity: 1;
+    pointer-events: auto;
+    transition: var(--vc-cui-fade-transition)
+}
+
+body:has(.vc-collapsible-ui-user-area-collapsed) [class*="sidebar_"] > [class*="panels_"]:not(:is(:hover, :focus-within)) {
+    height: var(--vc-cui-hover-peek) !important;
+    block-size: var(--vc-cui-hover-peek) !important;
+    min-height: var(--vc-cui-hover-peek) !important;
+    min-block-size: var(--vc-cui-hover-peek) !important;
+    max-height: var(--vc-cui-hover-peek) !important;
+    max-block-size: var(--vc-cui-hover-peek) !important;
+    overflow: hidden !important;
+    border-top-width: 0 !important;
+    padding-block: 0 !important;
+    transition: var(--vc-cui-block-transition) !important
+}
+
+body:has(.vc-collapsible-ui-user-area-collapsed) [class*="sidebar_"] > [class*="panels_"]:not(:is(:hover, :focus-within)) > * {
+    opacity: 0;
+    pointer-events: none;
+    transition: var(--vc-cui-fade-transition)
+}
+
+body:has(.vc-collapsible-ui-guild-bar-collapsed):has(.vc-collapsible-ui-channel-list-collapsed) [class*="sidebar_"] > [class*="panels_"]:not(:is(:hover, :focus-within)) {
+    width: calc(var(--vc-cui-hover-peek) + 4px) !important;
+    inline-size: calc(var(--vc-cui-hover-peek) + 4px) !important;
+    min-width: calc(var(--vc-cui-hover-peek) + 4px) !important;
+    min-inline-size: calc(var(--vc-cui-hover-peek) + 4px) !important;
+    max-width: calc(var(--vc-cui-hover-peek) + 4px) !important;
+    max-inline-size: calc(var(--vc-cui-hover-peek) + 4px) !important
+}
+
+body:has(.vc-collapsible-ui-title-bar-collapsed) section[class*="title_"][class*="container__"] {
+    overflow: hidden !important;
+    transition: var(--vc-cui-block-transition) !important
+}
+
+body:has(.vc-collapsible-ui-title-bar-collapsed) section[class*="title_"][class*="container__"]:is(:hover, :focus-within) {
+    transition-delay: var(--vc-cui-hover-delay)
+}
+
+body:has(.vc-collapsible-ui-title-bar-collapsed) section[class*="title_"][class*="container__"]:is(:hover, :focus-within) > * {
+    opacity: 1;
+    pointer-events: auto;
+    transition: var(--vc-cui-fade-transition);
+    transition-delay: var(--vc-cui-hover-delay)
+}
+
+body:has(.vc-collapsible-ui-title-bar-collapsed) section[class*="title_"][class*="container__"]:not(:is(:hover, :focus-within)) {
+    height: var(--vc-cui-hover-peek) !important;
+    block-size: var(--vc-cui-hover-peek) !important;
+    min-height: var(--vc-cui-hover-peek) !important;
+    min-block-size: var(--vc-cui-hover-peek) !important;
+    max-height: var(--vc-cui-hover-peek) !important;
+    max-block-size: var(--vc-cui-hover-peek) !important;
+    padding-block: 0 !important
+}
+
+body:has(.vc-collapsible-ui-title-bar-collapsed) section[class*="title_"][class*="container__"]:not(:is(:hover, :focus-within)) > * {
+    opacity: 0;
+    pointer-events: none;
+    transition: var(--vc-cui-fade-transition)
+}
+
+/* stylelint-disable no-descending-specificity */
+body:has(.vc-collapsible-ui-header-bar-collapsed) [class*="bar_"]:has(> [class*="title_"]) {
+    position: relative;
+    z-index: 3;
+    overflow: hidden !important;
+    transition: var(--vc-cui-block-transition) !important
+}
+
+body:has(.vc-collapsible-ui-header-bar-collapsed) [class*="base_"]:has(> [class*="bar_"] > [class*="title_"]) {
+    /* stylelint-disable-next-line value-keyword-case */
+    grid-template-rows: [top] var(--vc-cui-hover-peek) [titleBarEnd] auto [noticeEnd] minmax(0, 1fr) [end] !important
+}
+
+body:has(.vc-collapsible-ui-header-bar-collapsed) [class*="base_"]:has(> [class*="bar_"]:is(:hover, :focus-within) > [class*="title_"]) {
+    /* stylelint-disable-next-line value-keyword-case */
+    grid-template-rows: [top] var(--vc-cui-header-bar-height) [titleBarEnd] auto [noticeEnd] minmax(0, 1fr) [end] !important
+}
+
+body:has(.vc-collapsible-ui-header-bar-collapsed) [class*="bar_"]:has(> [class*="title_"]):is(:hover, :focus-within) {
+    height: var(--vc-cui-header-bar-height) !important;
+    block-size: var(--vc-cui-header-bar-height) !important;
+    min-height: var(--vc-cui-header-bar-height) !important;
+    min-block-size: var(--vc-cui-header-bar-height) !important;
+    max-height: var(--vc-cui-header-bar-height) !important;
+    max-block-size: var(--vc-cui-header-bar-height) !important;
+    transition-delay: var(--vc-cui-hover-delay)
+}
+
+body:has(.vc-collapsible-ui-header-bar-collapsed) [class*="bar_"]:has(> [class*="title_"]):is(:hover, :focus-within) > * {
+    opacity: 1;
+    pointer-events: auto;
+    transition: var(--vc-cui-fade-transition);
+    transition-delay: var(--vc-cui-hover-delay)
+}
+
+body:has(.vc-collapsible-ui-header-bar-collapsed) [class*="bar_"]:has(> [class*="title_"]):not(:is(:hover, :focus-within)) {
+    height: var(--vc-cui-hover-peek) !important;
+    block-size: var(--vc-cui-hover-peek) !important;
+    min-height: var(--vc-cui-hover-peek) !important;
+    min-block-size: var(--vc-cui-hover-peek) !important;
+    max-height: var(--vc-cui-hover-peek) !important;
+    max-block-size: var(--vc-cui-hover-peek) !important;
+    padding-block: 0 !important
+}
+
+body:has(.vc-collapsible-ui-header-bar-collapsed) [class*="bar_"]:has(> [class*="title_"]):not(:is(:hover, :focus-within)) > * {
+    opacity: 0;
+    pointer-events: none;
+    transition: var(--vc-cui-fade-transition)
+}
+/* stylelint-enable no-descending-specificity */
+
+/* stylelint-disable no-descending-specificity */
+body:has(.vc-collapsible-ui-guild-bar-collapsed) .vc-betterFolders-sidebar-grid:has(nav[class*="guilds_"]:is(:hover, :focus-within), .vc-betterFolders-sidebar:is(:hover, :focus-within)) .vc-betterFolders-sidebar > *,
+body:has(.vc-collapsible-ui-guild-bar-collapsed) nav[class*="guilds_"]:not(:is(.vc-betterFolders-sidebar nav[class*="guilds_"])):is(:hover, :focus-within) > * {
+    opacity: 1;
+    pointer-events: auto;
+    transition: var(--vc-cui-fade-transition);
+    transition-delay: calc(var(--vc-cui-hover-delay) + var(--vc-cui-transition))
+}
+
+body:has(.vc-collapsible-ui-guild-bar-collapsed) nav[class*="guilds_"]:not(:is(.vc-betterFolders-sidebar nav[class*="guilds_"])):is(:hover, :focus-within) > [class*="unreadMentionsIndicator"] {
+    pointer-events: none
+}
+
+body:has(.vc-collapsible-ui-guild-bar-collapsed) .vc-betterFolders-sidebar-grid:not(:has(nav[class*="guilds_"]:is(:hover, :focus-within), .vc-betterFolders-sidebar:is(:hover, :focus-within))) .vc-betterFolders-sidebar > *,
+body:has(.vc-collapsible-ui-guild-bar-collapsed) nav[class*="guilds_"]:not(:is(.vc-betterFolders-sidebar nav[class*="guilds_"]), :is(:hover, :focus-within), :is(.vc-betterFolders-sidebar-grid:has(.vc-betterFolders-sidebar:is(:hover, :focus-within)) nav[class*="guilds_"])) > * {
+    opacity: 0;
+    pointer-events: none;
+    transition: var(--vc-cui-fade-transition)
+}
+
+body:has(.vc-collapsible-ui-channel-list-collapsed):not(:has([class*="sidebar_"] > [class*="panels_"]:is(:hover, :focus-within))) [class*="sidebarList_"]:not(:is(:hover, :focus-within)) > * {
+    opacity: 0;
+    pointer-events: none;
+    transition: var(--vc-cui-fade-transition)
+}
+/* stylelint-enable no-descending-specificity */
+
+.vc-collapsible-ui-chat-buttons {
+    display: flex;
+    align-items: center;
+    min-inline-size: 0
+}
+
+.vc-collapsible-ui-chat-buttons-collapsed {
+    min-inline-size: var(--vc-cui-hover-peek)
+}
+
+.vc-collapsible-ui-chat-buttons-items {
+    display: flex;
+    align-items: center;
+    min-inline-size: 0;
+    max-inline-size: var(--vc-cui-chat-buttons-width);
+    overflow: hidden;
+    transition:
+        max-inline-size var(--vc-cui-transition) var(--vc-cui-ease),
+        opacity var(--vc-cui-transition) var(--vc-cui-ease),
+        margin var(--vc-cui-transition) var(--vc-cui-ease)
+}
+
+.vc-collapsible-ui-chat-buttons-collapsed .vc-collapsible-ui-chat-buttons-items {
+    max-inline-size: 0;
+    opacity: 0;
+    pointer-events: none
+}
+
+.vc-collapsible-ui-chat-buttons-collapsed:is(:hover, :focus-within) .vc-collapsible-ui-chat-buttons-items {
+    max-inline-size: var(--vc-cui-chat-buttons-width);
+    opacity: 1;
+    pointer-events: auto;
+    transition-delay: var(--vc-cui-hover-delay)
+}
+
+@media (prefers-reduced-motion: reduce) {
+    body:has(.vc-collapsible-ui-state) {
+        --vc-cui-transition: 0ms
+    }
+}
diff --git a/src/equicordplugins/commandPalette/actions/executors.ts b/src/equicordplugins/commandPalette/actions/executors.ts
index eee6f90e6..3680a27e4 100644
--- a/src/equicordplugins/commandPalette/actions/executors.ts
+++ b/src/equicordplugins/commandPalette/actions/executors.ts
@@ -7,8 +7,6 @@
 import { isPluginEnabled, plugins } from "@api/PluginManager";
 import { NotesIcon } from "@components/Icons";
 import { toggleEnabled } from "@equicordplugins/equicordHelper/utils";
-import { noteHandler } from "@equicordplugins/holyNotes/NoteHandler";
-import type { Note } from "@equicordplugins/holyNotes/types";
 import type { ScheduledMessage } from "@equicordplugins/scheduledMessages/types";
 import { addScheduledMessage, getChannelDisplayInfo, getScheduledMessages, removeScheduledMessage, sendScheduledMessageNow, updateScheduledMessageTime } from "@equicordplugins/scheduledMessages/utils";
 import { sleep } from "@utils/misc";
@@ -21,17 +19,11 @@ import { DISCORD_INTERNAL_HOSTS, executeCommand, getCommandById } from "../regis
 import { makeIconFromUrl } from "../ui/iconFromUrl";
 import { sendMessageToChannel, sendMessageToUser } from "./sendMessageAction";
 
-interface ResolvedHolyNote {
-    notebook: string;
-    note: Note;
-}
-
 interface StagedRescheduledMessage {
     id: string;
     label: string;
 }
 
-let stagedMoveNote: ResolvedHolyNote | null = null;
 let stagedRescheduleMessage: StagedRescheduledMessage | null = null;
 let pendingCancelScheduledMessageId: string | null = null;
 
@@ -559,198 +551,6 @@ function filterScheduledMessages(target: string): ScheduledMessage[] {
     });
 }
 
-function getNotebookNames(): string[] {
-    return Object.keys(noteHandler.getAllNotes());
-}
-
-function filterNotebookNames(target: string, includeMain: boolean): string[] {
-    const normalizedTarget = normalizeText(target);
-    return getNotebookNames()
-        .filter(notebook => includeMain || notebook !== "Main")
-        .filter(notebook => !normalizedTarget || notebook.toLowerCase().includes(normalizedTarget))
-        .sort((left, right) => left.localeCompare(right));
-}
-
-function getResolvedNotes(target: string): ResolvedHolyNote[] {
-    const normalizedTarget = normalizeText(target);
-    const notebooks = noteHandler.getAllNotes();
-    const resolved: ResolvedHolyNote[] = [];
-
-    for (const [notebook, notes] of Object.entries(notebooks)) {
-        for (const note of Object.values(notes)) {
-            const content = note.content?.trim() ?? "";
-            if (normalizedTarget && !content.toLowerCase().includes(normalizedTarget)) continue;
-            resolved.push({ notebook, note });
-        }
-    }
-
-    return resolved;
-}
-
-function toNoteSnippet(note: Note): string {
-    const content = note.content?.replace(/\s+/g, " ").trim();
-    if (!content) return "(No text)";
-    if (content.length <= 56) return content;
-    return `${content.slice(0, 53)}...`;
-}
-
-function buildCreateNotebookCandidates(target: string): QueryActionCandidate[] {
-    const notebookName = target.trim();
-    if (!notebookName) {
-        return [{
-            id: "query-create-notebook-invalid",
-            label: "Create notebook",
-            description: "Notebook name is required.",
-            badge: "Query",
-            icon: NotesIcon,
-            run: () => {
-                showToast("Notebook name is required.", Toasts.Type.FAILURE);
-                return false;
-            }
-        }];
-    }
-
-    return [{
-        id: `query-create-notebook-${notebookName.toLowerCase()}`,
-        label: `Create notebook ${notebookName}`,
-        badge: "Query",
-        icon: NotesIcon,
-        run: async () => {
-            if (!await ensureHolyNotesEnabled()) return false;
-            if (noteHandler.getNotes(notebookName)) {
-                showToast(`Notebook ${notebookName} already exists`, Toasts.Type.FAILURE);
-                return false;
-            }
-            noteHandler.newNoteBook(notebookName);
-        }
-    }];
-}
-
-function buildDeleteNotebookCandidates(target: string): QueryActionCandidate[] {
-    const notebooks = filterNotebookNames(target, false);
-    if (notebooks.length === 0) {
-        return [{
-            id: "query-delete-notebook-none",
-            label: "Delete notebook",
-            description: "No deletable notebook found.",
-            badge: "Query",
-            icon: NotesIcon,
-            run: () => {
-                showToast("No deletable notebook found.", Toasts.Type.MESSAGE);
-                return false;
-            }
-        }];
-    }
-
-    return notebooks.slice(0, 8).map(notebook => ({
-        id: `query-delete-notebook-${notebook.toLowerCase()}`,
-        label: notebook,
-        description: "Notebook",
-        badge: "Query",
-        icon: NotesIcon,
-        run: async () => {
-            if (!await ensureHolyNotesEnabled()) return false;
-            noteHandler.deleteNotebook(notebook);
-        }
-    }));
-}
-
-function buildJumpNoteCandidates(target: string): QueryActionCandidate[] {
-    const notes = getResolvedNotes(target).slice(0, 10);
-    if (notes.length === 0) {
-        return [{
-            id: "query-jump-note-none",
-            label: "Jump to note",
-            description: "No matching note found.",
-            badge: "Query",
-            icon: NotesIcon,
-            run: () => {
-                showToast("No matching note found.", Toasts.Type.FAILURE);
-                return false;
-            }
-        }];
-    }
-
-    return notes.map(({ notebook, note }) => ({
-        id: `query-jump-note-${notebook}-${note.id}`,
-        label: `[${notebook}] ${toNoteSnippet(note)}`,
-        description: "Open original message.",
-        badge: "Query",
-        icon: NotesIcon,
-        run: async () => {
-            if (!await ensureHolyNotesEnabled()) return false;
-            NavigationRouter.transitionTo(`/channels/${note.guild_id || "@me"}/${note.channel_id}/${note.id}`);
-        }
-    }));
-}
-
-function buildMoveNoteCandidates(target: string): QueryActionCandidate[] {
-    if (stagedMoveNote) {
-        const destinationNotebooks = filterNotebookNames(target, true)
-            .filter(notebook => notebook !== stagedMoveNote?.notebook);
-
-        if (destinationNotebooks.length === 0) {
-            return [{
-                id: "query-move-note-no-destination",
-                label: "Move note",
-                description: "No destination notebook found.",
-                badge: "Query",
-                icon: NotesIcon,
-                run: () => {
-                    showToast("No destination notebook found.", Toasts.Type.FAILURE);
-                    return false;
-                }
-            }];
-        }
-
-        return destinationNotebooks.slice(0, 8).map(destinationNotebook => ({
-            id: `query-move-note-destination-${destinationNotebook.toLowerCase()}`,
-            label: `[${stagedMoveNote!.notebook}] ${toNoteSnippet(stagedMoveNote!.note)} -> Move to ${destinationNotebook}`,
-            description: "Move note",
-            badge: "Query",
-            icon: NotesIcon,
-            run: async () => {
-                if (!stagedMoveNote) return;
-                if (!await ensureHolyNotesEnabled()) return false;
-                if (!stagedMoveNote) return;
-                noteHandler.moveNote(stagedMoveNote.note, stagedMoveNote.notebook, destinationNotebook);
-                stagedMoveNote = null;
-            }
-        }));
-    }
-
-    const notes = getResolvedNotes(target).slice(0, 10);
-    if (notes.length === 0) {
-        return [{
-            id: "query-move-note-none",
-            label: "Move note",
-            description: "No matching note found.",
-            badge: "Query",
-            icon: NotesIcon,
-            run: () => {
-                showToast("No matching note found.", Toasts.Type.FAILURE);
-                return false;
-            }
-        }];
-    }
-
-    return notes.map(({ notebook, note }) => ({
-        id: `query-move-note-select-${notebook}-${note.id}`,
-        label: `[${notebook}] ${toNoteSnippet(note)}`,
-        description: "Select destination notebook.",
-        badge: "Query",
-        icon: NotesIcon,
-        run: () => {
-            return ensureHolyNotesEnabled().then(enabled => {
-                if (!enabled) return false;
-                stagedMoveNote = { notebook, note };
-                showToast("Note selected. Choose destination notebook.", Toasts.Type.MESSAGE);
-                return false;
-            });
-        }
-    }));
-}
-
 function buildQuickScheduleMessageCandidates(target: string): QueryActionCandidate[] {
     const parsed = parseQuickScheduleTarget(target);
     if (!parsed) return [];
@@ -926,15 +726,11 @@ function buildCancelScheduledMessageCandidates(target: string): QueryActionCandi
 export function buildQueryResolution(query: string): QueryResolution {
     const parsed = parseQuery(query);
     if (!parsed) {
-        stagedMoveNote = null;
         stagedRescheduleMessage = null;
         pendingCancelScheduledMessageId = null;
         return { type: "none" };
     }
 
-    if (parsed.intent !== "move_note") {
-        stagedMoveNote = null;
-    }
     if (parsed.intent !== "reschedule_message") {
         stagedRescheduleMessage = null;
     }
@@ -971,14 +767,6 @@ export function buildQueryResolution(query: string): QueryResolution {
             return { type: "candidates", candidates: buildTogglePluginCandidates(parsed.target) };
         case "open_url":
             return { type: "candidates", candidates: buildOpenUrlCandidates(parsed.target) };
-        case "create_notebook":
-            return { type: "candidates", candidates: buildCreateNotebookCandidates(parsed.target) };
-        case "delete_notebook":
-            return { type: "candidates", candidates: buildDeleteNotebookCandidates(parsed.target) };
-        case "move_note":
-            return { type: "candidates", candidates: buildMoveNoteCandidates(parsed.target) };
-        case "jump_note":
-            return { type: "candidates", candidates: buildJumpNoteCandidates(parsed.target) };
         case "schedule_message":
             return { type: "candidates", candidates: buildQuickScheduleMessageCandidates(parsed.target) };
         case "reschedule_message":
diff --git a/src/equicordplugins/commandPalette/extensions/actions/holyNotes.ts b/src/equicordplugins/commandPalette/extensions/actions/holyNotes.ts
deleted file mode 100644
index 7b41380e2..000000000
--- a/src/equicordplugins/commandPalette/extensions/actions/holyNotes.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2026 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { isPluginEnabled, plugins } from "@api/PluginManager";
-import { toggleEnabled } from "@equicordplugins/equicordHelper/utils";
-import { noteHandler } from "@equicordplugins/holyNotes/NoteHandler";
-import { Message } from "@vencord/discord-types";
-import { MessageStore, SelectedChannelStore, Toasts } from "@webpack/common";
-
-import { DEFAULT_CATEGORY_ID } from "../../metadata/categories";
-import { TAG_NAVIGATION, TAG_PLUGINS, TAG_UTILITY } from "../../metadata/tags";
-import type { CommandEntry } from "../../registry";
-import type { HolyNotesPlugin } from "../types";
-
-function showToast(message: string, type: (typeof Toasts.Type)[keyof typeof Toasts.Type]) {
-    Toasts.show({ message, type, id: Toasts.genId(), options: { position: Toasts.Position.BOTTOM } });
-}
-
-function getHolyNotesPlugin(): HolyNotesPlugin | null {
-    const plugin = plugins.HolyNotes as HolyNotesPlugin | undefined;
-    return plugin ?? null;
-}
-
-async function ensureHolyNotesPluginEnabled() {
-    const plugin = getHolyNotesPlugin();
-    if (!plugin) {
-        showToast("HolyNotes plugin is unavailable.", Toasts.Type.FAILURE);
-        return false;
-    }
-
-    if (isPluginEnabled(plugin.name)) return true;
-
-    const success = await toggleEnabled(plugin.name);
-    if (!success || !isPluginEnabled(plugin.name)) {
-        showToast("Failed to enable HolyNotes.", Toasts.Type.FAILURE);
-        return false;
-    }
-
-    showToast("Enabled HolyNotes.", Toasts.Type.SUCCESS);
-    return true;
-}
-
-async function runHolyNotesOpen() {
-    if (!await ensureHolyNotesPluginEnabled()) return;
-
-    const plugin = getHolyNotesPlugin();
-    const openNotes = plugin?.toolboxActions?.["Open Notes"];
-    if (typeof openNotes !== "function") {
-        showToast("HolyNotes action is unavailable.", Toasts.Type.FAILURE);
-        return;
-    }
-
-    await Promise.resolve(openNotes());
-}
-
-function getLastNonSystemMessageInChannel(channelId: string): Message | null {
-    const messageCollection = MessageStore.getMessages?.(channelId) as { _array?: Message[]; } | undefined;
-    const messages = messageCollection?._array;
-    if (!messages?.length) return null;
-
-    for (let index = messages.length - 1; index >= 0; index--) {
-        const message = messages[index] as Message & { deleted?: boolean; type?: number; };
-        if (!message || message.deleted) continue;
-        if (typeof message.type === "number" && message.type !== 0) continue;
-        return message;
-    }
-
-    return null;
-}
-
-async function runHolyNotesQuickSaveLastMessage() {
-    if (!await ensureHolyNotesPluginEnabled()) return;
-
-    const channelId = SelectedChannelStore.getChannelId();
-    if (!channelId) {
-        showToast("No active channel available.", Toasts.Type.FAILURE);
-        return;
-    }
-
-    const message = getLastNonSystemMessageInChannel(channelId);
-    if (!message) {
-        showToast("No message available to save.", Toasts.Type.MESSAGE);
-        return;
-    }
-
-    noteHandler.addNote(message, "Main");
-}
-
-export function createHolyNotesExtensionCommands(): CommandEntry[] {
-    return [
-        {
-            id: "extension-holy-notes-open",
-            label: "Open Notes",
-            description: "Open the HolyNotes notebook modal.",
-            keywords: ["holy", "notes", "notebook", "bookmark", "open", "plugin", "extension"],
-            categoryId: DEFAULT_CATEGORY_ID,
-            tags: [TAG_PLUGINS, TAG_UTILITY, TAG_NAVIGATION],
-            handler: runHolyNotesOpen
-        },
-        {
-            id: "extension-holy-notes-create-notebook-query",
-            label: "Create Notebook",
-            description: "Create a HolyNotes notebook.",
-            keywords: ["holy", "notes", "notebook", "create", "new", "plugin", "extension"],
-            categoryId: DEFAULT_CATEGORY_ID,
-            tags: [TAG_PLUGINS, TAG_UTILITY],
-            closeAfterExecute: true,
-            queryTemplate: "create notebook ",
-            queryPlaceholder: "Notebook name",
-            handler: () => undefined
-        },
-        {
-            id: "extension-holy-notes-delete-notebook-query",
-            label: "Delete Notebook",
-            description: "Delete a HolyNotes notebook.",
-            keywords: ["holy", "notes", "notebook", "delete", "remove", "plugin", "extension"],
-            categoryId: DEFAULT_CATEGORY_ID,
-            tags: [TAG_PLUGINS, TAG_UTILITY],
-            closeAfterExecute: true,
-            queryTemplate: "delete notebook ",
-            queryPlaceholder: "Notebook name",
-            handler: () => undefined
-        },
-        {
-            id: "extension-holy-notes-move-note-query",
-            label: "Move Note",
-            description: "Move a HolyNotes note to another notebook.",
-            keywords: ["holy", "notes", "note", "move", "notebook", "plugin", "extension"],
-            categoryId: DEFAULT_CATEGORY_ID,
-            tags: [TAG_PLUGINS, TAG_UTILITY],
-            closeAfterExecute: true,
-            queryTemplate: "move note ",
-            queryPlaceholder: "Find note by content, then destination",
-            handler: () => undefined
-        },
-        {
-            id: "extension-holy-notes-jump-note-query",
-            label: "Jump To Note",
-            description: "Jump to the original message for a HolyNotes note.",
-            keywords: ["holy", "notes", "jump", "note", "message", "plugin", "extension"],
-            categoryId: DEFAULT_CATEGORY_ID,
-            tags: [TAG_PLUGINS, TAG_NAVIGATION],
-            closeAfterExecute: true,
-            queryTemplate: "jump to note ",
-            queryPlaceholder: "Search note content",
-            handler: () => undefined
-        },
-        {
-            id: "extension-holy-notes-quick-save-last-message",
-            label: "Quick Save Last Message",
-            description: "Save the latest message in this channel to Main.",
-            keywords: ["holy", "notes", "save", "last", "message", "bookmark", "main", "plugin", "extension"],
-            categoryId: DEFAULT_CATEGORY_ID,
-            tags: [TAG_PLUGINS, TAG_UTILITY],
-            handler: runHolyNotesQuickSaveLastMessage
-        }
-    ];
-}
diff --git a/src/equicordplugins/commandPalette/extensions/catalog.ts b/src/equicordplugins/commandPalette/extensions/catalog.ts
index 6e13217fd..68c5ca40f 100644
--- a/src/equicordplugins/commandPalette/extensions/catalog.ts
+++ b/src/equicordplugins/commandPalette/extensions/catalog.ts
@@ -69,18 +69,6 @@ export const EXTENSIONS_CATALOG: ExtensionDefinition[] = [
         tags: [TAG_PLUGINS, TAG_UTILITY],
         keywords: ["extension", "plugin", "random", "voice", "join", "channel", "vc"]
     },
-    {
-        id: HOLY_NOTES_EXTENSION_ID,
-        label: "HolyNotes",
-        description: "Control HolyNotes from the command palette.",
-        detailCategoryId: HOLY_NOTES_EXTENSION_DETAIL_CATEGORY_ID,
-        commandId: "extension-holy-notes-open",
-        commandLabel: "Open Notes",
-        commandDescription: "Open the HolyNotes notebook modal.",
-        sourcePath: "src/equicordplugins/holyNotes",
-        tags: [TAG_PLUGINS, TAG_UTILITY],
-        keywords: ["extension", "plugin", "holy", "notes", "notebook", "bookmark"]
-    },
     {
         id: SILENT_MESSAGE_TOGGLE_EXTENSION_ID,
         label: "SilentMessageToggle",
diff --git a/src/equicordplugins/commandPalette/extensions/providers.ts b/src/equicordplugins/commandPalette/extensions/providers.ts
index fbf72664b..30dd6f894 100644
--- a/src/equicordplugins/commandPalette/extensions/providers.ts
+++ b/src/equicordplugins/commandPalette/extensions/providers.ts
@@ -9,7 +9,6 @@ import { Toasts } from "@webpack/common";
 
 import { TAG_DEVELOPER, TAG_NAVIGATION, TAG_PLUGINS, TAG_UTILITY } from "../metadata/tags";
 import type { CommandEntry, ExtensionDefinition } from "../registry";
-import { createHolyNotesExtensionCommands } from "./actions/holyNotes";
 import { createRandomVoiceExtensionCommand } from "./actions/randomVoice";
 import { createScheduledMessagesExtensionCommands } from "./actions/scheduledMessages";
 import { createSilentMessageToggleExtensionCommand } from "./actions/silentMessageToggle";
@@ -19,7 +18,6 @@ import {
     EXTENSIONS_CATALOG_CATEGORY_ID,
     EXTENSIONS_DETAIL_PROVIDER_ID,
     EXTENSIONS_PACK_PROVIDER_ID,
-    HOLY_NOTES_EXTENSION_ID,
     RANDOM_VOICE_EXTENSION_ID,
     SCHEDULED_MESSAGES_EXTENSION_ID,
     SILENT_MESSAGE_TOGGLE_EXTENSION_ID,
@@ -55,10 +53,6 @@ function createInstalledExtensionCommands(extensionsState: ExtensionsState): Com
         entries.push(createRandomVoiceExtensionCommand(extensionsState.extensionKeybinds));
     }
 
-    if (extensionsState.installedExtensionIds.has(HOLY_NOTES_EXTENSION_ID)) {
-        entries.push(...createHolyNotesExtensionCommands());
-    }
-
     if (extensionsState.installedExtensionIds.has(SILENT_MESSAGE_TOGGLE_EXTENSION_ID)) {
         entries.push(createSilentMessageToggleExtensionCommand(extensionsState.extensionKeybinds));
     }
diff --git a/src/equicordplugins/commandPalette/index.tsx b/src/equicordplugins/commandPalette/index.tsx
index c11d44a83..df917d822 100644
--- a/src/equicordplugins/commandPalette/index.tsx
+++ b/src/equicordplugins/commandPalette/index.tsx
@@ -201,18 +201,10 @@ function hotkeyUsesModifiers() {
 export default definePlugin({
     name: "CommandPalette",
     description: "Quickly run actions through a searchable command palette",
+    tags: ["Appearance", "Customisation", "Commands", "Shortcuts"],
     authors: [EquicordDevs.justjxke],
+    dependencies: ["ChatInputButtonAPI"],
     settings,
-    patches: [
-        {
-            find: '"sticker")',
-            replacement: {
-                match: /("div",\{.{0,15}children:)(.+?)\}/,
-                replace: "$1$self.wrapChatBarChildren($2)}"
-            }
-        }
-    ],
-
     start() {
         registerBuiltInCommands();
         window.addEventListener("keydown", this.handleKeydown);
@@ -237,5 +229,5 @@ export default definePlugin({
         });
     },
 
-    wrapChatBarChildren,
+    chatBarButtonWrapper: wrapChatBarChildren,
 });
diff --git a/src/equicordplugins/commandPalette/registry.tsx b/src/equicordplugins/commandPalette/registry.tsx
index ea1616940..2007fc3bc 100644
--- a/src/equicordplugins/commandPalette/registry.tsx
+++ b/src/equicordplugins/commandPalette/registry.tsx
@@ -6,8 +6,9 @@
 
 import { DataStore } from "@api/index";
 import { isPluginEnabled, plugins, startPlugin, stopPlugin } from "@api/PluginManager";
-import { SettingsStore } from "@api/Settings";
+import { Settings, SettingsStore } from "@api/Settings";
 import { getUserSettingLazy } from "@api/UserSettings";
+import { HeadphonesIcon } from "@components/Icons";
 import { openPluginModal } from "@components/settings/tabs";
 import { toggleEnabled } from "@equicordplugins/equicordHelper/utils";
 import { copyWithToast } from "@utils/discord";
@@ -15,10 +16,9 @@ import { Logger } from "@utils/Logger";
 import type { Plugin } from "@utils/types";
 import { changes, checkForUpdates } from "@utils/updater";
 import { Guild } from "@vencord/discord-types";
-import { findByPropsLazy, findExportedComponentLazy, findStoreLazy } from "@webpack";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { Alerts, ChannelActionCreators, ChannelRouter, ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, IconUtils, MediaEngineStore, MessageStore, NavigationRouter, React, ReadStateStore, ReadStateUtils, SelectedChannelStore, SelectedGuildStore, SettingsRouter, StreamerModeStore, Toasts, useEffect, UserStore, VoiceActions } from "@webpack/common";
 import type { FC, ReactElement, ReactNode } from "react";
-import { Settings } from "Vencord";
 
 import commandPalette from ".";
 import {
@@ -801,7 +801,6 @@ const runtimeCleanupCallbacks: Array<() => void> = [];
 const NotificationSettingsActionCreators = findByPropsLazy("updateGuildNotificationSettings", "updateChannelOverrideSettings");
 const GuildSettingsActions = findByPropsLazy("open", "selectRole", "updateGuild");
 const GuildMembershipActions = findByPropsLazy("leaveGuild");
-const HeadphonesIcon = findExportedComponentLazy("HeadphonesIcon");
 const UserGuildSettingsStore = findStoreLazy("UserGuildSettingsStore");
 const NotificationsInboxStore = findStoreLazy("NotificationsInboxStore") as NotificationsInboxStoreLike;
 const RecentMentionsStore = findStoreLazy("RecentMentionsStore") as RecentMentionsStoreLike;
diff --git a/src/equicordplugins/commandPalette/ui/CommandPaletteActionBar.tsx b/src/equicordplugins/commandPalette/ui/CommandPaletteActionBar.tsx
index d6655909b..8b8c6606e 100644
--- a/src/equicordplugins/commandPalette/ui/CommandPaletteActionBar.tsx
+++ b/src/equicordplugins/commandPalette/ui/CommandPaletteActionBar.tsx
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { EquicordIcon } from "@equicordplugins/components.dev/components/icons/EquicordIcon";
+import { EquicordIcon } from "@equicordplugins/discordDevBanner/components";
 import { IS_MAC } from "@utils/constants";
 import { classNameFactory } from "@utils/css";
 import { classes } from "@utils/misc";
diff --git a/src/equicordplugins/commandPalette/ui/CommandPaletteCalculatorCards.tsx b/src/equicordplugins/commandPalette/ui/CommandPaletteCalculatorCards.tsx
index 9eaf47254..9fac29e63 100644
--- a/src/equicordplugins/commandPalette/ui/CommandPaletteCalculatorCards.tsx
+++ b/src/equicordplugins/commandPalette/ui/CommandPaletteCalculatorCards.tsx
@@ -229,8 +229,15 @@ function GraphView({ result }: { result: CalculatorResult; }) {
                         onMouseMove={event => {
                             const bounds = svgRef.current?.getBoundingClientRect();
                             if (!bounds) return;
-                            const scaleX = bounds.width / GRAPH_WIDTH;
-                            const localX = (event.clientX - bounds.left) / scaleX;
+
+                            const viewAspect = GRAPH_WIDTH / GRAPH_HEIGHT;
+                            const boundsAspect = bounds.width / bounds.height;
+                            const renderedWidth = boundsAspect > viewAspect
+                                ? bounds.height * viewAspect
+                                : bounds.width;
+                            const renderedLeft = bounds.left + (bounds.width - renderedWidth) / 2;
+                            const scaleX = renderedWidth / GRAPH_WIDTH;
+                            const localX = (event.clientX - renderedLeft) / scaleX;
                             const innerX = clamp(localX - GRAPH_PADDING_X, 0, GRAPH_INNER_WIDTH);
                             const clampedRatio = innerX / GRAPH_INNER_WIDTH;
                             const nextX = graph.domain[0] + (graph.domain[1] - graph.domain[0]) * clampedRatio;
diff --git a/src/equicordplugins/commandPalette/ui/pages/specs/statusTimerPage.ts b/src/equicordplugins/commandPalette/ui/pages/specs/statusTimerPage.ts
index cbf1061eb..a931c0cb7 100644
--- a/src/equicordplugins/commandPalette/ui/pages/specs/statusTimerPage.ts
+++ b/src/equicordplugins/commandPalette/ui/pages/specs/statusTimerPage.ts
@@ -4,12 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { findExportedComponentLazy } from "@webpack";
+import { TimerIcon } from "@plugins/callTimer/TimerIcon";
 
 import { cancelScheduledStatusReset, setStatusDndForDuration } from "../../../registry";
 import type { PalettePageSpec, PaletteSuggestion } from "../types";
 
-const TimerIcon = findExportedComponentLazy("TimerIcon");
 const DURATION_CHOICES = [
     { id: "15", label: "15 minutes", icon: TimerIcon },
     { id: "30", label: "30 minutes", icon: TimerIcon },
diff --git a/src/equicordplugins/components.dev/components/ComponentsTab.tsx b/src/equicordplugins/components.dev/components/ComponentsTab.tsx
deleted file mode 100644
index 724a76cc9..000000000
--- a/src/equicordplugins/components.dev/components/ComponentsTab.tsx
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Heading } from "@components/Heading";
-import { SettingsTab, wrapTab } from "@components/settings";
-import { Margins } from "@utils/margins";
-import { TabBar, useMemo, useState } from "@webpack/common";
-
-import { SearchBar } from ".";
-import AccordionTab from "./tabs/AccordionTab";
-import AlertTab from "./tabs/AlertTab";
-import AnchorTab from "./tabs/AnchorTab";
-import AnimationsTab from "./tabs/AnimationsTab";
-import AvatarTab from "./tabs/AvatarTab";
-import BadgeTab from "./tabs/BadgeTab";
-import ButtonsTab from "./tabs/ButtonsTab";
-import CalendarTab from "./tabs/CalendarTab";
-import CardTab from "./tabs/CardTab";
-import CheckboxGroupTab from "./tabs/CheckboxGroupTab";
-import CheckboxTab from "./tabs/CheckboxTab";
-import ChipTab from "./tabs/ChipTab";
-import ClickableTab from "./tabs/ClickableTab";
-import CodeBlockTab from "./tabs/CodeBlockTab";
-import ColorPickerTab from "./tabs/ColorPickerTab";
-import ComboboxTab from "./tabs/ComboboxTab";
-import DividerTab from "./tabs/DividerTab";
-import ErrorBoundaryTab from "./tabs/ErrorBoundaryTab";
-import FocusLockTab from "./tabs/FocusLockTab";
-import GuildIconTab from "./tabs/GuildIconTab";
-import HeadingTab from "./tabs/HeadingTab";
-import LayerModalTab from "./tabs/LayerModalTab";
-import ListboxTab from "./tabs/ListboxTab";
-import MenuTab from "./tabs/MenuTab";
-import ModalTab from "./tabs/ModalTab";
-import NoticeTab from "./tabs/NoticeTab";
-import PaginatorTab from "./tabs/PaginatorTab";
-import PopoverTab from "./tabs/PopoverTab";
-import ProgressBarTab from "./tabs/ProgressBarTab";
-import RadioGroupTab from "./tabs/RadioGroupTab";
-import RichTooltipTab from "./tabs/RichTooltipTab";
-import ScrollerTab from "./tabs/ScrollerTab";
-import SearchBarTab from "./tabs/SearchBarTab";
-import SelectTab from "./tabs/SelectTab";
-import SkeletonTab from "./tabs/SkeletonTab";
-import SliderTab from "./tabs/SliderTab";
-import SpinnerTab from "./tabs/SpinnerTab";
-import SwitchTab from "./tabs/SwitchTab";
-import TabBarTab from "./tabs/TabBarTab";
-import TextAreaTab from "./tabs/TextAreaTab";
-import TextButtonTab from "./tabs/TextButtonTab";
-import TextInputTab from "./tabs/TextInputTab";
-import TimestampTab from "./tabs/TimestampTab";
-import ToastTab from "./tabs/ToastTab";
-import TooltipTab from "./tabs/TooltipTab";
-import TypographyTab from "./tabs/TypographyTab";
-import UserSummaryItemTab from "./tabs/UserSummaryItemTab";
-
-const TABS = [
-    { id: "accordion", label: "Accordion" },
-    { id: "alert", label: "Alert" },
-    { id: "animations", label: "Animations" },
-    { id: "anchor", label: "Anchor" },
-    { id: "avatar", label: "Avatar" },
-    { id: "badge", label: "Badge" },
-    { id: "buttons", label: "Buttons" },
-    { id: "calendar", label: "Calendar" },
-    { id: "card", label: "Card" },
-    { id: "chip", label: "Chip" },
-    { id: "checkbox", label: "Checkbox" },
-    { id: "checkboxgroup", label: "CheckboxGroup" },
-    { id: "clickable", label: "Clickable" },
-    { id: "codeblock", label: "CodeBlock" },
-    { id: "colorpicker", label: "ColorPicker" },
-    { id: "combobox", label: "Combobox" },
-    { id: "divider", label: "Divider" },
-    { id: "errorboundary", label: "ErrorBoundary" },
-    { id: "focuslock", label: "FocusLock" },
-    { id: "guildicon", label: "GuildIcon" },
-    { id: "heading", label: "Heading" },
-    { id: "layermodal", label: "LayerModal" },
-    { id: "listbox", label: "Listbox" },
-    { id: "menu", label: "Menu" },
-    { id: "modal", label: "Modal" },
-    { id: "notice", label: "Notice" },
-    { id: "paginator", label: "Paginator" },
-    { id: "popover", label: "Popover" },
-    { id: "progressbar", label: "ProgressBar" },
-    { id: "radiogroup", label: "RadioGroup" },
-    { id: "richtooltip", label: "RichTooltip" },
-    { id: "scroller", label: "Scroller" },
-    { id: "searchbar", label: "SearchBar" },
-    { id: "select", label: "Select" },
-    { id: "skeleton", label: "Skeleton" },
-    { id: "slider", label: "Slider" },
-    { id: "spinner", label: "Spinner" },
-    { id: "switch", label: "Switch" },
-    { id: "tabbar", label: "TabBar" },
-    { id: "textarea", label: "TextArea" },
-    { id: "textbutton", label: "TextButton" },
-    { id: "textinput", label: "TextInput" },
-    { id: "timestamp", label: "Timestamp" },
-    { id: "toast", label: "Toast" },
-    { id: "tooltip", label: "Tooltip" },
-    { id: "typography", label: "Typography" },
-    { id: "usersummaryitem", label: "UserSummaryItem" },
-
-].sort((a, b) => a.label.localeCompare(b.label));
-
-type TabId = typeof TABS[number]["id"];
-
-const TAB_COMPONENTS: Record<TabId, React.ComponentType> = {
-    accordion: AccordionTab,
-    alert: AlertTab,
-    animations: AnimationsTab,
-    anchor: AnchorTab,
-    avatar: AvatarTab,
-    badge: BadgeTab,
-    buttons: ButtonsTab,
-    calendar: CalendarTab,
-    card: CardTab,
-    chip: ChipTab,
-    checkbox: CheckboxTab,
-    checkboxgroup: CheckboxGroupTab,
-    clickable: ClickableTab,
-    codeblock: CodeBlockTab,
-    colorpicker: ColorPickerTab,
-    combobox: ComboboxTab,
-    divider: DividerTab,
-    errorboundary: ErrorBoundaryTab,
-    focuslock: FocusLockTab,
-    guildicon: GuildIconTab,
-    heading: HeadingTab,
-    layermodal: LayerModalTab,
-    listbox: ListboxTab,
-    menu: MenuTab,
-    modal: ModalTab,
-    notice: NoticeTab,
-    paginator: PaginatorTab,
-    popover: PopoverTab,
-    progressbar: ProgressBarTab,
-    radiogroup: RadioGroupTab,
-    richtooltip: RichTooltipTab,
-    scroller: ScrollerTab,
-    searchbar: SearchBarTab,
-    select: SelectTab,
-    skeleton: SkeletonTab,
-    slider: SliderTab,
-    spinner: SpinnerTab,
-    switch: SwitchTab,
-    tabbar: TabBarTab,
-    textarea: TextAreaTab,
-    textbutton: TextButtonTab,
-    textinput: TextInputTab,
-    timestamp: TimestampTab,
-    toast: ToastTab,
-    tooltip: TooltipTab,
-    typography: TypographyTab,
-    usersummaryitem: UserSummaryItemTab,
-};
-
-function ComponentsTab() {
-    const [currentTab, setCurrentTab] = useState<TabId>("avatar");
-    const [search, setSearch] = useState("");
-    const TabComponent = TAB_COMPONENTS[currentTab];
-
-    const filteredTabs = useMemo(() => {
-        if (!search.trim()) return TABS;
-        const query = search.toLowerCase();
-        return TABS.filter(tab => tab.label.toLowerCase().includes(query));
-    }, [search]);
-
-    return (
-        <SettingsTab>
-            <Heading className={Margins.bottom16}>Components</Heading>
-            <div className="vc-compfinder-search">
-                <SearchBar
-                    query={search}
-                    onChange={setSearch}
-                    onClear={() => setSearch("")}
-                    placeholder="Search components..."
-                />
-            </div>
-            <TabBar
-                type="top"
-                look="brand"
-                selectedItem={currentTab}
-                onItemSelect={setCurrentTab}
-                className="vc-compfinder-tabbar"
-            >
-                {filteredTabs.map(tab => (
-                    <TabBar.Item key={tab.id} id={tab.id} className="vc-compfinder-tab">
-                        {tab.label}
-                    </TabBar.Item>
-                ))}
-            </TabBar>
-            <div className="vc-compfinder-content">
-                <ErrorBoundary message={`Failed to render ${currentTab} tab`}>
-                    <TabComponent />
-                </ErrorBoundary>
-            </div>
-        </SettingsTab>
-    );
-}
-
-export default wrapTab(ComponentsTab, "ComponentsTab");
diff --git a/src/equicordplugins/components.dev/components/DocPage.tsx b/src/equicordplugins/components.dev/components/DocPage.tsx
deleted file mode 100644
index 59de63cae..000000000
--- a/src/equicordplugins/components.dev/components/DocPage.tsx
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2026 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { CodeBlock } from "@components/CodeBlock";
-import { classNameFactory } from "@utils/css";
-
-import { DiscordHeading, DiscordText, Divider, InlineCode, Notice, Paragraph } from ".";
-
-const cl = classNameFactory("vc-compfinder-");
-
-export interface PropDef {
-    name: string;
-    type: string;
-    default?: string;
-    required?: boolean;
-    internal?: boolean;
-    description: string;
-}
-
-export interface DocNotice {
-    type: "info" | "warn" | "danger" | "positive";
-    children: React.ReactNode;
-}
-
-export interface DemoSection {
-    title: string;
-    description?: string;
-    children: React.ReactNode;
-    code?: string;
-    relevantProps?: string[];
-    notice?: DocNotice;
-    id?: string;
-}
-
-export interface PropGroup {
-    title: string;
-    props: PropDef[];
-}
-
-export interface CodeExample {
-    label: string;
-    code: string;
-}
-
-export interface DocPageConfig {
-    overview: string;
-    importPath: string;
-    sections?: DemoSection[];
-    demos?: DemoSection[];
-    props: PropDef[] | PropGroup[];
-    examples?: CodeExample[];
-    componentName?: string;
-    notices?: DocNotice[];
-    showToc?: boolean;
-}
-
-function isGrouped(props: PropDef[] | PropGroup[]): props is PropGroup[] {
-    return props.length > 0 && "props" in props[0];
-}
-
-function allProps(props: PropDef[] | PropGroup[]): PropDef[] {
-    return isGrouped(props) ? props.flatMap(g => g.props) : props;
-}
-
-function generateId(title: string): string {
-    return title.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-}
-
-function PropsTable({ props, showLegend }: { props: PropDef[]; showLegend?: boolean; }) {
-    const hasRequired = props.some(p => p.required);
-    const hasInternal = props.some(p => p.internal);
-    return (
-        <>
-            <div className={cl("table-wrapper")}>
-                <table className={cl("table")}>
-                    <thead>
-                        <tr>
-                            <th>FIELD</th>
-                            <th>TYPE</th>
-                            <th>DEFAULT</th>
-                            <th>DESCRIPTION</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {props.map(p => (
-                            <tr key={p.name} className={p.required ? cl("table-row-required") : p.internal ? cl("table-row-internal") : undefined}>
-                                <td>
-                                    <span className={cl("table-field")}>{p.name}</span>
-                                </td>
-                                <td><InlineCode>{p.type}</InlineCode></td>
-                                <td>{p.default ?? <span className={cl("table-dash")}>-</span>}</td>
-                                <td className={cl("table-desc")}>{p.description}</td>
-                            </tr>
-                        ))}
-                    </tbody>
-                </table>
-            </div>
-            {showLegend && (hasRequired || hasInternal) && (
-                <div className={cl("table-legend")}>
-                    {hasRequired && <span className={cl("table-legend-item")}><span className={cl("table-legend-bar", "table-legend-required")} /> Required</span>}
-                    {hasInternal && <span className={cl("table-legend-item")}><span className={cl("table-legend-bar", "table-legend-internal")} /> Internal</span>}
-                </div>
-            )}
-        </>
-    );
-}
-
-function TableOfContents({ entries }: { entries: { id: string; label: string; }[]; }) {
-    return (
-        <div className={cl("toc")}>
-            <DiscordText variant="text-xs/semibold" color="text-muted" className={cl("toc-label")}>
-                ON THIS PAGE
-            </DiscordText>
-            <div className={cl("toc-links")}>
-                {entries.map(entry => (
-                    <a
-                        key={entry.id}
-                        className={cl("toc-link")}
-                        href={`#${entry.id}`}
-                        onClick={e => {
-                            e.preventDefault();
-                            document.getElementById(entry.id)?.scrollIntoView({ behavior: "smooth", block: "start" });
-                        }}
-                    >
-                        {entry.label}
-                    </a>
-                ))}
-            </div>
-        </div>
-    );
-}
-
-function MajorSection({ title, id, children }: { title: string; id: string; children: React.ReactNode; }) {
-    return (
-        <div id={id} className={cl("doc-section")}>
-            <DiscordHeading variant="heading-lg/semibold" color="text-strong">{title}</DiscordHeading>
-            {children}
-        </div>
-    );
-}
-
-function DemoSectionBlock({ section, relevantProps }: { section: DemoSection; relevantProps: PropDef[] | null; }) {
-    const id = section.id ?? generateId(section.title);
-    return (
-        <div id={id} className={cl("doc-section")}>
-            <DiscordHeading variant="heading-md/semibold" color="text-strong">{section.title}</DiscordHeading>
-            {section.notice && (
-                <Notice messageType={section.notice.type}>{section.notice.children}</Notice>
-            )}
-            {section.description && (
-                <Paragraph color="text-muted">{section.description}</Paragraph>
-            )}
-            <div className={cl("doc-demo")}>
-                {section.children}
-            </div>
-            {section.code && (
-                <CodeBlock content={section.code} lang="tsx" />
-            )}
-            {relevantProps && (
-                <div className={cl("doc-relevant-props")}>
-                    <PropsTable props={relevantProps} />
-                </div>
-            )}
-        </div>
-    );
-}
-
-export function DocPage({ componentName, overview, importPath, sections, demos, props, examples, notices, showToc }: DocPageConfig) {
-    const items = sections ?? demos ?? [];
-    const flat = allProps(props);
-
-    const tocEntries = [
-        { id: "overview", label: "Overview" },
-        { id: "import", label: "Import" },
-        ...items.map(s => ({ id: s.id ?? generateId(s.title), label: s.title })),
-        { id: "api-reference", label: "API Reference" },
-        ...(examples?.length ? [{ id: "examples", label: "Examples" }] : []),
-    ];
-
-    const shouldShowToc = showToc ?? items.length >= 4;
-
-    return (
-        <div className={cl("doc-page")}>
-            {componentName && (
-                <DiscordHeading variant="heading-xl/bold" color="text-strong" className={cl("doc-title")}>
-                    {componentName}
-                </DiscordHeading>
-            )}
-
-            <div id="overview" className={cl("doc-section")}>
-                <DiscordHeading variant="heading-lg/semibold" color="text-strong">Overview</DiscordHeading>
-                <Paragraph color="text-muted">{overview}</Paragraph>
-            </div>
-
-            {notices?.map((notice, i) => (
-                <Notice key={i} messageType={notice.type}>{notice.children}</Notice>
-            ))}
-
-            {shouldShowToc && <TableOfContents entries={tocEntries} />}
-
-            <Divider />
-
-            <div id="import" className={cl("doc-section")}>
-                <div className={cl("import-block")}>
-                    <DiscordText variant="text-xs/semibold" color="text-muted" className={cl("import-label")}>
-                        IMPORT
-                    </DiscordText>
-                    <CodeBlock content={importPath} lang="tsx" />
-                </div>
-            </div>
-
-            {items.map(section => {
-                const relevant = section.relevantProps?.length
-                    ? flat.filter(p => section.relevantProps!.includes(p.name))
-                    : null;
-
-                return [
-                    <Divider key={`${section.title}-divider`} />,
-                    <DemoSectionBlock key={section.title} section={section} relevantProps={relevant} />,
-                ];
-            })}
-
-            <Divider />
-
-            <MajorSection title="API Reference" id="api-reference">
-                {isGrouped(props) ? (
-                    props.map(group => (
-                        <div key={group.title} className={cl("doc-prop-group")}>
-                            <DiscordHeading variant="heading-md/medium" color="text-strong">
-                                {group.title}
-                            </DiscordHeading>
-                            <PropsTable props={group.props} showLegend />
-                        </div>
-                    ))
-                ) : (
-                    <PropsTable props={props} showLegend />
-                )}
-            </MajorSection>
-
-            {examples?.length ? (
-                <>
-                    <Divider />
-                    <MajorSection title="Examples" id="examples">
-                        {examples.map(ex => (
-                            <div key={ex.label} className={cl("doc-example")}>
-                                <Paragraph color="text-muted">{ex.label}</Paragraph>
-                                <CodeBlock content={ex.code} lang="tsx" />
-                            </div>
-                        ))}
-                    </MajorSection>
-                </>
-            ) : null}
-        </div>
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/SectionWrapper.tsx b/src/equicordplugins/components.dev/components/SectionWrapper.tsx
deleted file mode 100644
index be236a9c3..000000000
--- a/src/equicordplugins/components.dev/components/SectionWrapper.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Heading } from "@components/Heading";
-import { Margins } from "@utils/margins";
-import { classes } from "@utils/misc";
-
-interface SectionWrapperProps {
-    title: string;
-    children: React.ReactNode;
-}
-
-export function SectionWrapper({ title, children }: SectionWrapperProps) {
-    return (
-        <div className={classes("vc-compfinder-section-block", Margins.bottom16)}>
-            <Heading tag="h3" className={Margins.bottom8}>{title}</Heading>
-            {children}
-        </div>
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/icons/EquicordIcon.tsx b/src/equicordplugins/components.dev/components/icons/EquicordIcon.tsx
deleted file mode 100644
index 4999f587b..000000000
--- a/src/equicordplugins/components.dev/components/icons/EquicordIcon.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export function EquicordIcon({ className, size, color }: { className?: string; size?: string; color?: string; }) {
-    const dimension = size === "xs" ? 12 : size === "sm" ? 16 : size === "lg" ? 24 : 20;
-    return (
-        <svg className={className} viewBox="0 0 443 443" width={dimension} height={dimension}>
-            <path fill={color || "currentColor"} d="M221.5.6C99.2.6,0,99.7,0,222.1s99.2,221.5,221.5,221.5,221.5-99.2,221.5-221.5S343.8.6,221.5.6ZM221.5,363.3c-78.3,0-141.8-63.5-141.8-141.8s63.5-141.8,141.8-141.8,141.8,63.5,141.8,141.8-63.5,141.8-141.8,141.8Z" />
-            <path fill={color || "currentColor"} d="M438.3,175C421,90.1,354.7,23.1,269.9,5.1,145-21.3,33.1,57.6,6.2,169.5c-3.4,14.1,4.6,28.5,18.4,33.1l2.7.9c24.7,8.2,51.8-4.7,60.4-29.3,19.4-55.6,72.5-95.4,134.9-95,44.3.3,84.1,21.2,109.9,53.7l-63.3,29.5c-7.9-7-17.5-12.5-28.5-15.7-35.6-10.3-73.8,7.7-88.5,41.7-17.2,39.8,3.3,85.4,43.9,99.4,37.9,13,79.7-6.9,93.5-44.5,2.6-7.2,4.1-14.5,4.4-21.8l66-30.8c1.8,8.2,2.9,16.6,3.2,25.2,1.2,34-9.6,65.5-28.5,90.5-17.8,23.6-10.5,57.4,15.7,71.1l1.3.7c10.4,5.5,23.3,3.4,31.4-5.2,46.8-49.9,70.8-121.4,55.2-198Z" />
-            <path fill={color || "currentColor"} transform="translate(319.7 -16.5) rotate(65)" d="M172.8,152.7h0c17.7,0,32,14.3,32,32v148h-64v-148c0-17.7,14.3-32,32-32Z" />
-        </svg>
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/index.tsx b/src/equicordplugins/components.dev/components/index.tsx
deleted file mode 100644
index d55c8b8dc..000000000
--- a/src/equicordplugins/components.dev/components/index.tsx
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Button } from "@components/Button";
-import { Card } from "@components/Card";
-import { Heading } from "@components/Heading";
-import { Paragraph } from "@components/Paragraph";
-import { TooltipContainer } from "@components/TooltipContainer";
-import { proxyLazy } from "@utils/lazy";
-import { filters, findByCodeLazy, findByPropsLazy, findComponentByCodeLazy, findCssClassesLazy, findLazy, mapMangledModuleLazy, waitFor, wreq } from "@webpack";
-import {
-    GuildStore,
-    ListScrollerAuto,
-    ListScrollerThin,
-    OAuth2AuthorizeModal,
-    ScrollerAuto,
-    ScrollerNone,
-    ScrollerThin,
-    SearchableSelect,
-    TabBar,
-    useEffect,
-    useRef,
-    UserStore,
-    useState,
-} from "@webpack/common";
-
-import { ToastPosition, ToastType } from "../constants";
-import type {
-    AccordionProps,
-    AlertsType,
-    AnchorProps,
-    AvatarProps,
-    BadgeShapesType,
-    ChipProps,
-    CircleBadgeProps,
-    ClickableProps,
-    ColorPickerProps,
-    ColorPickerWithSwatchesProps,
-    ColorSwatchProps,
-    ConfirmModalProps,
-    ContextMenuApiType,
-    CustomColorButtonProps,
-    DefaultColorButtonProps,
-    DiscordHeadingProps,
-    DiscordTextProps,
-    ErrorBoundaryProps,
-    ExpressiveModalProps,
-    FocusLockProps,
-    GuildIconProps,
-    IconBadgeProps,
-    LocalErrorBoundaryProps,
-    ManaBaseRadioGroupProps,
-    ManaButtonProps,
-    ManaCalendarProps,
-    ManaCheckboxGroupProps,
-    ManaCheckboxProps,
-    ManaComboboxProps,
-    ManaDatePickerProps,
-    ManaListboxProps,
-    ManaPopoverProps,
-    ManaRichTooltipProps,
-    ManaSelectProps,
-    ManaSwitchProps,
-    ManaTextAreaProps,
-    ManaTextButtonProps,
-    ManaTextInputProps,
-    ManaTooltipProps,
-    MenuType,
-    ModalProps,
-    ModalRenderFn,
-    NoticeProps,
-    NumberBadgeProps,
-    OpenModalOptions,
-    PaginatorProps,
-    PremiumBadgeProps,
-    ProgressBarProps,
-    SearchBarProps,
-    SimpleErrorBoundaryProps,
-    SkeletonProps,
-    SliderProps,
-    SpinnerComponent,
-    StandaloneRadioIndicatorProps,
-    TextBadgeProps,
-    TimestampProps,
-    ToastData,
-    ToastOptions,
-    ToastsModule,
-    ToastTypeValue,
-    UserSummaryItemProps,
-} from "../types";
-
-export * from "../constants";
-export type * from "../types";
-
-export {
-    Button,
-    Card,
-    GuildStore,
-    Heading,
-    ListScrollerAuto,
-    ListScrollerThin,
-    OAuth2AuthorizeModal,
-    Paragraph,
-    ScrollerAuto,
-    ScrollerNone,
-    ScrollerThin,
-    SearchableSelect,
-    TabBar,
-    TooltipContainer,
-    useEffect,
-    useRef,
-    UserStore,
-    useState,
-};
-
-export const Anchor = findComponentByCodeLazy("getDefaultLinkInterceptor", "useDefaultUnderlineStyles") as React.ComponentType<AnchorProps>;
-export const Clickable = findByCodeLazy("ignoreKeyPress", "renderNonInteractive") as React.ComponentType<ClickableProps>;
-
-export const ManaButton = findComponentByCodeLazy('"data-mana-component":"button"') as React.ComponentType<ManaButtonProps>;
-export const ManaTextButton = findComponentByCodeLazy('"data-mana-component":"text-button"') as React.ComponentType<ManaTextButtonProps>;
-export const ManaSwitch = findComponentByCodeLazy('"data-mana-component":"switch"') as React.ComponentType<ManaSwitchProps>;
-export const ManaTextInput = findComponentByCodeLazy('"data-mana-component":"text-input"') as React.ComponentType<ManaTextInputProps>;
-export const ManaTextArea = findComponentByCodeLazy('"data-mana-component":"text-area"') as React.ComponentType<ManaTextAreaProps>;
-export const ManaCheckbox = findComponentByCodeLazy('"data-mana-component":"checkbox"') as React.ComponentType<ManaCheckboxProps>;
-export const ManaSelect = findComponentByCodeLazy('"data-mana-component":"select"') as React.ComponentType<ManaSelectProps>;
-export const ManaCalendar = findComponentByCodeLazy('"data-mana-component":"calendar"') as React.ComponentType<ManaCalendarProps>;
-export const ManaDatePicker = findComponentByCodeLazy('"data-mana-component":"date-picker"') as React.ComponentType<ManaDatePickerProps>;
-export const ManaListbox = findComponentByCodeLazy('"data-mana-component":"listbox"') as React.ComponentType<ManaListboxProps>;
-export const ManaCheckboxGroup = findComponentByCodeLazy('"data-mana-component":"checkbox-group"') as React.ComponentType<ManaCheckboxGroupProps>;
-export const ManaBaseRadioGroup = findComponentByCodeLazy('"data-mana-component":"BaseRadioGroup"') as React.ComponentType<ManaBaseRadioGroupProps>;
-export const ManaCombobox = findComponentByCodeLazy("itemToString", "multiSelect", "maxVisibleItems") as React.ComponentType<ManaComboboxProps>;
-export const ManaTooltip = findComponentByCodeLazy("VoidTooltip cannot find DOM node") as React.ComponentType<ManaTooltipProps>;
-export const ManaRichTooltip = findComponentByCodeLazy('"data-mana-component":"rich-tooltip"') as React.ComponentType<ManaRichTooltipProps>;
-export const ManaPopover = findByCodeLazy("title", "body", "badge", "graphic", "actions", "textLink", "gradientColor", "popoverRef") as React.ComponentType<ManaPopoverProps>;
-export const StandaloneRadioIndicator = findComponentByCodeLazy("standaloneRadioIndicator", "animateIn", "animateOut") as React.ComponentType<StandaloneRadioIndicatorProps>;
-
-export const Slider = findComponentByCodeLazy("stickToMarkers", "onMarkerRender", "grabberClassName") as React.ComponentType<SliderProps>;
-export const Avatar = findComponentByCodeLazy("statusTooltip", "statusBackdropColor", "isSpeaking") as React.ComponentType<AvatarProps>;
-export const ProgressBar = findComponentByCodeLazy("progressContainer", "labelledBy", "aria-valuenow") as React.ComponentType<ProgressBarProps>;
-export const Spinner = findComponentByCodeLazy("spinningCircleSimple", "pulsingEllipsis", "wanderingCubes") as unknown as SpinnerComponent;
-export const SearchBar = findComponentByCodeLazy("#{intl::SEARCH}", "clearable", "autoComplete") as React.ComponentType<SearchBarProps>;
-export const Paginator = findComponentByCodeLazy("#{intl::BACK}", "#{intl::NEXT}", "renderPageWrapper") as React.ComponentType<PaginatorProps>;
-export const Notice = findComponentByCodeLazy("messageType", '="text-default"', '="text-sm/medium"') as React.ComponentType<NoticeProps>;
-export const Chip = findComponentByCodeLazy('variant:"eyebrow"', "chip,") as React.ComponentType<ChipProps>;
-export const Skeleton = findComponentByCodeLazy("withHeader:t=!0,size:") as React.ComponentType<SkeletonProps>;
-export const Accordion = findComponentByCodeLazy("scrollHeight)}", "onExpandedChange", "defaultExpanded") as React.ComponentType<AccordionProps>;
-export const Timestamp = findComponentByCodeLazy("#{intl::MESSAGE_EDITED_TIMESTAMP_A11Y_LABEL}", "isVisibleOnlyOnHover") as React.ComponentType<TimestampProps>;
-export const GuildIcon = findComponentByCodeLazy("Masks.CLAN_ICON,width", "acronymClassName") as React.ComponentType<GuildIconProps>;
-export const ColorPicker = findComponentByCodeLazy("#{intl::USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR}", "showEyeDropper") as React.ComponentType<ColorPickerProps>;
-export const FocusLock = findComponentByCodeLazy(".containerRef,{keyboardModeEnabled:") as React.ComponentType<FocusLockProps>;
-export const UserSummaryItem = findComponentByCodeLazy("popoutUserId") as React.ComponentType<UserSummaryItemProps>;
-
-export const Animations = findByPropsLazy("useSpring", "animated", "useTransition");
-
-export const SpringConfigs = proxyLazy(() => Animations.config) as {
-    default: object;
-    gentle: object;
-    wobbly: object;
-    stiff: object;
-    slow: object;
-    molasses: object;
-};
-
-export const useSpring = proxyLazy(() => Animations.useSpring) as (config: object) => object;
-export const useTransition = proxyLazy(() => Animations.useTransition) as <T>(items: T[], config: object) => (callback: (style: object, item: T) => React.ReactNode) => React.ReactNode[];
-export const useTrail = proxyLazy(() => Animations.useTrail) as (count: number, config: object) => object[];
-
-const ColorPickerModule = findLazy(m => {
-    const values = Object.values(m);
-    return values.length === 4 &&
-        values.some(v => typeof v === "function" && v.toString?.().includes('id:"color-picker"')) &&
-        values.some(v => typeof v === "function" && v.toString?.().includes("isDefault:!0"));
-});
-
-function getColorPickerExport(check: (fn: Function) => boolean): React.ComponentType<any> {
-    for (const value of Object.values(ColorPickerModule)) {
-        if (typeof value === "function" && check(value)) return value as React.ComponentType<any>;
-    }
-    return (() => null) as React.ComponentType<any>;
-}
-
-export const ColorPickerWithSwatches: React.ComponentType<ColorPickerWithSwatchesProps> = proxyLazy(() =>
-    getColorPickerExport(fn => fn.toString().includes('id:"color-picker"'))
-);
-export const ColorSwatch: React.ComponentType<ColorSwatchProps> = proxyLazy(() =>
-    getColorPickerExport(fn => fn.toString().includes("isDefault") && fn.toString().includes("isCustom") && fn.toString().includes("colorPickerSwatch"))
-);
-export const DefaultColorButton: React.ComponentType<DefaultColorButtonProps> = proxyLazy(() =>
-    getColorPickerExport(fn => fn.toString().includes("isDefault:!0") && fn.toString().includes("allowBlackCustomColor"))
-);
-export const CustomColorButton: React.ComponentType<CustomColorButtonProps> = proxyLazy(() =>
-    getColorPickerExport(fn => fn.toString().includes("isCustom:!0") && fn.toString().includes("presets"))
-);
-
-const BadgeModule = findLazy(m => {
-    const values = Object.values(m);
-    return values.length < 15 &&
-        values.some(v => typeof v === "function" && v.toString?.().includes("BADGE_NOTIFICATION_BACKGROUND")) &&
-        values.some(v => typeof v === "object" && (v as BadgeShapesType)?.ROUND && (v as BadgeShapesType)?.ROUND_LEFT);
-});
-
-function getBadgeExport(check: (fn: Function) => boolean): React.ComponentType<any> {
-    for (const value of Object.values(BadgeModule)) {
-        if (typeof value === "function" && check(value)) return value as React.ComponentType<any>;
-    }
-    return (() => null) as React.ComponentType<any>;
-}
-
-export const NumberBadge: React.ComponentType<NumberBadgeProps> = proxyLazy(() =>
-    getBadgeExport(fn => fn.toString().includes("numberBadge"))
-);
-export const TextBadge: React.ComponentType<TextBadgeProps> = proxyLazy(() =>
-    getBadgeExport(fn => fn.toString().includes("textBadge"))
-);
-export const IconBadge: React.ComponentType<IconBadgeProps> = proxyLazy(() =>
-    getBadgeExport(fn => fn.toString().includes("iconBadge"))
-);
-export const CircleBadge: React.ComponentType<CircleBadgeProps> = proxyLazy(() =>
-    getBadgeExport(fn =>
-        fn.toString().includes("disableColor") &&
-        !fn.toString().includes("iconBadge") &&
-        !fn.toString().includes("textBadge") &&
-        !fn.toString().includes("numberBadge") &&
-        !fn.toString().includes("premiumBadge")
-    )
-);
-export const PremiumBadge: React.ComponentType<PremiumBadgeProps> = proxyLazy(() =>
-    getBadgeExport(fn => fn.toString().includes("premiumBadge"))
-);
-export const BadgeShapes = proxyLazy(() =>
-    Object.values(BadgeModule).find(v => typeof v === "object" && (v as BadgeShapesType)?.ROUND) as BadgeShapesType ??
-    { ROUND: "", ROUND_LEFT: "", ROUND_RIGHT: "", SQUARE: "" }
-);
-
-export const getBadgeWidthForValue: (count: number) => number = proxyLazy(() => {
-    for (const value of Object.values(BadgeModule)) {
-        if (typeof value === "function" && value.toString().includes("e<10?16:e<100")) return value as (count: number) => number;
-    }
-    return (count: number) => count < 10 ? 16 : count < 100 ? 22 : 30;
-});
-
-export const getBadgeCountString: (count: number) => string = proxyLazy(() => {
-    for (const value of Object.values(BadgeModule)) {
-        if (typeof value === "function" && value.toString().includes("e<1e3")) return value as (count: number) => string;
-    }
-    return (count: number) => count < 1000 ? `${count}` : `${Math.min(Math.floor(count / 1000), 9)}k+`;
-});
-
-const ToastsModule = findByPropsLazy("showToast", "popToast");
-export const Toasts: ToastsModule = proxyLazy(() => ({
-    Type: ToastType,
-    Position: ToastPosition,
-    genId: () => Math.random().toString(36).slice(2),
-    show: (toast: ToastData) => ToastsModule.showToast(toast),
-    pop: () => ToastsModule.popToast(),
-    create: (message: string, type: ToastTypeValue, options?: ToastOptions) => ToastsModule.createToast(message, type, options),
-}));
-
-export const showToast = (message: string, type: ToastTypeValue = ToastType.MESSAGE) =>
-    ToastsModule.showToast(ToastsModule.createToast(message, type));
-
-const ModalModule = findByPropsLazy("Modal", "ConfirmModal");
-const ModalAPIModule = findByPropsLazy("openModal", "closeModal");
-
-export const Modal: React.ComponentType<ModalProps> = proxyLazy(() => ModalModule.Modal);
-export const ConfirmModal: React.ComponentType<ConfirmModalProps> = proxyLazy(() => ModalModule.ConfirmModal);
-export const ExpressiveModal: React.ComponentType<ExpressiveModalProps> = proxyLazy(() => ModalModule.ExpressiveModal);
-
-export const openModal = (render: ModalRenderFn, options?: OpenModalOptions): string =>
-    ModalAPIModule.openModal(render, options);
-export const closeModal = (modalKey: string): void =>
-    ModalAPIModule.closeModal(modalKey);
-export const closeAllModals = (): void =>
-    ModalAPIModule.closeAllModals();
-export const hasModalOpen = (modalKey: string): boolean =>
-    ModalAPIModule.hasModalOpen(modalKey);
-export const hasAnyModalOpen = (): boolean =>
-    ModalAPIModule.hasAnyModalOpen();
-
-const DiscordTextModule = findByPropsLazy("Heading", "Text");
-
-export function DiscordHeading(props: DiscordHeadingProps) {
-    return <DiscordTextModule.Heading {...props} />;
-}
-
-export function DiscordText(props: DiscordTextProps) {
-    return <DiscordTextModule.Text {...props} />;
-}
-
-export function Divider({ className, style, ...restProps }: React.ComponentPropsWithoutRef<"hr">) {
-    return <hr className={`vc-divider${className ? ` ${className}` : ""}`} style={style} {...restProps} />;
-}
-
-const CodeContainerClasses = findCssClassesLazy("markup", "codeContainer");
-
-export function InlineCode({ children }: { children: React.ReactNode; }) {
-    return (
-        <span className={CodeContainerClasses.markup}>
-            <code className="inline">{children}</code>
-        </span>
-    );
-}
-
-const AlertsModule = findByPropsLazy("show", "close", "confirm");
-
-export const Alerts: AlertsType = {
-    show: options => AlertsModule.show(options),
-    close: () => AlertsModule.close(),
-    confirm: options => AlertsModule.confirm(options),
-};
-
-const MenuComponents: Record<string, React.ComponentType<any>> = {};
-
-waitFor(m => m.name === "MenuCheckboxItem", (_, id) => {
-    const exports = wreq(id);
-    for (const key in exports) {
-        try {
-            const value = exports[key];
-            if (typeof value === "function" && value.name?.startsWith("Menu")) {
-                MenuComponents[value.name] = value;
-            }
-        } catch { }
-    }
-});
-
-waitFor(filters.componentByCode('path:["empty"]'), m => { MenuComponents.Menu = m; });
-waitFor(filters.componentByCode("SLIDER)", "handleSize:16"), m => { MenuComponents.MenuSliderControl = m; });
-waitFor(filters.componentByCode(".SEARCH)", ".focus()", "query:"), m => { MenuComponents.MenuSearchControl = m; });
-
-waitFor(m => m.name === "MenuCheckboxItem", (_, id) => {
-    const exports = wreq(id);
-    for (const key in exports) {
-        try {
-            const value = exports[key];
-            if (typeof value !== "function") continue;
-            const str = value.toString();
-            if (str.length === 26 && str.endsWith("(e){return null}") && value.name === "l") {
-                Object.defineProperty(value, "name", { value: "MenuSwitchItem" });
-                MenuComponents.MenuSwitchItem = value;
-                break;
-            }
-        } catch { }
-    }
-});
-
-export const Menu: MenuType = proxyLazy(() => ({
-    Menu: MenuComponents.Menu,
-    MenuItem: MenuComponents.MenuItem,
-    MenuCheckboxItem: MenuComponents.MenuCheckboxItem,
-    MenuRadioItem: MenuComponents.MenuRadioItem,
-    MenuSwitchItem: MenuComponents.MenuSwitchItem,
-    MenuGroup: MenuComponents.MenuGroup,
-    MenuSeparator: MenuComponents.MenuSeparator,
-    MenuControlItem: MenuComponents.MenuControlItem,
-    MenuSliderControl: MenuComponents.MenuSliderControl,
-    MenuSearchControl: MenuComponents.MenuSearchControl,
-}));
-
-export const ContextMenuApi: ContextMenuApiType = mapMangledModuleLazy('type:"CONTEXT_MENU_OPEN', {
-    closeContextMenu: filters.byCode("CONTEXT_MENU_CLOSE"),
-    openContextMenu: filters.byCode("renderLazy:"),
-    openContextMenuLazy: e => typeof e === "function" && e.toString().length < 100
-});
-
-export const ErrorBoundary = findComponentByCodeLazy("this.resetErrorBoundary", "onReset", "FallbackComponent") as React.ComponentType<ErrorBoundaryProps>;
-export const SimpleErrorBoundary = findComponentByCodeLazy("getDerivedStateFromError", "this.props.fallback") as React.ComponentType<SimpleErrorBoundaryProps>;
-export const LocalErrorBoundary = findComponentByCodeLazy("LocalErrorBoundary", "text-feedback-critical") as React.ComponentType<LocalErrorBoundaryProps>;
diff --git a/src/equicordplugins/components.dev/components/tabs/AccordionTab.tsx b/src/equicordplugins/components.dev/components/tabs/AccordionTab.tsx
deleted file mode 100644
index 320f26008..000000000
--- a/src/equicordplugins/components.dev/components/tabs/AccordionTab.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Accordion, Paragraph, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const ACCORDION_PROPS: PropDef[] = [
-    { name: "title", type: "string", required: true, description: "Header title text. Rendered as text-sm/medium." },
-    { name: "children", type: "ReactNode", required: true, description: "Content revealed when expanded." },
-    { name: "subtitle", type: "string", description: "Optional subtitle below the title. Rendered as text-xs/medium in text-subtle." },
-    { name: "icon", type: "ReactNode", description: "Optional icon displayed before the title." },
-    { name: "defaultExpanded", type: "boolean", default: "false", description: "Initial expanded state for uncontrolled usage." },
-    { name: "isExpanded", type: "boolean", description: "Controlled expanded state. When set, the component becomes controlled." },
-    { name: "onExpandedChange", type: "(expanded: boolean) => void", description: "Called when expanded state changes. Works in both controlled and uncontrolled modes." },
-    { name: "onOpen", type: "() => void", description: "Called only when the accordion opens, not when it closes." },
-    { name: "maxHeight", type: "number | string", description: "Maximum content height when expanded. Numbers are converted to px. Without this, height is based on scrollHeight." },
-    { name: "className", type: "string", description: "Additional CSS class name on the root element." },
-];
-
-function ControlledDemo() {
-    const [controlled, setControlled] = useState(false);
-
-    return (
-        <Accordion
-            title="Controlled Accordion"
-            isExpanded={controlled}
-            onExpandedChange={setControlled}
-        >
-            <Paragraph>This accordion's state is controlled externally.</Paragraph>
-        </Accordion>
-    );
-}
-
-export default function AccordionTab() {
-    return (
-        <DocPage
-            componentName="Accordion"
-            overview="Accordion is a collapsible content container with a clickable header. It supports both controlled and uncontrolled modes, optional subtitle and icon, and configurable max height for overflowing content."
-            importPath={'import { Accordion } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Click the header to expand and collapse.",
-                    children: (
-                        <Accordion title="Click to expand">
-                            <Paragraph>This is the accordion content that is revealed when expanded.</Paragraph>
-                        </Accordion>
-                    ),
-                    code: '<Accordion title="Details">\n  <Paragraph>Hidden content here.</Paragraph>\n</Accordion>',
-                    relevantProps: ["title", "children"]
-                },
-                {
-                    title: "With Subtitle",
-                    description: "A subtitle renders below the title in smaller, subtler text.",
-                    children: (
-                        <Accordion title="Settings" subtitle="Configure options">
-                            <Paragraph>Content with a subtitle in the header.</Paragraph>
-                        </Accordion>
-                    ),
-                    relevantProps: ["subtitle", "icon"]
-                },
-                {
-                    title: "Default Expanded",
-                    description: "Starts open on mount using defaultExpanded.",
-                    children: (
-                        <Accordion title="Already Open" defaultExpanded>
-                            <Paragraph>This accordion starts expanded by default.</Paragraph>
-                        </Accordion>
-                    ),
-                    relevantProps: ["defaultExpanded"]
-                },
-                {
-                    title: "Controlled",
-                    description: "Use isExpanded and onExpandedChange to manage state externally.",
-                    children: <ControlledDemo />,
-                    code: '<Accordion title="Settings" isExpanded={open} onExpandedChange={setOpen}>\n  <Paragraph>Controlled content.</Paragraph>\n</Accordion>',
-                    relevantProps: ["isExpanded", "onExpandedChange"]
-                },
-                {
-                    title: "With Max Height",
-                    description: "Constrains expanded content height. Overflowing content is clipped.",
-                    children: (
-                        <Accordion title="Limited Height" maxHeight={100}>
-                            <Paragraph>Line 1</Paragraph>
-                            <Paragraph>Line 2</Paragraph>
-                            <Paragraph>Line 3</Paragraph>
-                            <Paragraph>Line 4</Paragraph>
-                            <Paragraph>Line 5</Paragraph>
-                            <Paragraph>Line 6</Paragraph>
-                        </Accordion>
-                    ),
-                    code: '<Accordion title="Advanced" subtitle="Extra options" icon={<GearIcon />} maxHeight={200}>\n  <Paragraph>Scrollable content area.</Paragraph>\n</Accordion>',
-                    relevantProps: ["maxHeight"]
-                },
-            ]}
-            props={ACCORDION_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/AlertTab.tsx b/src/equicordplugins/components.dev/components/tabs/AlertTab.tsx
deleted file mode 100644
index 089f9fb5b..000000000
--- a/src/equicordplugins/components.dev/components/tabs/AlertTab.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Alerts, Button, showToast, ToastType } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const ALERT_PROPS: PropDef[] = [
-    { name: "title", type: "string", required: true, description: "Alert dialog title." },
-    { name: "body", type: "ReactNode", required: true, description: "Alert body content. Can be a string or JSX." },
-    { name: "confirmText", type: "string", description: "Text for the confirm button. Defaults to a localized \"Okay\" string." },
-    { name: "cancelText", type: "string", description: "Text for the cancel button. Only shown when set to a non-empty string." },
-    { name: "confirmVariant", type: '"primary" | "critical-primary" | "expressive"', default: '"primary"', description: "Visual variant for the confirm button." },
-    { name: "onConfirm", type: "() => void", description: "Called when the confirm button is clicked." },
-    { name: "onCancel", type: "() => void", description: "Called when the cancel button is clicked." },
-    { name: "onCloseCallback", type: "() => void", description: "Called when the alert closes, regardless of which button was pressed." },
-    { name: "contextKey", type: "string", description: "Optional context key passed to the modal system." },
-];
-
-export default function AlertTab() {
-    return (
-        <DocPage
-            componentName="Alerts"
-            overview={"Alerts is a utility API for showing modal alert dialogs. It wraps Discord's ConfirmModal with a simple show/close/confirm interface. The confirm method returns a Promise that resolves to true or false based on the user's choice."}
-            notices={[
-                { type: "warn", children: "Alerts.show() opens a modal dialog that blocks user interaction with the rest of the UI. Avoid chaining multiple alerts or showing them in rapid succession." },
-                { type: "info", children: "Prefer Alerts.confirm() over Alerts.show() when you need to act on the user's choice, since it returns a Promise<boolean> that cleanly integrates with async flows." },
-            ]}
-            importPath={'import { Alerts } from "../components";'}
-            sections={[
-                {
-                    title: "Basic Alert",
-                    description: "Simple alert with just a title and body. Only shows a confirm button.",
-                    children: (
-                        <Button onClick={() => {
-                            Alerts.show({
-                                title: "Basic Alert",
-                                body: "This is a basic alert dialog with just an OK button.",
-                            });
-                        }}>
-                            Show Basic Alert
-                        </Button>
-                    ),
-                    code: 'Alerts.show({ title: "Done", body: "Operation completed successfully." });',
-                    relevantProps: ["title", "body"]
-                },
-                {
-                    title: "Confirm Alert",
-                    description: "Alert with confirm and cancel buttons. Both fire callbacks on click.",
-                    children: (
-                        <Button onClick={() => {
-                            Alerts.show({
-                                title: "Confirm Action",
-                                body: "Are you sure you want to proceed with this action?",
-                                confirmText: "Yes, proceed",
-                                cancelText: "Cancel",
-                                onConfirm: () => showToast("Confirmed!", ToastType.SUCCESS),
-                                onCancel: () => showToast("Cancelled", ToastType.MESSAGE),
-                            });
-                        }}>
-                            Show Confirm Alert
-                        </Button>
-                    ),
-                    relevantProps: ["confirmText", "cancelText", "onConfirm", "onCancel"]
-                },
-                {
-                    title: "Danger Alert",
-                    description: "Uses critical-primary variant for destructive actions.",
-                    children: (
-                        <Button variant="dangerPrimary" onClick={() => {
-                            Alerts.show({
-                                title: "Delete Item",
-                                body: "This action cannot be undone. Are you sure you want to delete this item?",
-                                confirmText: "Delete",
-                                confirmVariant: "critical-primary",
-                                cancelText: "Keep it",
-                                onConfirm: () => showToast("Deleted!", ToastType.SUCCESS),
-                            });
-                        }}>
-                            Show Danger Alert
-                        </Button>
-                    ),
-                    code: 'Alerts.show({\n  title: "Delete?",\n  body: "This cannot be undone.",\n  confirmText: "Delete",\n  confirmVariant: "critical-primary",\n  cancelText: "Cancel",\n  onConfirm: () => deleteItem(),\n});',
-                    relevantProps: ["confirmVariant"]
-                },
-                {
-                    title: "Expressive Alert",
-                    description: "Uses the expressive variant for premium or promotional actions.",
-                    children: (
-                        <Button onClick={() => {
-                            Alerts.show({
-                                title: "Premium Feature",
-                                body: "This feature requires a premium subscription.",
-                                confirmText: "Upgrade Now",
-                                confirmVariant: "expressive",
-                                cancelText: "Maybe Later",
-                                onConfirm: () => showToast("Upgrading!", ToastType.SUCCESS),
-                            });
-                        }}>
-                            Show Expressive Alert
-                        </Button>
-                    ),
-                    relevantProps: ["confirmVariant"]
-                },
-                {
-                    title: "Promise-based Confirm",
-                    description: "Alerts.confirm() returns a Promise<boolean>. Resolves true on confirm, false on cancel.",
-                    children: (
-                        <Button onClick={async () => {
-                            const result = await Alerts.confirm({
-                                title: "Async Confirm",
-                                body: "This uses Alerts.confirm() which returns a promise.",
-                                confirmText: "Accept",
-                                cancelText: "Decline",
-                            });
-                            showToast(result ? "Accepted!" : "Declined", result ? ToastType.SUCCESS : ToastType.MESSAGE);
-                        }}>
-                            Show Promise Confirm
-                        </Button>
-                    ),
-                    code: 'const confirmed = await Alerts.confirm({\n  title: "Proceed?",\n  body: "Are you sure?",\n  confirmText: "Yes",\n  cancelText: "No",\n});\nif (confirmed) doSomething();'
-                },
-            ]}
-            props={ALERT_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/AnchorTab.tsx b/src/equicordplugins/components.dev/components/tabs/AnchorTab.tsx
deleted file mode 100644
index 1a5f568b9..000000000
--- a/src/equicordplugins/components.dev/components/tabs/AnchorTab.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Anchor, Paragraph } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const ANCHOR_PROPS: PropDef[] = [
-    { name: "href", type: "string", description: "Link URL. External links automatically get rel=\"noreferrer noopener\" and target=\"_blank\"." },
-    { name: "children", type: "ReactNode", description: "Link content." },
-    { name: "onClick", type: "MouseEventHandler", description: "Click handler. If omitted and href is set, uses Discord's default link interceptor." },
-    { name: "useDefaultUnderlineStyles", type: "boolean", default: "true", description: "Whether to show underline on hover." },
-    { name: "title", type: "string", description: "Tooltip text shown on hover." },
-    { name: "target", type: "string", description: "Link target. Auto-set to _blank for external URLs." },
-    { name: "rel", type: "string", description: "Link relationship. Auto-set to \"noreferrer noopener\" for external URLs." },
-    { name: "focusProps", type: "Record<string, unknown>", internal: true, description: "Props forwarded to the focus management wrapper." },
-    { name: "ref", type: "Ref<HTMLAnchorElement>", description: "Ref to the underlying anchor element." },
-    { name: "className", type: "string", description: "Additional CSS class name." },
-    { name: "style", type: "CSSProperties", description: "Inline styles." },
-];
-
-export default function AnchorTab() {
-    return (
-        <DocPage
-            componentName="Anchor"
-            overview="Anchor is Discord's styled link component. It handles external link safety (adding noreferrer/noopener, opening in new tabs), untrusted link warning modals, and integrates with Discord's focus management system. Supports underline-on-hover styling by default."
-            notices={[
-                { type: "positive", children: 'Anchor automatically applies rel="noreferrer noopener" and target="_blank" for external URLs, so you don\'t need to set these manually.' },
-            ]}
-            importPath={'import { Anchor } from "../components";'}
-            sections={[
-                {
-                    title: "Basic Link",
-                    description: "A styled link with underline on hover.",
-                    children: (
-                        <Anchor href="https://discord.com">
-                            Discord Homepage
-                        </Anchor>
-                    ),
-                    code: '<Anchor href="https://example.com">Visit Example</Anchor>',
-                    relevantProps: ["href", "children"]
-                },
-                {
-                    title: "Without Underline",
-                    description: "Disable the default underline-on-hover behavior with useDefaultUnderlineStyles={false}.",
-                    children: (
-                        <Anchor href="https://discord.com" useDefaultUnderlineStyles={false}>
-                            No underline on hover
-                        </Anchor>
-                    ),
-                    relevantProps: ["useDefaultUnderlineStyles"]
-                },
-                {
-                    title: "With Title Tooltip",
-                    description: "Hover to see the native title tooltip.",
-                    children: (
-                        <Anchor href="https://discord.com" title="Click to visit Discord">
-                            Hover for tooltip
-                        </Anchor>
-                    ),
-                    relevantProps: ["title"]
-                },
-                {
-                    title: "Custom Styling",
-                    children: (
-                        <Anchor
-                            href="https://discord.com"
-                            style={{ color: "var(--text-positive)", fontWeight: 600 }}
-                        >
-                            Green styled link
-                        </Anchor>
-                    ),
-                    relevantProps: ["style", "className"]
-                },
-                {
-                    title: "With onClick Handler",
-                    description: "Custom click handler prevents default navigation.",
-                    children: (
-                        <Anchor
-                            href="#"
-                            onClick={e => {
-                                e.preventDefault();
-                                alert("Link clicked!");
-                            }}
-                        >
-                            Click me (shows alert)
-                        </Anchor>
-                    ),
-                    code: '<Anchor href="#" onClick={e => { e.preventDefault(); doSomething(); }}>\n  Click me\n</Anchor>',
-                    relevantProps: ["onClick"]
-                },
-                {
-                    title: "Inline in Text",
-                    description: "Links used naturally within a paragraph.",
-                    children: (
-                        <Paragraph>
-                            Check out the <Anchor href="https://discord.com/terms">Terms of Service</Anchor> and{" "}
-                            <Anchor href="https://discord.com/privacy">Privacy Policy</Anchor> for more info.
-                        </Paragraph>
-                    ),
-                    code: '<Paragraph>\n  Read the <Anchor href="/docs" useDefaultUnderlineStyles={false}>documentation</Anchor>.\n</Paragraph>'
-                },
-            ]}
-            props={ANCHOR_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/AnimationsTab.tsx b/src/equicordplugins/components.dev/components/tabs/AnimationsTab.tsx
deleted file mode 100644
index 05602a228..000000000
--- a/src/equicordplugins/components.dev/components/tabs/AnimationsTab.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Animations, ManaButton, Paragraph, SpringConfigs, useSpring, useState, useTrail, useTransition } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const { animated } = Animations;
-
-const TRAIL_ITEMS = ["Discord", "uses", "react-spring", "for", "animations"];
-
-const SPRING_CONFIG_PROPS: PropDef[] = [
-    { name: "default", type: "{ tension: 170, friction: 26 }", description: "Standard spring. Balanced speed and bounce." },
-    { name: "gentle", type: "{ tension: 120, friction: 14 }", description: "Soft, slow spring with more bounce." },
-    { name: "wobbly", type: "{ tension: 180, friction: 12 }", description: "Bouncy, playful spring with high overshoot." },
-    { name: "stiff", type: "{ tension: 210, friction: 20 }", description: "Quick, snappy spring with minimal bounce." },
-    { name: "slow", type: "{ tension: 280, friction: 60 }", description: "High tension with heavy damping. Slow and deliberate." },
-    { name: "molasses", type: "{ tension: 280, friction: 120 }", description: "Extremely slow and heavily damped. No bounce." },
-];
-
-function SpringDemo() {
-    const [toggled, setToggled] = useState(false);
-    const [config, setConfig] = useState<keyof typeof SpringConfigs>("default");
-
-    const spring = useSpring({
-        opacity: toggled ? 1 : 0.3,
-        transform: toggled ? "scale(1) rotate(0deg)" : "scale(0.8) rotate(-10deg)",
-        backgroundColor: toggled ? "var(--brand-500)" : "var(--background-tertiary)",
-        config: SpringConfigs[config]
-    });
-
-    return (
-        <>
-            <div style={{ display: "flex", gap: 8, marginBottom: 16, flexWrap: "wrap" }}>
-                {(Object.keys(SpringConfigs) as (keyof typeof SpringConfigs)[]).map(c => (
-                    <ManaButton
-                        key={c}
-                        variant={config === c ? "primary" : "secondary"}
-                        size="sm"
-                        text={c}
-                        onClick={() => setConfig(c)}
-                    />
-                ))}
-            </div>
-            <animated.div
-                onClick={() => setToggled(!toggled)}
-                style={{
-                    ...spring,
-                    width: 120,
-                    height: 120,
-                    borderRadius: 12,
-                    cursor: "pointer",
-                    display: "flex",
-                    alignItems: "center",
-                    justifyContent: "center"
-                }}
-            >
-                <Paragraph color="text-strong">Click me</Paragraph>
-            </animated.div>
-        </>
-    );
-}
-
-function TransitionDemo() {
-    const [items, setItems] = useState([1, 2, 3]);
-    const [nextId, setNextId] = useState(4);
-
-    const transitions = useTransition(items, {
-        from: { opacity: 0, transform: "translateX(-20px) scale(0.9)" },
-        enter: { opacity: 1, transform: "translateX(0px) scale(1)" },
-        leave: { opacity: 0, transform: "translateX(20px) scale(0.9)" },
-        keys: item => item,
-        config: SpringConfigs.gentle
-    });
-
-    return (
-        <>
-            <div style={{ display: "flex", gap: 8, marginBottom: 16 }}>
-                <ManaButton variant="primary" size="sm" text="Add Item" onClick={() => {
-                    setItems([...items, nextId]);
-                    setNextId(nextId + 1);
-                }} />
-                <ManaButton
-                    variant="secondary"
-                    size="sm"
-                    text="Clear All"
-                    onClick={() => setItems([])}
-                    disabled={items.length === 0}
-                />
-            </div>
-            <div style={{ display: "flex", gap: 8, flexWrap: "wrap", minHeight: 50 }}>
-                {transitions((style, item) => (
-                    <animated.div
-                        style={{
-                            ...style,
-                            padding: "8px 16px",
-                            background: "var(--background-secondary)",
-                            borderRadius: 8,
-                            cursor: "pointer"
-                        }}
-                        onClick={() => setItems(items.filter(i => i !== item))}
-                    >
-                        <Paragraph>Item {item}</Paragraph>
-                    </animated.div>
-                ))}
-            </div>
-        </>
-    );
-}
-
-function TrailDemo() {
-    const [show, setShow] = useState(true);
-
-    const trail = useTrail(TRAIL_ITEMS.length, {
-        opacity: show ? 1 : 0,
-        transform: show ? "translateY(0px)" : "translateY(20px)",
-        config: SpringConfigs.gentle
-    }) as object[];
-
-    return (
-        <>
-            <div style={{ marginBottom: 16 }}>
-                <ManaButton
-                    variant="secondary"
-                    size="sm"
-                    text={show ? "Hide" : "Show"}
-                    onClick={() => setShow(!show)}
-                />
-            </div>
-            <div style={{ display: "flex", gap: 8, flexWrap: "wrap", minHeight: 40 }}>
-                {trail.map((style, i) => (
-                    <animated.div
-                        key={i}
-                        style={{
-                            ...style,
-                            padding: "8px 12px",
-                            background: "var(--brand-500)",
-                            borderRadius: 6
-                        }}
-                    >
-                        <Paragraph color="text-strong">{TRAIL_ITEMS[i]}</Paragraph>
-                    </animated.div>
-                ))}
-            </div>
-        </>
-    );
-}
-
-function AnimatedElementsDemo() {
-    const [hover, setHover] = useState(false);
-
-    const hoverSpring = useSpring({
-        scale: hover ? 1.05 : 1,
-        boxShadow: hover
-            ? "0 8px 24px rgba(0,0,0,0.3)"
-            : "0 2px 8px rgba(0,0,0,0.1)",
-        config: SpringConfigs.wobbly
-    });
-
-    return (
-        <animated.div
-            onMouseEnter={() => setHover(true)}
-            onMouseLeave={() => setHover(false)}
-            style={{
-                ...hoverSpring,
-                width: 100,
-                height: 100,
-                background: "var(--background-secondary)",
-                borderRadius: 12,
-                display: "flex",
-                alignItems: "center",
-                justifyContent: "center",
-                cursor: "pointer"
-            }}
-        >
-            <Paragraph color="text-muted" style={{ fontSize: 12 }}>Hover me</Paragraph>
-        </animated.div>
-    );
-}
-
-export default function AnimationsTab() {
-    return (
-        <DocPage
-            componentName="Animations"
-            overview="Discord uses react-spring for physics-based animations. The Animations module exposes useSpring, useTransition, useTrail, useChain, useSprings hooks plus animated.* element wrappers and preset spring configs. All animations are interruptible and use spring physics rather than duration-based easing."
-            notices={[
-                { type: "info", children: "These are re-exports of react-spring. All animations are interruptible and respect the user's reduced motion preference when used with Discord's built-in motion settings." },
-            ]}
-            importPath={'import { Animations, useSpring, useTransition, useTrail, SpringConfigs } from "../components";'}
-            sections={[
-                {
-                    title: "useSpring",
-                    description: "Animate values with spring physics. Click the box to toggle, and switch between config presets to see different animation feels.",
-                    children: <SpringDemo />,
-                    code: "const spring = useSpring({ opacity: visible ? 1 : 0, config: SpringConfigs.gentle });\nreturn <animated.div style={spring}>Content</animated.div>;"
-                },
-                {
-                    title: "useTransition",
-                    description: "Animate items entering and leaving a list. Click items to remove them, or use the buttons to add/clear.",
-                    children: <TransitionDemo />,
-                    code: "const transitions = useTransition(items, {\n  from: { opacity: 0 },\n  enter: { opacity: 1 },\n  leave: { opacity: 0 },\n  keys: item => item.id,\n});\nreturn transitions((style, item) => <animated.div style={style}>{item.name}</animated.div>);"
-                },
-                {
-                    title: "useTrail",
-                    description: "Staggered animations for multiple items. Each item animates slightly after the previous one.",
-                    children: <TrailDemo />,
-                    code: 'const trail = useTrail(items.length, {\n  opacity: show ? 1 : 0,\n  transform: show ? "translateY(0)" : "translateY(20px)",\n  config: SpringConfigs.gentle,\n});'
-                },
-                {
-                    title: "animated Elements",
-                    description: "Use animated.div, animated.span, animated.svg etc. to create spring-animated HTML elements. Hover the box below.",
-                    children: <AnimatedElementsDemo />
-                },
-            ]}
-            props={SPRING_CONFIG_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/AvatarTab.tsx b/src/equicordplugins/components.dev/components/tabs/AvatarTab.tsx
deleted file mode 100644
index 8a721c967..000000000
--- a/src/equicordplugins/components.dev/components/tabs/AvatarTab.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Avatar, AvatarSizes, AvatarStatuses, Paragraph, UserStore } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const AVATAR_PROPS: PropDef[] = [
-    { name: "src", type: "string", description: "Avatar image URL." },
-    { name: "size", type: "AvatarSize", description: "Avatar size constant (SIZE_16 through SIZE_152). Controls the SVG viewBox dimensions." },
-    { name: "status", type: "AvatarStatus", description: "User presence status. Renders a colored indicator dot." },
-    { name: "statusColor", type: "string", description: "Override the status indicator color." },
-    { name: "statusBackdropColor", type: "string", description: "Background color behind the status indicator." },
-    { name: "isMobile", type: "boolean", default: "false", description: "Shows the mobile phone status indicator instead of a dot." },
-    { name: "isVR", type: "boolean", default: "false", description: "Shows the VR headset status indicator." },
-    { name: "isTyping", type: "boolean", default: "false", description: "Shows a typing animation in the status area." },
-    { name: "isSpeaking", type: "boolean", default: "false", description: "Renders an animated speaking ring around the avatar." },
-    { name: "isLatched", type: "boolean", default: "false", description: "Latched speaking state for voice activity." },
-    { name: "voiceDb", type: "number", description: "Voice volume level in dB for speaking animation intensity." },
-    { name: "speakingStylesConfig", type: "Record<string, any>", description: "Custom styles config for the speaking ring animation." },
-    { name: "statusTooltip", type: "boolean", default: "false", description: "Shows a tooltip with the status text on hover." },
-    { name: "statusTooltipDelay", type: "number", description: "Delay in ms before the status tooltip appears." },
-    { name: "typingIndicatorRef", type: "Ref<any>", description: "Ref for the typing indicator element." },
-    { name: "avatarContentRef", type: "Ref<any>", description: "Ref for the avatar image foreignObject content." },
-    { name: "CutoutIcon", type: "ComponentType<any>", description: "Custom icon component rendered as a cutout overlay on the avatar." },
-    { name: "avatarTooltipAsset", type: "ReactNode", description: "Custom tooltip asset displayed on the avatar." },
-    { name: "avatarTooltipText", type: "string", description: "Tooltip text for the avatar overlay." },
-    { name: "avatarTooltipTitle", type: "string", description: "Tooltip title for the avatar overlay." },
-    { name: "avatarDecoration", type: "string", description: "URL for the avatar decoration overlay image." },
-    { name: "aria-hidden", type: "boolean", default: "false", description: "Hides the avatar from screen readers." },
-    { name: "aria-label", type: "string", description: "Accessibility label for the avatar." },
-    { name: "imageClassName", type: "string", description: "CSS class applied to the avatar image element." },
-    { name: "className", type: "string", description: "CSS class applied to the root wrapper." },
-    { name: "onClick", type: "MouseEventHandler", description: "Click handler on the avatar wrapper. Makes the avatar interactive." },
-    { name: "onMouseDown", type: "MouseEventHandler", description: "Mouse down handler on the avatar wrapper." },
-    { name: "onKeyDown", type: "KeyboardEventHandler", description: "Key down handler on the avatar wrapper." },
-    { name: "onContextMenu", type: "MouseEventHandler", description: "Context menu handler on the avatar wrapper." },
-    { name: "onMouseEnter", type: "MouseEventHandler", description: "Mouse enter handler on the avatar wrapper." },
-    { name: "onMouseLeave", type: "MouseEventHandler", description: "Mouse leave handler on the avatar wrapper." },
-    { name: "tabIndex", type: "number", description: "Tab index for keyboard navigation on the avatar wrapper." },
-    { name: "ref", type: "Ref<SVGSVGElement>", description: "Ref to the root SVG element." },
-];
-
-export default function AvatarTab() {
-    const currentUser = UserStore.getCurrentUser();
-    const avatarUrl = currentUser?.getAvatarURL?.(undefined, 128);
-
-    return (
-        <DocPage
-            componentName="Avatar"
-            overview="Avatar renders a user's profile picture as an SVG with optional status indicators, speaking rings, typing animations, and tooltip overlays. It handles all the visual states used throughout Discord's UI including mobile, VR, and voice activity indicators."
-            importPath={'import { Avatar } from "../components";'}
-            sections={[
-                {
-                    title: "Sizes",
-                    description: "All 13 available sizes from 16px to 152px.",
-                    relevantProps: ["size", "src"],
-                    children: (
-                        <div className="vc-compfinder-grid" style={{ alignItems: "flex-end" }}>
-                            {AvatarSizes.map(size => (
-                                <div key={size} style={{ textAlign: "center" }}>
-                                    <Avatar src={avatarUrl} size={size} />
-                                    <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                        {size.replace("SIZE_", "")}
-                                    </Paragraph>
-                                </div>
-                            ))}
-                        </div>
-                    )
-                },
-                {
-                    title: "Statuses",
-                    description: "All status indicator variants.",
-                    code: '<Avatar src={user.getAvatarURL()} size="SIZE_40" status="online" />',
-                    relevantProps: ["status", "statusColor", "statusBackdropColor"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {AvatarStatuses.map(status => (
-                                <div key={status} style={{ textAlign: "center" }}>
-                                    <Avatar src={avatarUrl} size="SIZE_40" status={status} />
-                                    <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                        {status}
-                                    </Paragraph>
-                                </div>
-                            ))}
-                        </div>
-                    )
-                },
-                {
-                    title: "Mobile Status",
-                    description: "Shows the mobile phone icon instead of a status dot when isMobile is true.",
-                    code: '<Avatar src={avatarUrl} size="SIZE_32" status="online" isMobile statusTooltip />',
-                    relevantProps: ["isMobile", "isVR"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <div style={{ textAlign: "center" }}>
-                                <Avatar src={avatarUrl} size="SIZE_40" status="online" isMobile />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>Mobile</Paragraph>
-                            </div>
-                            <div style={{ textAlign: "center" }}>
-                                <Avatar src={avatarUrl} size="SIZE_40" status="online" isVR />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>VR</Paragraph>
-                            </div>
-                        </div>
-                    )
-                },
-                {
-                    title: "Speaking State",
-                    description: "Animated ring indicator for voice activity.",
-                    code: '<Avatar src={avatarUrl} size="SIZE_80" isSpeaking voiceDb={voiceLevel} />',
-                    relevantProps: ["isSpeaking", "isLatched", "voiceDb"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <div style={{ textAlign: "center" }}>
-                                <Avatar src={avatarUrl} size="SIZE_40" isSpeaking />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>Speaking</Paragraph>
-                            </div>
-                        </div>
-                    )
-                },
-                {
-                    title: "Typing Indicator",
-                    description: "Shows a typing animation in the status area.",
-                    relevantProps: ["isTyping"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <div style={{ textAlign: "center" }}>
-                                <Avatar src={avatarUrl} size="SIZE_40" status="online" isTyping />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>Typing</Paragraph>
-                            </div>
-                        </div>
-                    )
-                },
-                {
-                    title: "Status Tooltip",
-                    description: "Hover to see the status text tooltip.",
-                    relevantProps: ["statusTooltip", "statusTooltipDelay"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {AvatarStatuses.map(status => (
-                                <div key={status} style={{ textAlign: "center" }}>
-                                    <Avatar src={avatarUrl} size="SIZE_40" status={status} statusTooltip />
-                                    <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                        {status}
-                                    </Paragraph>
-                                </div>
-                            ))}
-                        </div>
-                    )
-                },
-            ]}
-            props={AVATAR_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/BadgeTab.tsx b/src/equicordplugins/components.dev/components/tabs/BadgeTab.tsx
deleted file mode 100644
index 29aa9ce53..000000000
--- a/src/equicordplugins/components.dev/components/tabs/BadgeTab.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { BadgeShapes, CircleBadge, IconBadge, NumberBadge, PremiumBadge, TextBadge } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-import { EquicordIcon } from "../icons/EquicordIcon";
-
-const SHARED_PROPS: PropDef[] = [
-    { name: "color", type: "string", default: "BADGE_NOTIFICATION_BACKGROUND", description: "Background color. Defaults to the notification red for most badges. CircleBadge defaults to INTERACTIVE_TEXT_ACTIVE instead." },
-    { name: "disableColor", type: "boolean", default: "false", description: "Removes the background color entirely when true." },
-    { name: "shape", type: "BadgeShapes", default: "ROUND", description: "Controls border radius. ROUND (pill), ROUND_LEFT, ROUND_RIGHT, or SQUARE." },
-    { name: "className", type: "string", description: "Additional CSS class name." },
-    { name: "style", type: "CSSProperties", description: "Inline styles." },
-];
-
-const ALL_PROPS: PropDef[] = [
-    { name: "count", type: "number", required: true, description: "NumberBadge only. The count to display. Auto-abbreviates large values (1000+ becomes \"1k+\", capped at \"9k+\")." },
-    { name: "renderBadgeCount", type: "(count: number) => string", description: "NumberBadge only. Custom formatter for the count display. Defaults to the built-in abbreviation." },
-    { name: "text", type: "string", required: true, description: "TextBadge and PremiumBadge. The text content to display." },
-    { name: "icon", type: "ComponentType<{ className?: string; color?: string; }>", required: true, description: "IconBadge only. Icon component to render inside the badge." },
-    ...SHARED_PROPS,
-];
-
-export default function BadgeTab() {
-    return (
-        <DocPage
-            componentName="Badge"
-            overview="Discord's badge system provides four visual badge components (NumberBadge, TextBadge, IconBadge, CircleBadge) plus a PremiumBadge variant. All share a common set of styling props for color, shape, and disabled state. NumberBadge auto-sizes its width based on digit count and abbreviates large numbers."
-            importPath={'import { NumberBadge, TextBadge, IconBadge, CircleBadge, PremiumBadge, BadgeShapes } from "../components";'}
-            sections={[
-                {
-                    title: "NumberBadge",
-                    description: "Displays a count. Auto-abbreviates at 1000+ and auto-sizes width based on digit count (16px for <10, 22px for <100, 30px otherwise).",
-                    code: "<NumberBadge count={unreadCount} />",
-                    relevantProps: ["count", "renderBadgeCount"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <NumberBadge count={1} />
-                            <NumberBadge count={9} />
-                            <NumberBadge count={99} />
-                            <NumberBadge count={999} />
-                            <NumberBadge count={9999} />
-                        </div>
-                    )
-                },
-                {
-                    title: "TextBadge",
-                    description: "Displays text content inside a badge.",
-                    relevantProps: ["text"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <TextBadge text="NEW" />
-                            <TextBadge text="BETA" />
-                            <TextBadge text="PRO" />
-                        </div>
-                    )
-                },
-                {
-                    title: "PremiumBadge",
-                    description: "A TextBadge variant with an additional premium styling class applied.",
-                    relevantProps: ["text"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <PremiumBadge text="PREMIUM" />
-                            <PremiumBadge text="NITRO" />
-                            <PremiumBadge text="BOOST" />
-                        </div>
-                    )
-                },
-                {
-                    title: "IconBadge",
-                    description: "Renders an icon component inside a badge. The icon receives color=\"currentColor\".",
-                    code: '<IconBadge icon={StarIcon} color="var(--status-warning)" />',
-                    relevantProps: ["icon"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <IconBadge icon={EquicordIcon} />
-                            <IconBadge icon={EquicordIcon} color="var(--status-positive)" />
-                            <IconBadge icon={EquicordIcon} color="var(--status-warning)" />
-                        </div>
-                    )
-                },
-                {
-                    title: "CircleBadge",
-                    description: "A simple circular dot indicator. Defaults to INTERACTIVE_TEXT_ACTIVE color unlike other badges.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <CircleBadge />
-                            <CircleBadge color="var(--status-positive)" />
-                            <CircleBadge color="var(--status-warning)" />
-                            <CircleBadge color="var(--status-danger)" />
-                        </div>
-                    )
-                },
-                {
-                    title: "Shapes",
-                    description: "All four shape variants. SQUARE removes border radius entirely.",
-                    code: '<TextBadge text="NEW" shape={BadgeShapes.ROUND_LEFT} color="var(--brand-500)" />',
-                    relevantProps: ["shape"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <TextBadge text="ROUND" shape={BadgeShapes.ROUND} />
-                            <TextBadge text="LEFT" shape={BadgeShapes.ROUND_LEFT} />
-                            <TextBadge text="RIGHT" shape={BadgeShapes.ROUND_RIGHT} />
-                            <TextBadge text="SQUARE" shape={BadgeShapes.SQUARE} />
-                        </div>
-                    )
-                },
-                {
-                    title: "Custom Colors",
-                    description: "Any CSS color value works. Use disableColor to remove the background entirely.",
-                    relevantProps: ["color", "disableColor"],
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <NumberBadge count={5} color="var(--status-danger)" />
-                            <NumberBadge count={5} color="var(--status-positive)" />
-                            <NumberBadge count={5} color="var(--status-warning)" />
-                            <NumberBadge count={5} color="var(--brand-500)" />
-                            <NumberBadge count={5} disableColor />
-                        </div>
-                    )
-                },
-                {
-                    title: "Custom Render",
-                    description: "NumberBadge accepts a custom renderBadgeCount function to format the display.",
-                    code: '<NumberBadge\n  count={messageCount}\n  renderBadgeCount={n => n > 99 ? "99+" : String(n)}\n/>',
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <NumberBadge count={42} renderBadgeCount={n => `#${n}`} />
-                            <NumberBadge count={100} renderBadgeCount={n => `${n}%`} />
-                            <NumberBadge count={5} renderBadgeCount={() => "!"} />
-                        </div>
-                    )
-                },
-            ]}
-            props={ALL_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ButtonsTab.tsx b/src/equicordplugins/components.dev/components/tabs/ButtonsTab.tsx
deleted file mode 100644
index 1cd50c2cc..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ButtonsTab.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaButton, ManaButtonSizes, ManaButtonVariants, Paragraph, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const BUTTON_PROPS: PropDef[] = [
-    { name: "text", type: "string", description: "Button label text." },
-    { name: "variant", type: "ManaButtonVariant", default: '"primary"', description: "Visual style variant." },
-    { name: "size", type: "ManaButtonSize", default: '"md"', description: "Button size. Also controls icon and text variant sizing internally." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disables the button. When true, all event handlers are suppressed." },
-    { name: "loading", type: "boolean", default: "false", description: "Shows a loading spinner overlay and suppresses event handlers like disabled." },
-    { name: "loadingStartedLabel", type: "string", description: "Accessibility label announced via live region when loading begins." },
-    { name: "loadingFinishedLabel", type: "string", description: "Accessibility label announced via live region when loading ends." },
-    { name: "fullWidth", type: "boolean", default: "false", description: "Expands the button to fill its container width. Can be overridden by a parent ButtonGroup context." },
-    { name: "rounded", type: "boolean", default: "false", description: "Applies fully rounded pill-shaped corners." },
-    { name: "icon", type: "ManaButtonIconType", description: "Icon to display. Accepts a component, or an object with type \"icon\", \"rive\", or \"sticker\"." },
-    { name: "iconPosition", type: '"start" | "end"', default: '"start"', description: "Which side of the text the icon appears on." },
-    { name: "iconOpticalOffsetMargin", type: "number", default: "0", description: "Pixel offset margin for optical icon alignment." },
-    { name: "minWidth", type: "number | string", description: "Minimum button width. Numbers are converted to px." },
-    { name: "role", type: "string", default: '"button"', description: "ARIA role attribute." },
-    { name: "type", type: '"button" | "submit" | "reset"', default: '"button"', description: "HTML button type attribute." },
-    { name: "rel", type: "string", description: "Relationship attribute for link-style buttons." },
-    { name: "onClick", type: "(e: MouseEvent) => void", description: "Click handler. Suppressed when disabled or loading." },
-    { name: "onDoubleClick", type: "(e: MouseEvent) => void", description: "Double-click handler. Suppressed when disabled or loading." },
-    { name: "onMouseEnter", type: "(e: MouseEvent) => void", description: "Mouse enter handler. Suppressed when disabled or loading." },
-    { name: "onMouseLeave", type: "(e: MouseEvent) => void", description: "Mouse leave handler. Suppressed when disabled or loading." },
-    { name: "onMouseUp", type: "(e: MouseEvent) => void", description: "Mouse up handler. Suppressed when disabled or loading." },
-    { name: "onMouseDown", type: "(e: MouseEvent) => void", description: "Mouse down handler. Suppressed when disabled or loading." },
-    { name: "onKeyDown", type: "(e: KeyboardEvent) => void", description: "Keyboard handler. Suppressed when disabled or loading." },
-    { name: "focusProps", type: "Record<string, any>", internal: true, description: "Props forwarded to the focus management wrapper." },
-    { name: "buttonRef", type: "Ref<HTMLButtonElement>", internal: true, description: "Ref attached to the underlying button element." },
-    { name: "className", type: "string", description: "Additional CSS class name." },
-    { name: "style", type: "CSSProperties", description: "Inline styles applied to the button." },
-];
-
-function StatesDemo() {
-    const [loading, setLoading] = useState(false);
-
-    return (
-        <div className="vc-compfinder-grid">
-            <ManaButton variant="primary" size="md" text="Disabled" disabled />
-            <ManaButton
-                variant="primary"
-                size="md"
-                text={loading ? "Loading..." : "Click to Load"}
-                loading={loading}
-                onClick={() => {
-                    setLoading(true);
-                    setTimeout(() => setLoading(false), 2000);
-                }}
-            />
-            <ManaButton variant="primary" size="md" text="Rounded" rounded />
-            <ManaButton variant="primary" size="md" text="Full Width" fullWidth />
-        </div>
-    );
-}
-
-export default function ButtonsTab() {
-    return (
-        <DocPage
-            overview="ManaButton is Discord's primary button component used for actions and form submissions. It supports eight visual variants, three sizes, loading states, icons, and full-width layouts. Renders a native button element wrapped in a focus management provider."
-            importPath={'import { ManaButton } from "../components";'}
-            sections={[
-                {
-                    title: "Variants",
-                    description: "All eight visual styles at the default medium size. The expressive variant includes a Rive animation background on hover.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {ManaButtonVariants.map(variant => (
-                                <ManaButton key={variant} variant={variant} size="md" text={variant} />
-                            ))}
-                        </div>
-                    ),
-                    code: '<ManaButton variant="primary" size="md" text="Save" onClick={() => save()} />',
-                    relevantProps: ["variant"],
-                },
-                {
-                    title: "Sizes",
-                    description: "Each size maps to a specific text variant internally (xs to text-xs/medium, sm to text-sm/medium, md to text-md/medium) and a corresponding icon size.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {ManaButtonSizes.map(size => (
-                                <ManaButton key={size} variant="primary" size={size} text={`Size: ${size}`} />
-                            ))}
-                        </div>
-                    ),
-                    code: '<ManaButton variant="primary" size="sm" text="Small" />',
-                    relevantProps: ["size"],
-                },
-                {
-                    title: "States",
-                    description: "Disabled and loading both suppress all event handlers. Loading shows a spinner overlay with accessibility announcements.",
-                    children: <StatesDemo />,
-                    code: '<ManaButton\n  variant="primary"\n  text="Save"\n  loading={saving}\n  loadingStartedLabel="Saving..."\n  loadingFinishedLabel="Saved!"\n  onClick={handleSave}\n/>',
-                    relevantProps: ["disabled", "loading", "loadingStartedLabel", "loadingFinishedLabel", "rounded", "fullWidth"],
-                },
-                {
-                    title: "All Variants Disabled",
-                    description: "How each variant looks in its disabled state.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {ManaButtonVariants.map(variant => (
-                                <ManaButton key={variant} variant={variant} size="md" text={variant} disabled />
-                            ))}
-                        </div>
-                    ),
-                },
-                {
-                    title: "Size \u00d7 Variant Matrix",
-                    description: "Every combination of size and variant for comparison.",
-                    children: (
-                        <>
-                            {ManaButtonSizes.map(size => (
-                                <div key={size} style={{ marginBottom: 8 }}>
-                                    <Paragraph color="text-muted" style={{ fontSize: 12, marginBottom: 4 }}>
-                                        Size: {size}
-                                    </Paragraph>
-                                    <div className="vc-compfinder-grid">
-                                        {ManaButtonVariants.map(variant => (
-                                            <ManaButton key={`${size}-${variant}`} variant={variant} size={size} text={variant} />
-                                        ))}
-                                    </div>
-                                </div>
-                            ))}
-                        </>
-                    ),
-                },
-            ]}
-            props={BUTTON_PROPS}
-            examples={[
-                {
-                    label: "Destructive action with critical variant:",
-                    code: '<ManaButton variant="critical-primary" size="sm" text="Delete" onClick={handleDelete} />',
-                },
-            ]}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/CalendarTab.tsx b/src/equicordplugins/components.dev/components/tabs/CalendarTab.tsx
deleted file mode 100644
index fd1cb27be..000000000
--- a/src/equicordplugins/components.dev/components/tabs/CalendarTab.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaCalendar, ManaDatePicker, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const CALENDAR_PROPS: PropDef[] = [
-    { name: "value", type: "CalendarDate | null", description: "The currently selected date value." },
-    { name: "onChange", type: "(value: CalendarDate) => void", description: "Called when a date is selected." },
-    { name: "minValue", type: "CalendarDate", description: "Minimum selectable date." },
-    { name: "maxValue", type: "CalendarDate", description: "Maximum selectable date." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disables the entire calendar." },
-    { name: "readOnly", type: "boolean", default: "false", description: "Makes the calendar read-only. Dates are visible but not selectable." },
-    { name: "className", type: "string", description: "Additional CSS class on the root element." },
-    { name: "aria-label", type: "string", description: "Accessibility label for the calendar." },
-];
-
-const DATEPICKER_PROPS: PropDef[] = [
-    { name: "value", type: "CalendarDate | CalendarDateTime | null", description: "The currently selected date/time value." },
-    { name: "onChange", type: "(value: CalendarDate | CalendarDateTime) => void", description: "Called when the value changes. Also closes the popover." },
-    { name: "minValue", type: "CalendarDate", description: "Minimum selectable date." },
-    { name: "maxValue", type: "CalendarDate", description: "Maximum selectable date." },
-    { name: "placeholderValue", type: "CalendarDate | CalendarDateTime", description: "Placeholder date shown in the input when no value is selected." },
-    { name: "granularity", type: '"day" | "hour" | "minute" | "second"', default: '"day"', description: "Time precision level. Day shows only date fields, others add time segments." },
-    { name: "hourCycle", type: "12 | 24", description: "Whether to use 12-hour or 24-hour time format." },
-    { name: "hideTimeZone", type: "boolean", default: "false", description: "Hides the time zone display when using time granularity." },
-    { name: "label", type: "string", description: "Input field label." },
-    { name: "hideLabel", type: "boolean", description: "Visually hides the label while keeping it accessible." },
-    { name: "description", type: "string", description: "Help text shown below the label." },
-    { name: "helperText", type: "string", description: "Additional help text shown below the input." },
-    { name: "errorMessage", type: "string", description: "Error text shown below the input. Triggers error styling when non-empty." },
-    { name: "successMessage", type: "string", description: "Success text shown below the input." },
-    { name: "disabled", type: "boolean", description: "Disables the date picker input and calendar." },
-    { name: "required", type: "boolean", default: "false", description: "Marks the field as required." },
-    { name: "badge", type: "ReactNode", description: "Badge element displayed next to the label." },
-    { name: "icon", type: "ReactNode", description: "Icon displayed in the field." },
-    { name: "id", type: "string", description: "Custom ID for the input control." },
-    { name: "layout", type: "string", description: "Field layout variant." },
-    { name: "layoutConfig", type: "Record<string, unknown>", description: "Configuration for the field layout." },
-];
-
-function CalendarDemo() {
-    const [value, setValue] = useState<any>(null);
-
-    return (
-        <ManaCalendar
-            value={value}
-            onChange={setValue}
-            aria-label="Select a date"
-        />
-    );
-}
-
-function DatePickerDemo() {
-    const [value, setValue] = useState<any>(null);
-
-    return (
-        <div style={{ display: "flex", flexDirection: "column", gap: 16, maxWidth: 300 }}>
-            <ManaDatePicker
-                value={value}
-                onChange={setValue}
-                label="Select Date"
-                description="Choose a date from the calendar"
-                granularity="day"
-            />
-        </div>
-    );
-}
-
-function DatePickerTimeDemo() {
-    const [value, setValue] = useState<any>(null);
-
-    return (
-        <div style={{ display: "flex", flexDirection: "column", gap: 16, maxWidth: 300 }}>
-            <ManaDatePicker
-                value={value}
-                onChange={setValue}
-                label="Select Date & Time"
-                granularity="minute"
-                hourCycle={24}
-            />
-        </div>
-    );
-}
-
-function DatePickerStatesDemo() {
-    const [value, setValue] = useState<any>(null);
-
-    return (
-        <div style={{ display: "flex", flexDirection: "column", gap: 16, maxWidth: 300 }}>
-            <ManaDatePicker
-                value={value}
-                onChange={setValue}
-                label="Disabled"
-                disabled
-            />
-            <ManaDatePicker
-                value={value}
-                onChange={setValue}
-                label="Required"
-                required
-            />
-            <ManaDatePicker
-                value={value}
-                onChange={setValue}
-                label="With Error"
-                errorMessage="Please select a valid date"
-            />
-            <ManaDatePicker
-                value={value}
-                onChange={setValue}
-                label="With Helper Text"
-                helperText="Pick any date in the future"
-            />
-        </div>
-    );
-}
-
-export default function CalendarTab() {
-    return (
-        <DocPage
-            componentName="Calendar"
-            overview="ManaCalendar is a standalone calendar grid for date selection. ManaDatePicker wraps it in a text input with a popover, supporting time granularity, validation states, and field layout props. Both use react-aria internationalized date objects internally."
-            notices={[
-                { type: "info", children: "Calendar values use react-aria's CalendarDate and CalendarDateTime types from @internationalized/date, not native JavaScript Date objects. You may need to convert between them." },
-            ]}
-            importPath={'import { ManaCalendar, ManaDatePicker } from "../components";'}
-            sections={[
-                {
-                    title: "Calendar",
-                    description: "Basic calendar grid. Click a date to select it. Navigate months with the arrow buttons.",
-                    code: '<ManaCalendar value={date} onChange={setDate} aria-label="Pick a date" />',
-                    relevantProps: ["value", "onChange", "aria-label"],
-                    children: <CalendarDemo />
-                },
-                {
-                    title: "Calendar (Disabled)",
-                    description: "All dates are visible but not interactive.",
-                    relevantProps: ["disabled"],
-                    children: (
-                        <ManaCalendar
-                            value={null}
-                            onChange={() => { }}
-                            disabled
-                            aria-label="Disabled calendar"
-                        />
-                    )
-                },
-                {
-                    title: "Calendar (Read Only)",
-                    description: "Dates are visible with current selection shown but cannot be changed.",
-                    relevantProps: ["readOnly"],
-                    children: (
-                        <ManaCalendar
-                            value={null}
-                            onChange={() => { }}
-                            readOnly
-                            aria-label="Read only calendar"
-                        />
-                    )
-                },
-                {
-                    title: "Date Picker",
-                    description: "Text input with a calendar popover. Click the calendar icon to open.",
-                    code: '<ManaDatePicker\n  value={date}\n  onChange={setDate}\n  label="Event Date"\n  description="When should this happen?"\n  granularity="day"\n/>',
-                    relevantProps: ["label", "description", "granularity"],
-                    children: <DatePickerDemo />
-                },
-                {
-                    title: "Date Picker with Time",
-                    description: "Using minute granularity adds hour and minute segments to the input.",
-                    code: '<ManaDatePicker\n  value={date}\n  onChange={setDate}\n  label="Start Time"\n  granularity="minute"\n  hourCycle={24}\n  required\n  errorMessage={!date ? "Required" : ""}\n/>',
-                    relevantProps: ["granularity", "hourCycle"],
-                    children: <DatePickerTimeDemo />
-                },
-                {
-                    title: "Date Picker States",
-                    description: "Disabled, required, error, and helper text states.",
-                    relevantProps: ["disabled", "required", "errorMessage", "helperText"],
-                    children: <DatePickerStatesDemo />
-                },
-            ]}
-            props={[
-                ...CALENDAR_PROPS.map(p => ({ ...p, name: `[Calendar] ${p.name}` })),
-                ...DATEPICKER_PROPS.map(p => ({ ...p, name: `[DatePicker] ${p.name}` })),
-            ]}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/CardTab.tsx b/src/equicordplugins/components.dev/components/tabs/CardTab.tsx
deleted file mode 100644
index b3c55d07f..000000000
--- a/src/equicordplugins/components.dev/components/tabs/CardTab.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Card, CardVariants, Paragraph } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const CARD_PROPS: PropDef[] = [
-    { name: "variant", type: '"primary" | "warning" | "danger" | "success" | "brand"', default: '"primary"', description: "Visual style variant controlling background color." },
-    { name: "outline", type: "boolean", default: "false", description: "Renders with a border outline instead of filled background." },
-    { name: "defaultPadding", type: "boolean", description: "Adds 1em padding to the card. Defaults to true when no className is provided, false otherwise." },
-    { name: "children", type: "ReactNode", description: "Card content." },
-    { name: "className", type: "string", description: "Additional CSS class. When set, defaultPadding becomes false unless explicitly overridden." },
-    { name: "style", type: "CSSProperties", description: "Inline styles." },
-    { name: "...restProps", type: "HTMLDivAttributes", description: "All other standard div attributes are forwarded to the root element." },
-];
-
-export default function CardTab() {
-    return (
-        <DocPage
-            componentName="Card"
-            overview="Card is a Vencord component that renders a styled container div with variant-based coloring. It supports filled and outline modes, automatic default padding, and all standard div attributes. Useful for grouping content with visual emphasis."
-            notices={[
-                { type: "info", children: "Card is a Vencord component from @components/Card, not a Discord native component. Its API is stable but may differ from Discord's own card patterns." },
-            ]}
-            importPath={'import { Card } from "@components/Card";'}
-            sections={[
-                {
-                    title: "Variants",
-                    description: "Five visual styles for different content contexts.",
-                    code: '<Card variant="primary">\n  <Paragraph>Content here</Paragraph>\n</Card>',
-                    relevantProps: ["variant", "children"],
-                    children: (
-                        <div style={{ display: "flex", flexDirection: "column", gap: 12 }}>
-                            {CardVariants.map(variant => (
-                                <Card key={variant} variant={variant}>
-                                    <Paragraph style={{ fontWeight: 600, marginBottom: 4 }}>
-                                        {variant.charAt(0).toUpperCase() + variant.slice(1)}
-                                    </Paragraph>
-                                    <Paragraph color="text-muted">
-                                        {variant === "primary" ? "General purpose content container." :
-                                            variant === "warning" ? "Cautionary or attention-needed messages." :
-                                                variant === "danger" ? "Error states or destructive actions." :
-                                                    variant === "success" ? "Positive feedback or confirmations." :
-                                                        "Branded or highlighted content."}
-                                    </Paragraph>
-                                </Card>
-                            ))}
-                        </div>
-                    )
-                },
-                {
-                    title: "Outline Mode",
-                    description: "Uses a border instead of a filled background.",
-                    code: '<Card variant="warning" outline>\n  <Paragraph>Heads up!</Paragraph>\n</Card>',
-                    relevantProps: ["outline"],
-                    children: (
-                        <div style={{ display: "flex", flexDirection: "column", gap: 12 }}>
-                            {CardVariants.map(variant => (
-                                <Card key={variant} variant={variant} outline>
-                                    <Paragraph>{variant} outline</Paragraph>
-                                </Card>
-                            ))}
-                        </div>
-                    )
-                },
-                {
-                    title: "Padding Control",
-                    description: "Cards get 1em padding by default when no className is set. You can override this behavior explicitly.",
-                    code: '<Card variant="brand" className={myClass} defaultPadding>\n  <Paragraph>Keeps padding despite custom className</Paragraph>\n</Card>',
-                    relevantProps: ["defaultPadding", "className"],
-                    children: (
-                        <div style={{ display: "flex", flexDirection: "column", gap: 12 }}>
-                            <Card defaultPadding>
-                                <Paragraph>defaultPadding=true</Paragraph>
-                            </Card>
-                            <Card defaultPadding={false}>
-                                <Paragraph style={{ padding: 8 }}>defaultPadding=false (content adds own padding)</Paragraph>
-                            </Card>
-                        </div>
-                    )
-                },
-                {
-                    title: "Nested Cards",
-                    description: "Cards can nest for complex layouts.",
-                    children: (
-                        <Card variant="primary">
-                            <Paragraph style={{ fontWeight: 600, marginBottom: 8 }}>Outer Card</Paragraph>
-                            <Card variant="warning" style={{ marginBottom: 8 }}>
-                                <Paragraph>Nested warning card</Paragraph>
-                            </Card>
-                            <Card variant="danger">
-                                <Paragraph>Nested danger card</Paragraph>
-                            </Card>
-                        </Card>
-                    )
-                },
-                {
-                    title: "Custom Styling",
-                    description: "Cards accept custom styles and all div attributes.",
-                    relevantProps: ["style"],
-                    children: (
-                        <Card
-                            variant="primary"
-                            style={{ borderLeft: "4px solid var(--text-brand)", borderRadius: 4 }}
-                        >
-                            <Paragraph>Card with custom border accent</Paragraph>
-                        </Card>
-                    )
-                },
-            ]}
-            props={CARD_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/CheckboxGroupTab.tsx b/src/equicordplugins/components.dev/components/tabs/CheckboxGroupTab.tsx
deleted file mode 100644
index 807c1154f..000000000
--- a/src/equicordplugins/components.dev/components/tabs/CheckboxGroupTab.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { CheckboxGroupOption, ManaCheckboxGroup, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-import { EquicordIcon } from "../icons/EquicordIcon";
-
-const BASIC_OPTIONS: CheckboxGroupOption[] = [
-    { value: "option1", label: "Option 1" },
-    { value: "option2", label: "Option 2" },
-    { value: "option3", label: "Option 3" },
-];
-
-const OPTIONS_WITH_DESCRIPTIONS: CheckboxGroupOption[] = [
-    { value: "notifications", label: "Notifications", description: "Receive push notifications" },
-    { value: "sounds", label: "Sounds", description: "Play sounds for events" },
-    { value: "badges", label: "Badges", description: "Show unread badges" },
-];
-
-const OPTIONS_WITH_ICONS: CheckboxGroupOption[] = [
-    { value: "item1", label: "Item with icon", description: "This option has an icon", leadingIcon: EquicordIcon },
-    { value: "item2", label: "Another with icon", leadingIcon: EquicordIcon },
-    { value: "item3", label: "Third with icon", leadingIcon: EquicordIcon },
-];
-
-const OPTIONS_MIXED: CheckboxGroupOption[] = [
-    { value: "enabled", label: "Enabled option" },
-    { value: "disabled", label: "Disabled option", disabled: true },
-    { value: "another", label: "Another enabled" },
-];
-
-const GROUP_PROPS: PropDef[] = [
-    { name: "options", type: "CheckboxGroupOption[]", required: true, description: "Array of checkbox options to render." },
-    { name: "selectedValues", type: "(string | number)[]", required: true, description: "Currently selected option values." },
-    { name: "onChange", type: "(values: (string | number)[]) => void", description: "Called with the updated selection array when any checkbox is toggled." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disables the entire group. Individual option disabled flags still apply." },
-    { name: "label", type: "string", description: "Field label displayed above the group." },
-    { name: "hideLabel", type: "boolean", description: "Visually hides the label while keeping it accessible." },
-    { name: "badge", type: "ReactNode", description: "Badge element displayed next to the label." },
-    { name: "icon", type: "ReactNode", description: "Icon element displayed next to the label." },
-    { name: "required", type: "boolean", description: "Marks the field as required." },
-    { name: "description", type: "string", description: "Description text displayed below the label." },
-    { name: "helperText", type: "string", description: "Helper text displayed below the group." },
-    { name: "errorMessage", type: "string", description: "Error message displayed below the group." },
-    { name: "successMessage", type: "string", description: "Success message displayed below the group." },
-    { name: "id", type: "string", description: "Custom ID for the control element." },
-    { name: "layout", type: "string", description: "Field layout variant." },
-    { name: "layoutConfig", type: "Record<string, unknown>", description: "Configuration for the field layout." },
-];
-
-const OPTION_PROPS: PropDef[] = [
-    { name: "value", type: "string | number", required: true, description: "Unique identifier for this option." },
-    { name: "label", type: "string", required: true, description: "Label text displayed next to the checkbox." },
-    { name: "description", type: "string", description: "Description text below the label." },
-    { name: "disabled", type: "boolean", description: "Disables this individual option." },
-    { name: "leadingIcon", type: "ComponentType<any>", description: "Icon component displayed before the checkbox." },
-];
-
-function BasicDemo() {
-    const [selected, setSelected] = useState<(string | number)[]>(["option1"]);
-    return <ManaCheckboxGroup options={BASIC_OPTIONS} selectedValues={selected} onChange={setSelected} />;
-}
-
-function DescriptionDemo() {
-    const [selected, setSelected] = useState<(string | number)[]>(["notifications", "sounds"]);
-    return <ManaCheckboxGroup options={OPTIONS_WITH_DESCRIPTIONS} selectedValues={selected} onChange={setSelected} />;
-}
-
-function IconDemo() {
-    const [selected, setSelected] = useState<(string | number)[]>(["item1"]);
-    return <ManaCheckboxGroup options={OPTIONS_WITH_ICONS} selectedValues={selected} onChange={setSelected} />;
-}
-
-function MixedDemo() {
-    const [selected, setSelected] = useState<(string | number)[]>(["enabled"]);
-    return <ManaCheckboxGroup options={OPTIONS_MIXED} selectedValues={selected} onChange={setSelected} />;
-}
-
-export default function CheckboxGroupTab() {
-    return (
-        <DocPage
-            componentName="ManaCheckboxGroup"
-            overview="ManaCheckboxGroup renders a group of checkboxes from an options array with multi-select state management. Each option supports labels, descriptions, icons, and individual disabled state. The group can also be disabled entirely."
-            notices={[
-                { type: "info", children: "CheckboxGroup manages multi-select state internally by delegating to individual ManaCheckbox instances. Use this instead of manually rendering multiple checkboxes when you need shared state tracking." },
-            ]}
-            importPath={'import { ManaCheckboxGroup } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Simple group with three options.",
-                    children: <BasicDemo />,
-                    code: '<ManaCheckboxGroup\n  options={[\n    { value: "a", label: "Option A" },\n    { value: "b", label: "Option B" },\n  ]}\n  selectedValues={selected}\n  onChange={setSelected}\n/>',
-                    relevantProps: ["options", "selectedValues", "onChange"],
-                },
-                {
-                    title: "With Descriptions",
-                    description: "Each option can have a description below its label.",
-                    children: <DescriptionDemo />,
-                },
-                {
-                    title: "With Leading Icons",
-                    description: "Options can display an icon component before the checkbox.",
-                    children: <IconDemo />,
-                },
-                {
-                    title: "With Disabled Option",
-                    description: "Individual options can be disabled while others remain interactive.",
-                    children: <MixedDemo />,
-                },
-                {
-                    title: "Entire Group Disabled",
-                    description: "The disabled prop on the group disables all options.",
-                    children: (
-                        <ManaCheckboxGroup
-                            options={BASIC_OPTIONS}
-                            selectedValues={["option1", "option2"]}
-                            disabled
-                        />
-                    ),
-                    relevantProps: ["disabled"],
-                },
-            ]}
-            props={[
-                { title: "ManaCheckboxGroup", props: GROUP_PROPS },
-                { title: "CheckboxGroupOption", props: OPTION_PROPS },
-            ]}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/CheckboxTab.tsx b/src/equicordplugins/components.dev/components/tabs/CheckboxTab.tsx
deleted file mode 100644
index c9312fa16..000000000
--- a/src/equicordplugins/components.dev/components/tabs/CheckboxTab.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaCheckbox, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-import { EquicordIcon } from "../icons/EquicordIcon";
-
-const CHECKBOX_PROPS: PropDef[] = [
-    { name: "checked", type: "boolean", required: true, description: "Current checked state." },
-    { name: "onChange", type: "(checked: boolean) => void", description: "Called when the checkbox is toggled." },
-    { name: "label", type: "string", description: "Label text displayed next to the checkbox." },
-    { name: "description", type: "string", description: "Description text below the label." },
-    { name: "labelType", type: '"primary" | "secondary"', default: '"primary"', description: "Label text styling. Primary uses normal weight, secondary uses muted color." },
-    { name: "leadingIcon", type: "ComponentType<any>", description: "Icon component displayed before the checkbox." },
-    { name: "usageVariant", type: '"single" | "indicator"', default: '"single"', internal: true, description: "Visual style. Single has full padding and spacing, indicator is compact." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disables the checkbox interaction." },
-    { name: "displayOnly", type: "boolean", internal: true, description: "Renders the checkbox in a display-only state without interaction." },
-    { name: "value", type: "string | number", description: "Value identifier used when inside a CheckboxGroup." },
-    { name: "labeledBy", type: "string", internal: true, description: "ID of an external element that labels this checkbox for accessibility." },
-];
-
-function BasicDemo() {
-    const [checked, setChecked] = useState(true);
-    const [unchecked, setUnchecked] = useState(false);
-
-    return (
-        <div className="vc-compfinder-grid-vertical">
-            <ManaCheckbox label="Checked" checked={checked} onChange={setChecked} />
-            <ManaCheckbox label="Unchecked" checked={unchecked} onChange={setUnchecked} />
-        </div>
-    );
-}
-
-function DescriptionDemo() {
-    const [checked, setChecked] = useState(true);
-
-    return (
-        <ManaCheckbox
-            label="Option with description"
-            description="This is a helpful description for the option."
-            checked={checked}
-            onChange={setChecked}
-        />
-    );
-}
-
-function LabelTypesDemo() {
-    const [primary, setPrimary] = useState(true);
-    const [secondary, setSecondary] = useState(false);
-
-    return (
-        <div className="vc-compfinder-grid-vertical">
-            <ManaCheckbox label="Primary label (default)" labelType="primary" checked={primary} onChange={setPrimary} />
-            <ManaCheckbox label="Secondary label" labelType="secondary" checked={secondary} onChange={setSecondary} />
-        </div>
-    );
-}
-
-function IconDemo() {
-    const [checked, setChecked] = useState(true);
-
-    return (
-        <ManaCheckbox
-            label="With icon"
-            description="This checkbox has a leading icon."
-            leadingIcon={EquicordIcon}
-            checked={checked}
-            onChange={setChecked}
-        />
-    );
-}
-
-function UsageVariantsDemo() {
-    const [single, setSingle] = useState(true);
-    const [indicator, setIndicator] = useState(false);
-
-    return (
-        <div className="vc-compfinder-grid-vertical">
-            <ManaCheckbox label="Single (default)" usageVariant="single" checked={single} onChange={setSingle} />
-            <ManaCheckbox label="Indicator" usageVariant="indicator" checked={indicator} onChange={setIndicator} />
-        </div>
-    );
-}
-
-export default function CheckboxTab() {
-    return (
-        <DocPage
-            componentName="ManaCheckbox"
-            overview="ManaCheckbox is Discord's checkbox component with label, description, icon support, and two visual variants. Supports controlled state, disabled and display-only modes, and integrates with CheckboxGroup for multi-select patterns."
-            notices={[
-                { type: "info", children: "ManaCheckbox is a controlled component. The checked prop must always be provided, and you must update it via onChange to reflect the new state." },
-            ]}
-            importPath={'import { ManaCheckbox } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Toggle checkboxes on and off.",
-                    children: <BasicDemo />,
-                    code: '<ManaCheckbox label="Enable feature" checked={enabled} onChange={setEnabled} />',
-                    relevantProps: ["checked", "onChange", "label"],
-                },
-                {
-                    title: "With Description",
-                    description: "A description renders below the label in smaller text.",
-                    children: <DescriptionDemo />,
-                    code: '<ManaCheckbox\n  label="Notifications"\n  description="Receive email notifications for new messages."\n  checked={checked}\n  onChange={setChecked}\n/>',
-                    relevantProps: ["description"],
-                },
-                {
-                    title: "Label Types",
-                    description: "Primary uses normal text styling, secondary uses a muted, lighter appearance.",
-                    children: <LabelTypesDemo />,
-                    relevantProps: ["labelType"],
-                },
-                {
-                    title: "With Leading Icon",
-                    description: "An icon component displayed before the checkbox indicator.",
-                    children: <IconDemo />,
-                    code: '<ManaCheckbox\n  label="With icon"\n  leadingIcon={BellIcon}\n  checked={checked}\n  onChange={setChecked}\n/>',
-                    relevantProps: ["leadingIcon"],
-                },
-                {
-                    title: "States",
-                    description: "Disabled prevents interaction. Display only renders without any interactive behavior.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            <ManaCheckbox label="Disabled (checked)" checked={true} disabled />
-                            <ManaCheckbox label="Disabled (unchecked)" checked={false} disabled />
-                            <ManaCheckbox label="Display only" checked={true} displayOnly />
-                        </div>
-                    ),
-                    relevantProps: ["disabled", "displayOnly"],
-                },
-                {
-                    title: "Usage Variants",
-                    description: "Single has full padding and spacing for standalone use. Indicator is compact for inline contexts.",
-                    children: <UsageVariantsDemo />,
-                    relevantProps: ["usageVariant"],
-                },
-            ]}
-            props={CHECKBOX_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ChipTab.tsx b/src/equicordplugins/components.dev/components/tabs/ChipTab.tsx
deleted file mode 100644
index 4122b7c58..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ChipTab.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Chip, Paragraph } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const CHIP_COLORS = ["blurple", "purple", "green", "orange", "yellow", "pink", "red", "gray"] as const;
-const CHIP_SHADES = ["Light", "Medium", "Dark"] as const;
-
-const CHIP_PROPS: PropDef[] = [
-    { name: "text", type: "string", required: true, description: "Text displayed inside the chip." },
-    { name: "variant", type: "ChipVariant", default: '"grayLight"', description: "Color variant in the format {color}{shade}. 8 colors (blurple, purple, green, orange, yellow, pink, red, gray) times 3 shades (Light, Medium, Dark) for 24 total variants." },
-];
-
-export default function ChipTab() {
-    return (
-        <DocPage
-            componentName="Chip"
-            overview="Chip is a small label component used for tags, statuses, and categories. It renders text in an eyebrow style with a colored background. Supports 24 variants across 8 colors and 3 shade levels."
-            importPath={'import { Chip } from "../components";'}
-            sections={[
-                {
-                    title: "All Variants",
-                    description: "All 24 chip variants: 8 colors times 3 shades.",
-                    children: (
-                        <>
-                            {CHIP_SHADES.map(shade => (
-                                <div key={shade} style={{ marginBottom: 16 }}>
-                                    <Paragraph color="text-muted" style={{ marginBottom: 8, fontWeight: 600 }}>
-                                        {shade}
-                                    </Paragraph>
-                                    <div className="vc-compfinder-grid">
-                                        {CHIP_COLORS.map(color => (
-                                            <Chip
-                                                key={`${color}${shade}`}
-                                                text={color}
-                                                variant={`${color}${shade}` as any}
-                                            />
-                                        ))}
-                                    </div>
-                                </div>
-                            ))}
-                        </>
-                    ),
-                    code: '<Chip text="New" variant="blurpleLight" />',
-                    relevantProps: ["variant"],
-                },
-                {
-                    title: "Use Cases",
-                    description: "Common patterns for status labels and tags.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <Chip text="New" variant="blurpleLight" />
-                            <Chip text="Beta" variant="yellowMedium" />
-                            <Chip text="Deprecated" variant="redLight" />
-                            <Chip text="Stable" variant="greenLight" />
-                            <Chip text="Premium" variant="pinkMedium" />
-                            <Chip text="Experimental" variant="orangeLight" />
-                        </div>
-                    ),
-                },
-            ]}
-            props={CHIP_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ClickableTab.tsx b/src/equicordplugins/components.dev/components/tabs/ClickableTab.tsx
deleted file mode 100644
index 7cc8e07ae..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ClickableTab.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Clickable, Paragraph, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const CLICKABLE_PROPS: PropDef[] = [
-    { name: "tag", type: "keyof JSX.IntrinsicElements", default: '"div"', description: "HTML element to render as." },
-    { name: "onClick", type: "MouseEventHandler", description: "Click handler. When absent, renders as a non-interactive element without keyboard handling." },
-    { name: "onKeyPress", type: "KeyboardEventHandler", description: "Key press handler called after internal Enter/Space handling." },
-    { name: "role", type: "string", default: '"button"', description: "ARIA role attribute." },
-    { name: "tabIndex", type: "number", default: "0", description: "Tab index for keyboard navigation." },
-    { name: "ignoreKeyPress", type: "boolean", description: "When true, Enter and Space keys will not trigger onClick." },
-    { name: "focusProps", type: "Record<string, unknown>", internal: true, description: "Props forwarded to the focus management wrapper." },
-    { name: "innerRef", type: "Ref<HTMLElement>", internal: true, description: "Ref to the underlying DOM element." },
-    { name: "href", type: "string", description: "Optional href. Affects key handling behavior (Space won't preventDefault when set)." },
-    { name: "className", type: "string", description: "Additional CSS class name." },
-    { name: "children", type: "ReactNode", description: "Child elements." },
-];
-
-const boxStyle: React.CSSProperties = {
-    padding: "8px 16px",
-    backgroundColor: "var(--background-secondary)",
-    borderRadius: 4,
-    cursor: "pointer",
-};
-
-function BasicDemo() {
-    const [count, setCount] = useState(0);
-
-    return (
-        <>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>Click count: {count}</Paragraph>
-            <Clickable onClick={() => setCount(c => c + 1)} style={boxStyle}>
-                Click me!
-            </Clickable>
-        </>
-    );
-}
-
-function TagDemo() {
-    const [last, setLast] = useState("None");
-
-    return (
-        <>
-            <div style={{ display: "flex", gap: 8 }}>
-                <Clickable tag="div" onClick={() => setLast("div")} style={{ ...boxStyle, backgroundColor: "var(--background-tertiary)" }}>
-                    tag="div"
-                </Clickable>
-                <Clickable tag="span" onClick={() => setLast("span")} style={{ ...boxStyle, backgroundColor: "var(--background-tertiary)" }}>
-                    tag="span"
-                </Clickable>
-                <Clickable tag="button" onClick={() => setLast("button")} style={{ ...boxStyle, backgroundColor: "var(--background-tertiary)", border: "none", color: "inherit" }}>
-                    tag="button"
-                </Clickable>
-            </div>
-            <Paragraph color="text-muted" style={{ marginTop: 8 }}>Last clicked: {last}</Paragraph>
-        </>
-    );
-}
-
-function KeyPressDemo() {
-    const [last, setLast] = useState("None");
-
-    return (
-        <>
-            <div style={{ display: "flex", gap: 8 }}>
-                <Clickable tabIndex={0} onClick={() => setLast("Normal (keys work)")} style={boxStyle}>
-                    Normal (try Enter/Space)
-                </Clickable>
-                <Clickable tabIndex={0} ignoreKeyPress onClick={() => setLast("Keys blocked")} style={boxStyle}>
-                    ignoreKeyPress (keys blocked)
-                </Clickable>
-            </div>
-            <Paragraph color="text-muted" style={{ marginTop: 8 }}>Last action: {last}</Paragraph>
-        </>
-    );
-}
-
-export default function ClickableTab() {
-    return (
-        <DocPage
-            componentName="Clickable"
-            overview="Clickable is a generic interactive wrapper that adds click and keyboard handling to any HTML element. It handles Enter/Space key presses, integrates with Discord's focus management context, and gracefully degrades to a non-interactive element when no onClick is provided. It's a class component with configurable tag, role, and tabIndex defaults."
-            notices={[
-                { type: "positive", children: 'Use Clickable instead of adding onClick to plain divs. It handles keyboard accessibility, focus management, and proper ARIA role="button" automatically.' },
-            ]}
-            importPath={'import { Clickable } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Default clickable element. Renders as a div with role=\"button\" and tabIndex=0.",
-                    children: <BasicDemo />,
-                    code: "<Clickable onClick={() => doSomething()} style={myStyles}>\n  Click me!\n</Clickable>",
-                    relevantProps: ["onClick", "children"],
-                },
-                {
-                    title: "Custom Tag",
-                    description: "Clickable can render as any HTML element using the tag prop.",
-                    children: <TagDemo />,
-                    code: '<Clickable tag="button" onClick={handleClick}>\n  I am a button element\n</Clickable>',
-                    relevantProps: ["tag"],
-                },
-                {
-                    title: "Role and TabIndex",
-                    description: "Accessibility props for keyboard navigation. Defaults to role=\"button\" and tabIndex=0.",
-                    children: (
-                        <div style={{ display: "flex", gap: 8 }}>
-                            <Clickable role="button" tabIndex={0} onClick={() => { }} style={boxStyle}>
-                                role="button"
-                            </Clickable>
-                            <Clickable role="link" tabIndex={0} onClick={() => { }} style={boxStyle}>
-                                role="link"
-                            </Clickable>
-                        </div>
-                    ),
-                    relevantProps: ["role", "tabIndex"],
-                },
-                {
-                    title: "Ignore Key Press",
-                    description: "When ignoreKeyPress is true, Enter and Space will not trigger onClick. Only mouse clicks work.",
-                    children: <KeyPressDemo />,
-                    relevantProps: ["ignoreKeyPress"],
-                },
-                {
-                    title: "Non-Interactive",
-                    description: "When no onClick is provided, renders without keyboard handling or interactive behavior.",
-                    children: (
-                        <Clickable style={{ padding: "8px 16px", backgroundColor: "var(--background-modifier-accent)", borderRadius: 4 }}>
-                            Non-interactive (no onClick)
-                        </Clickable>
-                    ),
-                },
-            ]}
-            props={CLICKABLE_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/CodeBlockTab.tsx b/src/equicordplugins/components.dev/components/tabs/CodeBlockTab.tsx
deleted file mode 100644
index 691ca276a..000000000
--- a/src/equicordplugins/components.dev/components/tabs/CodeBlockTab.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { CodeBlock } from "@components/CodeBlock";
-
-import { InlineCode, Paragraph } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const CODEBLOCK_PROPS: PropDef[] = [
-    { name: "content", type: "string", description: "The code text to render inside the block." },
-    { name: "lang", type: "string", required: true, description: "Language identifier for syntax highlighting (e.g. \"tsx\", \"js\", \"css\", \"py\"). Use empty string for no highlighting." },
-];
-
-const INLINECODE_PROPS: PropDef[] = [
-    { name: "children", type: "ReactNode", required: true, description: "Content to render as inline code." },
-];
-
-const JS_EXAMPLE = `function greet(name) {
-    return \`Hello, \${name}!\`;
-}
-
-console.log(greet("World"));`;
-
-const TS_EXAMPLE = `interface User {
-    id: string;
-    name: string;
-    email?: string;
-}
-
-const getUser = (id: string): User => {
-    return { id, name: "John" };
-};`;
-
-const CSS_EXAMPLE = `.container {
-    display: flex;
-    gap: 8px;
-    padding: 16px;
-    background: var(--background-secondary);
-    border-radius: 8px;
-}`;
-
-const PYTHON_EXAMPLE = `def fibonacci(n: int) -> list[int]:
-    if n <= 0:
-        return []
-    sequence = [0, 1]
-    while len(sequence) < n:
-        sequence.append(sequence[-1] + sequence[-2])
-    return sequence[:n]
-
-print(fibonacci(10))`;
-
-const JSON_EXAMPLE = `{
-    "name": "equicord",
-    "version": "1.0.0",
-    "plugins": ["example"],
-    "settings": {
-        "enabled": true,
-        "theme": "dark"
-    }
-}`;
-
-export default function CodeBlockTab() {
-    return (
-        <DocPage
-            componentName="CodeBlock"
-            overview="CodeBlock renders syntax-highlighted code using Discord's built-in markdown parser. InlineCode renders small code snippets inline within text. Both are Vencord components wrapping Discord's markup system."
-            importPath={'import { CodeBlock } from "@components/CodeBlock";\nimport { InlineCode } from "../components";'}
-            sections={[
-                {
-                    title: "Inline Code",
-                    description: "Small code snippets rendered inline within text.",
-                    children: (
-                        <>
-                            <Paragraph>I really like <InlineCode>cats</InlineCode> so yeah</Paragraph>
-                            <Paragraph>Use <InlineCode>console.log()</InlineCode> to debug your code.</Paragraph>
-                            <Paragraph>
-                                Combine <InlineCode>const</InlineCode> with <InlineCode>let</InlineCode> and
-                                use <InlineCode>===</InlineCode> for strict equality.
-                            </Paragraph>
-                        </>
-                    ),
-                    code: "<Paragraph>Use <InlineCode>console.log()</InlineCode> to debug.</Paragraph>",
-                },
-                {
-                    title: "JavaScript",
-                    children: <CodeBlock content={JS_EXAMPLE} lang="js" />,
-                    code: '<CodeBlock content={jsCode} lang="js" />',
-                    relevantProps: ["content", "lang"],
-                },
-                {
-                    title: "TypeScript",
-                    children: <CodeBlock content={TS_EXAMPLE} lang="ts" />,
-                },
-                {
-                    title: "CSS",
-                    children: <CodeBlock content={CSS_EXAMPLE} lang="css" />,
-                },
-                {
-                    title: "Python",
-                    children: <CodeBlock content={PYTHON_EXAMPLE} lang="py" />,
-                },
-                {
-                    title: "JSON",
-                    children: <CodeBlock content={JSON_EXAMPLE} lang="json" />,
-                },
-                {
-                    title: "Plain Text",
-                    description: "Use an empty string for lang to render without syntax highlighting.",
-                    children: <CodeBlock content={"This is plain text\nwithout any syntax highlighting."} lang="" />,
-                    code: '<CodeBlock content="plain text" lang="" />',
-                },
-            ]}
-            props={[
-                { title: "CodeBlock", props: CODEBLOCK_PROPS },
-                { title: "InlineCode", props: INLINECODE_PROPS },
-            ]}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ColorPickerTab.tsx b/src/equicordplugins/components.dev/components/tabs/ColorPickerTab.tsx
deleted file mode 100644
index a27c59346..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ColorPickerTab.tsx
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ColorPicker, ColorPickerWithSwatches, ColorSwatch, DefaultColorButton, Paragraph, PresetColors, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const DEFAULT_COLOR = 0x5865F2;
-
-function intToHex(color: number): string {
-    return "#" + color.toString(16).padStart(6, "0");
-}
-
-const PICKER_PROPS: PropDef[] = [
-    { name: "color", type: "number", required: true, description: "Current color as an integer (e.g. 0x5865F2)." },
-    { name: "onChange", type: "(color: number) => void", required: true, description: "Called with the new color integer when changed." },
-    { name: "onClose", type: "() => void", description: "Called when the picker popout closes." },
-    { name: "suggestedColors", type: "string[]", description: "Array of hex color strings shown as suggestions in the popout." },
-    { name: "disabled", type: "boolean", description: "Disables the color picker." },
-    { name: "label", type: "ReactNode", description: "Optional label displayed next to the swatch." },
-    { name: "colorPickerMiddle", type: "ReactNode", internal: true, description: "Content injected in the middle of the popout." },
-    { name: "colorPickerFooter", type: "ReactNode", internal: true, description: "Content injected in the footer of the popout." },
-    { name: "showEyeDropper", type: "boolean", description: "Shows the eye dropper tool in the popout." },
-];
-
-const SWATCH_PROPS: PropDef[] = [
-    { name: "color", type: "number", description: "Color value. Omit for a \"no color\" state." },
-    { name: "isDefault", type: "boolean", description: "Renders in the larger default button style." },
-    { name: "isCustom", type: "boolean", description: "Shows a dropper icon overlay." },
-    { name: "isSelected", type: "boolean", description: "Shows a checkmark overlay." },
-    { name: "disabled", type: "boolean", description: "Disables the swatch." },
-    { name: "onClick", type: "(color) => void", description: "Click handler receiving the color or gradient object." },
-    { name: "isGradient", type: "boolean", description: "Enables gradient rendering mode." },
-    { name: "gradientStart", type: "number", description: "Start color for gradients." },
-    { name: "gradientEnd", type: "number", description: "End color for gradients." },
-    { name: "gradientDegrees", type: "number", default: "180", description: "Angle in degrees for the gradient." },
-    { name: "aria-label", type: "string", description: "Accessibility label." },
-    { name: "style", type: "CSSProperties", description: "Inline styles." },
-];
-
-const SWATCHES_PROPS: PropDef[] = [
-    { name: "defaultColor", type: "number", required: true, description: "Default/reset color value." },
-    { name: "colors", type: "number[] | GradientColor[]", required: true, description: "Array of preset color values or gradient definitions." },
-    { name: "value", type: "number", required: true, description: "Currently selected color." },
-    { name: "onChange", type: "(color: number) => void", required: true, description: "Called when a color is selected." },
-    { name: "customColor", type: "number", description: "Current custom color for the custom button." },
-    { name: "secondaryValue", type: "number", description: "Secondary color value for gradient mode." },
-    { name: "disabled", type: "boolean", description: "Disables all swatches." },
-    { name: "renderDefaultButton", type: "(props) => ReactNode", description: "Render prop for the default/reset button." },
-    { name: "renderCustomButton", type: "(props) => ReactNode", description: "Render prop for the custom color button." },
-    { name: "isGradient", type: "boolean", description: "Enables gradient mode for all swatches." },
-    { name: "gradientDegrees", type: "number", description: "Gradient angle for all swatches." },
-    { name: "allowBlackCustomColor", type: "boolean", description: "Allows selecting pure black (#000000)." },
-    { name: "className", type: "string", description: "Additional CSS class on the root." },
-    { name: "colorContainerClassName", type: "string", description: "CSS class on the swatch grid container." },
-];
-
-function BasicPickerDemo() {
-    const [color, setColor] = useState(DEFAULT_COLOR);
-
-    return (
-        <>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>Selected: {intToHex(color)}</Paragraph>
-            <ColorPicker color={color} onChange={setColor} showEyeDropper={false} />
-        </>
-    );
-}
-
-function EyeDropperDemo() {
-    const [color, setColor] = useState(DEFAULT_COLOR);
-
-    return <ColorPicker color={color} onChange={setColor} showEyeDropper />;
-}
-
-function SuggestedDemo() {
-    const [color, setColor] = useState(0xE74C3C);
-
-    return (
-        <>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>Selected: {intToHex(color)}</Paragraph>
-            <ColorPicker
-                color={color}
-                onChange={setColor}
-                showEyeDropper={false}
-                suggestedColors={["#1ABC9C", "#2ECC71", "#3498DB", "#9B59B6", "#E91E63", "#F1C40F", "#E67E22", "#E74C3C"]}
-            />
-        </>
-    );
-}
-
-function SwatchSelectDemo() {
-    const [selected, setSelected] = useState(0x2ECC71);
-
-    return (
-        <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
-            {PresetColors.slice(0, 10).map(color => (
-                <ColorSwatch key={color} color={color} isSelected={selected === color} onClick={() => setSelected(color)} />
-            ))}
-        </div>
-    );
-}
-
-function SwatchesGridDemo() {
-    const [color, setColor] = useState(0x3498DB);
-
-    return (
-        <>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>Selected: {intToHex(color)}</Paragraph>
-            <ColorPickerWithSwatches
-                defaultColor={DEFAULT_COLOR}
-                colors={[...PresetColors]}
-                value={color}
-                onChange={setColor}
-                renderDefaultButton={() => null}
-                renderCustomButton={() => null}
-            />
-        </>
-    );
-}
-
-function FullPickerDemo() {
-    const [color, setColor] = useState(0x9B59B6);
-
-    return (
-        <>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>Selected: {intToHex(color)}</Paragraph>
-            <ColorPickerWithSwatches
-                defaultColor={DEFAULT_COLOR}
-                customColor={color}
-                colors={[...PresetColors]}
-                value={color}
-                onChange={setColor}
-                renderDefaultButton={props => <DefaultColorButton {...props} />}
-                renderCustomButton={() => (
-                    <ColorPicker color={color} onChange={setColor} showEyeDropper={false} />
-                )}
-            />
-        </>
-    );
-}
-
-export default function ColorPickerTab() {
-    return (
-        <DocPage
-            componentName="ColorPicker"
-            overview="Discord's color picker system includes a full-featured ColorPicker popout, individual ColorSwatch buttons, and a ColorPickerWithSwatches grid. Colors are represented as integers (e.g. 0x5865F2). Convert with parseInt(hex, 16) and color.toString(16)."
-            notices={[
-                { type: "info", children: 'Colors are represented as integers, not hex strings. Convert with parseInt(hex, 16) to get an integer and color.toString(16).padStart(6, "0") to get a hex string.' },
-            ]}
-            importPath={'import { ColorPicker, ColorPickerWithSwatches, ColorSwatch, DefaultColorButton, CustomColorButton } from "../components";'}
-            sections={[
-                {
-                    title: "Basic ColorPicker",
-                    description: "Click the swatch to open a full color picker popout.",
-                    children: <BasicPickerDemo />,
-                    code: "<ColorPicker color={color} onChange={setColor} showEyeDropper={false} />",
-                    relevantProps: ["color", "onChange"],
-                },
-                {
-                    title: "With Eye Dropper",
-                    description: "Includes the eye dropper tool for picking colors from screen.",
-                    children: <EyeDropperDemo />,
-                    relevantProps: ["showEyeDropper"],
-                },
-                {
-                    title: "With Suggested Colors",
-                    description: "Shows suggested color swatches inside the popout.",
-                    children: <SuggestedDemo />,
-                    code: '<ColorPicker\n  color={color}\n  onChange={setColor}\n  suggestedColors={["#1ABC9C", "#2ECC71", "#3498DB"]}\n/>',
-                    relevantProps: ["suggestedColors"],
-                },
-                {
-                    title: "Disabled",
-                    children: <ColorPicker color={0x5865F2} onChange={() => { }} disabled />,
-                    relevantProps: ["disabled"],
-                },
-                {
-                    title: "Color Swatches",
-                    description: "Individual swatch buttons. Click to select.",
-                    children: <SwatchSelectDemo />,
-                    code: "<ColorSwatch color={0x5865F2} isSelected={selected === 0x5865F2} onClick={() => setSelected(0x5865F2)} />",
-                },
-                {
-                    title: "Swatch States",
-                    description: "Normal, selected, default, custom, disabled, and no-color states.",
-                    children: (
-                        <div style={{ display: "flex", gap: 8, alignItems: "center", flexWrap: "wrap" }}>
-                            {([
-                                ["Normal", {}],
-                                ["Selected", { isSelected: true }],
-                                ["Default", { isDefault: true }],
-                                ["Custom", { isCustom: true }],
-                                ["Disabled", { disabled: true }],
-                            ] as const).map(([label, props]) => (
-                                <div key={label} style={{ textAlign: "center" }}>
-                                    <ColorSwatch color={0x5865F2} {...props} />
-                                    <Paragraph color="text-muted" style={{ fontSize: 10 }}>{label}</Paragraph>
-                                </div>
-                            ))}
-                            <div style={{ textAlign: "center" }}>
-                                <ColorSwatch />
-                                <Paragraph color="text-muted" style={{ fontSize: 10 }}>No Color</Paragraph>
-                            </div>
-                        </div>
-                    ),
-                    relevantProps: ["isSelected", "isDefault", "isCustom", "disabled"],
-                },
-                {
-                    title: "Gradient Swatches",
-                    description: "Gradient swatches with customizable angle.",
-                    children: (
-                        <div style={{ display: "flex", gap: 8 }}>
-                            <ColorSwatch isGradient gradientStart={0xE91E63} gradientEnd={0x9B59B6} gradientDegrees={90} />
-                            <ColorSwatch isGradient gradientStart={0x3498DB} gradientEnd={0x2ECC71} gradientDegrees={135} />
-                            <ColorSwatch isGradient gradientStart={0xF1C40F} gradientEnd={0xE74C3C} gradientDegrees={180} />
-                        </div>
-                    ),
-                    relevantProps: ["isGradient", "gradientStart", "gradientEnd", "gradientDegrees"],
-                },
-                {
-                    title: "Swatch Grid",
-                    description: "ColorPickerWithSwatches renders a grid of preset color swatches.",
-                    children: <SwatchesGridDemo />,
-                    code: "<ColorPickerWithSwatches\n  defaultColor={DEFAULT_COLOR}\n  colors={presetColors}\n  value={color}\n  onChange={setColor}\n  renderDefaultButton={() => null}\n  renderCustomButton={() => null}\n/>",
-                },
-                {
-                    title: "Full Picker with Buttons",
-                    description: "Swatch grid with default reset button and custom color picker using render props.",
-                    children: <FullPickerDemo />,
-                    relevantProps: ["renderDefaultButton", "renderCustomButton"],
-                },
-            ]}
-            props={[
-                { title: "ColorPicker", props: PICKER_PROPS },
-                { title: "ColorSwatch", props: SWATCH_PROPS },
-                { title: "ColorPickerWithSwatches", props: SWATCHES_PROPS },
-            ]}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ComboboxTab.tsx b/src/equicordplugins/components.dev/components/tabs/ComboboxTab.tsx
deleted file mode 100644
index 581787451..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ComboboxTab.tsx
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaCombobox, Paragraph, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const COMBOBOX_PROPS: PropDef[] = [
-    { name: "placeholder", type: "string", description: "Placeholder text for the search input." },
-    { name: "value", type: "T | T[]", description: "Currently selected value or array of values for multi-select." },
-    { name: "onChange", type: "(value: T | T[]) => void", description: "Called when the selection changes." },
-    { name: "multiSelect", type: "boolean", default: "false", description: "Enable multiple selection mode." },
-    { name: "autoFocus", type: "boolean", default: "false", description: "Focus the search input on mount." },
-    { name: "maxVisibleItems", type: "number", default: "5", description: "Maximum items visible before scrolling." },
-    { name: "itemToString", type: "(item: T) => string", description: "Converts an item to a string for display." },
-    { name: "emptyStateHeader", type: "string", description: "Header text shown when no results match the query." },
-    { name: "emptyStateText", type: "string", description: "Body text shown when no results match the query." },
-    { name: "onQueryChange", type: "(query: string) => void", description: "Called when the search query changes. Useful for external filtering." },
-    { name: "aria-label", type: "string", description: "Accessibility label for the combobox." },
-    { name: "className", type: "string", description: "CSS class for the combobox container." },
-    { name: "listClassName", type: "string", description: "CSS class for the dropdown list." },
-    { name: "children", type: "(query: string) => ReactNode[]", required: true, description: "Render function receiving the search query. Return filterable items." },
-];
-
-const SAMPLE_ITEMS = [
-    { id: "1", label: "Apple" },
-    { id: "2", label: "Banana" },
-    { id: "3", label: "Cherry" },
-    { id: "4", label: "Date" },
-    { id: "5", label: "Elderberry" },
-    { id: "6", label: "Fig" },
-    { id: "7", label: "Grape" },
-    { id: "8", label: "Honeydew" },
-];
-
-function ComboboxItem({ item, isSelected, onClick }: { item: { id: string; label: string; }; isSelected: boolean; onClick: () => void; }) {
-    return (
-        <div
-            onClick={onClick}
-            style={{
-                padding: "8px 12px",
-                cursor: "pointer",
-                background: isSelected ? "var(--background-modifier-selected)" : "transparent",
-                borderRadius: 4,
-            }}
-            onMouseEnter={e => (e.currentTarget.style.background = "var(--background-modifier-hover)")}
-            onMouseLeave={e => (e.currentTarget.style.background = isSelected ? "var(--background-modifier-selected)" : "transparent")}
-        >
-            {item.label}
-        </div>
-    );
-}
-
-function filterItems(query: string) {
-    return SAMPLE_ITEMS.filter(item =>
-        item.label.toLowerCase().includes(query.toLowerCase())
-    );
-}
-
-function SingleSelectDemo() {
-    const [value, setValue] = useState<string>("");
-
-    return (
-        <div style={{ maxWidth: 300 }}>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>
-                Selected: {SAMPLE_ITEMS.find(i => i.id === value)?.label ?? "None"}
-            </Paragraph>
-            <ManaCombobox
-                placeholder="Search fruits..."
-                value={value}
-                onChange={v => setValue(v as string)}
-                aria-label="Select a fruit"
-                maxVisibleItems={5}
-                emptyStateHeader="No results"
-                emptyStateText="Try a different search term"
-            >
-                {query => filterItems(query).map(item => (
-                    <ComboboxItem
-                        key={item.id}
-                        item={item}
-                        isSelected={value === item.id}
-                        onClick={() => setValue(item.id)}
-                    />
-                ))}
-            </ManaCombobox>
-        </div>
-    );
-}
-
-function MultiSelectDemo() {
-    const [values, setValues] = useState<string[]>([]);
-
-    return (
-        <div style={{ maxWidth: 300 }}>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>
-                Selected: {values.length ? values.map(v => SAMPLE_ITEMS.find(i => i.id === v)?.label).join(", ") : "None"}
-            </Paragraph>
-            <ManaCombobox
-                placeholder="Search fruits..."
-                value={values}
-                onChange={v => setValues(v as string[])}
-                multiSelect
-                aria-label="Select fruits"
-                maxVisibleItems={5}
-            >
-                {query => filterItems(query).map(item => (
-                    <ComboboxItem
-                        key={item.id}
-                        item={item}
-                        isSelected={values.includes(item.id)}
-                        onClick={() => {
-                            if (values.includes(item.id)) {
-                                setValues(values.filter(v => v !== item.id));
-                            } else {
-                                setValues([...values, item.id]);
-                            }
-                        }}
-                    />
-                ))}
-            </ManaCombobox>
-        </div>
-    );
-}
-
-function EmptyStateDemo() {
-    return (
-        <div style={{ maxWidth: 300 }}>
-            <ManaCombobox
-                placeholder="Type something that won't match..."
-                value=""
-                onChange={() => { }}
-                aria-label="Empty state demo"
-                emptyStateHeader="Nothing found"
-                emptyStateText="We couldn't find what you're looking for."
-            >
-                {() => []}
-            </ManaCombobox>
-        </div>
-    );
-}
-
-export default function ComboboxTab() {
-    return (
-        <DocPage
-            componentName="ManaCombobox"
-            overview="ManaCombobox is Discord's searchable dropdown component using a render props pattern. Children is a function that receives the search query and returns filterable items. Supports single and multi-select modes, custom empty states, and external query tracking."
-            notices={[
-                { type: "warn", children: "ManaCombobox uses a render props pattern where children is a function. You are responsible for filtering items based on the query parameter. The component does not filter automatically." },
-            ]}
-            importPath={'import { ManaCombobox } from "../components";'}
-            sections={[
-                {
-                    title: "Single Selection",
-                    description: "Basic combobox with single item selection. Type to filter the list.",
-                    children: <SingleSelectDemo />,
-                    code: `<ManaCombobox
-  placeholder="Search fruits..."
-  value={value}
-  onChange={v => setValue(v as string)}
-  aria-label="Select a fruit"
-  maxVisibleItems={5}
-  emptyStateHeader="No results"
-  emptyStateText="Try a different search term"
->
-  {query => filterItems(query).map(item => (
-    <ComboboxItem key={item.id} item={item} />
-  ))}
-</ManaCombobox>`,
-                    relevantProps: ["value", "onChange", "placeholder", "maxVisibleItems"],
-                },
-                {
-                    title: "Multi Selection",
-                    description: "Enable multiSelect to allow choosing multiple items at once.",
-                    children: <MultiSelectDemo />,
-                    code: `<ManaCombobox
-  placeholder="Search fruits..."
-  value={values}
-  onChange={v => setValues(v as string[])}
-  multiSelect
-  aria-label="Select fruits"
->
-  {query => filterItems(query).map(item => (
-    <ComboboxItem key={item.id} item={item} />
-  ))}
-</ManaCombobox>`,
-                    relevantProps: ["multiSelect"],
-                },
-                {
-                    title: "Empty State",
-                    description: "Custom header and text shown when the children function returns an empty array.",
-                    children: <EmptyStateDemo />,
-                    relevantProps: ["emptyStateHeader", "emptyStateText"],
-                },
-            ]}
-            props={COMBOBOX_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/DividerTab.tsx b/src/equicordplugins/components.dev/components/tabs/DividerTab.tsx
deleted file mode 100644
index c23200a8d..000000000
--- a/src/equicordplugins/components.dev/components/tabs/DividerTab.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Divider, Paragraph } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const DIVIDER_PROPS: PropDef[] = [
-    { name: "className", type: "string", description: "Custom CSS class for the divider." },
-    { name: "style", type: "CSSProperties", description: "Inline styles applied to the hr element." },
-    { name: "...restProps", type: "HTMLAttributes<hr>", description: "Any other standard hr element attributes." },
-];
-
-export default function DividerTab() {
-    return (
-        <DocPage
-            componentName="Divider"
-            overview="Divider is a simple horizontal rule component from Vencord's @components/Divider. It renders an hr element with the vc-divider class and accepts standard HTML attributes."
-            importPath={'import { Divider } from "../components";'}
-            sections={[
-                {
-                    title: "Basic Divider",
-                    description: "A simple horizontal rule separating content.",
-                    children: (
-                        <div style={{ padding: "8px 0" }}>
-                            <Paragraph>Content above divider</Paragraph>
-                            <Divider />
-                            <Paragraph>Content below divider</Paragraph>
-                        </div>
-                    ),
-                    code: "<Divider />",
-                },
-                {
-                    title: "Custom Spacing",
-                    description: "Control the spacing around dividers using inline styles.",
-                    children: (
-                        <div style={{ padding: "8px 0" }}>
-                            <Paragraph>Tight spacing (8px)</Paragraph>
-                            <Divider style={{ margin: "8px 0" }} />
-                            <Paragraph>Medium spacing (16px)</Paragraph>
-                            <Divider style={{ margin: "16px 0" }} />
-                            <Paragraph>Large spacing (24px)</Paragraph>
-                            <Divider style={{ margin: "24px 0" }} />
-                            <Paragraph>End</Paragraph>
-                        </div>
-                    ),
-                    code: '<Divider style={{ margin: "16px 0" }} />',
-                    relevantProps: ["style"],
-                },
-            ]}
-            props={DIVIDER_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ErrorBoundaryTab.tsx b/src/equicordplugins/components.dev/components/tabs/ErrorBoundaryTab.tsx
deleted file mode 100644
index 9a96f2cb7..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ErrorBoundaryTab.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Button, ErrorBoundary, LocalErrorBoundary, Paragraph, SimpleErrorBoundary, useState } from "..";
-import { DocPage, type PropDef, type PropGroup } from "../DocPage";
-
-function ThrowError(): never {
-    throw new Error("This is a demo error thrown intentionally!");
-}
-
-function ErrorTrigger({ label }: { label: string; }) {
-    const [shouldThrow, setShouldThrow] = useState(false);
-
-    if (shouldThrow) {
-        return <ThrowError />;
-    }
-
-    return (
-        <Button variant="dangerPrimary" onClick={() => setShouldThrow(true)}>
-            {label}
-        </Button>
-    );
-}
-
-function CustomFallback({ error, resetErrorBoundary }: { error: Error; resetErrorBoundary: () => void; }) {
-    return (
-        <div style={{ padding: 16, background: "var(--background-secondary)", borderRadius: 8 }}>
-            <Paragraph color="text-danger" style={{ marginBottom: 8 }}>
-                <strong>Custom Fallback UI</strong>
-            </Paragraph>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>
-                Error: {error.message}
-            </Paragraph>
-            <Button onClick={resetErrorBoundary}>Reset</Button>
-        </div>
-    );
-}
-
-const ERROR_BOUNDARY_PROPS: PropDef[] = [
-    { name: "children", type: "ReactNode", required: true, description: "Content to wrap with error handling." },
-    { name: "fallback", type: "ReactNode", description: "Static fallback content to show on error." },
-    { name: "fallbackRender", type: "(props: { error, resetErrorBoundary }) => ReactNode", description: "Render function for dynamic fallback with error details and reset capability." },
-    { name: "FallbackComponent", type: "ComponentType<{ error, resetErrorBoundary }>", description: "Component that receives error and reset props as fallback." },
-    { name: "onError", type: "(error: Error, info: ErrorInfo) => void", description: "Callback fired when an error is caught." },
-    { name: "onReset", type: "(details) => void", description: "Callback fired when the boundary is reset." },
-    { name: "resetKeys", type: "any[]", description: "Array of values that trigger an automatic reset when changed." },
-];
-
-const SIMPLE_PROPS: PropDef[] = [
-    { name: "children", type: "ReactNode", required: true, description: "Content to wrap with error handling." },
-    { name: "fallback", type: "ReactNode", required: true, description: "Static content to display when an error occurs." },
-];
-
-const LOCAL_PROPS: PropDef[] = [
-    { name: "children", type: "ReactNode", required: true, description: "Content to wrap. Shows inline error text on failure." },
-];
-
-const PROP_GROUPS: PropGroup[] = [
-    { title: "ErrorBoundary", props: ERROR_BOUNDARY_PROPS },
-    { title: "SimpleErrorBoundary", props: SIMPLE_PROPS },
-    { title: "LocalErrorBoundary", props: LOCAL_PROPS },
-];
-
-function ErrorBoundaryDemo() {
-    const [key, setKey] = useState(0);
-
-    return (
-        <div key={key}>
-            <ErrorBoundary
-                fallbackRender={({ error, resetErrorBoundary }) => (
-                    <CustomFallback error={error} resetErrorBoundary={resetErrorBoundary} />
-                )}
-                onReset={() => setKey(k => k + 1)}
-            >
-                <ErrorTrigger label="Trigger Error" />
-            </ErrorBoundary>
-        </div>
-    );
-}
-
-function SimpleDemo() {
-    const [key, setKey] = useState(0);
-
-    return (
-        <div key={key}>
-            <SimpleErrorBoundary
-                fallback={
-                    <div style={{ padding: 16, background: "var(--background-secondary)", borderRadius: 8 }}>
-                        <Paragraph color="text-danger">Something went wrong!</Paragraph>
-                        <Button onClick={() => setKey(k => k + 1)} style={{ marginTop: 8 }}>Reset</Button>
-                    </div>
-                }
-            >
-                <ErrorTrigger label="Trigger Error" />
-            </SimpleErrorBoundary>
-        </div>
-    );
-}
-
-function LocalDemo() {
-    const [key, setKey] = useState(0);
-
-    return (
-        <div key={key}>
-            <LocalErrorBoundary>
-                <ErrorTrigger label="Trigger Error" />
-            </LocalErrorBoundary>
-            <Button variant="secondary" onClick={() => setKey(k => k + 1)} style={{ marginTop: 8 }}>
-                Reset
-            </Button>
-        </div>
-    );
-}
-
-export default function ErrorBoundaryTab() {
-    return (
-        <DocPage
-            componentName="ErrorBoundary"
-            overview="Discord provides three error boundary components with different levels of control. ErrorBoundary is feature-rich with fallbackRender, FallbackComponent, onError/onReset callbacks, and resetKeys. SimpleErrorBoundary accepts a static fallback ReactNode. LocalErrorBoundary shows inline error text for non-critical failures."
-            notices={[
-                { type: "positive", children: "Wrap plugin UI components with ErrorBoundary to prevent crashes from taking down the entire Discord UI. Use LocalErrorBoundary for non-critical elements." },
-                { type: "info", children: "ErrorBoundary only catches errors during rendering, lifecycle methods, and constructors. It does not catch errors in event handlers or async code." },
-            ]}
-            importPath={'import { ErrorBoundary, SimpleErrorBoundary, LocalErrorBoundary } from "../components";'}
-            sections={[
-                {
-                    title: "ErrorBoundary",
-                    description: "Full-featured boundary with fallbackRender for dynamic error UI with reset capability.",
-                    children: <ErrorBoundaryDemo />,
-                    code: `<ErrorBoundary
-  fallbackRender={({ error, resetErrorBoundary }) => (
-    <div>
-      <p>Error: {error.message}</p>
-      <button onClick={resetErrorBoundary}>Reset</button>
-    </div>
-  )}
-  onError={(error, info) => console.error(error)}
-  onReset={() => refetch()}
->
-  <MyComponent />
-</ErrorBoundary>`,
-                    relevantProps: ["fallbackRender", "onError", "onReset", "resetKeys"],
-                },
-                {
-                    title: "SimpleErrorBoundary",
-                    description: "Lightweight boundary that shows static fallback content on error.",
-                    children: <SimpleDemo />,
-                    code: `<SimpleErrorBoundary fallback={<p>Something went wrong!</p>}>
-  <MyComponent />
-</SimpleErrorBoundary>`,
-                },
-                {
-                    title: "LocalErrorBoundary",
-                    description: "Displays an inline error message for non-critical component failures. No fallback prop needed.",
-                    children: <LocalDemo />,
-                    code: `<LocalErrorBoundary>
-  <MyWidget />
-</LocalErrorBoundary>`,
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/FocusLockTab.tsx b/src/equicordplugins/components.dev/components/tabs/FocusLockTab.tsx
deleted file mode 100644
index f224c543a..000000000
--- a/src/equicordplugins/components.dev/components/tabs/FocusLockTab.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { FocusLock, ManaButton, ManaTextInput, Paragraph, useRef, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const FOCUSLOCK_PROPS: PropDef[] = [
-    { name: "containerRef", type: "RefObject<HTMLElement | null>", required: true, description: "React ref pointing to the container element that defines the focus trap boundary." },
-    { name: "keyboardModeEnabled", type: "boolean", description: "Enable keyboard-based focus trapping. When true, Tab key cycles through focusable elements inside the container." },
-    { name: "children", type: "ReactNode", description: "Content rendered inside the focus trap." },
-];
-
-function FocusLockDemo() {
-    const [enabled, setEnabled] = useState(false);
-    const containerRef = useRef<HTMLDivElement>(null);
-    const [inputValue, setInputValue] = useState("");
-
-    return (
-        <div>
-            <ManaButton
-                variant={enabled ? "primary" : "secondary"}
-                text={enabled ? "Disable Focus Lock" : "Enable Focus Lock"}
-                onClick={() => setEnabled(!enabled)}
-                style={{ marginBottom: 16 }}
-            />
-            <div
-                ref={containerRef}
-                style={{
-                    padding: 16,
-                    border: `2px solid ${enabled ? "var(--brand-500)" : "var(--background-modifier-accent)"}`,
-                    borderRadius: 8,
-                    background: "var(--background-secondary)",
-                }}
-            >
-                {enabled ? (
-                    <FocusLock containerRef={containerRef}>
-                        <Paragraph style={{ marginBottom: 12 }}>
-                            Focus is trapped. Try pressing Tab to cycle through these elements:
-                        </Paragraph>
-                        <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
-                            <ManaTextInput
-                                value={inputValue}
-                                onChange={setInputValue}
-                                placeholder="First input"
-                            />
-                            <ManaTextInput
-                                value=""
-                                onChange={() => { }}
-                                placeholder="Second input"
-                            />
-                            <div style={{ display: "flex", gap: 8 }}>
-                                <ManaButton variant="secondary" text="Button A" onClick={() => { }} />
-                                <ManaButton variant="secondary" text="Button B" onClick={() => { }} />
-                                <ManaButton variant="primary" text="Exit Focus Lock" onClick={() => setEnabled(false)} />
-                            </div>
-                        </div>
-                    </FocusLock>
-                ) : (
-                    <Paragraph color="text-muted">
-                        Click "Enable Focus Lock" to activate the focus trap demo.
-                    </Paragraph>
-                )}
-            </div>
-        </div>
-    );
-}
-
-export default function FocusLockTab() {
-    return (
-        <DocPage
-            componentName="FocusLock"
-            overview="FocusLock traps keyboard focus within a container element. When active, pressing Tab cycles through focusable elements inside the boundary without escaping. Used in modals, dropdown menus, and anywhere keyboard accessibility requires scoped navigation."
-            notices={[
-                { type: "warn", children: "FocusLock traps all keyboard focus within its container. Always provide a way for the user to exit the focus trap (e.g. a close button or Escape key handler), otherwise they will be unable to navigate away." },
-                { type: "info", children: "FocusLock is typically used inside modals and dropdown menus that already handle dismiss behavior. If you use it standalone, you must implement your own dismiss logic." },
-            ]}
-            importPath={'import { FocusLock } from "../components";'}
-            sections={[
-                {
-                    title: "Focus Trap",
-                    description: "Enable the focus lock and press Tab to see focus cycle within the container boundary.",
-                    children: <FocusLockDemo />,
-                    code: `const containerRef = useRef<HTMLDivElement>(null);
-
-<div ref={containerRef}>
-  <FocusLock containerRef={containerRef}>
-    <input />
-    <button>OK</button>
-    <button>Cancel</button>
-  </FocusLock>
-</div>`,
-                    relevantProps: ["containerRef"],
-                },
-            ]}
-            props={FOCUSLOCK_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/GuildIconTab.tsx b/src/equicordplugins/components.dev/components/tabs/GuildIconTab.tsx
deleted file mode 100644
index b2e9283de..000000000
--- a/src/equicordplugins/components.dev/components/tabs/GuildIconTab.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { GuildIcon, GuildIconSizes, GuildStore, ManaButton, Paragraph, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const GUILDICON_PROPS: PropDef[] = [
-    { name: "guildId", type: "string", required: true, description: "The guild's snowflake ID." },
-    { name: "guildName", type: "string", required: true, description: "Guild name, used for the acronym fallback when no icon is available." },
-    { name: "guildIcon", type: "string | null", required: true, description: "Icon hash from the guild object, or null for acronym fallback." },
-    { name: "iconSize", type: "number", required: true, description: "Size in pixels. Common values: 16, 20, 24, 32, 40, 48, 56, 80, 96." },
-    { name: "animate", type: "boolean", description: "Enable animated icons (animated GIF guild icons)." },
-    { name: "className", type: "string", description: "CSS class for the icon container." },
-    { name: "acronymClassName", type: "string", description: "CSS class for the acronym text fallback." },
-];
-
-function SizesDemo() {
-    const [animate, setAnimate] = useState(true);
-    const guilds = Object.values(GuildStore.getGuilds()).slice(0, 6);
-    const guildWithIcon = guilds.find(g => g.icon);
-
-    if (!guildWithIcon) {
-        return <Paragraph color="text-muted">No guilds with icons found.</Paragraph>;
-    }
-
-    return (
-        <div>
-            <ManaButton
-                variant="secondary"
-                text={`Animate: ${animate}`}
-                onClick={() => setAnimate(a => !a)}
-                style={{ marginBottom: 12 }}
-            />
-            <div className="vc-compfinder-grid" style={{ alignItems: "flex-end" }}>
-                {GuildIconSizes.map(size => (
-                    <div key={size} style={{ textAlign: "center" }}>
-                        <GuildIcon
-                            guildId={guildWithIcon.id}
-                            guildName={guildWithIcon.name}
-                            guildIcon={guildWithIcon.icon ?? null}
-                            iconSize={size}
-                            animate={animate}
-                        />
-                        <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                            {size}px
-                        </Paragraph>
-                    </div>
-                ))}
-            </div>
-        </div>
-    );
-}
-
-function AcronymDemo() {
-    const guilds = Object.values(GuildStore.getGuilds()).slice(0, 6);
-    const guildWithoutIcon = guilds.find(g => !g.icon);
-
-    return (
-        <div className="vc-compfinder-grid" style={{ alignItems: "flex-end" }}>
-            {[32, 48, 80].map(size => (
-                <div key={size} style={{ textAlign: "center" }}>
-                    <GuildIcon
-                        guildId={guildWithoutIcon?.id ?? "0"}
-                        guildName={guildWithoutIcon?.name ?? "Test Guild"}
-                        guildIcon={null}
-                        iconSize={size}
-                    />
-                    <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                        {size}px (no icon)
-                    </Paragraph>
-                </div>
-            ))}
-        </div>
-    );
-}
-
-function YourGuildsDemo() {
-    const [animate, setAnimate] = useState(true);
-    const guilds = Object.values(GuildStore.getGuilds()).slice(0, 8);
-
-    return (
-        <div>
-            <ManaButton
-                variant="secondary"
-                text={`Animate: ${animate}`}
-                onClick={() => setAnimate(a => !a)}
-                style={{ marginBottom: 12 }}
-            />
-            <div className="vc-compfinder-grid">
-                {guilds.map(guild => (
-                    <div key={guild.id} style={{ textAlign: "center", maxWidth: 80 }}>
-                        <GuildIcon
-                            guildId={guild.id}
-                            guildName={guild.name}
-                            guildIcon={guild.icon ?? null}
-                            iconSize={48}
-                            animate={animate}
-                        />
-                        <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
-                            {guild.name.slice(0, 12)}
-                        </Paragraph>
-                    </div>
-                ))}
-            </div>
-        </div>
-    );
-}
-
-export default function GuildIconTab() {
-    return (
-        <DocPage
-            componentName="GuildIcon"
-            overview="GuildIcon renders a server icon from its hash, or falls back to an acronym derived from the guild name. Supports all standard Discord icon sizes and animated GIF icons."
-            importPath={'import { GuildIcon, GuildIconSizes } from "../components";'}
-            sections={[
-                {
-                    title: "Icon Sizes",
-                    description: "All available GuildIconSizes from 16px to 96px.",
-                    children: <SizesDemo />,
-                    code: `<GuildIcon
-  guildId={guild.id}
-  guildName={guild.name}
-  guildIcon={guild.icon}
-  iconSize={48}
-  animate={true}
-/>`,
-                    relevantProps: ["iconSize", "animate"],
-                },
-                {
-                    title: "Acronym Fallback",
-                    description: "When guildIcon is null, the component renders an acronym based on the guild name.",
-                    children: <AcronymDemo />,
-                    relevantProps: ["guildName", "guildIcon"],
-                },
-                {
-                    title: "Your Guilds",
-                    description: "Live preview using guilds you're currently in.",
-                    children: <YourGuildsDemo />,
-                },
-            ]}
-            props={GUILDICON_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/HeadingTab.tsx b/src/equicordplugins/components.dev/components/tabs/HeadingTab.tsx
deleted file mode 100644
index 973ceaa3f..000000000
--- a/src/equicordplugins/components.dev/components/tabs/HeadingTab.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { DiscordHeading, DiscordText, HeadingVariants, TextColors, TextVariants } from "..";
-import { DocPage, type PropDef, type PropGroup } from "../DocPage";
-
-const HEADING_PROPS: PropDef[] = [
-    { name: "variant", type: "HeadingVariant", required: true, description: 'Heading size and weight, e.g. "heading-xl/bold", "heading-sm/medium".' },
-    { name: "color", type: "TextColor", description: "Text color name from Discord's color system." },
-    { name: "className", type: "string", description: "Custom CSS class." },
-    { name: "style", type: "CSSProperties", description: "Inline styles." },
-    { name: "children", type: "ReactNode", description: "Heading content." },
-];
-
-const TEXT_PROPS: PropDef[] = [
-    { name: "variant", type: "TextVariant", required: true, description: 'Text size and weight, e.g. "text-md/medium", "text-sm/normal".' },
-    { name: "color", type: "TextColor", description: "Text color name from Discord's color system." },
-    { name: "tag", type: "string", default: '"div"', description: "HTML tag to render (div, span, p, etc.)." },
-    { name: "selectable", type: "boolean", description: "Allow text selection." },
-    { name: "lineClamp", type: "number", description: "Number of lines before truncation with ellipsis." },
-    { name: "tabularNumbers", type: "boolean", description: "Use tabular (monospace) number spacing for aligned columns." },
-    { name: "scaleFontToUserSetting", type: "boolean", description: "Scale font size based on user's accessibility settings." },
-    { name: "className", type: "string", description: "Custom CSS class." },
-    { name: "style", type: "CSSProperties", description: "Inline styles." },
-    { name: "children", type: "ReactNode", description: "Text content." },
-];
-
-const PROP_GROUPS: PropGroup[] = [
-    { title: "DiscordHeading", props: HEADING_PROPS },
-    { title: "DiscordText", props: TEXT_PROPS },
-];
-
-export default function HeadingTab() {
-    return (
-        <DocPage
-            componentName="DiscordHeading"
-            overview="Discord's typography system uses two components: DiscordHeading for headings (xxl through sm) and DiscordText for body text (xxl through xs). Both support multiple weight variants and Discord's color system."
-            importPath={'import { DiscordHeading, DiscordText, HeadingVariants, TextVariants, TextColors } from "../components";'}
-            sections={[
-                {
-                    title: "Heading Variants",
-                    description: "All heading size/weight combinations from xxl to sm.",
-                    children: (
-                        <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
-                            {HeadingVariants.map(variant => (
-                                <DiscordHeading key={variant} variant={variant}>
-                                    {variant}
-                                </DiscordHeading>
-                            ))}
-                        </div>
-                    ),
-                    code: '<DiscordHeading variant="heading-xl/bold">Title</DiscordHeading>',
-                    relevantProps: ["variant"],
-                },
-                {
-                    title: "Text Variants",
-                    description: "All text size/weight combinations from xxl to xs.",
-                    children: (
-                        <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
-                            {TextVariants.map(variant => (
-                                <DiscordText key={variant} variant={variant}>
-                                    {variant}
-                                </DiscordText>
-                            ))}
-                        </div>
-                    ),
-                    code: '<DiscordText variant="text-md/medium">Body text</DiscordText>',
-                },
-                {
-                    title: "Text Colors",
-                    description: "All available color values for the color prop.",
-                    children: (
-                        <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
-                            {TextColors.map(color => (
-                                <DiscordText key={color} variant="text-md/medium" color={color}>
-                                    {color}
-                                </DiscordText>
-                            ))}
-                        </div>
-                    ),
-                    code: '<DiscordText variant="text-md/medium" color="text-brand">Branded</DiscordText>',
-                    relevantProps: ["color"],
-                },
-                {
-                    title: "Line Clamp",
-                    description: "Truncate text after a specified number of lines.",
-                    children: (
-                        <div style={{ maxWidth: 300 }}>
-                            <DiscordText variant="text-md/normal" lineClamp={2}>
-                                This is a long paragraph of text that will be clamped to two lines maximum.
-                                Any content beyond the second line will be hidden and replaced with an ellipsis.
-                                This demonstrates the lineClamp prop in action.
-                            </DiscordText>
-                        </div>
-                    ),
-                    code: '<DiscordText variant="text-md/normal" lineClamp={2}>\n  Long text here...\n</DiscordText>',
-                    relevantProps: ["lineClamp"],
-                },
-                {
-                    title: "Tabular Numbers",
-                    description: "Monospaced number spacing for aligned numeric columns.",
-                    children: (
-                        <div style={{ display: "flex", flexDirection: "column", gap: 2 }}>
-                            <DiscordText variant="text-md/medium" tabularNumbers>1,234,567</DiscordText>
-                            <DiscordText variant="text-md/medium" tabularNumbers>89,012</DiscordText>
-                            <DiscordText variant="text-md/medium" tabularNumbers>345</DiscordText>
-                        </div>
-                    ),
-                    relevantProps: ["tabularNumbers"],
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/LayerModalTab.tsx b/src/equicordplugins/components.dev/components/tabs/LayerModalTab.tsx
deleted file mode 100644
index 49455793e..000000000
--- a/src/equicordplugins/components.dev/components/tabs/LayerModalTab.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { openModal } from "@utils/modal";
-import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
-
-import { Heading, ManaButton, Paragraph, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const LayerModal = findComponentByCodeLazy('"data-mana-component":"layer-modal"') as React.ComponentType<{
-    transitionState: number;
-    animationVariant?: "default" | string;
-    returnRef?: React.Ref<HTMLDivElement>;
-    "aria-label"?: string;
-    onClose: () => void;
-    children: React.ReactNode;
-}>;
-
-const TransitionState = findByPropsLazy("ENTERING", "ENTERED", "EXITING") as {
-    ENTERING: number;
-    ENTERED: number;
-    EXITING: number;
-    EXITED: number;
-    HIDDEN: number;
-};
-
-const LAYERMODAL_PROPS: PropDef[] = [
-    { name: "transitionState", type: "number", required: true, description: "Animation state. Use TransitionState.ENTERED for visible." },
-    { name: "onClose", type: "() => void", required: true, description: "Called when the modal should close." },
-    { name: "children", type: "ReactNode", required: true, description: "Modal content." },
-    { name: "animationVariant", type: '"default" | string', default: '"default"', description: "Animation style for enter/exit transitions." },
-    { name: "returnRef", type: "Ref<HTMLDivElement>", internal: true, description: "Ref forwarded to the modal root element." },
-    { name: "aria-label", type: "string", description: "Accessibility label for the modal." },
-];
-
-function ModalContentDemo({ onClose }: { onClose: () => void; }) {
-    return (
-        <LayerModal
-            transitionState={TransitionState.ENTERED}
-            onClose={onClose}
-            aria-label="Demo Layer Modal"
-        >
-            <div style={{ padding: 24, minWidth: 300 }}>
-                <Heading tag="h2" style={{ marginBottom: 8 }}>Layer Modal</Heading>
-                <Paragraph color="text-muted" style={{ marginBottom: 16 }}>
-                    This is a layer modal opened via openModal. It supports stacked/layered
-                    modal experiences with built-in animation handling.
-                </Paragraph>
-                <ManaButton variant="primary" text="Close" onClick={onClose} />
-            </div>
-        </LayerModal>
-    );
-}
-
-function InlineDemo() {
-    const [visible, setVisible] = useState(false);
-
-    return (
-        <div>
-            <ManaButton
-                variant="secondary"
-                text={visible ? "Hide Inline" : "Show Inline"}
-                onClick={() => setVisible(!visible)}
-            />
-            {visible && (
-                <div style={{ marginTop: 16, position: "relative", minHeight: 200 }}>
-                    <LayerModal
-                        transitionState={TransitionState.ENTERED}
-                        onClose={() => setVisible(false)}
-                        aria-label="Inline Demo"
-                    >
-                        <div style={{ padding: 16 }}>
-                            <Paragraph>Inline layer modal content</Paragraph>
-                            <ManaButton variant="primary" text="Close" onClick={() => setVisible(false)} style={{ marginTop: 8 }} />
-                        </div>
-                    </LayerModal>
-                </div>
-            )}
-        </div>
-    );
-}
-
-export default function LayerModalTab() {
-    return (
-        <DocPage
-            componentName="LayerModal"
-            overview="LayerModal is Discord's component for stacked/layered modal experiences. It has different animation behavior than regular modals and is typically used with openModal() for proper backdrop and positioning. Requires TransitionState for controlling visibility."
-            notices={[
-                { type: "warn", children: "LayerModal must be used with openModal() for proper backdrop, positioning, and transition state management. Rendering it inline without the modal system will result in incorrect behavior." },
-                { type: "info", children: "LayerModal is found via findComponentByCodeLazy, not exported directly. The TransitionState constants are also required and must be found separately." },
-            ]}
-            importPath={`import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
-
-const LayerModal = findComponentByCodeLazy('"data-mana-component":"layer-modal"');
-const TransitionState = findByPropsLazy("ENTERING", "ENTERED", "EXITING");`}
-            sections={[
-                {
-                    title: "Open via openModal",
-                    description: "The recommended way to use LayerModal is with openModal() which handles backdrop and positioning.",
-                    children: (
-                        <ManaButton
-                            variant="secondary"
-                            text="Open Layer Modal"
-                            onClick={() => openModal(props => (
-                                <ModalContentDemo onClose={props.onClose} />
-                            ))}
-                        />
-                    ),
-                    code: `openModal(props => (
-  <LayerModal
-    transitionState={TransitionState.ENTERED}
-    onClose={props.onClose}
-    aria-label="My Modal"
-  >
-    <div style={{ padding: 24 }}>
-      <p>Modal content here</p>
-    </div>
-  </LayerModal>
-))`,
-                    relevantProps: ["transitionState", "onClose"],
-                },
-                {
-                    title: "Inline Preview",
-                    description: "Rendered inline for preview purposes. Not recommended for production use.",
-                    children: <InlineDemo />,
-                    relevantProps: ["aria-label", "animationVariant"],
-                },
-            ]}
-            props={LAYERMODAL_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ListboxTab.tsx b/src/equicordplugins/components.dev/components/tabs/ListboxTab.tsx
deleted file mode 100644
index a76a5af19..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ListboxTab.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ListboxItem, ManaListbox, useState } from "..";
-import { DocPage, type PropDef, type PropGroup } from "../DocPage";
-
-const LISTBOX_PROPS: PropDef[] = [
-    { name: "items", type: "ListboxItem[]", required: true, description: "Array of items to display in the listbox." },
-    { name: "selectedItems", type: "ListboxItem[]", description: "Currently selected items (controlled)." },
-    { name: "defaultSelectedItems", type: "ListboxItem[]", description: "Initially selected items (uncontrolled)." },
-    { name: "onSelectionChange", type: "(items: ListboxItem[]) => void", description: "Called when the selection changes." },
-    { name: "selectionMode", type: '"single" | "multiple"', description: "Whether one or many items can be selected." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disable the entire listbox." },
-    { name: "required", type: "boolean", description: "Mark the listbox as required for form validation." },
-    { name: "loading", type: "boolean", default: "false", description: "Show a loading state." },
-    { name: "maxVisibleItems", type: "number", description: "Maximum items visible before scrolling." },
-    { name: "shouldFocusWrap", type: "boolean", description: "Wrap keyboard focus when reaching the end." },
-    { name: "typeahead", type: "boolean", description: "Enable keyboard search by typing item labels." },
-    { name: "renderListItem", type: "(item: ListboxItem) => ReactNode", description: "Custom render function for list items." },
-    { name: "renderEmptyState", type: "() => ReactNode", description: "Custom render for the empty state." },
-];
-
-const ITEM_PROPS: PropDef[] = [
-    { name: "id", type: "string", required: true, description: "Unique identifier for the item." },
-    { name: "label", type: "string", required: true, description: "Display label for the item." },
-    { name: "disabled", type: "boolean", description: "Disable this specific item." },
-];
-
-const PROP_GROUPS: PropGroup[] = [
-    { title: "ManaListbox", props: LISTBOX_PROPS },
-    { title: "ListboxItem", props: ITEM_PROPS },
-];
-
-const SAMPLE_ITEMS: ListboxItem[] = [
-    { id: "1", label: "Apple" },
-    { id: "2", label: "Banana" },
-    { id: "3", label: "Cherry" },
-    { id: "4", label: "Date" },
-    { id: "5", label: "Elderberry" },
-];
-
-const ITEMS_WITH_DISABLED: ListboxItem[] = [
-    { id: "1", label: "Available option" },
-    { id: "2", label: "Disabled option", disabled: true },
-    { id: "3", label: "Another available" },
-    { id: "4", label: "Also disabled", disabled: true },
-    { id: "5", label: "Last option" },
-];
-
-const MANY_ITEMS: ListboxItem[] = Array.from({ length: 10 }, (_, i) => ({
-    id: String(i + 1),
-    label: `Item ${i + 1}`,
-}));
-
-function SingleSelectDemo() {
-    const [selected, setSelected] = useState<ListboxItem[]>([SAMPLE_ITEMS[0]]);
-    return (
-        <ManaListbox
-            items={SAMPLE_ITEMS}
-            selectedItems={selected}
-            onSelectionChange={setSelected}
-            selectionMode="single"
-        />
-    );
-}
-
-function MultiSelectDemo() {
-    const [selected, setSelected] = useState<ListboxItem[]>([SAMPLE_ITEMS[0], SAMPLE_ITEMS[2]]);
-    return (
-        <ManaListbox
-            items={SAMPLE_ITEMS}
-            selectedItems={selected}
-            onSelectionChange={setSelected}
-            selectionMode="multiple"
-        />
-    );
-}
-
-function DisabledItemsDemo() {
-    const [selected, setSelected] = useState<ListboxItem[]>([]);
-    return (
-        <ManaListbox
-            items={ITEMS_WITH_DISABLED}
-            selectedItems={selected}
-            onSelectionChange={setSelected}
-            selectionMode="multiple"
-        />
-    );
-}
-
-function MaxVisibleDemo() {
-    const [selected, setSelected] = useState<ListboxItem[]>([]);
-    return (
-        <ManaListbox
-            items={MANY_ITEMS}
-            selectedItems={selected}
-            onSelectionChange={setSelected}
-            selectionMode="multiple"
-            maxVisibleItems={5}
-        />
-    );
-}
-
-export default function ListboxTab() {
-    return (
-        <DocPage
-            componentName="ManaListbox"
-            overview="ManaListbox is Discord's listbox component for selecting one or multiple items from a list. Supports single and multiple selection modes, disabled items, loading/empty states, keyboard navigation with typeahead, and custom item rendering."
-            importPath={'import { ManaListbox, ListboxItem } from "../components";'}
-            sections={[
-                {
-                    title: "Single Selection",
-                    description: "Only one item can be selected at a time.",
-                    children: <SingleSelectDemo />,
-                    code: `<ManaListbox
-  items={items}
-  selectedItems={selected}
-  onSelectionChange={setSelected}
-  selectionMode="single"
-/>`,
-                    relevantProps: ["selectionMode", "selectedItems", "onSelectionChange"],
-                },
-                {
-                    title: "Multiple Selection",
-                    description: "Multiple items can be selected simultaneously.",
-                    children: <MultiSelectDemo />,
-                    code: `<ManaListbox
-  items={items}
-  selectedItems={selected}
-  onSelectionChange={setSelected}
-  selectionMode="multiple"
-/>`,
-                },
-                {
-                    title: "Disabled Items",
-                    description: "Individual items can be disabled while the rest remain interactive.",
-                    children: <DisabledItemsDemo />,
-                },
-                {
-                    title: "Max Visible Items",
-                    description: "Limits visible items to 5 with scrolling for the rest.",
-                    children: <MaxVisibleDemo />,
-                    relevantProps: ["maxVisibleItems"],
-                },
-                {
-                    title: "Disabled State",
-                    description: "The entire listbox is non-interactive when disabled.",
-                    children: (
-                        <ManaListbox
-                            items={SAMPLE_ITEMS}
-                            selectedItems={[SAMPLE_ITEMS[1]]}
-                            disabled
-                        />
-                    ),
-                    relevantProps: ["disabled"],
-                },
-                {
-                    title: "Loading State",
-                    description: "Shows a loading indicator while data is being fetched.",
-                    children: <ManaListbox items={[]} loading />,
-                    relevantProps: ["loading"],
-                },
-                {
-                    title: "Empty State",
-                    description: "Default empty appearance when no items are provided.",
-                    children: <ManaListbox items={[]} />,
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/MenuTab.tsx b/src/equicordplugins/components.dev/components/tabs/MenuTab.tsx
deleted file mode 100644
index 1e2ec6774..000000000
--- a/src/equicordplugins/components.dev/components/tabs/MenuTab.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Button, ContextMenuApi, Menu, useState } from "..";
-import { DocPage, type PropDef, type PropGroup } from "../DocPage";
-
-const MENU_PROPS: PropDef[] = [
-    { name: "navId", type: "string", required: true, description: "Unique navigation ID for the menu." },
-    { name: "onClose", type: "() => void", required: true, description: "Called when the menu should close." },
-    { name: "children", type: "ReactNode", required: true, description: "Menu items, groups, and separators." },
-];
-
-const MENUITEM_PROPS: PropDef[] = [
-    { name: "id", type: "string", required: true, description: "Unique item identifier." },
-    { name: "label", type: "ReactNode | ((props) => ReactNode)", required: true, description: "Display text for the item." },
-    { name: "action", type: "(e: MouseEvent) => void", description: "Called when the item is clicked." },
-    { name: "icon", type: "ComponentType", description: "Icon component displayed after the label." },
-    { name: "iconLeft", type: "ComponentType", description: "Icon component displayed before the label." },
-    { name: "iconProps", type: "MenuItemIconProps", description: "Props passed to the icon component." },
-    { name: "leadingAccessory", type: "ReactNode", description: "Custom leading accessory element." },
-    { name: "trailingIndicator", type: "ReactNode", description: "Trailing indicator element." },
-    { name: "hint", type: "ReactNode | ((props) => ReactNode)", description: "Keyboard shortcut hint displayed on the right." },
-    { name: "shortcut", type: "ReactNode", description: "Keyboard shortcut display." },
-    { name: "subtext", type: "ReactNode", description: "Secondary text below the label." },
-    { name: "subtextLineClamp", type: "number", description: "Max lines for subtext before truncation." },
-    { name: "color", type: '"default" | "brand" | "danger" | "success" | "premium" | "premium-gradient"', description: "Item color variant." },
-    { name: "loading", type: "boolean", description: "Show loading state." },
-    { name: "badge", type: "ReactNode", description: "Badge element displayed alongside the label." },
-    { name: "disabled", type: "boolean", description: "Disable interaction." },
-    { name: "onClose", type: "() => void", description: "Called when the menu should close after this item's action." },
-    { name: "onFocus", type: "() => void", description: "Called when the item receives focus." },
-    { name: "dontCloseOnAction", type: "boolean", description: "Prevent menu from closing when this item is clicked." },
-    { name: "dontCloseOnActionIfHoldingShiftKey", type: "boolean", description: "Prevent close on click if shift key is held." },
-    { name: "className", type: "string", description: "Custom CSS class name." },
-    { name: "focusedClassName", type: "string", description: "CSS class applied when focused." },
-    { name: "children", type: "ReactNode", description: "Nested MenuItem elements create a submenu." },
-];
-
-const CHECKBOX_PROPS: PropDef[] = [
-    { name: "id", type: "string", required: true, description: "Unique item identifier." },
-    { name: "label", type: "ReactNode | ((props) => ReactNode)", required: true, description: "Display text." },
-    { name: "checked", type: "boolean", required: true, description: "Current checked state." },
-    { name: "color", type: "MenuItemColor", default: '"default"', description: "Item color variant." },
-    { name: "action", type: "(e: MouseEvent) => void", description: "Called when toggled." },
-    { name: "disabled", type: "boolean", description: "Disable interaction." },
-    { name: "subtext", type: "ReactNode", description: "Secondary text below the label." },
-    { name: "subtextLineClamp", type: "number", description: "Max lines for subtext before truncation." },
-    { name: "leftIcon", type: "ComponentType", description: "Icon component displayed on the left." },
-    { name: "leadingAccessory", type: "ReactNode", description: "Custom leading accessory element." },
-    { name: "className", type: "string", description: "Custom CSS class name." },
-    { name: "focusedClassName", type: "string", description: "CSS class applied when focused." },
-];
-
-const RADIO_PROPS: PropDef[] = [
-    { name: "id", type: "string", required: true, description: "Unique item identifier." },
-    { name: "label", type: "ReactNode | ((props) => ReactNode)", required: true, description: "Display text." },
-    { name: "group", type: "string", required: true, description: "Radio group name for mutual exclusion." },
-    { name: "checked", type: "boolean", required: true, description: "Whether this option is selected." },
-    { name: "color", type: "MenuItemColor", default: '"default"', description: "Item color variant." },
-    { name: "action", type: "(e: MouseEvent) => void", description: "Called when selected." },
-    { name: "disabled", type: "boolean", description: "Disable interaction." },
-    { name: "subtext", type: "ReactNode", description: "Secondary text below the label." },
-    { name: "subtextLineClamp", type: "number", description: "Max lines for subtext before truncation." },
-    { name: "leftIcon", type: "ComponentType", description: "Icon component displayed on the left." },
-    { name: "leadingAccessory", type: "ReactNode", description: "Custom leading accessory element." },
-];
-
-const SLIDER_PROPS: PropDef[] = [
-    { name: "minValue", type: "number", required: true, description: "Minimum slider value." },
-    { name: "maxValue", type: "number", required: true, description: "Maximum slider value." },
-    { name: "value", type: "number", required: true, description: "Current slider value." },
-    { name: "onChange", type: "(value: number) => void", required: true, description: "Called when the value changes." },
-    { name: "renderValue", type: "(value: number) => string", description: "Format the value label display." },
-];
-
-const SWITCH_PROPS: PropDef[] = [
-    { name: "id", type: "string", required: true, description: "Unique item identifier." },
-    { name: "label", type: "ReactNode", description: "Display text." },
-    { name: "checked", type: "boolean", required: true, description: "Current switch state." },
-    { name: "action", type: "(e: MouseEvent) => void", required: true, description: "Called when toggled." },
-    { name: "color", type: "MenuItemColor", default: '"default"', description: "Item color variant." },
-    { name: "disabled", type: "boolean", description: "Disable interaction." },
-    { name: "subtext", type: "ReactNode", description: "Secondary text below the label." },
-    { name: "subtextLineClamp", type: "number", description: "Max lines for subtext before truncation." },
-    { name: "className", type: "string", description: "Custom CSS class name." },
-];
-
-const PROP_GROUPS: PropGroup[] = [
-    { title: "Menu.Menu", props: MENU_PROPS },
-    { title: "Menu.MenuItem", props: MENUITEM_PROPS },
-    { title: "Menu.MenuCheckboxItem", props: CHECKBOX_PROPS },
-    { title: "Menu.MenuRadioItem", props: RADIO_PROPS },
-    { title: "Menu.MenuSwitchItem", props: SWITCH_PROPS },
-    { title: "Menu.MenuSliderControl", props: SLIDER_PROPS },
-];
-
-function DemoMenu({ onClose }: { onClose: () => void; }) {
-    const [checkboxValue, setCheckboxValue] = useState(false);
-    const [switchValue, setSwitchValue] = useState(true);
-    const [radioValue, setRadioValue] = useState("option1");
-    const [sliderValue, setSliderValue] = useState(50);
-
-    return (
-        <Menu.Menu navId="demo-menu" onClose={onClose}>
-            <Menu.MenuItem id="item-1" label="Basic Item" action={() => { }} />
-            <Menu.MenuItem
-                id="item-2"
-                label="Item with Icon"
-                icon={() => (
-                    <svg width="18" height="18" viewBox="0 0 24 24">
-                        <path fill="currentColor" d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z" />
-                    </svg>
-                )}
-                action={() => { }}
-            />
-            <Menu.MenuItem id="item-hint" label="Item with Hint" hint="Ctrl+H" action={() => { }} />
-            <Menu.MenuItem id="item-subtext" label="Item with Subtext" subtext="Additional description" action={() => { }} />
-            <Menu.MenuItem id="item-disabled" label="Disabled Item" disabled />
-
-            <Menu.MenuSeparator />
-
-            <Menu.MenuGroup label="Colors">
-                <Menu.MenuItem id="c-default" label="Default" color="default" action={() => { }} />
-                <Menu.MenuItem id="c-brand" label="Brand" color="brand" action={() => { }} />
-                <Menu.MenuItem id="c-danger" label="Danger" color="danger" action={() => { }} />
-                <Menu.MenuItem id="c-success" label="Success" color="success" action={() => { }} />
-                <Menu.MenuItem id="c-premium" label="Premium" color="premium" action={() => { }} />
-                <Menu.MenuItem id="c-premium-g" label="Premium Gradient" color="premium-gradient" action={() => { }} />
-            </Menu.MenuGroup>
-
-            <Menu.MenuSeparator />
-
-            <Menu.MenuCheckboxItem
-                id="checkbox"
-                label="Checkbox Item"
-                checked={checkboxValue}
-                action={() => setCheckboxValue(v => !v)}
-            />
-            <Menu.MenuSwitchItem
-                id="switch"
-                label="Switch Item"
-                checked={switchValue}
-                action={() => setSwitchValue(v => !v)}
-            />
-
-            <Menu.MenuSeparator />
-
-            <Menu.MenuGroup label="Radio Group">
-                <Menu.MenuRadioItem id="r-1" group="demo" label="Option 1" checked={radioValue === "option1"} action={() => setRadioValue("option1")} />
-                <Menu.MenuRadioItem id="r-2" group="demo" label="Option 2" checked={radioValue === "option2"} action={() => setRadioValue("option2")} />
-                <Menu.MenuRadioItem id="r-3" group="demo" label="Option 3" checked={radioValue === "option3"} action={() => setRadioValue("option3")} />
-            </Menu.MenuGroup>
-
-            <Menu.MenuSeparator />
-
-            <Menu.MenuItem id="submenu" label="Submenu">
-                <Menu.MenuItem id="sub-1" label="Sub Item 1" action={() => { }} />
-                <Menu.MenuItem id="sub-2" label="Sub Item 2" action={() => { }} />
-                <Menu.MenuItem id="nested" label="Nested Submenu">
-                    <Menu.MenuItem id="nested-1" label="Nested Item" action={() => { }} />
-                </Menu.MenuItem>
-            </Menu.MenuItem>
-
-            <Menu.MenuSeparator />
-
-            <Menu.MenuControlItem
-                id="slider"
-                label="Volume"
-                control={() => (
-                    <Menu.MenuSliderControl
-                        minValue={0}
-                        maxValue={100}
-                        value={sliderValue}
-                        onChange={setSliderValue}
-                        renderValue={v => `${v}%`}
-                    />
-                )}
-            />
-        </Menu.Menu>
-    );
-}
-
-export default function MenuTab() {
-    const openMenu = (e: React.MouseEvent) => {
-        ContextMenuApi.openContextMenu(e, () => (
-            <DemoMenu onClose={ContextMenuApi.closeContextMenu} />
-        ));
-    };
-
-    return (
-        <DocPage
-            componentName="Menu"
-            overview="Discord's Menu system provides context menus with items, checkboxes, radio buttons, switches, sliders, submenus, and groups. Open menus with ContextMenuApi.openContextMenu(). The Menu object contains all sub-components: Menu, MenuItem, MenuCheckboxItem, MenuRadioItem, MenuSwitchItem, MenuGroup, MenuSeparator, MenuControlItem, MenuSliderControl, and MenuSearchControl."
-            notices={[
-                { type: "info", children: "Menus must be opened via ContextMenuApi.openContextMenu(). Set the onClose prop to ContextMenuApi.closeContextMenu to ensure proper cleanup." },
-            ]}
-            importPath={'import { Menu, ContextMenuApi } from "../components";'}
-            sections={[
-                {
-                    title: "Full Menu Demo",
-                    description: "Click or right-click to open a menu showcasing all component types: basic items, icons, hints, subtext, colors, checkboxes, switches, radio groups, submenus, and sliders.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <Button onClick={openMenu}>Open Menu (Click)</Button>
-                            <Button variant="secondary" onContextMenu={openMenu}>Open Menu (Right-Click)</Button>
-                        </div>
-                    ),
-                    code: `const openMenu = (e: React.MouseEvent) => {
-  ContextMenuApi.openContextMenu(e, () => (
-    <Menu.Menu navId="my-menu" onClose={ContextMenuApi.closeContextMenu}>
-      <Menu.MenuItem id="item" label="Click me" action={() => { }} />
-      <Menu.MenuSeparator />
-      <Menu.MenuCheckboxItem id="check" label="Toggle" checked={on} action={() => setOn(!on)} />
-    </Menu.Menu>
-  ));
-};`,
-                },
-                {
-                    title: "MenuItem Colors",
-                    description: "Items support color variants: default, brand, danger, success, premium, and premium-gradient. These are visible in the full demo above.",
-                    children: (
-                        <Button variant="secondary" onClick={openMenu}>
-                            Open Menu to See Colors
-                        </Button>
-                    ),
-                    relevantProps: ["color"],
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ModalTab.tsx b/src/equicordplugins/components.dev/components/tabs/ModalTab.tsx
deleted file mode 100644
index e37884d9c..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ModalTab.tsx
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import {
-    closeAllModals,
-    ConfirmModal,
-    ExpressiveModal,
-    ManaButton,
-    ManaTextInput,
-    Modal,
-    openModal,
-    Paragraph,
-    showToast,
-    ToastType,
-    useState,
-} from "..";
-import { DocPage, type PropDef, type PropGroup } from "../DocPage";
-
-const MODAL_PROPS: PropDef[] = [
-    { name: "title", type: "string", required: true, description: "Modal title displayed in the header." },
-    { name: "onClose", type: "() => void", required: true, description: "Called when the modal should close." },
-    { name: "subtitle", type: "string", description: "Subtitle text below the title." },
-    { name: "size", type: '"sm" | "md"', description: "Modal width size." },
-    { name: "transitionState", type: "number", description: "Animation state from openModal render props." },
-    { name: "animationVariant", type: '"default" | "fade" | "slide-up"', default: '"default"', description: "Transition animation style." },
-    { name: "paddingSize", type: '"sm" | "lg"', default: '"sm"', description: "Internal padding size." },
-    { name: "fullScreenOnMobile", type: "boolean", default: "true", description: "Whether to go full screen on mobile." },
-    { name: "maxHeight", type: '"default" | "full"', default: '"default"', description: "Maximum height constraint." },
-    { name: "dismissable", type: "boolean", default: "true", description: "Whether the modal can be dismissed by clicking outside." },
-    { name: "children", type: "ReactNode", description: "Modal body content." },
-    { name: "actions", type: "ModalAction[]", description: "Array of action buttons in the footer." },
-    { name: "actionBarInput", type: "ReactNode", description: "Input element in the action bar area." },
-    { name: "actionBarInputLayout", type: '"default" | "full-width"', default: '"default"', description: "Layout of the action bar input." },
-    { name: "notice", type: '{ message: string; type: "info" | "warn" | "critical" | "positive" }', description: "Notice banner shown at the top of the modal." },
-    { name: "input", type: "ReactNode", description: "Input controls rendered in the header area." },
-    { name: "preview", type: "ReactNode", description: "Preview content above the modal body." },
-    { name: "onScroll", type: "(e: UIEvent) => void", description: "Scroll event handler for the modal body." },
-    { name: "scrollerRef", type: "Ref<HTMLDivElement>", description: "Ref to the scroller element." },
-    { name: "role", type: "string", default: '"dialog"', description: "ARIA role for the modal." },
-    { name: "aria-label", type: "string", description: "ARIA label for the modal." },
-    { name: "className", type: "string", description: "Custom CSS class." },
-];
-
-const CONFIRM_PROPS: PropDef[] = [
-    { name: "title", type: "string", required: true, description: "Modal title." },
-    { name: "confirmText", type: "string", required: true, description: "Text for the confirm button." },
-    { name: "onClose", type: "() => void", required: true, description: "Called when the modal should close." },
-    { name: "cancelText", type: "string", description: "Text for the cancel button." },
-    { name: "variant", type: '"critical" | "primary" | "secondary"', description: "Visual style of the confirm button." },
-    { name: "onConfirm", type: "() => void | Promise<void>", description: "Called when the confirm button is clicked. Can be async." },
-    { name: "onCancel", type: "() => void", description: "Called when the cancel button is clicked." },
-    { name: "checkboxProps", type: "{ label, checked, onChange }", description: "Optional checkbox in the modal body." },
-    { name: "children", type: "ReactNode", description: "Body content." },
-];
-
-const EXPRESSIVE_PROPS: PropDef[] = [
-    { name: "title", type: "string", required: true, description: "Modal title." },
-    { name: "onClose", type: "() => void", required: true, description: "Called when the modal should close." },
-    { name: "subtitle", type: "string", description: "Subtitle text below the title." },
-    { name: "size", type: '"sm" | "md"', default: '"md"', description: "Modal width size." },
-    { name: "transitionState", type: "number", description: "Animation state." },
-    { name: "gradientColor", type: '"purple" | "blue" | "pink" | "green"', default: '"purple"', description: "Background gradient color." },
-    { name: "graphic", type: '{ type: "image"; src: string; aspectRatio?: string }', description: "Image graphic shown above the content." },
-    { name: "badge", type: "ReactNode", description: "Badge element shown near the title." },
-    { name: "actionBarInput", type: "ReactNode", description: "Input element in the action bar area." },
-    { name: "actions", type: "ModalAction[]", description: "Action buttons." },
-    { name: "children", type: "ReactNode", description: "Modal body content." },
-];
-
-const ACTION_PROPS: PropDef[] = [
-    { name: "text", type: "string", required: true, description: "Button text." },
-    { name: "variant", type: '"primary" | "secondary" | "critical-primary" | "critical-secondary"', required: true, description: "Button style variant." },
-    { name: "onClick", type: "() => void", required: true, description: "Click handler." },
-    { name: "disabled", type: "boolean", description: "Disable the button." },
-    { name: "loading", type: "boolean", description: "Show loading spinner." },
-];
-
-const PROP_GROUPS: PropGroup[] = [
-    { title: "Modal", props: MODAL_PROPS },
-    { title: "ConfirmModal", props: CONFIRM_PROPS },
-    { title: "ExpressiveModal", props: EXPRESSIVE_PROPS },
-    { title: "ModalAction", props: ACTION_PROPS },
-];
-
-function openBasicModal() {
-    openModal(props => (
-        <Modal
-            title="Basic Modal"
-            subtitle="This is a subtitle"
-            transitionState={props.transitionState}
-            onClose={props.onClose}
-            actions={[
-                { text: "Cancel", variant: "secondary", onClick: props.onClose },
-                { text: "Confirm", variant: "primary", onClick: () => { showToast("Confirmed!", ToastType.SUCCESS); props.onClose(); } },
-            ]}
-        >
-            <Paragraph>This is the modal body content. Any React components can go here.</Paragraph>
-        </Modal>
-    ));
-}
-
-function openNoticeModal() {
-    openModal(props => (
-        <Modal
-            title="Modal with Notice"
-            transitionState={props.transitionState}
-            onClose={props.onClose}
-            notice={{ message: "This is an informational notice", type: "info" }}
-            actions={[{ text: "Got it", variant: "primary", onClick: props.onClose }]}
-        >
-            <Paragraph>Modals can display notices at the top for important information.</Paragraph>
-        </Modal>
-    ));
-}
-
-function ModalWithInputContent({ onClose, transitionState }: { onClose: () => void; transitionState: number; }) {
-    const [inputValue, setInputValue] = useState("");
-    return (
-        <Modal
-            title="Modal with Input"
-            subtitle="Enter some information"
-            transitionState={transitionState}
-            onClose={onClose}
-            actions={[
-                { text: "Cancel", variant: "secondary", onClick: onClose },
-                { text: "Submit", variant: "primary", onClick: () => { showToast(`Submitted: ${inputValue}`, ToastType.SUCCESS); onClose(); } },
-            ]}
-        >
-            <ManaTextInput value={inputValue} onChange={setInputValue} placeholder="Type something..." />
-        </Modal>
-    );
-}
-
-function openConfirmCritical() {
-    openModal(props => (
-        <ConfirmModal
-            title="Confirm Action"
-            subtitle="Are you sure you want to proceed?"
-            transitionState={props.transitionState}
-            confirmText="Delete"
-            cancelText="Cancel"
-            variant="critical"
-            onConfirm={() => showToast("Item deleted!", ToastType.SUCCESS)}
-            onCancel={() => showToast("Cancelled", ToastType.MESSAGE)}
-            onClose={props.onClose}
-        >
-            <Paragraph>This action cannot be undone. The item will be permanently deleted.</Paragraph>
-        </ConfirmModal>
-    ));
-}
-
-function openConfirmPrimary() {
-    openModal(props => (
-        <ConfirmModal
-            title="Save Changes"
-            transitionState={props.transitionState}
-            confirmText="Save"
-            variant="primary"
-            onConfirm={() => showToast("Changes saved!", ToastType.SUCCESS)}
-            onClose={props.onClose}
-        >
-            <Paragraph>Do you want to save your changes?</Paragraph>
-        </ConfirmModal>
-    ));
-}
-
-function openExpressive() {
-    openModal(props => (
-        <ExpressiveModal
-            title="Welcome!"
-            subtitle="This is an expressive modal with a more visual design."
-            transitionState={props.transitionState}
-            gradientColor="purple"
-            actions={[{ text: "Get Started", variant: "primary", onClick: props.onClose }]}
-            onClose={props.onClose}
-        />
-    ));
-}
-
-export default function ModalTab() {
-    return (
-        <DocPage
-            componentName="Modal"
-            overview="Discord's modal system includes Modal for general-purpose dialogs, ConfirmModal for confirmation flows, and ExpressiveModal for visual/onboarding experiences. All are opened via openModal() which handles backdrop, positioning, and transition states."
-            notices={[
-                { type: "warn", children: "Always use openModal() to display modals. It handles the backdrop, animation state, stacking context, and cleanup. Rendering modals inline will not work correctly." },
-                { type: "info", children: "The transitionState prop from openModal's render callback must be forwarded to the modal component for enter/exit animations to work properly." },
-            ]}
-            importPath={'import { Modal, ConfirmModal, ExpressiveModal, openModal, closeModal, closeAllModals } from "../components";'}
-            sections={[
-                {
-                    title: "Basic Modal",
-                    description: "Simple modal with title, subtitle, body content, and action buttons.",
-                    children: <ManaButton variant="secondary" text="Open Basic Modal" onClick={openBasicModal} />,
-                    code: `openModal(props => (
-  <Modal
-    title="My Modal"
-    subtitle="Subtitle text"
-    transitionState={props.transitionState}
-    onClose={props.onClose}
-    actions={[
-      { text: "Cancel", variant: "secondary", onClick: props.onClose },
-      { text: "Confirm", variant: "primary", onClick: handleConfirm },
-    ]}
-  >
-    <p>Modal content here</p>
-  </Modal>
-))`,
-                    relevantProps: ["title", "subtitle", "actions"],
-                },
-                {
-                    title: "Modal with Notice",
-                    description: "A notice banner appears at the top of the modal for important info.",
-                    children: <ManaButton variant="secondary" text="Open Modal with Notice" onClick={openNoticeModal} />,
-                    relevantProps: ["notice"],
-                },
-                {
-                    title: "Modal with Input",
-                    description: "Modal with form controls in the body area.",
-                    children: (
-                        <ManaButton
-                            variant="secondary"
-                            text="Open Modal with Input"
-                            onClick={() => openModal(props => (
-                                <ModalWithInputContent onClose={props.onClose} transitionState={props.transitionState} />
-                            ))}
-                        />
-                    ),
-                },
-                {
-                    title: "ConfirmModal (Critical)",
-                    description: "Confirmation dialog for destructive actions with danger styling.",
-                    children: <ManaButton variant="critical-secondary" text="Open Confirm Modal" onClick={openConfirmCritical} />,
-                    code: `openModal(props => (
-  <ConfirmModal
-    title="Delete Item?"
-    confirmText="Delete"
-    cancelText="Cancel"
-    variant="critical"
-    onConfirm={() => deleteItem()}
-    onClose={props.onClose}
-    transitionState={props.transitionState}
-  >
-    <p>This cannot be undone.</p>
-  </ConfirmModal>
-))`,
-                    relevantProps: ["confirmText", "variant", "onConfirm"],
-                },
-                {
-                    title: "ConfirmModal (Primary)",
-                    description: "Confirmation dialog for non-destructive actions.",
-                    children: <ManaButton variant="secondary" text="Open Save Dialog" onClick={openConfirmPrimary} />,
-                },
-                {
-                    title: "ExpressiveModal",
-                    description: "Visual modal for onboarding or promotional experiences.",
-                    children: <ManaButton variant="secondary" text="Open Expressive Modal" onClick={openExpressive} />,
-                    relevantProps: ["subtitle", "gradientColor", "graphic", "badge"],
-                },
-                {
-                    title: "Close All Modals",
-                    description: "Utility to close all open modals at once.",
-                    children: <ManaButton variant="critical-secondary" text="Close All Modals" onClick={closeAllModals} />,
-                    code: "closeAllModals();",
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/NoticeTab.tsx b/src/equicordplugins/components.dev/components/tabs/NoticeTab.tsx
deleted file mode 100644
index dacc6e57e..000000000
--- a/src/equicordplugins/components.dev/components/tabs/NoticeTab.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Button, Notice, NoticeTypes, Paragraph } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const NOTICE_PROPS: PropDef[] = [
-    { name: "children", type: "ReactNode", required: true, description: "Notice content text." },
-    { name: "messageType", type: '"info" | "warn" | "danger" | "positive" | "preview"', required: true, description: "Visual severity level of the notice." },
-    { name: "action", type: "ReactNode", description: "Action element (typically a button) displayed on the right side." },
-    { name: "hidden", type: "boolean", default: "false", description: "Hides the notice without removing it from the DOM." },
-    { name: "textColor", type: "string", description: "Custom text color override." },
-    { name: "textVariant", type: "string", default: '"text-sm/medium"', description: 'Text size/weight variant, e.g. "text-md/normal".' },
-    { name: "icon", type: "ComponentType<{ className?, color? }>", description: "Custom icon component to replace the default." },
-    { name: "className", type: "string", description: "Additional CSS class." },
-];
-
-export default function NoticeTab() {
-    return (
-        <DocPage
-            componentName="Notice"
-            overview="Notice displays informational messages with different severity levels. Each type has a distinct color and icon. Supports action buttons, custom icons, text variants, and can be hidden without unmounting."
-            importPath={'import { Notice, NoticeTypes } from "../components";'}
-            sections={[
-                {
-                    title: "Message Types",
-                    description: "All five severity levels with distinct colors and icons.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            {NoticeTypes.map(type => (
-                                <Notice key={type} messageType={type}>
-                                    This is a {type} notice message.
-                                </Notice>
-                            ))}
-                        </div>
-                    ),
-                    code: '<Notice messageType="info">Informational message.</Notice>',
-                    relevantProps: ["messageType"],
-                },
-                {
-                    title: "With Action Button",
-                    description: "Notices can include action buttons for user interaction.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            <Notice
-                                messageType="info"
-                                action={<Button size="small" variant="secondary">Action</Button>}
-                            >
-                                Notice with an action button.
-                            </Notice>
-                            <Notice
-                                messageType="warn"
-                                action={<Button size="small" variant="primary">Fix Now</Button>}
-                            >
-                                Warning that requires attention.
-                            </Notice>
-                        </div>
-                    ),
-                    code: `<Notice
-  messageType="warn"
-  action={<Button size="small" variant="primary">Fix Now</Button>}
->
-  Warning that requires attention.
-</Notice>`,
-                    relevantProps: ["action"],
-                },
-                {
-                    title: "Hidden State",
-                    description: "The hidden prop controls visibility without removing from the DOM.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            <div>
-                                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>hidden=false:</Paragraph>
-                                <Notice messageType="info" hidden={false}>
-                                    This notice is visible.
-                                </Notice>
-                            </div>
-                            <div>
-                                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>hidden=true (invisible below):</Paragraph>
-                                <Notice messageType="info" hidden={true}>
-                                    This notice is hidden.
-                                </Notice>
-                            </div>
-                        </div>
-                    ),
-                    relevantProps: ["hidden"],
-                },
-                {
-                    title: "Text Variants",
-                    description: "Customize text sizing with the textVariant prop.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            <div>
-                                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Default (text-sm/medium):</Paragraph>
-                                <Notice messageType="info">Default text variant.</Notice>
-                            </div>
-                            <div>
-                                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>text-md/normal:</Paragraph>
-                                <Notice messageType="info" textVariant="text-md/normal">Larger text variant.</Notice>
-                            </div>
-                        </div>
-                    ),
-                    relevantProps: ["textVariant"],
-                },
-            ]}
-            props={NOTICE_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/PaginatorTab.tsx b/src/equicordplugins/components.dev/components/tabs/PaginatorTab.tsx
deleted file mode 100644
index 2b994f6d2..000000000
--- a/src/equicordplugins/components.dev/components/tabs/PaginatorTab.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Paginator, Paragraph, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const PAGINATOR_PROPS: PropDef[] = [
-    { name: "currentPage", type: "number", required: true, description: "Currently active page (1-based)." },
-    { name: "totalCount", type: "number", required: true, description: "Total number of items across all pages." },
-    { name: "pageSize", type: "number", required: true, description: "Number of items per page." },
-    { name: "onPageChange", type: "(page: number) => void", description: "Called when the user navigates to a different page." },
-    { name: "maxVisiblePages", type: "number", description: "Maximum number of page buttons visible at once." },
-    { name: "hideMaxPage", type: "boolean", default: "false", description: "Hide the last page number." },
-    { name: "disablePaginationGap", type: "boolean", default: "false", description: "Remove the ellipsis gaps between page numbers." },
-    { name: "className", type: "string", description: "Custom CSS class." },
-    { name: "renderPageWrapper", type: "(props, defaultRender) => ReactNode", description: "Custom render wrapper for each page button." },
-];
-
-function BasicDemo() {
-    const [page, setPage] = useState(1);
-    return (
-        <div>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>Page {page} of 10</Paragraph>
-            <Paginator currentPage={page} totalCount={100} pageSize={10} onPageChange={setPage} />
-        </div>
-    );
-}
-
-function MaxVisibleDemo() {
-    const [page3, setPage3] = useState(1);
-    const [page7, setPage7] = useState(1);
-
-    return (
-        <div className="vc-compfinder-grid-vertical">
-            <div>
-                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>maxVisiblePages=3:</Paragraph>
-                <Paginator currentPage={page3} totalCount={100} pageSize={10} maxVisiblePages={3} onPageChange={setPage3} />
-            </div>
-            <div>
-                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>maxVisiblePages=7:</Paragraph>
-                <Paginator currentPage={page7} totalCount={100} pageSize={10} maxVisiblePages={7} onPageChange={setPage7} />
-            </div>
-        </div>
-    );
-}
-
-function OptionsDemo() {
-    const [page, setPage] = useState(1);
-
-    return (
-        <div className="vc-compfinder-grid-vertical">
-            <div>
-                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>hideMaxPage:</Paragraph>
-                <Paginator currentPage={page} totalCount={100} pageSize={10} hideMaxPage onPageChange={setPage} />
-            </div>
-            <div>
-                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>disablePaginationGap:</Paragraph>
-                <Paginator currentPage={page} totalCount={50} pageSize={10} disablePaginationGap onPageChange={setPage} />
-            </div>
-        </div>
-    );
-}
-
-export default function PaginatorTab() {
-    return (
-        <DocPage
-            componentName="Paginator"
-            overview="Paginator provides page navigation for paginated content. Shows page numbers with back/next buttons, ellipsis gaps for large page ranges, and supports customization of visible page count and gap behavior."
-            notices={[
-                { type: "info", children: "Paginator is 1-based. The currentPage value starts at 1, not 0." },
-            ]}
-            importPath={'import { Paginator } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Standard paginator with 10 pages.",
-                    children: <BasicDemo />,
-                    code: `<Paginator
-  currentPage={page}
-  totalCount={100}
-  pageSize={10}
-  onPageChange={setPage}
-/>`,
-                    relevantProps: ["currentPage", "totalCount", "pageSize", "onPageChange"],
-                },
-                {
-                    title: "Max Visible Pages",
-                    description: "Control how many page numbers are visible before ellipsis appears.",
-                    children: <MaxVisibleDemo />,
-                    relevantProps: ["maxVisiblePages"],
-                },
-                {
-                    title: "Options",
-                    description: "Hide the last page number or remove ellipsis gaps entirely.",
-                    children: <OptionsDemo />,
-                    relevantProps: ["hideMaxPage", "disablePaginationGap"],
-                },
-            ]}
-            props={PAGINATOR_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/PopoverTab.tsx b/src/equicordplugins/components.dev/components/tabs/PopoverTab.tsx
deleted file mode 100644
index a27d78ec1..000000000
--- a/src/equicordplugins/components.dev/components/tabs/PopoverTab.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaButton, ManaPopover, PopoverAction, useRef, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const POPOVER_PROPS: PropDef[] = [
-    { name: "targetElementRef", type: "RefObject<HTMLElement>", required: true, description: "Ref to the element the popover is anchored to." },
-    { name: "shouldShow", type: "boolean", required: true, description: "Controls popover visibility." },
-    { name: "onRequestClose", type: "(reason: string) => void", description: "Called when the popover wants to close (click outside, escape, etc.)." },
-    { name: "title", type: "string", description: "Popover title text." },
-    { name: "body", type: "string", description: "Popover body text." },
-    { name: "size", type: '"sm" | "md" | "lg"', description: "Popover width size." },
-    { name: "position", type: '"top" | "bottom" | "left" | "right"', description: "Position relative to the target element." },
-    { name: "actions", type: "PopoverAction[]", description: "Action buttons rendered in the popover footer." },
-    { name: "textLink", type: "{ text: string; onClick?: () => void }", description: "Text link displayed below the body." },
-    { name: "graphic", type: "{ src: string; aspectRatio?: string }", description: "Image graphic shown in the popover." },
-    { name: "badge", type: "ReactNode", description: "Badge element displayed near the title." },
-    { name: "gradientColor", type: "string", description: "Background gradient color." },
-    { name: "scrollBehavior", type: "string", description: "Scroll behavior for popover content." },
-    { name: "hasVideo", type: "boolean", description: "Whether the popover contains video content." },
-    { name: "popoverRef", type: "Ref<HTMLDivElement>", description: "Ref forwarded to the popover container." },
-    { name: "caretConfig", type: '{ align?: "start" | "center" | "end" }', description: "Configuration for the caret arrow." },
-    { name: "alignmentStrategy", type: '"edge" | "trigger-center"', description: "How the popover aligns to the target element." },
-    { name: "align", type: '"left" | "center" | "right"', description: 'Alignment when alignmentStrategy is "edge".' },
-];
-
-function PopoverDemo({ label, title, body, size, actions, position }: {
-    label: string;
-    title: string;
-    body: string;
-    size?: "sm" | "md" | "lg";
-    actions?: PopoverAction[];
-    position?: "top" | "bottom" | "left" | "right";
-}) {
-    const wrapperRef = useRef<HTMLDivElement>(null);
-    const [show, setShow] = useState(false);
-
-    return (
-        <>
-            <div ref={wrapperRef} style={{ display: "inline-block" }}>
-                <ManaButton variant="secondary" text={label} onClick={() => setShow(!show)} />
-            </div>
-            <ManaPopover
-                targetElementRef={wrapperRef}
-                shouldShow={show}
-                onRequestClose={() => setShow(false)}
-                title={title}
-                body={body}
-                size={size}
-                actions={actions}
-                position={position}
-            />
-        </>
-    );
-}
-
-export default function PopoverTab() {
-    return (
-        <DocPage
-            componentName="ManaPopover"
-            overview="ManaPopover is Discord's popover component that anchors to a target element. Supports title, body text, action buttons, graphics, text links, and badge elements. Positioned relative to the target with configurable direction and size."
-            notices={[
-                { type: "warn", children: "The targetElementRef must point to a mounted DOM element. If the ref is null when shouldShow becomes true, the popover will not position correctly." },
-                { type: "info", children: "Handle onRequestClose to dismiss the popover when the user clicks outside or presses Escape. Without it, the popover will remain visible until shouldShow is manually set to false." },
-            ]}
-            importPath={'import { ManaPopover } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Simple popover with title and body text.",
-                    children: (
-                        <PopoverDemo
-                            label="Click me"
-                            title="Popover Title"
-                            body="This is the popover body text with some helpful information."
-                        />
-                    ),
-                    code: `const ref = useRef<HTMLDivElement>(null);
-const [show, setShow] = useState(false);
-
-<div ref={ref}>
-  <Button onClick={() => setShow(!show)}>Click me</Button>
-</div>
-<ManaPopover
-  targetElementRef={ref}
-  shouldShow={show}
-  onRequestClose={() => setShow(false)}
-  title="Popover Title"
-  body="Body text here."
-/>`,
-                    relevantProps: ["targetElementRef", "shouldShow", "onRequestClose", "title", "body"],
-                },
-                {
-                    title: "Sizes",
-                    description: "Three size variants: sm, md, and lg.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <PopoverDemo label="sm" title="Small" body="Small popover." size="sm" />
-                            <PopoverDemo label="md" title="Medium" body="Medium popover (default)." size="md" />
-                            <PopoverDemo label="lg" title="Large" body="Large popover with more space." size="lg" />
-                        </div>
-                    ),
-                    relevantProps: ["size"],
-                },
-                {
-                    title: "Positions",
-                    description: "Popover can be positioned on any side of the target element.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <PopoverDemo label="top" title="Top" body="Appears above." position="top" />
-                            <PopoverDemo label="bottom" title="Bottom" body="Appears below." position="bottom" />
-                            <PopoverDemo label="left" title="Left" body="Appears left." position="left" />
-                            <PopoverDemo label="right" title="Right" body="Appears right." position="right" />
-                        </div>
-                    ),
-                    relevantProps: ["position"],
-                },
-                {
-                    title: "With Actions",
-                    description: "Popover with action buttons in the footer.",
-                    children: (
-                        <PopoverDemo
-                            label="With Actions"
-                            title="Popover with Actions"
-                            body="This popover has action buttons."
-                            actions={[
-                                { text: "Primary", variant: "primary" },
-                                { text: "Secondary", variant: "secondary" },
-                            ]}
-                        />
-                    ),
-                    relevantProps: ["actions"],
-                },
-            ]}
-            props={POPOVER_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ProgressBarTab.tsx b/src/equicordplugins/components.dev/components/tabs/ProgressBarTab.tsx
deleted file mode 100644
index bc288f701..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ProgressBarTab.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Paragraph, ProgressBar, useEffect, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const PROGRESSBAR_PROPS: PropDef[] = [
-    { name: "progress", type: "number", required: true, description: "Current progress value." },
-    { name: "minimum", type: "number", default: "0", description: "Minimum range value." },
-    { name: "maximum", type: "number", default: "100", description: "Maximum range value." },
-    { name: "variant", type: '"blue" | "orange" | "unset"', default: '"blue"', description: 'Color variant. Use "unset" with override for custom colors.' },
-    { name: "override", type: "{ default?: { background, gradientStart, gradientEnd } }", description: 'Custom colors when variant is "unset".' },
-    { name: "weight", type: '"light" | "medium"', default: '"light"', description: "Visual weight of the progress bar." },
-    { name: "glowing", type: "boolean", default: "true", description: "Whether the progress bar has a glow effect." },
-    { name: "labelledBy", type: "string", internal: true, description: "ID of the labelling element for accessibility." },
-];
-
-function AnimatedDemo() {
-    const [progress, setProgress] = useState(0);
-
-    useEffect(() => {
-        const interval = setInterval(() => {
-            setProgress(prev => (prev >= 100 ? 0 : prev + 5));
-        }, 200);
-        return () => clearInterval(interval);
-    }, []);
-
-    return (
-        <div>
-            <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Progress: {progress}%</Paragraph>
-            <ProgressBar progress={progress} variant="blue" />
-        </div>
-    );
-}
-
-export default function ProgressBarTab() {
-    return (
-        <DocPage
-            overview="ProgressBar displays a horizontal progress indicator with support for blue and orange color variants, light and medium weights, a glow effect, custom color overrides via gradients, and configurable min/max ranges."
-            importPath={'import { ProgressBar } from "../components";'}
-            sections={[
-                {
-                    title: "Variants",
-                    description: "Blue (default) and orange color variants.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            <div>
-                                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Blue:</Paragraph>
-                                <ProgressBar progress={60} variant="blue" />
-                            </div>
-                            <div>
-                                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Orange:</Paragraph>
-                                <ProgressBar progress={60} variant="orange" />
-                            </div>
-                        </div>
-                    ),
-                    code: '<ProgressBar progress={60} variant="blue" />',
-                    relevantProps: ["variant"],
-                },
-                {
-                    title: "Progress Values",
-                    description: "Various progress levels from 0% to 100%.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            {[0, 25, 50, 75, 100].map(v => (
-                                <div key={v}>
-                                    <Paragraph color="text-muted" style={{ marginBottom: 4 }}>{v}%:</Paragraph>
-                                    <ProgressBar progress={v} variant="blue" />
-                                </div>
-                            ))}
-                        </div>
-                    ),
-                    relevantProps: ["progress"],
-                },
-                {
-                    title: "Animated",
-                    description: "Progress bar that increments automatically.",
-                    children: <AnimatedDemo />,
-                },
-                {
-                    title: "Weight",
-                    description: "Light (default) and medium weight variants.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            <div>
-                                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Light (default):</Paragraph>
-                                <ProgressBar progress={60} weight="light" />
-                            </div>
-                            <div>
-                                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Medium:</Paragraph>
-                                <ProgressBar progress={60} weight="medium" />
-                            </div>
-                        </div>
-                    ),
-                    code: '<ProgressBar progress={60} weight="medium" />',
-                    relevantProps: ["weight"],
-                },
-                {
-                    title: "Glowing",
-                    description: "Glow effect is enabled by default. Set glowing={false} to disable.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            <div>
-                                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Glowing (default):</Paragraph>
-                                <ProgressBar progress={60} glowing={true} />
-                            </div>
-                            <div>
-                                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>No glow:</Paragraph>
-                                <ProgressBar progress={60} glowing={false} />
-                            </div>
-                        </div>
-                    ),
-                    code: "<ProgressBar progress={60} glowing={false} />",
-                    relevantProps: ["glowing"],
-                },
-                {
-                    title: "Custom Range",
-                    description: "Using minimum=0 and maximum=200 with progress=150 (75% filled).",
-                    children: <ProgressBar progress={150} minimum={0} maximum={200} variant="orange" />,
-                    code: '<ProgressBar progress={150} minimum={0} maximum={200} variant="orange" />',
-                    relevantProps: ["minimum", "maximum"],
-                },
-                {
-                    title: "Custom Override",
-                    description: 'Using variant="unset" with custom gradient colors.',
-                    children: (
-                        <ProgressBar
-                            progress={70}
-                            variant="unset"
-                            override={{
-                                default: {
-                                    background: "rgba(88, 101, 242, 0.3)",
-                                    gradientStart: "#5865F2",
-                                    gradientEnd: "#EB459E",
-                                },
-                            }}
-                        />
-                    ),
-                    code: `<ProgressBar
-  progress={70}
-  variant="unset"
-  override={{
-    default: {
-      background: "rgba(88, 101, 242, 0.3)",
-      gradientStart: "#5865F2",
-      gradientEnd: "#EB459E",
-    },
-  }}
-/>`,
-                    relevantProps: ["override"],
-                },
-            ]}
-            props={PROGRESSBAR_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/RadioGroupTab.tsx b/src/equicordplugins/components.dev/components/tabs/RadioGroupTab.tsx
deleted file mode 100644
index fc8852e52..000000000
--- a/src/equicordplugins/components.dev/components/tabs/RadioGroupTab.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaBaseRadioGroup, RadioOption, StandaloneRadioIndicator, useState } from "..";
-import { DocPage, type PropDef, type PropGroup } from "../DocPage";
-import { EquicordIcon } from "../icons/EquicordIcon";
-
-const RADIOGROUP_PROPS: PropDef[] = [
-    { name: "options", type: "RadioOption[]", required: true, description: "Array of radio options to display." },
-    { name: "value", type: "string | number | null", description: "Currently selected value." },
-    { name: "onChange", type: "(value: string | number) => void", description: "Called when the selection changes." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disable the entire radio group." },
-    { name: "orientation", type: '"vertical" | "horizontal"', description: "Layout orientation of the radio items." },
-    { name: "radioPosition", type: '"left" | "right"', default: '"left"', description: "Position of the radio indicator relative to the label." },
-    { name: "withTransparentBackground", type: "boolean", description: "Use transparent background for radio items." },
-    { name: "label", type: "string", description: "Field label text for the group." },
-    { name: "description", type: "string", description: "Field description text." },
-    { name: "required", type: "boolean", description: "Mark the field as required." },
-    { name: "errorMessage", type: "string", description: "Error message displayed below the group." },
-    { name: "aria-labelledby", type: "string", description: "ID of an external labelling element for accessibility." },
-    { name: "className", type: "string", description: "Custom CSS class name." },
-];
-
-const OPTION_PROPS: PropDef[] = [
-    { name: "value", type: "string | number", required: true, description: "The value for this option." },
-    { name: "name", type: "string", required: true, description: "Display label text." },
-    { name: "description", type: "string", description: "Description text shown below the label." },
-    { name: "disabled", type: "boolean", description: "Disable this individual option." },
-    { name: "icon", type: "ComponentType", description: "Icon component displayed alongside the radio option." },
-    { name: "color", type: "string", description: "Custom color for the option highlight." },
-];
-
-const STANDALONE_PROPS: PropDef[] = [
-    { name: "isSelected", type: "boolean", required: true, description: "Whether the indicator shows as selected." },
-    { name: "disabled", type: "boolean", description: "Disable the indicator." },
-];
-
-const PROP_GROUPS: PropGroup[] = [
-    { title: "ManaBaseRadioGroup", props: RADIOGROUP_PROPS },
-    { title: "RadioOption", props: OPTION_PROPS },
-    { title: "StandaloneRadioIndicator", props: STANDALONE_PROPS },
-];
-
-const BASIC_OPTIONS: RadioOption[] = [
-    { value: "option1", name: "Option 1" },
-    { value: "option2", name: "Option 2" },
-    { value: "option3", name: "Option 3" },
-];
-
-const DESC_OPTIONS: RadioOption[] = [
-    { value: "low", name: "Low Quality", description: "Faster loading, uses less data" },
-    { value: "medium", name: "Medium Quality", description: "Balanced quality and performance" },
-    { value: "high", name: "High Quality", description: "Best quality, uses more data" },
-];
-
-const ICON_OPTIONS: RadioOption[] = [
-    { value: "item1", name: "Item with icon", description: "This option has an icon", icon: EquicordIcon },
-    { value: "item2", name: "Another with icon", icon: EquicordIcon },
-    { value: "item3", name: "Third with icon", icon: EquicordIcon },
-];
-
-const MIXED_OPTIONS: RadioOption[] = [
-    { value: "enabled", name: "Enabled option" },
-    { value: "disabled", name: "Disabled option", disabled: true },
-    { value: "another", name: "Another enabled" },
-];
-
-function BasicDemo() {
-    const [value, setValue] = useState<string | number>("option1");
-    return <ManaBaseRadioGroup options={BASIC_OPTIONS} value={value} onChange={setValue} />;
-}
-
-function DescDemo() {
-    const [value, setValue] = useState<string | number>("medium");
-    return <ManaBaseRadioGroup options={DESC_OPTIONS} value={value} onChange={setValue} />;
-}
-
-function IconDemo() {
-    const [value, setValue] = useState<string | number>("item1");
-    return <ManaBaseRadioGroup options={ICON_OPTIONS} value={value} onChange={setValue} />;
-}
-
-function DisabledItemDemo() {
-    const [value, setValue] = useState<string | number>("enabled");
-    return <ManaBaseRadioGroup options={MIXED_OPTIONS} value={value} onChange={setValue} />;
-}
-
-function UnselectedDemo() {
-    const [value, setValue] = useState<string | number | undefined>(undefined);
-    return <ManaBaseRadioGroup options={BASIC_OPTIONS} value={value} onChange={setValue} />;
-}
-
-function StandaloneDemo() {
-    const [selected, setSelected] = useState(false);
-    return (
-        <div onClick={() => setSelected(!selected)} style={{ cursor: "pointer", display: "inline-block" }}>
-            <StandaloneRadioIndicator isSelected={selected} />
-        </div>
-    );
-}
-
-export default function RadioGroupTab() {
-    return (
-        <DocPage
-            componentName="ManaBaseRadioGroup"
-            overview="ManaBaseRadioGroup renders a group of mutually exclusive radio options. Options support descriptions, leading icons, and individual disabled states. StandaloneRadioIndicator is an animated radio circle for custom radio implementations."
-            importPath={'import { ManaBaseRadioGroup, StandaloneRadioIndicator, RadioOption } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Simple radio group with text-only options.",
-                    children: <BasicDemo />,
-                    code: `<ManaBaseRadioGroup
-  options={[
-    { value: "a", name: "Option A" },
-    { value: "b", name: "Option B" },
-  ]}
-  value={value}
-  onChange={setValue}
-/>`,
-                    relevantProps: ["options", "value", "onChange"],
-                },
-                {
-                    title: "With Descriptions",
-                    description: "Options with descriptive text using the description field.",
-                    children: <DescDemo />,
-                },
-                {
-                    title: "With Leading Icons",
-                    description: "Each option can have an icon component before the radio indicator.",
-                    children: <IconDemo />,
-                },
-                {
-                    title: "Disabled Option",
-                    description: "Individual options can be disabled while others remain interactive.",
-                    children: <DisabledItemDemo />,
-                },
-                {
-                    title: "No Initial Selection",
-                    description: "Radio group with no option initially selected.",
-                    children: <UnselectedDemo />,
-                },
-                {
-                    title: "Entire Group Disabled",
-                    description: "The entire group is non-interactive.",
-                    children: <ManaBaseRadioGroup options={BASIC_OPTIONS} value="option2" disabled />,
-                    relevantProps: ["disabled"],
-                },
-                {
-                    title: "Standalone Radio Indicator",
-                    description: "An animated radio circle component for custom radio UIs. Click to toggle.",
-                    children: <StandaloneDemo />,
-                    code: "<StandaloneRadioIndicator isSelected={selected} />",
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/RichTooltipTab.tsx b/src/equicordplugins/components.dev/components/tabs/RichTooltipTab.tsx
deleted file mode 100644
index 95ed33b63..000000000
--- a/src/equicordplugins/components.dev/components/tabs/RichTooltipTab.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaButton, ManaRichTooltip } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const RICHTOOLTIP_PROPS: PropDef[] = [
-    { name: "body", type: "string", required: true, description: "Tooltip body text." },
-    { name: "children", type: "ReactNode | ((props) => ReactNode)", required: true, description: "Trigger element or render function." },
-    { name: "title", type: "string", description: "Bold title text above the body." },
-    { name: "position", type: '"top" | "bottom" | "left" | "right"', description: "Position relative to the trigger." },
-    { name: "align", type: '"start" | "center" | "end"', description: "Alignment along the position axis." },
-    { name: "spacing", type: "number", description: "Distance in pixels from the trigger element." },
-    { name: "asContainer", type: "boolean", description: "Wrap children in a container element for hover detection." },
-    { name: "element", type: '"span" | "div"', description: "HTML element type for the container when asContainer is true." },
-    { name: "asset", type: "ReactNode | { src: string; alt?: string }", description: "Image or element displayed in the tooltip." },
-    { name: "assetSize", type: "number", description: "Size of the asset in pixels." },
-    { name: "targetElementRef", type: "RefObject<HTMLElement>", description: "Ref to an external trigger element instead of wrapping children." },
-    { name: "anchorRef", type: "RefObject<HTMLElement>", description: "Ref to an anchor element for positioning." },
-    { name: "positionKey", type: "string", internal: true, description: "Unique key for position caching." },
-    { name: "caretConfig", type: '{ align?: "start" | "center" | "end" }', description: "Configuration for the caret arrow." },
-    { name: "layerContext", type: "any", internal: true, description: "Layer context for stacking." },
-    { name: "ariaHidden", type: "boolean", default: "false", description: "Hide the tooltip from screen readers." },
-    { name: "shouldShow", type: "boolean", default: "true", description: "Externally control whether the tooltip is shown." },
-    { name: "delay", type: "number", description: "Delay in milliseconds before the tooltip appears." },
-    { name: "forceOpen", type: "boolean", default: "false", description: "Force the tooltip to stay open." },
-    { name: "overflowOnly", type: "boolean", default: "false", description: "Only show when the trigger text is overflowing." },
-    { name: "hideOnClick", type: "boolean", default: "true", description: "Hide when the trigger is clicked." },
-    { name: "onTooltipShow", type: "() => void", description: "Callback when the tooltip becomes visible." },
-    { name: "onTooltipHide", type: "() => void", description: "Callback when the tooltip is hidden." },
-];
-
-export default function RichTooltipTab() {
-    return (
-        <DocPage
-            componentName="ManaRichTooltip"
-            overview="ManaRichTooltip is Discord's rich tooltip component that displays a title, body text, and optional assets on hover. Unlike ManaTooltip which is text-only, RichTooltip supports structured content with headings and descriptions."
-            notices={[
-                { type: "info", children: "Use asContainer when wrapping components that don't forward refs or hover props. Without it, the tooltip may not detect hover events on the trigger element." },
-            ]}
-            importPath={'import { ManaRichTooltip } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Rich tooltip with title and body text. Hover to preview.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <ManaRichTooltip title="Tooltip Title" body="This is the body text with more detailed information." asContainer>
-                                <ManaButton variant="secondary" text="Hover me" />
-                            </ManaRichTooltip>
-                            <ManaRichTooltip body="This tooltip only has body text, no title." asContainer>
-                                <ManaButton variant="secondary" text="Body Only" />
-                            </ManaRichTooltip>
-                        </div>
-                    ),
-                    code: `<ManaRichTooltip title="Title" body="Body text here." asContainer>
-  <Button>Hover me</Button>
-</ManaRichTooltip>`,
-                    relevantProps: ["title", "body", "asContainer"],
-                },
-                {
-                    title: "Positions",
-                    description: "Tooltip can appear on any side of the trigger element.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {(["top", "bottom", "left", "right"] as const).map(pos => (
-                                <ManaRichTooltip key={pos} title={pos} body={`Positioned at ${pos}`} position={pos} asContainer>
-                                    <ManaButton variant="secondary" text={pos} />
-                                </ManaRichTooltip>
-                            ))}
-                        </div>
-                    ),
-                    relevantProps: ["position"],
-                },
-                {
-                    title: "Alignment",
-                    description: "Align the tooltip along the position axis.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {(["start", "center", "end"] as const).map(align => (
-                                <ManaRichTooltip key={align} title={`${align} aligned`} body={`Tooltip aligned to ${align}`} align={align} asContainer>
-                                    <ManaButton variant="secondary" text={align} />
-                                </ManaRichTooltip>
-                            ))}
-                        </div>
-                    ),
-                    relevantProps: ["align"],
-                },
-                {
-                    title: "Custom Spacing",
-                    description: "Control the distance between tooltip and trigger.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <ManaRichTooltip title="4px spacing" body="Minimal spacing." spacing={4} asContainer>
-                                <ManaButton variant="secondary" text="4px" />
-                            </ManaRichTooltip>
-                            <ManaRichTooltip title="16px spacing" body="Increased spacing." spacing={16} asContainer>
-                                <ManaButton variant="secondary" text="16px" />
-                            </ManaRichTooltip>
-                        </div>
-                    ),
-                    relevantProps: ["spacing"],
-                },
-                {
-                    title: "Container Element",
-                    description: "Choose the wrapper element type for the trigger.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <ManaRichTooltip title="Span" body="Uses span container (default)" element="span" asContainer>
-                                <ManaButton variant="secondary" text="Span" />
-                            </ManaRichTooltip>
-                            <ManaRichTooltip title="Div" body="Uses div container" element="div" asContainer>
-                                <ManaButton variant="secondary" text="Div" />
-                            </ManaRichTooltip>
-                        </div>
-                    ),
-                    relevantProps: ["element"],
-                },
-            ]}
-            props={RICHTOOLTIP_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ScrollerTab.tsx b/src/equicordplugins/components.dev/components/tabs/ScrollerTab.tsx
deleted file mode 100644
index be3dadba9..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ScrollerTab.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaButton, Paragraph, ScrollerAuto, ScrollerNone, ScrollerThin, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const SCROLLER_PROPS: PropDef[] = [
-    { name: "children", type: "ReactNode", required: true, description: "Content to render inside the scrollable area." },
-    { name: "orientation", type: '"vertical" | "horizontal"', default: '"vertical"', description: "Scroll direction." },
-    { name: "paddingFix", type: "boolean", default: "true", description: "Apply padding fix for scroll containers." },
-    { name: "fade", type: "boolean", default: "false", description: "Add a fade effect at the edges to indicate more content." },
-    { name: "dir", type: '"ltr" | "rtl"', default: '"ltr"', description: "Text direction for horizontal scrolling." },
-    { name: "onScroll", type: "(e: UIEvent) => void", description: "Scroll event handler." },
-    { name: "className", type: "string", description: "Custom CSS class." },
-    { name: "style", type: "CSSProperties", description: "Inline styles." },
-];
-
-const SAMPLE_ITEMS = Array.from({ length: 20 }, (_, i) => `Item ${i + 1}`);
-
-function ScrollerDemo({ Component, label }: { Component: React.ComponentType<any>; label: string; }) {
-    const [orientation, setOrientation] = useState<"vertical" | "horizontal">("vertical");
-    const [fade, setFade] = useState(true);
-
-    const scrollerStyle = orientation === "vertical"
-        ? { height: 200, width: "100%", border: "1px solid var(--background-modifier-accent)", borderRadius: 8 }
-        : { height: 60, width: "100%", border: "1px solid var(--background-modifier-accent)", borderRadius: 8 };
-
-    const itemStyle = orientation === "vertical"
-        ? { padding: "8px 12px", borderBottom: "1px solid var(--background-modifier-accent)" }
-        : { padding: "8px 16px", display: "inline-block", whiteSpace: "nowrap" as const };
-
-    return (
-        <div>
-            <div className="vc-compfinder-grid" style={{ marginBottom: 8 }}>
-                <ManaButton
-                    variant="secondary"
-                    text={`Orientation: ${orientation}`}
-                    onClick={() => setOrientation(o => o === "vertical" ? "horizontal" : "vertical")}
-                />
-                <ManaButton
-                    variant="secondary"
-                    text={`Fade: ${fade}`}
-                    onClick={() => setFade(f => !f)}
-                />
-            </div>
-            <Component orientation={orientation} fade={fade} style={scrollerStyle}>
-                {SAMPLE_ITEMS.map(item => (
-                    <div key={item} style={itemStyle}>
-                        <Paragraph>{item}</Paragraph>
-                    </div>
-                ))}
-            </Component>
-        </div>
-    );
-}
-
-export default function ScrollerTab() {
-    return (
-        <DocPage
-            componentName="Scroller"
-            overview="Discord provides three scroller variants for different scrollbar styles: ScrollerThin (thin scrollbar, most common), ScrollerAuto (standard auto-showing scrollbar), and ScrollerNone (hidden scrollbar, still scrollable). All support vertical/horizontal orientation and edge fade effects."
-            importPath={'import { ScrollerThin, ScrollerAuto, ScrollerNone } from "../components";'}
-            sections={[
-                {
-                    title: "ScrollerThin",
-                    description: "Thin scrollbar, the most commonly used variant. Ideal for sidebars and lists.",
-                    children: <ScrollerDemo Component={ScrollerThin} label="ScrollerThin" />,
-                    code: `<ScrollerThin orientation="vertical" fade style={{ height: 200 }}>
-  {items.map(item => <div key={item.id}>{item.label}</div>)}
-</ScrollerThin>`,
-                    relevantProps: ["orientation", "fade"],
-                },
-                {
-                    title: "ScrollerAuto",
-                    description: "Standard scrollbar that appears automatically when content overflows.",
-                    children: <ScrollerDemo Component={ScrollerAuto} label="ScrollerAuto" />,
-                },
-                {
-                    title: "ScrollerNone",
-                    description: "No visible scrollbar. Content is still scrollable via mouse wheel or touch.",
-                    children: <ScrollerDemo Component={ScrollerNone} label="ScrollerNone" />,
-                },
-            ]}
-            props={SCROLLER_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/SearchBarTab.tsx b/src/equicordplugins/components.dev/components/tabs/SearchBarTab.tsx
deleted file mode 100644
index 10a702d55..000000000
--- a/src/equicordplugins/components.dev/components/tabs/SearchBarTab.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { SearchBar, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const SEARCHBAR_PROPS: PropDef[] = [
-    { name: "query", type: "string", required: true, description: "Current search query value." },
-    { name: "onChange", type: "(value: string) => void", required: true, description: "Called when the query text changes." },
-    { name: "onClear", type: "() => void", description: "Called when the clear button is clicked." },
-    { name: "placeholder", type: "string", description: "Placeholder text when empty." },
-    { name: "size", type: '"sm" | "md"', description: "Input size variant." },
-    { name: "autoFocus", type: "boolean", description: "Focus the input on mount." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disable the search bar." },
-    { name: "onKeyDown", type: "(e: KeyboardEvent) => void", description: "Keyboard event handler." },
-    { name: "onBlur", type: "() => void", description: "Called when the input loses focus." },
-    { name: "onFocus", type: "() => void", description: "Called when the input gains focus." },
-    { name: "autoComplete", type: "string", description: "HTML autocomplete attribute value." },
-    { name: "inputProps", type: "Record<string, any>", description: "Additional props passed to the underlying input element." },
-    { name: "className", type: "string", description: "Custom CSS class." },
-    { name: "aria-label", type: "string", description: "Accessibility label." },
-];
-
-function BasicDemo() {
-    const [query, setQuery] = useState("");
-    return (
-        <SearchBar
-            query={query}
-            onChange={setQuery}
-            onClear={() => setQuery("")}
-            placeholder="Search..."
-        />
-    );
-}
-
-function SizesDemo() {
-    const [query, setQuery] = useState("");
-    return (
-        <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
-            <SearchBar query={query} onChange={setQuery} onClear={() => setQuery("")} placeholder="Small size" size="sm" />
-            <SearchBar query={query} onChange={setQuery} onClear={() => setQuery("")} placeholder="Medium size (default)" size="md" />
-        </div>
-    );
-}
-
-function StatesDemo() {
-    const [prefilled, setPrefilled] = useState("prefilled");
-    return (
-        <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
-            <SearchBar query="" onChange={() => { }} placeholder="Disabled" disabled />
-            <SearchBar query={prefilled} onChange={setPrefilled} onClear={() => setPrefilled("")} placeholder="Prefilled" />
-        </div>
-    );
-}
-
-export default function SearchBarTab() {
-    return (
-        <DocPage
-            componentName="SearchBar"
-            overview="SearchBar is Discord's search input component with a built-in search icon, clearable button, and two size variants. Used throughout Discord for filtering and searching content."
-            importPath={'import { SearchBar } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Default search bar with clear button.",
-                    children: <BasicDemo />,
-                    code: `<SearchBar
-  query={query}
-  onChange={setQuery}
-  onClear={() => setQuery("")}
-  placeholder="Search..."
-/>`,
-                    relevantProps: ["query", "onChange", "onClear", "placeholder"],
-                },
-                {
-                    title: "Sizes",
-                    description: "Available in sm and md (default) sizes.",
-                    children: <SizesDemo />,
-                    relevantProps: ["size"],
-                },
-                {
-                    title: "States",
-                    description: "Disabled and prefilled states.",
-                    children: <StatesDemo />,
-                    relevantProps: ["disabled"],
-                },
-            ]}
-            props={SEARCHBAR_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/SelectTab.tsx b/src/equicordplugins/components.dev/components/tabs/SelectTab.tsx
deleted file mode 100644
index b4cf83680..000000000
--- a/src/equicordplugins/components.dev/components/tabs/SelectTab.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaSelect, ManaSelectOption, useState } from "..";
-import { DocPage, type PropDef, type PropGroup } from "../DocPage";
-
-const SELECT_PROPS: PropDef[] = [
-    { name: "options", type: "ManaSelectOption[]", required: true, description: "Array of selectable options." },
-    { name: "value", type: "string | string[] | null", description: "Currently selected value(s)." },
-    { name: "onSelectionChange", type: "(value: string | string[] | null) => void", description: "Called when the selection changes. Note: NOT onChange." },
-    { name: "selectionMode", type: '"single" | "multiple"', description: "Single or multi-select mode." },
-    { name: "placeholder", type: "string", description: "Placeholder text when nothing is selected." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disable the select." },
-    { name: "readOnly", type: "boolean", description: "Make the select read-only." },
-    { name: "clearable", type: "boolean", description: "Allow clearing the selection." },
-    { name: "fullWidth", type: "boolean", description: "Expand to fill available width." },
-    { name: "autoFocus", type: "boolean", description: "Focus on mount." },
-    { name: "closeOnSelect", type: "boolean", description: "Close the dropdown after selecting." },
-    { name: "shouldFocusWrap", type: "boolean", description: "Wrap keyboard focus at list ends." },
-    { name: "maxOptionsVisible", type: "number", description: "Maximum options visible before scrolling." },
-    { name: "wrapTags", type: "boolean", description: "Wrap selected tags to multiple lines in multi-select." },
-    { name: "formatOption", type: "(option: ManaSelectOption) => ReactNode", description: "Custom render for each option." },
-    { name: "label", type: "string", description: "Label text for the select." },
-    { name: "required", type: "boolean", description: "Mark as required for form validation." },
-];
-
-const OPTION_PROPS: PropDef[] = [
-    { name: "id", type: "string", required: true, description: "Unique option identifier." },
-    { name: "value", type: "string", required: true, description: "Option value." },
-    { name: "label", type: "string", required: true, description: "Display label." },
-];
-
-const PROP_GROUPS: PropGroup[] = [
-    { title: "ManaSelect", props: SELECT_PROPS },
-    { title: "ManaSelectOption", props: OPTION_PROPS },
-];
-
-const SAMPLE_OPTIONS: ManaSelectOption[] = [
-    { id: "1", value: "option1", label: "Option 1" },
-    { id: "2", value: "option2", label: "Option 2" },
-    { id: "3", value: "option3", label: "Option 3" },
-    { id: "4", value: "option4", label: "Option 4" },
-];
-
-function SingleDemo() {
-    const [value, setValue] = useState<string>("option1");
-    return (
-        <ManaSelect
-            options={SAMPLE_OPTIONS}
-            value={value}
-            onSelectionChange={v => setValue(v as string)}
-            selectionMode="single"
-        />
-    );
-}
-
-function MultiDemo() {
-    const [value, setValue] = useState<string[]>(["option1", "option2"]);
-    return (
-        <ManaSelect
-            options={SAMPLE_OPTIONS}
-            value={value}
-            onSelectionChange={v => setValue(v as string[])}
-            selectionMode="multiple"
-        />
-    );
-}
-
-function PlaceholderDemo() {
-    const [value, setValue] = useState<string>("");
-    return (
-        <ManaSelect
-            options={SAMPLE_OPTIONS}
-            value={value}
-            onSelectionChange={v => setValue(v as string)}
-            placeholder="Select an option..."
-        />
-    );
-}
-
-function ClearableDemo() {
-    const [value, setValue] = useState<string>("option1");
-    return (
-        <ManaSelect
-            options={SAMPLE_OPTIONS}
-            value={value}
-            onSelectionChange={v => setValue(v as string)}
-            clearable
-        />
-    );
-}
-
-export default function SelectTab() {
-    return (
-        <DocPage
-            componentName="ManaSelect"
-            overview="ManaSelect is Discord's dropdown select component supporting single and multi-select modes. Important: uses onSelectionChange (not onChange) for the selection callback. Supports clearable selection, placeholder text, full width, and custom option rendering."
-            notices={[
-                { type: "warn", children: "ManaSelect uses onSelectionChange, not onChange. This is a common source of confusion since most other Discord form components use onChange." },
-            ]}
-            importPath={'import { ManaSelect, ManaSelectOption } from "../components";'}
-            sections={[
-                {
-                    title: "Single Selection",
-                    description: "Default single-select dropdown.",
-                    children: <SingleDemo />,
-                    code: `<ManaSelect
-  options={options}
-  value={value}
-  onSelectionChange={v => setValue(v as string)}
-  selectionMode="single"
-/>`,
-                    relevantProps: ["options", "value", "onSelectionChange", "selectionMode"],
-                },
-                {
-                    title: "Multiple Selection",
-                    description: "Multi-select with tag pills for each selected option.",
-                    children: <MultiDemo />,
-                },
-                {
-                    title: "With Placeholder",
-                    description: "Shows placeholder text when no option is selected.",
-                    children: <PlaceholderDemo />,
-                    relevantProps: ["placeholder"],
-                },
-                {
-                    title: "Clearable",
-                    description: "Adds a clear button to reset the selection.",
-                    children: <ClearableDemo />,
-                    relevantProps: ["clearable"],
-                },
-                {
-                    title: "Full Width",
-                    description: "Expands to fill the available width.",
-                    children: (
-                        <ManaSelect options={SAMPLE_OPTIONS} value="option1" fullWidth />
-                    ),
-                    relevantProps: ["fullWidth"],
-                },
-                {
-                    title: "Disabled",
-                    description: "Non-interactive disabled state.",
-                    children: (
-                        <ManaSelect options={SAMPLE_OPTIONS} value="option2" disabled />
-                    ),
-                    relevantProps: ["disabled"],
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/SkeletonTab.tsx b/src/equicordplugins/components.dev/components/tabs/SkeletonTab.tsx
deleted file mode 100644
index 386c23535..000000000
--- a/src/equicordplugins/components.dev/components/tabs/SkeletonTab.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaButton, Skeleton, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const SKELETON_PROPS: PropDef[] = [
-    { name: "withHeader", type: "boolean", default: "true", description: "Show a header placeholder row." },
-    { name: "size", type: "number", default: "15", description: "Number of skeleton rows to display." },
-];
-
-function SkeletonDemo() {
-    const [withHeader, setWithHeader] = useState(true);
-    const [size, setSize] = useState(5);
-
-    return (
-        <div>
-            <div style={{ display: "flex", gap: 8, marginBottom: 16 }}>
-                <ManaButton variant="secondary" text={withHeader ? "Hide Header" : "Show Header"} onClick={() => setWithHeader(!withHeader)} />
-                <ManaButton variant="secondary" text="Fewer Items" onClick={() => setSize(Math.max(1, size - 1))} />
-                <ManaButton variant="secondary" text="More Items" onClick={() => setSize(Math.min(20, size + 1))} />
-            </div>
-            <div className="full-motion">
-                <Skeleton withHeader={withHeader} size={size} />
-            </div>
-        </div>
-    );
-}
-
-export default function SkeletonTab() {
-    return (
-        <DocPage
-            componentName="Skeleton"
-            overview="Skeleton displays a loading placeholder with shimmer animation. Used in Discord's member list and other loading states. Renders rows of animated placeholder content with an optional header."
-            importPath={'import { Skeleton } from "../components";'}
-            sections={[
-                {
-                    title: "Interactive Demo",
-                    description: "Toggle the header and adjust the number of skeleton rows.",
-                    children: <SkeletonDemo />,
-                    code: "<Skeleton withHeader={true} size={5} />",
-                    relevantProps: ["withHeader", "size"],
-                },
-                {
-                    title: "Header Only",
-                    children: (
-                        <div className="full-motion">
-                            <Skeleton withHeader={true} size={0} />
-                        </div>
-                    ),
-                },
-                {
-                    title: "No Header",
-                    children: (
-                        <div className="full-motion">
-                            <Skeleton withHeader={false} size={3} />
-                        </div>
-                    ),
-                },
-            ]}
-            props={SKELETON_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/SliderTab.tsx b/src/equicordplugins/components.dev/components/tabs/SliderTab.tsx
deleted file mode 100644
index 4f2b1024c..000000000
--- a/src/equicordplugins/components.dev/components/tabs/SliderTab.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Paragraph, Slider, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const SLIDER_PROPS: PropDef[] = [
-    { name: "initialValue", type: "number", description: "Initial slider value (uncontrolled)." },
-    { name: "value", type: "number", description: "Current slider value (controlled)." },
-    { name: "minValue", type: "number", description: "Minimum range value." },
-    { name: "maxValue", type: "number", description: "Maximum range value." },
-    { name: "onValueChange", type: "(value: number) => void", description: "Called when the value changes (on release)." },
-    { name: "asValueChanges", type: "(value: number) => void", description: "Called continuously as the value changes (while dragging)." },
-    { name: "onValueRender", type: "(value: number) => string | null", description: "Custom tooltip label for the current value." },
-    { name: "markers", type: "number[]", description: "Array of values to show as tick marks." },
-    { name: "stickToMarkers", type: "boolean", description: "Snap the slider value to the nearest marker." },
-    { name: "equidistant", type: "boolean", description: "Space markers equally regardless of value." },
-    { name: "onMarkerRender", type: "(value: number) => string | ReactNode", description: "Custom label for each marker tick." },
-    { name: "keyboardStep", type: "number", description: "Step size for keyboard arrow key increments." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disable interaction." },
-    { name: "mini", type: "boolean", description: "Use compact visual style." },
-    { name: "hideBubble", type: "boolean", description: "Hide the value tooltip bubble." },
-    { name: "orientation", type: '"horizontal" | "vertical"', default: '"horizontal"', description: "Slider orientation." },
-    { name: "className", type: "string", description: "Custom CSS class." },
-];
-
-function BasicDemo() {
-    const [value, setValue] = useState(50);
-    return (
-        <div>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>Value: {value}</Paragraph>
-            <Slider initialValue={value} minValue={0} maxValue={100} onValueChange={setValue} />
-        </div>
-    );
-}
-
-function MarkersDemo() {
-    const [value, setValue] = useState(50);
-    return (
-        <div>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>Value: {value}</Paragraph>
-            <Slider
-                initialValue={value}
-                minValue={0}
-                maxValue={100}
-                markers={[0, 25, 50, 75, 100]}
-                onValueChange={setValue}
-                onMarkerRender={(v: number) => `${v}%`}
-            />
-        </div>
-    );
-}
-
-function MiniDemo() {
-    const [value, setValue] = useState(30);
-    return (
-        <div>
-            <Paragraph color="text-muted" style={{ marginBottom: 8 }}>Value: {value}</Paragraph>
-            <div style={{ width: 200 }}>
-                <Slider initialValue={value} minValue={0} maxValue={100} mini onValueChange={setValue} />
-            </div>
-        </div>
-    );
-}
-
-export default function SliderTab() {
-    return (
-        <DocPage
-            componentName="Slider"
-            overview="Slider is Discord's range input component with support for markers, snap-to-marker behavior, mini mode, value tooltips, and custom rendering. Supports both controlled and uncontrolled usage."
-            notices={[
-                { type: "info", children: "Slider has two change callbacks: onValueChange fires on release (final value), while asValueChanges fires continuously during dragging. Use onValueChange for state updates to avoid excessive re-renders." },
-            ]}
-            importPath={'import { Slider } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Simple slider with min/max range.",
-                    children: <BasicDemo />,
-                    code: `<Slider
-  initialValue={50}
-  minValue={0}
-  maxValue={100}
-  onValueChange={setValue}
-/>`,
-                    relevantProps: ["initialValue", "minValue", "maxValue", "onValueChange"],
-                },
-                {
-                    title: "With Markers",
-                    description: "Tick marks at specified values with custom labels.",
-                    children: <MarkersDemo />,
-                    code: `<Slider
-  initialValue={50}
-  minValue={0}
-  maxValue={100}
-  markers={[0, 25, 50, 75, 100]}
-  onMarkerRender={v => \`\${v}%\`}
-/>`,
-                    relevantProps: ["markers", "onMarkerRender"],
-                },
-                {
-                    title: "Stick to Markers",
-                    description: "Value snaps to the nearest marker position.",
-                    children: (
-                        <Slider
-                            initialValue={50}
-                            minValue={0}
-                            maxValue={100}
-                            markers={[0, 25, 50, 75, 100]}
-                            stickToMarkers
-                            onMarkerRender={(v: number) => `${v}%`}
-                        />
-                    ),
-                    relevantProps: ["stickToMarkers"],
-                },
-                {
-                    title: "Mini",
-                    description: "Compact visual style for tight layouts.",
-                    children: <MiniDemo />,
-                    relevantProps: ["mini"],
-                },
-                {
-                    title: "Disabled",
-                    description: "Non-interactive disabled state.",
-                    children: <Slider initialValue={60} minValue={0} maxValue={100} disabled />,
-                    relevantProps: ["disabled"],
-                },
-                {
-                    title: "Custom Range",
-                    description: "Slider with negative to positive range.",
-                    children: (
-                        <Slider
-                            initialValue={0}
-                            minValue={-50}
-                            maxValue={50}
-                            markers={[-50, -25, 0, 25, 50]}
-                            onMarkerRender={(v: number) => v.toString()}
-                        />
-                    ),
-                },
-            ]}
-            props={SLIDER_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/SpinnerTab.tsx b/src/equicordplugins/components.dev/components/tabs/SpinnerTab.tsx
deleted file mode 100644
index e1bb67949..000000000
--- a/src/equicordplugins/components.dev/components/tabs/SpinnerTab.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaButton, Paragraph, Spinner, SpinnerTypes, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const SPINNER_PROPS: PropDef[] = [
-    { name: "type", type: "SpinnerType", description: 'Spinner variant. One of: "wanderingCubes", "chasingDots", "pulsingEllipsis", "spinningCircle", "spinningCircleSimple", "lowMotion".' },
-    { name: "animated", type: "boolean", default: "true", description: "Enable or pause the animation." },
-    { name: "className", type: "string", description: "CSS class for the container." },
-    { name: "itemClassName", type: "string", description: "CSS class for inner animation items." },
-    { name: "aria-label", type: "string", description: "Accessibility label." },
-];
-
-function AnimationToggleDemo() {
-    const [animated, setAnimated] = useState(true);
-    return (
-        <div>
-            <ManaButton
-                variant="secondary"
-                text={animated ? "Pause Animation" : "Resume Animation"}
-                onClick={() => setAnimated(!animated)}
-                style={{ marginBottom: 16 }}
-            />
-            <div style={{ textAlign: "center", padding: 16 }}>
-                <Spinner type="spinningCircle" animated={animated} />
-                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 8 }}>
-                    animated={animated.toString()}
-                </Paragraph>
-            </div>
-        </div>
-    );
-}
-
-export default function SpinnerTab() {
-    return (
-        <DocPage
-            componentName="Spinner"
-            overview="Spinner provides animated loading indicators in six visual styles. Automatically switches to the lowMotion variant when the user has reduced motion enabled. The animation can be paused via the animated prop."
-            notices={[
-                { type: "positive", children: "Spinner automatically respects the user's reduced motion setting by switching to the lowMotion variant. You don't need to handle this manually." },
-            ]}
-            importPath={'import { Spinner, SpinnerTypes } from "../components";'}
-            sections={[
-                {
-                    title: "All Types",
-                    description: "All six spinner variants.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {SpinnerTypes.map(type => (
-                                <div key={type} style={{ textAlign: "center", padding: 16 }}>
-                                    <Spinner type={type} />
-                                    <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 8 }}>
-                                        {type}
-                                    </Paragraph>
-                                </div>
-                            ))}
-                        </div>
-                    ),
-                    code: '<Spinner type="spinningCircle" />',
-                    relevantProps: ["type"],
-                },
-                {
-                    title: "Animation Toggle",
-                    description: "Spinners can be paused with animated=false.",
-                    children: <AnimationToggleDemo />,
-                    relevantProps: ["animated"],
-                },
-                {
-                    title: "Low Motion",
-                    description: "The lowMotion type is used when the user prefers reduced motion. The component automatically switches to this variant.",
-                    children: (
-                        <div style={{ textAlign: "center", padding: 16 }}>
-                            <Spinner type="lowMotion" />
-                        </div>
-                    ),
-                },
-            ]}
-            props={SPINNER_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/SwitchTab.tsx b/src/equicordplugins/components.dev/components/tabs/SwitchTab.tsx
deleted file mode 100644
index 399041ddd..000000000
--- a/src/equicordplugins/components.dev/components/tabs/SwitchTab.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { findComponentByCodeLazy } from "@webpack";
-
-import { ManaSwitch, useState } from "..";
-import { DocPage, type PropDef, type PropGroup } from "../DocPage";
-
-interface SwitchWithLabelProps {
-    checked: boolean;
-    onChange?: (checked: boolean) => void;
-    disabled?: boolean;
-    label?: string;
-    description?: string;
-}
-
-const SwitchWithLabel = findComponentByCodeLazy('"data-toggleable-component":"switch"') as React.ComponentType<SwitchWithLabelProps>;
-
-const SWITCH_PROPS: PropDef[] = [
-    { name: "checked", type: "boolean", required: true, description: "Current toggle state." },
-    { name: "onChange", type: "(checked: boolean) => void", description: "Called when the switch is toggled." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disable interaction." },
-    { name: "id", type: "string", description: "HTML id attribute." },
-    { name: "hasIcon", type: "boolean", description: "Show a checkmark/x icon inside the toggle." },
-    { name: "describedBy", type: "string", internal: true, description: "ID of an element describing this switch." },
-    { name: "labelledBy", type: "string", internal: true, description: "ID of an element labelling this switch." },
-    { name: "innerRef", type: "Ref<HTMLInputElement>", internal: true, description: "Ref to the underlying input element." },
-];
-
-const SWITCH_WITH_LABEL_PROPS: PropDef[] = [
-    { name: "checked", type: "boolean", required: true, description: "Current toggle state." },
-    { name: "onChange", type: "(checked: boolean) => void", description: "Called when the switch is toggled." },
-    { name: "label", type: "string", description: "Label text displayed next to the switch." },
-    { name: "description", type: "string", description: "Description text below the label." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disable interaction." },
-];
-
-const PROP_GROUPS: PropGroup[] = [
-    { title: "ManaSwitch", props: SWITCH_PROPS },
-    { title: "SwitchWithLabel", props: SWITCH_WITH_LABEL_PROPS },
-];
-
-function BasicDemo() {
-    const [on, setOn] = useState(true);
-    const [off, setOff] = useState(false);
-
-    return (
-        <div className="vc-compfinder-grid">
-            <div className="vc-compfinder-switch-item">
-                <span>On:</span>
-                <ManaSwitch checked={on} onChange={setOn} />
-            </div>
-            <div className="vc-compfinder-switch-item">
-                <span>Off:</span>
-                <ManaSwitch checked={off} onChange={setOff} />
-            </div>
-            <div className="vc-compfinder-switch-item">
-                <span>Disabled On:</span>
-                <ManaSwitch checked={true} disabled />
-            </div>
-            <div className="vc-compfinder-switch-item">
-                <span>Disabled Off:</span>
-                <ManaSwitch checked={false} disabled />
-            </div>
-        </div>
-    );
-}
-
-function LabelDemo() {
-    const [on, setOn] = useState(true);
-    const [off, setOff] = useState(false);
-
-    return (
-        <div className="vc-compfinder-grid-vertical">
-            <SwitchWithLabel label="Enabled option" checked={on} onChange={setOn} />
-            <SwitchWithLabel label="Disabled option" checked={off} onChange={setOff} />
-        </div>
-    );
-}
-
-function DescriptionDemo() {
-    const [checked, setChecked] = useState(true);
-    return (
-        <SwitchWithLabel
-            label="Feature toggle"
-            description="Enable this feature to unlock additional functionality."
-            checked={checked}
-            onChange={setChecked}
-        />
-    );
-}
-
-export default function SwitchTab() {
-    return (
-        <DocPage
-            componentName="ManaSwitch"
-            overview="Discord provides two switch components: ManaSwitch is a bare toggle without label (used inline), and SwitchWithLabel wraps it with label and description text for settings-style layouts."
-            notices={[
-                { type: "info", children: "SwitchWithLabel is found via findComponentByCodeLazy, not directly exported. Use it for settings layouts, and ManaSwitch for inline toggle scenarios." },
-            ]}
-            importPath={`import { ManaSwitch } from "../components";
-import { findComponentByCodeLazy } from "@webpack";
-const SwitchWithLabel = findComponentByCodeLazy('"data-toggleable-component":"switch"');`}
-            sections={[
-                {
-                    title: "Basic Switch",
-                    description: "ManaSwitch in on, off, and disabled states.",
-                    children: <BasicDemo />,
-                    code: "<ManaSwitch checked={enabled} onChange={setEnabled} />",
-                    relevantProps: ["checked", "onChange", "disabled"],
-                },
-                {
-                    title: "Switch with Label",
-                    description: "SwitchWithLabel renders a label next to the toggle.",
-                    children: <LabelDemo />,
-                    code: `<SwitchWithLabel
-  label="Notifications"
-  checked={enabled}
-  onChange={setEnabled}
-/>`,
-                },
-                {
-                    title: "With Description",
-                    description: "Label with description text below.",
-                    children: <DescriptionDemo />,
-                    code: `<SwitchWithLabel
-  label="Feature toggle"
-  description="Enable this to unlock additional functionality."
-  checked={checked}
-  onChange={setChecked}
-/>`,
-                },
-                {
-                    title: "Disabled States",
-                    description: "Both checked and unchecked disabled states.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            <SwitchWithLabel label="Disabled (checked)" checked={true} disabled />
-                            <SwitchWithLabel label="Disabled (unchecked)" checked={false} disabled />
-                        </div>
-                    ),
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/TabBarTab.tsx b/src/equicordplugins/components.dev/components/tabs/TabBarTab.tsx
deleted file mode 100644
index 56f6031b5..000000000
--- a/src/equicordplugins/components.dev/components/tabs/TabBarTab.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Paragraph, TabBar, useState } from "..";
-import { DocPage, type PropDef, type PropGroup } from "../DocPage";
-
-const TABBAR_PROPS: PropDef[] = [
-    { name: "type", type: '"side" | "top" | "top-pill"', description: "Tab bar visual style." },
-    { name: "look", type: '"brand" | "grey"', description: "Color scheme." },
-    { name: "selectedItem", type: "string", description: "ID of the currently selected tab." },
-    { name: "onItemSelect", type: "(id: string) => void", description: "Called when a tab is selected." },
-    { name: "orientation", type: '"horizontal" | "vertical"', description: "Layout direction." },
-    { name: "className", type: "string", description: "Custom CSS class." },
-    { name: "style", type: "CSSProperties", description: "Inline styles." },
-    { name: "aria-label", type: "string", description: "Accessibility label." },
-];
-
-const ITEM_PROPS: PropDef[] = [
-    { name: "id", type: "string", required: true, description: "Unique tab identifier." },
-    { name: "children", type: "ReactNode", required: true, description: "Tab label content." },
-    { name: "disabled", type: "boolean", description: "Disable the tab." },
-    { name: "color", type: "string", description: "Custom tab color (hex or CSS color)." },
-    { name: "variant", type: '"destructive"', description: "Danger styling for actions like logout." },
-    { name: "disableItemStyles", type: "boolean", description: "Remove default tab styles." },
-    { name: "onClick", type: "MouseEventHandler", description: "Custom click handler." },
-];
-
-const PROP_GROUPS: PropGroup[] = [
-    { title: "TabBar", props: TABBAR_PROPS },
-    { title: "TabBar.Item", props: ITEM_PROPS },
-];
-
-function SideDemo() {
-    const [tab, setTab] = useState("tab1");
-    return (
-        <div>
-            <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Selected: {tab}</Paragraph>
-            <TabBar type="side" look="grey" selectedItem={tab} onItemSelect={setTab}>
-                <TabBar.Item id="tab1">First Tab</TabBar.Item>
-                <TabBar.Item id="tab2">Second Tab</TabBar.Item>
-                <TabBar.Item id="tab3">Third Tab</TabBar.Item>
-            </TabBar>
-        </div>
-    );
-}
-
-function TopDemo() {
-    const [tab, setTab] = useState("tab1");
-    return (
-        <TabBar type="top" look="grey" selectedItem={tab} onItemSelect={setTab}>
-            <TabBar.Item id="tab1">Overview</TabBar.Item>
-            <TabBar.Item id="tab2">Settings</TabBar.Item>
-            <TabBar.Item id="tab3">Members</TabBar.Item>
-        </TabBar>
-    );
-}
-
-function TopPillDemo() {
-    const [tab, setTab] = useState("tab1");
-    return (
-        <TabBar type="top-pill" look="grey" selectedItem={tab} onItemSelect={setTab}>
-            <TabBar.Item id="tab1">All</TabBar.Item>
-            <TabBar.Item id="tab2">Online</TabBar.Item>
-            <TabBar.Item id="tab3">Pending</TabBar.Item>
-            <TabBar.Item id="tab4">Blocked</TabBar.Item>
-        </TabBar>
-    );
-}
-
-function BrandDemo() {
-    const [tab, setTab] = useState("tab1");
-    return (
-        <TabBar type="top" look="brand" selectedItem={tab} onItemSelect={setTab}>
-            <TabBar.Item id="tab1">Home</TabBar.Item>
-            <TabBar.Item id="tab2">Explore</TabBar.Item>
-            <TabBar.Item id="tab3">Library</TabBar.Item>
-        </TabBar>
-    );
-}
-
-function HeaderSeparatorDemo() {
-    const [tab, setTab] = useState("tab1");
-    return (
-        <TabBar type="side" look="grey" selectedItem={tab} onItemSelect={setTab}>
-            <TabBar.Header>User Settings</TabBar.Header>
-            <TabBar.Item id="tab1">My Account</TabBar.Item>
-            <TabBar.Item id="tab2">Privacy</TabBar.Item>
-            <TabBar.Separator />
-            <TabBar.Header>App Settings</TabBar.Header>
-            <TabBar.Item id="tab3">Appearance</TabBar.Item>
-            <TabBar.Item id="tab4">Notifications</TabBar.Item>
-        </TabBar>
-    );
-}
-
-function FeaturesDemo() {
-    const [tab, setTab] = useState("tab1");
-    const [colorTab, setColorTab] = useState("tab1");
-
-    return (
-        <div className="vc-compfinder-grid-vertical">
-            <div>
-                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Disabled items:</Paragraph>
-                <TabBar type="top" look="grey" selectedItem={tab} onItemSelect={setTab}>
-                    <TabBar.Item id="tab1">Active</TabBar.Item>
-                    <TabBar.Item id="tab2" disabled>Disabled</TabBar.Item>
-                    <TabBar.Item id="tab3">Another Active</TabBar.Item>
-                </TabBar>
-            </div>
-            <div>
-                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Custom colors:</Paragraph>
-                <TabBar type="top" look="grey" selectedItem={colorTab} onItemSelect={setColorTab}>
-                    <TabBar.Item id="tab1" color="#43b581">Green</TabBar.Item>
-                    <TabBar.Item id="tab2" color="#faa61a">Yellow</TabBar.Item>
-                    <TabBar.Item id="tab3" color="#f04747">Red</TabBar.Item>
-                </TabBar>
-            </div>
-            <div>
-                <Paragraph color="text-muted" style={{ marginBottom: 4 }}>Destructive variant:</Paragraph>
-                <TabBar type="side" look="grey" selectedItem={tab} onItemSelect={setTab}>
-                    <TabBar.Item id="tab1">Settings</TabBar.Item>
-                    <TabBar.Item id="logout" variant="destructive">Log Out</TabBar.Item>
-                </TabBar>
-            </div>
-        </div>
-    );
-}
-
-export default function TabBarTab() {
-    return (
-        <DocPage
-            componentName="TabBar"
-            overview="TabBar provides navigation tabs in three styles: side (vertical sidebar), top (horizontal with underline), and top-pill (horizontal pill buttons). Supports brand/grey color schemes, disabled items, custom colors, destructive variants, and section headers with separators."
-            importPath={'import { TabBar } from "../components";'}
-            sections={[
-                {
-                    title: "Side (Default)",
-                    description: "Vertical sidebar-style tabs with grey look.",
-                    children: <SideDemo />,
-                    code: `<TabBar type="side" look="grey" selectedItem={tab} onItemSelect={setTab}>
-  <TabBar.Item id="tab1">First Tab</TabBar.Item>
-  <TabBar.Item id="tab2">Second Tab</TabBar.Item>
-</TabBar>`,
-                    relevantProps: ["type", "look", "selectedItem", "onItemSelect"],
-                },
-                {
-                    title: "Top",
-                    description: "Horizontal tabs with underline indicator.",
-                    children: <TopDemo />,
-                },
-                {
-                    title: "Top Pill",
-                    description: "Pill-style horizontal tabs.",
-                    children: <TopPillDemo />,
-                },
-                {
-                    title: "Brand Look",
-                    description: "Brand-colored tab styling.",
-                    children: <BrandDemo />,
-                },
-                {
-                    title: "Headers and Separators",
-                    description: "TabBar.Header and TabBar.Separator for organizing groups of tabs.",
-                    children: <HeaderSeparatorDemo />,
-                },
-                {
-                    title: "Disabled, Colors, Destructive",
-                    description: "Items can be disabled, colored, or styled as destructive.",
-                    children: <FeaturesDemo />,
-                    relevantProps: ["disabled", "color", "variant"],
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/TextAreaTab.tsx b/src/equicordplugins/components.dev/components/tabs/TextAreaTab.tsx
deleted file mode 100644
index 954bdcefa..000000000
--- a/src/equicordplugins/components.dev/components/tabs/TextAreaTab.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaTextArea, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const TEXTAREA_PROPS: PropDef[] = [
-    { name: "value", type: "string", description: "Current textarea value (controlled)." },
-    { name: "defaultValue", type: "string", description: "Initial value (uncontrolled)." },
-    { name: "onChange", type: "(value: string, name?: string) => void", description: "Called when the text changes." },
-    { name: "placeholder", type: "string", description: "Placeholder text when empty." },
-    { name: "name", type: "string", description: "HTML name attribute for form submission." },
-    { name: "rows", type: "number", description: "Fixed number of visible text rows." },
-    { name: "autosize", type: "boolean", description: "Automatically grow height to fit content." },
-    { name: "autoFocus", type: "boolean", description: "Focus on mount." },
-    { name: "maxLength", type: "number", description: "Maximum character limit." },
-    { name: "minLength", type: "number", description: "Minimum character requirement." },
-    { name: "showCharacterCount", type: "boolean", description: "Display current character count." },
-    { name: "showRemainingCharacterCount", type: "boolean", description: "Display remaining characters instead of current count." },
-    { name: "error", type: "string | boolean", description: "Error state. String shows error message, boolean shows red border." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disable the textarea." },
-    { name: "readOnly", type: "boolean", description: "Make the textarea read-only." },
-    { name: "fullWidth", type: "boolean", description: "Expand to full available width." },
-    { name: "inputRef", type: "Ref<HTMLTextAreaElement>", internal: true, description: "Ref to the underlying textarea element." },
-];
-
-function BasicDemo() {
-    const [value, setValue] = useState("Hello world\nThis is a textarea");
-    return <ManaTextArea value={value} onChange={setValue} />;
-}
-
-function AutosizeDemo() {
-    const [value, setValue] = useState("This textarea will grow as you type more content...");
-    return <ManaTextArea value={value} onChange={setValue} autosize />;
-}
-
-function CharCountDemo() {
-    const [value, setValue] = useState("Count characters");
-    return <ManaTextArea value={value} onChange={setValue} showCharacterCount maxLength={200} />;
-}
-
-export default function TextAreaTab() {
-    return (
-        <DocPage
-            overview="ManaTextArea is Discord's multi-line text input with support for autosize, character counting, fixed row count, error states, and disabled/read-only modes."
-            importPath={'import { ManaTextArea } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Default textarea with controlled value.",
-                    children: <BasicDemo />,
-                    code: "<ManaTextArea value={value} onChange={setValue} />",
-                    relevantProps: ["value", "onChange"],
-                },
-                {
-                    title: "With Placeholder",
-                    children: (
-                        <ManaTextArea value="" onChange={() => { }} placeholder="Enter your message..." />
-                    ),
-                    relevantProps: ["placeholder"],
-                },
-                {
-                    title: "Autosize",
-                    description: "Automatically grows to fit content as you type.",
-                    children: <AutosizeDemo />,
-                    relevantProps: ["autosize"],
-                },
-                {
-                    title: "Fixed Rows",
-                    description: "Fixed height with 5 visible rows.",
-                    children: (
-                        <ManaTextArea value="Fixed 5 rows" onChange={() => { }} rows={5} />
-                    ),
-                    relevantProps: ["rows"],
-                },
-                {
-                    title: "Character Count",
-                    description: "Shows character count with a max length of 200.",
-                    children: <CharCountDemo />,
-                    relevantProps: ["showCharacterCount", "maxLength"],
-                },
-                {
-                    title: "States",
-                    description: "Disabled and read-only states.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            <ManaTextArea value="Disabled textarea" disabled />
-                            <ManaTextArea value="Read only textarea" readOnly />
-                        </div>
-                    ),
-                    relevantProps: ["disabled", "readOnly"],
-                },
-            ]}
-            props={TEXTAREA_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/TextButtonTab.tsx b/src/equicordplugins/components.dev/components/tabs/TextButtonTab.tsx
deleted file mode 100644
index aa6f25796..000000000
--- a/src/equicordplugins/components.dev/components/tabs/TextButtonTab.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaTextButton, ManaTextButtonTextVariants, ManaTextButtonVariants } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const TEXTBUTTON_PROPS: PropDef[] = [
-    { name: "text", type: "string", required: true, description: "Button label text." },
-    { name: "variant", type: '"primary" | "secondary" | "always-white" | "critical"', description: "Color variant." },
-    { name: "textVariant", type: "string", description: 'Typography variant, e.g. "text-sm/medium", "text-lg/medium".' },
-    { name: "lineClamp", type: "number", description: "Max lines before truncation with ellipsis." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disable the button." },
-    { name: "onClick", type: "(e: MouseEvent) => void", description: "Click handler." },
-    { name: "role", type: "string", description: "ARIA role attribute." },
-    { name: "type", type: '"button" | "submit" | "reset"', description: "HTML button type." },
-    { name: "buttonRef", type: "Ref<HTMLButtonElement>", internal: true, description: "Ref to the underlying button element." },
-    { name: "className", type: "string", description: "Custom CSS class." },
-    { name: "style", type: "CSSProperties", description: "Inline styles." },
-];
-
-export default function TextButtonTab() {
-    return (
-        <DocPage
-            overview="ManaTextButton is Discord's text-only button component (no background or border). Supports four color variants, typography sizing via textVariant, line clamping, and disabled state."
-            importPath={'import { ManaTextButton, ManaTextButtonVariants, ManaTextButtonTextVariants } from "../components";'}
-            sections={[
-                {
-                    title: "Variants",
-                    description: "All four color variants.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {ManaTextButtonVariants.map(variant => (
-                                <ManaTextButton key={variant} text={variant} variant={variant} />
-                            ))}
-                        </div>
-                    ),
-                    code: '<ManaTextButton text="Click me" variant="primary" />',
-                    relevantProps: ["variant"],
-                },
-                {
-                    title: "Text Variants",
-                    description: "Different typography sizes and weights.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            {ManaTextButtonTextVariants.map(textVariant => (
-                                <ManaTextButton key={textVariant} text={textVariant} textVariant={textVariant} />
-                            ))}
-                        </div>
-                    ),
-                    relevantProps: ["textVariant"],
-                },
-                {
-                    title: "States",
-                    description: "Normal and disabled states.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <ManaTextButton text="Normal" />
-                            <ManaTextButton text="Disabled" disabled />
-                        </div>
-                    ),
-                    relevantProps: ["disabled"],
-                },
-                {
-                    title: "Line Clamp",
-                    description: "Truncate long text to a single line.",
-                    children: (
-                        <div style={{ maxWidth: 200 }}>
-                            <ManaTextButton text="This is a very long text that should be clamped to one line" lineClamp={1} />
-                        </div>
-                    ),
-                    relevantProps: ["lineClamp"],
-                },
-            ]}
-            props={TEXTBUTTON_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/TextInputTab.tsx b/src/equicordplugins/components.dev/components/tabs/TextInputTab.tsx
deleted file mode 100644
index 478b27795..000000000
--- a/src/equicordplugins/components.dev/components/tabs/TextInputTab.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaTextInput, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const TEXTINPUT_PROPS: PropDef[] = [
-    { name: "value", type: "string", description: "Current input value (controlled)." },
-    { name: "defaultValue", type: "string", description: "Initial value (uncontrolled)." },
-    { name: "onChange", type: "(value: string, name?: string) => void", description: "Called when the input value changes." },
-    { name: "placeholder", type: "string", description: "Placeholder text when empty." },
-    { name: "name", type: "string", description: "HTML name attribute for form submission." },
-    { name: "type", type: '"text" | "password" | "email" | "number" | "search" | "tel" | "url"', default: '"text"', description: "Input type." },
-    { name: "size", type: '"sm" | "md"', default: '"md"', description: "Input size variant." },
-    { name: "clearable", type: "boolean | { show: boolean }", description: "Show a clear button when the input has a value." },
-    { name: "showCharacterCount", type: "boolean", description: "Display current character count." },
-    { name: "maxLength", type: "number", description: "Maximum character limit." },
-    { name: "minLength", type: "number", description: "Minimum character requirement." },
-    { name: "error", type: "string | boolean", description: "Error state. String shows error message, boolean shows red border." },
-    { name: "disabled", type: "boolean", default: "false", description: "Disable the input." },
-    { name: "readOnly", type: "boolean", description: "Make the input read-only." },
-    { name: "fullWidth", type: "boolean", description: "Expand to full available width." },
-    { name: "leading", type: "TextInputLeadingAccessory", description: "Leading accessory (icon, button, tags, or image)." },
-    { name: "trailing", type: "TextInputTrailingAccessory", description: "Trailing accessory (icon or button)." },
-    { name: "inputRef", type: "Ref<HTMLInputElement>", internal: true, description: "Ref to the underlying input element." },
-];
-
-function BasicDemo() {
-    const [value, setValue] = useState("Hello world");
-    return <ManaTextInput value={value} onChange={setValue} />;
-}
-
-function SizesDemo() {
-    const [sm, setSm] = useState("Small");
-    const [md, setMd] = useState("Medium");
-    return (
-        <div className="vc-compfinder-grid-vertical">
-            <ManaTextInput value={sm} onChange={setSm} size="sm" placeholder="Size: sm" />
-            <ManaTextInput value={md} onChange={setMd} size="md" placeholder="Size: md" />
-        </div>
-    );
-}
-
-function ClearableDemo() {
-    const [value, setValue] = useState("Clear me");
-    return <ManaTextInput value={value} onChange={setValue} clearable />;
-}
-
-function CharCountDemo() {
-    const [value, setValue] = useState("Count chars");
-    return <ManaTextInput value={value} onChange={setValue} showCharacterCount maxLength={50} />;
-}
-
-function ErrorDemo() {
-    const [value, setValue] = useState("Invalid input");
-    return <ManaTextInput value={value} onChange={setValue} error />;
-}
-
-export default function TextInputTab() {
-    return (
-        <DocPage
-            overview="ManaTextInput is Discord's single-line text input with support for two sizes, clearable button, character counting, error states, leading/trailing accessories, and disabled/read-only modes."
-            importPath={'import { ManaTextInput } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "Default text input with controlled value.",
-                    children: <BasicDemo />,
-                    code: "<ManaTextInput value={value} onChange={setValue} />",
-                    relevantProps: ["value", "onChange"],
-                },
-                {
-                    title: "Sizes",
-                    description: "Available in sm and md (default) sizes.",
-                    children: <SizesDemo />,
-                    relevantProps: ["size"],
-                },
-                {
-                    title: "With Placeholder",
-                    children: (
-                        <ManaTextInput value="" onChange={() => { }} placeholder="Enter text here..." />
-                    ),
-                    relevantProps: ["placeholder"],
-                },
-                {
-                    title: "Clearable",
-                    description: "Shows a clear button when the input has a value.",
-                    children: <ClearableDemo />,
-                    relevantProps: ["clearable"],
-                },
-                {
-                    title: "Character Count",
-                    description: "Displays character count with a 50-character max.",
-                    children: <CharCountDemo />,
-                    relevantProps: ["showCharacterCount", "maxLength"],
-                },
-                {
-                    title: "Error State",
-                    description: "Red border indicating invalid input.",
-                    children: <ErrorDemo />,
-                    relevantProps: ["error"],
-                },
-                {
-                    title: "States",
-                    description: "Disabled and read-only states.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            <ManaTextInput value="Disabled" disabled />
-                            <ManaTextInput value="Read only" readOnly />
-                        </div>
-                    ),
-                    relevantProps: ["disabled", "readOnly"],
-                },
-            ]}
-            props={TEXTINPUT_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/TimestampTab.tsx b/src/equicordplugins/components.dev/components/tabs/TimestampTab.tsx
deleted file mode 100644
index 5804f7e15..000000000
--- a/src/equicordplugins/components.dev/components/tabs/TimestampTab.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Paragraph, Timestamp, TimestampDisplayFormats, TooltipPositions } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const TIMESTAMP_PROPS: PropDef[] = [
-    { name: "timestamp", type: "Date | Moment", required: true, description: "The date or moment object to display." },
-    { name: "timestampFormat", type: "TimestampDisplayFormat", description: 'Moment.js format string. One of: "LT", "LTS", "L", "LL", "LLL", "LLLL", "l", "ll", "lll", "llll".' },
-    { name: "compact", type: "boolean", default: "false", description: "Use a shorter display style." },
-    { name: "cozyAlt", type: "boolean", default: "false", description: "Use the cozy alternative layout." },
-    { name: "isInline", type: "boolean", default: "false", description: "Render the timestamp inline." },
-    { name: "isVisibleOnlyOnHover", type: "boolean", default: "false", description: "Hide the timestamp until the parent is hovered." },
-    { name: "isEdited", type: "boolean", default: "false", description: 'Show an "(edited)" indicator after the timestamp.' },
-    { name: "tooltipPosition", type: '"top" | "bottom" | "left" | "right"', description: "Position of the full-date tooltip." },
-    { name: "id", type: "string", description: "HTML id attribute." },
-    { name: "className", type: "string", description: "Additional CSS class." },
-    { name: "children", type: "ReactNode", description: "Custom content to render instead of the formatted timestamp." },
-];
-
-export default function TimestampTab() {
-    const now = new Date();
-
-    return (
-        <DocPage
-            componentName="Timestamp"
-            overview="Timestamp renders a formatted date with a tooltip showing the full date. Supports moment.js format strings, compact mode, inline rendering, edited indicators, and hover-only visibility."
-            importPath={'import { Timestamp, TimestampDisplayFormats } from "../components";'}
-            sections={[
-                {
-                    title: "Formats",
-                    description: "All available timestamp display formats using moment.js format strings.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {TimestampDisplayFormats.map(({ format, description }) => (
-                                <div key={format} style={{ padding: 12, display: "flex", flexDirection: "column", gap: 4 }}>
-                                    <Timestamp timestamp={now} timestampFormat={format} />
-                                    <Paragraph color="text-muted" style={{ fontSize: 10 }}>
-                                        {format}: {description}
-                                    </Paragraph>
-                                </div>
-                            ))}
-                        </div>
-                    ),
-                    code: '<Timestamp timestamp={new Date()} timestampFormat="LLL" />',
-                    relevantProps: ["timestamp", "timestampFormat"],
-                },
-                {
-                    title: "Compact Mode",
-                    description: "Compact mode shows a shorter version of the timestamp.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <div style={{ padding: 12 }}>
-                                <Timestamp timestamp={now} compact={false} />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                    compact=false (default)
-                                </Paragraph>
-                            </div>
-                            <div style={{ padding: 12 }}>
-                                <Timestamp timestamp={now} compact={true} />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                    compact=true
-                                </Paragraph>
-                            </div>
-                        </div>
-                    ),
-                    relevantProps: ["compact"],
-                },
-                {
-                    title: "Display Variants",
-                    description: "Inline and cozy alternative display modes.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <div style={{ padding: 12 }}>
-                                <Timestamp timestamp={now} isInline={false} />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                    isInline=false (default)
-                                </Paragraph>
-                            </div>
-                            <div style={{ padding: 12 }}>
-                                <Timestamp timestamp={now} isInline={true} />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                    isInline=true
-                                </Paragraph>
-                            </div>
-                            <div style={{ padding: 12 }}>
-                                <Timestamp timestamp={now} cozyAlt={true} />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                    cozyAlt=true
-                                </Paragraph>
-                            </div>
-                        </div>
-                    ),
-                    relevantProps: ["isInline", "cozyAlt"],
-                },
-                {
-                    title: "Edited Indicator",
-                    description: 'Shows an "(edited)" indicator after the timestamp.',
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <div style={{ padding: 12 }}>
-                                <Timestamp timestamp={now} isEdited={false} />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                    isEdited=false (default)
-                                </Paragraph>
-                            </div>
-                            <div style={{ padding: 12 }}>
-                                <Timestamp timestamp={now} isEdited={true} />
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                    isEdited=true
-                                </Paragraph>
-                            </div>
-                        </div>
-                    ),
-                    relevantProps: ["isEdited"],
-                },
-                {
-                    title: "Visibility on Hover",
-                    description: "Timestamp can be hidden until the parent element is hovered.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <div style={{ padding: 12 }}>
-                                <span style={{ padding: 8, background: "var(--background-secondary)", borderRadius: 4 }}>
-                                    Hover me: <Timestamp timestamp={now} isVisibleOnlyOnHover={true} />
-                                </span>
-                                <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                    isVisibleOnlyOnHover=true
-                                </Paragraph>
-                            </div>
-                        </div>
-                    ),
-                    relevantProps: ["isVisibleOnlyOnHover"],
-                },
-                {
-                    title: "Tooltip Positions",
-                    description: "The tooltip showing the full date can be positioned on any side.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {TooltipPositions.map(position => (
-                                <div key={position} style={{ padding: 12 }}>
-                                    <Timestamp timestamp={now} tooltipPosition={position} />
-                                    <Paragraph color="text-muted" style={{ fontSize: 10, marginTop: 4 }}>
-                                        tooltipPosition="{position}"
-                                    </Paragraph>
-                                </div>
-                            ))}
-                        </div>
-                    ),
-                    relevantProps: ["tooltipPosition"],
-                },
-            ]}
-            props={TIMESTAMP_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/ToastTab.tsx b/src/equicordplugins/components.dev/components/tabs/ToastTab.tsx
deleted file mode 100644
index 8c187fe3e..000000000
--- a/src/equicordplugins/components.dev/components/tabs/ToastTab.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaButton, Paragraph, showToast, Toasts, ToastType, type ToastTypeValue } from "..";
-import { DocPage, type PropGroup } from "../DocPage";
-
-const TOAST_TYPES: { type: ToastTypeValue; label: string; description: string; }[] = [
-    { type: ToastType.MESSAGE, label: "MESSAGE", description: "Default message toast." },
-    { type: ToastType.SUCCESS, label: "SUCCESS", description: "Green success toast." },
-    { type: ToastType.FAILURE, label: "FAILURE", description: "Red failure/error toast." },
-    { type: ToastType.CLIP, label: "CLIP", description: "Clip/copy toast." },
-    { type: ToastType.LINK, label: "LINK", description: "Link copied toast." },
-    { type: ToastType.FORWARD, label: "FORWARD", description: "Forward action toast." },
-    { type: ToastType.BOOKMARK, label: "BOOKMARK", description: "Bookmark action toast." },
-    { type: ToastType.CLOCK, label: "CLOCK", description: "Clock/timer toast." },
-];
-
-const PROP_GROUPS: PropGroup[] = [
-    {
-        title: "showToast(message, type)",
-        props: [
-            { name: "message", type: "string", required: true, description: "Toast message text." },
-            { name: "type", type: "ToastTypeValue", default: '"message"', description: "Toast type from ToastType." },
-        ],
-    },
-    {
-        title: "Toasts.create(message, type, options)",
-        props: [
-            { name: "message", type: "string", required: true, description: "Toast message text." },
-            { name: "type", type: "ToastTypeValue", required: true, description: "Toast type from ToastType." },
-            { name: "options.duration", type: "number", description: "Display time in milliseconds." },
-            { name: "options.position", type: "0 | 1", description: "Toast position. 0 = TOP, 1 = BOTTOM." },
-            { name: "options.component", type: "ReactNode", description: "Custom React content for CUSTOM type toasts." },
-        ],
-    },
-    {
-        title: "ToastType",
-        props: [
-            { name: "MESSAGE", type: '"message"', description: "Default message style." },
-            { name: "SUCCESS", type: '"success"', description: "Green checkmark icon." },
-            { name: "FAILURE", type: '"failure"', description: "Red X icon." },
-            { name: "CUSTOM", type: '"custom"', description: "Custom component content." },
-            { name: "CLIP", type: '"clip"', description: "Clip/scissors icon." },
-            { name: "LINK", type: '"link"', description: "Link icon." },
-            { name: "FORWARD", type: '"forward"', description: "Forward arrow icon." },
-            { name: "BOOKMARK", type: '"bookmark"', description: "Bookmark icon." },
-            { name: "CLOCK", type: '"clock"', description: "Clock icon." },
-        ],
-    },
-];
-
-export default function ToastTab() {
-    return (
-        <DocPage
-            componentName="Toasts"
-            overview="Toasts are brief notification messages that appear at screen edges. Use showToast for quick one-liners, or Toasts.create + Toasts.show for full control over duration, position, and custom content. Toasts.pop removes the most recent toast."
-            notices={[
-                { type: "info", children: "Use showToast() for quick one-liners. Use Toasts.create() + Toasts.show() when you need custom duration, position, or component content." },
-            ]}
-            importPath={'import { showToast, Toasts, ToastType } from "../components";'}
-            sections={[
-                {
-                    title: "All Types",
-                    description: "Click any button to show that toast type.",
-                    children: (
-                        <div className="vc-compfinder-grid" style={{ gap: 8 }}>
-                            {TOAST_TYPES.map(({ type, label, description }) => (
-                                <div key={label} style={{ display: "flex", flexDirection: "column", gap: 4 }}>
-                                    <ManaButton
-                                        variant="secondary"
-                                        text={label}
-                                        onClick={() => showToast(`This is a ${label} toast!`, type)}
-                                    />
-                                    <Paragraph color="text-muted" style={{ fontSize: 10 }}>
-                                        {description}
-                                    </Paragraph>
-                                </div>
-                            ))}
-                        </div>
-                    ),
-                    code: 'showToast("Copied to clipboard!", ToastType.SUCCESS);',
-                },
-                {
-                    title: "Simple Usage",
-                    description: "showToast is the quickest way to show a toast. It creates and shows a toast in one call.",
-                    children: (
-                        <ManaButton
-                            variant="primary"
-                            text="Show Simple Toast"
-                            onClick={() => showToast("Hello from showToast!", ToastType.SUCCESS)}
-                        />
-                    ),
-                    code: 'showToast("Hello from showToast!", ToastType.SUCCESS);',
-                },
-                {
-                    title: "Advanced Usage",
-                    description: "Use Toasts.create to build a toast with custom duration, position, or component content, then Toasts.show to display it.",
-                    children: (
-                        <div className="vc-compfinder-grid" style={{ gap: 8 }}>
-                            <ManaButton
-                                variant="secondary"
-                                text="5s Duration Toast"
-                                onClick={() => {
-                                    const toast = Toasts.create("This lasts 5 seconds", ToastType.SUCCESS, { duration: 5000 });
-                                    Toasts.show(toast);
-                                }}
-                            />
-                            <ManaButton
-                                variant="secondary"
-                                text="Bottom Position Toast"
-                                onClick={() => {
-                                    const toast = Toasts.create("Bottom toast", ToastType.MESSAGE, { position: Toasts.Position.BOTTOM });
-                                    Toasts.show(toast);
-                                }}
-                            />
-                            <ManaButton
-                                variant="secondary"
-                                text="Custom Component Toast"
-                                onClick={() => {
-                                    const toast = Toasts.create("Custom", ToastType.CUSTOM, {
-                                        component: <span style={{ color: "var(--text-brand)" }}>Custom JSX content!</span>,
-                                    });
-                                    Toasts.show(toast);
-                                }}
-                            />
-                        </div>
-                    ),
-                    code: `const toast = Toasts.create("Done!", ToastType.SUCCESS, {
-    duration: 5000,
-    position: Toasts.Position.BOTTOM,
-});
-Toasts.show(toast);`,
-                },
-                {
-                    title: "Pop Toast",
-                    description: "Toasts.pop removes the most recent toast from the stack.",
-                    children: (
-                        <ManaButton
-                            variant="critical-secondary"
-                            text="Pop Last Toast"
-                            onClick={() => Toasts.pop()}
-                        />
-                    ),
-                    code: "Toasts.pop();",
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/TooltipTab.tsx b/src/equicordplugins/components.dev/components/tabs/TooltipTab.tsx
deleted file mode 100644
index 42a8f50df..000000000
--- a/src/equicordplugins/components.dev/components/tabs/TooltipTab.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { ManaButton, ManaTooltip, Paragraph, TooltipColors, TooltipPositions } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const TOOLTIP_PROPS: PropDef[] = [
-    { name: "text", type: "string | (() => ReactNode)", required: true, description: "Tooltip content. Can be a string or a render function for rich content." },
-    { name: "children", type: "(props) => ReactNode", required: true, description: "Render function that receives props to spread on the trigger element." },
-    { name: "position", type: '"top" | "bottom" | "left" | "right"', default: '"top"', description: "Which side of the trigger the tooltip appears on." },
-    { name: "align", type: '"start" | "center" | "end"', default: '"center"', description: "Alignment along the tooltip edge." },
-    { name: "color", type: '"primary" | "grey" | "brand" | "green" | "red"', default: '"primary"', description: "Tooltip background color." },
-    { name: "spacing", type: "number", default: "8", description: "Gap in pixels between the trigger and tooltip." },
-    { name: "delay", type: "number", description: "Delay in milliseconds before the tooltip appears." },
-    { name: "hideOnClick", type: "boolean", default: "true", description: "Hide the tooltip when the trigger is clicked." },
-    { name: "forceOpen", type: "boolean", description: "Force the tooltip to stay open." },
-    { name: "shouldShow", type: "boolean", description: "Externally control whether the tooltip is shown." },
-    { name: "allowOverflow", type: "boolean", description: "Allow the tooltip to overflow its container." },
-    { name: "overflowOnly", type: "boolean", description: "Only show the tooltip when the trigger text is overflowing." },
-    { name: "tooltipClassName", type: "string", description: "CSS class for the tooltip container." },
-    { name: "tooltipStyle", type: "CSSProperties", description: "Inline styles for the tooltip container." },
-    { name: "tooltipContentClassName", type: "string", description: "CSS class for the tooltip content." },
-    { name: "tooltipPointerClassName", type: "string", description: "CSS class for the tooltip arrow pointer." },
-    { name: "positionKeyStemOverride", type: "string", internal: true, description: "Override the position key stem used for animation keying." },
-    { name: "clickableOnMobile", type: "boolean", description: "Make the tooltip trigger clickable on mobile devices." },
-    { name: "disableTooltipPointerEvents", type: "boolean", description: "Disable pointer events on the tooltip overlay." },
-    { name: "targetElementRef", type: "RefObject<HTMLElement>", description: "Ref to an external element to position the tooltip against." },
-    { name: "onTooltipShow", type: "() => void", description: "Callback when the tooltip becomes visible." },
-    { name: "onTooltipHide", type: "() => void", description: "Callback when the tooltip is hidden." },
-    { name: "onAnimationRest", type: "() => void", description: "Callback when the tooltip show/hide animation completes." },
-    { name: "aria-label", type: "string | false", description: "Accessibility label. Set to false to disable." },
-];
-
-export default function TooltipTab() {
-    return (
-        <DocPage
-            componentName="ManaTooltip"
-            overview="ManaTooltip displays contextual information on hover via a render-props pattern. Supports positioning on all four sides, five color variants, configurable delay, and click-to-hide behavior. The children prop receives props that must be spread on the trigger element."
-            notices={[
-                { type: "info", children: "ManaTooltip uses a render-props pattern. The children function receives props that must be spread onto the trigger element for hover detection to work." },
-            ]}
-            importPath={'import { ManaTooltip, TooltipPositions, TooltipColors } from "../components";'}
-            sections={[
-                {
-                    title: "Positions",
-                    description: "Tooltip can appear on any side of the trigger element.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {TooltipPositions.map(position => (
-                                <ManaTooltip key={position} text={`Tooltip on ${position}`} position={position}>
-                                    {props => (
-                                        <ManaButton {...props} variant="secondary" text={position} />
-                                    )}
-                                </ManaTooltip>
-                            ))}
-                        </div>
-                    ),
-                    code: `<ManaTooltip text="Tooltip on top" position="top">
-    {props => <ManaButton {...props} variant="secondary" text="Hover me" />}
-</ManaTooltip>`,
-                    relevantProps: ["position"],
-                },
-                {
-                    title: "Colors",
-                    description: "Five background color variants.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            {TooltipColors.map(color => (
-                                <ManaTooltip key={color} text={`${color} tooltip`} color={color}>
-                                    {props => (
-                                        <ManaButton {...props} variant="secondary" text={color} />
-                                    )}
-                                </ManaTooltip>
-                            ))}
-                        </div>
-                    ),
-                    code: '<ManaTooltip text="Branded" color="brand">\n    {props => <ManaButton {...props} variant="secondary" text="Brand" />}\n</ManaTooltip>',
-                    relevantProps: ["color"],
-                },
-                {
-                    title: "Delay",
-                    description: "Configure how long to wait before showing the tooltip.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <ManaTooltip text="No delay" delay={0}>
-                                {props => (
-                                    <ManaButton {...props} variant="secondary" text="No delay" />
-                                )}
-                            </ManaTooltip>
-                            <ManaTooltip text="500ms delay" delay={500}>
-                                {props => (
-                                    <ManaButton {...props} variant="secondary" text="500ms delay" />
-                                )}
-                            </ManaTooltip>
-                            <ManaTooltip text="1000ms delay" delay={1000}>
-                                {props => (
-                                    <ManaButton {...props} variant="secondary" text="1s delay" />
-                                )}
-                            </ManaTooltip>
-                        </div>
-                    ),
-                    relevantProps: ["delay"],
-                },
-                {
-                    title: "Hide on Click",
-                    description: "By default tooltips hide when the trigger is clicked. Set hideOnClick=false to keep them visible.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <ManaTooltip text="Hides when clicked" hideOnClick>
-                                {props => (
-                                    <ManaButton {...props} variant="secondary" text="hideOnClick=true" />
-                                )}
-                            </ManaTooltip>
-                            <ManaTooltip text="Stays visible when clicked" hideOnClick={false}>
-                                {props => (
-                                    <ManaButton {...props} variant="secondary" text="hideOnClick=false" />
-                                )}
-                            </ManaTooltip>
-                        </div>
-                    ),
-                    relevantProps: ["hideOnClick"],
-                },
-                {
-                    title: "Rich Content",
-                    description: "The text prop accepts a function that returns JSX for rich tooltip content.",
-                    children: (
-                        <div className="vc-compfinder-grid">
-                            <ManaTooltip text={() => (
-                                <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
-                                    <Paragraph color="text-default" style={{ fontWeight: 600 }}>Rich Tooltip</Paragraph>
-                                    <Paragraph color="text-muted" style={{ fontSize: 12 }}>With multiple lines of content.</Paragraph>
-                                </div>
-                            )}>
-                                {props => (
-                                    <ManaButton {...props} variant="secondary" text="Rich content" />
-                                )}
-                            </ManaTooltip>
-                        </div>
-                    ),
-                    code: `<ManaTooltip text={() => (
-    <div>
-        <strong>Title</strong>
-        <p>Description text</p>
-    </div>
-)}>
-    {props => <ManaButton {...props} text="Hover me" />}
-</ManaTooltip>`,
-                    relevantProps: ["text"],
-                },
-            ]}
-            props={TOOLTIP_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/TypographyTab.tsx b/src/equicordplugins/components.dev/components/tabs/TypographyTab.tsx
deleted file mode 100644
index 2a7acead9..000000000
--- a/src/equicordplugins/components.dev/components/tabs/TypographyTab.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { CodeColors, FontSizeMap, Paragraph, TextColors, TextSizes, TextWeights } from "..";
-import { DocPage, type PropGroup } from "../DocPage";
-
-const PROP_GROUPS: PropGroup[] = [
-    {
-        title: "Text Colors",
-        props: TextColors.map(color => ({
-            name: color,
-            type: "CSS variable",
-            description: `var(--${color})`,
-        })),
-    },
-    {
-        title: "Text Sizes",
-        props: TextSizes.map(({ name, value, pixels }) => ({
-            name,
-            type: "font-size",
-            description: `${value} (${pixels}).`,
-        })),
-    },
-    {
-        title: "Text Weights",
-        props: TextWeights.map(({ name, value }) => ({
-            name,
-            type: "font-weight",
-            description: `font-weight: ${value}.`,
-        })),
-    },
-    {
-        title: "Code Colors",
-        props: CodeColors.map(color => ({
-            name: color,
-            type: "CSS variable",
-            description: `var(--${color})`,
-        })),
-    },
-];
-
-export default function TypographyTab() {
-    return (
-        <DocPage
-            componentName="Typography Reference"
-            overview="Typography reference for Discord's design system CSS variables. Shows all available text colors, sizes, weights, and code syntax colors. Use these with the Paragraph, DiscordHeading, and DiscordText components."
-            importPath={'import { TextColors, TextSizes, TextWeights, CodeColors, FontSizeMap } from "../components";'}
-            sections={[
-                {
-                    title: "Text Colors",
-                    description: "All available text color CSS variables. Use these as the color prop on Paragraph and DiscordText.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            {TextColors.map(color => (
-                                <div key={color} style={{ display: "flex", alignItems: "center", gap: 16 }}>
-                                    <span style={{ color: `var(--${color})`, minWidth: 200 }}>
-                                        {color}
-                                    </span>
-                                    <code style={{ color: "var(--text-muted)", fontSize: "0.75rem" }}>
-                                        var(--{color})
-                                    </code>
-                                </div>
-                            ))}
-                        </div>
-                    ),
-                    code: '<Paragraph color="text-muted">Muted text</Paragraph>',
-                },
-                {
-                    title: "Text Sizes",
-                    description: "Font sizes from xxs (10px) to xxl (32px).",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            {TextSizes.map(({ name, value, pixels }) => (
-                                <div key={name} style={{ display: "flex", alignItems: "baseline", gap: 16 }}>
-                                    <span style={{ fontSize: FontSizeMap[name], minWidth: 200 }}>
-                                        {name}
-                                    </span>
-                                    <code style={{ color: "var(--text-muted)", fontSize: "0.75rem" }}>
-                                        {value} ({pixels})
-                                    </code>
-                                </div>
-                            ))}
-                        </div>
-                    ),
-                },
-                {
-                    title: "Text Weights",
-                    description: "Font weights from thin (100) to extrabold (800).",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            {TextWeights.map(({ name, value }) => (
-                                <div key={name} style={{ display: "flex", alignItems: "center", gap: 16 }}>
-                                    <span style={{ fontWeight: Number(value), minWidth: 200 }}>
-                                        {name}
-                                    </span>
-                                    <code style={{ color: "var(--text-muted)", fontSize: "0.75rem" }}>
-                                        font-weight: {value}
-                                    </code>
-                                </div>
-                            ))}
-                        </div>
-                    ),
-                },
-                {
-                    title: "Code Colors",
-                    description: "Syntax highlighting colors for code blocks.",
-                    children: (
-                        <div className="vc-compfinder-grid-vertical">
-                            {CodeColors.map(color => (
-                                <div key={color} style={{ display: "flex", alignItems: "center", gap: 16 }}>
-                                    <span style={{ color: `var(--${color})`, minWidth: 200, fontFamily: "monospace" }}>
-                                        {color}
-                                    </span>
-                                    <code style={{ color: "var(--text-muted)", fontSize: "0.75rem" }}>
-                                        var(--{color})
-                                    </code>
-                                </div>
-                            ))}
-                        </div>
-                    ),
-                },
-                {
-                    title: "Usage with Components",
-                    description: "These values are used with Paragraph, DiscordHeading, and DiscordText. See those tabs for component-specific documentation.",
-                    children: (
-                        <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
-                            <Paragraph color="text-default">text-default: Primary readable text.</Paragraph>
-                            <Paragraph color="text-muted">text-muted: Secondary, less prominent text.</Paragraph>
-                            <Paragraph color="text-link">text-link: Clickable link text.</Paragraph>
-                            <Paragraph color="text-brand">text-brand: Brand-colored text.</Paragraph>
-                        </div>
-                    ),
-                    code: `<Paragraph color="text-muted">Muted text</Paragraph>
-<DiscordText variant="text-md/semibold" color="text-brand">Brand text</DiscordText>
-<DiscordHeading variant="heading-lg/bold">Bold heading</DiscordHeading>`,
-                },
-            ]}
-            props={PROP_GROUPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/components/tabs/UserSummaryItemTab.tsx b/src/equicordplugins/components.dev/components/tabs/UserSummaryItemTab.tsx
deleted file mode 100644
index 597ec004d..000000000
--- a/src/equicordplugins/components.dev/components/tabs/UserSummaryItemTab.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Paragraph, UserStore, UserSummaryItem, useState } from "..";
-import { DocPage, type PropDef } from "../DocPage";
-
-const USER_SUMMARY_PROPS: PropDef[] = [
-    { name: "users", type: "(User | null)[]", required: true, description: "Array of User objects to display as avatars. Null entries render as empty slots." },
-    { name: "max", type: "number", default: "10", description: "Maximum number of avatars to show before the overflow indicator." },
-    { name: "count", type: "number", description: 'Override the count used in the "+N" overflow display.' },
-    { name: "size", type: "16 | 24 | 32 | 56", default: "24", description: "Avatar size in pixels." },
-    { name: "guildId", type: "string", description: "Guild context for server-specific avatars." },
-    { name: "showUserPopout", type: "boolean", default: "false", description: "Show user popout when an avatar is clicked." },
-    { name: "showDefaultAvatarsForNullUsers", type: "boolean", description: "Render default avatars for null entries in the users array." },
-    { name: "renderUser", type: "(user, isLast, index) => ReactNode", description: "Custom render function for each user avatar." },
-    { name: "renderMoreUsers", type: "(text, count) => ReactNode", description: 'Custom render function for the "+N" overflow indicator.' },
-    { name: "renderIcon", type: "boolean", description: "Whether to render an icon." },
-    { name: "renderLeadingIcon", type: "(className) => ReactNode", description: "Render a leading icon before the user avatars." },
-    { name: "dimEmptyUsers", type: "boolean", description: "Dim null user slots." },
-    { name: "hideMoreUsers", type: "boolean", default: "false", description: 'Hide the "+N" overflow count.' },
-    { name: "useFallbackUserForPopout", type: "boolean", description: "Use fallback user data for popout when user data is unavailable." },
-    { name: "extraDetail", type: "ReactNode", description: "Additional content rendered after the avatars." },
-    { name: "className", type: "string", description: "CSS class for the container." },
-];
-
-function MaxUsersDemo() {
-    const currentUser = UserStore.getCurrentUser();
-    const users = currentUser ? Array(5).fill(currentUser) : [];
-
-    return (
-        <div style={{ display: "flex", flexDirection: "column", gap: 12 }}>
-            {[2, 3, 5].map(max => (
-                <div key={max} style={{ display: "flex", alignItems: "center", gap: 16 }}>
-                    <Paragraph color="text-muted" style={{ width: 80 }}>max={max}:</Paragraph>
-                    <UserSummaryItem users={users} max={max} />
-                </div>
-            ))}
-        </div>
-    );
-}
-
-function SizesDemo() {
-    const currentUser = UserStore.getCurrentUser();
-    const users = currentUser ? Array(5).fill(currentUser) : [];
-
-    return (
-        <div style={{ display: "flex", flexDirection: "column", gap: 16 }}>
-            {([16, 24, 32, 56] as const).map(size => (
-                <div key={size} style={{ display: "flex", alignItems: "center", gap: 16 }}>
-                    <Paragraph color="text-muted" style={{ width: 50 }}>{size}:</Paragraph>
-                    <UserSummaryItem users={users} max={4} size={size} />
-                </div>
-            ))}
-        </div>
-    );
-}
-
-function OverrideCountDemo() {
-    const currentUser = UserStore.getCurrentUser();
-    const users = currentUser ? Array(3).fill(currentUser) : [];
-    const [count, setCount] = useState(42);
-
-    return (
-        <div style={{ display: "flex", flexDirection: "column", gap: 12 }}>
-            <div style={{ display: "flex", alignItems: "center", gap: 16 }}>
-                <Paragraph color="text-muted" style={{ width: 120 }}>Default count:</Paragraph>
-                <UserSummaryItem users={users} max={2} />
-            </div>
-            <div style={{ display: "flex", alignItems: "center", gap: 16 }}>
-                <Paragraph color="text-muted" style={{ width: 120 }}>count={count}:</Paragraph>
-                <UserSummaryItem users={users} max={2} count={count} />
-            </div>
-        </div>
-    );
-}
-
-export default function UserSummaryItemTab() {
-    const currentUser = UserStore.getCurrentUser();
-    const users = currentUser ? Array(5).fill(currentUser) : [];
-
-    return (
-        <DocPage
-            componentName="UserSummaryItem"
-            overview="UserSummaryItem displays a row of user avatars with an overflow indicator. Supports four sizes, configurable max visible count, user popout on click, and custom render functions for both avatars and the overflow indicator."
-            importPath={'import { UserSummaryItem, UserStore } from "../components";'}
-            sections={[
-                {
-                    title: "Basic",
-                    description: "A simple row of user avatars with overflow.",
-                    children: (
-                        <UserSummaryItem users={users} max={3} />
-                    ),
-                    code: `const users = [user1, user2, user3, user4, user5];
-<UserSummaryItem users={users} max={3} />`,
-                    relevantProps: ["users", "max"],
-                },
-                {
-                    title: "Sizes",
-                    description: "Four avatar sizes: 16, 24, 32, and 56 pixels.",
-                    children: <SizesDemo />,
-                    code: "<UserSummaryItem users={users} max={4} size={32} />",
-                    relevantProps: ["size"],
-                },
-                {
-                    title: "Max Users",
-                    description: "Control how many avatars are visible before the overflow count.",
-                    children: <MaxUsersDemo />,
-                    relevantProps: ["max"],
-                },
-                {
-                    title: "Override Count",
-                    description: 'The count prop overrides the number shown in the "+N" indicator, useful when the total is different from users.length.',
-                    children: <OverrideCountDemo />,
-                    relevantProps: ["count"],
-                },
-                {
-                    title: "User Popout",
-                    description: "Enable user popout on avatar click with showUserPopout.",
-                    children: (
-                        <UserSummaryItem users={users} max={3} showUserPopout />
-                    ),
-                    code: "<UserSummaryItem users={users} max={3} showUserPopout />",
-                    relevantProps: ["showUserPopout"],
-                },
-                {
-                    title: "Hide Overflow",
-                    description: 'Hide the "+N" overflow indicator entirely.',
-                    children: (
-                        <div style={{ display: "flex", flexDirection: "column", gap: 12 }}>
-                            <div style={{ display: "flex", alignItems: "center", gap: 16 }}>
-                                <Paragraph color="text-muted" style={{ width: 150 }}>hideMoreUsers=false:</Paragraph>
-                                <UserSummaryItem users={users} max={3} />
-                            </div>
-                            <div style={{ display: "flex", alignItems: "center", gap: 16 }}>
-                                <Paragraph color="text-muted" style={{ width: 150 }}>hideMoreUsers=true:</Paragraph>
-                                <UserSummaryItem users={users} max={3} hideMoreUsers />
-                            </div>
-                        </div>
-                    ),
-                    relevantProps: ["hideMoreUsers"],
-                },
-            ]}
-            props={USER_SUMMARY_PROPS}
-        />
-    );
-}
diff --git a/src/equicordplugins/components.dev/constants.ts b/src/equicordplugins/components.dev/constants.ts
deleted file mode 100644
index faad5dda5..000000000
--- a/src/equicordplugins/components.dev/constants.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export const ManaButtonVariants = ["primary", "secondary", "critical-primary", "critical-secondary", "active", "overlay-primary", "overlay-secondary", "expressive"] as const;
-export type ManaButtonVariant = typeof ManaButtonVariants[number];
-
-export const ManaButtonSizes = ["xs", "sm", "md"] as const;
-export type ManaButtonSize = typeof ManaButtonSizes[number];
-
-export const ManaTextButtonVariants = ["primary", "secondary", "always-white", "critical"] as const;
-export type ManaTextButtonVariant = typeof ManaTextButtonVariants[number];
-
-export const AvatarSizes = ["SIZE_16", "SIZE_20", "SIZE_24", "SIZE_32", "SIZE_40", "SIZE_44", "SIZE_48", "SIZE_56", "SIZE_72", "SIZE_80", "SIZE_96", "SIZE_120", "SIZE_152"] as const;
-export type AvatarSize = typeof AvatarSizes[number];
-
-export const AvatarStatuses = ["online", "idle", "dnd", "offline", "streaming"] as const;
-export type AvatarStatus = typeof AvatarStatuses[number];
-
-export const GuildIconSizes = [16, 20, 24, 32, 40, 48, 56, 80, 96] as const;
-export type GuildIconSize = typeof GuildIconSizes[number];
-
-export const CardVariants = ["primary", "warning", "danger", "success", "brand"] as const;
-export type CardVariant = typeof CardVariants[number];
-
-export const SpinnerTypes = ["wanderingCubes", "chasingDots", "pulsingEllipsis", "spinningCircle", "spinningCircleSimple", "lowMotion"] as const;
-export type SpinnerType = typeof SpinnerTypes[number];
-
-export const TooltipPositions = ["top", "bottom", "left", "right"] as const;
-export type TooltipPosition = typeof TooltipPositions[number];
-
-export const TooltipAligns = ["start", "center", "end"] as const;
-export type TooltipAlign = typeof TooltipAligns[number];
-
-export const TooltipColors = ["primary", "grey", "brand", "green", "red"] as const;
-export type TooltipColor = typeof TooltipColors[number];
-
-export const TextInputSizes = ["sm", "md"] as const;
-export type TextInputSize = typeof TextInputSizes[number];
-
-export const TimestampFormats = [
-    { format: "R", label: "Relative", example: "2 hours ago" },
-    { format: "t", label: "Short Time", example: "9:30 PM" },
-    { format: "T", label: "Long Time", example: "9:30:00 PM" },
-    { format: "d", label: "Short Date", example: "01/20/2024" },
-    { format: "D", label: "Long Date", example: "January 20, 2024" },
-    { format: "f", label: "Short DateTime", example: "January 20, 2024 9:30 PM" },
-    { format: "F", label: "Long DateTime", example: "Saturday, January 20, 2024 9:30 PM" },
-] as const;
-
-export const ModalSizes = [
-    { size: "small", width: "440px" },
-    { size: "medium", width: "600px" },
-    { size: "large", width: "720px" },
-    { size: "dynamic", width: "fit-content" },
-] as const;
-export type ModalSize = typeof ModalSizes[number]["size"];
-
-export const TextColors = [
-    "text-default", "text-muted", "text-subtle", "text-strong", "text-normal",
-    "text-link", "text-brand", "text-disabled", "text-invert",
-    "text-feedback-critical", "text-feedback-warning", "text-feedback-info", "text-feedback-positive",
-    "text-status-online", "text-status-idle", "text-status-dnd", "text-status-offline",
-    "text-overlay-dark", "text-overlay-light",
-] as const;
-export type TextColorType = typeof TextColors[number];
-
-export const TextSizes = [
-    { name: "xxs", value: "0.625rem", pixels: "10px" },
-    { name: "xs", value: "0.75rem", pixels: "12px" },
-    { name: "sm", value: "0.875rem", pixels: "14px" },
-    { name: "md", value: "1rem", pixels: "16px" },
-    { name: "lg", value: "1.25rem", pixels: "20px" },
-    { name: "xl", value: "1.5rem", pixels: "24px" },
-    { name: "xxl", value: "2rem", pixels: "32px" },
-] as const;
-export type TextSizeType = typeof TextSizes[number]["name"];
-
-export const TextWeights = [
-    { name: "thin", value: "100" },
-    { name: "extralight", value: "200" },
-    { name: "light", value: "300" },
-    { name: "normal", value: "400" },
-    { name: "medium", value: "500" },
-    { name: "semibold", value: "600" },
-    { name: "bold", value: "700" },
-    { name: "extrabold", value: "800" },
-] as const;
-export type TextWeightType = typeof TextWeights[number]["name"];
-
-export const TextVariants = [
-    "text-xxl/bold", "text-xxl/semibold", "text-xxl/medium", "text-xxl/normal",
-    "text-xl/bold", "text-xl/semibold", "text-xl/medium", "text-xl/normal",
-    "text-lg/bold", "text-lg/semibold", "text-lg/medium", "text-lg/normal",
-    "text-md/bold", "text-md/semibold", "text-md/medium", "text-md/normal",
-    "text-sm/bold", "text-sm/semibold", "text-sm/medium", "text-sm/normal",
-    "text-xs/bold", "text-xs/semibold", "text-xs/medium", "text-xs/normal",
-] as const;
-export type TextVariantType = typeof TextVariants[number];
-
-export const HeadingVariants = [
-    "heading-xxl/extrabold", "heading-xxl/bold", "heading-xxl/semibold", "heading-xxl/medium", "heading-xxl/normal",
-    "heading-xl/extrabold", "heading-xl/bold", "heading-xl/semibold", "heading-xl/medium",
-    "heading-lg/extrabold", "heading-lg/bold", "heading-lg/semibold", "heading-lg/medium",
-    "heading-md/bold", "heading-md/semibold", "heading-md/medium", "heading-md/normal",
-    "heading-sm/bold", "heading-sm/semibold", "heading-sm/medium",
-] as const;
-export type HeadingVariantType = typeof HeadingVariants[number];
-
-export const CodeColors = [
-    "text-code", "text-code-keyword", "text-code-string", "text-code-comment",
-    "text-code-builtin", "text-code-variable", "text-code-tag", "text-code-title",
-    "text-code-section", "text-code-bullet", "text-code-addition", "text-code-deletion",
-] as const;
-export type CodeColorType = typeof CodeColors[number];
-
-export const NoticeTypes = ["info", "warn", "danger", "positive", "preview"] as const;
-export type NoticeTypeValue = typeof NoticeTypes[number];
-
-export const PresetColors = [
-    0x5865F2, 0x3BA55C, 0xFAA61A, 0xED4245, 0xEB459E,
-    0x9B59B6, 0x3498DB, 0x1ABC9C, 0xE67E22, 0x2ECC71,
-] as const;
-
-export const FontSizeMap: Record<string, string> = {
-    xxs: "0.625rem",
-    xs: "0.75rem",
-    sm: "0.875rem",
-    md: "1rem",
-    lg: "1.25rem",
-    xl: "1.5rem",
-    xxl: "2rem",
-};
-
-export const ManaTextButtonTextVariants = [
-    "text-xs/normal", "text-sm/normal", "text-sm/medium",
-    "text-md/normal", "text-md/medium", "text-lg/medium",
-] as const;
-export type ManaTextButtonTextVariant = typeof ManaTextButtonTextVariants[number];
-
-export const TimestampDisplayFormats = [
-    { format: "LT", description: "Time (e.g., 8:30 PM)" },
-    { format: "LTS", description: "Time with seconds (e.g., 8:30:25 PM)" },
-    { format: "L", description: "Date (e.g., 09/04/1986)" },
-    { format: "LL", description: "Date with month name (e.g., September 4, 1986)" },
-    { format: "LLL", description: "Date and time (e.g., September 4, 1986 8:30 PM)" },
-    { format: "LLLL", description: "Full date and time (e.g., Thursday, September 4, 1986 8:30 PM)" },
-    { format: "l", description: "Short date (e.g., 9/4/1986)" },
-    { format: "ll", description: "Short date with month (e.g., Sep 4, 1986)" },
-    { format: "lll", description: "Short date and time (e.g., Sep 4, 1986 8:30 PM)" },
-    { format: "llll", description: "Short full date and time (e.g., Thu, Sep 4, 1986 8:30 PM)" },
-] as const;
-export type TimestampDisplayFormat = typeof TimestampDisplayFormats[number]["format"];
-
-export const CheckboxLabelTypes = ["primary", "secondary"] as const;
-export type CheckboxLabelType = typeof CheckboxLabelTypes[number];
-
-export const CheckboxUsageVariants = ["single", "indicator"] as const;
-export type CheckboxUsageVariant = typeof CheckboxUsageVariants[number];
-
-export const PopoverSizes = ["sm", "md", "lg"] as const;
-export type PopoverSize = typeof PopoverSizes[number];
-
-export const SliderOrientations = ["horizontal", "vertical"] as const;
-export type SliderOrientation = typeof SliderOrientations[number];
-
-export const ToastType = {
-    MESSAGE: "message",
-    SUCCESS: "success",
-    FAILURE: "failure",
-    CUSTOM: "custom",
-    CLIP: "clip",
-    LINK: "link",
-    FORWARD: "forward",
-    BOOKMARK: "bookmark",
-    CLOCK: "clock",
-} as const;
-
-export const ToastPosition = {
-    TOP: 0,
-    BOTTOM: 1,
-} as const;
diff --git a/src/equicordplugins/components.dev/index.tsx b/src/equicordplugins/components.dev/index.tsx
deleted file mode 100644
index b740b2403..000000000
--- a/src/equicordplugins/components.dev/index.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import "./styles.css";
-
-import { ComponentsIcon } from "@components/Icons";
-import SettingsPlugin from "@plugins/_core/settings";
-import { Devs } from "@utils/constants";
-import { removeFromArray } from "@utils/misc";
-import definePlugin, { StartAt } from "@utils/types";
-import { SettingsRouter } from "@webpack/common";
-
-import ComponentsTab from "./components/ComponentsTab";
-
-export default definePlugin({
-    name: "Components",
-    description: "Adds a new tab to settings to browse Discord components.",
-    authors: [Devs.prism],
-    dependencies: ["Settings"],
-    startAt: StartAt.WebpackReady,
-    toolboxActions: {
-        "Open Components Tab"() {
-            SettingsRouter.openUserSettings("equicord_components_panel");
-        },
-    },
-    start() {
-        SettingsPlugin.customEntries.push({
-            key: "equicord_components",
-            title: "Components",
-            Component: ComponentsTab,
-            Icon: ComponentsIcon
-        });
-    },
-    stop() {
-        removeFromArray(SettingsPlugin.customEntries, e => e.key === "equicord_components");
-    },
-});
diff --git a/src/equicordplugins/components.dev/styles.css b/src/equicordplugins/components.dev/styles.css
deleted file mode 100644
index a9d47b6f7..000000000
--- a/src/equicordplugins/components.dev/styles.css
+++ /dev/null
@@ -1,314 +0,0 @@
-/* ── Search & Tab Navigation ── */
-
-.vc-compfinder-search {
-    margin-bottom: 40px;
-}
-
-.vc-compfinder-tabbar {
-    margin-bottom: 16px;
-    flex-wrap: wrap !important;
-    gap: 8px 16px;
-}
-
-.vc-compfinder-tabbar > div {
-    flex-wrap: wrap !important;
-    gap: 8px 16px;
-}
-
-.vc-compfinder-tab {
-    padding: 8px 12px;
-    margin: 0 !important;
-}
-
-.vc-compfinder-content {
-    padding-top: 16px;
-}
-
-/* ── Shared Utility Layouts ── */
-
-.vc-compfinder-section {
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-}
-
-.vc-compfinder-section-block > :nth-child(n+3) {
-    margin-top: 8px;
-}
-
-.vc-compfinder-grid {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-    align-items: center;
-}
-
-.vc-compfinder-grid-vertical {
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-}
-
-.vc-compfinder-switch-item {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    padding: 8px 12px;
-    background: rgb(0 0 0 / 15%);
-    border-radius: 4px;
-}
-
-.vc-compfinder-demo-button {
-    padding: 8px 16px;
-    background: rgb(0 0 0 / 15%);
-    border: 1px solid rgb(255 255 255 / 6%);
-    border-radius: 4px;
-    color: var(--text-default);
-    cursor: pointer;
-}
-
-.vc-compfinder-demo-button:hover {
-    background: rgb(0 0 0 / 25%);
-}
-
-/* ── Modal Demo Helpers ── */
-
-.vc-compfinder-modal-header {
-    display: flex;
-    align-items: flex-start;
-    position: relative;
-}
-
-.vc-compfinder-modal-header-content {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    flex: 1;
-}
-
-.vc-compfinder-modal-close {
-    position: absolute;
-    top: 0;
-    right: 0;
-}
-
-.vc-compfinder-modal-content {
-    padding-bottom: var(--space-16);
-}
-
-.vc-compfinder-modal-footer {
-    display: flex;
-    flex-direction: row-reverse;
-    gap: 8px;
-}
-
-.vc-alert-danger-btn {
-    color: var(--white-500);
-    background-color: var(--button-danger-background);
-}
-
-/* ── DocPage Layout ── */
-
-.vc-compfinder-doc-page {
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
-}
-
-.vc-compfinder-doc-page > .vc-divider {
-    margin: 8px 0;
-}
-
-.vc-compfinder-doc-title {
-    margin-bottom: -8px;
-}
-
-.vc-compfinder-doc-section {
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-}
-
-.vc-compfinder-doc-section [id] {
-    scroll-margin-top: 16px;
-}
-
-.vc-compfinder-doc-demo {
-    padding: 16px;
-}
-
-.vc-compfinder-doc-relevant-props {
-    margin-top: 8px;
-}
-
-.vc-compfinder-doc-prop-group {
-    margin-bottom: 16px;
-}
-
-.vc-compfinder-doc-example {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-}
-
-.vc-compfinder-doc-example + .vc-compfinder-doc-example {
-    margin-top: 12px;
-}
-
-/* ── Import Block ── */
-
-.vc-compfinder-import-block {
-    display: flex;
-    flex-direction: column;
-    gap: 6px;
-}
-
-.vc-compfinder-import-label {
-    text-transform: uppercase;
-    letter-spacing: 0.05em;
-}
-
-/* ── Table of Contents ── */
-
-.vc-compfinder-toc {
-    display: flex;
-    flex-direction: column;
-    gap: 6px;
-}
-
-.vc-compfinder-toc-label {
-    text-transform: uppercase;
-    letter-spacing: 0.05em;
-}
-
-.vc-compfinder-toc-links {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 2px 12px;
-}
-
-.vc-compfinder-toc-link {
-    color: var(--text-link);
-    font-size: 0.8125rem;
-    text-decoration: none;
-    cursor: pointer;
-    line-height: 1.6;
-}
-
-.vc-compfinder-toc-link:hover {
-    text-decoration: underline;
-}
-
-/* ── Props Table ── */
-
-.vc-compfinder-table-wrapper {
-    overflow-x: auto;
-}
-
-.vc-compfinder-table {
-    width: 100%;
-    border-collapse: collapse;
-    font-size: 0.75rem;
-}
-
-.vc-compfinder-table th {
-    text-align: left;
-    padding: 8px 12px;
-    font-size: 0.625rem;
-    font-weight: 700;
-    text-transform: uppercase;
-    letter-spacing: 0.05em;
-    color: var(--text-muted);
-    background: rgb(0 0 0 / 20%);
-    border-bottom: 1px solid rgb(255 255 255 / 6%);
-    vertical-align: middle;
-}
-
-.vc-compfinder-table td {
-    padding: 8px 12px;
-    color: var(--text-default);
-    vertical-align: middle;
-}
-
-.vc-compfinder-table tbody tr:nth-child(odd) {
-    background: rgb(0 0 0 / 8%);
-}
-
-.vc-compfinder-table tbody tr:nth-child(even) {
-    background: rgb(0 0 0 / 15%);
-}
-
-.vc-compfinder-table code.inline {
-    padding: 1px 4px !important;
-    font-size: 0.625rem !important;
-    line-height: 1.3;
-    white-space: nowrap;
-}
-
-.vc-compfinder-doc-page code.inline {
-    padding: 2px 5px;
-    font-size: 0.75rem;
-}
-
-.vc-compfinder-doc-page pre code {
-    font-size: 0.75rem !important;
-}
-
-.vc-compfinder-table td:nth-child(2) {
-    white-space: nowrap;
-}
-
-.vc-compfinder-table-field {
-    font-weight: 600;
-    font-size: 0.75rem;
-    color: var(--text-default);
-    font-family: var(--font-code);
-    white-space: nowrap;
-}
-
-.vc-compfinder-table-row-required td:first-child {
-    border-left: 3px solid var(--status-positive);
-    padding-left: 9px;
-}
-
-.vc-compfinder-table-row-internal td:first-child {
-    border-left: 3px solid var(--status-warning);
-    padding-left: 9px;
-}
-
-.vc-compfinder-table-legend {
-    display: flex;
-    gap: 16px;
-    margin-top: 8px;
-}
-
-.vc-compfinder-table-legend-item {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    font-size: 0.6875rem;
-    color: var(--text-muted);
-}
-
-.vc-compfinder-table-legend-bar {
-    width: 3px;
-    height: 12px;
-    border-radius: 1px;
-}
-
-.vc-compfinder-table-legend-required {
-    background: var(--status-positive);
-}
-
-.vc-compfinder-table-legend-internal {
-    background: var(--status-warning);
-}
-
-.vc-compfinder-table-dash {
-    color: var(--text-faint);
-}
-
-.vc-compfinder-table-desc {
-    color: var(--text-muted);
-    line-height: 1.4;
-}
\ No newline at end of file
diff --git a/src/equicordplugins/components.dev/types/accordion.d.ts b/src/equicordplugins/components.dev/types/accordion.d.ts
deleted file mode 100644
index 6a8690965..000000000
--- a/src/equicordplugins/components.dev/types/accordion.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface AccordionProps {
-    icon?: React.ReactNode;
-    title: string;
-    subtitle?: string;
-    children: React.ReactNode;
-    className?: string;
-    isExpanded?: boolean;
-    onExpandedChange?: (expanded: boolean) => void;
-    defaultExpanded?: boolean;
-    onOpen?: () => void;
-    maxHeight?: number | string;
-}
diff --git a/src/equicordplugins/components.dev/types/alert.d.ts b/src/equicordplugins/components.dev/types/alert.d.ts
deleted file mode 100644
index ee7d04dd6..000000000
--- a/src/equicordplugins/components.dev/types/alert.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface AlertOptions {
-    title: string;
-    body: React.ReactNode;
-    confirmText?: string;
-    cancelText?: string;
-    confirmVariant?: "primary" | "critical-primary" | "expressive";
-    onConfirm?: () => void;
-    onCancel?: () => void;
-    onCloseCallback?: () => void;
-    contextKey?: string;
-}
-
-export interface AlertsType {
-    show: (options: AlertOptions) => void;
-    close: () => void;
-    confirm: (options: AlertOptions) => Promise<boolean>;
-}
diff --git a/src/equicordplugins/components.dev/types/anchor.d.ts b/src/equicordplugins/components.dev/types/anchor.d.ts
deleted file mode 100644
index 17d29c018..000000000
--- a/src/equicordplugins/components.dev/types/anchor.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface AnchorProps extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
-    href?: string;
-    onClick?: React.MouseEventHandler<HTMLAnchorElement>;
-    className?: string;
-    children?: React.ReactNode;
-    rel?: string;
-    target?: string;
-    useDefaultUnderlineStyles?: boolean;
-    title?: string;
-    style?: React.CSSProperties;
-    focusProps?: Record<string, unknown>;
-    ref?: React.Ref<HTMLAnchorElement>;
-}
diff --git a/src/equicordplugins/components.dev/types/avatar.d.ts b/src/equicordplugins/components.dev/types/avatar.d.ts
deleted file mode 100644
index 50fdc530a..000000000
--- a/src/equicordplugins/components.dev/types/avatar.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { AvatarSize, AvatarStatus } from "../constants";
-
-export type { AvatarSize, AvatarStatus };
-
-export interface AvatarSizeConfig {
-    size: number;
-    status: number;
-    stroke: number;
-    offset: number;
-}
-
-export interface AvatarProps {
-    src?: string;
-    size?: AvatarSize;
-    status?: AvatarStatus;
-    statusColor?: string;
-    statusBackdropColor?: string;
-    isMobile?: boolean;
-    isVR?: boolean;
-    isTyping?: boolean;
-    isSpeaking?: boolean;
-    isLatched?: boolean;
-    voiceDb?: number;
-    speakingStylesConfig?: Record<string, any>;
-    statusTooltip?: boolean;
-    statusTooltipDelay?: number;
-    typingIndicatorRef?: React.Ref<any>;
-    avatarContentRef?: React.Ref<any>;
-    CutoutIcon?: React.ComponentType<any>;
-    avatarTooltipAsset?: React.ReactNode;
-    avatarTooltipText?: string;
-    avatarTooltipTitle?: string;
-    avatarDecoration?: string;
-    "aria-hidden"?: boolean;
-    "aria-label"?: string;
-    imageClassName?: string;
-    className?: string;
-    onClick?: React.MouseEventHandler<HTMLElement>;
-    onMouseDown?: React.MouseEventHandler<HTMLElement>;
-    onKeyDown?: React.KeyboardEventHandler<HTMLElement>;
-    onContextMenu?: React.MouseEventHandler<HTMLElement>;
-    onMouseEnter?: React.MouseEventHandler<HTMLElement>;
-    onMouseLeave?: React.MouseEventHandler<HTMLElement>;
-    tabIndex?: number;
-    ref?: React.Ref<SVGSVGElement>;
-}
diff --git a/src/equicordplugins/components.dev/types/badge.d.ts b/src/equicordplugins/components.dev/types/badge.d.ts
deleted file mode 100644
index 3f58a57d2..000000000
--- a/src/equicordplugins/components.dev/types/badge.d.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface BadgeShapesType {
-    ROUND: string;
-    ROUND_LEFT: string;
-    ROUND_RIGHT: string;
-    SQUARE: string;
-}
-
-export interface NumberBadgeProps extends Omit<React.HTMLAttributes<HTMLDivElement>, "children"> {
-    count: number;
-    color?: string;
-    disableColor?: boolean;
-    shape?: string;
-    className?: string;
-    style?: React.CSSProperties;
-    renderBadgeCount?: (count: number) => string;
-}
-
-export interface TextBadgeProps extends Omit<React.HTMLAttributes<HTMLDivElement>, "children"> {
-    text: string;
-    color?: string;
-    disableColor?: boolean;
-    shape?: string;
-    className?: string;
-    style?: React.CSSProperties;
-}
-
-export interface IconBadgeProps {
-    icon: React.ComponentType<{ className?: string; color?: string; }>;
-    color?: string;
-    disableColor?: boolean;
-    shape?: string;
-    className?: string;
-    style?: React.CSSProperties;
-}
-
-export interface CircleBadgeProps extends Omit<React.HTMLAttributes<HTMLDivElement>, "children"> {
-    color?: string;
-    disableColor?: boolean;
-    shape?: string;
-    className?: string;
-    style?: React.CSSProperties;
-}
-
-export interface PremiumBadgeProps extends Omit<React.HTMLAttributes<HTMLDivElement>, "children"> {
-    text: string;
-    className?: string;
-    color?: string;
-    disableColor?: boolean;
-    shape?: string;
-    style?: React.CSSProperties;
-}
diff --git a/src/equicordplugins/components.dev/types/button.d.ts b/src/equicordplugins/components.dev/types/button.d.ts
deleted file mode 100644
index c8a4caf27..000000000
--- a/src/equicordplugins/components.dev/types/button.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { ManaButtonSize, ManaButtonVariant, ManaTextButtonVariant } from "../constants";
-
-export type { ManaButtonSize, ManaButtonVariant, ManaTextButtonVariant };
-
-export type ManaButtonIconType =
-    | React.ComponentType<any>
-    | { type: "icon"; asset: React.ComponentType<any>; }
-    | { type: "rive"; asset: React.ComponentType<any>; riveProps?: Record<string, any>; }
-    | { type: "sticker"; asset: any; component: React.ComponentType<any>; };
-
-export interface ManaButtonProps {
-    text?: string;
-    variant?: ManaButtonVariant;
-    size?: ManaButtonSize;
-    disabled?: boolean;
-    loading?: boolean;
-    loadingStartedLabel?: string;
-    loadingFinishedLabel?: string;
-    fullWidth?: boolean;
-    rounded?: boolean;
-    icon?: ManaButtonIconType;
-    iconPosition?: "start" | "end";
-    iconOpticalOffsetMargin?: number;
-    minWidth?: number | string;
-    role?: string;
-    type?: "button" | "submit" | "reset";
-    rel?: string;
-    onClick?: (e: React.MouseEvent) => void;
-    onDoubleClick?: (e: React.MouseEvent) => void;
-    onMouseEnter?: (e: React.MouseEvent) => void;
-    onMouseLeave?: (e: React.MouseEvent) => void;
-    onMouseUp?: (e: React.MouseEvent) => void;
-    onMouseDown?: (e: React.MouseEvent) => void;
-    onKeyDown?: (e: React.KeyboardEvent) => void;
-    focusProps?: Record<string, any>;
-    buttonRef?: React.Ref<HTMLButtonElement>;
-    className?: string;
-    style?: React.CSSProperties;
-}
-
-export interface ManaTextButtonProps {
-    text: string;
-    variant?: ManaTextButtonVariant;
-    textVariant?: string;
-    lineClamp?: number;
-    role?: string;
-    type?: "button" | "submit" | "reset";
-    onClick?: (e: React.MouseEvent) => void;
-    disabled?: boolean;
-    focusProps?: Record<string, any>;
-    buttonRef?: React.Ref<HTMLButtonElement>;
-    className?: string;
-    style?: React.CSSProperties;
-}
diff --git a/src/equicordplugins/components.dev/types/calendar.d.ts b/src/equicordplugins/components.dev/types/calendar.d.ts
deleted file mode 100644
index 1de325466..000000000
--- a/src/equicordplugins/components.dev/types/calendar.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface ManaCalendarProps {
-    value?: any;
-    onChange?: (value: any) => void;
-    minValue?: any;
-    maxValue?: any;
-    disabled?: boolean;
-    readOnly?: boolean;
-    className?: string;
-    "aria-label"?: string;
-}
-
-export interface ManaDatePickerProps {
-    value?: any;
-    onChange?: (value: any) => void;
-    minValue?: any;
-    maxValue?: any;
-    placeholderValue?: any;
-    granularity?: "day" | "hour" | "minute" | "second";
-    hourCycle?: 12 | 24;
-    hideTimeZone?: boolean;
-    disabled?: boolean;
-    required?: boolean;
-    label?: string;
-    hideLabel?: boolean;
-    badge?: React.ReactNode;
-    icon?: React.ReactNode;
-    description?: string;
-    helperText?: string;
-    errorMessage?: string;
-    successMessage?: string;
-    id?: string;
-    layout?: string;
-    layoutConfig?: Record<string, unknown>;
-}
diff --git a/src/equicordplugins/components.dev/types/checkbox.d.ts b/src/equicordplugins/components.dev/types/checkbox.d.ts
deleted file mode 100644
index 5b891e55a..000000000
--- a/src/equicordplugins/components.dev/types/checkbox.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { CheckboxLabelType, CheckboxUsageVariant } from "../constants";
-
-export type { CheckboxLabelType, CheckboxUsageVariant };
-
-export interface ManaCheckboxProps {
-    checked: boolean;
-    onChange?: (checked: boolean) => void;
-    disabled?: boolean;
-    displayOnly?: boolean;
-    label?: string;
-    description?: string;
-    leadingIcon?: React.ComponentType<any>;
-    labelType?: CheckboxLabelType;
-    usageVariant?: CheckboxUsageVariant;
-    value?: string | number;
-    labeledBy?: string;
-}
-
-export interface CheckboxGroupOption {
-    value: string | number;
-    label: string;
-    description?: string;
-    disabled?: boolean;
-    leadingIcon?: React.ComponentType<any>;
-}
-
-export interface ManaCheckboxGroupProps {
-    options: CheckboxGroupOption[];
-    selectedValues: (string | number)[];
-    onChange?: (values: (string | number)[]) => void;
-    disabled?: boolean;
-    label?: string;
-    hideLabel?: boolean;
-    badge?: React.ReactNode;
-    icon?: React.ReactNode;
-    required?: boolean;
-    description?: string;
-    helperText?: string;
-    errorMessage?: string;
-    successMessage?: string;
-    id?: string;
-    layout?: string;
-    layoutConfig?: Record<string, unknown>;
-}
diff --git a/src/equicordplugins/components.dev/types/chip.d.ts b/src/equicordplugins/components.dev/types/chip.d.ts
deleted file mode 100644
index 7f931d72f..000000000
--- a/src/equicordplugins/components.dev/types/chip.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export type ChipVariant =
-    | "blurpleLight" | "blurpleMedium" | "blurpleDark"
-    | "purpleLight" | "purpleMedium" | "purpleDark"
-    | "greenLight" | "greenMedium" | "greenDark"
-    | "orangeLight" | "orangeMedium" | "orangeDark"
-    | "yellowLight" | "yellowMedium" | "yellowDark"
-    | "pinkLight" | "pinkMedium" | "pinkDark"
-    | "redLight" | "redMedium" | "redDark"
-    | "grayLight" | "grayMedium" | "grayDark";
-
-export interface ChipProps {
-    text: string;
-    variant?: ChipVariant;
-}
diff --git a/src/equicordplugins/components.dev/types/clickable.d.ts b/src/equicordplugins/components.dev/types/clickable.d.ts
deleted file mode 100644
index c6ab2b8eb..000000000
--- a/src/equicordplugins/components.dev/types/clickable.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface ClickableProps extends React.HTMLAttributes<HTMLElement> {
-    tag?: keyof React.JSX.IntrinsicElements;
-    focusProps?: Record<string, unknown>;
-    innerRef?: React.Ref<HTMLElement>;
-    onClick?: React.MouseEventHandler<HTMLElement>;
-    role?: string;
-    tabIndex?: number;
-    ignoreKeyPress?: boolean;
-    className?: string;
-    children?: React.ReactNode;
-    href?: string;
-    onKeyPress?: React.KeyboardEventHandler<HTMLElement>;
-}
diff --git a/src/equicordplugins/components.dev/types/colorpicker.d.ts b/src/equicordplugins/components.dev/types/colorpicker.d.ts
deleted file mode 100644
index 3fa8f5c8f..000000000
--- a/src/equicordplugins/components.dev/types/colorpicker.d.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface ColorPickerProps {
-    color: number;
-    onChange: (color: number) => void;
-    onClose?: () => void;
-    suggestedColors?: string[];
-    disabled?: boolean;
-    label?: React.ReactNode;
-    colorPickerMiddle?: React.ReactNode;
-    colorPickerFooter?: React.ReactNode;
-    showEyeDropper?: boolean;
-}
-
-export interface ColorSwatchProps {
-    color?: number;
-    isDefault?: boolean;
-    isCustom?: boolean;
-    isSelected?: boolean;
-    disabled?: boolean;
-    style?: React.CSSProperties;
-    onClick?: (colorOrGradient: number | { start: number; end: number; }) => void;
-    isGradient?: boolean;
-    "aria-label"?: string;
-    gradientStart?: number;
-    gradientEnd?: number;
-    gradientDegrees?: number;
-}
-
-export interface DefaultColorButtonProps {
-    color: number;
-    onChange: (color: number) => void;
-    value: number;
-    disabled?: boolean;
-    allowBlackCustomColor?: boolean;
-}
-
-export interface CustomColorButtonProps {
-    customColor?: number;
-    value: number;
-    disabled?: boolean;
-    "aria-label"?: string;
-    presets: number[];
-}
-
-export interface GradientColor {
-    start: number;
-    end: number;
-    name?: string;
-}
-
-export interface ColorPickerWithSwatchesProps {
-    className?: string;
-    defaultColor: number;
-    customColor?: number;
-    colors: number[] | GradientColor[];
-    value: number;
-    secondaryValue?: number;
-    disabled?: boolean;
-    onChange: (color: number, secondaryColor?: number) => void;
-    renderDefaultButton?: (props: DefaultColorButtonProps) => React.ReactNode;
-    renderCustomButton?: (props: CustomColorButtonProps) => React.ReactNode;
-    colorContainerClassName?: string;
-    isGradient?: boolean;
-    renderGradientCustomButton?: (props: {
-        value: number;
-        startColor: number;
-        endColor: number;
-        disabled?: boolean;
-    }) => React.ReactNode;
-    gradientDegrees?: number;
-    allowBlackCustomColor?: boolean;
-}
diff --git a/src/equicordplugins/components.dev/types/errorboundary.d.ts b/src/equicordplugins/components.dev/types/errorboundary.d.ts
deleted file mode 100644
index 3a205d708..000000000
--- a/src/equicordplugins/components.dev/types/errorboundary.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { ComponentType, ErrorInfo, ReactNode } from "react";
-
-export interface ErrorBoundaryFallbackProps {
-    error: Error;
-    resetErrorBoundary: (...args: any[]) => void;
-}
-
-export interface ErrorBoundaryProps {
-    children: ReactNode;
-    fallback?: ReactNode;
-    fallbackRender?: (props: ErrorBoundaryFallbackProps) => ReactNode;
-    FallbackComponent?: ComponentType<ErrorBoundaryFallbackProps>;
-    onError?: (error: Error, info: ErrorInfo) => void;
-    onReset?: (details: { reason: "imperative-api" | "keys"; args?: any[]; prev?: any[]; next?: any[]; }) => void;
-    resetKeys?: any[];
-}
-
-export interface SimpleErrorBoundaryProps {
-    children: ReactNode;
-    fallback: ReactNode;
-}
-
-export interface LocalErrorBoundaryProps {
-    children: ReactNode;
-}
diff --git a/src/equicordplugins/components.dev/types/focuslock.d.ts b/src/equicordplugins/components.dev/types/focuslock.d.ts
deleted file mode 100644
index b1d476187..000000000
--- a/src/equicordplugins/components.dev/types/focuslock.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface FocusLockProps {
-    containerRef: React.RefObject<HTMLElement | null>;
-    keyboardModeEnabled?: boolean;
-    children?: React.ReactNode;
-}
diff --git a/src/equicordplugins/components.dev/types/guildicon.d.ts b/src/equicordplugins/components.dev/types/guildicon.d.ts
deleted file mode 100644
index 2439f187c..000000000
--- a/src/equicordplugins/components.dev/types/guildicon.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface GuildIconProps {
-    guildId: string;
-    guildName: string;
-    guildIcon: string | null;
-    iconSize: number;
-    className?: string;
-    acronymClassName?: string;
-    animate?: boolean;
-}
diff --git a/src/equicordplugins/components.dev/types/heading.d.ts b/src/equicordplugins/components.dev/types/heading.d.ts
deleted file mode 100644
index cd30c5a82..000000000
--- a/src/equicordplugins/components.dev/types/heading.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { HeadingVariantType, TextColorType, TextVariantType } from "../constants";
-
-export type HeadingVariant = HeadingVariantType;
-export type TextVariant = TextVariantType;
-export type TextColor = TextColorType | "currentColor" | "none" | "always-white";
-
-export interface DiscordHeadingProps {
-    variant: HeadingVariant;
-    className?: string;
-    color?: TextColor;
-    style?: React.CSSProperties;
-    children?: React.ReactNode;
-}
-
-export interface DiscordTextProps {
-    variant: TextVariant;
-    color?: TextColor;
-    tag?: string;
-    selectable?: boolean;
-    lineClamp?: number;
-    tabularNumbers?: boolean;
-    scaleFontToUserSetting?: boolean;
-    className?: string;
-    style?: React.CSSProperties;
-    children?: React.ReactNode;
-}
diff --git a/src/equicordplugins/components.dev/types/index.d.ts b/src/equicordplugins/components.dev/types/index.d.ts
deleted file mode 100644
index 792bf25f5..000000000
--- a/src/equicordplugins/components.dev/types/index.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export * from "../constants";
-export * from "./accordion";
-export * from "./alert";
-export * from "./anchor";
-export * from "./avatar";
-export * from "./badge";
-export * from "./button";
-export * from "./calendar";
-export * from "./checkbox";
-export * from "./chip";
-export * from "./clickable";
-export * from "./colorpicker";
-export * from "./errorboundary";
-export * from "./focuslock";
-export * from "./guildicon.d";
-export * from "./heading";
-export * from "./input";
-export * from "./menu";
-export * from "./modal";
-export * from "./notice";
-export * from "./paginator";
-export * from "./progress";
-export * from "./radio";
-export * from "./scroller";
-export * from "./select";
-export * from "./skeleton";
-export * from "./slider";
-export * from "./spinner";
-export * from "./switch";
-export * from "./tabbar";
-export * from "./timestamp";
-export * from "./toast";
-export * from "./tooltip";
-export * from "./usersummary";
diff --git a/src/equicordplugins/components.dev/types/input.d.ts b/src/equicordplugins/components.dev/types/input.d.ts
deleted file mode 100644
index f438e1ebf..000000000
--- a/src/equicordplugins/components.dev/types/input.d.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { TextInputSize } from "../constants";
-
-export type { TextInputSize };
-
-export type TextInputLeadingAccessory =
-    | string
-    | React.ComponentType<any>
-    | { icon: React.ComponentType<any>; tooltip?: string; }
-    | { button: React.ReactNode; }
-    | { type: "tags"; tags: string[]; onRemove?: (tag: string) => void; }
-    | { type: "image"; src: string; };
-
-export type TextInputTrailingAccessory =
-    | React.ComponentType<any>
-    | { icon: React.ComponentType<any>; tooltip?: string; }
-    | { button: React.ReactNode; };
-
-export interface ManaTextInputProps {
-    value?: string;
-    defaultValue?: string;
-    onChange?: (value: string, name?: string) => void;
-    onClear?: (e: React.MouseEvent) => void;
-    onFocus?: (e: React.FocusEvent) => void;
-    onBlur?: (e: React.FocusEvent) => void;
-    placeholder?: string;
-    name?: string;
-    type?: "text" | "password" | "email" | "number" | "search" | "tel" | "url";
-    disabled?: boolean;
-    readOnly?: boolean;
-    editable?: boolean;
-    size?: TextInputSize;
-    error?: string | boolean;
-    clearable?: boolean | { show: boolean; };
-    showCharacterCount?: boolean;
-    maxLength?: number;
-    minLength?: number;
-    fullWidth?: boolean;
-    leading?: TextInputLeadingAccessory;
-    trailing?: TextInputTrailingAccessory;
-    validateOn?: "change" | "blur";
-    defaultDirty?: boolean;
-    focusProps?: Record<string, any>;
-    inputRef?: React.Ref<HTMLInputElement>;
-    label?: string;
-    hideLabel?: boolean;
-    badge?: React.ReactNode;
-    icon?: React.ReactNode;
-    required?: boolean;
-    description?: string;
-    helperText?: string;
-    errorMessage?: string;
-    successMessage?: string;
-    id?: string;
-    layout?: string;
-    layoutConfig?: Record<string, unknown>;
-    "aria-label"?: string;
-    "aria-labelledby"?: string;
-    "aria-describedby"?: string;
-}
-
-export interface ManaTextAreaProps {
-    value?: string;
-    defaultValue?: string;
-    onChange?: (value: string, name?: string) => void;
-    onFocus?: (e: React.FocusEvent) => void;
-    onBlur?: (e: React.FocusEvent) => void;
-    placeholder?: string;
-    name?: string;
-    disabled?: boolean;
-    readOnly?: boolean;
-    rows?: number;
-    autoFocus?: boolean;
-    autosize?: boolean;
-    maxLength?: number;
-    minLength?: number;
-    showCharacterCount?: boolean;
-    showRemainingCharacterCount?: boolean;
-    error?: string | boolean;
-    defaultDirty?: boolean;
-    fullWidth?: boolean;
-    focusProps?: Record<string, any>;
-    inputRef?: React.Ref<HTMLTextAreaElement>;
-    label?: string;
-    hideLabel?: boolean;
-    badge?: React.ReactNode;
-    icon?: React.ReactNode;
-    required?: boolean;
-    description?: string;
-    helperText?: string;
-    errorMessage?: string;
-    successMessage?: string;
-    id?: string;
-    layout?: string;
-    layoutConfig?: Record<string, unknown>;
-    "aria-label"?: string;
-    "aria-labelledby"?: string;
-    "aria-describedby"?: string;
-}
-
-export interface SearchBarProps {
-    query: string;
-    onChange: (value: string) => void;
-    onClear?: () => void;
-    placeholder?: string;
-    size?: TextInputSize;
-    autoFocus?: boolean;
-    disabled?: boolean;
-    onKeyDown?: (e: React.KeyboardEvent) => void;
-    onBlur?: () => void;
-    onFocus?: () => void;
-    autoComplete?: string;
-    inputProps?: Record<string, any>;
-    ref?: React.Ref<HTMLInputElement>;
-    "aria-label"?: string;
-}
diff --git a/src/equicordplugins/components.dev/types/menu.d.ts b/src/equicordplugins/components.dev/types/menu.d.ts
deleted file mode 100644
index 8f0e62e1a..000000000
--- a/src/equicordplugins/components.dev/types/menu.d.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { ComponentType, CSSProperties, MouseEvent, ReactNode, Ref, UIEvent } from "react";
-
-export type MenuItemColor = "default" | "brand" | "danger" | "premium" | "premium-gradient" | "success";
-
-export type MenuIconSize = "sm" | "md" | "lg";
-
-export interface MenuProps {
-    navId: string;
-    onClose: () => void;
-    onSelect?: () => void;
-    onInteraction?: (data: { type: number; }) => void;
-    variant?: "flexible" | "fixed";
-    hideScroller?: boolean;
-    className?: string;
-    style?: CSSProperties;
-    "aria-label"?: string;
-    children: ReactNode;
-}
-
-export interface MenuItemIconProps {
-    color?: string;
-    className?: string;
-}
-
-export interface MenuItemProps {
-    id: string;
-    label: ReactNode | ((props: MenuItemProps) => ReactNode);
-    color?: MenuItemColor;
-    icon?: ComponentType<MenuItemIconProps>;
-    iconLeft?: ComponentType<MenuItemIconProps>;
-    iconLeftSize?: MenuIconSize;
-    iconProps?: MenuItemIconProps;
-    leadingAccessory?: ReactNode;
-    trailingIndicator?: ReactNode;
-    hint?: ReactNode | ((props: MenuItemProps) => ReactNode);
-    shortcut?: ReactNode;
-    subtext?: ReactNode;
-    subtextLineClamp?: number;
-    hasSubmenu?: boolean;
-    loading?: boolean;
-    badge?: ReactNode;
-    disabled?: boolean;
-    action?: (e: MouseEvent) => void;
-    onClose?: () => void;
-    onFocus?: () => void;
-    dontCloseOnAction?: boolean;
-    dontCloseOnActionIfHoldingShiftKey?: boolean;
-    className?: string;
-    focusedClassName?: string;
-    subMenuIconClassName?: string;
-    render?: (props: MenuItemProps) => ReactNode;
-    navigable?: boolean;
-    onChildrenScroll?: () => void;
-    childRowHeight?: number;
-    listClassName?: string;
-    subMenuClassName?: string;
-    children?: ReactNode;
-}
-
-export interface MenuCheckboxItemProps {
-    id: string;
-    label: ReactNode | ((props: MenuCheckboxItemProps) => ReactNode);
-    color?: MenuItemColor;
-    checked: boolean;
-    action?: (e: MouseEvent) => void;
-    disabled?: boolean;
-    subtext?: ReactNode;
-    subtextLineClamp?: number;
-    leftIcon?: ComponentType<MenuItemIconProps>;
-    leadingAccessory?: ReactNode;
-    className?: string;
-    focusedClassName?: string;
-}
-
-export interface MenuRadioItemProps {
-    id: string;
-    group: string;
-    label: ReactNode | ((props: MenuRadioItemProps) => ReactNode);
-    color?: MenuItemColor;
-    checked: boolean;
-    action?: (e: MouseEvent) => void;
-    disabled?: boolean;
-    subtext?: ReactNode;
-    subtextLineClamp?: number;
-    leftIcon?: ComponentType<MenuItemIconProps>;
-    leadingAccessory?: ReactNode;
-}
-
-export interface MenuSwitchItemProps {
-    id: string;
-    label?: ReactNode;
-    color?: MenuItemColor;
-    checked: boolean;
-    action: (e: MouseEvent) => void;
-    disabled?: boolean;
-    subtext?: ReactNode;
-    subtextLineClamp?: number;
-    className?: string;
-}
-
-export interface MenuGroupProps {
-    label?: ReactNode;
-    color?: MenuItemColor;
-    className?: string;
-    children: ReactNode;
-}
-
-export interface MenuCustomItemRenderProps {
-    color: MenuItemColor;
-    disabled: boolean;
-    isFocused: boolean;
-}
-
-export interface MenuCustomItemProps {
-    id: string;
-    color?: MenuItemColor;
-    disabled?: boolean;
-    keepItemStyles?: boolean;
-    action?: (e: MouseEvent) => void;
-    dontCloseOnAction?: boolean;
-    dontCloseOnActionIfHoldingShiftKey?: boolean;
-    navigable?: boolean;
-    children: (props: MenuCustomItemRenderProps) => ReactNode;
-}
-
-export interface MenuControlItemControlProps {
-    onClose: () => void;
-    disabled?: boolean;
-    isFocused: boolean;
-    onInteraction: (type?: number) => void;
-}
-
-export interface MenuControlItemProps {
-    id: string;
-    label?: ReactNode;
-    color?: MenuItemColor;
-    control: (props: MenuControlItemControlProps, ref: Ref<MenuControlRef>) => ReactNode;
-    disabled?: boolean;
-    showDefaultFocus?: boolean;
-}
-
-export interface MenuCompositeControlItemProps {
-    id: string;
-    color?: MenuItemColor;
-    disabled?: boolean;
-    showDefaultFocus?: boolean;
-    interactive?: boolean;
-    children: ReactNode;
-}
-
-export interface MenuControlRef {
-    focus: () => void;
-    blur: () => void;
-    activate: () => boolean;
-}
-
-export interface MenuSliderControlProps {
-    value: number;
-    minValue?: number;
-    maxValue?: number;
-    onChange: (value: number) => void;
-    onInteraction?: (type?: number) => void;
-    renderValue?: (value: number) => string;
-    "aria-label"?: string;
-}
-
-export interface MenuSearchControlProps {
-    query: string;
-    onChange: (query: string) => void;
-    disabled?: boolean;
-    placeholder?: string;
-    onInteraction?: (type?: number) => void;
-    "aria-label"?: string;
-}
-
-export interface MenuType {
-    Menu: ComponentType<MenuProps>;
-    MenuItem: ComponentType<MenuItemProps>;
-    MenuCheckboxItem: ComponentType<MenuCheckboxItemProps>;
-    MenuRadioItem: ComponentType<MenuRadioItemProps>;
-    MenuSwitchItem: ComponentType<MenuSwitchItemProps>;
-    MenuGroup: ComponentType<MenuGroupProps>;
-    MenuSeparator: ComponentType<Record<string, never>>;
-    MenuControlItem: ComponentType<MenuControlItemProps>;
-    MenuSliderControl: ComponentType<MenuSliderControlProps>;
-    MenuSearchControl: ComponentType<MenuSearchControlProps>;
-}
-
-export interface ContextMenuOpenOptions {
-    enableSpellCheck?: boolean;
-}
-
-export interface ContextMenuApiType {
-    openContextMenu: (
-        event: UIEvent,
-        render: (props: { onClose: () => void; }) => ReactNode,
-        options?: ContextMenuOpenOptions
-    ) => void;
-    openContextMenuLazy: (
-        event: UIEvent,
-        renderLazy: () => Promise<(props: { onClose: () => void; }) => ReactNode>,
-        options?: ContextMenuOpenOptions
-    ) => void;
-    closeContextMenu: (callback?: () => void) => void;
-}
diff --git a/src/equicordplugins/components.dev/types/modal.d.ts b/src/equicordplugins/components.dev/types/modal.d.ts
deleted file mode 100644
index bcf51f6f3..000000000
--- a/src/equicordplugins/components.dev/types/modal.d.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export type NativeModalSize = "sm" | "md";
-
-export type ModalActionVariant = "primary" | "secondary" | "critical-primary" | "critical-secondary";
-
-export interface ModalAction {
-    text: string;
-    variant: ModalActionVariant;
-    onClick: () => void;
-    disabled?: boolean;
-    loading?: boolean;
-}
-
-export interface ModalNotice {
-    message: string;
-    type: "info" | "warn" | "critical" | "positive";
-}
-
-export type ModalAnimationVariant = "default" | "fade" | "slide-up";
-
-export type ModalMaxHeight = "default" | "full";
-
-export interface ModalProps {
-    title: string;
-    subtitle?: string;
-    size?: NativeModalSize;
-    transitionState?: number;
-    animationVariant?: ModalAnimationVariant;
-    paddingSize?: "sm" | "lg";
-    fullScreenOnMobile?: boolean;
-    maxHeight?: ModalMaxHeight;
-    dismissable?: boolean;
-    children?: React.ReactNode;
-    actions?: ModalAction[];
-    actionBarInput?: React.ReactNode;
-    actionBarInputLayout?: "default" | "full-width";
-    input?: React.ReactNode;
-    preview?: React.ReactNode;
-    listProps?: Record<string, any>;
-    notice?: ModalNotice;
-    onClose: () => void;
-    onScroll?: (e: React.UIEvent) => void;
-    scrollerRef?: React.Ref<HTMLDivElement>;
-    returnRef?: React.Ref<HTMLElement>;
-    role?: string;
-    "aria-label"?: string;
-    className?: string;
-}
-
-export interface ConfirmModalProps extends Omit<ModalProps, "actions" | "transitionState"> {
-    transitionState?: number;
-    confirmText: string;
-    cancelText?: string;
-    onConfirm?: (setError?: (error: string) => void) => void | Promise<void>;
-    onCancel?: () => void;
-    onCloseCallback?: () => void;
-    variant?: "critical" | "primary" | "secondary";
-    checkboxProps?: {
-        label: string;
-        checked: boolean;
-        onChange: (checked: boolean) => void;
-    };
-}
-
-export type ExpressiveGradientColor = "purple" | "blue" | "pink" | "green";
-
-export interface ModalGraphic {
-    type: "image";
-    src: string;
-    aspectRatio?: string;
-}
-
-export interface ExpressiveModalProps {
-    title: string;
-    subtitle?: string;
-    size?: NativeModalSize;
-    transitionState?: number;
-    gradientColor?: ExpressiveGradientColor;
-    graphic?: ModalGraphic;
-    badge?: React.ReactNode;
-    actionBarInput?: React.ReactNode;
-    actions?: ModalAction[];
-    children?: React.ReactNode;
-    onClose: () => void;
-}
-
-export interface OpenModalOptions {
-    modalKey?: string;
-    dismissable?: boolean;
-    instant?: boolean;
-    onCloseRequest?: () => void;
-    onCloseCallback?: () => void;
-    backdropStyle?: "default" | "dark" | "transparent";
-    stackingBehavior?: "stack" | "replace";
-    stackNextByDefault?: boolean;
-    allowsNavigation?: boolean;
-}
-
-export type ModalRenderFn = (props: { onClose: () => void; transitionState: number }) => React.ReactNode;
-
-export interface ModalAPI {
-    openModal: (render: ModalRenderFn, options?: OpenModalOptions) => string;
-    openModalLazy: (renderFactory: () => Promise<{ default: React.ComponentType<any> }>, options?: OpenModalOptions) => Promise<string>;
-    closeModal: (modalKey: string) => void;
-    closeAllModals: () => void;
-    hasModalOpen: (modalKey: string) => boolean;
-    hasAnyModalOpen: () => boolean;
-}
-
-export interface ModalComponents {
-    Modal: React.ComponentType<ModalProps>;
-    ConfirmModal: React.ComponentType<ConfirmModalProps>;
-    ExpressiveModal: React.ComponentType<ExpressiveModalProps>;
-}
diff --git a/src/equicordplugins/components.dev/types/notice.d.ts b/src/equicordplugins/components.dev/types/notice.d.ts
deleted file mode 100644
index 5d6ced3d9..000000000
--- a/src/equicordplugins/components.dev/types/notice.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { NoticeTypeValue } from "../constants";
-
-export type NoticeType = NoticeTypeValue;
-
-export interface NoticeProps {
-    children: React.ReactNode;
-    messageType: NoticeType;
-    action?: React.ReactNode;
-    className?: string;
-    textColor?: string;
-    textVariant?: string;
-    icon?: React.ComponentType<{ className?: string; color?: string; }>;
-    hidden?: boolean;
-}
diff --git a/src/equicordplugins/components.dev/types/paginator.d.ts b/src/equicordplugins/components.dev/types/paginator.d.ts
deleted file mode 100644
index 8a2694519..000000000
--- a/src/equicordplugins/components.dev/types/paginator.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface PaginatorPageWrapperProps {
-    key: string;
-    targetPage: number;
-    selected: boolean;
-    navigateToPage: () => void;
-}
-
-export interface PaginatorProps {
-    currentPage: number;
-    totalCount: number;
-    pageSize: number;
-    maxVisiblePages?: number;
-    disablePaginationGap?: boolean;
-    onPageChange?: (page: number) => void;
-    hideMaxPage?: boolean;
-    className?: string;
-    renderPageWrapper?: (props: PaginatorPageWrapperProps, defaultRender: React.ReactNode) => React.ReactNode;
-}
diff --git a/src/equicordplugins/components.dev/types/progress.d.ts b/src/equicordplugins/components.dev/types/progress.d.ts
deleted file mode 100644
index 89cee00cc..000000000
--- a/src/equicordplugins/components.dev/types/progress.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export type ProgressBarVariant = "blue" | "orange" | "unset";
-
-export interface ProgressBarOverride {
-    background?: string;
-    gradientStart?: string;
-    gradientEnd?: string;
-}
-
-export type ProgressBarWeight = "light" | "medium";
-
-export interface ProgressBarProps {
-    progress: number;
-    minimum?: number;
-    maximum?: number;
-    weight?: ProgressBarWeight;
-    variant?: ProgressBarVariant;
-    override?: {
-        default?: ProgressBarOverride;
-        [key: string]: ProgressBarOverride | undefined;
-    };
-    glowing?: boolean;
-    labelledBy?: string;
-}
diff --git a/src/equicordplugins/components.dev/types/radio.d.ts b/src/equicordplugins/components.dev/types/radio.d.ts
deleted file mode 100644
index d4f4133c6..000000000
--- a/src/equicordplugins/components.dev/types/radio.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface RadioOption {
-    value: string | number;
-    name: string;
-    description?: string;
-    disabled?: boolean;
-    icon?: React.ComponentType<{ className?: string; size?: string; color?: string; }>;
-    color?: string;
-    radioItemIconClassName?: string;
-    radioBarClassName?: string;
-}
-
-export type RadioPosition = "left" | "right";
-
-export interface ManaBaseRadioGroupProps {
-    options: RadioOption[];
-    value?: string | number | null;
-    onChange?: (value: string | number) => void;
-    disabled?: boolean;
-    size?: string;
-    orientation?: "vertical" | "horizontal";
-    radioPosition?: RadioPosition;
-    withTransparentBackground?: boolean;
-    label?: string;
-    description?: string;
-    required?: boolean;
-    errorMessage?: string;
-    "aria-labelledby"?: string;
-    className?: string;
-    itemInfoClassName?: string;
-    itemTitleClassName?: string;
-    radioItemClassName?: string;
-    collapsibleClassName?: string;
-}
-
-export interface StandaloneRadioIndicatorProps {
-    isSelected: boolean;
-    disabled?: boolean;
-}
diff --git a/src/equicordplugins/components.dev/types/scroller.d.ts b/src/equicordplugins/components.dev/types/scroller.d.ts
deleted file mode 100644
index 9ed39c1ef..000000000
--- a/src/equicordplugins/components.dev/types/scroller.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface ScrollerProps extends Omit<React.HTMLAttributes<HTMLDivElement>, "dir"> {
-    className?: string;
-    style?: React.CSSProperties;
-    children?: React.ReactNode;
-    orientation?: "vertical" | "horizontal";
-    paddingFix?: boolean;
-    fade?: boolean;
-    dir?: "ltr" | "rtl";
-    onScroll?: (e: React.UIEvent<HTMLDivElement>) => void;
-}
-
-export interface ListScrollerProps {
-    className?: string;
-    style?: React.CSSProperties;
-    dir?: "ltr" | "rtl";
-    fade?: boolean;
-    customTheme?: boolean;
-    onScroll?: (e: React.UIEvent<HTMLDivElement>) => void;
-    onResize?: ((entries: ResizeObserverEntry[]) => void) | null;
-    onContentResize?: ((entries: ResizeObserverEntry[]) => void) | null;
-    sections: number[];
-    sectionHeight: number;
-    rowHeight: number;
-    footerHeight?: number;
-    sidebarHeight?: number;
-    listHeaderHeight?: number;
-    renderSection?: (section: { type: string; section: number; }) => React.ReactNode;
-    renderRow: (row: { type: string; section: number; row: number; }) => React.ReactNode;
-    renderFooter?: (footer: { type: string; section: number; }) => React.ReactNode;
-    renderSidebar?: (isListVisible: boolean, isSidebarVisible: boolean) => React.ReactNode;
-    renderListHeader?: () => React.ReactNode;
-    stickyListHeader?: boolean;
-    wrapSection?: (section: number, children: React.ReactNode[]) => React.ReactNode;
-    paddingTop?: number;
-    paddingBottom?: number;
-    chunkSize?: number;
-    innerId?: string;
-    innerRole?: string;
-    innerAriaLabel?: string;
-}
diff --git a/src/equicordplugins/components.dev/types/select.d.ts b/src/equicordplugins/components.dev/types/select.d.ts
deleted file mode 100644
index d99e2b3da..000000000
--- a/src/equicordplugins/components.dev/types/select.d.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface ManaSelectOption {
-    id: string;
-    value: string;
-    label: string;
-}
-
-export interface ManaSelectProps {
-    options: ManaSelectOption[];
-    value?: string | string[] | null;
-    onSelectionChange?: (value: string | string[] | null) => void;
-    selectionMode?: "single" | "multiple";
-    placeholder?: string;
-    disabled?: boolean;
-    readOnly?: boolean;
-    clearable?: boolean;
-    fullWidth?: boolean;
-    autoFocus?: boolean;
-    closeOnSelect?: boolean;
-    shouldFocusWrap?: boolean;
-    maxOptionsVisible?: number;
-    wrapTags?: boolean;
-    formatOption?: (option: ManaSelectOption) => React.ReactNode;
-    name?: string;
-    form?: string;
-    autoComplete?: string;
-    label?: string;
-    required?: boolean;
-}
-
-export interface ManaComboboxProps<T = string> {
-    placeholder?: string;
-    value?: T | T[];
-    onChange?: (value: T | T[]) => void;
-    multiSelect?: boolean;
-    autoFocus?: boolean;
-    maxVisibleItems?: number;
-    itemToString?: (item: T) => string;
-    emptyStateText?: string;
-    emptyStateHeader?: string;
-    onQueryChange?: (query: string) => void;
-    "aria-label"?: string;
-    className?: string;
-    listClassName?: string;
-    children: (query: string) => React.ReactNode[];
-}
-
-export interface ListboxItem {
-    id: string;
-    label: string;
-    disabled?: boolean;
-}
-
-export interface ManaListboxProps {
-    items: ListboxItem[];
-    selectedItems?: ListboxItem[];
-    defaultSelectedItems?: ListboxItem[];
-    onSelectionChange?: (items: ListboxItem[]) => void;
-    selectionMode?: "single" | "multiple";
-    disabled?: boolean;
-    required?: boolean;
-    loading?: boolean;
-    maxVisibleItems?: number;
-    shouldFocusWrap?: boolean;
-    typeahead?: boolean;
-    renderListItem?: (item: ListboxItem) => React.ReactNode;
-    renderEmptyState?: () => React.ReactNode;
-}
diff --git a/src/equicordplugins/components.dev/types/skeleton.d.ts b/src/equicordplugins/components.dev/types/skeleton.d.ts
deleted file mode 100644
index e68a44df3..000000000
--- a/src/equicordplugins/components.dev/types/skeleton.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface SkeletonProps {
-    withHeader?: boolean;
-    size?: number;
-}
diff --git a/src/equicordplugins/components.dev/types/slider.d.ts b/src/equicordplugins/components.dev/types/slider.d.ts
deleted file mode 100644
index 9d0271b50..000000000
--- a/src/equicordplugins/components.dev/types/slider.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { SliderOrientation } from "../constants";
-
-export type { SliderOrientation };
-
-export interface SliderProps {
-    initialValue?: number;
-    value?: number;
-    minValue?: number;
-    maxValue?: number;
-    onValueChange?: (value: number) => void;
-    asValueChanges?: (value: number) => void;
-    onValueRender?: (value: number) => string | null;
-    markers?: number[];
-    stickToMarkers?: boolean;
-    equidistant?: boolean;
-    onMarkerRender?: (value: number) => string | React.ReactNode | null;
-    renderMarker?: (value: number) => React.ReactNode;
-    getAriaValueText?: (value: number) => string;
-    keyboardStep?: number;
-    handleSize?: number;
-    disabled?: boolean;
-    mini?: boolean;
-    hideBubble?: boolean;
-    defaultValue?: number;
-    orientation?: SliderOrientation;
-    markerPosition?: 0 | 1;
-    barStyles?: React.CSSProperties;
-    fillStyles?: React.CSSProperties;
-    grabberStyles?: React.CSSProperties;
-    barClassName?: string;
-    grabberClassName?: string;
-    className?: string;
-    "aria-hidden"?: boolean;
-    "aria-label"?: string;
-    "aria-labelledby"?: string;
-    "aria-describedby"?: string;
-    label?: string;
-    hideLabel?: boolean;
-    required?: boolean;
-    description?: string;
-    helperText?: string;
-    errorMessage?: string;
-    successMessage?: string;
-}
diff --git a/src/equicordplugins/components.dev/types/spinner.d.ts b/src/equicordplugins/components.dev/types/spinner.d.ts
deleted file mode 100644
index 3352257f5..000000000
--- a/src/equicordplugins/components.dev/types/spinner.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { SpinnerType } from "../constants";
-
-export type { SpinnerType };
-
-export interface SpinnerTypeEnum {
-    WANDERING_CUBES: "wanderingCubes";
-    CHASING_DOTS: "chasingDots";
-    PULSING_ELLIPSIS: "pulsingEllipsis";
-    SPINNING_CIRCLE: "spinningCircle";
-    SPINNING_CIRCLE_SIMPLE: "spinningCircleSimple";
-    LOW_MOTION: "lowMotion";
-}
-
-export interface SpinnerProps {
-    type?: SpinnerType;
-    animated?: boolean;
-    className?: string;
-    itemClassName?: string;
-    "aria-label"?: string;
-}
-
-export interface SpinnerComponent extends React.FC<SpinnerProps> {
-    Type: SpinnerTypeEnum;
-}
diff --git a/src/equicordplugins/components.dev/types/switch.d.ts b/src/equicordplugins/components.dev/types/switch.d.ts
deleted file mode 100644
index 68e98d488..000000000
--- a/src/equicordplugins/components.dev/types/switch.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface ManaSwitchProps {
-    checked: boolean;
-    onChange?: (checked: boolean) => void;
-    disabled?: boolean;
-    id?: string;
-    hasIcon?: boolean;
-    focusProps?: Record<string, any>;
-    describedBy?: string;
-    labelledBy?: string;
-    innerRef?: React.Ref<HTMLInputElement>;
-}
diff --git a/src/equicordplugins/components.dev/types/tabbar.d.ts b/src/equicordplugins/components.dev/types/tabbar.d.ts
deleted file mode 100644
index 78baba9d7..000000000
--- a/src/equicordplugins/components.dev/types/tabbar.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export interface TabBarProps {
-    className?: string;
-    children?: React.ReactNode;
-    type?: "side" | "top" | "top-pill";
-    look?: "brand" | "grey";
-    style?: React.CSSProperties;
-    selectedItem?: string;
-    onItemSelect?: (id: string) => void;
-    orientation?: "horizontal" | "vertical";
-    "aria-label"?: string;
-}
-
-export interface TabBarItemProps {
-    id: string;
-    className?: string;
-    children?: React.ReactNode;
-    selectedItem?: string;
-    onItemSelect?: (id: string) => void;
-    itemType?: "side" | "top" | "top-pill";
-    look?: "brand" | "grey";
-    color?: string;
-    variant?: "destructive";
-    disabled?: boolean;
-    disableItemStyles?: boolean;
-    onClick?: React.MouseEventHandler;
-    onContextMenu?: React.MouseEventHandler;
-    clickableRef?: React.Ref<HTMLElement>;
-    clickableInnerRef?: React.Ref<HTMLElement>;
-    "aria-label"?: string;
-}
-
-export interface TabBarHeaderProps {
-    className?: string;
-    children?: React.ReactNode;
-    onClick?: React.MouseEventHandler;
-    "aria-expanded"?: boolean;
-    "aria-controls"?: string;
-}
-
-export interface TabBarSeparatorProps {
-    style?: React.CSSProperties;
-}
-
-export type TabBarComponent = React.ComponentType<TabBarProps> & {
-    Item: React.ComponentType<TabBarItemProps>;
-    Header: React.ComponentType<TabBarHeaderProps>;
-    Separator: React.ComponentType<TabBarSeparatorProps>;
-    Panel: React.ComponentType<{ children?: React.ReactNode; }>;
-};
diff --git a/src/equicordplugins/components.dev/types/timestamp.d.ts b/src/equicordplugins/components.dev/types/timestamp.d.ts
deleted file mode 100644
index 8a0de3ef8..000000000
--- a/src/equicordplugins/components.dev/types/timestamp.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { Moment } from "moment";
-
-import type { TimestampDisplayFormat, TooltipPosition } from "../constants";
-
-export type TimestampFormat = TimestampDisplayFormat;
-
-export type { TooltipPosition };
-
-export interface TimestampProps {
-    timestamp: Date | Moment;
-    timestampFormat?: TimestampFormat;
-    compact?: boolean;
-    cozyAlt?: boolean;
-    isInline?: boolean;
-    isVisibleOnlyOnHover?: boolean;
-    isEdited?: boolean;
-    application?: any;
-    id?: string;
-    className?: string;
-    children?: React.ReactNode;
-    tooltipPosition?: TooltipPosition;
-}
diff --git a/src/equicordplugins/components.dev/types/toast.d.ts b/src/equicordplugins/components.dev/types/toast.d.ts
deleted file mode 100644
index 27527ca90..000000000
--- a/src/equicordplugins/components.dev/types/toast.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export type ToastTypeValue = "message" | "success" | "failure" | "custom" | "clip" | "link" | "forward" | "bookmark" | "clock";
-
-export type ToastPositionValue = 0 | 1;
-
-export interface ToastOptions {
-    duration?: number;
-    position?: ToastPositionValue;
-    component?: React.ReactNode;
-    appContext?: number;
-}
-
-export interface ToastData {
-    message: string;
-    type: ToastTypeValue;
-    id: string;
-    options?: ToastOptions;
-}
-
-export interface ToastsModule {
-    Type: Record<string, ToastTypeValue>;
-    Position: Record<string, ToastPositionValue>;
-    genId: () => string;
-    show: (data: ToastData) => void;
-    pop: () => void;
-    create: (message: string, type: ToastTypeValue, options?: ToastOptions) => ToastData;
-}
diff --git a/src/equicordplugins/components.dev/types/tooltip.d.ts b/src/equicordplugins/components.dev/types/tooltip.d.ts
deleted file mode 100644
index 27c1dfe9b..000000000
--- a/src/equicordplugins/components.dev/types/tooltip.d.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { PopoverSize, TooltipAlign, TooltipColor, TooltipPosition } from "../constants";
-
-export type { PopoverSize, TooltipAlign, TooltipColor, TooltipPosition };
-
-export interface ManaTooltipProps {
-    text: string | (() => React.ReactNode);
-    position?: TooltipPosition;
-    align?: TooltipAlign;
-    color?: TooltipColor;
-    spacing?: number;
-    hideOnClick?: boolean;
-    delay?: number;
-    forceOpen?: boolean;
-    shouldShow?: boolean;
-    allowOverflow?: boolean;
-    overflowOnly?: boolean;
-    clickableOnMobile?: boolean;
-    disableTooltipPointerEvents?: boolean;
-    targetElementRef?: React.RefObject<HTMLElement>;
-    tooltipClassName?: string;
-    tooltipStyle?: React.CSSProperties;
-    tooltipContentClassName?: string;
-    tooltipPointerClassName?: string;
-    positionKeyStemOverride?: string;
-    onTooltipShow?: () => void;
-    onTooltipHide?: () => void;
-    onAnimationRest?: () => void;
-    "aria-label"?: string | false;
-    children: (props: Record<string, any>) => React.ReactNode;
-}
-
-export interface ManaRichTooltipProps {
-    title?: string;
-    body: string;
-    asset?: React.ReactNode | { src: string; alt?: string; };
-    assetSize?: number;
-    asContainer?: boolean;
-    element?: "span" | "div";
-    position?: TooltipPosition;
-    align?: TooltipAlign;
-    spacing?: number;
-    caretConfig?: { align?: "start" | "center" | "end"; };
-    layerContext?: any;
-    targetElementRef?: React.RefObject<HTMLElement>;
-    anchorRef?: React.RefObject<HTMLElement>;
-    positionKey?: string;
-    ariaHidden?: boolean;
-    shouldShow?: boolean;
-    delay?: number;
-    onTooltipShow?: () => void;
-    onTooltipHide?: () => void;
-    forceOpen?: boolean;
-    overflowOnly?: boolean;
-    hideOnClick?: boolean;
-    children: React.ReactNode | ((props: Record<string, any>) => React.ReactNode);
-}
-
-export interface PopoverAction {
-    text: string;
-    onClick?: () => void;
-    variant?: "primary" | "secondary";
-}
-
-export interface ManaPopoverProps {
-    title?: string;
-    body?: string;
-    badge?: React.ReactNode;
-    graphic?: { src: string; aspectRatio?: string; };
-    size?: PopoverSize;
-    actions?: PopoverAction[];
-    textLink?: { text: string; onClick?: () => void; };
-    gradientColor?: string;
-    scrollBehavior?: string;
-    hasVideo?: boolean;
-    onRequestClose?: (reason: string) => void;
-    popoverRef?: React.Ref<HTMLDivElement>;
-    targetElementRef: React.RefObject<HTMLElement | null>;
-    shouldShow: boolean;
-    position?: TooltipPosition;
-    caretConfig?: { align?: "start" | "center" | "end"; };
-    alignmentStrategy?: "edge" | "trigger-center";
-    align?: "left" | "center" | "right";
-}
diff --git a/src/equicordplugins/components.dev/types/usersummary.d.ts b/src/equicordplugins/components.dev/types/usersummary.d.ts
deleted file mode 100644
index 366e7a564..000000000
--- a/src/equicordplugins/components.dev/types/usersummary.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { User } from "@vencord/discord-types";
-
-export type UserSummarySize = 16 | 24 | 32 | 56;
-
-export interface UserSummaryItemProps {
-    users: (User | null)[];
-    max?: number;
-    count?: number;
-    size?: UserSummarySize;
-    guildId?: string;
-    showUserPopout?: boolean;
-    showDefaultAvatarsForNullUsers?: boolean;
-    renderUser?: (user: User | null, isLast: boolean, index: number) => React.ReactNode;
-    renderMoreUsers?: (text: string, count: number) => React.ReactNode;
-    renderIcon?: boolean;
-    renderLeadingIcon?: (className: string) => React.ReactNode;
-    dimEmptyUsers?: boolean;
-    hideMoreUsers?: boolean;
-    useFallbackUserForPopout?: boolean;
-    extraDetail?: React.ReactNode;
-    className?: string;
-}
diff --git a/src/equicordplugins/contentWarning/index.tsx b/src/equicordplugins/contentWarning/index.tsx
index cb2283c19..0c6982df5 100644
--- a/src/equicordplugins/contentWarning/index.tsx
+++ b/src/equicordplugins/contentWarning/index.tsx
@@ -152,6 +152,7 @@ export default definePlugin({
     name: "ContentWarning",
     authors: [EquicordDevs.camila314],
     description: "Allows you to specify certain trigger words that will be blurred by default. Hovering/Clicking on the blurred content will reveal it.",
+    tags: ["Appearance", "Utility"],
     settings,
     patches: [
         {
diff --git a/src/equicordplugins/copyProfileColors/index.tsx b/src/equicordplugins/copyProfileColors/index.tsx
index 256e86994..d6acd32e5 100644
--- a/src/equicordplugins/copyProfileColors/index.tsx
+++ b/src/equicordplugins/copyProfileColors/index.tsx
@@ -7,14 +7,20 @@
 import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { copyToClipboard } from "@utils/clipboard";
 import { EquicordDevs } from "@utils/constants";
+import { Logger } from "@utils/Logger";
 import definePlugin from "@utils/types";
-import { Menu, Toasts, UserProfileStore } from "@webpack/common";
+import { User } from "@vencord/discord-types";
+import { Menu, SelectedGuildStore, Toasts, UserProfileStore } from "@webpack/common";
 
-function getProfileColors(userId) {
+const logger = new Logger("CopyProfileColors");
+
+function getProfileColors(userId: string, guildId?: string) {
     try {
-        const profile = UserProfileStore.getUserProfile(userId);
+        const profile = guildId
+            ? UserProfileStore.getGuildMemberProfile(userId, guildId)
+            : UserProfileStore.getUserProfile(userId);
 
-        if (!profile || !profile.themeColors || profile.themeColors.length < 2) {
+        if (!profile?.themeColors || profile.themeColors.length < 2) {
             return null;
         }
 
@@ -23,13 +29,13 @@ function getProfileColors(userId) {
 
         return { primaryColor, secondaryColor };
     } catch (e) {
-        console.error("Failed to get profile colors:", e);
+        logger.error("Failed to get profile colors:", e);
         return null;
     }
 }
 
-function copyProfileColors(userId) {
-    const colors = getProfileColors(userId);
+function copyProfileColors(userId: string, guildId?: string) {
+    const colors = getProfileColors(userId, guildId);
 
     if (!colors) {
         Toasts.show({
@@ -53,7 +59,7 @@ function copyProfileColors(userId) {
             id: Toasts.genId()
         });
     } catch (e) {
-        console.error("Failed to copy to clipboard:", e);
+        logger.error("Failed to copy to clipboard:", e);
         Toasts.show({
             type: Toasts.Type.FAILURE,
             message: "Error copying profile colors!",
@@ -75,8 +81,15 @@ export function ColorIcon() {
     );
 }
 // spawn in the context menu
-const userContextMenuPatch: NavContextMenuPatchCallback = (children, { user }) => {
+const userContextMenuPatch: NavContextMenuPatchCallback = (children, { user, guildId }: { user?: User; guildId?: string; }) => {
     if (!user) return;
+
+    const effectiveGuildId = guildId ?? SelectedGuildStore.getGuildId();
+    const guildProfile = effectiveGuildId
+        ? UserProfileStore.getGuildMemberProfile(user.id, effectiveGuildId)
+        : null;
+    const hasGuildColors = guildProfile?.themeColors && guildProfile.themeColors.length >= 2;
+
     children.push(
         <Menu.MenuItem
             id="CopyProfileColors"
@@ -85,12 +98,24 @@ const userContextMenuPatch: NavContextMenuPatchCallback = (children, { user }) =
             action={() => copyProfileColors(user.id)}
         />
     );
+
+    if (hasGuildColors && effectiveGuildId) {
+        children.push(
+            <Menu.MenuItem
+                id="CopyServerProfileColors"
+                icon={ColorIcon}
+                label="Copy Server Profile Colors"
+                action={() => copyProfileColors(user.id, effectiveGuildId)}
+            />
+        );
+    }
 };
 
 export default definePlugin({
     name: "CopyProfileColors",
     description: "A plugin to copy people's profile gradient colors to clipboard.",
-    authors: [EquicordDevs.Crxa, EquicordDevs.Cortex],
+    tags: ["Appearance", "Customisation"],
+    authors: [EquicordDevs.Crxa, EquicordDevs.Cortex, EquicordDevs.Gir0fa],
     contextMenus: {
         "user-context": userContextMenuPatch,
         "user-profile-actions": userContextMenuPatch
diff --git a/src/equicordplugins/copyStatusUrls/index.ts b/src/equicordplugins/copyStatusUrls/index.ts
index c05692269..ff17bb6f0 100644
--- a/src/equicordplugins/copyStatusUrls/index.ts
+++ b/src/equicordplugins/copyStatusUrls/index.ts
@@ -23,6 +23,7 @@ const getMetadataFromApi: (activity: any, userId: string) => Promise<any> = find
 export default definePlugin({
     name: "CopyStatusUrls",
     description: "Copy the users status url when you right-click it",
+    tags: ["Activity", "Utility"],
     authors: [Devs.sadan],
 
     patches: [
diff --git a/src/equicordplugins/copyUserMention/index.tsx b/src/equicordplugins/copyUserMention/index.tsx
index e11eda7e0..afcdaa55f 100644
--- a/src/equicordplugins/copyUserMention/index.tsx
+++ b/src/equicordplugins/copyUserMention/index.tsx
@@ -48,6 +48,7 @@ export default definePlugin({
     name: "CopyUserMention",
     authors: [EquicordDevs.Cortex, Devs.castdrian],
     description: "Adds a button to copy user's mention on the user context menu, works best with ValidUser.",
+    tags: ["Chat", "Utility"],
     contextMenus: {
         "user-context": UserContextMenuPatch
     }
diff --git a/src/equicordplugins/cursorBuddy/index.tsx b/src/equicordplugins/cursorBuddy/index.tsx
index 478d41cb8..1bfb47a5c 100644
--- a/src/equicordplugins/cursorBuddy/index.tsx
+++ b/src/equicordplugins/cursorBuddy/index.tsx
@@ -235,8 +235,9 @@ migratePluginSettings("CursorBuddy", "Oneko", "oneko");
 export default definePlugin({
     name: "CursorBuddy",
     description: "Adds a sprite that follows your cursor.",
+    tags: ["Appearance", "Customisation", "Fun"],
     authors: [Devs.Ven, Devs.adryd, EquicordDevs.nexpid, EquicordDevs.ZcraftElite],
-    tags: ["Oneko", "FatassHorse", "Pet"],
+    searchTerms: ["Oneko", "FatassHorse", "Pet"],
     settings,
     isModified: true,
 
diff --git a/src/equicordplugins/customFolderIcons/index.tsx b/src/equicordplugins/customFolderIcons/index.tsx
index eecc37762..7c860d5f5 100644
--- a/src/equicordplugins/customFolderIcons/index.tsx
+++ b/src/equicordplugins/customFolderIcons/index.tsx
@@ -14,6 +14,7 @@ import { folderProp, int2rgba } from "./util";
 export default definePlugin({
     name: "CustomFolderIcons",
     description: "Customize folder icons with any png",
+    tags: ["Appearance", "Customisation", "Organisation"],
     authors: [EquicordDevs.sadan],
     settings,
     patches: [
diff --git a/src/equicordplugins/customSounds/index.tsx b/src/equicordplugins/customSounds/index.tsx
index 7af13bd02..5a99fe1c5 100644
--- a/src/equicordplugins/customSounds/index.tsx
+++ b/src/equicordplugins/customSounds/index.tsx
@@ -393,6 +393,8 @@ export function findOverride(id: string): SoundOverride | null {
 export default definePlugin({
     name: "CustomSounds",
     description: "Customize Discord's sounds.",
+    dependencies: ["AudioPlayerAPI"],
+    tags: ["Customisation", "Notifications", "Voice"],
     authors: [Devs.ScattrdBlade, Devs.TheKodeToad],
     settings,
     startAt: StartAt.Init,
diff --git a/src/equicordplugins/customStatusTimeouts/index.tsx b/src/equicordplugins/customStatusTimeouts/index.tsx
new file mode 100644
index 000000000..d76f258a1
--- /dev/null
+++ b/src/equicordplugins/customStatusTimeouts/index.tsx
@@ -0,0 +1,116 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { EquicordDevs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+const Millis = {
+    HALF_SECOND: 500,
+    SECOND: 1e3,
+    MINUTE: 6e4,
+    HOUR: 36e5,
+    DAY: 864e5,
+    WEEK: 6048e5,
+    DAYS_30: 2592e6
+};
+
+const settings = definePluginSettings({
+    showForeverOnTop: {
+        type: OptionType.BOOLEAN,
+        description: "Show the Forever option at the top of the list instead of the bottom.",
+        restartNeeded: true,
+        default: true
+    },
+    extraSeconds: {
+        type: OptionType.STRING,
+        description: "Extra seconds to add, separated by a comma (e.g. 5, 10, 30)",
+        restartNeeded: true,
+        default: "15, 30, 45"
+    },
+    extraMinutes: {
+        type: OptionType.STRING,
+        description: "Extra minutes to add, separated by a comma (e.g. 5, 10, 30)",
+        restartNeeded: true,
+        default: "5, 10, 30"
+    },
+    extraHours: {
+        type: OptionType.STRING,
+        description: "Extra hours to add, separated by a comma (e.g. 2, 4, 6, 12)",
+        restartNeeded: true,
+        default: "2, 4, 6, 12"
+    },
+    extraDays: {
+        type: OptionType.STRING,
+        description: "Extra days to add, separated by a comma (e.g. 1, 2)",
+        restartNeeded: true,
+        default: "1, 2"
+    },
+});
+
+export default definePlugin({
+    name: "CustomStatusTimeouts",
+    description: "Adds configurable timeout presets to the status (presence) menu.",
+    tags: ["Activity", "Utility"],
+    authors: [EquicordDevs.Kiri, EquicordDevs.thororen],
+    settings,
+    patches: [
+        {
+            find: "#{intl::DURATION_FOREVER}",
+            replacement: {
+                match: /\[\{duration.*?#{intl::DURATION_FOREVER}\)\}\]/,
+                replace: "$self.buildTimeouts($&)"
+            }
+        }
+    ],
+    buildTimeouts(existing) {
+        const parse = (str: string) => str.split(",").map(s => Number(s.trim())).filter(Boolean);
+
+        const seconds = parse(settings.store.extraSeconds);
+        const minutes = parse(settings.store.extraMinutes);
+        const hours = parse(settings.store.extraHours);
+        const days = parse(settings.store.extraDays);
+        // I was testing weeks and months and for some reason random ones didnt apply look below for the working ones
+        // tested weeks between 1-12 working weeks were 1, 2, 3, 8, 9, 10 the rest didnt work
+        // tested months between 1-12 working months were 2, 4, 10, 12 the rest didnt work
+        // for months I only tested evens except for 1 so I hardcoded them to avoid user complaints
+        const weeks = [1, 2, 3];
+        const months = [2, 4];
+
+        const extra = [
+            ...seconds.map(s => ({
+                duration: s * Millis.SECOND,
+                label: () => `For ${s} ${s === 1 ? "Second" : "Seconds"}`
+            })),
+            ...minutes.map(m => ({
+                duration: m * Millis.MINUTE,
+                label: () => `For ${m} ${m === 1 ? "Minute" : "Minutes"}`
+            })),
+            ...hours.map(h => ({
+                duration: h * Millis.HOUR,
+                label: () => `For ${h} ${h === 1 ? "Hour" : "Hours"}`
+            })),
+            ...days.map(d => ({
+                duration: d * Millis.DAY,
+                label: () => `For ${d} ${d === 1 ? "Day" : "Days"}`
+            })),
+            ...weeks.map(w => ({
+                duration: w * Millis.WEEK,
+                label: () => `For ${w} ${w === 1 ? "Week" : "Weeks"}`
+            })),
+            ...months.map(m => ({
+                duration: m * Millis.DAYS_30,
+                label: () => `For ${m} ${m === 1 ? "Month" : "Months"}`
+            })),
+        ];
+
+        return [...existing, ...extra].sort((a, b) => {
+            if (a.duration === undefined) return settings.store.showForeverOnTop ? -1 : 1;
+            if (b.duration === undefined) return settings.store.showForeverOnTop ? 1 : -1;
+            return a.duration - b.duration;
+        });
+    }
+});
diff --git a/src/equicordplugins/customTimestamps/index.tsx b/src/equicordplugins/customTimestamps/index.tsx
index 9aa55258a..3db95fdf3 100644
--- a/src/equicordplugins/customTimestamps/index.tsx
+++ b/src/equicordplugins/customTimestamps/index.tsx
@@ -125,6 +125,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "CustomTimestamps",
     description: "Custom timestamps on messages and tooltips",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.Rini, EquicordDevs.nvhhr, EquicordDevs.Suffocate, Devs.Obsidian],
     settings,
     settingsAboutComponent: () => (
diff --git a/src/equicordplugins/customTimestamps/style.css b/src/equicordplugins/customTimestamps/style.css
index 279334fc0..bd538cbfb 100644
--- a/src/equicordplugins/customTimestamps/style.css
+++ b/src/equicordplugins/customTimestamps/style.css
@@ -12,6 +12,7 @@
     padding: 10px 0;
     cursor: pointer;
     top: -8px;
+    z-index: 10;
     border: solid grey 1px;
     border-radius: 5px;
 }
\ No newline at end of file
diff --git a/src/equicordplugins/customUserColors/index.tsx b/src/equicordplugins/customUserColors/index.tsx
index db4db60e5..55f92cf3f 100644
--- a/src/equicordplugins/customUserColors/index.tsx
+++ b/src/equicordplugins/customUserColors/index.tsx
@@ -100,6 +100,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "CustomUserColors",
     description: "Lets you add a custom color to any user, anywhere! Highly recommend to use with typingTweaks and roleColorEverywhere",
+    tags: ["Appearance", "Customisation", "Chat"],
     authors: [EquicordDevs.mochienya],
     contextMenus: {
         "user-context": userContextMenuPatch,
diff --git a/src/equicordplugins/declutter/index.tsx b/src/equicordplugins/declutter/index.tsx
index e816d9159..6ed8a4245 100644
--- a/src/equicordplugins/declutter/index.tsx
+++ b/src/equicordplugins/declutter/index.tsx
@@ -6,13 +6,16 @@
 
 import "./style.css";
 
+import { isPluginEnabled } from "@api/PluginManager";
 import { definePluginSettings, migrateOldSettingToNewPlugin, migratePluginSetting, migratePluginSettings } from "@api/Settings";
 import { Divider } from "@components/Divider";
 import { HeadingSecondary } from "@components/Heading";
 import { Notice } from "@components/Notice";
+import decor from "@plugins/decor";
 import { classNameFactory } from "@utils/css";
 import { Devs, EquicordDevs } from "@utils/index";
 import definePlugin, { OptionType } from "@utils/types";
+import { Alerts } from "@webpack/common";
 
 migratePluginSettings("Declutter", "BetterUserArea", "Anammox");
 migrateOldSettingToNewPlugin("Declutter", "removeClanTag", "GuildTagSettings", "hideTags");
@@ -37,6 +40,13 @@ export const settings = definePluginSettings({
         type: OptionType.COMPONENT,
         component: () => SectionSeparator("User Profile"),
     },
+    removeAvatarDecoration: {
+        type: OptionType.BOOLEAN,
+        description: "Remove avatar decorations.",
+        default: false,
+        disabled: () => isPluginEnabled("Decor"),
+        restartNeeded: true,
+    },
     removeNameplate: {
         type: OptionType.BOOLEAN,
         description: "Remove nameplates.",
@@ -141,15 +151,37 @@ function SectionSeparator(title: string) {
 export default definePlugin({
     name: "Declutter",
     description: "Cleans up Discord by removing non-essential UI elements like profile effects, shop tabs, boosts, and more.",
+    tags: ["Appearance", "Customisation"],
     authors: [EquicordDevs.Leon135, Devs.prism, Devs.Kyuuhachi],
+    start() {
+        if (isPluginEnabled("Decor") && settings.store.removeAvatarDecoration) {
+            settings.store.removeAvatarDecoration = false;
+            Alerts.show({
+                title: "Declutter",
+                body: "Avatar decoration removal has been disabled to prevent conflicts with Decor plugin.",
+                confirmText: "OK",
+                // @ts-expect-error not typed
+                confirmVariant: "critical-primary"
+            });
+        }
+    },
     settings,
     patches: [
         {
-            // Nameplate
-            find: "#{intl::AVATAR_MALLOW}",
+            // Avatar decoration
+            find: "isAvatarDecorationAnimating:",
             replacement: {
-                match: /function \i\(\i\)\{(?=.{0,25}skuId:)/,
-                replace: "$&return null;"
+                match: /(?<=\{avatarDecoration:.{0,40}?)(void 0!==\i\?\i:)\i(?=\)?,canAnimate:)/,
+                replace: "$1null"
+            },
+            predicate: () => settings.store.removeAvatarDecoration && !isPluginEnabled(decor.name),
+        },
+        {
+            // Nameplate
+            find: ".MINI_PREVIEW,[",
+            replacement: {
+                match: /function \i\((\i)\)\{(?=let.{1,5}\{nameplate:\i,)/,
+                replace: '$&if($1.placement!=="preview"&&$1.placement!=="mini_preview")return null;'
             },
             predicate: () => settings.store.removeNameplate,
         },
@@ -157,8 +189,8 @@ export default definePlugin({
             // Profile banner animation effect
             find: "bannerAdjustment,isHovering",
             replacement: {
-                match: /\i=\i=>\{(?=.{0,50}\.useReducedMotion\))/,
-                replace: "$&return null;"
+                match: /\i=(\i)=>\{(?=.{0,50}\.useReducedMotion\))/,
+                replace: "$&if(!$1.shopPreview)return null;"
             },
             predicate: () => settings.store.removeProfileEffect,
         },
diff --git a/src/equicordplugins/disableCameras/index.tsx b/src/equicordplugins/disableCameras/index.tsx
index aa928134b..c2b5d1011 100644
--- a/src/equicordplugins/disableCameras/index.tsx
+++ b/src/equicordplugins/disableCameras/index.tsx
@@ -10,10 +10,11 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "DisableCameras",
     description: "Disables cameras in a call by default",
+    tags: ["Appearance", "Customisation", "Media", "Privacy"],
     authors: [Devs.Joona],
     patches: [
         {
-            find: ".identifyStartTime));",
+            find: ".identifyStartTime))",
             replacement: {
                 match: /\i\.self_video\|\|!1/g,
                 replace: "false"
diff --git a/src/equicordplugins/discordDevBanner/components/makeDevBanner.tsx b/src/equicordplugins/discordDevBanner/components/makeDevBanner.tsx
index 48ef55064..10642d7e0 100644
--- a/src/equicordplugins/discordDevBanner/components/makeDevBanner.tsx
+++ b/src/equicordplugins/discordDevBanner/components/makeDevBanner.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import SettingsPlugin from "@plugins/_core/settings";
 import { detectClient } from "@plugins/_core/supportHelper";
 import { gitHashShort } from "@shared/vencordUserAgent";
 import { React } from "@webpack/common";
-import SettingsPlugin from "plugins/_core/settings";
 import { JSX } from "react";
 
 import { ChromiumIcon, ClientIcon, DevBannerIcon, DiscordIcon, ElectronIcon, EquicordIcon, names, settings } from ".";
diff --git a/src/equicordplugins/discordDevBanner/index.tsx b/src/equicordplugins/discordDevBanner/index.tsx
index 4e56bd288..fdd32848e 100644
--- a/src/equicordplugins/discordDevBanner/index.tsx
+++ b/src/equicordplugins/discordDevBanner/index.tsx
@@ -14,6 +14,7 @@ import { makeDevBanner, settings } from "./components";
 export default definePlugin({
     name: "DiscordDevBanner",
     description: "Enables the Discord developer banner, in which displays the build-ID",
+    tags: ["Appearance", "Console", "Developers"],
     authors: [EquicordDevs.KrystalSkull, Devs.thororen],
     settings,
     patches: [
@@ -25,7 +26,11 @@ export default definePlugin({
                     replace: "true"
                 },
                 {
-                    match: /children:\[.*?\{\}\)\]/g,
+                    match: /children:\[.{0,80}#{intl::BUILD_OVERRIDE}.{0,15}\{\}\)\]/,
+                    replace: "children:$self.makeDevBanner()"
+                },
+                {
+                    match: /children:\[.{0,80}#{intl::uyrfYF::raw}.{0,50}\{\}\)\]/,
                     replace: "children:$self.makeDevBanner()"
                 },
             ]
diff --git a/src/equicordplugins/dragFavoriteEmotes/index.tsx b/src/equicordplugins/dragFavoriteEmotes/index.tsx
index 2b8e6b096..711308b2c 100644
--- a/src/equicordplugins/dragFavoriteEmotes/index.tsx
+++ b/src/equicordplugins/dragFavoriteEmotes/index.tsx
@@ -45,12 +45,13 @@ export default definePlugin({
     name: "DragFavoriteEmotes",
     authors: [EquicordDevs.PWall],
     description: "Adds the ability to change the order of your favourite emotes",
+    tags: ["Customisation", "Chat", "Emotes"],
     patches: [
         {
             find: "#{intl::EMOJI_FAVORITE_TOOLTIP}",
             replacement: [
                 {
-                    match: /(ref:\i,children:)(\(0,\i.jsx\)\(\i.\i)/,
+                    match: /(ref:\i,children:)(\(0,\i.jsxs?\)\(\i)/,
                     replace: "$1arguments[0]?.collected?.isDragging?$self.dragItem():$2",
                 },
                 {
diff --git a/src/equicordplugins/dragify/index.tsx b/src/equicordplugins/dragify/index.tsx
index ea819273e..1bb788f09 100644
--- a/src/equicordplugins/dragify/index.tsx
+++ b/src/equicordplugins/dragify/index.tsx
@@ -149,13 +149,14 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "Dragify",
     description: "Drop users, channels, or servers into chat to insert mentions or invites.",
+    tags: ["Chat", "Servers", "Utility", "Voice"],
     authors: [EquicordDevs.justjxke],
     settings,
 
     patches: [
         // Voice user rows (voice channel sidebar list)
         {
-            find: '"system:click_outside","user:escape"',
+            find: ".VOICE_USER],shouldShow:",
             replacement: {
                 match: /(?<=GuildChannelUserContextMenu.{0,150})"data-dnd-name":\i/,
                 replace: "\"data-dragify-user\":!0,\"data-user-id\":arguments[0].user?.id,draggable:!0,onDragStart:e=>$self.onUserDragStart(e,arguments[0].user),$&"
@@ -171,19 +172,11 @@ export default definePlugin({
                 },
                 // Voice channel rows (guild sidebar fallback - li wrapper)
                 {
-                    match: /(?<=getModeClass\(\),.{0,50})"data-dnd-name":.{0,25},children:\[/,
+                    match: /(?<=this\.getModeClass\(\),.{0,50})"data-dnd-name":.{0,40},children:\[/g,
                     replace: "draggable:!0,onDragStart:e=>$self.onChannelDragStart(e,{id:this?.props?.channel?.id,guild_id:this?.props?.channel?.guild_id}),$&"
                 }
             ]
         },
-        // Voice channel rows (alternate voice list implementation)
-        {
-            find: "handleClickChat",
-            replacement: {
-                match: /(?<=getModeClass\(\),.{0,50})"data-dnd-name":.{0,25},children:\[/,
-                replace: "draggable:!0,onDragStart:e=>$self.onChannelDragStart(e,{id:this?.props?.channel?.id,guild_id:this?.props?.channel?.guild_id}),$&"
-            }
-        },
         // Thread rows in channel list (sidebar thread items)
         {
             find: "__invalid_threadMainContent",
@@ -198,7 +191,7 @@ export default definePlugin({
         {
             find: "shouldShowThreadsPopout",
             replacement: {
-                match: /(?<=getClassName\(\).{0,50})"data-dnd-name":.{0,25},onMouseEnter:/,
+                match: /(?<=getClassName\(\).{0,50})"data-dnd-name":.{0,40},onMouseEnter:/,
                 replace: "draggable:!0,onDragStart:e=>$self.onChannelDragStart(e,{id:this?.props?.channel?.id,guild_id:this?.props?.channel?.guild_id}),$&"
             }
         },
diff --git a/src/equicordplugins/elementHighlighter.dev/index.tsx b/src/equicordplugins/elementHighlighter.dev/index.tsx
index edbda06bb..c466b1449 100644
--- a/src/equicordplugins/elementHighlighter.dev/index.tsx
+++ b/src/equicordplugins/elementHighlighter.dev/index.tsx
@@ -449,6 +449,7 @@ function onToggle(e: KeyboardEvent) {
 export default definePlugin({
     name: "ElementHighlighter",
     description: "Highlight and inspect elements easily.",
+    tags: ["Developers"],
     authors: [Devs.prism],
     settings,
 
diff --git a/src/equicordplugins/equibopStreamFixes.equibop/index.tsx b/src/equicordplugins/equibopStreamFixes.equibop/index.tsx
index fb9a99b3f..f60c764e7 100644
--- a/src/equicordplugins/equibopStreamFixes.equibop/index.tsx
+++ b/src/equicordplugins/equibopStreamFixes.equibop/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { isPluginEnabled } from "@api/PluginManager";
-import { definePluginSettings } from "@api/Settings";
+import { definePluginSettings, Settings } from "@api/Settings";
 import fakeNitro from "@plugins/fakeNitro";
 import { EquicordDevs } from "@utils/constants";
 import { localStorage } from "@utils/localStorage";
@@ -89,6 +89,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "EquibopStreamFixes",
     description: "Tries to fix stream quality on Equibop by patching Discord's encoder and quality restrictions.",
+    tags: ["Voice"],
     authors: [EquicordDevs.creations],
     settings,
 
@@ -119,15 +120,15 @@ export default definePlugin({
             find: "canUseCustomStickersEverywhere:",
             replacement: [
                 {
-                    match: /canStreamQuality:\i,/,
-                    replace: "canStreamQuality:()=>true,",
+                    match: /(?<=canUseHighVideoUploadQuality:function\(\i\)\{)/,
+                    replace: "return true;",
                 },
                 {
-                    match: /canUseHighVideoUploadQuality:\i,/,
-                    replace: "canUseHighVideoUploadQuality:()=>true,",
+                    match: /(?<=canStreamQuality:function\(\i,\i\)\{)/,
+                    replace: "return true;",
                 },
             ],
-            predicate: () => settings.store.unlockQualityOptions && !isPluginEnabled(fakeNitro.name),
+            predicate: () => settings.store.unlockQualityOptions && !isPluginEnabled(fakeNitro.name) && !Settings.plugins[fakeNitro.name].enableStreamQualityBypass,
             noWarn: true,
         },
         // remove guild premium tier restriction from stream fps options
@@ -142,10 +143,10 @@ export default definePlugin({
         },
         // allow resolutions above 720p at 60fps
         {
-            find: ".RESOLUTION_720&&",
+            find: ",setIsForceShowSharingPopout:",
             replacement: {
-                match: /\i===\i\.\i\.RESOLUTION_720&&\i!==\i\.\i\.FPS_60/,
-                replace: "false",
+                match: /\i!==\i\.\i\.RESOLUTION_720\|\|\i===\i\.\i\.FPS_60/,
+                replace: "true",
             },
             predicate: () => settings.store.removeResolutionCap,
         },
diff --git a/src/equicordplugins/equicordHelper/index.tsx b/src/equicordplugins/equicordHelper/index.tsx
index d7d082bb9..40ddf07a0 100644
--- a/src/equicordplugins/equicordHelper/index.tsx
+++ b/src/equicordplugins/equicordHelper/index.tsx
@@ -8,13 +8,14 @@ import { ApplicationCommandInputType, sendBotMessage } from "@api/Commands";
 import { HeaderBarButton } from "@api/HeaderBar";
 import { addMessagePreSendListener, removeMessagePreSendListener } from "@api/MessageEvents";
 import { isPluginEnabled } from "@api/PluginManager";
-import { definePluginSettings, migratePluginToSettings } from "@api/Settings";
+import { definePluginSettings, migratePluginToSettings, Settings } from "@api/Settings";
+import { ShieldIcon, WarningIcon } from "@components/Icons";
 import customRPC from "@plugins/customRPC";
 import { Devs, EquicordDevs, GUILD_ID, SUPPORT_CHANNEL_ID, SUPPORT_CHANNEL_IDS, VC_SUPPORT_CHANNEL_IDS } from "@utils/constants";
 import { isAnyPluginDev } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
 import { StandingState } from "@vencord/discord-types/enums";
-import { findByCodeLazy, findExportedComponentLazy, findStoreLazy } from "@webpack";
+import { findByCodeLazy, findStoreLazy } from "@webpack";
 import { Alerts, ApplicationCommandIndexStore, NavigationRouter, React, SettingsRouter, UserStore, useStateFromStores } from "@webpack/common";
 import { ComponentType } from "react";
 
@@ -29,8 +30,6 @@ let clicked = false;
 
 const SafetyHubStore = findStoreLazy("SafetyHubStore");
 const fetchSafetyHub: () => Promise<void> = findByCodeLazy("SAFETY_HUB_FETCH_START");
-const WarningIcon = findExportedComponentLazy("WarningIcon");
-const ShieldIcon = findExportedComponentLazy("ShieldIcon");
 
 const StandingConfig: Record<number, { label: string; hoverColor: string; Icon: ComponentType<any>; }> = {
     [StandingState.ALL_GOOD]: { label: "All good!", hoverColor: "var(--status-positive)", Icon: ShieldIcon },
@@ -125,14 +124,22 @@ const settings = definePluginSettings({
     disableAdoptTagPrompt: {
         type: OptionType.BOOLEAN,
         description: "Disable the prompt to adopt tags",
-        default: true,
-        restartNeeded: true
+        restartNeeded: true,
+        default: false,
     },
+    jsonGateway: {
+        type: OptionType.BOOLEAN,
+        description: "Forces JSON on gateway reconnect",
+        restartNeeded: true,
+        default: false,
+    }
 });
 
 export default definePlugin({
     name: "EquicordHelper",
     description: "Used to provide support, fix discord caused crashes, and other misc features.",
+    tags: ["Appearance", "Commands", "Utility"],
+    dependencies: ["CommandsAPI", "HeaderBarAPI", "MessageAccessoriesAPI"],
     authors: [
         Devs.thororen,
         EquicordDevs.nyx,
@@ -165,6 +172,22 @@ export default definePlugin({
                 }
             ]
         },
+        // Fix a race condition?
+        {
+            find: ".completeOperation(",
+            replacement: {
+                match: /(?<=this\.nextId\(\);)(\i\(\i\)),(.{0,200}reject:\i\}\))/,
+                replace: "$2,$1"
+            }
+        },
+        // catch if it cant open
+        {
+            find: "discarding speculative database",
+            replacement: {
+                match: /await (\i)\((\i)\)(?=;.{0,15}this\.databases)/,
+                replace: "$&.catch(()=>null)"
+            }
+        },
         // When focused on voice channel or group chat voice call
         {
             find: ".STATUS_WARNING_BACKGROUND})})",
@@ -195,10 +218,10 @@ export default definePlugin({
         },
         // Remove Activity Section above Member List
         {
-            find: ".MEMBERLIST_CONTENT_FEED_TOGGLED,",
+            find: ".GLOBAL_FEED});",
             predicate: () => settings.store.removeActivitySection,
             replacement: {
-                match: /null==\i\|\|/,
+                match: /null==\i\|\|0.{0,100}VIEW_CHANNEL\)&&/,
                 replace: "true||$&"
             },
         },
@@ -258,7 +281,7 @@ export default definePlugin({
         },
         // Removes Modal Animation
         {
-            find: "renderLurkerModeUpsellPopout,position:",
+            find: ".SWITCH_THUMB_BACKGROUND_SELECTED_DEFAULT)",
             predicate: () => settings.store.noModalAnimation,
             replacement: {
                 match: /200:300/g,
@@ -268,11 +291,41 @@ export default definePlugin({
         {
             find: "GuildTagAvailableCoachmark",
             replacement: {
-                match: /return.{0,100}shouldShow/g,
+                match: /return.{0,200}GUILD_TAG_COACHMARK_ASSET/g,
                 replace: "return null;$&"
             },
             predicate: () => settings.store.disableAdoptTagPrompt
-        }
+        },
+        {
+            find: "JSONEncoding",
+            replacement: {
+                match: /void 0!==\i\?\i:/,
+                replace: ""
+            },
+            predicate: () => settings.store.jsonGateway
+        },
+        {
+            find: ".USE_OSX_NATIVE_TRAFFIC_LIGHTS",
+            replacement: {
+                match: /case \i\.\i\.WINDOWS:/,
+                replace: 'case "WEB":'
+            },
+            predicate: () => Settings.winNativeTitleBar,
+        },
+        {
+            find: '"refresh-title-bar-small"',
+            replacement: [
+                {
+                    match: /\i===\i\.PlatformTypes\.WINDOWS/g,
+                    replace: "false"
+                },
+                {
+                    match: /\i===\i\.PlatformTypes\.WEB/g,
+                    replace: "true"
+                }
+            ],
+            predicate: () => Settings.winNativeTitleBar,
+        },
     ],
     renderMessageAccessory(props) {
         return (
diff --git a/src/equicordplugins/equicordToolbox/index.tsx b/src/equicordplugins/equicordToolbox/index.tsx
index 5a6b32394..f2e9542f7 100644
--- a/src/equicordplugins/equicordToolbox/index.tsx
+++ b/src/equicordplugins/equicordToolbox/index.tsx
@@ -77,11 +77,10 @@ migratePluginSettings("EquicordToolbox", "VencordToolbox");
 export default definePlugin({
     name: "EquicordToolbox",
     description: "Adds a button next to the inbox button in the channel header that houses Equicord quick actions",
+    tags: ["Voice", "Accessibility"],
     authors: [Devs.Ven, Devs.AutumnVN],
     dependencies: ["HeaderBarAPI"],
-
     settings,
-
     headerBarButton: {
         icon: Icon,
         render: VencordPopoutButton,
diff --git a/src/equicordplugins/equicordToolbox/menu.tsx b/src/equicordplugins/equicordToolbox/menu.tsx
index 1f2f45057..3ca297f9e 100644
--- a/src/equicordplugins/equicordToolbox/menu.tsx
+++ b/src/equicordplugins/equicordToolbox/menu.tsx
@@ -5,7 +5,7 @@
  */
 
 import { openNotificationLogModal } from "@api/Notifications/notificationLog";
-import { isPluginEnabled, plugins } from "@api/PluginManager";
+import { isPluginEnabled, isSettingDisabled, isSettingHidden, plugins } from "@api/PluginManager";
 import { Settings, useSettings } from "@api/Settings";
 import { openPluginModal, openSettingsTabModal, PluginsTab, ThemesTab } from "@components/settings";
 import { useAwaiter } from "@utils/react";
@@ -81,8 +81,8 @@ export function buildPluginMenuEntries(includeEmpty = false) {
 
                     let hasAnyOption = false;
 
-                    if (p.options) for (const [key, option] of Object.entries(p.options)) {
-                        if ("hidden" in option && option.hidden) continue;
+                    if (p.settings) for (const [key, option] of Object.entries(p.settings.def)) {
+                        if (isSettingHidden(p.settings, option)) continue;
 
                         hasAnyOption = true;
 
@@ -92,7 +92,7 @@ export function buildPluginMenuEntries(includeEmpty = false) {
                             id: `${p.name}-${key}`,
                             key: key,
                             label: wordsToTitle(wordsFromCamel(key)),
-                            disabled: "disabled" in option ? option.disabled?.call(p.settings) : false,
+                            disabled: isSettingDisabled(p.settings, option)
                         };
 
                         switch (option.type) {
diff --git a/src/equicordplugins/equissant/index.ts b/src/equicordplugins/equissant/index.ts
index 188316213..b5b4ad4bd 100644
--- a/src/equicordplugins/equissant/index.ts
+++ b/src/equicordplugins/equissant/index.ts
@@ -33,6 +33,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "Equissant",
     description: "Crossant every specified amount of clicks :trolley:",
+    tags: ["Fun"],
     authors: [EquicordDevs.SomeAspy, Devs.thororen],
     dependencies: ["AudioPlayerAPI"],
     settings,
diff --git a/src/equicordplugins/exitSounds/index.tsx b/src/equicordplugins/exitSounds/index.tsx
index db67fe6ed..4273c32e0 100644
--- a/src/equicordplugins/exitSounds/index.tsx
+++ b/src/equicordplugins/exitSounds/index.tsx
@@ -104,6 +104,7 @@ let original: typeof ChannelActions.selectVoiceChannel;
 export default definePlugin({
     name: "ExitSounds",
     description: "Play soundboard sounds when you disconnect from voice.",
+    tags: ["Fun", "Voice"],
     authors: [Devs.prism],
     dependencies: ["AudioPlayerAPI"],
     settings,
diff --git a/src/equicordplugins/exportMessages/index.tsx b/src/equicordplugins/exportMessages/index.tsx
index d2d3d68f5..ec3accf62 100644
--- a/src/equicordplugins/exportMessages/index.tsx
+++ b/src/equicordplugins/exportMessages/index.tsx
@@ -129,6 +129,7 @@ function getUsernames(contacts: ContactsList[], type: number): string[] {
 export default definePlugin({
     name: "ExportMessages",
     description: "Allows you to export any message to a file",
+    tags: ["Chat", "Utility"],
     authors: [EquicordDevs.veygax, EquicordDevs.dat_insanity],
     settings,
     contextMenus: {
diff --git a/src/equicordplugins/fastDeleteChannels/index.tsx b/src/equicordplugins/fastDeleteChannels/index.tsx
index e4b20c200..adff9bea7 100644
--- a/src/equicordplugins/fastDeleteChannels/index.tsx
+++ b/src/equicordplugins/fastDeleteChannels/index.tsx
@@ -74,6 +74,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "FastDeleteChannels",
     description: "Adds a trash icon to delete channels",
+    tags: ["Servers", "Utility"],
     authors: [Devs.thororen],
     settings,
     patches: [
diff --git a/src/equicordplugins/favouriteAnything/index.tsx b/src/equicordplugins/favouriteAnything/index.tsx
index b9d094962..9aaa3c214 100644
--- a/src/equicordplugins/favouriteAnything/index.tsx
+++ b/src/equicordplugins/favouriteAnything/index.tsx
@@ -25,8 +25,9 @@ export const AttachmentContext = proxyLazyWebpack(() => React.createContext<null
 export default definePlugin({
     name: "FavouriteAnything",
     description: "Favourite any image, video, or file attachment",
+    tags: ["Chat", "Media"],
     authors: [Devs.nin0dev, EquicordDevs.davri],
-    tags: ["favorite"],
+    searchTerms: ["favorite"],
     managedStyle,
     patches: [
         // EMBEDS
diff --git a/src/equicordplugins/favouriteAnything/polyfills.ts b/src/equicordplugins/favouriteAnything/polyfills.ts
index fc6950a20..1042633c0 100644
--- a/src/equicordplugins/favouriteAnything/polyfills.ts
+++ b/src/equicordplugins/favouriteAnything/polyfills.ts
@@ -44,7 +44,7 @@ interface Uint8ArrayConstructorExtended extends Uint8ArrayConstructor {
     ): Uint8ArrayExtended<ArrayBuffer>;
 }
 
-function supportsToBase64(array: Uint8Array<ArrayBufferLike>): array is Uint8ArrayExtended<ArrayBufferLike> {
+function supportsToBase64(array: Uint8Array<ArrayBufferLike>): boolean {
     return "toBase64" in array && typeof array.toBase64 === "function";
 }
 
diff --git a/src/equicordplugins/fileUpload/constants.ts b/src/equicordplugins/fileUpload/constants.ts
index 5934a3be9..37caa5232 100644
--- a/src/equicordplugins/fileUpload/constants.ts
+++ b/src/equicordplugins/fileUpload/constants.ts
@@ -11,5 +11,8 @@ export function normalizeCorsProxyUrl(url?: string): string {
 }
 
 export function toProxiedUrl(url: string, corsProxyUrl = CORS_PROXY): string {
+    if (corsProxyUrl === "none") {
+        return url;
+    }
     return `${normalizeCorsProxyUrl(corsProxyUrl)}?url=${encodeURIComponent(url)}`;
 }
diff --git a/src/equicordplugins/fileUpload/index.tsx b/src/equicordplugins/fileUpload/index.tsx
index e06d504a8..724b5e926 100644
--- a/src/equicordplugins/fileUpload/index.tsx
+++ b/src/equicordplugins/fileUpload/index.tsx
@@ -22,6 +22,7 @@ import { cancelCurrentUpload, getUploadState, isConfigured, subscribeUploadState
 const cl = classNameFactory("vc-file-upload-");
 const { getUserMaxFileSize } = findByPropsLazy("getUserMaxFileSize");
 let uploadAddFilesInterceptor: ((event: unknown) => void) | null = null;
+let pasteEventListener: ((event: ClipboardEvent) => void) | null = null;
 
 type UploadAddFilesEvent = {
     type: string;
@@ -37,7 +38,7 @@ type UploadAddFilesEvent = {
 };
 
 function shouldInterceptUploadFiles(files: readonly File[], payload: UploadAddFilesEvent): boolean {
-    if (!settings.store.interceptDiscordUploadOnlyOverLimit) return true;
+    if (!settings.store.bypassDiscordUploadOnlyOverLimit) return true;
 
     const directLimit = [payload.maxFileSize, payload.fileSizeLimit, payload.limits?.fileSize].find(limit => Number.isFinite(limit)) as number | undefined;
     const fallbackLimit = getUserMaxFileSize(UserStore.getCurrentUser());
@@ -73,7 +74,7 @@ function interceptUploadAddFiles(event: unknown): void {
 
     if (payload.draftType !== DraftType.ChannelMessage) return;
 
-    if (!Boolean((settings.store as { interceptDiscordUpload?: boolean; }).interceptDiscordUpload) || !isConfigured()) return;
+    if (!settings.store.bypassDiscordUpload || !isConfigured()) return;
 
     const files = [
         ...extractFilesFromValue(payload.files),
@@ -91,6 +92,33 @@ function interceptUploadAddFiles(event: unknown): void {
     void uploadProvidedFiles(uniqueFiles);
 }
 
+function handlePaste(event: ClipboardEvent) {
+    const files = Array.from(event.clipboardData?.files || []);
+    if (files.length === 0) return;
+
+    if (!settings.store.autoUploadPastedFiles || !isConfigured()) return;
+
+    event.preventDefault();
+    event.stopPropagation();
+
+    void uploadProvidedFiles(files);
+}
+
+function formatBytes(bytes: number): string {
+    if (!bytes) return "";
+
+    const units = ["B", "KB", "MB", "GB"];
+    let value = bytes;
+    let unitIndex = 0;
+
+    while (value >= 1024 && unitIndex < units.length - 1) {
+        value /= 1024;
+        unitIndex++;
+    }
+
+    return `${value.toFixed(value >= 10 || unitIndex === 0 ? 0 : 1)} ${units[unitIndex]}`;
+}
+
 const ProgressBarInner = () => {
     const [state, setState] = useState(getUploadState);
 
@@ -99,6 +127,9 @@ const ProgressBarInner = () => {
     if (state.phase === "idle") return null;
 
     const percentage = Math.max(0, Math.min(100, state.percent));
+    const progressLabel = state.totalBytes > 0
+        ? `${Math.round(percentage)}% - ${formatBytes(state.transferredBytes)} of ${formatBytes(state.totalBytes)}`
+        : `${Math.round(percentage)}%`;
 
     return (
         <div
@@ -110,6 +141,9 @@ const ProgressBarInner = () => {
                     {state.status || "Uploading..."}
                 </div>
                 <div className={cl("progress-meta")}>
+                    <span className={cl("progress-percent")}>
+                        {progressLabel}
+                    </span>
                     <span className={cl("progress-attempt")}>
                         {state.attempt > 0 && state.totalAttempts > 0 ? `${state.attempt}/${state.totalAttempts}` : ""}
                     </span>
@@ -216,6 +250,7 @@ const channelAttachMenuPatch: NavContextMenuPatchCallback = (children, props) =>
 export default definePlugin({
     name: "FileUpload",
     description: "Upload images and videos to file hosting services like Zipline and Nest",
+    tags: ["Media"],
     authors: [EquicordDevs.creations, EquicordDevs.keircn, Devs.ScattrdBlade],
     settings,
     patches: [
@@ -247,6 +282,9 @@ export default definePlugin({
 
         uploadAddFilesInterceptor = event => interceptUploadAddFiles(event);
         FluxDispatcher.addInterceptor(uploadAddFilesInterceptor);
+
+        pasteEventListener = event => handlePaste(event);
+        document.addEventListener("paste", pasteEventListener, true);
     },
     stop() {
         if (!uploadAddFilesInterceptor) {
@@ -259,9 +297,14 @@ export default definePlugin({
         }
 
         uploadAddFilesInterceptor = null;
+
+        if (pasteEventListener) {
+            document.removeEventListener("paste", pasteEventListener, true);
+            pasteEventListener = null;
+        }
     },
     shouldBypassDiscordUploadSizeCheck(): boolean {
-        return Boolean((settings.store as { interceptDiscordUpload?: boolean; }).interceptDiscordUpload) && isConfigured();
+        return Boolean(settings.store.bypassDiscordUpload) && isConfigured();
     },
     renderUploadProgress() {
         return <ProgressBar />;
diff --git a/src/equicordplugins/fileUpload/native.ts b/src/equicordplugins/fileUpload/native.ts
index e20121dc5..ad401217d 100644
--- a/src/equicordplugins/fileUpload/native.ts
+++ b/src/equicordplugins/fileUpload/native.ts
@@ -376,6 +376,88 @@ export async function uploadToFilebin(
     }
 }
 
+export async function uploadToPixelVault(
+    _: IpcMainInvokeEvent,
+    fileBuffer: ArrayBuffer,
+    filename: string,
+    uploadKey: string
+): Promise<NativeUploadResult> {
+    try {
+        const formData = new FormData();
+        formData.append("file", new Blob([fileBuffer]), filename);
+
+        const response = await fetch("https://pixelvault.co/", {
+            method: "POST",
+            headers: {
+                Authorization: uploadKey
+            },
+            body: formData
+        });
+
+        const text = await response.text();
+        let data: { resource?: string; url?: string; } | null = null;
+
+        try {
+            data = text ? JSON.parse(text) : null;
+        } catch {
+            data = null;
+        }
+
+        if (!response.ok) {
+            return { success: false, error: `Upload failed: ${response.status} ${text}` };
+        }
+
+        const url = data?.resource || data?.url || text.trim();
+        if (!url) {
+            return { success: false, error: "No URL returned from upload" };
+        }
+
+        return { success: true, url };
+    } catch (e) {
+        return { success: false, error: e instanceof Error ? e.message : "Unknown error" };
+    }
+}
+
+export async function uploadToPixelDrain(
+    _: IpcMainInvokeEvent,
+    fileBuffer: ArrayBuffer,
+    filename: string,
+    apiKey?: string
+): Promise<NativeUploadResult> {
+    try {
+        const headers: Record<string, string> = {};
+        if (apiKey?.trim()) {
+            headers.Authorization = `Basic ${Buffer.from(`:${apiKey.trim()}`).toString("base64")}`;
+        }
+
+        const response = await fetch(`https://pixeldrain.com/api/file/${encodeURIComponent(filename)}`, {
+            method: "PUT",
+            headers,
+            body: new Blob([fileBuffer])
+        });
+
+        const text = await response.text();
+        let data: { id?: string; message?: string; } | null = null;
+        try {
+            data = text ? JSON.parse(text) : null;
+        } catch {
+            data = null;
+        }
+
+        if (!response.ok) {
+            return { success: false, error: data?.message || `Upload failed: ${response.status} ${text}` };
+        }
+
+        if (!data?.id) {
+            return { success: false, error: data?.message || "No URL returned from upload" };
+        }
+
+        return { success: true, url: `https://pixeldrain.com/u/${data.id}` };
+    } catch (e) {
+        return { success: false, error: e instanceof Error ? e.message : "Unknown error" };
+    }
+}
+
 export async function fetchFile(
 
     _: IpcMainInvokeEvent,
diff --git a/src/equicordplugins/fileUpload/settings.tsx b/src/equicordplugins/fileUpload/settings.tsx
index b1aceb041..d5451d3b3 100644
--- a/src/equicordplugins/fileUpload/settings.tsx
+++ b/src/equicordplugins/fileUpload/settings.tsx
@@ -8,14 +8,18 @@ import { definePluginSettings } from "@api/Settings";
 import { Button } from "@components/Button";
 import { SettingsSection } from "@components/settings/tabs/plugins/components/Common";
 import { Switch } from "@components/Switch";
+import { classNameFactory } from "@utils/css";
 import { useForceUpdater } from "@utils/react";
 import { OptionType } from "@utils/types";
 import { React, Select, showToast, TextArea, TextInput, Toasts } from "@webpack/common";
 
 import { CORS_PROXY } from "./constants";
-import { ServiceType } from "./types";
+import { fallbackServiceOrder, serviceLabels, ServiceType } from "./types";
 import { parseShareXConfig } from "./utils/sharex";
 
+const defaultFallbackOrder = fallbackServiceOrder.join(",");
+const cl = classNameFactory("vc-file-upload-settings-");
+
 const serviceOptions = [
     { label: "Zipline", value: ServiceType.ZIPLINE, default: true },
     { label: "E-Z Host", value: ServiceType.EZHOST },
@@ -29,6 +33,8 @@ const serviceOptions = [
     { label: "buzzheavier.com", value: ServiceType.BUZZHEAVIER },
     { label: "temp.sh", value: ServiceType.TEMPSH },
     { label: "filebin.net", value: ServiceType.FILEBIN },
+    { label: "PixelVault", value: ServiceType.PIXELVAULT },
+    { label: "PixelDrain", value: ServiceType.PIXELDRAIN },
     { label: "ShareX Custom Uploader", value: ServiceType.SHAREX }
 ];
 
@@ -39,6 +45,11 @@ const litterboxOptions = [
     { label: "72 hours", value: "72h" }
 ];
 
+const embedProxyOptions = [
+    { label: "CORS Proxy", value: "cors", default: true },
+    { label: "discord.nfp.is", value: "nfp" }
+];
+
 export const settings = definePluginSettings({
     serviceType: {
         type: OptionType.SELECT,
@@ -167,15 +178,15 @@ export const settings = definePluginSettings({
         default: false,
         hidden: true
     },
-    interceptDiscordUpload: {
+    bypassDiscordUpload: {
         type: OptionType.BOOLEAN,
-        description: "Intercept Discord uploads and use FileUpload instead.",
-        default: false,
+        description: "Bypass Discord uploads and use FileUpload instead.",
+        default: true,
         hidden: true
     },
-    interceptDiscordUploadOnlyOverLimit: {
+    bypassDiscordUploadOnlyOverLimit: {
         type: OptionType.BOOLEAN,
-        description: "Only intercept uploads that exceed Discord file size limit.",
+        description: "Only use FileUpload if the file(s) exceed the file size limit.",
         default: true,
         hidden: true
     },
@@ -185,6 +196,24 @@ export const settings = definePluginSettings({
         default: "",
         hidden: true
     },
+    fallbackOrder: {
+        type: OptionType.STRING,
+        description: "Fallback uploader order",
+        default: defaultFallbackOrder,
+        hidden: true
+    },
+    pixelVaultKey: {
+        type: OptionType.STRING,
+        description: "PixelVault upload key",
+        default: "",
+        hidden: true
+    },
+    pixelDrainKey: {
+        type: OptionType.STRING,
+        description: "Optional PixelDrain API key",
+        default: "",
+        hidden: true
+    },
     uploadTimeoutMs: {
         type: OptionType.NUMBER,
         description: "Upload timeout in milliseconds",
@@ -197,6 +226,19 @@ export const settings = definePluginSettings({
         default: false,
         hidden: true
     },
+    embedProxyEnabled: {
+        type: OptionType.BOOLEAN,
+        description: "Proxy uploaded video links through an embed helper service.",
+        default: false,
+        hidden: true
+    },
+    embedProxyService: {
+        type: OptionType.SELECT,
+        description: "Embed helper service to wrap uploaded video links.",
+        options: embedProxyOptions,
+        default: "cors",
+        hidden: true
+    },
     corsProxyUrl: {
         type: OptionType.STRING,
         description: "CORS proxy URL used for browser uploads",
@@ -209,12 +251,23 @@ export const settings = definePluginSettings({
         default: false,
         hidden: true
     },
+    preserveOriginalFilename: {
+        type: OptionType.BOOLEAN,
+        description: "Preserve the original filename when uploading.",
+        default: true,
+        hidden: true
+    },
     autoCopy: {
         type: OptionType.BOOLEAN,
         description: "Auto copy upload URL",
         default: true,
         hidden: true
     },
+    autoUploadPastedFiles: {
+        type: OptionType.BOOLEAN,
+        description: "Automatically upload files from clipboard to image host when pasting in chat input.",
+        default: false
+    },
     settingsComponent: {
         type: OptionType.COMPONENT,
         description: "Settings",
@@ -232,7 +285,7 @@ function SettingTextInput(props: {
     const { description, name, onChange, placeholder, value } = props;
 
     return (
-        <SettingsSection name={name} description={description}>
+        <SettingsSection name={name} description={description ?? ""}>
             <TextInput
                 value={value}
                 onChange={onChange}
@@ -242,6 +295,126 @@ function SettingTextInput(props: {
     );
 }
 
+function SettingGroup(props: {
+    children: React.ReactNode;
+    description?: string;
+    name: string;
+}) {
+    const { children, description, name } = props;
+
+    return (
+        <SettingsSection name={name} description={description ?? ""}>
+            <div className={cl("group")}>
+                {children}
+            </div>
+        </SettingsSection>
+    );
+}
+
+function SettingSwitch(props: {
+    checked: boolean;
+    description: string;
+    name: string;
+    onChange: (value: boolean) => void;
+}) {
+    const { checked, description, name, onChange } = props;
+
+    return (
+        <SettingsSection tag="label" name={name} description={description} inlineSetting>
+            <Switch checked={checked} onChange={onChange} />
+        </SettingsSection>
+    );
+}
+
+function ServicePicker(props: {
+    onChange: (service: ServiceType) => void;
+    value: ServiceType;
+}) {
+    const { onChange, value } = props;
+
+    return (
+        <div className={cl("service-grid")}>
+            {serviceOptions.map(option => (
+                <button
+                    key={option.value}
+                    type="button"
+                    className={cl("service-option")}
+                    data-selected={option.value === value}
+                    onClick={() => onChange(option.value)}
+                >
+                    <span className={cl("service-option-label")}>{option.label}</span>
+                </button>
+            ))}
+        </div>
+    );
+}
+
+function FallbackOrderSettings() {
+    const update = useForceUpdater();
+    const { store } = settings;
+    const [dragIndex, setDragIndex] = React.useState<number | null>(null);
+    const [order, setOrder] = React.useState<ServiceType[]>(() => {
+        const configured = (store.fallbackOrder || defaultFallbackOrder)
+            .split(/[\n,]/)
+            .map(entry => entry.trim())
+            .filter((entry): entry is ServiceType => Object.values(ServiceType).includes(entry as ServiceType));
+
+        return configured.length === fallbackServiceOrder.length && new Set(configured).size === fallbackServiceOrder.length
+            ? configured
+            : fallbackServiceOrder;
+    });
+
+    const commitOrder = (nextOrder: ServiceType[]) => {
+        setOrder(nextOrder);
+        store.fallbackOrder = nextOrder.join(",");
+        update();
+    };
+
+    return (
+        <SettingsSection name="Fallback Order" description="Drag hosts to reorder fallback attempts. The selected host is tried first, then this order is used.">
+            <div className={cl("fallback-order-list")}>
+                {order.map((service, index) => (
+                    <div
+                        key={service}
+                        className={cl("fallback-order-item")}
+                        draggable
+                        onDragStart={event => {
+                            setDragIndex(index);
+                            event.dataTransfer.effectAllowed = "move";
+                            event.dataTransfer.setData("text/plain", String(index));
+                        }}
+                        onDragOver={event => event.preventDefault()}
+                        onDrop={event => {
+                            event.preventDefault();
+                            const sourceIndex = dragIndex ?? Number(event.dataTransfer.getData("text/plain"));
+                            if (!Number.isInteger(sourceIndex) || sourceIndex === index || sourceIndex < 0 || sourceIndex >= order.length) {
+                                setDragIndex(null);
+                                return;
+                            }
+
+                            const nextOrder = [...order];
+                            const [moved] = nextOrder.splice(sourceIndex, 1);
+                            nextOrder.splice(index, 0, moved);
+                            setDragIndex(null);
+                            commitOrder(nextOrder);
+                        }}
+                        onDragEnd={() => setDragIndex(null)}
+                        data-dragging={dragIndex === index}
+                    >
+                        <span className={cl("fallback-order-label")}>{serviceLabels[service]}</span>
+                        <span className={cl("fallback-order-handle")}>Drag</span>
+                    </div>
+                ))}
+            </div>
+            <div className={cl("fallback-order-actions")}>
+                <Button size="small" onClick={() => commitOrder(fallbackServiceOrder)}>
+                    Reset to default
+                </Button>
+            </div>
+        </SettingsSection>
+    );
+}
+
 export function SettingsComponent() {
     const update = useForceUpdater();
     const { store } = settings;
@@ -253,6 +426,8 @@ export function SettingsComponent() {
     const isCatbox = store.serviceType === ServiceType.CATBOX;
     const isLitterbox = store.serviceType === ServiceType.LITTERBOX;
     const isGofile = store.serviceType === ServiceType.GOFILE;
+    const isPixelVault = store.serviceType === ServiceType.PIXELVAULT;
+    const isPixelDrain = store.serviceType === ServiceType.PIXELDRAIN;
     const isShareX = store.serviceType === ServiceType.SHAREX;
 
     const validateShareXConfig = () => {
@@ -292,21 +467,18 @@ export function SettingsComponent() {
 
     return (
         <>
-            <SettingsSection name="Service Type" description="The upload service to use">
-                <Select
-                    options={serviceOptions}
-                    isSelected={v => v === store.serviceType}
-                    select={v => {
-                        store.serviceType = v;
+            <SettingsSection name="Upload Service" description="Choose where FileUpload sends new files.">
+                <ServicePicker
+                    value={store.serviceType as ServiceType}
+                    onChange={service => {
+                        store.serviceType = service;
                         update();
                     }}
-                    serialize={v => v}
-                    placeholder="Select a service"
                 />
             </SettingsSection>
 
             {isZipline && (
-                <>
+                <SettingGroup name="Zipline" description="Connection details for your Zipline instance.">
                     <SettingTextInput
                         name="Service URL"
                         description="The URL of your Zipline instance"
@@ -328,31 +500,35 @@ export function SettingsComponent() {
                         onChange={v => store.folderId = v}
                         placeholder="Leave empty for no folder"
                     />
-                </>
+                </SettingGroup>
             )}
 
             {isEzHost && (
-                <SettingTextInput
-                    name="E-Z Host API Key"
-                    description="Your E-Z Host API key"
-                    value={store.ezHostKey}
-                    onChange={v => store.ezHostKey = v}
-                    placeholder="Your E-Z Host API key"
-                />
+                <SettingGroup name="E-Z Host" description="Connection details for E-Z Host uploads.">
+                    <SettingTextInput
+                        name="E-Z Host API Key"
+                        description="Your E-Z Host API key"
+                        value={store.ezHostKey}
+                        onChange={v => store.ezHostKey = v}
+                        placeholder="Your E-Z Host API key"
+                    />
+                </SettingGroup>
             )}
 
             {isNest && (
-                <SettingTextInput
-                    name="Nest Token"
-                    description="Your Nest API authorization token"
-                    value={store.nestToken}
-                    onChange={v => store.nestToken = v}
-                    placeholder="Your Nest API token"
-                />
+                <SettingGroup name="Nest" description="Connection details for Nest uploads.">
+                    <SettingTextInput
+                        name="Nest Token"
+                        description="Your Nest API authorization token"
+                        value={store.nestToken}
+                        onChange={v => store.nestToken = v}
+                        placeholder="Your Nest API token"
+                    />
+                </SettingGroup>
             )}
 
             {isS3 && (
-                <>
+                <SettingGroup name="S3-Compatible Storage" description="Connection details and object naming for your bucket.">
                     <SettingTextInput
                         name="S3 Endpoint URL"
                         description="S3-compatible endpoint (e.g. https://<accountid>.r2.cloudflarestorage.com)"
@@ -409,23 +585,25 @@ export function SettingsComponent() {
                         onChange={v => store.s3Prefix = v}
                         placeholder="uploads/discord"
                     />
-                    <SettingsSection tag="label" name="Use Path-Style Endpoint" description="Use endpoint/bucket/key format (recommended for R2)" inlineSetting>
-                        <Switch
-                            checked={store.s3ForcePathStyle}
-                            onChange={v => store.s3ForcePathStyle = v}
-                        />
-                    </SettingsSection>
-                </>
+                    <SettingSwitch
+                        name="Use Path-Style Endpoint"
+                        description="Use endpoint/bucket/key format, recommended for R2."
+                        checked={store.s3ForcePathStyle}
+                        onChange={v => store.s3ForcePathStyle = v}
+                    />
+                </SettingGroup>
             )}
 
             {isCatbox && (
-                <SettingTextInput
-                    name="Catbox Userhash"
-                    description="Your Catbox userhash for account binding (leave empty for anonymous uploads)"
-                    value={store.catboxUserhash}
-                    onChange={v => store.catboxUserhash = v}
-                    placeholder="Your Catbox userhash"
-                />
+                <SettingGroup name="Catbox" description="Optional account binding for Catbox uploads.">
+                    <SettingTextInput
+                        name="Catbox Userhash"
+                        description="Your Catbox userhash for account binding, leave empty for anonymous uploads."
+                        value={store.catboxUserhash}
+                        onChange={v => store.catboxUserhash = v}
+                        placeholder="Your Catbox userhash"
+                    />
+                </SettingGroup>
             )}
 
             {isLitterbox && (
@@ -444,17 +622,43 @@ export function SettingsComponent() {
             )}
 
             {isGofile && (
-                <SettingTextInput
-                    name="GoFile Token"
-                    description="Optional GoFile token to upload into your account"
-                    value={store.gofileToken}
-                    onChange={v => store.gofileToken = v}
-                    placeholder="Optional GoFile token"
-                />
+                <SettingGroup name="GoFile" description="Optional account binding for GoFile uploads.">
+                    <SettingTextInput
+                        name="GoFile Token"
+                        description="Optional GoFile token to upload into your account."
+                        value={store.gofileToken}
+                        onChange={v => store.gofileToken = v}
+                        placeholder="Optional GoFile token"
+                    />
+                </SettingGroup>
+            )}
+
+            {isPixelVault && (
+                <SettingGroup name="PixelVault" description="Connection details for PixelVault uploads.">
+                    <SettingTextInput
+                        name="PixelVault Upload Key"
+                        description="Your PixelVault authorization key."
+                        value={store.pixelVaultKey}
+                        onChange={v => store.pixelVaultKey = v}
+                        placeholder="Your PixelVault upload key"
+                    />
+                </SettingGroup>
+            )}
+
+            {isPixelDrain && (
+                <SettingGroup name="PixelDrain" description="Optional account binding for PixelDrain uploads.">
+                    <SettingTextInput
+                        name="PixelDrain API Key"
+                        description="Optional PixelDrain API key for authenticated uploads. Leave empty for anonymous uploads."
+                        value={store.pixelDrainKey}
+                        onChange={v => store.pixelDrainKey = v}
+                        placeholder="Your PixelDrain API key"
+                    />
+                </SettingGroup>
             )}
 
             {isShareX && (
-                <>
+                <SettingGroup name="ShareX Custom Uploader" description="Paste, import, or validate a ShareX custom uploader config.">
                     <SettingsSection
                         name="ShareX Custom Uploader Config"
                         description="Paste your ShareX custom uploader JSON (.sxcu/.json). DestinationType must include FileUploader or ImageUploader."
@@ -467,7 +671,7 @@ export function SettingsComponent() {
                         />
                     </SettingsSection>
                     <SettingsSection name="ShareX Config Actions" description="Import from file or validate pasted config">
-                        <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
+                        <div className={cl("actions")}>
                             <Button size="small" onClick={triggerShareXFileUpload}>Import .sxcu/.json</Button>
                             <Button size="small" onClick={validateShareXConfig}>Validate</Button>
                         </div>
@@ -479,95 +683,142 @@ export function SettingsComponent() {
                             onChange={handleShareXFileUpload}
                         />
                     </SettingsSection>
-                </>
+                </SettingGroup>
             )}
 
-            <SettingsSection tag="label" name="Strip Query Parameters" description="Strip query parameters from the uploaded file URL" inlineSetting>
-                <Switch
+            <SettingGroup name="Upload Behavior" description="Control what FileUpload does after a host returns a URL.">
+                <SettingSwitch
+                    name="Strip Query Parameters"
+                    description="Strip query parameters from the uploaded file URL."
                     checked={store.stripQueryParams}
                     onChange={v => store.stripQueryParams = v}
                 />
-            </SettingsSection>
 
-            <SettingTextInput
-                name="CORS Proxy URL"
-                description="CORS proxy used for web uploads. Leave empty to use the default proxy"
-                value={store.corsProxyUrl || ""}
-                onChange={v => store.corsProxyUrl = v}
-                placeholder="https://your-cors-proxy.example.com"
-            />
+                <SettingSwitch
+                    name="Use Embed Proxy"
+                    description="Wrap uploaded video links with an embed proxy service for better Discord previews."
+                    checked={store.embedProxyEnabled}
+                    onChange={v => {
+                        store.embedProxyEnabled = v;
+                        update();
+                    }}
+                />
 
-            <SettingsSection name="Default CORS Proxy Source" description="Source code for the default CORS proxy">
-                <a href="https://codeberg.org/key/corsproxy" target="_blank" rel="noreferrer">codeberg.org/key/corsproxy</a>
-            </SettingsSection>
+                {store.embedProxyEnabled && (
+                    <SettingsSection name="Embed Proxy Service" description="Choose which embed proxy service to use for uploaded video links">
+                        <Select
+                            options={embedProxyOptions}
+                            isSelected={v => v === store.embedProxyService}
+                            select={v => {
+                                store.embedProxyService = v;
+                                update();
+                            }}
+                            serialize={v => v}
+                            placeholder="Select an embed proxy service"
+                        />
+                    </SettingsSection>
+                )}
 
-            <SettingsSection tag="label" name="Convert APNG to GIF" description="Convert APNG files to GIF format" inlineSetting>
-                <Switch
+                <SettingSwitch
+                    name="Convert APNG to GIF"
+                    description="Convert APNG files to GIF format."
                     checked={store.apngToGif}
                     onChange={v => store.apngToGif = v}
                 />
-            </SettingsSection>
 
-            <SettingsSection tag="label" name="Auto Copy URL" description="Automatically copy the uploaded file URL to clipboard" inlineSetting>
-                <Switch
+                <SettingSwitch
+                    name="Preserve Original Filename"
+                    description="Use the original filename instead of naming uploads as upload.ext."
+                    checked={Boolean((store as { preserveOriginalFilename?: boolean; }).preserveOriginalFilename)}
+                    onChange={v => (store as { preserveOriginalFilename?: boolean; }).preserveOriginalFilename = v}
+                />
+
+                <SettingSwitch
+                    name="Auto Copy URL"
+                    description="Automatically copy the uploaded file URL to clipboard."
                     checked={store.autoCopy}
                     onChange={v => store.autoCopy = v}
                 />
-            </SettingsSection>
 
-            <SettingsSection tag="label" name="Disable Fallback Uploaders" description="Only use the selected uploader without trying fallback hosts" inlineSetting>
-                <Switch
+                <SettingSwitch
+                    name="Disable Fallback Uploaders"
+                    description="Only use the selected uploader without trying fallback hosts."
                     checked={store.disableFallbacks}
                     onChange={v => store.disableFallbacks = v}
                 />
-            </SettingsSection>
 
-            <SettingsSection tag="label" name="Insert URL into Chat Input" description="After upload, insert the resulting URL into the current chat input" inlineSetting>
-                <Switch
+                <SettingSwitch
+                    name="Insert URL into Chat Input"
+                    description="After upload, insert the resulting URL into the current chat input."
                     checked={store.autoSend}
                     onChange={v => store.autoSend = v}
                 />
-            </SettingsSection>
 
-            <SettingsSection tag="label" name="Format Inserted URL" description="Wrap inserted URLs in angle brackets to avoid Discord preview embedding" inlineSetting>
-                <Switch
+                <SettingSwitch
+                    name="Format Inserted URL"
+                    description="Wrap inserted URLs in angle brackets to avoid Discord preview embedding."
                     checked={store.autoFormat}
                     onChange={v => store.autoFormat = v}
                 />
-            </SettingsSection>
+            </SettingGroup>
 
-            <SettingsSection tag="label" name="Intercept Discord Upload Button" description="Use FileUpload when uploading through Discord's file picker" inlineSetting>
-                <Switch
-                    checked={Boolean((store as { interceptDiscordUpload?: boolean; }).interceptDiscordUpload)}
-                    onChange={v => (store as { interceptDiscordUpload?: boolean; }).interceptDiscordUpload = v}
+            <SettingGroup name="Discord Integration" description="Choose when FileUpload takes over Discord file handling.">
+                <SettingSwitch
+                    name="Bypass Discord Upload Button"
+                    description="Use FileUpload when uploading through Discord's file picker."
+                    checked={Boolean((store as { bypassDiscordUpload?: boolean; }).bypassDiscordUpload)}
+                    onChange={v => (store as { bypassDiscordUpload?: boolean; }).bypassDiscordUpload = v}
                 />
-            </SettingsSection>
 
-            <SettingsSection tag="label" name="Only Intercept Over Discord File Size Limit" description="Use FileUpload only for files larger than your current Discord upload limit" inlineSetting>
-                <Switch
-                    checked={store.interceptDiscordUploadOnlyOverLimit}
-                    onChange={v => store.interceptDiscordUploadOnlyOverLimit = v}
+                <SettingSwitch
+                    name="Auto Upload Pasted Files"
+                    description="Automatically upload files from clipboard to image host when pasting in chat input."
+                    checked={store.autoUploadPastedFiles}
+                    onChange={v => store.autoUploadPastedFiles = v}
                 />
-            </SettingsSection>
 
-            <SettingsSection name="Upload Timeout" description="Maximum time to wait per upload attempt before switching to fallback">
-                <Select
-                    options={[
-                        { label: "30 seconds", value: 30000 },
-                        { label: "1 minute", value: 60000 },
-                        { label: "2 minutes", value: 120000 },
-                        { label: "5 minutes", value: 300000, default: true },
-                        { label: "10 minutes", value: 600000 }
-                    ]}
-                    isSelected={v => v === (store.uploadTimeoutMs || 300000)}
-                    select={v => {
-                        store.uploadTimeoutMs = v;
-                        update();
-                    }}
-                    serialize={v => v}
-                    placeholder="Select timeout"
+                <SettingSwitch
+                    name="Respect Discord File Size Limit"
+                    description="Use FileUpload only for files larger than your current Discord upload limit."
+                    checked={store.bypassDiscordUploadOnlyOverLimit}
+                    onChange={v => store.bypassDiscordUploadOnlyOverLimit = v}
                 />
-            </SettingsSection>
+            </SettingGroup>
+
+            <SettingGroup name="Network" description="Configure browser upload proxying and timeouts.">
+                <SettingTextInput
+                    name="CORS Proxy URL"
+                    description="CORS proxy used for web uploads. Leave empty to use the default proxy."
+                    value={store.corsProxyUrl || ""}
+                    onChange={v => store.corsProxyUrl = v}
+                    placeholder="https://your-cors-proxy.example.com"
+                />
+
+                <SettingsSection name="Default CORS Proxy Source" description="Source code for the default CORS proxy">
+                    <a href="https://codeberg.org/key/corsproxy" target="_blank" rel="noreferrer">codeberg.org/key/corsproxy</a>
+                </SettingsSection>
+
+                <SettingsSection name="Upload Timeout" description="Maximum time to wait per upload attempt before switching to fallback">
+                    <Select
+                        options={[
+                            { label: "30 seconds", value: 30000 },
+                            { label: "1 minute", value: 60000 },
+                            { label: "2 minutes", value: 120000 },
+                            { label: "5 minutes", value: 300000, default: true },
+                            { label: "10 minutes", value: 600000 }
+                        ]}
+                        isSelected={v => v === (store.uploadTimeoutMs || 300000)}
+                        select={v => {
+                            store.uploadTimeoutMs = v;
+                            update();
+                        }}
+                        serialize={v => v}
+                        placeholder="Select timeout"
+                    />
+                </SettingsSection>
+            </SettingGroup>
+
+            <FallbackOrderSettings />
         </>
     );
 }
diff --git a/src/equicordplugins/fileUpload/styles.css b/src/equicordplugins/fileUpload/styles.css
index 67bcf3893..77a66fe50 100644
--- a/src/equicordplugins/fileUpload/styles.css
+++ b/src/equicordplugins/fileUpload/styles.css
@@ -32,6 +32,12 @@
     color: var(--text-muted);
 }
 
+.vc-file-upload-progress-percent {
+    font-size: 12px;
+    color: var(--text-default);
+    white-space: nowrap;
+}
+
 .vc-file-upload-progress-cancel {
     border: none;
     border-radius: 6px;
@@ -70,4 +76,81 @@
 
 .vc-file-upload-progress-wrap[data-phase="success"] .vc-file-upload-progress-fill {
     background: var(--status-positive);
-}
\ No newline at end of file
+}
+
+.vc-file-upload-settings-fallback-order-list {
+    display: grid;
+    gap: 6px;
+}
+
+.vc-file-upload-settings-fallback-order-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+    padding: 8px 10px;
+    border-radius: 8px;
+    border: 1px solid var(--border-subtle);
+    background: var(--background-secondary);
+    color: var(--text-default);
+    cursor: grab;
+}
+
+.vc-file-upload-settings-fallback-order-item[data-dragging="true"] {
+    background: var(--background-modifier-hover);
+}
+
+.vc-file-upload-settings-fallback-order-label {
+    color: var(--text-default);
+}
+
+.vc-file-upload-settings-fallback-order-handle {
+    color: var(--text-muted);
+    font-size: 12px;
+}
+
+.vc-file-upload-settings-fallback-order-actions {
+    margin-top: 8px;
+}
+
+.vc-file-upload-settings-group {
+    display: grid;
+    gap: 10px;
+}
+
+.vc-file-upload-settings-service-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    gap: 8px;
+}
+
+.vc-file-upload-settings-service-option {
+    min-height: 38px;
+    border: 1px solid var(--border-subtle);
+    border-radius: 8px;
+    background: var(--background-secondary);
+    color: var(--text-default);
+    cursor: pointer;
+    padding: 8px 10px;
+    text-align: left;
+}
+
+.vc-file-upload-settings-service-option:hover {
+    background: var(--background-modifier-hover);
+}
+
+.vc-file-upload-settings-service-option[data-selected="true"] {
+    border-color: var(--brand-500);
+    background: var(--background-modifier-selected);
+}
+
+.vc-file-upload-settings-service-option-label {
+    font-size: 13px;
+    font-weight: 500;
+}
+
+.vc-file-upload-settings-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+}
diff --git a/src/equicordplugins/fileUpload/types.ts b/src/equicordplugins/fileUpload/types.ts
index 2f7c52b57..1464efec7 100644
--- a/src/equicordplugins/fileUpload/types.ts
+++ b/src/equicordplugins/fileUpload/types.ts
@@ -17,7 +17,9 @@ export enum ServiceType {
     TMPFILES = "tmpfiles",
     BUZZHEAVIER = "buzzheavier",
     TEMPSH = "tempsh",
-    FILEBIN = "filebin"
+    FILEBIN = "filebin",
+    PIXELVAULT = "pixelvault",
+    PIXELDRAIN = "pixeldrain"
 }
 
 export const serviceLabels: Record<ServiceType, string> = {
@@ -33,9 +35,29 @@ export const serviceLabels: Record<ServiceType, string> = {
     [ServiceType.TMPFILES]: "tmpfiles.org",
     [ServiceType.BUZZHEAVIER]: "buzzheavier.com",
     [ServiceType.TEMPSH]: "temp.sh",
-    [ServiceType.FILEBIN]: "filebin.net"
+    [ServiceType.FILEBIN]: "filebin.net",
+    [ServiceType.PIXELVAULT]: "PixelVault",
+    [ServiceType.PIXELDRAIN]: "PixelDrain"
 };
 
+export const fallbackServiceOrder: ServiceType[] = [
+    ServiceType.ZIPLINE,
+    ServiceType.EZHOST,
+    ServiceType.NEST,
+    ServiceType.S3,
+    ServiceType.CATBOX,
+    ServiceType.ZEROX0,
+    ServiceType.LITTERBOX,
+    ServiceType.GOFILE,
+    ServiceType.TMPFILES,
+    ServiceType.BUZZHEAVIER,
+    ServiceType.TEMPSH,
+    ServiceType.FILEBIN,
+    ServiceType.PIXELVAULT,
+    ServiceType.PIXELDRAIN,
+    ServiceType.SHAREX
+];
+
 export interface UploadResponse {
     files: {
         id: string;
diff --git a/src/equicordplugins/fileUpload/utils/s3.ts b/src/equicordplugins/fileUpload/utils/s3.ts
index 2cc9827d3..092189973 100644
--- a/src/equicordplugins/fileUpload/utils/s3.ts
+++ b/src/equicordplugins/fileUpload/utils/s3.ts
@@ -21,6 +21,14 @@ type S3Store = {
     corsProxyUrl?: string;
 };
 
+type UploadRequestResponse = {
+    ok: boolean;
+    status: number;
+    text(): Promise<string>;
+};
+
+type UploadRequest = (url: string, options: RequestInit) => Promise<UploadRequestResponse>;
+
 const textEncoder = new TextEncoder();
 
 function toArrayBuffer(data: ArrayBuffer | Uint8Array | string): ArrayBuffer {
@@ -90,7 +98,8 @@ export function isS3Configured(): boolean {
 export async function uploadToS3(
     fileBlob: Blob,
     filename: string,
-    native: PluginNative<typeof import("../native")> | null
+    native: PluginNative<typeof import("../native")> | null,
+    uploadRequest: UploadRequest
 ): Promise<string> {
     const {
         s3Endpoint,
@@ -189,7 +198,7 @@ export async function uploadToS3(
             throw new Error(result.error || "Upload failed");
         }
     } else {
-        const response = await fetch(toProxiedUrl(uploadUrl.toString(), settings.store.corsProxyUrl), {
+        const response = await uploadRequest(toProxiedUrl(uploadUrl.toString(), settings.store.corsProxyUrl), {
             method: "PUT",
             headers: requestHeaders,
             body: fileBlob
diff --git a/src/equicordplugins/fileUpload/utils/upload.ts b/src/equicordplugins/fileUpload/utils/upload.ts
index 6efebcaac..fb0bfd5f5 100644
--- a/src/equicordplugins/fileUpload/utils/upload.ts
+++ b/src/equicordplugins/fileUpload/utils/upload.ts
@@ -6,7 +6,7 @@
 
 import { normalizeCorsProxyUrl, toProxiedUrl } from "@equicordplugins/fileUpload/constants";
 import { settings } from "@equicordplugins/fileUpload/settings";
-import { serviceLabels, ServiceType, ShareXUploaderConfig, UploadResponse } from "@equicordplugins/fileUpload/types";
+import { fallbackServiceOrder, serviceLabels, ServiceType, ShareXUploaderConfig, UploadResponse } from "@equicordplugins/fileUpload/types";
 import { copyToClipboard } from "@utils/clipboard";
 import { insertTextIntoChatInputBox } from "@utils/discord";
 import { Logger } from "@utils/Logger";
@@ -38,6 +38,7 @@ function toProxyUrl(url: string): string {
 let isUploading = false;
 
 type UploadPhase = "idle" | "preparing" | "uploading" | "retrying" | "success" | "failed" | "cancelled";
+type EmbedProxyService = "cors" | "nfp";
 
 export interface UploadProgressState {
     phase: UploadPhase;
@@ -47,6 +48,8 @@ export interface UploadProgressState {
     attempt: number;
     totalAttempts: number;
     percent: number;
+    transferredBytes: number;
+    totalBytes: number;
     status: string;
     canCancel: boolean;
 }
@@ -59,6 +62,8 @@ const defaultUploadState: UploadProgressState = {
     attempt: 0,
     totalAttempts: 0,
     percent: 0,
+    transferredBytes: 0,
+    totalBytes: 0,
     status: "",
     canCancel: false
 };
@@ -66,6 +71,7 @@ const defaultUploadState: UploadProgressState = {
 let uploadState: UploadProgressState = { ...defaultUploadState };
 const uploadStateListeners = new Set<() => void>();
 let activeAbortController: AbortController | null = null;
+let activeXhr: XMLHttpRequest | null = null;
 let cancelRequested = false;
 
 function isUploadCancelledError(error: unknown): boolean {
@@ -76,6 +82,18 @@ function isUploadCancelledError(error: unknown): boolean {
     return message.includes("cancelled") || message.includes("canceled") || message.includes("aborted") || message.includes("aborterror");
 }
 
+function getFallbackServices(): ServiceType[] {
+    const configuredOrder = (settings.store as { fallbackOrder?: string; }).fallbackOrder || fallbackServiceOrder.join(",");
+    const services = configuredOrder
+        .split(/[\n,]/)
+        .map(service => service.trim())
+        .filter((service): service is ServiceType => Object.values(ServiceType).includes(service as ServiceType));
+
+    return services.length === fallbackServiceOrder.length && new Set(services).size === fallbackServiceOrder.length
+        ? services
+        : fallbackServiceOrder;
+}
+
 function emitUploadState() {
     for (const listener of uploadStateListeners) {
         listener();
@@ -108,6 +126,7 @@ export function cancelCurrentUpload() {
 
     cancelRequested = true;
     activeAbortController?.abort();
+    activeXhr?.abort();
     setUploadState({
         phase: "cancelled",
         status: "Upload cancelled.",
@@ -150,6 +169,103 @@ async function fetchWithTimeout(url: string, options: RequestInit): Promise<Resp
     }
 }
 
+function getHeaderEntries(headers?: HeadersInit): [string, string][] {
+    if (!headers) return [];
+    if (headers instanceof Headers) return Array.from(headers.entries());
+    if (Array.isArray(headers)) return headers.map(([key, value]) => [key, value]);
+
+    return Object.entries(headers);
+}
+
+class XhrResponse {
+    ok: boolean;
+    headers: Headers;
+    status: number;
+    statusText: string;
+    url: string;
+
+    constructor(private xhr: XMLHttpRequest) {
+        this.status = xhr.status;
+        this.statusText = xhr.statusText;
+        this.url = xhr.responseURL;
+        this.ok = this.status >= 200 && this.status < 300;
+        this.headers = new Headers();
+
+        const rawHeaders = xhr.getAllResponseHeaders();
+        for (const line of rawHeaders.trim().split(/[\r\n]+/)) {
+            if (!line) continue;
+
+            const separatorIndex = line.indexOf(":");
+            if (separatorIndex < 0) continue;
+
+            this.headers.append(line.slice(0, separatorIndex).trim(), line.slice(separatorIndex + 1).trim());
+        }
+    }
+
+    async text(): Promise<string> {
+        return typeof this.xhr.response === "string"
+            ? this.xhr.response
+            : this.xhr.responseText;
+    }
+
+    async json(): Promise<unknown> {
+        return JSON.parse(await this.text());
+    }
+}
+
+function setXhrUploadProgress(event: ProgressEvent) {
+    if (!event.lengthComputable || event.total <= 0) {
+        setUploadState({
+            status: uploadState.currentServiceLabel
+                ? `Uploading via ${uploadState.currentServiceLabel}...`
+                : "Uploading..."
+        });
+        return;
+    }
+
+    const percent = Math.round(Math.max(0, Math.min(100, event.loaded / event.total * 100)));
+    setUploadState({
+        phase: "uploading",
+        percent,
+        transferredBytes: event.loaded,
+        totalBytes: event.total,
+        status: uploadState.currentServiceLabel
+            ? `Uploading via ${uploadState.currentServiceLabel}...`
+            : "Uploading..."
+    });
+}
+
+async function uploadRequestWithTimeout(url: string, options: RequestInit): Promise<XhrResponse> {
+    const requestUrl = toProxyUrl(url);
+
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        activeXhr = xhr;
+        const timeout = setTimeout(() => xhr.abort(), getUploadTimeoutMs());
+
+        xhr.open(options.method || "GET", requestUrl);
+
+        for (const [key, value] of getHeaderEntries(options.headers)) {
+            xhr.setRequestHeader(key, value);
+        }
+
+        xhr.upload.onprogress = setXhrUploadProgress;
+        xhr.onload = () => resolve(new XhrResponse(xhr));
+        xhr.onerror = () => reject(new Error("Upload failed"));
+        xhr.onabort = () => reject(new Error(cancelRequested ? "Upload cancelled by user" : "Upload timed out"));
+        xhr.onloadend = () => {
+            clearTimeout(timeout);
+            xhr.upload.onprogress = null;
+            if (activeXhr === xhr) {
+                activeXhr = null;
+            }
+        };
+
+        const { body } = options;
+        xhr.send(body instanceof ReadableStream ? null : body as XMLHttpRequestBodyInit | null);
+    });
+}
+
 function resolveShareXRequestValue(value: string | number | boolean, filename: string): string {
     return String(value)
         .replace(/\$filename\$/g, filename)
@@ -212,7 +328,7 @@ async function uploadToShareX(fileBlob: Blob, filename: string): Promise<string>
         throw new Error(`Unsupported ShareX Body type: ${config.Body || "unknown"}`);
     }
 
-    const response = await fetchWithTimeout(requestUrl, { method, headers, body });
+    const response = await uploadRequestWithTimeout(requestUrl, { method, headers, body });
 
     const responseText = await response.text();
     let responseJson: unknown = null;
@@ -259,7 +375,7 @@ async function uploadToZipline(fileBlob: Blob, filename: string): Promise<string
         headers["x-zipline-folder"] = folderId;
     }
 
-    const response = await fetchWithTimeout(`${baseUrl}/api/upload`, {
+    const response = await uploadRequestWithTimeout(`${baseUrl}/api/upload`, {
         method: "POST",
         headers,
         body: formData
@@ -276,7 +392,7 @@ async function uploadToZipline(fileBlob: Blob, filename: string): Promise<string
         throw new Error("Server returned invalid response (not JSON)");
     }
 
-    const data: UploadResponse = await response.json();
+    const data = await response.json() as UploadResponse;
 
     if (data.files && data.files.length > 0 && data.files[0].url) {
         return data.files[0].url;
@@ -310,7 +426,7 @@ async function uploadToNest(fileBlob: Blob, filename: string): Promise<string> {
     const formData = new FormData();
     formData.append("file", fileBlob, filename);
 
-    const response = await fetchWithTimeout("https://nest.rip/api/files/upload", {
+    const response = await uploadRequestWithTimeout("https://nest.rip/api/files/upload", {
         method: "POST",
         headers: {
             "Authorization": nestToken
@@ -361,7 +477,10 @@ export function isConfigured(): boolean {
         case ServiceType.BUZZHEAVIER:
         case ServiceType.TEMPSH:
         case ServiceType.FILEBIN:
+        case ServiceType.PIXELDRAIN:
             return true;
+        case ServiceType.PIXELVAULT:
+            return Boolean((settings.store as { pixelVaultKey?: string; }).pixelVaultKey);
         case ServiceType.SHAREX:
             try {
                 parseShareXConfigFromSettings();
@@ -400,7 +519,7 @@ async function uploadToEzHost(fileBlob: Blob, filename: string): Promise<string>
 
     const headers: Record<string, string> = { key: ezHostKey };
 
-    const response = await fetchWithTimeout("https://api.e-z.host/files", {
+    const response = await uploadRequestWithTimeout("https://api.e-z.host/files", {
         method: "POST",
         headers,
         body: formData
@@ -411,12 +530,14 @@ async function uploadToEzHost(fileBlob: Blob, filename: string): Promise<string>
         throw new Error(`Upload failed: ${response.status} ${text}`);
     }
 
-    const data = await response.json();
+    const data = await response.json() as { success?: boolean; error?: string; imageUrl?: string; rawUrl?: string; };
     if (!data || !data.success) {
         throw new Error(data?.error || "Upload failed");
     }
 
-    return data.imageUrl || data.rawUrl;
+    const url = data.imageUrl || data.rawUrl;
+    if (!url) throw new Error("No URL returned from upload");
+    return url;
 }
 
 async function uploadToCatbox(fileBlob: Blob, filename: string): Promise<string> {
@@ -433,7 +554,7 @@ async function uploadToCatbox(fileBlob: Blob, filename: string): Promise<string>
     if (catboxUserhash) formData.append("userhash", catboxUserhash);
     formData.append("fileToUpload", fileBlob, filename);
 
-    const response = await fetchWithTimeout("https://catbox.moe/user/api.php", {
+    const response = await uploadRequestWithTimeout("https://catbox.moe/user/api.php", {
         method: "POST",
         body: formData
     });
@@ -477,7 +598,7 @@ async function uploadToLitterbox(fileBlob: Blob, filename: string): Promise<stri
     formData.append("time", expiry);
     formData.append("fileToUpload", fileBlob, filename);
 
-    const response = await fetchWithTimeout("https://litterbox.catbox.moe/resources/internals/api.php", {
+    const response = await uploadRequestWithTimeout("https://litterbox.catbox.moe/resources/internals/api.php", {
         method: "POST",
         body: formData
     });
@@ -504,7 +625,7 @@ async function uploadToGofile(fileBlob: Blob, filename: string): Promise<string>
     formData.append("file", fileBlob, filename);
 
     const uploadUrl = "https://upload.gofile.io/uploadfile";
-    const response = await fetchWithTimeout(uploadUrl, {
+    const response = await uploadRequestWithTimeout(uploadUrl, {
         method: "POST",
         body: formData
     });
@@ -539,7 +660,7 @@ async function uploadToTmpfiles(fileBlob: Blob, filename: string): Promise<strin
     formData.append("file", fileBlob, filename);
 
     const uploadUrl = "https://tmpfiles.org/api/v1/upload";
-    const response = await fetchWithTimeout(uploadUrl, {
+    const response = await uploadRequestWithTimeout(uploadUrl, {
         method: "POST",
         body: formData
     });
@@ -567,7 +688,7 @@ async function uploadToBuzzheavier(fileBlob: Blob, filename: string): Promise<st
     }
 
     const uploadUrl = `https://w.buzzheavier.com/${encodeURIComponent(filename)}`;
-    const response = await fetchWithTimeout(uploadUrl, {
+    const response = await uploadRequestWithTimeout(uploadUrl, {
         method: "PUT",
         body: fileBlob
     });
@@ -602,7 +723,7 @@ async function uploadToTempSh(fileBlob: Blob, filename: string): Promise<string>
     formData.append("file", fileBlob, filename);
 
     const uploadUrl = "https://temp.sh/upload";
-    const response = await fetchWithTimeout(uploadUrl, {
+    const response = await uploadRequestWithTimeout(uploadUrl, {
         method: "POST",
         body: formData
     });
@@ -634,7 +755,7 @@ async function uploadToFilebin(fileBlob: Blob, filename: string): Promise<string
     const formData = new FormData();
     formData.append("file", fileBlob, filename);
 
-    const response = await fetchWithTimeout(uploadUrl, {
+    const response = await uploadRequestWithTimeout(uploadUrl, {
         method: "POST",
         body: formData
     });
@@ -646,6 +767,98 @@ async function uploadToFilebin(fileBlob: Blob, filename: string): Promise<string
     return `https://filebin.net/${binId}/${encodeURIComponent(filename)}`;
 }
 
+async function uploadToPixelVault(fileBlob: Blob, filename: string): Promise<string> {
+    const { pixelVaultKey } = settings.store as { pixelVaultKey?: string; };
+
+    if (!pixelVaultKey?.trim()) {
+        throw new Error("PixelVault upload key is required");
+    }
+
+    if (Native) {
+        const result = await Native.uploadToPixelVault(await fileBlob.arrayBuffer(), filename, pixelVaultKey.trim());
+
+        if (!result.success) {
+            throw new Error(result.error || "Upload failed");
+        }
+
+        if (!result.url) {
+            throw new Error("No URL returned from upload");
+        }
+
+        return result.url;
+    }
+
+    const formData = new FormData();
+    formData.append("file", fileBlob, filename);
+
+    const response = await uploadRequestWithTimeout("https://pixelvault.co/", {
+        method: "POST",
+        headers: {
+            Authorization: pixelVaultKey.trim()
+        },
+        body: formData
+    });
+
+    const text = await response.text();
+    let data: { resource?: string; url?: string; } | null = null;
+
+    try {
+        data = text ? JSON.parse(text) : null;
+    } catch {
+        data = null;
+    }
+
+    if (!response.ok) {
+        throw new Error(`Upload failed: ${response.status} ${text}`);
+    }
+
+    const url = data?.resource || data?.url || text.trim();
+    if (!url) {
+        throw new Error("No URL returned from upload");
+    }
+
+    return url;
+}
+
+async function uploadToPixelDrain(fileBlob: Blob, filename: string): Promise<string> {
+    const { pixelDrainKey } = settings.store as { pixelDrainKey?: string; };
+
+    if (Native) {
+        const result = await Native.uploadToPixelDrain(await fileBlob.arrayBuffer(), filename, pixelDrainKey?.trim() || undefined);
+        if (!result.success || !result.url) throw new Error(result.error || "No URL returned from upload");
+        return result.url;
+    }
+
+    const headers: Record<string, string> = {};
+    if (pixelDrainKey?.trim()) {
+        headers.Authorization = `Basic ${btoa(`:${pixelDrainKey.trim()}`)}`;
+    }
+
+    const response = await uploadRequestWithTimeout(`https://pixeldrain.com/api/file/${encodeURIComponent(filename)}`, {
+        method: "PUT",
+        headers,
+        body: fileBlob
+    });
+
+    const text = await response.text();
+    let data: { id?: string; success?: boolean; message?: string; } | null = null;
+    try {
+        data = text ? JSON.parse(text) : null;
+    } catch {
+        data = null;
+    }
+
+    if (!response.ok) {
+        throw new Error(data?.message || `Upload failed: ${response.status} ${text}`);
+    }
+
+    if (!data?.id) {
+        throw new Error(data?.message || "No URL returned from upload");
+    }
+
+    return `https://pixeldrain.com/u/${data.id}`;
+}
+
 async function uploadToService(serviceType: ServiceType, fileBlob: Blob, filename: string): Promise<string> {
     switch (serviceType) {
         case ServiceType.ZIPLINE:
@@ -655,7 +868,7 @@ async function uploadToService(serviceType: ServiceType, fileBlob: Blob, filenam
         case ServiceType.EZHOST:
             return uploadToEzHost(fileBlob, filename);
         case ServiceType.S3:
-            return uploadToS3(fileBlob, filename, Native);
+            return uploadToS3(fileBlob, filename, Native, uploadRequestWithTimeout);
         case ServiceType.CATBOX:
             return uploadToCatbox(fileBlob, filename);
         case ServiceType.ZEROX0:
@@ -674,28 +887,56 @@ async function uploadToService(serviceType: ServiceType, fileBlob: Blob, filenam
             return uploadToTempSh(fileBlob, filename);
         case ServiceType.FILEBIN:
             return uploadToFilebin(fileBlob, filename);
+        case ServiceType.PIXELVAULT:
+            return uploadToPixelVault(fileBlob, filename);
+        case ServiceType.PIXELDRAIN:
+            return uploadToPixelDrain(fileBlob, filename);
         default:
             throw new Error("Unknown service type");
     }
 }
 
-const FALLBACK_SERVICES: ServiceType[] = [
-    ServiceType.CATBOX,
-    ServiceType.LITTERBOX,
-    ServiceType.ZEROX0,
-    ServiceType.TMPFILES,
-    ServiceType.GOFILE,
-    ServiceType.BUZZHEAVIER,
-    ServiceType.TEMPSH,
-    ServiceType.FILEBIN
-];
-
 const EXE_BLOCKED_SERVICES = new Set<ServiceType>([
     ServiceType.CATBOX,
     ServiceType.LITTERBOX,
     ServiceType.ZEROX0
 ]);
 
+function getEmbedProxyService(): EmbedProxyService {
+    const service = settings.store.embedProxyService;
+    return service === "nfp" ? service : "cors";
+
+}
+
+function shouldProxyEmbedUrl(url: string): boolean {
+    const ext = getUrlExtension(url)?.toLowerCase();
+    if (!ext) {
+        return false;
+    }
+
+    return getMimeFromExtension(ext).startsWith("video/");
+}
+
+function applyEmbedProxy(url: string): string {
+    if (!settings.store.embedProxyEnabled) {
+        return url;
+    }
+
+    const service = getEmbedProxyService();
+    if (!shouldProxyEmbedUrl(url)) {
+        return url;
+    }
+
+    switch (service) {
+        case "cors":
+            return toProxyUrl(url);
+        case "nfp":
+            return `https://discord.nfp.is/?v=${encodeURIComponent(url)}`;
+        default:
+            return toProxyUrl(url);
+    }
+}
+
 function isExeFileName(fileName: string): boolean {
     return fileName.toLowerCase().endsWith(".exe");
 }
@@ -732,12 +973,12 @@ function buildUploadOrder(primary: ServiceType, fileName: string): ServiceType[]
     const disableFallbacks = Boolean((settings.store as { disableFallbacks?: boolean; }).disableFallbacks);
     const effectivePrimary = normalizePrimaryService(primary, fileName);
 
-    if (disableFallbacks || effectivePrimary === ServiceType.SHAREX || effectivePrimary === ServiceType.S3 || effectivePrimary === ServiceType.ZIPLINE || effectivePrimary === ServiceType.NEST || effectivePrimary === ServiceType.EZHOST) {
-        return [effectivePrimary];
+    const order: ServiceType[] = [effectivePrimary];
+    if (disableFallbacks) {
+        return order;
     }
 
-    const order: ServiceType[] = [effectivePrimary];
-    for (const fallback of FALLBACK_SERVICES) {
+    for (const fallback of getFallbackServices()) {
         if (fallback !== effectivePrimary && canServiceHandleFile(fallback, fileName)) {
             order.push(fallback);
         }
@@ -760,6 +1001,14 @@ function finalizeUploadedUrl(url: string): string {
     }
 }
 
+function getFilenameExtension(filename: string): string | undefined {
+    const dotIndex = filename.lastIndexOf(".");
+    if (dotIndex < 1 || dotIndex === filename.length - 1) return undefined;
+
+    const ext = filename.slice(dotIndex + 1).toLowerCase();
+    return ext.length <= 10 ? ext : undefined;
+}
+
 async function notifyUploadSuccess(finalUrl: string): Promise<void> {
     if (settings.store.autoCopy) {
         if (!finalUrl || !finalUrl.trim()) {
@@ -796,6 +1045,8 @@ async function uploadWithFallbacks(fileBlob: Blob, filename: string, primary: Se
         totalAttempts: uploadOrder.length,
         attempt: 1,
         percent: 5,
+        transferredBytes: 0,
+        totalBytes: fileBlob.size,
         status: `Starting upload via ${serviceLabels[uploadOrder[0]]}...`,
         currentService: uploadOrder[0],
         currentServiceLabel: serviceLabels[uploadOrder[0]],
@@ -806,12 +1057,15 @@ async function uploadWithFallbacks(fileBlob: Blob, filename: string, primary: Se
         if (cancelRequested) throw new Error("Upload cancelled by user");
 
         const attempt = attempted.length + 1;
+
         setUploadState({
             phase: attempt === 1 ? "uploading" : "retrying",
             attempt,
             currentService: service,
             currentServiceLabel: serviceLabels[service],
-            percent: Math.min(90, 10 + Math.round((attempt / uploadOrder.length) * 70)),
+            transferredBytes: 0,
+            totalBytes: fileBlob.size,
+            percent: 0,
             status: attempt === 1
                 ? `Uploading via ${serviceLabels[service]}...`
                 : `Retrying with ${serviceLabels[service]} (${attempt}/${uploadOrder.length})...`
@@ -866,8 +1120,20 @@ async function uploadWithFallbacks(fileBlob: Blob, filename: string, primary: Se
 }
 
 async function normalizeUploadBlob(blob: Blob, sourceUrl?: string): Promise<{ blob: Blob; filename: string; }> {
+    let sourceFileName = "";
+    if (blob instanceof File && blob.name) {
+        sourceFileName = blob.name;
+    } else if (sourceUrl && URL.canParse(sourceUrl)) {
+        const segment = new URL(sourceUrl).pathname.split("/").pop();
+        if (segment) sourceFileName = decodeURIComponent(segment);
+    }
+
     const extGuessFromSource = sourceUrl ? getUrlExtension(sourceUrl) : undefined;
-    let ext = await getExtensionFromBytes(blob) || getExtensionFromMime(blob.type) || extGuessFromSource || "png";
+    let ext = await getExtensionFromBytes(blob)
+        || getExtensionFromMime(blob.type)
+        || getFilenameExtension(sourceFileName)
+        || extGuessFromSource
+        || "bin";
 
     if (ext === "apng" && settings.store.apngToGif) {
         const gifBlob = await convertApngToGif(blob);
@@ -880,9 +1146,16 @@ async function normalizeUploadBlob(blob: Blob, sourceUrl?: string): Promise<{ bl
     }
 
     const mimeType = getMimeFromExtension(ext);
+    const { preserveOriginalFilename } = settings.store;
+    let filename = `upload.${ext}`;
+    if (preserveOriginalFilename && sourceFileName) {
+        const dotIndex = sourceFileName.lastIndexOf(".");
+        filename = `${sourceFileName.slice(0, dotIndex < 0 ? undefined : dotIndex)}.${ext}`;
+    }
+
     return {
         blob: new Blob([blob], { type: mimeType }),
-        filename: `upload.${ext}`
+        filename
     };
 }
 
@@ -891,7 +1164,7 @@ async function uploadPreparedBlob(blob: Blob, sourceUrl?: string): Promise<void>
     const { blob: normalizedBlob, filename } = await normalizeUploadBlob(blob, sourceUrl);
     setUploadState({ fileName: filename, status: "File ready, starting upload...", percent: 4 });
     const uploadedUrl = await uploadWithFallbacks(normalizedBlob, filename, primary);
-    const finalUrl = finalizeUploadedUrl(uploadedUrl);
+    const finalUrl = applyEmbedProxy(finalizeUploadedUrl(uploadedUrl));
     await notifyUploadSuccess(finalUrl);
 }
 
@@ -971,6 +1244,7 @@ export async function uploadFile(url: string): Promise<void> {
     } finally {
         isUploading = false;
         activeAbortController = null;
+        activeXhr = null;
         setTimeout(() => resetUploadState(), 1800);
     }
 }
@@ -1034,6 +1308,7 @@ export async function uploadProvidedFiles(files: readonly File[]): Promise<void>
     } finally {
         isUploading = false;
         activeAbortController = null;
+        activeXhr = null;
         setTimeout(() => resetUploadState(), 1800);
     }
 }
diff --git a/src/equicordplugins/findReply/ReplyNavigator.tsx b/src/equicordplugins/findReply/ReplyNavigator.tsx
index c33a0ddac..1c656d1ce 100644
--- a/src/equicordplugins/findReply/ReplyNavigator.tsx
+++ b/src/equicordplugins/findReply/ReplyNavigator.tsx
@@ -7,10 +7,11 @@
 import "./styles.css";
 
 import ErrorBoundary from "@components/ErrorBoundary";
+import { Paginator, requirePaginator } from "@plugins/reviewDB/components/ReviewModal";
 import { ModalCloseButton } from "@utils/modal";
 import { Message } from "@vencord/discord-types";
 import { findCssClassesLazy } from "@webpack";
-import { Paginator, React, useRef, useState } from "@webpack/common";
+import { React, useRef, useState } from "@webpack/common";
 import { MutableRefObject } from "react";
 
 import { jumper } from "./index";
@@ -38,6 +39,7 @@ export default function ReplyNavigator({ replies }: { replies: Message[]; }) {
             document.removeEventListener("mousedown", onMouseDown);
         };
     }, [ref]);
+    requirePaginator();
     return (
         <ErrorBoundary>
             <div ref={ref} className={containerStyles.containerBottom + " vc-findreply-div"} style={{
diff --git a/src/equicordplugins/findReply/index.tsx b/src/equicordplugins/findReply/index.tsx
index e76cf8f69..33c28ba8f 100644
--- a/src/equicordplugins/findReply/index.tsx
+++ b/src/equicordplugins/findReply/index.tsx
@@ -89,6 +89,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "FindReply",
     description: "Jumps to the earliest reply to a message in a channel (lets you follow past conversations more easily).",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Chat", "Shortcuts"],
     authors: [Devs.newwares],
     settings,
     messagePopoverButton: {
diff --git a/src/equicordplugins/fixFileExtensions/index.tsx b/src/equicordplugins/fixFileExtensions/index.tsx
index 489f4d5e5..0c2f3a2d7 100644
--- a/src/equicordplugins/fixFileExtensions/index.tsx
+++ b/src/equicordplugins/fixFileExtensions/index.tsx
@@ -29,6 +29,7 @@ export default definePlugin({
     name: "FixFileExtensions",
     authors: [Devs.thororen],
     description: "Fixes file extensions by renaming them to a compatible supported format if possible",
+    tags: ["Media", "Utility"],
     reporterTestable: ReporterTestable.None,
     patches: [
         // Taken from AnonymiseFileNames
diff --git a/src/equicordplugins/followVoiceUser/index.tsx b/src/equicordplugins/followVoiceUser/index.tsx
index 18ef15244..56f242166 100644
--- a/src/equicordplugins/followVoiceUser/index.tsx
+++ b/src/equicordplugins/followVoiceUser/index.tsx
@@ -74,6 +74,7 @@ const UserContextMenuPatch: NavContextMenuPatchCallback = (children, { channel,
 export default definePlugin({
     name: "FollowVoiceUser",
     description: "Follow a friend in voice chat.",
+    tags: ["Voice"],
     authors: [EquicordDevs.TheArmagan],
     settings,
     settingsAboutComponent: () => (
diff --git a/src/equicordplugins/fontLoader/index.tsx b/src/equicordplugins/fontLoader/index.tsx
index f81c1d9a5..aab6f31f3 100644
--- a/src/equicordplugins/fontLoader/index.tsx
+++ b/src/equicordplugins/fontLoader/index.tsx
@@ -200,6 +200,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "FontLoader",
     description: "Loads any font from Google Fonts",
+    tags: ["Appearance", "Customisation"],
     authors: [EquicordDevs.vmohammad],
     settings,
 
diff --git a/src/equicordplugins/forwardAnywhere/index.ts b/src/equicordplugins/forwardAnywhere/index.ts
index 4b1a4dd4e..0404c4acf 100644
--- a/src/equicordplugins/forwardAnywhere/index.ts
+++ b/src/equicordplugins/forwardAnywhere/index.ts
@@ -25,6 +25,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "ForwardAnywhere",
     description: "If a forward fails send it as a normal message also allows nsfw forwards",
+    tags: ["Chat", "Utility"],
     authors: [Devs.thororen],
     settings,
     patches: [
diff --git a/src/equicordplugins/frequentQuickSwitcher/index.tsx b/src/equicordplugins/frequentQuickSwitcher/index.tsx
index c2d61a11e..f6c2a3770 100644
--- a/src/equicordplugins/frequentQuickSwitcher/index.tsx
+++ b/src/equicordplugins/frequentQuickSwitcher/index.tsx
@@ -37,6 +37,7 @@ function generateSearchResults(query) {
 export default definePlugin({
     name: "FrequentQuickSwitcher",
     description: "Rewrites and filters the quick switcher results to be your most frequent channels",
+    tags: ["Shortcuts", "Servers"],
     authors: [Devs.Samwich],
     generateSearchResults: generateSearchResults,
     patches: [
diff --git a/src/equicordplugins/friendCodes/index.tsx b/src/equicordplugins/friendCodes/index.tsx
index 8168cfe04..9997a8347 100644
--- a/src/equicordplugins/friendCodes/index.tsx
+++ b/src/equicordplugins/friendCodes/index.tsx
@@ -12,6 +12,7 @@ import FriendCodesPanel from "./FriendCodesPanel";
 export default definePlugin({
     name: "FriendCodes",
     description: "Generate FriendCodes to easily add friends",
+    tags: ["Friends", "Utility"],
     authors: [Devs.HypedDomi],
     patches: [
         {
diff --git a/src/equicordplugins/friendTags/index.tsx b/src/equicordplugins/friendTags/index.tsx
index 0f893cdb8..520fafda4 100644
--- a/src/equicordplugins/friendTags/index.tsx
+++ b/src/equicordplugins/friendTags/index.tsx
@@ -209,6 +209,7 @@ const userPatch: NavContextMenuPatchCallback = (children, { user }) => {
 export default definePlugin({
     name: "FriendTags",
     description: "Allows you to filter by custom tags in the quick switcher by starting a search with &",
+    tags: ["Shortcuts"],
     authors: [Devs.Samwich],
     settings,
     contextMenus: {
diff --git a/src/equicordplugins/friendshipRanks/index.tsx b/src/equicordplugins/friendshipRanks/index.tsx
index 9294c9f61..c33b57b9e 100644
--- a/src/equicordplugins/friendshipRanks/index.tsx
+++ b/src/equicordplugins/friendshipRanks/index.tsx
@@ -6,7 +6,7 @@
 
 import "./styles.css";
 
-import { BadgePosition, BadgeUserArgs, ProfileBadge } from "@api/Badges";
+import { BadgePosition, BadgeUserArgs } from "@api/Badges";
 import { Badges } from "@api/index";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
@@ -121,8 +121,9 @@ function shouldShowBadge(userId: string, requirement: number, index: number) {
 }
 
 function getBadgesToApply() {
-    const badgesToApply: ProfileBadge[] = ranks.map((rank, index) => {
+    return ranks.map((rank, index) => {
         return ({
+            id: `friendship_ranks_badge_${index}`,
             description: rank.title,
             iconSrc: rank.iconSrc,
             position: BadgePosition.END,
@@ -136,13 +137,12 @@ function getBadgesToApply() {
             },
         });
     });
-
-    return badgesToApply;
 }
 
 export default definePlugin({
     name: "FriendshipRanks",
     description: "Adds badges showcasing how long you have been friends with a user for",
+    tags: ["Friends"],
     authors: [Devs.Samwich],
     start() {
         getBadgesToApply().forEach(b => Badges.addProfileBadge(b));
diff --git a/src/equicordplugins/fullVcPfp/index.tsx b/src/equicordplugins/fullVcPfp/index.tsx
index f1664da80..09c9fec27 100644
--- a/src/equicordplugins/fullVcPfp/index.tsx
+++ b/src/equicordplugins/fullVcPfp/index.tsx
@@ -14,6 +14,7 @@ import style from "./style.css?managed";
 export default definePlugin({
     name: "FullVCPFP",
     description: "Makes avatars take up the entire vc tile",
+    tags: ["Appearance", "Voice"],
     authors: [EquicordDevs.mochienya],
     patches: [
         {
diff --git a/src/equicordplugins/ghosted/index.tsx b/src/equicordplugins/ghosted/index.tsx
index 921970696..ca2b504d9 100644
--- a/src/equicordplugins/ghosted/index.tsx
+++ b/src/equicordplugins/ghosted/index.tsx
@@ -147,6 +147,7 @@ function makeContextItem(props) {
 export default definePlugin({
     name: "Ghosted",
     description: "A cute ghost will appear if you don't answer their DMs",
+    tags: ["Chat", "Utility"],
     authors: [EquicordDevs.vei, Devs.sadan, EquicordDevs.justjxke, EquicordDevs.iamme],
     settings,
     dependencies: ["AudioPlayerAPI", "ServerListAPI"],
diff --git a/src/equicordplugins/gifCollections/index.tsx b/src/equicordplugins/gifCollections/index.tsx
index 54fb969a0..92c3ac962 100644
--- a/src/equicordplugins/gifCollections/index.tsx
+++ b/src/equicordplugins/gifCollections/index.tsx
@@ -6,7 +6,7 @@
 
 import "./style.css";
 
-import { Devs, EquicordDevs } from "@utils/constants";
+import { EquicordDevs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { FluxDispatcher } from "@webpack/common";
 
@@ -26,6 +26,7 @@ let oldTrendingCat: Category[] | null = null;
 export default definePlugin({
     name: "GifCollections",
     description: "Allows you to create collections of gifs.",
+    tags: ["Chat", "Emotes"],
     authors: [EquicordDevs.creations],
     settings,
     contextMenus: {
@@ -157,7 +158,7 @@ export default definePlugin({
                 oldTrendingCat = instance.props.trendingCategories;
             }
             if (settings.store.onlyShowCollections) {
-                instance.props.trendingCategories = [...this.sortedCollections(), ...instance.props.favorites];
+                instance.props.trendingCategories = this.sortedCollections();
             } else if (oldTrendingCat != null) {
                 instance.props.trendingCategories = [...this.sortedCollections(), ...oldTrendingCat];
             }
diff --git a/src/equicordplugins/githubRepos/index.tsx b/src/equicordplugins/githubRepos/index.tsx
index 75f566a82..be371e203 100644
--- a/src/equicordplugins/githubRepos/index.tsx
+++ b/src/equicordplugins/githubRepos/index.tsx
@@ -13,7 +13,7 @@ import { classNameFactory } from "@utils/css";
 import definePlugin, { OptionType } from "@utils/types";
 import { User } from "@vencord/discord-types";
 import { findByCodeLazy } from "@webpack";
-import { React } from "@webpack/common";
+import { React, UserProfileStore } from "@webpack/common";
 
 import { ProfilePopoutComponent } from "./components/ProfilePopoutComponent";
 import { ProfileTabComponent } from "./components/ProfileTabComponent";
@@ -38,6 +38,8 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "GitHubRepos",
     description: "Displays a user's public GitHub repositories in their profile",
+    dependencies: ["ProfileCollectionsAPI"],
+    tags: ["Appearance"],
     authors: [EquicordDevs.talhakf, EquicordDevs.Panniku, EquicordDevs.benjii],
     settings,
 
@@ -46,8 +48,8 @@ export default definePlugin({
         {
             find: "#{intl::USER_PROFILE_ACTIVITY}",
             replacement: {
-                match: /\.MUTUAL_GUILDS\}\)\)(?=,(\i))/,
-                replace: '$&,$1.push({text:"GitHub",section:"GITHUB"})',
+                match: /(\i)\.id!==\i\?\.id&&\i&&\(.{0,300}\.MUTUAL_GUILDS\}\)\)(?=,(\i))/,
+                replace: '$&,$self.shouldShowGitHub($1.id)&&$2.push({text:"GitHub",section:"GITHUB"})',
             }
         },
         // User Profile Modal v2 tab content
@@ -59,6 +61,9 @@ export default definePlugin({
             }
         }
     ],
+    shouldShowGitHub(userId: string) {
+        return UserProfileStore.getUserProfile(userId)?.connectedAccounts?.some((c: any) => c.type === "github") ?? false;
+    },
     renderProfileCollection: (props: { user: User; displayProfile?: any; }) => {
         return (
             <ProfilePopoutComponent
diff --git a/src/equicordplugins/globalBadges/index.tsx b/src/equicordplugins/globalBadges/index.tsx
index 24802395a..5d0d3ce23 100644
--- a/src/equicordplugins/globalBadges/index.tsx
+++ b/src/equicordplugins/globalBadges/index.tsx
@@ -25,6 +25,7 @@ migratePluginSetting("GlobalBadges", "showRaincord", "showRa1ncord");
 export default definePlugin({
     name: "GlobalBadges",
     description: "Adds global badges from other client mods",
+    tags: ["Appearance"],
     authors: [Devs.HypedDomi, EquicordDevs.Wolfie, Devs.thororen],
     settings,
     settingsAboutComponent: () => (
@@ -60,7 +61,8 @@ export default definePlugin({
         return GlobalBadges;
     },
     getGlobalBadges(userId: string) {
-        return GlobalBadges[userId]?.map(badge => ({
+        return GlobalBadges[userId]?.map((badge, idx) => ({
+            id: `global_badges_badge_${idx}`,
             iconSrc: badge.badge,
             description: badge.tooltip,
             position: BadgePosition.START,
diff --git a/src/equicordplugins/googleThat/index.tsx b/src/equicordplugins/googleThat/index.tsx
index 18f6753c3..3f924d419 100644
--- a/src/equicordplugins/googleThat/index.tsx
+++ b/src/equicordplugins/googleThat/index.tsx
@@ -75,8 +75,10 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "GoogleThat",
     description: "Adds a command to send a internet search link",
+    dependencies: ["CommandsAPI"],
+    tags: ["Commands", "Utility"],
     authors: [Devs.Samwich, EquicordDevs.KrystalSkull],
-    tags: ["search", "google", "query", "duckduckgo", "command"],
+    searchTerms: ["search", "google", "query", "duckduckgo", "command"],
     settings,
     commands: [
         {
diff --git a/src/equicordplugins/guildPickerDumper/index.tsx b/src/equicordplugins/guildPickerDumper/index.tsx
index 58892bf73..fe9e86b39 100644
--- a/src/equicordplugins/guildPickerDumper/index.tsx
+++ b/src/equicordplugins/guildPickerDumper/index.tsx
@@ -95,6 +95,7 @@ async function zipGuildAssets(guild: Guild, type: "emojis" | "stickers") {
 export default definePlugin({
     name: "GuildPickerDumper",
     description: "Context menu to dump and download a server's emojis and stickers.",
+    tags: ["Emotes", "Servers", "Utility"],
     authors: [EquicordDevs.Cortex, Devs.Samwich, EquicordDevs.Synth, Devs.thororen],
     contextMenus: {
         "guild-context": Patch,
diff --git a/src/equicordplugins/hideChatButtons/index.tsx b/src/equicordplugins/hideChatButtons/index.tsx
index 9bdbfc98e..62a578cad 100644
--- a/src/equicordplugins/hideChatButtons/index.tsx
+++ b/src/equicordplugins/hideChatButtons/index.tsx
@@ -5,21 +5,21 @@
  */
 
 import { ChatBarButton } from "@api/ChatButtons";
-import { definePluginSettings } from "@api/Settings";
+import { definePluginSettings, migratePluginSetting } from "@api/Settings";
 import { EquicordDevs } from "@utils/constants";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
-import { React, useEffect, useState } from "@webpack/common";
+import { useEffect, useState } from "@webpack/common";
 import type { MouseEventHandler, ReactNode } from "react";
 
 let hidechatbuttonsopen: boolean | undefined;
 
 const settings = definePluginSettings({
-    Color: {
+    color: {
         type: OptionType.BOOLEAN,
         description: "Color it red on open", // something extra
         default: false,
     },
-    Open: {
+    open: {
         type: OptionType.BOOLEAN,
         description: "opened by default",
         default: false,
@@ -35,7 +35,7 @@ function HideToggleButton(props: { open: boolean | undefined, onClick: MouseEven
         tooltip={props.open ? "Close" : "Open"}
     >
         <svg
-            fill={settings.store.Color && props.open ? "#c32a32" : "currentColor"}
+            fill={settings.store.color && props.open ? "#c32a32" : "currentColor"}
             fillRule="evenodd"
             width="20"
             height="20"
@@ -50,8 +50,14 @@ function HideToggleButton(props: { open: boolean | undefined, onClick: MouseEven
     </ChatBarButton>);
 }
 
-function ButtonsInnerComponent({ buttons }: { buttons: ReactNode[]; }) {
-    if (!buttons || buttons.every(x => (x as any)?.props?.disabled === true)) return null;
+function ButtonsInnerComponent({ buttons }: { buttons: ReactNode; }) {
+    const buttonItems = Array.isArray(buttons)
+        ? buttons
+        : buttons == null
+            ? []
+            : [buttons];
+
+    if (buttonItems.length === 0 || buttonItems.every(button => (button as any)?.props?.disabled === true)) return null;
 
     const [open, setOpen] = useState(hidechatbuttonsopen);
 
@@ -66,34 +72,29 @@ function ButtonsInnerComponent({ buttons }: { buttons: ReactNode[]; }) {
             overflowX: "auto",
             overflowY: "hidden"
         }}>
-            {open && buttons.map((b, i) => <React.Fragment key={i}>{b}</React.Fragment>)}
+            {open && buttons}
             <HideToggleButton onClick={() => setOpen(!open)} open={open} />
         </div>
     );
 }
 
+migratePluginSetting("HideChatButtons", "open", "Open");
+migratePluginSetting("HideChatButtons", "color", "Color");
 export default definePlugin({
     name: "HideChatButtons",
-    description: "able to hide the chat buttons",
-    settings: settings,
+    description: "Able to hide the chat buttons",
+    tags: ["Chat", "Utility"],
     authors: [EquicordDevs.iamme],
-    patches: [
-        {
-            find: '"sticker")',
-            replacement: {
-                match: /(?<="div",\{.{0,15}children:)(.+?)\}/,
-                replace: "$self.buttonsInner($1)}"
-            }
-        }
-    ],
+    dependencies: ["ChatInputButtonAPI"],
+    settings: settings,
     startAt: StartAt.Init,
-    buttonsInner(buttons: ReactNode[]) {
+    chatBarButtonWrapper: (buttons: ReactNode) => {
         return <ButtonsInnerComponent buttons={buttons} />;
     },
     start() {
-        hidechatbuttonsopen = settings.store.Open;
+        hidechatbuttonsopen = settings.store.open;
     },
     stop() {
         hidechatbuttonsopen = undefined;
-    }
+    },
 });
diff --git a/src/equicordplugins/hideMessages/index.tsx b/src/equicordplugins/hideMessages/index.tsx
index ca5feb6bd..425eaa4d9 100644
--- a/src/equicordplugins/hideMessages/index.tsx
+++ b/src/equicordplugins/hideMessages/index.tsx
@@ -6,15 +6,12 @@
 
 import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
+import { EyeIcon } from "@components/Icons";
 import { EquicordDevs } from "@utils/constants";
-import definePlugin, { IconComponent, OptionType } from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { Message } from "@vencord/discord-types";
-import { findExportedComponentLazy } from "@webpack";
 import { ChannelStore, FluxDispatcher, Menu } from "@webpack/common";
 
-const EyeIconLazy = findExportedComponentLazy("EyeIcon");
-const EyeIcon: IconComponent = props => <EyeIconLazy {...props} />;
-
 const hideMessage = (messageId: string, channelId: string) => {
     FluxDispatcher.dispatch({
         type: "MESSAGE_DELETE",
@@ -49,6 +46,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "HideMessages",
     description: "A plugin to temporarily hide messages until you restart.",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Chat", "Utility"],
     authors: [EquicordDevs.yash],
     contextMenus: {
         "message": messageCtxPatch
diff --git a/src/equicordplugins/hideServers/index.tsx b/src/equicordplugins/hideServers/index.tsx
index 054c9ecac..8de222d2f 100644
--- a/src/equicordplugins/hideServers/index.tsx
+++ b/src/equicordplugins/hideServers/index.tsx
@@ -76,8 +76,9 @@ export function removeIndicator() {
 export default definePlugin({
     name: "HideServers",
     description: "Allows you to hide servers from the guild list and quick switcher by right clicking them",
+    tags: ["Servers", "Utility"],
     authors: [EquicordDevs.bep],
-    tags: ["guild", "server", "hide", "folder"],
+    searchTerms: ["guild", "server", "hide", "folder"],
 
     dependencies: ["ServerListAPI"],
     contextMenus: {
diff --git a/src/equicordplugins/holyNotes/NoteHandler.ts b/src/equicordplugins/holyNotes/NoteHandler.ts
deleted file mode 100644
index 0dcc3ab3e..000000000
--- a/src/equicordplugins/holyNotes/NoteHandler.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Channel, Message } from "@vencord/discord-types";
-import { proxyLazyWebpack } from "@webpack";
-import { ChannelStore, Toasts, UserStore } from "@webpack/common";
-
-import { AllNotebooks, Note, Notebook } from "./types";
-import { deleteCacheFromDataStore, DeleteEntireStore, saveCacheToDataStore } from "./utils";
-
-export const noteHandlerCache = new Map<string, Notebook>();
-
-function showToast(message: string, type: typeof Toasts.Type[keyof typeof Toasts.Type] = Toasts.Type.SUCCESS) {
-    Toasts.show({ id: Toasts.genId(), message, type });
-}
-
-function formatNote(channel: Channel, message: Message): Note {
-    return {
-        id: message.id,
-        channel_id: message.channel_id,
-        guild_id: channel.guild_id,
-        content: message.content,
-        author: {
-            id: message.author.id,
-            avatar: message.author.avatar,
-            discriminator: message.author.discriminator,
-            username: message.author.username,
-        },
-        flags: message.flags,
-        timestamp: message.timestamp.toString(),
-        attachments: message.attachments,
-        embeds: message.embeds,
-        reactions: message.reactions,
-        stickerItems: message.stickerItems,
-    };
-}
-
-export const noteHandler = proxyLazyWebpack(() => ({
-    getNotes(notebook: string): Notebook | undefined {
-        return noteHandlerCache.get(notebook);
-    },
-
-    getAllNotes(): AllNotebooks {
-        return Object.fromEntries(noteHandlerCache.entries());
-    },
-
-    addNote(message: Message, notebook: string) {
-        const notes = this.getNotes(notebook) ?? {};
-        const channel = ChannelStore.getChannel(message.channel_id);
-        const newNotes = { [message.id]: formatNote(channel, message), ...notes };
-
-        noteHandlerCache.set(notebook, newNotes);
-        saveCacheToDataStore(notebook, newNotes);
-        showToast(`Added note to ${notebook}`);
-    },
-
-    deleteNote(noteId: string, notebook: string) {
-        const notes = this.getNotes(notebook);
-        if (!notes) return;
-
-        const { [noteId]: _, ...rest } = notes;
-        noteHandlerCache.set(notebook, rest);
-        saveCacheToDataStore(notebook, rest);
-        showToast(`Deleted note from ${notebook}`);
-    },
-
-    moveNote(note: Note, from: string, to: string) {
-        const fromNotes = this.getNotes(from);
-        const toNotes = this.getNotes(to);
-        if (!fromNotes || !toNotes) return;
-
-        const { [note.id]: _, ...restFrom } = fromNotes;
-        const newTo = { [note.id]: note, ...toNotes };
-
-        noteHandlerCache.set(from, restFrom);
-        noteHandlerCache.set(to, newTo);
-        saveCacheToDataStore(from, restFrom);
-        saveCacheToDataStore(to, newTo);
-        showToast(`Moved note from ${from} to ${to}`);
-    },
-
-    newNoteBook(name: string, silent?: boolean) {
-        if (noteHandlerCache.has(name)) {
-            showToast(`Notebook ${name} already exists`, Toasts.Type.FAILURE);
-            return;
-        }
-
-        noteHandlerCache.set(name, {});
-        saveCacheToDataStore(name, {});
-        if (!silent) showToast(`Created notebook ${name}`);
-    },
-
-    deleteNotebook(name: string) {
-        noteHandlerCache.delete(name);
-        deleteCacheFromDataStore(name);
-        showToast(`Deleted notebook ${name}`);
-    },
-
-    refreshAvatars() {
-        const notebooks = this.getAllNotes();
-
-        for (const notebookName in notebooks) {
-            const notebook = notebooks[notebookName];
-            for (const noteId in notebook) {
-                const note = notebook[noteId];
-                const user = UserStore.getUser(note.author.id);
-                if (user) {
-                    note.author.avatar = user.avatar;
-                    note.author.discriminator = user.discriminator;
-                    note.author.username = user.username;
-                }
-            }
-            noteHandlerCache.set(notebookName, notebook);
-            saveCacheToDataStore(notebookName, notebook);
-        }
-
-        showToast("Refreshed avatars");
-    },
-
-    async deleteEverything() {
-        noteHandlerCache.clear();
-        await DeleteEntireStore();
-        showToast("Deleted all notes");
-    },
-
-    exportNotes(): AllNotebooks {
-        return this.getAllNotes();
-    },
-
-    importNotes(jsonString: string) {
-        let parsed: AllNotebooks;
-        try {
-            parsed = JSON.parse(jsonString);
-        } catch {
-            showToast("Invalid JSON", Toasts.Type.FAILURE);
-            return;
-        }
-
-        for (const notebook in parsed) {
-            noteHandlerCache.set(notebook, parsed[notebook]);
-            saveCacheToDataStore(notebook, parsed[notebook]);
-        }
-
-        showToast("Imported notes");
-    },
-}));
diff --git a/src/equicordplugins/holyNotes/components/modals/Error.tsx b/src/equicordplugins/holyNotes/components/modals/Error.tsx
deleted file mode 100644
index df7974d71..000000000
--- a/src/equicordplugins/holyNotes/components/modals/Error.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { resultsClasses } from "@equicordplugins/holyNotes";
-
-export default function EmptyNotebook({ error }: { error?: Error; } = {}) {
-    if (error) {
-        console.error("[HolyNotes] Error:", error);
-        return (
-            <div className={resultsClasses.emptyResultsWrap}>
-                <div className={resultsClasses.emptyResultsContent} style={{ paddingBottom: 0 }}>
-                    <div className={resultsClasses.errorImage} />
-                    <div className={resultsClasses.emptyResultsText}>
-                        There was an error parsing your notes. Check the console for details.
-                    </div>
-                </div>
-            </div>
-        );
-    }
-
-    const isEasterEgg = Math.random() < 0.1;
-
-    return (
-        <div className={resultsClasses.emptyResultsWrap}>
-            <div className={resultsClasses.emptyResultsContent} style={{ paddingBottom: 0 }}>
-                <div className={`${resultsClasses.noResultsImage}${isEasterEgg ? ` ${resultsClasses.alt}` : ""}`} />
-                <div className={resultsClasses.emptyResultsText}>
-                    {isEasterEgg
-                        ? "No notes were found. Empathy banana is here for you."
-                        : "No notes were found in this notebook."}
-                </div>
-            </div>
-        </div>
-    );
-}
diff --git a/src/equicordplugins/holyNotes/components/modals/HelpModal.tsx b/src/equicordplugins/holyNotes/components/modals/HelpModal.tsx
deleted file mode 100644
index 3efe060c2..000000000
--- a/src/equicordplugins/holyNotes/components/modals/HelpModal.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { BaseText } from "@components/BaseText";
-import { Button } from "@components/Button";
-import { Flex } from "@components/Flex";
-import { cl } from "@equicordplugins/holyNotes";
-import { noteHandler } from "@equicordplugins/holyNotes/NoteHandler";
-import { downloadNotes, uploadNotes } from "@equicordplugins/holyNotes/utils";
-import { CloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
-
-function HelpSection({ title, children }: { title: string; children: React.ReactNode; }) {
-    return (
-        <>
-            <BaseText size="md" weight="semibold" color="text-strong">{title}</BaseText>
-            <BaseText size="sm" color="text-default" style={{ marginTop: 4 }}>{children}</BaseText>
-            <hr />
-        </>
-    );
-}
-
-export default function HelpModal({ onClose, transitionState }: ModalProps) {
-    return (
-        <ModalRoot transitionState={transitionState} size={ModalSize.MEDIUM}>
-            <ModalHeader separator={false} className={cl("header")}>
-                <div className={cl("header-content")}>
-                    <BaseText tag="h2" size="lg" weight="semibold" className={cl("title")}>
-                        Help
-                    </BaseText>
-                    <BaseText size="sm" className={cl("description")}>
-                        Learn how to use Holy Notes
-                    </BaseText>
-                </div>
-                <div className={cl("header-trailing")}>
-                    <CloseButton onClick={onClose} />
-                </div>
-            </ModalHeader>
-            <ModalContent className={cl("content")}>
-                <div className="vc-help-markdown">
-                    <HelpSection title="Adding Notes">
-                        Right-click a message, hover over "Note Message", and select the notebook.
-                    </HelpSection>
-                    <HelpSection title="Deleting Notes">
-                        Right-click a note and select "Delete Note", or hold DELETE and click a note.
-                    </HelpSection>
-                    <HelpSection title="Moving Notes">
-                        Right-click a note, hover over "Move Note", and select the destination notebook.
-                    </HelpSection>
-                    <HelpSection title="Jump To Message">
-                        Right-click a note and select "Jump to Message" to go to the original message.
-                    </HelpSection>
-                </div>
-            </ModalContent>
-            <ModalFooter>
-                <Flex style={{ gap: 8, flexWrap: "wrap" }}>
-                    <Button size="small" variant="primary" onClick={() => noteHandler.refreshAvatars()}>
-                        Refresh Avatars
-                    </Button>
-                    <Button size="small" variant="secondary" onClick={uploadNotes}>
-                        Import Notes
-                    </Button>
-                    <Button size="small" variant="secondary" onClick={downloadNotes}>
-                        Export Notes
-                    </Button>
-                    <Button size="small" variant="dangerSecondary" onClick={() => noteHandler.deleteEverything()}>
-                        Delete All Notes
-                    </Button>
-                </Flex>
-            </ModalFooter>
-        </ModalRoot>
-    );
-}
diff --git a/src/equicordplugins/holyNotes/components/modals/Notebook.tsx b/src/equicordplugins/holyNotes/components/modals/Notebook.tsx
deleted file mode 100644
index 011ccbf43..000000000
--- a/src/equicordplugins/holyNotes/components/modals/Notebook.tsx
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { BaseText } from "@components/BaseText";
-import { Button } from "@components/Button";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Flex } from "@components/Flex";
-import { BookmarkIcon, CircleQuestionIcon, cl } from "@equicordplugins/holyNotes";
-import { noteHandler } from "@equicordplugins/holyNotes/NoteHandler";
-import { Note, Notebook } from "@equicordplugins/holyNotes/types";
-import { CloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { Clickable, React, Select, TextInput, Tooltip, useState } from "@webpack/common";
-
-import Errors from "./Error";
-import HelpModal from "./HelpModal";
-import NotebookCreateModal from "./NotebookCreateModal";
-import NotebookDeleteModal from "./NotebookDeleteModal";
-import { RenderMessage } from "./RenderMessage";
-
-const enum SortOption {
-    NewestAdded,
-    OldestAdded,
-    NewestMessage,
-    OldestMessage
-}
-
-function NotebookTabs({ notebooks, selected, onSelect }: {
-    notebooks: string[];
-    selected: string;
-    onSelect: (tab: string) => void;
-}) {
-    const sorted = [...notebooks].sort((a, b) =>
-        a === "Main" ? -1 : b === "Main" ? 1 : a.localeCompare(b)
-    );
-
-    return (
-        <div className={cl("tabs")}>
-            {sorted.map(name => (
-                <Clickable
-                    key={name}
-                    className={cl("tab", selected === name && "tab-selected")}
-                    onClick={() => onSelect(name)}
-                >
-                    {name}
-                </Clickable>
-            ))}
-        </div>
-    );
-}
-
-function sortNotes(notes: Note[], sort: SortOption): Note[] {
-    const sorted = [...notes];
-    switch (sort) {
-        case SortOption.NewestAdded:
-            return sorted;
-        case SortOption.OldestAdded:
-            return sorted.reverse();
-        case SortOption.NewestMessage:
-            return sorted.sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
-        case SortOption.OldestMessage:
-            return sorted.sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
-    }
-}
-
-function filterNotes(notes: Notebook, search: string): Note[] {
-    const arr = Object.values(notes);
-    if (!search) return arr;
-    const q = search.toLowerCase();
-    return arr.filter(n => n.content?.toLowerCase().includes(q));
-}
-
-export function NoteModal({ onClose, transitionState }: ModalProps) {
-    const [sort, setSort] = useState(SortOption.NewestAdded);
-    const [search, setSearch] = useState("");
-    const [notebook, setNotebook] = useState("Main");
-    const [, forceUpdate] = React.useReducer(x => x + 1, 0);
-
-    const notes = noteHandler.getNotes(notebook);
-    if (!notes) return null;
-
-    const filtered = filterNotes(notes, search);
-    const sorted = sortNotes(filtered, sort);
-    const total = Object.keys(notes).length;
-    const isMain = notebook === "Main";
-
-    return (
-        <ModalRoot transitionState={transitionState} size={ModalSize.LARGE}>
-            <ModalHeader separator={false} className={cl("header")}>
-                <div className={cl("header-content")}>
-                    <Flex alignItems="center" style={{ gap: "12px" }}>
-                        <BookmarkIcon size="md" />
-                        <BaseText tag="h2" size="lg" weight="semibold" className={cl("title")}>
-                            Notebook
-                        </BaseText>
-                    </Flex>
-                    <BaseText size="sm" className={cl("description")}>
-                        {search ? `${filtered.length} of ${total}` : total} {total === 1 ? "note" : "notes"}
-                    </BaseText>
-                </div>
-                <div className={cl("header-trailing")}>
-                    <CloseButton onClick={onClose} />
-                </div>
-            </ModalHeader>
-
-            <div className={cl("controls")}>
-                <TextInput
-                    placeholder="Search notes..."
-                    value={search}
-                    onChange={setSearch}
-                />
-                <Select
-                    options={[
-                        { label: "Newest First", value: SortOption.NewestAdded, default: true },
-                        { label: "Oldest First", value: SortOption.OldestAdded },
-                        { label: "Newest Msg", value: SortOption.NewestMessage },
-                        { label: "Oldest Msg", value: SortOption.OldestMessage },
-                    ]}
-                    serialize={String}
-                    select={setSort}
-                    isSelected={v => v === sort}
-                    closeOnSelect
-                />
-            </div>
-
-            <NotebookTabs
-                notebooks={Object.keys(noteHandler.getAllNotes())}
-                selected={notebook}
-                onSelect={setNotebook}
-            />
-
-            <ModalContent className={cl("content")}>
-                <ErrorBoundary>
-                    {sorted.length ? sorted.map(note => (
-                        <RenderMessage
-                            key={note.id}
-                            note={note}
-                            notebook={notebook}
-                            updateParent={forceUpdate}
-                            fromDeleteModal={false}
-                            closeModal={onClose}
-                        />
-                    )) : <Errors />}
-                </ErrorBoundary>
-            </ModalContent>
-
-            <ModalFooter>
-                <Flex style={{ justifyContent: "space-between", alignItems: "center", width: "100%" }}>
-                    <Tooltip text="Help">
-                        {({ onMouseEnter, onMouseLeave }) => (
-                            <Clickable
-                                className={cl("icon-button")}
-                                onClick={() => openModal(props => <HelpModal {...props} />)}
-                                onMouseEnter={onMouseEnter}
-                                onMouseLeave={onMouseLeave}
-                            >
-                                <CircleQuestionIcon size="sm" />
-                            </Clickable>
-                        )}
-                    </Tooltip>
-                    <Button
-                        variant={isMain ? "primary" : "dangerPrimary"}
-                        onClick={() => isMain
-                            ? openModal(props => <NotebookCreateModal {...props} />)
-                            : openModal(props => <NotebookDeleteModal {...props} notebook={notebook} onChangeTab={setNotebook} />)
-                        }
-                    >
-                        {isMain ? "Create Notebook" : "Delete Notebook"}
-                    </Button>
-                </Flex>
-            </ModalFooter>
-        </ModalRoot>
-    );
-}
diff --git a/src/equicordplugins/holyNotes/components/modals/NotebookCreateModal.tsx b/src/equicordplugins/holyNotes/components/modals/NotebookCreateModal.tsx
deleted file mode 100644
index ba4c3353a..000000000
--- a/src/equicordplugins/holyNotes/components/modals/NotebookCreateModal.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { BaseText } from "@components/BaseText";
-import { Button } from "@components/Button";
-import { cl } from "@equicordplugins/holyNotes";
-import { noteHandler } from "@equicordplugins/holyNotes/NoteHandler";
-import { CloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
-import { TextInput, useState } from "@webpack/common";
-
-export default function NotebookCreateModal({ onClose, transitionState }: ModalProps) {
-    const [name, setName] = useState("");
-
-    const handleCreate = () => {
-        if (!name.trim()) return;
-        noteHandler.newNoteBook(name.trim());
-        onClose();
-    };
-
-    return (
-        <ModalRoot transitionState={transitionState} size={ModalSize.SMALL} className={cl("create-modal")}>
-            <ModalHeader separator={false} className={cl("header")}>
-                <div className={cl("header-content")}>
-                    <BaseText tag="h2" size="lg" weight="semibold" className={cl("title")}>
-                        Create Notebook
-                    </BaseText>
-                    <BaseText size="sm" className={cl("description")}>
-                        Enter a name for your new notebook
-                    </BaseText>
-                </div>
-                <div className={cl("header-trailing")}>
-                    <CloseButton onClick={onClose} />
-                </div>
-            </ModalHeader>
-            <ModalContent className={cl("content")}>
-                <TextInput
-                    value={name}
-                    placeholder="Notebook Name"
-                    onChange={setName}
-                />
-            </ModalContent>
-            <ModalFooter>
-                <Button variant="primary" onClick={handleCreate}>
-                    Create
-                </Button>
-                <Button variant="secondary" onClick={onClose}>
-                    Cancel
-                </Button>
-            </ModalFooter>
-        </ModalRoot>
-    );
-}
diff --git a/src/equicordplugins/holyNotes/components/modals/NotebookDeleteModal.tsx b/src/equicordplugins/holyNotes/components/modals/NotebookDeleteModal.tsx
deleted file mode 100644
index 6dc68a830..000000000
--- a/src/equicordplugins/holyNotes/components/modals/NotebookDeleteModal.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { BaseText } from "@components/BaseText";
-import { Button } from "@components/Button";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { cl } from "@equicordplugins/holyNotes";
-import { noteHandler } from "@equicordplugins/holyNotes/NoteHandler";
-import { CloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
-import { React } from "@webpack/common";
-
-import EmptyNotebook from "./Error";
-import { RenderMessage } from "./RenderMessage";
-
-interface Props extends ModalProps {
-    notebook: string;
-    onChangeTab: React.Dispatch<React.SetStateAction<string>>;
-}
-
-export default function NotebookDeleteModal({ onClose, transitionState, notebook, onChangeTab }: Props) {
-    const notes = noteHandler.getNotes(notebook);
-
-    const handleDelete = () => {
-        onClose();
-        onChangeTab("Main");
-        noteHandler.deleteNotebook(notebook);
-    };
-
-    const noteList = notes ? Object.values(notes) : [];
-
-    return (
-        <ModalRoot transitionState={transitionState} size={ModalSize.LARGE}>
-            <ModalHeader separator={false} className={cl("header")}>
-                <div className={cl("header-content")}>
-                    <BaseText tag="h2" size="lg" weight="semibold" className={cl("title")}>
-                        Delete "{notebook}"?
-                    </BaseText>
-                    <BaseText size="sm" className={cl("description")}>
-                        {noteList.length} {noteList.length === 1 ? "note" : "notes"} will be deleted
-                    </BaseText>
-                </div>
-                <div className={cl("header-trailing")}>
-                    <CloseButton onClick={onClose} />
-                </div>
-            </ModalHeader>
-            <ModalContent className={cl("content")}>
-                <ErrorBoundary>
-                    {noteList.length ? noteList.map(note => (
-                        <RenderMessage
-                            key={note.id}
-                            note={note}
-                            notebook={notebook}
-                            fromDeleteModal
-                        />
-                    )) : <EmptyNotebook />}
-                </ErrorBoundary>
-            </ModalContent>
-            <ModalFooter>
-                <Button variant="dangerPrimary" onClick={handleDelete}>
-                    Delete Notebook
-                </Button>
-            </ModalFooter>
-        </ModalRoot>
-    );
-}
diff --git a/src/equicordplugins/holyNotes/components/modals/RenderMessage.tsx b/src/equicordplugins/holyNotes/components/modals/RenderMessage.tsx
deleted file mode 100644
index d3e7f91f6..000000000
--- a/src/equicordplugins/holyNotes/components/modals/RenderMessage.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { CopyIcon, DeleteIcon, IDIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
-import { ChannelMessage, ChannelRecord, messageClasses, MessageRecord } from "@equicordplugins/holyNotes";
-import { noteHandler } from "@equicordplugins/holyNotes/NoteHandler";
-import { Note } from "@equicordplugins/holyNotes/types";
-import { copyToClipboard } from "@utils/clipboard";
-import { fetchUserProfile } from "@utils/discord";
-import { proxyLazy } from "@utils/lazy";
-import { classes } from "@utils/misc";
-import { ContextMenuApi, FluxDispatcher, Menu, NavigationRouter, useEffect, useReducer, useRef, UserStore } from "@webpack/common";
-
-const UserRecord = proxyLazy(() => UserStore.getCurrentUser().constructor) as any;
-
-interface Props {
-    note: Note;
-    notebook: string;
-    updateParent?: () => void;
-    fromDeleteModal: boolean;
-    closeModal?: () => void;
-}
-
-export function RenderMessage({ note, notebook, updateParent, fromDeleteModal, closeModal }: Props) {
-    const isHoldingDeleteRef = useRef(false);
-    const [, forceUpdate] = useReducer(x => x + 1, 0);
-
-    useEffect(() => {
-        if (!UserStore.getUser(note.author.id)) {
-            fetchUserProfile(note.author.id);
-        }
-    }, [note.author.id]);
-
-    useEffect(() => {
-        const handleKey = (e: KeyboardEvent) => {
-            if (e.key !== "Delete") return;
-            const isDown = e.type === "keydown";
-            if (isHoldingDeleteRef.current !== isDown) {
-                isHoldingDeleteRef.current = isDown;
-                forceUpdate();
-            }
-        };
-
-        document.addEventListener("keydown", handleKey);
-        document.addEventListener("keyup", handleKey);
-        return () => {
-            document.removeEventListener("keydown", handleKey);
-            document.removeEventListener("keyup", handleKey);
-        };
-    }, []);
-
-    const author = UserStore.getUser(note.author.id) ?? note.author;
-
-    const handleClick = () => {
-        if (isHoldingDeleteRef.current && !fromDeleteModal) {
-            noteHandler.deleteNote(note.id, notebook);
-            updateParent?.();
-        }
-    };
-
-    const handleContextMenu = (e: React.MouseEvent) => {
-        if (fromDeleteModal) return;
-        ContextMenuApi.openContextMenu(e, () => (
-            <NoteContextMenu
-                note={note}
-                notebook={notebook}
-                updateParent={updateParent}
-                closeModal={closeModal}
-            />
-        ));
-    };
-
-    const message = new MessageRecord({
-        ...note,
-        author: new UserRecord({ ...author, bot: true }),
-        timestamp: new Date(note.timestamp),
-        embeds: note.embeds?.map(embed =>
-            embed.timestamp ? { ...embed, timestamp: new Date(embed.timestamp) } : embed
-        ),
-    });
-
-    return (
-        <div
-            className="vc-holy-note"
-            style={{ margin: "8px 0", padding: "4px 0" }}
-            onClick={handleClick}
-            onContextMenu={handleContextMenu}
-        >
-            <ChannelMessage
-                className={classes("vc-holy-render", messageClasses?.message, messageClasses?.groupStart, messageClasses?.cozyMessage)}
-                key={note.id}
-                groupId={note.id}
-                id={note.id}
-                compact={false}
-                isHighlight={false}
-                isLastItem={false}
-                renderContentOnly={false}
-                channel={new ChannelRecord({ id: "holy-notes" })}
-                message={message}
-            />
-        </div>
-    );
-}
-
-interface ContextMenuProps {
-    note: Note;
-    notebook: string;
-    updateParent?: () => void;
-    closeModal?: () => void;
-}
-
-function NoteContextMenu({ note, notebook, updateParent, closeModal }: ContextMenuProps) {
-    const allNotebooks = Object.keys(noteHandler.getAllNotes());
-
-    return (
-        <Menu.Menu
-            navId="holynotes"
-            onClose={() => FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" })}
-            aria-label="Holy Notes"
-        >
-            <Menu.MenuItem
-                label="Jump To Message"
-                id="jump"
-                icon={OpenExternalIcon}
-                action={() => {
-                    NavigationRouter.transitionTo(`/channels/${note.guild_id || "@me"}/${note.channel_id}/${note.id}`);
-                    closeModal?.();
-                }}
-            />
-            <Menu.MenuItem
-                label="Copy Text"
-                id="copy-text"
-                icon={CopyIcon}
-                action={() => copyToClipboard(note.content)}
-            />
-            {note.attachments.length > 0 && (
-                <Menu.MenuItem
-                    label="Copy Attachment URL"
-                    id="copy-url"
-                    icon={LinkIcon}
-                    action={() => copyToClipboard(note.attachments[0].url)}
-                />
-            )}
-            <Menu.MenuItem
-                label="Copy ID"
-                id="copy-id"
-                icon={IDIcon}
-                action={() => copyToClipboard(note.id)}
-            />
-            {allNotebooks.length > 1 && (
-                <Menu.MenuItem label="Move Note" id="move-note">
-                    {allNotebooks.filter(k => k !== notebook).map(k => (
-                        <Menu.MenuItem
-                            key={k}
-                            label={`Move to ${k}`}
-                            id={k}
-                            action={() => {
-                                noteHandler.moveNote(note, notebook, k);
-                                updateParent?.();
-                            }}
-                        />
-                    ))}
-                </Menu.MenuItem>
-            )}
-            <Menu.MenuItem
-                color="danger"
-                label="Delete Note"
-                id="delete"
-                icon={DeleteIcon}
-                action={() => {
-                    noteHandler.deleteNote(note.id, notebook);
-                    updateParent?.();
-                }}
-            />
-        </Menu.Menu>
-    );
-}
diff --git a/src/equicordplugins/holyNotes/index.tsx b/src/equicordplugins/holyNotes/index.tsx
deleted file mode 100644
index f98001b74..000000000
--- a/src/equicordplugins/holyNotes/index.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2024 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import "./style.css";
-
-import { NavContextMenuPatchCallback } from "@api/ContextMenu";
-import { HeaderBarButton } from "@api/HeaderBar";
-import { DataStore } from "@api/index";
-import { EquicordDevs } from "@utils/constants";
-import { classNameFactory } from "@utils/css";
-import { openModal } from "@utils/modal";
-import definePlugin, { IconComponent } from "@utils/types";
-import { Message } from "@vencord/discord-types";
-import { findByCodeLazy, findComponentByCodeLazy, findCssClassesLazy, findExportedComponentLazy } from "@webpack";
-import { ChannelStore, Menu } from "@webpack/common";
-
-import { NoteModal } from "./components/modals/Notebook";
-import { noteHandler, noteHandlerCache } from "./NoteHandler";
-import { DataStoreToCache, HolyNoteStore } from "./utils";
-
-export const cl = classNameFactory("vc-notebook-");
-export const CircleQuestionIcon = findExportedComponentLazy("CircleQuestionIcon");
-export const BookmarkIconLazy = findExportedComponentLazy("BookmarkIcon");
-export const BookmarkIcon: IconComponent = props => <BookmarkIconLazy {...props} />;
-export const MessageRecord = findByCodeLazy("isEdited(){");
-export const messageClasses = findCssClassesLazy("message", "groupStart", "cozyMessage");
-export const resultsClasses = findCssClassesLazy("emptyResultsWrap", "emptyResultsContent", "errorImage", "emptyResultsText", "noResultsImage", "alt");
-export const ChannelRecord = findByCodeLazy("computeLurkerPermissionsAllowList(){");
-export const ChannelMessage = findComponentByCodeLazy("Message must not be a thread");
-
-const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { message }: { message: Message; }) => {
-    children.push(
-        <Menu.MenuItem label="Note Message" id="note-message">
-            {Object.keys(noteHandler.getAllNotes()).map(notebook => (
-                <Menu.MenuItem
-                    key={notebook}
-                    label={notebook}
-                    id={notebook}
-                    action={() => noteHandler.addNote(message, notebook)}
-                />
-            ))}
-        </Menu.MenuItem>
-    );
-};
-
-function ToolBarHeader() {
-    return (
-        <HeaderBarButton
-            tooltip="Holy Notes"
-            position="bottom"
-            icon={BookmarkIcon}
-            onClick={() => openModal(props => <NoteModal {...props} />)}
-        />
-    );
-}
-
-export default definePlugin({
-    name: "HolyNotes",
-    description: "Save messages as notes to revisit later",
-    authors: [EquicordDevs.Wolfie],
-
-    toolboxActions: {
-        "Open Notes"() {
-            openModal(props => <NoteModal {...props} />);
-        }
-    },
-
-    contextMenus: {
-        message: messageContextMenuPatch
-    },
-
-    headerBarButton: {
-        icon: BookmarkIcon,
-        render: ToolBarHeader
-    },
-
-    messagePopoverButton: {
-        icon: BookmarkIcon,
-        render(message) {
-            return {
-                label: "Save Note",
-                icon: BookmarkIcon,
-                message,
-                channel: ChannelStore.getChannel(message.channel_id),
-                onClick: () => noteHandler.addNote(message, "Main")
-            };
-        }
-    },
-
-    async start() {
-        const keys = await DataStore.keys(HolyNoteStore);
-        if (!keys.includes("Main")) {
-            noteHandler.newNoteBook("Main");
-            return;
-        }
-        if (!noteHandlerCache.has("Main")) await DataStoreToCache();
-    },
-});
diff --git a/src/equicordplugins/holyNotes/style.css b/src/equicordplugins/holyNotes/style.css
deleted file mode 100644
index ee103f6a5..000000000
--- a/src/equicordplugins/holyNotes/style.css
+++ /dev/null
@@ -1,120 +0,0 @@
-.vc-notebook-header {
-    align-items: flex-start;
-    position: relative;
-    padding: 16px 16px 0 24px;
-}
-
-.vc-notebook-header-content {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    flex: 1;
-}
-
-.vc-notebook-header-trailing {
-    position: absolute;
-    top: 8px;
-    right: 8px;
-}
-
-.vc-notebook-title {
-    color: var(--text-strong);
-}
-
-.vc-notebook-description {
-    color: var(--text-subtle);
-}
-
-.vc-notebook-controls {
-    display: grid;
-    gap: 10px;
-    grid-template-columns: 1fr 150px;
-    padding: 16px 24px;
-}
-
-.vc-notebook-tabs {
-    display: flex;
-    gap: 24px;
-    padding: 0 24px;
-    border-bottom: 1px solid var(--border-subtle);
-}
-
-.vc-notebook-tab {
-    padding: 8px 0;
-    font-size: 14px;
-    font-weight: 500;
-    color: var(--text-subtle);
-    cursor: pointer;
-    border-bottom: 2px solid transparent;
-    margin-bottom: -1px;
-    transition: color 0.15s ease, border-color 0.15s ease;
-}
-
-.vc-notebook-tab:hover {
-    color: var(--text-default);
-    border-bottom-color: var(--text-subtle);
-}
-
-.vc-notebook-tab-selected {
-    color: var(--text-default);
-    border-bottom-color: var(--control-brand-foreground);
-}
-
-.vc-notebook-content {
-    padding: 16px 24px;
-}
-
-.vc-notebook-create-modal [class*="footer"] {
-    gap: 8px;
-}
-
-.vc-notebook-icon-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 4px;
-    color: var(--icon-subtle);
-    border-radius: 4px;
-    transition: color 0.15s ease;
-}
-
-.vc-notebook-icon-button:hover {
-    color: var(--icon-default);
-}
-
-.vc-holy-note [class*="buttonContainer"] {
-    display: none;
-}
-
-.vc-holy-note [class*="messageListItem"] {
-    list-style-type: none;
-}
-
-.vc-holy-note [class*="botText"] {
-    font-size: 0 !important;
-    line-height: 0;
-}
-
-.vc-holy-note [class*="botText"]::after {
-    content: "NOTE";
-    font-size: 0.625rem;
-    line-height: 1.3;
-    font-weight: 600;
-    font-family: var(--font-display);
-    color: inherit;
-    letter-spacing: 0.02em;
-    text-transform: uppercase;
-}
-
-.vc-help-markdown {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-}
-
-.vc-help-markdown hr {
-    border: none;
-    height: 1px;
-    margin: 12px 0;
-    background-color: var(--border-subtle);
-}
diff --git a/src/equicordplugins/holyNotes/types.ts b/src/equicordplugins/holyNotes/types.ts
deleted file mode 100644
index ebdc9f06a..000000000
--- a/src/equicordplugins/holyNotes/types.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Embed, MessageAttachment, MessageReaction } from "@vencord/discord-types";
-import { StickerFormatType } from "@vencord/discord-types/enums";
-
-export interface NoteAuthor {
-    id: string;
-    avatar: string;
-    discriminator: string;
-    username: string;
-}
-
-export interface NoteStickerItem {
-    format_type: StickerFormatType;
-    id: string;
-    name: string;
-}
-
-export interface Note {
-    id: string;
-    channel_id: string;
-    guild_id: string;
-    content: string;
-    author: NoteAuthor;
-    flags: number;
-    timestamp: string;
-    attachments: MessageAttachment[];
-    embeds: Embed[];
-    reactions: MessageReaction[];
-    stickerItems: NoteStickerItem[];
-}
-
-export type Notebook = Record<string, Note>;
-export type AllNotebooks = Record<string, Notebook>;
diff --git a/src/equicordplugins/holyNotes/utils.ts b/src/equicordplugins/holyNotes/utils.ts
deleted file mode 100644
index ff1620867..000000000
--- a/src/equicordplugins/holyNotes/utils.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { createStore } from "@api/DataStore";
-import { DataStore } from "@api/index";
-import { Toasts } from "@webpack/common";
-
-import { noteHandler, noteHandlerCache } from "./NoteHandler";
-import { Notebook } from "./types";
-
-export const HolyNoteStore = createStore("HolyNoteData", "HolyNoteStore");
-
-export function saveCacheToDataStore(key: string, value: Notebook) {
-    DataStore.set(key, value, HolyNoteStore);
-}
-
-export function deleteCacheFromDataStore(key: string) {
-    DataStore.del(key, HolyNoteStore);
-}
-
-export async function DataStoreToCache() {
-    const entries = await DataStore.entries(HolyNoteStore);
-    for (const [key, value] of entries) {
-        noteHandlerCache.set(String(key), value as Notebook);
-    }
-}
-
-export async function DeleteEntireStore() {
-    await DataStore.clear(HolyNoteStore);
-    noteHandler.newNoteBook("Main", true);
-}
-
-export async function downloadNotes() {
-    const filename = "notes.json";
-    const data = JSON.stringify(noteHandler.exportNotes(), null, 2);
-
-    if (IS_VESKTOP || IS_EQUIBOP || IS_WEB) {
-        const file = new File([data], filename, { type: "application/json" });
-        const a = document.createElement("a");
-        a.href = URL.createObjectURL(file);
-        a.download = filename;
-        document.body.appendChild(a);
-        a.click();
-        setTimeout(() => {
-            URL.revokeObjectURL(a.href);
-            document.body.removeChild(a);
-        }, 0);
-    } else {
-        DiscordNative.fileManager.saveWithDialog(data, filename);
-    }
-}
-
-export async function uploadNotes() {
-    if (IS_VESKTOP || IS_EQUIBOP || IS_WEB) {
-        const input = document.createElement("input");
-        input.type = "file";
-        input.accept = "application/json";
-        input.style.display = "none";
-        input.onchange = () => {
-            const file = input.files?.[0];
-            if (!file) return;
-
-            const reader = new FileReader();
-            reader.onload = () => {
-                try {
-                    noteHandler.importNotes(reader.result as string);
-                } catch {
-                    Toasts.show({
-                        id: Toasts.genId(),
-                        message: "Failed to import notes",
-                        type: Toasts.Type.FAILURE,
-                    });
-                }
-            };
-            reader.readAsText(file);
-        };
-        document.body.appendChild(input);
-        input.click();
-        setTimeout(() => document.body.removeChild(input), 0);
-    } else {
-        const [file] = await DiscordNative.fileManager.openFiles({
-            filters: [{ name: "notes", extensions: ["json"] }]
-        });
-        if (file) {
-            noteHandler.importNotes(new TextDecoder().decode(file.data));
-        }
-    }
-}
diff --git a/src/equicordplugins/homeTyping/index.tsx b/src/equicordplugins/homeTyping/index.tsx
index 83fa1c0b9..b32cd8a9c 100644
--- a/src/equicordplugins/homeTyping/index.tsx
+++ b/src/equicordplugins/homeTyping/index.tsx
@@ -18,6 +18,7 @@ const PrivateChannelSortStore = findStoreLazy("PrivateChannelSortStore") as { ge
 export default definePlugin({
     name: "HomeTyping",
     description: "Changes the home button to a typing indicator if someone in your dms is typing",
+    tags: ["Chat"],
     authors: [Devs.Samwich],
     TypingIcon() {
         return <ThreeDots className={cl("dots")} dotRadius={3} themed={true} />;
@@ -35,7 +36,7 @@ export default definePlugin({
             replacement:
                 [
                     {
-                        match: /(\(0,\i.jsx\)\(\i.\i,{}\))/,
+                        match: /(\(0,\i.jsxs?\)\(\i,{}\))/,
                         replace: "arguments[0].user == null ? null : (vcIsTyping ? $self.TypingIcon() : $1)"
                     },
                     // define isTyping earlier in the function so i dont bReAk ThE rUlEs Of HoOkS
diff --git a/src/equicordplugins/hopOn/index.tsx b/src/equicordplugins/hopOn/index.tsx
index cd0de30ed..a9a2b15a6 100644
--- a/src/equicordplugins/hopOn/index.tsx
+++ b/src/equicordplugins/hopOn/index.tsx
@@ -32,6 +32,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "HopOn",
     description: "Hop on! Opens a configurable URL when a message matches a custom regex in the current channel.",
+    tags: ["Fun"],
     authors: [Devs.ImLvna],
     settings,
     flux: {
diff --git a/src/equicordplugins/husk/index.tsx b/src/equicordplugins/husk/index.tsx
index 25aad8e37..2596bb8a8 100644
--- a/src/equicordplugins/husk/index.tsx
+++ b/src/equicordplugins/husk/index.tsx
@@ -99,6 +99,8 @@ function getEmojiIdThatShouldBeUsed(guildId: string) {
 export default definePlugin({
     name: "Husk",
     description: "Adds Husk button (check settings to change used emoji)",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Emotes", "Fun"],
     authors: [Devs.nin0dev],
     settings,
     messagePopoverButton: {
diff --git a/src/equicordplugins/iRememberYou/components/data.tsx b/src/equicordplugins/iRememberYou/components/data.tsx
index 4d75730bb..6d5250f7e 100644
--- a/src/equicordplugins/iRememberYou/components/data.tsx
+++ b/src/equicordplugins/iRememberYou/components/data.tsx
@@ -6,7 +6,7 @@
 
 import { DataStore } from "@api/index";
 import { Guild, User } from "@vencord/discord-types";
-import { ChannelStore, GuildMemberStore, GuildStore, InviteActions, MessageStore, PermissionsBits, PermissionStore, UserStore, } from "@webpack/common";
+import { ChannelStore, GuildMemberStore, GuildStore, MessageStore, UserStore, } from "@webpack/common";
 
 export interface IUserExtra {
     isOwner?: boolean;
@@ -104,9 +104,7 @@ export class Data {
                 extra: { ...previouExtra, ...extra },
                 iconURL: user.getAvatarURL(),
             };
-
-            if (source && !processedGuilds.has(source.id) && this.hasInvitePermissions(source.id)) {
-                this.collectInviteLink(source.id);
+            if (source && !processedGuilds.has(source.id)) {
                 processedGuilds.add(source.id);
             }
         }
@@ -148,10 +146,6 @@ export class Data {
             }
 
             this.processUsersToCollection([...target]);
-
-            if (guild && this.hasInvitePermissions(guild.id)) {
-                this.collectInviteLink(guild.id);
-            }
         }
     }
 
@@ -176,38 +170,6 @@ export class Data {
         this.processUsersToCollection([...target]);
     }
 
-    hasInvitePermissions(guildId: string): boolean {
-        const guild = GuildStore.getGuild(guildId);
-        if (!guild) return false;
-
-        const currentUser = UserStore.getCurrentUser();
-        if (!currentUser) return false;
-
-        if (guild.ownerId === currentUser.id) return true;
-
-        const member = GuildMemberStore.getMember(guildId, currentUser.id);
-        if (!member) return false;
-
-        return PermissionStore.can(PermissionsBits.CREATE_INSTANT_INVITE, guild);
-    }
-
-    async collectInviteLink(guildId: string) {
-        try {
-            const invites = await InviteActions.getInvites(guildId);
-            if (invites && invites.length > 0) {
-                const invite = invites[0];
-                const inviteCode = invite.code;
-                const inviteLink = `https://discord.gg/${inviteCode}`;
-
-                if (this.usersCollection[guildId]) {
-                    this.usersCollection[guildId].inviteLink = inviteLink;
-                }
-            }
-        } catch (error) {
-            console.warn("Failed to collect invite link for guild:", guildId, error);
-        }
-    }
-
     storageAutoSaveProtocol() {
         this._storageAutoSaveProtocol_interval = setInterval(
             this.updateStorage.bind(this),
diff --git a/src/equicordplugins/iRememberYou/index.tsx b/src/equicordplugins/iRememberYou/index.tsx
index dc9f62b57..2a469c2e2 100644
--- a/src/equicordplugins/iRememberYou/index.tsx
+++ b/src/equicordplugins/iRememberYou/index.tsx
@@ -19,6 +19,7 @@ import DataUI from "./components/ui";
 export default definePlugin({
     name: "IRememberYou",
     description: "Locally saves everyone you've been communicating with (including servers), in case of lose",
+    tags: ["Chat", "Servers"],
     authors: [EquicordDevs.zoodogood, EquicordDevs.keircn],
     dependencies: ["MessageEventsAPI"],
 
diff --git a/src/equicordplugins/iconViewer/components/IconsTab.tsx b/src/equicordplugins/iconViewer/components/IconsTab.tsx
index ca06e9797..fcc14adcd 100644
--- a/src/equicordplugins/iconViewer/components/IconsTab.tsx
+++ b/src/equicordplugins/iconViewer/components/IconsTab.tsx
@@ -8,6 +8,7 @@ import { Button } from "@components/Button";
 import { Heading } from "@components/Heading";
 import { SettingsTab, wrapTab } from "@components/settings";
 import { TooltipContainer } from "@components/TooltipContainer";
+import { iconsModule } from "@equicordplugins/_core/concatenatedModules";
 import { debounce } from "@shared/debounce";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
@@ -16,7 +17,6 @@ import { Icon } from "@vencord/discord-types";
 import { Clickable, TextInput, useCallback, useEffect, useMemo, useState } from "@webpack/common";
 
 import { IconsDef } from "../types";
-import { IconsModule } from "../utils";
 import { openIconModal } from "./Modals";
 
 let cachedIcons: IconsDef | null = null;
@@ -25,7 +25,7 @@ function getIcons(): IconsDef {
     if (cachedIcons) return cachedIcons;
 
     cachedIcons = Object.fromEntries(
-        Object.entries(IconsModule).filter(([name, fn]) =>
+        Object.entries(iconsModule).filter(([name, fn]) =>
             typeof fn === "function" && name.endsWith("Icon")
         )
     );
diff --git a/src/equicordplugins/iconViewer/index.tsx b/src/equicordplugins/iconViewer/index.tsx
index 1f364adf5..6df0d72f1 100644
--- a/src/equicordplugins/iconViewer/index.tsx
+++ b/src/equicordplugins/iconViewer/index.tsx
@@ -19,6 +19,7 @@ import { SettingsAbout } from "./components/Modals";
 export default definePlugin({
     name: "IconViewer",
     description: "Adds a new tab to settings to preview all icons.",
+    tags: ["Developers"],
     authors: [EquicordDevs.iamme],
     dependencies: ["Settings"],
     startAt: StartAt.WebpackReady,
diff --git a/src/equicordplugins/iconViewer/utils.ts b/src/equicordplugins/iconViewer/utils.ts
index 09f6e6a94..01eb662dd 100644
--- a/src/equicordplugins/iconViewer/utils.ts
+++ b/src/equicordplugins/iconViewer/utils.ts
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { Icon } from "@vencord/discord-types";
 import { findByPropsLazy, waitFor } from "@webpack";
 
 import { CssColorData, IconSize } from "./types";
@@ -12,8 +11,6 @@ import { CssColorData, IconSize } from "./types";
 let colorKeys: string[] = [];
 
 const Colors = findByPropsLazy("colors", "layout");
-export const IconsModule = findByPropsLazy("AngleBracketsIcon", "StaffBadgeIcon") as Record<string, Icon>;
-
 export const iconSizesInPx: Record<string, number> = findByPropsLazy("md", "lg", "xxs");
 export const iconSizes: IconSize[] = ["xxs", "xs", "sm", "md", "lg"];
 
diff --git a/src/equicordplugins/idleAutoRestart/index.tsx b/src/equicordplugins/idleAutoRestart/index.tsx
index 2112f671f..33d11e2eb 100644
--- a/src/equicordplugins/idleAutoRestart/index.tsx
+++ b/src/equicordplugins/idleAutoRestart/index.tsx
@@ -36,6 +36,7 @@ function onActivity() {
 export default definePlugin({
     name: "IdleAutoRestart",
     description: "Automatically restarts the client after being idle for a configurable amount of time, but avoids restarting while you are in VC.",
+    tags: ["Utility"],
     authors: [EquicordDevs.SteelTech],
     settings,
 
diff --git a/src/equicordplugins/ignoreCalls/index.tsx b/src/equicordplugins/ignoreCalls/index.tsx
index 2505ce860..1a448fb7b 100644
--- a/src/equicordplugins/ignoreCalls/index.tsx
+++ b/src/equicordplugins/ignoreCalls/index.tsx
@@ -93,6 +93,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "IgnoreCalls",
     description: "Allows you to ignore calls from specific users or dm groups.",
+    tags: ["Voice"],
     authors: [EquicordDevs.TheArmagan, Devs.thororen],
     settings,
     patches: [
diff --git a/src/equicordplugins/inRole/index.tsx b/src/equicordplugins/inRole/index.tsx
index 755f9219c..847688f73 100644
--- a/src/equicordplugins/inRole/index.tsx
+++ b/src/equicordplugins/inRole/index.tsx
@@ -34,8 +34,9 @@ function getMembersInRole(roleId: string, guildId: string) {
 export default definePlugin({
     name: "InRole",
     description: "Know who is in a role with the role context menu or /inrole command (read plugin info!)",
+    tags: ["Commands", "Roles"],
     authors: [Devs.nin0dev],
-    dependencies: ["UserSettingsAPI"],
+    dependencies: ["UserSettingsAPI", "CommandsAPI"],
     start() {
         // DeveloperMode needs to be enabled for the context menu to be shown
         DeveloperMode.updateSetting(true);
diff --git a/src/equicordplugins/ingtoninator/index.tsx b/src/equicordplugins/ingtoninator/index.tsx
index 43013fc4f..00a4909b0 100644
--- a/src/equicordplugins/ingtoninator/index.tsx
+++ b/src/equicordplugins/ingtoninator/index.tsx
@@ -146,6 +146,8 @@ function disabledIcon() {
 export default definePlugin({
     name: "Ingtoninator",
     description: "Suffixes 'ington' to a random word in your message",
+    dependencies: ["ChatInputButtonAPI"],
+    tags: ["Fun"],
     authors: [EquicordDevs.zyqunix, EquicordDevs.BioTomateDE],
     settings,
     chatBarButton: {
diff --git a/src/equicordplugins/instantScreenshare/index.tsx b/src/equicordplugins/instantScreenshare/index.tsx
index 1d0160048..c65def667 100644
--- a/src/equicordplugins/instantScreenshare/index.tsx
+++ b/src/equicordplugins/instantScreenshare/index.tsx
@@ -62,9 +62,10 @@ async function autoStartStream(instant = true) {
 export default definePlugin({
     name: "InstantScreenshare",
     description: "Instantly screenshare when joining a voice channel with support for desktop sources, windows, and video input devices (cameras, capture cards)",
+    tags: ["Media", "Voice"],
     authors: [Devs.HAHALOSAH, Devs.thororen, EquicordDevs.mart],
     dependencies: ["EquicordToolbox"],
-    tags: ["ScreenshareKeybind"],
+    searchTerms: ["ScreenshareKeybind"],
     autoStartStream,
     settings,
 
@@ -99,7 +100,7 @@ export default definePlugin({
             },
         },
         {
-            find: "keybindActionTypes()",
+            find: '"push-to-talk-priority"',
             predicate: () => settings.store.keybindScreenshare,
             replacement: {
                 match: /=\[(\{id:.{0,25}value:\i\.\i\.UNASSIGNED)/,
diff --git a/src/equicordplugins/invisibleChat.desktop/index.tsx b/src/equicordplugins/invisibleChat.desktop/index.tsx
index 5589f8dec..c45149141 100644
--- a/src/equicordplugins/invisibleChat.desktop/index.tsx
+++ b/src/equicordplugins/invisibleChat.desktop/index.tsx
@@ -149,8 +149,9 @@ export async function buildEmbed(message: any, revealed: string): Promise<void>
 export default definePlugin({
     name: "InvisibleChat",
     description: "Encrypt your Messages in a non-suspicious way!",
+    tags: ["Chat"],
     authors: [Devs.SammCheese],
-    dependencies: ["MessageUpdaterAPI"],
+    dependencies: ["MessageUpdaterAPI", "ChatInputButtonAPI", "MessagePopoverAPI"],
     reporterTestable: ReporterTestable.Patches,
     settings,
 
diff --git a/src/equicordplugins/inviteDefaults/index.ts b/src/equicordplugins/inviteDefaults/index.ts
index 597c96fec..09845cc86 100644
--- a/src/equicordplugins/inviteDefaults/index.ts
+++ b/src/equicordplugins/inviteDefaults/index.ts
@@ -45,6 +45,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "InviteDefaults",
     description: "Allows you to edit the default values when creating server invites.",
+    tags: ["Servers"],
     authors: [EquicordDevs.VillainsRule],
     settings,
     patches: [
@@ -52,7 +53,7 @@ export default definePlugin({
             find: ".GUILD_CREATE_INVITE_SUGGESTION,defaultMaxAge",
             replacement: [
                 {
-                    match: /(?<=maxAge:)\i\?\?\i\?\?\i\.\i/,
+                    match: /(?<=maxAge:)\i\?\?\i\?\?\i/,
                     replace: "$self.settings.store.inviteDuration"
                 },
                 {
diff --git a/src/equicordplugins/jumpTo/index.tsx b/src/equicordplugins/jumpTo/index.tsx
index 537d9c19f..791b2a93b 100644
--- a/src/equicordplugins/jumpTo/index.tsx
+++ b/src/equicordplugins/jumpTo/index.tsx
@@ -121,6 +121,7 @@ const MessageMenuPatch: NavContextMenuPatchCallback = (children, { message }: {
 export default definePlugin({
     name: "JumpTo",
     description: "Adds context menu options to jump to the start or bottom of a channel/DM.",
+    tags: ["Chat", "Utility"],
     authors: [Devs.Samwich, Devs.thororen],
     contextMenus: {
         "channel-context": ChannelMenuPatch,
diff --git a/src/equicordplugins/jumpscare/index.tsx b/src/equicordplugins/jumpscare/index.tsx
index 5a8e4d531..8070cfd13 100644
--- a/src/equicordplugins/jumpscare/index.tsx
+++ b/src/equicordplugins/jumpscare/index.tsx
@@ -48,6 +48,7 @@ function getJumpscareRoot(): Root {
 export default definePlugin({
     name: "Jumpscare",
     description: "Adds a configurable chance of jumpscaring you whenever you open a channel. Inspired by Geometry Dash Mega Hack",
+    tags: ["Fun"],
     authors: [Devs.surgedevs],
     dependencies: ["AudioPlayerAPI"],
     settings,
diff --git a/src/equicordplugins/keyboardNavigation/index.tsx b/src/equicordplugins/keyboardNavigation/index.tsx
index f0c6e8d2a..852edafa6 100644
--- a/src/equicordplugins/keyboardNavigation/index.tsx
+++ b/src/equicordplugins/keyboardNavigation/index.tsx
@@ -87,6 +87,7 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "KeyboardNavigation",
     description: "Allows you to navigate the UI with a keyboard.",
+    tags: ["Accessibility", "Shortcuts"],
     authors: [Devs.Ethan],
     settings,
 
diff --git a/src/equicordplugins/keyboardSounds/index.ts b/src/equicordplugins/keyboardSounds/index.ts
index 14c8018ff..e85262bdd 100644
--- a/src/equicordplugins/keyboardSounds/index.ts
+++ b/src/equicordplugins/keyboardSounds/index.ts
@@ -126,6 +126,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "KeyboardSounds",
     description: "Adds OperaGX or osu! sound effects when typing on your keyboard.",
+    tags: ["Fun"],
     authors: [Devs.HypedDomi, EquicordDevs.Etorix],
     dependencies: ["AudioPlayerAPI"],
     settings,
diff --git a/src/equicordplugins/keywordNotify/index.tsx b/src/equicordplugins/keywordNotify/index.tsx
index 10b08dddb..a12fd9420 100644
--- a/src/equicordplugins/keywordNotify/index.tsx
+++ b/src/equicordplugins/keywordNotify/index.tsx
@@ -318,28 +318,27 @@ export default definePlugin({
     name: "KeywordNotify",
     authors: [EquicordDevs.camila314, EquicordDevs.x3rt],
     description: "Sends a notification if a given message matches certain keywords or regexes",
+    tags: ["Chat", "Notifications"],
     settings,
     patches: [
         {
             find: "#{intl::UNREADS_TAB_LABEL})}",
+            group: true,
             replacement: [
                 {
-                    match: /,(\i\?\(0,\i\.jsxs?\)\(\i\.\i\i\.Item)/,
-                    replace: ",$self.keywordTabBar()$&"
+                    match: /#{intl::Fn6Odn::raw}\)\}\):null/,
+                    replace: "$&,$self.keywordTabBar()"
                 },
                 {
-                    match: /:(\i)===\i\.\i\.MENTIONS\?/,
+                    match: /:(\i)===\i\.\i\.MENTIONS\?\(0,.{0,500}null}/,
                     replace: ": $1 === 8 ? $self.keywordClearButton() $&"
+                },
+                {
+                    match: /:(\i)===\i\.\i\.MENTIONS\?\(0,.{0,500}onJump:(\i)}\)/,
+                    replace: ": $1 === 8 ? $self.tryKeywordMenu($2) $&"
                 }
             ]
         },
-        {
-            find: ".MENTIONS)});",
-            replacement: {
-                match: /:(\i)===\i\.\i\.MENTIONS\?\(0,.+?onJump:(\i)}\)/,
-                replace: ": $1 === 8 ? $self.tryKeywordMenu($2) $&"
-            }
-        },
         {
             find: ".guildFilter:null",
             replacement: [
diff --git a/src/equicordplugins/lastActive/index.tsx b/src/equicordplugins/lastActive/index.tsx
index 9e8333a5e..9ca7a035c 100644
--- a/src/equicordplugins/lastActive/index.tsx
+++ b/src/equicordplugins/lastActive/index.tsx
@@ -135,6 +135,7 @@ export function LastActiveIcon() {
 export default definePlugin({
     name: "LastActive",
     description: "A plugin to jump to last active message from yourself or another user in a channel/server.",
+    tags: ["Chat", "Utility"],
     authors: [EquicordDevs.Crxa],
     contextMenus: {
         "channel-context": ChannelContextMenuPatch,
diff --git a/src/equicordplugins/loginWithQR/index.tsx b/src/equicordplugins/loginWithQR/index.tsx
index 21f1c7c9d..54fa10542 100644
--- a/src/equicordplugins/loginWithQR/index.tsx
+++ b/src/equicordplugins/loginWithQR/index.tsx
@@ -42,6 +42,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "LoginWithQR",
     description: "Allows you to login to another device by scanning a login QR code, just like on mobile!",
+    tags: ["Utility"],
     authors: [EquicordDevs.nexpid],
 
     settings,
@@ -51,7 +52,7 @@ export default definePlugin({
         {
             find: ".clipboardData&&(",
             replacement: {
-                match: /handleGlobalPaste:(\i)/,
+                match: /handleGlobalPaste:(\i)(?=\}\))/,
                 replace: "handleGlobalPaste:(...args)=>!$self.qrModalOpen&&$1(...args)",
             },
         },
diff --git a/src/equicordplugins/mediaPlaybackSpeed/index.tsx b/src/equicordplugins/mediaPlaybackSpeed/index.tsx
index 42edab6e7..086f2f1e2 100644
--- a/src/equicordplugins/mediaPlaybackSpeed/index.tsx
+++ b/src/equicordplugins/mediaPlaybackSpeed/index.tsx
@@ -48,6 +48,7 @@ type MediaRef = RefObject<HTMLMediaElement> | undefined;
 export default definePlugin({
     name: "MediaPlaybackSpeed",
     description: "Allows changing the (default) playback speed of media embeds",
+    tags: ["Chat", "Media"],
     authors: [Devs.D3SOX],
     settings,
     patches: [
diff --git a/src/equicordplugins/messageBurst/index.ts b/src/equicordplugins/messageBurst/index.ts
index 0d60216c8..18f8d6060 100644
--- a/src/equicordplugins/messageBurst/index.ts
+++ b/src/equicordplugins/messageBurst/index.ts
@@ -66,6 +66,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "MessageBurst",
     description: "Merges messages sent within a time period with your previous sent message if no one else sends a message before you.",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Chat"],
     authors: [EquicordDevs.port22exposed],
     settings,
     onBeforeMessageSend(channelId, message) {
diff --git a/src/equicordplugins/messageColors/index.tsx b/src/equicordplugins/messageColors/index.tsx
index 568718102..5217971a8 100644
--- a/src/equicordplugins/messageColors/index.tsx
+++ b/src/equicordplugins/messageColors/index.tsx
@@ -27,6 +27,7 @@ export default definePlugin({
     authors: [EquicordDevs.Hen],
     name: "MessageColors",
     description: "Displays color codes like #FF0042 inside of messages",
+    tags: ["Appearance", "Chat"],
     settings,
     patches: [
         // Create a new markdown rule, so it parses just like any other features
diff --git a/src/equicordplugins/messageFetchTimer/index.tsx b/src/equicordplugins/messageFetchTimer/index.tsx
index 139a35209..a0622668d 100644
--- a/src/equicordplugins/messageFetchTimer/index.tsx
+++ b/src/equicordplugins/messageFetchTimer/index.tsx
@@ -147,6 +147,8 @@ function handleMessageLoad(data: any) {
 export default definePlugin({
     name: "MessageFetchTimer",
     description: "Shows how long it took to fetch messages for the current channel",
+    dependencies: ["ChatInputButtonAPI"],
+    tags: ["Chat", "Utility"],
     authors: [EquicordDevs.GroupXyz],
     settings,
 
diff --git a/src/equicordplugins/messageLinkTooltip/index.tsx b/src/equicordplugins/messageLinkTooltip/index.tsx
index 87f97581a..8e0d053f7 100644
--- a/src/equicordplugins/messageLinkTooltip/index.tsx
+++ b/src/equicordplugins/messageLinkTooltip/index.tsx
@@ -62,6 +62,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "MessageLinkTooltip",
     description: "Adds a tooltip with a message preview when hovering over message links, replies, and forwarded messages.",
+    tags: ["Appearance", "Chat"],
     authors: [Devs.Kyuuhachi],
 
     settings,
diff --git a/src/equicordplugins/messageLoggerEnhanced/LoggedMessageManager.ts b/src/equicordplugins/messageLoggerEnhanced/LoggedMessageManager.ts
index 7f51572af..5408349e9 100644
--- a/src/equicordplugins/messageLoggerEnhanced/LoggedMessageManager.ts
+++ b/src/equicordplugins/messageLoggerEnhanced/LoggedMessageManager.ts
@@ -17,7 +17,7 @@
 */
 
 import { Flogger, settings } from ".";
-import { addMessageIDB, countMessagesIDB, DBMessageStatus, deleteMessagesBulkIDB, getOlderThanTimestampForGuildsIDB, getOldestMessagesIDB } from "./db";
+import { addMessageIDB, db, DBMessageStatus, deleteMessagesBulkIDB, getOlderThanTimestampForGuildsIDB, getOldestMessagesIDB } from "./db";
 import { LoggedMessage, LoggedMessageJSON } from "./types";
 import { cleanupMessage } from "./utils";
 import { cacheMessageImages } from "./utils/saveImage";
@@ -47,7 +47,7 @@ export const addMessage = async (message: LoggedMessage | LoggedMessageJSON, sta
     }
 
     if (settings.store.messageLimit > 0) {
-        const currentMessageCount = await countMessagesIDB();
+        const currentMessageCount = await db.count("messages");
         if (currentMessageCount > settings.store.messageLimit) {
             const messagesToDelete = currentMessageCount - settings.store.messageLimit;
             if (messagesToDelete <= 0 || messagesToDelete >= settings.store.messageLimit) return;
diff --git a/src/equicordplugins/messageLoggerEnhanced/components/LogsButton.tsx b/src/equicordplugins/messageLoggerEnhanced/components/LogsButton.tsx
index e6613a983..5efc7c1fc 100644
--- a/src/equicordplugins/messageLoggerEnhanced/components/LogsButton.tsx
+++ b/src/equicordplugins/messageLoggerEnhanced/components/LogsButton.tsx
@@ -17,22 +17,18 @@
 */
 
 import { HeaderBarButton } from "@api/HeaderBar";
+import { LogsIcon } from "@components/Icons";
 import { cl } from "@equicordplugins/messageLoggerEnhanced/index";
-import { findComponentByCodeLazy } from "@webpack";
 
 import { openLogModal } from "./LogsModal";
 
-const Icon = findComponentByCodeLazy("0-1.27-.97l-2.5.7a3");
-
 export function OpenLogsButton() {
     return (
         <HeaderBarButton
             className={cl("toolbox-btn")}
             onClick={() => openLogModal()}
             tooltip={"Open Logs"}
-            icon={Icon}
+            icon={LogsIcon}
         />
     );
 }
-
-export { Icon as LogsIcon };
diff --git a/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx b/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx
index 06727dba8..3fa47d67b 100644
--- a/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx
+++ b/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx
@@ -16,8 +16,8 @@ import { type User } from "@vencord/discord-types";
 import { find, findByCode, findByCodeLazy } from "@webpack";
 import { Alerts, ChannelStore, ContextMenuApi, FluxDispatcher, GuildStore, Menu, NavigationRouter, React, TabBar, TextInput, Tooltip, useMemo, useRef, useState } from "@webpack/common";
 
-import { clearMessagesIDB, DBMessageRecord, deleteMessageIDB, deleteMessagesBulkIDB } from "../db";
-import { cl, settings } from "../index";
+import { DBMessageRecord, deleteMessageIDB, deleteMessagesBulkIDB } from "../db";
+import { cl, clearLogs, settings } from "../index";
 import { LoggedMessage, LoggedMessageJSON } from "../types";
 import { messageJsonToMessageClass } from "../utils";
 import { importLogs } from "../utils/settingsUtils";
@@ -147,7 +147,7 @@ export function LogsModal({ modalProps, initalQuery }: Props) {
                         confirmVariant: "critical-primary",
                         cancelText: "Cancel",
                         onConfirm: async () => {
-                            await clearMessagesIDB();
+                            await clearLogs();
                             reset();
                         }
 
diff --git a/src/equicordplugins/messageLoggerEnhanced/db.ts b/src/equicordplugins/messageLoggerEnhanced/db.ts
index 31c34ef45..a9824e3dc 100644
--- a/src/equicordplugins/messageLoggerEnhanced/db.ts
+++ b/src/equicordplugins/messageLoggerEnhanced/db.ts
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { Logger } from "@utils/Logger";
 import { ChannelStore, Toasts } from "@webpack/common";
 import { DBSchema, IDBPDatabase, openDB } from "idb";
 
@@ -38,63 +37,17 @@ export interface MLIDB extends DBSchema {
             by_timestamp_and_message_id: [string, string];
         };
     };
+
 }
 
-const logger = new Logger("MessageLoggerEnhanced");
-let db: IDBPDatabase<MLIDB> | null = null;
-let dbPromise: Promise<IDBPDatabase<MLIDB> | null> | null = null;
-let loggedFailure = false;
-
+export let db: IDBPDatabase<MLIDB>;
 export const cachedMessages = new Map<string, LoggedMessageJSON>();
 
-function handleDbFailure(error: unknown) {
-    if (loggedFailure) return;
-    loggedFailure = true;
-    logger.error("Message storage unavailable, using memory only.", error);
-}
-
-async function ensureDb() {
-    if (db) return db;
-    if (!dbPromise) {
-        dbPromise = openDB<MLIDB>(DB_NAME, DB_VERSION, {
-            upgrade(database) {
-                const messageStore = database.createObjectStore("messages", { keyPath: "message_id" });
-                messageStore.createIndex("by_channel_id", "channel_id");
-                messageStore.createIndex("by_status", "status");
-                messageStore.createIndex("by_timestamp", "message.timestamp");
-                messageStore.createIndex("by_timestamp_and_message_id", ["channel_id", "message.timestamp"]);
-            }
-        }).then(database => {
-            db = database;
-            return database;
-        }).catch(error => {
-            handleDbFailure(error);
-            return null;
-        });
-    }
-
-    db = await dbPromise;
-    return db;
-}
-
-async function withDb<T>(fallback: T, callback: (database: IDBPDatabase<MLIDB>) => Promise<T>): Promise<T> {
-    const database = await ensureDb();
-    if (!database) return fallback;
-
-    try {
-        return await callback(database);
-    } catch (error) {
-        handleDbFailure(error);
-        return fallback;
-    }
-}
-
-async function cacheRecords(records: DBMessageRecord[], cacheAttachmentBlobs = true) {
+// this is probably not the best way to do this
+async function cacheRecords(records: DBMessageRecord[]) {
     for (const r of records) {
         cacheRecord(r);
 
-        if (!cacheAttachmentBlobs) continue;
-
         for (const att of r.message.attachments) {
             const blobUrl = await getAttachmentBlobUrl(att);
             if (blobUrl) {
@@ -103,7 +56,6 @@ async function cacheRecords(records: DBMessageRecord[], cacheAttachmentBlobs = t
             }
         }
     }
-
     return records;
 }
 
@@ -116,56 +68,57 @@ async function cacheRecord(record?: DBMessageRecord | null) {
 }
 
 export async function initIDB() {
-    await ensureDb();
+    if (db) return;
+    db = await openDB<MLIDB>(DB_NAME, DB_VERSION, {
+        upgrade(db) {
+            const messageStore = db.createObjectStore("messages", { keyPath: "message_id" });
+            messageStore.createIndex("by_channel_id", "channel_id");
+            messageStore.createIndex("by_status", "status");
+            messageStore.createIndex("by_timestamp", "message.timestamp");
+            messageStore.createIndex("by_timestamp_and_message_id", ["channel_id", "message.timestamp"]);
+        }
+    });
 }
-void initIDB();
+initIDB();
 
 export async function hasMessageIDB(message_id: string) {
-    if (cachedMessages.has(message_id)) return true;
-    return withDb(false, database => database.count("messages", message_id).then(count => count > 0));
+    return cachedMessages.has(message_id) || (await db.count("messages", message_id)) > 0;
 }
 
 export async function countMessagesIDB() {
-    if (!db) return cachedMessages.size;
     return db.count("messages");
 }
 
 export async function countMessagesByStatusIDB(status: DBMessageStatus) {
-    return withDb(0, database => database.countFromIndex("messages", "by_status", status));
+    return db.countFromIndex("messages", "by_status", status);
 }
 
 export async function getAllMessagesIDB() {
-    return withDb([], async database => cacheRecords(await database.getAll("messages")));
+    return cacheRecords(await db.getAll("messages"));
 }
 
 export async function getMessagesForChannelIDB(channel_id: string) {
-    return withDb([], async database => cacheRecords(await database.getAllFromIndex("messages", "by_channel_id", channel_id)));
+    return cacheRecords(await db.getAllFromIndex("messages", "by_channel_id", channel_id));
 }
 
 export async function getMessageIDB(message_id: string) {
-    return withDb<DBMessageRecord | null>(null, async database => {
-        const record = await database.get("messages", message_id);
-        await cacheRecord(record);
-        return record ?? null;
-    });
+    return cacheRecord(await db.get("messages", message_id));
 }
 
 export async function getMessagesByStatusIDB(status: DBMessageStatus) {
-    return withDb([], async database => cacheRecords(await database.getAllFromIndex("messages", "by_status", status)));
+    return cacheRecords(await db.getAllFromIndex("messages", "by_status", status));
 }
 
 export async function getOldestMessagesIDB(limit: number) {
-    return withDb([], async database => cacheRecords(await database.getAllFromIndex("messages", "by_timestamp", undefined, limit)));
+    return cacheRecords(await db.getAllFromIndex("messages", "by_timestamp", undefined, limit));
 }
 
 export async function* iterateAllMessagesIDB(batchSize = 100) {
-    if (!db && !(await ensureDb())) return;
-
     let lastId: string | undefined;
     while (true) {
         const batch: DBMessageRecord[] = [];
-
-        const tx = db!.transaction("messages");
+        // new transaction for each batch to avoid timeouts during yield
+        const tx = db.transaction("messages");
         const range = lastId ? IDBKeyRange.lowerBound(lastId, true) : undefined;
         let cursor = await tx.store.openCursor(range);
 
@@ -177,6 +130,7 @@ export async function* iterateAllMessagesIDB(batchSize = 100) {
         if (batch.length === 0) break;
 
         lastId = batch[batch.length - 1].message_id;
+
         yield await cacheRecords(batch);
 
         if (batch.length < batchSize) break;
@@ -184,20 +138,22 @@ export async function* iterateAllMessagesIDB(batchSize = 100) {
 }
 
 export async function getOlderThanTimestampIDB(timestamp: string) {
-    return withDb([], async database => {
-        const tx = database.transaction("messages", "readonly");
-        const index = tx.store.index("by_timestamp");
-        const cursor = await index.openCursor(IDBKeyRange.upperBound(timestamp));
+    const tx = db.transaction("messages", "readonly");
+    const { store } = tx;
+    const index = store.index("by_timestamp");
 
-        if (!cursor) return [];
+    const cursor = await index.openCursor(IDBKeyRange.upperBound(timestamp));
 
-        const messages: DBMessageRecord[] = [];
-        for await (const c of cursor) {
-            messages.push(c.value);
-        }
+    if (!cursor) {
+        return [];
+    }
 
-        return cacheRecords(messages, false);
-    });
+    const messages: DBMessageRecord[] = [];
+    for await (const c of cursor) {
+        messages.push(c.value);
+    }
+
+    return cacheRecords(messages);
 }
 
 export async function getOlderThanTimestampForGuildsIDB(timestamp: string, currentChannelId?: string, preserveCurrentChannel?: boolean) {
@@ -212,106 +168,102 @@ export async function getOlderThanTimestampForGuildsIDB(timestamp: string, curre
 }
 
 export async function getDateStortedMessagesByStatusIDB(newest: boolean, limit: number, status: DBMessageStatus) {
-    return withDb([], async database => {
-        const tx = database.transaction("messages", "readonly");
-        const index = tx.store.index("by_status");
-        const direction = newest ? "prev" : "next";
-        const cursor = await index.openCursor(IDBKeyRange.only(status), direction);
+    const tx = db.transaction("messages", "readonly");
+    const { store } = tx;
+    const index = store.index("by_status");
 
-        if (!cursor) {
-            return [];
-        }
+    const direction = newest ? "prev" : "next";
+    const cursor = await index.openCursor(IDBKeyRange.only(status), direction);
 
-        const messages: DBMessageRecord[] = [];
-        for await (const c of cursor) {
-            messages.push(c.value);
-            if (messages.length >= limit) break;
-        }
+    if (!cursor) {
+        console.log("No messages found");
+        return [];
+    }
 
-        return cacheRecords(messages);
-    });
+    const messages: DBMessageRecord[] = [];
+    for await (const c of cursor) {
+        messages.push(c.value);
+        if (messages.length >= limit) break;
+    }
+
+    return cacheRecords(messages);
 }
 
 export async function getMessagesByChannelAndAfterTimestampIDB(channel_id: string, start: string) {
-    return withDb([], async database => {
-        const tx = database.transaction("messages", "readonly");
-        const index = tx.store.index("by_timestamp_and_message_id");
-        const cursor = await index.openCursor(IDBKeyRange.bound([channel_id, start], [channel_id, "\uffff"]));
+    const tx = db.transaction("messages", "readonly");
+    const { store } = tx;
+    const index = store.index("by_timestamp_and_message_id");
 
-        if (!cursor) {
-            return [];
-        }
+    const cursor = await index.openCursor(IDBKeyRange.bound([channel_id, start], [channel_id, "\uffff"]));
 
-        const messages: DBMessageRecord[] = [];
-        for await (const c of cursor) {
-            messages.push(c.value);
-        }
+    if (!cursor) {
+        console.log("No messages found in range");
+        return [];
+    }
 
-        return cacheRecords(messages, false);
-    });
+    const messages: DBMessageRecord[] = [];
+    for await (const c of cursor) {
+        messages.push(c.value);
+    }
+
+    return cacheRecords(messages);
 }
 
 export async function addMessageIDB(message: LoggedMessageJSON, status: DBMessageStatus) {
     stripTransientRenderState(message);
-    cachedMessages.set(message.id, message);
 
-    return withDb(void 0, async database => {
-        await database.put("messages", {
-            channel_id: message.channel_id,
-            message_id: message.id,
-            status,
-            message,
-        });
+    if (!db) await initIDB();
+    await db.put("messages", {
+        channel_id: message.channel_id,
+        message_id: message.id,
+        status,
+        message,
     });
+
+    cachedMessages.set(message.id, message);
 }
 
 export async function addMessagesBulkIDB(messages: LoggedMessageJSON[], status?: DBMessageStatus) {
     messages.forEach(stripTransientRenderState);
+
+    const tx = db.transaction("messages", "readwrite");
+    const { store } = tx;
+
+    await Promise.all([
+        ...messages.map(message => store.add({
+            channel_id: message.channel_id,
+            message_id: message.id,
+            status: status ?? getMessageStatus(message),
+            message,
+        })),
+        tx.done
+    ]);
+
     messages.forEach(message => cachedMessages.set(message.id, message));
-
-    return withDb(void 0, async database => {
-        const tx = database.transaction("messages", "readwrite");
-        const { store } = tx;
-
-        await Promise.all([
-            ...messages.map(message => store.add({
-                channel_id: message.channel_id,
-                message_id: message.id,
-                status: status ?? getMessageStatus(message),
-                message,
-            })),
-            tx.done
-        ]);
-    });
 }
 
 export async function deleteMessageIDB(message_id: string) {
-    cachedMessages.delete(message_id);
+    await db.delete("messages", message_id);
 
-    return withDb(void 0, database => database.delete("messages", message_id));
+    cachedMessages.delete(message_id);
 }
 
 export async function deleteMessagesBulkIDB(message_ids: string[]) {
+    const tx = db.transaction("messages", "readwrite");
+    const { store } = tx;
+
+    await Promise.all([...message_ids.map(id => store.delete(id)), tx.done]);
     message_ids.forEach(id => cachedMessages.delete(id));
-
-    return withDb(void 0, async database => {
-        const tx = database.transaction("messages", "readwrite");
-        const { store } = tx;
-        await Promise.all([
-            ...message_ids.map(id => store.delete(id)),
-            tx.done
-        ]);
-    });
 }
 
-export async function clearMessagesIDB() {
+export async function clearMessagesIDB(showToast = true) {
     cachedMessages.clear();
+    await db.clear("messages");
+    if (!showToast) return;
 
-    return withDb(void 0, database => database.clear("messages")).then(() => {
-        Toasts.show({
-            type: Toasts.Type.MESSAGE,
-            message: "Cleared message log database and cache.",
-            id: Toasts.genId()
-        });
+    Toasts.show({
+        type: Toasts.Type.MESSAGE,
+        message: "Cleared message log database and cache.",
+        id: Toasts.genId()
     });
 }
diff --git a/src/equicordplugins/messageLoggerEnhanced/index.tsx b/src/equicordplugins/messageLoggerEnhanced/index.tsx
index cf5a537f8..efaf59567 100644
--- a/src/equicordplugins/messageLoggerEnhanced/index.tsx
+++ b/src/equicordplugins/messageLoggerEnhanced/index.tsx
@@ -8,6 +8,7 @@ export const Native = getNative();
 
 import "./styles.css";
 
+import { LogsIcon } from "@components/Icons";
 import { Devs, EquicordDevs } from "@utils/constants";
 import { classNameFactory } from "@utils/css";
 import { Logger } from "@utils/Logger";
@@ -15,11 +16,11 @@ import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { FluxDispatcher, MessageStore, SelectedChannelStore, UserStore } from "@webpack/common";
 
-import { LogsIcon, OpenLogsButton } from "./components/LogsButton";
+import { OpenLogsButton } from "./components/LogsButton";
 import { openLogModal } from "./components/LogsModal";
 import * as idb from "./db";
-import { addMessage } from "./LoggedMessageManager";
 import * as LoggedMessageManager from "./LoggedMessageManager";
+import { addMessage } from "./LoggedMessageManager";
 import { settings } from "./settings";
 import { FetchMessagesResponse, LoadMessagePayload, LoggedMessage, LoggedMessageJSON, MessageCreatePayload, MessageDeleteBulkPayload, MessageDeletePayload, MessageUpdatePayload } from "./types";
 import { cleanUpCachedMessage, cleanupUserObject, getNative, isGhostPinged, mapTimestamp, messageJsonToMessageClass, reAddDeletedMessages } from "./utils";
@@ -36,8 +37,15 @@ export const Flogger = new Logger("MessageLoggerEnhanced", "#f26c6c");
 export const cacheSentMessages = new LimitedMap<string, LoggedMessageJSON>();
 export const cl = classNameFactory("vc-msg-logger-enhanced-");
 
+let didClearLogsOnStartup = false;
+
 const cacheThing = findByPropsLazy("commit", "getOrCreate");
 
+export async function clearLogs(showToast = true) {
+    await idb.clearMessagesIDB(showToast);
+    cacheSentMessages.clear();
+}
+
 let oldGetMessage: typeof MessageStore.getMessage;
 
 const handledMessageIds = new Set();
@@ -251,7 +259,8 @@ export default definePlugin({
     name: "MessageLoggerEnhanced",
     authors: [Devs.Aria, EquicordDevs.keircn],
     description: "Improves MessageLogger with edited message history, ghost ping detection and more",
-    dependencies: ["MessageLogger"],
+    tags: ["Chat", "Servers"],
+    dependencies: ["MessageLogger", "HeaderBarAPI"],
 
     patches: [
         {
@@ -396,6 +405,15 @@ export default definePlugin({
 
         Native.init();
 
+        if (settings.store.clearLogsOnRestart && !didClearLogsOnStartup) {
+            try {
+                await clearLogs(false);
+                didClearLogsOnStartup = true;
+            } catch (e) {
+                Flogger.error("Failed to clear logs on restart", e);
+            }
+        }
+
         const { imageCacheDir, logsDir } = await Native.getSettings();
         settings.store.imageCacheDir = imageCacheDir;
         settings.store.logsDir = logsDir;
diff --git a/src/equicordplugins/messageLoggerEnhanced/settings.tsx b/src/equicordplugins/messageLoggerEnhanced/settings.tsx
index c573acff8..1c39df9e4 100644
--- a/src/equicordplugins/messageLoggerEnhanced/settings.tsx
+++ b/src/equicordplugins/messageLoggerEnhanced/settings.tsx
@@ -4,17 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { definePluginSettings } from "@api/Settings";
+import { definePluginSettings, Settings } from "@api/Settings";
 import { Button } from "@components/Button";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { OptionType } from "@utils/types";
 import { Alerts, useState } from "@webpack/common";
-import { Settings } from "Vencord";
 
-import { Native } from ".";
+import { clearLogs, Native } from ".";
 import { ImageCacheDir, LogsDir } from "./components/FolderSelectInput";
 import { openLogModal } from "./components/LogsModal";
-import { clearMessagesIDB } from "./db";
 import { blockedExts } from "./list";
 import { DEFAULT_IMAGE_CACHE_DIR } from "./utils/constants";
 import { exportLogs, importLogs } from "./utils/settingsUtils";
@@ -260,6 +258,13 @@ export const settings = definePluginSettings({
         component: ExportLogsButton
     },
 
+    clearLogsOnRestart: {
+        type: OptionType.BOOLEAN,
+        description: "Clear logs when Discord restarts.",
+        default: false,
+        restartNeeded: true,
+    },
+
     openLogs: {
         type: OptionType.COMPONENT,
         description: "Open Logs",
@@ -298,7 +303,7 @@ export const settings = definePluginSettings({
                     confirmText: "Clear",
                     cancelText: "Cancel",
                     onConfirm: async () => {
-                        await clearMessagesIDB();
+                        await clearLogs();
                     },
                 })}
             >
diff --git a/src/equicordplugins/messageLoggerEnhanced/utils/LimitedMap.ts b/src/equicordplugins/messageLoggerEnhanced/utils/LimitedMap.ts
index a0b381e75..c027d3869 100644
--- a/src/equicordplugins/messageLoggerEnhanced/utils/LimitedMap.ts
+++ b/src/equicordplugins/messageLoggerEnhanced/utils/LimitedMap.ts
@@ -33,4 +33,8 @@ export class LimitedMap<K, V> {
     get(key: K) {
         return this.map.get(key);
     }
+
+    clear() {
+        this.map.clear();
+    }
 }
diff --git a/src/equicordplugins/messageLoggerEnhanced/utils/misc.ts b/src/equicordplugins/messageLoggerEnhanced/utils/misc.ts
index 43c5f4166..66a264abf 100644
--- a/src/equicordplugins/messageLoggerEnhanced/utils/misc.ts
+++ b/src/equicordplugins/messageLoggerEnhanced/utils/misc.ts
@@ -24,6 +24,7 @@ import { DBMessageStatus } from "../db";
 import { LoggedMessageJSON } from "../types";
 import { DEFAULT_IMAGE_CACHE_DIR } from "./constants";
 import { DISCORD_EPOCH } from "./index";
+import { memoize } from "./memoize";
 
 const MessageClass: any = findLazy(m => m?.prototype?.isEdited);
 const AuthorClass = findLazy(m => m?.prototype?.getAvatarURL);
@@ -92,7 +93,7 @@ export const mapTimestamp = (m: any) => {
     return m;
 };
 
-export const messageJsonToMessageClass = (log: { message: LoggedMessageJSON; }) => {
+export const messageJsonToMessageClass = memoize((log: { message: LoggedMessageJSON; }) => {
     // console.time("message populate");
     if (!log?.message) return null;
 
@@ -122,7 +123,7 @@ export const messageJsonToMessageClass = (log: { message: LoggedMessageJSON; })
 
     // console.timeEnd("message populate");
     return message;
-};
+});
 
 export function parseJSON(json?: string | null) {
     try {
diff --git a/src/equicordplugins/messageLoggerEnhanced/utils/settingsUtils.ts b/src/equicordplugins/messageLoggerEnhanced/utils/settingsUtils.ts
index 1f89770c5..0d59e56ab 100644
--- a/src/equicordplugins/messageLoggerEnhanced/utils/settingsUtils.ts
+++ b/src/equicordplugins/messageLoggerEnhanced/utils/settingsUtils.ts
@@ -21,8 +21,8 @@ import { chooseFile as chooseFileWeb } from "@utils/web";
 import { Toasts } from "@webpack/common";
 import { showSaveFilePicker } from "native-file-system-adapter";
 
-import { Native } from "..";
-import { addMessagesBulkIDB, clearMessagesIDB, iterateAllMessagesIDB } from "../db";
+import { clearLogs,Native } from "..";
+import { addMessagesBulkIDB, iterateAllMessagesIDB } from "../db";
 import { LoggedMessageJSON } from "../types";
 
 export async function importLogs() {
@@ -34,7 +34,7 @@ export async function importLogs() {
 
         for await (const logItems of iterateLogItems()) {
             if (!cleared) {
-                await clearMessagesIDB();
+                await clearLogs(false);
                 cleared = true;
             }
 
diff --git a/src/equicordplugins/messageNotifier/index.ts b/src/equicordplugins/messageNotifier/index.ts
index 7a41158d0..af9cee4b6 100644
--- a/src/equicordplugins/messageNotifier/index.ts
+++ b/src/equicordplugins/messageNotifier/index.ts
@@ -38,6 +38,7 @@ export default definePlugin({
     authors: [EquicordDevs.cassie, EquicordDevs.mochienya],
     name: "MessageNotifier",
     description: "Get toasts for when chosen users send a message",
+    tags: ["Chat", "Notifications"],
     settings,
     flux: {
         MESSAGE_CREATE({ message, channelId, guildId }: MessageCreatePayload) {
diff --git a/src/equicordplugins/messagePeek/index.tsx b/src/equicordplugins/messagePeek/index.tsx
index 340552eac..a9360a0ad 100644
--- a/src/equicordplugins/messagePeek/index.tsx
+++ b/src/equicordplugins/messagePeek/index.tsx
@@ -9,6 +9,7 @@ import "./style.css";
 import { DecoratorProps } from "@api/MemberListDecorators";
 import { isPluginEnabled } from "@api/PluginManager";
 import { definePluginSettings } from "@api/Settings";
+import { AttachmentIcon, GifIcon, ImageIcon, Microphone, StickerIcon, VideoIcon } from "@components/Icons";
 import betterActivities from "@equicordplugins/betterActivities";
 import showMeYourName from "@plugins/showMeYourName";
 import { Devs, EquicordDevs } from "@utils/constants";
@@ -17,7 +18,7 @@ import { classes } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
 import { Activity, ApplicationStream, Channel, Message, OnlineStatus, User } from "@vencord/discord-types";
 import { MessageFlags } from "@vencord/discord-types/enums";
-import { findByCodeLazy, findByPropsLazy, findComponentByCodeLazy, findCssClassesLazy, findExportedComponentLazy } from "@webpack";
+import { findByCodeLazy, findByPropsLazy, findComponentByCodeLazy, findCssClassesLazy } from "@webpack";
 import { ChannelStore, ExperimentStore, MessageStore, Parser, RelationshipStore, SnowflakeUtils, UserGuildSettingsStore, UserStore, useStateFromStores } from "@webpack/common";
 
 const cl = classNameFactory("vc-message-peek-");
@@ -27,7 +28,7 @@ const ActivityClasses = findCssClassesLazy("textWithIconContainer", "icon", "tru
 const MessageActions = findByPropsLazy("fetchMessages", "sendMessage");
 
 const hasRelevantActivity: (props: ActivityCheckProps) => boolean = findByCodeLazy(".OFFLINE||", ".INVISIBLE)return!1");
-const ActivityText: React.ComponentType<ActivityTextProps> = findComponentByCodeLazy("hasQuest:", "hideEmoji:");
+const ActivityText: React.ComponentType<ActivityTextProps> = findComponentByCodeLazy('"ActivityStatus"');
 
 const ONE_HOUR_MS = 60 * 60 * 1000;
 
@@ -43,12 +44,12 @@ type AttachmentType = "image" | "gif" | "video" | "file";
 type IconType = AttachmentType | "voice" | "sticker";
 
 const Icons: Record<IconType, React.ComponentType<{ size: string; className: string; }>> = {
-    image: findExportedComponentLazy("ImageIcon"),
-    file: findExportedComponentLazy("AttachmentIcon"),
-    voice: findExportedComponentLazy("MicrophoneIcon"),
-    sticker: findExportedComponentLazy("StickerIcon"),
-    gif: findExportedComponentLazy("GifIcon"),
-    video: findExportedComponentLazy("VideoIcon"),
+    image: ImageIcon,
+    file: AttachmentIcon,
+    voice: Microphone,
+    sticker: StickerIcon,
+    gif: GifIcon,
+    video: VideoIcon,
 };
 
 const ATTACHMENT_LABELS: Record<AttachmentType, string> = {
@@ -239,6 +240,8 @@ function shouldShowActivity(lastMessage: Message | undefined, hasActivity: boole
 export default definePlugin({
     name: "MessagePeek",
     description: "Shows the last message preview and timestamp in the Direct Messages list.",
+    dependencies: ["MemberListDecoratorsAPI"],
+    tags: ["Appearance", "Chat"],
     authors: [Devs.prism, EquicordDevs.justjxke],
     settings,
     patches: [
diff --git a/src/equicordplugins/messageTranslate/index.tsx b/src/equicordplugins/messageTranslate/index.tsx
index 6384b6ee9..64b7f50d2 100644
--- a/src/equicordplugins/messageTranslate/index.tsx
+++ b/src/equicordplugins/messageTranslate/index.tsx
@@ -4,64 +4,112 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
+import "./styles.css";
 
-const settings = definePluginSettings(
-    {
-        targetLanguage: {
-            type: OptionType.STRING,
-            description: "The language messages should be translated to",
-            default: "en",
-            restartNeeded: true
-        },
-        confidenceRequirement: {
-            type: OptionType.STRING,
-            description: "The confidence required to translated the message. Best not to edit unless you know what you're doing",
-            default: "0.8",
-            restartNeeded: true
-        },
-    });
+import { EquicordDevs } from "@utils/constants";
+import { classNameFactory } from "@utils/css";
+import definePlugin from "@utils/types";
+import { ChannelStore, FluxDispatcher, MessageStore, UserStore } from "@webpack/common";
 
-async function translateAPI(sourceLang: string, targetLang: string, text: string): Promise<any> {
+import { getIgnoredChannels, getIgnoredGuilds, getIgnoredUsers, settings } from "./settings";
+import { MessageWithContent } from "./types";
+import { clearCache, getCached, hasFailed, isInProgress, translate } from "./utils/translate";
 
-    const url = `https://translate.googleapis.com/translate_a/single?client=gtx&sl=${sourceLang}&tl=${targetLang}&dt=t&dj=1&q=${encodeURIComponent(text)}`;
-    const response = await fetch(url);
-    if (!response.ok) {
-        throw new Error(`Failed to translate "${text}" from ${sourceLang} to ${targetLang}: ${response.status} ${response.statusText}`);
+const cl = classNameFactory("mt-");
+const translatedMessages = new Map<string, string>();
+
+function shouldTranslate(message: MessageWithContent): boolean {
+    if (!message.content || typeof message.content !== "string") return false;
+    if (hasFailed(message.id, message.content)) return false;
+
+    if (settings.store.skipOwnMessages) {
+        const currentUserId = UserStore.getCurrentUser()?.id;
+        if (currentUserId && message.author?.id === currentUserId) return false;
     }
 
-    return await response.json();
+    if (settings.store.skipBotMessages && message.author?.bot) return false;
+
+    if (message.author && getIgnoredUsers().has(message.author.id)) return false;
+    if (message.channel_id && getIgnoredChannels().has(message.channel_id)) return false;
+
+    const guildId = message.channel_id ? ChannelStore.getChannel(message.channel_id)?.guild_id : null;
+    if (guildId && getIgnoredGuilds().has(guildId)) return false;
+
+    return true;
 }
 
-async function TranslateMessage(string) {
-    // there may be a better way to do this lmao
-    if (string.includes("(Translated)")) return string;
+function triggerReRender(message: MessageWithContent) {
+    const current = MessageStore.getMessage(message.channel_id, message.id);
+    if (!current) return;
 
-    const response = await translateAPI("auto", settings.store.targetLanguage, string);
-
-    if (response.src === settings.store.targetLanguage || response.confidence < settings.store.confidenceRequirement) return string;
-
-    const { sentences }: { sentences: { trans?: string; }[]; } = await response;
-    const translatedText = sentences.map(s => s?.trans).filter(Boolean).join("");
-
-    return `${translatedText} *(Translated)*`;
+    FluxDispatcher.dispatch({
+        type: "MESSAGE_UPDATE",
+        message: current,
+    });
 }
 
 export default definePlugin({
     name: "MessageTranslate",
-    description: "Auto translate messages to your language",
-    authors: [Devs.Samwich],
+    description: "Auto translate messages to your language with caching, per-channel toggles, and more options.",
+    tags: ["Chat", "Utility"],
+    authors: [EquicordDevs.creations],
     settings,
-    TranslateMessage: TranslateMessage,
+
     patches: [
         {
             find: '.CUSTOM_GIFT?""',
-            replacement: {
-                match: /renderContentOnly:\i}=\i;/,
-                replace: "$&$self.TranslateMessage(arguments[0].message.content).then(response => arguments[0].message.content = response);"
-            }
+            replacement: [
+                {
+                    match: /message:(\i),message:\{id:\i\}.{0,200}renderContentOnly:\i\}=\i;/,
+                    replace: "$&$1=$self.transformMessage($1);",
+                },
+                {
+                    match: /childrenMessageContent:(\i),/g,
+                    replace: "childrenMessageContent:$self.wrapContent($1,arguments[0].message.id),",
+                },
+            ],
         },
-    ]
+    ],
+
+    transformMessage(message: MessageWithContent): MessageWithContent {
+        if (!settings.store.autoTranslate || !shouldTranslate(message)) {
+            translatedMessages.delete(message.id);
+            return message;
+        }
+
+        const cached = getCached(message.id);
+        if (cached) {
+            if (cached.original !== message.content) {
+                clearCache(message.id);
+                translatedMessages.delete(message.id);
+                return message;
+            }
+            translatedMessages.set(message.id, cached.sourceLang);
+            return Object.assign(Object.create(Object.getPrototypeOf(message)), message, {
+                content: cached.translated,
+            }) as MessageWithContent;
+        }
+
+        translatedMessages.delete(message.id);
+        if (!isInProgress(message.id)) {
+            translate(message.id, message.content).then(result => {
+                if (result) triggerReRender(message);
+            });
+        }
+
+        return message;
+    },
+
+    wrapContent(content: any, messageId: string) {
+        const sourceLang = translatedMessages.get(messageId);
+        if (!sourceLang) return content;
+        return (
+            <>
+                {content}
+                {settings.store.showIndicator && (
+                    <div className={cl("indicator")}>translated from {sourceLang}</div>
+                )}
+            </>
+        );
+    },
 });
diff --git a/src/equicordplugins/messageTranslate/settings.ts b/src/equicordplugins/messageTranslate/settings.ts
new file mode 100644
index 000000000..491240737
--- /dev/null
+++ b/src/equicordplugins/messageTranslate/settings.ts
@@ -0,0 +1,72 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { OptionType } from "@utils/types";
+
+export const settings = definePluginSettings({
+    targetLanguage: {
+        type: OptionType.STRING,
+        description: "Target language code for translations (e.g. en, es, fr, de, ja).",
+        default: "en",
+    },
+    confidenceRequirement: {
+        type: OptionType.NUMBER,
+        description: "Minimum confidence (0 to 1) required to show a translation.",
+        default: 0.8,
+    },
+    autoTranslate: {
+        type: OptionType.BOOLEAN,
+        description: "Automatically translate messages as they appear.",
+        default: true,
+    },
+    skipOwnMessages: {
+        type: OptionType.BOOLEAN,
+        description: "Do not translate your own messages.",
+        default: true,
+    },
+    skipBotMessages: {
+        type: OptionType.BOOLEAN,
+        description: "Do not translate bot messages.",
+        default: false,
+    },
+    ignoredGuilds: {
+        type: OptionType.STRING,
+        description: "Comma-separated list of server IDs to not translate in.",
+        default: "",
+    },
+    ignoredChannels: {
+        type: OptionType.STRING,
+        description: "Comma-separated list of channel IDs to not translate in.",
+        default: "",
+    },
+    ignoredUsers: {
+        type: OptionType.STRING,
+        description: "Comma-separated list of user IDs to not translate.",
+        default: "",
+    },
+    showIndicator: {
+        type: OptionType.BOOLEAN,
+        description: "Append a small (translated) indicator to translated messages.",
+        default: true,
+    },
+});
+
+function parseIdList(value: string): Set<string> {
+    return new Set(value.split(",").map(s => s.trim()).filter(Boolean));
+}
+
+export function getIgnoredGuilds(): Set<string> {
+    return parseIdList(settings.store.ignoredGuilds);
+}
+
+export function getIgnoredChannels(): Set<string> {
+    return parseIdList(settings.store.ignoredChannels);
+}
+
+export function getIgnoredUsers(): Set<string> {
+    return parseIdList(settings.store.ignoredUsers);
+}
diff --git a/src/equicordplugins/messageTranslate/styles.css b/src/equicordplugins/messageTranslate/styles.css
new file mode 100644
index 000000000..14cd820e6
--- /dev/null
+++ b/src/equicordplugins/messageTranslate/styles.css
@@ -0,0 +1,9 @@
+.mt-indicator {
+    color: var(--text-muted);
+    font-style: italic;
+    font-weight: 400;
+    font-size: 0.7rem;
+    line-height: 1;
+    margin-top: 0.15em;
+    opacity: 0.75;
+}
diff --git a/src/equicordplugins/messageTranslate/types.ts b/src/equicordplugins/messageTranslate/types.ts
new file mode 100644
index 000000000..d6cb8f1f5
--- /dev/null
+++ b/src/equicordplugins/messageTranslate/types.ts
@@ -0,0 +1,21 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { Message } from "@vencord/discord-types";
+
+export interface TranslateResponse {
+    src: string;
+    confidence: number;
+    sentences: { trans?: string; }[];
+}
+
+export interface CachedTranslation {
+    original: string;
+    translated: string;
+    sourceLang: string;
+}
+
+export type MessageWithContent = Message & { content: string; };
diff --git a/src/equicordplugins/messageTranslate/utils/translate.ts b/src/equicordplugins/messageTranslate/utils/translate.ts
new file mode 100644
index 000000000..612b26c1a
--- /dev/null
+++ b/src/equicordplugins/messageTranslate/utils/translate.ts
@@ -0,0 +1,81 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Logger } from "@utils/Logger";
+
+import { settings } from "../settings";
+import { CachedTranslation, TranslateResponse } from "../types";
+
+const logger = new Logger("MessageTranslate");
+
+const translationCache = new Map<string, CachedTranslation>();
+const inProgress = new Set<string>();
+const failed = new Map<string, string>();
+
+export function getCached(messageId: string): CachedTranslation | undefined {
+    return translationCache.get(messageId);
+}
+
+export function hasFailed(messageId: string, text: string): boolean {
+    return failed.get(messageId) === text;
+}
+
+export function isInProgress(messageId: string): boolean {
+    return inProgress.has(messageId);
+}
+
+export function clearCache(messageId: string) {
+    translationCache.delete(messageId);
+    failed.delete(messageId);
+}
+
+async function fetchTranslation(text: string, targetLang: string): Promise<TranslateResponse> {
+    const url = `https://translate.googleapis.com/translate_a/single?client=gtx&sl=auto&tl=${targetLang}&dt=t&dj=1&q=${encodeURIComponent(text)}`;
+    const response = await fetch(url);
+
+    if (!response.ok) {
+        throw new Error(`Translation API returned ${response.status} ${response.statusText}`);
+    }
+
+    return await response.json();
+}
+
+export async function translate(messageId: string, text: string): Promise<CachedTranslation | null> {
+    if (inProgress.has(messageId)) return null;
+    if (translationCache.has(messageId)) return translationCache.get(messageId)!;
+
+    inProgress.add(messageId);
+
+    try {
+        const targetLang = settings.store.targetLanguage;
+        const response = await fetchTranslation(text, targetLang);
+
+        if (response.src === targetLang || response.confidence < settings.store.confidenceRequirement) {
+            failed.set(messageId, text);
+            return null;
+        }
+
+        const translatedText = response.sentences.map(s => s.trans).filter(Boolean).join("");
+        if (!translatedText || translatedText === text) {
+            failed.set(messageId, text);
+            return null;
+        }
+
+        const entry: CachedTranslation = {
+            original: text,
+            translated: translatedText,
+            sourceLang: response.src,
+        };
+        translationCache.set(messageId, entry);
+        return entry;
+    } catch (e) {
+        logger.error("Translation failed", e);
+        failed.set(messageId, text);
+        return null;
+    } finally {
+        inProgress.delete(messageId);
+    }
+}
diff --git a/src/equicordplugins/micLoopbackTester/index.tsx b/src/equicordplugins/micLoopbackTester/index.tsx
index f0f249fd6..8e0a27a60 100644
--- a/src/equicordplugins/micLoopbackTester/index.tsx
+++ b/src/equicordplugins/micLoopbackTester/index.tsx
@@ -115,6 +115,7 @@ const MicLoopbackUserAreaButton: UserAreaButtonFactory = props => <MicLoopbackBu
 export default definePlugin({
     name: "MicLoopbackTester",
     description: "Adds mic loopback test icon to the user panel",
+    tags: ["Utility", "Voice"],
     authors: [EquicordDevs.benjii],
     dependencies: ["UserSettingsAPI", "UserAreaAPI"],
     userAreaButton: {
diff --git a/src/equicordplugins/middleClickTweaks/index.ts b/src/equicordplugins/middleClickTweaks/index.ts
index da10a5d21..fff576a6f 100644
--- a/src/equicordplugins/middleClickTweaks/index.ts
+++ b/src/equicordplugins/middleClickTweaks/index.ts
@@ -98,10 +98,11 @@ migrate();
 export default definePlugin({
     name: "MiddleClickTweaks",
     description: "Various middle click tweaks, such as with pasting and link opening.",
+    tags: ["Utility"],
     authors: [EquicordDevs.Etorix, EquicordDevs.korzi],
     settings,
 
-    tags: ["LimitMiddleClickPaste"],
+    searchTerms: ["LimitMiddleClickPaste"],
 
     isPastingDisabled(isInput: boolean) {
         const pasteBlocked = Date.now() - lastMiddleClickUp < Math.max(settings.store.pasteThreshold, 1);
diff --git a/src/equicordplugins/moreCommands/index.ts b/src/equicordplugins/moreCommands/index.ts
index b174a4576..9f6cbbfd9 100644
--- a/src/equicordplugins/moreCommands/index.ts
+++ b/src/equicordplugins/moreCommands/index.ts
@@ -52,6 +52,8 @@ migratePluginSettings("MoreCommands", "FriendCloud", "GifRoulette", "ImgToGif",
 export default definePlugin({
     name: "MoreCommands",
     description: "Adds various fun and useful commands",
+    dependencies: ["CommandsAPI"],
+    tags: ["Commands", "Fun", "Shortcuts"],
     authors: [
         Devs.Arjix,
         Devs.amy,
diff --git a/src/equicordplugins/moreStickers/components/misc.tsx b/src/equicordplugins/moreStickers/components/misc.tsx
index 783ded6d4..bca8f2990 100644
--- a/src/equicordplugins/moreStickers/components/misc.tsx
+++ b/src/equicordplugins/moreStickers/components/misc.tsx
@@ -144,7 +144,7 @@ export const Packs = () => {
                             flexGrow: 1
                         }}>
                             <CheckedTextInput
-                                value={addStickerUrl}
+                                initialValue={addStickerUrl}
                                 onChange={setAddStickerUrl}
                                 validate={(v: string) => {
                                     try {
diff --git a/src/equicordplugins/moreStickers/index.tsx b/src/equicordplugins/moreStickers/index.tsx
index 97bfbdaee..4e89d8089 100644
--- a/src/equicordplugins/moreStickers/index.tsx
+++ b/src/equicordplugins/moreStickers/index.tsx
@@ -34,6 +34,7 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "MoreStickers",
     description: "Adds sticker packs from other social media platforms. (e.g. LINE)",
+    tags: ["Chat", "Emotes", "Media"],
     authors: [EquicordDevs.Leko, Devs.Arjix],
     settings,
 
@@ -64,7 +65,7 @@ export default definePlugin({
             find: "#{intl::EXPRESSION_PICKER_CATEGORIES_A11Y_LABEL}",
             replacement: [
                 {
-                    match: /(?<=(\i)\?(\(.{0,15}\))\((\i),\{.{0,150}(\i)===\i\.\i\.STICKER,.{0,150}children:(.{0,30}\.\i,children:.{0,25})\}\)\}\):null)/,
+                    match: /(?<=(\i)\?(\(.{0,15}\))\((\i),\{.{0,150}(\i)===\i\.\i\.STICKER,.{0,150}children:(.{0,50}\.\i,children:.{0,50})\}\)\}\):null)/,
                     replace: ',vcStickers=$1?$2($3,{id:"stickers+-picker-tab","aria-controls":"more-stickers-picker-tab-panel","aria-selected":$4==="stickers+",isActive:$4==="stickers+",autoFocus:true,viewType:"stickers+",children:$5+"+"})}):null'
                 },
                 {
diff --git a/src/equicordplugins/moreStickers/stickers.ts b/src/equicordplugins/moreStickers/stickers.ts
index 932a1d821..0d3717f39 100644
--- a/src/equicordplugins/moreStickers/stickers.ts
+++ b/src/equicordplugins/moreStickers/stickers.ts
@@ -8,7 +8,8 @@ import * as DataStore from "@api/DataStore";
 
 import { removeRecentStickerByPackId } from "./components";
 import { DynamicPackSetMeta, DynamicStickerPackMeta, StickerPack, StickerPackMeta } from "./types";
-import { Mutex } from "./utils";
+import { corsFetch, Mutex } from "./utils";
+
 const mutex = new Mutex();
 
 const PACKS_KEY = "MoreStickers:Packs";
@@ -117,7 +118,7 @@ export async function deleteStickerPack(id: string, packsKey: string = PACKS_KEY
 // ---------------------------- Dynamic Packs ----------------------------
 
 export async function getDynamicStickerPack(dspm: DynamicStickerPackMeta): Promise<StickerPack | null> {
-    const dsp = await fetch(dspm.dynamic.refreshUrl, {
+    const dsp = await corsFetch(dspm.dynamic.refreshUrl, {
         headers: dspm.dynamic.authHeaders,
     });
     if (!dsp.ok) return null;
@@ -133,7 +134,7 @@ function hasDynamicPackSetMeta(dpsm: DynamicPackSetMeta, metas?: DynamicPackSetM
 }
 
 export async function fetchDynamicPackSetMeta(dpsm: DynamicPackSetMeta): Promise<DynamicPackSetMeta | null> {
-    const dpsm_ = await fetch(dpsm.refreshUrl, {
+    const dpsm_ = await corsFetch(dpsm.refreshUrl, {
         headers: dpsm.authHeaders,
     });
     if (!dpsm_.ok) return null;
diff --git a/src/equicordplugins/moreStickers/upload.ts b/src/equicordplugins/moreStickers/upload.ts
index 75cf1ae53..5f36bcd4f 100644
--- a/src/equicordplugins/moreStickers/upload.ts
+++ b/src/equicordplugins/moreStickers/upload.ts
@@ -6,13 +6,13 @@
 
 import { getMimeFromExtension } from "@equicordplugins/fileUpload/utils/getMediaUrl";
 import { FFmpeg } from "@ffmpeg/ffmpeg";
-import { fetchFile } from "@ffmpeg/util";
 import { insertTextIntoChatInputBox, MessageOptions } from "@utils/discord";
 import { CloudUploadPlatform } from "@vencord/discord-types/enums";
 import { ChannelStore, CloudUploader, Constants, DraftStore, FluxDispatcher, MessageActions, PendingReplyStore, RestAPI, showToast, SnowflakeUtils, Toasts, UploadHandler } from "@webpack/common";
 
 import { settings } from ".";
 import { FFmpegState, Sticker } from "./types";
+import { corsFetch } from "./utils";
 
 type SendStickerOptions = {
     channelId: string;
@@ -75,7 +75,10 @@ async function resizeImage(url: string) {
 
 async function toGIF(url: string, ffmpeg: FFmpeg): Promise<File> {
     const filename = (new URL(url)).pathname.split("/").pop() ?? "image.png";
-    await ffmpeg.writeFile(filename, await fetchFile(url));
+    const res = await corsFetch(url);
+    if (!res.ok) throw new Error("Failed to fetch image for GIF conversion");
+    const arr = new Uint8Array(await res.arrayBuffer());
+    await ffmpeg.writeFile(filename, arr);
 
     const outputFilename = "output.gif";
     await ffmpeg.exec(["-i", filename,
@@ -127,7 +130,8 @@ export async function sendSticker({ channelId, sticker, ctrlKey, shiftKey, ffmpe
         if (!ffmpegState?.ffmpeg || !ffmpegState.isLoaded) throw new Error("FFmpeg not ready");
         file = await toGIF(sticker.image, ffmpegState.ffmpeg);
     } else {
-        const res = await fetch(sticker.image);
+        const res = await corsFetch(sticker.image);
+        if (!res.ok) throw new Error("Failed to fetch sticker image");
         const blobUrl = URL.createObjectURL(await res.blob());
         const processed = await resizeImage(blobUrl);
         const filename = sticker.filename ?? new URL(sticker.image).pathname.split("/").pop()!;
diff --git a/src/equicordplugins/moreUserTags/index.tsx b/src/equicordplugins/moreUserTags/index.tsx
index d7852ba5f..395144257 100644
--- a/src/equicordplugins/moreUserTags/index.tsx
+++ b/src/equicordplugins/moreUserTags/index.tsx
@@ -37,6 +37,8 @@ migratePluginToSettings(true, "MoreUserTags", "NoAppsAllowed", "noAppsAllowed");
 export default definePlugin({
     name: "MoreUserTags",
     description: "Adds tags for webhooks and moderative roles (owner, admin, etc.)",
+    dependencies: ["MemberListDecoratorsAPI", "MessageDecorationsAPI", "NicknameIconsAPI"],
+    tags: ["Appearance", "Chat"],
     authors: [Devs.Cyn, Devs.TheSun, Devs.RyanCaoDev, Devs.LordElias, Devs.AutumnVN, EquicordDevs.Hen, EquicordDevs.meowabyte],
     settings,
     patches: [
diff --git a/src/equicordplugins/moyai/index.ts b/src/equicordplugins/moyai/index.ts
index 4c6d79391..0d0b40c1b 100644
--- a/src/equicordplugins/moyai/index.ts
+++ b/src/equicordplugins/moyai/index.ts
@@ -91,6 +91,7 @@ export default definePlugin({
     name: "Moyai",
     authors: [Devs.Megu, Devs.Nuckyz],
     description: "Plays a 🗿 sound effect whenever a moyai emoji is sent, reacted, or used as a voice effect in your current channel.",
+    tags: ["Fun"],
     settings,
 
     flux: {
diff --git a/src/equicordplugins/musicControls/index.tsx b/src/equicordplugins/musicControls/index.tsx
index 3fb672401..dae172841 100644
--- a/src/equicordplugins/musicControls/index.tsx
+++ b/src/equicordplugins/musicControls/index.tsx
@@ -34,7 +34,8 @@ export default definePlugin({
     description: "Music Controls and Lyrics for multiple services ",
     authors: [Devs.Ven, Devs.afn, Devs.KraXen72, Devs.Av32000, Devs.nin0dev, Devs.thororen, EquicordDevs.vmohammad, Devs.Joona],
     settings,
-    tags: [
+    tags: ["Media", "Activity"],
+    searchTerms: [
         // Spotify
         "Spotify",
         "SpotifyControls",
diff --git a/src/equicordplugins/musicControls/spotify/PlayerComponent.tsx b/src/equicordplugins/musicControls/spotify/PlayerComponent.tsx
index cfde0c29e..e93529a45 100644
--- a/src/equicordplugins/musicControls/spotify/PlayerComponent.tsx
+++ b/src/equicordplugins/musicControls/spotify/PlayerComponent.tsx
@@ -18,7 +18,6 @@
 
 import "./spotifyStyles.css";
 
-import { Settings } from "@api/Settings";
 import { Flex } from "@components/Flex";
 import { CopyIcon, ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
 import { Paragraph } from "@components/Paragraph";
@@ -29,6 +28,7 @@ import { copyWithToast, openImageModal } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { ContextMenuApi, FluxDispatcher, Menu, React, useEffect, useState, useStateFromStores } from "@webpack/common";
 
+import { settings } from "../settings";
 import { SeekBar } from "./SeekBar";
 import { SpotifyStore, Track } from "./SpotifyStore";
 
@@ -132,7 +132,7 @@ function Controls() {
                 <Shuffle />
             </Button>
             <Button onClick={() => {
-                Settings.plugins.MusicControls.previousButtonRestartsTrack && SpotifyStore.position > 3000 ? SpotifyStore.seek(0) : SpotifyStore.prev();
+                settings.store.previousButtonRestartsTrack && SpotifyStore.position > 3000 ? SpotifyStore.seek(0) : SpotifyStore.prev();
             }}>
                 <SkipPrev />
             </Button>
diff --git a/src/equicordplugins/musicControls/spotify/SpotifyStore.ts b/src/equicordplugins/musicControls/spotify/SpotifyStore.ts
index 0e2d80b85..1e7462e3d 100644
--- a/src/equicordplugins/musicControls/spotify/SpotifyStore.ts
+++ b/src/equicordplugins/musicControls/spotify/SpotifyStore.ts
@@ -17,11 +17,12 @@
 */
 
 import { isPluginEnabled } from "@api/PluginManager";
-import { Settings } from "@api/Settings";
 import OpenInAppPlugin from "@plugins/openInApp";
 import { findByProps, findByPropsLazy, proxyLazyWebpack } from "@webpack";
 import { Flux, FluxDispatcher } from "@webpack/common";
 
+import { settings } from "../settings";
+
 export interface Track {
     id: string;
     name: string;
@@ -91,7 +92,7 @@ export const SpotifyStore = proxyLazyWebpack(() => {
         public isSettingPosition = false;
 
         public openExternal(path: string) {
-            const url = Settings.plugins.SpotifyControls.useSpotifyUris || isPluginEnabled(OpenInAppPlugin.name)
+            const url = settings.store.useSpotifyUris || isPluginEnabled(OpenInAppPlugin.name)
                 ? "spotify:" + path.replaceAll("/", (_, idx) => idx === 0 ? "" : ":")
                 : "https://open.spotify.com" + path;
 
diff --git a/src/equicordplugins/musicControls/spotify/spotifyStyles.css b/src/equicordplugins/musicControls/spotify/spotifyStyles.css
index 8f54fa623..d33f4fd47 100644
--- a/src/equicordplugins/musicControls/spotify/spotifyStyles.css
+++ b/src/equicordplugins/musicControls/spotify/spotifyStyles.css
@@ -70,7 +70,7 @@
     position: absolute;
     top: 50%;
     left: 50%;
-    transform: translate(-50%, -50%);
+    transform: translate(-55%, -50%);
 }
 
 .vc-spotify-button-row {
diff --git a/src/equicordplugins/musicControls/tidal/tidalStyles.css b/src/equicordplugins/musicControls/tidal/tidalStyles.css
index e5e840cb1..746f6c680 100644
--- a/src/equicordplugins/musicControls/tidal/tidalStyles.css
+++ b/src/equicordplugins/musicControls/tidal/tidalStyles.css
@@ -135,7 +135,7 @@
     position: absolute;
     top: 50%;
     left: 50%;
-    transform: translate(-50%, -50%);
+    transform: translate(-55%, -50%);
 }
 
 #eq-tdl-info-wrapper {
diff --git a/src/equicordplugins/neverPausePreviews/index.tsx b/src/equicordplugins/neverPausePreviews/index.tsx
index 3c237c788..d31b02048 100644
--- a/src/equicordplugins/neverPausePreviews/index.tsx
+++ b/src/equicordplugins/neverPausePreviews/index.tsx
@@ -23,6 +23,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "NeverPausePreviews",
     description: "Prevents in-call/PiP previews (screenshare, streams, etc) from pausing even if the client loses focus",
+    tags: ["Media"],
     authors: [EquicordDevs.vappstar],
     settingsAboutComponent: () => (
         <Notice.Warning>
diff --git a/src/equicordplugins/newPluginsManager/index.tsx b/src/equicordplugins/newPluginsManager/index.tsx
index 683d9de74..d4a340fc1 100644
--- a/src/equicordplugins/newPluginsManager/index.tsx
+++ b/src/equicordplugins/newPluginsManager/index.tsx
@@ -14,6 +14,7 @@ import { openNewPluginsModal } from "./NewPluginsModal";
 export default definePlugin({
     name: "NewPluginsManager",
     description: "Utility that notifies you when new plugins are added to Equicord",
+    tags: ["Utility"],
     authors: [Devs.Sqaaakoi],
     enabledByDefault: true,
     flux: {
diff --git a/src/equicordplugins/noNitroUpsell/index.ts b/src/equicordplugins/noNitroUpsell/index.ts
index d7b2eaf5d..cd3c2a665 100644
--- a/src/equicordplugins/noNitroUpsell/index.ts
+++ b/src/equicordplugins/noNitroUpsell/index.ts
@@ -10,7 +10,8 @@ import { OverridePremiumTypeStore } from "@webpack/common";
 
 export default definePlugin({
     name: "NoNitroUpsell",
-    description: "Removes ALL of Discord's nitro upsells by tricking the client into thinking you have nitro.",
+    description: "Removes all of Discord's nitro upsells by tricking the client into thinking you have nitro.",
+    tags: ["Utility"],
     authors: [Devs.thororen],
     flux: {
         CONNECTION_OPEN() {
diff --git a/src/equicordplugins/noPushToTalk/index.ts b/src/equicordplugins/noPushToTalk/index.ts
index ff5ee8682..fb2d922e8 100644
--- a/src/equicordplugins/noPushToTalk/index.ts
+++ b/src/equicordplugins/noPushToTalk/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "NoPushToTalk",
     description: "Bypasses the push-to-talk requirement for voice activity in channels that enforce it.",
+    tags: ["Servers", "Voice"],
     authors: [EquicordDevs.omaw],
     patches: [
         {
diff --git a/src/equicordplugins/noRPC.discordDesktop/index.ts b/src/equicordplugins/noRPC.discordDesktop/index.ts
index 51ed1f962..df2d409de 100644
--- a/src/equicordplugins/noRPC.discordDesktop/index.ts
+++ b/src/equicordplugins/noRPC.discordDesktop/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "NoRPC",
     description: "Disables Discord's RPC server.",
+    tags: ["Privacy", "Servers"],
     authors: [Devs.Cyn],
     patches: [
         {
diff --git a/src/equicordplugins/noRoleHeaders/index.ts b/src/equicordplugins/noRoleHeaders/index.ts
index 6b4a7d3a0..c008e9273 100644
--- a/src/equicordplugins/noRoleHeaders/index.ts
+++ b/src/equicordplugins/noRoleHeaders/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "NoRoleHeaders",
     description: "We are all equal!! Removes the role headers in the member list.",
+    tags: ["Appearance", "Fun", "Roles"],
     authors: [Devs.Samwich],
     patches: [
         {
diff --git a/src/equicordplugins/normalizeMessageLinks/index.ts b/src/equicordplugins/normalizeMessageLinks/index.ts
index 062f1ee44..6ee61a440 100644
--- a/src/equicordplugins/normalizeMessageLinks/index.ts
+++ b/src/equicordplugins/normalizeMessageLinks/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "NormalizeMessageLinks",
     description: "Strip canary/ptb from message links",
+    tags: ["Chat"],
     authors: [Devs.bb010g],
     patches: [
         {
diff --git a/src/equicordplugins/notificationTitle.discordDesktop/index.tsx b/src/equicordplugins/notificationTitle.discordDesktop/index.tsx
index 56d8b3fef..f2db23cac 100644
--- a/src/equicordplugins/notificationTitle.discordDesktop/index.tsx
+++ b/src/equicordplugins/notificationTitle.discordDesktop/index.tsx
@@ -20,6 +20,7 @@ const MessageTypes = findByPropsLazy("REPLY", "STAGE_RAISE_HAND", "CHANNEL_NAME_
 export default definePlugin({
     name: "NotificationTitle",
     description: "Makes desktop notifications more informative",
+    tags: ["Appearance", "Notifications"],
     authors: [Devs.Kyuuhachi],
 
     patches: [
diff --git a/src/equicordplugins/orbolayBridge/index.tsx b/src/equicordplugins/orbolayBridge/index.tsx
index 6c9863ee4..36d1a6ad5 100644
--- a/src/equicordplugins/orbolayBridge/index.tsx
+++ b/src/equicordplugins/orbolayBridge/index.tsx
@@ -314,6 +314,7 @@ const createWebsocket = () => {
 export default definePlugin({
     name: "OrbolayBridge",
     description: "Bridge plugin to connect Orbolay to Discord",
+    tags: ["Utility", "Voice"],
     authors: [EquicordDevs.SpikeHD],
     settings,
     flux: {
diff --git a/src/equicordplugins/partyMode/index.ts b/src/equicordplugins/partyMode/index.ts
index f7cddbf97..8641257ad 100644
--- a/src/equicordplugins/partyMode/index.ts
+++ b/src/equicordplugins/partyMode/index.ts
@@ -44,6 +44,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "PartyMode",
     description: "Allows you to use party mode cause the party never ends ✨",
+    tags: ["Fun"],
     authors: [Devs.UwUDev],
     reporterTestable: ReporterTestable.None,
     settings,
diff --git a/src/equicordplugins/pendingFriendRequest/index.tsx b/src/equicordplugins/pendingFriendRequest/index.tsx
new file mode 100644
index 000000000..43c5f6942
--- /dev/null
+++ b/src/equicordplugins/pendingFriendRequest/index.tsx
@@ -0,0 +1,94 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { NavContextMenuPatchCallback } from "@api/ContextMenu";
+import { EquicordDevs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { RelationshipType } from "@vencord/discord-types/enums";
+import { findByPropsLazy } from "@webpack";
+import { Menu, RelationshipStore } from "@webpack/common";
+
+const RelationshipActions = findByPropsLazy("cancelFriendRequest", "addRelationship");
+
+function isOutgoingFriendRequest(userId: string) {
+    return RelationshipStore.getRelationshipType(userId) === RelationshipType.OUTGOING_REQUEST;
+}
+
+function cancelOutgoingFriendRequest(userId: string) {
+    if (!isOutgoingFriendRequest(userId)) return;
+    return RelationshipActions.cancelFriendRequest(userId);
+}
+
+const userContextPatch: NavContextMenuPatchCallback = (children, { user }) => {
+    if (!user || !isOutgoingFriendRequest(user.id)) return;
+
+    children.push(
+        <Menu.MenuItem
+            id="vc-cancel-outgoing-friend-request"
+            label="Cancel Outgoing Friend Request"
+            action={() => cancelOutgoingFriendRequest(user.id)}
+        />
+    );
+};
+
+export default definePlugin({
+    name: "CancelFriendRequest",
+    description: "Adds a way to cancel outgoing friend requests from profiles.",
+    authors: [EquicordDevs.omaw],
+
+    contextMenus: {
+        "user-profile-overflow-menu": userContextPatch
+    },
+
+    patches: [
+        {
+            find: "#{intl::rQSndv::raw}",
+            replacement: {
+                match: /variant:"primary",.{0,50}#{intl::ADD_FRIEND_BUTTON_AFTER}\)/,
+                replace: "...$self.getCancelFriendRequestTextButtonProps(arguments[0].user.id)"
+            }
+        },
+        {
+            find: "#{intl::FRIENDS_REQUEST_STATUS_OUTGOING}",
+            group: true,
+            replacement: [
+                {
+                    match: /(?<=\i=\{icon:(\i),.{0,100}\.\.\.\i)(?=\};return 0===)/g,
+                    replace: ",...$self.getCancelFriendRequestIconButtonProps(arguments[0],$1)"
+                },
+                {
+                    match: /disabled:!0(?=.{0,25}targetElementRef:)/g,
+                    replace: "disabled:!$self.isOutgoingButton(arguments[0])"
+                }
+            ]
+        }
+    ],
+
+    isOutgoingButton({ relationshipType, hasOutgoingPendingGameFriends }) {
+        return relationshipType === RelationshipType.OUTGOING_REQUEST || hasOutgoingPendingGameFriends === true;
+    },
+
+    getCancelFriendRequestTextButtonProps(userId: string) {
+        return {
+            variant: "critical-secondary",
+            onClick: () => cancelOutgoingFriendRequest(userId),
+            text: "Cancel Outgoing Friend Request"
+        };
+    },
+
+    getCancelFriendRequestIconButtonProps(context, Icon) {
+        if (!this.isOutgoingButton(context)) return {};
+
+        return {
+            "aria-label": "Cancel Outgoing Friend Request",
+            disabled: false,
+            icon: Icon ? (iconProps: Record<string, unknown>) => <Icon {...iconProps} color="var(--status-danger)" /> : undefined,
+            tooltipText: "Cancel Outgoing Friend Request",
+            variant: "critical-secondary",
+            onClick: () => cancelOutgoingFriendRequest(context?.user?.id)
+        };
+    }
+});
diff --git a/src/equicordplugins/pinIcon/index.tsx b/src/equicordplugins/pinIcon/index.tsx
index 1e6f5987f..d44edfe8f 100644
--- a/src/equicordplugins/pinIcon/index.tsx
+++ b/src/equicordplugins/pinIcon/index.tsx
@@ -25,6 +25,7 @@ const PinIcon = findComponentByCodeLazy("1-.06-.63L6.16");
 export default definePlugin({
     name: "PinIcon",
     description: "Adds a pin icon to pinned messages",
+    tags: ["Appearance", "Chat"],
     authors: [EquicordDevs.iamme],
     patches: [
         {
diff --git a/src/equicordplugins/pingNotifications/index.tsx b/src/equicordplugins/pingNotifications/index.tsx
index e6b0e45e2..1d96249b5 100644
--- a/src/equicordplugins/pingNotifications/index.tsx
+++ b/src/equicordplugins/pingNotifications/index.tsx
@@ -92,6 +92,7 @@ function isUserBlocked(userId) {
 export default definePlugin({
     name: "PingNotifications",
     description: "Customizable notifications with improved mention formatting",
+    tags: ["Chat", "Friends", "Notifications", "Servers"],
     authors: [EquicordDevs.smuki],
     settings,
 
diff --git a/src/equicordplugins/platformSpoofer/index.tsx b/src/equicordplugins/platformSpoofer/index.tsx
index aab45545a..00a773a2b 100644
--- a/src/equicordplugins/platformSpoofer/index.tsx
+++ b/src/equicordplugins/platformSpoofer/index.tsx
@@ -52,6 +52,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "PlatformSpoofer",
     description: "Spoof what platform or device you're on",
+    tags: ["Utility"],
     authors: [EquicordDevs.Drag, EquicordDevs.neoarz],
     settingsAboutComponent: () => (
         <Notice.Warning>
@@ -62,16 +63,22 @@ export default definePlugin({
     patches: [
         {
             find: "_doIdentify(){",
-            replacement: {
-                match: /(\[IDENTIFY\].*let.{0,5}=\{.*properties:)(.*),presence/,
-                replace: "$1{...$2,...$self.getPlatform(true)},presence"
-            }
+            replacement: [
+                {
+                    match: /window._ws=null,null!=\i/,
+                    replace: "false"
+                },
+                {
+                    match: /(?<="GatewaySocket"\)\}\),properties:)(\i)/,
+                    replace: "{...$1,...$self.getPlatform(true)}"
+                },
+            ]
         },
         {
-            find: '("AppSkeleton");',
+            find: ".ORBS,label:",
             replacement: {
-                match: /(?<=\.isPlatformEmbedded.{0,50}\i\)\)\}.{0,30})\i\?\i\.\i\.set\(.{0,10}:/,
-                replace: ""
+                match: /\{enabled:(\i).{0,25}"collectibles_shop_header_bar"\}\)/,
+                replace: "$1=true"
             }
         }
     ],
diff --git a/src/equicordplugins/polishWording/index.ts b/src/equicordplugins/polishWording/index.ts
index 57f925901..2f8f6d33c 100644
--- a/src/equicordplugins/polishWording/index.ts
+++ b/src/equicordplugins/polishWording/index.ts
@@ -64,6 +64,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "PolishWording",
     description: "Tweaks your messages to make them look nicer and have better grammar. See settings",
+    dependencies: ["MessageEventsAPI"],
+    tags: ["Chat"],
     authors: [Devs.Samwich, EquicordDevs.WKoA],
     onBeforeMessageSend: presendObject,
     settings,
diff --git a/src/equicordplugins/profileSets/index.tsx b/src/equicordplugins/profileSets/index.tsx
index a2db97aa4..c474658b1 100644
--- a/src/equicordplugins/profileSets/index.tsx
+++ b/src/equicordplugins/profileSets/index.tsx
@@ -29,13 +29,14 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "ProfileSets",
     description: "Allows you to save and load different profile presets, via the Profile Section in Settings.",
+    tags: ["Appearance", "Customisation", "Utility"],
     authors: [EquicordDevs.omaw, EquicordDevs.justjxke],
     settings,
     patches: [
         {
             find: "DefaultCustomizationSections: user cannot be undefined",
             replacement: {
-                match: /return.{0,50}children:\[(?<=\.getLegacyUsername\(\).*?)/,
+                match: /return.{0,50}children:\[(?=.{0,50},\{placeholder:)/,
                 replace: "$&$self.renderPresetSection(\"main\"),"
             }
         },
diff --git a/src/equicordplugins/questify/components/questButton.tsx b/src/equicordplugins/questify/components/questButton.tsx
new file mode 100644
index 000000000..41c07ea06
--- /dev/null
+++ b/src/equicordplugins/questify/components/questButton.tsx
@@ -0,0 +1,368 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { plugins } from "@api/PluginManager";
+import { ErrorBoundary } from "@components/index";
+import { findComponentByCodeLazy } from "@webpack";
+import { ContextMenuApi, Menu, NavigationRouter, useState } from "@webpack/common";
+import type { CSSProperties, JSX, MouseEvent } from "react";
+
+import { getQuestifySettings, useQuestifySettings } from "../settings/access";
+import type { QuestButtonAction, QuestButtonDisplayMode, QuestButtonIndicatorMode } from "../settings/def";
+import { getIgnoredQuestIDs, ignoreAllQuests, resetIgnoredQuests } from "../settings/ignoredQuests";
+import { initialQuestDataFetched } from "../state";
+import { fetchAndAlertQuests } from "../utils/fetching";
+import { decimalToRGB, formatLowerBadge, isDarkish, leftClick, middleClick, q, QUEST_PAGE, rightClick } from "../utils/ui";
+import { openQuestifySettingsModal } from "./settingsModal";
+
+const GuildlessServerListItemComponent = findComponentByCodeLazy("tooltip:", "lowerBadgeSize:");
+const ServerListItemPillComponent = findComponentByCodeLazy('"pill":"empty"');
+const ServerListItemLowerBadgeComponent = findComponentByCodeLazy("BADGE_NOTIFICATION_BACKGROUND", "let{count:");
+
+interface QuestButtonLowerBadgeProps {
+    count: number;
+    color?: string;
+    style?: CSSProperties;
+    maxDigits?: number;
+}
+
+interface QuestButtonViewProps {
+    id: string;
+    className: string;
+    badgeProps: QuestButtonLowerBadgeProps;
+    hasUnread: boolean;
+    selected: boolean;
+    visible: boolean;
+    onPress: (event: MouseEvent<Element>) => void;
+}
+
+export function QuestIcon(height: number, width: number, className?: string): JSX.Element {
+    return (
+        <svg
+            viewBox="0 0 24 24"
+            height={height}
+            width={width}
+            fill="none"
+            className={className}
+        >
+            <path fill="currentColor" d="M7.5 21.7a8.95 8.95 0 0 1 9 0 1 1 0 0 0 1-1.73c-.6-.35-1.24-.64-1.9-.87.54-.3 1.05-.65 1.52-1.07a3.98 3.98 0 0 0 5.49-1.8.77.77 0 0 0-.24-.95 3.98 3.98 0 0 0-2.02-.76A4 4 0 0 0 23 10.47a.76.76 0 0 0-.71-.71 4.06 4.06 0 0 0-1.6.22 3.99 3.99 0 0 0 .54-5.35.77.77 0 0 0-.95-.24c-.75.36-1.37.95-1.77 1.67V6a4 4 0 0 0-4.9-3.9.77.77 0 0 0-.6.72 4 4 0 0 0 3.7 4.17c.89 1.3 1.3 2.95 1.3 4.51 0 3.66-2.75 6.5-6 6.5s-6-2.84-6-6.5c0-1.56.41-3.21 1.3-4.51A4 4 0 0 0 11 2.82a.77.77 0 0 0-.6-.72 4.01 4.01 0 0 0-4.9 3.96A4.02 4.02 0 0 0 3.73 4.4a.77.77 0 0 0-.95.24 3.98 3.98 0 0 0 .55 5.35 4 4 0 0 0-1.6-.22.76.76 0 0 0-.72.71l-.01.28a4 4 0 0 0 2.65 3.77c-.75.06-1.45.33-2.02.76-.3.22-.4.62-.24.95a4 4 0 0 0 5.49 1.8c.47.42.98.78 1.53 1.07-.67.23-1.3.52-1.91.87a1 1 0 1 0 1 1.73Z" />
+        </svg>
+    );
+}
+
+function splitClassNames(className: string): string[] {
+    const classNames = className.split(/\s+/).filter(Boolean);
+
+    return classNames.length ? classNames : [q("quest-button")];
+}
+
+function suffixClassNames(classNames: string[], suffix: string): string {
+    return classNames.map(className => `${className}-${suffix}`).join(" ");
+}
+
+function QuestButtonLowerBadge(props: QuestButtonLowerBadgeProps & { className: string; }): JSX.Element {
+    return <ServerListItemLowerBadgeComponent {...props} />;
+}
+
+function QuestButtonView({
+    id,
+    className,
+    badgeProps,
+    hasUnread,
+    selected,
+    visible,
+    onPress,
+}: QuestButtonViewProps): JSX.Element {
+    const [hovered, setHovered] = useState(false);
+    const baseClasses = splitClassNames(className);
+    const mainContainerClass = suffixClassNames(baseClasses, "container");
+    const iconContainerClass = suffixClassNames(baseClasses, "icon-container");
+    const buttonContainerClass = suffixClassNames(baseClasses, "server-list-button-container");
+    const pillContainerClass = suffixClassNames(baseClasses, "pill-container");
+    const buttonClass = suffixClassNames(baseClasses, "button");
+    const pillClass = suffixClassNames(baseClasses, "pill");
+    const lowerBadgeClass = suffixClassNames(baseClasses, "lower-badge");
+    const lowerBadgeSize = { width: formatLowerBadge(badgeProps.count, badgeProps.maxDigits)[1] };
+    const lowerBadge = badgeProps.count === 0
+        ? null
+        : (
+            <QuestButtonLowerBadge
+                {...badgeProps}
+                className={lowerBadgeClass}
+                style={{ ...(badgeProps.style ?? {}), ...lowerBadgeSize }}
+            />
+        );
+    const icon = (
+        <div className={iconContainerClass}>
+            {QuestIcon(26, 26)}
+        </div>
+    );
+
+    return (
+        <ErrorBoundary>
+            {visible && (
+                <div id={id} className={mainContainerClass}>
+                    <div className={pillContainerClass}>
+                        <ServerListItemPillComponent
+                            unread={hasUnread}
+                            selected={selected}
+                            hovered={hovered}
+                            className={`${pillClass}${selected ? " selected" : hovered ? " hovered" : ""}`}
+                        />
+                    </div>
+                    <div className={buttonContainerClass}>
+                        <GuildlessServerListItemComponent
+                            icon={() => icon}
+                            tooltip="Quests"
+                            showPill={false}
+                            selected={selected}
+                            className={buttonClass}
+                            onClick={onPress}
+                            onMouseDown={onPress}
+                            onContextMenu={onPress}
+                            onMouseEnter={() => setHovered(true)}
+                            onMouseLeave={() => setHovered(false)}
+                            {...(lowerBadge ? { lowerBadge, lowerBadgeSize } : {})}
+                        />
+                    </div>
+                </div>
+            )}
+        </ErrorBoundary>
+    );
+}
+
+export function showQuestButton(displayMode: QuestButtonDisplayMode, badgeCount: number, isOnQuestsPage: boolean): boolean {
+    return displayMode !== "never" && (displayMode === "always" || badgeCount > 0 || isOnQuestsPage);
+}
+
+export function disguiseHomeButton(pathname: string): boolean {
+    const buttonSettings = useQuestifySettings(["questButtonDisplay", "questButtonBadgeCount", "isOnQuestsPage"]);
+
+    if (!showQuestButton(buttonSettings.questButtonDisplay, buttonSettings.questButtonBadgeCount, buttonSettings.isOnQuestsPage)) {
+        return false;
+    }
+
+    return pathname === QUEST_PAGE;
+}
+
+function resolveQuestButtonAction(
+    event: MouseEvent<Element>,
+    leftAction: QuestButtonAction,
+    middleAction: QuestButtonAction,
+    rightAction: QuestButtonAction,
+): QuestButtonAction | null {
+    if (event.button === middleClick) {
+        return middleAction;
+    }
+
+    if (event.button === rightClick) {
+        return rightAction;
+    }
+
+    if (event.button === leftClick) {
+        return leftAction;
+    }
+
+    return null;
+}
+
+function getQuestButtonLowerBadgeProps(
+    badgeCount: number,
+    indicatorMode: QuestButtonIndicatorMode,
+    badgeColor: number | null,
+): QuestButtonLowerBadgeProps {
+    const resolvedColor = badgeColor === null ? null : decimalToRGB(badgeColor);
+
+    return {
+        count: indicatorMode === "badge" || indicatorMode === "both" ? badgeCount : 0,
+        maxDigits: 2,
+        ...(resolvedColor
+            ? { color: `rgb(${resolvedColor.r}, ${resolvedColor.g}, ${resolvedColor.b})` }
+            : {}),
+        ...(resolvedColor
+            ? { style: { color: isDarkish(resolvedColor) ? "white" : "black" } }
+            : {}),
+    };
+}
+
+export function QuestButtonContextMenu({ dummy = false }: { dummy?: boolean; }): JSX.Element {
+    const navId = q(dummy ? "dummy-quest-button-context-menu" : "quest-button-context-menu");
+    const markAllIgnoredDisabled = dummy || getQuestifySettings().questButtonBadgeCount <= 0;
+    const resetIgnoredDisabled = dummy || getIgnoredQuestIDs().length <= 0;
+    const fetchQuestsDisabled = dummy;
+
+    return (
+        <Menu.Menu
+            navId={navId}
+            onClose={ContextMenuApi.closeContextMenu}
+            aria-label="Quest Button Menu"
+        >
+            <Menu.MenuItem
+                id={q(`${navId}-mark-all-ignored`)}
+                label="Mark All Ignored"
+                action={ignoreAllQuests}
+                disabled={markAllIgnoredDisabled}
+            />
+            <Menu.MenuItem
+                id={q(`${navId}-reset-ignored-list`)}
+                label="Reset Ignored List"
+                action={resetIgnoredQuests}
+                disabled={resetIgnoredDisabled}
+            />
+            <Menu.MenuItem
+                id={q(`${navId}-fetch-quests`)}
+                label="Fetch Quests"
+                action={() => { void fetchAndAlertQuests("MANUAL_FETCH"); }}
+                disabled={fetchQuestsDisabled}
+            />
+        </Menu.Menu>
+    );
+}
+
+export function QuestButton(): JSX.Element {
+    const {
+        isOnQuestsPage,
+        questButtonBadgeColor,
+        questButtonDisplay,
+        questButtonBadgeCount,
+        questButtonLeftClickAction,
+        questButtonMiddleClickAction,
+        questButtonRightClickAction,
+        questButtonIndicator,
+    } = useQuestifySettings([
+        "isOnQuestsPage",
+        "questButtonBadgeColor",
+        "questButtonDisplay",
+        "questButtonBadgeCount",
+        "questButtonLeftClickAction",
+        "questButtonMiddleClickAction",
+        "questButtonRightClickAction",
+        "questButtonIndicator",
+    ]);
+
+    const staleData = !initialQuestDataFetched;
+    const badgeColor = questButtonBadgeColor;
+    const badgeCount = staleData ? 0 : questButtonBadgeCount;
+    const onQuestsPage = staleData ? false : isOnQuestsPage;
+    const displayMode = questButtonDisplay as QuestButtonDisplayMode;
+    const leftClickAction = questButtonLeftClickAction as QuestButtonAction;
+    const middleClickAction = questButtonMiddleClickAction as QuestButtonAction;
+    const rightClickAction = questButtonRightClickAction as QuestButtonAction;
+    const indicatorMode = questButtonIndicator as QuestButtonIndicatorMode;
+
+    const lowerBadgeProps = getQuestButtonLowerBadgeProps(badgeCount, indicatorMode, badgeColor);
+    const hasUnread = indicatorMode === "pill" || indicatorMode === "both";
+    const isVisible = showQuestButton(displayMode, badgeCount, onQuestsPage);
+
+    function handlePress(event: MouseEvent<Element>): void {
+        // List items do not support onAuxClick, so middle-click is handled on mousedown.
+        if (event.type === "mousedown" && event.button !== middleClick) {
+            return;
+        }
+
+        event.preventDefault();
+        event.stopPropagation();
+
+        const action = resolveQuestButtonAction(
+            event,
+            leftClickAction,
+            middleClickAction,
+            rightClickAction,
+        );
+
+        if (action === "open-quests") {
+            NavigationRouter.transitionTo(QUEST_PAGE);
+
+            return;
+        }
+
+        if (action === "plugin-settings") {
+            openQuestifySettingsModal(plugins.Questify);
+
+            return;
+        }
+
+        if (action === "context-menu") {
+            ContextMenuApi.openContextMenu(event, () => <QuestButtonContextMenu />);
+        }
+    }
+
+    return (
+        <QuestButtonView
+            id={q("quest-button")}
+            className={q("quest-button")}
+            selected={onQuestsPage}
+            visible={isVisible}
+            hasUnread={badgeCount > 0 && hasUnread}
+            badgeProps={lowerBadgeProps}
+            onPress={handlePress}
+        />
+    );
+}
+
+export interface DummyQuestButtonProps {
+    badgeColor: number | null;
+    leftClickAction: QuestButtonAction;
+    middleClickAction: QuestButtonAction;
+    rightClickAction: QuestButtonAction;
+    showBadge: boolean;
+    showPill: boolean;
+    visible: boolean;
+}
+
+export function DummyQuestButton({
+    badgeColor,
+    leftClickAction,
+    middleClickAction,
+    rightClickAction,
+    showBadge,
+    showPill,
+    visible,
+}: DummyQuestButtonProps): JSX.Element {
+    const badgeCount = showBadge ? 3 : 0;
+    const indicatorMode = showBadge ? (showPill ? "both" : "badge") : (showPill ? "pill" : "none");
+    const lowerBadgeProps = getQuestButtonLowerBadgeProps(badgeCount, indicatorMode, badgeColor);
+    const [dummySelected, setDummySelected] = useState(false);
+
+    function handlePress(event: MouseEvent<Element>): void {
+        // List items do not support onAuxClick, so middle-click is handled on mousedown.
+        if (event.type === "mousedown" && event.button !== middleClick) {
+            return;
+        }
+
+        event.preventDefault();
+        event.stopPropagation();
+
+        const action = resolveQuestButtonAction(
+            event,
+            leftClickAction,
+            middleClickAction,
+            rightClickAction,
+        );
+
+        if (action === "open-quests") {
+            setDummySelected(!dummySelected);
+
+            return;
+        }
+
+        if (action === "context-menu") {
+            ContextMenuApi.openContextMenu(event, () => <QuestButtonContextMenu dummy={true} />);
+        }
+    }
+
+    return (
+        <QuestButtonView
+            id={q("dummy-quest-button")}
+            className={q("dummy-quest-button", "quest-button")}
+            selected={dummySelected}
+            visible={visible}
+            hasUnread={showPill}
+            badgeProps={lowerBadgeProps}
+            onPress={handlePress}
+        />
+    );
+}
diff --git a/src/equicordplugins/questify/components/questButtonSettings.tsx b/src/equicordplugins/questify/components/questButtonSettings.tsx
new file mode 100644
index 000000000..6378bc130
--- /dev/null
+++ b/src/equicordplugins/questify/components/questButtonSettings.tsx
@@ -0,0 +1,276 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { QuestRewardType, QuestTaskType } from "@vencord/discord-types/enums";
+import type { JSX } from "react";
+
+import { getQuestifySettings, useQuestifySettings } from "../settings/access";
+import { type QuestButtonAction, type QuestButtonDisplayMode, type QuestButtonIncludedTypes, type QuestButtonIndicatorMode } from "../settings/def";
+import { startAutoFetchingQuests } from "../settings/fetching";
+import { validateIgnoredQuests } from "../settings/ignoredQuests";
+import { canShowBadge, canShowButton, canShowPill } from "../utils/ui";
+import { DummyQuestButton } from "./questButton";
+import { type ManaSelectOption, SettingsCard, SettingsColorPicker, SettingsDescription, SettingsHeader, SettingsRow, SettingsRowItem, SettingsSelect, SettingsSubheader } from "./shared";
+
+interface QuestButtonIncludedTypeOption {
+    label: string;
+    value: QuestTaskType | QuestRewardType;
+}
+
+const questButtonDisplayOptions = [
+    { label: "Always", value: "always" },
+    { label: "Unclaimed", value: "unclaimed" },
+    { label: "Never", value: "never" },
+] as const satisfies readonly { label: string; value: QuestButtonDisplayMode; }[];
+
+const questButtonIndicatorOptions = [
+    { label: "Pill", value: "pill" },
+    { label: "Badge", value: "badge" },
+    { label: "Both", value: "both" },
+    { label: "None", value: "none" },
+] as const satisfies readonly { label: string; value: QuestButtonIndicatorMode; }[];
+
+const questButtonClickOptions = [
+    { label: "Open Quests", value: "open-quests" },
+    { label: "Context Menu", value: "context-menu" },
+    { label: "Plugin Settings", value: "plugin-settings" },
+    { label: "Nothing", value: "nothing" },
+] as const satisfies readonly { label: string; value: QuestButtonAction; }[];
+
+const questButtonRewardTypeOptions = [
+    { label: "Orbs", value: QuestRewardType.VIRTUAL_CURRENCY },
+    { label: "Nitro Codes", value: QuestRewardType.FRACTIONAL_PREMIUM },
+    { label: "Reward Codes", value: QuestRewardType.REWARD_CODE },
+    { label: "In Game Items", value: QuestRewardType.IN_GAME },
+    { label: "Profile Collectibles", value: QuestRewardType.COLLECTIBLE },
+] as const satisfies readonly QuestButtonIncludedTypeOption[];
+
+const questButtonQuestTypeOptions = [
+    { label: "Watch Video", value: QuestTaskType.WATCH_VIDEO },
+    { label: "Watch Video on Mobile", value: QuestTaskType.WATCH_VIDEO_ON_MOBILE },
+    { label: "Achievement in Activity", value: QuestTaskType.ACHIEVEMENT_IN_ACTIVITY },
+    { label: "Achievement in Game", value: QuestTaskType.ACHIEVEMENT_IN_GAME },
+    { label: "Play Activity", value: QuestTaskType.PLAY_ACTIVITY },
+    { label: "Play on Desktop", value: QuestTaskType.PLAY_ON_DESKTOP },
+    { label: "Play on Desktop V2", value: QuestTaskType.PLAY_ON_DESKTOP_V2 },
+    { label: "Stream on Desktop", value: QuestTaskType.STREAM_ON_DESKTOP },
+    { label: "Play on PlayStation", value: QuestTaskType.PLAY_ON_PLAYSTATION },
+    { label: "Play on Xbox", value: QuestTaskType.PLAY_ON_XBOX },
+] as const satisfies readonly QuestButtonIncludedTypeOption[];
+
+function toManaOptions<T extends string | number>(options: readonly { label: string; value: T; }[]): ManaSelectOption[] {
+    return options.map(({ label, value }) => ({
+        id: String(value),
+        label,
+        value: String(value),
+    }));
+}
+
+const questButtonDisplayManaOptions = toManaOptions(questButtonDisplayOptions);
+const questButtonIndicatorManaOptions = toManaOptions(questButtonIndicatorOptions);
+const questButtonClickManaOptions = toManaOptions(questButtonClickOptions);
+const questButtonRewardTypeManaOptions = toManaOptions(questButtonRewardTypeOptions);
+const questButtonQuestTypeManaOptions = toManaOptions(questButtonQuestTypeOptions);
+
+export function QuestButtonSetting(): JSX.Element {
+    const questButton = useQuestifySettings([
+        "disableQuestsEverything",
+        "questButtonDisplay",
+        "questButtonIncludedTypes",
+        "questButtonIndicator",
+        "questButtonBadgeCount",
+        "questButtonBadgeColor",
+        "questButtonLeftClickAction",
+        "questButtonMiddleClickAction",
+        "questButtonRightClickAction",
+    ]);
+
+    const disabled = questButton.disableQuestsEverything;
+    const includedTypes = questButton.questButtonIncludedTypes as QuestButtonIncludedTypes;
+
+    const selectedRewardTypes = questButtonRewardTypeOptions
+        .filter(({ value }) => includedTypes[value])
+        .map(({ value }) => String(value));
+
+    const selectedQuestTypes = questButtonQuestTypeOptions
+        .filter(({ value }) => includedTypes[value])
+        .map(({ value }) => String(value));
+
+    function updateQuestButtonDisplay(value: string | string[] | null) {
+        if (typeof value !== "string") return;
+
+        getQuestifySettings().questButtonDisplay = value as QuestButtonDisplayMode;
+        startAutoFetchingQuests(true);
+    }
+
+    function updateQuestButtonIndicator(value: string | string[] | null) {
+        if (typeof value !== "string") return;
+
+        getQuestifySettings().questButtonIndicator = value as QuestButtonIndicatorMode;
+        startAutoFetchingQuests(true);
+    }
+
+    function updateQuestButtonAction(key: "questButtonLeftClickAction" | "questButtonMiddleClickAction" | "questButtonRightClickAction", value: string | string[] | null) {
+        if (typeof value !== "string") return;
+
+        getQuestifySettings()[key] = value as QuestButtonAction;
+    }
+
+    function updateBadgeColor(value: number | null) {
+        getQuestifySettings().questButtonBadgeColor = value;
+    }
+
+    function updateIncludedTypes(options: readonly QuestButtonIncludedTypeOption[], value: string | string[] | null) {
+        const selectedValues = new Set(Array.isArray(value) ? value : value ? [value] : []);
+        const nextIncludedTypes = { ...getQuestifySettings().questButtonIncludedTypes };
+
+        for (const option of options) {
+            nextIncludedTypes[option.value] = selectedValues.has(String(option.value));
+        }
+
+        getQuestifySettings().questButtonIncludedTypes = nextIncludedTypes;
+        validateIgnoredQuests();
+    }
+
+    return (
+        <SettingsCard>
+            <SettingsRow>
+                <SettingsRowItem>
+                    <SettingsHeader> Quest Button </SettingsHeader>
+                    <SettingsDescription> Show a Quest Button in the server list with an optional indicator for unclaimed and unignored Quests. </SettingsDescription>
+                </SettingsRowItem>
+                <SettingsRowItem width="content">
+                    <DummyQuestButton
+                        badgeColor={questButton.questButtonBadgeColor}
+                        leftClickAction={questButton.questButtonLeftClickAction}
+                        middleClickAction={questButton.questButtonMiddleClickAction}
+                        rightClickAction={questButton.questButtonRightClickAction}
+                        showBadge={canShowBadge(questButton.questButtonIndicator)}
+                        showPill={canShowPill(questButton.questButtonIndicator)}
+                        visible={canShowButton(questButton.questButtonDisplay)}
+                    />
+                </SettingsRowItem>
+            </SettingsRow>
+            <SettingsSubheader className="no-top-margin"> Button Behavior </SettingsSubheader>
+            <SettingsRow>
+                <SettingsRowItem>
+                    <SettingsSelect
+                        label="Left Click Action:"
+                        options={questButtonClickManaOptions}
+                        value={questButton.questButtonLeftClickAction}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        onSelectionChange={value => updateQuestButtonAction("questButtonLeftClickAction", value)}
+                    />
+                </SettingsRowItem>
+                <SettingsRowItem>
+                    <SettingsSelect
+                        label="Middle Click Action:"
+                        options={questButtonClickManaOptions}
+                        value={questButton.questButtonMiddleClickAction}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        onSelectionChange={value => updateQuestButtonAction("questButtonMiddleClickAction", value)}
+                    />
+                </SettingsRowItem>
+                <SettingsRowItem>
+                    <SettingsSelect
+                        label="Right Click Action:"
+                        options={questButtonClickManaOptions}
+                        value={questButton.questButtonRightClickAction}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        onSelectionChange={value => updateQuestButtonAction("questButtonRightClickAction", value)}
+                    />
+                </SettingsRowItem>
+            </SettingsRow>
+            <SettingsRow>
+                <SettingsRowItem>
+                    <SettingsSelect
+                        label="Button Visibility:"
+                        options={questButtonDisplayManaOptions}
+                        value={questButton.questButtonDisplay}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        onSelectionChange={updateQuestButtonDisplay}
+                        tooltip={{
+                            position: "top",
+                            text: "Always shows the Quest Button whenever this feature is enabled."
+                                + "\n\nUnclaimed only shows it while you have relevant unclaimed Quest rewards."
+                                + "\n\nNever hides the Quest Button."
+                        }}
+                    />
+                </SettingsRowItem>
+                <SettingsRowItem>
+                    <SettingsSelect
+                        label="Unclaimed Indicator:"
+                        options={questButtonIndicatorManaOptions}
+                        value={questButton.questButtonIndicator}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        onSelectionChange={updateQuestButtonIndicator}
+                        tooltip={{
+                            position: "top",
+                            text: "Pill shows Discord's unread-style marker beside the Quest Button."
+                                + "\n\nBadge shows the number of relevant unclaimed Quest rewards."
+                                + "\n\nBoth shows the pill and badge together."
+                                + "\n\nNone hides unclaimed indicators."
+                        }}
+                    />
+                </SettingsRowItem>
+                <SettingsRowItem>
+                    <SettingsColorPicker
+                        label="Badge Color:"
+                        className="quest-button-color-picker"
+                        color={questButton.questButtonBadgeColor}
+                        disabled={disabled}
+                        onChange={updateBadgeColor}
+                        showEyeDropper={true}
+                    />
+                </SettingsRowItem>
+            </SettingsRow>
+            <SettingsSubheader> Quest Relevancy </SettingsSubheader>
+            <SettingsSelect
+                label="Included Reward Types:"
+                wrapTags={true}
+                options={questButtonRewardTypeManaOptions}
+                value={selectedRewardTypes}
+                closeOnSelect={false}
+                maxOptionsVisible={questButtonRewardTypeManaOptions.length}
+                selectionMode="multiple"
+                disabled={disabled}
+                fullWidth={true}
+                onSelectionChange={value => updateIncludedTypes(questButtonRewardTypeOptions, value)}
+                tooltip={{
+                    position: "top",
+                    text: "Only count Quests with these reward types as unclaimed when determining button visibility, badge count, and alert behavior."
+                }}
+            />
+            <SettingsSelect
+                label="Included Quest Types:"
+                labelClassName="margin-top-9"
+                wrapTags={true}
+                options={questButtonQuestTypeManaOptions}
+                value={selectedQuestTypes}
+                closeOnSelect={false}
+                maxOptionsVisible={questButtonQuestTypeManaOptions.length}
+                selectionMode="multiple"
+                disabled={disabled}
+                fullWidth={true}
+                onSelectionChange={value => updateIncludedTypes(questButtonQuestTypeOptions, value)}
+                tooltip={{
+                    position: "top",
+                    text: "Only count Quests with these task types as unclaimed when determining button visibility, badge count, and alert behavior."
+                }}
+            />
+        </SettingsCard>
+    );
+}
diff --git a/src/equicordplugins/questify/components/questFeaturesSetting.tsx b/src/equicordplugins/questify/components/questFeaturesSetting.tsx
new file mode 100644
index 000000000..d540a6930
--- /dev/null
+++ b/src/equicordplugins/questify/components/questFeaturesSetting.tsx
@@ -0,0 +1,366 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { QuestTaskType } from "@vencord/discord-types/enums";
+import type { JSX } from "react";
+
+import { getQuestifySettings, useQuestifySettings } from "../settings/access";
+import { autoCompleteQuestTaskTypes, defaultAllowChangingDangerousSettings, defaultAutoCompleteQuestsSimultaneously, defaultAutoCompleteQuestTypes, defaultCompleteVideoQuestsQuicker, defaultMakeMobileVideoQuestsDesktopCompatible, defaultResumeInterruptedQuests, isDesktopCompatible } from "../settings/def";
+import { Alerts, q } from "../utils/ui";
+import { ManaButton, type ManaSelectOption, SettingsCard, SettingsDescription, SettingsHeader, SettingsNotice, SettingsParagraph, SettingsSelect, SettingsSubheader, SettingsSubtleSwitch } from "./shared";
+
+type QuestDisableSettingKey =
+    | "disableAccountPanelPromo"
+    | "disableAccountPanelQuestProgress"
+    | "disableFriendsListPromo"
+    | "disableMembersListPromo"
+    | "disableOrbsAndQuestsBadges"
+    | "disableRelocationNotices"
+    | "disableSponsoredBanner";
+
+type QuestModifySettingKey =
+    | "autoCompleteQuestsSimultaneously"
+    | "resumeInterruptedQuests"
+    | "completeVideoQuestsQuicker"
+    | "makeMobileVideoQuestsDesktopCompatible";
+
+interface QuestDisableOption {
+    key: QuestDisableSettingKey;
+    label: string;
+}
+
+const disableFeatureOptions = [
+    {
+        key: "disableSponsoredBanner",
+        label: "Sponsored Banner",
+    },
+    {
+        key: "disableRelocationNotices",
+        label: "Relocation Notices",
+    },
+    {
+        key: "disableFriendsListPromo",
+        label: "Friends List Promo",
+    },
+    {
+        key: "disableMembersListPromo",
+        label: "Members List Promo",
+    },
+    {
+        key: "disableAccountPanelPromo",
+        label: "Account Panel Promo",
+    },
+    {
+        key: "disableAccountPanelQuestProgress",
+        label: "Account Panel Progress",
+    },
+    {
+        key: "disableOrbsAndQuestsBadges",
+        label: "Quest & Orbs Badges",
+    },
+] as const satisfies readonly QuestDisableOption[];
+
+const disableManaOptions: ManaSelectOption[] = disableFeatureOptions.map(({ key, label }) => ({
+    id: key,
+    label,
+    value: key,
+}));
+
+const autoCompleteQuestTypeLabels = {
+    [QuestTaskType.WATCH_VIDEO]: "Watch Video",
+    [QuestTaskType.WATCH_VIDEO_ON_MOBILE]: "Watch Video on Mobile",
+    [QuestTaskType.ACHIEVEMENT_IN_ACTIVITY]: "Achievement in Activity",
+    [QuestTaskType.PLAY_ACTIVITY]: "Play Activity",
+    [QuestTaskType.PLAY_ON_DESKTOP]: "Play on Desktop",
+    [QuestTaskType.PLAY_ON_PLAYSTATION]: "Play on PlayStation",
+    [QuestTaskType.PLAY_ON_XBOX]: "Play on Xbox",
+} as const satisfies Record<typeof autoCompleteQuestTaskTypes[number], string>;
+
+const autoCompleteQuestTypeOptions = autoCompleteQuestTaskTypes.map(questType => ({
+    label: autoCompleteQuestTypeLabels[questType],
+    value: questType,
+})) satisfies { label: string; value: QuestTaskType; }[];
+
+const autoCompleteQuestTypeManaOptions: ManaSelectOption[] = autoCompleteQuestTypeOptions.map(({ label, value }) => ({
+    id: String(value),
+    label,
+    value: String(value),
+    disabled: !isDesktopCompatible(value),
+}));
+
+interface SettingsAllowDangerousButtonProps {
+    allowed: boolean;
+    disabled?: boolean;
+    onClick?: (e: React.MouseEvent) => void;
+}
+
+function SettingsAllowDangerousButton({
+    allowed,
+    disabled,
+    onClick,
+}: SettingsAllowDangerousButtonProps): JSX.Element {
+    return (
+        <div className={q("settings-button", "allow-dangerous-button")}>
+            <ManaButton
+                text={allowed
+                    ? "Reset and disallow changing dangerous settings..."
+                    : "Allow changing dangerous settings..."}
+                variant={allowed ? "critical-secondary" : "critical-primary"}
+                fullWidth={true}
+                disabled={disabled}
+                onClick={onClick}
+                size="sm"
+            />
+        </div>
+    );
+}
+
+export function QuestFeaturesSetting(): JSX.Element {
+    const questFeatures = useQuestifySettings([
+        "disableQuestsEverything",
+        "disableSponsoredBanner",
+        "disableRelocationNotices",
+        "disableFriendsListPromo",
+        "disableMembersListPromo",
+        "disableAccountPanelPromo",
+        "disableAccountPanelQuestProgress",
+        "disableOrbsAndQuestsBadges",
+        "resumeInterruptedQuests",
+        "allowChangingDangerousSettings",
+        "makeMobileVideoQuestsDesktopCompatible",
+        "autoCompleteQuestsSimultaneously",
+        "autoCompleteQuestTypes",
+        "completeVideoQuestsQuicker",
+    ]);
+
+    const selectedDisableValues = disableFeatureOptions
+        .filter(({ key }) => questFeatures[key])
+        .map(({ key }) => key);
+
+    const selectedAutoCompleteQuestTypeValues = autoCompleteQuestTypeOptions
+        .filter(({ value }) => isDesktopCompatible(value) && questFeatures.autoCompleteQuestTypes[value] === true)
+        .map(({ value }) => String(value));
+
+    function updateDisableValue(value: string | string[] | null) {
+        const selectedKeys = new Set(Array.isArray(value) ? value : value ? [value] : []);
+
+        for (const { key } of disableFeatureOptions) {
+            getQuestifySettings()[key] = selectedKeys.has(key);
+        }
+    }
+
+    function confirmDangerousSettingChange(body: string, onConfirm: () => void) {
+        Alerts.show({
+            title: "Are you sure?",
+            body,
+            confirmText: "Continue",
+            confirmVariant: "critical-primary",
+            cancelText: "Cancel",
+            onConfirm,
+        });
+    }
+
+    function updateAutoCompleteQuestTypes(value: string | string[] | null) {
+        const selectedValues = new Set(Array.isArray(value) ? value : value ? [value] : []);
+        const nextAutoCompleteQuestTypes = { ...defaultAutoCompleteQuestTypes };
+
+        for (const { value: questType } of autoCompleteQuestTypeOptions) {
+            const nextValue = selectedValues.has(String(questType))
+                && isDesktopCompatible(questType);
+
+            nextAutoCompleteQuestTypes[questType] = nextValue;
+        }
+
+        getQuestifySettings().autoCompleteQuestTypes = nextAutoCompleteQuestTypes;
+    }
+
+    function updateDisableEverything(checked: boolean) {
+        function setDisableEverything() {
+            getQuestifySettings().disableQuestsEverything = checked;
+        }
+
+        if (checked) {
+            confirmDangerousSettingChange(
+                "This will completely disable Quest functionality.",
+                () => {
+                    resetDangerousSettings();
+                    setDisableEverything();
+                }
+            );
+        } else {
+            setDisableEverything();
+        }
+    }
+
+    function resetDangerousSettings() {
+        const settings = getQuestifySettings();
+
+        settings.allowChangingDangerousSettings = defaultAllowChangingDangerousSettings;
+        settings.autoCompleteQuestsSimultaneously = defaultAutoCompleteQuestsSimultaneously;
+        settings.completeVideoQuestsQuicker = defaultCompleteVideoQuestsQuicker;
+        settings.makeMobileVideoQuestsDesktopCompatible = defaultMakeMobileVideoQuestsDesktopCompatible;
+        settings.resumeInterruptedQuests = defaultResumeInterruptedQuests;
+        settings.autoCompleteQuestTypes = { ...defaultAutoCompleteQuestTypes };
+    }
+
+    function updateDangerousAccess(checked: boolean) {
+        function setDangerousAccess() {
+            getQuestifySettings().allowChangingDangerousSettings = checked;
+        }
+
+        if (checked) {
+            confirmDangerousSettingChange(
+                "This will allow changing dangerous settings.",
+                setDangerousAccess
+            );
+        } else {
+            resetDangerousSettings();
+            setDangerousAccess();
+        }
+    }
+
+    function updateModifyValue(key: QuestModifySettingKey, checked: boolean) {
+        getQuestifySettings()[key] = checked;
+    }
+
+    return (
+        <SettingsCard>
+            <SettingsHeader> Quest Features </SettingsHeader>
+            <SettingsDescription> Modify how Quests behave to enhance or remove functionality. </SettingsDescription>
+            <SettingsSubheader> Disable Features </SettingsSubheader>
+            <SettingsSubtleSwitch
+                checked={questFeatures.disableQuestsEverything}
+                label="Completely disable Quest functionality:"
+                onChange={updateDisableEverything}
+                bottomSpacing="10"
+                tooltip={{
+                    position: "top",
+                    text: "This will disable all plugin enhancements, hide the Quests page and Quest elements across Discord, and prevent Discord from fetching Quest data. This will not affect the shop as Orbs are too intrinsically tied to it as a secondary currency."
+                }}
+            />
+            <SettingsSelect
+                label="Disable specific features:"
+                wrapTags={true}
+                options={disableManaOptions}
+                value={selectedDisableValues}
+                closeOnSelect={false}
+                maxOptionsVisible={7}
+                selectionMode="multiple"
+                disabled={questFeatures.disableQuestsEverything}
+                onSelectionChange={updateDisableValue}
+                tooltip={{
+                    position: "top",
+                    text: "Sponsored Banner is a paid-for Quest banner at the top of the Quests page."
+                        + "\n\nRelocation Notices are indicators such as in the Discovery page about Quests moving to DMs."
+                        + "\n\nFriends List Promo is a card that displays on the \"Active Now\" section of your Friends List while a user you share a server with is playing a game with an active Quest."
+                        + "\n\nMembers List Promo is an icon that displays on members in a server's Members List while they are playing a game with an active Quest."
+                        + "\n\nAccount Panel Promo is a paid-for Quest promotion that appears above your user account panel."
+                        + "\n\nAccount Panel Progress is the active or completed Quest progress shown above your user account panel."
+                        + "\n\nQuest & Orbs Badges are badges on user profiles for when someone has completed at least one Quest or bought the Orbs badge respectively."
+                }}
+            />
+            <SettingsSubheader> Modify Features </SettingsSubheader>
+            <SettingsNotice className={["notice-card-red", questFeatures.disableQuestsEverything ? "dimmed-settings-item" : undefined, questFeatures.allowChangingDangerousSettings ? undefined : "notice-card-solo", "no-bottom-margin"].filter(c => c !== undefined)}>
+                <SettingsParagraph>
+                    Discord has began issuing warnings to users of scripts or plugins that modify how Quests are completed, which is against their <a href="https://discord.com/safety/platform-manipulation-policy-explainer" target="_blank" rel="noreferrer">Terms of Service</a>.
+                </SettingsParagraph>
+                <br />
+                <SettingsParagraph>
+                    The warnings appear limited to threat of loss of access to Quests or their rewards, but Discord may escalate at any time.
+                </SettingsParagraph>
+                <br />
+                <SettingsParagraph>
+                    Due to the various methods Discord uses to track users, there's no way to realistically evade detection. If you proceed, understand that Discord likely will detect it at some point.
+                </SettingsParagraph>
+                <br />
+                <SettingsParagraph>
+                    Use the following toggle to access potentially dangerous settings at your own risk.
+                </SettingsParagraph>
+                <SettingsAllowDangerousButton
+                    allowed={questFeatures.allowChangingDangerousSettings}
+                    disabled={questFeatures.disableQuestsEverything}
+                    onClick={() => updateDangerousAccess(!questFeatures.allowChangingDangerousSettings)}
+                />
+                {questFeatures.allowChangingDangerousSettings && <>
+                    <SettingsSubtleSwitch
+                        disabled={questFeatures.disableQuestsEverything || !questFeatures.allowChangingDangerousSettings}
+                        checked={questFeatures.completeVideoQuestsQuicker}
+                        label="Accelerate Video Quest auto-completion:"
+                        onChange={checked => updateModifyValue("completeVideoQuestsQuicker", checked)}
+                        topSpacing="10"
+                        bottomSpacing="5"
+                        tooltip={{
+                            position: "top",
+                            text: "Discord allows Video Quests to be completed once 24 seconds less than the duration of the video has passed since you enrolled into the Quest."
+                                + "\n\nThis means that if a Video Quest is 24 seconds or less, or if you enroll in a Video Quest and return later to complete it, it can be completed immediately."
+                                + "\n\nThis setting will only apply to auto-completing Video Quests and relies on the auto-complete setting below. Manually completing Video Quests will still require waiting the full duration and is not dependent on enrollment time."
+                        }}
+                    />
+                    <SettingsSubtleSwitch
+                        disabled={questFeatures.disableQuestsEverything || !questFeatures.allowChangingDangerousSettings}
+                        checked={questFeatures.makeMobileVideoQuestsDesktopCompatible}
+                        label="Make some mobile-only Video Quests completable on desktop:"
+                        onChange={checked => updateModifyValue("makeMobileVideoQuestsDesktopCompatible", checked)}
+                        bottomSpacing="5"
+                        tooltip={{
+                            position: "top",
+                            text: "Some mobile-only Video Quests can be enrolled in on desktop, but still must be completed on mobile. This setting will allow those to be completed on desktop."
+                                + "\n\nSome mobile-only Video Quests are only enrollable on mobile. For this setting to affect those, you must enroll in those Quests on your mobile device before returning to desktop and refreshing your Quests."
+                                + "\n\nThis setting, when enabled independently, applies only to manually completing Video Quests. Auto-completing mobile Video Quests from desktop relies on the auto-complete setting below, and will implicitly enable this setting as well."
+                        }}
+                    />
+                    <SettingsSubtleSwitch
+                        disabled={questFeatures.disableQuestsEverything || !questFeatures.allowChangingDangerousSettings}
+                        checked={questFeatures.autoCompleteQuestsSimultaneously}
+                        label="Auto-complete Quests simultaneously rather than sequentially:"
+                        onChange={checked => updateModifyValue("autoCompleteQuestsSimultaneously", checked)}
+                        bottomSpacing="5"
+                        tooltip={{
+                            position: "top",
+                            text: "By default, attempting to auto-complete multiple Quests will queue them to be completed in order."
+                                + "\n\nThis setting will alternatively allow all auto-complete Quests to run at the same time."
+                                + "\n\nThis setting will only apply to auto-completing Quests and relies on the auto-complete setting below."
+                        }}
+                    />
+                    <SettingsSubtleSwitch
+                        disabled={questFeatures.disableQuestsEverything || !questFeatures.allowChangingDangerousSettings}
+                        checked={questFeatures.resumeInterruptedQuests}
+                        label="Resume interrupted auto-completions after a reload or restart:"
+                        onChange={checked => updateModifyValue("resumeInterruptedQuests", checked)}
+                        bottomSpacing="5"
+                        tooltip={{
+                            position: "top",
+                            text: "This setting will automatically resume any interrupted auto-completions caused by reloads or restarts, including requeuing Quests which had yet to start auto-completing but had been queued."
+                        }}
+                    />
+                    <SettingsSelect
+                        label="Auto-complete specific Quest types:"
+                        labelClassName="margin-top-9"
+                        wrapTags={true}
+                        options={autoCompleteQuestTypeManaOptions}
+                        value={selectedAutoCompleteQuestTypeValues}
+                        closeOnSelect={false}
+                        maxOptionsVisible={7}
+                        selectionMode="multiple"
+                        disabled={questFeatures.disableQuestsEverything || !questFeatures.allowChangingDangerousSettings}
+                        onSelectionChange={updateAutoCompleteQuestTypes}
+                        tooltip={{
+                            position: "top",
+                            wider: true,
+                            text: "Watch Video on Mobile Quests will only work on mobile Quests which are enrollable on desktop. If a Quest is locked to enrollment on mobile, you must first enroll in it on your mobile device before returning to desktop and refreshing your Quests."
+                                + "\n\nAll video related Quests usually send a stack trace with the progress reports. This means Discord would know exactly which functions were called, and can therefore verify that their own functions initiated the progress. Questify erases this stack trace, but the absence of it will be just as telling as its presence."
+                                + "\n\nPlay on Desktop, Play on PlayStation, Play on Xbox, and Play Activity Quests are only available on official desktop clients due to a limitation imposed by Discord. 3rd party clients such as web extensions, Vesktop, Equibop, and others, do not support auto-completing these Quest types."
+                                + "\n\nAll game related Quests usually send a game fingerprint with the heartbeat reports. This means Discord can use data from tens of thousands of users to determine whether other users are likely using a real game or are emulating the executable. There is no reasonable method to spoof this value, so Questify leaves it blank, but the absence of it will be just as telling as poorly spoofing the value."
+                                + "\n\nAchievement in Activity Quests can only be auto-completed by completing them immediately. This method may be patched at any time."
+                                + "\n\nAuto-completing Quests is done by clicking their respective buttons on the Quests page. Quests will be auto-completed in the order they were queued, unless the simultaneous completion setting is enabled above."
+                                + "\n\nAuto-completing Quests is the riskiest dangerous setting available. Enable it at your own risk."
+                        }}
+                    />
+                </>}
+            </SettingsNotice>
+        </SettingsCard>
+    );
+}
diff --git a/src/equicordplugins/questify/components/questNotificationsSetting.tsx b/src/equicordplugins/questify/components/questNotificationsSetting.tsx
new file mode 100644
index 000000000..3a834eb02
--- /dev/null
+++ b/src/equicordplugins/questify/components/questNotificationsSetting.tsx
@@ -0,0 +1,336 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { type AudioPlayerInterface, createAudioPlayer, defaultAudioNames } from "@api/AudioPlayer";
+import { useEffect, useMemo, useRef, useState } from "@webpack/common";
+import type { JSX, MouseEvent } from "react";
+
+import { getQuestifySettings, useQuestifySettings } from "../settings/access";
+import { startAutoFetchingQuests } from "../settings/fetching";
+import { q } from "../utils/ui";
+import { ManaSelectFormattedOption, ManaSelectOption, SettingsCard, SettingsDescription, SettingsHeader, SettingsRow, SettingsRowItem, SettingsSelect, SettingsSlider, SettingsSubheader, SettingsSubtleSwitch } from "./shared";
+
+const questFetchIntervalOptions = [
+    { id: "30-minutes", label: "30 Minutes", value: String(30 * 60) },
+    { id: "45-minutes", label: "45 Minutes", value: String(45 * 60) },
+    { id: "1-hour", label: "1 Hour", value: String(60 * 60) },
+    { id: "3-hours", label: "3 Hours", value: String(3 * 60 * 60) },
+    { id: "6-hours", label: "6 Hours", value: String(6 * 60 * 60) },
+    { id: "12-hours", label: "12 Hours", value: String(12 * 60 * 60) },
+] satisfies ManaSelectOption[];
+
+function SoundIcon({ className }: { className?: string; }): JSX.Element {
+    return (
+        <svg
+            viewBox="0 0 24 24"
+            height={18}
+            width={18}
+            fill="none"
+            className={className}
+            aria-hidden={true}
+        >
+            <path fill="currentColor" d="M12 3a1 1 0 0 0-1-1h-.06a1 1 0 0 0-.74.32L5.92 7H3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h2.92l4.28 4.68a1 1 0 0 0 .74.32H11a1 1 0 0 0 1-1V3ZM15.1 20.75c-.58.14-1.1-.33-1.1-.92v-.03c0-.5.37-.92.85-1.05a7 7 0 0 0 0-13.5A1.11 1.11 0 0 1 14 4.2v-.03c0-.6.52-1.06 1.1-.92a9 9 0 0 1 0 17.5Z" />
+            <path fill="currentColor" d="M15.16 16.51c-.57.28-1.16-.2-1.16-.83v-.14c0-.43.28-.8.63-1.02a3 3 0 0 0 0-5.04c-.35-.23-.63-.6-.63-1.02v-.14c0-.63.59-1.1 1.16-.83a5 5 0 0 1 0 9.02Z" />
+        </svg>
+    );
+}
+
+function getSoundOptions(): ManaSelectOption[] {
+    return defaultAudioNames()
+        .map(sound => ({
+            id: sound,
+            label: formatSoundName(sound),
+            value: sound,
+        }))
+        .sort((a, b) => a.label.localeCompare(b.label));
+}
+
+function formatSoundName(sound: string): string {
+    return sound
+        .toUpperCase()
+        .replace(/_/g, " ")
+        .replace(/(\d+)/g, " $1");
+}
+
+interface QuestNotificationSoundSelectProps {
+    disabled?: boolean;
+    label: string;
+    onChange: (value: string | null) => void;
+    onPreview: (sound: string) => void;
+    options: ManaSelectOption[];
+    playingSound: string | null;
+    tooltip?: { position: "top" | "bottom", text: string; };
+    value: string | null;
+}
+
+function QuestNotificationSoundSelect({
+    disabled,
+    label,
+    onChange,
+    onPreview,
+    options,
+    playingSound,
+    tooltip,
+    value,
+}: QuestNotificationSoundSelectProps): JSX.Element {
+    function formatOption(option: ManaSelectOption): ManaSelectFormattedOption {
+        const sound = option.value || null;
+        const isPlaying = sound != null && playingSound === sound;
+
+        function handlePreviewMouseDown(event: MouseEvent<HTMLButtonElement>) {
+            event.preventDefault();
+            event.stopPropagation();
+        }
+
+        function handlePreviewClick(event: MouseEvent<HTMLButtonElement>) {
+            event.preventDefault();
+            event.stopPropagation();
+
+            if (sound && !disabled) {
+                onPreview(sound);
+            }
+        }
+
+        return {
+            ...option,
+            trailing: sound
+                ? (
+                    <button
+                        type="button"
+                        className={q("sound-preview-button", isPlaying ? "playing-audio" : undefined)}
+                        aria-label={`Preview ${option.label}`}
+                        disabled={disabled}
+                        onMouseDown={handlePreviewMouseDown}
+                        onClick={handlePreviewClick}
+                    >
+                        <SoundIcon />
+                    </button>
+                )
+                : undefined,
+        };
+    }
+
+    return (
+        <SettingsSelect
+            label={label}
+            options={options}
+            value={value}
+            selectionMode="single"
+            disabled={disabled}
+            clearable={true}
+            fullWidth={true}
+            maxOptionsVisible={7}
+            placeholder="DISABLED"
+            selectClassName="sound-select"
+            formatOption={formatOption}
+            tooltip={tooltip}
+            onSelectionChange={nextValue => {
+                if (nextValue != null && typeof nextValue !== "string") return;
+
+                onChange(nextValue ?? null);
+            }}
+        />
+    );
+}
+
+export function QuestNotificationsSetting(): JSX.Element {
+    const questNotifications = useQuestifySettings([
+        "newExcludedQuestAlertSound",
+        "newExcludedQuestAlertVolume",
+        "newQuestAlertSound",
+        "newQuestAlertVolume",
+        "questFetchInterval",
+        "disableQuestsEverything",
+        "notifyOnNewExcludedQuests",
+        "notifyOnNewQuests",
+        "notifyOnQuestComplete",
+        "questCompletedAlertSound",
+        "questCompletedAlertVolume",
+    ]);
+
+    const soundOptions = useMemo(getSoundOptions, []);
+    const activePlayer = useRef<AudioPlayerInterface | null>(null);
+    const [playingSound, setPlayingSound] = useState<string | null>(null);
+    const disabled = questNotifications.disableQuestsEverything;
+
+    function clearActivePlayer(): void {
+        const player = activePlayer.current;
+        activePlayer.current = null;
+        player?.stop();
+        setPlayingSound(null);
+    }
+
+    function previewSound(sound: string, volume: number): void {
+        if (playingSound === sound) {
+            clearActivePlayer();
+
+            return;
+        }
+
+        clearActivePlayer();
+        const player = createAudioPlayer(sound, { volume: Math.max(0, Math.min(100, volume)), onEnded: clearActivePlayer });
+        activePlayer.current = player;
+        setPlayingSound(sound);
+        player?.play();
+    }
+
+    useEffect(() => clearActivePlayer, []);
+    useEffect(() => {
+        if (disabled) {
+            clearActivePlayer();
+        }
+    }, [disabled]);
+
+    function updateFetchInterval(value: string | string[] | null): void {
+        if (value != null && typeof value !== "string") return;
+
+        const interval = value == null ? 0 : Number(value);
+        getQuestifySettings().questFetchInterval = interval;
+        startAutoFetchingQuests(true);
+    }
+
+    return (
+        <SettingsCard>
+            <SettingsHeader> Quest Notifications </SettingsHeader>
+            <SettingsDescription>Configure Quest completed and new Quest detected notifications and alerts. </SettingsDescription>
+            <SettingsSubheader> Quest Completed </SettingsSubheader>
+            <SettingsSubtleSwitch
+                checked={questNotifications.notifyOnQuestComplete}
+                disabled={disabled}
+                label="Show a notification when a Quest is completed:"
+                onChange={checked => { getQuestifySettings().notifyOnQuestComplete = checked; }}
+                bottomSpacing="5"
+            />
+            <SettingsRow>
+                <SettingsRowItem className="sound-select-row-item">
+                    <QuestNotificationSoundSelect
+                        label="Play a sound when a Quest is completed:"
+                        disabled={disabled}
+                        options={soundOptions}
+                        value={questNotifications.questCompletedAlertSound}
+                        playingSound={playingSound}
+                        onPreview={sound => previewSound(sound, questNotifications.questCompletedAlertVolume)}
+                        onChange={value => { getQuestifySettings().questCompletedAlertSound = value; }}
+                    />
+                </SettingsRowItem>
+                <SettingsRowItem className="volume-slider-row-item">
+                    <SettingsSlider
+                        label="Volume:"
+                        className="inline-volume-slider"
+                        disabled={disabled}
+                        value={questNotifications.questCompletedAlertVolume}
+                        onChange={value => { getQuestifySettings().questCompletedAlertVolume = value; }}
+                    />
+                </SettingsRowItem>
+            </SettingsRow>
+            <SettingsSubheader> New Quests Detected </SettingsSubheader>
+            <SettingsSubtleSwitch
+                checked={questNotifications.notifyOnNewQuests}
+                disabled={disabled}
+                label="Show a notification when new Quests are detected:"
+                bottomSpacing="5"
+                onChange={checked => {
+                    getQuestifySettings().notifyOnNewQuests = checked;
+                    startAutoFetchingQuests(true);
+                }}
+            />
+            <SettingsRow>
+                <SettingsRowItem className="sound-select-row-item">
+                    <QuestNotificationSoundSelect
+                        label="Play a sound when new Quests are detected:"
+                        disabled={disabled}
+                        options={soundOptions}
+                        value={questNotifications.newQuestAlertSound}
+                        playingSound={playingSound}
+                        onPreview={sound => previewSound(sound, questNotifications.newQuestAlertVolume)}
+                        onChange={value => {
+                            getQuestifySettings().newQuestAlertSound = value;
+                            startAutoFetchingQuests(true);
+                        }}
+                    />
+                </SettingsRowItem>
+                <SettingsRowItem className="volume-slider-row-item">
+                    <SettingsSlider
+                        label="Volume:"
+                        className="inline-volume-slider"
+                        disabled={disabled}
+                        value={questNotifications.newQuestAlertVolume}
+                        onChange={value => { getQuestifySettings().newQuestAlertVolume = value; }}
+                    />
+                </SettingsRowItem>
+            </SettingsRow>
+            <SettingsSubtleSwitch
+                className="margin-top-14"
+                checked={questNotifications.notifyOnNewExcludedQuests}
+                disabled={disabled}
+                label="Show a notification when new excluded Quests are detected:"
+                bottomSpacing="5"
+                onChange={checked => {
+                    getQuestifySettings().notifyOnNewExcludedQuests = checked;
+                    startAutoFetchingQuests(true);
+                }}
+                tooltip={{
+                    position: "top",
+                    text: "Some Quests are excluded from your available Quests list due to region or platform restrictions."
+                        + "\n\nWhen enabled, Questify will fetch their Quest configs, apply your included Quest and reward type filters, print the resolved excluded Quest data to console, and show a separate notification for matching excluded Quests."
+                }}
+            />
+            <SettingsRow>
+                <SettingsRowItem className="sound-select-row-item">
+                    <QuestNotificationSoundSelect
+                        label="Play a sound when new excluded Quests are detected:"
+                        disabled={disabled}
+                        options={soundOptions}
+                        value={questNotifications.newExcludedQuestAlertSound}
+                        playingSound={playingSound}
+                        onPreview={sound => previewSound(sound, questNotifications.newExcludedQuestAlertVolume)}
+                        onChange={value => {
+                            getQuestifySettings().newExcludedQuestAlertSound = value;
+                            startAutoFetchingQuests(true);
+                        }}
+                        tooltip={{
+                            position: "top",
+                            text: "Some Quests are excluded from your available Quests list due to region or platform restrictions."
+                                + "\n\nWhen a sound is selected, Questify will fetch their Quest configs, apply your included Quest and reward type filters, print the resolved excluded Quest data to console, and play this sound for matching excluded Quests."
+                        }}
+                    />
+                </SettingsRowItem>
+                <SettingsRowItem className="volume-slider-row-item">
+                    <SettingsSlider
+                        label="Volume:"
+                        className="inline-volume-slider"
+                        disabled={disabled}
+                        value={questNotifications.newExcludedQuestAlertVolume}
+                        onChange={value => { getQuestifySettings().newExcludedQuestAlertVolume = value; }}
+                    />
+                </SettingsRowItem>
+            </SettingsRow>
+            <SettingsRow>
+                <SettingsRowItem>
+                    <SettingsSelect
+                        className="margin-top-12"
+                        label="Quest Fetch Interval:"
+                        options={questFetchIntervalOptions}
+                        value={questNotifications.questFetchInterval > 0 ? String(questNotifications.questFetchInterval) : null}
+                        selectionMode="single"
+                        disabled={disabled}
+                        clearable={true}
+                        fullWidth={true}
+                        placeholder="DISABLED"
+                        maxOptionsVisible={questFetchIntervalOptions.length}
+                        onSelectionChange={updateFetchInterval}
+                        tooltip={{
+                            position: "top",
+                            text: "Discord only fetches Quests on load and when you visit the Quests page."
+                                + "\n\nThis interval periodically fetches Quests for you while the client stays open, so Quest Button indicators and new Quest alerts can stay up to date throughout the day."
+                                + "\n\nThis only runs if enabled and if the Quest Button or Quest Notifications settings are configured in a way which makes fetching periodically meaningful."
+                        }}
+                    />
+                </SettingsRowItem>
+            </SettingsRow>
+        </SettingsCard>
+    );
+}
diff --git a/src/equicordplugins/questify/components/questTileContextMenu.tsx b/src/equicordplugins/questify/components/questTileContextMenu.tsx
new file mode 100644
index 000000000..ec1cb048f
--- /dev/null
+++ b/src/equicordplugins/questify/components/questTileContextMenu.tsx
@@ -0,0 +1,81 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { copyToClipboard } from "@utils/index";
+import type { Quest } from "@vencord/discord-types";
+import { Menu } from "@webpack/common";
+import type { ReactNode } from "react";
+
+import { addIgnoredQuest, questIsIgnored, removeIgnoredQuest } from "../settings/ignoredQuests";
+import { rerenderQuests } from "../settings/rerender";
+import { canAutoCompleteQuest, getQuestAutoCompleteEntry, processQuestForAutoComplete, stopQuestAutoComplete } from "../utils/completion";
+import { q } from "../utils/ui";
+
+export function QuestTileContextMenu(
+    children: ReactNode[],
+    props: { quest?: Quest; },
+    isClaimedMenu: boolean = false,
+): void {
+    const { quest } = props;
+
+    if (!quest) {
+        return;
+    }
+
+    const isIgnored = questIsIgnored(quest.id);
+    const isEnrolled = Boolean(quest.userStatus?.enrolledAt);
+    const isAutoCompleting = getQuestAutoCompleteEntry(quest) != null;
+    const canStartAutoComplete = !isClaimedMenu && isEnrolled && canAutoCompleteQuest(quest);
+
+    children.unshift((
+        <Menu.MenuGroup>
+            {!isClaimedMenu && (!isIgnored ? (
+                <Menu.MenuItem
+                    id={q("ignore-quest")}
+                    label="Mark as Ignored"
+                    action={() => addIgnoredQuest(quest.id)}
+                />
+            ) : (
+                <Menu.MenuItem
+                    id={q("unignore-quest")}
+                    label="Unmark as Ignored"
+                    action={() => removeIgnoredQuest(quest.id)}
+                />
+            ))}
+            {isAutoCompleting ? (
+                <Menu.MenuItem
+                    id={q("stop-auto-complete")}
+                    label="Stop Auto-Complete"
+                    action={() => {
+                        stopQuestAutoComplete(quest, {
+                            manual: true,
+                            preserveResume: false,
+                            terminalHeartbeat: true,
+                        });
+                        rerenderQuests();
+                    }}
+                />
+            ) : canStartAutoComplete ? (
+                <Menu.MenuItem
+                    id={q("start-auto-complete")}
+                    label="Start Auto-Complete"
+                    action={() => {
+                        processQuestForAutoComplete(quest, {
+                            force: true,
+                            source: "manual",
+                        });
+                        rerenderQuests();
+                    }}
+                />
+            ) : null}
+            <Menu.MenuItem
+                id={q("copy-quest-id")}
+                label="Copy Quest ID"
+                action={() => copyToClipboard(quest.id)}
+            />
+        </Menu.MenuGroup>
+    ));
+}
diff --git a/src/equicordplugins/questify/components/questTilesSetting.tsx b/src/equicordplugins/questify/components/questTilesSetting.tsx
new file mode 100644
index 000000000..b0d51b0c7
--- /dev/null
+++ b/src/equicordplugins/questify/components/questTilesSetting.tsx
@@ -0,0 +1,330 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { Quest } from "@vencord/discord-types";
+import { findComponentByCodeLazy } from "@webpack";
+import { QuestStore, useEffect, useMemo, useRef, useState, useStateFromStores } from "@webpack/common";
+import type { JSX, SyntheticEvent } from "react";
+
+import { getQuestifySettings, useQuestifySettings } from "../settings/access";
+import { defaultQuestTileClaimedColorSetting, defaultQuestTileExpiredColorSetting, defaultQuestTileIgnoredColorSetting, defaultQuestTileUnclaimedColorSetting, type QuestTileColorSetting, type QuestTileGradient } from "../settings/def";
+import { rerenderQuests } from "../settings/rerender";
+import { getQuestTileClasses, getQuestTileStyle } from "../utils/questTiles";
+import { q } from "../utils/ui";
+import { ManaButton, type ManaSelectOption, SettingsCard, SettingsColorPicker, SettingsDescription, SettingsHeader, SettingsRow, SettingsRowItem, SettingsSelect, SettingsSubheader } from "./shared";
+
+const QuestTile = findComponentByCodeLazy(".rowIndex,trackGuildAndChannelMetadata") as React.ComponentType<{
+    className?: string;
+    quest: Quest;
+}>;
+
+const gradientOptions = [
+    { label: "Intense Restyle Gradient", value: "intense" },
+    { label: "Default Restyle Gradient", value: "default" },
+    { label: "Subtle Black Gradient", value: "black" },
+    { label: "No Gradient", value: "hide" },
+] as const satisfies readonly { label: string, value: QuestTileGradient; }[];
+
+const gradientManaOptions: ManaSelectOption[] = gradientOptions.map(({ label, value }) => ({
+    id: value,
+    label,
+    value,
+}));
+
+const preloadManaOptions: ManaSelectOption[] = [
+    { id: "true", label: "Load All Quest Assets On Page Load", value: "true" },
+    { id: "false", label: "Load Quest Assets During Page Scroll", value: "false" },
+];
+
+type QuestTileColorKey =
+    | "questTileUnclaimedColor"
+    | "questTileClaimedColor"
+    | "questTileIgnoredColor"
+    | "questTileExpiredColor";
+
+interface QuestTileColorOption {
+    key: QuestTileColorKey;
+    label: string;
+    defaultValue: QuestTileColorSetting;
+}
+
+const colorOptions = [
+    {
+        key: "questTileUnclaimedColor",
+        label: "Unclaimed",
+        defaultValue: defaultQuestTileUnclaimedColorSetting,
+    },
+    {
+        key: "questTileClaimedColor",
+        label: "Claimed",
+        defaultValue: defaultQuestTileClaimedColorSetting,
+    },
+    {
+        key: "questTileIgnoredColor",
+        label: "Ignored",
+        defaultValue: defaultQuestTileIgnoredColorSetting,
+    },
+    {
+        key: "questTileExpiredColor",
+        label: "Expired",
+        defaultValue: defaultQuestTileExpiredColorSetting,
+    },
+] as const satisfies readonly QuestTileColorOption[];
+
+const defaultPreviewColorKey: QuestTileColorKey = "questTileUnclaimedColor";
+
+function getRandomQuest(): Quest | null {
+    const quests = Array.from(QuestStore.quests.values());
+    return quests.length > 0 ? quests[Math.floor(Math.random() * quests.length)] : null;
+}
+
+function cloneDummyQuest(quest: Quest, dummyColor: QuestTileColorSetting): Quest & { dummyColor: QuestTileColorSetting; } {
+    return {
+        ...structuredClone(quest),
+        dummyColor,
+    };
+}
+
+function stopDummyQuestInteraction(event: SyntheticEvent): void {
+    event.preventDefault();
+    event.stopPropagation();
+    event.nativeEvent.stopImmediatePropagation();
+}
+
+function DummyQuestTile({
+    disabled,
+    dummyQuest,
+    dummyGradient,
+}: {
+    disabled?: boolean;
+    dummyQuest: Quest & { dummyColor: QuestTileColorSetting; };
+    dummyGradient: QuestTileGradient;
+}): JSX.Element {
+    const blockerRef = useRef<HTMLDivElement>(null);
+    const classes = getQuestTileClasses(q("dummy-quest"), dummyQuest, dummyGradient);
+    const style = getQuestTileStyle(dummyQuest);
+
+    useEffect(() => {
+        const blocker = blockerRef.current;
+
+        if (!blocker) return;
+
+        const eventNames = [
+            "auxclick",
+            "click",
+            "contextmenu",
+            "dblclick",
+            "dragstart",
+            "mousedown",
+            "mouseup",
+            "pointercancel",
+            "pointerdown",
+            "pointerup",
+        ];
+
+        function stopEvent(event: Event) {
+            event.preventDefault();
+            event.stopPropagation();
+            event.stopImmediatePropagation();
+        }
+
+        for (const eventName of eventNames) {
+            blocker.addEventListener(eventName, stopEvent, true);
+        }
+
+        return () => {
+            for (const eventName of eventNames) {
+                blocker.removeEventListener(eventName, stopEvent, true);
+            }
+        };
+    }, []);
+
+    return (
+        <div
+            ref={blockerRef}
+            className={q("dummy-quest-preview", disabled ? "dimmed-settings-item" : undefined)}
+            style={style}
+            onAuxClickCapture={stopDummyQuestInteraction}
+            onClickCapture={stopDummyQuestInteraction}
+            onContextMenuCapture={stopDummyQuestInteraction}
+            onDoubleClickCapture={stopDummyQuestInteraction}
+            onDragStartCapture={stopDummyQuestInteraction}
+            onMouseDownCapture={stopDummyQuestInteraction}
+            onMouseUpCapture={stopDummyQuestInteraction}
+            onPointerCancelCapture={stopDummyQuestInteraction}
+            onPointerDownCapture={stopDummyQuestInteraction}
+            onPointerUpCapture={stopDummyQuestInteraction}
+        >
+            <QuestTile
+                className={classes}
+                quest={dummyQuest}
+            />
+        </div>
+    );
+}
+
+function DummyQuestPreview({
+    disabled,
+    dummyColor,
+    dummyGradient,
+}: {
+    disabled?: boolean;
+    dummyColor: QuestTileColorSetting;
+    dummyGradient: QuestTileGradient;
+}): JSX.Element | null {
+    const sourceQuest = useStateFromStores([QuestStore], getRandomQuest);
+
+    const dummyQuest = useMemo(
+        () => sourceQuest ? cloneDummyQuest(sourceQuest, dummyColor) : null,
+        [dummyColor, sourceQuest]
+    );
+
+    if (!dummyQuest) return null;
+
+    return (
+        <DummyQuestTile
+            disabled={disabled}
+            dummyQuest={dummyQuest}
+            dummyGradient={dummyGradient}
+        />
+    );
+}
+
+export function QuestTilesSetting(): JSX.Element {
+    const questTiles = useQuestifySettings([
+        "disableQuestsEverything",
+        "questTileUnclaimedColor",
+        "questTileClaimedColor",
+        "questTileIgnoredColor",
+        "questTileExpiredColor",
+        "questTileGradient",
+        "questTilePreload",
+    ]);
+
+    const [previewColorKey, setPreviewColorKey] = useState<QuestTileColorKey>(defaultPreviewColorKey);
+
+    const disabled = questTiles.disableQuestsEverything;
+    const previewColor = questTiles[previewColorKey] as QuestTileColorSetting;
+
+    function updateColor(key: QuestTileColorKey, nextColor: QuestTileColorSetting): void {
+        setPreviewColorKey(key);
+        getQuestifySettings()[key] = nextColor;
+    }
+
+    function updateColorValue(key: QuestTileColorKey, setting: QuestTileColorSetting, value: number | null): void {
+        if (typeof value !== "number") return;
+
+        updateColor(key, {
+            enabled: setting.enabled,
+            color: value,
+        });
+    }
+
+    function updateColorEnabled(key: QuestTileColorKey, setting: QuestTileColorSetting, enabled: boolean): void {
+        updateColor(key, {
+            ...setting,
+            enabled,
+        });
+    }
+
+    function updateGradient(value: string | string[] | null): void {
+        if (typeof value !== "string") return;
+
+        getQuestifySettings().questTileGradient = value as QuestTileGradient;
+    }
+
+    function updatePreload(value: string | string[] | null): void {
+        if (typeof value !== "string") return;
+
+        const preload = value === "true";
+        getQuestifySettings().questTilePreload = preload;
+        rerenderQuests();
+    }
+
+    return (
+        <SettingsCard>
+            <SettingsHeader> Quest Tiles </SettingsHeader>
+            <SettingsDescription> Highlight Quests with optional theme colors for visibility. </SettingsDescription>
+            <SettingsSubheader> Tile Behavior </SettingsSubheader>
+            <SettingsRow className="quest-tile-behavior-row">
+                <SettingsRowItem className="quest-tile-gradient-row-item">
+                    <SettingsSelect
+                        label="Gradient Style:"
+                        options={gradientManaOptions}
+                        value={questTiles.questTileGradient}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        maxOptionsVisible={gradientManaOptions.length}
+                        onSelectionChange={updateGradient}
+                        tooltip={{
+                            position: "top",
+                            text: "Intense and Default use the selected tile color in the asset gradient."
+                                + "\n\nSubtle Black keeps a darker neutral gradient for contrast."
+                                + "\n\nNo Gradient removes the asset gradient, which can make some Quest artwork harder to read."
+                        }}
+                    />
+                </SettingsRowItem>
+                <SettingsRowItem className="quest-tile-preload-row-item">
+                    <SettingsSelect
+                        label="Asset Preload:"
+                        options={preloadManaOptions}
+                        value={String(questTiles.questTilePreload)}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        maxOptionsVisible={preloadManaOptions.length}
+                        onSelectionChange={updatePreload}
+                        tooltip={{
+                            position: "top",
+                            text: "Loading all assets when the Quests page opens reduces layout shifting while scrolling."
+                                + "\n\nLoading during page scroll is closer to Discord's default behavior and may use less work up front."
+                        }}
+                    />
+                </SettingsRowItem>
+            </SettingsRow>
+            <SettingsSubheader> Tile Colors </SettingsSubheader>
+            <SettingsRow className="quest-tile-color-row">
+                {colorOptions.map(({ key, label }) => {
+                    const setting = questTiles[key] as QuestTileColorSetting;
+
+                    return (
+                        <SettingsRowItem key={key} className="quest-tile-color-row-item">
+                            <div
+                                onFocusCapture={() => setPreviewColorKey(key)}
+                                onPointerDownCapture={() => setPreviewColorKey(key)}
+                            >
+                                <SettingsColorPicker
+                                    label={`${label}:`}
+                                    className={["quest-tile-color-picker", setting.enabled ? "" : "disabled-color-picker"].filter(Boolean)}
+                                    color={setting.color}
+                                    disabled={disabled || !setting.enabled}
+                                    onChange={value => updateColorValue(key, setting, value)}
+                                    showEyeDropper={true}
+                                />
+                            </div>
+                            <div className={q("settings-button", "quest-tile-color-button")}>
+                                <ManaButton
+                                    text={setting.enabled ? "Disable" : "Enable"}
+                                    variant={setting.enabled ? "critical-secondary" : "primary"}
+                                    disabled={disabled}
+                                    fullWidth={true}
+                                    size="sm"
+                                    onClick={() => updateColorEnabled(key, setting, !setting.enabled)}
+                                />
+                            </div>
+                        </SettingsRowItem>
+                    );
+                })}
+            </SettingsRow>
+            <DummyQuestPreview
+                disabled={disabled}
+                dummyColor={previewColor}
+                dummyGradient={questTiles.questTileGradient as QuestTileGradient}
+            />
+        </SettingsCard>
+    );
+}
diff --git a/src/equicordplugins/questify/components/reorderQuestsSetting.tsx b/src/equicordplugins/questify/components/reorderQuestsSetting.tsx
new file mode 100644
index 000000000..b2f51b8d8
--- /dev/null
+++ b/src/equicordplugins/questify/components/reorderQuestsSetting.tsx
@@ -0,0 +1,246 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { JSX } from "react";
+
+import { getQuestifySettings, useQuestifySettings } from "../settings/access";
+import { defaultQuestOrder, type QuestOrderStatus, type QuestSubsort } from "../settings/def";
+import { rerenderQuests } from "../settings/rerender";
+import { type ManaSelectOption, SettingsCard, SettingsDescription, SettingsHeader, SettingsRow, SettingsRowItem, SettingsSelect, SettingsSubheader, SettingsSubtleSwitch } from "./shared";
+
+const questStatusOptions = [
+    { label: "Unclaimed", value: "UNCLAIMED" },
+    { label: "Claimed", value: "CLAIMED" },
+    { label: "Ignored", value: "IGNORED" },
+    { label: "Expired", value: "EXPIRED" },
+] as const satisfies readonly { label: string, value: QuestOrderStatus; }[];
+
+const questStatusManaOptions: ManaSelectOption[] = questStatusOptions.map(({ label, value }) => ({
+    id: value,
+    label,
+    value,
+}));
+
+const baseSubsortOptions = [
+    { label: "Added (Newest)", value: "Recent DESC" },
+    { label: "Added (Oldest)", value: "Recent ASC" },
+] as const satisfies readonly { label: string, value: QuestSubsort; }[];
+
+const expiringSubsortOptions = [
+    ...baseSubsortOptions,
+    { label: "Expiring (Soonest)", value: "Expiring ASC" },
+    { label: "Expiring (Latest)", value: "Expiring DESC" },
+] as const satisfies readonly { label: string, value: QuestSubsort; }[];
+
+const expiredSubsortOptions = [
+    ...baseSubsortOptions,
+    { label: "Expired (Most Recent)", value: "Expiring DESC" },
+    { label: "Expired (Least Recent)", value: "Expiring ASC" },
+] as const satisfies readonly { label: string, value: QuestSubsort; }[];
+
+const claimedSubsortOptions = [
+    ...baseSubsortOptions,
+    { label: "Claimed (Most Recent)", value: "Claimed DESC" },
+    { label: "Claimed (Least Recent)", value: "Claimed ASC" },
+] as const satisfies readonly { label: string, value: QuestSubsort; }[];
+
+function toManaOptions(options: readonly { label: string, value: QuestSubsort; }[]): ManaSelectOption[] {
+    return options.map(({ label, value }) => ({
+        id: value,
+        label,
+        value,
+    }));
+}
+
+const unclaimedSubsortManaOptions = toManaOptions(expiringSubsortOptions);
+const claimedSubsortManaOptions = toManaOptions(claimedSubsortOptions);
+const ignoredSubsortManaOptions = toManaOptions(expiringSubsortOptions);
+const expiredSubsortManaOptions = toManaOptions(expiredSubsortOptions);
+const positionLabels = ["First", "Second", "Third", "Fourth"] as const;
+const subsortTooltips = {
+    unclaimedSubsort: "Completed but unclaimed Quests stay below incomplete unclaimed Quests, then this subsort is applied within those groups.",
+    claimedSubsort: "Claimed Quests can be sorted by claim time or by when the Quest was added.",
+    ignoredSubsort: "Ignored Quests still keep their ignored group position, then this subsort controls their order inside that group.",
+    expiredSubsort: "Expired Quests can be sorted by expiration time or by when the Quest was added.",
+} as const;
+
+function sanitizeQuestOrder(order: unknown): QuestOrderStatus[] {
+    const validStatuses = new Set<QuestOrderStatus>(defaultQuestOrder);
+    const sanitized = Array.isArray(order)
+        ? order.filter((status): status is QuestOrderStatus => validStatuses.has(status as QuestOrderStatus))
+        : [];
+
+    for (const status of defaultQuestOrder) {
+        if (!sanitized.includes(status)) {
+            sanitized.push(status);
+        }
+    }
+
+    return sanitized.slice(0, defaultQuestOrder.length);
+}
+
+export function ReorderQuestsSetting(): JSX.Element {
+    const reorderQuests = useQuestifySettings([
+        "disableQuestsEverything",
+        "questOrder",
+        "unclaimedSubsort",
+        "claimedSubsort",
+        "ignoredSubsort",
+        "expiredSubsort",
+        "rememberQuestPageSort",
+        "rememberQuestPageFilters",
+    ]);
+
+    const disabled = reorderQuests.disableQuestsEverything;
+    const questOrder = sanitizeQuestOrder(reorderQuests.questOrder);
+
+    function updateQuestOrder(index: number, value: string | string[] | null): void {
+        if (typeof value !== "string") return;
+
+        const nextStatus = value as QuestOrderStatus;
+        const nextOrder = [...questOrder];
+        const previousStatus = nextOrder[index];
+        const existingIndex = nextOrder.indexOf(nextStatus);
+
+        if (existingIndex !== -1 && existingIndex !== index) {
+            nextOrder[existingIndex] = previousStatus;
+        }
+
+        nextOrder[index] = nextStatus;
+        getQuestifySettings().questOrder = nextOrder;
+        rerenderQuests();
+    }
+
+    function updateSubsort(key: "unclaimedSubsort" | "claimedSubsort" | "ignoredSubsort" | "expiredSubsort", value: string | string[] | null): void {
+        if (typeof value !== "string") return;
+
+        getQuestifySettings()[key] = value;
+        rerenderQuests();
+    }
+
+    function updateRememberSetting(key: "rememberQuestPageSort" | "rememberQuestPageFilters", checked: boolean): void {
+        getQuestifySettings()[key] = checked;
+    }
+
+    return (
+        <SettingsCard>
+            <SettingsHeader> Reorder Quests </SettingsHeader>
+            <SettingsDescription> Sort Quests by their status when the Questify sort option is selected on the Quests page. </SettingsDescription>
+            <SettingsSubheader> Status Order </SettingsSubheader>
+            <SettingsRow>
+                {questOrder.map((status, index) => (
+                    <SettingsRowItem key={index}>
+                        <SettingsSelect
+                            label={`${positionLabels[index]}:`}
+                            options={questStatusManaOptions}
+                            value={status}
+                            selectionMode="single"
+                            disabled={disabled}
+                            fullWidth={true}
+                            maxOptionsVisible={questStatusManaOptions.length}
+                            onSelectionChange={value => updateQuestOrder(index, value)}
+                            tooltip={{
+                                position: "top",
+                                text: "Each status can only appear once. Selecting a status already used in another position swaps the two positions."
+                            }}
+                        />
+                    </SettingsRowItem>
+                ))}
+            </SettingsRow>
+            <SettingsSubheader> Subsorts </SettingsSubheader>
+            <SettingsRow>
+                <SettingsRowItem>
+                    <SettingsSelect
+                        label="Unclaimed Subsort:"
+                        options={unclaimedSubsortManaOptions}
+                        value={reorderQuests.unclaimedSubsort}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        maxOptionsVisible={unclaimedSubsortManaOptions.length}
+                        onSelectionChange={value => updateSubsort("unclaimedSubsort", value)}
+                        tooltip={{
+                            position: "top",
+                            text: subsortTooltips.unclaimedSubsort
+                        }}
+                    />
+                </SettingsRowItem>
+                <SettingsRowItem>
+                    <SettingsSelect
+                        label="Claimed Subsort:"
+                        options={claimedSubsortManaOptions}
+                        value={reorderQuests.claimedSubsort}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        maxOptionsVisible={claimedSubsortManaOptions.length}
+                        onSelectionChange={value => updateSubsort("claimedSubsort", value)}
+                        tooltip={{
+                            position: "top",
+                            text: subsortTooltips.claimedSubsort
+                        }}
+                    />
+                </SettingsRowItem>
+            </SettingsRow>
+            <SettingsRow>
+                <SettingsRowItem>
+                    <SettingsSelect
+                        label="Ignored Subsort:"
+                        options={ignoredSubsortManaOptions}
+                        value={reorderQuests.ignoredSubsort}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        maxOptionsVisible={ignoredSubsortManaOptions.length}
+                        onSelectionChange={value => updateSubsort("ignoredSubsort", value)}
+                        tooltip={{
+                            position: "top",
+                            text: subsortTooltips.ignoredSubsort
+                        }}
+                    />
+                </SettingsRowItem>
+                <SettingsRowItem>
+                    <SettingsSelect
+                        label="Expired Subsort:"
+                        options={expiredSubsortManaOptions}
+                        value={reorderQuests.expiredSubsort}
+                        selectionMode="single"
+                        disabled={disabled}
+                        fullWidth={true}
+                        maxOptionsVisible={expiredSubsortManaOptions.length}
+                        onSelectionChange={value => updateSubsort("expiredSubsort", value)}
+                        tooltip={{
+                            position: "top",
+                            text: subsortTooltips.expiredSubsort
+                        }}
+                    />
+                </SettingsRowItem>
+            </SettingsRow>
+            <SettingsSubheader> Quest Page Memory </SettingsSubheader>
+            <SettingsSubtleSwitch
+                checked={reorderQuests.rememberQuestPageSort}
+                disabled={disabled}
+                label="Remember the selected Quest page sort:"
+                onChange={checked => updateRememberSetting("rememberQuestPageSort", checked)}
+                bottomSpacing="5"
+                tooltip={{
+                    position: "top",
+                    text: "When disabled, the Quests page opens with the Questify sort option each time."
+                }}
+            />
+            <SettingsSubtleSwitch
+                checked={reorderQuests.rememberQuestPageFilters}
+                disabled={disabled}
+                label="Remember the selected Quest page filters:"
+                onChange={checked => updateRememberSetting("rememberQuestPageFilters", checked)}
+                tooltip={{
+                    position: "top",
+                    text: "When disabled, the Quests page opens without task or reward filters each time."
+                }}
+            />
+        </SettingsCard>
+    );
+}
diff --git a/src/equicordplugins/questify/components/settingsModal.tsx b/src/equicordplugins/questify/components/settingsModal.tsx
new file mode 100644
index 000000000..4b741c9d3
--- /dev/null
+++ b/src/equicordplugins/questify/components/settingsModal.tsx
@@ -0,0 +1,32 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import PluginModal from "@components/settings/tabs/plugins/PluginModal";
+import { openModal } from "@utils/modal";
+import type { Plugin } from "@utils/types";
+
+import { promptToRestartIfDirty } from "../settings/restartTracking";
+import { setSettingsModalOpen } from "../state";
+
+export function openQuestifySettingsModal(plugin: Plugin): void {
+    setSettingsModalOpen(true);
+
+    openModal(
+        modalProps => (
+            <PluginModal
+                {...modalProps}
+                plugin={plugin}
+                onRestartNeeded={() => { }}
+            />
+        ),
+        {
+            onCloseCallback: () => {
+                setSettingsModalOpen(false);
+                promptToRestartIfDirty();
+            }
+        }
+    );
+}
diff --git a/src/equicordplugins/questify/components/shared.tsx b/src/equicordplugins/questify/components/shared.tsx
new file mode 100644
index 000000000..dbdedd0eb
--- /dev/null
+++ b/src/equicordplugins/questify/components/shared.tsx
@@ -0,0 +1,379 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Card } from "@components/Card";
+import { Heading } from "@components/Heading";
+import { Paragraph } from "@components/Paragraph";
+import { findComponentByCodeLazy } from "@webpack";
+import { ColorPicker, Slider } from "@webpack/common";
+import type { ComponentProps, ComponentType, JSX, ReactNode } from "react";
+
+import { q } from "../utils/ui";
+
+export function SettingsCard({ children }: { children: ReactNode; }): JSX.Element {
+    return (
+        <Card variant="primary" className={q("setting")}>
+            {children}
+        </Card>
+    );
+}
+
+export function SettingsHeader({ children }: { children: ReactNode; }): JSX.Element {
+    return (
+        <Heading className={q("setting-header")}>
+            {children}
+        </Heading>
+    );
+}
+
+export function SettingsSubheader({ children, className }: { children: ReactNode; className?: string | string[]; }): JSX.Element {
+    return (
+        <Heading className={q("setting-subheader", className)}>
+            {children}
+        </Heading>
+    );
+}
+
+export function SettingsDescription({ children }: { children: ReactNode; }): JSX.Element {
+    return (
+        <Paragraph className={q("setting-description")}>
+            {children}
+        </Paragraph>
+    );
+}
+
+export function SettingsParagraph({ children, className }: { children: ReactNode; className?: string | string[]; }): JSX.Element {
+    return (
+        <Paragraph className={q("setting-paragraph", className)}>
+            {children}
+        </Paragraph>
+    );
+}
+
+function withDimmedClass(className: string | string[] | undefined, dimmed: boolean): string | string[] | undefined {
+    if (!dimmed) return className;
+
+    return [
+        ...(Array.isArray(className) ? className : [className]),
+        "dimmed-settings-item",
+    ].filter(c => c !== undefined);
+}
+
+export function SettingsNotice({ children, className }: { children: ReactNode; className?: string | string[]; }): JSX.Element {
+    return (
+        <Paragraph className={q("notice-card", className)}>
+            {children}
+        </Paragraph>
+    );
+}
+
+export interface SettingsRowProps {
+    children: ReactNode;
+    className?: string | string[];
+}
+
+export function SettingsRow({ children, className }: SettingsRowProps): JSX.Element {
+    return (
+        <div className={q("settings-row", className)}>
+            {children}
+        </div>
+    );
+}
+
+export interface SettingsRowItemProps {
+    children: ReactNode;
+    className?: string | string[];
+    width?: "fill" | "content";
+}
+
+export function SettingsRowItem({
+    children,
+    className,
+    width = "fill",
+}: SettingsRowItemProps): JSX.Element {
+    return (
+        <div className={q(
+            "settings-row-item",
+            width === "content" ? "settings-row-item-content" : undefined,
+            className,
+        )}>
+            {children}
+        </div>
+    );
+}
+
+export interface ManaSelectOption {
+    id: string;
+    value: string;
+    label: string;
+    disabled?: boolean;
+}
+
+export interface ManaSelectFormattedOption extends ManaSelectOption {
+    description?: ReactNode;
+    leading?: ReactNode;
+    trailing?: ReactNode;
+}
+
+export interface ManaSelectProps {
+    options: ManaSelectOption[];
+    value?: string | string[] | null;
+    onSelectionChange?: (value: string | string[] | null) => void;
+    selectionMode?: "single" | "multiple";
+    placeholder?: string;
+    disabled?: boolean;
+    readOnly?: boolean;
+    clearable?: boolean;
+    fullWidth?: boolean;
+    autoFocus?: boolean;
+    closeOnSelect?: boolean;
+    shouldFocusWrap?: boolean;
+    maxOptionsVisible?: number;
+    wrapTags?: boolean;
+    formatOption?: (option: ManaSelectOption) => ManaSelectFormattedOption;
+    name?: string;
+    form?: string;
+    autoComplete?: string;
+    label?: string;
+    required?: boolean;
+}
+
+export const ManaSelect = findComponentByCodeLazy('"data-mana-component":"select"') as React.ComponentType<ManaSelectProps>;
+
+export interface SettingsSelectProps extends Omit<ManaSelectProps, "label"> {
+    label: ReactNode;
+    className?: string | string[];
+    labelClassName?: string | string[];
+    selectClassName?: string | string[];
+    tooltip?: { position: "top" | "bottom", text: string; wider?: boolean; };
+}
+
+export function SettingsSelect({
+    label,
+    className,
+    labelClassName,
+    selectClassName,
+    tooltip,
+    ...props
+}: SettingsSelectProps): JSX.Element {
+    const selectElement = (
+        <div className={q("settings-select", className)}>
+            <SettingsParagraph className={withDimmedClass(labelClassName, !!props.disabled)}>{label}</SettingsParagraph>
+            <div className={q(selectClassName)}>
+                <ManaSelect {...props} />
+            </div>
+        </div>
+    );
+
+    if (tooltip) {
+        return (
+            <SettingsTooltip text={tooltip.text} position={tooltip.position} wider={tooltip.wider}>
+                {selectElement}
+            </SettingsTooltip>
+        );
+    }
+
+    return selectElement;
+}
+
+type ColorPickerWithOnCloseProps = ComponentProps<typeof ColorPicker> & {
+    onClose?: () => void;
+};
+
+function ColorPickerWithOnClose(props: ColorPickerWithOnCloseProps): JSX.Element {
+    const LiveColorPicker = ColorPicker as ComponentType<ColorPickerWithOnCloseProps>;
+
+    return <LiveColorPicker {...props} />;
+}
+
+export interface SettingsColorPickerProps extends ColorPickerWithOnCloseProps {
+    className?: string | string[];
+    label?: ReactNode;
+    labelClassName?: string | string[];
+}
+
+export function SettingsColorPicker({
+    className,
+    label,
+    labelClassName,
+    ...props
+}: SettingsColorPickerProps): JSX.Element {
+    return (
+        <>
+            {label != null && <SettingsParagraph className={withDimmedClass(labelClassName, !!props.disabled)}>{label}</SettingsParagraph>}
+            <div className={q("settings-color-picker", className)}>
+                <ColorPickerWithOnClose {...props} />
+            </div>
+        </>
+    );
+}
+
+export interface SettingsSliderProps {
+    className?: string | string[];
+    disabled?: boolean;
+    label: ReactNode;
+    labelClassName?: string | string[];
+    maxValue?: number;
+    minValue?: number;
+    onChange: (value: number) => void;
+    sliderClassName?: string | string[];
+    value: number;
+}
+
+export function SettingsSlider({
+    className,
+    disabled,
+    label,
+    labelClassName,
+    maxValue = 100,
+    minValue = 0,
+    onChange,
+    sliderClassName,
+    value,
+}: SettingsSliderProps): JSX.Element {
+    return (
+        <div className={q("settings-slider", className)}>
+            <SettingsParagraph className={withDimmedClass(labelClassName, !!disabled)}>{label}</SettingsParagraph>
+            <div className={q("settings-slider-control-container")}>
+                <Slider
+                    minValue={minValue}
+                    maxValue={maxValue}
+                    initialValue={value}
+                    onValueChange={onChange}
+                    className={q("settings-slider-control", sliderClassName)}
+                    disabled={disabled}
+                />
+            </div>
+        </div>
+    );
+}
+
+interface SwitchWithLabelProps {
+    checked: boolean;
+    onChange?: (checked: boolean) => void;
+    disabled?: boolean;
+    label?: string;
+    description?: string;
+}
+
+interface SettingsSwitchLayoutProps extends SwitchWithLabelProps {
+    bottomSpacing?: "5" | "10" | "15";
+    topSpacing?: "5" | "10" | "15";
+    className?: string | string[];
+    tooltip?: { position: "top" | "bottom", text: string; };
+}
+
+const SwitchWithLabel = findComponentByCodeLazy('"data-toggleable-component":"switch"') as React.ComponentType<SwitchWithLabelProps>;
+
+export type SettingsSubtleSwitchProps = Omit<SettingsSwitchLayoutProps, "description">;
+
+export function SettingsSubtleSwitch(props: SettingsSubtleSwitchProps): JSX.Element {
+    const switchElement = (
+        <div className={q(
+            "setting-subtle-switch",
+            props.topSpacing ? `margin-top-${props.topSpacing}` : undefined,
+            props.bottomSpacing ? `margin-bottom-${props.bottomSpacing}` : undefined,
+            withDimmedClass(props.className, !!props.disabled)
+        )}>
+            <SwitchWithLabel {...props} />
+        </div>
+    );
+
+    if (props.tooltip) {
+        return (
+            <SettingsTooltip text={props.tooltip.text} aria-label={props.tooltip.text} position={props.tooltip.position}>
+                {switchElement}
+            </SettingsTooltip>
+        );
+    }
+
+    return switchElement;
+}
+
+export const TooltipPositions = ["top", "bottom", "left", "right"] as const;
+export type TooltipPosition = typeof TooltipPositions[number];
+
+export const TooltipAligns = ["start", "center", "end"] as const;
+export type TooltipAlign = typeof TooltipAligns[number];
+
+export const TooltipColors = ["primary", "grey", "brand", "green", "red"] as const;
+export type TooltipColor = typeof TooltipColors[number];
+
+export interface ManaTooltipProps {
+    text: string | (() => React.ReactNode);
+    position?: TooltipPosition;
+    align?: TooltipAlign;
+    color?: TooltipColor;
+    spacing?: number;
+    hideOnClick?: boolean;
+    delay?: number;
+    forceOpen?: boolean;
+    shouldShow?: boolean;
+    allowOverflow?: boolean;
+    overflowOnly?: boolean;
+    clickableOnMobile?: boolean;
+    disableTooltipPointerEvents?: boolean;
+    targetElementRef?: React.RefObject<HTMLElement>;
+    tooltipClassName?: string;
+    tooltipStyle?: React.CSSProperties;
+    tooltipContentClassName?: string;
+    tooltipPointerClassName?: string;
+    positionKeyStemOverride?: string;
+    onTooltipShow?: () => void;
+    onTooltipHide?: () => void;
+    onAnimationRest?: () => void;
+    "aria-label"?: string | false;
+    children: (props: Record<string, any>) => React.ReactNode;
+}
+
+export const ManaTooltip = findComponentByCodeLazy("VoidTooltip cannot find DOM node") as React.ComponentType<ManaTooltipProps>;
+
+function SettingsTooltip({
+    children,
+    position,
+    text,
+    wider,
+    className
+}: {
+    children: ReactNode;
+    position: "top" | "bottom";
+    text: string;
+    wider?: boolean;
+    className?: string | string[];
+}): JSX.Element {
+    return (
+        <div className={q("settings-tooltip-wrapper", className)}>
+            <ManaTooltip
+                text={text}
+                position={position}
+                color="brand"
+                tooltipStyle={{ maxWidth: wider ? "602px" : "350px" }}
+                tooltipContentClassName={q("settings-tooltip-content")}
+                delay={50}
+            >
+                {tooltipProps => <div {...tooltipProps}>{children}</div>}
+            </ManaTooltip>
+        </div>
+    );
+}
+
+export const ManaButtonVariants = ["primary", "secondary", "critical-primary", "critical-secondary", "active", "overlay-primary", "overlay-secondary", "expressive"] as const;
+export type ManaButtonVariant = typeof ManaButtonVariants[number];
+
+export const ManaButtonSizes = ["xs", "sm", "md"] as const;
+export type ManaButtonSize = typeof ManaButtonSizes[number];
+
+export interface ManaButtonProps {
+    text?: string;
+    variant?: ManaButtonVariant;
+    size?: ManaButtonSize;
+    disabled?: boolean;
+    fullWidth?: boolean;
+    onClick?: (e: React.MouseEvent) => void;
+    style?: React.CSSProperties;
+}
+
+export const ManaButton = findComponentByCodeLazy('"data-mana-component":"button"') as React.ComponentType<ManaButtonProps>;
diff --git a/src/equicordplugins/questify/index.tsx b/src/equicordplugins/questify/index.tsx
index b9c9b41c3..a1a6f10cf 100644
--- a/src/equicordplugins/questify/index.tsx
+++ b/src/equicordplugins/questify/index.tsx
@@ -1,1594 +1,283 @@
 /*
  * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
+ * Copyright (c) 2026 Vendicated and contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import "./styles.css";
 
-import { showNotification } from "@api/Notifications";
-import { plugins } from "@api/PluginManager";
+import { playAudio } from "@api/AudioPlayer";
 import { addServerListElement, removeServerListElement, ServerListRenderPosition } from "@api/ServerList";
-import { migratePluginToSettings, Settings } from "@api/Settings";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { openPluginModal } from "@components/settings";
+import { Settings } from "@api/Settings";
+import { ErrorBoundary } from "@components/index";
 import { EquicordDevs } from "@utils/constants";
-import { copyToClipboard } from "@utils/index";
-import definePlugin, { PluginNative, StartAt } from "@utils/types";
-import { findStoreLazy, onceReady } from "@webpack";
-import { ContextMenuApi, Menu, NavigationRouter, RestAPI, useEffect, useState } from "@webpack/common";
-import { JSX } from "react";
+import definePlugin, { StartAt } from "@utils/types";
+import type { Quest, QuestUserStatus } from "@vencord/discord-types";
+import { findComponentByCodeLazy, onceReady } from "@webpack";
+import { QuestStore } from "@webpack/common";
+import type { JSX } from "react";
 
-import { addIgnoredQuest, addRerenderCallback, autoFetchCompatible, fetchAndAlertQuests, maximumAutoFetchIntervalValue, minimumAutoFetchIntervalValue, questIsIgnored, removeIgnoredQuest, rerenderQuests, settings, startAutoFetchingQuests, stopAutoFetchingQuests, validateAndOverwriteIgnoredQuests } from "./settings";
-import { ActiveQuestIntervalsMap, ExcludedQuestMap, GuildlessServerListItem, Quest, QuestIcon, QuestMap, QuestStatus, QuestTaskType, RGB } from "./utils/components";
-import { adjustRGB, decimalToRGB, fetchAndDispatchQuests, formatLowerBadge, getFormattedNow, getIgnoredQuestIDs, getQuestProgress, getQuestStatus, getQuestTarget, getQuestTask, isDarkish, leftClick, middleClick, normalizeQuestName, q, QuestifyLogger, questPath, QuestsStore, refreshQuest, reportPlayGameQuestProgress, reportVideoQuestProgress, rightClick, setIgnoredQuestIDs, waitUntilEnrolled } from "./utils/misc";
+import { disguiseHomeButton, QuestButton, showQuestButton } from "./components/questButton";
+import { QuestTileContextMenu } from "./components/questTileContextMenu";
+import { getQuestifySettings } from "./settings/access";
+import { resetQuestsToResume, startAutoFetchingQuests, stopAutoFetchingQuests } from "./settings/fetching";
+import { validateIgnoredQuests } from "./settings/ignoredQuests";
+import { rerenderQuests, useQuestRerender } from "./settings/rerender";
+import { disposeRestartTracking, initializeRestartTracking, promptToRestartIfDirty } from "./settings/restartTracking";
+import { settings } from "./settings/store";
+import { getSettingsModalOpen, initialQuestDataFetched, setInitialQuestDataFetched, setSettingsModalOpen } from "./state";
+import { canAutoCompleteQuest, getActiveAutoCompletes, getQuestAutoCompleteProgress, getQuestButtonProps, getQuestPanelSubtitleText, hasEnabledAutoCompleteQuestTypes, processQuestForAutoComplete, resumeInterruptedAutoCompletes, setHeartbeatStackTracePatchSucceeded, setVideoProgressStackTracePatchSucceeded, stopAllAutoCompletes, stopAutoCompletesForRunningGames, stopQuestAutoComplete } from "./utils/completion";
+import { canOpenDevToolsWindow, fetchAndDispatchQuests, openDevToolsWindow, snakeToCamel } from "./utils/fetching";
+import { normalizeQuestName } from "./utils/filtering";
+import { notifyQuestCompletion, QL } from "./utils/logging";
+import { getQuestPanelOverride, getQuestPanelPercentComplete, shouldForceQuestPanelVisible } from "./utils/questState";
+import { getLastFilterChoices, getLastSortChoice, getQuestTileClasses, getQuestTileStyle, setLastFilterChoices, setLastSortChoice, shouldPreloadQuestAssets, sortQuests } from "./utils/questTiles";
+import { formatLowerBadge, QUEST_PAGE } from "./utils/ui";
 
-const AuthorizedAppsStore = findStoreLazy("AuthorizedAppsStore");
-let initialQuestDataFetched = false;
-const QuestifyNative = VencordNative.pluginHelpers.Questify as PluginNative<typeof import("./native")>;
-const patchedMobileQuests = new Set<string>();
-const manuallyStoppedQuestIDs = new Set<string>();
-export const activeQuestIntervals = new ActiveQuestIntervalsMap();
+let isSwitchingAccount = false;
+let didAttemptAutoCompleteResume = false;
+const notifiedCompletedQuests = new Set<string>();
 
-function questMenuUnignoreAllClicked(): void {
-    validateAndOverwriteIgnoredQuests([]);
+function setOnQuestsPage(force?: boolean): void {
+    getQuestifySettings().isOnQuestsPage = force ?? (window.location.pathname === QUEST_PAGE);
 }
 
-function questMenuIgnoreAllClicked(): void {
-    const quests = (QuestsStore.quests as QuestMap);
-    const excludedQuests = (QuestsStore.excludedQuests as ExcludedQuestMap);
-    const ignoredQuestsSet = new Set<string>();
-    const ignoredQuestIDs = getIgnoredQuestIDs();
+function startPerAccountTasks(source: string): void {
+    const startedAt = Date.now();
 
-    for (const quest of quests.values()) {
-        const questID = quest.id;
-        const questStatus = getQuestStatus(quest, false);
+    setOnQuestsPage();
+    startAutoFetchingQuests();
+    resumeAutoCompletesIfReady();
+    fetchAndDispatchQuests();
 
-        if (questStatus === QuestStatus.Unclaimed || ignoredQuestIDs.includes(questID)) {
-            ignoredQuestsSet.add(questID);
-        }
-    }
-
-    for (const quest of excludedQuests.values()) {
-        if (ignoredQuestIDs.includes(quest.id)) {
-            ignoredQuestsSet.add(quest.id);
-        }
-    }
-
-    setIgnoredQuestIDs(Array.from(ignoredQuestsSet));
-    settings.store.unclaimedUnignoredQuests = 0;
+    QL.info(`START_TASKS-${source.toUpperCase()}`, { startedAt });
 }
 
-function showQuestsButton(questButtonDisplay: string, unclaimedUnignoredQuests: number, onQuestsPage: boolean): boolean {
-    const canShow = questButtonDisplay !== "never";
-    const alwaysShow = questButtonDisplay === "always";
-    return canShow && (alwaysShow || !!unclaimedUnignoredQuests || onQuestsPage);
+function stopPerAccountTasks(source: string, preserveResume: boolean = true): void {
+    const stoppedAt = Date.now();
+
+    setOnQuestsPage();
+    stopAutoFetchingQuests();
+    notifiedCompletedQuests.clear();
+    stopAllAutoCompletes({ manual: false, preserveResume, terminalHeartbeat: true });
+
+    QL.info(`STOP_TASKS-${source.toUpperCase()}`, { stoppedAt });
 }
 
-export function QuestButton(): JSX.Element {
-    const { questButtonDisplay, questButtonUnclaimed, questButtonBadgeColor, unclaimedUnignoredQuests, onQuestsPage } = settings.use(["questButtonDisplay", "questButtonUnclaimed", "questButtonBadgeColor", "unclaimedUnignoredQuests", "onQuestsPage"]);
-    const questButtonBadgeColorRGB = questButtonBadgeColor === null ? null : decimalToRGB(questButtonBadgeColor);
-
-    function handleClick(event: React.MouseEvent<Element>) {
-        // ListItem does not support onAuxClick, so we have to listen for mousedown events.
-        // Ignore left and right clicks sent via mousedown events to prevent double events.
-        if (event.type === "mousedown" && event.button !== middleClick) {
-            return;
-        }
-
-        event.preventDefault();
-        event.stopPropagation();
-
-        let todo: string | null = null;
-
-        if (event.button === middleClick) {
-            todo = settings.store.questButtonMiddleClickAction;
-        } else if (event.button === rightClick) {
-            todo = settings.store.questButtonRightClickAction;
-        } else if (event.button === leftClick) {
-            todo = settings.store.questButtonLeftClickAction;
-        }
-
-        if (todo === "open-quests") {
-            NavigationRouter.transitionTo(questPath);
-        } else if (todo === "plugin-settings") {
-            openPluginModal(plugins.Questify);
-        } else if (todo === "context-menu") {
-            ContextMenuApi.openContextMenu(event, () => (
-                <Menu.Menu
-                    navId={q("quest-button-context-menu")}
-                    onClose={ContextMenuApi.closeContextMenu}
-                    aria-label="Quest Button Menu"
-                >
-                    <Menu.MenuItem
-                        id={q("ignore-quests-option")}
-                        label="Mark All Ignored"
-                        action={questMenuIgnoreAllClicked}
-                        disabled={!unclaimedUnignoredQuests}
-                    />
-                    <Menu.MenuItem
-                        id={q("unignore-quests-option")}
-                        label="Reset Ignored List"
-                        action={questMenuUnignoreAllClicked}
-                        disabled={!getIgnoredQuestIDs().length}
-                    />
-                    <Menu.MenuItem
-                        id={q("fetch-quests-option")}
-                        label="Fetch Quests"
-                        action={() => fetchAndAlertQuests("Questify-ManualFetch", QuestifyLogger)}
-                    />
-                </Menu.Menu>
-            ));
-        }
+function resumeAutoCompletesIfReady(): void {
+    if (didAttemptAutoCompleteResume || !initialQuestDataFetched) {
+        return;
     }
 
-    const lowerBadgeProps = {
-        count: !["badge", "both"].includes(questButtonUnclaimed) ? 0 : unclaimedUnignoredQuests,
-        maxDigits: 2,
-        ...(questButtonBadgeColorRGB ? { color: `rgb(${questButtonBadgeColorRGB.r}, ${questButtonBadgeColorRGB.g}, ${questButtonBadgeColorRGB.b})` } : {}),
-        ...(questButtonBadgeColorRGB ? { style: { color: isDarkish(questButtonBadgeColorRGB) ? "white" : "black" } } : {})
-    };
+    didAttemptAutoCompleteResume = true;
+    resumeInterruptedAutoCompletes();
+}
+
+const Button = findComponentByCodeLazy("BUTTON_LOADING_STARTED_LABEL)),");
+
+function enrolledIncompleteButton(args: { quest: Quest, size: string; }): JSX.Element | null {
+    const props = getQuestButtonProps({ quest: args.quest });
+
+    if (!props) {
+        return null;
+    }
 
     return (
-        <GuildlessServerListItem
-            id={q("quest-button")}
-            className={q("quest-button")}
-            icon={QuestIcon(26, 26)}
-            tooltip="Quests"
-            showPill={true}
-            isVisible={showQuestsButton(questButtonDisplay, unclaimedUnignoredQuests, onQuestsPage)}
-            isSelected={onQuestsPage}
-            hasUnread={!!unclaimedUnignoredQuests && ["pill", "both"].includes(questButtonUnclaimed)}
-            lowerBadgeProps={lowerBadgeProps}
-            onClick={handleClick}
-            onContextMenu={handleClick}
-            onMouseDown={handleClick}
-        />
+        <ErrorBoundary noop>
+            <Button
+                size={args.size}
+                variant="secondary"
+                disabled={false}
+                fullWidth={true}
+                {...props}
+            />
+        </ErrorBoundary>
     );
 }
 
-function shouldHideGiftInventoryRelocationNotice(): boolean {
-    const {
-        disableQuestsGiftInventoryRelocationNotice,
-        disableQuestsEverything
-    } = settings.use([
-        "disableQuestsGiftInventoryRelocationNotice",
-        "disableQuestsEverything"
-    ]);
-
-    return disableQuestsGiftInventoryRelocationNotice || disableQuestsEverything;
-}
-
-function shouldHideDiscoveryTab(): boolean {
-    const {
-        disableQuestsDiscoveryTab,
-        disableQuestsEverything
-    } = settings.use([
-        "disableQuestsDiscoveryTab",
-        "disableQuestsEverything"
-    ]);
-
-    return disableQuestsDiscoveryTab || disableQuestsEverything;
-}
-
-function shouldHideDirectMessagesTab(): boolean {
-    const {
-        disableQuestsDirectMessagesTab,
-        disableQuestsEverything
-    } = settings.use([
-        "disableQuestsDirectMessagesTab",
-        "disableQuestsEverything"
-    ]);
-
-    return disableQuestsDirectMessagesTab || disableQuestsEverything;
-}
-
-function shouldHideSponsoredQuestBanner(): boolean {
-    const {
-        disableQuestsPageSponsoredBanner,
-        disableQuestsEverything
-    } = settings.use([
-        "disableQuestsPageSponsoredBanner",
-        "disableQuestsEverything"
-    ]);
-
-    return disableQuestsPageSponsoredBanner || disableQuestsEverything;
-}
-
-function shouldHideBadgeOnUserProfiles(): boolean {
-    const {
-        disableQuestsBadgeOnUserProfiles,
-        disableQuestsEverything
-    } = settings.use([
-        "disableQuestsBadgeOnUserProfiles",
-        "disableQuestsEverything"
-    ]);
-
-    return disableQuestsBadgeOnUserProfiles || disableQuestsEverything;
-}
-
-function shouldHideQuestPopup(quest: Quest | null): boolean {
-    const {
-        disableQuestsPopupAboveAccountPanel,
-        disableQuestsEverything
-    } = settings.use([
-        "disableQuestsPopupAboveAccountPanel",
-        "disableQuestsEverything",
-        "triggerQuestsRerender"
-    ]);
-
-    const noProgress = !quest?.userStatus?.progress || Object.keys(quest?.userStatus?.progress || {}).length === 0;
-    return !quest || ((disableQuestsPopupAboveAccountPanel || disableQuestsEverything) && noProgress);
-}
-
-function shouldPreventFetchingQuests(): boolean {
-    return settings.store.disableQuestsFetchingQuests || settings.store.disableQuestsEverything;
-}
-
-function shouldHideFriendsListActiveNowPromotion(): boolean {
-    const {
-        disableFriendsListActiveNowPromotion,
-        disableQuestsEverything
-    } = settings.use([
-        "disableFriendsListActiveNowPromotion",
-        "disableQuestsEverything"
-    ]);
-
-    return disableFriendsListActiveNowPromotion || disableQuestsEverything;
-}
-
-function shouldHideMembersListActivelyPlayingIcon(): boolean {
-    const {
-        disableMembersListActivelyPlayingIcon,
-        disableQuestsEverything
-    } = settings.use([
-        "disableMembersListActivelyPlayingIcon",
-        "disableQuestsEverything"
-    ]);
-
-    return disableMembersListActivelyPlayingIcon || disableQuestsEverything;
-}
-
-function QuestTileContextMenu(children: React.ReactNode[], props: { quest: any; }, isClaimedMenu: boolean = false): void {
-    const isIgnored = questIsIgnored(props.quest.id);
-    const isEnrolled = !!props.quest.userStatus?.enrolledAt;
-    const canAutoComplete = !isClaimedMenu && isEnrolled && canQuestAutoComplete(props.quest);
-
-    children.unshift((
-        <Menu.MenuGroup>
-            {!isClaimedMenu && (!isIgnored ? (
-                <Menu.MenuItem
-                    id={q("ignore-quests")}
-                    label="Mark as Ignored"
-                    action={() => { addIgnoredQuest(props.quest.id); }}
-                />
-            ) : (
-                <Menu.MenuItem
-                    id={q("unignore-quests")}
-                    label="Unmark as Ignored"
-                    action={() => { removeIgnoredQuest(props.quest.id); }}
-                />
-            ))}
-            {activeQuestIntervals.has(props.quest.id) ? (
-                <Menu.MenuItem
-                    id={q("stop-auto-complete")}
-                    label="Stop Auto-Complete"
-                    action={() => {
-                        const interval = activeQuestIntervals.get(props.quest.id);
-
-                        if (interval) {
-                            manuallyStoppedQuestIDs.add(props.quest.id);
-                            QuestifyLogger.info(`[${getFormattedNow()}] Auto-Complete for Quest ${normalizeQuestName(props.quest.config.messages.questName)} stopped via context menu.`);
-                            clearInterval(interval.progressTimeout);
-                            clearTimeout(interval.rerenderTimeout);
-                            activeQuestIntervals.delete(props.quest.id);
-                            resetQuestsToResume(props.quest);
-                            rerenderQuests();
-                        }
-                    }}
-                />) : canAutoComplete ? (
-                    <Menu.MenuItem
-                        id={q("start-auto-complete")}
-                        label="Start Auto-Complete"
-                        action={() => { processQuestForAutoComplete(props.quest, true); }}
-                    />) : null
-            }
-            <Menu.MenuItem
-                id={q("copy-quest-id")}
-                label="Copy Quest ID"
-                action={() => { copyToClipboard(props.quest.id); }}
-            />
-        </Menu.MenuGroup>
-    ));
-}
-
-export function getQuestTileClasses(originalClasses: string, quest: Quest, color: number | null | undefined, gradient: string | undefined): string {
-    const {
-        restyleQuestsUnclaimed,
-        restyleQuestsClaimed,
-        restyleQuestsIgnored,
-        restyleQuestsExpired,
-        restyleQuestsGradient
-    } = settings.use([
-        "ignoredQuestIDs",
-        "ignoredQuestProfile",
-        "restyleQuestsUnclaimed",
-        "restyleQuestsClaimed",
-        "restyleQuestsIgnored",
-        "restyleQuestsExpired",
-        "restyleQuestsGradient"
-    ]);
-
-    const customClasses = [
-        q("quest-item-restyle"),
-        q("quest-item-intense-gradient"),
-        q("quest-item-default-gradient"),
-        q("quest-item-black-gradient"),
-        q("quest-item-hide-gradient"),
-        q("quest-item-contrast-logo")
-    ];
-
-    if (originalClasses.includes(q("dummy-quest"))) {
-        return originalClasses;
-    }
-
-    const questStatus = getQuestStatus(quest);
-    const baseClasses = originalClasses.split(" ").filter(cls => cls && !customClasses.includes(cls));
-    const returnClasses: string[] = [...baseClasses];
-    const hasColorOverride = color !== undefined;
-    const skipColorCheck = hasColorOverride && color === null;
-    let isRestyledAndDarkish: any = null;
-
-    if (!skipColorCheck) {
-        if (questStatus === QuestStatus.Claimed && (color || restyleQuestsClaimed !== null)) {
-            returnClasses.push(q("quest-item-restyle"));
-            isRestyledAndDarkish = isDarkish(decimalToRGB(color ?? restyleQuestsClaimed), 0.875);
-        } else if (questStatus === QuestStatus.Unclaimed && (color || restyleQuestsUnclaimed !== null)) {
-            returnClasses.push(q("quest-item-restyle"));
-            isRestyledAndDarkish = isDarkish(decimalToRGB(color ?? restyleQuestsUnclaimed), 0.875);
-        } else if (questStatus === QuestStatus.Expired && (color || restyleQuestsExpired !== null)) {
-            returnClasses.push(q("quest-item-restyle"));
-            isRestyledAndDarkish = isDarkish(decimalToRGB(color ?? restyleQuestsExpired), 0.875);
-        } else if (questStatus === QuestStatus.Ignored && (color || restyleQuestsIgnored !== null)) {
-            returnClasses.push(q("quest-item-restyle"));
-            isRestyledAndDarkish = isDarkish(decimalToRGB(color ?? restyleQuestsIgnored), 0.875);
-        }
-    }
-
-    if (isRestyledAndDarkish !== null) {
-        if ((gradient || restyleQuestsGradient) === "black") {
-            returnClasses.push(q("quest-item-black-gradient"));
-        } else if ((gradient || restyleQuestsGradient) === "hide") {
-            returnClasses.push(q("quest-item-hide-gradient"));
-        } else {
-            if ((gradient || restyleQuestsGradient) === "default") {
-                returnClasses.push(q("quest-item-default-gradient"));
-            } else {
-                returnClasses.push(q("quest-item-intense-gradient"));
-            }
-
-            if (!isRestyledAndDarkish) {
-                returnClasses.push(q("quest-item-contrast-logo"));
-            }
-        }
-    }
-
-    return returnClasses.join(" ");
-}
-
-function makeDesktopCompatible(quests: Quest[]): void {
-    const { makeMobileQuestsDesktopCompatible } = settings.use(["makeMobileQuestsDesktopCompatible", "triggerQuestsRerender"]);
-
-    if (makeMobileQuestsDesktopCompatible) {
-        quests.forEach(quest => {
-            const config = quest.config?.taskConfigV2;
-            const tasks = config?.tasks;
-
-            if (tasks?.WATCH_VIDEO_ON_MOBILE && (!tasks?.WATCH_VIDEO || patchedMobileQuests.has(quest.id))) {
-                patchedMobileQuests.add(quest.id);
-
-                tasks.WATCH_VIDEO = {
-                    ...tasks.WATCH_VIDEO_ON_MOBILE,
-                    type: QuestTaskType.WATCH_VIDEO
-                };
-            }
-        });
-    } else if (patchedMobileQuests.size > 0) {
-        patchedMobileQuests.forEach(questId => {
-            const quest = quests.find(q => q.id === questId);
-            const config = quest?.config?.taskConfigV2;
-
-            if (config) {
-                delete config.tasks.WATCH_VIDEO;
-            }
-        });
-
-        patchedMobileQuests.clear();
-    }
-}
-
-function sortQuests(quests: Quest[], skip?: boolean): Quest[] {
-    const {
-        reorderQuests,
-        unclaimedSubsort,
-        claimedSubsort,
-        ignoredSubsort,
-        expiredSubsort,
-    } = settings.use([
-        "ignoredQuestIDs",
-        "ignoredQuestProfile",
-        "reorderQuests",
-        "unclaimedSubsort",
-        "claimedSubsort",
-        "ignoredSubsort",
-        "expiredSubsort",
-        "completeVideoQuestsInBackground",
-        "completeGameQuestsInBackground",
-        "completeAchievementQuestsInBackground",
-        "triggerQuestsRerender"
-    ]);
-
-    makeDesktopCompatible(quests);
-
-    if (skip || !reorderQuests?.trim()) {
-        return quests;
-    }
-
-    const orderList = reorderQuests.split(",").map(q => q.trim().toLowerCase());
-
-    const questGroups: { [key: string]: Quest[]; } = {
-        claimed: [],
-        expired: [],
-        ignored: [],
-        unclaimed: [],
-        unknown: []
-    };
-
-    quests.forEach(quest => {
-        const questStatus = getQuestStatus(quest);
-
-        if (questStatus === QuestStatus.Claimed) {
-            questGroups.claimed.push(quest);
-        } else if (questStatus === QuestStatus.Unclaimed) {
-            questGroups.unclaimed.push(quest);
-        } else if (questStatus === QuestStatus.Expired) {
-            questGroups.expired.push(quest);
-        } else if (questStatus === QuestStatus.Ignored) {
-            questGroups.ignored.push(quest);
-        } else {
-            questGroups.unknown.push(quest);
-        }
-    });
-
-    const createSortFunction = (subsort: string) => {
-        switch (subsort) {
-            case "Recent ASC":
-                return (a: Quest, b: Quest) => new Date(a.config.startsAt).getTime() - new Date(b.config.startsAt).getTime();
-            case "Recent DESC":
-                return (a: Quest, b: Quest) => new Date(b.config.startsAt).getTime() - new Date(a.config.startsAt).getTime();
-            case "Expiring ASC":
-                return (a: Quest, b: Quest) => new Date(a.config.expiresAt).getTime() - new Date(b.config.expiresAt).getTime();
-            case "Expiring DESC":
-                return (a: Quest, b: Quest) => new Date(b.config.expiresAt).getTime() - new Date(a.config.expiresAt).getTime();
-            case "Claimed ASC":
-                return (a: Quest, b: Quest) => new Date(a.userStatus?.claimedAt || 0).getTime() - new Date(b.userStatus?.claimedAt || 0).getTime();
-            case "Claimed DESC":
-                return (a: Quest, b: Quest) => new Date(b.userStatus?.claimedAt || 0).getTime() - new Date(a.userStatus?.claimedAt || 0).getTime();
-            default:
-                return (a: Quest, b: Quest) => new Date(b.config.startsAt).getTime() - new Date(a.config.startsAt).getTime();
-        }
-    };
-
-    const unclaimedSortFunction = createSortFunction(unclaimedSubsort || "Recent DESC");
-
-    // Divide unclaimed Quests by completion status before applying subsort.
-    questGroups.unclaimed.sort((a: Quest, b: Quest) => {
-        const aCompleted = !!a.userStatus?.completedAt;
-        const bCompleted = !!b.userStatus?.completedAt;
-
-        if (aCompleted !== bCompleted) {
-            return aCompleted ? 1 : -1;
-        }
-
-        return unclaimedSortFunction(a, b);
-    });
-
-    questGroups.claimed.sort(createSortFunction(claimedSubsort || "Claimed DESC"));
-    questGroups.ignored.sort(createSortFunction(ignoredSubsort || "Recent DESC"));
-    questGroups.expired.sort(createSortFunction(expiredSubsort || "Expiring DESC"));
-
-    const sortedQuests: Quest[] = [];
-
-    orderList.forEach(status => {
-        if (questGroups[status]) {
-            sortedQuests.push(...questGroups[status]);
-        }
-    });
-
-    Object.keys(questGroups).forEach(status => {
-        if (!orderList.includes(status)) {
-            sortedQuests.push(...questGroups[status]);
-        }
-    });
-
-    return sortedQuests;
-}
-
-export function getQuestTileStyle(quest: Quest | null): Record<string, string> {
-    settings.use([
-        "restyleQuests",
-        "ignoredQuestIDs",
-        "ignoredQuestProfile"
-    ]);
-
-    const style: Record<string, string> = {};
-    let themeColor: RGB | null = null;
-
-    const restyleUnclaimed = settings.store.restyleQuestsUnclaimed;
-    const restyleClaimed = settings.store.restyleQuestsClaimed;
-    const restyleIgnored = settings.store.restyleQuestsIgnored;
-    const restyleExpired = settings.store.restyleQuestsExpired;
-
-    const claimedColor = restyleClaimed !== null ? decimalToRGB(restyleClaimed) : "";
-    const unclaimedColor = restyleUnclaimed !== null ? decimalToRGB(restyleUnclaimed) : "";
-    const ignoredColor = restyleIgnored !== null ? decimalToRGB(restyleIgnored) : "";
-    const expiredColor = restyleExpired !== null ? decimalToRGB(restyleExpired) : "";
-    const dummyProvided = quest?.dummyColor !== undefined;
-    const dummyColor = (quest?.dummyColor !== undefined && quest?.dummyColor !== null) ? decimalToRGB(quest.dummyColor) : null;
-    const questStatus = quest ? getQuestStatus(quest) : null;
-
-    if (questStatus === QuestStatus.Claimed) {
-        themeColor = dummyProvided ? dummyColor : claimedColor || null;
-    } else if (questStatus === QuestStatus.Unclaimed) {
-        themeColor = dummyProvided ? dummyColor : unclaimedColor || null;
-    } else if (questStatus === QuestStatus.Expired) {
-        themeColor = dummyProvided ? dummyColor : expiredColor || null;
-    } else if (questStatus === QuestStatus.Ignored) {
-        themeColor = dummyProvided ? dummyColor : ignoredColor || null;
-    }
-
-    if (!themeColor) return style;
-
-    const darkish = isDarkish(themeColor);
-    const sign = darkish ? 1 : -1;
-    const questNameColor = adjustRGB(themeColor, 200 * sign);
-    const rewardTitleColor = adjustRGB(themeColor, 150 * sign);
-    const rewardDescriptionColor = adjustRGB(themeColor, 100 * sign);
-    const buttonNormalColor = adjustRGB(themeColor, 50 * sign);
-    const buttonHoverColor = adjustRGB(themeColor, 75 * sign);
-
-    style["--questify-color"] = `rgb(${themeColor.r}, ${themeColor.g}, ${themeColor.b})`;
-    style["--questify-quest-name"] = `rgb(${questNameColor.r}, ${questNameColor.g}, ${questNameColor.b})`;
-    style["--questify-reward-title"] = `rgb(${rewardTitleColor.r}, ${rewardTitleColor.g}, ${rewardTitleColor.b})`;
-    style["--questify-reward-description"] = `rgb(${rewardDescriptionColor.r}, ${rewardDescriptionColor.g}, ${rewardDescriptionColor.b})`;
-    style["--questify-button-normal"] = `rgb(${buttonNormalColor.r}, ${buttonNormalColor.g}, ${buttonNormalColor.b})`;
-    style["--questify-button-hover"] = `rgb(${buttonHoverColor.r}, ${buttonHoverColor.g}, ${buttonHoverColor.b})`;
-
-    return style;
-}
-
-function shouldPreloadQuestAssets(): boolean {
-    const { restyleQuestsPreload } = settings.use(["restyleQuestsPreload"]);
-    return restyleQuestsPreload;
-}
-
-async function startVideoProgressTracking(quest: Quest, target: { raw: number; adjusted: number; }): Promise<void> {
-    quest = refreshQuest(quest);
-    const questName = normalizeQuestName(quest.config.messages.questName);
-    const task = getQuestTask(quest);
-    const { completeVideoQuestsQuicker } = settings.store;
-    const questEnrolledAt = quest.userStatus?.enrolledAt ? new Date(quest.userStatus.enrolledAt) : null;
-    const initialProgress = completeVideoQuestsQuicker
-        ? Number(Math.max(1, ((new Date()).getTime() - (questEnrolledAt ?? new Date()).getTime()) / 1000).toFixed(6))
-        : Math.max(0, getQuestProgress(quest, task) || 0);
-    activeQuestIntervals.set(quest.id, { progressTimeout: null as any, rerenderTimeout: null as any, progress: initialProgress, type: "watch" });
-    // Max up to ~25 seconds into the future can be reported.
-    const { raw: reportTarget, adjusted: questTargetWithLeeway } = target;
-    let currentProgress = initialProgress;
-    let currentProgressScaled = initialProgress;
-    const timeRemaining = Math.max(0, questTargetWithLeeway - currentProgressScaled);
-
-    QuestifyLogger.info(`[${getFormattedNow()}] Quest ${questName} will be completed in the background in ${timeRemaining} seconds.`);
-
-    if (!questEnrolledAt) {
-        const enrollmentTimeout = 60000;
-        const enrolled = await waitUntilEnrolled(quest, enrollmentTimeout, 15, QuestifyLogger);
-        quest = refreshQuest(quest);
-
-        if (!enrolled) {
-            QuestifyLogger.warn(`[${getFormattedNow()}] Quest ${questName} not enrolled within ${enrollmentTimeout / 1000} seconds.`);
-            activeQuestIntervals.delete(quest.id);
-            return;
-        }
-    }
-
-    if (!activeQuestIntervals.has(quest.id)) {
-        return;
-    }
-
-    const playbackTickMs = 250;
-    const minimumReportDelta = 6;
-    const maximumReportDelta = 8;
-    const floatPrecision = 6;
-    let progressIntervalId: NodeJS.Timeout | null = null;
-    let renderIntervalId: NodeJS.Timeout | null = null;
-    let maximumPlaybackTimestamp = Math.floor(initialProgress);
-    let nextReportThreshold = 0;
-    let hasReportedInitialProgress = currentProgressScaled <= 0;
-    let lastPlaybackTickAt = performance.now();
-
-    function clampFloat(value: number): number {
-        return Number(value.toFixed(floatPrecision));
-    }
-
-    function randomBetween(min: number, max: number): number {
-        return clampFloat(min + Math.random() * (max - min));
-    }
-
-    function getNextReportThreshold(currentPlaybackPosition: number): number {
-        return clampFloat(currentPlaybackPosition + randomBetween(minimumReportDelta, maximumReportDelta));
-    }
-
-    function getProgressToReport(currentPlaybackPosition: number): number {
-        const cappedProgress = clampFloat(Math.min(reportTarget, currentPlaybackPosition));
-        const lowerBound = nextReportThreshold > 0
-            ? nextReportThreshold
-            : clampFloat(Math.min(cappedProgress, 0.05));
-        const overshootAvailable = clampFloat(Math.max(0, cappedProgress - lowerBound));
-
-        return overshootAvailable > 0
-            ? clampFloat(lowerBound + randomBetween(0, overshootAvailable))
-            : lowerBound;
-    }
-
-    function updateQuestIntervalProgress(progress: number): void {
-        const intervalData = activeQuestIntervals.get(quest.id);
-
-        if (intervalData) {
-            intervalData.progress = Math.floor(progress);
-        }
-    }
-
-    function clearTrackingTimers(): void {
-        if (progressIntervalId) {
-            clearTimeout(progressIntervalId);
-        }
-
-        if (renderIntervalId) {
-            clearInterval(renderIntervalId);
-        }
-    }
-
-    async function handleSendComplete() {
-        clearTrackingTimers();
-        const success = await reportVideoQuestProgress(quest, maximumPlaybackTimestamp, QuestifyLogger);
-        activeQuestIntervals.delete(quest.id);
-        resetQuestsToResume(quest);
-
-        if (success) {
-            QuestifyLogger.info(`[${getFormattedNow()}] Quest ${questName} completed.`);
-
-            if (settings.store.notifyOnQuestComplete) {
-                showNotification({
-                    title: "Quest Completed!",
-                    body: `The ${questName} Quest has completed.`,
-                    dismissOnClick: true,
-                    onClick: () => NavigationRouter.transitionTo(`${questPath}#${quest.id}`)
-                });
-            }
-        } else {
-            QuestifyLogger.error(`[${getFormattedNow()}] Failed to complete Quest ${questName}.`);
-        }
-    }
-
-    const simulatedProgressToCover = reportTarget - currentProgressScaled;
-    const speedFactor = timeRemaining > 0 ? simulatedProgressToCover / timeRemaining : 0;
-
-    async function scheduleNextPlaybackTick(): Promise<void> {
-        progressIntervalId = setTimeout(async () => {
-            if (!activeQuestIntervals.has(quest.id)) {
-                return;
-            }
-
-            const now = performance.now();
-            const playbackElapsedSeconds = clampFloat((now - lastPlaybackTickAt) / 1000);
-            lastPlaybackTickAt = now;
-
-            currentProgress = clampFloat(Math.min(questTargetWithLeeway, currentProgress + playbackElapsedSeconds));
-            currentProgressScaled = clampFloat(Math.min(reportTarget, currentProgressScaled + playbackElapsedSeconds * speedFactor));
-            maximumPlaybackTimestamp = Math.max(maximumPlaybackTimestamp, Math.floor(currentProgressScaled));
-            updateQuestIntervalProgress(currentProgress);
-
-            if (hasReportedInitialProgress && currentProgressScaled >= nextReportThreshold && currentProgress < questTargetWithLeeway) {
-                const progressToReport = getProgressToReport(currentProgressScaled);
-                const reported = await reportVideoQuestProgress(quest, progressToReport, QuestifyLogger);
-
-                if (!reported) {
-                    clearTrackingTimers();
-                    activeQuestIntervals.delete(quest.id);
-                    QuestifyLogger.error(`[${getFormattedNow()}] Failed to report progress for Quest ${questName}.`);
-                    return;
-                }
-
-                nextReportThreshold = getNextReportThreshold(progressToReport);
-            }
-
-            if (currentProgress >= questTargetWithLeeway) {
-                await handleSendComplete();
-                return;
-            }
-
-            await scheduleNextPlaybackTick();
-        }, playbackTickMs);
-
-        const intervalData = activeQuestIntervals.get(quest.id);
-
-        if (intervalData && progressIntervalId) {
-            intervalData.progressTimeout = progressIntervalId;
-        }
-    }
-
-    updateQuestIntervalProgress(currentProgress);
-    renderIntervalId = setInterval(() => rerenderQuests(), 1000);
-
-    const intervalData = activeQuestIntervals.get(quest.id);
-
-    if (intervalData) {
-        intervalData.rerenderTimeout = renderIntervalId;
-    }
-
-    if (timeRemaining <= 0) {
-        await handleSendComplete();
-        return;
-    }
-
-    if (currentProgressScaled > 0) {
-        const initialProgressToReport = clampFloat(Math.min(reportTarget, currentProgressScaled));
-
-        void (async () => {
-            const reported = await reportVideoQuestProgress(quest, initialProgressToReport, QuestifyLogger);
-
-            if (!activeQuestIntervals.has(quest.id)) {
-                return;
-            }
-
-            if (!reported) {
-                clearTrackingTimers();
-                activeQuestIntervals.delete(quest.id);
-                QuestifyLogger.error(`[${getFormattedNow()}] Failed to report initial progress for Quest ${questName}.`);
-                return;
-            }
-
-            hasReportedInitialProgress = true;
-            nextReportThreshold = getNextReportThreshold(initialProgressToReport);
-        })();
-    }
-
-    lastPlaybackTickAt = performance.now();
-
-    await scheduleNextPlaybackTick();
-}
-
-async function startPlayGameProgressTracking(quest: Quest, target: { raw: number; adjusted: number; }): Promise<void> {
-    quest = refreshQuest(quest);
-    const questName = normalizeQuestName(quest.config.messages.questName);
-    const questEnrolledAt = quest.userStatus?.enrolledAt ? new Date(quest.userStatus.enrolledAt) : null;
-    const task = getQuestTask(quest);
-    const questTarget = target.adjusted;
-    const initialProgress = getQuestProgress(quest, task) || 0;
-    const remaining = Math.max(0, questTarget - initialProgress);
-    const maximumHeartbeatDurationMs = 60 * 1000;
-    const heartbeatBufferMs = 1 * 1000;
-    activeQuestIntervals.set(quest.id, { progressTimeout: null as any, rerenderTimeout: null as any, progress: initialProgress, type: "play" });
-
-    QuestifyLogger.info(`[${getFormattedNow()}] Quest ${questName} will be completed in the background in ${remaining} seconds.`);
-
-    if (!questEnrolledAt) {
-        const enrollmentTimeout = 60000;
-        const enrolled = await waitUntilEnrolled(quest, enrollmentTimeout, 500, QuestifyLogger);
-        quest = refreshQuest(quest);
-
-        if (!enrolled) {
-            QuestifyLogger.warn(`[${getFormattedNow()}] Quest ${questName} not enrolled after waiting for ${enrollmentTimeout / 1000} seconds.`);
-            activeQuestIntervals.delete(quest.id);
-            return;
-        }
-    }
-
-    if (!activeQuestIntervals.has(quest.id)) {
-        return;
-    }
-
-    let progressTimeoutId: NodeJS.Timeout | null = null;
-    let renderIntervalId: NodeJS.Timeout | null = null;
-
-    function getHeartbeatDurationMs(progress: number): number {
-        const remainingMs = Math.max(0, (questTarget - progress) * 1000);
-
-        return remainingMs <= maximumHeartbeatDurationMs
-            ? remainingMs + heartbeatBufferMs
-            : maximumHeartbeatDurationMs;
-    }
-
-    function clearTrackingTimers(): void {
-        if (progressTimeoutId) {
-            clearTimeout(progressTimeoutId);
-        }
-
-        if (renderIntervalId) {
-            clearTimeout(renderIntervalId);
-        }
-    }
-
-    function handleQuestComplete(): void {
-        clearTrackingTimers();
-        activeQuestIntervals.delete(quest.id);
-        QuestifyLogger.info(`[${getFormattedNow()}] Quest ${questName} completed.`);
-
-        if (settings.store.notifyOnQuestComplete) {
-            showNotification({
-                title: "Quest Completed!",
-                body: `The ${questName} Quest has completed.`,
-                dismissOnClick: true,
-                onClick: () => NavigationRouter.transitionTo(`${questPath}#${quest.id}`),
-            });
-        }
-    }
-
-    async function scheduleNextHeartbeat(progress: number): Promise<void> {
-        const heartbeatDurationMs = getHeartbeatDurationMs(progress);
-
-        progressTimeoutId = setTimeout(async () => {
-            const result = await reportPlayGameQuestProgress(quest, false, QuestifyLogger, { attempts: 3, delay: 2500 });
-
-            if (result.progress === null) {
-                clearTrackingTimers();
-                activeQuestIntervals.delete(quest.id);
-                QuestifyLogger.error(`[${getFormattedNow()}] Failed to send heartbeat for Quest ${questName}.`);
-                return;
-            }
-
-            const intervalData = activeQuestIntervals.get(quest.id);
-
-            if (intervalData) {
-                intervalData.progress = result.progress;
-            }
-
-            if (result.completed || result.progress >= questTarget) {
-                handleQuestComplete();
-                return;
-            }
-
-            await scheduleNextHeartbeat(result.progress);
-        }, heartbeatDurationMs);
-
-        const intervalData = activeQuestIntervals.get(quest.id);
-
-        if (intervalData && progressTimeoutId) {
-            intervalData.progressTimeout = progressTimeoutId;
-        }
-    }
-
-    const initial = await reportPlayGameQuestProgress(quest, false, QuestifyLogger, { attempts: 3, delay: 2500 });
-
-    if (initial.progress === null) {
-        activeQuestIntervals.delete(quest.id);
-        QuestifyLogger.error(`[${getFormattedNow()}] Failed to send heartbeat for Quest ${questName}.`);
-        return;
-    }
-
-    renderIntervalId = setInterval(() => {
-        const intervalData = activeQuestIntervals.get(quest.id);
-
-        if (!!intervalData) {
-            intervalData.progress += 1;
-        } else {
-            if (renderIntervalId) {
-                clearInterval(renderIntervalId);
-            }
-        }
-
-        rerenderQuests();
-    }, 1000);
-
-    const intervalData = activeQuestIntervals.get(quest.id);
-
-    if (intervalData) {
-        intervalData.progress = initial.progress || initialProgress;
-        intervalData.rerenderTimeout = renderIntervalId;
-    }
-
-    if (initial.completed || initial.progress >= questTarget) {
-        handleQuestComplete();
-        return;
-    }
-
-    await scheduleNextHeartbeat(initial.progress);
-}
-
-async function startAchievementActivityProgressTracking(quest: Quest, target: { raw: number; adjusted: number; }): Promise<void> {
-    const questName = normalizeQuestName(quest.config.messages.questName);
-    const questEnrolledAt = quest.userStatus?.enrolledAt ? new Date(quest.userStatus.enrolledAt) : null;
-    const achievementType = quest.config.taskConfigV2?.tasks.ACHIEVEMENT_IN_ACTIVITY;
-    activeQuestIntervals.set(quest.id, { progressTimeout: null as any, rerenderTimeout: null as any, progress: 0, type: "achievement" });
-
-    QuestifyLogger.info(`[${getFormattedNow()}] Quest ${questName} will be completed in the background.`);
-
-    if (!questEnrolledAt) {
-        const enrollmentTimeout = 60000;
-        const enrolled = await waitUntilEnrolled(quest, enrollmentTimeout, 15, QuestifyLogger);
-        quest = refreshQuest(quest);
-
-        if (!enrolled) {
-            QuestifyLogger.warn(`[${getFormattedNow()}] Quest ${questName} not enrolled within ${enrollmentTimeout / 1000} seconds.`);
-            activeQuestIntervals.delete(quest.id);
-            return;
-        }
-    }
-
-    if (!activeQuestIntervals.has(quest.id)) {
-        return;
-    }
-
-    const appID = achievementType?.applications?.[0].id;
-
-    if (!appID) {
-        QuestifyLogger.warn(`[${getFormattedNow()}] Could not find application ID for Quest ${questName}.`);
-        activeQuestIntervals.delete(quest.id);
-        return;
-    }
-
-    let authCode: string | null = null;
-
-    try {
-        const response = await RestAPI.post({
-            url: `/oauth2/authorize?client_id=${appID}&response_type=code&scope=identify%20applications.entitlements&state=`,
-            body: { authorize: true }
-        });
-
-        const location = response?.body?.location;
-
-        if (location) {
-            authCode = new URL(location).searchParams.get("code");
-        }
-
-        if (!authCode) {
-            QuestifyLogger.warn(`[${getFormattedNow()}] Auth code not found for Quest ${questName}.`);
-            activeQuestIntervals.delete(quest.id);
-            return;
-        }
-    } catch (error) {
-        QuestifyLogger.error(`[${getFormattedNow()}] Failed to retrieve auth code for Quest ${questName}:`, error);
-        activeQuestIntervals.delete(quest.id);
-        return;
-    }
-
-    const result = await QuestifyNative.complete(appID, authCode!, target.adjusted);
-    activeQuestIntervals.delete(quest.id);
-
-    if (!result.success) {
-        const errorReason = result.error || "An error occurred while completing the Quest.";
-        QuestifyLogger.error(`[${getFormattedNow()}] Failed to complete Quest ${questName}:`, errorReason);
-    } else {
-        QuestifyLogger.info(`[${getFormattedNow()}] Quest ${questName} completed.`);
-
-        if (settings.store.notifyOnQuestComplete) {
-            showNotification({
-                title: "Quest Completed!",
-                body: `The ${questName} Quest has completed.`,
-                dismissOnClick: true,
-                onClick: () => NavigationRouter.transitionTo(`${questPath}#${quest.id}`),
-            });
-        }
-    }
-
-    try {
-        const deauthToken = AuthorizedAppsStore.getNewestTokenForApplication(appID)?.id;
-
-        if (!deauthToken) {
-            throw new Error("Deauthorization token not found.");
-        }
-
-        await RestAPI.del({
-            url: `/oauth2/tokens/${deauthToken}/`,
-        });
-    } catch (error) {
-        QuestifyLogger.error(`[${getFormattedNow()}] Failed to deauthorize application for Quest ${questName}:`, error);
-    }
-}
-
-function canQuestAutoComplete(quest: Quest): boolean {
-    const { completeVideoQuestsInBackground, completeGameQuestsInBackground, completeAchievementQuestsInBackground } = settings.store;
-
-    const task = getQuestTask(quest);
-
-    if (!task) { return false; }
-
-    const questStatus = getQuestStatus(quest);
-    const questCompleted = !!quest.userStatus?.completedAt;
-
-    if (questStatus !== QuestStatus.Unclaimed || questCompleted) {
-        return false;
-    }
-
-    const isWatch = task.type === QuestTaskType.WATCH_VIDEO || task.type === QuestTaskType.WATCH_VIDEO_ON_MOBILE;
-    const isPlay = task.type === QuestTaskType.PLAY_ON_DESKTOP || task.type === QuestTaskType.PLAY_ON_XBOX || task.type === QuestTaskType.PLAY_ON_PLAYSTATION || task.type === QuestTaskType.PLAY_ACTIVITY;
-    const isAchievement = task.type === QuestTaskType.ACHIEVEMENT_IN_ACTIVITY;
-
-    const watchTypeCompatible = isWatch && completeVideoQuestsInBackground;
-    const playTypeCompatible = isPlay && completeGameQuestsInBackground && IS_DISCORD_DESKTOP;
-    const achievementTypeCompatible = isAchievement && completeAchievementQuestsInBackground && IS_DISCORD_DESKTOP;
-
-    if (watchTypeCompatible || playTypeCompatible || achievementTypeCompatible) {
-        return true;
-    }
-
-    return false;
-}
-
-function processQuestForAutoComplete(quest: Quest, force: boolean = false): boolean {
-    const questName = normalizeQuestName(quest.config.messages.questName);
-
-    const task = getQuestTask(quest);
-    const questTarget = getQuestTarget(task);
-    const existingInterval = activeQuestIntervals.get(quest.id);
-
-    const isWatch = task?.type === QuestTaskType.WATCH_VIDEO || task?.type === QuestTaskType.WATCH_VIDEO_ON_MOBILE;
-    const isPlay = task?.type === QuestTaskType.PLAY_ON_DESKTOP || task?.type === QuestTaskType.PLAY_ON_XBOX || task?.type === QuestTaskType.PLAY_ON_PLAYSTATION || task?.type === QuestTaskType.PLAY_ACTIVITY;
-    const isAchievement = task?.type === QuestTaskType.ACHIEVEMENT_IN_ACTIVITY;
-    const canAutoComplete = canQuestAutoComplete(quest);
-
-    if (force) {
-        manuallyStoppedQuestIDs.delete(quest.id);
-    } else if (manuallyStoppedQuestIDs.has(quest.id)) {
-        return false;
-    }
-
-    if (quest.userStatus?.completedAt || existingInterval) {
-        return false;
-    } else if (!task) {
-        QuestifyLogger.warn(`[${getFormattedNow()}] Could not recognize the Quest type for ${questName}.`);
-        return false;
-    } else if (!canAutoComplete) {
-        return false;
-    } else if (isWatch) {
-        startVideoProgressTracking(quest, questTarget);
-        return true;
-    } else if (isPlay) {
-        startPlayGameProgressTracking(quest, questTarget);
-        return true;
-    } else if (isAchievement) {
-        startAchievementActivityProgressTracking(quest, questTarget);
-        return true;
-    }
-
-    return false;
-}
-
-function shouldDisableQuestAcceptedButton(quest: Quest): boolean | null {
-    const { completeGameQuestsInBackground } = settings.store;
-
-    if (activeQuestIntervals.has(quest.id)) {
-        return true;
-    } else if (completeGameQuestsInBackground) {
-        if (IS_DISCORD_DESKTOP) {
-            return false;
-        }
-    }
-
-    return null;
-}
-
-function getQuestUnacceptedButtonText(quest: Quest): string | null {
-    const { completeGameQuestsInBackground, completeVideoQuestsInBackground, completeAchievementQuestsInBackground } = settings.store;
-
-    if (activeQuestIntervals.has(quest.id) || !!quest.userStatus?.enrolledAt) {
-        return null;
-    }
-
-    const task = getQuestTask(quest);
-    const { adjusted: target } = getQuestTarget(task);
-    const targetFormatted = `${String(Math.floor(target / 60)).padStart(2, "0")}:${String(target % 60).padStart(2, "0")}`;
-
-    const isWatch = task?.type === QuestTaskType.WATCH_VIDEO || task?.type === QuestTaskType.WATCH_VIDEO_ON_MOBILE;
-    const isPlay = task?.type === QuestTaskType.PLAY_ON_DESKTOP || task?.type === QuestTaskType.PLAY_ON_XBOX || task?.type === QuestTaskType.PLAY_ON_PLAYSTATION || task?.type === QuestTaskType.PLAY_ACTIVITY;
-    const isAchievement = task?.type === QuestTaskType.ACHIEVEMENT_IN_ACTIVITY;
-
-    if ((isPlay && completeGameQuestsInBackground && IS_DISCORD_DESKTOP) || (isWatch && completeVideoQuestsInBackground && target > 0)) {
-        return `Complete (${targetFormatted})`;
-    } else if ((isAchievement && completeAchievementQuestsInBackground) || (isWatch && completeVideoQuestsInBackground && target === 0)) {
-        return "Complete (Immediate)";
-    }
-
-    return null;
-}
-
-function getQuestAcceptedButtonText(quest: Quest, prepositional: boolean = false): string | null {
-    const { completeVideoQuestsQuicker, completeGameQuestsInBackground, completeVideoQuestsInBackground, completeAchievementQuestsInBackground } = settings.store;
-
-    quest = refreshQuest(quest);
-    const task = getQuestTask(quest);
-    const intervalData = activeQuestIntervals.get(quest.id);
-    const questEnrolledAt = quest.userStatus?.enrolledAt ? new Date(quest.userStatus.enrolledAt) : null;
-
-    const isWatch = task?.type === QuestTaskType.WATCH_VIDEO || task?.type === QuestTaskType.WATCH_VIDEO_ON_MOBILE;
-    const isPlay = task?.type === QuestTaskType.PLAY_ON_DESKTOP || task?.type === QuestTaskType.PLAY_ON_XBOX || task?.type === QuestTaskType.PLAY_ON_PLAYSTATION || task?.type === QuestTaskType.PLAY_ACTIVITY;
-    const isAchievement = task?.type === QuestTaskType.ACHIEVEMENT_IN_ACTIVITY;
-
-    if (questEnrolledAt) {
-        if (((isPlay && completeGameQuestsInBackground && IS_DISCORD_DESKTOP) || (isWatch && completeVideoQuestsInBackground))) {
-            const { adjusted: durationWithLeeway } = getQuestTarget(task);
-            const currentProgress = getQuestProgress(quest, task) ?? 0;
-            const progress = Math.min(currentProgress, durationWithLeeway);
-            const timeRemaining = Math.max(0, durationWithLeeway - progress);
-            const canCompleteImmediately = isWatch && (
-                completeVideoQuestsQuicker
-                    ? !!questEnrolledAt && ((new Date().getTime() - questEnrolledAt.getTime()) / 1000) >= durationWithLeeway
-                    : !timeRemaining
-            );
-            const progressFormatted = `${String(Math.floor(timeRemaining / 60)).padStart(2, "0")}:${String(timeRemaining % 60).padStart(2, "0")}`;
-            const progressFormattedAsPreposition = timeRemaining >= 60
-                ? `${Math.floor(timeRemaining / 60)}m ${timeRemaining % 60}s`
-                : `${timeRemaining % 60}s`;
-
-            if (!!intervalData) {
-                return canCompleteImmediately || !timeRemaining
-                    ? "Completing..."
-                    : `Completing ${prepositional ? `in ${progressFormattedAsPreposition}` : `(${progressFormatted})`}`;
-            } else if (isWatch || isPlay) {
-                return canCompleteImmediately ? "Complete (Immediate)" : timeRemaining === durationWithLeeway ? `Complete (${progressFormatted})` : `Resume (${progressFormatted})`;
-            }
-        } else if (isAchievement && completeAchievementQuestsInBackground) {
-            if (!!intervalData) {
-                return "Completing...";
-            } else {
-                return "Complete (Immediate)";
-            }
-        }
-    }
-
-    return null;
-}
-
-function getQuestPanelPercentComplete({ quest, percentCompleteText }: { quest: Quest; percentCompleteText?: string; }): { percentComplete: number; } | { percentComplete: number; percentCompleteText: string; } | null {
-    if (!quest) { return null; }
-
-    quest = refreshQuest(quest);
-    const task = getQuestTask(quest);
-
-    if (!task) { return null; }
-
-    const { adjusted: questTarget } = getQuestTarget(task);
-    const questProgress = getQuestProgress(quest, task);
-
-    if (!questTarget || questProgress === null) { return null; }
-
-    const decimal = Math.min(1, questProgress / questTarget);
-
-    return percentCompleteText ? {
-        percentComplete: decimal,
-        percentCompleteText: `${Math.floor(decimal * 100)}%`
-    } : {
-        percentComplete: decimal
-    };
-}
-
-function getQuestPanelSubtitleText(quest: Quest): string | null {
-    const questStatus = getQuestStatus(quest);
-    const questCompleted = !!quest.userStatus?.completedAt && questStatus === QuestStatus.Unclaimed;
-    const intervalData = activeQuestIntervals.get(quest.id);
-    const rewardItem = quest.config.rewardsConfig.rewards[0] || null;
-    const completingText = getQuestAcceptedButtonText(quest, true) || "Completing";
-    const completedText = questCompleted ? "Completed" : null;
-
-    if (!intervalData && !completedText) {
-        return null;
-    }
-
-    if (rewardItem?.orbQuantity) {
-        return `${completedText || completingText} for ${rewardItem.orbQuantity} Orbs.`;
-    } else if (rewardItem?.messages?.nameWithArticle) {
-        return `${completedText || completingText} for ${rewardItem.messages.nameWithArticle}.`;
-    } else {
-        return `${completedText || completingText} for an unrecognized reward.`;
-    }
-}
-
-function getQuestPanelTitleText(quest: Quest): string | null {
-    return normalizeQuestName(quest.config.messages.questName);
-}
-
-function getQuestPanelOverride(): Quest | null {
-    settings.use(["triggerQuestsRerender"]);
-    let closestQuest: Quest | null = null;
-    let closestTimeRemaining = Infinity;
-
-    activeQuestIntervals.forEach((interval, questId) => {
-        const quest = QuestsStore.getQuest(questId);
-
-        if (!quest) {
-            return;
-        }
-
-        const task = getQuestTask(quest);
-        const { adjusted: duration } = getQuestTarget(task);
-
-        if (!duration) {
-            return;
-        }
-
-        const timeRemaining = duration - interval.progress;
-
-        // 3 second buffer to account for per-second rerendering
-        // which could cause flickering if multiple Quests were
-        // started at the same time.
-        if (timeRemaining < (closestTimeRemaining - 3)) {
-            closestTimeRemaining = timeRemaining;
-            closestQuest = quest;
-        }
-    });
-
-    if (!closestQuest) {
-        const completedUnclaimedQuests = (Array.from(QuestsStore.quests.values()) as Quest[])
-            .filter(q => q.userStatus?.completedAt && getQuestStatus(q) === QuestStatus.Unclaimed)
-            .sort((a, b) => {
-                const aTime = new Date(a.userStatus?.completedAt as string).getTime();
-                const bTime = new Date(b.userStatus?.completedAt as string).getTime();
-                return bTime - aTime;
-            });
-
-        closestQuest = completedUnclaimedQuests[0] ?? null;
-    }
-
-    return closestQuest;
-}
-
-function disguiseHomeButton(location: string): boolean {
-    const { questButtonDisplay, unclaimedUnignoredQuests, onQuestsPage } = settings.use(["questButtonDisplay", "unclaimedUnignoredQuests", "onQuestsPage"]);
-
-    if (!showQuestsButton(questButtonDisplay, unclaimedUnignoredQuests, onQuestsPage)) {
-        return false;
-    }
-
-    return location === questPath;
-}
-
-function useQuestRerender(): number {
-    settings.use(["triggerQuestsRerender"]);
-    const [renderTrigger, setRenderTrigger] = useState(0);
-    useEffect(() => addRerenderCallback(() => setRenderTrigger(prev => prev + 1)), []);
-    return renderTrigger;
-}
-
-function getLastSortChoice(): string | null {
-    const { rememberQuestPageSort, lastQuestPageSort } = settings.store;
-    return rememberQuestPageSort ? lastQuestPageSort : "questify";
-}
-
-function getLastFilterChoices(): { group: string; filter: string; }[] | null {
-    const { rememberQuestPageFilters, lastQuestPageFilters } = settings.store;
-    return rememberQuestPageFilters ? Object.values(lastQuestPageFilters).map(item => JSON.parse(JSON.stringify(item))) : null;
-}
-
-function setLastSortChoice(sort: string): void {
-    if (!sort) sort = "questify";
-    settings.store.lastQuestPageSort = sort;
-}
-
-function setLastFilterChoices(filters: { group: string; filter: string; }[] | null): void {
-    if (!filters || filters.length === 0) {
-        settings.store.lastQuestPageFilters = {};
-        return;
-    }
-
-    if (!filters.every(f => f && f.group && f.filter)) {
-        return;
-    }
-
-    settings.store.lastQuestPageFilters = (JSON.parse(JSON.stringify(filters)) as { group: string; filter: string; }[]).reduce((acc, item) => {
-        acc[item.filter] = item;
-        return acc;
-    }, {});
-}
-
-function getQuestAcceptedButtonProps(quest: Quest, text: string, disabled: boolean, onClick?: () => void) {
-    const validTasks = [
-        QuestTaskType.WATCH_VIDEO,
-        QuestTaskType.WATCH_VIDEO_ON_MOBILE,
-        QuestTaskType.PLAY_ON_DESKTOP,
-        QuestTaskType.PLAY_ON_XBOX,
-        QuestTaskType.PLAY_ON_PLAYSTATION,
-        QuestTaskType.PLAY_ACTIVITY,
-        QuestTaskType.ACHIEVEMENT_IN_ACTIVITY
-    ];
-
-    const validTask = Array.from(validTasks).some(taskType => Object.values(quest.config.taskConfigV2?.tasks || {}).some(
-        task => task.type === taskType && (task.type !== QuestTaskType.WATCH_VIDEO_ON_MOBILE || settings.store.makeMobileQuestsDesktopCompatible)
-    ));
-
-    if (!validTask) {
-        return {
-            disabled: disabled,
-            text: text,
-            onClick: onClick,
-            icon: () => { }
-        };
-    }
-
-    return {
-        disabled: shouldDisableQuestAcceptedButton(quest) ?? disabled,
-        text: getQuestAcceptedButtonText(quest) ?? text,
-        onClick: () => { const startingAutocomplete = processQuestForAutoComplete(quest, true); !startingAutocomplete && onClick ? onClick() : null; },
-        icon: () => { }
-    };
-}
-
-function resetQuestsToResume(quest?: Quest): void {
-    if (quest) {
-        settings.store.resumeQuestIDs.play = settings.store.resumeQuestIDs.play.filter(id => id !== quest.id);
-        settings.store.resumeQuestIDs.watch = settings.store.resumeQuestIDs.watch.filter(id => id !== quest.id);
-        settings.store.resumeQuestIDs.achievement = settings.store.resumeQuestIDs.achievement.filter(id => id !== quest.id);
-    } else {
-        settings.store.resumeQuestIDs = {
-            watch: [],
-            play: [],
-            achievement: [],
-        };
-    }
-}
-
-// Drop support for QuestCompleter and migrate to Questify settings.
-migratePluginToSettings(true, "Questify", "QuestCompleter", "completeVideoQuestsInBackground", "completeGameQuestsInBackground", "completeAchievementQuestsInBackground");
-
 export default definePlugin({
     name: "Questify",
-    description: "Enhance your Quest experience with a suite of features, or disable them entirely if they're not your thing.",
+    description: "Enhance specific Quest features, disable annoyances, or completely remove Quests.",
+    tags: ["Appearance", "Customisation", "Privacy", "Utility"],
     authors: [EquicordDevs.Etorix],
     dependencies: ["AudioPlayerAPI", "ServerListAPI"],
     startAt: StartAt.Init, // Needed in order to beat Read All Messages to inserting above the server list.
     settings,
 
-    sortQuests,
-    formatLowerBadge,
-    getQuestTileStyle,
-    getQuestTileClasses,
-    makeDesktopCompatible,
-    shouldHideQuestPopup,
-    shouldHideDiscoveryTab,
-    shouldPreloadQuestAssets,
-    shouldHideDirectMessagesTab,
-    shouldPreventFetchingQuests,
-    shouldHideBadgeOnUserProfiles,
-    shouldHideSponsoredQuestBanner,
-    shouldHideGiftInventoryRelocationNotice,
-    shouldHideFriendsListActiveNowPromotion,
-    shouldHideMembersListActivelyPlayingIcon,
-    getQuestUnacceptedButtonText,
-    getQuestPanelPercentComplete,
-    processQuestForAutoComplete,
-    getQuestAcceptedButtonProps,
-    getQuestAcceptedButtonText,
-    getQuestPanelSubtitleText,
-    getQuestPanelTitleText,
-    getQuestPanelOverride,
-    setLastFilterChoices,
-    getLastFilterChoices,
-    activeQuestIntervals,
+    canOpenDevToolsWindow,
+    canAutoCompleteQuest,
     disguiseHomeButton,
+    enrolledIncompleteButton,
+    formatLowerBadge,
+    getActiveAutoCompletes,
+    getLastFilterChoices,
     getLastSortChoice,
+    getQuestAutoCompleteProgress,
+    getQuestButtonProps,
+    getQuestPanelOverride,
+    getQuestPanelPercentComplete,
+    getQuestPanelSubtitleText,
+    getQuestTileClasses,
+    getQuestTileStyle,
+    getSettingsModalOpen,
+    hasEnabledAutoCompleteQuestTypes,
+    normalizeQuestName,
+    openDevToolsWindow,
+    processQuestForAutoComplete,
+    rerenderQuests,
+    setHeartbeatStackTracePatchSucceeded,
+    setLastFilterChoices,
     setLastSortChoice,
+    setVideoProgressStackTracePatchSucceeded,
+    shouldForceQuestPanelVisible,
+    shouldPreloadQuestAssets,
+    sortQuests,
+    stopQuestAutoComplete,
     useQuestRerender,
 
     patches: [
         {
-            // Hides the notice in the gift inventory that Quests have been relocated to the Discovery tab.
-            find: "quests-wumpus-hikes-mountain-transparent-background",
+            // Prevent color picker modal and dummy Quest button context menu modal
+            // from force scrolling back up to the top of the settings when closed.
+            find: ",NodeFilter.SHOW_ELEMENT,{acceptNode:function(",
             replacement: {
-                match: /return(?=\(0,\i.\i\)\("div",{className:)/,
-                replace: "return $self.shouldHideGiftInventoryRelocationNotice()?null:"
+                match: /\.focus\(\)/g,
+                replace: ".focus({preventScroll:$self.getSettingsModalOpen()?!0:undefined})"
             }
         },
+        {
+            // Exports the guildless server list item component used by the Quest button.
+            find: '="DOWNLOAD_APPS";function',
+            replacement: {
+                match: /(?=\i:\(\)=>\i.{0,30000}?asContainer:!\i.{0,50};let (\i)=\i.forwardRef\(function)/,
+                replace: "GuildlessServerListItemComponent:()=>$1,"
+            }
+        },
+        {
+            // Prevents the DMs Quests tab from counting as part of the
+            // DM button highlight logic while the Quest button is visible.
+            find: "GLOBAL_DISCOVERY),",
+            predicate: () => !getQuestifySettings().disableQuestsEverything && showQuestButton(getQuestifySettings().questButtonDisplay, 1, true),
+            replacement: {
+                match: /(pathname:(\i)}.{0,400}?return )/,
+                replace: "$1$self.disguiseHomeButton($2)?false:"
+            }
+        },
+        {
+            // Hides the Quest icon on members list nameplates.
+            find: '("ActivityStatus"),',
+            predicate: () => getQuestifySettings().disableQuestsEverything || getQuestifySettings().disableMembersListPromo,
+            replacement: {
+                match: /(,hasQuest:)(?=\i=!1)/,
+                replace: ",questifyInvalid1:"
+            }
+        },
+        {
+            // Hides the Friends List "Active Now" promotion.
+            find: "`application-stream-",
+            predicate: () => getQuestifySettings().disableQuestsEverything || getQuestifySettings().disableFriendsListPromo,
+            replacement: [
+                {
+                    match: /(?<=let{party:\i,onChannelContextMenu:\i,)quest:(\i)/,
+                    replace: "questifyInvalid2:$1=null"
+                }
+            ]
+        },
         {
             // Hides Quests tab in the Discovery page.
             find: "GLOBAL_DISCOVERY_SIDEBAR},",
+            predicate: () => getQuestifySettings().disableQuestsEverything || getQuestifySettings().disableRelocationNotices,
             replacement: [
                 {
                     match: /(GLOBAL_DISCOVERY_TABS).map/,
-                    replace: '$1.filter(tab=>!(tab==="quests"&&$self.shouldHideDiscoveryTab())).map'
+                    replace: '$1.filter(tab=>tab!=="quests").map'
                 }
             ]
         },
         {
             // Hides Quests tab in the DMs tab list.
             find: ".QUEST_HOME):",
+            predicate: () => getQuestifySettings().disableQuestsEverything,
             replacement: [
                 {
                     match: /(?<="family-center"\):null,)/,
-                    replace: "$self.shouldHideDirectMessagesTab()||"
+                    replace: "null&&"
                 }
             ]
         },
         {
             // Hides the sponsored banner on the Quests page.
-            find: "{isInDiscoverQuestHomeTab:",
+            find: "resetSortingFiltering(),requestAnimationFrame",
             group: true,
+            predicate: () => !getQuestifySettings().disableQuestsEverything && getQuestifySettings().disableSponsoredBanner,
             replacement: [
                 {
-                    match: /(?<=scrollToQuest\(\i\)\}\)\},\[\]\);)/,
-                    replace: "const shouldHideSponsoredQuestBanner=$self.shouldHideSponsoredQuestBanner();"
-                },
-                {
-                    match: /(?<=return null;if\(\i)(\).{0,30}?null!=\i)/,
-                    replace: "&&!shouldHideSponsoredQuestBanner$1&&!shouldHideSponsoredQuestBanner"
+                    match: /(?<=(\i),isLoading:(\i)}=\(0,\i.\i\)\(\);)/,
+                    replace: "if(true){$1=null;$2=false;};"
                 }
             ]
         },
         {
-            // Hides the Quest icon from members list items when
-            // a user is playing a game tied to an active Quest.
-            find: '"ActivityStatus")',
-            group: true,
-            replacement: [
-                {
-                    match: /(?<=\i\)&&"xs"===\i;)/,
-                    replace: "const shouldHideMembersListActivelyPlayingIcon=$self.shouldHideMembersListActivelyPlayingIcon();"
-                },
-                {
-                    match: /(?<=\i\(\),\i&&)/,
-                    replace: "!shouldHideMembersListActivelyPlayingIcon&&"
-                }
-            ]
-        },
-        {
-            // Hides the Quest badge on user profiles.
+            // Hides the Quest & Orbs badges on user profiles.
             find: ".MODAL]:26",
             group: true,
+            predicate: () => !getQuestifySettings().disableQuestsEverything && getQuestifySettings().disableOrbsAndQuestsBadges,
             replacement: [
-                {
-                    match: /(return 0===\i.length\?null:\(0,)/,
-                    replace: "const shouldHideBadgeOnUserProfiles=$self.shouldHideBadgeOnUserProfiles();$1"
-                },
                 {
                     match: /(badges:\i)/,
-                    replace: '$1.filter(badge=>!(["quest_completed","orb_profile_badge"].includes(badge.id)&&shouldHideBadgeOnUserProfiles))',
+                    replace: '$1.filter(badge=>!["quest_completed","orb_profile_badge"].includes(badge.id))',
                 }
             ]
         },
         {
-            // Hides the new Quest popup above the account panel.
-            // Allows in-progress Quests to still show.
+            // Overrides the account panel Quest popup and progress display.
             find: "QUESTS_BAR,questId",
+            predicate: () => getQuestifySettings().disableAccountPanelPromo || !getQuestifySettings().disableAccountPanelQuestProgress,
             replacement: {
-                match: /(?<=function\(\){let (\i)=\(0,\i.\i\)\(\);)(return)/,
-                replace: "const hidePopup=$self.shouldHideQuestPopup($1);$2 hidePopup||"
+                match: /(?<=function\(\){)(let (\i)=\(0,\i.\i\)\(\);)/,
+                replace: "void $self.useQuestRerender();$1$2=$self.getQuestPanelOverride($2);"
             }
         },
         {
-            // Fixes the progress tracking for auto-completing Quests.
+            // Prevents fetching Quests.
+            find: 'type:"QUESTS_FETCH_CURRENT_QUESTS_BEGIN"',
+            group: true,
+            predicate: () => getQuestifySettings().disableQuestsEverything,
+            replacement: [
+                {
+                    // QUESTS_FETCH_CURRENT_QUESTS_BEGIN
+                    match: /(?=if\(!\i.\i.isFetchingCurrentQuests\))/,
+                    replace: "return;"
+                },
+                {
+                    // QUESTS_FETCH_QUEST_TO_DELIVER_BEGIN
+                    match: /(?=let.{0,150}QUESTS_FETCH_QUEST_TO_DELIVER_BEGIN)/,
+                    replace: "return;"
+                }
+            ]
+        },
+        {
+            // Fixes the progress tracking for Quests.
             find: ",{progressTextAnimation:",
+            predicate: () => !getQuestifySettings().disableQuestsEverything,
             replacement: {
                 match: /(let{percentComplete:.{0,115}?children:\i}=)(\i)/,
                 replace: "const questifyProgress=$self.getQuestPanelPercentComplete({...$2,quest:$2.children?.props?.quest});$1Object.assign({},$2,questifyProgress??{})"
             }
         },
         {
-            // Overrides the title and subtitle to provide more
-            // useful information for Quests being auto-completed.
+            // Overrides the title and subtitle to provide more useful information for Quests being completed.
             find: '"progress-title"',
+            predicate: () => !getQuestifySettings().disableQuestsEverything,
             replacement: {
                 match: /(?<={quest:(\i).{0,250}?return.{0,150}?,percentComplete:\i.{0,280}?"progress-title",children.{0,115}?children:)(\i.{0,50}"progress-subtitle",isTextTransition:!0,children.{0,115}?children:)/,
-                replace: "$self.getQuestPanelTitleText($1)??$2$self.getQuestPanelSubtitleText($1)??"
-            }
-        },
-        {
-            // Replaces the default displayed Quest with the soonest to
-            // be completed Quest which is actively being auto-completed.
-            find: '"useQuestBarQuest"})',
-            replacement: {
-                match: /(?<=null\);return )(\i\?\i:\i)/,
-                replace: "$self.getQuestPanelOverride()??($1)"
-            }
-        },
-        {
-            // Hides the Friends List "Active Now" promotion.
-            find: "`application-stream-",
-            group: true,
-            replacement: [
-                {
-                    match: /(let{party)/,
-                    replace: "const shouldHideFriendsListActiveNowPromotion=$self.shouldHideFriendsListActiveNowPromotion();$1"
-                },
-                {
-                    match: /(null!=(\i)&&null!=\i&&)/,
-                    replace: "!shouldHideFriendsListActiveNowPromotion&&$1"
-                }
-            ]
-        },
-        {
-            // Prevents fetching Quests.
-            find: 'type:"QUESTS_FETCH_CURRENT_QUESTS_BEGIN"',
-            group: true,
-            replacement: [
-                {
-                    // QUESTS_FETCH_CURRENT_QUESTS_BEGIN
-                    match: /(if\(!\i.\i.isFetchingCurrentQuests\))/,
-                    replace: "if($self.shouldPreventFetchingQuests())return;$1"
-                },
-                {
-                    // QUESTS_FETCH_QUEST_TO_DELIVER_BEGIN
-                    match: /(?=let.{0,150}QUESTS_FETCH_QUEST_TO_DELIVER_BEGIN)/,
-                    replace: "if($self.shouldPreventFetchingQuests())return;"
-                }
-            ]
-        },
-        {
-            // MARK: TODO 1
-            //  - Cleanup once Discord rolls out the new mana select completely.
-            //  - Also see anywhere DynamicDropdown is used for refactoring.
-            //
-            // Various patches to the SearchableSelect component.
-            find: ".popoutLayerContext,renderPopout:",
-            group: true,
-            replacement: [
-                {
-                    // Extracts a custom feedback prop before the variable is overwritten.
-                    match: /(?<=forwardRef\(function\((\i),\i\){)/,
-                    replace: "const vcDynamicDropdownFeedback=$1.feedback;"
-                },
-                {
-                    // Passes the custom prop to the dropdown's invalid handler.
-                    match: /((\i);return\(0,\i.\i\)\(\i,{)(loading:\i,)/,
-                    replace: "$1feedback:vcDynamicDropdownFeedback,$3"
-                },
-                {
-                    // Makes use of the custom prop if provided, otherwise assume default behavior.
-                    match: /(\i.intl.string\(\i.\i#{intl::NO_RESULTS_FOUND}\))/,
-                    replace: "arguments[0]?.feedback??$1"
-                },
-                {
-                    // Prevent SearchableSelect from force-scrolling into view, causing the dropdown to close.
-                    match: /(&&\i.current\?\.scrollIntoView\(\))/,
-                    replace: ""
-                },
-                {
-                    // Passes a popoutClassName and optionClassName to the popout handler.
-                    match: /(?<=renderOptionPrefix:\i,renderOptionSuffix:\i)/,
-                    replace: ",popoutClassName:arguments[0]?.popoutClassName,optionClassName:arguments[0]?.optionClassName"
-                },
-                {
-                    // Makes use of the custom popoutClassName prop if provided.
-                    match: /"aria-busy":!0,className:\i\(\)\(/,
-                    replace: "$&arguments[0]?.popoutClassName,"
-                },
-                {
-                    // Passes the custom optionClassName prop to the row renderer.
-                    match: /(?<="aria-posinset":\i,"aria-setsize":\i.length,)/,
-                    replace: "optionClassName:arguments[0]?.optionClassName,"
-                },
-                {
-                    // Makes use of the custom optionClassName prop if provided.
-                    match: /(?<=focusProps:{enabled:!1},className:\i\(\)\()/,
-                    replace: "arguments[0]?.optionClassName,"
-                },
-                {
-                    // Pass the unused props to the new mana select being
-                    // used by dev://experiment/2025-09-mana-desktop-select
-                    match: /(?<=closeOnSelect:\i)(?=})/,
-                    replace: ",...arguments[0]"
-                }
-            ]
-        },
-        {
-            // Prevent the new version of SearchableSelect from force-scrolling into view.
-            find: '"data-mana-component":"combobox",',
-            replacement: {
-                match: /\i.current\?\.scrollIntoView\({.{0,50}?}\)/,
-                replace: ""
+                replace: "$self.normalizeQuestName($1)??$2$self.getQuestPanelSubtitleText($1)??"
             }
         },
         {
             // Formats the Orbs balance on the Quests page with locale string formatting.
             find: '("BalanceCounter")',
+            predicate: () => !getQuestifySettings().disableQuestsEverything,
             replacement: [
                 {
                     match: /(`\${(\i).toFixed\(0\)}`.length)/,
@@ -1600,6 +289,223 @@ export default definePlugin({
                 }
             ]
         },
+        {
+            // Removes stack traces from Quest auto-complete network actions and marks both patches as healthy.
+            find: "NetworkActionNames.QUEST_VIDEO_PROGRESS,",
+            group: true,
+            predicate: () => !getQuestifySettings().disableQuestsEverything && hasEnabledAutoCompleteQuestTypes(),
+            replacement: [
+                {
+                    match: /(async function \i\(\i,\i\)\{await \i\.\i\.post\(\{url:\i\.\i\.QUESTS_VIDEO_PROGRESS.{0,200}?stack_trace:)Error\(\)\.stack\?\?""/,
+                    replace: '$self.setVideoProgressStackTracePatchSucceeded();$1""'
+                },
+                {
+                    match: /(async function \i\(\i\)\{let\{questId:\i,streamKey:\i.{0,350}?stack_trace:)Error\(\)\.stack\?\?""/,
+                    replace: '$self.setHeartbeatStackTracePatchSucceeded();$1""'
+                }
+            ]
+        },
+        {
+            find: "resetSortingFiltering(),requestAnimationFrame",
+            group: true,
+            predicate: () => !getQuestifySettings().disableQuestsEverything,
+            replacement: [
+                {
+                    // Subscribes the Quest page sort/filter state to Questify rerenders.
+                    match: /(let \i,\i,\i,\i,\i=\i\.useRef\(null\),)/,
+                    replace: "$1questRerenderTrigger=$self.useQuestRerender(),"
+                },
+                {
+                    // Set the initial sort method.
+                    match: /(\i.\i.SUGGESTED)/,
+                    replace: "$self.getLastSortChoice()??$1"
+                },
+                {
+                    // Set the initial filters and update the filters and sort method when they change.
+                    match: /(get\(\i\)\)\?\?)(\i,\[)(\i)(\]\),\i=\i.useCallback\((\i)=>{)(.{0,60}?useCallback\((\i)=>{)/,
+                    replace: "$1$self.getLastFilterChoices()??$2$3,questRerenderTrigger$4$self.setLastSortChoice($5);$6$self.setLastFilterChoices($7);$self.rerenderQuests();"
+                },
+                {
+                    // Update the last used sort and filter choices when the toggle setting for either is changed.
+                    match: /(?<=ALL,\i.useMemo\(\(\)=>\()({sortMethod:(\i),filters:(\i))/,
+                    replace: "$self.setLastSortChoice($2),$self.setLastFilterChoices($3),$1"
+                },
+                {
+                    // Makes the reset action return to the Questify sort option.
+                    match: /(?<=resetSortingFiltering:\(\)=>{\i\(\),\i\()\i.\i.SUGGESTED/,
+                    replace: '"questify"'
+                }
+            ]
+        },
+        {
+            find: "config.taskConfigV2.tasks).length)return",
+            group: true,
+            predicate: () => !getQuestifySettings().disableQuestsEverything && hasEnabledAutoCompleteQuestTypes(),
+            replacement: [
+                {
+                    // Overwrite button props for UNENROLLED Quests.
+                    match: /(?<=onClick:(\(\)=>{.[^}]+}),text:(\i),icon:\i,fullWidth:!0)/,
+                    replace: ",...($self.getQuestButtonProps(arguments[0])??{})"
+                },
+                {
+                    // Overwrite button props for ENROLLED/INCOMPLETE Quests.
+                    match: /(?<=let{quest:\i,taskType:\i,surface:\i.{0,150}?size:\i}=\i;return)(.{0,300}?taskType:\i,size:\i,analyticsCtxQuestContent:\i,analyticsCtxSourceQuestContent:\i}\))/,
+                    replace: " $self.enrolledIncompleteButton(arguments[0])||($1)"
+                }
+            ]
+        },
+        {
+            // Overwrite button props for Quest bar.
+            find: "QUESTS_BAR,questId",
+            predicate: () => !getQuestifySettings().disableQuestsEverything && hasEnabledAutoCompleteQuestTypes(),
+            replacement: {
+                match: /(?<=SELECT&&!\i&&!\i,(\i)=null;)(return )(\i\?\i=\(0,\i.\i\)\(\i,{quest:(\i))/,
+                replace: "const questifyButton=$self.enrolledIncompleteButton({quest:$4});$2questifyButton?$1=questifyButton:$3"
+            }
+        },
+        {
+            // Keeps Questify completion progress visible when Discord marks the native Quest bar dismissed.
+            find: "prevIsQuestAccepted:",
+            predicate: () => !getQuestifySettings().disableQuestsEverything && !getQuestifySettings().disableAccountPanelQuestProgress,
+            replacement: {
+                match: /(?<=isLoading:\i}=\(0,\i.\i\)\(\),\i=\i\.useContext\(\i\.\i\)\|\|\i&&)(\i)/,
+                replace: "($1||$self.shouldForceQuestPanelVisible(arguments[0].quest))"
+            }
+        },
+        {
+            find: ".rowIndex,trackGuildAndChannelMetadata",
+            group: true,
+            predicate: () => !getQuestifySettings().disableQuestsEverything,
+            replacement: [
+                {
+                    // Prevent the platform selector if the Quest is auto-completable.
+                    match: /(?<=ACCEPTED,\i=)(?=\i&&)/,
+                    replace: "!$self.canAutoCompleteQuest(arguments[0].quest)&&"
+                },
+                {
+                    // Prevent the platform selector if the Quest is auto-completable.
+                    match: /(?<=SELECT,\i=)(?=\i&&)/,
+                    replace: "!$self.canAutoCompleteQuest(arguments[0].quest)&&"
+                },
+                // If this group becomes unruly due to Discord refactoring and is unfixable,
+                // the 2nd, 3rd, and 4th can be commented out in favor of just the 1st at the
+                // expense of not seeing CTA buttons on completed but unclaimed Quests.
+                {
+                    // Always expose the CTA button when available instead of only for videos and activities.
+                    match: /(?<=wrap:!1,children:\[)\i&&[^?]+/,
+                    replace: "!!arguments[0].quest.config.ctaConfig"
+                },
+                {
+                    // Let completed/claimed expired Quests with CTAs use the CTA-aware completed branch.
+                    match: /(?<=return\()(?=\i.enabled&&\i===\i\.\i\.EXPIRED_CLAIMABLE&&\i\.\i\.has\(\i\))/,
+                    replace: "!arguments[0].quest.config.ctaConfig&&"
+                },
+                {
+                    // Let completed/claimed expired Quests with CTAs use the CTA-aware completed branch.
+                    match: /(?<=\):\i\?\i=)(\i)(?=\?\(0,\i\.jsx\)\(\i,\{quest:\i,sourceQuestContent:\i,onClick:\i,text:\i\}\):\(0,\i\.\i\)\(\i\)\?)/,
+                    replace: "arguments[0].quest.config.ctaConfig||$1"
+                },
+                {
+                    // Force the CTA-aware complete branch.
+                    match: /(?<=analyticsCtxQuestContentRowIndex:\i}\)}\):\i&&\i)(.{0,200}?fullWidth:!0}\)}\):)(\i.enabled)(.{0,50}?CLAIMED\))&&\i.\i.has\(\i\)(\?\i=)\i/,
+                    replace: "&&false$1arguments[0].quest.config.ctaConfig&&arguments[0].quest.userStatus?.completedAt&&($2||true)$3$4true"
+                }
+            ]
+        },
+        {
+            find: ".rowIndex,trackGuildAndChannelMetadata",
+            group: true,
+            predicate: () => !getQuestifySettings().disableQuestsEverything,
+            replacement: [
+                {
+                    // Subscribes each Quest tile to Questify's manual rerender trigger.
+                    match: /(?=return\(0,\i\.\i\)\("div",\{id:`quest-tile-\$\{\i\.id\}`)/,
+                    replace: "void $self.useQuestRerender();"
+                },
+                {
+                    // Adds Questify tile classes and inline CSS variables.
+                    match: /(?<=className:)(\i\(\)\(\i\.\i,\i\))(?=,onMouseEnter)/,
+                    replace: "$self.getQuestTileClasses($1,arguments[0].quest),style:$self.getQuestTileStyle(arguments[0].quest)"
+                },
+                {
+                    // Skips the reward placeholder when assets are preloaded.
+                    match: /(?<=showPlaceholder:)(!\i)(?=,width)/g,
+                    replace: "$self.shouldPreloadQuestAssets()?!1:$1"
+                },
+                {
+                    // Disables lazy loading for Quest art when preloading is enabled.
+                    match: /(?<=onLoadComplete:\i,lazyLoad:)!0/g,
+                    replace: "$self.shouldPreloadQuestAssets()?!1:!0"
+                },
+                {
+                    // Treats the banner & reward content as visible so it loads immediately when preloading.
+                    match: /(?<=isVisibleInViewport:)(\i)(?=,sourceQuestContent:\i\}\))/g,
+                    replace: "$self.shouldPreloadQuestAssets()?true:$1"
+                }
+            ]
+        },
+        {
+            // Adds the Questify sort option to Discord's Quest sort enum.
+            find: "SUGGESTED=\"suggested\",",
+            predicate: () => !getQuestifySettings().disableQuestsEverything,
+            replacement: {
+                match: /(?<=\(\((\i)=\{\}\))(?=\.SUGGESTED="suggested",)/,
+                replace: ".QUESTIFY=\"questify\",$1"
+            }
+        },
+        {
+            // Labels the injected Questify sort option in the dropdown.
+            find: "has no rewards configured`",
+            predicate: () => !getQuestifySettings().disableQuestsEverything,
+            replacement: {
+                match: /(?=case (\i\.\i)\.SUGGESTED)/,
+                replace: "case $1.QUESTIFY:return\"Questify\";"
+            },
+        },
+        {
+            find: "CLAIMED=\"claimed\",",
+            group: true,
+            predicate: () => !getQuestifySettings().disableQuestsEverything,
+            replacement: [
+                {
+                    // Runs Questify sorting in the hook-safe Quest list path and tracks manual rerenders.
+                    match: /,(\i)=new Map\((\i)\.map/,
+                    replace: ";const questRerenderTrigger=$self.useQuestRerender();const questifySorted=$self.sortQuests($2,arguments[1]?.sortMethod!==\"questify\");let $1=new Map($2.map"
+                },
+                {
+                    // Replaces Discord's filtered Quest list with Questify's order only when selected.
+                    match: /(?=if\(0===(\i)\.length\)return\[\];if\(\i\.current\.length>0)/,
+                    replace: "if(arguments[1]?.sortMethod===\"questify\"){$1=questifySorted;};"
+                },
+                {
+                    // Bypasses Discord's memo cache while the Questify sort is active.
+                    match: /(if\(\i\.current\.length>0&&\i\.current===\i\.length&&\i\.current===\i\.sortMethod&&\i\.current===\i\.filters&&\i\.current===\i)(\)return \i\.current;)/,
+                    replace: "$1&&arguments[1]?.sortMethod!==\"questify\"$2"
+                },
+                {
+                    // If we already applied Questify's sort, skip further sorting.
+                    match: /(?<=\{sortMethod:(\i).{0,750}?return )((\i).sort)/,
+                    replace: "$1===\"questify\"?$3:$2"
+                },
+                {
+                    // Recomputes Discord's Quest list memo when Questify settings or rerenders change.
+                    match: /(?<=\.id\);return \i\.current=\i,\i\.current=\i\.sortMethod,\i\.current=\i\.filters,\i\.current=\i\.length,\i\.current=\i,\i\},\[)(\i,\i,\i)(?=\]\)\))/,
+                    replace: "$1,questRerenderTrigger,questifySorted"
+                }
+            ]
+        },
+        {
+            // Sorts the "Claimed Quests" tabs.
+            find: ".ALL)}):(",
+            group: true,
+            predicate: () => !getQuestifySettings().disableQuestsEverything,
+            replacement: [
+                {
+                    match: /(return \i&&0===\i.length.{0,150}?children:)\[\.\.\.(\i).{0,100}?claimedAt\?\?""\)\)/,
+                    replace: "const questifySorted=$self.sortQuests($2);$1questifySorted"
+                },
+            ]
+        },
         {
             // Adds a maxDigits prop to the LowerBadge component which allows for not truncating, or for truncating at a specific threshold.
             find: ".INTERACTIVE_TEXT_ACTIVE.css,shape",
@@ -1616,381 +522,127 @@ export default definePlugin({
                     replace: "$1,maxDigits"
                 },
                 {
-                    // Makes use of the custom prop if provided by using custom logic for negatives and truncation.
-                    // If the prop is not provided, assume default behavior for native badges or other plugins not
-                    // utilizing the custom prop.
+                    // Makes use of the custom prop if provided by using custom logic for negatives and
+                    // truncation. If the prop is not provided, assume default behavior for native badges.
                     match: /(?<=function \i\((\i))(\){return )(\i<1e3.{0,60}?k\+`)/,
                     replace: ",maxDigits$2maxDigits===undefined?($3):$self.formatLowerBadge($1,maxDigits)[0]"
                 }
             ]
         },
-        {
-            find: "id:`quest-tile-",
-            group: true,
-            replacement: [
-                {
-                    // Restyles Quest tiles with colors.
-                    match: /(?<=\i.current=\i},className:)(\i\(\)\(\i.\i,\i\)),/,
-                    replace: "$self.getQuestTileClasses($1,arguments[0].quest),style:$self.getQuestTileStyle(arguments[0].quest),"
-                },
-                {
-                    // Encourages banners to load quicker if the setting is enabled.
-                    match: /(warningHints:\i,)isVisibleInViewport:(\i)/,
-                    replace: "$1isVisibleInViewport:$self.shouldPreloadQuestAssets()?true:$2"
-                },
-                {
-                    // Encourages reward icons to load quicker if the setting is enabled.
-                    match: /(onReceiveErrorHints:\i,)isVisibleInViewport:(\i)/,
-                    replace: "$1isVisibleInViewport:$self.shouldPreloadQuestAssets()?true:$2"
-                },
-            ]
-        },
-        {
-            // Sorts the "Claimed Quests" tabs.
-            find: ".ALL)}):(",
-            group: true,
-            replacement: [
-                {
-                    match: /(claimedQuests:(\i).{0,50}?;)/,
-                    replace: "$1$2=$self.sortQuests($2);"
-                },
-            ]
-        },
-        {
-            // Adds the "Questify" sort option to the sort enum.
-            find: "SUGGESTED=\"suggested\",",
-            replacement: {
-                match: /return ((\i).SUGGESTED="suggested",)/,
-                replace: "return $2.QUESTIFY=\"questify\",$1"
-            }
-        },
-        {
-            // Adds the "Questify" sort option to the sort dropdown.
-            find: "has no rewards configured`",
-            replacement: {
-                match: /(?=case (\i.\i).SUGGESTED)/,
-                replace: "case $1.QUESTIFY:return \"Questify\";"
-            },
-        },
-        {
-            find: "CLAIMED=\"claimed\",",
-            group: true,
-            replacement: [
-                {
-                    // Run Questify's sort function every time due to hook requirements but return
-                    // early if not applicable. If the sort method is set to "Questify", replace the
-                    // Quests with the sorted ones. Also, setup a trigger to rerender the memo.
-                    match: /(return \i.useMemo\(\(\)=>{)(?=if\(0===(\i).length\))/,
-                    replace: "const questRerenderTrigger=$self.useQuestRerender();const questifySorted=$self.sortQuests($2,arguments[1].sortMethod!==\"questify\");$1if(arguments[1].sortMethod===\"questify\"){$2=questifySorted;};"
-                },
-                {
-                    // Account for Quest status changes.
-                    match: /return (\i).current;/,
-                    replace: "null;"
-                },
-                {
-                    // If we already applied Questify's sort, skip further sorting.
-                    match: /(?<=sortMethod:(\i).{0,115}?return )((\i).sort)/,
-                    replace: "$1===\"questify\"?$3:$2"
-                },
-                {
-                    // Add the trigger to the memo for rerendering Quests order due to progress changes, etc.
-                    match: /(?<=id\);.{0,100}?,\i},\[\i,\i)/,
-                    replace: ",questRerenderTrigger,questifySorted"
-                }
-            ]
-        },
-        {
-            // Loads the last used sort method and filter choices.
-            // Defaults to sorting by "Questify" and no filters.
-            find: "({resetSortingFiltering:()",
-            group: true,
-            replacement: [
-                {
-                    // Set the initial sort method.
-                    match: /(\i.\i.SUGGESTED)/,
-                    replace: "$self.getLastSortChoice()??$1"
-                },
-                {
-                    // Set the initial filters and update the filters and sort method when they change.
-                    match: /(get\(\i\)\)\?\?)(\i,\[\i\]\),\i=\i.useCallback\((\i)=>{)(.{0,60}?useCallback\((\i)=>{)/,
-                    replace: "$1$self.getLastFilterChoices()??$2$self.setLastSortChoice($3);$4$self.setLastFilterChoices($5);"
-                },
-                {
-                    // Update the last used sort and filter choices when the toggle setting for either is changed.
-                    match: /(?<=ALL,\i.useMemo\(\(\)=>\()({sortMethod:(\i),filters:(\i))/,
-                    replace: "$self.setLastSortChoice($2),$self.setLastFilterChoices($3),$1"
-                },
-                {
-                    match: /(?<=resetSortingFiltering:\(\)=>{\i\(\),\i\()\i.\i.SUGGESTED/,
-                    replace: '"questify"'
-                }
-            ]
-        },
-        {
-            // Whether preloading assets is enabled or not, the placeholders loading
-            // before the assets causes a lot of element shifting, whereas if
-            // the elements load immediately instead, it doesn't.
-            find: ".QUEST_HOME_TILE_HEADER_WATCH_VIDEO})},",
-            replacement: {
-                match: /showPlaceholder:!\i/,
-                replace: "showPlaceholder:false"
-            }
-        },
-        // MARK: TODO 2 START
-        //  - Cleanup once Discord rolls out the new quest CTA refactor completely.
-        {
-            // Sets intervals to progress Play Game Quests in the background and patches some common click handlers.
-            find: "IN_PROGRESS:if(",
-            group: true,
-            replacement: [
-                {
-                    // Resume Video Quest.
-                    match: /(tooltipText:\i.intl.string\(\i.\i.\i\),onClick:\(\)=>)(\(0,\i.\i\)\({quest)/,
-                    replace: "$1!$self.processQuestForAutoComplete(arguments[0].quest,true)&&$2"
-                },
-                {
-                    // Start Play Game and Play Activity Quests.
-                    // Video Quests are handled in the next patch group.
-                    // Also set the unaccepted button text to "Complete".
-                    match: /(\i,tooltipText:null,onClick:async\(\)=>{)/,
-                    replace: "$self.getQuestUnacceptedButtonText(arguments[0].quest)??$1const startingAutoComplete=arguments[0].isVideoQuest?false:$self.processQuestForAutoComplete(arguments[0].quest,true);"
-                },
-                {
-                    // Set the accepted button text to "Complete", "Completing", or "Resume" based on progress.
-                    match: /(if\(\i\)return{text:)/,
-                    replace: "$1$self.getQuestAcceptedButtonText(arguments[0].quest)??",
-                },
-                {
-                    // Setup a trigger to rerender the memo.
-                    match: /(?=return \i.useMemo)/,
-                    replace: "const questRerenderTrigger=$self.useQuestRerender();"
-                },
-                {
-                    // Add the trigger to the memo for rerendering the progress label.
-                    match: /(\i\.intl\.string\(\i\.\i#{intl::QUESTS_SEE_CODE}\)\}\)\}\},\[|\)\}\}\},\[)/,
-                    replace: "$1questRerenderTrigger,"
-                },
-                {
-                    // Stop Play Activity Quests from launching the activity on first click.
-                    match: /(?<=,)(\i\(\))(\)}};)/,
-                    replace: "!startingAutoComplete&&$1$2"
-                }
-            ]
-        },
-        {
-            // Adds support for dev://experiment/2025-12-quest-cta-refactor-rollout
-            find: "WATCH_VIDEO?async()=>{await",
-            replacement: [
-                {
-                    match: /(?=let{quest:)/,
-                    replace: "const questifyText=$self.getQuestUnacceptedButtonText(arguments[0].quest)??$self.getQuestAcceptedButtonText(arguments[0].quest);"
-                },
-                {
-                    match: /(?<=}\),)(\i\?\.\(\))/,
-                    replace: "!$self.processQuestForAutoComplete(arguments[0].quest,true)&&($1)"
-                },
-                {
-                    match: /(?<=,text:)(\i),icon:\i/,
-                    replace: "questifyText??$1"
-                }
-            ]
-        },
-        {
-            // Same thing as above, maybe? Different location though.
-            find: ".ACCEPT_QUEST),",
-            replacement: [
-                {
-                    match: /(?=let{quest:)/,
-                    replace: "const questifyText=$self.getQuestUnacceptedButtonText(arguments[0].quest)??$self.getQuestAcceptedButtonText(arguments[0].quest);"
-                },
-                {
-                    match: /(?<=,text:)(\i)/g,
-                    replace: "questifyText??$1"
-                },
-                {
-                    match: /(?<="primary",onClick:)(\i)/,
-                    replace: "()=>{!$self.processQuestForAutoComplete(arguments[0].quest,true)&&$1}"
-                }
-            ]
-        },
-        {
-            // Sets intervals to progress Video Quests in the background.
-            find: "questContentRowIndex});",
-            replacement: {
-                match: /(?<=SUCCESS:)(\i\({)/,
-                replace: "!$self.processQuestForAutoComplete(arguments[0])&&$1"
-            }
-        },
-        {
-            // Sets intervals to progress Play Game Quests in the background.
-            // Triggers if a Quest has already been started but was interrupted, such as by a reload.
-            find: "WATCH_VIDEO,skipEnrollmentCheck:!0})",
-            group: true,
-            replacement: [
-                {
-                    // Initial and subsequent select drop down for picking or changing a platform.
-                    match: /(select:)(\i)(,serialize:\i=>{)/g,
-                    replace: "$1(platform)=>{$self.processQuestForAutoComplete(arguments[0].quest,true),$2(platform)}$3"
-                },
-                {
-                    // The Quest Accepted button is disabled by default. If the user reloads the client, they need a way
-                    // to resume the automatic completion, so patch in optionally enabling it if the feature is enabled.
-                    // The "Quest Accepted" text is changed to "Resume" if the Quest is in progress but not active.
-                    // Then, when the Quest Accepted button is clicked, resume the automatic completion of the
-                    // Quest and disable the button again.
-                    match: /(?<=secondary",)disabled:(!0),text:(\i\.intl\.string\(\i\.\i#{intl::QUEST_ACCEPTED}\)),/,
-                    replace: "...$self.getQuestAcceptedButtonProps(arguments[0].quest,$2,$1,undefined),"
-                },
-                {
-                    // Does the above for resuming Play Activity Quests.
-                    match: /(?<=icon:.{0,35}?onClick:(.{0,20}?),text:(\i),fullWidth:!0)/,
-                    replace: ",...$self.getQuestAcceptedButtonProps(arguments[0].quest,$2,false,$1)"
-                }
-            ]
-        },
-        // MARK: TODO 2 END
-        {
-            // Prevents the new Quests location from counting as part of the
-            // DM button highlight logic while the Quest button is visible.
-            find: "GLOBAL_DISCOVERY),",
-            replacement: {
-                match: /(pathname:(\i)}.{0,400}?return )/,
-                replace: "$1$self.disguiseHomeButton($2)?false:"
-            }
-        }
     ],
 
-    contextMenus: {
-        "quests-entry": QuestTileContextMenu
-    },
-
     flux: {
-        CHANNEL_SELECT(data) {
-            settings.store.onQuestsPage = (window.location.pathname === questPath);
+        CHANNEL_SELECT() { setOnQuestsPage(); },
+
+        QUESTS_FETCH_CURRENT_QUESTS_SUCCESS(data: { quests: Quest[]; }): void {
+            setInitialQuestDataFetched(true);
+            QL.log("QUESTS_FETCH_CURRENT_QUESTS_SUCCESS", data);
+            validateIgnoredQuests(data.quests);
+            resumeAutoCompletesIfReady();
         },
 
-        QUESTS_FETCH_CURRENT_QUESTS_SUCCESS(data) {
-            initialQuestDataFetched = true;
-            const source = data.source ? ` [${data.source}]` : "";
-            QuestifyLogger.info(`[${getFormattedNow()}] [QUESTS_FETCH_CURRENT_QUESTS_SUCCESS]${source}\n`, data);
-            validateAndOverwriteIgnoredQuests(undefined, data.quests);
+        QUESTS_ENROLL_SUCCESS(data: any): void {
+            QL.log("QUESTS_ENROLL_SUCCESS", data);
+            validateIgnoredQuests();
         },
 
-        QUESTS_ENROLL_SUCCESS(data) {
-            QuestifyLogger.info(`[${getFormattedNow()}] [QUESTS_ENROLL_SUCCESS]\n`, data);
-            fetchAndDispatchQuests("Questify", QuestifyLogger);
-            validateAndOverwriteIgnoredQuests();
+        QUESTS_CLAIM_REWARD_SUCCESS(data: any): void {
+            QL.log("QUESTS_CLAIM_REWARD_SUCCESS", data);
+            validateIgnoredQuests();
         },
 
-        QUESTS_CLAIM_REWARD_SUCCESS(data) {
-            QuestifyLogger.info(`[${getFormattedNow()}] [QUESTS_CLAIM_REWARD_SUCCESS]\n`, data);
-            fetchAndDispatchQuests("Questify", QuestifyLogger);
-            validateAndOverwriteIgnoredQuests();
-        },
+        QUESTS_USER_STATUS_UPDATE(data: any): void {
+            QL.log("QUESTS_USER_STATUS_UPDATE", data);
 
-        QUESTS_USER_STATUS_UPDATE(data) {
-            QuestifyLogger.info(`[${getFormattedNow()}] [QUESTS_USER_STATUS_UPDATE]\n`, data);
-            validateAndOverwriteIgnoredQuests();
-        },
+            const userStatus = snakeToCamel(data).userStatus as QuestUserStatus | undefined;
+            const claimedAt = !!userStatus?.claimedAt;
+            const completedRecently = userStatus?.completedAt
+                ? Date.now() - new Date(userStatus.completedAt).getTime() <= 5000
+                : false;
 
-        // Stops any Game Quest background completion intervals for running games to prevent duplicate heartbeats.
-        // This will also update the button text back to "Quest Accepted" from "Resume" if the Quest is in progress.
-        RUNNING_GAMES_CHANGE(data) {
-            const gameIDs: string[] = data.games.map(game => game.id);
-            let shouldRerenderQuests = false;
+            validateIgnoredQuests();
 
-            (Array.from(QuestsStore.quests.values()) as Quest[]).forEach(quest => {
-                const questName = normalizeQuestName(quest.config.messages.questName);
-                const questAppID = quest.config.application.id;
+            if (completedRecently && !claimedAt && !notifiedCompletedQuests.has(userStatus!.questId)) {
+                notifiedCompletedQuests.add(userStatus!.questId);
 
-                if (gameIDs.includes(questAppID) && activeQuestIntervals.has(quest.id)) {
-                    const intervalData = activeQuestIntervals.get(quest.id);
-                    clearInterval(intervalData?.progressTimeout);
-                    clearTimeout(intervalData?.rerenderTimeout);
-                    activeQuestIntervals.delete(quest.id);
-                    QuestifyLogger.info(`[${getFormattedNow()}] Application for Quest ${questName} that was being completed in the background has been launched. Stopping background completion to prevent duplicate heartbeats.`);
-                    shouldRerenderQuests = true;
+                if (getQuestifySettings().notifyOnQuestComplete) {
+                    notifyQuestCompletion(QuestStore.getQuest(userStatus!.questId));
                 }
-            });
 
-            if (shouldRerenderQuests) {
-                rerenderQuests();
+                if (getQuestifySettings().questCompletedAlertSound) {
+                    playAudio(
+                        getQuestifySettings().questCompletedAlertSound,
+                        { volume: Math.max(0, Math.min(100, getQuestifySettings().questCompletedAlertVolume)) }
+                    );
+                }
             }
         },
 
-        LOGOUT(data) {
-            settings.store.unclaimedUnignoredQuests = 0;
-            settings.store.onQuestsPage = false;
+        USER_SETTINGS_MODAL_OPEN(): void {
+            setSettingsModalOpen(true);
         },
 
-        LOGIN_SUCCESS(data) {
-            onceReady.then(() => {
-                fetchAndDispatchQuests("Questify", QuestifyLogger);
-            });
+        USER_SETTINGS_MODAL_CLOSE(): void {
+            setSettingsModalOpen(false);
+            promptToRestartIfDirty();
+        },
+
+        LOGIN_SUCCESS(): void {
+            if (!isSwitchingAccount || getQuestifySettings().disableQuestsEverything) {
+                return;
+            } else {
+                isSwitchingAccount = false;
+            }
+
+            setInitialQuestDataFetched(false);
+            didAttemptAutoCompleteResume = false;
+            startPerAccountTasks("LOGIN_SUCCESS");
+        },
+
+        LOGOUT(data: { isSwitchingAccount?: boolean; }): void {
+            if (!data.isSwitchingAccount) {
+                return;
+            } else {
+                isSwitchingAccount = true;
+            }
+
+            setInitialQuestDataFetched(false);
+            stopPerAccountTasks("LOGOUT");
+        },
+
+        RUNNING_GAMES_CHANGE(data: { games: { id: string; }[]; }): void {
+            stopAutoCompletesForRunningGames(data.games.map(game => game.id));
         }
     },
 
+    contextMenus: {
+        "quests-entry": QuestTileContextMenu,
+    },
+
     renderQuestifyButton: ErrorBoundary.wrap(QuestButton, { noop: true }),
 
     start() {
+        initializeRestartTracking(settings);
         addServerListElement(ServerListRenderPosition.Above, this.renderQuestifyButton);
-        const interval = settings.store.fetchingQuestsInterval;
-        const intervalValid = interval >= minimumAutoFetchIntervalValue && interval <= maximumAutoFetchIntervalValue;
-
-        if (!!intervalValid && autoFetchCompatible()) {
-            startAutoFetchingQuests();
-        }
-
-        const wasReload = window?.navigation?.activation?.navigationType === "reload";
-        const maybeResumable = !(settings.store.disableQuestsEverything || settings.store.disableQuestsFetchingQuests);
-
-        if (!wasReload || !maybeResumable) {
-            resetQuestsToResume();
-            return;
-        }
 
         onceReady.then(() => {
-            const interval = setInterval(() => {
-                if (initialQuestDataFetched) {
-                    clearInterval(interval);
-
-                    const playResume = settings.store.resumeQuestIDs.play.map(id => QuestsStore.getQuest(id)).filter(Boolean);
-                    const watchResume = settings.store.resumeQuestIDs.watch.map(id => QuestsStore.getQuest(id)).filter(Boolean);
-                    const achievementResume = settings.store.resumeQuestIDs.achievement.map(id => QuestsStore.getQuest(id)).filter(Boolean);
-
-                    settings.store.resumeQuestIDs.play = playResume.map(quest => quest!.id);
-                    settings.store.resumeQuestIDs.watch = watchResume.map(quest => quest!.id);
-                    settings.store.resumeQuestIDs.achievement = achievementResume.map(quest => quest!.id);
-
-                    if (!playResume.length && !watchResume.length && !achievementResume.length) {
-                        return;
-                    }
-
-                    QuestifyLogger.info(`[${getFormattedNow()}] Resuming background completion for Quests:`, {
-                        play: playResume.map(q => q.config.messages.questName),
-                        watch: watchResume.map(q => q.config.messages.questName),
-                        achievement: achievementResume.map(q => q.config.messages.questName)
-                    });
-
-                    [...playResume, ...watchResume, ...achievementResume].forEach(quest => quest && processQuestForAutoComplete(quest));
-                }
-            }, 100);
+            if (!getQuestifySettings().disableQuestsEverything) {
+                startPerAccountTasks("PLUGIN_START");
+            } else {
+                removeServerListElement(ServerListRenderPosition.Above, this.renderQuestifyButton);
+            }
         });
     },
 
     stop() {
-        removeServerListElement(ServerListRenderPosition.Above, this.renderQuestifyButton);
-        stopAutoFetchingQuests();
+        const pluginEnabled = Settings.plugins.Questify?.enabled;
 
-        if (!Settings.plugins.Questify.enabled) {
+        disposeRestartTracking();
+        removeServerListElement(ServerListRenderPosition.Above, this.renderQuestifyButton);
+        stopPerAccountTasks("PLUGIN_STOP", pluginEnabled);
+
+        if (!pluginEnabled) {
             resetQuestsToResume();
         }
-
-        activeQuestIntervals.forEach((intervalData, questId) => {
-            clearInterval(intervalData.progressTimeout);
-            clearTimeout(intervalData.rerenderTimeout);
-            activeQuestIntervals.delete(questId);
-        });
     }
 });
diff --git a/src/equicordplugins/questify/native.ts b/src/equicordplugins/questify/native.ts
index 93eed6818..1a852d895 100644
--- a/src/equicordplugins/questify/native.ts
+++ b/src/equicordplugins/questify/native.ts
@@ -1,50 +1,83 @@
 /*
  * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
+ * Copyright (c) 2026 Vendicated and contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { IpcMainInvokeEvent } from "electron";
+import { BrowserWindow, type IpcMainInvokeEvent } from "electron";
 
-export async function complete(_: IpcMainInvokeEvent, appID: string, authCode: string, questTarget: number): Promise<{ success: boolean; error: string | null; }> {
-    const result = await authorize(appID, authCode);
+export function canOpenDevTools(event: IpcMainInvokeEvent): boolean {
+    return !event.sender.isDestroyed();
+}
 
-    if (result.error || !result.token) {
-        return { success: false, error: JSON.stringify(result.error) };
+export function openDevTools(event: IpcMainInvokeEvent): boolean {
+    if (!canOpenDevTools(event)) {
+        return false;
     }
 
-    const success = await progress(appID, result.token, questTarget);
+    const window = BrowserWindow.fromWebContents(event.sender);
 
-    if (success.error || !success.success) {
-        return { success: false, error: JSON.stringify(success.error) };
+    if (event.sender.isDevToolsOpened()) {
+        window?.focus();
+
+        return true;
+    }
+
+    event.sender.openDevTools();
+
+    return true;
+}
+
+export async function complete(_: IpcMainInvokeEvent, appId: string, authCode: string, questTarget: number): Promise<{ success: boolean; error: string | null; }> {
+    const authorization = await authorize(appId, authCode);
+
+    if (authorization.error || !authorization.token) {
+        return { success: false, error: JSON.stringify(authorization.error) };
+    }
+
+    const progressResult = await progress(appId, authorization.token, questTarget);
+
+    if (progressResult.error || !progressResult.success) {
+        return { success: false, error: JSON.stringify(progressResult.error) };
     }
 
     return { success: true, error: null };
 }
 
-async function authorize(appID: string, authCode: string): Promise<{ token: string | false; error: any; }> {
-    let error = null;
+async function authorize(appId: string, authCode: string): Promise<{ token: string | false; error: unknown; }> {
+    let error: unknown = null;
 
-    const token = await fetch(`https://${appID}.discordsays.com/.proxy/acf/authorize`, {
+    const token = await fetch(`https://${appId}.discordsays.com/.proxy/acf/authorize`, {
         body: JSON.stringify({ code: authCode }),
         method: "POST",
         mode: "cors",
-        credentials: "include"
-    }).then(res => res.json()).then(data => data.token).catch(e => { error = e; return ""; });
+        credentials: "include",
+    })
+        .then(res => res.json())
+        .then(data => data.token)
+        .catch(e => {
+            error = e;
+            return false;
+        });
 
     return { token, error };
 }
 
-async function progress(appID: string, token: string, questTarget: number): Promise<{ success: boolean; error: any; }> {
-    let error = null;
+async function progress(appId: string, token: string, questTarget: number): Promise<{ success: boolean; error: unknown; }> {
+    let error: unknown = null;
 
-    const success = await fetch(`https://${appID}.discordsays.com/.proxy/acf/quest/progress`, {
+    const success = await fetch(`https://${appId}.discordsays.com/.proxy/acf/quest/progress`, {
         headers: { "x-auth-token": token },
         body: JSON.stringify({ progress: questTarget }),
         method: "POST",
         mode: "cors",
-        credentials: "include"
-    }).then(res => res.ok).catch(e => { error = e; return false; });
+        credentials: "include",
+    })
+        .then(res => res.ok)
+        .catch(e => {
+            error = e;
+            return false;
+        });
 
     return { success, error };
 }
diff --git a/src/equicordplugins/questify/settings.tsx b/src/equicordplugins/questify/settings.tsx
deleted file mode 100644
index e50b43cd3..000000000
--- a/src/equicordplugins/questify/settings.tsx
+++ /dev/null
@@ -1,2002 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { defaultAudioNames, playAudio } from "@api/AudioPlayer";
-import { definePluginSettings } from "@api/Settings";
-import { Divider } from "@components/Divider";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Heading } from "@components/Heading";
-import { Paragraph } from "@components/Paragraph";
-import { Logger } from "@utils/Logger";
-import { makeRange, OptionType } from "@utils/types";
-import { Button, ColorPicker, ContextMenuApi, Menu, Select, Slider, TextInput, useEffect, useRef, useState } from "@webpack/common";
-import { JSX } from "react";
-
-import { activeQuestIntervals, getQuestTileClasses, getQuestTileStyle } from "./index";
-import { DynamicDropdown, DynamicDropdownSettingOption, ExcludedQuest, GuildlessServerListItem, Quest, QuestIcon, QuestRewardType, QuestStatus, QuestTile, RadioGroup, RadioOption, SelectOption, SoundIcon } from "./utils/components";
-import { decimalToRGB, fetchAndDispatchQuests, getFormattedNow, getIgnoredQuestIDs, getQuestStatus, isDarkish, isSoundAllowed, leftClick, middleClick, q, QuestifyLogger, QuestsStore, rightClick, setIgnoredQuestIDs, validCommaSeparatedList } from "./utils/misc";
-
-let autoFetchInterval: null | ReturnType<typeof setInterval> = null;
-const defaultLeftClickAction = "open-quests";
-const defaultMiddleClickAction = "plugin-settings";
-const defaultRightClickAction = "context-menu";
-const defaultQuestButtonDisplay = "always";
-const defaultQuestButtonUnclaimed = "both";
-const defaultQuestOrder = "UNCLAIMED, CLAIMED, IGNORED, EXPIRED";
-const defaultUnclaimedColor = 2842239;
-const defaultClaimedColor = 6105983;
-const defaultIgnoredColor = 8334124;
-const defaultExpiredColor = 2368553;
-const defaultRestyleQuestsGradient = "intense";
-const defaultFetchQuestsAlert = "discodo";
-export const minimumAutoFetchIntervalValue = 30 * 60;
-export const maximumAutoFetchIntervalValue = 12 * 60 * 60;
-
-const rerenderCallbacks = new Set<() => void>();
-
-export function addRerenderCallback(callback: () => void): () => void {
-    rerenderCallbacks.add(callback);
-    return () => rerenderCallbacks.delete(callback);
-}
-
-export function rerenderQuests(): void {
-    settings.store.triggerQuestsRerender = !settings.store.triggerQuestsRerender;
-    rerenderCallbacks.forEach(callback => callback());
-}
-
-export function fetchAndAlertQuests(source: string, logger: Logger): void {
-    const { questRewardIncludeRewardCode, questRewardIncludeNitroCode, questRewardIncludeCollectibles, questRewardIncludeInGame, questRewardIncludeOrbs } = settings.store;
-
-    const rewardTypeToSettingMap = {
-        [QuestRewardType.REWARD_CODE]: questRewardIncludeRewardCode,
-        [QuestRewardType.IN_GAME]: questRewardIncludeInGame,
-        [QuestRewardType.COLLECTIBLE]: questRewardIncludeCollectibles,
-        [QuestRewardType.VIRTUAL_CURRENCY]: questRewardIncludeOrbs,
-        [QuestRewardType.FRACTIONAL_PREMIUM]: questRewardIncludeNitroCode
-    };
-
-    const currentQuests = Array.from(QuestsStore.quests.values()) as Quest[];
-
-    fetchAndDispatchQuests(source, logger).then(newQuests => {
-        if (newQuests !== null && Array.isArray(newQuests) && currentQuests.length > 0) {
-            const currentIds = new Set(currentQuests.map((q: Quest) => q.id));
-            const newOnly = newQuests.filter((q: Quest) => !currentIds.has(q.id));
-
-            const newOnlyFiltered = newOnly.filter(quest => {
-                const rewardType = getQuestRewardType(quest);
-                return rewardType in rewardTypeToSettingMap && rewardTypeToSettingMap[rewardType];
-            });
-
-            if (newOnly.length > 0) {
-                const shouldAlert = settings.store.fetchingQuestsAlert;
-
-                if (shouldAlert && newOnlyFiltered.length > 0) {
-                    logger.info(`[${getFormattedNow()}] New Quests detected. Playing alert sound.`);
-                    playAudio(shouldAlert, { volume: settings.store.fetchingQuestsAlertVolume });
-                } else {
-                    logger.info(`[${getFormattedNow()}] New Quests detected.`);
-                }
-            }
-        }
-    });
-}
-
-function checkAutoFetchInterval(interval: number | null): void {
-    if (!!interval && autoFetchCompatible()) {
-        startAutoFetchingQuests();
-    } else {
-        stopAutoFetchingQuests();
-    }
-}
-
-export function startAutoFetchingQuests(seconds?: number): void {
-    if (autoFetchInterval) {
-        clearInterval(autoFetchInterval);
-        autoFetchInterval = null;
-    }
-
-    const interval = seconds ? seconds * 1000 : settings.store.fetchingQuestsInterval * 1000;
-    QuestifyLogger.info(`[${getFormattedNow()}] Starting AutoFetch of Quests every ${(interval / 60000).toFixed(2)} minutes.`);
-    autoFetchInterval = setInterval(() => { fetchAndAlertQuests("Questify-AutoFetch", QuestifyLogger); }, interval);
-}
-
-export function stopAutoFetchingQuests(): void {
-    if (autoFetchInterval) {
-        QuestifyLogger.info(`[${getFormattedNow()}] Stopping AutoFetch of Quests.`);
-        clearInterval(autoFetchInterval);
-        autoFetchInterval = null;
-    }
-}
-
-export function autoFetchCompatible(): boolean {
-    const display = settings.store.questButtonDisplay;
-    const unclaimed = settings.store.questButtonUnclaimed;
-    const fetching = !settings.store.disableQuestsEverything && !settings.store.disableQuestsFetchingQuests;
-
-    if (display === "always") {
-        return fetching && ["pill", "badge", "both"].includes(unclaimed);
-    } else if (display === "unclaimed") {
-        return fetching;
-    } else {
-        return false;
-    }
-}
-
-export const intervalScales = {
-    second: {
-        singular: "Second",
-        plural: "Seconds",
-        multiplier: 1
-    },
-    minute: {
-        singular: "Minute",
-        plural: "Minutes",
-        multiplier: 60
-    },
-    hour: {
-        singular: "Hour",
-        plural: "Hours",
-        multiplier: 60 * 60
-    },
-    day: {
-        singular: "Day",
-        plural: "Days",
-        multiplier: 24 * 60 * 60
-    },
-    week: {
-        singular: "Week",
-        plural: "Weeks",
-        multiplier: 7 * 24 * 60 * 60
-    }
-};
-
-export function removeIgnoredQuest(questID: string): void {
-    const ignoredQuests = getIgnoredQuestIDs();
-    const newIgnoredQuests = ignoredQuests.filter(id => id !== questID);
-    validateAndOverwriteIgnoredQuests(newIgnoredQuests);
-}
-
-export function addIgnoredQuest(questID: string): void {
-    const ignoredQuests = getIgnoredQuestIDs();
-    const newIgnoredQuests = ignoredQuests.concat(questID);
-    validateAndOverwriteIgnoredQuests(newIgnoredQuests);
-}
-
-export function questIsIgnored(questID: string): boolean {
-    const ignoredQuests = getIgnoredQuestIDs();
-    return ignoredQuests.includes(questID);
-}
-
-function getQuestRewardType(quest: Quest): QuestRewardType {
-    const reward = quest.config.rewardsConfig.rewards[0];
-    if (!(reward.type in QuestRewardType)) return QuestRewardType.UNKNOWN;
-    return reward.type as QuestRewardType;
-}
-
-export function validateIgnoredQuests(ignoredQuests?: string[], questsData?: Quest[]): [string[], number] {
-    const { questRewardIncludeRewardCode, questRewardIncludeNitroCode, questRewardIncludeCollectibles, questRewardIncludeInGame, questRewardIncludeOrbs } = settings.store;
-
-    const rewardTypeToSettingMap = {
-        [QuestRewardType.REWARD_CODE]: questRewardIncludeRewardCode,
-        [QuestRewardType.IN_GAME]: questRewardIncludeInGame,
-        [QuestRewardType.COLLECTIBLE]: questRewardIncludeCollectibles,
-        [QuestRewardType.VIRTUAL_CURRENCY]: questRewardIncludeOrbs,
-        [QuestRewardType.FRACTIONAL_PREMIUM]: questRewardIncludeNitroCode
-    };
-
-    const quests = questsData ?? Array.from(QuestsStore.quests.values()) as Quest[];
-    const excludedQuests = Array.from(QuestsStore.excludedQuests.values()) as ExcludedQuest[];
-    const currentlyIgnored = ignoredQuests ? new Set(ignoredQuests) : new Set(getIgnoredQuestIDs(questsData?.[0]?.userStatus?.userId));
-    const validIgnored = new Set<string>();
-    let numUnclaimedUnignoredQuests = 0;
-
-    for (const quest of quests) {
-        const questStatus = getQuestStatus(quest, false);
-
-        if (currentlyIgnored.has(quest.id)) {
-            validIgnored.add(quest.id);
-        } else if (questStatus === QuestStatus.Unclaimed) {
-            const rewardType = getQuestRewardType(quest);
-
-            if (rewardTypeToSettingMap[rewardType]) {
-                numUnclaimedUnignoredQuests++;
-            }
-        }
-    }
-
-    for (const quest of excludedQuests) {
-        if (currentlyIgnored.has(quest.id)) {
-            validIgnored.add(quest.id);
-        }
-    }
-
-    return [Array.from(validIgnored), numUnclaimedUnignoredQuests];
-}
-
-export function validateAndOverwriteIgnoredQuests(ignoredQuests?: string[], questsData?: Quest[]): string[] {
-    const [validIgnored, numUnclaimedUnignoredQuests] = validateIgnoredQuests(ignoredQuests, questsData);
-    settings.store.unclaimedUnignoredQuests = numUnclaimedUnignoredQuests;
-    setIgnoredQuestIDs(validIgnored, questsData?.[0]?.userStatus?.userId);
-    rerenderQuests();
-    return validIgnored;
-}
-
-interface DummyQuestButtonProps {
-    visible: boolean;
-    selected: boolean;
-    showPill: boolean;
-    showBadge: boolean;
-    badgeColor: number | null;
-    leftClickAction: string;
-    middleClickAction: string;
-    rightClickAction: string;
-    onSelectedChange: (selected: boolean) => void;
-}
-
-function DummyQuestButton({
-    visible,
-    selected,
-    showPill,
-    showBadge,
-    badgeColor,
-    leftClickAction,
-    middleClickAction,
-    rightClickAction,
-    onSelectedChange
-}: DummyQuestButtonProps): JSX.Element {
-    function handleClick(event: React.MouseEvent<Element>) {
-        // ListItem does not support onAuxClick, so we have to listen for mousedown events.
-        // Ignore left and right clicks sent via mousedown events to prevent double events.
-        if (event.type === "mousedown" && event.button !== middleClick) {
-            return;
-        }
-
-        event.preventDefault();
-        event.stopPropagation();
-
-        let todo: string | null = null;
-
-        if (event.button === middleClick) {
-            todo = middleClickAction;
-        } else if (event.button === rightClick) {
-            todo = rightClickAction;
-        } else if (event.button === leftClick) {
-            todo = leftClickAction;
-        }
-
-        if (todo === "open-quests") {
-            onSelectedChange(!selected);
-        } else if (todo === "plugin-settings") {
-        } else if (todo === "context-menu") {
-            ContextMenuApi.openContextMenu(event, () => (
-                <Menu.Menu
-                    navId={q("dummy-quest-button-context-menu")}
-                    onClose={ContextMenuApi.closeContextMenu}
-                    aria-label="Quest Button Menu"
-                >
-                    <Menu.MenuItem
-                        id={q("dummy-quest-button-mark-all-ignored")}
-                        label="Mark All Ignored"
-                        disabled={true}
-                    />
-                    <Menu.MenuItem
-                        id={q("dummy-quest-button-reset-ignored-list")}
-                        label="Reset Ignored List"
-                        disabled={true}
-                    />
-                    <Menu.MenuItem
-                        id={q("dummy-quest-button-fetch-quests")}
-                        label="Fetch Quests"
-                        disabled={true}
-                    />
-                </Menu.Menu>
-            ));
-        }
-    }
-
-    const dummyBadgeColorRGB = badgeColor ? decimalToRGB(badgeColor) : null;
-    const lowerBadgeProps = {
-        count: showBadge ? 3 : 0,
-        maxDigits: 2,
-        ...(dummyBadgeColorRGB ? { color: `rgb(${dummyBadgeColorRGB.r},${dummyBadgeColorRGB.g},${dummyBadgeColorRGB.b})` } : {}),
-        ...(dummyBadgeColorRGB ? { style: { color: isDarkish(dummyBadgeColorRGB) ? "white" : "black" } } : {})
-    };
-
-    return (
-        <GuildlessServerListItem
-            id={q("dummy-quest-button")}
-            className={q("dummy-quest-button", "quest-button")}
-            icon={QuestIcon(26, 26)}
-            tooltip="Quests"
-            showPill={true}
-            isVisible={visible}
-            isSelected={selected}
-            hasUnread={showPill}
-            lowerBadgeProps={lowerBadgeProps}
-            onClick={handleClick}
-            onContextMenu={handleClick}
-            onMouseDown={handleClick}
-        />
-    );
-}
-
-function validateQuestButtonSetting() {
-    const {
-        questButtonDisplay,
-        questButtonUnclaimed,
-        questButtonBadgeColor,
-        questButtonLeftClickAction,
-        questButtonMiddleClickAction,
-        questButtonRightClickAction
-    } = settings.use([
-        "questButtonDisplay",
-        "questButtonUnclaimed",
-        "questButtonBadgeColor",
-        "questButtonLeftClickAction",
-        "questButtonMiddleClickAction",
-        "questButtonRightClickAction"
-    ]);
-
-    if (!["always", "unclaimed", "never"].includes(questButtonDisplay)) {
-        settings.store.questButtonDisplay = "always";
-    }
-
-    if (!["pill", "badge", "both", "none"].includes(questButtonUnclaimed)) {
-        settings.store.questButtonUnclaimed = "both";
-    }
-
-    if (typeof questButtonBadgeColor !== "number" && questButtonBadgeColor !== null) {
-        settings.store.questButtonBadgeColor = defaultUnclaimedColor;
-    }
-
-    if (!["open-quests", "context-menu", "plugin-settings", "nothing"].includes(questButtonLeftClickAction)) {
-        settings.store.questButtonLeftClickAction = defaultLeftClickAction;
-    }
-
-    if (!["open-quests", "context-menu", "plugin-settings", "nothing"].includes(questButtonMiddleClickAction)) {
-        settings.store.questButtonMiddleClickAction = defaultMiddleClickAction;
-    }
-
-    if (!["open-quests", "context-menu", "plugin-settings", "nothing"].includes(questButtonRightClickAction)) {
-        settings.store.questButtonRightClickAction = defaultRightClickAction;
-    }
-}
-
-function validateDisableQuestSetting() {
-    const {
-        disableQuestsDiscoveryTab,
-        disableQuestsFetchingQuests,
-        disableQuestsDirectMessagesTab,
-        disableQuestsPageSponsoredBanner,
-        disableQuestsPopupAboveAccountPanel,
-        disableQuestsBadgeOnUserProfiles,
-        disableQuestsGiftInventoryRelocationNotice,
-        disableFriendsListActiveNowPromotion,
-        disableMembersListActivelyPlayingIcon
-    } = settings.use([
-        "disableQuestsEverything",
-        "disableQuestsDiscoveryTab",
-        "disableQuestsFetchingQuests",
-        "disableQuestsDirectMessagesTab",
-        "disableQuestsPageSponsoredBanner",
-        "disableQuestsPopupAboveAccountPanel",
-        "disableQuestsBadgeOnUserProfiles",
-        "disableQuestsGiftInventoryRelocationNotice",
-        "disableFriendsListActiveNowPromotion",
-        "disableMembersListActivelyPlayingIcon"
-    ]);
-
-    if (disableQuestsDiscoveryTab || disableQuestsDirectMessagesTab || disableQuestsPageSponsoredBanner || disableQuestsFetchingQuests || disableQuestsPopupAboveAccountPanel || disableQuestsBadgeOnUserProfiles || disableQuestsGiftInventoryRelocationNotice || disableFriendsListActiveNowPromotion || disableMembersListActivelyPlayingIcon) {
-        settings.store.disableQuestsEverything = false;
-    }
-}
-
-function QuestButtonSettings(): JSX.Element {
-    validateQuestButtonSetting();
-
-    const {
-        questButtonDisplay,
-        questRewardIncludeRewardCode,
-        questRewardIncludeNitroCode,
-        questRewardIncludeCollectibles,
-        questRewardIncludeInGame,
-        questRewardIncludeOrbs,
-        questButtonUnclaimed,
-        questButtonBadgeColor,
-        questButtonLeftClickAction,
-        questButtonMiddleClickAction,
-        questButtonRightClickAction
-    } = settings.use([
-        "questButtonDisplay",
-        "questRewardIncludeRewardCode",
-        "questRewardIncludeNitroCode",
-        "questRewardIncludeCollectibles",
-        "questRewardIncludeInGame",
-        "questRewardIncludeOrbs",
-        "questButtonUnclaimed",
-        "questButtonBadgeColor",
-        "questButtonLeftClickAction",
-        "questButtonMiddleClickAction",
-        "questButtonRightClickAction"
-    ]);
-
-    const questButtonDisplayOptions: RadioOption[] = [
-        { name: "Always", value: "always" },
-        { name: "Unclaimed", value: "unclaimed" },
-        { name: "Never", value: "never" }
-    ];
-
-    const questButtonUnclaimedOptions: RadioOption[] = [
-        { name: "Pill", value: "pill" },
-        { name: "Badge", value: "badge" },
-        { name: "Both", value: "both" },
-        { name: "None", value: "none" }
-    ];
-
-    const questButtonClickOptions: SelectOption[] = [
-        { label: "Open Quests", value: "open-quests" },
-        { label: "Context Menu", value: "context-menu" },
-        { label: "Plugin Settings", value: "plugin-settings" },
-        { label: "Nothing", value: "nothing" }
-    ];
-
-    const questButtonRewardDisplayOptions: DynamicDropdownSettingOption[] = [
-        { label: "Orbs", value: "orbs", selected: questRewardIncludeOrbs },
-        { label: "Nitro Codes", value: "nitro-code", selected: questRewardIncludeNitroCode },
-        { label: "Reward Codes", value: "reward-code", selected: questRewardIncludeRewardCode },
-        { label: "In Game Items", value: "in-game", selected: questRewardIncludeInGame },
-        { label: "Profile Collectibles", value: "collectibles", selected: questRewardIncludeCollectibles },
-    ];
-
-    const [currentRewardsOptions, setCurrentRewardsOptions] = useState(questButtonRewardDisplayOptions.filter(option => option.selected).map(option => option.value));
-    const [currentQuestButtonDisplay, setCurrentQuestButtonDisplay] = useState((questButtonDisplayOptions.find(option => option.value === questButtonDisplay) as RadioOption));
-    const [currentQuestButtonUnclaimed, setCurrentQuestButtonUnclaimed] = useState((questButtonUnclaimedOptions.find(option => option.value === questButtonUnclaimed) as RadioOption));
-    const [currentQuestButtonLeftClickAction, setCurrentQuestButtonLeftClickAction] = useState<"open-quests" | "plugin-settings" | "context-menu" | "nothing">(questButtonLeftClickAction as "open-quests" | "plugin-settings" | "context-menu" | "nothing");
-    const [currentQuestButtonMiddleClickAction, setCurrentQuestButtonMiddleClickAction] = useState<"open-quests" | "plugin-settings" | "context-menu" | "nothing">(questButtonMiddleClickAction as "open-quests" | "plugin-settings" | "context-menu" | "nothing");
-    const [currentQuestButtonRightClickAction, setCurrentQuestButtonRightClickAction] = useState<"open-quests" | "plugin-settings" | "context-menu" | "nothing">(questButtonRightClickAction as "open-quests" | "plugin-settings" | "context-menu" | "nothing");
-    const [currentBadgeColor, setCurrentBadgeColor] = useState((questButtonBadgeColor as number | null));
-    const [dummySelected, setDummySelected] = useState(false);
-
-    function updateSettingsTruthy(enabled: string[]) {
-        questButtonRewardDisplayOptions.forEach(option => {
-            option.selected = enabled.includes(option.value);
-        });
-
-        settings.store.questRewardIncludeRewardCode = enabled.includes("reward-code");
-        settings.store.questRewardIncludeNitroCode = enabled.includes("nitro-code");
-        settings.store.questRewardIncludeCollectibles = enabled.includes("collectibles");
-        settings.store.questRewardIncludeInGame = enabled.includes("in-game");
-        settings.store.questRewardIncludeOrbs = enabled.includes("orbs");
-
-        setCurrentRewardsOptions(enabled);
-        validateAndOverwriteIgnoredQuests();
-    }
-
-    function handleQuestRewardDisplayChange(values: Array<DynamicDropdownSettingOption | string>) {
-        const parsedValues = values.map(v => typeof v === "string" ? questButtonRewardDisplayOptions.find(option => option.value === v) as DynamicDropdownSettingOption : v);
-
-        if (values.length === 0) {
-            updateSettingsTruthy([]);
-            return;
-        }
-
-        const selectedOption = values.length > currentRewardsOptions.length ? values[values.length - 1] as string : currentRewardsOptions.find(v => !values.includes(v)) as string;
-        const stringlessValues = parsedValues.filter(v => v.value !== selectedOption);
-        const option = questButtonRewardDisplayOptions.find(option => option.value === selectedOption) as DynamicDropdownSettingOption;
-
-        if (option.selected) {
-            updateSettingsTruthy(stringlessValues.filter(v => v.value !== selectedOption).map(v => v.value));
-        } else {
-            updateSettingsTruthy([...stringlessValues.map(v => v.value), option.value]);
-        }
-    }
-
-    function handleQuestButtonDisplayChange(value: RadioOption) {
-        setCurrentQuestButtonDisplay(value);
-        settings.store.questButtonDisplay = value.value;
-        checkAutoFetchInterval(settings.store.fetchingQuestsInterval);
-    }
-
-    function handleQuestButtonUnclaimedChange(value: RadioOption) {
-        setCurrentQuestButtonUnclaimed(value);
-        settings.store.questButtonUnclaimed = value.value;
-        checkAutoFetchInterval(settings.store.fetchingQuestsInterval);
-    }
-
-    function handleBadgeColorChange(value: number | null) {
-        setCurrentBadgeColor(value);
-        settings.store.questButtonBadgeColor = value as any;
-    }
-
-    function handleLeftClickActionChange(value: "open-quests" | "context-menu" | "plugin-settings" | "nothing") {
-        setCurrentQuestButtonLeftClickAction(value);
-        settings.store.questButtonLeftClickAction = value;
-    }
-
-    function handleMiddleClickActionChange(value: "open-quests" | "context-menu" | "plugin-settings" | "nothing") {
-        setCurrentQuestButtonMiddleClickAction(value);
-        settings.store.questButtonMiddleClickAction = value;
-    }
-
-    function handleRightClickActionChange(value: "open-quests" | "context-menu" | "plugin-settings" | "nothing") {
-        setCurrentQuestButtonRightClickAction(value);
-        settings.store.questButtonRightClickAction = value;
-    }
-
-    return (
-        <ErrorBoundary>
-            <Divider className={q("setting-divider")} />
-            <div className={q("setting", "quest-icon-setting")}>
-                <section>
-                    <div className={q("main-inline-group")}>
-                        <div>
-                            <Heading className={q("form-title")}>
-                                Quest Button
-                            </Heading>
-                            <Paragraph className={q("form-description")}>
-                                Show a Quest button in the server list with an optional indicator for unclaimed Quests.
-                            </Paragraph>
-                        </div>
-                        <div className={q("dummy-quest-button")}>
-                            <DummyQuestButton
-                                visible={currentQuestButtonDisplay.value !== "never"}
-                                selected={dummySelected}
-                                showPill={currentQuestButtonUnclaimed.value === "pill" || currentQuestButtonUnclaimed.value === "both"}
-                                showBadge={currentQuestButtonUnclaimed.value === "badge" || currentQuestButtonUnclaimed.value === "both"}
-                                badgeColor={currentBadgeColor}
-                                leftClickAction={currentQuestButtonLeftClickAction}
-                                middleClickAction={currentQuestButtonMiddleClickAction}
-                                rightClickAction={currentQuestButtonRightClickAction}
-                                onSelectedChange={setDummySelected}
-                            />
-                        </div>
-                    </div>
-                    <div className={q("main-inline-group")}>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle", "form-subtitle-spacier")}>
-                                Left Click Action
-                            </Heading>
-                            <Select
-                                options={questButtonClickOptions}
-                                className={q("select", "titled-select")}
-                                popoutPosition="top"
-                                serialize={String}
-                                isSelected={(value: string) => value === currentQuestButtonLeftClickAction}
-                                select={handleLeftClickActionChange}
-                            />
-                        </div>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle", "form-subtitle-spacier")}>
-                                Middle Click Action
-                            </Heading>
-                            <Select
-                                options={questButtonClickOptions}
-                                className={q("select", "titled-select")}
-                                popoutPosition="top"
-                                serialize={String}
-                                isSelected={(value: string) => value === currentQuestButtonMiddleClickAction}
-                                select={handleMiddleClickActionChange}
-                            />
-                        </div>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle", "form-subtitle-spacier")}>
-                                Right Click Action
-                            </Heading>
-                            <Select
-                                options={questButtonClickOptions}
-                                className={q("select", "titled-select")}
-                                popoutPosition="top"
-                                serialize={String}
-                                isSelected={(value: string) => value === currentQuestButtonRightClickAction}
-                                select={handleRightClickActionChange}
-                            />
-                        </div>
-                    </div>
-                    <div className={q("main-inline-group")}>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle")}>
-                                Button Visibility
-                            </Heading>
-                            <RadioGroup
-                                value={(currentQuestButtonDisplay as any).value}
-                                options={questButtonDisplayOptions}
-                                onChange={handleQuestButtonDisplayChange}
-                            />
-                            <Heading className={q("form-subtitle")}>
-                                Badge Color
-                            </Heading>
-                            <div className={q("sub-inline-group")}>
-                                <ColorPicker
-                                    color={currentBadgeColor}
-                                    onChange={handleBadgeColorChange}
-                                    showEyeDropper={true}
-                                />
-                                <Button
-                                    className={q("button", "button-blue")}
-                                    onClick={() => handleBadgeColorChange(defaultUnclaimedColor)}
-                                >
-                                    Default
-                                </Button>
-                                <Button
-                                    className={q("button", "button-red")}
-                                    onClick={() => handleBadgeColorChange(null)}
-                                >
-                                    Disable
-                                </Button>
-                            </div>
-                        </div>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle")}>
-                                Unclaimed Indicator
-                            </Heading>
-                            <RadioGroup
-                                value={(currentQuestButtonUnclaimed as any).value}
-                                options={questButtonUnclaimedOptions}
-                                onChange={handleQuestButtonUnclaimedChange}
-                            />
-                        </div>
-                    </div>
-                    <div className={q("main-inline-group")}>
-                        <section>
-                            <Heading className={q("form-subtitle", "form-subtitle-spacier")}>
-                                Included Reward Types
-                            </Heading>
-                            <Paragraph className={q("form-description", "margin-bottom-8")}>
-                                Only count Quests with these reward types as unclaimed when determining button
-                                visibility, badge count, and when playing the alert sound.
-                            </Paragraph>
-                            <DynamicDropdown
-                                placeholder="Select which reward types to include in the unclaimed count..."
-                                feedback="There's no supported Quest feature by that name."
-                                className={q("select")}
-                                optionClassName={q("affixless-select-popout-option")}
-                                maxVisibleItems={questButtonRewardDisplayOptions.length}
-                                maxOptionsVisible={questButtonRewardDisplayOptions.length} // Mana Select Prop
-                                clearable={true}
-                                multi={true}
-                                value={currentRewardsOptions}
-                                options={questButtonRewardDisplayOptions}
-                                onChange={handleQuestRewardDisplayChange}
-                                closeOnSelect={false}
-                            >
-                            </DynamicDropdown>
-                        </section>
-                    </div>
-                </section>
-            </div>
-        </ErrorBoundary>
-    );
-}
-
-function DisableQuestsSetting(): JSX.Element {
-    validateDisableQuestSetting();
-
-    const {
-        disableQuestsEverything,
-        disableQuestsDiscoveryTab,
-        disableQuestsFetchingQuests,
-        disableQuestsDirectMessagesTab,
-        disableQuestsPageSponsoredBanner,
-        disableQuestsPopupAboveAccountPanel,
-        disableQuestsBadgeOnUserProfiles,
-        disableQuestsGiftInventoryRelocationNotice,
-        disableFriendsListActiveNowPromotion,
-        disableMembersListActivelyPlayingIcon,
-        makeMobileQuestsDesktopCompatible,
-        completeVideoQuestsQuicker,
-        completeVideoQuestsInBackground,
-        completeGameQuestsInBackground,
-        completeAchievementQuestsInBackground,
-        notifyOnQuestComplete
-    } = settings.use([
-        "disableQuestsEverything",
-        "disableQuestsDiscoveryTab",
-        "disableQuestsFetchingQuests",
-        "disableQuestsDirectMessagesTab",
-        "disableQuestsPageSponsoredBanner",
-        "disableQuestsPopupAboveAccountPanel",
-        "disableQuestsBadgeOnUserProfiles",
-        "disableQuestsGiftInventoryRelocationNotice",
-        "disableFriendsListActiveNowPromotion",
-        "disableMembersListActivelyPlayingIcon",
-        "makeMobileQuestsDesktopCompatible",
-        "completeVideoQuestsQuicker",
-        "completeVideoQuestsInBackground",
-        "completeGameQuestsInBackground",
-        "completeAchievementQuestsInBackground",
-        "notifyOnQuestComplete",
-    ]);
-
-    const options: DynamicDropdownSettingOption[] = [
-        { label: "Disable Everything", value: "everything", selected: disableQuestsEverything, type: "disable" },
-        { label: "Disable Fetching Quests", value: "fetching", selected: disableQuestsFetchingQuests, type: "disable" },
-        { label: "Disable Quests Tab in DMs", value: "dms", selected: disableQuestsDirectMessagesTab, type: "disable" },
-        { label: "Disable Badge on User Profiles", value: "badge", selected: disableQuestsBadgeOnUserProfiles, type: "disable" },
-        { label: "Disable Popup Above User Panel", value: "popup", selected: disableQuestsPopupAboveAccountPanel, type: "disable" },
-        { label: "Disable Discovery Tab Relocation Notice", value: "discovery", selected: disableQuestsDiscoveryTab, type: "disable" },
-        { label: "Disable Gift Inventory Relocation Notice", value: "inventory", selected: disableQuestsGiftInventoryRelocationNotice, type: "disable" },
-        { label: "Disable Sponsored Banner on Quests Page", value: "sponsored-banner", selected: disableQuestsPageSponsoredBanner, type: "disable" },
-        { label: "Disable Friends List Active Now Promotion", value: "friends-list", selected: disableFriendsListActiveNowPromotion, type: "disable" },
-        { label: "Disable Members List Actively Playing Icon", value: "members-list", selected: disableMembersListActivelyPlayingIcon, type: "disable" },
-        { label: "Complete Watch Video Quests in Background", value: "video-quests-background", selected: completeVideoQuestsInBackground, type: "modification" },
-        { label: "Complete Play Game/Activity Quests in Background", value: "game-quests-background", selected: completeGameQuestsInBackground, type: "modification" },
-        { label: "Complete Task in Activity Quests in Background", value: "achievement-quests-background", selected: completeAchievementQuestsInBackground, type: "modification" },
-        { label: "Complete Watch Video Quests Quicker", value: "video-quests-quicker", selected: completeVideoQuestsQuicker, type: "modification" },
-        { label: "Make Mobile Quests Desktop Compatible", value: "mobile-desktop-compatible", selected: makeMobileQuestsDesktopCompatible, type: "modification" },
-        { label: "Notify on Auto-Complete", value: "notify-on-complete", selected: notifyOnQuestComplete, type: "modification" },
-    ];
-
-    const disableOptions = options.filter(option => option.type === "disable");
-    const modificationOptions = options.filter(option => option.type === "modification");
-    const everythingOnly = options.find(option => option.value === "everything") as DynamicDropdownSettingOption;
-    const [currentValue, setCurrentValue] = useState(options.filter(option => option.selected).map(option => option.value));
-
-    function updateSettingsTruthy(enabled: string[]) {
-        options.forEach(option => {
-            option.selected = enabled.includes(option.value);
-        });
-
-        const redoAutoFetch = (
-            settings.store.disableQuestsEverything !== enabled.includes("everything") ||
-            settings.store.disableQuestsFetchingQuests !== enabled.includes("fetching")
-        );
-
-        settings.store.disableQuestsEverything = enabled.includes("everything");
-        settings.store.disableQuestsDiscoveryTab = enabled.includes("discovery");
-        settings.store.disableQuestsFetchingQuests = enabled.includes("fetching");
-        settings.store.disableQuestsDirectMessagesTab = enabled.includes("dms");
-        settings.store.disableQuestsPageSponsoredBanner = enabled.includes("sponsored-banner");
-        settings.store.disableQuestsPopupAboveAccountPanel = enabled.includes("popup");
-        settings.store.disableQuestsBadgeOnUserProfiles = enabled.includes("badge");
-        settings.store.disableQuestsGiftInventoryRelocationNotice = enabled.includes("inventory");
-        settings.store.disableFriendsListActiveNowPromotion = enabled.includes("friends-list");
-        settings.store.disableMembersListActivelyPlayingIcon = enabled.includes("members-list");
-        settings.store.makeMobileQuestsDesktopCompatible = enabled.includes("mobile-desktop-compatible");
-        settings.store.completeVideoQuestsQuicker = enabled.includes("video-quests-quicker");
-        settings.store.completeVideoQuestsInBackground = enabled.includes("video-quests-background");
-        settings.store.completeGameQuestsInBackground = enabled.includes("game-quests-background");
-        settings.store.completeAchievementQuestsInBackground = enabled.includes("achievement-quests-background");
-        settings.store.notifyOnQuestComplete = enabled.includes("notify-on-complete");
-
-        redoAutoFetch ? checkAutoFetchInterval(settings.store.fetchingQuestsInterval) : null;
-        setCurrentValue(enabled.map(value => typeof value === "string" ? value : (value as any).value));
-    }
-
-    function handleChange(values: Array<DynamicDropdownSettingOption | string>) {
-        const parsedValues = values.map(v => typeof v === "string" ? options.find(option => option.value === v) as DynamicDropdownSettingOption : v);
-
-        if (values.length === 0) {
-            updateSettingsTruthy([]);
-            return;
-        }
-
-        const selectedOption = values.length > currentValue.length ? values[values.length - 1] as string : currentValue.find(v => !values.includes(v)) as string;
-        const stringlessValues = parsedValues.filter(v => v.value !== selectedOption);
-
-        if (selectedOption === "everything") {
-            if (everythingOnly.selected) {
-                // If was already selected when clicked.
-                updateSettingsTruthy(stringlessValues.filter(option => option.value !== selectedOption).map(option => option.value));
-            } else {
-                updateSettingsTruthy([...stringlessValues.filter(option => option.type !== "disable").map(option => option.value), selectedOption]);
-            }
-        } else if (disableOptions.some(option => option.value === selectedOption)) {
-            const option = disableOptions.find(option => option.value === selectedOption) as DynamicDropdownSettingOption;
-
-            if (option.selected) {
-                // If was already selected when clicked.
-                updateSettingsTruthy(stringlessValues.filter(option => option.value !== selectedOption).map(option => option.value));
-            } else {
-                updateSettingsTruthy([...stringlessValues.map(option => option.value), selectedOption]);
-            }
-        } else if (modificationOptions.some(option => option.value === selectedOption)) {
-            const option = modificationOptions.find(option => option.value === selectedOption) as DynamicDropdownSettingOption;
-
-            if (option.selected) {
-                // If was already selected when clicked.
-                updateSettingsTruthy(stringlessValues.map(option => option.value));
-            } else {
-                updateSettingsTruthy([...stringlessValues.map(option => option.value), selectedOption]);
-            }
-        }
-    }
-
-    return (
-        <ErrorBoundary>
-            <Divider className={q("setting-divider")} />
-            <div className={q("setting", "disable-quests-setting")}>
-                <section>
-                    <Heading className={q("form-title")}>
-                        Quest Features
-                    </Heading>
-                    <Paragraph className={q("form-description", "margin-bottom-8")}>
-                        Modify specific Quest features.
-                        <br /><br />
-                        The <span className={q("inline-code-block")}>Disable Quest Popup Above Account Panel</span> option
-                        will be ignored for completed Quests and Quest progress tracking.
-                        <br /><br />
-                        The <span className={q("inline-code-block")}>Complete Video Quests in Background</span> option
-                        will wait for the duration of the Video Quest and mark it as completed automatically.
-                        <br /><br />
-                        Similarly, the <span className={q("inline-code-block")}>Complete Play Game/Activity Quests in Background</span> option
-                        will wait for the duration of the Game Quest and mark it as completed automatically. This option is only supported
-                        on the official desktop client.
-                        <br /><br />
-                        The <span className={q("inline-code-block")}>Complete Task in Activity Quests in Background</span> option
-                        will immediately mark Task in Activity Quests as completed when started.
-                        <br /><br />
-                        The <span className={q("inline-code-block")}>Complete Video Quests Quicker</span> option
-                        uses Discord's progress leeway and elapsed enrollment time for Video Quests. When disabled, Video
-                        Quests wait for the full duration at 1x speed, which may appear less suspicious to their systems.
-                        <br /><br />
-                        You still must start the Quests manually. The first click will start the Quests in the background.
-                        For Video Quests, subsequent clicks will open the video modal as normal. For Activity Quests, subsequent clicks
-                        will open the activity as normal. To abort the Quests, you can open the context menu on the Quest tile and
-                        select <span className={q("inline-code-block")}>Stop Auto-Complete</span>.
-                    </Paragraph>
-                    <Paragraph className={q("form-warning")}>
-                        Using any of the Auto-Complete options is against <a href="https://discord.com/safety/platform-manipulation-policy-explainer" target="_blank" rel="noreferrer">Discord's TOS</a>. Discord has been known to warn users
-                        that automate Quest completion with threat of loss of access to Quests. There has been no reports of account
-                        limitations or bans, but Discord may change their stance at any time. Use at your own risk.
-                    </Paragraph>
-                    <DynamicDropdown
-                        placeholder="Select which Quest features to modify."
-                        feedback="There's no supported Quest feature by that name."
-                        className={q("select")}
-                        optionClassName={q("affixless-select-popout-option")}
-                        maxVisibleItems={options.length}
-                        maxOptionsVisible={options.length} // Mana Select Prop
-                        clearable={true}
-                        multi={true}
-                        value={currentValue}
-                        options={options}
-                        onChange={handleChange}
-                        closeOnSelect={false}
-                    >
-                    </DynamicDropdown>
-                </section>
-            </div>
-        </ErrorBoundary>
-    );
-}
-
-const DummyQuestPreview = ({ quest, dummyColor, dummyGradient }: { quest: Quest; dummyColor: number | null; dummyGradient: string; }) => {
-    const classes = getQuestTileClasses("", quest, dummyColor, dummyGradient);
-
-    return (
-        <QuestTile
-            className={[q("dummy-quest"), classes].join(" ")}
-            quest={quest}
-        />
-    );
-};
-
-function RestyleQuestsSetting() {
-    const {
-        restyleQuestsUnclaimed,
-        restyleQuestsClaimed,
-        restyleQuestsIgnored,
-        restyleQuestsExpired,
-        restyleQuestsGradient,
-        restyleQuestsPreload
-    } = settings.use([
-        "restyleQuestsUnclaimed",
-        "restyleQuestsClaimed",
-        "restyleQuestsIgnored",
-        "restyleQuestsExpired",
-        "restyleQuestsGradient",
-        "restyleQuestsPreload",
-    ]);
-
-    const [unclaimedColor, setUnclaimedColor] = useState<number | null>(restyleQuestsUnclaimed);
-    const [claimedColor, setClaimedColor] = useState<number | null>(restyleQuestsClaimed);
-    const [ignoredColor, setIgnoredColor] = useState<number | null>(restyleQuestsIgnored);
-    const [expiredColor, setExpiredColor] = useState<number | null>(restyleQuestsExpired);
-    const [restyleQuestsGradientValue, setRestyleQuestsGradientValue] = useState(restyleQuestsGradient);
-    const [restyleQuestsPreloadValue, setRestyleQuestsPreloadValue] = useState(restyleQuestsPreload);
-    const [dummyColor, setDummyColor] = useState<number | null>(restyleQuestsUnclaimed);
-    const [dummyGradient, setDummyGradient] = useState(restyleQuestsGradient);
-
-    const [hasQuests, setHasQuests] = useState(false);
-    const [dummyQuest, setDummyQuest] = useState<Quest | null>(null);
-    const dummyQuestStyle = getQuestTileStyle(dummyQuest);
-
-    useEffect(() => {
-        const handleChange = () => {
-            if (QuestsStore.quests.size > 0) {
-                if (!dummyQuest) {
-                    const questArray = Array.from(QuestsStore.quests.values()) as Quest[];
-                    const questIndex = Math.floor(Math.random() * questArray.length);
-                    const questData = structuredClone(questArray[questIndex]);
-                    questData.dummyColor = dummyColor as any;
-                    setDummyQuest(questData);
-                } else if (dummyQuest) {
-                    const updatedQuest = structuredClone(dummyQuest);
-                    updatedQuest.dummyColor = dummyColor as any;
-                    setDummyQuest(updatedQuest);
-                }
-
-                setHasQuests(true);
-            } else {
-                setHasQuests(false);
-                setDummyQuest(null);
-            }
-        };
-
-        QuestsStore.addChangeListener(handleChange);
-        handleChange();
-
-        return () => QuestsStore.removeChangeListener(handleChange);
-    }, [dummyColor]);
-
-    function handleRestyleChange(colorIndex: number, newColorValue: number | null) {
-        if (colorIndex === 0) setUnclaimedColor(newColorValue);
-        if (colorIndex === 1) setClaimedColor(newColorValue);
-        if (colorIndex === 2) setIgnoredColor(newColorValue);
-        if (colorIndex === 3) setExpiredColor(newColorValue);
-        setDummyColor(newColorValue);
-
-        settings.store.restyleQuestsUnclaimed = colorIndex === 0 ? newColorValue : unclaimedColor as any;
-        settings.store.restyleQuestsClaimed = colorIndex === 1 ? newColorValue : claimedColor as any;
-        settings.store.restyleQuestsIgnored = colorIndex === 2 ? newColorValue : ignoredColor as any;
-        settings.store.restyleQuestsExpired = colorIndex === 3 ? newColorValue : expiredColor as any;
-    }
-
-    function handleGradientChange(value: "intense" | "default" | "black" | "hide") {
-        setDummyGradient(value);
-        setRestyleQuestsGradientValue(value);
-        settings.store.restyleQuestsGradient = value;
-    }
-
-    function handlePreloadChange(value: boolean) {
-        setRestyleQuestsPreloadValue(value);
-        settings.store.restyleQuestsPreload = value;
-    }
-
-    const colorPickers = [
-        {
-            label: "Unclaimed",
-            idx: 0,
-            defaultValue: defaultUnclaimedColor,
-            value: unclaimedColor
-        },
-        {
-            label: "Claimed",
-            idx: 1,
-            defaultValue: defaultClaimedColor,
-            value: claimedColor
-        },
-        {
-            label: "Ignored",
-            idx: 2,
-            defaultValue: defaultIgnoredColor,
-            value: ignoredColor
-        },
-        {
-            label: "Expired",
-            idx: 3,
-            defaultValue: defaultExpiredColor,
-            value: expiredColor
-        }
-    ];
-
-    const gradientOptions = [
-        { label: "Intense Restyle Gradient", value: "intense" },
-        { label: "Default Restyle Gradient", value: "default" },
-        { label: "Subtle Black Gradient", value: "black" },
-        { label: "No Gradient", value: "hide" }
-    ];
-
-    const preloadOptions = [
-        { label: "Load All Quest Assets On Page Load", value: true },
-        { label: "Load Quest Assets During Page Scroll", value: false }
-    ];
-
-    return (
-        <ErrorBoundary>
-            <Divider className={q("setting-divider")} />
-            <div className={q("setting", "restyle-quests-setting")}>
-                <section>
-                    <div>
-                        <Heading className={q("form-title")}>
-                            Restyle Quests
-                        </Heading>
-                        <Paragraph className={q("form-description")}>
-                            Highlight Quests with optional theme colors for visibility.
-                            <br /><br />
-                            Claimed and Expired Quest styles will take precedence even if a Quest is ignored.
-                        </Paragraph>
-                    </div>
-                    <div className={q("main-inline-group")}>
-                        <div className={q("gradient-setting-group", "inline-group-item", "flex-35")}>
-                            <Heading className={q("form-subtitle")}>
-                                Gradient Style
-                            </Heading>
-                            <Select
-                                options={gradientOptions}
-                                className={q("select", "titled-select")}
-                                popoutPosition="top"
-                                serialize={String}
-                                isSelected={(value: string) => value === restyleQuestsGradientValue}
-                                select={handleGradientChange}
-                            />
-                        </div>
-                        <div className={q("preload-setting-group", "inline-group-item", "flex-65")}>
-                            <Heading className={q("form-subtitle")}>
-                                Asset Preload
-                            </Heading>
-                            <Select
-                                options={preloadOptions}
-                                className={q("select", "titled-select")}
-                                popoutPosition="top"
-                                serialize={String}
-                                isSelected={(value: boolean) => value === restyleQuestsPreloadValue}
-                                select={handlePreloadChange}
-                            />
-                        </div>
-                    </div>
-                    <div className={q("color-picker-container")}>
-                        {colorPickers.map(({ label, idx, defaultValue, value }) => (
-                            <div
-                                key={label}
-                                className={q("inline-group-item", "color-picker-group")}
-                            >
-                                <Heading className={q("form-subtitle")}>
-                                    {label}
-                                </Heading>
-                                <div className={q("color-picker-with-buttons")}>
-                                    <ColorPicker
-                                        color={value}
-                                        onChange={newValue => handleRestyleChange(idx, newValue)}
-                                        showEyeDropper={true}
-                                    />
-                                    <div className={q("sub-inline-group")}>
-                                        <Button
-                                            className={q("button", "wide-button", "button-blue")}
-                                            onClick={() => handleRestyleChange(idx, defaultValue)}
-                                        >
-                                            Default
-                                        </Button>
-                                        <Button
-                                            className={q("button", "wide-button", "button-red")}
-                                            onClick={() => handleRestyleChange(idx, null)}
-                                        >
-                                            Disable
-                                        </Button>
-                                    </div>
-                                </div>
-                            </div>
-                        ))}
-                    </div>
-                    <div className={q("dummy-quest-preview")} style={dummyQuestStyle}>
-                        {hasQuests && dummyQuest && (
-                            <DummyQuestPreview quest={dummyQuest} dummyColor={dummyColor} dummyGradient={dummyGradient} />
-                        )}
-                    </div>
-                </section>
-            </div>
-        </ErrorBoundary>
-    );
-}
-
-function ReorderQuestsSetting(): JSX.Element {
-    const [reorderQuests, setReorderQuests] = useState(settings.store.reorderQuests);
-
-    const {
-        unclaimedSubsort,
-        claimedSubsort,
-        ignoredSubsort,
-        expiredSubsort,
-        ignoredQuestProfile,
-        rememberQuestPageSort,
-        rememberQuestPageFilters
-    } = settings.use([
-        "unclaimedSubsort",
-        "claimedSubsort",
-        "ignoredSubsort",
-        "expiredSubsort",
-        "ignoredQuestProfile",
-        "rememberQuestPageSort",
-        "rememberQuestPageFilters"
-    ]);
-
-    const getSubsortOptions = (source: string): SelectOption[] => {
-        const baseOptions = [
-            { label: "Added (Newest)", value: "Recent DESC" },
-            { label: "Added (Oldest)", value: "Recent ASC" }
-        ];
-
-        if (source === "expired") {
-            baseOptions.push(
-                { label: "Expired (Most Recent)", value: "Expiring DESC" },
-                { label: "Expired (Least Recent)", value: "Expiring ASC" }
-            );
-        } else if (source !== "claimed") {
-            baseOptions.push(
-                { label: "Expiring (Soonest)", value: "Expiring ASC" },
-                { label: "Expiring (Latest)", value: "Expiring DESC" }
-            );
-        }
-
-        if (source === "claimed") {
-            baseOptions.push(
-                { label: "Claimed (Most Recent)", value: "Claimed DESC" },
-                { label: "Claimed (Least Recent)", value: "Claimed ASC" }
-            );
-        }
-
-        return baseOptions;
-    };
-
-    return (
-        <ErrorBoundary>
-            <Divider className={q("setting-divider")} />
-            <div className={q("setting", "reorder-quests-setting")}>
-                <section>
-                    <div>
-                        <Heading className={q("form-title")}>
-                            Reorder Quests
-                        </Heading>
-                        <Paragraph className={q("form-description")}>
-                            Sort Quests by their status. Applied when the "Questify" sort option is selected on the Quest page.
-                            <br /><br />
-                            Comma-separated list must contain all of: <span className={q("inline-code-block")}>UNCLAIMED, CLAIMED, IGNORED, EXPIRED</span>.
-                        </Paragraph>
-                    </div>
-                    <div>
-                        <TextInput
-                            inputClassName={q("text-input")}
-                            value={reorderQuests}
-                            onChange={newValue => {
-                                const trimmedValue = newValue.toUpperCase();
-                                const isValid = validCommaSeparatedList(trimmedValue, ["UNCLAIMED", "CLAIMED", "IGNORED", "EXPIRED"], true, true, true, false);
-                                setReorderQuests(trimmedValue);
-
-                                if (isValid) {
-                                    const cleaned = trimmedValue
-                                        .split(",")
-                                        .map(item => item.trim())
-                                        .join(", ");
-                                    settings.store.reorderQuests = cleaned;
-                                }
-                            }}
-                            placeholder="You must include all of UNCLAIMED, CLAIMED, IGNORED, EXPIRED"
-                            error={
-                                validCommaSeparatedList(reorderQuests, ["UNCLAIMED", "CLAIMED", "IGNORED", "EXPIRED"], false, true, true, false)
-                                    ? undefined
-                                    : "Invalid format."
-                            }
-                        >
-                        </TextInput>
-                    </div>
-                    <div className={q("main-inline-group")}>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle")}>
-                                Unclaimed Subsort
-                            </Heading>
-                            <Select
-                                options={getSubsortOptions("unclaimed")}
-                                className={q("select", "titled-select")}
-                                popoutPosition="bottom"
-                                serialize={String}
-                                isSelected={(value: string) => value === unclaimedSubsort}
-                                select={(value: string) => {
-                                    settings.store.unclaimedSubsort = value;
-                                }}
-                            />
-                        </div>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle")}>
-                                Claimed Subsort
-                            </Heading>
-                            <Select
-                                options={getSubsortOptions("claimed")}
-                                className={q("select", "titled-select")}
-                                popoutPosition="bottom"
-                                serialize={String}
-                                isSelected={(value: string) => value === claimedSubsort}
-                                select={(value: string) => {
-                                    settings.store.claimedSubsort = value;
-                                }}
-                            />
-                        </div>
-                    </div>
-                    <div className={q("main-inline-group")}>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle")}>
-                                Ignored Subsort
-                            </Heading>
-                            <Select
-                                options={getSubsortOptions("ignored")}
-                                className={q("select", "titled-select")}
-                                popoutPosition="bottom"
-                                serialize={String}
-                                isSelected={(value: string) => value === ignoredSubsort}
-                                select={(value: string) => {
-                                    settings.store.ignoredSubsort = value;
-                                }}
-                            />
-                        </div>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle")}>
-                                Expired Subsort
-                            </Heading>
-                            <Select
-                                options={getSubsortOptions("expired")}
-                                className={q("select", "titled-select")}
-                                popoutPosition="bottom"
-                                serialize={String}
-                                isSelected={(value: string) => value === expiredSubsort}
-                                select={(value: string) => {
-                                    settings.store.expiredSubsort = value;
-                                }}
-                            />
-                        </div>
-                    </div>
-                    <div className={q("main-inline-group")}>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle")}>
-                                Ignored Quest Profile
-                            </Heading>
-                            <Select
-                                options={[
-                                    { label: "Shared: All accounts on this client share ignores.", value: "shared" },
-                                    { label: "Private: All accounts on this client have separate ignores.", value: "private" }
-                                ]}
-                                className={q("select", "titled-select")}
-                                popoutPosition="bottom"
-                                serialize={String}
-                                isSelected={(value: string) => value === ignoredQuestProfile}
-                                select={(value: string) => { settings.store.ignoredQuestProfile = value; }}
-                            />
-                        </div>
-                    </div>
-                    <div className={q("main-inline-group")}>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle")}>
-                                Remember Sort Choice
-                            </Heading>
-                            <Select
-                                options={[
-                                    { label: "Yes", value: true },
-                                    { label: "No", value: false }
-                                ]}
-                                className={q("select", "titled-select")}
-                                popoutPosition="bottom"
-                                serialize={String}
-                                isSelected={(value: boolean) => value === rememberQuestPageSort}
-                                select={(value: boolean) => { settings.store.rememberQuestPageSort = value; }}
-                            />
-                        </div>
-                        <div className={q("inline-group-item")}>
-                            <Heading className={q("form-subtitle")}>
-                                Remember Filter Choice
-                            </Heading>
-                            <Select
-                                options={[
-                                    { label: "Yes", value: true },
-                                    { label: "No", value: false }
-                                ]}
-                                className={q("select", "titled-select")}
-                                popoutPosition="bottom"
-                                serialize={String}
-                                isSelected={(value: boolean) => value === rememberQuestPageFilters}
-                                select={(value: boolean) => { settings.store.rememberQuestPageFilters = value; }}
-                            />
-                        </div>
-                    </div>
-                    <div className={q("main-inline-group")}>
-                        <Paragraph className={q("form-description")}>
-                            This sort and filter choice refers to the built-in sort and filter options on the Quest page.
-                            The custom sorting above is only applied when the "Questify" sort option is selected on the Quest page.
-                            If remembering is disabled, the sort or filter options will be reset each time you open the Quest page.
-                        </Paragraph>
-                    </div>
-                </section>
-            </div>
-        </ErrorBoundary>
-    );
-}
-
-function FetchingQuestsSetting(): JSX.Element {
-    const {
-        fetchingQuestsInterval,
-        fetchingQuestsAlert
-    } = settings.use([
-        "fetchingQuestsInterval",
-        "fetchingQuestsAlert"
-    ]);
-
-    const allowedScales: Record<string, { singular: string; plural: string; multiplier: number; }> = {
-        minutes: { singular: "Minute", plural: "Minutes", multiplier: 60 },
-        hours: { singular: "Hour", plural: "Hours", multiplier: 60 * 60 },
-    };
-
-    const resolvedIntervals: SelectOption[] = [
-        { value: 0, label: "Disabled" },
-        { value: 60 * 30, label: "30 Minutes" },
-        { value: 60 * 60, label: "1 Hour" },
-        { value: 60 * 60 * 2, label: "3 Hours" },
-        { value: 60 * 60 * 4, label: "6 Hours" },
-        { value: 60 * 60 * 6, label: "12 Hours" },
-    ];
-
-    const resolvedSounds: SelectOption[] = defaultAudioNames().map(sound => {
-        const label = sound.toUpperCase().replace(/_/g, " ").replace(/(\d+)/g, " $1");
-        return { value: sound, label };
-    });
-
-    function createIntervalSelectOptionFromValue(value: number): SelectOption {
-        const existingOption = resolvedIntervals.find(option => option.value === value);
-        if (existingOption) { return existingOption; }
-
-        const relevantScales = Object.entries(allowedScales).filter(([_, scale]) => { return value >= scale.multiplier; });
-        const largestScale = relevantScales[relevantScales.length - 1]?.[1];
-        const valueInScale = Math.ceil((value / largestScale.multiplier) * 100) / 100;
-        const label = valueInScale === 1 ? largestScale.singular : largestScale.plural;
-
-        return {
-            value: value,
-            label: `${valueInScale} ${label}`
-        };
-    }
-
-    function createAlertSelectOptionFromValue(value: string): SelectOption | null {
-        if (value === null) {
-            return null;
-        }
-
-        const existingOption = resolvedSounds.find(option => option.value === value);
-
-        if (existingOption) {
-            return existingOption;
-        }
-
-        const filename = value
-            .split("/")
-            .pop()
-            ?.split("?")[0]
-            ?.split(".")[0]
-            ?.replace(/_/g, " ")
-            .replace(/\w\S*/g, word =>
-                word.toUpperCase()
-            ) || "CUSTOM SOUND";
-
-        return {
-            value: value,
-            label: filename
-        };
-    }
-
-    function getAllIntervalOptions(currentValue: number) {
-        const currentOption = createIntervalSelectOptionFromValue(currentValue);
-        const otherOptions = resolvedIntervals.filter(option => option.value !== currentValue);
-
-        return [
-            currentOption,
-            ...otherOptions
-        ].sort((a, b) => Number(a.value) - Number(b.value));
-    }
-
-    function getAllAlertOptions(currentValue: string | null) {
-        const otherOptions = currentValue ? resolvedSounds.filter(option => option.value !== currentValue) : resolvedSounds;
-
-        if (!currentValue) {
-            return otherOptions.sort((a, b) => a.label.localeCompare(b.label));
-        }
-
-        const currentOption = createAlertSelectOptionFromValue(currentValue);
-
-        return [
-            currentOption!,
-            ...otherOptions
-        ].sort((a, b) => a.label.localeCompare(b.label));
-    }
-
-    function handleScaleSearchChange(searchValue: string) {
-        if (!searchValue.trim()) {
-            // Show all options for empty searches.
-            setCurrentIntervalOptions(getAllIntervalOptions(currentIntervalSelection));
-            return;
-        }
-
-        const isDisabledTerm = resolvedIntervals.find(option => option.value === 0 && option.label.toLowerCase().startsWith(searchValue.toLowerCase()));
-
-        if (isDisabledTerm) {
-            // Show the dedicated "disabled" option if it matches the search term.
-            setCurrentIntervalOptions([isDisabledTerm]);
-            return;
-        }
-
-        const match = searchValue.match(/^\s*(\d+\.?(?:\d+)?)\s*([a-zA-Z]+)?\s*$/i);
-
-        if (!match) {
-            // If the input can't be parsed, show feedback message.
-            setCurrentIntervalOptions([]);
-            return;
-        }
-
-        const num = Number(match[1]);
-        const scaleName = match[2]?.toLowerCase();
-        const resolvedScale = Object.keys(allowedScales).filter(key => allowedScales[key].singular.toLowerCase().startsWith(scaleName) || allowedScales[key].plural.toLowerCase().startsWith(scaleName))[0];
-
-        if (isNaN(num)) {
-            // If the input isn't valid, show feedback message.
-            setCurrentIntervalOptions([]);
-            return;
-        }
-
-        const options: SelectOption[] = [];
-
-        if (!resolvedScale) {
-            for (const scale of Object.values(intervalScales)) {
-                // Try each allowed scale to see if the value fits within the min/max range.
-                const valueInSeconds = Math.ceil((num * scale.multiplier) * 100) / 100;
-
-                if (valueInSeconds >= minimumAutoFetchIntervalValue && valueInSeconds <= maximumAutoFetchIntervalValue) {
-                    options.push(createIntervalSelectOptionFromValue(valueInSeconds));
-                }
-            }
-        } else {
-            // If a specific scale was provided, use it to create the option.
-            const scale = allowedScales[resolvedScale];
-            const valueInSeconds = Math.ceil((num * scale.multiplier) * 100) / 100;
-
-            if (valueInSeconds >= minimumAutoFetchIntervalValue && valueInSeconds <= maximumAutoFetchIntervalValue) {
-                options.push(createIntervalSelectOptionFromValue(valueInSeconds));
-            }
-        }
-
-        setCurrentIntervalOptions(options);
-    }
-
-    function handleAlertSearchChange(searchValue: string) {
-        if (!searchValue.trim()) {
-            // Show all options for empty searches.
-            setCurrentAlertOptions(getAllAlertOptions(currentAlertSelection));
-            return;
-        }
-
-        const isCustomSound = searchValue.startsWith("http://") || searchValue.startsWith("https://");
-        const customSoundOption = createAlertSelectOptionFromValue(searchValue);
-
-        if (isCustomSound) {
-            isSoundAllowed(searchValue).then(allowed => {
-                if (allowed) {
-                    // If the input is a custom sound URL, show it as the only option.
-                    setCurrentAlertOptions([customSoundOption as SelectOption]);
-                } else {
-                    // If the input is a custom sound URL but not allowed, show feedback message.
-                    setCurrentAlertOptions([]);
-                }
-            });
-
-            return;
-        }
-
-        const matches = resolvedSounds.filter(option => option.label.toLowerCase().replace(/\s+/, "").includes(searchValue.toLowerCase().replace(/\s+/, "")));
-
-        if (matches) {
-            // If a matching sound is found, show it as the only option.
-            setCurrentAlertOptions(matches);
-            return;
-        }
-
-        // If no match is found, show feedback message.
-        setCurrentAlertOptions([]);
-    }
-
-    const resolvedIntervalValue = fetchingQuestsInterval;
-    const [currentIntervalSelection, setCurrentSelection] = useState(resolvedIntervalValue);
-    const [currentIntervalOptions, setCurrentIntervalOptions] = useState(getAllIntervalOptions(currentIntervalSelection));
-    const resolvedAlertValue = fetchingQuestsAlert;
-    const [currentAlertSelection, setCurrentAlertSelection] = useState<string | null>(resolvedAlertValue);
-    const [currentAlertOptions, setCurrentAlertOptions] = useState(getAllAlertOptions(currentAlertSelection));
-    // Needed to update the playing state of the preview button.
-    const [isPlaying, setIsPlaying] = useState<boolean>(false);
-    // Needed to stop audio output on settings close mid-preview.
-    const activePlayer = useRef<any>(null);
-
-    function clearActivePlayer() {
-        activePlayer.current?.stop();
-        activePlayer.current = null;
-        setIsPlaying(false);
-    }
-
-    useEffect(() => {
-        return () => {
-            clearActivePlayer();
-        };
-    }, []);
-
-    return (
-        <ErrorBoundary>
-            <Divider className={q("setting-divider")} />
-            <div className={q("setting", "fetching-quests-setting")}>
-                <section>
-                    <div>
-                        <Heading className={q("form-title")}>
-                            Fetching Quests
-                        </Heading>
-                        <Paragraph className={q("form-description")}>
-                            Configure how often to fetch Quests from Discord and set up alerts for new Quests.
-                            <br /><br />
-                            By default, Discord only fetches Quests on load and when visiting the Quests page.
-                            This means that without a fetch interval defined below, this plugin will become unaware
-                            of new Quests added throughout the day.
-                            <br /><br />
-                            This relies on the Quest Button being enabled and set to either <span className={q("inline-code-block")}>Unclaimed</span>, or set to <span className={q("inline-code-block")}>Always</span> with
-                            unclaimed <span className={q("inline-code-block")}>Pill</span>, <span className={q("inline-code-block")}>Badge</span>, or <span className={q("inline-code-block")}>Both</span> indicators enabled. Otherwise, there is no reason to periodically fetch Quests.
-                            <br /><br />
-                            Also, if <span className={q("inline-code-block")}>Fetching Quests</span> is blocked in the <span className={q("inline-code-block")}>Quest Features</span> setting, this will not work.
-                        </Paragraph>
-                    </div>
-                    <div>
-                        <div>
-                            <Heading className={q("form-subtitle", "form-subtitle-spacier")}>
-                                Fetch Interval
-                            </Heading>
-                        </div>
-                        <div>
-                            <DynamicDropdown
-                                filter={(options, query) => options}
-                                placeholder="Select or type an interval between 30 minutes and 12 hours."
-                                feedback="Intervals must be between 30 minutes and 12 hours."
-                                className={q("select", "titled-select")}
-                                maxVisibleItems={resolvedIntervals.length + 1}
-                                maxOptionsVisible={resolvedIntervals.length + 1}
-                                clearable={false}
-                                multi={false}
-                                value={currentIntervalSelection as any}
-                                options={currentIntervalOptions}
-                                closeOnSelect={true}
-                                onSearchChange={handleScaleSearchChange}
-                                onClose={() => { setCurrentIntervalOptions(getAllIntervalOptions(currentIntervalSelection)); }}
-                                onChange={value => {
-                                    const val = value as number;
-                                    settings.store.fetchingQuestsInterval = val;
-
-                                    setCurrentSelection(val);
-                                    setCurrentIntervalOptions(getAllIntervalOptions(val));
-                                    checkAutoFetchInterval(val);
-                                }}
-                            />
-                        </div>
-                    </div>
-                    <div>
-                        <div>
-                            <Heading className={q("form-subtitle", "form-subtitle-spacier")}>
-                                Alert Sound
-                            </Heading>
-                        </div>
-                        <div className={q("sub-inline-group")}>
-                            <div className={q("inline-group-item")}>
-                                <DynamicDropdown
-                                    filter={(options, query) => options}
-                                    placeholder="Select a sound or provide a custom sound URL."
-                                    feedback="Sound not found, or URL is not from a supported domain."
-                                    className={q("select", "titled-select")}
-                                    clearable={true}
-                                    multi={false}
-                                    maxVisibleItems={7}
-                                    value={currentAlertSelection as any}
-                                    options={currentAlertOptions}
-                                    closeOnSelect={false}
-                                    onSearchChange={handleAlertSearchChange}
-                                    onClose={() => { setCurrentAlertOptions(getAllAlertOptions(currentAlertSelection)); }}
-                                    onChange={value => {
-                                        const val = value as string | null;
-                                        settings.store.fetchingQuestsAlert = val as any;
-
-                                        setCurrentAlertSelection(val);
-                                        setCurrentAlertOptions(getAllAlertOptions(val));
-                                    }}
-                                />
-                            </div>
-                            <div
-                                className={q("inline-group-item", "alert-icon", { "playing-audio": !!isPlaying })}
-                                onClick={() => {
-                                    if (currentAlertSelection) {
-                                        if (activePlayer.current) {
-                                            clearActivePlayer();
-                                        } else {
-                                            activePlayer.current = playAudio(currentAlertSelection, { onEnded: clearActivePlayer, volume: settings.store.fetchingQuestsAlertVolume });
-                                            setIsPlaying(true);
-                                        }
-                                    }
-                                }}
-                                style={{ cursor: currentAlertSelection ? "pointer" : "default" }}
-                            >
-                                {SoundIcon(24, 24)}
-                            </div>
-                        </div>
-                        <div className={q("sub-inline-group")}>
-                            <div className={q("inline-group-item", "volume-slider-container")}>
-                                <Slider
-                                    markers={makeRange(0, 100, 10)}
-                                    initialValue={settings.store.fetchingQuestsAlertVolume}
-                                    onValueChange={val => { settings.store.fetchingQuestsAlertVolume = val; }}
-                                    className={q("volume-slider")}
-                                />
-                            </div>
-                        </div>
-                    </div>
-                </section>
-            </div>
-        </ErrorBoundary>
-    );
-}
-
-export const settings = definePluginSettings({
-    disableQuests: {
-        type: OptionType.COMPONENT,
-        component: DisableQuestsSetting,
-        description: "Select which Quest features to disable."
-    },
-    disableQuestsEverything: {
-        type: OptionType.BOOLEAN,
-        description: "Disable all Quest features.",
-        default: false,
-        hidden: true
-    },
-    disableQuestsFetchingQuests: {
-        type: OptionType.BOOLEAN,
-        description: "Disable fetching Quests from Discord.",
-        default: false,
-        hidden: true
-    },
-    disableQuestsDiscoveryTab: {
-        type: OptionType.BOOLEAN,
-        description: "Disable Quest tab in the Discovery page.",
-        default: false,
-        hidden: true
-    },
-    disableQuestsDirectMessagesTab: {
-        type: OptionType.BOOLEAN,
-        description: "Disable Quest tab in Direct Messages.",
-        default: false,
-        hidden: true
-    },
-    disableQuestsPageSponsoredBanner: {
-        type: OptionType.BOOLEAN,
-        description: "Disable the sponsored banner on the Quest page.",
-        default: false,
-        hidden: true
-    },
-    disableQuestsPopupAboveAccountPanel: {
-        type: OptionType.BOOLEAN,
-        description: "Disable the Quest popup above your account panel.",
-        default: true,
-        hidden: true
-    },
-    disableQuestsBadgeOnUserProfiles: {
-        type: OptionType.BOOLEAN,
-        description: "Disable the Quest badge on user profiles.",
-        default: false,
-        hidden: true
-    },
-    disableQuestsGiftInventoryRelocationNotice: {
-        type: OptionType.BOOLEAN,
-        description: "Disable the gift inventory Quest relocation notice.",
-        default: true,
-        hidden: true
-    },
-    disableFriendsListActiveNowPromotion: {
-        type: OptionType.BOOLEAN,
-        description: "Disable the promotion of Quests for games played by friends.",
-        default: true,
-        hidden: true
-    },
-    disableMembersListActivelyPlayingIcon: {
-        type: OptionType.BOOLEAN,
-        description: "Disable the actively playing icon in members list items.",
-        default: true,
-        hidden: true
-    },
-    makeMobileQuestsDesktopCompatible: {
-        type: OptionType.BOOLEAN,
-        description: "Make mobile-only Quests compatible with desktop.",
-        default: true,
-        hidden: true
-    },
-    completeVideoQuestsQuicker: {
-        type: OptionType.BOOLEAN,
-        description: "Use Discord's progress leeway and elapsed enrollment time for Video Quest auto-completion.",
-        default: false,
-        hidden: true,
-        onChange: () => {
-            rerenderQuests();
-        }
-    },
-    completeVideoQuestsInBackground: {
-        type: OptionType.BOOLEAN,
-        description: "Complete Video Quests in the background after the video duration has passed.",
-        default: false,
-        hidden: true,
-        onChange: (value: boolean) => {
-            if (!value) {
-                activeQuestIntervals.forEach((interval, questId) => {
-                    if (interval.type === "watch") {
-                        clearTimeout(interval.progressTimeout);
-                        clearTimeout(interval.rerenderTimeout);
-                        activeQuestIntervals.delete(questId);
-                    }
-                });
-            }
-
-            rerenderQuests();
-        }
-    },
-    completeGameQuestsInBackground: {
-        type: OptionType.BOOLEAN,
-        description: "Complete Game Quests in the background after the game duration has passed.",
-        default: false,
-        hidden: true,
-        onChange: (value: boolean) => {
-            if (!value) {
-                activeQuestIntervals.forEach((interval, questId) => {
-                    if (interval.type === "play") {
-                        clearTimeout(interval.progressTimeout);
-                        clearTimeout(interval.rerenderTimeout);
-                        activeQuestIntervals.delete(questId);
-                    }
-                });
-            }
-
-            rerenderQuests();
-        },
-    },
-    completeAchievementQuestsInBackground: {
-        type: OptionType.BOOLEAN,
-        description: "Complete Achievement in Activity Quests in the background.",
-        default: false,
-        hidden: true,
-        onChange: (value: boolean) => {
-            if (!value) {
-                activeQuestIntervals.forEach((interval, questId) => {
-                    if (interval.type === "achievement") {
-                        clearTimeout(interval.progressTimeout);
-                        clearTimeout(interval.rerenderTimeout);
-                        activeQuestIntervals.delete(questId);
-                    }
-                });
-            }
-
-            rerenderQuests();
-        }
-    },
-    notifyOnQuestComplete: {
-        type: OptionType.BOOLEAN,
-        description: "Show a notification when a Quest is auto-completed.",
-        default: true,
-        hidden: true
-    },
-    questButton: {
-        type: OptionType.COMPONENT,
-        component: QuestButtonSettings,
-        description: "Show a Quest button in the server list."
-    },
-    questButtonDisplay: {
-        type: OptionType.STRING,
-        description: "Which display type to use for the Quest button in the server list.",
-        default: defaultQuestButtonDisplay, // "always", "unclaimed", "never"
-        hidden: true,
-    },
-    questRewardIncludeRewardCode: {
-        type: OptionType.BOOLEAN,
-        description: "Include Quests with Reward Codes when displaying Quest counts.",
-        default: true,
-        hidden: true,
-    },
-    questRewardIncludeNitroCode: {
-        type: OptionType.BOOLEAN,
-        description: "Include Quests with Nitro Codes when displaying Quest counts.",
-        default: true,
-        hidden: true,
-    },
-    questRewardIncludeInGame: {
-        type: OptionType.BOOLEAN,
-        description: "Include Quests with In-Game rewards when displaying Quest counts.",
-        default: true,
-        hidden: true,
-    },
-    questRewardIncludeCollectibles: {
-        type: OptionType.BOOLEAN,
-        description: "Include Quests with Collectibles when displaying Quest counts.",
-        default: true,
-        hidden: true,
-    },
-    questRewardIncludeOrbs: {
-        type: OptionType.BOOLEAN,
-        description: "Include Quests with Orbs when displaying Quest counts.",
-        default: true,
-        hidden: true,
-    },
-    questButtonUnclaimed: {
-        type: OptionType.STRING,
-        description: "Which display type to use for the unclaimed indicator on the Quest button in the server list.",
-        default: defaultQuestButtonUnclaimed, // "pill", "badge", "both", "none"
-        hidden: true,
-    },
-    questButtonBadgeColor: {
-        type: OptionType.NUMBER | OptionType.CUSTOM,
-        description: "The color of the Quest button badge in the server list.",
-        default: defaultUnclaimedColor, // Decimal, null (Discord Default)
-        hidden: true
-    },
-    questButtonLeftClickAction: {
-        type: OptionType.STRING,
-        description: "The action to perform when left-clicking the Quest button in the server list.",
-        default: defaultLeftClickAction, // "open-quests", "context-menu", "plugin-settings", "nothing"
-        hidden: true
-    },
-    questButtonMiddleClickAction: {
-        type: OptionType.STRING,
-        description: "The action to perform when middle-clicking the Quest button in the server list.",
-        default: defaultMiddleClickAction, // "open-quests", "context-menu", "plugin-settings", "nothing"
-        hidden: true
-    },
-    questButtonRightClickAction: {
-        type: OptionType.STRING,
-        description: "The action to perform when right-clicking the Quest button in the server list.",
-        default: defaultRightClickAction, // "open-quests", "context-menu", "plugin-settings", "nothing"
-        hidden: true
-    },
-    fetchingQuests: {
-        type: OptionType.COMPONENT,
-        component: FetchingQuestsSetting,
-        description: "Fetch Quests from Discord."
-    },
-    fetchingQuestsInterval: {
-        type: OptionType.NUMBER | OptionType.CUSTOM,
-        description: "The interval in seconds to fetch Quests from Discord.",
-        default: 2700, // Digit >= 0, null (Disabled)
-        hidden: true
-    },
-    fetchingQuestsAlert: {
-        type: OptionType.STRING | OptionType.CUSTOM,
-        description: "The sound to play when new Quests are detected.",
-        default: defaultFetchQuestsAlert, // Item from predefined list or a URL to CSP valid audio file.
-        hidden: true
-    },
-    fetchingQuestsAlertVolume: {
-        type: OptionType.NUMBER,
-        description: "The volume for the new Quest alert sound.",
-        default: 100, // 0 - 100
-        hidden: true
-    },
-    restyleQuests: {
-        type: OptionType.COMPONENT,
-        component: RestyleQuestsSetting,
-        description: "Customize the appearance of Quest tiles in the Quests page."
-    },
-    restyleQuestsUnclaimed: {
-        type: OptionType.NUMBER | OptionType.CUSTOM,
-        description: "The color of unclaimed Quest tiles in the Quests page.",
-        default: defaultUnclaimedColor, // Decimal, null (Discord Default)
-        hidden: true
-    },
-    restyleQuestsClaimed: {
-        type: OptionType.NUMBER | OptionType.CUSTOM,
-        description: "The color of claimed Quest tiles in the Quests page.",
-        default: defaultClaimedColor, // Decimal, null (Discord Default)
-        hidden: true
-    },
-    restyleQuestsIgnored: {
-        type: OptionType.NUMBER | OptionType.CUSTOM,
-        description: "The color of ignored Quest tiles in the Quests page.",
-        default: defaultIgnoredColor, // Decimal, null (Discord Default)
-        hidden: true
-    },
-    restyleQuestsExpired: {
-        type: OptionType.NUMBER | OptionType.CUSTOM,
-        description: "The color of expired Quest tiles in the Quests page.",
-        default: defaultExpiredColor, // Decimal, null (Discord Default)
-        hidden: true
-    },
-    restyleQuestsGradient: {
-        type: OptionType.STRING,
-        description: "Style of the gradient used in the Quest tiles.",
-        default: defaultRestyleQuestsGradient, // "intense", "default", "black", "hide"
-        hidden: true
-    },
-    restyleQuestsPreload: {
-        type: OptionType.BOOLEAN,
-        description: "Attempt to preload the assets for the Quest tiles.",
-        default: true,
-        hidden: true
-    },
-    reorderQuests: {
-        type: OptionType.COMPONENT,
-        description: "Sort Quests by their status. Leave empty for default sorting. Comma-separated list must contain all of: UNCLAIMED, CLAIMED, IGNORED, EXPIRED.",
-        default: defaultQuestOrder,
-        component: ReorderQuestsSetting,
-    },
-    unclaimedSubsort: {
-        type: OptionType.STRING,
-        description: "Subsort method for unclaimed Quests.",
-        default: "Expiring ASC", // "Recent ASC", "Recent DESC", "Expiring ASC", "Expiring DESC"
-        hidden: true
-    },
-    claimedSubsort: {
-        type: OptionType.STRING,
-        description: "Subsort method for claimed Quests.",
-        default: "Claimed DESC", // "Recent ASC", "Recent DESC", "Claimed ASC", "Claimed DESC"
-        hidden: true
-    },
-    ignoredSubsort: {
-        type: OptionType.STRING,
-        description: "Subsort method for ignored Quests.",
-        default: "Recent DESC", // "Recent ASC", "Recent DESC", "Expiring ASC", "Expiring DESC"
-        hidden: true
-    },
-    expiredSubsort: {
-        type: OptionType.STRING,
-        description: "Subsort method for expired Quests.",
-        default: "Expiring DESC", // "Recent ASC", "Recent DESC", "Expiring ASC", "Expiring DESC"
-        hidden: true
-    },
-    unclaimedUnignoredQuests: {
-        type: OptionType.NUMBER,
-        description: "Tracks the number of unclaimed and unignored Quests.",
-        default: 0, // Digit >= 0
-        hidden: true
-    },
-    onQuestsPage: {
-        type: OptionType.BOOLEAN,
-        description: "Whether the user is currently on the Quests page.",
-        default: false,
-        hidden: true
-    },
-    triggerQuestsRerender: {
-        type: OptionType.BOOLEAN,
-        description: "Trigger a rerender of the Quests page by toggling this setting.",
-        default: false,
-        hidden: true
-    },
-    ignoredQuestProfile: {
-        type: OptionType.STRING,
-        description: "The profile used for ignored Quests.",
-        default: "private", // "shared", "private"
-        hidden: true
-    },
-    rememberQuestPageSort: {
-        type: OptionType.BOOLEAN,
-        description: "Remember the last used sort on the Quests page.",
-        default: true,
-        hidden: true
-    },
-    rememberQuestPageFilters: {
-        type: OptionType.BOOLEAN,
-        description: "Remember the last used filters on the Quests page.",
-        default: true,
-        hidden: true
-    },
-    lastQuestPageSort: {
-        type: OptionType.STRING,
-        description: "Remember the last used sort on the Quests page.",
-        default: "questify" as string, // sort key
-        hidden: true
-    },
-    lastQuestPageFilters: {
-        type: OptionType.CUSTOM,
-        description: "Remember the last used filters on the Quests page.",
-        default: {} as { [filter: string]: { group: string, filter: string; }; }, // Array of filters
-        hidden: true
-    },
-    ignoredQuestIDs: {
-        type: OptionType.CUSTOM,
-        description: "An array of Quest IDs that are ignored.",
-        default: {} as Record<string, string[]>,
-        hidden: true,
-    },
-    resumeQuestIDs: {
-        type: OptionType.CUSTOM,
-        description: "An array of Quest IDs that are being auto-completed in the background.",
-        default: { "watch": [], "play": [], "achievement": [] } as Record<"watch" | "play" | "achievement", string[]>, // Type to Quest ID
-        hidden: true,
-    },
-});
diff --git a/src/equicordplugins/questify/settings/access.ts b/src/equicordplugins/questify/settings/access.ts
new file mode 100644
index 000000000..c05eec17d
--- /dev/null
+++ b/src/equicordplugins/questify/settings/access.ts
@@ -0,0 +1,29 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Settings, useSettings } from "@api/Settings";
+import { UserStore } from "@webpack/common";
+
+export const QUESTIFY_PLUGIN_NAME = "Questify";
+
+interface QuestifySettingsOverrides {
+    ignoredQuestIDs: Record<string, string[]>;
+    resumeQuestIDs: Record<string, { timestamp: number, questIDs: string[]; }>;
+}
+
+type QuestifySettings = Settings["plugins"][typeof QUESTIFY_PLUGIN_NAME] & QuestifySettingsOverrides;
+
+export function getQuestifySettings(): QuestifySettings {
+    return Settings.plugins[QUESTIFY_PLUGIN_NAME] as QuestifySettings;
+}
+
+export function useQuestifySettings<K extends keyof QuestifySettings & string>(keys: readonly K[]): Pick<QuestifySettings, K> {
+    return useSettings(keys.map(key => `plugins.${QUESTIFY_PLUGIN_NAME}.${key}`) as any).plugins[QUESTIFY_PLUGIN_NAME] as unknown as Pick<QuestifySettings, K>;
+}
+
+export function getCurrentUserId(userId?: string): string | null {
+    return userId ?? UserStore.getCurrentUser()?.id ?? null;
+}
diff --git a/src/equicordplugins/questify/settings/def.ts b/src/equicordplugins/questify/settings/def.ts
new file mode 100644
index 000000000..433b8fd5e
--- /dev/null
+++ b/src/equicordplugins/questify/settings/def.ts
@@ -0,0 +1,128 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { QuestRewardType, QuestTaskType } from "@vencord/discord-types/enums";
+
+export type QuestButtonDisplayMode = "always" | "unclaimed" | "never";
+export type QuestButtonIndicatorMode = "pill" | "badge" | "both" | "none";
+export type QuestButtonAction = "open-quests" | "context-menu" | "plugin-settings" | "nothing";
+export type QuestTileGradient = "intense" | "default" | "black" | "hide";
+export type QuestOrderStatus = "UNCLAIMED" | "CLAIMED" | "IGNORED" | "EXPIRED";
+export type QuestSubsort = "Recent ASC" | "Recent DESC" | "Expiring ASC" | "Expiring DESC" | "Claimed ASC" | "Claimed DESC";
+export interface QuestTileColorSetting {
+    enabled: boolean;
+    color: number;
+}
+
+export const defaultQuestTileUnclaimedColor = 2842239;
+export const defaultQuestTileClaimedColor = 6105983;
+export const defaultQuestTileIgnoredColor = 8334124;
+export const defaultQuestTileExpiredColor = 2368553;
+export const defaultQuestTileGradient: QuestTileGradient = "intense";
+export const defaultQuestTilePreload = true;
+export const defaultQuestTileUnclaimedColorSetting: QuestTileColorSetting = { enabled: true, color: defaultQuestTileUnclaimedColor };
+export const defaultQuestTileClaimedColorSetting: QuestTileColorSetting = { enabled: true, color: defaultQuestTileClaimedColor };
+export const defaultQuestTileIgnoredColorSetting: QuestTileColorSetting = { enabled: true, color: defaultQuestTileIgnoredColor };
+export const defaultQuestTileExpiredColorSetting: QuestTileColorSetting = { enabled: true, color: defaultQuestTileExpiredColor };
+export const defaultQuestOrder = ["UNCLAIMED", "CLAIMED", "IGNORED", "EXPIRED"] as const satisfies readonly QuestOrderStatus[];
+
+export const defaultQuestButtonBadgeColor = defaultQuestTileUnclaimedColor;
+export const defaultQuestButtonDisplay: QuestButtonDisplayMode = "always";
+export const defaultQuestButtonIndicator: QuestButtonIndicatorMode = "both";
+export const defaultLeftClickAction: QuestButtonAction = "open-quests";
+export const defaultMiddleClickAction: QuestButtonAction = "plugin-settings";
+export const defaultRightClickAction: QuestButtonAction = "context-menu";
+
+export const defaultDisableQuestsEverything = false;
+export const defaultDisableRelocationNotices = true;
+export const defaultDisableSponsoredBanner = false;
+export const defaultDisableAccountPanelPromo = true;
+export const defaultDisableAccountPanelQuestProgress = false;
+export const defaultDisableOrbsAndQuestsBadges = false;
+export const defaultDisableFriendsListPromo = true;
+export const defaultDisableMembersListPromo = true;
+export const defaultResumeInterruptedQuests = false;
+export const defaultAllowChangingDangerousSettings = false; // true -> Risky
+export const defaultMakeMobileVideoQuestsDesktopCompatible = false; // true -> Risky
+export const defaultCompleteVideoQuestsQuicker = false; // true -> Risky
+export const defaultAutoCompleteQuestsSimultaneously = false; // true -> Risky
+export const defaultNotifyOnQuestComplete = true;
+export const defaultNotifyOnNewQuests = true;
+export const defaultNotifyOnNewExcludedQuests = false;
+export const defaultQuestCompletedAlertSound = "bop_message1";
+export const defaultQuestCompletedAlertVolume = 100;
+
+const questTaskTypes = [
+    QuestTaskType.WATCH_VIDEO,
+    QuestTaskType.WATCH_VIDEO_ON_MOBILE,
+    QuestTaskType.ACHIEVEMENT_IN_ACTIVITY,
+    QuestTaskType.ACHIEVEMENT_IN_GAME,
+    QuestTaskType.PLAY_ACTIVITY,
+    QuestTaskType.PLAY_ON_DESKTOP,
+    QuestTaskType.PLAY_ON_DESKTOP_V2,
+    QuestTaskType.STREAM_ON_DESKTOP,
+    QuestTaskType.PLAY_ON_PLAYSTATION,
+    QuestTaskType.PLAY_ON_XBOX,
+] as const satisfies readonly QuestTaskType[];
+
+export const autoCompleteQuestTaskTypes = [
+    QuestTaskType.PLAY_ON_DESKTOP,
+    QuestTaskType.PLAY_ON_XBOX,
+    QuestTaskType.PLAY_ON_PLAYSTATION,
+    QuestTaskType.PLAY_ACTIVITY,
+    QuestTaskType.WATCH_VIDEO,
+    QuestTaskType.WATCH_VIDEO_ON_MOBILE,
+    QuestTaskType.ACHIEVEMENT_IN_ACTIVITY,
+] as const satisfies readonly QuestTaskType[];
+
+const desktopOnlyAutoCompleteQuestTypes = new Set<QuestTaskType>([
+    QuestTaskType.PLAY_ON_DESKTOP,
+    QuestTaskType.PLAY_ON_PLAYSTATION,
+    QuestTaskType.PLAY_ON_XBOX,
+    QuestTaskType.PLAY_ACTIVITY,
+]);
+
+export function isDesktopCompatible(questType: QuestTaskType): boolean {
+    return IS_DISCORD_DESKTOP || !desktopOnlyAutoCompleteQuestTypes.has(questType);
+}
+
+export type AutoCompleteQuestTypes = Partial<Record<QuestTaskType, boolean>>;
+
+export const defaultAutoCompleteQuestTypes = Object.fromEntries(
+    autoCompleteQuestTaskTypes.map(questType => [questType, false])
+) as AutoCompleteQuestTypes;
+
+export type QuestButtonIncludedTypes = Record<QuestTaskType | QuestRewardType, boolean>;
+
+export const defaultQuestButtonIncludedTypes: QuestButtonIncludedTypes = {
+    ...Object.fromEntries(questTaskTypes.map(questType => [questType, true])),
+    [QuestRewardType.REWARD_CODE]: true,
+    [QuestRewardType.IN_GAME]: true,
+    [QuestRewardType.COLLECTIBLE]: true,
+    [QuestRewardType.VIRTUAL_CURRENCY]: true,
+    [QuestRewardType.FRACTIONAL_PREMIUM]: true,
+} as QuestButtonIncludedTypes;
+
+export const defaultQuestButtonBadgeCount = 0;
+export const defaultQuestFetchInterval = 2700;
+export const defaultNewQuestAlertSound = "discodo";
+export const defaultNewQuestAlertVolume = 100;
+export const defaultNewExcludedQuestAlertSound = null;
+export const defaultNewExcludedQuestAlertVolume = 100;
+
+export const defaultUnclaimedSubsort: QuestSubsort = "Expiring ASC";
+export const defaultClaimedSubsort: QuestSubsort = "Claimed DESC";
+export const defaultIgnoredSubsort: QuestSubsort = "Recent DESC";
+export const defaultExpiredSubsort: QuestSubsort = "Expiring DESC";
+export const defaultIsOnQuestsPage = false;
+export const defaultRememberQuestPageSort = true;
+export const defaultRememberQuestPageFilters = true;
+export const defaultLastQuestPageSort = "questify";
+export const defaultLastQuestPageFilters = {} as Record<string, { group: string, filter: string; }>;
+export const ignoredQuestIDsKey = "questIDs";
+export const defaultIgnoredQuestIDs = { [ignoredQuestIDsKey]: [] } as Record<typeof ignoredQuestIDsKey, string[]>;
+export const defaultResumeQuestIDs = {} as Record<string, // key: UserID
+    { timestamp: number, questIDs: string[]; }>;
diff --git a/src/equicordplugins/questify/settings/fetching.ts b/src/equicordplugins/questify/settings/fetching.ts
new file mode 100644
index 000000000..4c669d3fe
--- /dev/null
+++ b/src/equicordplugins/questify/settings/fetching.ts
@@ -0,0 +1,97 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { Quest } from "@vencord/discord-types";
+
+import { fetchAndAlertQuests } from "../utils/fetching";
+import { QL } from "../utils/logging";
+import { getCurrentUserId, getQuestifySettings } from "./access";
+
+let autoFetchInterval: null | ReturnType<typeof setInterval> = null;
+const minimumAutoFetchIntervalValue = 30 * 60; // 30 minutes
+const maximumAutoFetchIntervalValue = 12 * 60 * 60; // 12 hours
+
+export function autoFetchCompatible(): boolean {
+    const settings = getQuestifySettings();
+    const {
+        newExcludedQuestAlertSound,
+        newQuestAlertSound,
+        questFetchInterval,
+        notifyOnNewExcludedQuests,
+        notifyOnNewQuests,
+        questButtonDisplay: displayMode,
+        questButtonIndicator: indicatorMode
+    } = settings;
+    const fetching = !settings.disableQuestsEverything && questFetchInterval > 0;
+    const notificationsCompatible = notifyOnNewQuests || notifyOnNewExcludedQuests || Boolean(newQuestAlertSound) || Boolean(newExcludedQuestAlertSound);
+    let buttonCompatible = false;
+
+    if (displayMode === "always") {
+        buttonCompatible = ["pill", "badge", "both"].includes(indicatorMode);
+    } else if (displayMode === "unclaimed") {
+        buttonCompatible = true;
+    }
+
+    const compatible = fetching && (buttonCompatible || notificationsCompatible);
+
+    return compatible;
+}
+
+export function startAutoFetchingQuests(force: boolean = false): void {
+    if (!autoFetchCompatible()) {
+        stopAutoFetchingQuests();
+
+        return;
+    }
+
+    if (autoFetchInterval) {
+        if (!force) {
+            return;
+        }
+
+        stopAutoFetchingQuests();
+    }
+
+    const { questFetchInterval } = getQuestifySettings();
+    const interval = Math.min(Math.max(questFetchInterval, minimumAutoFetchIntervalValue), maximumAutoFetchIntervalValue);
+    autoFetchInterval = setInterval(() => { void fetchAndAlertQuests("AUTO_FETCH"); }, interval * 1000);
+    QL.info("START_AUTO_FETCHING_QUESTS", { autoFetchIntervalID: autoFetchInterval, questFetchInterval, questFetchIntervalClamped: interval });
+}
+
+export function stopAutoFetchingQuests(): void {
+    if (autoFetchInterval) {
+        clearInterval(autoFetchInterval);
+        autoFetchInterval = null;
+        QL.info("STOP_AUTO_FETCHING_QUESTS");
+    }
+}
+
+export function resetQuestsToResume(quest?: Quest, userId?: string): void {
+    const { resumeQuestIDs } = getQuestifySettings();
+    const key = getCurrentUserId(userId);
+
+    if (!key) {
+        QL.warn("RESET_QUESTS_TO_RESUME_NO_USER");
+        return;
+    }
+
+    const resumeState = resumeQuestIDs[key];
+
+    if (!resumeState) {
+        return;
+    }
+
+    if (!quest) {
+        delete resumeQuestIDs[key];
+
+        return;
+    }
+
+    resumeQuestIDs[key] = {
+        timestamp: resumeState.timestamp,
+        questIDs: resumeState.questIDs.filter(id => id !== quest.id),
+    };
+}
diff --git a/src/equicordplugins/questify/settings/ignoredQuests.ts b/src/equicordplugins/questify/settings/ignoredQuests.ts
new file mode 100644
index 000000000..fa3006674
--- /dev/null
+++ b/src/equicordplugins/questify/settings/ignoredQuests.ts
@@ -0,0 +1,87 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { Quest } from "@vencord/discord-types";
+import { QuestStore } from "@webpack/common";
+
+import type { QuestIncludedTypes } from "../utils/filtering";
+import { countIncludedUnclaimedQuests, getQuestStatus, QuestStatus } from "../utils/questState";
+import { getQuestifySettings } from "./access";
+import { ignoredQuestIDsKey } from "./def";
+import { rerenderQuests } from "./rerender";
+
+function validateQuestBadgeCount(): void {
+    const settings = getQuestifySettings();
+    const questButtonIncludedTypes = settings.questButtonIncludedTypes as QuestIncludedTypes;
+    const quests = Array.from(QuestStore.quests.values());
+    const ignoredQuestIds = getIgnoredQuestIDs();
+    const count = countIncludedUnclaimedQuests(quests, ignoredQuestIds, questButtonIncludedTypes);
+
+    settings.questButtonBadgeCount = count;
+}
+
+export function getIgnoredQuestIDs(): string[] {
+    const { ignoredQuestIDs } = getQuestifySettings();
+    const ignoredQuestIDsForKey = Array.from(ignoredQuestIDs[ignoredQuestIDsKey] ?? []);
+    return ignoredQuestIDsForKey;
+}
+
+function setIgnoredQuestIDs(questIDs: string[]): void {
+    getQuestifySettings().ignoredQuestIDs[ignoredQuestIDsKey] = questIDs;
+}
+
+export function validateIgnoredQuests(qs?: Quest[]): void {
+    const currentlyIgnoredQuests = getIgnoredQuestIDs();
+    const quests = qs ?? Array.from(QuestStore.quests.values());
+    const excludedQuests = Array.from(QuestStore.excludedQuests.values());
+    const validIgnored = Array.from(new Set<string>(currentlyIgnoredQuests.filter(id => quests.some(quest => quest.id === id) || excludedQuests.some(quest => quest.id === id))));
+
+    setIgnoredQuestIDs(validIgnored);
+    validateQuestBadgeCount();
+    rerenderQuests();
+}
+
+export function resetIgnoredQuests(): void {
+    setIgnoredQuestIDs([]);
+    validateIgnoredQuests();
+}
+
+export function addIgnoredQuest(questId: string): void {
+    setIgnoredQuestIDs(Array.from(new Set([...getIgnoredQuestIDs(), questId])));
+    validateIgnoredQuests();
+}
+
+export function removeIgnoredQuest(questId: string): void {
+    setIgnoredQuestIDs(getIgnoredQuestIDs().filter(id => id !== questId));
+    validateIgnoredQuests();
+}
+
+export function questIsIgnored(questId: string): boolean {
+    return getIgnoredQuestIDs().includes(questId);
+}
+
+export function ignoreAllQuests(): void {
+    const currentlyIgnored = new Set(getIgnoredQuestIDs());
+    const ignoredQuests = new Set<string>();
+
+    for (const quest of QuestStore.quests.values()) {
+        if (
+            currentlyIgnored.has(quest.id)
+            || getQuestStatus(quest, Array.from(currentlyIgnored), false) === QuestStatus.Unclaimed
+        ) {
+            ignoredQuests.add(quest.id);
+        }
+    }
+
+    for (const quest of QuestStore.excludedQuests.values()) {
+        if (currentlyIgnored.has(quest.id)) {
+            ignoredQuests.add(quest.id);
+        }
+    }
+
+    setIgnoredQuestIDs(Array.from(ignoredQuests));
+    validateIgnoredQuests();
+}
diff --git a/src/equicordplugins/questify/settings/rerender.ts b/src/equicordplugins/questify/settings/rerender.ts
new file mode 100644
index 000000000..1d963ebf2
--- /dev/null
+++ b/src/equicordplugins/questify/settings/rerender.ts
@@ -0,0 +1,29 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { React } from "@webpack/common";
+
+let questRerenderVersion = 0;
+const listeners = new Set<() => void>();
+
+function subscribe(listener: () => void): () => void {
+    listeners.add(listener);
+
+    return () => listeners.delete(listener);
+}
+
+function getSnapshot(): number {
+    return questRerenderVersion;
+}
+
+export function rerenderQuests(): void {
+    questRerenderVersion++;
+    listeners.forEach(listener => listener());
+}
+
+export function useQuestRerender(): number {
+    return React.useSyncExternalStore(subscribe, getSnapshot);
+}
diff --git a/src/equicordplugins/questify/settings/restartTracking.ts b/src/equicordplugins/questify/settings/restartTracking.ts
new file mode 100644
index 000000000..19aa59c03
--- /dev/null
+++ b/src/equicordplugins/questify/settings/restartTracking.ts
@@ -0,0 +1,65 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { SettingsStore } from "@api/Settings";
+import type { DefinedSettings, SettingsDefinition } from "@utils/types";
+
+import { Alerts } from "../utils/ui";
+
+type RestartTrackingSettings = Pick<DefinedSettings<SettingsDefinition>, "def" | "pluginName">;
+
+let restartDirty = false;
+let didAttachRestartListeners = false;
+const restartListenerCleanups: (() => void)[] = [];
+
+function getRestartSettingPaths(settings: RestartTrackingSettings): string[] {
+    return Object.entries(settings.def)
+        .filter(([, definition]) => definition.restartNeeded)
+        .map(([key]) => `plugins.${settings.pluginName}.${key}`);
+}
+
+export function initializeRestartTracking(settings: RestartTrackingSettings): void {
+    if (didAttachRestartListeners) {
+        return;
+    }
+
+    didAttachRestartListeners = true;
+
+    for (const path of getRestartSettingPaths(settings)) {
+        const markRestartDirty = () => { restartDirty = true; };
+
+        SettingsStore.addChangeListener(path, markRestartDirty);
+        restartListenerCleanups.push(() => SettingsStore.removeChangeListener(path, markRestartDirty));
+    }
+}
+
+export function disposeRestartTracking(): void {
+    for (const cleanup of restartListenerCleanups.splice(0)) {
+        cleanup();
+    }
+
+    didAttachRestartListeners = false;
+}
+
+export function isRestartDirty(): boolean {
+    return restartDirty;
+}
+
+export function promptToRestartIfDirty(): boolean {
+    if (!restartDirty) {
+        return false;
+    }
+
+    Alerts.show({
+        title: "Restart Required",
+        body: "A change you've made to Questify's settings requires a restart.",
+        confirmText: "Restart",
+        cancelText: "Later",
+        onConfirm: () => location.reload(),
+    });
+
+    return true;
+}
diff --git a/src/equicordplugins/questify/settings/store.ts b/src/equicordplugins/questify/settings/store.ts
new file mode 100644
index 000000000..a0faddbf0
--- /dev/null
+++ b/src/equicordplugins/questify/settings/store.ts
@@ -0,0 +1,381 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings, PlainSettings, SettingsStore } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { OptionType } from "@utils/types";
+
+import { QuestButtonSetting } from "../components/questButtonSettings";
+import { QuestFeaturesSetting } from "../components/questFeaturesSetting";
+import { QuestNotificationsSetting } from "../components/questNotificationsSetting";
+import { QuestTilesSetting } from "../components/questTilesSetting";
+import { ReorderQuestsSetting } from "../components/reorderQuestsSetting";
+import { defaultAllowChangingDangerousSettings, defaultAutoCompleteQuestsSimultaneously, defaultAutoCompleteQuestTypes, defaultClaimedSubsort, defaultCompleteVideoQuestsQuicker, defaultDisableAccountPanelPromo, defaultDisableAccountPanelQuestProgress, defaultDisableFriendsListPromo, defaultDisableMembersListPromo, defaultDisableOrbsAndQuestsBadges, defaultDisableQuestsEverything, defaultDisableRelocationNotices, defaultDisableSponsoredBanner, defaultExpiredSubsort, defaultIgnoredQuestIDs, defaultIgnoredSubsort, defaultIsOnQuestsPage, defaultLastQuestPageFilters, defaultLastQuestPageSort, defaultLeftClickAction, defaultMakeMobileVideoQuestsDesktopCompatible, defaultMiddleClickAction, defaultNewExcludedQuestAlertSound, defaultNewExcludedQuestAlertVolume, defaultNewQuestAlertSound, defaultNewQuestAlertVolume, defaultNotifyOnNewExcludedQuests, defaultNotifyOnNewQuests, defaultNotifyOnQuestComplete, defaultQuestButtonBadgeColor, defaultQuestButtonBadgeCount, defaultQuestButtonDisplay, defaultQuestButtonIncludedTypes, defaultQuestButtonIndicator, defaultQuestCompletedAlertSound, defaultQuestCompletedAlertVolume, defaultQuestFetchInterval, defaultQuestOrder, defaultQuestTileClaimedColorSetting, defaultQuestTileExpiredColorSetting, defaultQuestTileGradient, defaultQuestTileIgnoredColorSetting, defaultQuestTilePreload, defaultQuestTileUnclaimedColorSetting, defaultRememberQuestPageFilters, defaultRememberQuestPageSort, defaultResumeInterruptedQuests, defaultResumeQuestIDs, defaultRightClickAction, defaultUnclaimedSubsort, type QuestButtonAction, type QuestButtonDisplayMode, type QuestButtonIncludedTypes, type QuestButtonIndicatorMode, type QuestOrderStatus } from "./def";
+
+const MIGRATION_TARGET = 1;
+const CURRENT_SETTINGS = PlainSettings.plugins.Questify;
+
+if (CURRENT_SETTINGS) {
+    let migrationVersion = CURRENT_SETTINGS.migrationVersion ?? 0;
+
+    // 0 -> 1: Reset Settings
+    if (migrationVersion === 0) {
+        PlainSettings.plugins.Questify = { enabled: CURRENT_SETTINGS.enabled, migrationVersion: 1 };
+        migrationVersion = 1;
+    }
+
+    if (migrationVersion !== CURRENT_SETTINGS.migrationVersion) {
+        SettingsStore.markAsChanged();
+    }
+}
+
+export const settings = definePluginSettings({
+    migrationVersion: {
+        type: OptionType.NUMBER,
+        description: "The current migration version of the settings.",
+        default: MIGRATION_TARGET,
+        hidden: true,
+    },
+    questFeatures: {
+        type: OptionType.COMPONENT,
+        component: ErrorBoundary.wrap(QuestFeaturesSetting) as any,
+        description: "Select which Quest features to disable.",
+    },
+    disableQuestsEverything: {
+        type: OptionType.BOOLEAN,
+        description: "Disable all Quest features.",
+        default: defaultDisableQuestsEverything,
+        restartNeeded: true,
+        hidden: true,
+    },
+    disableRelocationNotices: {
+        type: OptionType.BOOLEAN,
+        description: "Disable Quest relocation notices in the Discovery page.",
+        default: defaultDisableRelocationNotices,
+        restartNeeded: true,
+        hidden: true,
+    },
+    disableSponsoredBanner: {
+        type: OptionType.BOOLEAN,
+        description: "Disable the sponsored banner on the Quest page.",
+        default: defaultDisableSponsoredBanner,
+        restartNeeded: true,
+        hidden: true,
+    },
+    disableAccountPanelPromo: {
+        type: OptionType.BOOLEAN,
+        description: "Disable the promoted Quest popup above your account panel.",
+        default: defaultDisableAccountPanelPromo,
+        restartNeeded: true,
+        hidden: true,
+    },
+    disableAccountPanelQuestProgress: {
+        type: OptionType.BOOLEAN,
+        description: "Disable active and completed Quest progress above your account panel.",
+        default: defaultDisableAccountPanelQuestProgress,
+        restartNeeded: true,
+        hidden: true,
+    },
+    disableOrbsAndQuestsBadges: {
+        type: OptionType.BOOLEAN,
+        description: "Disable the Quest badge on user profiles.",
+        default: defaultDisableOrbsAndQuestsBadges,
+        restartNeeded: true,
+        hidden: true,
+    },
+    disableFriendsListPromo: {
+        type: OptionType.BOOLEAN,
+        description: "Disable the promotion of Quests for games played by friends.",
+        default: defaultDisableFriendsListPromo,
+        restartNeeded: true,
+        hidden: true,
+    },
+    disableMembersListPromo: {
+        type: OptionType.BOOLEAN,
+        description: "Disable the actively playing icon in members list items.",
+        default: defaultDisableMembersListPromo,
+        restartNeeded: true,
+        hidden: true,
+    },
+    allowChangingDangerousSettings: {
+        type: OptionType.BOOLEAN,
+        description: "Allow changing dangerous settings.",
+        default: defaultAllowChangingDangerousSettings,
+        hidden: true,
+    },
+    resumeInterruptedQuests: {
+        type: OptionType.BOOLEAN,
+        description: "Resume auto-completing Quests after a reload or restart.",
+        default: defaultResumeInterruptedQuests,
+        restartNeeded: true,
+        hidden: true,
+    },
+    makeMobileVideoQuestsDesktopCompatible: {
+        type: OptionType.BOOLEAN,
+        description: "Make mobile-only Video Quests compatible with desktop.",
+        default: defaultMakeMobileVideoQuestsDesktopCompatible,
+        restartNeeded: true,
+        hidden: true,
+    },
+    autoCompleteQuestsSimultaneously: {
+        type: OptionType.BOOLEAN,
+        description: "Complete Quests simultaneously rather than sequentially.",
+        default: defaultAutoCompleteQuestsSimultaneously,
+        restartNeeded: true,
+        hidden: true,
+    },
+    completeVideoQuestsQuicker: {
+        type: OptionType.BOOLEAN,
+        description: "Use Discord's progress leeway and elapsed enrollment time for Video Quest auto-completion.",
+        default: defaultCompleteVideoQuestsQuicker,
+        restartNeeded: true,
+        hidden: true,
+    },
+    autoCompleteQuestTypes: {
+        type: OptionType.CUSTOM,
+        description: "Which types of Quests to auto-complete in the background.",
+        default: defaultAutoCompleteQuestTypes,
+        restartNeeded: true,
+        hidden: true,
+    },
+    questButton: {
+        type: OptionType.COMPONENT,
+        component: ErrorBoundary.wrap(QuestButtonSetting) as any,
+        description: "Customize the Quest button in the server list.",
+    },
+    questButtonDisplay: {
+        type: OptionType.CUSTOM,
+        description: "Which display type to use for the Quest button in the server list.",
+        default: defaultQuestButtonDisplay as QuestButtonDisplayMode,
+        restartNeeded: true,
+        hidden: true,
+    },
+    questButtonIncludedTypes: {
+        type: OptionType.CUSTOM,
+        description: "Which reward types and Quest types to include when displaying Quest counts on the Quest button.",
+        default: defaultQuestButtonIncludedTypes as QuestButtonIncludedTypes,
+        hidden: true,
+    },
+    questButtonIndicator: {
+        type: OptionType.CUSTOM,
+        description: "Which display type to use for the unclaimed indicator on the Quest button in the server list.",
+        default: defaultQuestButtonIndicator as QuestButtonIndicatorMode,
+        hidden: true,
+    },
+    questButtonBadgeCount: {
+        type: OptionType.NUMBER,
+        description: "The current number of relevant unclaimed Quests.",
+        default: defaultQuestButtonBadgeCount,
+        hidden: true,
+    },
+    questButtonBadgeColor: {
+        type: OptionType.NUMBER | OptionType.CUSTOM,
+        description: "The color of the Quest button badge in the server list.",
+        default: defaultQuestButtonBadgeColor as number | null,
+        hidden: true,
+    },
+    questButtonLeftClickAction: {
+        type: OptionType.CUSTOM,
+        description: "The action to perform when left-clicking the Quest button in the server list.",
+        default: defaultLeftClickAction as QuestButtonAction,
+        hidden: true,
+    },
+    questButtonMiddleClickAction: {
+        type: OptionType.CUSTOM,
+        description: "The action to perform when middle-clicking the Quest button in the server list.",
+        default: defaultMiddleClickAction as QuestButtonAction,
+        hidden: true,
+    },
+    questButtonRightClickAction: {
+        type: OptionType.CUSTOM,
+        description: "The action to perform when right-clicking the Quest button in the server list.",
+        default: defaultRightClickAction as QuestButtonAction,
+        hidden: true,
+    },
+    questNotifications: {
+        type: OptionType.COMPONENT,
+        component: ErrorBoundary.wrap(QuestNotificationsSetting) as any,
+        description: "Configure Quest completed and new Quest detected notifications.",
+    },
+    notifyOnQuestComplete: {
+        type: OptionType.BOOLEAN,
+        description: "Show a notification when a Quest is completed.",
+        default: defaultNotifyOnQuestComplete,
+        hidden: true,
+    },
+    notifyOnNewQuests: {
+        type: OptionType.BOOLEAN,
+        description: "Show a notification when new Quests are detected.",
+        default: defaultNotifyOnNewQuests,
+        hidden: true,
+    },
+    notifyOnNewExcludedQuests: {
+        type: OptionType.BOOLEAN,
+        description: "Show a notification when new excluded Quests are detected.",
+        default: defaultNotifyOnNewExcludedQuests,
+        hidden: true,
+    },
+    questCompletedAlertSound: {
+        type: OptionType.STRING | OptionType.CUSTOM,
+        description: "The sound to play when a Quest is completed.",
+        default: defaultQuestCompletedAlertSound as string | null,
+        hidden: true,
+    },
+    questCompletedAlertVolume: {
+        type: OptionType.NUMBER,
+        description: "The volume for the Quest completed alert sound.",
+        default: defaultQuestCompletedAlertVolume,
+        hidden: true,
+    },
+    questFetchInterval: {
+        type: OptionType.NUMBER,
+        description: "The interval in seconds to fetch Quests from Discord.",
+        default: defaultQuestFetchInterval,
+        hidden: true,
+    },
+    newQuestAlertSound: {
+        type: OptionType.STRING | OptionType.CUSTOM,
+        description: "The sound to play when new Quests are detected.",
+        default: defaultNewQuestAlertSound as string | null,
+        hidden: true,
+    },
+    newQuestAlertVolume: {
+        type: OptionType.NUMBER,
+        description: "The volume for the new Quest alert sound.",
+        default: defaultNewQuestAlertVolume,
+        hidden: true,
+    },
+    newExcludedQuestAlertSound: {
+        type: OptionType.STRING | OptionType.CUSTOM,
+        description: "The sound to play when new excluded Quests are detected.",
+        default: defaultNewExcludedQuestAlertSound as string | null,
+        hidden: true,
+    },
+    newExcludedQuestAlertVolume: {
+        type: OptionType.NUMBER,
+        description: "The volume for the new excluded Quest alert sound.",
+        default: defaultNewExcludedQuestAlertVolume,
+        hidden: true,
+    },
+    questTiles: {
+        type: OptionType.COMPONENT,
+        component: ErrorBoundary.wrap(QuestTilesSetting) as any,
+        description: "Customize the appearance of Quest tiles in the Quests page.",
+    },
+    questTileUnclaimedColor: {
+        type: OptionType.CUSTOM,
+        description: "The color of unclaimed Quest tiles in the Quests page.",
+        default: { ...defaultQuestTileUnclaimedColorSetting },
+        hidden: true,
+    },
+    questTileClaimedColor: {
+        type: OptionType.CUSTOM,
+        description: "The color of claimed Quest tiles in the Quests page.",
+        default: { ...defaultQuestTileClaimedColorSetting },
+        hidden: true,
+    },
+    questTileIgnoredColor: {
+        type: OptionType.CUSTOM,
+        description: "The color of ignored Quest tiles in the Quests page.",
+        default: { ...defaultQuestTileIgnoredColorSetting },
+        hidden: true,
+    },
+    questTileExpiredColor: {
+        type: OptionType.CUSTOM,
+        description: "The color of expired Quest tiles in the Quests page.",
+        default: { ...defaultQuestTileExpiredColorSetting },
+        hidden: true,
+    },
+    questTileGradient: {
+        type: OptionType.STRING,
+        description: "Style of the gradient used in the Quest tiles.",
+        default: defaultQuestTileGradient,
+        hidden: true,
+    },
+    questTilePreload: {
+        type: OptionType.BOOLEAN,
+        description: "Attempt to preload the assets for the Quest tiles.",
+        default: defaultQuestTilePreload,
+        hidden: true,
+    },
+    reorderQuests: {
+        type: OptionType.COMPONENT,
+        description: "Sort Quests by their status.",
+        component: ErrorBoundary.wrap(ReorderQuestsSetting) as any,
+    },
+    questOrder: {
+        type: OptionType.CUSTOM,
+        description: "Sort order for Quest status groups.",
+        default: Array.from(defaultQuestOrder) as QuestOrderStatus[],
+        hidden: true,
+    },
+    unclaimedSubsort: {
+        type: OptionType.STRING,
+        description: "Subsort method for unclaimed Quests.",
+        default: defaultUnclaimedSubsort,
+        hidden: true,
+    },
+    claimedSubsort: {
+        type: OptionType.STRING,
+        description: "Subsort method for claimed Quests.",
+        default: defaultClaimedSubsort,
+        hidden: true,
+    },
+    ignoredSubsort: {
+        type: OptionType.STRING,
+        description: "Subsort method for ignored Quests.",
+        default: defaultIgnoredSubsort,
+        hidden: true,
+    },
+    expiredSubsort: {
+        type: OptionType.STRING,
+        description: "Subsort method for expired Quests.",
+        default: defaultExpiredSubsort,
+        hidden: true,
+    },
+    isOnQuestsPage: {
+        type: OptionType.BOOLEAN,
+        description: "Whether the user is currently on the Quests page.",
+        default: defaultIsOnQuestsPage,
+        hidden: true,
+    },
+    rememberQuestPageSort: {
+        type: OptionType.BOOLEAN,
+        description: "Remember the last used sort on the Quests page.",
+        default: defaultRememberQuestPageSort,
+        hidden: true,
+    },
+    rememberQuestPageFilters: {
+        type: OptionType.BOOLEAN,
+        description: "Remember the last used filters on the Quests page.",
+        default: defaultRememberQuestPageFilters,
+        hidden: true,
+    },
+    lastQuestPageSort: {
+        type: OptionType.STRING,
+        description: "Remember the last used sort on the Quests page.",
+        default: defaultLastQuestPageSort,
+        hidden: true,
+    },
+    lastQuestPageFilters: {
+        type: OptionType.CUSTOM,
+        description: "Remember the last used filters on the Quests page.",
+        default: defaultLastQuestPageFilters,
+        hidden: true,
+    },
+    ignoredQuestIDs: {
+        type: OptionType.CUSTOM,
+        description: "An array of Quest IDs that are ignored.",
+        default: defaultIgnoredQuestIDs,
+        hidden: true,
+    },
+    resumeQuestIDs: {
+        type: OptionType.CUSTOM,
+        description: "An array of Quest IDs that are being or are queued to be auto-completed in the background.",
+        default: defaultResumeQuestIDs,
+        hidden: true,
+    },
+});
diff --git a/src/equicordplugins/questify/state.ts b/src/equicordplugins/questify/state.ts
new file mode 100644
index 000000000..5522d2adc
--- /dev/null
+++ b/src/equicordplugins/questify/state.ts
@@ -0,0 +1,20 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export let initialQuestDataFetched = false;
+let settingsModalOpen = false;
+
+export function setInitialQuestDataFetched(fetched: boolean): void {
+    initialQuestDataFetched = fetched;
+}
+
+export function setSettingsModalOpen(open: boolean): void {
+    settingsModalOpen = open;
+}
+
+export function getSettingsModalOpen(): boolean {
+    return settingsModalOpen;
+}
diff --git a/src/equicordplugins/questify/styles.css b/src/equicordplugins/questify/styles.css
index 38912c83b..788b92ddf 100644
--- a/src/equicordplugins/questify/styles.css
+++ b/src/equicordplugins/questify/styles.css
@@ -1,209 +1,550 @@
-/* Plugin Settings */
+/* Miscellaneous */
+
+/* Fix to overwrite bad CSS in callTimer/alignedChatInputFix.css */
+[class*="panels"] [class*="questProgressWrapper"] [class*="outer"] > [class*="inner"] {
+    height: 100% !important;
+}
+
+/* Fix to overwrite bad CSS in callTimer/alignedChatInputFix.css */
+[class*="panels"] [class*="questProgressWrapper"] > div {
+    opacity: 1 !important;
+}
+
+/* Fix oversized confetti blocking Quest buttons. */
+[class*="rewardDescriptionContainer"] [class*="progressWrapper"] > [class*="confetti"] {
+    pointer-events: none;
+}
+
+/* Fix Questify button text clipping. */
+.questify-quest-item-restyle button [class*="buttonChildren"],
+.questify-quest-item-restyle button span {
+    overflow: visible;
+}
+
+/* Settings */
+
+.questify-setting {
+    border-radius: 3px;
+    border-left: 3px solid var(--text-strong);
+    padding: 8px;
+    user-select: text;
+}
+
+.questify-settings-divider-small {
+    margin: 10px 0;
+}
+
+.questify-settings-divider-medium {
+    margin: 15px 0;
+}
+
+.questify-settings-divider-large {
+    margin: 20px 0;
+}
+
+.questify-dimmed-settings-item {
+    filter: brightness(0.5);
+}
+
+.questify-setting-header {
+    font-size: 19px;
+    font-weight: 600;
+    margin-bottom: 10px;
+}
+
+.questify-setting-subheader {
+    font-size: 16px;
+    font-weight: 500;
+    margin: 15px 0 5px;
+}
+
+.questify-setting-paragraph {
+    font-size: 14px;
+    font-weight: 400;
+    margin: 5px 0;
+    line-height: normal;
+}
+
+.questify-setting-description {
+    margin-bottom: 15px;
+    line-height: normal;
+}
+
+.questify-setting-description-multi-paragraph {
+    line-height: 0.2em;
+}
+
+[class*="clickTrapContainer"] > div > div:has(.questify-settings-tooltip-content) {
+    margin-right: 4px;
+}
+
+.questify-settings-tooltip-content {
+    text-align: justify;
+    white-space: pre-line;
+}
+
+.questify-setting-switch {
+    margin-bottom: 5px;
+}
+
+.questify-setting-switch [class*="container_"] [class*="labelContainer_"] label {
+    font-size: 16px;
+    font-weight: 500;
+}
+
+.questify-setting-subtle-switch [class*="container_"] [class*="labelContainer_"] label,
+.questify-setting-switch [class*="container_"] [class*="labelContainer_"] div {
+    font-size: 14px;
+    font-weight: 400;
+}
+
+.questify-notice-card {
+    margin: 12px 0;
+    padding: 12px;
+    border-radius: 4px;
+    line-height: 0.2em;
+}
+
+.questify-notice-card-red {
+    border-left: 3px solid var(--status-danger);
+    background-color: color-mix(in srgb, var(--status-danger) 12%, transparent);
+}
+
+.questify-notice-card-blue {
+    border-left: 3px solid var(--background-brand);
+    background-color: color-mix(in srgb, var(--background-brand) 12%, transparent);
+}
+
+.questify-notice-card-solo {
+    margin: 12px 0 0;
+}
+
+.questify-settings-button > button[data-mana-component="button"] {
+    border-radius: 3px;
+}
+
+.questify-settings-button > button[data-mana-component="button"] span {
+    font-size: 14px;
+}
+
+.questify-setting [data-floating-ui-focusable][class*="selectDropdown"],
+.questify-setting [data-mana-component="select-input-field"] > [class*="selectField"],
+.questify-setting [data-mana-component="select-input-field"] [class*="tagList"] > div {
+    border-radius: 3px;
+}
+
+.questify-inline-volume-slider {
+    margin-top: 0;
+}
+
+.questify-sound-preview-button {
+    color: var(--interactive-normal);
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 28px;
+    height: 28px;
+    padding: 0;
+    border: 0;
+    border-radius: 4px;
+    background: transparent;
+    cursor: pointer;
+    flex: 0 0 auto;
+}
+
+.questify-sound-preview-button:hover,
+.questify-sound-preview-button.questify-playing-audio {
+    background: var(--background-modifier-hover);
+}
+
+.questify-sound-preview-button:hover {
+    color: var(--interactive-active);
+}
+
+.questify-sound-preview-button.questify-playing-audio {
+    color: var(--red-500);
+}
+
+.questify-sound-preview-button:disabled {
+    cursor: default;
+}
+
+.questify-sound-select [class*="selectedIcon"] {
+    display: none;
+}
+
+.questify-no-top-margin,
+.questify-margin-top-0 {
+    margin-top: 0;
+}
+
+.questify-margin-top-1 {
+    margin-top: 1px;
+}
+
+.questify-margin-top-2 {
+    margin-top: 2px;
+}
+
+.questify-margin-top-3 {
+    margin-top: 3px;
+}
+
+.questify-margin-top-4 {
+    margin-top: 4px;
+}
+
+.questify-margin-top-5 {
+    margin-top: 5px;
+}
+
+.questify-margin-top-6 {
+    margin-top: 6px;
+}
+
+.questify-margin-top-7 {
+    margin-top: 7px;
+}
+
+.questify-margin-top-8 {
+    margin-top: 8px;
+}
+
+.questify-margin-top-9 {
+    margin-top: 9px;
+}
+
+.questify-margin-top-10 {
+    margin-top: 10px;
+}
+
+.questify-margin-top-11 {
+    margin-top: 11px;
+}
+
+.questify-margin-top-12 {
+    margin-top: 12px;
+}
+
+.questify-margin-top-13 {
+    margin-top: 13px;
+}
+
+.questify-margin-top-14 {
+    margin-top: 14px;
+}
+
+.questify-margin-top-15 {
+    margin-top: 15px;
+}
+
+.questify-no-bottom-margin,
+.questify-margin-bottom-0 {
+    margin-bottom: 0;
+}
+
+.questify-margin-bottom-1 {
+    margin-bottom: 1px;
+}
+
+.questify-margin-bottom-2 {
+    margin-bottom: 2px;
+}
+
+.questify-margin-bottom-3 {
+    margin-bottom: 3px;
+}
+
+.questify-margin-bottom-4 {
+    margin-bottom: 4px;
+}
+
+.questify-margin-bottom-5 {
+    margin-bottom: 5px;
+}
+
+.questify-margin-bottom-6 {
+    margin-bottom: 6px;
+}
+
+.questify-margin-bottom-7 {
+    margin-bottom: 7px;
+}
+
 .questify-margin-bottom-8 {
     margin-bottom: 8px;
 }
 
-.questify-setting-divider {
-    margin: 0;
+.questify-margin-bottom-9 {
+    margin-bottom: 9px;
 }
 
-.questify-setting {
-    border-left: 3px solid var(--text-strong);
-    padding: 3px 0 3px 8px;
-    border-radius: 3px;
-    user-select: text;
+.questify-margin-bottom-10 {
+    margin-bottom: 10px;
 }
 
-.questify-main-inline-group {
+.questify-margin-bottom-11 {
+    margin-bottom: 11px;
+}
+
+.questify-margin-bottom-12 {
+    margin-bottom: 12px;
+}
+
+.questify-margin-bottom-13 {
+    margin-bottom: 13px;
+}
+
+.questify-margin-bottom-14 {
+    margin-bottom: 14px;
+}
+
+.questify-margin-bottom-15 {
+    margin-bottom: 15px;
+}
+
+.questify-settings-row {
     margin-top: 4px;
     display: flex;
-    gap: 12px;
+    gap: 4px;
+    align-items: flex-start;
 }
 
-.questify-sub-inline-group {
-    display: flex;
-    gap: 8px;
+.questify-settings-row-item {
+    flex: 1 1 0;
+    min-width: 0;
 }
 
-.questify-inline-group-item {
-    flex: 1;
+.questify-settings-row-item-content {
+    flex: 0 0 auto;
 }
 
-.questify-form-title {
-    font-size: 18px;
-    font-weight: 700;
-    margin-bottom: 8px;
-}
-
-.questify-form-subtitle {
-    font-size: 14px;
-    font-weight: 500;
-    margin-top: 4px;
-    margin-bottom: 4px;
-}
-
-.questify-form-subtitle-spacier {
-    margin-top: 8px;
-}
-
-.questify-form-description {
-    font-size: 14px;
-}
-
-.questify-form-warning {
-    margin: 12px 0 8px;
-    padding: 10px 12px;
-    border-left: 3px solid var(--status-danger);
-    border-radius: 4px;
-    background-color: color-mix(in srgb, var(--status-danger) 12%, transparent);
-}
-
-.questify-select > div {
-    border-radius: 3px;
-    min-height: 43px;
-    border: 1px solid var(--border-normal);
-}
-
-.questify-affixless-select-popout-option {
-    grid-template-areas: "content selectedIcon" !important;
-    grid-template-columns: 1fr auto !important;
-}
-
-.questify-setting [class*="comboBoxInputContainer"] {
-    flex-wrap: wrap;
-}
-
-.questify-volume-slider-container {
-    margin: 8px 0 0;
+.questify-settings-slider-control-container {
+    margin: 4px 0 0;
     background-color: var(--input-background-default, var(--input-background));
-    padding: 7px 12px 7px 7px;
+    padding: 0 12px 0 4px;
     border-radius: 3px;
     border: 1px solid var(--border-normal);
-}
-
-.questify-button,
-.questify-sub-inline-group [class*="swatch"] {
-    height: 38px;
-    min-height: 38px;
-    width: 80px;
-    min-width: 80px;
-    padding: 2px;
-    border-radius: 3px;
-}
-
-.questify-alert-icon {
-    flex: 0;
-    place-content: center center;
-    background-color: var(--input-background-default, var(--input-background));
-    border-radius: 3px;
-    padding: 0 10px;
-    color: var(--text-default);
-    border: 1px solid var(--border-normal);
-    min-height: 43px;
+    min-height: 40px;
+    box-sizing: border-box;
     display: flex;
     align-items: center;
-    transition: color 0.2s ease-in-out;
 }
 
-.questify-alert-icon.questify-playing-audio {
-    color: var(--red-500);
-    transition: color 0.2s ease-in-out;
-}
-
-.questify-button [class*="contents"] {
-    margin: 0 8px;
-}
-
-.questify-button-red {
-    background-color: var(--red-500) !important;
-}
-
-.questify-button-red:hover {
-    filter: brightness(0.75);
-    transition: filter 0.2s ease-in-out;
-}
-
-.questify-button-blue {
-    background-color: var(--blue-500) !important;
-}
-
-.questify-button-blue:hover {
-    filter: brightness(0.75);
-    transition: filter 0.2s ease-in-out;
-}
-
-#questify-dummy-quest-button {
-    border-left: 5px solid var(--text-strong);
-    border-radius: 4px;
-}
-
-.questify-text-input,
-.questify-text-area {
-    margin-top: 4px;
+.questify-settings-slider-control {
+    margin: 0 4px;
     width: 100%;
-    border-radius: 3px;
 }
 
-.questify-text-area {
-    height: 150px;
+.questify-sound-select-row-item {
+    flex: 0 1 67%;
 }
 
-.questify-color-picker-container {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 8px;
-    margin-top: 8px;
+.questify-volume-slider-row-item {
+    flex: 0 1 33%;
 }
 
-.questify-color-picker-group {
+/* Quest Tiles */
+
+.questify-quest-tile-gradient-row-item {
+    flex: 0 1 42%;
+}
+
+.questify-quest-tile-preload-row-item {
+    flex: 0 1 58%;
+}
+
+.questify-quest-tile-color-row {
+    align-items: stretch;
+}
+
+.questify-quest-tile-color-row-item {
     display: flex;
     flex-direction: column;
 }
 
-.questify-color-picker-with-buttons {
-    background-color: var(--input-background-default, var(--input-background));
-    border: 1px solid var(--border-normal);
-    border-radius: 3px;
-    padding: 8px;
+.questify-settings-color-picker.questify-quest-tile-color-picker {
+    display: flex;
+    height: 38px;
+    min-height: 38px;
+    min-width: 0;
+    margin-top: 5px;
 }
 
-.questify-color-picker-with-buttons [class*="swatch"],
-.questify-color-picker-with-buttons [class*="colorSwatch"] {
-    border-radius: 3px;
+.questify-settings-color-picker.questify-quest-tile-color-picker > [class*="colorSwatch"] {
+    display: flex;
     width: 100%;
-    margin-bottom: 4px;
+    height: 100%;
+    min-height: 38px;
 }
 
-.questify-wide-button {
+.questify-settings-color-picker.questify-quest-tile-color-picker [class*="swatch"],
+.questify-settings-color-picker.questify-quest-tile-color-picker [class*="Swatch"] {
     width: 100%;
-    flex: 1;
+    height: 100%;
+    min-height: 38px;
+    border-radius: 3px;
 }
 
-.questify-flex-65 {
-    flex: 6;
+.questify-settings-color-picker.questify-disabled-color-picker {
+    filter: brightness(0.5);
+    pointer-events: none;
 }
 
-.questify-flex-35 {
-    flex: 4;
+.questify-quest-tile-color-button {
+    margin-top: 6px;
 }
 
-.questify-inline-code-block {
-    display: inline-block;
-    padding: 0 4px;
-    border-radius: 4px;
-    background-color: var(--background-code);
-    border: 1px solid var(--border-normal);
-    font-family: var(--font-code);
-    font-size: 90%;
+.questify-dummy-quest-preview {
+    cursor: default;
+    margin-top: 12px;
+    user-select: none;
 }
 
 .questify-dummy-quest {
     margin-top: 8px;
 }
 
-.questify-dummy-quest:active {
+/* Background of Quest tile. */
+.questify-quest-item-restyle > :where(div) {
+    background-color: var(--questify-color) !important;
+}
+
+/* Normal button text + SVG button text color. */
+.questify-quest-item-restyle > :nth-child(2) button > *,
+.questify-quest-item-restyle > :nth-child(2) button > * > * > span {
+    color: var(--questify-quest-name);
+}
+
+/* Watch again button SVG color. */
+.questify-quest-item-restyle > :nth-child(2) button > div > div > svg path {
+    fill: var(--questify-quest-name);
+}
+
+/* Allows glowing reward previews which aren't confined to their own square video frame to overflow. */
+.questify-quest-item-restyle > div > div[class*="rewardDescriptionContainer"] {
+    overflow: visible;
+}
+
+/* Quest name color. */
+.questify-quest-item-restyle > div > div[class*="rewardDescriptionContainer"] > div[class*="textContainer"] > [class*="eyebrow"] {
+    color: var(--questify-quest-name) !important;
+}
+
+/* Reward title + Orbs reward title text color. */
+.questify-quest-item-restyle > div > div[class*="rewardDescriptionContainer"] > div[class*="textContainer"] > div[class*="text-md"],
+.questify-quest-item-restyle > div > div[class*="rewardDescriptionContainer"] > div[class*="textContainer"] > div[class*="text-md"] > span {
+    color: var(--questify-reward-title) !important;
+}
+
+/* Quest description text color. */
+.questify-quest-item-restyle > div > div[class*="rewardDescriptionContainer"] > div[class*="textContainer"] > div[class*="text-sm"] {
+    color: var(--questify-reward-description) !important;
+}
+
+.questify-quest-item-restyle [class*="placeholderElement"] {
+    background-color: transparent;
+}
+
+/* Promoted by XYZ text color. */
+.questify-quest-item-restyle > div[class*="container"] > div[class*="positionContentOverBackground"] > div[class*="contents"] > div[class*="bottomRow"] > div[class*="text-sm"] {
+    color: var(--questify-reward-description) !important;
+}
+
+.questify-quest-item-contrast-logo > div[class*="container"] > div[class*="positionContentOverBackground"] > div[class*="contents"] > div[class*="partnerBranding"] > img {
+    filter: drop-shadow(0 0 10px rgb(0 0 0 / 80%));
+}
+
+.questify-quest-item-intense-gradient > :nth-child(1) [class*="overlay"] {
+    background: linear-gradient(to top,
+            var(--questify-color) 0,
+            hsl(from var(--questify-color) h s l / 100%) 20.5%,
+            hsl(from var(--questify-color) h s l / 99.5%) 23.33%,
+            hsl(from var(--questify-color) h s l / 98%) 26.66%,
+            hsl(from var(--questify-color) h s l / 97%) 30%,
+            hsl(from var(--questify-color) h s l / 90%) 40%,
+            hsl(from var(--questify-color) h s l / 77%) 50%,
+            hsl(from var(--questify-color) h s l / 0%) 100%);
+}
+
+.questify-quest-item-default-gradient > :nth-child(1) [class*="overlay"] {
+    background: linear-gradient(to top,
+            var(--questify-color) 0,
+            hsl(from var(--questify-color) h s l / 95%) 20.31%,
+            hsl(from var(--questify-color) h s l / 0%) 100%);
+}
+
+.questify-quest-item-black-gradient > :nth-child(1) [class*="overlay"] {
+    background: linear-gradient(to top,
+            hsl(0deg 0% 0% / 80%) 10%,
+            hsl(0deg 0% 0% / 65%) 20%,
+            hsl(0deg 0% 0% / 50%) 50%,
+            hsl(0deg 0% 0% / 10%) 75%,
+            hsl(0deg 0% 0% / 0%) 90%);
+}
+
+.questify-quest-item-hide-gradient > :nth-child(1) [class*="overlay"] {
+    display: none;
+}
+
+.questify-quest-item-restyle > :nth-child(2) [class*="textOverflowBlur"] {
+    background: linear-gradient(transparent 50%, var(--questify-color) 100%);
+    filter: brightness(0.9);
+}
+
+.questify-quest-item-restyle > :nth-child(2) > div button {
+    background-color: var(--questify-button-normal) !important;
+}
+
+.questify-quest-item-restyle > :nth-child(2) > div button:not([disabled]):hover {
+    background-color: var(--questify-button-hover) !important;
+    transition: background-color 0.2s ease-in-out;
+}
+
+.questify-quest-item-restyle > :nth-child(1) [class*="container"] {
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+}
+
+.questify-quest-item-restyle > :nth-child(2) [class*="container"] {
+    border-bottom-left-radius: 8px;
+    border-bottom-right-radius: 8px;
+}
+
+div[id^="quest-tile-"] div[class^="confetti__"] {
     pointer-events: none;
-    user-select: none;
+}
+
+/* Quest Button */
+
+#questify-dummy-quest-button {
+    margin-right: -12px;
+    margin-left: 5px;
+    border-left: 5px solid var(--text-strong);
+    border-radius: 4px;
+}
+
+.questify-settings-color-picker.questify-quest-button-color-picker {
+    display: flex;
+    height: 38px;
+    min-height: 38px;
+    min-width: 0;
+    margin-top: 5px;
+}
+
+.questify-settings-color-picker.questify-quest-button-color-picker > [class*="colorSwatch"] {
+    display: flex;
+    width: 100%;
+    height: 100%;
+    min-height: 38px;
+}
+
+.questify-settings-color-picker.questify-quest-button-color-picker [class*="swatch"],
+.questify-settings-color-picker.questify-quest-button-color-picker [class*="Swatch"] {
+    width: 100%;
+    height: 100%;
+    min-height: 38px;
+    border-radius: 3px;
 }
 
 .questify-quest-button-pill {
@@ -245,121 +586,3 @@
 .questify-quest-button-container {
     position: relative;
 }
-
-/* Background of Quest tile. */
-.questify-quest-item-restyle > div {
-    background-color: var(--questify-color) !important;
-}
-
-/* Normal button text + SVG button text color. */
-.questify-quest-item-restyle > :nth-child(2) button > div,
-.questify-quest-item-restyle > :nth-child(2) button > div > div > span {
-    color: var(--questify-quest-name);
-}
-
-/* Watch again button SVG color. */
-.questify-quest-item-restyle > :nth-child(2) button > div > div > svg path {
-    fill: var(--questify-quest-name);
-}
-
-/* Allows glowing reward previews which aren't confined to their own
-    square video frame to overflow so the glow doesn't get cut off. */
-.questify-quest-item-restyle > div > div[class*="rewardDescriptionContainer"] {
-    overflow: visible;
-}
-
-/* Quest name color. */
-.questify-quest-item-restyle > div > div[class*="rewardDescriptionContainer"] > div[class*="textContainer"] > [class*="eyebrow"] {
-    color: var(--questify-quest-name) !important;
-}
-
-/* Reward title + Orbs reward title text color. */
-.questify-quest-item-restyle > div > div[class*="rewardDescriptionContainer"] > div[class*="textContainer"] > div[class*="text-md"],
-.questify-quest-item-restyle > div > div[class*="rewardDescriptionContainer"] > div[class*="textContainer"] > div[class*="text-md"] > span {
-    color: var(--questify-reward-title) !important;
-}
-
-/* Quest description text color. */
-.questify-quest-item-restyle > div > div[class*="rewardDescriptionContainer"] > div[class*="textContainer"] > div[class*="text-sm"] {
-    color: var(--questify-reward-description) !important;
-}
-
-/* Hides the gray placeholder elements which distract from the restyles. */
-.questify-quest-item-restyle [class*="placeholderElement"] {
-    background-color: transparent;
-}
-
-/* Promoted by XYZ text color. */
-.questify-quest-item-restyle > div[class*="container"] > div[class*="positionContentOverBackground"] > div[class*="contents"] > div[class*="bottomRow"] > div[class*="text-sm"] {
-    color: var(--questify-reward-description) !important;
-}
-
-/* Drop shadow for >87.5% luminance (near-white) restyle gradients so logos are legible. */
-.questify-quest-item-contrast-logo > div[class*="container"] > div[class*="positionContentOverBackground"] > div[class*="contents"] > div[class*="partnerBranding"] > img {
-    filter: drop-shadow(0 0 10px rgb(0 0 0 / 80%));
-}
-
-/* Increased gradient intensity with restyle color. */
-.questify-quest-item-intense-gradient > :nth-child(1) [class*="overlay"] {
-    background: linear-gradient(to top,
-            var(--questify-color) 0,
-            hsl(from var(--questify-color) h s l / 100%) 20.5%,
-            hsl(from var(--questify-color) h s l / 99.5%) 23.33%,
-            hsl(from var(--questify-color) h s l / 98%) 26.66%,
-            hsl(from var(--questify-color) h s l / 97%) 30%,
-            hsl(from var(--questify-color) h s l / 90%) 40%,
-            hsl(from var(--questify-color) h s l / 77%) 50%,
-            hsl(from var(--questify-color) h s l / 0%) 100%);
-}
-
-/* Default gradient intensity with restyle color. */
-.questify-quest-item-default-gradient > :nth-child(1) [class*="overlay"] {
-    background: linear-gradient(to top,
-            var(--questify-color) 0,
-            hsl(from var(--questify-color) h s l / 95%) 20.31%,
-            hsl(from var(--questify-color) h s l / 0%) 100%);
-}
-
-/* Subtle black gradient. */
-.questify-quest-item-black-gradient > :nth-child(1) [class*="overlay"] {
-    background: linear-gradient(to top,
-            hsl(0deg 0% 0% / 80%) 10%,
-            hsl(0deg 0% 0% / 65%) 20%,
-            hsl(0deg 0% 0% / 50%) 50%,
-            hsl(0deg 0% 0% / 10%) 75%,
-            hsl(0deg 0% 0% / 0%) 90%);
-}
-
-/* Hides the gradient altogether. */
-.questify-quest-item-hide-gradient > :nth-child(1) [class*="overlay"] {
-    display: none;
-}
-
-/* Matches the text overlay which darkens the text of long
-    descriptions until hovered with the chosen restyle color. */
-.questify-quest-item-restyle > :nth-child(2) [class*="textOverflowBlur"] {
-    background: linear-gradient(transparent 50%, var(--questify-color) 100%);
-    filter: brightness(0.9);
-}
-
-/* Quest tile button color. */
-.questify-quest-item-restyle > :nth-child(2) > div button {
-    background-color: var(--questify-button-normal) !important;
-}
-
-.questify-quest-item-restyle > :nth-child(2) > div button:not([disabled]):hover {
-    background-color: var(--questify-button-hover) !important;
-    transition: background-color 0.2s ease-in-out;
-}
-
-/* Quest tile border radius. */
-
-.questify-quest-item-restyle > :nth-child(1) [class*="container"] {
-    border-top-left-radius: 8px;
-    border-top-right-radius: 8px;
-}
-
-.questify-quest-item-restyle > :nth-child(2) [class*="container"] {
-    border-bottom-left-radius: 8px;
-    border-bottom-right-radius: 8px;
-}
\ No newline at end of file
diff --git a/src/equicordplugins/questify/utils/completion.ts b/src/equicordplugins/questify/utils/completion.ts
new file mode 100644
index 000000000..54f600e62
--- /dev/null
+++ b/src/equicordplugins/questify/utils/completion.ts
@@ -0,0 +1,1205 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { PluginNative } from "@utils/types";
+import type { Quest } from "@vencord/discord-types";
+import { QuestTaskType } from "@vencord/discord-types/enums";
+import { findByCodeLazy, findLazy } from "@webpack";
+import { FluxDispatcher, QuestStore, RestAPI, showToast, Toasts } from "@webpack/common";
+
+import { getCurrentUserId, getQuestifySettings } from "../settings/access";
+import { autoCompleteQuestTaskTypes, isDesktopCompatible } from "../settings/def";
+import { resetQuestsToResume } from "../settings/fetching";
+import { getIgnoredQuestIDs } from "../settings/ignoredQuests";
+import { rerenderQuests } from "../settings/rerender";
+import { AuthorizedAppsStore } from "./fetching";
+import { normalizeQuestName } from "./filtering";
+import { QL } from "./logging";
+import { getQuestStatus, getQuestStoredProgress, isVideoQuestTask, QuestStatus, QuestTask, refreshQuest } from "./questState";
+import { hasInjectedDesktopVideoCompatibility } from "./questTiles";
+
+type QuestEnrollResult =
+    | { type: "success"; }
+    | { type: "captcha_failed"; }
+    | { type: "unknown_error"; }
+    | { type: "previous_in_flight_request"; };
+
+interface QuestEnrollmentMetadata {
+    questContent: unknown;
+    questContentCTA?: unknown;
+    sourceQuestContent: unknown;
+    sourceQuestContentCTA?: unknown;
+    questContentPosition: unknown;
+    questContentRowIndex: unknown;
+}
+
+interface QuestCTAConstants {
+    START_QUEST: string;
+    ACCEPT_QUEST: string;
+}
+
+interface QuestButtonAnalyticsArgs {
+    taskType?: QuestTaskType;
+    analyticsCtxQuestContent?: QuestEnrollmentMetadata["questContent"];
+    analyticsCtxSourceQuestContent?: QuestEnrollmentMetadata["sourceQuestContent"];
+    analyticsCtxQuestContentPosition?: QuestEnrollmentMetadata["questContentPosition"];
+    analyticsCtxQuestContentRowIndex?: QuestEnrollmentMetadata["questContentRowIndex"];
+}
+
+export interface QuestButtonPropsArgs extends Partial<QuestButtonAnalyticsArgs> {
+    quest: Quest;
+    preClickCallback?: () => void;
+}
+
+export interface QuestButtonPatchProps {
+    icon: string | undefined;
+    text: string;
+    onClick: () => void;
+}
+
+interface QuestButtonTextOptions {
+    prepositional?: boolean;
+}
+
+export enum QuestCompletionState {
+    Completing = "COMPLETING",
+    Queued = "QUEUED",
+    Accepted = "ACCEPTED",
+    Unenrolled = "UNENROLLED",
+}
+
+type QuestCompletionStateTuple = [text: string | null, state: QuestCompletionState];
+
+interface QuestRewardItem {
+    orbQuantity?: number;
+    messages?: {
+        nameWithArticle?: string;
+    };
+}
+
+const reportVideoProgress = findByCodeLazy(".QUESTS_VIDEO_PROGRESS(") as (questId: string, progress: number) => Promise<void>;
+const sendHeartbeat = findByCodeLazy(".QUESTS_HEARTBEAT(") as (options: {
+    questId: string;
+    streamKey?: string;
+    applicationId: string;
+    terminal?: boolean;
+    executableFingerprint?: unknown;
+}) => Promise<void>;
+export const enrollInQuest = findByCodeLazy('type:"QUESTS_ENROLL_BEGIN",') as (questId: string, options: QuestEnrollmentMetadata) => Promise<QuestEnrollResult>;
+
+const QuestCTA = findLazy(m => !!m?.START_QUEST && !!m?.ACCEPT_QUEST) as QuestCTAConstants;
+
+function resolveQuestCTA(taskType?: QuestTaskType): string | undefined {
+    return !taskType ? undefined : [QuestTaskType.ACHIEVEMENT_IN_ACTIVITY, QuestTaskType.PLAY_ACTIVITY, QuestTaskType.WATCH_VIDEO].includes(taskType) ? QuestCTA.START_QUEST : QuestCTA.ACCEPT_QUEST;
+}
+
+export function makeEnrollmentData(args: QuestButtonAnalyticsArgs): QuestEnrollmentMetadata {
+    return {
+        questContent: args.analyticsCtxQuestContent,
+        questContentCTA: resolveQuestCTA(args.taskType),
+        sourceQuestContent: args.analyticsCtxSourceQuestContent,
+        sourceQuestContentCTA: resolveQuestCTA(args.taskType),
+        questContentPosition: args.analyticsCtxQuestContentPosition,
+        questContentRowIndex: args.analyticsCtxQuestContentRowIndex
+    };
+}
+
+const QuestifyNative = VencordNative?.pluginHelpers?.Questify as PluginNative<typeof import("../native")> | undefined;
+
+const videoQuestLeeway = 24;
+const resumeExpiryMs = 60 * 60 * 1000;
+export type AutoCompleteQuestKind = "watch" | "play" | "achievement";
+export type AutoCompleteQuestStatus = "queued" | "running";
+export type AutoCompleteStartSource = "manual" | "resume" | "auto";
+
+export interface AutoCompleteEntry {
+    questId: string;
+    questName: string;
+    task: QuestTask;
+    kind: AutoCompleteQuestKind;
+    status: AutoCompleteQuestStatus;
+    progress: number | null;
+    abortController: AbortController;
+    progressInterval: ReturnType<typeof setInterval> | null;
+    rerenderInterval: ReturnType<typeof setInterval> | null;
+}
+
+export interface AutoCompleteStartOptions {
+    force?: boolean;
+    source?: AutoCompleteStartSource;
+}
+
+export interface AutoCompleteStopOptions {
+    manual?: boolean;
+    preserveResume?: boolean;
+    terminalHeartbeat?: boolean;
+}
+
+type HeartbeatDispatchResult =
+    | { type: "success"; userStatus: Quest["userStatus"]; }
+    | { type: "failure"; error: unknown; }
+    | { type: "timeout"; };
+
+interface AutoCompleteQuestTarget {
+    raw: number;
+    adjusted: number;
+}
+
+type PlayHeartbeatResult = { progress: number | null; completed: boolean; };
+type HeartbeatDispatchWaiter = { promise: Promise<HeartbeatDispatchResult>; cancel: () => void; };
+
+interface VideoProgressReportOptions {
+    attempts?: number;
+    delay?: number;
+    displayProgress?: number;
+}
+
+const activeAutoCompletes = new Map<string, AutoCompleteEntry>();
+const manuallyStoppedQuestIds = new Set<string>();
+let suppressQueueDrain = false;
+let videoProgressStackTracePatchSucceeded = false;
+let heartbeatStackTracePatchSucceeded = false;
+let didShowBrokenAutoCompleteToast = false;
+
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    if (signal?.aborted) {
+        return Promise.reject(new Error("Auto-complete aborted."));
+    }
+
+    return new Promise((resolve, reject) => {
+        const timeoutId = setTimeout(() => {
+            signal?.removeEventListener("abort", onAbort);
+            resolve();
+        }, ms);
+
+        function onAbort() {
+            clearTimeout(timeoutId);
+            signal?.removeEventListener("abort", onAbort);
+            reject(new Error("Auto-complete aborted."));
+        }
+
+        signal?.addEventListener("abort", onAbort, { once: true });
+    });
+}
+
+function clampFloat(value: number, precision: number = 6): number {
+    return Number(value.toFixed(precision));
+}
+
+function randomBetween(min: number, max: number): number {
+    return clampFloat(min + Math.random() * (max - min));
+}
+
+export function setVideoProgressStackTracePatchSucceeded(): void {
+    videoProgressStackTracePatchSucceeded = true;
+}
+
+export function setHeartbeatStackTracePatchSucceeded(): void {
+    heartbeatStackTracePatchSucceeded = true;
+}
+
+export function getStackTracePatchesSucceeded(): { videoProgress: boolean; heartbeat: boolean; } {
+    return {
+        videoProgress: videoProgressStackTracePatchSucceeded,
+        heartbeat: heartbeatStackTracePatchSucceeded,
+    };
+}
+
+function showBrokenAutoCompleteToast(): void {
+    if (didShowBrokenAutoCompleteToast) {
+        return;
+    }
+
+    didShowBrokenAutoCompleteToast = true;
+    showToast("AutoComplete is broken. A fix will be implemented shortly.", Toasts.Type.FAILURE);
+}
+
+export function hasEnabledAutoCompleteQuestTypes(): boolean {
+    return autoCompleteQuestTaskTypes.some(questType => getQuestifySettings().autoCompleteQuestTypes[questType]);
+}
+
+function isAutoCompleteRuntimeReady(notify: boolean = false): boolean {
+    const stackTracePatches = getStackTracePatchesSucceeded();
+
+    if (stackTracePatches.videoProgress && stackTracePatches.heartbeat) {
+        return true;
+    }
+
+    if (notify) {
+        showBrokenAutoCompleteToast();
+        QL.warn("AUTO_COMPLETE_STACK_TRACE_PATCH_MISSING", stackTracePatches);
+    }
+
+    return false;
+}
+
+export function getQuestAutoCompleteProgress(quest: Quest): number | null {
+    return activeAutoCompletes.get(quest.id)?.progress ?? null;
+}
+
+export function getQuestAutoCompleteEntry(questOrId: Quest | string): Readonly<AutoCompleteEntry> | null {
+    const questId = typeof questOrId === "string" ? questOrId : questOrId.id;
+
+    return activeAutoCompletes.get(questId) ?? null;
+}
+
+export function getAutoCompleteQuestTarget(task: QuestTask): AutoCompleteQuestTarget {
+    const raw = task.target;
+
+    return {
+        raw,
+        adjusted: Math.max(0, raw - (isVideoQuestTask(task.type) && getQuestifySettings().completeVideoQuestsQuicker ? videoQuestLeeway : 0)),
+    };
+}
+
+function getAutoCompleteQuestTasks(quest: Quest): QuestTask[] {
+    const tasks = quest.config.taskConfigV2?.tasks;
+
+    if (!tasks) {
+        return [];
+    }
+
+    return autoCompleteQuestTaskTypes.flatMap(taskType => {
+        const task = tasks[taskType] as QuestTask | undefined;
+
+        return task ? [task] : [];
+    });
+}
+
+function getQuestAutoCompleteKind(task: QuestTask): AutoCompleteQuestKind | null {
+    switch (task.type) {
+        case QuestTaskType.WATCH_VIDEO:
+        case QuestTaskType.WATCH_VIDEO_ON_MOBILE:
+            return "watch";
+        case QuestTaskType.PLAY_ON_DESKTOP:
+        case QuestTaskType.PLAY_ON_XBOX:
+        case QuestTaskType.PLAY_ON_PLAYSTATION:
+        case QuestTaskType.PLAY_ACTIVITY:
+            return "play";
+        case QuestTaskType.ACHIEVEMENT_IN_ACTIVITY:
+            return "achievement";
+        default:
+            return null;
+    }
+}
+
+function getEffectiveAutoCompleteTaskType(task: QuestTask, quest: Quest): QuestTaskType {
+    return task.type === QuestTaskType.WATCH_VIDEO && hasInjectedDesktopVideoCompatibility(quest)
+        ? QuestTaskType.WATCH_VIDEO_ON_MOBILE
+        : task.type;
+}
+
+function isAutoCompleteQuestTaskEnabled(quest: Quest, task: QuestTask): boolean {
+    const taskType = getEffectiveAutoCompleteTaskType(task, quest);
+    const compatible = isDesktopCompatible(taskType);
+    const enabled = getQuestifySettings().autoCompleteQuestTypes[taskType] === true;
+
+    return compatible && enabled && getQuestAutoCompleteKind(task) != null;
+}
+
+function resolveAutoCompleteQuest(quest: Quest): { task: QuestTask; kind: AutoCompleteQuestKind; } | null {
+    for (const task of getAutoCompleteQuestTasks(quest)) {
+        const kind = getQuestAutoCompleteKind(task);
+
+        if (kind && isAutoCompleteQuestTaskEnabled(quest, task)) {
+            return { task, kind };
+        }
+    }
+
+    return null;
+}
+
+function getResumeQuestIds(): string[] {
+    return Array.from(activeAutoCompletes.keys());
+}
+
+function isResumeStateExpired(timestamp: number): boolean {
+    return Date.now() - timestamp > resumeExpiryMs;
+}
+
+function updateResumeState(questIDs: string[] = getResumeQuestIds()): void {
+    const userId = getCurrentUserId();
+
+    if (!userId) {
+        QL.warn("AUTO_COMPLETE_RESUME_NO_USER");
+        return;
+    }
+
+    if (!getQuestifySettings().resumeInterruptedQuests || questIDs.length === 0) {
+        delete getQuestifySettings().resumeQuestIDs[userId];
+        return;
+    }
+
+    getQuestifySettings().resumeQuestIDs[userId] = {
+        timestamp: Date.now(),
+        questIDs,
+    };
+}
+
+function createAutoCompleteEntry(
+    quest: Quest,
+    task: QuestTask,
+    kind: AutoCompleteQuestKind,
+): AutoCompleteEntry {
+    return {
+        questId: quest.id,
+        questName: normalizeQuestName(quest),
+        task,
+        kind,
+        status: "queued",
+        progress: getQuestStoredProgress(quest, task),
+        abortController: new AbortController(),
+        progressInterval: null,
+        rerenderInterval: null,
+    };
+}
+
+function clearEntryTimers(entry: AutoCompleteEntry): void {
+    if (entry.progressInterval) {
+        clearInterval(entry.progressInterval);
+        entry.progressInterval = null;
+    }
+
+    if (entry.rerenderInterval) {
+        clearInterval(entry.rerenderInterval);
+        entry.rerenderInterval = null;
+    }
+}
+
+function isEntryActive(entry: AutoCompleteEntry): boolean {
+    return activeAutoCompletes.get(entry.questId) === entry && !entry.abortController.signal.aborted;
+}
+
+function formatQuestTime(seconds: number, prepositional: boolean = false): string {
+    const remaining = Math.max(0, Math.floor(seconds));
+    const minutes = Math.floor(remaining / 60);
+    const secondsPart = remaining % 60;
+
+    if (prepositional) {
+        return remaining >= 60 ? `${minutes}m ${secondsPart}s` : `${secondsPart}s`;
+    }
+
+    return `${String(minutes).padStart(2, "0")}:${String(secondsPart).padStart(2, "0")}`;
+}
+
+function isQuestQueuedForResume(questId: string): boolean {
+    if (!getQuestifySettings().resumeInterruptedQuests) {
+        return false;
+    }
+
+    const userId = getCurrentUserId();
+    const resumeState = userId ? getQuestifySettings().resumeQuestIDs[userId] : null;
+
+    return Boolean(resumeState && !isResumeStateExpired(resumeState.timestamp) && resumeState.questIDs.includes(questId));
+}
+
+function getQueuedAutoCompletePosition(questId: string): number | null {
+    const queuedQuestIds = Array.from(activeAutoCompletes.values())
+        .filter(entry => entry.status === "queued")
+        .map(entry => entry.questId);
+    const queuedIndex = queuedQuestIds.indexOf(questId);
+
+    return queuedIndex === -1 ? null : queuedIndex + 1;
+}
+
+export function getQuestCompletionState(quest: Quest, options: QuestButtonTextOptions = {}): QuestCompletionStateTuple {
+    quest = refreshQuest(quest);
+
+    const activeEntry = activeAutoCompletes.get(quest.id);
+    const resolvedQuest = activeEntry ?? resolveAutoCompleteQuest(quest);
+
+    if (!resolvedQuest) {
+        return [null, QuestCompletionState.Unenrolled];
+    }
+
+    const { task, kind } = resolvedQuest;
+    const target = getAutoCompleteQuestTarget(task).adjusted;
+    const enrolledAt = quest.userStatus?.enrolledAt ? new Date(quest.userStatus.enrolledAt) : null;
+    const storedProgress = activeEntry?.progress ?? getQuestStoredProgress(quest, task) ?? 0;
+    const elapsedProgress = !activeEntry && enrolledAt && isVideoQuestTask(task.type) && getQuestifySettings().completeVideoQuestsQuicker
+        ? Math.max(0, (Date.now() - enrolledAt.getTime()) / 1000)
+        : 0;
+    const progress = Math.min(target, Math.max(storedProgress, elapsedProgress));
+    const timeRemaining = Math.max(0, target - progress);
+    const formattedTime = formatQuestTime(timeRemaining, options.prepositional);
+    const immediate = kind === "achievement" || timeRemaining <= 1;
+
+    if (activeEntry?.status === "running") {
+        const text = immediate
+            ? "Completing..."
+            : `Completing ${options.prepositional ? `in ${formattedTime}` : `(${formattedTime})`}`;
+
+        return [text, QuestCompletionState.Completing];
+    }
+
+    if (activeEntry?.status === "queued") {
+        return [`Queued (${getQueuedAutoCompletePosition(quest.id) ?? "?"})`, QuestCompletionState.Queued];
+    }
+
+    if (enrolledAt) {
+        if (isQuestQueuedForResume(quest.id)) {
+            return ["Resuming...", QuestCompletionState.Queued];
+        }
+
+        const meaningfulProgress = progress >= 1;
+
+        return [
+            immediate ? "Complete Now" : `${meaningfulProgress ? "Resume" : "Complete"} (${formatQuestTime(timeRemaining)})`,
+            QuestCompletionState.Accepted,
+        ];
+    }
+
+    return [
+        immediate ? "Complete Now" : `Complete (${formatQuestTime(target)})`,
+        QuestCompletionState.Unenrolled,
+    ];
+}
+
+export function getQuestButtonProps(args: QuestButtonPropsArgs): QuestButtonPatchProps | null {
+    if (!canAutoCompleteQuest(args.quest)) {
+        return null;
+    }
+
+    const [label, completionState] = getQuestCompletionState(args.quest);
+
+    if (!label) {
+        return null;
+    }
+
+    return {
+        icon: undefined,
+        text: label,
+        onClick: async () => {
+            if (completionState === QuestCompletionState.Unenrolled) {
+                args.preClickCallback?.();
+                const enrollment = await enrollInQuest(args.quest.id, makeEnrollmentData(args));
+
+                if (["success", "previous_in_flight_request"].includes(enrollment.type)) {
+                    processQuestForAutoComplete(args.quest, { force: true, source: "manual" });
+                    rerenderQuests();
+                } else {
+                    showToast(`Enrollment in ${normalizeQuestName(args.quest)} Quest failed.`, Toasts.Type.FAILURE);
+                }
+            } else if (completionState === QuestCompletionState.Completing) {
+                stopQuestAutoComplete(args.quest, { manual: true, preserveResume: false, terminalHeartbeat: true });
+                rerenderQuests();
+            } else if (completionState === QuestCompletionState.Queued) {
+                stopQuestAutoComplete(args.quest, { manual: true, preserveResume: false, terminalHeartbeat: true });
+                rerenderQuests();
+            } else if (completionState === QuestCompletionState.Accepted) {
+                processQuestForAutoComplete(args.quest, { force: true, source: "manual" });
+                rerenderQuests();
+            }
+        }
+    };
+}
+
+export function getQuestPanelSubtitleText(quest: Quest): string | null {
+    quest = refreshQuest(quest);
+
+    const questCompleted = Boolean(quest.userStatus?.completedAt)
+        && getQuestStatus(quest, getIgnoredQuestIDs()) === QuestStatus.Unclaimed;
+    const [completingText] = getQuestCompletionState(quest, { prepositional: true });
+    const completedText = questCompleted ? "Completed" : null;
+    const statusText = completedText ?? completingText;
+
+    if (!statusText) {
+        return null;
+    }
+
+    const rewardItem = (quest.config.rewardsConfig.rewards[0] ?? null) as QuestRewardItem | null;
+    const orbsReward = rewardItem?.orbQuantity ?? 0;
+
+    if (orbsReward > 0) {
+        return `${statusText} for ${orbsReward} Orbs.`;
+    }
+
+    if (rewardItem?.messages?.nameWithArticle) {
+        return `${statusText} for ${rewardItem.messages.nameWithArticle}.`;
+    }
+
+    return `${statusText} for an unrecognized reward.`;
+}
+
+export function canAutoCompleteQuest(quest: Quest): boolean {
+    if (!isAutoCompleteRuntimeReady()) {
+        return false;
+    }
+
+    if (quest.userStatus?.completedAt) {
+        return false;
+    }
+
+    if (getQuestStatus(quest, getIgnoredQuestIDs()) !== QuestStatus.Unclaimed) {
+        return false;
+    }
+
+    return resolveAutoCompleteQuest(quest) != null;
+}
+
+export function setQuestAutoCompleteProgress(questOrId: Quest | string, progress: number | null): boolean {
+    const questId = typeof questOrId === "string" ? questOrId : questOrId.id;
+    const entry = activeAutoCompletes.get(questId);
+
+    if (!entry) {
+        return false;
+    }
+
+    entry.progress = progress == null ? null : Math.max(0, progress);
+
+    return true;
+}
+
+async function waitUntilEnrolled(quest: Quest, entry: AutoCompleteEntry, timeout: number = 60000, interval: number = 500): Promise<Quest | null> {
+    const startedAt = Date.now();
+
+    quest = refreshQuest(quest);
+
+    if (quest.userStatus?.enrolledAt) {
+        return quest;
+    }
+
+    if (quest.userStatus?.completedAt) {
+        return null;
+    }
+
+    while (isEntryActive(entry) && !quest.userStatus?.enrolledAt && (Date.now() - startedAt) < timeout) {
+        await sleep(interval, entry.abortController.signal);
+        quest = refreshQuest(quest);
+    }
+
+    if (quest.userStatus?.enrolledAt) {
+        return quest;
+    }
+
+    QL.warn("AUTO_COMPLETE_ENROLL_TIMEOUT", { questId: quest.id, questName: entry.questName, timeout });
+    return null;
+}
+
+async function reportVideoQuestProgress(quest: Quest, entry: AutoCompleteEntry, progress: number, options: VideoProgressReportOptions = {}): Promise<boolean> {
+    quest = refreshQuest(quest);
+
+    const attempts = options.attempts ?? 1;
+    const delay = options.delay ?? 2500;
+    const displayProgress = options.displayProgress ?? progress;
+
+    if (!quest.userStatus?.enrolledAt) {
+        QL.warn("AUTO_COMPLETE_VIDEO_UNENROLLED", { questId: quest.id, questName: entry.questName });
+        return false;
+    }
+
+    if (quest.userStatus?.completedAt) {
+        return true;
+    }
+
+    for (let attempt = 1; attempt <= attempts; attempt++) {
+        try {
+            await reportVideoProgress(quest.id, progress);
+            setQuestAutoCompleteProgress(quest, displayProgress);
+
+            QL.info("AUTO_COMPLETE_VIDEO_PROGRESS_REPORTED", { questId: quest.id, questName: entry.questName, progress, displayProgress, attempt, attempts });
+            return true;
+        } catch (error) {
+            QL.error("AUTO_COMPLETE_VIDEO_PROGRESS_FAILED", { questId: quest.id, questName: entry.questName, progress, attempt, attempts, error });
+
+            if (attempt < attempts) {
+                await sleep(delay, entry.abortController.signal);
+            }
+        }
+    }
+
+    return false;
+}
+
+function waitForHeartbeatDispatchResult(questId: string, timeoutMs: number): HeartbeatDispatchWaiter {
+    let settled = false;
+    let cleanup = () => { };
+    const promise = new Promise<HeartbeatDispatchResult>(resolve => {
+        const successEvent = "QUESTS_SEND_HEARTBEAT_SUCCESS";
+        const failureEvent = "QUESTS_SEND_HEARTBEAT_FAILURE";
+        const timeoutId = setTimeout(() => {
+            cleanup();
+            resolve({ type: "timeout" });
+        }, timeoutMs);
+
+        cleanup = () => {
+            if (settled) {
+                return;
+            }
+
+            settled = true;
+            clearTimeout(timeoutId);
+            FluxDispatcher.unsubscribe(successEvent, onSuccess);
+            FluxDispatcher.unsubscribe(failureEvent, onFailure);
+        };
+
+        function onSuccess(data: { questId?: string; userStatus?: Quest["userStatus"]; }) {
+            if (data.questId !== questId) {
+                return;
+            }
+
+            cleanup();
+            resolve({ type: "success", userStatus: data.userStatus ?? null });
+        }
+
+        function onFailure(data: { questId?: string; error?: unknown; }) {
+            if (data.questId !== questId) {
+                return;
+            }
+
+            cleanup();
+            resolve({ type: "failure", error: data.error });
+        }
+
+        FluxDispatcher.subscribe(successEvent, onSuccess);
+        FluxDispatcher.subscribe(failureEvent, onFailure);
+    });
+
+    return { promise, cancel: cleanup };
+}
+
+function getPlayProgressValue(userStatus: Quest["userStatus"], task: QuestTask): number | null {
+    return userStatus?.progress?.[task.type]?.value ?? null;
+}
+
+async function reportPlayQuestProgress(
+    quest: Quest,
+    entry: AutoCompleteEntry,
+    terminal: boolean,
+    options: { attempts?: number; delay?: number; timeout?: number; applicationId?: string; streamKey?: string; } = {},
+): Promise<PlayHeartbeatResult> {
+    quest = refreshQuest(quest);
+
+    if (!quest.userStatus?.enrolledAt) {
+        QL.warn("AUTO_COMPLETE_PLAY_UNENROLLED", { questId: quest.id, questName: entry.questName });
+        return { progress: null, completed: false };
+    }
+
+    if (quest.userStatus?.completedAt && !terminal) {
+        return { progress: getQuestStoredProgress(quest, entry.task), completed: true };
+    }
+
+    const attempts = options.attempts ?? 1;
+    const delay = options.delay ?? 2500;
+    const timeout = options.timeout ?? 10000;
+    const applicationId = options.applicationId ?? quest.config.application.id;
+
+    for (let attempt = 1; attempt <= attempts; attempt++) {
+        try {
+            const dispatchWaiter = waitForHeartbeatDispatchResult(quest.id, timeout);
+
+            try {
+                await sendHeartbeat({
+                    questId: quest.id,
+                    streamKey: options.streamKey,
+                    applicationId,
+                    terminal,
+                });
+            } catch (error) {
+                dispatchWaiter.cancel();
+                throw error;
+            }
+
+            const dispatchResult = await dispatchWaiter.promise;
+
+            if (dispatchResult.type === "failure") {
+                QL.error("AUTO_COMPLETE_PLAY_HEARTBEAT_FAILURE", { questId: quest.id, questName: entry.questName, attempt, attempts, error: dispatchResult.error });
+            } else if (dispatchResult.type === "timeout") {
+                QL.warn("AUTO_COMPLETE_PLAY_HEARTBEAT_TIMEOUT", { questId: quest.id, questName: entry.questName, attempt, attempts, timeout });
+            } else {
+                const updatedQuest = refreshQuest(quest);
+                const progress = getPlayProgressValue(dispatchResult.userStatus, entry.task)
+                    ?? getQuestStoredProgress(updatedQuest, entry.task)
+                    ?? 0;
+                const completed = !!dispatchResult.userStatus?.completedAt || !!updatedQuest.userStatus?.completedAt;
+
+                setQuestAutoCompleteProgress(quest, terminal ? progress : Math.max(progress, entry.progress ?? 0));
+                QL.info("AUTO_COMPLETE_PLAY_HEARTBEAT_SENT", { questId: quest.id, questName: entry.questName, progress, target: entry.task.target, terminal });
+
+                return { progress, completed };
+            }
+        } catch (error) {
+            QL.error("AUTO_COMPLETE_PLAY_HEARTBEAT_ERROR", { questId: quest.id, questName: entry.questName, attempt, attempts, error });
+        }
+
+        if (attempt < attempts) {
+            await sleep(delay, entry.abortController.signal);
+        }
+    }
+
+    return { progress: null, completed: false };
+}
+
+function startRerenderInterval(entry: AutoCompleteEntry): void {
+    clearEntryTimers(entry);
+
+    entry.rerenderInterval = setInterval(() => {
+        if (!isEntryActive(entry)) {
+            clearEntryTimers(entry);
+            return;
+        }
+
+        rerenderQuests();
+    }, 1000);
+}
+
+async function runVideoQuest(quest: Quest, entry: AutoCompleteEntry, target: AutoCompleteQuestTarget): Promise<boolean> {
+    quest = await waitUntilEnrolled(quest, entry, 60000, 500) ?? quest;
+
+    if (!isEntryActive(entry) || !quest.userStatus?.enrolledAt) {
+        return false;
+    }
+
+    const reportTarget = target.raw;
+    const completionTarget = target.adjusted;
+    const enrolledAt = new Date(quest.userStatus.enrolledAt);
+    const initialStoredProgress = getQuestStoredProgress(quest, entry.task) ?? 0;
+    const initialProgress = getQuestifySettings().completeVideoQuestsQuicker
+        ? clampFloat(Math.max(1, (Date.now() - enrolledAt.getTime()) / 1000))
+        : Math.max(0, initialStoredProgress);
+    let displayedProgress = clampFloat(Math.min(completionTarget, initialProgress));
+    let reportedProgress = clampFloat(Math.min(reportTarget, initialProgress));
+    let maximumPlaybackTimestamp = Math.floor(reportedProgress);
+    let nextReportThreshold = 0;
+    let hasReportedInitialProgress = reportedProgress <= 0;
+    let lastTickAt = performance.now();
+
+    setQuestAutoCompleteProgress(quest, displayedProgress);
+    startRerenderInterval(entry);
+
+    const timeRemaining = Math.max(0, completionTarget - displayedProgress);
+    const progressToCover = Math.max(0, reportTarget - reportedProgress);
+    const speedFactor = timeRemaining > 0 ? progressToCover / timeRemaining : 0;
+
+    QL.info("AUTO_COMPLETE_VIDEO_STARTED", { questId: quest.id, questName: entry.questName, timeRemaining, target });
+
+    if (timeRemaining <= 0) {
+        return reportVideoQuestProgress(quest, entry, Math.min(reportTarget, maximumPlaybackTimestamp), { attempts: 3, displayProgress: completionTarget });
+    }
+
+    if (reportedProgress > 0) {
+        const initialReport = clampFloat(Math.min(reportTarget, reportedProgress));
+        const reported = await reportVideoQuestProgress(quest, entry, initialReport, { attempts: 3, displayProgress: displayedProgress });
+
+        if (!reported || !isEntryActive(entry)) {
+            return false;
+        }
+
+        hasReportedInitialProgress = true;
+        nextReportThreshold = clampFloat(initialReport + randomBetween(6, 8));
+    }
+
+    while (isEntryActive(entry) && displayedProgress < completionTarget) {
+        await sleep(250, entry.abortController.signal);
+
+        const now = performance.now();
+        const elapsedSeconds = clampFloat((now - lastTickAt) / 1000);
+        lastTickAt = now;
+
+        displayedProgress = clampFloat(Math.min(completionTarget, displayedProgress + elapsedSeconds));
+        reportedProgress = clampFloat(Math.min(reportTarget, reportedProgress + elapsedSeconds * speedFactor));
+        maximumPlaybackTimestamp = Math.max(maximumPlaybackTimestamp, Math.floor(reportedProgress));
+        setQuestAutoCompleteProgress(quest, displayedProgress);
+
+        if (hasReportedInitialProgress && reportedProgress >= nextReportThreshold && displayedProgress < completionTarget) {
+            const progressToReport = clampFloat(Math.min(reportTarget, nextReportThreshold + randomBetween(0, Math.max(0, reportedProgress - nextReportThreshold))));
+            const reported = await reportVideoQuestProgress(quest, entry, progressToReport, { displayProgress: displayedProgress });
+
+            if (!reported) {
+                return false;
+            }
+
+            nextReportThreshold = clampFloat(progressToReport + randomBetween(6, 8));
+        }
+    }
+
+    return isEntryActive(entry) && reportVideoQuestProgress(quest, entry, Math.min(reportTarget, maximumPlaybackTimestamp), { attempts: 3, displayProgress: completionTarget });
+}
+
+async function runPlayQuest(quest: Quest, entry: AutoCompleteEntry, target: AutoCompleteQuestTarget): Promise<boolean> {
+    quest = await waitUntilEnrolled(quest, entry, 60000, 500) ?? quest;
+
+    if (!isEntryActive(entry) || !quest.userStatus?.enrolledAt) {
+        return false;
+    }
+
+    const questTarget = target.adjusted;
+    const initialProgress = getQuestStoredProgress(quest, entry.task) ?? 0;
+    const maximumHeartbeatDurationMs = 60 * 1000;
+    const heartbeatBufferMs = 1000;
+
+    setQuestAutoCompleteProgress(quest, initialProgress);
+    startRerenderInterval(entry);
+
+    entry.progressInterval = setInterval(() => {
+        if (!isEntryActive(entry) || entry.progress == null) {
+            return;
+        }
+
+        setQuestAutoCompleteProgress(entry.questId, Math.min(questTarget, entry.progress + 1));
+    }, 1000);
+
+    QL.info("AUTO_COMPLETE_PLAY_STARTED", { questId: quest.id, questName: entry.questName, remaining: Math.max(0, questTarget - initialProgress), target });
+
+    let heartbeat = await reportPlayQuestProgress(quest, entry, false, { attempts: 3, delay: 2500 });
+
+    if (heartbeat.progress === null) {
+        return false;
+    }
+
+    while (isEntryActive(entry)) {
+        if (heartbeat.completed || heartbeat.progress >= questTarget) {
+            await reportPlayQuestProgress(refreshQuest(quest), entry, true, { attempts: 3, delay: 2500 });
+            return true;
+        }
+
+        const remainingMs = Math.max(0, (questTarget - heartbeat.progress) * 1000);
+        await sleep(remainingMs <= maximumHeartbeatDurationMs ? remainingMs + heartbeatBufferMs : maximumHeartbeatDurationMs, entry.abortController.signal);
+        heartbeat = await reportPlayQuestProgress(quest, entry, false, { attempts: 3, delay: 2500 });
+
+        if (heartbeat.progress === null) {
+            return false;
+        }
+    }
+
+    return false;
+}
+
+async function runAchievementQuest(quest: Quest, entry: AutoCompleteEntry, target: AutoCompleteQuestTarget): Promise<boolean> {
+    quest = await waitUntilEnrolled(quest, entry, 60000, 500) ?? quest;
+
+    if (!isEntryActive(entry) || !quest.userStatus?.enrolledAt) {
+        return false;
+    }
+
+    if (!QuestifyNative?.complete) {
+        QL.error("AUTO_COMPLETE_ACHIEVEMENT_NATIVE_MISSING", { questId: quest.id, questName: entry.questName });
+        return false;
+    }
+
+    const appId = entry.task.applications?.[0]?.id;
+
+    if (!appId) {
+        QL.warn("AUTO_COMPLETE_ACHIEVEMENT_APP_MISSING", { questId: quest.id, questName: entry.questName });
+        return false;
+    }
+
+    setQuestAutoCompleteProgress(quest, 0);
+
+    let authCode: string | null = null;
+
+    try {
+        const response = await RestAPI.post({
+            url: `/oauth2/authorize?client_id=${appId}&response_type=code&scope=identify%20applications.entitlements&state=`,
+            body: { authorize: true },
+        });
+        const location = response?.body?.location;
+
+        authCode = location ? new URL(location).searchParams.get("code") : null;
+    } catch (error) {
+        QL.error("AUTO_COMPLETE_ACHIEVEMENT_AUTH_FAILED", { questId: quest.id, questName: entry.questName, error });
+        return false;
+    }
+
+    if (!authCode) {
+        QL.warn("AUTO_COMPLETE_ACHIEVEMENT_AUTH_CODE_MISSING", { questId: quest.id, questName: entry.questName });
+        return false;
+    }
+
+    const result = await QuestifyNative.complete(appId, authCode, target.adjusted);
+    const success = result.success === true;
+
+    setQuestAutoCompleteProgress(quest, success ? target.adjusted : 0);
+
+    try {
+        const deauthToken = AuthorizedAppsStore.getNewestTokenForApplication(appId)?.id;
+
+        if (deauthToken) {
+            await RestAPI.del({ url: `/oauth2/tokens/${deauthToken}` });
+        }
+    } catch (error) {
+        QL.error("AUTO_COMPLETE_ACHIEVEMENT_DEAUTH_FAILED", { questId: quest.id, questName: entry.questName, error });
+    }
+
+    if (!success) {
+        QL.error("AUTO_COMPLETE_ACHIEVEMENT_FAILED", { questId: quest.id, questName: entry.questName, error: result.error });
+    }
+
+    return success;
+}
+
+async function runAutoCompleteQuest(quest: Quest, entry: AutoCompleteEntry): Promise<boolean> {
+    const target = getAutoCompleteQuestTarget(entry.task);
+
+    QL.info("AUTO_COMPLETE_RUN_START", {
+        questId: quest.id,
+        questName: entry.questName,
+        kind: entry.kind,
+        taskType: entry.task.type,
+        target,
+    });
+
+    switch (entry.kind) {
+        case "watch":
+            return runVideoQuest(quest, entry, target);
+        case "play":
+            return runPlayQuest(quest, entry, target);
+        case "achievement":
+            return runAchievementQuest(quest, entry, target);
+    }
+}
+
+function hasRunningQueuedAutoComplete(): boolean {
+    return Array.from(activeAutoCompletes.values()).some(entry => entry.status === "running");
+}
+
+async function runEntry(quest: Quest, entry: AutoCompleteEntry): Promise<void> {
+    entry.status = "running";
+    updateResumeState();
+
+    try {
+        const completed = await runAutoCompleteQuest(quest, entry);
+
+        if (!isEntryActive(entry)) {
+            return;
+        }
+
+        if (completed) {
+            QL.info("AUTO_COMPLETE_COMPLETED", { questId: entry.questId, questName: entry.questName });
+        } else {
+            QL.warn("AUTO_COMPLETE_FAILED", { questId: entry.questId, questName: entry.questName });
+        }
+    } catch (error) {
+        if (entry.abortController.signal.aborted) {
+            QL.warn("AUTO_COMPLETE_RUN_ABORTED", { questId: entry.questId, questName: entry.questName });
+        } else {
+            QL.error("AUTO_COMPLETE_RUN_ERROR", { questId: entry.questId, questName: entry.questName, error });
+        }
+    } finally {
+        clearEntryTimers(entry);
+
+        if (activeAutoCompletes.get(entry.questId) !== entry) {
+            return;
+        }
+
+        activeAutoCompletes.delete(entry.questId);
+        resetQuestsToResume(quest);
+        updateResumeState();
+
+        if (!getQuestifySettings().autoCompleteQuestsSimultaneously && !suppressQueueDrain) {
+            runNextQueuedQuest();
+        }
+    }
+}
+
+function runNextQueuedQuest(): void {
+    if (suppressQueueDrain || getQuestifySettings().autoCompleteQuestsSimultaneously || hasRunningQueuedAutoComplete()) {
+        return;
+    }
+
+    const nextEntry = Array.from(activeAutoCompletes.values()).find(entry => entry.status === "queued");
+
+    if (!nextEntry) {
+        return;
+    }
+
+    const nextQuest = QuestStore.getQuest(nextEntry.questId);
+
+    if (!nextQuest) {
+        activeAutoCompletes.delete(nextEntry.questId);
+        updateResumeState();
+        runNextQueuedQuest();
+        return;
+    }
+
+    void runEntry(nextQuest, nextEntry);
+}
+
+export function processQuestForAutoComplete(quest: Quest, options: AutoCompleteStartOptions = {}): boolean {
+    const { force = false, source = "manual" } = options;
+    const questName = normalizeQuestName(quest);
+    const existingEntry = activeAutoCompletes.get(quest.id);
+
+    if (!isAutoCompleteRuntimeReady(true)) {
+        return false;
+    }
+
+    if (existingEntry) {
+        return true;
+    }
+
+    if (force) {
+        manuallyStoppedQuestIds.delete(quest.id);
+    } else if (manuallyStoppedQuestIds.has(quest.id)) {
+        QL.warn("AUTO_COMPLETE_MANUALLY_STOPPED", { questId: quest.id, questName });
+        return false;
+    }
+
+    if (quest.userStatus?.completedAt || getQuestStatus(quest, getIgnoredQuestIDs()) !== QuestStatus.Unclaimed) {
+        QL.warn("AUTO_COMPLETE_INCOMPATIBLE_STATUS", { questId: quest.id, questName });
+        return false;
+    }
+
+    const resolvedQuest = resolveAutoCompleteQuest(quest);
+
+    if (!resolvedQuest) {
+        QL.warn("AUTO_COMPLETE_INCOMPATIBLE_TASKS", { questId: quest.id, questName });
+        return false;
+    }
+
+    const entry = createAutoCompleteEntry(quest, resolvedQuest.task, resolvedQuest.kind);
+
+    activeAutoCompletes.set(quest.id, entry);
+
+    if (getQuestifySettings().autoCompleteQuestsSimultaneously) {
+        void runEntry(quest, entry);
+    } else {
+        updateResumeState();
+        runNextQueuedQuest();
+    }
+
+    QL.info("AUTO_COMPLETE_STARTED", {
+        questId: quest.id,
+        questName,
+        source,
+        mode: getQuestifySettings().autoCompleteQuestsSimultaneously ? "simultaneous" : "queue",
+        taskType: entry.task.type,
+    });
+
+    return true;
+}
+
+export function stopQuestAutoComplete(questOrId: Quest | string, options: AutoCompleteStopOptions = {}): boolean {
+    const { manual = true, preserveResume = false, terminalHeartbeat = false } = options;
+    const questId = typeof questOrId === "string" ? questOrId : questOrId.id;
+    const entry = activeAutoCompletes.get(questId);
+    const resumeQuestIds = preserveResume ? getResumeQuestIds() : undefined;
+
+    if (manual) {
+        manuallyStoppedQuestIds.add(questId);
+    }
+
+    if (!entry) {
+        updateResumeState(resumeQuestIds);
+        return false;
+    }
+
+    clearEntryTimers(entry);
+    entry.abortController.abort();
+    activeAutoCompletes.delete(questId);
+
+    const quest = typeof questOrId === "string" ? QuestStore.getQuest(questId) : questOrId;
+
+    if (terminalHeartbeat && quest && entry.kind === "play" && entry.status === "running") {
+        void reportPlayQuestProgress(refreshQuest(quest), entry, true, { attempts: 1 });
+    }
+
+    if (!preserveResume) {
+        resetQuestsToResume(quest);
+    }
+
+    updateResumeState(resumeQuestIds);
+
+    if (!getQuestifySettings().autoCompleteQuestsSimultaneously && !suppressQueueDrain) {
+        runNextQueuedQuest();
+    }
+
+    QL.info("AUTO_COMPLETE_STOPPED", { questId, manual, preserveResume, terminalHeartbeat });
+    return true;
+}
+
+export function stopAllAutoCompletes(options: AutoCompleteStopOptions = {}): void {
+    const resumeQuestIds = options.preserveResume ? getResumeQuestIds() : undefined;
+
+    suppressQueueDrain = true;
+
+    try {
+        for (const questId of Array.from(activeAutoCompletes.keys())) {
+            stopQuestAutoComplete(questId, options);
+        }
+
+        updateResumeState(resumeQuestIds);
+    } finally {
+        suppressQueueDrain = false;
+    }
+}
+
+export function stopAutoCompletesForRunningGames(gameIds: string[]): boolean {
+    let stoppedAny = false;
+
+    for (const entry of Array.from(activeAutoCompletes.values())) {
+        const quest = QuestStore.getQuest(entry.questId);
+
+        if (entry.kind === "play" && quest && gameIds.includes(quest.config.application.id)) {
+            stopQuestAutoComplete(quest, { manual: false, preserveResume: false });
+            stoppedAny = true;
+        }
+    }
+
+    if (stoppedAny) {
+        rerenderQuests();
+    }
+
+    return stoppedAny;
+}
+
+export function resumeInterruptedAutoCompletes(): void {
+    if (!getQuestifySettings().resumeInterruptedQuests) {
+        return;
+    }
+
+    const userId = getCurrentUserId();
+    const resumeState = userId ? getQuestifySettings().resumeQuestIDs[userId] : null;
+
+    if (!userId || !resumeState?.questIDs.length) {
+        return;
+    }
+
+    if (isResumeStateExpired(resumeState.timestamp)) {
+        delete getQuestifySettings().resumeQuestIDs[userId];
+        QL.info("AUTO_COMPLETE_RESUME_EXPIRED", { userId, timestamp: resumeState.timestamp, maxAge: resumeExpiryMs });
+        return;
+    }
+
+    const resumeQuestIds = Array.from(new Set(resumeState.questIDs));
+    const resumableQuests = resumeQuestIds
+        .map(questId => QuestStore.getQuest(questId))
+        .filter((quest): quest is Quest => quest != null);
+
+    if (resumableQuests.length === 0) {
+        updateResumeState();
+        return;
+    }
+
+    QL.info("AUTO_COMPLETE_RESUME_INTERRUPTED", {
+        userId,
+        timestamp: resumeState.timestamp,
+        questIDs: resumeQuestIds,
+    });
+
+    const resumedQuestIds = new Set<string>();
+
+    for (const quest of resumableQuests) {
+        if (processQuestForAutoComplete(quest, { force: true, source: "resume" })) {
+            resumedQuestIds.add(quest.id);
+        }
+    }
+
+    updateResumeState();
+
+    const droppedQuestIds = resumeQuestIds.filter(questId => !resumedQuestIds.has(questId));
+
+    if (droppedQuestIds.length > 0) {
+        QL.warn("AUTO_COMPLETE_RESUME_DROPPED_QUESTS", {
+            userId,
+            questIDs: droppedQuestIds,
+        });
+    }
+}
+
+export function getActiveAutoCompletes(): readonly Readonly<AutoCompleteEntry>[] {
+    return Array.from(activeAutoCompletes.values());
+}
diff --git a/src/equicordplugins/questify/utils/components.tsx b/src/equicordplugins/questify/utils/components.tsx
deleted file mode 100644
index 1a9300d97..000000000
--- a/src/equicordplugins/questify/utils/components.tsx
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import ErrorBoundary from "@components/ErrorBoundary";
-import { findComponentByCodeLazy } from "@webpack";
-import { SearchableSelect, useState } from "@webpack/common";
-import { JSX } from "react";
-
-import { settings } from "../settings";
-import { formatLowerBadge } from "./misc";
-
-// GuildlessServerListItem's built-in pill does not support unread state.
-export const GuildlessServerListItemComponent = findComponentByCodeLazy("tooltip:", "lowerBadgeSize:");
-export const GuildedServerListItemPillComponent = findComponentByCodeLazy('"pill":"empty"');
-export const ServerListItemLowerBadgeComponent = findComponentByCodeLazy("BADGE_NOTIFICATION_BACKGROUND", "let{count:");
-export const ServerListItemUpperBadgeComponent = findComponentByCodeLazy("{icon:", ".ROUND,disableColor");
-export const RadioGroup = findComponentByCodeLazy(",{label:", ",description:", ",required:", ",errorMessage:", ",children:");
-export const QuestTile = findComponentByCodeLazy(".rowIndex,trackGuildAndChannelMetadata");
-
-export class ActiveQuestIntervalsMap extends Map<string, { progressTimeout: NodeJS.Timeout; rerenderTimeout: NodeJS.Timeout; progress: number; type: string; }> {
-    set(key: string, value: { progressTimeout: NodeJS.Timeout; rerenderTimeout: NodeJS.Timeout; progress: number; type: string; }): this {
-        const { resumeQuestIDs } = settings.store;
-
-        settings.store.resumeQuestIDs = {
-            watch: resumeQuestIDs.watch.filter((id: string) => id !== key),
-            play: resumeQuestIDs.play.filter((id: string) => id !== key),
-            achievement: resumeQuestIDs.achievement.filter((id: string) => id !== key),
-        };
-
-        settings.store.resumeQuestIDs[value.type].push(key);
-
-        return super.set(key, value);
-    }
-
-    delete(key: string): boolean {
-        const { resumeQuestIDs } = settings.store;
-
-        settings.store.resumeQuestIDs = {
-            watch: resumeQuestIDs.watch.filter((id: string) => id !== key),
-            play: resumeQuestIDs.play.filter((id: string) => id !== key),
-            achievement: resumeQuestIDs.achievement.filter((id: string) => id !== key),
-        };
-
-        return super.delete(key);
-    }
-}
-
-export enum QuestRewardType {
-    UNKNOWN = 0,
-    REWARD_CODE = 1,
-    IN_GAME = 2,
-    COLLECTIBLE = 3,
-    VIRTUAL_CURRENCY = 4,
-    FRACTIONAL_PREMIUM = 5
-}
-
-export enum QuestStatus {
-    Claimed = "CLAIMED",
-    Unclaimed = "UNCLAIMED",
-    Ignored = "IGNORED",
-    Expired = "EXPIRED",
-    Unknown = "UNKNOWN"
-}
-
-export interface FetchingQuestsSettingProps {
-    interval: number | null;
-    alert: string | null;
-}
-
-export interface RadioOption {
-    name: string;
-    value: string;
-}
-
-export interface SelectOption {
-    label: string;
-    value: string | number;
-}
-
-export interface DynamicDropdownSettingOption {
-    label: string;
-    value: string;
-    selected: boolean;
-    type?: string;
-}
-
-export interface RGB {
-    r: number;
-    g: number;
-    b: number;
-}
-
-export type ExcludedQuestMap = Map<string, ExcludedQuest>;
-
-export type QuestMap = Map<string, Quest>;
-
-export interface ExcludedQuest {
-    id: string;
-}
-
-export enum QuestTaskType {
-    WATCH_VIDEO = "WATCH_VIDEO",
-    WATCH_VIDEO_ON_MOBILE = "WATCH_VIDEO_ON_MOBILE",
-    PLAY_ON_DESKTOP = "PLAY_ON_DESKTOP",
-    PLAY_ON_XBOX = "PLAY_ON_XBOX",
-    PLAY_ON_PLAYSTATION = "PLAY_ON_PLAYSTATION",
-    PLAY_ACTIVITY = "PLAY_ACTIVITY",
-    ACHIEVEMENT_IN_ACTIVITY = "ACHIEVEMENT_IN_ACTIVITY"
-}
-
-export interface QuestTask {
-    type: QuestTaskType;
-    target: number;
-}
-
-export interface Quest {
-    questifyNumber: number;
-    id: string;
-    config: {
-        application: {
-            id: string;
-            name: string;
-        },
-        startsAt: string;
-        expiresAt: string;
-        messages: {
-            questName: string;
-        };
-        rewardsConfig: {
-            rewards: {
-                type: QuestRewardType;
-                orbQuantity?: number;
-                messages?: {
-                    nameWithArticle: string;
-                };
-            }[];
-        },
-        taskConfigV2: {
-            tasks: {
-                WATCH_VIDEO?: {
-                    type: QuestTaskType.WATCH_VIDEO;
-                    target: number;
-                },
-                WATCH_VIDEO_ON_MOBILE?: {
-                    type: QuestTaskType.WATCH_VIDEO_ON_MOBILE;
-                    target: number;
-                },
-                PLAY_ON_DESKTOP?: {
-                    type: QuestTaskType.PLAY_ON_DESKTOP;
-                    target: number;
-                },
-                PLAY_ON_XBOX?: {
-                    type: QuestTaskType.PLAY_ON_XBOX;
-                    target: number;
-                },
-                PLAY_ON_PLAYSTATION?: {
-                    type: QuestTaskType.PLAY_ON_PLAYSTATION;
-                    target: number;
-                },
-                PLAY_ACTIVITY?: {
-                    type: QuestTaskType.PLAY_ACTIVITY;
-                    target: number;
-                };
-                ACHIEVEMENT_IN_ACTIVITY?: {
-                    type: QuestTaskType.ACHIEVEMENT_IN_ACTIVITY;
-                    target: number;
-                    eventName: "progress";
-                    applications: {
-                        id: string;
-                    }[];
-                };
-            };
-        };
-    },
-    userStatus: null | {
-        userId: string;
-        claimedAt: string | null;
-        completedAt: string | null;
-        enrolledAt: string | null;
-        progress: null | {
-            WATCH_VIDEO?: {
-                eventName: QuestTaskType.WATCH_VIDEO;
-                value: number;
-            },
-            WATCH_VIDEO_ON_MOBILE?: {
-                eventName: QuestTaskType.WATCH_VIDEO_ON_MOBILE;
-                value: number;
-            },
-            PLAY_ON_DESKTOP?: {
-                eventName: QuestTaskType.PLAY_ON_DESKTOP;
-                value: number;
-            },
-            PLAY_ON_XBOX?: {
-                eventName: QuestTaskType.PLAY_ON_XBOX;
-                value: number;
-            },
-            PLAY_ON_PLAYSTATION?: {
-                eventName: QuestTaskType.PLAY_ON_PLAYSTATION;
-                value: number;
-            },
-            PLAY_ACTIVITY?: {
-                eventName: QuestTaskType.PLAY_ACTIVITY;
-                value: number;
-            },
-        };
-    },
-    dummyColor?: number | null;
-}
-
-export function SoundIcon(height: number, width: number, className?: string): JSX.Element {
-    return (
-        <svg
-            viewBox="0 0 24 24"
-            height={height}
-            width={width}
-            fill="none"
-            className={className}
-        >
-            <path fill="currentColor" d="M12 3a1 1 0 0 0-1-1h-.06a1 1 0 0 0-.74.32L5.92 7H3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h2.92l4.28 4.68a1 1 0 0 0 .74.32H11a1 1 0 0 0 1-1V3ZM15.1 20.75c-.58.14-1.1-.33-1.1-.92v-.03c0-.5.37-.92.85-1.05a7 7 0 0 0 0-13.5A1.11 1.11 0 0 1 14 4.2v-.03c0-.6.52-1.06 1.1-.92a9 9 0 0 1 0 17.5Z" className=""></path><path fill="currentColor" d="M15.16 16.51c-.57.28-1.16-.2-1.16-.83v-.14c0-.43.28-.8.63-1.02a3 3 0 0 0 0-5.04c-.35-.23-.63-.6-.63-1.02v-.14c0-.63.59-1.1 1.16-.83a5 5 0 0 1 0 9.02Z"></path>
-        </svg>
-    );
-}
-export function QuestIcon(height: number, width: number, className?: string): JSX.Element {
-    return (
-        <svg
-            viewBox="0 0 24 24"
-            height={height}
-            width={width}
-            fill="none"
-            className={className}
-        >
-            <path fill="currentColor" d="M7.5 21.7a8.95 8.95 0 0 1 9 0 1 1 0 0 0 1-1.73c-.6-.35-1.24-.64-1.9-.87.54-.3 1.05-.65 1.52-1.07a3.98 3.98 0 0 0 5.49-1.8.77.77 0 0 0-.24-.95 3.98 3.98 0 0 0-2.02-.76A4 4 0 0 0 23 10.47a.76.76 0 0 0-.71-.71 4.06 4.06 0 0 0-1.6.22 3.99 3.99 0 0 0 .54-5.35.77.77 0 0 0-.95-.24c-.75.36-1.37.95-1.77 1.67V6a4 4 0 0 0-4.9-3.9.77.77 0 0 0-.6.72 4 4 0 0 0 3.7 4.17c.89 1.3 1.3 2.95 1.3 4.51 0 3.66-2.75 6.5-6 6.5s-6-2.84-6-6.5c0-1.56.41-3.21 1.3-4.51A4 4 0 0 0 11 2.82a.77.77 0 0 0-.6-.72 4.01 4.01 0 0 0-4.9 3.96A4.02 4.02 0 0 0 3.73 4.4a.77.77 0 0 0-.95.24 3.98 3.98 0 0 0 .55 5.35 4 4 0 0 0-1.6-.22.76.76 0 0 0-.72.71l-.01.28a4 4 0 0 0 2.65 3.77c-.75.06-1.45.33-2.02.76-.3.22-.4.62-.24.95a4 4 0 0 0 5.49 1.8c.47.42.98.78 1.53 1.07-.67.23-1.3.52-1.91.87a1 1 0 1 0 1 1.73Z" ></path>
-        </svg>
-    );
-}
-
-export interface ServerListItemUpperBadgeProps {
-    icon?: (() => JSX.Element),
-    color?: string;
-    className?: string;
-}
-
-export function ServerListItemUpperBadge(props: ServerListItemUpperBadgeProps): JSX.Element {
-    return (
-        <ServerListItemUpperBadgeComponent {...props} />
-    );
-}
-
-export interface ServerListItemLowerBadgeProps {
-    count: number;
-    className?: string;
-    color?: string;
-    style?: React.CSSProperties;
-    maxDigits?: number;
-}
-
-export function ServerListItemLowerBadge(props: ServerListItemLowerBadgeProps): JSX.Element {
-    return (
-        <ServerListItemLowerBadgeComponent
-            {...props}
-        />
-    );
-}
-
-export interface GuildlessServerListItemProps {
-    id?: string;
-    className?: string;
-    icon?: JSX.Element;
-    tooltip?: string;
-    showPill?: boolean;
-    isVisible?: boolean;
-    isSelected?: boolean;
-    hasUnread?: boolean;
-    lowerBadgeProps?: ServerListItemLowerBadgeProps;
-    upperBadgeProps?: ServerListItemUpperBadgeProps;
-    onClick?: ((e: React.MouseEvent) => void);
-    onContextMenu?: ((e: React.MouseEvent) => void);
-    onMouseDown?: ((e: React.MouseEvent) => void);
-}
-
-export function GuildlessServerListItem({
-    id,
-    className = "vc-server-list-item",
-    icon,
-    tooltip,
-    showPill = true,
-    isVisible,
-    isSelected,
-    hasUnread,
-    lowerBadgeProps,
-    upperBadgeProps,
-    onClick,
-    onContextMenu,
-    onMouseDown
-}: GuildlessServerListItemProps): JSX.Element {
-    const baseClasses = className.split(" ") || ["vc-server-list-item"];
-    const mainContainerClass = `${baseClasses.join(" ")}-container`;
-    const iconContainerClass = `${baseClasses.join(" ")}-icon-container`;
-    const buttonContainerClass = `${baseClasses.join(" ")}-server-list-button-container`;
-    const pillContainerClass = `${baseClasses.join(" ")}-pill-container`;
-    const buttonClass = `${baseClasses.join(" ")}-button`;
-    const pillClass = `${baseClasses.join(" ")}-pill`;
-    const pillClassSelected = `${pillClass} selected`;
-    const pillClassHovered = `${pillClass} hovered`;
-    const lowerBadgeClass = `${baseClasses.join(" ")}-lower-badge`;
-    const upperBadgeClass = `${baseClasses.join(" ")}-upper-badge`;
-
-    const [hovered, setHovered] = useState(false);
-    const visible = isVisible ?? true;
-    const selected = isSelected ?? false;
-    const unread = hasUnread ?? false;
-    const lowerBadgeData = lowerBadgeProps ? { ...lowerBadgeProps, className: lowerBadgeProps.className ?? lowerBadgeClass } : null;
-    const lowerBadgeSize = lowerBadgeData ? { width: formatLowerBadge(lowerBadgeData.count, lowerBadgeData.maxDigits)[1] } : null;
-
-    const lowerBadge = !lowerBadgeData || lowerBadgeData.count === 0 ? null : ServerListItemLowerBadge({ ...lowerBadgeData, style: { ...(lowerBadgeData.style || {}), ...(lowerBadgeSize || {}) } });
-    const upperBadgeData = upperBadgeProps ? { ...upperBadgeProps, className: upperBadgeProps.className ?? upperBadgeClass } : null;
-    const upperBadge = upperBadgeData ? ServerListItemUpperBadge(upperBadgeData) : null;
-
-    const wrappedIcon = icon ? (
-        <div className={iconContainerClass}>
-            {icon}
-        </div>
-    ) : undefined;
-
-    const componentProps: Record<string, any> = {
-        ...(wrappedIcon && { icon: () => wrappedIcon }),
-        ...(tooltip !== undefined && { tooltip }),
-        ...(onClick !== undefined && { onClick }),
-        ...(onMouseDown !== undefined && { onMouseDown }),
-        ...(onContextMenu !== undefined && { onContextMenu }),
-        // This one styles the backdrop of the badge while the one passed as a prop to the badge styles the badge itself.
-        ...(lowerBadge && lowerBadgeSize ? { lowerBadgeSize: lowerBadgeSize } : {}),
-        ...(lowerBadge ? { lowerBadge: lowerBadge } : {}),
-        ...(upperBadge ? { upperBadge: upperBadge } : {}),
-    };
-
-    return (
-        <ErrorBoundary>
-            {visible && (
-                <div
-                    {...(id !== undefined ? { id } : {})}
-                    className={mainContainerClass}
-                >
-                    <div className={pillContainerClass} >
-                        <GuildedServerListItemPillComponent
-                            unread={unread && showPill}
-                            selected={selected && showPill}
-                            hovered={hovered && showPill}
-                            className={selected ? pillClassSelected : hovered ? pillClassHovered : pillClass}
-                        />
-                    </div>
-                    <div
-                        className={buttonContainerClass}
-                    >
-                        <GuildlessServerListItemComponent
-                            showPill={false}
-                            selected={selected}
-                            className={buttonClass}
-                            onMouseEnter={() => setHovered(true)}
-                            onMouseLeave={() => setHovered(false)}
-                            {...componentProps}
-                        />
-                    </div>
-                </div>
-            )}
-        </ErrorBoundary>
-    );
-}
-
-export interface DynamicDropdownProps extends React.ComponentProps<typeof SearchableSelect> {
-    feedback?: string;
-    maxOptionsVisible?: number;
-}
-
-export const DynamicDropdown: React.FC<DynamicDropdownProps> = props => {
-    return <SearchableSelect {...props} />;
-};
diff --git a/src/equicordplugins/questify/utils/fetching.ts b/src/equicordplugins/questify/utils/fetching.ts
new file mode 100644
index 000000000..512d5b847
--- /dev/null
+++ b/src/equicordplugins/questify/utils/fetching.ts
@@ -0,0 +1,218 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { playAudio } from "@api/AudioPlayer";
+import { showNotification } from "@api/Notifications";
+import { sleep } from "@utils/misc";
+import type { PluginNative } from "@utils/types";
+import type { Quest } from "@vencord/discord-types";
+import { findByCodeLazy, findStoreLazy } from "@webpack";
+import { QuestStore, RestAPI } from "@webpack/common";
+import { NavigationRouter } from "@webpack/common/utils";
+
+import { getQuestifySettings } from "../settings/access";
+import { questIsIgnored } from "../settings/ignoredQuests";
+import { getNewQuests, normalizeQuestName, type QuestIncludedTypes, questMatchesIncludedTypes } from "./filtering";
+import { QL } from "./logging";
+import { QUEST_PAGE } from "./ui";
+
+export const AuthorizedAppsStore = findStoreLazy("AuthorizedAppsStore");
+const QuestifyNative = VencordNative?.pluginHelpers?.Questify as PluginNative<typeof import("../native")> | undefined;
+
+export function snakeToCamel(obj: any): any {
+    if (Array.isArray(obj)) {
+        return obj.map(snakeToCamel);
+    }
+
+    if (obj && typeof obj === "object") {
+        return Object.fromEntries(
+            Object.entries(obj).map(([key, value]) => [
+                key.replace(/_([a-z])/g, (_, c) => c.toUpperCase()),
+                snakeToCamel(value),
+            ]),
+        );
+    }
+
+    return obj;
+}
+
+export const fetchAndDispatchQuests = findByCodeLazy("QUESTS_FETCH_CURRENT_QUESTS_BEGIN");
+const parseQuestConfig = findByCodeLazy("config).with({config_version:");
+const formatQuestData = findByCodeLazy("config),userStatus:null==");
+
+async function fetchQuestById(questId: string): Promise<Quest | null> {
+    try {
+        const { body } = await RestAPI.get({ url: `/quests/${questId}`, retries: 3 });
+        const valid = !!parseQuestConfig({ config: body });
+
+        if (!valid) {
+            QL.warn("FETCH_QUEST_BY_ID_INVALID_BODY", { questId, body });
+
+            return null;
+        }
+
+        return formatQuestData(body);
+    } catch (error: unknown) {
+        QL.warn("FETCH_QUEST_BY_ID_FAILED", { questId, error });
+
+        return null;
+    }
+}
+
+async function fetchExcludedQuestConfigs(questIds: string[]): Promise<Quest[]> {
+    const quests: Quest[] = [];
+
+    for (const [index, questId] of questIds.entries()) {
+        if (index > 0) {
+            await sleep(1000);
+        }
+
+        const quest = await fetchQuestById(questId);
+
+        if (quest) {
+            quests.push(quest);
+        }
+    }
+
+    return quests;
+}
+
+export function canOpenDevToolsWindow(): boolean {
+    return typeof QuestifyNative?.canOpenDevTools === "function"
+        && typeof QuestifyNative?.openDevTools === "function";
+}
+
+export async function openDevToolsWindow(): Promise<boolean> {
+    if (!canOpenDevToolsWindow()) {
+        return false;
+    }
+
+    const native = QuestifyNative!;
+
+    return await native.canOpenDevTools()
+        ? native.openDevTools()
+        : false;
+}
+
+function getQuestNotificationText(quests: Quest[], excluded: boolean): { title: string; body: string; } {
+    const firstQuest = quests[0];
+    const firstQuestName = normalizeQuestName(firstQuest);
+
+    if (quests.length === 1) {
+        return {
+            title: excluded ? "New Excluded Quest Detected!" : "New Quest Detected!",
+            body: excluded
+                ? `The excluded ${firstQuestName} Quest was detected. ID: ${firstQuest.id}`
+                : `The ${firstQuestName} Quest is now available.`
+        };
+    }
+
+    return {
+        title: excluded ? "New Excluded Quests Detected!" : "New Quests Detected!",
+        body: excluded
+            ? `${quests.length} new excluded Quests were detected. Check the console for their Quest IDs.`
+            : `${quests.length} new Quests are now available.`
+    };
+}
+
+function notifyNewQuests(quests: Quest[], excluded: boolean): void {
+    if (quests.length === 0) return;
+
+    const firstQuest = quests[0];
+    const { title, body } = getQuestNotificationText(quests, excluded);
+    const onClick = excluded
+        ? canOpenDevToolsWindow() ? openDevToolsWindow : undefined
+        : () => NavigationRouter.transitionTo(`${QUEST_PAGE}#${firstQuest.id}`);
+
+    showNotification({
+        title,
+        body,
+        dismissOnClick: true,
+        onClick
+    });
+
+    QL.log("NOTIFY_NEW_QUESTS", { excluded, quests });
+}
+
+export async function fetchAndAlertQuests(source: string): Promise<Quest[] | null> {
+    const settings = getQuestifySettings();
+    const alertSound = settings.newQuestAlertSound;
+    const alertVolume = settings.newQuestAlertVolume;
+    const excludedAlertSound = settings.newExcludedQuestAlertSound;
+    const excludedAlertVolume = settings.newExcludedQuestAlertVolume;
+    const shouldFetchExcludedQuests = settings.notifyOnNewExcludedQuests || Boolean(excludedAlertSound);
+    const currentQuests = Array.from(QuestStore.quests.values());
+    const currentExcludedQuestIds = new Set(Array.from(QuestStore.excludedQuests.values()).map(quest => quest.id));
+    const includedTypes = settings.questButtonIncludedTypes as QuestIncludedTypes;
+
+    await fetchAndDispatchQuests();
+    await sleep(1000);
+
+    const nextQuests = Array.from(QuestStore.quests.values());
+
+    if (!nextQuests || currentQuests.length === 0) {
+        return nextQuests;
+    }
+
+    const newQuests = getNewQuests(currentQuests, nextQuests);
+    const newExcludedQuestIds = shouldFetchExcludedQuests
+        ? Array.from(QuestStore.excludedQuests.values())
+            .map(quest => quest.id)
+            .filter(questId => !currentExcludedQuestIds.has(questId))
+        : [];
+
+    if (newQuests.length === 0 && newExcludedQuestIds.length === 0) {
+        return nextQuests;
+    }
+
+    const newExcludedQuests = newExcludedQuestIds.length > 0 ? await fetchExcludedQuestConfigs(newExcludedQuestIds) : [];
+    const newIncludedQuests = newQuests.filter(quest => questMatchesIncludedTypes(quest, includedTypes) && !questIsIgnored(quest.id));
+    const newIncludedExcludedQuests = newExcludedQuests.filter(quest => questMatchesIncludedTypes(quest, includedTypes) && !questIsIgnored(quest.id));
+    const shouldAlert = Boolean(alertSound) && newIncludedQuests.length > 0;
+    const shouldAlertExcluded = Boolean(excludedAlertSound) && newIncludedExcludedQuests.length > 0;
+    const shouldNotify = settings.notifyOnNewQuests && newIncludedQuests.length > 0;
+    const shouldNotifyExcluded = settings.notifyOnNewExcludedQuests && newIncludedExcludedQuests.length > 0;
+
+    QL.info("FETCH_AND_ALERT_QUESTS_NEW_QUESTS", {
+        source,
+        newQuestCount: newQuests.length,
+        newQuests: newIncludedQuests,
+        matchedQuestCount: newIncludedQuests.length + newIncludedExcludedQuests.length,
+        ...(shouldFetchExcludedQuests ? {
+            newExcludedQuestCount: newExcludedQuestIds.length,
+            newExcludedQuests: newIncludedExcludedQuests,
+            matchedExcludedQuestCount: newIncludedExcludedQuests.length,
+        } : {}),
+        shouldAlert,
+        shouldAlertExcluded,
+        shouldNotify,
+        shouldNotifyExcluded,
+    });
+
+    if (shouldAlert) {
+        playAudio(
+            alertSound!,
+            { volume: Math.max(0, Math.min(100, alertVolume)) }
+        );
+    }
+
+    if (shouldAlertExcluded) {
+        playAudio(
+            excludedAlertSound!,
+            { volume: Math.max(0, Math.min(100, excludedAlertVolume)) }
+        );
+    }
+
+    if (shouldNotify) {
+        notifyNewQuests(newIncludedQuests, false);
+    }
+
+    if (shouldNotifyExcluded) {
+        notifyNewQuests(newIncludedExcludedQuests, true);
+    }
+
+    return nextQuests;
+}
diff --git a/src/equicordplugins/questify/utils/filtering.ts b/src/equicordplugins/questify/utils/filtering.ts
new file mode 100644
index 000000000..ca3800183
--- /dev/null
+++ b/src/equicordplugins/questify/utils/filtering.ts
@@ -0,0 +1,28 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { Quest } from "@vencord/discord-types";
+import { QuestRewardType, QuestTaskType } from "@vencord/discord-types/enums";
+
+export type QuestIncludedTypes = Record<QuestTaskType | QuestRewardType, boolean>;
+
+export function getNewQuests(currentQuests: Quest[], nextQuests: Quest[]): Quest[] {
+    const currentQuestIds = new Set(currentQuests.map(quest => quest.id));
+
+    return nextQuests.filter(quest => !currentQuestIds.has(quest.id));
+}
+
+export function questMatchesIncludedTypes(quest: Quest, includedTypes: QuestIncludedTypes): boolean {
+    const rewardTypeAllowed = quest.config.rewardsConfig.rewards.some(reward => Boolean(includedTypes[reward.type]));
+    const taskTypeAllowed = Object.values(quest.config.taskConfigV2.tasks).some(task => Boolean(includedTypes[task.type]));
+
+    return rewardTypeAllowed && taskTypeAllowed;
+}
+
+export function normalizeQuestName(quest: Quest): string {
+    const normalized = quest.config.messages.questName.trim().toUpperCase();
+    return normalized.endsWith("QUEST") ? normalized.slice(0, -5).trim() : normalized;
+}
diff --git a/src/equicordplugins/questify/utils/logging.ts b/src/equicordplugins/questify/utils/logging.ts
new file mode 100644
index 000000000..90bb6ecd5
--- /dev/null
+++ b/src/equicordplugins/questify/utils/logging.ts
@@ -0,0 +1,79 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { showNotification } from "@api/Notifications";
+import { Logger } from "@utils/Logger";
+import type { Quest } from "@vencord/discord-types";
+import { NavigationRouter } from "@webpack/common/utils";
+
+import { normalizeQuestName } from "./filtering";
+import { QUEST_PAGE } from "./ui";
+
+const LOG = new Logger("Questify");
+
+export function getFormattedNow(): string {
+    return new Date().toLocaleString(undefined, {
+        year: "numeric",
+        month: "2-digit",
+        day: "2-digit",
+        hour: "2-digit",
+        minute: "2-digit",
+        second: "2-digit",
+        hour12: true,
+    }).replace(",", "");
+}
+
+function getQuestifyLogPrefix(source: string): string {
+    return `[${getFormattedNow()}] [${source}]\n`;
+}
+
+function emitQuestifyLog(level: string, source: string, ...args: unknown[]): void {
+    const prefix = args.length ? getQuestifyLogPrefix(source) : getQuestifyLogPrefix(source).trim();
+
+    switch (level) {
+        case "debug":
+            LOG.debug(prefix, ...args);
+
+            return;
+        case "error":
+            LOG.error(prefix, ...args);
+
+            return;
+        case "info":
+            LOG.info(prefix, ...args);
+
+            return;
+        case "warn":
+            LOG.warn(prefix, ...args);
+
+            return;
+        default:
+            LOG.log(prefix, ...args);
+
+            return;
+    }
+}
+
+export const QL = {
+    log(source: string, ...args: unknown[]): void { emitQuestifyLog("log", source, ...args); },
+    info(source: string, ...args: unknown[]): void { emitQuestifyLog("info", source, ...args); },
+    warn(source: string, ...args: unknown[]): void { emitQuestifyLog("warn", source, ...args); },
+    error(source: string, ...args: unknown[]): void { emitQuestifyLog("error", source, ...args); },
+    debug(source: string, ...args: unknown[]): void { emitQuestifyLog("debug", source, ...args); },
+};
+
+export function notifyQuestCompletion(quest?: Quest): void {
+    if (!quest) return;
+
+    showNotification({
+        title: "Quest Completed!",
+        body: `The ${normalizeQuestName(quest)} Quest has completed.`,
+        dismissOnClick: true,
+        onClick: () => NavigationRouter.transitionTo(`${QUEST_PAGE}#${quest.id}`)
+    });
+
+    QL.log("NOTIFY_QUEST_COMPLETION", { quest });
+}
diff --git a/src/equicordplugins/questify/utils/misc.tsx b/src/equicordplugins/questify/utils/misc.tsx
deleted file mode 100644
index fa91de5f3..000000000
--- a/src/equicordplugins/questify/utils/misc.tsx
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { classNameFactory } from "@utils/css";
-import { Logger } from "@utils/Logger";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { FluxDispatcher, RestAPI, UserStore } from "@webpack/common";
-
-import { activeQuestIntervals } from "..";
-import { questIsIgnored, settings } from "../settings";
-import { Quest, QuestStatus, QuestTask, QuestTaskType, RGB } from "./components";
-
-export const q = classNameFactory("questify-");
-export const QuestifyLogger = new Logger("Questify");
-export const QuestsStore = findByPropsLazy("getQuest");
-export const reportProgress = findByCodeLazy(".QUESTS_VIDEO_PROGRESS(");
-export const sendHeartbeat = findByCodeLazy(".QUESTS_HEARTBEAT(");
-export const questPath = "/quest-home";
-export const videoQuestLeeway = 24;
-export const leftClick = 0;
-export const middleClick = 1;
-export const rightClick = 2;
-
-type HeartbeatDispatchResult =
-    | { type: "success"; userStatus: Quest["userStatus"]; }
-    | { type: "failure"; error: unknown; }
-    | { type: "timeout"; };
-
-export function setIgnoredQuestIDs(questIDs: string[], userId?: string): void {
-    const currentUserID = userId ?? UserStore.getCurrentUser()?.id;
-    if (!currentUserID) return;
-    const { ignoredQuestProfile } = settings.store;
-    const key = ignoredQuestProfile === "shared" ? "shared" : currentUserID;
-    settings.store.ignoredQuestIDs[key] = questIDs;
-}
-
-export function getIgnoredQuestIDs(userId?: string): string[] {
-    const currentUserID = userId ?? UserStore.getCurrentUser()?.id;
-    if (!currentUserID) return [];
-    const { ignoredQuestIDs, ignoredQuestProfile } = settings.store;
-    const key = ignoredQuestProfile === "shared" ? "shared" : currentUserID;
-    ignoredQuestIDs[key] ??= [];
-    return ignoredQuestIDs[key];
-}
-
-export function getQuestTask(quest: Quest): QuestTask {
-    const tasks = quest.config.taskConfigV2?.tasks;
-
-    return (tasks.PLAY_ON_DESKTOP ||
-        tasks.PLAY_ON_XBOX ||
-        tasks.PLAY_ON_PLAYSTATION ||
-        tasks.PLAY_ACTIVITY ||
-        tasks.WATCH_VIDEO ||
-        tasks.WATCH_VIDEO_ON_MOBILE ||
-        tasks.ACHIEVEMENT_IN_ACTIVITY) as QuestTask;
-}
-
-export function getQuestProgress(quest: Quest, task: QuestTask) {
-    const intervalData = activeQuestIntervals.get(quest.id);
-
-    if (intervalData) { return intervalData.progress; }
-
-    const progressMap = quest.userStatus?.progress;
-
-    if (!progressMap) { return null; }
-
-    if (task.type === QuestTaskType.WATCH_VIDEO || task.type === QuestTaskType.WATCH_VIDEO_ON_MOBILE) {
-        const watchProgress = progressMap.WATCH_VIDEO?.value;
-        const mobileProgress = progressMap.WATCH_VIDEO_ON_MOBILE?.value;
-
-        if (watchProgress !== undefined || mobileProgress !== undefined) {
-            return Math.max(watchProgress ?? 0, mobileProgress ?? 0);
-        }
-
-        return null;
-    }
-
-    return progressMap[task.type]?.value ?? null;
-}
-
-export function getQuestTarget(task: QuestTask) {
-    const isWatch = task.type === QuestTaskType.WATCH_VIDEO || task.type === QuestTaskType.WATCH_VIDEO_ON_MOBILE;
-    const { completeVideoQuestsQuicker } = settings.store;
-    const raw = task.target;
-    const adjusted = Math.max(0, raw - (isWatch && completeVideoQuestsQuicker ? videoQuestLeeway : 0));
-    return { raw, adjusted };
-}
-
-export function getQuestStatus(quest: Quest, checkIgnored: boolean = true): QuestStatus {
-    const completedQuest = quest.userStatus?.completedAt;
-    const claimedQuest = quest.userStatus?.claimedAt;
-    const expiredQuest = new Date(quest.config.expiresAt) < new Date();
-    const questIgnored = questIsIgnored(quest.id);
-
-    if (claimedQuest) {
-        return QuestStatus.Claimed;
-    } else if (checkIgnored && questIgnored && (!expiredQuest || completedQuest)) {
-        return QuestStatus.Ignored;
-    } else if (completedQuest || !expiredQuest) {
-        return QuestStatus.Unclaimed;
-    } else if (expiredQuest) {
-        return QuestStatus.Expired;
-    }
-
-    return QuestStatus.Unknown;
-}
-
-export function refreshQuest(quest: Quest): Quest {
-    return QuestsStore.getQuest(quest.id) as Quest ?? quest;
-}
-
-export function isSoundAllowed(url: string): Promise<boolean> {
-    return VencordNative.csp.isDomainAllowed(url, ["img-src"]);
-}
-
-export function snakeToCamel(obj: any): any {
-    if (Array.isArray(obj)) {
-        return obj.map(snakeToCamel);
-    } else if (obj && typeof obj === "object") {
-        return Object.fromEntries(
-            Object.entries(obj).map(([key, value]) => [
-                key.replace(/_([a-z])/g, (_, c) => c.toUpperCase()),
-                snakeToCamel(value)
-            ])
-        );
-    }
-
-    return obj;
-}
-
-export function getFormattedNow(): string {
-    return new Date().toLocaleString(undefined, {
-        year: "numeric",
-        month: "2-digit",
-        day: "2-digit",
-        hour: "2-digit",
-        minute: "2-digit",
-        second: "2-digit",
-        hour12: true
-    }).replace(",", "");
-}
-
-export function decimalToRGB(decimal: number): RGB {
-    const r = (decimal >> 16) & 0xFF;
-    const g = (decimal >> 8) & 0xFF;
-    const b = decimal & 0xFF;
-    return { r, g, b };
-}
-
-export function adjustRGB(rgb: RGB, shift: number): RGB {
-    const color = { ...rgb };
-
-    color.r = Math.max(0, Math.min(255, color.r + shift));
-    color.g = Math.max(0, Math.min(255, color.g + shift));
-    color.b = Math.max(0, Math.min(255, color.b + shift));
-
-    return color;
-}
-
-export function isDarkish(rgb: RGB, threshold: number = 0.5): boolean {
-    const luminance = (0.299 * rgb.r + 0.587 * rgb.g + 0.114 * rgb.b) / 255;
-    return luminance < threshold;
-}
-
-export function validCommaSeparatedList(
-    value: string,
-    allowedTerms: string[] = [],
-    allowEmpty: boolean = true,
-    mustIncludeAll: boolean = false,
-    noDuplicates: boolean = true,
-    caseSensitive: boolean = false
-): boolean {
-    const trimmedValue = value.trim();
-
-    if (!trimmedValue) {
-        return allowEmpty;
-    }
-
-    function normalize(str: string): string {
-        return caseSensitive ? str.trim() : str.trim().toLowerCase();
-    }
-
-    const allowed = new Set(allowedTerms.map(term => normalize(term)));
-    const seen = new Set<string>();
-
-    for (let term of trimmedValue.split(",")) {
-        term = normalize(term);
-
-        if (!term || !allowed.has(term)) {
-            return false;
-        }
-
-        if (noDuplicates && seen.has(term)) {
-            return false;
-        }
-
-        seen.add(term);
-    }
-
-    return !mustIncludeAll || (allowed.size === seen.size);
-}
-
-export function normalizeQuestName(name: string): string {
-    const normalized = name.trim().toUpperCase();
-    return normalized.endsWith("QUEST") ? normalized.slice(0, -5).trim() : normalized;
-}
-
-export async function fetchAndDispatchQuests(source?: string, logger?: Logger): Promise<Quest[] | null> {
-    try {
-        const { body } = snakeToCamel(await RestAPI.get({ url: "/quests/@me", retries: 3 }));
-
-        FluxDispatcher.dispatch({
-            type: "QUESTS_FETCH_CURRENT_QUESTS_SUCCESS",
-            excludedQuests: body.excludedQuests,
-            questEnrollmentBlockedUntil: body.questEnrollmentBlockedUntil,
-            quests: body.quests,
-            ...(source !== undefined && { source }),
-        });
-
-        return body.quests;
-    } catch (e) {
-        logger?.warn(`[${getFormattedNow()}] Failed to fetch and dispatch Quests:`, e);
-        return null;
-    }
-}
-
-export async function waitUntilEnrolled(quest: Quest, timeout: number = 30000, interval: number = 500, logger?: Logger): Promise<boolean> {
-    const questName = normalizeQuestName(quest.config.messages.questName);
-    const start = Date.now();
-
-    if (quest.userStatus?.enrolledAt) {
-        logger?.info(`[${getFormattedNow()}] Quest ${questName} is already enrolled.`);
-        return true;
-    } else if (quest.userStatus?.completedAt) {
-        logger?.warn(`[${getFormattedNow()}] Cannot enroll in completed Quest ${questName}.`);
-        return false;
-    } else {
-        logger?.info(`[${getFormattedNow()}] Waiting for enrollment in Quest ${questName}...`);
-    }
-
-    while (!quest.userStatus?.enrolledAt && (Date.now() - start) < timeout) {
-        await new Promise(resolve => setTimeout(resolve, interval));
-        quest = refreshQuest(quest);
-    }
-
-    if (quest.userStatus?.enrolledAt) {
-        logger?.info(`[${getFormattedNow()}] Successfully waited for enrollment in Quest ${questName}.`);
-        return true;
-    } else {
-        logger?.warn(`[${getFormattedNow()}] Timeout waiting for enrollment in Quest ${questName}.`);
-        return false;
-    }
-}
-
-export async function reportVideoQuestProgress(quest: Quest, currentProgress: number, logger?: Logger, options?: { attempts?: number, delay?: number; }): Promise<boolean> {
-    const questName = normalizeQuestName(quest.config.messages.questName);
-
-    if (!quest.userStatus?.enrolledAt) {
-        logger?.warn(`[${getFormattedNow()}] Cannot report progress for unenrolled Quest ${questName}.`);
-        return false;
-    } else if (quest.userStatus?.completedAt) {
-        return true;
-    }
-
-    const maxAttempts = options?.attempts ?? 1;
-    const delay = options?.delay ?? 2500;
-
-    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-        try {
-            await reportProgress(quest.id, currentProgress);
-
-            logger?.info(`[${getFormattedNow()}] Quest ${questName} progress reported: ${currentProgress.toFixed(6)} seconds.`);
-            return true;
-        } catch (error) {
-            logger?.error(`[${getFormattedNow()}] Failed to report progress for Quest ${questName} on attempt ${attempt}/${maxAttempts}:`, error);
-
-            if (attempt < maxAttempts) {
-                await new Promise(resolve => setTimeout(resolve, delay));
-            }
-        }
-    }
-
-    logger?.warn(`[${getFormattedNow()}] Exhausted all ${maxAttempts} attempts to report progress for Quest ${questName}.`);
-    return false;
-}
-
-function getPlayGameProgressValue(userStatus: Quest["userStatus"]): number | null {
-    const progressMap = userStatus?.progress;
-
-    if (!progressMap) {
-        return null;
-    }
-
-    const progressPlayType = progressMap.PLAY_ON_DESKTOP?.value
-        ?? progressMap.PLAY_ON_XBOX?.value
-        ?? progressMap.PLAY_ON_PLAYSTATION?.value
-        ?? progressMap.PLAY_ACTIVITY?.value;
-
-    return progressPlayType ?? null;
-}
-
-function waitForHeartbeatDispatchResult(questId: string, timeoutMs: number): Promise<HeartbeatDispatchResult> {
-    return new Promise(resolve => {
-        const successEvent = "QUESTS_SEND_HEARTBEAT_SUCCESS";
-        const failureEvent = "QUESTS_SEND_HEARTBEAT_FAILURE";
-        const timeoutId = setTimeout(() => {
-            cleanup();
-            resolve({ type: "timeout" });
-        }, timeoutMs);
-
-        function cleanup() {
-            clearTimeout(timeoutId);
-            FluxDispatcher.unsubscribe(successEvent, onSuccess);
-            FluxDispatcher.unsubscribe(failureEvent, onFailure);
-        }
-
-        function onSuccess(data: { questId?: string; userStatus?: Quest["userStatus"]; }) {
-            if (data.questId !== questId) {
-                return;
-            }
-
-            cleanup();
-            resolve({ type: "success", userStatus: data.userStatus ?? null });
-        }
-
-        function onFailure(data: { questId?: string; error?: unknown; }) {
-            if (data.questId !== questId) {
-                return;
-            }
-
-            cleanup();
-            resolve({ type: "failure", error: data.error });
-        }
-
-        FluxDispatcher.subscribe(successEvent, onSuccess);
-        FluxDispatcher.subscribe(failureEvent, onFailure);
-    });
-}
-
-export async function reportPlayGameQuestProgress(quest: Quest, terminal: boolean, logger?: Logger, options?: { attempts?: number, delay?: number; timeout?: number; applicationId?: string; streamKey?: string; }): Promise<{ progress: number | null; completed: boolean; }> {
-    const questName = normalizeQuestName(quest.config.messages.questName);
-
-    if (!quest.userStatus?.enrolledAt) {
-        logger?.warn(`[${getFormattedNow()}] Cannot send heartbeat for unenrolled Quest ${questName}.`);
-        return { progress: null, completed: false };
-    } else if (quest.userStatus?.completedAt) {
-        return { progress: null, completed: true };
-    }
-
-    const maxAttempts = options?.attempts ?? 1;
-    const delay = options?.delay ?? 2500;
-    const timeout = options?.timeout ?? 10000;
-    const streamKey = options?.streamKey ?? `call:${quest.id}:1`;
-    const applicationId = options?.applicationId ?? quest.config.application.id;
-    const questPlayType = quest.config.taskConfigV2?.tasks.PLAY_ON_DESKTOP || quest.config.taskConfigV2?.tasks.PLAY_ON_XBOX || quest.config.taskConfigV2?.tasks.PLAY_ON_PLAYSTATION || quest.config.taskConfigV2?.tasks.PLAY_ACTIVITY;
-
-    if (!questPlayType) {
-        logger?.warn(`[${getFormattedNow()}] Could not recognize the Quest type for Quest ${questName}.`);
-        return { progress: null, completed: false };
-    }
-
-    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-        try {
-            const dispatchResultPromise = waitForHeartbeatDispatchResult(quest.id, timeout);
-
-            await sendHeartbeat({
-                questId: quest.id,
-                streamKey,
-                applicationId,
-                terminal,
-            });
-
-            const dispatchResult = await dispatchResultPromise;
-
-            if (dispatchResult.type === "failure") {
-                logger?.error(`[${getFormattedNow()}] Failed to send heartbeat for Quest ${questName} on attempt ${attempt}/${maxAttempts}:`, dispatchResult.error);
-
-                if (attempt < maxAttempts) {
-                    await new Promise(resolve => setTimeout(resolve, delay));
-                }
-
-                continue;
-            }
-
-            if (dispatchResult.type === "timeout") {
-                logger?.warn(`[${getFormattedNow()}] Timed out waiting for heartbeat dispatch for Quest ${questName} on attempt ${attempt}/${maxAttempts}.`);
-
-                if (attempt < maxAttempts) {
-                    await new Promise(resolve => setTimeout(resolve, delay));
-                }
-
-                continue;
-            }
-
-            const updatedQuest = refreshQuest(quest);
-            const progress = getPlayGameProgressValue(dispatchResult.userStatus) ?? getQuestProgress(updatedQuest, questPlayType) ?? 0;
-            const completed = !!dispatchResult.userStatus?.completedAt || !!updatedQuest.userStatus?.completedAt;
-
-            logger?.info(`[${getFormattedNow()}] Heartbeat sent for Quest ${questName} with progress: ${progress}/${questPlayType.target}.`);
-            return { progress, completed };
-        } catch (error) {
-            logger?.error(`[${getFormattedNow()}] Failed to send heartbeat for Quest ${questName} on attempt ${attempt}/${maxAttempts}:`, error);
-
-            if (attempt < maxAttempts) {
-                await new Promise(resolve => setTimeout(resolve, delay));
-            }
-        }
-    }
-
-    logger?.warn(`[${getFormattedNow()}] Exhausted all ${maxAttempts} attempts to send heartbeat for Quest ${questName}.`);
-    return { progress: null, completed: false };
-}
-
-export function getBadgeSize(value: string, negative: boolean): number {
-    const numChars = value.length;
-    const subtract = negative ? 3 : 0;
-
-    if (numChars === 1) {
-        return 16;
-    } else if (numChars === 2) {
-        return 21;
-    } else {
-        return (21 + (numChars - 2) * 8) - subtract;
-    }
-}
-
-export function formatLowerBadge(value: number, maxDigits: number = 4): [string, number] {
-    const isNegative = value < 0;
-    const absValue = Math.abs(value);
-
-    if (maxDigits <= 0) {
-        const str = isNegative ? `-${absValue}` : `${absValue}`;
-        return [str, getBadgeSize(str, isNegative)];
-    }
-
-    const absStr = String(absValue);
-    const numDigits = absStr.length;
-
-    if (numDigits <= maxDigits) {
-        const str = isNegative ? `-${absValue}` : `${absValue}`;
-        return [str, getBadgeSize(str, isNegative)];
-    }
-
-    if (absValue < 1000) {
-        if (maxDigits === 1) {
-            if (absValue < 100) {
-                const str = isNegative ? "<-9" : "9+";
-                return [str, getBadgeSize(str, isNegative)];
-            } else {
-                const str = isNegative ? "<-99" : "99+";
-                return [str, getBadgeSize(str, isNegative)];
-            }
-        } else if (maxDigits === 2) {
-            const str = isNegative ? "<-99" : "99+";
-            return [str, getBadgeSize(str, isNegative)];
-        }
-    }
-
-    let num = absValue;
-    const units = ["K", "M", "B"];
-    let unit = "";
-
-    for (let i = 0; i < units.length; i++) {
-        const nextValue = Math.floor(num / 1000);
-
-        if (nextValue === 0) {
-            break;
-        }
-
-        if (i === units.length - 1 && nextValue >= 1000) {
-            num = 999;
-            unit = units[i];
-            break;
-        }
-
-        num = nextValue;
-        unit = units[i];
-    }
-
-    if (isNegative) {
-        const str = `<-${num}${unit}`;
-        return [str, getBadgeSize(str, true)];
-    } else {
-        const str = `${num}${unit}+`;
-        return [str, getBadgeSize(str, false)];
-    }
-}
diff --git a/src/equicordplugins/questify/utils/questState.ts b/src/equicordplugins/questify/utils/questState.ts
new file mode 100644
index 000000000..509d8ef0b
--- /dev/null
+++ b/src/equicordplugins/questify/utils/questState.ts
@@ -0,0 +1,323 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { Quest } from "@vencord/discord-types";
+import { QuestTaskType } from "@vencord/discord-types/enums";
+import { QuestStore } from "@webpack/common";
+
+import { getQuestifySettings, useQuestifySettings } from "../settings/access";
+import { ignoredQuestIDsKey } from "../settings/def";
+import { getActiveAutoCompletes, getAutoCompleteQuestTarget, getQuestAutoCompleteEntry } from "./completion";
+import { type QuestIncludedTypes, questMatchesIncludedTypes } from "./filtering";
+
+export interface QuestTask {
+    type: QuestTaskType;
+    target: number;
+    applications?: { id: string; }[];
+}
+
+export enum QuestStatus {
+    Claimed = "CLAIMED",
+    Unclaimed = "UNCLAIMED",
+    Ignored = "IGNORED",
+    Expired = "EXPIRED",
+    Unknown = "UNKNOWN"
+}
+
+const showcaseSwitchLeewaySeconds = 3;
+let showcasedAutoCompleteQuestId: string | null = null;
+
+const questProgressTaskPriority = [
+    QuestTaskType.WATCH_VIDEO,
+    QuestTaskType.WATCH_VIDEO_ON_MOBILE,
+    QuestTaskType.ACHIEVEMENT_IN_ACTIVITY,
+    QuestTaskType.ACHIEVEMENT_IN_GAME,
+    QuestTaskType.PLAY_ACTIVITY,
+    QuestTaskType.PLAY_ON_DESKTOP,
+    QuestTaskType.PLAY_ON_DESKTOP_V2,
+    QuestTaskType.STREAM_ON_DESKTOP,
+    QuestTaskType.PLAY_ON_PLAYSTATION,
+    QuestTaskType.PLAY_ON_XBOX,
+] as const satisfies readonly QuestTaskType[];
+
+interface QuestPanelPercentCompleteOptions {
+    quest?: Quest | null;
+    percentCompleteText?: string;
+}
+
+interface QuestPanelPercentCompleteResult {
+    percentComplete: number;
+    percentCompleteText?: string;
+}
+
+interface QuestProgressEntry {
+    eventName?: QuestTaskType;
+    heartbeat?: { lastBeatAt?: string | null; } | null;
+    updatedAt?: string | null;
+}
+
+export function refreshQuest(quest: Quest): Quest {
+    return QuestStore.getQuest(quest.id) ?? quest;
+}
+
+export function isVideoQuestTask(taskType: QuestTaskType): boolean {
+    return taskType === QuestTaskType.WATCH_VIDEO || taskType === QuestTaskType.WATCH_VIDEO_ON_MOBILE;
+}
+
+function getQuestTaskByType(quest: Quest, taskType: QuestTaskType): QuestTask | null {
+    const task = quest.config.taskConfigV2?.tasks[taskType] as QuestTask | undefined;
+
+    return task ?? null;
+}
+
+function getVideoQuestTask(quest: Quest): QuestTask | null {
+    return getQuestTaskByType(quest, QuestTaskType.WATCH_VIDEO)
+        ?? getQuestTaskByType(quest, QuestTaskType.WATCH_VIDEO_ON_MOBILE);
+}
+
+function getProgressTimestamp(progress: QuestProgressEntry): number {
+    const timestamp = progress.heartbeat?.lastBeatAt ?? progress.updatedAt;
+    const time = timestamp ? new Date(timestamp).getTime() : 0;
+
+    return Number.isFinite(time) ? time : 0;
+}
+
+function getLatestProgressTask(quest: Quest): QuestTask | null {
+    const progressEntries = Object.entries(quest.userStatus?.progress ?? {}) as [QuestTaskType, QuestProgressEntry][];
+
+    progressEntries.sort(([, a], [, b]) => getProgressTimestamp(b) - getProgressTimestamp(a));
+
+    for (const [fallbackTaskType, progress] of progressEntries) {
+        const task = getQuestTaskByType(quest, progress.eventName ?? fallbackTaskType);
+
+        if (task) {
+            return task;
+        }
+    }
+
+    return null;
+}
+
+function getQuestProgressTask(quest: Quest): QuestTask | null {
+    if (!quest.config.taskConfigV2?.tasks) {
+        return null;
+    }
+
+    const progressTask = getLatestProgressTask(quest) ?? getVideoQuestTask(quest);
+
+    if (progressTask) {
+        return progressTask;
+    }
+
+    for (const taskType of questProgressTaskPriority) {
+        const task = getQuestTaskByType(quest, taskType);
+
+        if (task) {
+            return task;
+        }
+    }
+
+    return null;
+}
+
+export function getQuestStoredProgress(quest: Quest, task: QuestTask): number | null {
+    if (quest.userStatus?.completedAt) {
+        return task.target;
+    }
+
+    const progressMap = quest.userStatus?.progress;
+
+    if (!progressMap) {
+        return null;
+    }
+
+    if (isVideoQuestTask(task.type)) {
+        const watchProgress = progressMap.WATCH_VIDEO?.value;
+        const mobileProgress = progressMap.WATCH_VIDEO_ON_MOBILE?.value;
+
+        return watchProgress !== undefined || mobileProgress !== undefined
+            ? Math.max(watchProgress ?? 0, mobileProgress ?? 0)
+            : null;
+    }
+
+    return progressMap[task.type]?.value ?? null;
+}
+
+function getCurrentIgnoredQuestIds(): string[] {
+    return Array.from(getQuestifySettings().ignoredQuestIDs[ignoredQuestIDsKey] ?? []);
+}
+
+function getAutoCompleteShowcaseQuest(): Quest | null {
+    let bestQuest: Quest | null = null;
+    let bestTimeRemaining = Infinity;
+    let currentQuest: Quest | null = null;
+    let currentTimeRemaining = Infinity;
+
+    for (const entry of getActiveAutoCompletes()) {
+        const quest = QuestStore.getQuest(entry.questId);
+
+        if (!quest) {
+            continue;
+        }
+
+        const progress = entry.progress ?? 0;
+        const { adjusted: target } = getAutoCompleteQuestTarget(entry.task);
+        const timeRemaining = Math.max(0, target - progress);
+
+        if (entry.questId === showcasedAutoCompleteQuestId) {
+            currentQuest = quest;
+            currentTimeRemaining = timeRemaining;
+        }
+
+        if (timeRemaining < bestTimeRemaining) {
+            bestQuest = quest;
+            bestTimeRemaining = timeRemaining;
+        }
+    }
+
+    if (!bestQuest) {
+        showcasedAutoCompleteQuestId = null;
+
+        return null;
+    }
+
+    if (currentQuest && bestQuest.id !== currentQuest.id && bestTimeRemaining >= currentTimeRemaining - showcaseSwitchLeewaySeconds) {
+        return currentQuest;
+    }
+
+    showcasedAutoCompleteQuestId = bestQuest.id;
+
+    return bestQuest;
+}
+
+function getMostRecentlyCompletedUnclaimedQuest(): Quest | null {
+    return Array.from(QuestStore.quests.values())
+        .filter(quest => (
+            Boolean(quest.userStatus?.completedAt)
+            && getQuestStatus(quest, getCurrentIgnoredQuestIds()) === QuestStatus.Unclaimed
+        ))
+        .sort((a, b) => {
+            const aTime = new Date(a.userStatus?.completedAt ?? 0).getTime();
+            const bTime = new Date(b.userStatus?.completedAt ?? 0).getTime();
+
+            return bTime - aTime;
+        })[0] ?? null;
+}
+
+export function getQuestPanelOverride(quest: Quest | null): Quest | null {
+    const panelState = useQuestifySettings(["disableQuestsEverything", "disableAccountPanelPromo", "disableAccountPanelQuestProgress"]);
+
+    if (panelState.disableQuestsEverything) {
+        return null;
+    }
+
+    if (panelState.disableAccountPanelPromo && panelState.disableAccountPanelQuestProgress) {
+        return null;
+    }
+
+    if (panelState.disableAccountPanelQuestProgress) {
+        return quest;
+    }
+
+    const nextQuest = getAutoCompleteShowcaseQuest() ?? getMostRecentlyCompletedUnclaimedQuest();
+
+    return nextQuest ?? (panelState.disableAccountPanelPromo ? null : quest);
+}
+
+export function shouldForceQuestPanelVisible(quest: Quest | null): boolean {
+    const settings = getQuestifySettings();
+
+    if (!quest || settings.disableQuestsEverything || settings.disableAccountPanelQuestProgress) {
+        return false;
+    }
+
+    return getQuestAutoCompleteEntry(refreshQuest(quest)) !== null;
+}
+
+export function getQuestPanelPercentComplete({
+    quest,
+    percentCompleteText,
+}: QuestPanelPercentCompleteOptions): QuestPanelPercentCompleteResult | null {
+    if (!quest) {
+        return null;
+    }
+
+    const refreshedQuest = refreshQuest(quest);
+    const activeAutoComplete = getQuestAutoCompleteEntry(refreshedQuest);
+    const task: QuestTask | null = activeAutoComplete?.task ?? getQuestProgressTask(refreshedQuest);
+
+    if (!task) {
+        return null;
+    }
+
+    const questTarget = activeAutoComplete
+        ? getAutoCompleteQuestTarget(task)
+            .adjusted
+        : task.target;
+    const questProgress = activeAutoComplete?.progress ?? getQuestStoredProgress(refreshedQuest, task);
+
+    if (!questTarget || questProgress === null) {
+        return null;
+    }
+
+    const percentComplete = Math.min(1, questProgress / questTarget);
+
+    if (!percentCompleteText) {
+        return { percentComplete };
+    }
+
+    return {
+        percentComplete,
+        percentCompleteText: `${Math.floor(percentComplete * 100)}%`,
+    };
+}
+
+export function getQuestStatus(
+    quest: Quest,
+    ignoredQuestIds: ReadonlyArray<string>,
+    checkIgnored: boolean = true,
+): QuestStatus {
+    const completedQuest = quest.userStatus?.completedAt;
+    const claimedQuest = quest.userStatus?.claimedAt;
+    const expiredQuest = new Date(quest.config.expiresAt) < new Date();
+    const questIgnored = ignoredQuestIds.includes(quest.id);
+
+    if (claimedQuest) {
+        return QuestStatus.Claimed;
+    }
+
+    if (checkIgnored && questIgnored && (!expiredQuest || completedQuest)) {
+        return QuestStatus.Ignored;
+    }
+
+    if (completedQuest || !expiredQuest) {
+        return QuestStatus.Unclaimed;
+    }
+
+    if (expiredQuest) {
+        return QuestStatus.Expired;
+    }
+
+    return QuestStatus.Unknown;
+}
+
+export function countIncludedUnclaimedQuests(
+    quests: Quest[],
+    ignoredQuestIds: ReadonlyArray<string>,
+    includedTypes: QuestIncludedTypes,
+): number {
+    let count = 0;
+
+    for (const quest of quests) {
+        const questStatus = getQuestStatus(quest, ignoredQuestIds);
+
+        if (questMatchesIncludedTypes(quest, includedTypes) && questStatus === QuestStatus.Unclaimed) {
+            count++;
+        }
+    }
+
+    return count;
+}
diff --git a/src/equicordplugins/questify/utils/questTiles.ts b/src/equicordplugins/questify/utils/questTiles.ts
new file mode 100644
index 000000000..297316118
--- /dev/null
+++ b/src/equicordplugins/questify/utils/questTiles.ts
@@ -0,0 +1,367 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { Quest, QuestTaskWatchVideo, QuestTaskWatchVideoOnMobile } from "@vencord/discord-types";
+import { QuestTaskType } from "@vencord/discord-types/enums";
+
+import { getQuestifySettings, useQuestifySettings } from "../settings/access";
+import { defaultClaimedSubsort, defaultExpiredSubsort, defaultIgnoredSubsort, defaultQuestOrder, defaultUnclaimedSubsort, type QuestOrderStatus, type QuestSubsort, type QuestTileColorSetting, type QuestTileGradient } from "../settings/def";
+import { getIgnoredQuestIDs } from "../settings/ignoredQuests";
+import { getQuestStatus, QuestStatus } from "./questState";
+import { adjustRGB, decimalToRGB, isDarkish, q, type RGB } from "./ui";
+
+type QuestGroupKey = "claimed" | "expired" | "ignored" | "unclaimed" | "unknown";
+
+export const desktopVideoCompatibilityQuestIds = new Set<string>();
+
+interface QuestTileColorSettings {
+    questTileUnclaimedColor: QuestTileColorSetting;
+    questTileClaimedColor: QuestTileColorSetting;
+    questTileIgnoredColor: QuestTileColorSetting;
+    questTileExpiredColor: QuestTileColorSetting;
+}
+
+const customQuestTileClasses = [
+    q("quest-item-restyle"),
+    q("quest-item-intense-gradient"),
+    q("quest-item-default-gradient"),
+    q("quest-item-black-gradient"),
+    q("quest-item-hide-gradient"),
+    q("quest-item-contrast-logo"),
+];
+
+const sortFallbacks = {
+    unclaimed: defaultUnclaimedSubsort,
+    claimed: defaultClaimedSubsort,
+    ignored: defaultIgnoredSubsort,
+    expired: defaultExpiredSubsort,
+} as const satisfies Record<string, QuestSubsort>;
+
+const validSubsorts = new Set<QuestSubsort>([
+    "Recent ASC",
+    "Recent DESC",
+    "Expiring ASC",
+    "Expiring DESC",
+    "Claimed ASC",
+    "Claimed DESC",
+]);
+
+function getTileColorSetting(status: QuestStatus, colors: QuestTileColorSettings): QuestTileColorSetting | null {
+    switch (status) {
+        case QuestStatus.Claimed:
+            return colors.questTileClaimedColor;
+        case QuestStatus.Unclaimed:
+            return colors.questTileUnclaimedColor;
+        case QuestStatus.Ignored:
+            return colors.questTileIgnoredColor;
+        case QuestStatus.Expired:
+            return colors.questTileExpiredColor;
+        default:
+            return null;
+    }
+}
+
+function getQuestTileColor(quest: Quest & { dummyColor?: QuestTileColorSetting; }, colors: QuestTileColorSettings): number | null {
+    const questStatus = getQuestStatus(quest, getIgnoredQuestIDs());
+    const setting = quest.dummyColor ?? getTileColorSetting(questStatus, colors);
+
+    if (!setting?.enabled) {
+        return null;
+    }
+
+    return setting.color;
+}
+
+function getGradientClass(gradient: QuestTileGradient): string | null {
+    if (gradient === "black") return q("quest-item-black-gradient");
+    if (gradient === "hide") return q("quest-item-hide-gradient");
+    if (gradient === "default") return q("quest-item-default-gradient");
+
+    return q("quest-item-intense-gradient");
+}
+
+export function getQuestTileClasses(originalClasses: string, quest: Quest & { dummyColor?: QuestTileColorSetting; }, gradientOverride?: QuestTileGradient): string {
+    const questTiles = useQuestifySettings([
+        "disableQuestsEverything",
+        "ignoredQuestIDs",
+        "questTileUnclaimedColor",
+        "questTileClaimedColor",
+        "questTileIgnoredColor",
+        "questTileExpiredColor",
+        "questTileGradient",
+    ]);
+
+    const baseClasses = originalClasses
+        .split(" ")
+        .filter(cls => cls && !customQuestTileClasses.includes(cls));
+    const colors: QuestTileColorSettings = {
+        questTileUnclaimedColor: questTiles.questTileUnclaimedColor as QuestTileColorSetting,
+        questTileClaimedColor: questTiles.questTileClaimedColor as QuestTileColorSetting,
+        questTileIgnoredColor: questTiles.questTileIgnoredColor as QuestTileColorSetting,
+        questTileExpiredColor: questTiles.questTileExpiredColor as QuestTileColorSetting,
+    };
+    const color = !questTiles.disableQuestsEverything
+        ? getQuestTileColor(quest, colors)
+        : null;
+
+    if (color == null) {
+        return baseClasses.join(" ");
+    }
+
+    const returnClasses = [...baseClasses, q("quest-item-restyle")];
+    const gradient = gradientOverride ?? questTiles.questTileGradient as QuestTileGradient;
+    const gradientClass = getGradientClass(gradient);
+
+    if (gradientClass != null) {
+        returnClasses.push(gradientClass);
+    }
+
+    if (gradient !== "black" && gradient !== "hide" && !isDarkish(decimalToRGB(color), 0.875)) {
+        returnClasses.push(q("quest-item-contrast-logo"));
+    }
+
+    return returnClasses.join(" ");
+}
+
+export function getQuestTileStyle(quest: (Quest & { dummyColor?: QuestTileColorSetting; }) | null): Record<string, string> {
+    const questTiles = useQuestifySettings([
+        "disableQuestsEverything",
+        "ignoredQuestIDs",
+        "questTileUnclaimedColor",
+        "questTileClaimedColor",
+        "questTileIgnoredColor",
+        "questTileExpiredColor",
+    ]);
+
+    const style: Record<string, string> = {};
+    const colors: QuestTileColorSettings = {
+        questTileUnclaimedColor: questTiles.questTileUnclaimedColor as QuestTileColorSetting,
+        questTileClaimedColor: questTiles.questTileClaimedColor as QuestTileColorSetting,
+        questTileIgnoredColor: questTiles.questTileIgnoredColor as QuestTileColorSetting,
+        questTileExpiredColor: questTiles.questTileExpiredColor as QuestTileColorSetting,
+    };
+    const themeColor = quest && !questTiles.disableQuestsEverything
+        ? getQuestTileColor(quest, colors)
+        : null;
+
+    if (themeColor == null) return style;
+
+    const rgb = decimalToRGB(themeColor);
+    const darkish = isDarkish(rgb);
+    const sign = darkish ? 1 : -1;
+    const questNameColor = adjustRGB(rgb, 200 * sign);
+    const rewardTitleColor = adjustRGB(rgb, 150 * sign);
+    const rewardDescriptionColor = adjustRGB(rgb, 100 * sign);
+    const buttonNormalColor = adjustRGB(rgb, 50 * sign);
+    const buttonHoverColor = adjustRGB(rgb, 75 * sign);
+
+    function toRGB(value: RGB): string {
+        return `rgb(${value.r}, ${value.g}, ${value.b})`;
+    }
+
+    style["--questify-color"] = toRGB(rgb);
+    style["--questify-quest-name"] = toRGB(questNameColor);
+    style["--questify-reward-title"] = toRGB(rewardTitleColor);
+    style["--questify-reward-description"] = toRGB(rewardDescriptionColor);
+    style["--questify-button-normal"] = toRGB(buttonNormalColor);
+    style["--questify-button-hover"] = toRGB(buttonHoverColor);
+
+    return style;
+}
+
+function createSortFunction(subsort: QuestSubsort): (a: Quest, b: Quest) => number {
+    switch (subsort) {
+        case "Recent ASC":
+            return (a, b) => new Date(a.config.startsAt).getTime() - new Date(b.config.startsAt).getTime();
+        case "Recent DESC":
+            return (a, b) => new Date(b.config.startsAt).getTime() - new Date(a.config.startsAt).getTime();
+        case "Expiring ASC":
+            return (a, b) => new Date(a.config.expiresAt).getTime() - new Date(b.config.expiresAt).getTime();
+        case "Expiring DESC":
+            return (a, b) => new Date(b.config.expiresAt).getTime() - new Date(a.config.expiresAt).getTime();
+        case "Claimed ASC":
+            return (a, b) => new Date(a.userStatus?.claimedAt || 0).getTime() - new Date(b.userStatus?.claimedAt || 0).getTime();
+        case "Claimed DESC":
+            return (a, b) => new Date(b.userStatus?.claimedAt || 0).getTime() - new Date(a.userStatus?.claimedAt || 0).getTime();
+    }
+}
+
+function getValidSubsort(value: unknown, fallback: QuestSubsort): QuestSubsort {
+    return validSubsorts.has(value as QuestSubsort) ? value as QuestSubsort : fallback;
+}
+
+function getValidQuestOrder(value: unknown): QuestOrderStatus[] {
+    const validStatuses = new Set<QuestOrderStatus>(defaultQuestOrder);
+    const configuredOrder = Array.isArray(value)
+        ? value
+        : defaultQuestOrder;
+    const order = configuredOrder.filter((status): status is QuestOrderStatus => validStatuses.has(status as QuestOrderStatus));
+
+    for (const status of defaultQuestOrder) {
+        if (!order.includes(status)) {
+            order.push(status);
+        }
+    }
+
+    return order;
+}
+
+function injectDesktopVideoQuestTasks(quests: Quest[]): void {
+    for (const quest of quests) {
+        const tasks = quest.config.taskConfigV2?.tasks;
+        const mobileVideoTask = tasks?.[QuestTaskType.WATCH_VIDEO_ON_MOBILE] as QuestTaskWatchVideoOnMobile | undefined;
+
+        if (!tasks || !mobileVideoTask || tasks[QuestTaskType.WATCH_VIDEO]) {
+            continue;
+        }
+
+        const desktopVideoTask: QuestTaskWatchVideo = {
+            ...mobileVideoTask,
+            type: QuestTaskType.WATCH_VIDEO,
+        };
+
+        const reorderedTasks: typeof tasks = {};
+
+        for (const [taskType, task] of Object.entries(tasks) as [QuestTaskType, typeof tasks[QuestTaskType]][]) {
+            if (taskType === QuestTaskType.WATCH_VIDEO_ON_MOBILE) {
+                reorderedTasks[QuestTaskType.WATCH_VIDEO] = desktopVideoTask;
+            }
+
+            reorderedTasks[taskType] = task;
+        }
+
+        quest.config.taskConfigV2.tasks = reorderedTasks;
+        desktopVideoCompatibilityQuestIds.add(quest.id);
+    }
+}
+
+export function hasInjectedDesktopVideoCompatibility(quest?: Quest | string | null): boolean {
+    return !quest ? false : desktopVideoCompatibilityQuestIds.has(typeof quest === "string" ? quest : quest.id);
+}
+
+export function sortQuests(quests: Quest[], skip?: boolean): Quest[] {
+    const questSorting = useQuestifySettings([
+        "disableQuestsEverything",
+        "ignoredQuestIDs",
+        "makeMobileVideoQuestsDesktopCompatible",
+        "completeVideoQuestsQuicker",
+        "questOrder",
+        "unclaimedSubsort",
+        "claimedSubsort",
+        "ignoredSubsort",
+        "expiredSubsort",
+        "autoCompleteQuestTypes",
+    ]);
+
+    if (questSorting.disableQuestsEverything) {
+        return quests;
+    }
+
+    if (questSorting.makeMobileVideoQuestsDesktopCompatible || !!questSorting.autoCompleteQuestTypes.WATCH_VIDEO_ON_MOBILE) {
+        injectDesktopVideoQuestTasks(quests);
+    }
+
+    if (skip) {
+        return quests;
+    }
+
+    const ignoredQuestIds = getIgnoredQuestIDs();
+    const questGroups: Record<QuestGroupKey, Quest[]> = {
+        claimed: [],
+        expired: [],
+        ignored: [],
+        unclaimed: [],
+        unknown: [],
+    };
+
+    for (const quest of quests) {
+        switch (getQuestStatus(quest, ignoredQuestIds)) {
+            case QuestStatus.Claimed:
+                questGroups.claimed.push(quest);
+                break;
+            case QuestStatus.Unclaimed:
+                questGroups.unclaimed.push(quest);
+                break;
+            case QuestStatus.Expired:
+                questGroups.expired.push(quest);
+                break;
+            case QuestStatus.Ignored:
+                questGroups.ignored.push(quest);
+                break;
+            default:
+                questGroups.unknown.push(quest);
+                break;
+        }
+    }
+
+    const unclaimedSortFunction = createSortFunction(getValidSubsort(questSorting.unclaimedSubsort, sortFallbacks.unclaimed));
+
+    questGroups.unclaimed.sort((a, b) => {
+        const aCompleted = !!a.userStatus?.completedAt;
+        const bCompleted = !!b.userStatus?.completedAt;
+
+        if (aCompleted !== bCompleted) {
+            return aCompleted ? 1 : -1;
+        }
+
+        return unclaimedSortFunction(a, b);
+    });
+
+    questGroups.claimed.sort(createSortFunction(getValidSubsort(questSorting.claimedSubsort, sortFallbacks.claimed)));
+    questGroups.ignored.sort(createSortFunction(getValidSubsort(questSorting.ignoredSubsort, sortFallbacks.ignored)));
+    questGroups.expired.sort(createSortFunction(getValidSubsort(questSorting.expiredSubsort, sortFallbacks.expired)));
+
+    return [
+        ...getValidQuestOrder(questSorting.questOrder).flatMap(status => questGroups[status.toLowerCase() as QuestGroupKey]),
+        ...questGroups.unknown,
+    ];
+}
+
+export function shouldPreloadQuestAssets(): boolean {
+    const settings = getQuestifySettings();
+
+    return !settings.disableQuestsEverything && settings.questTilePreload;
+}
+
+export function getLastSortChoice(): string | null {
+    const { rememberQuestPageSort, lastQuestPageSort } = getQuestifySettings();
+
+    return rememberQuestPageSort ? lastQuestPageSort : "questify";
+}
+
+export function setLastSortChoice(sort: string): void {
+    getQuestifySettings().lastQuestPageSort = sort || "questify";
+}
+
+function getFilterChoiceKey({ group, filter }: { group: string; filter: string; }): string {
+    return JSON.stringify([group, filter]);
+}
+
+export function getLastFilterChoices(): { group: string, filter: string; }[] | null {
+    const { rememberQuestPageFilters, lastQuestPageFilters } = getQuestifySettings();
+
+    return rememberQuestPageFilters
+        ? Object.values(lastQuestPageFilters).map(item => JSON.parse(JSON.stringify(item)))
+        : null;
+}
+
+export function setLastFilterChoices(filters: { group: string, filter: string; }[] | null): void {
+    if (!filters?.length) {
+        getQuestifySettings().lastQuestPageFilters = {};
+
+        return;
+    }
+
+    if (!filters.every(filter => filter?.group && filter?.filter)) {
+        return;
+    }
+
+    getQuestifySettings().lastQuestPageFilters = JSON.parse(JSON.stringify(filters)).reduce((acc, item) => {
+        acc[getFilterChoiceKey(item)] = item;
+
+        return acc;
+    }, {} as Record<string, { group: string, filter: string; }>);
+}
diff --git a/src/equicordplugins/questify/utils/ui.ts b/src/equicordplugins/questify/utils/ui.ts
new file mode 100644
index 000000000..47e61c1af
--- /dev/null
+++ b/src/equicordplugins/questify/utils/ui.ts
@@ -0,0 +1,158 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { classNameFactory } from "@utils/css";
+import { findByPropsLazy } from "@webpack";
+
+import type { QuestButtonDisplayMode, QuestButtonIndicatorMode } from "../settings/def";
+
+export interface RGB {
+    r: number;
+    g: number;
+    b: number;
+}
+
+export const QUEST_PAGE = "/quest-home";
+export const q = classNameFactory("questify-");
+export const leftClick = 0;
+export const middleClick = 1;
+export const rightClick = 2;
+
+export function decimalToRGB(decimal: number): RGB {
+    return {
+        r: (decimal >> 16) & 0xff,
+        g: (decimal >> 8) & 0xff,
+        b: decimal & 0xff,
+    };
+}
+
+export function adjustRGB(rgb: RGB, shift: number): RGB {
+    return {
+        r: Math.max(0, Math.min(255, rgb.r + shift)),
+        g: Math.max(0, Math.min(255, rgb.g + shift)),
+        b: Math.max(0, Math.min(255, rgb.b + shift)),
+    };
+}
+
+export function isDarkish(rgb: RGB, threshold: number = 0.5): boolean {
+    const luminance = (0.299 * rgb.r + 0.587 * rgb.g + 0.114 * rgb.b) / 255;
+
+    return luminance < threshold;
+}
+
+export function canShowBadge(mode: QuestButtonIndicatorMode): boolean {
+    return mode === "badge" || mode === "both";
+}
+
+export function canShowPill(mode: QuestButtonIndicatorMode): boolean {
+    return mode === "pill" || mode === "both";
+}
+
+export function canShowButton(mode: QuestButtonDisplayMode): boolean {
+    return mode === "always" || mode === "unclaimed";
+}
+
+function getBadgeSize(value: string, negative: boolean): number {
+    const numChars = value.length;
+    const subtract = negative ? 3 : 0;
+
+    if (numChars === 1) {
+        return 16;
+    }
+
+    if (numChars === 2) {
+        return 21;
+    }
+
+    return (21 + (numChars - 2) * 8) - subtract;
+}
+
+export function formatLowerBadge(value: number, maxDigits: number = 4): [string, number] {
+    const isNegative = value < 0;
+    const absValue = Math.abs(value);
+
+    if (maxDigits <= 0) {
+        const formatted = isNegative ? `-${absValue}` : `${absValue}`;
+
+        return [formatted, getBadgeSize(formatted, isNegative)];
+    }
+
+    const absStr = String(absValue);
+
+    if (absStr.length <= maxDigits) {
+        const formatted = isNegative ? `-${absValue}` : `${absValue}`;
+
+        return [formatted, getBadgeSize(formatted, isNegative)];
+    }
+
+    if (absValue < 1000) {
+        if (maxDigits === 1) {
+            const formatted = absValue < 100
+                ? (isNegative ? "<-9" : "9+")
+                : (isNegative ? "<-99" : "99+");
+
+            return [formatted, getBadgeSize(formatted, isNegative)];
+        }
+
+        if (maxDigits === 2) {
+            const formatted = isNegative ? "<-99" : "99+";
+
+            return [formatted, getBadgeSize(formatted, isNegative)];
+        }
+    }
+
+    let reducedValue = absValue;
+    let unit = "";
+    const units = ["K", "M", "B"];
+
+    for (let index = 0; index < units.length; index++) {
+        const nextValue = Math.floor(reducedValue / 1000);
+
+        if (nextValue === 0) {
+            break;
+        }
+
+        if (index === units.length - 1 && nextValue >= 1000) {
+            reducedValue = 999;
+            unit = units[index];
+
+            break;
+        }
+
+        reducedValue = nextValue;
+        unit = units[index];
+    }
+
+    const formatted = isNegative ? `<-${reducedValue}${unit}` : `${reducedValue}${unit}+`;
+
+    return [formatted, getBadgeSize(formatted, isNegative)];
+}
+
+export interface AlertOptions {
+    title: string;
+    body: React.ReactNode;
+    confirmText?: string;
+    cancelText?: string;
+    confirmVariant?: "primary" | "critical-primary" | "expressive";
+    onConfirm?: () => void;
+    onCancel?: () => void;
+    onCloseCallback?: () => void;
+    contextKey?: string;
+}
+
+export interface AlertsType {
+    show: (options: AlertOptions) => void;
+    close: () => void;
+    confirm: (options: AlertOptions) => Promise<boolean>;
+}
+
+const AlertsModule = findByPropsLazy("show", "close", "confirm");
+
+export const Alerts: AlertsType = {
+    show: options => AlertsModule.show(options),
+    close: () => AlertsModule.close(),
+    confirm: options => AlertsModule.confirm(options),
+};
diff --git a/src/equicordplugins/quickThemeSwitcher.discordDesktop/index.tsx b/src/equicordplugins/quickThemeSwitcher.discordDesktop/index.tsx
index 449e35239..82e9af31c 100644
--- a/src/equicordplugins/quickThemeSwitcher.discordDesktop/index.tsx
+++ b/src/equicordplugins/quickThemeSwitcher.discordDesktop/index.tsx
@@ -244,6 +244,7 @@ const handleThemeNamesChange = () => settings.store.autoRefresh && debouncedRefr
 export default definePlugin({
     name: "QuickThemeSwitcher",
     description: "Quickly switch between themes using keyboard shortcuts.",
+    tags: ["Appearance", "Utility"],
     authors: [Devs.prism],
     settings,
     startAt: StartAt.DOMContentLoaded,
diff --git a/src/equicordplugins/quoter/index.tsx b/src/equicordplugins/quoter/index.tsx
index 95825e3c1..d41104617 100644
--- a/src/equicordplugins/quoter/index.tsx
+++ b/src/equicordplugins/quoter/index.tsx
@@ -58,6 +58,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "Quoter",
     description: "Adds the ability to create an inspirational quote image from a message.",
+    tags: ["Chat"],
     authors: [Devs.Samwich, Devs.thororen, EquicordDevs.neoarz, Devs.prism],
     settings,
 
diff --git a/src/equicordplugins/randomVoice/index.tsx b/src/equicordplugins/randomVoice/index.tsx
index 6017aad6b..9d78149d2 100644
--- a/src/equicordplugins/randomVoice/index.tsx
+++ b/src/equicordplugins/randomVoice/index.tsx
@@ -671,6 +671,8 @@ function renderOperationGroup({
 export default definePlugin({
     name: "RandomVoice",
     description: "Adds a button near mute to join a random voice channel.",
+    dependencies: ["UserAreaAPI"],
+    tags: ["Fun", "Voice"],
     authors: [EquicordDevs.xijexo, EquicordDevs.omaw, Devs.thororen],
     settings,
 
diff --git a/src/equicordplugins/recentDMSwitcher/index.tsx b/src/equicordplugins/recentDMSwitcher/index.tsx
index 96a271861..48e5977fa 100644
--- a/src/equicordplugins/recentDMSwitcher/index.tsx
+++ b/src/equicordplugins/recentDMSwitcher/index.tsx
@@ -332,6 +332,7 @@ function showCycleToast() {
 export default definePlugin({
     name: "RecentDMSwitcher",
     description: "Ctrl+Tab between most recently used DMs (Ctrl+Shift+Tab reverse)",
+    tags: ["Chat", "Utility"],
     authors: [EquicordDevs.mmeta],
     settings,
 
diff --git a/src/equicordplugins/remix/index.tsx b/src/equicordplugins/remix/index.tsx
index 19595a5ef..a03d89d09 100644
--- a/src/equicordplugins/remix/index.tsx
+++ b/src/equicordplugins/remix/index.tsx
@@ -71,6 +71,7 @@ export function sendRemix(blob: Blob) {
 export default definePlugin({
     name: "RemixRevived",
     description: "Revives Remix and breings it to Desktop",
+    tags: ["Customisation", "Fun"],
     authors: [EquicordDevs.MrDiamond, EquicordDevs.meowabyte],
     contextMenus: {
         "channel-attach": UploadContextMenuPatch,
diff --git a/src/equicordplugins/repeatMessages/index.tsx b/src/equicordplugins/repeatMessages/index.tsx
index 6ca6bc494..5bbcf3f2b 100644
--- a/src/equicordplugins/repeatMessages/index.tsx
+++ b/src/equicordplugins/repeatMessages/index.tsx
@@ -132,6 +132,8 @@ migratePluginSettings("RepeatMessages", "RepeatMessage");
 export default definePlugin({
     name: "RepeatMessages",
     description: "Allows you to repeat messages quickly. If you hold shift while clicking the Repeat option, it will reply to the message.",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Chat"],
     authors: [EquicordDevs.Tolgchu, Devs.thororen],
     contextMenus: {
         "message": messageCtxPatch
diff --git a/src/equicordplugins/replyPingControl/index.ts b/src/equicordplugins/replyPingControl/index.ts
index aa877cfb6..83999f94e 100644
--- a/src/equicordplugins/replyPingControl/index.ts
+++ b/src/equicordplugins/replyPingControl/index.ts
@@ -21,13 +21,19 @@ export const settings = definePluginSettings({
         description: "Comma-separated list of User IDs to always receive reply pings from",
         default: "",
         disabled: () => settings.store.alwaysPingOnReply,
+    },
+    replyPingBlacklist: {
+        type: OptionType.STRING,
+        description: "Comma-separated list of User IDs to never receive reply pings from",
+        default: "",
     }
 });
 
 export default definePlugin({
     name: "ReplyPingControl",
-    description: "Control whether to always or never get pinged on message replies, with a whitelist feature",
-    authors: [Devs.ant0n, EquicordDevs.MrDiamond],
+    description: "Control whether to always or never get pinged on message replies, with whitelist and blacklist features",
+    tags: ["Chat", "Notifications"],
+    authors: [Devs.ant0n, EquicordDevs.MrDiamond, EquicordDevs.keircn],
     settings,
 
     patches: [{
@@ -45,10 +51,17 @@ export default definePlugin({
         const repliedMessage = this.getRepliedMessage(message);
         if (!repliedMessage || repliedMessage.author.id !== user.id) return;
 
-        const whitelist = settings.store.replyPingWhitelist.split(",").map(id => id.trim());
-        const isWhitelisted = settings.store.replyPingWhitelist.includes(message.author.id);
+        const { replyPingBlacklist, replyPingWhitelist, alwaysPingOnReply } = settings.plain;
+        const authorId = message.author.id;
 
-        if (isWhitelisted || settings.store.alwaysPingOnReply) {
+        if (replyPingBlacklist && replyPingBlacklist.split(",").some(id => id.trim() === authorId)) {
+            message.mentions = message.mentions.filter(mention => mention.id !== user.id);
+            return;
+        }
+
+        const isWhitelisted = replyPingWhitelist && replyPingWhitelist.split(",").some(id => id.trim() === authorId);
+
+        if (isWhitelisted || alwaysPingOnReply) {
             if (!message.mentions.some(mention => mention.id === user.id)) {
                 message.mentions.push(user as any);
             }
diff --git a/src/equicordplugins/richMagnetLinks/index.tsx b/src/equicordplugins/richMagnetLinks/index.tsx
index 33a42efbb..4cfb0275f 100644
--- a/src/equicordplugins/richMagnetLinks/index.tsx
+++ b/src/equicordplugins/richMagnetLinks/index.tsx
@@ -13,6 +13,7 @@ export default definePlugin({
     authors: [EquicordDevs.cassie, EquicordDevs.mochienya, EquicordDevs.secp192k1],
     name: "RichMagnetLinks",
     description: "Renders magnet links like message links",
+    tags: ["Appearance", "Chat"],
     patches: [
         {
             find: "AUTO_MODERATION_SYSTEM_MESSAGE_RULES:",
diff --git a/src/equicordplugins/richPresence/index.tsx b/src/equicordplugins/richPresence/index.tsx
index 8c0d4874e..d5d90f5bb 100644
--- a/src/equicordplugins/richPresence/index.tsx
+++ b/src/equicordplugins/richPresence/index.tsx
@@ -22,80 +22,81 @@ type SettingsKey = keyof SettingsStore;
 
 const logger = new Logger("RichPresence");
 
-const services: Record<string, { start(): void; stop(): void }> = {
-	[ServiceTab.AudioBookShelf]: abs,
-	[ServiceTab.Tosu]: tosu,
-	[ServiceTab.StatsFm]: statsfm,
-	[ServiceTab.Jellyfin]: jellyfin,
-	[ServiceTab.ListenBrainz]: listenbrainz,
-	[ServiceTab.GensokyoRadio]: gensokyoRadio,
+const services: Record<string, { start(): void; stop(): void; }> = {
+    [ServiceTab.AudioBookShelf]: abs,
+    [ServiceTab.Tosu]: tosu,
+    [ServiceTab.StatsFm]: statsfm,
+    [ServiceTab.Jellyfin]: jellyfin,
+    [ServiceTab.ListenBrainz]: listenbrainz,
+    [ServiceTab.GensokyoRadio]: gensokyoRadio,
 };
 
 const enableKeys: Record<string, SettingsKey> = {
-	[ServiceTab.AudioBookShelf]: "abs_enabled",
-	[ServiceTab.Tosu]: "tosu_enabled",
-	[ServiceTab.StatsFm]: "sfm_enabled",
-	[ServiceTab.Jellyfin]: "jf_enabled",
-	[ServiceTab.ListenBrainz]: "lb_enabled",
-	[ServiceTab.GensokyoRadio]: "gr_enabled",
+    [ServiceTab.AudioBookShelf]: "abs_enabled",
+    [ServiceTab.Tosu]: "tosu_enabled",
+    [ServiceTab.StatsFm]: "sfm_enabled",
+    [ServiceTab.Jellyfin]: "jf_enabled",
+    [ServiceTab.ListenBrainz]: "lb_enabled",
+    [ServiceTab.GensokyoRadio]: "gr_enabled",
 };
 
 const activeServices = new Set<string>();
 
 function syncServices() {
-	const globalEnabled = settings.store.enabled;
+    const globalEnabled = settings.store.enabled;
 
-	for (const [id, service] of Object.entries(services)) {
-		const shouldRun =
-			globalEnabled && !!settings.store[enableKeys[id]];
-		const isRunning = activeServices.has(id);
+    for (const [id, service] of Object.entries(services)) {
+        const shouldRun =
+            globalEnabled && !!settings.store[enableKeys[id]];
+        const isRunning = activeServices.has(id);
 
-		if (shouldRun && !isRunning) {
-			logger.info(`Starting ${id} service`);
-			service.start();
-			activeServices.add(id);
-		} else if (!shouldRun && isRunning) {
-			logger.info(`Stopping ${id} service`);
-			service.stop();
-			activeServices.delete(id);
-		}
-	}
+        if (shouldRun && !isRunning) {
+            logger.info(`Starting ${id} service`);
+            service.start();
+            activeServices.add(id);
+        } else if (!shouldRun && isRunning) {
+            logger.info(`Stopping ${id} service`);
+            service.stop();
+            activeServices.delete(id);
+        }
+    }
 }
 
 function stopAllServices() {
-	for (const id of activeServices) {
-		logger.info(`Stopping ${id} service`);
-		services[id].stop();
-	}
-	activeServices.clear();
+    for (const id of activeServices) {
+        logger.info(`Stopping ${id} service`);
+        services[id].stop();
+    }
+    activeServices.clear();
 }
 
 export default definePlugin({
-	name: "RichPresence",
-	description: "Unified rich presence hub for AudioBookShelf, osu!, stats.fm, Jellyfin, ListenBrainz, and Gensokyo Radio.",
-	authors: [
-		EquicordDevs.vmohammad,
-		Devs.AutumnVN,
-		EquicordDevs.Crxa,
-		Devs.SerStars,
-		EquicordDevs.ZcraftElite,
-		EquicordDevs.qouesm,
-		Devs.RyanCaoDev,
-		EquicordDevs.Prince527,
-		EquicordDevs.creations,
-	],
-	reporterTestable: ReporterTestable.None,
+    name: "RichPresence",
+    description: "Unified rich presence hub for AudioBookShelf, osu!, stats.fm, Jellyfin, ListenBrainz, and Gensokyo Radio.",
+    tags: ["Activity"],
+    authors: [
+        EquicordDevs.vmohammad,
+        Devs.AutumnVN,
+        EquicordDevs.Crxa,
+        Devs.SerStars,
+        EquicordDevs.ZcraftElite,
+        EquicordDevs.qouesm,
+        Devs.RyanCaoDev,
+        EquicordDevs.Prince527,
+        EquicordDevs.creations,
+    ],
+    reporterTestable: ReporterTestable.None,
 
-	settings,
+    settings,
 
-	start() {
-		migrateOldSettings();
-		syncServices();
-		setOnServiceChange(syncServices);
-	},
+    start() {
+        migrateOldSettings();
+        syncServices();
+        setOnServiceChange(syncServices);
+    },
 
-	stop() {
-		stopAllServices();
-		setOnServiceChange(null);
-	},
+    stop() {
+        stopAllServices();
+        setOnServiceChange(null);
+    },
 });
diff --git a/src/equicordplugins/richPresence/services/jellyfin.ts b/src/equicordplugins/richPresence/services/jellyfin.ts
index ae4dc8f5d..a8cf83ebe 100644
--- a/src/equicordplugins/richPresence/services/jellyfin.ts
+++ b/src/equicordplugins/richPresence/services/jellyfin.ts
@@ -5,6 +5,7 @@
  */
 
 import { Logger } from "@utils/Logger";
+import { formatDurationMs } from "@utils/text";
 import { Activity } from "@vencord/discord-types";
 import { ApplicationAssetUtils, FluxDispatcher, showToast } from "@webpack/common";
 
@@ -152,13 +153,18 @@ async function getActivity(): Promise<Activity | null> {
     };
 
     const getDetails = () => {
+        let details: string;
         if (mediaData.type === "Episode" && mediaData.seriesName)
-            return store.jf_privacyMode ? "Watching a TV Show" : mediaData.seriesName;
-        return store.jf_privacyMode ? "Watching Something" : mediaData.name;
+            details = store.jf_privacyMode ? "Watching a TV Show" : mediaData.seriesName;
+        else
+            details = store.jf_privacyMode ? "Watching Something" : mediaData.name;
+        if (mediaData.isPaused) details += " - Paused";
+        return details;
     };
 
     const getState = () => {
-        if (mediaData.isPaused) return "Paused";
+        let state: string | undefined;
+
         if (mediaData.type === "Episode" && mediaData.seriesName) {
             let episodeFormat = "";
             const season = mediaData.seasonNumber;
@@ -183,13 +189,23 @@ async function getActivity(): Promise<Activity | null> {
                 episodeFormat = format === "fulltext" ? `Episode ${episode}` : `E${episode.toString().padStart(2, "0")}`;
             }
 
-            if (store.jf_showEpisodeName && mediaData.name && !store.jf_privacyMode)
-                return `${episodeFormat} - ${mediaData.name}`;
-            return episodeFormat;
+            state = (store.jf_showEpisodeName && mediaData.name && !store.jf_privacyMode)
+                ? `${episodeFormat} - ${mediaData.name}`
+                : episodeFormat;
+        } else if (store.jf_privacyMode) {
+            state = mediaData.type === "Audio" ? "Listening to music" : (mediaData.year ? "(????)" : undefined);
+        } else {
+            state = mediaData.artist || (mediaData.year ? `(${mediaData.year})` : undefined);
         }
-        if (store.jf_privacyMode)
-            return mediaData.type === "Audio" ? "Listening to music" : (mediaData.year ? "(????)" : undefined);
-        return mediaData.artist || (mediaData.year ? `(${mediaData.year})` : undefined);
+
+        if (mediaData.isPaused) {
+            const time = mediaData.position != null && mediaData.duration != null
+                ? `${formatDurationMs(mediaData.position * 1000)} / ${formatDurationMs(mediaData.duration * 1000)}`
+                : undefined;
+            const parts = [state, time].filter(Boolean);
+            return parts.join(" - ") || "Paused";
+        }
+        return state;
     };
 
     const timestamps = (!mediaData.isPaused && mediaData.position != null && mediaData.duration != null) ? {
diff --git a/src/equicordplugins/rpcEditor/ReplaceSettings.tsx b/src/equicordplugins/rpcEditor/ReplaceSettings.tsx
index b85b0f7c1..81d541bf5 100644
--- a/src/equicordplugins/rpcEditor/ReplaceSettings.tsx
+++ b/src/equicordplugins/rpcEditor/ReplaceSettings.tsx
@@ -94,7 +94,7 @@ export function ReplaceSettings({ appIds, update, save }: SettingsProps) {
                         }
                         <Heading className={`${Margins.top8} ${Margins.bottom8}`}>Application ID</Heading>
                         <CheckedTextInput
-                            value={setting.appId}
+                            initialValue={setting.appId}
                             onChange={async v => {
                                 onChange(v, i, "appId");
                             }}
@@ -125,7 +125,7 @@ export function ReplaceSettings({ appIds, update, save }: SettingsProps) {
                                     <>
                                         <Heading className={`${Margins.top8} ${Margins.bottom8}`}>Stream URL (must be YouTube or Twitch)</Heading>
                                         <CheckedTextInput
-                                            value={setting.newStreamUrl}
+                                            initialValue={setting.newStreamUrl}
                                             onChange={async v => {
                                                 onChange(v, i, "newStreamUrl");
                                             }}
diff --git a/src/equicordplugins/rpcEditor/index.tsx b/src/equicordplugins/rpcEditor/index.tsx
index e60d6627f..b40009418 100644
--- a/src/equicordplugins/rpcEditor/index.tsx
+++ b/src/equicordplugins/rpcEditor/index.tsx
@@ -73,6 +73,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "RPCEditor",
     description: "Edit the type and content of any Rich Presence",
+    tags: ["Customisation"],
     authors: [Devs.Nyako, Devs.nin0dev],
     patches: [
         {
diff --git a/src/equicordplugins/rpcStats/index.tsx b/src/equicordplugins/rpcStats/index.tsx
index 76f07a44a..0d0bc5f5c 100644
--- a/src/equicordplugins/rpcStats/index.tsx
+++ b/src/equicordplugins/rpcStats/index.tsx
@@ -172,6 +172,7 @@ async function updateData() {
 export default definePlugin({
     name: "RPCStats",
     description: "Displays stats about your activity as an rpc",
+    tags: ["Utility"],
     authors: [Devs.Samwich],
     async start() {
         updateData();
diff --git a/src/equicordplugins/saveFavoriteGIFs/index.tsx b/src/equicordplugins/saveFavoriteGIFs/index.tsx
index e5af23613..268be6571 100644
--- a/src/equicordplugins/saveFavoriteGIFs/index.tsx
+++ b/src/equicordplugins/saveFavoriteGIFs/index.tsx
@@ -115,6 +115,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "SaveFavoriteGIFs",
     description: "Export favorited GIF urls",
+    dependencies: ["CommandsAPI"],
+    tags: ["Emotes", "Utility"],
     authors: [Devs.thororen],
     settings,
     commands: [
diff --git a/src/equicordplugins/scheduledMessages/index.tsx b/src/equicordplugins/scheduledMessages/index.tsx
index 7fee1cbd2..d79402226 100644
--- a/src/equicordplugins/scheduledMessages/index.tsx
+++ b/src/equicordplugins/scheduledMessages/index.tsx
@@ -86,6 +86,8 @@ function handleReactionEvent(event: FluxReactionEvent): void {
 export default definePlugin({
     name: "ScheduledMessages",
     description: "Schedule messages to be sent at a specific time or after a delay.",
+    tags: ["Chat", "Utility"],
+    dependencies: ["ChatInputButtonAPI", "MessageAccessoriesAPI", "MessageEventsAPI"],
     authors: [EquicordDevs.mmeta, Devs.prism],
     settings,
 
diff --git a/src/equicordplugins/screenRecorder.equibop/index.tsx b/src/equicordplugins/screenRecorder.equibop/index.tsx
index a24ef052b..b9446995c 100644
--- a/src/equicordplugins/screenRecorder.equibop/index.tsx
+++ b/src/equicordplugins/screenRecorder.equibop/index.tsx
@@ -14,7 +14,8 @@ let recoder: MediaRecorder;
 
 export default definePlugin({
     name: "ScreenRecorder",
-    description: "epic screen recorder lol",
+    description: "Adds an option to record your screen and upload the recording to the channel",
+    tags: ["Chat"],
     authors: [Devs.AutumnVN],
     contextMenus: {
         "channel-attach": startRecording
@@ -54,7 +55,7 @@ function stopRecording(children, props) {
             }
             action={() => {
                 recoder.addEventListener("dataavailable", e => {
-                    const file = new File([e.data], "watch if cute.webm", { type: "video/webm" });
+                    const file = new File([e.data], "recording.webm", { type: "video/webm" });
                     UploadHandler.promptToUpload([file], props.channel, 0);
                 });
                 recoder.stop();
diff --git a/src/equicordplugins/searchFix/index.tsx b/src/equicordplugins/searchFix/index.tsx
index e45e4cd16..301c1b14a 100644
--- a/src/equicordplugins/searchFix/index.tsx
+++ b/src/equicordplugins/searchFix/index.tsx
@@ -39,6 +39,7 @@ function settingsComponent() {
 export default definePlugin({
     name: "SearchFix",
     description: 'Fixes the annoying "We dropped the magnifying glass!" error.',
+    tags: ["Utility"],
     settingsAboutComponent: () => settingsComponent(),
     authors: [EquicordDevs.Jaxx],
     patches: [
@@ -48,7 +49,7 @@ export default definePlugin({
                 match: /\i\.searchResultsQuery=(\i)/,
                 replace: "$&,$self.main($1)"
             }
-        }
+        },
     ],
     main(query) {
         if (query.offset > 5000) {
diff --git a/src/equicordplugins/sekaiStickers/Components/SekaiStickersModal.tsx b/src/equicordplugins/sekaiStickers/Components/SekaiStickersModal.tsx
index 1037b96a8..3b75dcbb9 100644
--- a/src/equicordplugins/sekaiStickers/Components/SekaiStickersModal.tsx
+++ b/src/equicordplugins/sekaiStickers/Components/SekaiStickersModal.tsx
@@ -113,7 +113,7 @@ export default function SekaiStickersModal({ modalProps, settings }: { modalProp
                     </div>
                     <div style={{ marginRight: 10, width: "30vw" }}>
                         <Heading>Text</Heading>
-                        <TextArea onChange={setText} placeholder={text} rows={4} spellCheck={false} />
+                        <TextArea onChange={setText} placeholder={text} rows={4} />
                         <Heading>Rotation</Heading>
                         <Slider markers={[-10, -5, 0, 5, 10]} stickToMarkers={false} minValue={-10} maxValue={10} asValueChanges={val => setRotate(val)} initialValue={rotate} keyboardStep={0.2} orientation={"horizontal"} onValueRender={(v: number) => String(v.toFixed(2))} />
                         <Heading>Font Size</Heading>
diff --git a/src/equicordplugins/sekaiStickers/index.tsx b/src/equicordplugins/sekaiStickers/index.tsx
index af1d6c1af..aa6188e1a 100644
--- a/src/equicordplugins/sekaiStickers/index.tsx
+++ b/src/equicordplugins/sekaiStickers/index.tsx
@@ -33,6 +33,8 @@ let IS_FONTS_LOADED = false;
 export default definePlugin({
     name: "SekaiStickers",
     description: "Sekai Stickers built in discord originally from github.com/TheOriginalAyaka",
+    dependencies: ["ChatInputButtonAPI"],
+    tags: ["Chat", "Emotes"],
     authors: [Devs.MaiKokain],
     settings,
     chatBarButton: {
diff --git a/src/equicordplugins/selfForward/index.ts b/src/equicordplugins/selfForward/index.ts
index 74c9902bc..09672018c 100644
--- a/src/equicordplugins/selfForward/index.ts
+++ b/src/equicordplugins/selfForward/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "SelfForward",
     description: "Adds the current channel to the forward list popup",
+    tags: ["Utility"],
     authors: [EquicordDevs.VillainsRule],
     patches: [
         {
diff --git a/src/equicordplugins/serverSearch/index.tsx b/src/equicordplugins/serverSearch/index.tsx
index 48cbe348f..101650afc 100644
--- a/src/equicordplugins/serverSearch/index.tsx
+++ b/src/equicordplugins/serverSearch/index.tsx
@@ -10,8 +10,7 @@ import { addServerListElement, removeServerListElement, ServerListRenderPosition
 import ErrorBoundary from "@components/ErrorBoundary";
 import { EquicordDevs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { FluxDispatcher } from "@webpack/common";
-import { Tooltip } from "webpack/common/components";
+import { FluxDispatcher, Tooltip } from "@webpack/common";
 
 function SearchIcon() {
     return (
@@ -29,6 +28,7 @@ export default definePlugin({
     name: "ServerSearch",
     authors: [EquicordDevs.camila314],
     description: "Navigate your servers better with a quick search button",
+    tags: ["Shortcuts", "Servers"],
 
     renderButton() {
         return <ErrorBoundary noop>
diff --git a/src/equicordplugins/showBadgesInChat/index.tsx b/src/equicordplugins/showBadgesInChat/index.tsx
index 60066cc52..5e05ba431 100644
--- a/src/equicordplugins/showBadgesInChat/index.tsx
+++ b/src/equicordplugins/showBadgesInChat/index.tsx
@@ -6,11 +6,11 @@
 
 import "./styles.css";
 
+import badges from "@plugins/_api/badges";
 import { Devs, EquicordDevs } from "@utils/constants";
 import { isEquicordPluginDev, isPluginDev } from "@utils/misc";
 import definePlugin from "@utils/types";
 import { findComponentByCodeLazy, findCssClassesLazy } from "@webpack";
-import badges from "plugins/_api/badges";
 
 const { roleIcon } = findCssClassesLazy("roleIcon", "separator");
 const RoleIconComponent = findComponentByCodeLazy("#{intl::ROLE_ICON_ALT_TEXT}");
@@ -142,6 +142,8 @@ export default definePlugin({
     name: "ShowBadgesInChat",
     authors: [Devs.Inbestigator, EquicordDevs.KrystalSkull],
     description: "Shows the message author's badges beside their name in chat.",
+    dependencies: ["MessageDecorationsAPI"],
+    tags: ["Appearance", "Chat"],
     settings,
     renderMessageDecoration(props) {
         return props.message?.author ? <ChatBadges author={props.message.author} /> : null;
diff --git a/src/equicordplugins/showMessageEmbeds/index.tsx b/src/equicordplugins/showMessageEmbeds/index.tsx
index d224923d3..d503c2f77 100644
--- a/src/equicordplugins/showMessageEmbeds/index.tsx
+++ b/src/equicordplugins/showMessageEmbeds/index.tsx
@@ -193,6 +193,7 @@ function showFailureToast(message: string) {
 export default definePlugin({
     name: "ShowMessageEmbeds",
     description: "Adds a context menu option to show embeds for links that don't have one",
+    tags: ["Appearance", "Chat"],
     authors: [EquicordDevs.Suffocate],
 
     patches: [
diff --git a/src/equicordplugins/showResourceChannels/index.ts b/src/equicordplugins/showResourceChannels/index.ts
index d3ca76589..ecf2132f1 100644
--- a/src/equicordplugins/showResourceChannels/index.ts
+++ b/src/equicordplugins/showResourceChannels/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "ShowResourceChannels",
     description: "shows the channels hidden behind the server resources in the channel list",
+    tags: ["Servers"],
     authors: [EquicordDevs.VillainsRule],
     patches: [
         {
diff --git a/src/equicordplugins/showSongName/index.tsx b/src/equicordplugins/showSongName/index.tsx
index 96cdd5ae7..29716e129 100644
--- a/src/equicordplugins/showSongName/index.tsx
+++ b/src/equicordplugins/showSongName/index.tsx
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "ShowSongName",
     description: "Shows song name instead of artist for Spotify activity",
+    tags: ["Activity"],
     authors: [Devs.prism],
 
     patches: [
diff --git a/src/equicordplugins/sidebarChat/index.tsx b/src/equicordplugins/sidebarChat/index.tsx
deleted file mode 100644
index 7b88e2603..000000000
--- a/src/equicordplugins/sidebarChat/index.tsx
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import "./styles.css";
-
-import { NavContextMenuPatchCallback } from "@api/ContextMenu";
-import { HeaderBarButton } from "@api/HeaderBar";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import { classNameFactory } from "@utils/css";
-import { getCurrentChannel } from "@utils/discord";
-import definePlugin from "@utils/types";
-import { Channel, Guild, User } from "@vencord/discord-types";
-import {
-    DefaultExtractAndLoadChunksRegex,
-    extractAndLoadChunksLazy,
-    findByPropsLazy,
-    findComponentByCodeLazy,
-    findCssClassesLazy,
-    findStoreLazy
-} from "@webpack";
-import {
-    ChannelRouter,
-    ChannelStore,
-    FluxDispatcher,
-    GuildStore,
-    Menu,
-    MessageActions,
-    MessageStore,
-    PermissionsBits,
-    PermissionStore,
-    PopoutActions,
-    RelationshipStore,
-    SelectedChannelStore,
-    SelectedGuildStore,
-    useCallback,
-    useEffect,
-    useLayoutEffect,
-    UserStore,
-    useState,
-    useStateFromStores
-} from "@webpack/common";
-
-import { settings, SidebarStore } from "./store";
-
-const cl = classNameFactory("vc-sidebar-chat-");
-
-const HeaderBar = findComponentByCodeLazy("toolbarClassName:", "}),onDoubleClick:");
-const ForumView = findComponentByCodeLazy("sidebarState");
-
-const ArrowsLeftRightIcon = ({ color, ...rest }) => {
-    return (
-        <svg
-            aria-hidden="true"
-            role="img"
-            xmlns="http://www.w3.org/2000/svg"
-            fill={color}
-            viewBox="0 0 24 24"
-            {...rest}>
-            <path d="M2.3 7.7a1 1 0 0 1 0-1.4l4-4a1 1 0 0 1 1.4 1.4L5.42 6H21a1 1 0 1 1 0 2H5.41l2.3 2.3a1 1 0 1 1-1.42 1.4l-4-4ZM17.7 21.7l4-4a1 1 0 0 0 0-1.4l-4-4a1 1 0 0 0-1.4 1.4l2.29 2.3H3a1 1 0 1 0 0 2h15.59l-2.3 2.3a1 1 0 0 0 1.42 1.4Z" />
-        </svg>
-    );
-};
-
-const WindowLaunchIcon = findComponentByCodeLazy("1-1h6a1 1 0 1 0 0-2H5Z");
-const XSmallIcon = findComponentByCodeLazy("1.4L12 13.42l5.3 5.3Z");
-const Chat = findComponentByCodeLazy("filterAfterTimestamp:", "chatInputType");
-const Resize = findComponentByCodeLazy("sidebarType:", "RESIZE_HANDLE_WIDTH)");
-const ChannelHeader = findComponentByCodeLazy(".GUILD_ANNOUNCEMENT", "`channel-");
-const PopoutWindow = findComponentByCodeLazy("Missing guestWindow reference");
-const FullChannelView = findComponentByCodeLazy(/showFollowButton:\i\?\.type===/);
-const WanderingCubesLoading = findComponentByCodeLazy('="wanderingCubes"');
-
-const ChatInputTypes = findByPropsLazy("FORM", "NORMAL");
-const Sidebars = findByPropsLazy("ThreadSidebar", "MessageRequestSidebar");
-const ChatClasses = findCssClassesLazy("threadSidebarOpen", "loader");
-
-const ChannelSectionStore = findStoreLazy("ChannelSectionStore");
-
-const requireChannelContextMenu = extractAndLoadChunksLazy(
-    ["&&this.handleActivitiesPopoutClose(),"],
-    new RegExp(DefaultExtractAndLoadChunksRegex.source + ".{1,250}hasActiveThread")
-);
-
-const requireForumView = extractAndLoadChunksLazy(
-    ["Missing channel in Channel.renderHeaderToolbar"],
-    new RegExp(DefaultExtractAndLoadChunksRegex.source + '.{1,150}name:"ForumChannel"')
-);
-
-const MakeContextMenu = (id: string, guildId: string | null) => {
-    return (
-        <Menu.MenuItem
-            id={`vc-sidebar-chat-${id}`}
-            label={"Open Sidebar Chat"}
-            action={() => {
-                FluxDispatcher.dispatch({
-                    // @ts-ignore
-                    type: "VC_SIDEBAR_CHAT_NEW",
-                    guildId,
-                    id,
-                });
-            }}
-        />
-    );
-};
-
-const UserContextPatch: NavContextMenuPatchCallback = (children, args: { user: User; }) => {
-    const checks = [
-        args.user,
-        args.user.id !== UserStore.getCurrentUser().id,
-    ];
-    if (checks.some(check => !check)) return;
-    children.push(MakeContextMenu(args.user.id, null));
-};
-
-const ChannelContextPatch: NavContextMenuPatchCallback = (children, args: { channel: Channel; }) => {
-    const checks = [
-        args.channel,
-        args.channel.type !== 4, // categories
-        PermissionStore.can(PermissionsBits.VIEW_CHANNEL, args.channel),
-    ];
-    if (checks.some(check => !check)) return;
-    children.push(MakeContextMenu(args.channel.id, args.channel.guild_id));
-};
-
-export default definePlugin({
-    name: "SidebarChat",
-    authors: [Devs.Joona],
-    description: "Open a another channel or a DM as a sidebar or as a popout",
-    patches: [
-        {
-            find: 'case"pendingFriends":',
-            group: true,
-            replacement: [
-                {
-                    match: /if\(null!=.{0,50}ROLE_SUBSCRIPTIONS/,
-                    replace: "const vc_SidebarChat=$self.renderSidebar();$&"
-                },
-                {
-                    match: /return(\(0,\i\.jsxs?\)\(\i\.\i,{}\))}/,
-                    replace: "return [$1, vc_SidebarChat]}"
-                },
-                {
-                    match: /(case \i\.\i.+?return)(.+?);(?=.+?params\.messageId)(?<=guild_products".+?)/g,
-                    replace: "$1[$2, vc_SidebarChat];",
-                    predicate: () => settings.store.patchCommunity
-                }
-            ]
-        },
-    ],
-
-    settings,
-
-    contextMenus: {
-        "user-context": UserContextPatch,
-        "channel-context": ChannelContextPatch,
-        "thread-context": ChannelContextPatch,
-        "gdm-context": ChannelContextPatch,
-    },
-
-    toolboxActions: {
-        "Open Previous Chat"() {
-            FluxDispatcher.dispatch({
-                // @ts-ignore
-                type: "VC_SIDEBAR_CHAT_PREVIOUS",
-            });
-        }
-    },
-
-    renderSidebar() {
-        const { guild, channel /* width*/ } = useStateFromStores(
-            [SidebarStore, GuildStore, ChannelStore], () => {
-                const { channelId, guildId } = SidebarStore.getState();
-                return {
-                    guild: GuildStore.getGuild(guildId),
-                    channel: ChannelStore.getChannel(channelId)
-                };
-            }, []
-        );
-
-        const [channelSidebar, guildSidebar] = useStateFromStores(
-            [ChannelSectionStore, SelectedChannelStore, ChannelStore], () => {
-                const currentChannelId = SelectedChannelStore.getChannelId();
-                const currentGuildId = SelectedGuildStore.getGuildId();
-                return [
-                    ChannelSectionStore.getSidebarState(currentChannelId),
-                    ChannelSectionStore.getGuildSidebarState(currentGuildId),
-                ];
-            }, []
-        );
-
-        useEffect(() => {
-            if (!channel?.id || MessageStore.getLastMessage(channel.id)) return;
-            MessageActions.fetchMessages({
-                channelId: channel.id,
-                limit: 50,
-            });
-        }, [channel?.id]);
-
-        const [width, setWidth] = useState(window.innerWidth);
-
-        useLayoutEffect(() => {
-            const handleResize = () => setWidth(window.innerWidth);
-
-            window.addEventListener("resize", handleResize);
-            return () => window.removeEventListener("resize", handleResize);
-        }, []);
-
-        const [View, setViewComponent] = useState<React.ReactNode>(null);
-
-        useEffect(() => {
-            if (!channel) return;
-
-            if (channel.isForumLikeChannel()) {
-                requireForumView().then(() => {
-                    setViewComponent(
-                        <ForumView
-                            channel={channel}
-                            guild={guild}
-                            sidebarState={null}
-                        />
-                    );
-                });
-
-                setViewComponent(
-                    <div className={ChatClasses.loader}>
-                        <WanderingCubesLoading />
-                    </div>
-                );
-            } else {
-                setViewComponent(
-                    <Chat
-                        channel={channel}
-                        guild={guild}
-                        chatInputType={ChatInputTypes.SIDEBAR}
-                    />
-                );
-            }
-        }, [channel]);
-
-        if (!channel || channelSidebar || guildSidebar) return null;
-
-        return (
-            <ErrorBoundary noop>
-                <Resize
-                    sidebarType={Sidebars.MessageRequestSidebar}
-                    maxWidth={~~(width * 0.31)/* width - 690*/}
-                >
-                    <Header channel={channel} guild={guild} />
-                    {View}
-                </Resize>
-            </ErrorBoundary>
-        );
-    },
-});
-
-const Header = ({ guild, channel }: { guild: Guild; channel: Channel; }) => {
-    const recipientId = channel.isPrivate() ? channel.getRecipientId() as string : null;
-
-    const name = useStateFromStores([UserStore, RelationshipStore], () => {
-        if (!recipientId || channel.name) return channel.name;
-
-        const user = UserStore.getUser(recipientId);
-        return RelationshipStore.getNickname(recipientId) || user?.globalName || user?.username;
-    }, [recipientId, channel.name]);
-
-    const parentChannel = useStateFromStores(
-        [ChannelStore], () => ChannelStore.getChannel(channel?.parent_id),
-        [channel?.parent_id]
-    );
-
-    // @ts-ignore
-    const closeSidebar = () => FluxDispatcher.dispatch({ type: "VC_SIDEBAR_CHAT_CLOSE", });
-
-    const openPopout = useCallback(async () => {
-        await requireChannelContextMenu();
-        PopoutActions.open(
-            `DISCORD_VC_SC-${channel.id}`,
-            () => <RenderPopout channel={channel} name={name} />,
-            {
-                defaultWidth: 854,
-                defaultHeight: 480,
-            }
-        );
-    }, [channel, name]);
-
-    const switchChannels = useCallback(() => {
-        const mainChannel = getCurrentChannel()!;
-        FluxDispatcher.dispatch({
-            // @ts-ignore
-            type: "VC_SIDEBAR_CHAT_NEW",
-            guildId: mainChannel.guild_id,
-            id: mainChannel.id,
-        });
-        ChannelRouter.transitionToChannel(channel.id);
-    }, [channel.id]);
-
-    return (
-        <HeaderBar
-            toolbar={
-                <>
-                    <HeaderBarButton icon={ArrowsLeftRightIcon} tooltip="Switch channels" onClick={switchChannels} />
-                    <HeaderBarButton icon={WindowLaunchIcon} tooltip="Popout Chat" onClick={openPopout} />
-                    <HeaderBarButton icon={XSmallIcon} tooltip="Close Sidebar Chat" onClick={closeSidebar} />
-                </>
-            }
-        >
-            <ChannelHeader
-                channel={channel}
-                channelName={name}
-                guild={guild}
-                parentChannel={parentChannel}
-            />
-        </HeaderBar>
-    );
-};
-
-const RenderPopout = ErrorBoundary.wrap(({ channel, name }: { channel: Channel; name: string; }) => {
-    // Copy from an unexported function of the one they use in the experiment
-    // right click a channel and search withTitleBar:!0,windowKey
-    return (
-        <PopoutWindow
-            withTitleBar
-            windowKey={`DISCORD_VC_SC-${channel.id}`}
-            title={name || "Equicord"}
-            channelId={channel.id}
-            contentClassName={cl("popout")}
-        >
-            <FullChannelView providedChannel={channel} />
-        </PopoutWindow>
-    );
-});
diff --git a/src/equicordplugins/sidebarChat/store.ts b/src/equicordplugins/sidebarChat/store.ts
deleted file mode 100644
index b91591f5e..000000000
--- a/src/equicordplugins/sidebarChat/store.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { definePluginSettings } from "@api/Settings";
-import { proxyLazy } from "@utils/lazy";
-import { OptionType } from "@utils/types";
-import { Flux as TFlux } from "@vencord/discord-types";
-import { ChannelActionCreators, Flux as FluxWP, FluxDispatcher } from "@webpack/common";
-
-interface IFlux extends TFlux {
-    PersistedStore: TFlux["Store"];
-}
-
-export const settings = definePluginSettings({
-    persistSidebar: {
-        type: OptionType.BOOLEAN,
-        description: "Keep the sidebar chat open across Discord restarts",
-        default: true,
-    },
-    patchCommunity: {
-        type: OptionType.BOOLEAN,
-        description: "Patch things like the Channel Browser or Members tab that community servers have.",
-        default: true,
-        restartNeeded: true,
-    }
-});
-
-export const SidebarStore = proxyLazy(() => {
-    const current = {
-        guildId: "",
-        channelId: "",
-        width: 0
-    };
-
-    let previous = { ...current };
-
-    class SidebarStore extends (FluxWP as IFlux).PersistedStore {
-        static persistKey = "SidebarStore";
-
-        // @ts-ignore
-        initialize(previousState: { guildId?: string; channelId?: string; width?: number; } | undefined) {
-            if (!settings.store.persistSidebar || !previousState) return;
-            const { guildId, channelId, width } = previousState;
-            current.guildId = guildId || "";
-            current.channelId = channelId || "";
-            current.width = width || 0;
-        }
-
-        getState() {
-            return current;
-        }
-    }
-
-    const store = new SidebarStore(FluxDispatcher, {
-        // @ts-ignore
-        async VC_SIDEBAR_CHAT_NEW({ guildId: newGId, id }: { guildId: string | null; id: string; }) {
-            previous = { ...current };
-
-            current.guildId = newGId || "";
-
-            if (current.guildId) {
-                current.channelId = id;
-                store.emitChange();
-                return;
-            }
-
-            current.channelId = await ChannelActionCreators.getOrEnsurePrivateChannel(id);
-            store.emitChange();
-        },
-
-        VC_SIDEBAR_CHAT_PREVIOUS() {
-            if (previous.channelId) {
-                current.guildId = previous.guildId;
-                current.channelId = previous.channelId;
-            }
-            store.emitChange();
-        },
-
-        VC_SIDEBAR_CHAT_CLOSE() {
-            previous = { ...current };
-            current.guildId = "";
-            current.channelId = "";
-            store.emitChange();
-        },
-    });
-
-    return store;
-});
diff --git a/src/equicordplugins/sidebarChat/styles.css b/src/equicordplugins/sidebarChat/styles.css
deleted file mode 100644
index 34c367130..000000000
--- a/src/equicordplugins/sidebarChat/styles.css
+++ /dev/null
@@ -1,7 +0,0 @@
-[class*="content"] > [class*="page"] > * {
-    min-width: 0;
-}
-
-.vc-sidebar-chat-popout {
-    align-items: stretch;
-}
\ No newline at end of file
diff --git a/src/equicordplugins/signature/index.tsx b/src/equicordplugins/signature/index.tsx
index 1a7d28605..e09edf3e5 100644
--- a/src/equicordplugins/signature/index.tsx
+++ b/src/equicordplugins/signature/index.tsx
@@ -100,6 +100,8 @@ const ChatBarContextCheckbox: NavContextMenuPatchCallback = children => {
 export default definePlugin({
     name: "Signature",
     description: "Automated fingerprint/end text",
+    dependencies: ["CommandsAPI", "ChatInputButtonAPI", "MessagePopoverAPI"],
+    tags: ["Appearance", "Chat"],
     authors: [Devs.Ven, Devs.Rini, Devs.ImBanana, EquicordDevs.KrystalSkull],
     onBeforeMessageSend(channelId, msg) {
         if (!settings.store.isEnabled) {
diff --git a/src/equicordplugins/silenceUsers/index.ts b/src/equicordplugins/silenceUsers/index.ts
new file mode 100644
index 000000000..5d926254c
--- /dev/null
+++ b/src/equicordplugins/silenceUsers/index.ts
@@ -0,0 +1,69 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { EquicordDevs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { FluxDispatcher } from "@webpack/common";
+
+const settings = definePluginSettings({
+    mutedUserIds: {
+        type: OptionType.STRING,
+        description: "Comma-separated Discord user IDs to silence pings and server badges.",
+        default: "",
+        restartNeeded: false,
+    },
+});
+
+function getMutedIds(): Set<string> {
+    const { mutedUserIds } = settings.store;
+    const ids = mutedUserIds.split(",").map(id => id.trim()).filter(Boolean);
+    return new Set(ids);
+}
+
+function interceptor(event: any) {
+    try {
+        const mutedIds = getMutedIds();
+        if (!mutedIds.size) return;
+
+        if (event.type === "MESSAGE_CREATE" || event.type === "MESSAGE_UPDATE") {
+            const msg = event.message;
+            if (!msg) return;
+
+            const authorId = String(msg.author?.id ?? "");
+            if (!authorId || !mutedIds.has(authorId)) return;
+
+            msg.mention_everyone = false;
+            msg.mention_roles = [];
+            msg.mentions = [];
+        }
+
+        if (event.type === "NOTIFICATION_CREATE") {
+            const msg = event?.message ?? event?.notification?.message;
+            if (!msg) return;
+
+            const authorId = String(msg?.author?.id ?? "");
+            if (!authorId || !mutedIds.has(authorId)) return;
+
+            return false;
+        }
+    } catch { }
+}
+
+export default definePlugin({
+    name: "SilenceUsers",
+    description: "Silences @mention pings and server badge counts from specific users. Regular messages and DMs are untouched.",
+    authors: [EquicordDevs.dka],
+    settings,
+    start() {
+        FluxDispatcher.addInterceptor(interceptor);
+    },
+    stop() {
+        const list = FluxDispatcher._interceptors ?? [];
+        const idx = list.indexOf(interceptor);
+        if (idx !== -1) list.splice(idx, 1);
+    },
+});
diff --git a/src/equicordplugins/snowfall/index.tsx b/src/equicordplugins/snowfall/index.tsx
index 7f103e9f4..abba96ae3 100644
--- a/src/equicordplugins/snowfall/index.tsx
+++ b/src/equicordplugins/snowfall/index.tsx
@@ -450,7 +450,8 @@ let container: HTMLDivElement | null = null;
 
 export default definePlugin({
     name: "Snowfall",
-    description: "Let it snow on Discord! Ported from the BetterDiscord plugin by square.",
+    description: "Let it snow on Discord",
+    tags: ["Appearance"],
     authors: [EquicordDevs.ZcraftElite, EquicordDevs.square],
 
     settingsAboutComponent: () => (
diff --git a/src/equicordplugins/soggy/index.tsx b/src/equicordplugins/soggy/index.tsx
index a622197d9..099e94792 100644
--- a/src/equicordplugins/soggy/index.tsx
+++ b/src/equicordplugins/soggy/index.tsx
@@ -137,9 +137,10 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "Soggy",
     description: "Adds a soggy button to the toolbox",
+    tags: ["Fun"],
     authors: [EquicordDevs.sliwka],
     settings,
-    dependencies: ["AudioPlayerAPI"],
+    dependencies: ["AudioPlayerAPI", "HeaderBarAPI"],
 
     headerBarButton: {
         icon: () => (
diff --git a/src/equicordplugins/songLink.desktop/Providers.ts b/src/equicordplugins/songLink.desktop/Providers.ts
index 095fb27d2..b8baee643 100644
--- a/src/equicordplugins/songLink.desktop/Providers.ts
+++ b/src/equicordplugins/songLink.desktop/Providers.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-const Providers = {
+export const Providers = {
     amazonMusic: {
         name: "Amazon Music",
         logo: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABHNCSVQICAgIfAhkiAAAFVhJREFUeJztXXt8VcWd/87NCXlyCQlE3klQrBR8rGICaOURwCq+WNFSKostWrVVqVtbdt3uVrcVrd3uVtaya7UG20+7CyIKWKEUAQGDiCIgFEEhlIcJjwTIOze5d/rHmec55z5yEyHHzO/zSc48ft/5zZn53d9vzsycOQQKlYLOJsBvAKTA0BeRwhSY8xbIyzyB8MAk0GYAaeelWobONbWsBUkHmAKYzu+W1LIWJD1QCjobpvO7I6WVgs4mk0DbYHx+d6VwAKbzuzOlBM53DQydXzIK0M3JKEA3J6MA3ZyMAnRzMgrQzckoQDcnowDdnIwCdHMyCtDNyShANyejAN2cjAJ0czIK0M2JKQAFQEFBIeNgcaqwO8NUCxu8//AWSASUpRMGIgLMWe00EAJKIyAEoJTtJyPU4H2Mt1StoGyLKKWiNDuN2lzEoUEURO4qNXhf4m0FIDyDqwZDOa4UxNY4dhWSDN63eFJKWlS1SIBYoUmTwXclvCV9iG1QKCB8hJbGsJRSls8MkBevwfsGr7kAOYBQFIXnUVkINzuyEgbvV7wFRKCSZlyIElfCYoRJXAiD9xnecj8rMtWRdoSFoaRLUYrOGbwP8RZIhJkKhme2grIrAYTfsDMikpdVweD9i7cAKp4fAUVBVCGEy7B5bR2zUwhg8D7GW/J5EpwFwow442IKiUuJ6KbG4H2Ht6hqEkRBlNsOlsf8DQNTZeBIBY/B+xFvyVkkaGaDAiCE6olKYXDmGbwv8fYYgCeCGwuiGA+ZSwgRz5786YFoHAbvN7wcAzA3QZl2aK4C0AOEyrhqagzed3iLgo8BWCHcZBDVvxA7zni4EBtFDN7HeNdMoKIqoiyHukXnN3gtvr61nwhv+WMzHpt29pzKTwRvcXNAoSgQlTC+omiHFdPCeLR8gxf4yTPTtYYeMzUdIKe7XP3ZRJBiThQOQuzBAhEIbm64IDvN4N34SMT5y2Rd0sXqH7CfCSn7izDfEGG+ws6jSpzwOOM1eG/82sVNtg9mtH5pY5esPxmXdlh9iohN3LyorsTLLRm8b/ByP4BwIpLJtiY2tz2glCVwrRHr0QbvS7wFROwgBwPi+dG+2guOPJ8SCgLFl/GiDN6XeEu3/1w7ZAygoKxEe0ABNoLkuXZJWUGCqydnABTYsKxRw0+e2RPffSYXOX3kiXRNDRHMnVSJfR+GXPJvva8nvv2TXGQF5XsrDXU2/6e7Qp7yAWDctEwQNgDb+Hpj3PpfOSEDwd52ncrfbESoOeJ5/z0yApi/9AKMKs2ASuEwxYoX6vCredVobXG33xXj0hHMC4CAiPKjtR+XeO3NWZj5aC+MKJFPEYf2hvDqwlqseKEuLr69/UeuSz9A5TOFKMPbx4jVJJ5GWJhi8b4h6FeQCgBYu7gOP5l9Aj8qy8fkr/dELFr3Sj2emHUcAPDcugG4dGxGTP7332rE92+qdMm/+Mo0vFA+SPDNGH4YlRWtMev/dvOFgn/HpibMnfKZ6/4Xvj1Q64xotHllA/7lzioNr5a/q7wJD5VWRm2/B3+ehzseyokr54b8g2isoy48gKT6z+IjRkHEcdXC0nTY68rUzQtgwu3ZmPS12B3PaeId2di+oRGP/io/If5RpZkoGJ6KQ3tDmnyiLmoBIISPiKPXX+N35IMAiz4YjKIvJ3aK7kWX9XDh3eVHPNtvZWWRsETxqF+BhYO7Q9Hbv539Z/HNgeoIQt1JSl1xW5GIMClEe9wBgBRLSn9u3gksfe4sIhGJX/7XIvTOtwSP2vmL5lfjd0/XoLVVyn+tYijy+kn+hesGYmr/g5p856OM3cE0Zv01fnBvavOnphOt8/+yrQkPXHdU4LlJzQoGMOff8tDUQDW8o3ghxdl+v91e4Or89/7cgBefqMa+7S2glCKnTwqu/0YQdz7UG8cOhABCPdo/uf6T+wGUTnR2LGVLh1RMLvAmg74erdCDpYexq7zJjhBbKsffWngQGxsv1vjnTTuKLasbRFyVP23oAWxs/JLIy85JAV/TlvIdFgBU8sSov9o5fFqcguLex/tqufePO2I3rgPfUBvGgh+c0IoTky96hUAR0fAXDLZQOFy3MOMy94nRO7//M9VtWLzgNBY/WxO9/ZPsP8ttJqEXzHkJZTfhze+M7ypvjImnEQoSkKAtf6rXynDKD7dRzbK4fsKOOIXiAhKtv1JG4fAeDoZIu+7faRVt80s1fNm2Qo3jxv77IRZsOtj+ieID3PjJXwALk4iMq2Htqs5COSsUG191uNXdQDHkHz0QcvA75Uf7Rceqv5Nkeft3NnvcT6z796q/k3R8di9p+sNhivqzbVHvP377J9d/ATmdqEwbIsI0kTFyzRVXzsvTIpoJAsuNhW9rc3ZYbPlhF79DvlMBSPz6uztHyn/ppye03I0NX8bUu3tFv3+v+jtKV+VnZOvS31h0umPtn2T/BbippA4mwgaHtv9g6TRip4OCEmUu2mmOgbh4J8WV7+J3yvdQkHj1dyOE/HBbBLu2NGj58xYOwKbGEfiP5UNgpVFNvlf93fWR8q8cn6Xllq+q61D7J9t/iguIyF8GibCCda0irsUH+ee+3Xh4J8WT7+4uXX7EkZtI/R3lOeR/d9IBlK+qdUkuntQT606PxKaGkbhmanb09nOQKr9/YaqWd/KzUIfaP9n+C+j+QTWP7jj18oOEFx6lg6Li4/O7405+Kd9thRKpv0cdHPLn3VGB0rxd+GRXkwc/8PSSQqw/MzKB+kKTn2LpeeFwxAOfePsn238BoSHMVNijR2lOhPkQvzQq/Ku63Ogc9MbFOymOfC9+bbnT8xcdu/5u8pYfaongm2P24SvZO/CvsyoQDutYK5VgU8PlbryzPor86ip9UJs/0OpQ+yfbfwHpNyKaX+Hmwmk+CBfkGFy4Z+Ji450dFk++u6t0+V6PhXHr7+z8BO5/w2tnML7XDozv/SFqT7dpJUyd3VvDe9WZy//ovXotb9TE7A61f7L9F3CZDNevig0amJkXgji/54gaCeDdiFjyo/JzP+cwQWkZkid6/b3KTOz+21ojuHHwTg09Y26+A6+Tiq881KLl3XZP33bJj2ry24nX5wHE/LnT/Kq/Gqcf4abHebfx8B6NH1O+k3T5ba16g19yVWYC9XfWuf33f/KYNOW5+akx3FZs+WnpAaSme7Rbgu2fbP8FpOnjvyReiDrAUkeYPE/xQcRrEBgH79X4MeV7m3gu/1iFPkh7cP7gmPJv+VYfVwclc/99B8oZw91b63W8i3T8E3MOaLlrj1+ZdPsn238BuU9M9ydQ0zQNUswy9ytRftGx8NG4o8t386vymxrDWn6wt4X7/32QS/6dD16AzXXF+OGCophlrjs5Cj9/9WIMHpYW9f4XrrlEwz8zt0Krv7t8Hb9mySlt82hKCsE79cV4cP4gpGcS7f5LJgfx6/XDcfk12Z7tn2z/WXzCAADsRQV7qUiYdGVRgSgLOnyXKeHz1p43GwPvaqBIXPkufof8ir2NKBqeKTjuemQA7npkgAc2CpGIkN8jPYAxU3IwZkr8NXoAqDzcjJOVzQAc9RckJ2fU9rsuZys2147WOGc81B8zHurvKefS0dnYWV7r3f5J9J94CpA+QzEVirkQGqSNvNUpR7eJjol3UgLy3eUr8gnFXSU7oiiLTmuWnMQ1wXJsW38mqvzjR1uiwV20f2c9po/c7q6/g6K13zXBcpw4lpi8Iwcavds/yf4jY3tupnbjeqzpJkwUgy7MwJQ77SXUU5UhrFh0PCZiQFEavjrD3gdQXRXC8rLY/P2GpOHGb9j8NSda8fpvqjT5av1/+OyFuPWb/TR8uI1i4Y8P4f//+zORlppGMOsf7V1Ey8uqUF2lL1ClWARzny7CtHv6IRBwt8/e7XWYe8seNNS2wav9pt/XH8Fce8ZnRdlxnKpyLmjp9U+xCOb+rAi33t0PVqosL9xG8XpZFZ6dV+GxJuK+//YQGdtzE4Xym+RvjhKH6QDjUsOc3+D9i5dnBfOtQmwdWV1P9j5vhhM1eB/j7V3BaoHEcVXClIWpiBGRZvD+xLvOCJL+hDpKoJC7SvkoUg0bvB/xFj82jAIA5fvGlf3jROiZ8ggXkT6HmxyD9yXe3hVsZ7OCCLtSZjrkNA9h6XYy1zQYvI/xHieFqmE9Ls+e5yaGKmGD7wx83/49UDwhD0XDs5GTlwoCoOZkCJ/uqUP5mlOoO9PWqfL1k0K9XIlXuYQqvNTgO4BPywhg/suXY+wUfRt6LDpZ2Yxbhm/sFPn2aiBbNKBi0YXNGFFl9cg5q6QsMPQbkoble65DRnYgKXxH5fsRn3tBKjaemIQNlaXt6nwA6Ns/HRNvy++U+lvqgMBWFG4guA9hYQD2JENEKJatZBQ5fVORPyAd645Owqd7ajHr2nfahe+ofL/hn/7d32H8TfpMZXtpyLBMJqtj9bdUc8C45MQClX7DzqNKGmMiwN7tZ3DfjVvw/JtjcNGIILacvgHrVlTisdkfJoTvqHy/4TOzUvDnZZ9h19bT+MsHZ/DJ7jqEWiICr5r0S0ty8OzSYmRm65sIT59ssRk6WH9S0vsN1aFBe04kSm2cccCRBuTkpWH1J5O1iq5ecgyP378jIXxH5X+R8e/WTNXadebYt3Fwb12H5ZOS3iuE/ihZnnEhRFM5N//m41NhperfpHxvw0k8fPu7DpX0xndU/hcR/27NzRrv6NyVnSI/wJcH1Y0FEFfHxgK+2UDd9OCBv/aCN7D7/RpNbPH4vni3+masOTgF/Yakx8R3VL5f8ZlZATzz+1H4h0cudOHdnd058klJ7uuUgurqovgQNU3dUKBtMoiCHz0hH88uHeuqPKey/9yH55/8OCq+o/L9gp92dwHm/eIKrW0mFryBhro2gd9afZvIO3KgHtOvXts58ktyl4mZ5GQoukFj+QTYcOQWpGdEPwAh1BLGj+7ZhrffrOx0+V0VP2xkEE+VlWDw0GzP/JK810T4suJcvLBqnIjf89W38dG2mg7J50SKc19leGUgIYilsTVkpkYyrPHHxk//1lD84Bldy72osaENTz78Ada+fqxT5XcF/NBLeuKpstEovDj66Skf7zyN2RPXa/jn/zgOV4yWm1hL8pZ1Wv1Jcd4r4oAJwtP5owTHUpYnTIiaBrQHv3LXDcgfIPftxaNlZQfxv0/txtnqUKfIP5d4QoDZc7+Eb//TCNeg2IvmXL/OHjs55G89NV3wrFryVzz+nW2dVn9SnLdEcwFOk+J4yNDcSzz+aPghQ7Ox9L0b4jaIkyIRipV/OITFz+/Hp3trk5bf0fpHw2dkWpj5wDDMfOBi9MxxHjARncrXVuJ7MzZ7ys/J7YE1+28V8eI+r3Ru/Yv7LKZyI6WTJcpVMSP6GUHtw0/5+8H46a/HJNpOnhRqCWP1q4excdUxlK+tZC+IfP71LxoWxPW3D8b10wswsMDbj8ejmlPNmDpyJcJt/B0Ct7wX35yIy4pt87/4hf34xT9/2GntD1CQq/P+z72gBEjbwcsFL4Mxx1K7duLvvHcYHn3qqrgN1l5qDYXx6d6zOPix/Vd1tBGnqppwoqoJDWdDaG6JINTUhkBKAFnZFjJ7piIz20JObhoKLgpiyIXZKBgWROGwYNKd7EV1Z0O45YqVaKhjm1BjtN97p2YAACilKOm7uNPbn1zd5w9OKBPIeCF1pz2UDH7C1EH42aKvtFOSf6hi/1nMmrhaTvvGIEqBMRP7Y8GS8QCAawctTgin4hNpf3J1n9/b8wBMjdT/gK5cYscp5BKE+nWazsIHc9Pw8prrMbAgsbMGuzq99F+78T/zd7a7/co/+zpSUwO4ffRKHD5Q+7m0v7In0E5Q/6sjTCmDQl8PR6fjz9Y047ZRywEC3HhHEX68YCwCKe21QeeXdmw9ge/P2oDa0yH582tn+1Ueqce9N61BzanmpPCJtD8Z1fe30gWIhQQVFM2AqDU4N/ibvjYU854pQXqG43iNLkIbVh3Gk4+8izPVLV2y/bzwZFTfRZ5jAG+K99Bx7vC9ctPwnceuxG13DfN8a+dc0O4PTuKlX36ETX86kiCi67Qfj5NR+WXau4XcbAgFUgeTjjw4888zfsyEASi9uRATby5AsFdiZ/wmSu+/U4W3VlRg9bIK1J8Ndcn7Two/Kv8lKt8i4Rz2VSw0wDYr6jIzBSSPD/CZWRaGDA1iYEEQ2cFUZGalIiPLAqVAc2MrGupbcfxYI6qO1ePwwVr7JNMuVP/PDX9V/otRbEg0c5Oo2TF4P+DdW8IEORO57XDakGj1MXg/4C0eouAvDRJmJii72nbD1h3v51CD9y/e8d1AqSkU3Fc43kYVBxEoumXwvsVb+nFm3EfImH5V3jljvPp2JYP3G15/O1iME6jiY4iSz0ecxIExeL/i5XcDORGlMACaSRGmg4pPsojv1hm8L/HshBDddAhFUq5KcbqR4Vpl8L7E298MElk2nGoFg23lZyNIQhQfAsjNCAbvR7ycB1BNhl2yTKMQpkU9ewYqxOB9ibe4j3CVRGKH7edJ2OkG71u88t1AWYjwHXwyAVDMBwUhVBoOAoP3Md6eB9BMBbMe7AoivYvYUqyJc5oag/cTnk0FsyReEGci/B/PV1aXtI0GBu9XvK4AnqTkaQtHHEdg8P7Fi3kAeYSoNB/qHLL0JbZvEWlsDGHw/sSzk0Kp4kvU50U7zU5W0rkGEYAyc2Lw/sRb7i9b8GxeoEzhZ8x48Ru8P/H6hhB1TEEcV8BedhRpLKC6IIP3HV7sBxBYCuV5kRfMJw5sc8OFUcq0yuB9ixf7AYQhIYBYNxZJfHKBFQK2Ck1EyOB9ildcgGJHmHZIuB3WdqC6TJDB+xEv9wNw38ALEj6EOxCpbTKTV8Lg/YoXJ4Vyf0FVLPchHCOulJkaqV8G70+8OC2cKpzcV6img2uQ85sz0rsYvB/xFnF8M4hPGanvi/Gw7UP0r4QSUIP3Mb6d3wySpkMaIG9eg/cHPs43g6Jc+WSzFjZ4P+LlN4OorRUE3FeopoPpDF908PpmjcH7Ei+/GSS2CtnklWaPH9isk7IebfD+xTu+GcSvKsm0+N+8MXi/4S0gEgbgfZCv04WIdCrj2iYDg/cVniJsUULnENBFFDYTP1SAQF1PJrafAfchEC8k8gUGg/chnpA5BABGFH6vGaCeZ6qoyiNfL1bToiugwXdlPGnZc+iX6YQzjih8uBlAmttceEgjgHsxIkqNDL4r4lv2VCxIBwBxhPWeQwvSAdwNGgnbI0T9E2Ti82PiSxXQ0/gny6gHzuC7BJ5QGgZwN+98APgb3jJqqjbvK5kAAAAASUVORK5CYII="
@@ -93,5 +93,3 @@ const Providers = {
         logo: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABHNCSVQICAgIfAhkiAAABsJJREFUeJztndtrHFUcx79bokVrRUGJQipSfbCtEC9tpWYjSBKxWglRkngHkV31Uekf0KcK4uVBQZKUBFqoJGlTrWLBhiLdtbQGa0VLfakiLYgoxmrFRhPHF6dsd+dy7pc5v89bZuac85v5fn+/cya7O1NCwSmPTkUy7evVoZKqWFykMCcnKzQvRTGGtydhWvA8fDWEV0G7JnoaPpnB+UB9ET0N183gbHC+C9+Mq0ZwLqiiCd+Ma0ZwJpiiC9+MK0awHkRowjdj2wjWBg9d+CaW6tWhNhsDWzEAiZ+MjWpgdEASng2TRjA2EInPhykTGBmExBfDhAm0DkDCq0GnEbR1TOKrRZcJtHRK4utBhwmUd0ji60W1CZR2RuKbQaUJlHVE4ptFlQmUdELi20GFCaQ7IPHtImsCqcYkvhvImEC4IYnvFqImWKY6EMIvhFxD2e8mIlWAuwGJ7za8JuA6mMT3Ax4T0BogcJidQtnvF6xVgKkCkPj+UR6Z+oPlOJoCikoJV7EdlgNlv9/kTQVUAQIn0x2U/cUgqwpQBQicVGdQ9heLtCpAFSBwEl1B2V9MkqoAVYDAaTEAZX9x6RqZmmveRhUgIEolrG/eRgYInEsWBVT+w6BxMUgVIHDIAIFzsRSYKv+1yqCJYZTTPTZtOwSlxNOA0QrwzoNlk8MJUTSh8zBqgM5VN5ocjmDAmAF8KP2hZT/wvwHo9i88Ys2NVADKfneh20AAY0eO2w7BGtoN4EP27zx52nYI1gi+AoRa+mO0PqHah+yXodzRjlc339eyXaWpVq1cgd2PP5S4T8U4JV13AJctW4ZDzz+mo2tlpF3AJOM2Hstq7A++OoXXP/9GKDbe5BEzQzSrbQpwXXxReITp71zDLeT+p7YIVc5aZRAbbriOs1WpV4sBXtmwTke3ShHJGNEpjbVdrTKIa6+8QmgMAHjzkfuxdePtXG20GGDgjrU6urVKlog//PqbVHsAeK3nntw+WMbp71yTe0wjyheBPiz8ZBdPx74/g62zRxP3beu+Cz233ZI8bkc7amd/Sty3afVNidv7xmdwYWkpcV/ata5VBpnPMfjbQF66x6ZTxQeAbbXjqRd/e8IdA5AuZPfYdKr48f5fzv+ZEW0+Sg0QQvabYvuhdJM1MvDex4nbWbUIqgKwzKFZ8JiH9RZzJuUe/8DpM+yBSaBsDeBD9j+996DtEFq4fuUK6T5kqlowFeCBiRmp9id//Jm7jagwJqcpJQbwIfv/WkxfTLHw4kefqgnEMYKoAL4s/GwgbQAfsp9IR8oAT65drSoObVD2ZyNlgJe67lYVB2EJYQO80bdJZRxaUJn9L997p7K+3CGabatXh4S+E7Dx5g4dETnLo+tuxVtHvuRqU+5oFxpr9rkB9E7sYz5+z/BmtF/d+lzIvASoV4f7hCqADws/F+b+pG8LsbC8je//c0nisxLEbaAqVBj/7Py5S/7WZVRtnwZS9rORdp2e2POJVHvR49IoXAXYPfe11v5rlcHcuZ1XlC073xfqJ23/KMfvHLgmGx+y/90T32ofI57bf7+wgId37QcAXLP8cnz4bH9mu7TKdG7hn9Q28TXn+VLqLo7fOXA9H8B1A6gq/WnfCpY5/57xvfh76V/ucXlhvQbczwdwXXwTLCwuCrV7u/5FrviAvIFF2hdmDWBi4dc7sQ/PTB3gatM9No2pU99xHT9+9ARvaMLnb/wRMUUiqyrqnI5isr6cmkc8BdBj4gKEHhNHXIQMEDgtjw+naaDYND8ynipA4JABAiKKoh3N2+iNIQFBbwwhWqC3hgUCvTWMSITeHBoA9OZQIhV6e3jBobeHE5nkVgCAqoCv5GU/wF4B5H5bTRgninCY5TimCgBQFfANluwHOAwAkAl8gVV8gBaBxSOK5nkO56oAAFUB1+HJfkDAAACZwFV4xQcEDQCQCVxDRHyA1gCFIIowKdpWuAIAVAVcQTT7AUkDAGQC28iIDygwAEAmsIWs+IAiAwBkAtOoEB9QaACATGAKVeIDig0AkAl0o1J8QIMBADKBLlSLD2gyAEAmUI0O8QGN/wjSFXBoRBEmdV5LIyJRNRDDRBIZy1IyAR+mKqixzwJoSmAkiuZNXisrolA1SMZGklj5NLBeHSohwnkbY7tIFOGwrQppvSyHXg1sT43WDRATmhFsCx/jRBCNFN0Irggf41QwjRTNCK4JH+NkUI10jUzNlUpYbzsOEaIo2vHZC8MV23Fk4bwBGvGlKria7Ul4E2gzrpnBJ9Eb8TLoJEwbwlfBmynESWRRHp08CJR6xVpHs/XqcJ/aiNziP6HlZPcye03NAAAAAElFTkSuQmCC"
     }
 };
-
-export default Providers;
diff --git a/src/equicordplugins/songLink.desktop/Settings.tsx b/src/equicordplugins/songLink.desktop/Settings.tsx
index 78bfd316a..8ba895ca6 100644
--- a/src/equicordplugins/songLink.desktop/Settings.tsx
+++ b/src/equicordplugins/songLink.desktop/Settings.tsx
@@ -8,7 +8,7 @@ import { FormSwitch } from "@components/FormSwitch";
 import { HeadingTertiary } from "@components/Heading";
 
 import { settings } from ".";
-import Providers from "./Providers";
+import { Providers } from "./Providers";
 
 export function Settings() {
     const blazinglyFastSettings = settings.use(["servicesSettings"]);
diff --git a/src/equicordplugins/songLink.desktop/SongLinker.tsx b/src/equicordplugins/songLink.desktop/SongLinker.tsx
index 87a212fb0..158baad3d 100644
--- a/src/equicordplugins/songLink.desktop/SongLinker.tsx
+++ b/src/equicordplugins/songLink.desktop/SongLinker.tsx
@@ -6,13 +6,11 @@
 
 import { BaseText } from "@components/BaseText";
 import { Card } from "@components/Card";
-import { findComponentByCodeLazy } from "@webpack";
+import { HeadphonesIcon } from "@components/Icons";
 import { Button, useEffect, useState } from "@webpack/common";
 
 import pl, { Native, settings, SongLinkResult } from ".";
-import Providers from "./Providers";
-
-const HeadphonesIcon = findComponentByCodeLazy("4.1-2.13h1.86A9");
+import { Providers } from "./Providers";
 
 export default function SongLinker({ url }: { url: string; }) {
     const [songData, setSongData] = useState<SongLinkResult>();
diff --git a/src/equicordplugins/songLink.desktop/index.tsx b/src/equicordplugins/songLink.desktop/index.tsx
index 2961f1bd7..f558083a0 100644
--- a/src/equicordplugins/songLink.desktop/index.tsx
+++ b/src/equicordplugins/songLink.desktop/index.tsx
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
 import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
+import { Devs, EquicordDevs } from "@utils/constants";
+import { sendMessage } from "@utils/discord";
 import definePlugin, { OptionType, PluginNative } from "@utils/types";
 
-import Providers from "./Providers";
+import { Providers } from "./Providers";
 import { Settings } from "./Settings";
 import SongLinker from "./SongLinker";
 
@@ -27,6 +29,11 @@ export const settings = definePluginSettings({
         description: "Country used for lookup (Two letter country code)",
         default: "US"
     },
+    includeMetadata: {
+        type: OptionType.BOOLEAN,
+        description: "Include the track title and artist name as a header.",
+        default: true,
+    },
     servicesComponent: {
         type: OptionType.COMPONENT,
         component: () => <Settings />
@@ -48,10 +55,40 @@ export type SongLinkResult = {
 
 export const Native = VencordNative.pluginHelpers.SongLink as PluginNative<typeof import("./native")>;
 
+function formatMessage(data: SongLinkResult): string | null {
+    const lines: string[] = [];
+
+    for (const [serviceKey, service] of Object.entries(settings.store.servicesSettings)) {
+        if (!service.enabled) continue;
+
+        const platformData = data.links[serviceKey];
+        if (!platformData?.url) continue;
+
+        const provider = Providers[serviceKey];
+        const name = provider?.name ?? serviceKey;
+
+        lines.push(`- [${name}](<${platformData.url}>)`);
+    }
+
+    if (lines.length === 0) return null;
+
+    const parts: string[] = [];
+
+    if (settings.store.includeMetadata && data.info?.title && data.info?.artist) {
+        parts.push(`### **${data.info.title}** — *${data.info.artist}*`);
+    }
+
+    parts.push(lines.join("\n"));
+
+    return parts.join("\n");
+}
+
 export default definePlugin({
     name: "SongLink",
     description: "Adds streaming service buttons below song links",
-    authors: [Devs.nin0dev],
+    dependencies: ["MessageAccessoriesAPI"],
+    tags: ["Media", "Utility"],
+    authors: [Devs.nin0dev, EquicordDevs.NassCT],
     settings,
     Providers,
     cache: ({} as Record<string, SongLinkResult>),
@@ -83,5 +120,53 @@ export default definePlugin({
                 musicLinks.map(item => <SongLinker key={item} url={item} />)
             }
         </div>;
-    }
+    },
+    commands: [
+        {
+            name: "musiclink",
+            description: "Convert a music link to other streaming platforms.",
+            inputType: ApplicationCommandInputType.BUILT_IN,
+            options: [
+                {
+                    name: "url",
+                    description: "Music link (Spotify, Deezer, YouTube, Tidal, Apple Music, SoundCloud)",
+                    type: ApplicationCommandOptionType.STRING,
+                    required: true,
+                },
+            ],
+            execute: async (opts, ctx) => {
+                const url = findOption<string>(opts, "url", "");
+
+                if (!url) {
+                    sendBotMessage(ctx.channel.id, {
+                        content: "Please provide a music link.",
+                    });
+                    return;
+                }
+
+                sendBotMessage(ctx.channel.id, {
+                    content: "This will take a moment...",
+                });
+
+                try {
+                    const data = await Native.getTrackData(url);
+                    const formatted = formatMessage(data);
+
+                    if (!formatted) {
+                        sendBotMessage(ctx.channel.id, {
+                            content:
+                                "No alternative platforms found for this link.",
+                        });
+                        return;
+                    }
+
+                    sendMessage(ctx.channel.id, { content: formatted });
+                } catch (e: any) {
+                    sendBotMessage(ctx.channel.id, {
+                        content: "Failed to resolve music link",
+                    });
+                }
+            },
+        },
+    ],
 });
diff --git a/src/equicordplugins/songSpotlight.desktop/index.tsx b/src/equicordplugins/songSpotlight.desktop/index.tsx
index cbcc35d87..b870b58db 100644
--- a/src/equicordplugins/songSpotlight.desktop/index.tsx
+++ b/src/equicordplugins/songSpotlight.desktop/index.tsx
@@ -20,6 +20,8 @@ import WidgetSongs from "./ui/songs/WidgetSongs";
 export default definePlugin({
     name: "SongSpotlight",
     description: "Show off songs on your profile",
+    dependencies: ["ProfileCollectionsAPI"],
+    tags: ["Appearance", "Media"],
     authors: [EquicordDevs.nexpid],
     settings,
     patches: [
@@ -27,7 +29,7 @@ export default definePlugin({
         {
             find: ".MUTUAL_GUILDS})),",
             replacement: {
-                match: /(\i).push\({text.{0,50}}\);/,
+                match: /(\i).push\({text.{0,50}.ACTIVITY\}\);/,
                 replace: '$&$1.push({text:"Song Spotlight",section:"SONG_SPOTLIGHT"});',
             },
         },
diff --git a/src/equicordplugins/splitLargeMessages/index.ts b/src/equicordplugins/splitLargeMessages/index.ts
index 5fef6839e..f0c3c6e18 100644
--- a/src/equicordplugins/splitLargeMessages/index.ts
+++ b/src/equicordplugins/splitLargeMessages/index.ts
@@ -116,6 +116,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "SplitLargeMessages",
     description: "Splits large messages into multiple to fit Discord's message limit.",
+    dependencies: ["MessageEventsAPI"],
+    tags: ["Appearance", "Customisation", "Chat"],
     authors: [EquicordDevs.Reycko],
     settings,
     onBeforeMessageSend: listener,
diff --git a/src/equicordplugins/spotifyActivityToggle/index.tsx b/src/equicordplugins/spotifyActivityToggle/index.tsx
index c392644ca..65ff76b7f 100644
--- a/src/equicordplugins/spotifyActivityToggle/index.tsx
+++ b/src/equicordplugins/spotifyActivityToggle/index.tsx
@@ -88,6 +88,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "SpotifyActivityToggle",
     description: "Adds a toggle button for Spotify activity visibility.",
+    dependencies: ["UserAreaAPI"],
+    tags: ["Activity", "Utility"],
     authors: [Devs.thororen],
     settings,
 
diff --git a/src/equicordplugins/statusPresets/fixActionBar.css b/src/equicordplugins/statusPresets/fixActionBar.css
deleted file mode 100644
index 231a70c1f..000000000
--- a/src/equicordplugins/statusPresets/fixActionBar.css
+++ /dev/null
@@ -1,3 +0,0 @@
-[class*="outerContainer"] [class*="container"] [class*="actionBar"] {
-    gap: 0;
-}
\ No newline at end of file
diff --git a/src/equicordplugins/statusPresets/index.tsx b/src/equicordplugins/statusPresets/index.tsx
index 4904bd273..225492694 100644
--- a/src/equicordplugins/statusPresets/index.tsx
+++ b/src/equicordplugins/statusPresets/index.tsx
@@ -23,46 +23,30 @@ import { getUserSettingLazy } from "@api/UserSettings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { EquicordDevs } from "@utils/constants";
 import { proxyLazy } from "@utils/lazy";
-import { classes } from "@utils/misc";
 import { openModalLazy } from "@utils/modal";
 import { useForceUpdater } from "@utils/react";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
 import { extractAndLoadChunksLazy, findComponentByCodeLazy, findModuleId, wreq } from "@webpack";
-import { Clickable, Menu, OverridePremiumTypeStore, Toasts, useState } from "@webpack/common";
-
-import managedStyle from "./fixActionBar.css?managed";
-
-const settings = definePluginSettings({
-    StatusPresets: {
-        type: OptionType.COMPONENT,
-        description: "Status Presets",
-        component: () => <></>,
-        default: {}
-    }
-});
+import { Menu, OverridePremiumTypeStore, Toasts } from "@webpack/common";
 
 interface Emoji {
     animated: boolean;
-    id: bigint | null;
+    id: string | null;
     name: string;
 }
 
-const PlusSmallIcon = findComponentByCodeLazy("0-2h-5V6Z");
-
 interface DiscordStatus {
     emojiInfo: Emoji | null;
     text: string;
     clearAfter: "TODAY" | number | null;
-    status: "online" | "dnd" | "idle" | "invisible";
 }
 
-// TODO: find clearCustomStatusHint original css/svg or replace
-const PMenu = findComponentByCodeLazy("#{intl::MORE_OPTIONS}", ".ChevronSmallRightIcon");
+const PMenu = findComponentByCodeLazy("#{intl::MORE_OPTIONS}", ",renderSubmenu:");
 const EmojiComponent = findComponentByCodeLazy(/\.translateSurrogatesToInlineEmoji\(\i\.name\);/);
 
 const CustomStatusSettings = getUserSettingLazy("status", "customStatus")!;
 const StatusModule = proxyLazy(() => {
-    const id = findModuleId(".customStatusInputTitle,");
+    const id = findModuleId("#{intl::SAVE}", '"custom-status-input"', '"Invalid custom status clear timeout"),');
     return wreq(Number(id));
 });
 
@@ -77,7 +61,6 @@ const openCustomStatusModalLazy = () => openModalLazy(async () => {
 
 function getExpirationMs(expiration: "TODAY" | number) {
     if (expiration !== "TODAY") return Date.now() + expiration;
-
     const now = new Date();
     return new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1).getTime();
 }
@@ -92,78 +75,82 @@ function setStatus(status: DiscordStatus) {
     });
 }
 
-const ClearStatusButton = () => <Clickable onClick={e => { e.stopPropagation(); CustomStatusSettings?.updateSetting(null); }}><PlusSmallIcon className={"vc-sp-icon"} /></Clickable>;
-
-function StatusIcon({ isHovering, status }: { isHovering: boolean; status: DiscordStatus; }) {
-    return <div>{isHovering ?
-        <PlusSmallIcon className={"vc-sp-icon"} />
-        : (status.emojiInfo != null ? <EmojiComponent emoji={status.emojiInfo} animate={false} hideTooltip={false} /> : <div />)}</div>;
-}
-
-const RenderStatusMenuItem = ({ status, update, disabled }: { status: DiscordStatus; update: () => void; disabled: boolean; }) => {
-    const [isHovering, setIsHovering] = useState(false);
-    const handleMouseOver = () => {
-        setIsHovering(true);
-    };
-
-    const handleMouseOut = () => {
-        setIsHovering(false);
-    };
-
-    return <div className={classes("vc-sp-item", disabled ? "vc-sp-disabled" : null)}
-        onMouseOver={handleMouseOver}
-        onMouseOut={handleMouseOut}>
-        <Clickable
-            onClick={e => {
-                e.stopPropagation();
-                settings.store.StatusPresets[status.text] = undefined; // setting to undefined to remove it.
-                update();
-            }}><StatusIcon isHovering={isHovering} status={status} /></Clickable>
-        <div style={{ marginLeft: "2px" }}>{status.text}</div>
-    </div >;
-};
-
 const StatusSubMenuComponent = () => {
     const premiumType = OverridePremiumTypeStore.getState().premiumTypeActual ?? 0;
     const update = useForceUpdater();
-    return <Menu.Menu navId="sp-custom-status-submenu" onClose={() => { }}>
-        {Object.entries((settings.store.StatusPresets as { [k: string]: DiscordStatus | undefined; })).map(([index, status]) => status != null ? <Menu.MenuItem
-            key={"status-presets-" + index}
-            id={"status-presets-" + index}
-            label={status.status}
-            action={() => (status.emojiInfo?.id != null && premiumType > 0 || status.emojiInfo?.id == null) && setStatus(status)}
-            render={() => <RenderStatusMenuItem
-                status={status}
-                update={update}
-                disabled={status.emojiInfo?.id != null && premiumType === 0}
-            />}
-        /> : null)}
-    </Menu.Menu>;
+
+    return (
+        <Menu.Menu navId="sp-custom-status-submenu" onClose={() => { }}>
+            {Object.entries((settings.store.StatusPresets as { [k: string]: DiscordStatus | undefined; })).map(([index, status]) =>
+                status != null ? (
+                    <Menu.MenuItem
+                        key={"status-presets-" + index}
+                        id={"status-presets-" + index}
+                        label={status.text}
+                        action={() => (status.emojiInfo?.id == null || premiumType > 0) && setStatus(status)}
+                        icon={status.emojiInfo != null
+                            ? () => <EmojiComponent emoji={status.emojiInfo} animate={false} hideTooltip={false} />
+                            : undefined
+                        }
+                        disabled={status.emojiInfo?.id != null && premiumType === 0}
+                    >
+                        <Menu.MenuItem
+                            id={"status-presets-delete-" + index}
+                            label="Delete Preset"
+                            action={() => {
+                                const newPresets = JSON.parse(JSON.stringify(settings.store.StatusPresets));
+                                delete newPresets[status.text];
+                                settings.store.StatusPresets = newPresets;
+                                update();
+                            }}
+                        />
+                    </Menu.MenuItem>
+                ) : null
+            )}
+        </Menu.Menu>
+    );
 };
 
+const settings = definePluginSettings({
+    StatusPresets: {
+        type: OptionType.COMPONENT,
+        description: "Status Presets",
+        component: () => <></>,
+        default: {}
+    }
+});
+
 export default definePlugin({
     name: "StatusPresets",
     description: "Allows you to remember your statuses and set them later",
+    tags: ["Activity", "Utility"],
     authors: [EquicordDevs.iamme],
-    settings: settings,
+    settings,
     dependencies: ["UserSettingsAPI"],
-    managedStyle,
     patches: [
         {
             find: '="custom-status-input";',
             replacement: {
-                match: /(?<=(\i)\?\.state\?\?.*?)\{text:\i\.\i\.\i\(\i\.\i#{intl::SAVE}\)/,
-                replace: "$self.renderRememberButton($1),$&"
+                match: /(?<=\[(\i).{0,6}\.useState\(\i\?\.state\?\?""\),\[(\i).{0,25}\?\?null\),\[(\i).*?)\{text:\i\.\i\.\i\(\i\.\i#{intl::SAVE}\)/,
+                replace: "$self.renderRememberButton({text:$1,emojiInfo:$2,clearAfter:$3}),$&"
             }
         },
         {
             find: "#{intl::STATUS_MENU_LABEL}",
             replacement: {
-                match: /(:void 0\}\))\]/,
+                match: /(,\{onClose:\i,popoutContainerRef:\i\}\))\]/,
                 replace: "$1,$self.render()]"
             }
-        }
+        },
+        {
+            find: "#{intl::MORE_OPTIONS}),...",
+            replacement: {
+                match: /\i:\(\)=>\i,(?=.*?function (\i).{0,100}renderSubmenu:\i,ref:)/,
+                replace: "$&PMenu:()=>$1,"
+            }
+        },
     ],
+
     render() {
         const status = CustomStatusSettings.getSetting();
         return (
@@ -174,9 +161,7 @@ export default definePlugin({
                         id="sp-custom/presets-status"
                         action="PRESS_SET_STATUS"
                         onClick={openCustomStatusModalLazy}
-                        icon={
-                            () => <div />
-                        }
+                        icon={() => <div />}
                         label="Set Custom Status"
                         renderSubmenu={StatusSubMenuComponent}
                     />
@@ -185,19 +170,13 @@ export default definePlugin({
                         id="sp-edit/presets-status"
                         action="PRESS_EDIT_CUSTOM_STATUS"
                         onClick={openCustomStatusModalLazy}
-                        hint={<ClearStatusButton />}
-                        icon={
-                            () => status.emoji != null ? (
-                                <EmojiComponent
-                                    emoji={status.emoji}
-                                    animate={false}
-                                    hideTooltip={false}
-                                />
-                            ) : null
-                        }
+                        icon={() => status.emoji != null ? (
+                            <EmojiComponent emoji={status.emoji} animate={false} hideTooltip={false} />
+                        ) : null}
                         label="Edit Custom Status"
                         renderSubmenu={StatusSubMenuComponent}
-                    />}
+                    />
+                }
             </ErrorBoundary>
         );
     },
diff --git a/src/equicordplugins/statusPresets/style.css b/src/equicordplugins/statusPresets/style.css
index 3498d8821..6caa9dd9f 100644
--- a/src/equicordplugins/statusPresets/style.css
+++ b/src/equicordplugins/statusPresets/style.css
@@ -2,12 +2,23 @@
     opacity: 0.5;
 }
 
-.vc-sp-item:hover {
-    background-color: var(--menu-item-default-hover-bg) !important;
-    color: var(--white) !important;
-}
-
 .vc-sp-icon {
     transform: rotate(45deg);
-    margin-top: 4px;
+    width: 16px;
+    height: 16px;
+    color: var(--interactive-normal);
+    opacity: 0;
 }
+
+[data-menu-item="true"]:hover .vc-sp-icon {
+    opacity: 1;
+}
+
+[data-menu-item="true"]:hover .vc-sp-icon:hover {
+    color: var(--status-danger);
+}
+
+[data-menu-item="true"][id^="sp-custom-status-submenu"] img.emoji {
+    width: 16px !important;
+    height: 16px !important;
+}
\ No newline at end of file
diff --git a/src/equicordplugins/statusWhileActive.desktop/index.ts b/src/equicordplugins/statusWhileActive.desktop/index.ts
index 9d950e4b7..efb79ef53 100644
--- a/src/equicordplugins/statusWhileActive.desktop/index.ts
+++ b/src/equicordplugins/statusWhileActive.desktop/index.ts
@@ -56,6 +56,7 @@ function setStatus(preq, status) {
 export default definePlugin({
     name: "StatusWhileActive",
     description: "Automatically updates your online status when in a voice channel.",
+    tags: ["Activity", "Customisation", "Voice"],
     authors: [EquicordDevs.smuki],
     settings,
     flux: {
diff --git a/src/equicordplugins/steamStatusSync/index.tsx b/src/equicordplugins/steamStatusSync/index.tsx
index 7a20e9035..0ca190e11 100644
--- a/src/equicordplugins/steamStatusSync/index.tsx
+++ b/src/equicordplugins/steamStatusSync/index.tsx
@@ -85,6 +85,7 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "SteamStatusSync",
     description: "Sync your status to Steam! (Online, Away, Invisible, or Offline.)",
+    tags: ["Activity", "Appearance", "Customisation"],
     authors: [EquicordDevs.niko],
 
     settings,
diff --git a/src/equicordplugins/stickerBlocker/index.tsx b/src/equicordplugins/stickerBlocker/index.tsx
index 1993ebabb..7b2f59101 100644
--- a/src/equicordplugins/stickerBlocker/index.tsx
+++ b/src/equicordplugins/stickerBlocker/index.tsx
@@ -130,6 +130,7 @@ function isStickerBlocked(name) {
 export default definePlugin({
     name: "StickerBlocker",
     description: "Allows you to block stickers from being displayed.",
+    tags: ["Chat", "Emotes", "Utility"],
     authors: [Devs.Samwich],
     patches: [
         {
diff --git a/src/equicordplugins/streamingCodecDisabler/index.ts b/src/equicordplugins/streamingCodecDisabler/index.ts
index 24e3ece83..61d68d710 100644
--- a/src/equicordplugins/streamingCodecDisabler/index.ts
+++ b/src/equicordplugins/streamingCodecDisabler/index.ts
@@ -56,6 +56,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "StreamingCodecDisabler",
     description: "Disable codecs for streaming of your choice",
+    tags: ["Utility", "Voice"],
     authors: [EquicordDevs.davidkra230],
     settings,
 
diff --git a/src/equicordplugins/talkInReverse/index.tsx b/src/equicordplugins/talkInReverse/index.tsx
index c469c9b31..ac4cd1a64 100644
--- a/src/equicordplugins/talkInReverse/index.tsx
+++ b/src/equicordplugins/talkInReverse/index.tsx
@@ -66,7 +66,8 @@ export default definePlugin({
     name: "TalkInReverse",
     authors: [EquicordDevs.Tolgchu],
     description: "Reverses the message content before sending it.",
-    dependencies: ["MessageEventsAPI"],
+    tags: ["Chat", "Fun"],
+    dependencies: ["MessageEventsAPI", "ChatInputButtonAPI"],
     chatBarButton: {
         icon: ReverseMessageIcon,
         render: ReverseMessageToggle
diff --git a/src/equicordplugins/themeLibrary/index.tsx b/src/equicordplugins/themeLibrary/index.tsx
index 084ce9650..6a2fe0955 100644
--- a/src/equicordplugins/themeLibrary/index.tsx
+++ b/src/equicordplugins/themeLibrary/index.tsx
@@ -16,6 +16,7 @@ import { settings } from "./utils/settings";
 export default definePlugin({
     name: "ThemeLibrary",
     description: "A library of themes for Vencord.",
+    tags: ["Appearance", "Customisation"],
     authors: [EquicordDevs.Fafa],
     settings,
     toolboxActions: {
diff --git a/src/equicordplugins/tidalEmbeds/index.tsx b/src/equicordplugins/tidalEmbeds/index.tsx
index 1e9269859..f819da7c1 100644
--- a/src/equicordplugins/tidalEmbeds/index.tsx
+++ b/src/equicordplugins/tidalEmbeds/index.tsx
@@ -10,8 +10,9 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "TidalEmbeds",
     description: "Embeds TIDAL songs to make them playable in Discord.",
+    tags: ["Appearance", "Chat", "Media"],
     authors: [EquicordDevs.vmohammad],
-    dependencies: ["MessageUpdaterAPI"],
+    dependencies: ["MessageUpdaterAPI", "MessageAccessoriesAPI"],
     patches: [
         {
             find: "renderEmbeds(",
diff --git a/src/equicordplugins/tiktokTTS/index.ts b/src/equicordplugins/tiktokTTS/index.ts
index da5d8c24c..0e2ddf9f4 100644
--- a/src/equicordplugins/tiktokTTS/index.ts
+++ b/src/equicordplugins/tiktokTTS/index.ts
@@ -211,6 +211,7 @@ async function processQueue() {
 export default definePlugin({
     name: "TiktokTTS",
     description: "Adds a context menu option to read out chat messages with the good ol' Tiktok TTS voice :sob:",
+    tags: ["Accessibility", "Chat", "Voice"],
     authors: [EquicordDevs.VillainsRule, EquicordDevs.examplegit],
     dependencies: ["AudioPlayerAPI"],
     settings,
diff --git a/src/equicordplugins/timezones/index.tsx b/src/equicordplugins/timezones/index.tsx
index b40c3a515..d0a500991 100644
--- a/src/equicordplugins/timezones/index.tsx
+++ b/src/equicordplugins/timezones/index.tsx
@@ -257,6 +257,7 @@ export default definePlugin({
     name: "Timezones",
     authors: [Devs.Aria, EquicordDevs.creations],
     description: "Shows the local time of users in profiles and message headers",
+    tags: ["Appearance", "Chat", "Utility"],
     contextMenus: {
         "user-context": userContextMenuPatch
     },
@@ -274,8 +275,8 @@ export default definePlugin({
             find: "#{intl::GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY}",
             replacement: {
                 // thanks https://github.com/Syncxv/vc-timezones/pull/4
-                match: /(?<=isVisibleOnlyOnHover.+?)id:.{1,11},timestamp.{1,50}}\),/,
-                replace: "$&,$self.renderMessageTimezone(arguments[0]),"
+                match: /(?<=isVisibleOnlyOnHover.+?)id:.{0,15},timestamp.{1,50}}\),/,
+                replace: "$&$self.renderMessageTimezone(arguments[0]),"
             }
         }
     ],
diff --git a/src/equicordplugins/title/index.ts b/src/equicordplugins/title/index.ts
index 9e67a72a0..a9c9138ed 100644
--- a/src/equicordplugins/title/index.ts
+++ b/src/equicordplugins/title/index.ts
@@ -29,6 +29,7 @@ function setTitle(v: string) {
 export default definePlugin({
     name: "Title",
     description: "Replaces the window title prefix",
+    tags: ["Customisation"],
     authors: [Devs.Kyuuhachi],
     settings,
 
diff --git a/src/equicordplugins/toastNotifications/README.md b/src/equicordplugins/toastNotifications/README.md
new file mode 100644
index 000000000..d9d7f68d3
--- /dev/null
+++ b/src/equicordplugins/toastNotifications/README.md
@@ -0,0 +1,108 @@
+# ToastNotifications
+
+Displays a pop-up _'toast'_ notification in a configurable corner of the screen whenever you receive a message in a DM, group DM, or server channel.
+
+- [Configuration](#-configuration)
+    - [Notification Position](#notification-position)
+    - [Notification Timeout](#notification-timeout)
+    - [Opacity](#opacity)
+    - [Max Notifications](#max-notifications)
+    - [Disable In Streamer Mode](#disable-in-streamer-mode)
+    - [Respect Do Not Disturb](#respect-do-not-disturb)
+    - [Direct Messages](#direct-messages)
+    - [Group Messages](#group-messages)
+    - [Friend Server Notifications](#friend-server-notifications)
+    - [Ignored Users](#ignored-users)
+    - [Notify For](#notify-for)
+- [Theming](#-theming)
+
+## 🔧 Configuration
+
+### Notification Position
+
+Determines which corner of your screen the notification will appear in, valid options are:
+
+- Bottom Left _(Default)_
+- Bottom Right
+- Top Left
+- Top Right
+
+## Notification Timeout
+
+The duration _(in seconds)_ for which notifications will be shown on the screen before disappearing, a progress bar is shown below notifications to indicate how long is left before they disappear.
+
+> [!NOTE]
+> You can hover over a notification while it is visible to pause the timeout and keep it on screen indefinitely until you move your mouse away from it again.
+
+### Opacity
+
+The visible opacity of the notification message to display, acceptable value is between 10% and 100%.
+
+### Max Notifications
+
+The maximum number of concurrent notifications to display on the screen at once, if this limit is reached, the oldest notification will be removed from the screen to make room for the new one.
+
+### Disable In Streamer Mode
+
+When enabled, notifications are suppressed while Discord's streamer mode is active.
+
+### Respect Do Not Disturb
+
+If enabled, notifications will not be shown when your Discord status is set to Do Not Disturb mode.
+
+### Direct Messages
+
+Toggle notifications for messages sent in direct messages.
+
+### Group Messages
+
+Toggle notifications for messages sent in group DMs.
+
+### Friend Server Notifications
+
+When enabled, messages from friends in shared servers always trigger a notification regardless of the channel's notification level.
+
+### Ignored Users
+
+A comma-separated list of Discord User IDs whose messages will not trigger a notification. This is useful for ignoring messages from users who are not important to you or who send too many messages. Example value:
+
+- `123456789012345678,234567890123456789,345678901234567890`
+
+The above example will ignore messages from the users with IDs `123456789012345678`, `234567890123456789`, and `345678901234567890`. You can find a user's ID by right-clicking on their name in Discord and selecting <kbd>Copy ID</kbd> _(Developer Mode must be enabled in Discord settings)_.
+
+### Notify For
+
+A comma-separated list of channel IDs to **always** receive notifications from, regardless of the channel's notification level or mute state.
+
+---
+
+## 🎨 Theming
+
+This plugin supports theming and exposes a number of CSS variables to allow you to customize the appearance of notifications.
+
+| CSS Variable                                      | Description                                                                |
+| ------------------------------------------------- | -------------------------------------------------------------------------- |
+| `--vc-toast-notifications-background-color`           | Background color of the notification card.                                 |
+| `--vc-toast-notifications-text-color`                 | Default text color inside notifications.                                   |
+| `--vc-toast-notifications-border-radius`              | Border radius of the notification card.                                    |
+| `--vc-toast-notifications-width`                      | Width of the card. Defaults to `fit-content`.                              |
+| `--vc-toast-notifications-min-width`                  | Minimum width to use regardless of content.                                |
+| `--vc-toast-notifications-max-width`                  | Maximum width a single notification can grow to.                           |
+| `--vc-toast-notifications-min-height`                 | Minimum height to use regardless of content.                               |
+| `--vc-toast-notifications-max-height`                 | Maximum height a single notification can grow to.                          |
+| `--vc-toast-notifications-padding`                    | Inner padding of the notification card.                                    |
+| `--vc-toast-notifications-position-offset`            | Distance from the screen corner the stack is anchored at.                  |
+| `--vc-toast-notifications-title-color`                | Color of titles (system notifications) and context headers (group/server). |
+| `--vc-toast-notifications-title-font-size`            | Font size of titles and context headers.                                   |
+| `--vc-toast-notifications-title-font-weight`          | Font weight of titles and context headers.                                 |
+| `--vc-toast-notifications-title-line-height`          | Line height of titles and context headers.                                 |
+| `--vc-toast-notifications-image-height`               | Height of the avatar/icon shown in system notifications.                   |
+| `--vc-toast-notifications-image-width`                | Width of the avatar/icon shown in system notifications.                    |
+| `--vc-toast-notifications-image-border-radius`        | Border radius of the avatar/icon in system notifications.                  |
+| `--vc-toast-notifications-close-button-color`         | Color of the dismiss (X) button.                                           |
+| `--vc-toast-notifications-close-button-hover-color`   | Color of the dismiss (X) button on hover.                                  |
+| `--vc-toast-notifications-close-button-opacity`       | Opacity of the dismiss (X) button at rest.                                 |
+| `--vc-toast-notifications-close-button-hover-opacity` | Opacity of the dismiss (X) button on hover.                                |
+| `--vc-toast-notifications-progressbar-height`         | Height of the progress bar shown at the bottom of notifications.           |
+| `--vc-toast-notifications-progressbar-color`          | Color of the progress bar.                                                 |
+
diff --git a/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx b/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx
index 5318b1e26..af3e391fe 100644
--- a/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx
+++ b/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx
@@ -1,144 +1,179 @@
 /*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import "./styles.css";
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { settings as PluginSettings } from "@equicordplugins/toastNotifications/index";
-import { classes } from "@utils/misc";
-import { React, useEffect, useMemo, useState } from "@webpack/common";
+import { classNameFactory } from "@utils/css";
+import { findComponentByCodeLazy } from "@webpack";
+import { FluxDispatcher, GuildStore, IconUtils, React, useEffect, useMemo, useRef, useState } from "@webpack/common";
 
-import { NotificationData } from "./Notifications";
+import { MessageNotification, NotificationData } from "./Notifications";
 
-export default ErrorBoundary.wrap(function NotificationComponent({
-    title,
-    body,
-    richBody,
-    icon,
-    image,
-    permanent,
-    dismissOnClick,
-    index,
-    onClick,
-    onClose,
-    attachments
-}: NotificationData & { index?: number; }) {
+export const cl = classNameFactory("vc-toast-notifications-");
+const MessageComponent = findComponentByCodeLazy("childrenExecutedCommand:", ".hideAccessories");
+
+function isMessageNotification(props: NotificationData): props is MessageNotification {
+    return "mockedMessage" in props;
+}
+
+function renderContextHeader(channel: MessageNotification["channel"]): React.ReactNode {
+    if (channel.isGroupDM()) {
+        const icon = channel.icon
+            ? IconUtils.getChannelIconURL?.({ id: channel.id, icon: channel.icon, size: 32 })
+            : undefined;
+        const rawName = channel.name?.trim() || channel.rawRecipients.slice(0, 3).map(e => e.username).join(", ");
+        const name = rawName.length > 20 ? rawName.substring(0, 20) + "..." : rawName;
+        return (
+            <div className={cl("context-header")}>
+                {icon && <img className={cl("context-header-icon")} src={icon} alt="" />}
+                <span className={cl("context-header-name")}>{name}</span>
+            </div>
+        );
+    }
+
+    if (channel.guild_id) {
+        const guild = GuildStore.getGuild(channel.guild_id);
+        const icon = guild?.icon
+            ? IconUtils.getGuildIconURL({ id: guild.id, icon: guild.icon, size: 32 })
+            : undefined;
+        return (
+            <div className={cl("context-header")}>
+                {icon && <img className={cl("context-header-icon")} src={icon} alt="" />}
+                <span className={cl("context-header-name")}>
+                    {guild?.name ?? "Unknown Server"}
+                    {channel.name && (
+                        <>
+                            <span className={cl("context-header-separator")}>{" \u203A "}</span>
+                            <span className={cl("context-header-channel")}>#{channel.name}</span>
+                        </>
+                    )}
+                </span>
+            </div>
+        );
+    }
+
+    return null;
+}
+
+export default ErrorBoundary.wrap(function NotificationComponent(props: NotificationData) {
     const [isHover, setIsHover] = useState(false);
     const [elapsed, setElapsed] = useState(0);
 
-    let renderBody: boolean = true;
-    let footer: boolean = false;
+    const timeout = (PluginSettings.store.timeout ?? 5) * 1000;
+    const opacity = PluginSettings.store.opacity / 100;
+    const startRef = useRef(Date.now());
 
-    if (attachments > 0) footer = true;
-
-    if (body === "") renderBody = false;
-
-    // Precompute appearance settings.
-    const AppearanceSettings = {
-        position: `toastnotifications-position-${PluginSettings.store.position || "bottom-left"}`,
-        timeout: (PluginSettings.store.timeout * 1000) || 5000,
-        opacity: PluginSettings.store.opacity / 100,
-    };
-
-    const start = useMemo(() => Date.now(), [isHover]); // Reset the timer when the user hovers over the notification.
-
-    // Precompute the position style.
-    const positionStyle = useMemo(() => {
-        if (index === undefined) return {};
-        const isTopPosition = AppearanceSettings.position.includes("top");
-        const actualHeight = 115; // Update this with the actual height including margin
-        const effectiveIndex = index % PluginSettings.store.maxNotifications;
-        const offset = 10 + (effectiveIndex * actualHeight); // 10 is the base offset
-
-        return isTopPosition ? { top: `${offset}px` } : { bottom: `${offset}px` };
-    }, [index, AppearanceSettings.position]);
-
-    // Handle notification timeout.
     useEffect(() => {
-        if (isHover || permanent) return void setElapsed(0);
+        if (isHover || props.permanent) {
+            setElapsed(0);
+            return;
+        }
 
+        startRef.current = Date.now();
         const intervalId = setInterval(() => {
-            const elapsed = Date.now() - start;
-            if (elapsed >= AppearanceSettings.timeout)
-                onClose!();
-            else
-                setElapsed(elapsed);
+            const next = Date.now() - startRef.current;
+            if (next >= timeout) props.onClose!();
+            else setElapsed(next);
         }, 10);
 
         return () => clearInterval(intervalId);
-    }, [isHover]);
+    }, [isHover, props.permanent, timeout]);
 
-    const timeoutProgress = elapsed / AppearanceSettings.timeout;
+    const timeoutProgress = elapsed / timeout;
 
-    // Render the notification.
-    return (
+    const handleClick = () => {
+        props.onClick?.();
+        if (props.dismissOnClick !== false) props.onClose!();
+    };
+
+    const handleContextMenu = (e: React.MouseEvent) => {
+        e.preventDefault();
+        e.stopPropagation();
+
+        // Also marks the message as read.
+        if (isMessageNotification(props)) {
+            FluxDispatcher.dispatch({
+                type: "BULK_ACK",
+                context: "APP",
+                channels: [{
+                    channelId: props.channel.id,
+                    messageId: props.message.id,
+                    readStateType: 0
+                }]
+            });
+        }
+
+        props.onClose!();
+    };
+
+    const closeButton = useMemo(() => (
         <button
-            style={positionStyle}
-            className={classes("toastnotifications-notification-root", AppearanceSettings.position)}
-            onClick={() => {
-                onClick?.();
-                if (dismissOnClick !== false)
-                    onClose!();
-            }}
-            onContextMenu={e => {
+            className={cl("notification-close-btn")}
+            onClick={e => {
                 e.preventDefault();
                 e.stopPropagation();
-                onClose!();
+                props.onClose!();
             }}
+        >
+            <svg width="24" height="24" viewBox="0 0 24 24" role="img" aria-labelledby="vc-toast-notifications-dismiss-title">
+                <title id="vc-toast-notifications-dismiss-title">Dismiss Notification</title>
+                <path fill="currentColor" d="M18.4 4L12 10.4L5.6 4L4 5.6L10.4 12L4 18.4L5.6 20L12 13.6L18.4 20L20 18.4L13.6 12L20 5.6L18.4 4Z" />
+            </svg>
+        </button>
+    ), [props.onClose]);
+
+    let content: React.ReactNode;
+    if (isMessageNotification(props)) {
+        content = (
+            <div className={cl("notification-content")}>
+                {renderContextHeader(props.channel)}
+                <MessageComponent
+                    id={`toastnotification-mock-${props.message.id}`}
+                    message={props.mockedMessage}
+                    channel={props.channel}
+                    subscribeToComponentDispatch={false}
+                />
+            </div>
+        );
+    } else {
+        const { title, body, icon } = props;
+        content = (
+            <div className={cl("notification-system")}>
+                {icon && <img className={cl("notification-icon")} src={icon} alt="" />}
+                <div className={cl("notification-content")}>
+                    <div className={cl("notification-header")}>
+                        <h2 className={cl("notification-title")}>{title}</h2>
+                    </div>
+                    {body && (
+                        <p className={cl("notification-p")}>
+                            {body.length > 500 ? body.slice(0, 500) + "..." : body}
+                        </p>
+                    )}
+                </div>
+            </div>
+        );
+    }
+
+    return (
+        <button
+            style={{ opacity }}
+            className={cl("notification-root")}
+            onClick={handleClick}
+            onContextMenu={handleContextMenu}
             onMouseEnter={() => setIsHover(true)}
             onMouseLeave={() => setIsHover(false)}
         >
-            <div className="toastnotifications-notification">
-                {icon && <img className="toastnotifications-notification-icon" src={icon} alt="User Avatar" />}
-                <div className="toastnotifications-notification-content">
-                    <div className="toastnotifications-notification-header">
-                        <h2 className="toastnotifications-notification-title">{title}</h2>
-                        <button
-                            className="toastnotifications-notification-close-btn"
-                            onClick={e => {
-                                e.preventDefault();
-                                e.stopPropagation();
-                                onClose!();
-                            }}
-                        >
-                            <svg width="24" height="24" viewBox="0 0 24 24" role="img" aria-labelledby="toastnotifications-notification-dismiss-title">
-                                <title id="toastnotifications-notification-dismiss-title">Dismiss Notification</title>
-                                <path fill="currentColor" d="M18.4 4L12 10.4L5.6 4L4 5.6L10.4 12L4 18.4L5.6 20L12 13.6L18.4 20L20 18.4L13.6 12L20 5.6L18.4 4Z" />
-                            </svg>
-                        </button>
-                    </div>
-                    <div>
-                        {renderBody ? (
-                            richBody ?? (
-                                <p className="toastnotifications-notification-p">
-                                    {body.length > 500 ? body.slice(0, 500) + "..." : body}
-                                </p>
-                            )
-                        ) : null}
-                        {PluginSettings.store.renderImages && image && <img className="toastnotifications-notification-img" src={image} alt="ToastNotification Image" />}
-                        {footer && <p className="toastnotifications-notification-footer">{`${attachments} attachment${attachments > 1 ? "s" : ""} ${attachments > 1 ? "were" : "was"} sent.`}</p>}
-                    </div>
-                </div>
-            </div>
-            {AppearanceSettings.timeout !== 0 && !permanent && (
+            {closeButton}
+            {content}
+            {timeout !== 0 && !props.permanent && (
                 <div
-                    className="toastnotifications-notification-progressbar"
-                    style={{ width: `${(1 - timeoutProgress) * 100}%`, backgroundColor: "var(--toastnotifications-progressbar-color)" }}
+                    className={cl("notification-progressbar")}
+                    style={{ width: `${(1 - timeoutProgress) * 100}%` }}
                 />
             )}
         </button>
diff --git a/src/equicordplugins/toastNotifications/components/Notifications.tsx b/src/equicordplugins/toastNotifications/components/Notifications.tsx
index 463d1be36..13b3b1370 100644
--- a/src/equicordplugins/toastNotifications/components/Notifications.tsx
+++ b/src/equicordplugins/toastNotifications/components/Notifications.tsx
@@ -1,24 +1,13 @@
 /*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import { settings as PluginSettings } from "@equicordplugins/toastNotifications/index";
-import { createRoot, React } from "@webpack/common";
-import type { JSX, ReactNode } from "react";
+import { Channel, Message } from "@vencord/discord-types";
+import { createRoot } from "@webpack/common";
+import type { JSX } from "react";
 import type { Root } from "react-dom/client";
 
 import NotificationComponent from "./NotificationComponent";
@@ -26,31 +15,50 @@ import NotificationComponent from "./NotificationComponent";
 let NotificationQueue: JSX.Element[] = [];
 let notificationID = 0;
 let RootContainer: Root | undefined;
+let ToastContainer: HTMLDivElement | undefined;
 
 function getNotificationContainer() {
+    // If the root container doesn't exist, create it.
     if (!RootContainer) {
-        const container = document.createElement("div");
-        container.id = "toastnotifications-container";
-        document.body.append(container);
-        RootContainer = createRoot(container);
+        ToastContainer = document.createElement("div");
+        ToastContainer.id = "vc-toast-notifications-container";
+        document.body.append(ToastContainer);
+        RootContainer = createRoot(ToastContainer);
+    }
+
+    // Keep the container's position class in sync with the user's setting.
+    if (ToastContainer) {
+        ToastContainer.className = `vc-toast-notifications-position-${PluginSettings.store.position ?? "bottom-left"}`;
     }
 
     return RootContainer;
 }
 
-export interface NotificationData {
-    title: string; // Title to display in the notification.
-    body: string; // Notification body text.
-    richBody?: ReactNode; // Same as body, though a rich ReactNode to be rendered within the notification.
-    icon?: string; // Avatar image of the message author or source.
-    image?: string; // Large image to display in the notification for attachments.
-    permanent?: boolean; // Whether or not the notification should be permanent or timeout.
-    dismissOnClick?: boolean; // Whether or not the notification should be dismissed when clicked.
-    attachments: number;
+export function setContainerPosition(position: string) {
+    if (ToastContainer) ToastContainer.className = `vc-toast-notifications-position-${position ?? "bottom-left"}`;
+}
+
+interface BaseNotification {
+    permanent?: boolean;
+    dismissOnClick?: boolean;
     onClick?(): void;
     onClose?(): void;
 }
 
+export interface MessageNotification extends BaseNotification {
+    message: Message;
+    mockedMessage: Message;
+    channel: Channel;
+}
+
+export interface SystemNotification extends BaseNotification {
+    title: string;
+    body: string;
+    icon?: string;
+}
+
+export type NotificationData = MessageNotification | SystemNotification;
+
 export async function showNotification(notification: NotificationData) {
     const root = getNotificationContainer();
     const thisNotificationID = notificationID++;
@@ -59,44 +67,34 @@ export async function showNotification(notification: NotificationData) {
         const ToastNotification = (
             <NotificationComponent
                 key={thisNotificationID.toString()}
-                index={NotificationQueue.length}
                 {...notification}
                 onClose={() => {
-                    // Remove this notification from the queue.
                     NotificationQueue = NotificationQueue.filter(n => n.key !== thisNotificationID.toString());
-                    notification.onClose?.(); // Trigger the onClose callback if it exists.
-                    console.log(`[DEBUG] [ToastNotifications] Removed #${thisNotificationID} from queue.`);
-
-                    // Re-render remaining notifications with new reversed indices.
-                    root.render(
-                        <>
-                            {NotificationQueue.map((notification, index) => {
-                                const reversedIndex = (NotificationQueue.length - 1) - index;
-                                return React.cloneElement(notification, { index: reversedIndex });
-                            })}
-                        </>
-                    );
-
+                    notification.onClose?.();
+                    root.render(<>{NotificationQueue}</>);
                     resolve();
                 }}
             />
         );
 
-        // Add this notification to the queue.
+        // Push this notification into the stack.
         NotificationQueue.push(ToastNotification);
-        console.log(`[DEBUG] [ToastNotifications] Added #${thisNotificationID} to queue.`);
 
-        // Limit the number of notifications to the configured maximum.
+        // If the queue exceeds the maximum number of notifications, remove the oldest one.
         if (NotificationQueue.length > PluginSettings.store.maxNotifications) NotificationQueue.shift();
 
-        // Render the notifications.
-        root.render(
-            <>
-                {NotificationQueue.map((notification, index) => {
-                    const reversedIndex = (NotificationQueue.length - 1) - index;
-                    return React.cloneElement(notification, { index: reversedIndex });
-                })}
-            </>
-        );
+        root.render(<>{NotificationQueue}</>);
     });
 }
+
+/**
+ * Tears down the notification root and removes the container from the DOM.
+ * Called when the plugin is disabled.
+ */
+export function teardownNotifications() {
+    NotificationQueue = [];
+    RootContainer?.unmount();
+    RootContainer = undefined;
+    ToastContainer?.remove();
+    ToastContainer = undefined;
+}
diff --git a/src/equicordplugins/toastNotifications/components/styles.css b/src/equicordplugins/toastNotifications/components/styles.css
index 81828da13..ffc89022b 100644
--- a/src/equicordplugins/toastNotifications/components/styles.css
+++ b/src/equicordplugins/toastNotifications/components/styles.css
@@ -1,151 +1,226 @@
 :root {
     /* Body */
-    --toastnotifications-background-color: var(--background-base-lower-alt);
-    --toastnotifications-text-color: var(--text-default);
-    --toastnotifications-border-radius: 6px;
-    --toastnotifications-width: 25vw;
-    --toastnotifications-padding: 1.25rem;
+    --vc-toast-notifications-background-color: var(--background-base-lower-alt);
+    --vc-toast-notifications-text-color: var(--text-default);
+    --vc-toast-notifications-border-radius: 6px;
+    --vc-toast-notifications-width: fit-content;
+    --vc-toast-notifications-min-width: 25rem;
+    --vc-toast-notifications-max-width: 50%;
+    --vc-toast-notifications-min-height: 10vh;
+    --vc-toast-notifications-max-height: 50%;
+    --vc-toast-notifications-padding: 1rem;
 
     /* Title */
-    --toastnotifications-title-color: var(--text-strong);
-    --toastnotifications-title-font-size: 1rem;
-    --toastnotifications-title-font-weight: 600;
-    --toastnotifications-title-line-height: 1.25rem;
+    --vc-toast-notifications-title-color: var(--text-strong);
+    --vc-toast-notifications-title-font-size: 1rem;
+    --vc-toast-notifications-title-font-weight: 600;
+    --vc-toast-notifications-title-line-height: 1.25rem;
 
     /* Close Button */
-    --toastnotifications-close-button-color: var(--interactive-icon-default);
-    --toastnotifications-close-button-hover-color: var(--interactive-icon-hover);
-    --toastnotifications-close-button-opacity: 0.5;
-    --toastnotifications-close-button-hover-opacity: 1;
+    --vc-toast-notifications-close-button-color: var(--interactive-icon-default);
+    --vc-toast-notifications-close-button-hover-color: var(--interactive-icon-hover);
+    --vc-toast-notifications-close-button-opacity: 0.5;
+    --vc-toast-notifications-close-button-hover-opacity: 1;
 
     /* Message Author Image */
-    --toastnotifications-image-height: 4rem;
-    --toastnotifications-image-width: var(--toastnotifications-image-height);
-    --toastnotifications-image-border-radius: 6px;
+    --vc-toast-notifications-image-height: 4rem;
+    --vc-toast-notifications-image-width: var(--vc-toast-notifications-image-height);
+    --vc-toast-notifications-image-border-radius: 6px;
 
     /* Progress Bar */
-    --toastnotifications-progressbar-height: 0.25rem;
-    --toastnotifications-progressbar-color: var(--brand-500);
+    --vc-toast-notifications-progressbar-height: 0.25rem;
+    --vc-toast-notifications-progressbar-color: var(--brand-500);
 
     /* Position Offset - Global inherited offset by all positions */
-    --toastnotifications-position-offset: 1rem;
+    --vc-toast-notifications-position-offset: 1rem;
 }
 
-.toastnotifications-notification-root {
+#vc-toast-notifications-container {
+    position: fixed;
+    z-index: 2147483647;
+    display: flex;
+    gap: 0.75rem;
+    pointer-events: none;
+    max-height: calc(100vh - var(--vc-toast-notifications-position-offset) * 2);
+}
+
+#vc-toast-notifications-container.vc-toast-notifications-position-bottom-left,
+#vc-toast-notifications-container.vc-toast-notifications-position-bottom-right {
+    flex-direction: column;
+    justify-content: flex-end;
+}
+
+#vc-toast-notifications-container.vc-toast-notifications-position-top-left,
+#vc-toast-notifications-container.vc-toast-notifications-position-top-right {
+    flex-direction: column-reverse;
+    justify-content: flex-start;
+}
+
+.vc-toast-notifications-notification-root {
     all: unset;
+    pointer-events: auto;
+    position: relative;
     display: flex;
     flex-direction: column;
-    color: var(--toastnotifications-text-color);
-    background-color: var(--toastnotifications-background-color);
-    border-radius: var(--toastnotifications-border-radius);
+    color: var(--vc-toast-notifications-text-color);
+    background-color: var(--vc-toast-notifications-background-color);
+    border-radius: var(--vc-toast-notifications-border-radius);
     overflow: hidden;
     cursor: pointer;
-    position: absolute;
-    z-index: 2147483647;
-    right: 1rem;
-    width: var(--toastnotifications-width);
-    min-height: 10vh;
-    bottom: calc(1rem + var(--notification-index) * 12vh);
+    min-width: var(--vc-toast-notifications-min-width);
+    width: var(--vc-toast-notifications-width);
+    max-width: var(--vc-toast-notifications-max-width);
+    min-height: var(--vc-toast-notifications-min-height);
+    max-height: var(--vc-toast-notifications-max-height);
+    flex-shrink: 0;
 }
 
-.toastnotifications-notification {
+.vc-toast-notifications-notification-content {
     display: flex;
-    flex-direction: row;
-    padding: var(--toastnotifications-padding);
-    gap: 1.25rem;
-}
-
-.toastnotifications-notification-content {
+    flex-direction: column;
+    padding: var(--vc-toast-notifications-padding) 0.2rem;
     width: 100%;
 }
 
-.toastnotifications-notification-header {
+.vc-toast-notifications-context-header {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    color: var(--vc-toast-notifications-title-color);
+    font-size: var(--vc-toast-notifications-title-font-size);
+    font-weight: var(--vc-toast-notifications-title-font-weight);
+    line-height: var(--vc-toast-notifications-title-line-height);
+    padding: 0 0.8rem 0.5rem;
+}
+
+.vc-toast-notifications-context-header-icon {
+    width: 1.5rem;
+    height: 1.5rem;
+    border-radius: 50%;
+    object-fit: cover;
+    flex-shrink: 0;
+}
+
+.vc-toast-notifications-context-header-name {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    min-width: 0;
+}
+
+.vc-toast-notifications-context-header-separator {
+    color: var(--text-muted);
+    font-weight: 400;
+}
+
+.vc-toast-notifications-context-header-channel {
+    color: var(--text-muted);
+    font-weight: 500;
+}
+
+/* System-mode notifications (friend activity, example) */
+.vc-toast-notifications-notification-system {
+    display: flex;
+    flex-direction: row;
+    padding: var(--vc-toast-notifications-padding);
+    gap: 1.25rem;
+    width: 100%;
+}
+
+.vc-toast-notifications-notification-system .vc-toast-notifications-notification-content {
+    display: block;
+    padding: 0;
+    flex: 1;
+    min-width: 0;
+}
+
+.vc-toast-notifications-notification-header {
     display: flex;
     justify-content: space-between;
+    align-items: flex-start;
+    gap: 0.5rem;
 }
 
-.toastnotifications-notification-title {
-    color: var(--toastnotifications-title-color);
-    font-size: var(--toastnotifications-title-font-size);
-    font-weight: var(--toastnotifications-title-font-weight);
-    line-height: var(--toastnotifications-title-line-height);
+.vc-toast-notifications-notification-title {
+    color: var(--vc-toast-notifications-title-color);
+    font-size: var(--vc-toast-notifications-title-font-size);
+    font-weight: var(--vc-toast-notifications-title-font-weight);
+    line-height: var(--vc-toast-notifications-title-line-height);
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
-.toastnotifications-notification-close-btn {
+.vc-toast-notifications-notification-close-btn {
     all: unset;
     cursor: pointer;
-    color: var(--toastnotifications-close-button-color);
-    opacity: var(--toastnotifications-close-button-opacity);
+    color: var(--vc-toast-notifications-close-button-color);
+    opacity: var(--vc-toast-notifications-close-button-opacity);
     transition: opacity 0.2s ease-in-out, color 0.2s ease-in-out;
+    position: absolute;
+    top: 0.4rem;
+    right: 0.4rem;
+    z-index: 1;
+    width: 1.5rem;
+    height: 1.5rem;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 50%;
+    background-color: var(--vc-toast-notifications-background-color);
 }
 
-.toastnotifications-notification-close-btn:hover {
-    color: var(--toastnotifications-close-button-hover-color);
-    opacity: var(--toastnotifications-close-button-hover-opacity);
+.vc-toast-notifications-notification-close-btn svg {
+    width: 1.25rem;
+    height: 1.25rem;
 }
 
-.toastnotifications-notification-icon {
-    height: var(--toastnotifications-image-height);
-    width: var(--toastnotifications-image-width);
-    border-radius: var(--toastnotifications-image-border-radius);
+.vc-toast-notifications-notification-close-btn:hover {
+    color: var(--vc-toast-notifications-close-button-hover-color);
+    opacity: var(--vc-toast-notifications-close-button-hover-opacity);
 }
 
-.toastnotifications-notification-progressbar {
-    height: var(--toastnotifications-progressbar-height);
+.vc-toast-notifications-notification-icon {
+    height: var(--vc-toast-notifications-image-height);
+    width: var(--vc-toast-notifications-image-width);
+    border-radius: var(--vc-toast-notifications-image-border-radius);
+}
+
+.vc-toast-notifications-notification-progressbar {
+    height: var(--vc-toast-notifications-progressbar-height);
+    background-color: var(--vc-toast-notifications-progressbar-color);
     border-radius: 5px;
     margin-top: auto;
 }
 
-.toastnotifications-notification-p {
+.vc-toast-notifications-notification-p {
     margin: 0.5rem 0 0;
     margin-bottom: 3px;
     line-height: 140%;
-    word-break: break-all;
+    overflow-wrap: anywhere;
 }
 
-.toastnotifications-notification-footer {
-    margin: 0;
-    margin-top: 4px;
-    line-height: 140%;
-    font-size: 10px;
+/* Container positioning. */
+#vc-toast-notifications-container.vc-toast-notifications-position-bottom-left {
+    bottom: var(--vc-toast-notifications-position-offset);
+    left: var(--vc-toast-notifications-position-offset);
 }
 
-.toastnotifications-notification-img {
-    width: 75%;
-    border-radius: 3px;
+#vc-toast-notifications-container.vc-toast-notifications-position-top-left {
+    top: var(--vc-toast-notifications-position-offset);
+    left: var(--vc-toast-notifications-position-offset);
 }
 
-/* Notification Positioning CSS */
-.toastnotifications-position-bottom-left {
-    bottom: var(--toastnotifications-position-offset);
-    left: var(--toastnotifications-position-offset);
+#vc-toast-notifications-container.vc-toast-notifications-position-top-right {
+    top: var(--vc-toast-notifications-position-offset);
+    right: var(--vc-toast-notifications-position-offset);
 }
 
-.toastnotifications-position-top-left {
-    top: var(--toastnotifications-position-offset);
-    left: var(--toastnotifications-position-offset);
+#vc-toast-notifications-container.vc-toast-notifications-position-bottom-right {
+    bottom: var(--vc-toast-notifications-position-offset);
+    right: var(--vc-toast-notifications-position-offset);
 }
 
-.toastnotifications-position-top-right {
-    top: var(--toastnotifications-position-offset);
-    right: var(--toastnotifications-position-offset);
-}
-
-.toastnotifications-position-bottom-right {
-    bottom: var(--toastnotifications-position-offset);
-    right: var(--toastnotifications-position-offset);
-}
-
-/* Rich Body classes */
-.toastnotifications-mention-class {
-    color: var(--mention-foreground);
-    background: var(--mention-background);
-    /* stylelint-disable-next-line value-no-vendor-prefix */
-    unicode-bidi: -moz-plaintext;
-    unicode-bidi: plaintext;
-    font-weight: 500;
-}
-
-.visual-refresh .toastnotifications-notification-root {
+.visual-refresh .vc-toast-notifications-notification-root {
     background-color: var(--background-base-low);
 }
\ No newline at end of file
diff --git a/src/equicordplugins/toastNotifications/index.tsx b/src/equicordplugins/toastNotifications/index.tsx
index cd1be8023..9100341f9 100644
--- a/src/equicordplugins/toastNotifications/index.tsx
+++ b/src/equicordplugins/toastNotifications/index.tsx
@@ -1,49 +1,38 @@
 /*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import { definePluginSettings } from "@api/Settings";
+import { Button } from "@components/Button";
 import { EquicordDevs } from "@utils/constants";
 import definePlugin, { makeRange, OptionType } from "@utils/types";
-import { Channel, Message, User } from "@vencord/discord-types";
-import { MessageType, RelationshipType } from "@vencord/discord-types/enums";
+import { Channel, Message } from "@vencord/discord-types";
 import { findByPropsLazy, findStore } from "@webpack";
-import { Button, ChannelStore, GuildRoleStore, IconUtils, NavigationRouter, RelationshipStore, SelectedChannelStore, StreamerModeStore, UserStore } from "@webpack/common";
-import { ReactNode } from "react";
+import { ChannelStore, IconUtils, MessageStore, NavigationRouter, PresenceStore, RelationshipStore, SelectedChannelStore, StreamerModeStore, UserStore } from "@webpack/common";
 
-import { NotificationData, showNotification } from "./components/Notifications";
-import { StreamingTreatment } from "./types";
+import { setContainerPosition, showNotification, teardownNotifications } from "./components/Notifications";
+
+const MuteStore = findByPropsLazy("isSuppressEveryoneEnabled");
+const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel");
+const ChannelRTCActions = findByPropsLazy("updateChatOpen", "toggleParticipants");
+
+const ID_REGEX = /^\d{17,20}$/;
 
 let ignoredUsers: string[] = [];
 let notifyFor: string[] = [];
 
-// Functional variables.
-const MuteStore = findByPropsLazy("isSuppressEveryoneEnabled");
-const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel");
-const ChannelRTCActions = findByPropsLazy("updateChatOpen", "toggleParticipants");
-const UserUtils = findByPropsLazy("getGlobalName");
-
-// Adjustable variables.
-const USER_MENTION_REGEX = /<@!?(\d{17,20})>|<#(\d{17,20})>|<@&(\d{17,20})>/g; // This regex captures user, channel, and role mentions.
+enum NotificationLevel {
+    ALL_MESSAGES = 0,
+    ONLY_MENTIONS = 1,
+    NO_MESSAGES = 2
+}
 
 export const settings = definePluginSettings({
     position: {
         type: OptionType.SELECT,
-        description: "The position of the toast notification",
+        description: "The position of the toast notification.",
         options: [
             {
                 label: "Bottom Left",
@@ -62,529 +51,186 @@ export const settings = definePluginSettings({
                 label: "Bottom Right",
                 value: "bottom-right"
             },
-        ]
+        ],
+        onChange: value => setContainerPosition(value),
     },
     timeout: {
         type: OptionType.SLIDER,
-        description: "Time in seconds notifications will be shown for",
+        description: "Time in seconds notifications will be shown for.",
         default: 5,
         markers: makeRange(1, 15, 1)
     },
     opacity: {
         type: OptionType.SLIDER,
-        description: "Opacity of the notification",
+        description: "The visible opacity of the notification.",
         default: 100,
         markers: makeRange(10, 100, 10)
     },
     maxNotifications: {
         type: OptionType.SLIDER,
-        description: "Maximum number of notifications displayed at once",
+        description: "Maximum number of notifications displayed at once.",
         default: 3,
         markers: makeRange(1, 5, 1)
     },
-    determineServerNotifications: {
-        type: OptionType.BOOLEAN,
-        description: "Automatically determine what server notifications to show based on your channel/guild settings",
-        default: true
-    },
     disableInStreamerMode: {
         type: OptionType.BOOLEAN,
-        description: "Disable notifications while in streamer mode",
+        description: "Do not show notifications when streamer mode is enabled.",
         default: true
     },
-    renderImages: {
+    respectDoNotDisturb: {
         type: OptionType.BOOLEAN,
-        description: "Render images in notifications",
-        default: true
+        description: "Do not show notifications when your status is Do Not Disturb.",
+        default: false
     },
     directMessages: {
         type: OptionType.BOOLEAN,
-        description: "Show notifications for direct messages",
+        description: "Show notifications for direct messages.",
         default: true
     },
     groupMessages: {
         type: OptionType.BOOLEAN,
-        description: "Show notifications for group messages",
+        description: "Show notifications for group messages.",
         default: true
     },
     friendServerNotifications: {
         type: OptionType.BOOLEAN,
-        description: "Show notifications when friends send messages in servers they share with you",
+        description: "Show notifications when friends send messages in servers they share with you.",
         default: true
     },
-    friendActivity: {
-        type: OptionType.BOOLEAN,
-        description: "Show notifications for adding someone or receiving a friend request",
-        default: true
-    },
-    streamingTreatment: {
-        type: OptionType.SELECT,
-        description: "How to treat notifications while sharing your screen",
-        options: [
-            {
-                label: "Normal - Show the notification as normal",
-                value: StreamingTreatment.NORMAL,
-                default: true
-            },
-            {
-                label: "No Content - Hide the notification body",
-                value: StreamingTreatment.NO_CONTENT
-            },
-            {
-                label: "Ignore - Don't show the notification at all",
-                value: StreamingTreatment.IGNORE
-            }
-        ]
-    },
-    notifyFor: {
-        type: OptionType.STRING,
-        description: "Create a list of channel ids to receive notifications from (separate with commas)",
-        onChange: () => { notifyFor = stringToList(settings.store.notifyFor); },
-        default: ""
-    },
     ignoreUsers: {
         type: OptionType.STRING,
-        description: "Create a list of user ids to ignore all their notifications from (separate with commas)",
-        onChange: () => { ignoredUsers = stringToList(settings.store.ignoreUsers); },
-        default: ""
+        description: "A list of user IDs (separate by commas) to ignore displaying notifications for.",
+        onChange: () => { ignoredUsers = parseIdList(settings.store.ignoreUsers); },
+        default: "",
+        placeholder: "000000000000000000,111111111111111111,222222222222222222"
+    },
+    notifyFor: {
+        type: OptionType.STRING,
+        description: "A list of channel IDs (separate by commas) to always receive notifications from.",
+        onChange: () => { notifyFor = parseIdList(settings.store.notifyFor); },
+        default: "",
+        placeholder: "000000000000000000,111111111111111111,222222222222222222"
     },
     exampleButton: {
         type: OptionType.COMPONENT,
         description: "Show an example toast notification.",
-        component: () =>
-            <Button onClick={showExampleNotification}>
-                Show Example Notification
-            </Button>
+        component: () => <Button onClick={showExampleNotification}>Show Example Notification</Button>
     }
 });
 
-function stringToList(str: string): string[] {
-    if (str !== "") {
-        const array: string[] = [];
-        const string = str.replace(/\s/g, "");
-        const splitArray = string.split(",");
-        splitArray.forEach(id => {
-            array.push(id);
-        });
-
-        return array;
-    }
-    return [];
-}
-
-function limitMessageLength(body: string, hasAttachments: boolean): string {
-    if (hasAttachments) {
-        if (body?.length > 30) {
-            return body.substring(0, 27) + "...";
-        }
-    }
-
-    if (body?.length > 165) {
-        return body.substring(0, 162) + "...";
-    }
-
-    return body;
-}
-
-function getName(user: User): string {
-    return RelationshipStore.getNickname(user.id) ?? UserUtils.getName(user);
-}
-
-const addMention = (id: string, type: string, guildId?: string): ReactNode => {
-    let name;
-    if (type === "user")
-        name = `@${UserStore.getUser(id)?.username || "unknown-user"}`;
-    else if (type === "channel")
-        name = `#${ChannelStore.getChannel(id)?.name || "unknown-channel"}`;
-    else if (type === "role" && guildId)
-        name = `@${GuildRoleStore.getRole(guildId, id)?.name || "unknown-role"}`;
-
-    // Return the mention as a styled span.
-    return (
-        <span key={`${type}-${id}`} className={"toastnotifications-mention-class"}>
-            {name}
-        </span>
-    );
-};
-
 export default definePlugin({
     name: "ToastNotifications",
-    description: "Show a toast notification whenever you receive a direct message.",
+    description: "Show a pop-up toast notification, configurable for DMs, group, friends, or guild channels.",
+    tags: ["Appearance", "Customisation", "Notifications"],
     authors: [EquicordDevs.Skully, EquicordDevs.Ethan, EquicordDevs.Buzzy],
     settings,
     flux: {
-        async MESSAGE_CREATE({ message }: { message: Message; }) {
-
+        MESSAGE_CREATE({ message }: { message: Message; }) {
             const channel: Channel = ChannelStore.getChannel(message.channel_id);
+            if (!channel) return;
+
             const currentUser = UserStore.getCurrentUser();
 
-            const isStreaming = findStore("ApplicationStreamingStore").getAnyStreamForUser(UserStore.getCurrentUser()?.id);
-
-            const streamerMode = settings.store.disableInStreamerMode;
-            const currentUserStreamerMode = StreamerModeStore.enabled;
-
-            if (streamerMode && currentUserStreamerMode) return;
-            if (isStreaming && settings.store.streamingTreatment === StreamingTreatment.IGNORE) return;
-
+            // Check global conditions for all message types.
             if (
-                (
-                    (message.author.id === currentUser.id) // If message is from the user.
-                    || (channel.id === SelectedChannelStore.getChannelId()) // If the user is currently in the channel.
-                    || (ignoredUsers.includes(message.author.id)) // If the user is ignored.
-                )
+                (message.author.id === currentUser.id) // If message is from the user.
+                || (channel.id === SelectedChannelStore.getChannelId()) // If the user is currently in the channel.
+                || (ignoredUsers.includes(message.author.id)) // If the user is ignored.
+                || (settings.store.respectDoNotDisturb && PresenceStore.getStatus(currentUser.id) === "dnd") // If notifications are disabled while in DND.
+                || (settings.store.disableInStreamerMode && StreamerModeStore.enabled) // If notifications are disabled in streamer mode.
             ) return;
 
-            if (channel.guild_id) { // If this is a guild message and not a private message.
-                handleGuildMessage(message);
-                return;
+            // Channel type checks.
+            if (channel.guild_id) {
+                if (!shouldNotifyForGuildMessage(message, channel)) return;
+            } else {
+                if (
+                    (!settings.store.directMessages && channel.isDM()) // If DM notifications are disabled.
+                    || (!settings.store.groupMessages && channel.isGroupDM()) // If group DM notifications are disabled.
+                    || MuteStore.isChannelMuted(null, channel.id) // If the user has muted the DM/group channel.
+                ) return;
             }
 
-            if (!settings.store.directMessages && channel.isDM() || !settings.store.groupMessages && channel.isGroupDM() || MuteStore.isChannelMuted(null, channel.id)) return;
+            // Retrieve the message component for the message.
+            const mockedMessage: Message | undefined = MessageStore.getMessages(message.channel_id)?.receiveMessage(message)?.get(message.id);
+            if (!mockedMessage) return console.error(`[ToastNotifications] Failed to retrieve mocked message from MessageStore for message ID ${message.id}!`);
 
-            // Prepare the notification.
-            const Notification: NotificationData = {
-                title: getName(message.author),
-                icon: IconUtils.getUserAvatarURL(message.author),
-                body: message.content,
-                attachments: message.attachments?.length,
-                richBody: null,
-                permanent: false,
-                onClick() { SelectedChannelActionCreators.selectPrivateChannel(message.channel_id); }
-            };
-
-            const notificationText = message.content?.length > 0 ? message.content : false;
-            const richBodyElements: ReactNode[] = [];
-
-            // If this channel is a group DM, include the channel name.
-            if (channel.isGroupDM()) {
-                let channelName = channel.name?.trim() ?? false;
-                if (!channelName) { // If the channel doesn't have a set name, use the first 3 recipients.
-                    channelName = channel.rawRecipients.slice(0, 3).map(e => e.username).join(", ");
-                }
-
-                // Finally, truncate the channel name if it's too long.
-                const truncatedChannelName = channelName?.length > 20 ? channelName.substring(0, 20) + "..." : channelName;
-                Notification.title = `${message.author.username} (${truncatedChannelName})`;
-            }
-            else if (channel.guild_id) // If this is a guild message and not a private message.
-            {
-                Notification.title = `${getName(message.author)} (#${channel.name})`;
-            }
-
-            // Handle specific message types.
-            switch (message.type) {
-                case MessageType.CALL: {
-                    Notification.body = "Started a call with you!";
-                    break;
-                }
-                case MessageType.RECIPIENT_ADD: {
-                    const actor = UserStore.getUser(message.author.id);
-                    const user = message.mentions[0];
-                    const targetUser = UserStore.getUser((user as any).id);
-
-                    Notification.body = `${getName(targetUser)} was added to the group by ${getName(actor)}.`;
-                    break;
-                }
-                case MessageType.RECIPIENT_REMOVE: {
-                    const actor = UserStore.getUser(message.author.id);
-                    const user = message.mentions[0];
-                    const targetUser = UserStore.getUser((user as any).id);
-
-                    if (actor.id !== targetUser.id) {
-                        Notification.body = `${getName(targetUser)} was removed from the group by ${getName(actor)}.`;
-                    } else {
-                        Notification.body = "Left the group.";
-                    }
-                    break;
-                }
-                case MessageType.CHANNEL_NAME_CHANGE: {
-                    Notification.body = `Changed the channel name to '${message.content}'.`;
-                    break;
-                }
-                case MessageType.CHANNEL_ICON_CHANGE: {
-                    Notification.body = "Changed the channel icon.";
-                    break;
-                }
-                case MessageType.CHANNEL_PINNED_MESSAGE: {
-                    Notification.body = "Pinned a message.";
-                    break;
-                }
-            }
-
-            // Message contains an embed.
-            if (message.embeds?.length !== 0) {
-                Notification.body = notificationText || "Sent an embed.";
-            }
-
-            // Message contains a sticker.
-            if (message?.stickerItems) {
-                Notification.body = notificationText || "Sent a sticker.";
-            }
-
-            // Message contains an attachment.
-            if (message.attachments?.length !== 0) {
-                const images = message.attachments.filter(e => typeof e?.content_type === "string" && e?.content_type.startsWith("image"));
-                // Label the notification with the attachment type.
-                if (images?.length !== 0) {
-                    Notification.body = notificationText || ""; // Dont show any body
-                    Notification.image = images[0].url;
-                } else {
-                    Notification.body += ` [Attachment: ${message.attachments[0].filename}]`;
-                }
-            }
-
-            // TODO: Format emotes properly.
-            const matches = Notification.body.match(new RegExp("(<a?:\\w+:\\d+>)", "g"));
-            if (matches) {
-                for (const match of matches) {
-                    Notification.body = Notification.body.replace(new RegExp(`${match}`, "g"), `:${match.split(":")[1]}:`);
-                }
-            }
-
-            // Replace any mention of users, roles and channels.
-            if (message.mentions?.length !== 0 || message.mentionRoles?.length > 0) {
-                let lastIndex = 0;
-                Notification.body.replace(USER_MENTION_REGEX, (match, userId, channelId, roleId, offset) => {
-                    richBodyElements.push(Notification.body.slice(lastIndex, offset));
-
-                    // Add the mention itself as a styled span.
-                    if (userId) {
-                        richBodyElements.push(addMention(userId, "user"));
-                    } else if (channelId) {
-                        richBodyElements.push(addMention(channelId, "channel"));
-                    } else if (roleId) {
-                        richBodyElements.push(addMention(roleId, "role", channel.guild_id));
-                    }
-
-                    lastIndex = offset + match?.length;
-                    return match; // This value is not used but is necessary for the replace function
-                });
-            }
-
-            if (richBodyElements?.length > 0) {
-                const MyRichBodyComponent = () => <>{richBodyElements}</>;
-                Notification.richBody = <MyRichBodyComponent />;
-            }
-
-            Notification.body = limitMessageLength(Notification.body, Notification.attachments > 0);
-
-            if (isStreaming && settings.store.streamingTreatment === StreamingTreatment.NO_CONTENT) {
-                Notification.body = "Message content has been redacted.";
-            }
-
-            if (!settings.store.renderImages) {
-                Notification.icon = undefined;
-            }
-
-            showNotification(Notification);
-        },
-
-        async RELATIONSHIP_ADD({ relationship }) {
-            if (ignoredUsers.includes(relationship.user.id)) return;
-            relationshipAdd(relationship.user, relationship.type);
+            showNotification({
+                message,
+                mockedMessage,
+                channel,
+                onClick: () => channel.guild_id
+                    ? navigateToChannel(channel)
+                    : SelectedChannelActionCreators.selectPrivateChannel(channel.id)
+            });
         }
     },
 
     start() {
-        ignoredUsers = stringToList(settings.store.ignoreUsers);
-        notifyFor = stringToList(settings.store.notifyFor);
+        ignoredUsers = parseIdList(settings.store.ignoreUsers);
+        notifyFor = parseIdList(settings.store.notifyFor);
+    },
+
+    stop() {
+        teardownNotifications();
+        ignoredUsers = [];
+        notifyFor = [];
     }
 });
 
-function switchChannels(guildId: string | null, channelId: string) {
-    if (!ChannelStore.hasChannel(channelId)) return;
-    NavigationRouter.transitionTo(`/channels/${guildId ?? "@me"}/${channelId}/`);
+/**
+ * Splits a comma-separated string into a list of valid Discord snowflake IDs.
+ */
+function parseIdList(str: string): string[] {
+    if (!str) return [];
+    return str.replace(/\s/g, "").split(",").filter(id => ID_REGEX.test(id));
 }
 
+/**
+ * Navigates the client to the given channel, opening the chat panel for voice channels.
+ */
 function navigateToChannel(channel: Channel) {
-    if (channel.isGuildVocal?.()) {
-        switchChannels(channel.guild_id, channel.id);
-        ChannelRTCActions.updateChatOpen(channel.id, true);
-        return;
-    }
-
-    switchChannels(channel.guild_id, channel.id);
+    if (!ChannelStore.hasChannel(channel.id)) return;
+    NavigationRouter.transitionTo(`/channels/${channel.guild_id ?? "@me"}/${channel.id}/`);
+    if (channel.isGuildVocal?.()) ChannelRTCActions.updateChatOpen(channel.id, true);
 }
 
-enum NotificationLevel {
-    ALL_MESSAGES = 0,
-    ONLY_MENTIONS = 1,
-    NO_MESSAGES = 2
-}
+/**
+ * Decides whether a guild message should trigger a notification based on the
+ * channel allowlist, friend-server-notifications setting, channel/guild mutes,
+ * and the user's configured notification level for the channel/guild.
+ */
+function shouldNotifyForGuildMessage(message: Message, channel: Channel): boolean {
+    // Allowlist always wins.
+    if (notifyFor.includes(channel.id)) return true;
 
-function findNotificationLevel(channel: Channel): NotificationLevel {
-    const store = findStore("UserGuildSettingsStore");
-    const userGuildSettings = store.getAllSettings().userGuildSettings[channel.guild_id];
+    // Friend-in-server toggle.
+    if (settings.store.friendServerNotifications && RelationshipStore.isFriend(message.author.id)) return true;
 
-    if (!settings.store.determineServerNotifications || MuteStore.isGuildOrCategoryOrChannelMuted(channel.guild_id, channel.id)) {
-        return NotificationLevel.NO_MESSAGES;
-    }
+    // Respect the user's mute state for the guild/category/channel.
+    if (MuteStore.isGuildOrCategoryOrChannelMuted(channel.guild_id, channel.id)) return false;
 
-    if (userGuildSettings) {
-        const channelOverrides = userGuildSettings.channel_overrides?.[channel.id];
-        const guildDefault = userGuildSettings.message_notifications;
+    // Resolve the user's configured notification level for the channel/guild.
+    const userGuildSettings = findStore("UserGuildSettingsStore").getAllSettings().userGuildSettings[channel.guild_id];
+    if (!userGuildSettings) return false;
 
-        // Check if channel overrides exist and are in the expected format
-        if (channelOverrides && typeof channelOverrides === "object" && "message_notifications" in channelOverrides) {
-            return channelOverrides.message_notifications;
-        }
+    const channelOverride = userGuildSettings.channel_overrides?.[channel.id];
+    const level: NotificationLevel = (channelOverride && typeof channelOverride === "object" && "message_notifications" in channelOverride)
+        ? channelOverride.message_notifications
+        : (typeof userGuildSettings.message_notifications === "number" ? userGuildSettings.message_notifications : NotificationLevel.NO_MESSAGES);
 
-        // Check if guild default is in the expected format
-        if (typeof guildDefault === "number") {
-            return guildDefault;
-        }
-    }
+    if (level === NotificationLevel.NO_MESSAGES) return false;
+    if (level === NotificationLevel.ALL_MESSAGES) return true;
 
-    // Return a default value if no valid overrides or guild default is found
-    return NotificationLevel.NO_MESSAGES;
-}
-
-async function handleGuildMessage(message: Message) {
-    const c = ChannelStore.getChannel(message.channel_id);
-    const notificationLevel: number = findNotificationLevel(c);
-    let t = false;
-    // 0: All messages 1: Only mentions 2: No messages
-    // todo: check if the user who sent it is a friend
-    const all = notifyFor.includes(message.channel_id);
-    const friend = settings.store.friendServerNotifications && RelationshipStore.isFriend(message.author.id);
-
-    if (!all && !friend) {
-        t = true;
-        const isMention: boolean = message.content.includes(`<@${UserStore.getCurrentUser().id}>`);
-        const meetsMentionCriteria = notificationLevel !== NotificationLevel.ALL_MESSAGES && !isMention;
-
-        if (notificationLevel === NotificationLevel.NO_MESSAGES || meetsMentionCriteria) return;
-    }
-
-    const channel: Channel = ChannelStore.getChannel(message.channel_id);
-
-    const notificationText = message.content.length > 0 ? message.content : false;
-    const richBodyElements: React.ReactNode[] = [];
-
-    // Prepare the notification.
-    const Notification: NotificationData = {
-        title: `${getName(message.author)} (#${channel.name})`,
-        icon: IconUtils.getUserAvatarURL(message.author),
-        body: message.content,
-        attachments: message.attachments?.length,
-        richBody: null,
-        permanent: false,
-        onClick() { navigateToChannel(channel); }
-    };
-
-    if (message.embeds?.length !== 0) {
-        Notification.body = notificationText || "Sent an embed.";
-    }
-
-    // Message contains a sticker.
-    if (message?.stickerItems) {
-        Notification.body = notificationText || "Sent a sticker.";
-    }
-
-    // Message contains an attachment.
-    if (message.attachments?.length !== 0) {
-        const images = message.attachments.filter(e => typeof e?.content_type === "string" && e?.content_type.startsWith("image"));
-        // Label the notification with the attachment type.
-        if (images?.length !== 0) {
-            Notification.body = notificationText || ""; // Dont show any body
-            Notification.image = images[0].url;
-        } else {
-            Notification.body += ` [Attachment: ${message.attachments[0].filename}]`;
-        }
-    }
-
-    // TODO: Format emotes properly.
-    const matches = Notification.body.match(new RegExp("(<a?:\\w+:\\d+>)", "g"));
-    if (matches) {
-        for (const match of matches) {
-            Notification.body = Notification.body.replace(new RegExp(`${match}`, "g"), `:${match.split(":")[1]}:`);
-        }
-    }
-
-    // Replace any mention of users, roles and channels.
-    if (message.mentions?.length !== 0 || message.mentionRoles?.length > 0) {
-        let lastIndex = 0;
-        Notification.body.replace(USER_MENTION_REGEX, (match, userId, channelId, roleId, offset) => {
-            richBodyElements.push(Notification.body.slice(lastIndex, offset));
-
-            // Add the mention itself as a styled span.
-            if (userId) {
-                richBodyElements.push(addMention(userId, "user"));
-            } else if (channelId) {
-                richBodyElements.push(addMention(channelId, "channel"));
-            } else if (roleId) {
-                richBodyElements.push(addMention(roleId, "role", channel.guild_id));
-            }
-
-            lastIndex = offset + match?.length;
-            return match; // This value is not used but is necessary for the replace function
-        });
-    }
-
-    if (richBodyElements?.length > 0) {
-        const MyRichBodyComponent = () => <>{richBodyElements}</>;
-        Notification.richBody = <MyRichBodyComponent />;
-    }
-
-    Notification.body = limitMessageLength(Notification.body, Notification.attachments > 0);
-
-    const isStreaming = findStore("ApplicationStreamingStore").getAnyStreamForUser(UserStore.getCurrentUser()?.id);
-
-    if (isStreaming && settings.store.streamingTreatment === StreamingTreatment.NO_CONTENT) {
-        Notification.body = "Message content has been redacted.";
-    }
-
-    if (!settings.store.renderImages) {
-        Notification.icon = undefined;
-    }
-
-    await showNotification(Notification);
-
-}
-
-async function relationshipAdd(user: User, type: Number) {
-    user = UserStore.getUser(user.id);
-    if (!settings.store.friendActivity) return;
-
-    const Notification: NotificationData = {
-        title: "",
-        icon: IconUtils.getUserAvatarURL(user),
-        body: "",
-        attachments: 0,
-    };
-
-    if (!settings.store.renderImages) {
-        Notification.icon = undefined;
-    }
-
-    if (type === RelationshipType.FRIEND) {
-        Notification.title = `${user.username} is now your friend`;
-        Notification.body = "You can now message them directly.";
-        Notification.onClick = () => switchChannels(null, user.id);
-
-        await showNotification(Notification);
-
-    } else if (type === RelationshipType.INCOMING_REQUEST) {
-
-        Notification.title = `${user.username} sent you a friend request`;
-        Notification.body = "You can accept or decline it in the Friends tab.";
-        Notification.onClick = () => switchChannels(null, "");
-
-        await showNotification(Notification);
-    }
+    // Otherwise we only notify if the user was mentioned.
+    return message.content.includes(`<@${UserStore.getCurrentUser().id}>`);
 }
 
 function showExampleNotification(): Promise<void> {
-    const Notification: NotificationData = {
+    return showNotification({
         title: "Example Notification",
-        icon: IconUtils.getUserAvatarURL(UserStore.getCurrentUser()),
         body: "This is an example toast notification!",
-        attachments: 0,
+        icon: IconUtils.getUserAvatarURL(UserStore.getCurrentUser()),
         permanent: false
-    };
-
-    if (!settings.store.renderImages) {
-        Notification.icon = undefined;
-    }
-    return showNotification(Notification);
+    });
 }
diff --git a/src/equicordplugins/toastNotifications/types.ts b/src/equicordplugins/toastNotifications/types.ts
deleted file mode 100644
index 6081eac0f..000000000
--- a/src/equicordplugins/toastNotifications/types.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-export const enum StreamingTreatment {
-    NORMAL = 0,
-    NO_CONTENT = 1,
-    IGNORE = 2
-}
diff --git a/src/equicordplugins/toggleVideoBind/index.ts b/src/equicordplugins/toggleVideoBind/index.ts
index 3a56c4e8f..323a1e771 100644
--- a/src/equicordplugins/toggleVideoBind/index.ts
+++ b/src/equicordplugins/toggleVideoBind/index.ts
@@ -59,6 +59,7 @@ function handleKeydown({ code, ctrlKey, shiftKey, altKey }: KeyboardEvent) {
 export default definePlugin({
     name: "ToggleVideoBind",
     description: "Adds a customizable bind to toggle webcam.",
+    tags: ["Utility", "Voice"],
     authors: [EquicordDevs.mochienya],
     settings,
     start() {
diff --git a/src/equicordplugins/toneIndicators/index.tsx b/src/equicordplugins/toneIndicators/index.tsx
index 6dc0ba1a0..cf70719f5 100644
--- a/src/equicordplugins/toneIndicators/index.tsx
+++ b/src/equicordplugins/toneIndicators/index.tsx
@@ -163,6 +163,7 @@ function patchChildrenTree(children: any): any {
 export default definePlugin({
     name: "ToneIndicators",
     description: "Show tooltips for tone indicators like /srs, /gen, etc. in sent messages.",
+    tags: ["Chat", "Utility"],
     authors: [EquicordDevs.justjxke],
     settings,
 
diff --git a/src/equicordplugins/translatePlus/index.tsx b/src/equicordplugins/translatePlus/index.tsx
index 78e48b120..2473644b0 100644
--- a/src/equicordplugins/translatePlus/index.tsx
+++ b/src/equicordplugins/translatePlus/index.tsx
@@ -46,6 +46,8 @@ const messageCtxPatch: NavContextMenuPatchCallback = (children, { message }) =>
 export default definePlugin({
     name: "Translate+",
     description: "Vencord's translate plugin but with support for artistic languages!",
+    dependencies: ["MessageAccessoriesAPI", "MessagePopoverAPI"],
+    tags: ["Chat", "Utility"],
     authors: [Devs.Ven, EquicordDevs.Prince527],
     settings,
     contextMenus: {
diff --git a/src/equicordplugins/triviaAI/index.tsx b/src/equicordplugins/triviaAI/index.tsx
index f4c860347..f2932e93e 100644
--- a/src/equicordplugins/triviaAI/index.tsx
+++ b/src/equicordplugins/triviaAI/index.tsx
@@ -5,20 +5,17 @@
  */
 
 import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
+import { RobotIcon } from "@components/Icons";
 import { EquicordDevs } from "@utils/constants";
-import definePlugin, { IconComponent } from "@utils/types";
+import definePlugin from "@utils/types";
 import { Message } from "@vencord/discord-types";
-import { findExportedComponentLazy } from "@webpack";
 import { ChannelStore, Menu } from "@webpack/common";
 
 import { settings } from "./settings";
-import { getResponse, handleResponse, parseMessageContent } from "./utils";
-
-const RobotIconLazy = findExportedComponentLazy("RobotIcon");
-const RobotIcon: IconComponent = props => <RobotIconLazy {...props} />;
+import { getPayload, getResponse, handleResponse } from "./utils";
 
 const messageCtxPatch: NavContextMenuPatchCallback = (children, { message }: { message: Message; }) => {
-    const payload = parseMessageContent(message);
+    const payload = getPayload(message);
     if (!payload) return;
 
     const group = findGroupChildrenByChildId("copy-text", children);
@@ -40,6 +37,8 @@ const messageCtxPatch: NavContextMenuPatchCallback = (children, { message }: { m
 export default definePlugin({
     name: "TriviaAI",
     description: "A plugin that helps you answer trivia questions using AI.",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Appearance", "Customisation", "Fun"],
     authors: [EquicordDevs.yash],
     settings,
     contextMenus: {
@@ -48,7 +47,7 @@ export default definePlugin({
     messagePopoverButton: {
         icon: RobotIcon,
         render(message: Message) {
-            const payload = parseMessageContent(message);
+            const payload = getPayload(message);
             if (!payload) return null;
 
             return {
diff --git a/src/equicordplugins/triviaAI/settings.ts b/src/equicordplugins/triviaAI/settings.ts
index 1ccccd6ec..1729a05aa 100644
--- a/src/equicordplugins/triviaAI/settings.ts
+++ b/src/equicordplugins/triviaAI/settings.ts
@@ -25,9 +25,10 @@ export const settings = definePluginSettings({
     },
     systemPrompt: {
         type: OptionType.STRING,
-        description: "System Prompt for the AI.",
-        default: "You are a helpful assistant who answers questions for the user in a concise and short way while using the least amount of words and punctuation.",
-        placeholder: "Enter system prompt."
+        description: "System Prompt for the AI. Placeholders: {current_user}, {current_time}",
+        default: "You are a helpful assistant who answers questions for the user in a concise and short way while using the least amount of words and punctuation.\nCurrent user: {current_user}\nCurrent time: {current_time}",
+        placeholder: "Enter system prompt.",
+        multiline: true
     },
     maxTokens: {
         type: OptionType.NUMBER,
@@ -40,6 +41,21 @@ export const settings = definePluginSettings({
         default: "https://openrouter.ai/api/v1/chat/completions",
         placeholder: "Enter your OpenAI compatible AI endpoint here."
     },
+    context: {
+        type: OptionType.NUMBER,
+        description: "Number of previous messages to include as context.",
+        default: 0
+    },
+    passMessageAuthorName: {
+        type: OptionType.BOOLEAN,
+        description: "Prepend the author's name to the message content when passing it to the AI. This can help the AI distinguish between different users in a conversation.",
+        default: true
+    },
+    treatSelfAsAssistant: {
+        type: OptionType.BOOLEAN,
+        description: "When enabled, your own messages will be treated as assistant messages in the context. This causes some models to start generating fanfic.",
+        default: false
+    },
     mode: {
         type: OptionType.SELECT,
         description: "How should answers be handled?",
diff --git a/src/equicordplugins/triviaAI/utils.ts b/src/equicordplugins/triviaAI/utils.ts
index f9f000e9e..b13386e30 100644
--- a/src/equicordplugins/triviaAI/utils.ts
+++ b/src/equicordplugins/triviaAI/utils.ts
@@ -8,7 +8,7 @@ import { sendBotMessage } from "@api/Commands";
 import { insertTextIntoChatInputBox, sendMessage } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import { Message } from "@vencord/discord-types";
-import { showToast, Toasts } from "@webpack/common";
+import { MessageStore, showToast, Toasts, UserStore } from "@webpack/common";
 
 import { settings } from "./settings";
 
@@ -29,6 +29,66 @@ type ImagePart = {
 
 export type ContentPayload = string | (TextPart | ImagePart)[];
 
+export type ApiMessage = {
+    role: "user" | "assistant";
+    content: ContentPayload;
+};
+
+export function getPayload(message: Message): ApiMessage[] | null {
+    const prevMessages = getPreviousMessages(message, settings.store.context);
+    const allMessages = [...prevMessages, message];
+
+    const currentUserId = UserStore.getCurrentUser().id;
+
+    const payload: ApiMessage[] = [];
+
+    for (const msg of allMessages) {
+        const parsed = parseMessageContent(msg);
+        if (!parsed) continue;
+
+        const isOwn = msg.author?.id === currentUserId;
+        const isTargetMessage = msg.id === message.id;
+        const role = (isOwn && !isTargetMessage && settings.store.treatSelfAsAssistant) ? "assistant" : "user";
+
+        let content = parsed;
+
+        if (!isOwn && settings.store.passMessageAuthorName) {
+            const username = msg.author?.username ?? "Unknown";
+            const prefix = `${username}: `;
+
+            if (typeof parsed === "string") {
+                content = prefix + parsed;
+            } else if (Array.isArray(parsed)) {
+                content = [...parsed];
+                const firstTextIdx = content.findIndex(p => p.type === "text");
+
+                if (firstTextIdx !== -1) {
+                    content[firstTextIdx] = {
+                        type: "text",
+                        text: prefix + (content[firstTextIdx] as TextPart).text
+                    };
+                } else {
+                    content.unshift({
+                        type: "text",
+                        text: prefix
+                    });
+                }
+            }
+        }
+
+        payload.push({ role, content });
+    }
+
+    return payload.length > 0 ? payload : null;
+}
+
+export function getPreviousMessages(message: Message, count: number): Message[] {
+    const allMessages: Message[] = MessageStore.getMessages(message.channel_id)._array;
+    const idx = allMessages.findIndex(m => m.id === message.id);
+    if (idx <= 0 || count === 0) return [];
+    return allMessages.slice(Math.max(0, idx - count), idx);
+}
+
 export function parseMessageContent(message: Message): ContentPayload | null {
     const textParts: string[] = [];
 
@@ -123,19 +183,18 @@ export async function handleResponse(message: Message, response: string): Promis
     return response;
 }
 
-export async function getResponse(payload: ContentPayload): Promise<string> {
-    if (!settings.store.apiKey) {
-        showToast("TriviaAI: API Key is not set.", Toasts.Type.FAILURE);
-        return "";
-    }
+function getSystemPrompt() {
+    const currentUser = UserStore.getCurrentUser();
+    const currentTime = new Date().toString();
 
-    if (!settings.store.endpoint) {
-        showToast("TriviaAI: Endpoint is not set.", Toasts.Type.FAILURE);
-        return "";
-    }
+    return settings.store.systemPrompt
+        .replace(/{current_user}/g, currentUser?.username ?? "Unknown User")
+        .replace(/{current_time}/g, currentTime);
+}
 
-    if (!settings.store.model) {
-        showToast("TriviaAI: Model is not set.", Toasts.Type.FAILURE);
+export async function getResponse(payload: ApiMessage[]): Promise<string> {
+    if (!settings.store.apiKey || !settings.store.endpoint || !settings.store.model) {
+        showToast("TriviaAI: API settings are incomplete.", Toasts.Type.FAILURE);
         return "";
     }
 
@@ -151,12 +210,9 @@ export async function getResponse(payload: ContentPayload): Promise<string> {
                 messages: [
                     {
                         role: "system",
-                        content: settings.store.systemPrompt
+                        content: getSystemPrompt()
                     },
-                    {
-                        role: "user",
-                        content: payload
-                    }
+                    ...payload
                 ],
                 max_tokens: settings.store.maxTokens,
             })
diff --git a/src/equicordplugins/unitConverter/index.tsx b/src/equicordplugins/unitConverter/index.tsx
index 36d83568e..c8c67aa1e 100644
--- a/src/equicordplugins/unitConverter/index.tsx
+++ b/src/equicordplugins/unitConverter/index.tsx
@@ -48,6 +48,8 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "UnitConverter",
     description: "Converts metric units to Imperal units and vice versa",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Utility"],
     authors: [Devs.sadan],
     messagePopoverButton: {
         icon: ConvertIcon,
diff --git a/src/equicordplugins/universalMention/index.tsx b/src/equicordplugins/universalMention/index.tsx
index 2d8a977bb..f6f8b6998 100644
--- a/src/equicordplugins/universalMention/index.tsx
+++ b/src/equicordplugins/universalMention/index.tsx
@@ -39,6 +39,7 @@ export default definePlugin({
     name: "UniversalMention",
     authors: [EquicordDevs.justjxke],
     description: "Mention any user, regardless of channel access.",
+    tags: ["Chat", "Servers", "Utility"],
     settings,
     settingsAboutComponent: () => (
         <Notice.Warning>
diff --git a/src/equicordplugins/unlimitedAccounts/index.ts b/src/equicordplugins/unlimitedAccounts/index.ts
index cbf77811d..eeb41a955 100644
--- a/src/equicordplugins/unlimitedAccounts/index.ts
+++ b/src/equicordplugins/unlimitedAccounts/index.ts
@@ -32,6 +32,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "UnlimitedAccounts",
     description: "Increases the amount of accounts you can add.",
+    tags: ["Utility"],
     authors: [Devs.thororen],
     settings,
     patches: [
diff --git a/src/equicordplugins/unreadBadgeCount/index.tsx b/src/equicordplugins/unreadBadgeCount/index.tsx
index 0f08d06cd..a9135df54 100644
--- a/src/equicordplugins/unreadBadgeCount/index.tsx
+++ b/src/equicordplugins/unreadBadgeCount/index.tsx
@@ -33,6 +33,7 @@ export default definePlugin({
     name: "UnreadCountBadge",
     authors: [Devs.Joona],
     description: "Shows unread message count badges on channels in the channel list",
+    tags: ["Appearance", "Customisation", "Servers"],
     settings,
 
     patches: [
diff --git a/src/equicordplugins/urlHighlighter/index.tsx b/src/equicordplugins/urlHighlighter/index.tsx
index 6fbe9ba77..6a52b9495 100644
--- a/src/equicordplugins/urlHighlighter/index.tsx
+++ b/src/equicordplugins/urlHighlighter/index.tsx
@@ -121,6 +121,7 @@ function getMatchingPattern(url: string): PatternEntry | null {
 export default definePlugin({
     name: "UrlHighlighter",
     description: "Highlights URLs in messages that match your patterns.",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.prism],
     settings,
 
diff --git a/src/equicordplugins/userpfp/AvatarModal.tsx b/src/equicordplugins/userpfp/AvatarModal.tsx
index 35708dc80..bd730895f 100644
--- a/src/equicordplugins/userpfp/AvatarModal.tsx
+++ b/src/equicordplugins/userpfp/AvatarModal.tsx
@@ -5,32 +5,68 @@
  */
 
 import { set } from "@api/DataStore";
-import { classNameFactory } from "@api/Styles";
 import { Button } from "@components/Button";
 import { Flex } from "@components/Flex";
 import { Heading } from "@components/Heading";
-import { Margins } from "@utils/margins";
+import { Margins } from "@components/margins";
+import { classNameFactory } from "@utils/css";
 import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot } from "@utils/modal";
-import { TextInput, useState } from "@webpack/common";
+import { IconUtils, React, TextInput, Toasts, UserStore, useState } from "@webpack/common";
 
 import { data, KEY_DATASTORE } from ".";
-const cl = classNameFactory("vc-custom-avatars-");
 
-export function SetAvatarModal({ userId, modalProps }: { userId: string, modalProps: ModalProps; }) {
+const cl = classNameFactory("vc-userpfp-");
+
+function fileToDataUrl(file: File): Promise<string> {
+    return new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.onload = () => resolve(reader.result as string);
+        reader.onerror = reject;
+        reader.readAsDataURL(file);
+    });
+}
+
+export function SetAvatarModal({ userId, modalProps }: { userId: string; modalProps: ModalProps; }) {
     const { avatars } = data;
-    const initialAvatarUrl = avatars[userId] || "";
-    const [url, setUrl] = useState(initialAvatarUrl);
+    const user = UserStore.getUser(userId);
+    const originalAvatar = IconUtils.getUserAvatarURL(user, true, 128) || "";
+
+    const [url, setUrl] = useState(avatars[userId] || "");
+    const [preview, setPreview] = useState<string>(avatars[userId] || "");
+    const [isDragging, setIsDragging] = useState(false);
+    const fileInputRef = React.useRef<HTMLInputElement>(null);
 
     function handleKey(e: KeyboardEvent) {
         if (e.key === "Enter") saveUserAvatar();
     }
 
+    function handleUrlChange(val: string) {
+        setUrl(val);
+        setPreview(val.trim());
+    }
+
+    async function handleFile(file: File) {
+        if (!file.type.startsWith("image/")) return;
+
+        if (file.type === "image/gif" || file.type === "image/webp") {
+            Toasts.show({
+                message: "GIFs/WebP must be added via URL. Upload your GIF/WebP to a image hosting service and paste the link.",
+                type: Toasts.Type.FAILURE,
+                id: Toasts.genId(),
+            });
+            return;
+        }
+
+        const dataUrl = await fileToDataUrl(file);
+        setUrl(dataUrl);
+        setPreview(dataUrl);
+    }
+
     async function saveUserAvatar() {
         if (!url.trim()) {
             await deleteUserAvatar();
             return;
         }
-
         avatars[userId] = url.trim();
         await set(KEY_DATASTORE, avatars);
         modalProps.onClose();
@@ -48,20 +84,71 @@ export function SetAvatarModal({ userId, modalProps }: { userId: string, modalPr
                 <Heading tag="h3">Custom Avatar</Heading>
                 <ModalCloseButton onClick={modalProps.onClose} />
             </ModalHeader>
+
             <ModalContent className={cl("modal-content")} onKeyDown={handleKey}>
-                <section className={Margins.bottom16}>
+
+                {/* Preview */}
+                <div className={cl("preview-row")}>
+                    <div className={cl("preview-box")}>
+                        <span className={cl("preview-label")}>Original</span>
+                        <img src={originalAvatar} className={cl("avatar")} alt="original" />
+                    </div>
+                    <span className={cl("arrow")}>→</span>
+                    <div className={cl("preview-box")}>
+                        <span className={cl("preview-label")}>Local</span>
+                        <img
+                            src={preview || originalAvatar}
+                            className={`${cl("avatar")} ${preview ? cl("avatar-active") : ""}`}
+                            alt="local"
+                        />
+                    </div>
+                </div>
+
+                {/* URL input */}
+                <section className={Margins.bottom8}>
                     <Heading tag="h3">Enter PNG/GIF URL</Heading>
                     <TextInput
                         placeholder="https://example.com/image.png"
-                        value={url}
-                        onChange={setUrl}
+                        value={url.startsWith("data:") ? "(uploaded file)" : url}
+                        onChange={handleUrlChange}
                         autoFocus
                     />
                 </section>
+
+                {/* Drag & drop */}
+                <div
+                    className={`${cl("dropzone")} ${isDragging ? cl("dropzone-active") : ""}`}
+                    onDragOver={e => { e.preventDefault(); setIsDragging(true); }}
+                    onDragLeave={() => setIsDragging(false)}
+                    onDrop={e => {
+                        e.preventDefault();
+                        setIsDragging(false);
+                        const file = e.dataTransfer.files?.[0];
+                        if (file) handleFile(file);
+                    }}
+                    onClick={() => fileInputRef.current?.click()}
+                >
+                    {isDragging ? "Drop here!" : "⬆ Drag an image or click to upload (for GIFs or WebP use a URL instead)"}
+                    <input
+                        ref={fileInputRef}
+                        type="file"
+                        accept="image/png,image/jpeg"
+                        style={{ display: "none" }}
+                        onChange={e => {
+                            const file = e.currentTarget.files?.[0];
+                            if (file) handleFile(file);
+                            e.currentTarget.value = "";
+                        }}
+                    />
+                </div>
+
             </ModalContent>
+
             <ModalFooter className={cl("modal-footer")}>
                 <Flex gap="8px">
-                    {avatars[userId] && (<Button variant="dangerPrimary" onClick={deleteUserAvatar}>Delete</Button>)}
+                    {avatars[userId] && (
+                        <Button variant="dangerPrimary" onClick={deleteUserAvatar}>Delete</Button>
+                    )}
                     <Button onClick={saveUserAvatar}>Save</Button>
                 </Flex>
             </ModalFooter>
diff --git a/src/equicordplugins/userpfp/index.tsx b/src/equicordplugins/userpfp/index.tsx
index 777fb40c5..0bc2c5782 100644
--- a/src/equicordplugins/userpfp/index.tsx
+++ b/src/equicordplugins/userpfp/index.tsx
@@ -65,7 +65,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "UserPFP",
     description: "Allows you to use an animated avatar without Nitro",
-    authors: [EquicordDevs.nexpid, Devs.thororen, EquicordDevs.soapphia],
+    tags: ["Appearance", "Customisation", "Servers"],
+    authors: [EquicordDevs.nexpid, Devs.thororen, EquicordDevs.soapphia, EquicordDevs.sketchmyname],
     settings,
     data,
     settingsAboutComponent: () => (
@@ -129,13 +130,20 @@ export default definePlugin({
         if (settings.store.preferNitro && user.avatar?.startsWith("a_")) return original(user, animated, size);
         if (!data.avatars[user.id]) return original(user, animated, size);
 
-        const res = new URL(data.avatars[user.id]);
-        res.searchParams.set("animated", animated ? "true" : "false");
-        if (res && !animated) {
-            res.pathname = res.pathname.replaceAll(/\.gifv?/g, ".png");
-        }
+        const avatarUrl = data.avatars[user.id];
 
-        return res.toString();
+        if (avatarUrl.startsWith("data:")) return avatarUrl;
+
+        try {
+            const res = new URL(avatarUrl);
+            res.searchParams.set("animated", animated ? "true" : "false");
+            if (!animated) {
+                res.pathname = res.pathname.replaceAll(/\.gifv?/g, ".png");
+            }
+            return res.toString();
+        } catch {
+            return original(user, animated, size);
+        }
     },
     getAvatarServerHook: (original: any) => (config: any) => {
         const { userId, avatar, size, canAnimate } = config;
@@ -169,4 +177,4 @@ export default definePlugin({
             .then(remote => remote?.avatars && Object.assign(data.avatars, remote.avatars))
             .catch(() => null);
     }
-});
+});
\ No newline at end of file
diff --git a/src/equicordplugins/userpfp/styles.css b/src/equicordplugins/userpfp/styles.css
index 80d54852c..7a55af88b 100644
--- a/src/equicordplugins/userpfp/styles.css
+++ b/src/equicordplugins/userpfp/styles.css
@@ -9,4 +9,64 @@
 
 .vc-userpfp-settings-heart {
     margin-left: 6px;
+}
+
+.vc-userpfp-preview-row {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: row;
+    gap: 24px;
+    margin: 12px 0;
+}
+
+.vc-userpfp-preview-box {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 6px;
+}
+
+.vc-userpfp-preview-label {
+    font-size: 11px;
+    color: var(--text-muted);
+    text-transform: uppercase;
+    letter-spacing: 0.08em;
+}
+
+.vc-userpfp-avatar {
+    width: 80px;
+    height: 80px;
+    border-radius: 50%;
+    object-fit: cover;
+    border: 3px solid var(--background-modifier-accent);
+}
+
+.vc-userpfp-avatar-active {
+    border: 3px solid var(--brand-experiment);
+    box-shadow: 0 0 12px var(--brand-experiment-30a);
+}
+
+.vc-userpfp-arrow {
+    font-size: 24px;
+    color: var(--text-muted);
+    margin-top: 20px;
+}
+
+.vc-userpfp-dropzone {
+    border: 2px dashed var(--background-modifier-accent);
+    border-radius: 10px;
+    padding: 20px;
+    text-align: center;
+    cursor: pointer;
+    transition: background-color 0.15s, border-color 0.15s;
+    user-select: none;
+    color: var(--text-muted);
+    font-size: 14px;
+    margin-top: 8px;
+}
+
+.vc-userpfp-dropzone-active {
+    border-color: var(--brand-experiment);
+    background: var(--brand-experiment-10a);
 }
\ No newline at end of file
diff --git a/src/equicordplugins/userpluginInstaller.dev/VariableWithCallbacks.ts b/src/equicordplugins/userpluginInstaller.dev/VariableWithCallbacks.ts
new file mode 100644
index 000000000..b87476fe2
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/VariableWithCallbacks.ts
@@ -0,0 +1,40 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 nin0
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export class VariableWithCallbacks<T> {
+    #value: T;
+    #callbacks: {
+        id: number;
+        callback: (value: T, id: number) => void;
+    }[] = [];
+
+    constructor(value: T) {
+        this.#value = value;
+    }
+
+    value(newValue?: T): T {
+        if (newValue !== undefined) {
+            this.#value = newValue;
+            this.#callbacks.forEach(c => c.callback(this.#value, c.id));
+        }
+        return this.#value;
+    }
+
+    registerCallback(callback: (value: T, id: number) => void): number {
+        const id = Date.now();
+        this.#callbacks.push({
+            id,
+            callback
+        });
+        return id;
+    }
+
+    deregisterCallback(id: number) {
+        const possibleFallback = this.#callbacks.find(cb => cb.id === id);
+        if (!possibleFallback) return;
+        this.#callbacks.splice(this.#callbacks.indexOf(possibleFallback), 1);
+    }
+}
diff --git a/src/equicordplugins/userpluginInstaller.dev/components/SettingsTab.tsx b/src/equicordplugins/userpluginInstaller.dev/components/SettingsTab.tsx
new file mode 100644
index 000000000..0bc5a1c53
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/components/SettingsTab.tsx
@@ -0,0 +1,340 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 nin0
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { pluginRequiresRestart, startPlugin, stopPlugin } from "@api/PluginManager";
+import { useSettings } from "@api/Settings";
+import { BaseText } from "@components/BaseText";
+import { Button } from "@components/Button";
+import { Card } from "@components/Card";
+import { CheckedTextInput } from "@components/CheckedTextInput";
+import { HeadingTertiary } from "@components/Heading";
+import { DeleteIcon } from "@components/Icons";
+import { Paragraph } from "@components/Paragraph";
+import { AddonCard } from "@components/settings";
+import {
+    SettingsTab as STab,
+    wrapTab,
+} from "@components/settings/tabs/BaseTab";
+import { classes, isObjectEmpty } from "@utils/misc";
+import { closeAllModals } from "@utils/modal";
+import { relaunch } from "@utils/native";
+import { Alerts, NavigationRouter, Toasts, useEffect, useState } from "@webpack/common";
+
+import userpluginInstaller, { Native } from "..";
+import {
+    cl,
+    CLONE_LINK_REGEX,
+    showInstallFinishedAlert,
+} from "../misc/constants";
+
+function UserPluginsTab() {
+    const rs = useSettings(["plugins.*"]);
+    const [pluginsLoaded, loadPlugins] = useState(false);
+    const [plugins, setPlugins] = useState<
+        {
+            name: string;
+            description: string;
+            usesPreSend: boolean;
+            usesNative: boolean;
+            directory?: string;
+            remote: string;
+            supportChannelID?: string;
+        }[]
+    >([]);
+    const [url, setUrl] = useState("");
+    const [valid, setValid] = useState(false);
+    const [pluginsWithUpdates, setPluginsWithUpdates] = useState<
+        Record<string, string>
+    >({});
+    const [updatesLoaded, loadUpdates] = useState(false);
+
+    useEffect(() => {
+        const { plugins: plgobj, pluginsWithUpdates: pwug } =
+            userpluginInstaller;
+        setPlugins(plgobj.value());
+        loadPlugins(true);
+        const cid2 = plgobj.registerCallback(value => setPlugins(value));
+
+        const setPWU = value => {
+            const pwu = value.plugins.map(pg => ({
+                [pg]: plgobj.value().find(pfjh => pfjh.directory === pg)
+                    ?.name,
+            }));
+            setPluginsWithUpdates(Object.assign({}, ...pwu));
+            loadUpdates(value.finished);
+        };
+        const cid = pwug.registerCallback(value => {
+            setPWU(value);
+        });
+        setPWU(pwug.value());
+
+        return () => {
+            pwug.deregisterCallback(cid);
+            plgobj.deregisterCallback(cid2);
+        };
+    }, []);
+
+    return (
+        <STab
+            // @ts-ignore
+            title={`UserPlugins${pluginsLoaded ? ` (${plugins.length}, ${plugins.filter(p => Vencord.Settings.plugins[p.name].enabled).length} enabled)` : ""}`}
+        >
+            <div className={cl("update-check-container")}>
+                {isObjectEmpty(pluginsWithUpdates) ? (
+                    !updatesLoaded && (
+                        <BaseText>Checking for updates...</BaseText>
+                    )
+                ) : (
+                    <Card
+                        className={classes(cl("info-card"), "vc-warning-card")}
+                    >
+                        <HeadingTertiary className={cl("install-title")}>
+                            Plugin Updates Available
+                        </HeadingTertiary>
+                        <Paragraph className={cl("install-desc")}>
+                            The following plugins are out-of-date:
+                            <ul className={cl("outdated-list")}>
+                                {Object.values(pluginsWithUpdates)
+                                    .toSorted()
+                                    .map(pl => (
+                                        <li key={pl}>{pl}</li>
+                                    ))}
+                            </ul>
+                            {!updatesLoaded &&
+                                "and possibly more, as update checking is not finished. "}
+                            You can update plugins below.
+                        </Paragraph>
+                    </Card>
+                )}
+            </div>
+            <Card className={cl("info-card")}>
+                <HeadingTertiary className={cl("install-title")}>
+                    Install Plugin
+                </HeadingTertiary>
+                <Paragraph className={cl("install-desc")}>
+                    You can install a plugin from GitHub, GitLab, Codeberg,
+                    git.nin0.dev, or plugins.nin0.dev by pasting its clone URL
+                    here.
+                </Paragraph>
+                <div className={cl("install-field")}>
+                    <CheckedTextInput
+                        onChange={t => setUrl(t)}
+                        validate={t => {
+                            const match = t.match(CLONE_LINK_REGEX);
+                            if (match) {
+                                const idpl = match.includes("plugins.nin0.dev")
+                                    ? 1
+                                    : 0;
+                                const installed = plugins
+                                    .map(p => p.directory)
+                                    .includes(match[[3, 6][idpl]]);
+                                if (installed) {
+                                    setValid(false);
+                                    return "Plugin already installed, update below";
+                                }
+                                setValid(true);
+                                return true;
+                            } else {
+                                setValid(false);
+                                return "Invalid URL, read the notice above";
+                            }
+                        }}
+                        initialValue={url}
+                    />
+                </div>
+                <div className={cl("button-container")}>
+                    <Button
+                        disabled={!valid}
+                        className={cl("install-button")}
+                        onClick={async () => {
+                            const gitLink = url.match(CLONE_LINK_REGEX)!;
+                            const idpl = gitLink.includes("plugins.nin0.dev")
+                                ? 1
+                                : 0;
+                            try {
+                                const { name, native } = JSON.parse(
+                                    await Native.initPluginInstall(
+                                        gitLink[0],
+                                        gitLink[[1, 4][idpl]],
+                                        gitLink[[2, 5][idpl]],
+                                        gitLink[[3, 6][idpl]],
+                                    ),
+                                );
+                                showInstallFinishedAlert(name, native);
+                            } catch (e: any) {
+                                if (e.toString().includes("silentStop")) return;
+                                Alerts.show({
+                                    title: "Install error",
+                                    body: e.toString(),
+                                });
+                            }
+                        }}
+                    >
+                        Install
+                    </Button>
+                </div>
+            </Card>
+            <div className={cl("plugins-container")}>
+                {pluginsLoaded ? (
+                    <div className={cl("plugins-grid")}>
+                        {plugins
+                            .toSorted((a, b) =>
+                                a.name.localeCompare(b.name, "en", {
+                                    sensitivity: "base",
+                                }),
+                            )
+                            .toSorted((a, b) => {
+                                const updatePendingNames =
+                                    Object.keys(pluginsWithUpdates);
+                                const [aa, bb] = [
+                                    updatePendingNames.includes(a.directory!)
+                                        ? 1000
+                                        : 0,
+                                    updatePendingNames.includes(b.directory!)
+                                        ? 1000
+                                        : 0,
+                                ];
+                                return bb - aa;
+                            })
+                            .map(plugin => {
+
+                                const pl = Vencord.Plugins.plugins[
+                                    plugin.name
+                                ];
+                                return <AddonCard
+                                    key={pl.name}
+                                    name={pl.name}
+                                    description={pl.description}
+                                    enabled={rs.plugins[pl.name].enabled}
+                                    infoButton={<button
+                                        role="switch"
+                                        onClick={async () => {
+                                            await Native.rmPlugin(
+                                                plugin.directory!,
+                                            );
+                                            Alerts.show({
+                                                title: "Done!",
+                                                body: `${plugin.name} has been uninstalled. A ${plugin.usesNative ? "restart" : "refresh"} is needed to fully remove the plugin.`,
+                                                confirmText:
+                                                    plugin.usesNative
+                                                        ? "Restart"
+                                                        : "Refresh",
+                                                cancelText: "Later",
+                                                onConfirm() {
+                                                    plugin.usesNative
+                                                        ? relaunch()
+                                                        : window.location.reload();
+                                                },
+                                            });
+                                        }}
+                                        className={cl("delete-button")}
+                                    >
+                                        <DeleteIcon />
+                                    </button>}
+                                    setEnabled={t => {
+                                        Vencord.Settings.plugins[pl.name].enabled = t;
+                                        if (pluginRequiresRestart(pl)) {
+                                            Toasts.show({
+                                                id: Toasts.genId(),
+                                                message: "Restart to apply changes!",
+                                                type: Toasts.Type.MESSAGE
+                                            });
+                                        } else {
+                                            (t ? startPlugin : stopPlugin)(pl);
+                                        }
+                                    }}
+                                    footer={(
+                                        <div className={cl("plugin-footer")}>
+                                            {Object.keys(
+                                                pluginsWithUpdates,
+                                            ).includes(plugin.directory!) && (
+                                                    <Button
+                                                        size="small"
+                                                        onClick={async () => {
+                                                            try {
+                                                                await Native.updatePlugin(
+                                                                    plugin.directory!,
+                                                                );
+                                                                const oldPWU =
+                                                                    userpluginInstaller.pluginsWithUpdates.value()
+                                                                        .plugins;
+                                                                oldPWU.splice(
+                                                                    oldPWU.indexOf(
+                                                                        plugin.directory!,
+                                                                    ),
+                                                                    1,
+                                                                );
+                                                                userpluginInstaller.pluginsWithUpdates.value(
+                                                                    {
+                                                                        finished: true,
+                                                                        plugins: oldPWU,
+                                                                    },
+                                                                );
+                                                                Alerts.show({
+                                                                    title: "Done!",
+                                                                    body: `${plugin.name} has been updated. A ${plugin.usesNative ? "restart" : "refresh"} is needed to apply the update.`,
+                                                                    confirmText:
+                                                                        plugin.usesNative
+                                                                            ? "Restart"
+                                                                            : "Refresh",
+                                                                    cancelText: "Later",
+                                                                    onConfirm() {
+                                                                        plugin.usesNative
+                                                                            ? relaunch()
+                                                                            : window.location.reload();
+                                                                    },
+                                                                });
+                                                            } catch (e: any) {
+                                                                if (
+                                                                    e
+                                                                        .toString()
+                                                                        .includes(
+                                                                            "silentStop",
+                                                                        )
+                                                                )
+                                                                    return;
+                                                                Alerts.show({
+                                                                    title: "Update error",
+                                                                    body: e.toString(),
+                                                                });
+                                                            }
+                                                        }}
+                                                    >
+                                                        Update
+                                                    </Button>
+                                                )}
+                                            <Button
+                                                variant="secondary"
+                                                size="small"
+                                                disabled={plugin.remote === ""}
+                                                onClick={() =>
+                                                    VencordNative.native.openExternal(
+                                                        plugin.remote,
+                                                    )
+                                                }
+                                            >
+                                                Source
+                                            </Button>
+                                            {plugin.supportChannelID && <Button variant="secondary" size="small" onClick={() => {
+                                                closeAllModals();
+                                                NavigationRouter.transitionTo(`/channels/1015060230222131221/${plugin.supportChannelID}`);
+                                            }}>
+                                                Support
+                                            </Button>}
+                                        </div>
+                                    )}
+                                />;
+                            })}
+                    </div>
+                ) : (
+                    <BaseText>Loading plugins...</BaseText>
+                )}
+            </div>
+        </STab>
+    );
+}
+
+export default wrapTab(UserPluginsTab, "UserPlugins");
diff --git a/src/equicordplugins/userpluginInstaller.dev/components/UserpluginInstallButton.tsx b/src/equicordplugins/userpluginInstaller.dev/components/UserpluginInstallButton.tsx
new file mode 100644
index 000000000..753a93961
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/components/UserpluginInstallButton.tsx
@@ -0,0 +1,55 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 nin0
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Button } from "@components/Button";
+import { Alerts, ChannelStore, useEffect, useState } from "@webpack/common";
+
+import userpluginInstaller, { Native, OpenSettingsModule, settings } from "..";
+import { CLONE_LINK_REGEX, showInstallFinishedAlert, WHITELISTED_SHARE_CHANNELS } from "../misc/constants";
+
+export default function UserpluginInstallButton({ props }: any) {
+    const [plugins, setPlugins] = useState<{
+        directory?: string;
+    }[]>([]);
+    useEffect(() => {
+        const { plugins } = userpluginInstaller;
+
+        setPlugins(plugins.value());
+        const cid = plugins.registerCallback(value => setPlugins(plugins.value()));
+        return () => plugins.deregisterCallback(cid);
+    });
+    const { message } = props;
+    if (![...WHITELISTED_SHARE_CHANNELS, ...(settings.store.allowlistedChannels || "").split(",")].includes(ChannelStore.getChannel(message.channel_id).parent_id) && !WHITELISTED_SHARE_CHANNELS.includes(message.channel_id))
+        return;
+    const gitLink = (props.message.content as string).match(CLONE_LINK_REGEX);
+    if (!gitLink) return;
+    const idpl = gitLink.includes("plugins.nin0.dev") ? 1 : 0;
+    const installed = plugins.map(p => p.directory).includes(gitLink[[3, 6][idpl]]);
+    return <>
+        <div style={{ display: "flex" }}>
+            <Button style={{
+                marginTop: "5px"
+            }}
+                variant={installed ? "secondary" : "primary"}
+                onClick={async () => {
+                    if (installed) return void OpenSettingsModule.openUserSettings("vencord_userplugins_panel");
+                    try {
+                        const { name, native } = JSON.parse(await Native.initPluginInstall(gitLink[0], gitLink[[1, 4][idpl]], gitLink[[2, 5][idpl]], gitLink[[3, 6][idpl]]));
+                        showInstallFinishedAlert(name, native);
+                    }
+                    catch (e: any) {
+                        if (e.toString().includes("silentStop")) return;
+                        Alerts.show({
+                            title: "Install error",
+                            body: e.toString()
+                        });
+                    }
+                }}>
+                {installed ? "Manage plugins" : "Install plugin"}
+            </Button>
+        </div>
+    </>;
+}
diff --git a/src/equicordplugins/userpluginInstaller.dev/index.tsx b/src/equicordplugins/userpluginInstaller.dev/index.tsx
new file mode 100644
index 000000000..b0919edf6
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/index.tsx
@@ -0,0 +1,147 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 nin0
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./misc/style.css";
+
+import { showNotification } from "@api/Notifications";
+import { definePluginSettings } from "@api/Settings";
+import { Button } from "@components/Button";
+import { Notice } from "@components/Notice";
+import plSettings from "@plugins/_core/settings";
+import { Devs } from "@utils/constants";
+import { relaunch } from "@utils/native";
+import definePlugin, { OptionType, PluginNative } from "@utils/types";
+import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
+import { Alerts } from "@webpack/common";
+
+import SettingsTab from "./components/SettingsTab";
+import UserpluginInstallButton from "./components/UserpluginInstallButton";
+import { VariableWithCallbacks } from "./VariableWithCallbacks";
+
+// @ts-ignore
+export const Native = VencordNative.pluginHelpers.UserpluginInstaller as PluginNative<typeof import("./native")>;
+export const OpenSettingsModule = findByPropsLazy("openUserSettings");
+const AppsIcon = findComponentByCodeLazy("2.95H20a2 2 0");
+
+export const settings = definePluginSettings({
+    allowlistedChannels: {
+        type: OptionType.STRING,
+        description: "Comma separated list of channels where the Install Plugin button should be displayed. It is always displayed in the Vencord Userplugin channels"
+    },
+    notifyIfUpdate: {
+        type: OptionType.BOOLEAN,
+        description: "Show a Vencord notification if UserPlugins need to be updated",
+        default: true
+    },
+    neverNotifyForPlugins: {
+        type: OptionType.STRING,
+        description: "Never show update notifications for these plugins (you can still update them from the UserPlugins tab)",
+        default: ""
+    },
+    setGitPath: {
+        type: OptionType.COMPONENT,
+        component: () => <Button onClick={() => {
+            Native.openGitPathModal();
+        }} variant="secondary">
+            Set Git path
+        </Button>
+    }
+});
+
+export default definePlugin({
+    name: "UserpluginInstaller",
+    description: "Install userplugins with a simple button click",
+    settingsAboutComponent: () => (
+        <Notice.Warning>
+            Equicord does not moderate userplugins and takes no responsibility for anything that may result from installing them.
+            Only install userplugins from developers you trust. Doing so is entirely at your own risk.
+        </Notice.Warning>
+    ),
+    async checkPluginUpdates() {
+        for (const p of this.plugins.value()) {
+            if (await Native.isUpdateAvailableForPlugin(p.directory!)) {
+                const t = this.pluginsWithUpdates.value().plugins;
+                t.push(p.directory!);
+                this.pluginsWithUpdates.value({
+                    finished: false,
+                    plugins: t
+                });
+            }
+        }
+        const t = this.pluginsWithUpdates.value().plugins;
+        this.pluginsWithUpdates.value({
+            finished: true,
+            plugins: t
+        });
+    },
+    section: {
+        key: "vencord_userplugins",
+        title: "UserPlugins",
+        panelTitle: "UserPlugins",
+        Component: SettingsTab,
+        Icon: AppsIcon
+    },
+    async start() {
+        if (!VencordNative.pluginHelpers.UserpluginInstaller) return void Alerts.show({
+            title: "UserpluginInstaller not fully loaded",
+            body: "You need to restart to allow the native to be loaded :)",
+            confirmText: "Restart now",
+            onConfirm() {
+                relaunch();
+            },
+            cancelText: "Later"
+        });
+
+        await Native.ensurePluginsDirectory();
+
+        plSettings.customEntries.push(this.section);
+
+        this.pluginsWithUpdates.registerCallback((value, id) => {
+            if (value.plugins.length === 0) return;
+            if (settings.store.neverNotifyForPlugins.split(",").map(t => t.trim().toLowerCase()).includes(value.plugins[value.plugins.length - 1].toLowerCase()))
+                return;
+            this.pluginsWithUpdates.deregisterCallback(id);
+            if (settings.store.notifyIfUpdate)
+                showNotification({
+                    title: "Some UserPlugins are out of date!",
+                    body: "Click to open the UserPlugin Updater",
+                    noPersist: true,
+                    permanent: true,
+                    onClick() {
+                        OpenSettingsModule.openUserSettings("vencord_userplugins_panel");
+                    },
+                });
+        });
+        const pls = await Native.getUserplugins();
+        // @ts-ignore :trolley:
+        this.plugins.value(pls);
+        await this.checkPluginUpdates();
+    },
+    stop() {
+        // @ts-ignore
+        plSettings.customEntries.splice(plSettings.customEntries.indexOf(this.section), 1);
+    },
+    plugins: new VariableWithCallbacks<{
+        name: string;
+        description: string;
+        usesPreSend: boolean;
+        usesNative: boolean;
+        directory: string;
+        remote: string;
+    }[]>([]),
+    pluginsWithUpdates: new VariableWithCallbacks<{
+        finished: boolean;
+        plugins: string[];
+    }>({
+        finished: false,
+        plugins: []
+    }),
+    settings,
+    authors: [Devs.nin0dev],
+    renderMessageAccessory: props => {
+        return <UserpluginInstallButton props={props} />;
+    }
+});
diff --git a/src/equicordplugins/userpluginInstaller.dev/misc/constants.ts b/src/equicordplugins/userpluginInstaller.dev/misc/constants.ts
new file mode 100644
index 000000000..b860a82c3
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/misc/constants.ts
@@ -0,0 +1,28 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 nin0
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { classNameFactory } from "@api/Styles";
+import { relaunch } from "@utils/native";
+import { Alerts } from "@webpack/common";
+
+// if edited, also edit in native.ts!!!
+export const CLONE_LINK_REGEX = /https:\/\/(?:((?:git(?:hub|lab)\.com|git\.(?:[a-zA-Z0-9]|\.)+|codeberg\.org))\/(?!user-attachments)((?:[a-zA-Z0-9]|-)+)\/((?:[a-zA-Z0-9]|-|\.)+)(?:\.git)?|(plugins\.(nin0)\.dev)\/((?:[a-zA-Z0-9]|-|\.)+))(?:\/)?/;
+export const WHITELISTED_SHARE_CHANNELS = ["1256395889354997771", "1032200195582197831", "1301947896601509900", "1322935137591365683"];
+export const cl = classNameFactory("vc-userplugininstaller-");
+
+export function showInstallFinishedAlert(pluginToEnable: string, native: boolean) {
+    Alerts.show({
+        title: "Done!",
+        body: `${pluginToEnable} has been successfully installed.${native ? " However, as it makes use of native functions, a client restart is required." : ""} What now?`,
+        confirmText: `Enable & ${native ? "restart" : "refresh"}`,
+        cancelText: native ? "Restart" : "Refresh",
+        onConfirm() {
+            !Vencord.Plugins.plugins[pluginToEnable] ? Vencord.Settings.plugins[pluginToEnable] = { enabled: true } : Vencord.Settings.plugins[pluginToEnable].enabled = true;
+            native ? relaunch() : window.location.reload();
+        },
+        onCancel: () => native ? relaunch() : window.location.reload()
+    });
+}
diff --git a/src/equicordplugins/userpluginInstaller.dev/misc/pluginValidate.txt b/src/equicordplugins/userpluginInstaller.dev/misc/pluginValidate.txt
new file mode 100644
index 000000000..9486605c9
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/misc/pluginValidate.txt
@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>Review userplugin</title>
+        <script>
+            document.addEventListener("DOMContentLoaded", () => {
+                document
+                    .querySelector("#abort")
+                    .addEventListener("click", () => {
+                        document.title = "abortInstall";
+                    });
+                document
+                    .querySelector("#install")
+                    .addEventListener("click", () => {
+                        if (
+                            !document
+                                .querySelector("style")
+                                .innerHTML.includes(
+                                    "#native-ts-warning { display: none !important; }"
+                                ) &&
+                            !document.querySelector("input[type='checkbox']")
+                                .checked
+                        )
+                            return alert(
+                                "Make sure to acknowledge all warnings before installing."
+                            );
+                        document.title = "install";
+                    });
+
+                document.querySelector("style").innerHTML +=
+                    document.querySelector("addAtRuntimeStyle").innerHTML;
+            });
+        </script>
+        <style>
+            addAtRuntimeStyle {
+                display: none !important;
+            }
+            * {
+                font-family: sans-serif;
+                color: #cdd6f4;
+            }
+            body {
+                background-color: #1e1e2e;
+                padding: 10px;
+                display: flex;
+                flex-direction: column;
+            }
+            .card {
+                padding: 10px 12px;
+                border: 1px solid #9399b2;
+                border-radius: 10px;
+                margin-bottom: 10px; /* Added margin for better spacing */
+            }
+            .warn-card {
+                border-color: #f38ba8;
+                background-color: #313244;
+            }
+            .danger-card {
+                border-color: #f38ba8;
+                background-color: #313244;
+                h3 {
+                    color: #cdd6f4;
+                }
+            }
+            .card * {
+                margin: 0;
+            }
+            .card h3 {
+                margin-bottom: 5px;
+            }
+            input[type="checkbox"] {
+                margin-right: 5px;
+            }
+            #validate {
+                color: #f38ba8;
+            }
+            #btn-row {
+                display: flex;
+                flex: 1;
+            }
+            #btn-row * {
+                flex: 1;
+                margin: 5px;
+                padding: 10px 5px;
+                border: 1px solid #cdd6f4;
+                border-radius: 5px;
+            }
+            #abort {
+                background-color: #f38ba8;
+                color: #11111b;
+            }
+            #install {
+                color: #a6e3a1;
+                border-color: #a6e3a1;
+                background-color: #00000000;
+            }
+            #abort:hover {
+                background-color: #ec9393;
+                font-weight: bold;
+            }
+            #install:hover {
+                background-color: #425040;
+                font-weight: bold;
+            }
+        </style>
+        <addAtRuntimeStyle>
+            %WARNINGHIDER% %NATIVETSHIDER% %PRESENDHIDER%
+        </addAtRuntimeStyle>
+    </head>
+    <body>
+        <h2>Plugin info</h2>
+        <div class="card" id="plugin-info-card">
+            <h3>%PLUGINNAME%</h3>
+            <p>%PLUGINDESC%</p>
+        </div>
+
+        <h2 data-useless="warning">Warnings</h2>
+        <div
+            data-useless="warning"
+            class="card danger-card"
+            id="native-ts-warning"
+        >
+            <h3>Uses a native.ts file</h3>
+            <p>
+                Use of this file allows the plugin to escape the browser sandbox
+                and potentially do anything to your system and data.
+                <b
+                    >ONLY INSTALL THIS PLUGIN AFTER REVIEWING THE CODE AND BEING
+                    100% SURE THAT NOTHING BAD CAN BE DONE!</b
+                >
+            </p>
+            <br />
+            <input type="checkbox" /> Acknowledge warning (required to allow
+            install)
+        </div>
+        <div
+            data-useless="warning"
+            class="card warn-card"
+            id="pre-send-warning"
+        >
+            <h3>Has pre-send listeners</h3>
+            <p>
+                This allows the plugin to edit your messages before they are
+                sent.
+            </p>
+        </div>
+        <p id="validate">
+            Reminder: installing a userplugin can be a destructive action. Make
+            sure that you know and trust the developer before installing any.
+        </p>
+        <div id="btn-row">
+            <button id="abort">Cancel installation</button>
+            <button id="install">Install plugin</button>
+        </div>
+    </body>
+</html>
diff --git a/src/equicordplugins/userpluginInstaller.dev/misc/setGitPath.txt b/src/equicordplugins/userpluginInstaller.dev/misc/setGitPath.txt
new file mode 100644
index 000000000..5e4e6938e
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/misc/setGitPath.txt
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Git Path</title>
+    <script>
+        document.addEventListener("DOMContentLoaded", () => {
+            document.title
+            document.querySelector("#abort").addEventListener("click", () => {document.title = "abort";})
+            document.querySelector("#check").addEventListener("click", () => {document.title = `check-${document.querySelector("input").value.trim()}`; setTimeout(() => {document.title = "git";}, 1000)})
+            document.querySelector("#install").addEventListener("click", () => {document.title = `ok-${document.querySelector("input").value.trim()}`;})
+        });
+    </script>
+    <style>
+        * {
+            font-family: sans-serif;
+            color: #cdd6f4;
+        }
+
+        body {
+            background-color: #1e1e2e;
+            padding: 10px;
+            display: flex;
+            flex-direction: column;
+        }
+
+        #btn-row {
+            display: flex;
+            flex: 1;
+        }
+
+        #btn-row * {
+            flex: 1;
+            margin: 5px;
+            padding: 10px 5px;
+            border: 1px solid #cdd6f4;
+            border-radius: 5px;
+        }
+
+        #abort {
+            border-color: #f38ba8;
+            color: #f38ba8;
+            background-color: #00000000;
+        }
+
+        #install {
+            color: #a6e3a1;
+            border-color: #a6e3a1;
+            background-color: #00000000;
+        }
+
+        #check {
+            color: #a1afe3;
+            border-color: #a1afe3;
+            background-color: #00000000;
+        }
+
+        #abort:hover {
+            background-color: #504040;
+            font-weight: bold;
+        }
+
+        #check:hover {
+            background-color: #404550;
+            font-weight: bold;
+        }
+
+        #install:hover {
+            background-color: #425040;
+            font-weight: bold;
+        }
+
+        input {
+            background-color: #313244;
+            color: #cdd6f4;
+            padding: 5px 10px;
+            margin-bottom: 15px;
+            border: 1px solid #6c7086;
+            border-radius: 5px;
+
+            &:focus {
+                outline: none;
+                border: 2px solid #cdd6f4;
+                padding: 4px 9px;
+            }
+
+            &::placeholder {
+                color: #6c7086;
+            }
+        }
+    </style>
+</head>
+
+<body>
+    <h2>Git path</h2>
+    <p>
+        If you're having issues downloading userplugins because Git isn't properly detected, you can manually set a Git
+        path
+        that'll be used instead of
+        simply looking in PATH.
+        <br />
+        If you do not specify anything, Git will be called from the PATH variable. Do not set this setting unless you
+        have issues.
+        <br />
+        <br />
+        On Linux, Flatpak still isn't supported.
+    </p>
+    <input type="text" id="git-path" placeholder="Full, absolute path to Git" />
+    <div id="btn-row">
+        <button id="abort">Cancel</button>
+        <button id="check">Check</button>
+        <button id="install">Set</button>
+    </div>
+</body>
+
+</html>
diff --git a/src/equicordplugins/userpluginInstaller.dev/misc/style.css b/src/equicordplugins/userpluginInstaller.dev/misc/style.css
new file mode 100644
index 000000000..098e37ea6
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/misc/style.css
@@ -0,0 +1,78 @@
+.vc-userplugininstaller-info-card {
+    padding: 15px 20px;
+    margin-bottom: 20px;
+}
+
+.vc-userplugininstaller-install-desc {
+    margin-top: 5px;
+}
+
+.vc-userplugininstaller-install-field,
+.vc-userplugininstaller-button-container {
+    margin-top: 10px;
+}
+
+.vc-userplugininstaller-install-button {
+    margin-left: auto;
+}
+
+.vc-userplugininstaller-update-check-container {
+    margin-top: 10px;
+}
+
+.vc-userplugininstaller-plugins-grid {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 10px;
+    align-items: start;
+}
+
+.vc-userplugininstaller-info-button {
+    height: 24px;
+    width: 24px;
+    padding: 0;
+    background: transparent;
+    color: var(--icon-secondary);
+    transition: background-color 0.2s ease;
+
+    &:hover {
+        color: var(--interactive-hover);
+    }
+}
+
+.vc-userplugininstaller-settings-button:hover {
+    color: var(--interactive-hover);
+}
+
+.vc-userplugininstaller-plugin-footer {
+    margin-top: 10px;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 5px;
+
+    div {
+        flex-basis: 100%;
+        margin-top: 5px;
+        font-size: 0.9rem;
+    }
+}
+
+.vc-userplugininstaller-outdated-list {
+    padding-left: 30px;
+    margin: 3px 0;
+    list-style-type: disc;
+}
+
+.vc-userplugininstaller-delete-button {
+    height: 24px;
+    width: 24px;
+    padding: 0;
+    background: transparent;
+    margin-right: 8px;
+    color: var(--icon-muted);
+    transition: background-color .2s ease;
+
+    &:hover {
+        color: var(--red-new-46)
+    }
+}
diff --git a/src/equicordplugins/userpluginInstaller.dev/misc/updateValidate.txt b/src/equicordplugins/userpluginInstaller.dev/misc/updateValidate.txt
new file mode 100644
index 000000000..573200223
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/misc/updateValidate.txt
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>Review userplugin</title>
+        <script>
+            document.addEventListener("DOMContentLoaded", () => {
+                document
+                    .querySelector("#abort")
+                    .addEventListener("click", () => {
+                        document.title = "abortInstall";
+                    });
+                document
+                    .querySelector("#install")
+                    .addEventListener("click", () => {
+                        document.title = "install";
+                    });
+
+                for (const aEl of document.querySelectorAll("a")) {
+                    aEl.addEventListener("click", (e) => {
+                        e.preventDefault();
+                        document.title = `openLink:${aEl.href}`;
+                    });
+                }
+            });
+        </script>
+        <style>
+            addAtRuntimeStyle {
+                display: none !important;
+            }
+            * {
+                font-family: sans-serif;
+                color: #cdd6f4;
+            }
+            body {
+                background-color: #1e1e2e;
+                padding: 10px;
+                display: flex;
+                flex-direction: column;
+            }
+            .card {
+                padding: 10px 12px;
+                border: 1px solid #9399b2;
+                border-radius: 10px;
+                margin-bottom: 10px; /* Added margin for better spacing */
+            }
+            .warn-card {
+                border-color: #f38ba8;
+                background-color: #313244;
+            }
+            .danger-card {
+                border-color: #f38ba8;
+                background-color: #313244;
+                h3 {
+                    color: #cdd6f4;
+                }
+            }
+            .card * {
+                margin: 0;
+            }
+            .card h3 {
+                margin-bottom: 5px;
+            }
+            input[type="checkbox"] {
+                margin-right: 5px;
+            }
+            #validate {
+                color: #f38ba8;
+            }
+            #btn-row {
+                display: flex;
+                flex: 1;
+            }
+            #btn-row * {
+                flex: 1;
+                margin: 5px;
+                padding: 10px 5px;
+                border: 1px solid #cdd6f4;
+                border-radius: 5px;
+            }
+            #abort {
+                background-color: #f38ba8;
+                color: #11111b;
+            }
+            #install {
+                color: #a6e3a1;
+                border-color: #a6e3a1;
+                background-color: #00000000;
+            }
+            #abort:hover {
+                background-color: #ec9393;
+                font-weight: bold;
+            }
+            #install:hover {
+                background-color: #425040;
+                font-weight: bold;
+            }
+            a {
+                color: #89b4fa;
+            }
+        </style>
+    </head>
+    <body>
+        <h2>Plugin info</h2>
+        <div class="card" id="plugin-info-card">
+            <h3>%PLUGINNAME%</h3>
+            <p>%PLUGINDESC%</p>
+        </div>
+        <h2>Update info</h2>
+        <div class="card" id="update-info-card">
+            <p>%COMMITMESSAGE%</p>
+            <br />
+            <p>
+                You may want to review the
+                <a href="%REMOTE%">source code</a> that will be applied.
+            </p>
+        </div>
+
+        <p id="validate">
+            Reminder: installing a userplugin can be a destructive action. Make
+            sure that you know and trust the developer before installing any.
+        </p>
+        <div id="btn-row">
+            <button id="abort">Cancel update</button>
+            <button id="install">Apply update</button>
+        </div>
+    </body>
+</html>
diff --git a/src/equicordplugins/userpluginInstaller.dev/native.ts b/src/equicordplugins/userpluginInstaller.dev/native.ts
new file mode 100644
index 000000000..579190072
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/native.ts
@@ -0,0 +1,480 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 nin0
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { NativeSettings } from "@main/settings";
+import { exec, spawn } from "child_process";
+import { BrowserWindow, dialog, shell, WebContentsView } from "electron";
+import { existsSync, readdirSync, readFileSync } from "fs";
+import { mkdir, readdir, readFile, rm } from "fs/promises";
+import { basename, join } from "path";
+import yaml from "yaml-js";
+
+// @ts-ignore fuck off
+import pluginValidateContent from "./misc/pluginValidate.txt"; // i would use HTML but esbuild is being whiny
+// @ts-ignore fuck off
+import setGitPathContent from "./misc/setGitPath.txt";
+// @ts-ignore fuck off
+import updateValidateContent from "./misc/updateValidate.txt"; // see above
+
+const PLUGIN_META_REGEX = /export default definePlugin\((?:\s|\/(?:\/|\*).*)*{\s*(?:\s|\/(?:\/|\*).*)*name:\s*(?:"|'|`)(.*)(?:"|'|`)(?:\s|\/(?:\/|\*).*)*,(?:\s|\/(?:\/|\*).*)*.+(?:\s|\/(?:\/|\*).*)*description:\s*(?:"|'|`)(.*)(?:"|'|`)(?:\s|\/(?:\/|\*).*)*/;
+// if edited, also edit in misc/constants.ts!!!
+const CLONE_LINK_REGEX = /https:\/\/(?:((?:git(?:hub|lab)\.com|git\.(?:[a-zA-Z0-9]|\.)+|codeberg\.org))\/(?!user-attachments)((?:[a-zA-Z0-9]|-)+)\/((?:[a-zA-Z0-9]|-|\.)+)(?:\.git)?|(plugins\.(nin0)\.dev)\/((?:[a-zA-Z0-9]|-|\.)+))(?:\/)?/;
+
+const vencordPath = ["desktop", "equibop"].includes(basename(__dirname)) ? join(__dirname, "../") : __dirname;
+
+export async function ensurePluginsDirectory(_: any) {
+    if (!IS_DEV) return;
+    try {
+        await mkdir(join(vencordPath, "../src/userplugins"), { recursive: true });
+    } catch(e) { }
+}
+
+export async function rmPlugin(_, name: string): Promise<string> {
+    // eslint-disable-next-line
+    return new Promise(async (resolve, reject) => {
+        const ups = await getUserplugins();
+        const pl = ups.find(p => p.directory! === name);
+        if (!pl) return;
+
+        const deleteReqDialog = await dialog.showMessageBox({
+            title: "Uninstall plugin",
+            message: `Uninstall ${pl.name}`,
+            type: "error",
+            detail: `The uninstall of the userplugin ${pl.name} has been requested. Would you like to do so?\n\nIf you did not initiate this, press No.`,
+            buttons: ["No", "Yes"]
+        });
+
+        if (deleteReqDialog.response !== 1) return reject("User rejected");
+        await rm(join(vencordPath, "../src/userplugins", name), { recursive: true });
+
+        await build();
+        resolve("Done");
+    });
+}
+
+export async function isUpdateAvailableForPlugin(_, name: string): Promise<boolean> {
+    return new Promise(resolve => {
+        const pluginDir = join(vencordPath, "../src/userplugins", name);
+        const otherProc = exec("git fetch", {
+            cwd: pluginDir
+        });
+        otherProc.once("close", () => {
+            async function doStuff() {
+                try {
+                    const head = (await readFile(join(pluginDir, ".git/HEAD"), "utf8")).match(/^ref: (.+)/)![1];
+                    const remoteHead = (await readFile(join(pluginDir, ".git/refs/remotes/origin/HEAD"), "utf8")).match(/^ref: (.+)/)![1];
+                    const localCommit = await readFile(join(pluginDir, ".git", head), "utf8");
+                    const remoteCommit = await readFile(join(pluginDir, ".git", remoteHead), "utf8");
+
+                    resolve(localCommit !== remoteCommit);
+                }
+                catch (e) {
+                    resolve(false);
+                }
+            }
+            doStuff();
+        });
+    });
+}
+
+export function initPluginInstall(_, link: string, source: string, owner: string, repo: string): Promise<string> {
+    // eslint-disable-next-line
+    return new Promise(async (resolve, reject) => {
+        const verifiedRegex = link.match(CLONE_LINK_REGEX)!;
+        const idpl = source === "plugins.nin0.dev" ? 1 : 0;
+        if (![4, 7].includes(verifiedRegex.length) || verifiedRegex[0] !== link || verifiedRegex[[1, 4][idpl]] !== source || verifiedRegex[[2, 5][idpl]] !== owner || verifiedRegex[[3, 6][idpl]] !== repo) return reject("Invalid link");
+
+        // Ask for clone
+        const cloneDialog = await dialog.showMessageBox({
+            title: "Clone userplugin",
+            message: `You are about to clone a userplugin from ${source}.`,
+            type: "question",
+            detail: `The repository name is "${repo}" and it is owned by "${owner}".\nThe repository URL is ${link}\n\n(If you did not request this intentionally, choose Cancel)`,
+            buttons: ["Cancel", "Clone repository and continue install", "Open repository in browser"]
+        });
+        switch (cloneDialog.response) {
+            case 0: {
+                return reject("Rejected by user");
+            }
+            case 1: {
+                await cloneRepo(link, repo);
+                break;
+            }
+            case 2: {
+                await shell.openExternal(link);
+                return reject("silentStop");
+            }
+        }
+
+        // Get plugin meta
+        const meta = await getPluginMeta(join(vencordPath, "..", "src", "userplugins", repo));
+
+        // Review plugin
+        const win = new BrowserWindow({
+            maximizable: false,
+            minimizable: false,
+            width: 560,
+            height: meta.usesNative || meta.usesPreSend ? 650 : 360,
+            resizable: false,
+            webPreferences: {
+                devTools: true
+            },
+            title: "Review userplugin",
+            modal: true,
+            parent: BrowserWindow.getAllWindows()[0],
+            show: false,
+            autoHideMenuBar: true
+        });
+        const reView /* haha got it */ = new WebContentsView({
+            webPreferences: {
+                devTools: true,
+                nodeIntegration: true
+            }
+        });
+        win.contentView.addChildView(reView);
+        win.loadURL(generateReviewPluginContent(meta));
+        win.on("page-title-updated", async e => {
+            switch (win.webContents.getTitle() as "abortInstall" | "reviewCode" | "install") {
+                case "abortInstall": {
+                    win.close();
+                    await rm(join(vencordPath, "..", "src", "userplugins", repo), {
+                        recursive: true
+                    });
+                    return reject("Rejected by user");
+                }
+                case "install": {
+                    win.close();
+                    try {
+                        await build();
+                    }
+                    catch (e) {
+                        reject((e as Error).toString());
+                    }
+                    resolve(JSON.stringify({
+                        name: meta.name,
+                        native: meta.usesNative
+                    }));
+                    break;
+                }
+            }
+        });
+        win.show();
+    });
+}
+
+async function build(): Promise<any> {
+    return new Promise((resolve, reject) => {
+        const proc = exec("pnpm build --dev", {
+            cwd: join(vencordPath, ".."),
+            shell: process.env.SHELL || process.env.ComSpec || "/bin/sh"
+        });
+        proc.once("close", () => {
+            if (proc.exitCode !== 0) {
+                reject("Failed to build Vencord, try building from console");
+            }
+            resolve("Success");
+        });
+    });
+}
+
+async function getPluginMeta(path: string, extra: object = {}): Promise<{
+    name: string;
+    description: string;
+    usesPreSend: boolean;
+    usesNative: boolean;
+    directory?: string;
+    remote: string;
+    supportChannelID?: string;
+}> {
+    return new Promise((resolve, reject) => {
+        const files = readdirSync(path);
+        let fileToRead: "index.ts" | "index.tsx" | "index.js" | "index.jsx" | undefined;
+        files.forEach(f => {
+            if (f === "index.ts") fileToRead = "index.ts";
+            if (f === "index.tsx") fileToRead = "index.tsx";
+            if (f === "index.js") fileToRead = "index.js";
+            if (f === "index.jsx") fileToRead = "index.jsx";
+        });
+        if (!fileToRead) reject("Invalid plugin");
+
+        const file = readFileSync(`${path}/${fileToRead}`, "utf8");
+        let remoteURL;
+        try {
+            const remoteC = readFileSync(join(path, ".git/config"), "utf8");
+            remoteURL = remoteC.match(/\[remote "origin"]\s+url = (https:\/\/(?:(?:git(?:hub|lab)\.com|git\.(?:[a-zA-Z0-9]|\.)+|codeberg\.org)\/(?!user-attachments)(?:[a-zA-Z0-9]|-)+\/(?:[a-zA-Z0-9]|-|\.)+(?:\.git)?|(plugins\.(nin0)\.dev)\/((?:[a-zA-Z0-9]|-|\.)+))(?:\/)?)\n/);
+        } catch {
+            remoteURL = null;
+        }
+
+        let supportChannelID;
+        try {
+            const meta = readFileSync(join(path, "meta.yml"), "utf8");
+            console.log(meta);
+            const parsed = yaml.load(meta);
+            if (parsed.thread && typeof parsed.thread === "string" && /^\d+$/.test(parsed.thread)) {
+                supportChannelID = parsed.thread;
+            }
+        } catch {
+            supportChannelID = null;
+        }
+
+        const rawMeta = file.match(PLUGIN_META_REGEX);
+        resolve({
+            name: rawMeta![1],
+            description: rawMeta![2],
+            usesPreSend: file.includes("PreSendListener") || file.includes("onBeforeMessage"),
+            usesNative: files.includes("native.ts") || files.includes("native.js"),
+            remote: remoteURL ? remoteURL[1] : "",
+            supportChannelID,
+            ...extra
+        });
+
+    });
+}
+
+async function cloneRepo(link: string, repo: string): Promise<void> {
+    return new Promise((resolve, reject) => {
+        const proc = spawn("git", ["clone", link], {
+            cwd: join(vencordPath, "..", "src", "userplugins")
+        });
+        proc.once("close", async () => {
+            if (proc.exitCode !== 0) {
+                if (!existsSync(join(vencordPath, "..", "src", "userplugins", repo)))
+                    return reject("Failed to clone");
+                const deleteReqDialog = await dialog.showMessageBox({
+                    title: "Error",
+                    message: "Plugin already exists",
+                    type: "error",
+                    detail: `The plugin that you tried to clone already exists at ${join(vencordPath, "..", "src", "userplugins")}.\nWould you like to reclone it? Only do this if you want to reinstall or update the plugin.`,
+                    buttons: ["No", "Yes"]
+                });
+                if (deleteReqDialog.response !== 1) return reject("User rejected");
+                await rm(join(vencordPath, "..", "src", "userplugins", repo), {
+                    recursive: true
+                });
+                await cloneRepo(link, repo);
+            }
+            resolve();
+        });
+    });
+}
+
+function generateReviewPluginContent(meta: {
+    name: string;
+    description: string;
+    usesPreSend: boolean;
+    usesNative: boolean;
+}): string {
+    const template = pluginValidateContent.replace("%PLUGINNAME%", meta.name.replaceAll("<", "&lt;")).replace("%PLUGINDESC%", meta.description.replaceAll("<", "&lt;")).replace("%WARNINGHIDER%", !meta.usesNative && !meta.usesPreSend ? "[data-useless=\"warning\"] { display: none !important; }" : "").replace("%NATIVETSHIDER%", meta.usesNative ? "" : "#native-ts-warning { display: none !important; }").replace("%PRESENDHIDER%", meta.usesPreSend ? "" : "#pre-send-warning { display: none !important; }");
+    const buf = Buffer.from(template).toString("base64");
+    return `data:text/html;base64,${buf}`;
+}
+
+function generateUpdatePluginContent(meta: {
+    name: string;
+    description: string;
+    remote: string;
+    commit: string;
+}): string {
+    const template = updateValidateContent.replace("%PLUGINNAME%", meta.name.replaceAll("<", "&lt;")).replace("%PLUGINDESC%", meta.description.replaceAll("<", "&lt;")).replace("%REMOTE%", meta.remote).replace("%COMMITMESSAGE%", meta.commit.replaceAll("\n", "<br />"));
+    const buf = Buffer.from(template).toString("base64");
+    return `data:text/html;base64,${buf}`;
+}
+
+export async function getUserplugins() {
+    const folderContents = await readdir(join(vencordPath, "..", "src", "userplugins"), {
+        withFileTypes: true
+    });
+    const plugins = await Promise.allSettled(
+        folderContents
+            .filter(item => item.isDirectory())
+            .map(item => ({
+                path: join(item.parentPath, item.name),
+                directory: item.name
+            }))
+            .map(({ path, directory }) => getPluginMeta(path, { directory }))
+    );
+
+    return plugins
+        .filter(p => p.status === "fulfilled")
+        .map(p => p.value);
+}
+
+export async function updatePlugin(_, directory: string) {
+    return new Promise((resolve, reject) => {
+        const pluginDir = join(vencordPath, "../src/userplugins", directory);
+
+        async function doStuff() {
+            const pluginMeta = await getPluginMeta(pluginDir);
+
+            const win = new BrowserWindow({
+                maximizable: false,
+                minimizable: false,
+                width: 560,
+                height: 600,
+                resizable: false,
+                webPreferences: {
+                    devTools: true
+                },
+                title: "Review userplugin",
+                modal: true,
+                parent: BrowserWindow.getAllWindows()[0],
+                show: false,
+                autoHideMenuBar: true
+            });
+            const reView /* haha got it */ = new WebContentsView({
+                webPreferences: {
+                    devTools: true,
+                    nodeIntegration: true
+                }
+            });
+            win.contentView.addChildView(reView);
+
+            const commitProc = exec("git log origin/HEAD...HEAD --oneline --pretty=format:%an////////%h////////%H////////%s", {
+                cwd: pluginDir
+            });
+            let rawOutput = "";
+            commitProc.stdout?.on("data", d => {
+                rawOutput += String(d);
+            });
+            commitProc.once("close", () => {
+                win.loadURL(generateUpdatePluginContent({
+                    name: pluginMeta.name,
+                    description: pluginMeta.description,
+                    remote: pluginMeta.remote,
+                    commit: rawOutput.split("\n").map(line => line.split("////////")).map(([user, shortCommit, longCommit, message]) => `${user} (<a href="${pluginMeta.remote.replace("plugins.nin0.dev", "git.nin0.dev/userplugins")}/commit/${longCommit}" style="font-family: monospace;">${shortCommit}</a>) ~ ${message}`).join("\n")
+                }));
+                win.on("page-title-updated", async e => {
+                    if (win.webContents.getTitle().startsWith("openLink:")) {
+                        await shell.openExternal(win.webContents.getTitle().replace("openLink:", ""));
+                    }
+                    switch (win.webContents.getTitle() as "abortInstall" | "install") {
+                        case "abortInstall": {
+                            win.close();
+                            return reject("Rejected by user");
+                        }
+                        case "install": {
+                            win.close();
+                            try {
+                                const otherProc = exec("git rebase origin/HEAD", {
+                                    cwd: pluginDir
+                                });
+                                let errored = "";
+                                otherProc.stderr?.on("data", d => { if (String(d).includes("Success")) return; errored += String(d); });
+                                otherProc.once("close", () => {
+                                    if (errored) if (!errored.includes("Success")) return reject(`Failed to apply the update, chances are you have local changes that conflict with your remote. Git errors:\n\n${errored}`);
+                                    build().then(() => resolve(JSON.stringify({
+                                        name: pluginMeta.name,
+                                        native: pluginMeta.usesNative
+                                    })));
+                                });
+                            }
+                            catch (e) {
+                                reject((e as Error).toString());
+                            }
+                            break;
+                        }
+                    }
+                });
+            });
+            win.show();
+        }
+        doStuff();
+    });
+}
+
+export async function openGitPathModal(_: any) {
+    const gitPathSet: string | undefined = NativeSettings.store.plugins.UserpluginInstaller?.gitPath;
+    const win = new BrowserWindow({
+        maximizable: false,
+        minimizable: false,
+        width: 560,
+        height: 400,
+        resizable: false,
+        webPreferences: {
+            devTools: true
+        },
+        title: "Set Git path",
+        modal: true,
+        parent: BrowserWindow.getAllWindows()[0],
+        show: false,
+        autoHideMenuBar: true
+    });
+    const reView = new WebContentsView({
+        webPreferences: {
+            devTools: true,
+            nodeIntegration: true
+        }
+    });
+    win.contentView.addChildView(reView);
+    win.loadURL(`data:text/html;base64,${Buffer.from(setGitPathContent).toString("base64")}`);
+    win.on("page-title-updated", async _ => {
+        const t = win.webContents.getTitle();
+        if (t === "abort") win.close();
+        if (t.startsWith("ok")) {
+            if (!NativeSettings.store.plugins.UserpluginInstaller) {
+                NativeSettings.store.plugins.UserpluginInstaller = {
+                    gitPath: undefined
+                };
+            }
+            if (t === "ok-") {
+                NativeSettings.store.plugins.UserpluginInstaller.gitPath = undefined;
+            } else {
+                const gitPath2 = t.split("-").toSpliced(0, 1).join("-");
+                NativeSettings.store.plugins.UserpluginInstaller.gitPath = gitPath2;
+            }
+            win.close();
+        }
+        if (t.startsWith("check")) {
+            try {
+                const gitProc = spawn(t === "check-" ? "git" : t.split("-").toSpliced(0, 1).join("-"), ["--version"]);
+                let rawOutput = "";
+                gitProc.stdout?.on("data", d => {
+                    rawOutput += String(d);
+                });
+                gitProc.on("error", e => {
+                    dialog.showMessageBox({
+                        title: "Error",
+                        message: "Git error",
+                        type: "error",
+                        detail: `${e}\n\nDouble-check the path you entered.`,
+                        buttons: ["OK"]
+                    });
+                });
+                gitProc.once("close", () => {
+                    if (gitProc.exitCode === 0) {
+                        dialog.showMessageBox({
+                            title: "Success",
+                            message: "Git works!",
+                            type: "info",
+                            detail: `Successfully called ${rawOutput.trim()}`,
+                            buttons: ["OK"]
+                        });
+                    }
+                });
+            } catch (e) {
+                dialog.showMessageBox({
+                    title: "Error",
+                    message: "Git error",
+                    type: "error",
+                    detail: `${e}\n\nDouble-check the path you entered.`,
+                    buttons: ["OK"]
+                });
+            }
+        }
+    });
+    win.show();
+    if (gitPathSet) {
+        win.webContents.executeJavaScript(`document.querySelector("input").value = ${JSON.stringify(gitPathSet)};`);
+    }
+
+    console.log(yaml.load(`
+    name: test
+    items:
+      - a
+      - b
+    `));
+}
diff --git a/src/equicordplugins/userpluginInstaller.dev/yaml-js.d.ts b/src/equicordplugins/userpluginInstaller.dev/yaml-js.d.ts
new file mode 100644
index 000000000..0119167a7
--- /dev/null
+++ b/src/equicordplugins/userpluginInstaller.dev/yaml-js.d.ts
@@ -0,0 +1,9 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 nin0
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+declare module "yaml-js" {
+    export function load(yaml: string): any;
+}
diff --git a/src/equicordplugins/vcNarratorCustom/index.tsx b/src/equicordplugins/vcNarratorCustom/index.tsx
index c9d80123c..fac57eced 100644
--- a/src/equicordplugins/vcNarratorCustom/index.tsx
+++ b/src/equicordplugins/vcNarratorCustom/index.tsx
@@ -895,6 +895,7 @@ const UserContextMenuPatch: NavContextMenuPatchCallback = (children, { user }: U
 export default definePlugin({
     name: "VcNarratorCustom",
     description: "Announces when users join, leave, or move voice channels via narrator using TikTok TTS. Revamped and back from the dead.",
+    tags: ["Accessibility", "Voice"],
     authors: [Devs.Ven, Devs.Nyako, EquicordDevs.Loukios, EquicordDevs.examplegit],
     settings,
     contextMenus: {
diff --git a/src/equicordplugins/vcNarratorCustom/util.ts b/src/equicordplugins/vcNarratorCustom/util.ts
index 476d2d2e0..5d27f5e3e 100644
--- a/src/equicordplugins/vcNarratorCustom/util.ts
+++ b/src/equicordplugins/vcNarratorCustom/util.ts
@@ -198,9 +198,6 @@ const DB_VERSION = 2;
 
 const VOICES_STORE = "voices";
 
-import { Logger } from "@utils/Logger";
-
-const logger = new Logger("VcNarratorCustom");
 const META_STORE = "voices_meta";
 
 type VoiceMeta = {
@@ -209,76 +206,49 @@ type VoiceMeta = {
     lastAccess: number;
 };
 
-let openDbPromise: Promise<IDBDatabase | null> | undefined;
-let loggedFailure = false;
+function openDB(): Promise<IDBDatabase> {
+    return new Promise((resolve, reject) => {
+        const request = indexedDB.open(DB_NAME, DB_VERSION);
+        request.onupgradeneeded = event => {
+            const db = request.result;
+            const upgradeTx = request.transaction;
+            if (!db.objectStoreNames.contains(VOICES_STORE)) {
+                db.createObjectStore(VOICES_STORE);
+            }
+            if (!db.objectStoreNames.contains(META_STORE)) {
+                const meta = db.createObjectStore(META_STORE);
+                meta.createIndex("by_lastAccess", "lastAccess");
+            }
 
-function handleDbFailure(error: unknown) {
-    if (loggedFailure) return;
-    loggedFailure = true;
-    logger.error("Voice cache storage unavailable, falling back to memory.", error);
-}
-
-function openDB(): Promise<IDBDatabase | null> {
-    if (!openDbPromise) {
-        openDbPromise = new Promise<IDBDatabase>((resolve, reject) => {
-            const request = indexedDB.open(DB_NAME, DB_VERSION);
-            request.onupgradeneeded = event => {
-                const db = request.result;
-                const upgradeTx = request.transaction;
-                if (!db.objectStoreNames.contains(VOICES_STORE)) {
-                    db.createObjectStore(VOICES_STORE);
-                }
-                if (!db.objectStoreNames.contains(META_STORE)) {
-                    const meta = db.createObjectStore(META_STORE);
-                    meta.createIndex("by_lastAccess", "lastAccess");
-                }
-
-                if (upgradeTx && (event?.oldVersion ?? 0) < 2) {
-                    const now = Date.now();
-                    const voices = upgradeTx.objectStore(VOICES_STORE);
-                    const meta = upgradeTx.objectStore(META_STORE);
-                    const cursorReq = voices.openCursor();
-                    cursorReq.onsuccess = () => {
-                        const cursor = cursorReq.result;
-                        if (!cursor) return;
-                        const blob = cursor.value as Blob | undefined;
-                        meta.put(
-                            {
-                                size: blob?.size ?? 0,
-                                createdAt: now,
-                                lastAccess: now,
-                            } satisfies VoiceMeta,
-                            String(cursor.key)
-                        );
-                        cursor.continue();
-                    };
-                }
-            };
-            request.onsuccess = () => resolve(request.result);
-            request.onerror = () => reject(request.error);
-        }).then(db => db).catch(error => {
-            handleDbFailure(error);
-            return null;
-        });
-    }
-
-    return openDbPromise;
-}
-
-async function withDb<T>(fallback: T, callback: (db: IDBDatabase) => Promise<T>): Promise<T> {
-    const db = await openDB();
-    if (!db) return fallback;
-
-    try {
-        return await callback(db);
-    } catch (error) {
-        handleDbFailure(error);
-        return fallback;
-    }
+            if (upgradeTx && (event?.oldVersion ?? 0) < 2) {
+                const now = Date.now();
+                const voices = upgradeTx.objectStore(VOICES_STORE);
+                const meta = upgradeTx.objectStore(META_STORE);
+                const cursorReq = voices.openCursor();
+                cursorReq.onsuccess = () => {
+                    const cursor = cursorReq.result;
+                    if (!cursor) return;
+                    const blob = cursor.value as Blob | undefined;
+                    meta.put(
+                        {
+                            size: blob?.size ?? 0,
+                            createdAt: now,
+                            lastAccess: now,
+                        } satisfies VoiceMeta,
+                        String(cursor.key)
+                    );
+                    cursor.continue();
+                };
+            }
+        };
+        request.onsuccess = () => resolve(request.result);
+        request.onerror = () => reject(request.error);
+    });
 }
 
 export async function getPersistentTtsCacheStats(): Promise<{ bytes: number; entries: number; }> {
-    return withDb<{ bytes: number; entries: number; }>({ bytes: 0, entries: 0 }, db => new Promise<{ bytes: number; entries: number; }>((resolve, reject) => {
+    const db = await openDB();
+    return new Promise((resolve, reject) => {
         const tx = db.transaction(META_STORE, "readonly");
         const store = tx.objectStore(META_STORE);
 
@@ -298,7 +268,7 @@ export async function getPersistentTtsCacheStats(): Promise<{ bytes: number; ent
             cursor.continue();
         };
         cursorReq.onerror = () => reject(cursorReq.error);
-    }));
+    });
 }
 
 export async function clearTtsCache(): Promise<void> {
@@ -309,17 +279,19 @@ export async function clearTtsCache(): Promise<void> {
     }
     ttsCache.clear();
 
-    await withDb<void>(void 0, db => new Promise<void>((resolve, reject) => {
+    const db = await openDB();
+    return new Promise((resolve, reject) => {
         const tx = db.transaction([VOICES_STORE, META_STORE], "readwrite");
         tx.objectStore(VOICES_STORE).clear();
         tx.objectStore(META_STORE).clear();
         tx.oncomplete = () => resolve();
         tx.onerror = () => reject(tx.error);
-    }));
+    });
 }
 
 async function trimPersistentCacheToMaxBytes(maxBytes = PERSISTENT_TTS_CACHE_MAX_BYTES): Promise<void> {
-    await withDb<void>(void 0, db => new Promise<void>((resolve, reject) => {
+    const db = await openDB();
+    return new Promise((resolve, reject) => {
         const tx = db.transaction([VOICES_STORE, META_STORE], "readwrite");
         const voicesStore = tx.objectStore(VOICES_STORE);
         const metaStore = tx.objectStore(META_STORE);
@@ -372,11 +344,12 @@ async function trimPersistentCacheToMaxBytes(maxBytes = PERSISTENT_TTS_CACHE_MAX
 
         tx.oncomplete = () => resolve();
         tx.onerror = () => reject(tx.error);
-    }));
+    });
 }
 
 export async function getCachedVoiceFromDB(cacheKey: string): Promise<Blob | null> {
-    return withDb<Blob | null>(null, db => new Promise<Blob | null>((resolve, reject) => {
+    const db = await openDB();
+    return new Promise((resolve, reject) => {
         const tx = db.transaction([VOICES_STORE, META_STORE], "readwrite");
         const voicesStore = tx.objectStore(VOICES_STORE);
         const metaStore = tx.objectStore(META_STORE);
@@ -400,11 +373,12 @@ export async function getCachedVoiceFromDB(cacheKey: string): Promise<Blob | nul
             resolve(blob);
         };
         request.onerror = () => reject(request.error);
-    }));
+    });
 }
 
 export async function setCachedVoiceInDB(cacheKey: string, blob: Blob): Promise<void> {
-    await withDb<void>(void 0, db => new Promise<void>((resolve, reject) => {
+    const db = await openDB();
+    await new Promise<void>((resolve, reject) => {
         const tx = db.transaction([VOICES_STORE, META_STORE], "readwrite");
         const voicesStore = tx.objectStore(VOICES_STORE);
         const metaStore = tx.objectStore(META_STORE);
@@ -418,7 +392,7 @@ export async function setCachedVoiceInDB(cacheKey: string, blob: Blob): Promise<
 
         tx.oncomplete = () => resolve();
         tx.onerror = () => reject(tx.error);
-    }));
+    });
 
     await trimPersistentCacheToMaxBytes();
 }
diff --git a/src/equicordplugins/vcPanelSettings/index.tsx b/src/equicordplugins/vcPanelSettings/index.tsx
index bfc60e08f..24893ae04 100644
--- a/src/equicordplugins/vcPanelSettings/index.tsx
+++ b/src/equicordplugins/vcPanelSettings/index.tsx
@@ -238,6 +238,7 @@ function VoiceSettings() {
 export default definePlugin({
     name: "VCPanelSettings",
     description: "Control voice settings right from the voice panel",
+    tags: ["Utility", "Voice"],
     authors: [Devs.nin0dev],
     settings,
     renderVoiceSettings() { return <VoiceSettings />; },
diff --git a/src/equicordplugins/viewRawVariant/index.tsx b/src/equicordplugins/viewRawVariant/index.tsx
index 41597a401..97730526b 100644
--- a/src/equicordplugins/viewRawVariant/index.tsx
+++ b/src/equicordplugins/viewRawVariant/index.tsx
@@ -129,6 +129,7 @@ function makeContextCallback(
 export default definePlugin({
     name: "ViewRawVariant",
     description: "Copy/View raw content of any message, channel, or guild, but show in the right click menu.",
+    tags: ["Appearance", "Customisation", "Chat", "Organisation", "Servers"],
     authors: [Devs.KingFish, Devs.Ven, Devs.rad, Devs.ImLvna, Devs.Kyuuhachi],
     contextMenus: {
         "guild-context": makeContextCallback("guild", val =>
diff --git a/src/equicordplugins/voiceButtons/index.tsx b/src/equicordplugins/voiceButtons/index.tsx
index af960f502..16bc9f51b 100644
--- a/src/equicordplugins/voiceButtons/index.tsx
+++ b/src/equicordplugins/voiceButtons/index.tsx
@@ -16,6 +16,7 @@ import { UserChatButton, UserDeafenButton, UserMuteButton } from "./utils";
 export default definePlugin({
     name: "VoiceButtons",
     description: "Quickly DM, mute, or deafen any user right from the voice-call panel.",
+    tags: ["Servers", "Utility", "Voice"],
     authors: [EquicordDevs.nicola02nb, EquicordDevs.omaw],
     settings,
     patches: [
@@ -23,7 +24,7 @@ export default definePlugin({
             find: ".VOICE_PANEL}}",
             replacement: [
                 {
-                    match: /\}\),children:\[(?=.{0,200}\.VOICE_CHANNEL_GAME_ACTIVITY_INDICATOR_VIEWED)/,
+                    match: /\}\),children:\[(?=.{0,50}#{intl::PRIORITY_SPEAKER})/,
                     replace: "$&$self.renderButtons(arguments[0]?.user),"
                 }
             ]
diff --git a/src/equicordplugins/voiceChannelLog/index.tsx b/src/equicordplugins/voiceChannelLog/index.tsx
index a0e4d1d9c..377ff7503 100644
--- a/src/equicordplugins/voiceChannelLog/index.tsx
+++ b/src/equicordplugins/voiceChannelLog/index.tsx
@@ -54,8 +54,9 @@ const patchChannelContextMenu: NavContextMenuPatchCallback = (children, { channe
 export default definePlugin({
     name: "VoiceChannelLog",
     description: "Logs voice channel activity including joins, leaves, soundboard, mute, camera, screenshare, and more.",
+    tags: ["Servers", "Utility", "Voice"],
     authors: [Devs.Sqaaakoi, Devs.thororen, EquicordDevs.nyx, Devs.Moxxie, EquicordDevs.Fres, Devs.amy],
-    dependencies: ["AudioPlayerAPI"],
+    dependencies: ["AudioPlayerAPI", "HeaderBarAPI"],
     settings,
     contextMenus: {
         "channel-context": patchChannelContextMenu
diff --git a/src/equicordplugins/voiceChatUtils/index.tsx b/src/equicordplugins/voiceChatUtils/index.tsx
index 421000cf7..a9ebea15f 100644
--- a/src/equicordplugins/voiceChatUtils/index.tsx
+++ b/src/equicordplugins/voiceChatUtils/index.tsx
@@ -174,6 +174,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "VoiceChatUtilities",
     description: "This plugin allows you to perform multiple actions on an entire channel (move, mute, disconnect, etc.) (originally by dutake)",
+    tags: ["Chat", "Servers", "Voice"],
     authors: [Devs.D3SOX, EquicordDevs.nickwoah],
 
     settings,
diff --git a/src/equicordplugins/voiceJoinMessages/index.ts b/src/equicordplugins/voiceJoinMessages/index.ts
index 12824ab91..2c69e9159 100644
--- a/src/equicordplugins/voiceJoinMessages/index.ts
+++ b/src/equicordplugins/voiceJoinMessages/index.ts
@@ -10,7 +10,7 @@ import { humanFriendlyJoin } from "@utils/text";
 import definePlugin, { OptionType } from "@utils/types";
 import { Message, User } from "@vencord/discord-types";
 import { findByCodeLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher, MessageActions, MessageStore, RelationshipStore, SelectedChannelStore, UserStore } from "@webpack/common";
+import { ChannelStore, FluxDispatcher, MessageActions, MessageStore, PermissionsBits, PermissionStore, RelationshipStore, SelectedChannelStore, UserStore } from "@webpack/common";
 
 const createBotMessage = findByCodeLazy('username:"Clyde"');
 
@@ -111,6 +111,7 @@ let clientOldChannelId: string | undefined;
 export default definePlugin({
     name: "VoiceJoinMessages",
     description: "Recieve client-side ephemeral messages when your friends join voice channels",
+    tags: ["Servers", "Utility", "Voice"],
     authors: [Devs.Sqaaakoi, Devs.thororen],
     settings,
     flux: {
@@ -124,12 +125,15 @@ export default definePlugin({
                     oldChannelId = clientOldChannelId;
                     clientOldChannelId = channelId;
                 }
-                if (settings.store.ignoreBlockedUsers && RelationshipStore.isBlocked(userId)) return;
+                if (settings.store.ignoreBlockedUsers && RelationshipStore.isBlocked(userId)) continue;
                 // Ignore events from same channel
-                if (oldChannelId === channelId) return;
+                if (oldChannelId === channelId) continue;
 
                 // Friend joined a voice channel
                 if (settings.store.friendDirectMessages && (!oldChannelId && channelId) && userId !== clientUserId && isFriendAllowlisted(userId)) {
+                    const channel = ChannelStore.getChannel(channelId);
+                    if (!channel || !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel)) continue;
+
                     const selfInChannel = SelectedChannelStore.getVoiceChannelId() === channelId;
                     let memberListContent = "";
                     if (settings.store.friendDirectMessagesShowMembers || settings.store.friendDirectMessagesShowMemberCount) {
diff --git a/src/equicordplugins/voiceMessageTranscriber.desktop/index.tsx b/src/equicordplugins/voiceMessageTranscriber.desktop/index.tsx
index f60724321..664013588 100644
--- a/src/equicordplugins/voiceMessageTranscriber.desktop/index.tsx
+++ b/src/equicordplugins/voiceMessageTranscriber.desktop/index.tsx
@@ -14,7 +14,6 @@ import { Flex } from "@components/Flex";
 import { FormSwitch } from "@components/FormSwitch";
 import { Heading } from "@components/Heading";
 import { Span } from "@components/Span";
-import { ManaBaseRadioGroupProps } from "@equicordplugins/components.dev/types";
 import { copyToClipboard } from "@utils/clipboard";
 import { Devs } from "@utils/constants";
 import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
@@ -25,8 +24,8 @@ import { lodash, ScrollerAuto, SearchableSelect, useEffect, useRef, useState } f
 import { cl, decodeAudio, LANGUAGES, TranscriptionWorker } from "./utils";
 const Native = VencordNative.pluginHelpers.VoiceMessageTranscriber as PluginNative<typeof import("./native")>;
 
-const ManaBaseRadioGroup = findComponentByCodeLazy('"data-mana-component":"BaseRadioGroup"') as React.ComponentType<ManaBaseRadioGroupProps>;
 const ChannelListIcon = findComponentByCodeLazy("1-1-1ZM2 8a1");
+let ManaBaseRadioGroup;
 
 const settings = definePluginSettings({
     selectedModel: {
@@ -314,6 +313,7 @@ export default definePlugin({
     name: "VoiceMessageTranscriber",
     authors: [Devs.TheSun],
     description: "On-device transcriptions for voice messages powered by Whisper v3",
+    tags: ["Chat", "Media", "Utility", "Voice"],
     patches: [
         {
             find: ".VOICE_MESSAGE)),",
@@ -321,8 +321,18 @@ export default definePlugin({
                 match: /"source",{src:(\i).{0,700}duration:\i}\),/,
                 replace: "$&$self.button($1),"
             }
-        }
+        },
+        {
+            find: '"data-mana-component":"BaseRadioGroup"',
+            replacement: {
+                match: /(?=function (\i)\(\i\)\{.{0,400}"data-mana-component":"BaseRadioGroup")/,
+                replace: "$self.ManaBaseRadioGroup=$1;"
+            }
+        },
     ],
+    set ManaBaseRadioGroup(value: any) {
+        ManaBaseRadioGroup = value;
+    },
     settings,
 
     button(src: string) {
diff --git a/src/equicordplugins/voiceRejoin/index.tsx b/src/equicordplugins/voiceRejoin/index.tsx
index 12042df43..291bd7aee 100644
--- a/src/equicordplugins/voiceRejoin/index.tsx
+++ b/src/equicordplugins/voiceRejoin/index.tsx
@@ -51,6 +51,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "VoiceRejoin",
     description: "Rejoins DM/Server call automatically when restarting Discord.",
+    tags: ["Servers", "Utility", "Voice"],
     authors: [EquicordDevs.omaw, EquicordDevs.keircn],
     settings,
 
diff --git a/src/equicordplugins/voiceStats/index.tsx b/src/equicordplugins/voiceStats/index.tsx
new file mode 100644
index 000000000..5d8c8a39b
--- /dev/null
+++ b/src/equicordplugins/voiceStats/index.tsx
@@ -0,0 +1,189 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./styles.css";
+
+import { get, set } from "@api/DataStore";
+import { BaseText } from "@components/BaseText";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { EquicordDevs } from "@utils/constants";
+import { useTimer } from "@utils/react";
+import definePlugin from "@utils/types";
+import { VoiceState } from "@vencord/discord-types";
+import { findComponentByCodeLazy, findCssClassesLazy } from "@webpack";
+import { SelectedChannelStore, UserStore, VoiceStateStore } from "@webpack/common";
+
+const wrapperClasses = findCssClassesLazy("memberSinceWrapper");
+const containerClasses = findCssClassesLazy("memberSince");
+const Section = findComponentByCodeLazy("headingVariant:", '"section"', "headingIcon:");
+
+const storageKey = "VoiceStats_totals";
+const saveIntervalMs = 30_000;
+
+const sessionStarts = new Map<string, number>();
+const totalsByUser = new Map<string, number>();
+let trackedChannelId: string | null = null;
+let saveIntervalId: ReturnType<typeof setInterval> | null = null;
+
+async function loadStoredTotals() {
+    const saved = await get<Record<string, number>>(storageKey);
+    if (!saved) return;
+    for (const [userId, value] of Object.entries(saved)) totalsByUser.set(userId, value);
+}
+
+async function persistTotals() {
+    await set(storageKey, Object.fromEntries(totalsByUser));
+}
+
+function flushActiveSessions() {
+    const now = Date.now();
+    for (const [userId, startedAt] of sessionStarts) {
+        const accrued = Math.floor((now - startedAt) / 1000);
+        totalsByUser.set(userId, (totalsByUser.get(userId) ?? 0) + accrued);
+        sessionStarts.set(userId, now);
+    }
+}
+
+function startTrackingChannel(channelId: string, myId: string) {
+    trackedChannelId = channelId;
+    const states = VoiceStateStore.getVoiceStatesForChannel(channelId) ?? {};
+    const now = Date.now();
+    for (const state of Object.values(states) as VoiceState[]) {
+        if (state.userId !== myId) sessionStarts.set(state.userId, now);
+    }
+    saveIntervalId = setInterval(() => {
+        flushActiveSessions();
+        persistTotals();
+    }, saveIntervalMs);
+}
+
+function stopTrackingChannel() {
+    if (saveIntervalId) {
+        clearInterval(saveIntervalId);
+        saveIntervalId = null;
+    }
+    if (!trackedChannelId) return;
+    flushActiveSessions();
+    sessionStarts.clear();
+    trackedChannelId = null;
+    persistTotals();
+}
+
+function getLiveSeconds(userId: string): number {
+    const stored = totalsByUser.get(userId) ?? 0;
+    const startedAt = sessionStarts.get(userId);
+    return startedAt ? stored + Math.floor((Date.now() - startedAt) / 1000) : stored;
+}
+
+function formatDuration(seconds: number): string {
+    const h = Math.floor(seconds / 3600);
+    const m = Math.floor((seconds % 3600) / 60);
+    const s = seconds % 60;
+    if (h > 0) return `${h}h ${m}m ${s}s`;
+    if (m > 0) return `${m}m ${s}s`;
+    return `${s}s`;
+}
+
+const VoiceStatsSection = ErrorBoundary.wrap(({ userId, isSideBar }: { userId: string; isSideBar: boolean; }) => {
+    const isLive = sessionStarts.has(userId);
+    useTimer({ interval: isLive ? 1000 : 0 });
+
+    const seconds = getLiveSeconds(userId);
+    if (seconds <= 0) return null;
+
+    const text = formatDuration(seconds);
+
+    if (isSideBar) {
+        return (
+            <Section
+                heading="Voice Time"
+                headingVariant="text-xs/semibold"
+                headingColor="text-strong"
+            >
+                <BaseText size="sm">{text}</BaseText>
+            </Section>
+        );
+    }
+
+    return (
+        <Section
+            heading="Voice Time"
+            headingVariant="text-xs/medium"
+            headingColor="text-default"
+            className="vc-voicestats-profile-section"
+        >
+            <div className={wrapperClasses.memberSinceWrapper}>
+                <div className={containerClasses.memberSince}>
+                    <svg
+                        aria-hidden="true"
+                        width="16"
+                        height="16"
+                        viewBox="0 0 24 24"
+                        fill="var(--interactive-icon-default)"
+                    >
+                        <path d="M12 1a4 4 0 0 0-4 4v6a4 4 0 0 0 8 0V5a4 4 0 0 0-4-4Z" />
+                        <path d="M19 11a1 1 0 0 0-2 0 5 5 0 0 1-10 0 1 1 0 1 0-2 0 7 7 0 0 0 6 6.92V21a1 1 0 1 0 2 0v-3.08A7 7 0 0 0 19 11Z" />
+                    </svg>
+                    <BaseText size="sm">{text}</BaseText>
+                </div>
+            </div>
+        </Section>
+    );
+}, { noop: true });
+
+export default definePlugin({
+    name: "VoiceStats",
+    description: "Shows how long you've spent in voice with each user in their profile",
+    tags: ["Voice", "Friends"],
+    authors: [EquicordDevs.Moowi],
+    dependencies: ["ProfileSectionsAPI"],
+    renderProfileSection: VoiceStatsSection,
+    flux: {
+        VOICE_STATE_UPDATES({ voiceStates }: { voiceStates: VoiceState[]; }) {
+            const myId = UserStore.getCurrentUser()?.id;
+            if (!myId) return;
+
+            for (const state of voiceStates) {
+                const { userId, channelId, oldChannelId } = state;
+
+                if (userId === myId) {
+                    if (!oldChannelId && channelId) startTrackingChannel(channelId, myId);
+                    else if (oldChannelId && !channelId) stopTrackingChannel();
+                    else if (channelId && channelId !== oldChannelId) {
+                        stopTrackingChannel();
+                        startTrackingChannel(channelId, myId);
+                    }
+                    continue;
+                }
+
+                const joinedMyChannel = channelId === trackedChannelId && oldChannelId !== trackedChannelId;
+                const leftMyChannel = oldChannelId === trackedChannelId && channelId !== trackedChannelId;
+
+                if (joinedMyChannel) {
+                    sessionStarts.set(userId, Date.now());
+                } else if (leftMyChannel && sessionStarts.has(userId)) {
+                    const startedAt = sessionStarts.get(userId)!;
+                    const accrued = Math.floor((Date.now() - startedAt) / 1000);
+                    totalsByUser.set(userId, (totalsByUser.get(userId) ?? 0) + accrued);
+                    sessionStarts.delete(userId);
+                    persistTotals();
+                }
+            }
+        }
+    },
+
+    async start() {
+        await loadStoredTotals();
+        const myId = UserStore.getCurrentUser()?.id;
+        if (!myId) return;
+        const channelId = SelectedChannelStore.getVoiceChannelId?.();
+        if (channelId) startTrackingChannel(channelId, myId);
+    },
+
+    stop() {
+        stopTrackingChannel();
+    }
+});
diff --git a/src/equicordplugins/voiceStats/styles.css b/src/equicordplugins/voiceStats/styles.css
new file mode 100644
index 000000000..fb66c0122
--- /dev/null
+++ b/src/equicordplugins/voiceStats/styles.css
@@ -0,0 +1,3 @@
+.vc-voicestats-profile-section {
+    gap: 4px;
+}
diff --git a/src/equicordplugins/waitForSlot/index.tsx b/src/equicordplugins/waitForSlot/index.tsx
index fbcfd636e..4df55ee89 100644
--- a/src/equicordplugins/waitForSlot/index.tsx
+++ b/src/equicordplugins/waitForSlot/index.tsx
@@ -64,6 +64,7 @@ function promptVoiceChannel(channel: Channel | null | undefined): boolean {
 export default definePlugin({
     name: "WaitForSlot",
     description: "Automatically join a full voice channel when a slot opens.",
+    tags: ["Servers", "Utility", "Voice"],
     authors: [EquicordDevs.omaw, Devs.prism],
     settings,
     patches: [
diff --git a/src/equicordplugins/wallpaperFree/components/ctxmenu.tsx b/src/equicordplugins/wallpaperFree/components/ctxmenu.tsx
deleted file mode 100644
index b476a3a8e..000000000
--- a/src/equicordplugins/wallpaperFree/components/ctxmenu.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { NavContextMenuPatchCallback } from "@api/ContextMenu";
-import { WallpaperFreeStore } from "@equicordplugins/wallpaperFree/store";
-import { openModal } from "@utils/modal";
-import { ChannelStore, FluxDispatcher, Menu } from "@webpack/common";
-
-import { SetWallpaperModal } from "./modal";
-
-const addWallpaperMenu = (channelId?: string, guildId?: string) => {
-    const setWallpaper = (url?: string) => {
-        FluxDispatcher.dispatch({
-            // @ts-ignore
-            type: "VC_WALLPAPER_FREE_CHANGE",
-            channelId,
-            guildId,
-            url,
-        });
-    };
-
-    const initialUrl = channelId ? WallpaperFreeStore.getForChannel(channelId) :
-        guildId ? WallpaperFreeStore.getForGuild(guildId) : undefined;
-
-    return (
-        <Menu.MenuItem label="WallpaperFree" key="vc-wpfree-menu" id="vc-wpfree-menu">
-            <Menu.MenuItem
-                label="Set Wallpaper"
-                id="vc-wpfree-set-wallpaper"
-                action={() => openModal(props => <SetWallpaperModal props={props} onSelect={setWallpaper} initialUrl={initialUrl} />)}
-            />
-            <Menu.MenuSeparator />
-            <Menu.MenuItem
-                label="Remove Wallpaper"
-                id="vc-wpfree-remove-wallpaper"
-                color="danger"
-                disabled={!initialUrl}
-                action={() => setWallpaper(void 0)}
-            />
-        </Menu.MenuItem>
-    );
-};
-
-const UserContextPatch: NavContextMenuPatchCallback = (children, args) => {
-    if (!args.user) return;
-    const dmChannelId = ChannelStore.getDMFromUserId(args.user.id);
-    children.push(addWallpaperMenu(dmChannelId));
-};
-
-const ChannelContextPatch: NavContextMenuPatchCallback = (children, args) => {
-    if (!args.channel) return;
-    children.push(addWallpaperMenu(args.channel.id));
-};
-
-const GuildContextPatch: NavContextMenuPatchCallback = (children, args) => {
-    if (!args.guild) return;
-    children.push(addWallpaperMenu(void 0, args.guild.id));
-};
-
-export { ChannelContextPatch, GuildContextPatch, UserContextPatch };
diff --git a/src/equicordplugins/wallpaperFree/components/modal.tsx b/src/equicordplugins/wallpaperFree/components/modal.tsx
deleted file mode 100644
index 86ad0d602..000000000
--- a/src/equicordplugins/wallpaperFree/components/modal.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { BaseText } from "@components/BaseText";
-import { ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
-import { Button, TextInput, useState } from "@webpack/common";
-
-interface Props {
-    props: ModalProps;
-    onSelect: (url: string) => void;
-    initialUrl: string | undefined;
-}
-
-export function SetWallpaperModal({ props, onSelect, initialUrl }: Props) {
-    const [url, setUrl] = useState(initialUrl ?? "");
-
-    return (
-        <ModalRoot {...props} size={ModalSize.SMALL}>
-            <ModalHeader>
-                <BaseText size="lg" style={{ marginBottom: 8 }}>
-                    Set wallpaper
-                </BaseText>
-            </ModalHeader>
-            <ModalContent>
-                <div style={{ display: "flex", flexDirection: "column", gap: 16 }}>
-                    <BaseText>The image url</BaseText>
-                    <TextInput
-                        value={url}
-                        onChange={u => {
-                            setUrl(u);
-                        }}
-                        autoFocus
-                    />
-                    {url && (
-                        <img
-                            alt=""
-                            src={url}
-                            style={{
-                                display: "block",
-                                width: "100%",
-                                height: "auto",
-                                objectFit: "cover",
-                                borderRadius: 8
-                            }}
-                        />
-                    )}
-                    <div style={{ display: "flex", justifyContent: "flex-end", gap: 8 }}>
-                        <Button onClick={props.onClose}>Cancel</Button>
-                        <Button
-                            color={Button.Colors.BRAND}
-                            onClick={() => {
-                                onSelect(url);
-                                props.onClose();
-                            }}
-                            disabled={!url}
-                        >Apply</Button>
-                    </div>
-                </div>
-            </ModalContent>
-        </ModalRoot >
-    );
-}
diff --git a/src/equicordplugins/wallpaperFree/components/util.tsx b/src/equicordplugins/wallpaperFree/components/util.tsx
deleted file mode 100644
index c71e241f4..000000000
--- a/src/equicordplugins/wallpaperFree/components/util.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { BaseText } from "@components/BaseText";
-import { WallpaperFreeStore } from "@equicordplugins/wallpaperFree/store";
-import { openModal } from "@utils/modal";
-import { makeCodeblock } from "@utils/text";
-import { Button, FluxDispatcher, Parser } from "@webpack/common";
-
-import { SetWallpaperModal } from "./modal";
-
-export function GlobalDefaultComponent() {
-    const setGlobal = (url?: string) => {
-        FluxDispatcher.dispatch({
-            // @ts-ignore
-            type: "VC_WALLPAPER_FREE_CHANGE_GLOBAL",
-            url,
-        });
-    };
-
-    return (
-        <>
-            <Button onClick={() => {
-                openModal(props => <SetWallpaperModal props={props} onSelect={setGlobal} initialUrl={WallpaperFreeStore.globalDefault} />);
-            }}>Set a global wallpaper</Button>
-
-            <Button
-                color={Button.Colors.RED}
-                onClick={() => setGlobal(void 0)}
-            >Remove global default wallpaper</Button>
-
-            <Button
-                color={Button.Colors.RED}
-                onClick={() => {
-                    // @ts-ignore
-                    FluxDispatcher.dispatch({ type: "VC_WALLPAPER_FREE_RESET" });
-                }}
-            >Reset wallpaper data</Button>
-        </>
-    );
-}
-
-export function TipsComponent() {
-    const tipText = `
-    .vc-wpfree-wp-container {
-        transform: scaleX(-1); /* flip it horizontally */
-        filter: blur(4px); /* apply a blur */
-        opacity: 0.7; /* self-explanatory */
-    }
-
-    /* If you don't like embeds being transparent */
-
-    [class*=embedFull__] {
-        background: var(--background-surface-high) !important;
-    }
-
-    /* the same for codeblocks (or use ShikiCodeblocks) */
-
-    .hljs {
-        background-color: var(--background-base-lowest) !important;
-    }`;
-    return (
-        <div style={{ userSelect: "text" }}>
-            {!IS_WEB && (
-                <>
-                    <BaseText>
-                        you can use local files by having them in the vencord theme directory, and using the url <code>vencord:///themes/filename.ext</code>
-                    </BaseText>
-                    <Button onClick={() => VencordNative.themes.openFolder()}>
-                        Open Theme Directory
-                    </Button>
-                </>
-            )}
-            {Parser.parse(makeCodeblock(tipText, "css"))}
-            <Button onClick={() => VencordNative.quickCss.openEditor()}>
-                Open QuickCSS
-            </Button>
-        </div>
-    );
-}
diff --git a/src/equicordplugins/wallpaperFree/index.tsx b/src/equicordplugins/wallpaperFree/index.tsx
deleted file mode 100644
index 9545ef8e7..000000000
--- a/src/equicordplugins/wallpaperFree/index.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import "./styles.css";
-
-import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { Channel } from "@vencord/discord-types";
-import { useStateFromStores } from "@webpack/common";
-
-import { ChannelContextPatch, GuildContextPatch, UserContextPatch } from "./components/ctxmenu";
-import { GlobalDefaultComponent, TipsComponent } from "./components/util";
-import { WallpaperFreeStore } from "./store";
-
-export const settings = definePluginSettings({
-    globalDefault: {
-        description: "Set a global default wallpaper for all channels.",
-        type: OptionType.COMPONENT,
-        component: GlobalDefaultComponent
-    },
-    stylingTips: {
-        description: "",
-        type: OptionType.COMPONENT,
-        component: TipsComponent,
-    },
-});
-
-export default definePlugin({
-    name: "WallpaperFree",
-    authors: [Devs.Joona],
-    description: "Recreation of the old DM wallpaper experiment; Set a background image for any channel, user or server.",
-    patches: [
-        {
-            find: ".handleSendMessage,onResize",
-            group: true,
-            replacement: [
-                {
-                    match: /return.{1,150},(?=keyboardModeEnabled)/,
-                    replace: "const vcWallpaperFreeUrl=$self.WallpaperState(arguments[0].channel);$&vcWallpaperFreeUrl,"
-                },
-                {
-                    match: /}\)]}\)](?=.{1,30}messages-)/,
-                    replace: "$&.toSpliced(0,0,$self.Wallpaper({url:this.props.vcWallpaperFreeUrl}))"
-                }
-            ]
-        }
-    ],
-    settings,
-    contextMenus: {
-        "user-context": UserContextPatch,
-        "channel-context": ChannelContextPatch,
-        "thread-context": ChannelContextPatch,
-        "gdm-context": ChannelContextPatch,
-        "guild-context": GuildContextPatch,
-    },
-    Wallpaper({ url }: { url: string; }) {
-        // no we cant place the hook here
-        if (!url) return null;
-
-        return <div
-            className="vc-wpfree-wp-container"
-            style={{
-                backgroundImage: `url(${url})`,
-            }}></div>;
-    },
-    WallpaperState(channel: Channel) {
-        return useStateFromStores([WallpaperFreeStore], () => WallpaperFreeStore.getUrl(channel));
-    },
-});
diff --git a/src/equicordplugins/wallpaperFree/store.ts b/src/equicordplugins/wallpaperFree/store.ts
deleted file mode 100644
index c26119b7a..000000000
--- a/src/equicordplugins/wallpaperFree/store.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { proxyLazy } from "@utils/lazy";
-import { Channel, FluxEmitter, FluxStore } from "@vencord/discord-types";
-import { Flux as FluxWP, FluxDispatcher } from "@webpack/common";
-
-interface IFlux {
-    PersistedStore: typeof FluxStore;
-    Emitter: FluxEmitter;
-}
-
-export const WallpaperFreeStore = proxyLazy(() => {
-    const wallpaperChannelMap: Map<string, string> = new Map();
-    const wallpaperGuildMap: Map<string, string> = new Map();
-    let globalDefault: string | undefined;
-
-    class WallpaperFreeStore extends (FluxWP as unknown as IFlux).PersistedStore {
-        static persistKey = "WallpaperFreeStore";
-
-        // @ts-ignore
-        initialize(previous: { guildMap: Map<string, string>, channelMap: Map<string, string>, globalDefault: string; } | undefined) {
-            if (!previous)
-                return;
-
-            wallpaperGuildMap.clear();
-            wallpaperChannelMap.clear();
-            for (const [channel, url] of previous.channelMap) {
-                wallpaperChannelMap.set(channel, url);
-            }
-
-            for (const [guild, url] of previous.guildMap) {
-                wallpaperGuildMap.set(guild, url);
-            }
-            globalDefault = previous.globalDefault;
-        }
-
-        getState() {
-            return { guildMap: Array.from(wallpaperGuildMap), channelMap: Array.from(wallpaperChannelMap), globalDefault };
-        }
-
-        getUrl(channel: Channel) {
-            return (
-                wallpaperChannelMap.get(channel.id) ??
-                wallpaperGuildMap.get(channel.guild_id) ??
-                globalDefault
-            );
-        }
-
-        getForChannel(id: string) { return wallpaperChannelMap.get(id); }
-
-        getForGuild(id: string) { return wallpaperGuildMap.get(id); }
-
-        get globalDefault() { return globalDefault; }
-    }
-
-    const store = new WallpaperFreeStore(FluxDispatcher, {
-        // @ts-ignore
-        VC_WALLPAPER_FREE_CHANGE({ guildId, channelId, url }: { guildId: string | undefined, channelId: string | undefined, url: string; }) {
-            guildId && wallpaperGuildMap.set(guildId, url);
-            channelId && wallpaperChannelMap.set(channelId, url);
-            store.emitChange();
-        },
-
-        VC_WALLPAPER_FREE_CHANGE_GLOBAL({ url }: { url: string | undefined; }) {
-            globalDefault = url;
-            store.emitChange();
-        },
-
-        VC_WALLPAPER_FREE_RESET() {
-            wallpaperChannelMap.clear();
-            wallpaperGuildMap.clear();
-            globalDefault = void 0;
-            store.emitChange();
-        }
-    });
-
-    return store;
-});
diff --git a/src/equicordplugins/wallpaperFree/styles.css b/src/equicordplugins/wallpaperFree/styles.css
deleted file mode 100644
index 839cb1808..000000000
--- a/src/equicordplugins/wallpaperFree/styles.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.vc-wpfree-wp-container {
-    background-position: 100% 100%;
-    background-repeat: no-repeat;
-    background-size: cover;
-    inset: 0;
-    position: absolute;
-}
diff --git a/src/equicordplugins/webpackTarball/index.tsx b/src/equicordplugins/webpackTarball/index.tsx
index 536e1212c..c96e9011c 100644
--- a/src/equicordplugins/webpackTarball/index.tsx
+++ b/src/equicordplugins/webpackTarball/index.tsx
@@ -31,6 +31,7 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "WebpackTarball",
     description: "Converts Discord's webpack sources into a tarball.",
+    tags: ["Developers", "Utility"],
     authors: [Devs.Kyuuhachi],
     settings,
 
diff --git a/src/equicordplugins/whitelistedEmojis/index.tsx b/src/equicordplugins/whitelistedEmojis/index.tsx
index 70d21eb37..05284608e 100644
--- a/src/equicordplugins/whitelistedEmojis/index.tsx
+++ b/src/equicordplugins/whitelistedEmojis/index.tsx
@@ -11,37 +11,37 @@ import { DataStore } from "@api/index";
 import { definePluginSettings } from "@api/Settings";
 import { EquicordDevs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
+import { chooseFile, saveFile } from "@utils/web";
 import { CustomEmoji, UnicodeEmoji } from "@vencord/discord-types";
-import { Alerts, Button, EmojiStore, GuildStore, Menu, Toasts, useEffect, useState } from "@webpack/common";
+import { Alerts, Button, EmojiStore, GuildStore, IconUtils, Menu, Toasts, useEffect, useState } from "@webpack/common";
 import { JSX } from "react";
 
-interface ContextMenuEmoji {
-    type: string;
-    id: string;
-    name: string;
-    surrogates?: string;
-}
-
-interface Target {
-    dataset: ContextMenuEmoji;
-    firstChild: HTMLImageElement;
-}
-
-interface customSaveEmoji {
-    type: string;
-    id: string;
-    guildId?: string;
-    name: string;
-    surrogates?: string;
-    url?: string;
-    animated?: boolean;
-}
+import { ContextMenuEmoji, SavedEmoji, Target } from "./types";
 
 const DATA_COLLECTION_NAME = "whitelisted-emojis";
 
 let cache_allowedList: ContextMenuEmoji[] = [];
+const cacheListeners = new Set<() => void>();
+let writeChain: Promise<unknown> = Promise.resolve();
+
 const getAllowedList = async (): Promise<ContextMenuEmoji[]> => (await DataStore.get<ContextMenuEmoji[]>(DATA_COLLECTION_NAME)) ?? [];
 
+function notifyCacheChange() {
+    for (const listener of cacheListeners) listener();
+}
+
+function withWriteLock<T>(fn: () => T | Promise<T>): Promise<T> {
+    const next = writeChain.catch(() => undefined).then(fn);
+    writeChain = next;
+    return next;
+}
+
+async function setAllowedList(newList: ContextMenuEmoji[]) {
+    await DataStore.set(DATA_COLLECTION_NAME, newList);
+    cache_allowedList = newList;
+    notifyCacheChange();
+}
+
 function isItemAllowed(item: (CustomEmoji | UnicodeEmoji)) {
     if ("uniqueName" in item) {
         return cache_allowedList.some(emoji => emoji.name === item.uniqueName);
@@ -53,155 +53,76 @@ function itemAlreadyInList(item: ContextMenuEmoji) {
     return cache_allowedList.some(emoji => emoji.name === item.name);
 }
 
-async function addBulkToAllowedList(items: ContextMenuEmoji[]) {
-    const itemsToAdd = await Promise.all(items.map(async item => {
-        if (!itemAlreadyInList(item)) {
-            let emojiData: CustomEmoji | undefined = undefined;
+function buildSaveData(item: ContextMenuEmoji): SavedEmoji {
+    const saveData: SavedEmoji = {
+        type: "emoji",
+        id: item.id,
+        name: item.name,
+        surrogates: item.surrogates,
+    };
 
-            if (!item.surrogates) {
-                emojiData = EmojiStore.getCustomEmojiById(item.id);
-            }
-
-            const saveData: customSaveEmoji = {
-                type: "emoji",
-                id: item.id,
-                name: item.name,
-                surrogates: item.surrogates,
-            };
-
-            if (emojiData && emojiData.guildId) {
-                saveData.url = `https://cdn.discordapp.com/emojis/${emojiData.id}.${emojiData.animated ? "gif" : "png"}`;
-                saveData.guildId = emojiData.guildId;
-                saveData.animated = emojiData.animated;
-            }
-
-            return saveData;
-        }
-        return null;
-    }));
-
-    const validItemsToAdd = itemsToAdd.filter(item => item !== null);
-    await DataStore.set(DATA_COLLECTION_NAME, [...cache_allowedList, ...validItemsToAdd]);
-
-    if (!settings.store.disableToasts) {
-        Toasts.show({
-            message: `Added ${validItemsToAdd.length} emojis to the list, ${items.length - validItemsToAdd.length} already in the list`,
-            type: Toasts.Type.SUCCESS,
-            id: Toasts.genId(),
-            options: {
-                duration: 3000,
-                position: Toasts.Position.BOTTOM
-            }
-        });
-    }
-
-    cache_allowedList = await getAllowedList();
-}
-
-async function removeBulkFromAllowedList(items: ContextMenuEmoji[]) {
-    const itemsToRemove = items.filter(item => itemAlreadyInList(item));
-    await DataStore.set(DATA_COLLECTION_NAME, cache_allowedList.filter(emoji => {
-        return !itemsToRemove.some(item => item.name === emoji.name);
-    }));
-
-    if (!settings.store.disableToasts) {
-        Toasts.show({
-            message: `Removed ${itemsToRemove.length} emojis from the list`,
-            type: Toasts.Type.SUCCESS,
-            id: Toasts.genId(),
-            options: {
-                duration: 3000,
-                position: Toasts.Position.BOTTOM
-            }
-        });
-    }
-
-    cache_allowedList = await getAllowedList();
-}
-
-async function addToAllowedList(item: ContextMenuEmoji) {
-    if (!itemAlreadyInList(item)) {
-        let emojiData: CustomEmoji | undefined = undefined;
-
-        if (!item.surrogates) {
-            emojiData = EmojiStore.getCustomEmojiById(item.id);
-        }
-
-        const saveData: customSaveEmoji = {
-            type: "emoji",
-            id: item.id,
-            name: item.name,
-            surrogates: item.surrogates,
-        };
-
-        if (emojiData && emojiData.guildId) {
-            saveData.url = `https://cdn.discordapp.com/emojis/${emojiData.id}.${emojiData.animated ? "gif" : "png"}`;
+    if (!item.surrogates) {
+        const emojiData = EmojiStore.getCustomEmojiById(item.id);
+        if (emojiData?.guildId) {
+            saveData.url = IconUtils.getEmojiURL({ id: emojiData.id, animated: !!emojiData.animated, size: 64 });
             saveData.guildId = emojiData.guildId;
             saveData.animated = emojiData.animated;
         }
-
-        await DataStore.set(DATA_COLLECTION_NAME, [...cache_allowedList, { ...saveData }]);
-
-        if (!settings.store.disableToasts) {
-            Toasts.show({
-                message: `Added "${item.name}" to the list`,
-                type: Toasts.Type.SUCCESS,
-                id: Toasts.genId(),
-                options: {
-                    duration: 3000,
-                    position: Toasts.Position.BOTTOM
-                }
-            });
-        }
-    } else {
-        if (!settings.store.disableToasts) {
-            Toasts.show({
-                message: `"${item.name}" is already in the list`,
-                type: Toasts.Type.FAILURE,
-                id: Toasts.genId(),
-                options: {
-                    duration: 3000,
-                    position: Toasts.Position.BOTTOM
-                }
-            });
-        }
     }
 
-    cache_allowedList = await getAllowedList();
+    return saveData;
 }
 
-async function removeFromAllowedList(item: ContextMenuEmoji) {
-    if (itemAlreadyInList(item)) {
-        await DataStore.set(DATA_COLLECTION_NAME, cache_allowedList.filter(emoji => {
-            return emoji.name !== item.name;
-        }));
+function showToast(message: string, type = Toasts.Type.SUCCESS) {
+    if (settings.store.disableToasts) return;
+    Toasts.show({
+        message,
+        type,
+        id: Toasts.genId(),
+        options: { duration: 3000, position: Toasts.Position.BOTTOM }
+    });
+}
 
-        if (!settings.store.disableToasts) {
-            Toasts.show({
-                message: `Removed "${item.name}" from the list`,
-                type: Toasts.Type.SUCCESS,
-                id: Toasts.genId(),
-                options: {
-                    duration: 3000,
-                    position: Toasts.Position.BOTTOM
-                }
-            });
-        }
-    } else {
-        if (!settings.store.disableToasts) {
-            Toasts.show({
-                message: `"${item.name}" is not in the list`,
-                type: Toasts.Type.FAILURE,
-                id: Toasts.genId(),
-                options: {
-                    duration: 3000,
-                    position: Toasts.Position.BOTTOM
-                }
-            });
-        }
-    }
+function addBulkToAllowedList(items: ContextMenuEmoji[]) {
+    return withWriteLock(async () => {
+        const validItemsToAdd = items.filter(item => !itemAlreadyInList(item)).map(buildSaveData);
+        await setAllowedList([...cache_allowedList, ...validItemsToAdd]);
 
-    cache_allowedList = await getAllowedList();
+        showToast(`Added ${validItemsToAdd.length} emojis to the list, ${items.length - validItemsToAdd.length} already in the list`);
+    });
+}
+
+function removeBulkFromAllowedList(items: ContextMenuEmoji[]) {
+    return withWriteLock(async () => {
+        const itemsToRemove = items.filter(item => itemAlreadyInList(item));
+        await setAllowedList(cache_allowedList.filter(emoji => !itemsToRemove.some(item => item.name === emoji.name)));
+
+        showToast(`Removed ${itemsToRemove.length} emojis from the list`);
+    });
+}
+
+function addToAllowedList(item: ContextMenuEmoji) {
+    return withWriteLock(async () => {
+        if (itemAlreadyInList(item)) {
+            showToast(`"${item.name}" is already in the list`, Toasts.Type.FAILURE);
+            return;
+        }
+
+        await setAllowedList([...cache_allowedList, buildSaveData(item)]);
+        showToast(`Added "${item.name}" to the list`);
+    });
+}
+
+function removeFromAllowedList(item: ContextMenuEmoji) {
+    return withWriteLock(async () => {
+        if (!itemAlreadyInList(item)) {
+            showToast(`"${item.name}" is not in the list`, Toasts.Type.FAILURE);
+            return;
+        }
+
+        await setAllowedList(cache_allowedList.filter(emoji => emoji.name !== item.name));
+        showToast(`Removed "${item.name}" from the list`);
+    });
 }
 
 const expressionPickerPatch: NavContextMenuPatchCallback = (children, { target }: { target: Target; }) => {
@@ -229,8 +150,7 @@ const buildGuildContextPatch = (guild: { id: string; name: string; }) => {
                 key="add-white-list-guild-emojis"
                 label="Add All Guild Emojis"
                 action={() => {
-                    const { id, name } = guild;
-                    const emojis = EmojiStore.getGuildEmoji(id);
+                    const emojis = EmojiStore.getGuildEmoji(guild.id);
                     addBulkToAllowedList(emojis.map(emoji => ({
                         type: "emoji",
                         id: emoji.id,
@@ -243,8 +163,7 @@ const buildGuildContextPatch = (guild: { id: string; name: string; }) => {
                 key="remove-white-list-guild-emojis"
                 label="Remove All Guild Emojis"
                 action={() => {
-                    const { id, name } = guild;
-                    const emojis = EmojiStore.getGuildEmoji(id);
+                    const emojis = EmojiStore.getGuildEmoji(guild.id);
                     removeBulkFromAllowedList(emojis.map(emoji => ({
                         type: "emoji",
                         id: emoji.id,
@@ -257,49 +176,39 @@ const buildGuildContextPatch = (guild: { id: string; name: string; }) => {
 };
 
 function buildMenuItems(emoji: ContextMenuEmoji) {
-    const typeString = itemAlreadyInList(emoji) ? "Remove" : "Add";
+    const isInList = itemAlreadyInList(emoji);
     return (
         <>
             <Menu.MenuSeparator />
             <Menu.MenuItem
-                id={`white-list-emoji-${typeString}`}
-                key={`white-list-emoji-${typeString}`}
-                label={`${typeString} to Whitelist`}
-                action={() => {
-                    if (typeString === "Add") {
-                        addToAllowedList(emoji);
-                    } else {
-                        removeFromAllowedList(emoji);
-                    }
-                }}
+                id="white-list-emoji"
+                key="white-list-emoji"
+                label={isInList ? "Remove from Whitelist" : "Add to Whitelist"}
+                action={() => isInList ? removeFromAllowedList(emoji) : addToAllowedList(emoji)}
             />
         </>
     );
 }
 
+function useWhitelistedEmojis(): SavedEmoji[] {
+    const [, forceUpdate] = useState(0);
+    useEffect(() => {
+        const listener = () => forceUpdate(v => v + 1);
+        cacheListeners.add(listener);
+        return () => void cacheListeners.delete(listener);
+    }, []);
+    return cache_allowedList as SavedEmoji[];
+}
+
 const WhiteListedEmojisComponent = (): JSX.Element => {
-    const [whitelistedEmojis, setWhitelistedEmojis] = useState<customSaveEmoji[]>([]);
+    const whitelistedEmojis = useWhitelistedEmojis();
     const [collapsedGroups, setCollapsedGroups] = useState<Record<string, boolean>>({});
 
-    useEffect(() => {
-        const fetchAllowedList = async () => {
-            const allowedList = await getAllowedList() as customSaveEmoji[];
-            setWhitelistedEmojis(allowedList);
-        };
-        fetchAllowedList();
-    }, []);
+    const handleRemoveEmoji = (emoji: SavedEmoji) => removeFromAllowedList(emoji);
 
-    const handleRemoveEmoji = async (emoji: customSaveEmoji) => {
-        await removeFromAllowedList(emoji);
-        setWhitelistedEmojis(await getAllowedList() as customSaveEmoji[]);
-    };
-
-    const handleRemoveAllEmojis = async (guildId: string) => {
+    const handleRemoveAllEmojis = (guildId: string) => {
         const emojisToRemove = whitelistedEmojis.filter(emoji => emoji.guildId === guildId || (guildId === "default" && !emoji.guildId));
-        for (const emoji of emojisToRemove) {
-            await removeFromAllowedList(emoji);
-        }
-        setWhitelistedEmojis(await getAllowedList() as customSaveEmoji[]);
+        return removeBulkFromAllowedList(emojisToRemove);
     };
 
     const toggleGroupCollapse = (guildId: string) => {
@@ -316,7 +225,7 @@ const WhiteListedEmojisComponent = (): JSX.Element => {
         }
         groups[groupKey].push(emoji);
         return groups;
-    }, {} as Record<string, customSaveEmoji[]>);
+    }, {} as Record<string, SavedEmoji[]>);
 
     return (
         <div className="emoji-container">
@@ -346,7 +255,7 @@ const WhiteListedEmojisComponent = (): JSX.Element => {
                                     ) : (
                                         <img
                                             className="emoji-image"
-                                            src={`https://cdn.discordapp.com/emojis/${emoji.id}.${emoji.animated ? "gif" : "png"}`}
+                                            src={IconUtils.getEmojiURL({ id: emoji.id, animated: !!emoji.animated, size: 64 })}
                                             alt={emoji.name}
                                         />
                                     )}
@@ -374,67 +283,25 @@ const WhiteListedEmojisComponent = (): JSX.Element => {
 
 const exportEmojis = async () => {
     const fileName = "whitelisted-emojis.json";
-    const exportData = await exportEmojisToJson();
-    const data = new TextEncoder().encode(exportData);
+    const emojis = await getAllowedList();
+    const json = JSON.stringify({ emojis }, null, 4);
 
     if (IS_WEB || IS_EQUIBOP || IS_VESKTOP) {
-        const file = new File([data], fileName, { type: "application/json" });
-        const a = document.createElement("a");
-        a.href = URL.createObjectURL(file);
-        a.download = fileName;
-
-        document.body.appendChild(a);
-        a.click();
-        setImmediate(() => {
-            URL.revokeObjectURL(a.href);
-            document.body.removeChild(a);
-        });
+        saveFile(new File([json], fileName, { type: "application/json" }));
     } else {
-        DiscordNative.fileManager.saveWithDialog(data, fileName);
+        DiscordNative.fileManager.saveWithDialog(new TextEncoder().encode(json), fileName);
     }
 
-    if (!settings.store.disableToasts) {
-        Toasts.show({
-            message: "Successfully exported emojis",
-            type: Toasts.Type.SUCCESS,
-            id: Toasts.genId(),
-            options: {
-                duration: 3000,
-                position: Toasts.Position.BOTTOM
-            }
-        });
-    }
+    showToast("Successfully exported emojis");
 };
 
-async function exportEmojisToJson() {
-    const emojis = await getAllowedList();
-    return JSON.stringify({ emojis }, null, 4);
-}
-
 const uploadEmojis = async () => {
+    let data: string;
+
     if (IS_WEB || IS_EQUIBOP || IS_VESKTOP) {
-        const input = document.createElement("input");
-        input.type = "file";
-        input.style.display = "none";
-        input.accept = "application/json";
-        input.onchange = async () => {
-            const file = input.files?.[0];
-            if (!file) return;
-
-            const reader = new FileReader();
-            reader.onload = async () => {
-                const data = reader.result as string;
-                await importEmojis(data);
-            };
-
-            reader.readAsText(file);
-        };
-
-        document.body.appendChild(input);
-        input.click();
-        setImmediate(() => {
-            document.body.removeChild(input);
-        });
+        const file = await chooseFile("application/json");
+        if (!file) return;
+        data = await file.text();
     } else {
         const [file] = await DiscordNative.fileManager.openFiles({
             filters: [
@@ -442,105 +309,46 @@ const uploadEmojis = async () => {
                 { name: "all", extensions: ["*"] }
             ]
         });
-
-        if (file) {
-            try {
-                await importEmojis(new TextDecoder().decode(file.data));
-            } catch (err) {
-                console.error(err);
-                if (!settings.store.disableToasts) {
-                    Toasts.show({
-                        message: `Failed to import emojis: ${err}`,
-                        type: Toasts.Type.FAILURE,
-                        id: Toasts.genId(),
-                        options: {
-                            duration: 3000,
-                            position: Toasts.Position.BOTTOM
-                        }
-                    });
-                }
-            }
-        }
+        if (!file) return;
+        data = new TextDecoder().decode(file.data);
     }
+
+    await importEmojis(data);
 };
 
-const importEmojis = async (data: string) => {
+const importEmojis = (data: string) => withWriteLock(async () => {
     try {
         const parsed = JSON.parse(data);
         if (parsed && typeof parsed === "object" && Array.isArray(parsed.emojis)) {
-            await DataStore.set(DATA_COLLECTION_NAME, parsed.emojis);
-            cache_allowedList = await getAllowedList();
-
-            if (!settings.store.disableToasts) {
-                Toasts.show({
-                    message: "Successfully imported emojis",
-                    type: Toasts.Type.SUCCESS,
-                    id: Toasts.genId(),
-                    options: {
-                        duration: 3000,
-                        position: Toasts.Position.BOTTOM
-                    }
-                });
-            }
+            await setAllowedList(parsed.emojis);
+            showToast("Successfully imported emojis");
         } else {
-            if (!settings.store.disableToasts) {
-                Toasts.show({
-                    message: "Invalid JSON data",
-                    type: Toasts.Type.FAILURE,
-                    id: Toasts.genId(),
-                    options: {
-                        duration: 3000,
-                        position: Toasts.Position.BOTTOM
-                    }
-                });
-            }
+            showToast("Invalid JSON data", Toasts.Type.FAILURE);
         }
     } catch (err) {
-        if (!settings.store.disableToasts) {
-            Toasts.show({
-                message: `Failed to import emojis: ${err}`,
-                type: Toasts.Type.FAILURE,
-                id: Toasts.genId(),
-                options: {
-                    duration: 3000,
-                    position: Toasts.Position.BOTTOM
-                }
-            });
-        }
+        showToast(`Failed to import emojis: ${err}`, Toasts.Type.FAILURE);
     }
-};
+});
 
-const resetEmojis = async () => {
-    await DataStore.set(DATA_COLLECTION_NAME, []);
-    cache_allowedList = await getAllowedList();
-
-    if (!settings.store.disableToasts) {
-        Toasts.show({
-            message: "Reset emojis",
-            type: Toasts.Type.SUCCESS,
-            id: Toasts.genId(),
-            options: {
-                duration: 3000,
-                position: Toasts.Position.BOTTOM
-            }
-        });
-    }
-};
+const resetEmojis = () => withWriteLock(async () => {
+    await setAllowedList([]);
+    showToast("Reset emojis");
+});
 
 const settings = definePluginSettings({
     defaultEmojis: {
         type: OptionType.BOOLEAN,
-        description: "Hide default emojis",
+        description: "Hide default Unicode emojis from the autocomplete unless whitelisted.",
         default: true
     },
     serverEmojis: {
         type: OptionType.BOOLEAN,
-        description: "Hide server emojis",
+        description: "Hide custom server emojis from the autocomplete unless whitelisted.",
         default: true
     },
     disableToasts: {
         type: OptionType.BOOLEAN,
-        description: "Disable toasts",
+        description: "Don't show toasts when adding or removing emojis.",
         default: false
     },
     whiteListedEmojis: {
@@ -566,10 +374,7 @@ const settings = definePluginSettings({
                     confirmText: "Import",
                     confirmColor: Button.Colors.RED,
                     cancelText: "Cancel",
-                    onConfirm: async () => {
-                        await DataStore.set(DATA_COLLECTION_NAME, []);
-                        await uploadEmojis();
-                    }
+                    onConfirm: uploadEmojis
                 })}>
                 Import Emojis
             </Button>
@@ -597,19 +402,21 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "WhitelistedEmojis",
     description: "Adds the ability to disable all message emojis except for a whitelisted set.",
+    tags: ["Chat", "Emotes"],
     authors: [EquicordDevs.creations],
     patches: [
         {
-            find: "#{intl::EMOJI_MATCHING}",
+            find: "queryEmojiResults({query:",
             replacement: {
-                match: /renderResults\((\i)\){/,
-                replace: "$&$1.results.emojis=$self.filterEmojis($1);if($1.results.emojis.length===0)return;"
+                match: /\{emojis:\{unlocked:(\i)\}\}=\i\.\i\.queryEmojiResults\(\{.{0,200}\}\);/,
+                replace: "$&$1=$self.filterEmojis($1);"
             }
         }
     ],
     settings: settings,
     async start() {
         cache_allowedList = await getAllowedList();
+        notifyCacheChange();
         addContextMenuPatch("expression-picker", expressionPickerPatch);
         addContextMenuPatch("guild-context", guildContextPatch);
     },
@@ -617,18 +424,14 @@ export default definePlugin({
         removeContextMenuPatch("expression-picker", expressionPickerPatch);
         removeContextMenuPatch("guild-context", guildContextPatch);
     },
-    filterEmojis: (data: { results: { emojis: (CustomEmoji | UnicodeEmoji)[]; }; }) => {
-        const { emojis } = data.results;
-        let modifiedEmojis = emojis;
-
+    filterEmojis(emojis: (CustomEmoji | UnicodeEmoji)[]): (CustomEmoji | UnicodeEmoji)[] {
+        let result = emojis;
         if (settings.store.defaultEmojis) {
-            modifiedEmojis = modifiedEmojis.filter(emoji => !("uniqueName" in emoji) || isItemAllowed(emoji));
+            result = result.filter(e => !("uniqueName" in e) || isItemAllowed(e));
         }
-
         if (settings.store.serverEmojis) {
-            modifiedEmojis = modifiedEmojis.filter(emoji => "uniqueName" in emoji || isItemAllowed(emoji));
+            result = result.filter(e => "uniqueName" in e || isItemAllowed(e));
         }
-
-        return modifiedEmojis;
+        return result;
     }
 });
diff --git a/src/equicordplugins/whitelistedEmojis/types.ts b/src/equicordplugins/whitelistedEmojis/types.ts
new file mode 100644
index 000000000..a65c69e00
--- /dev/null
+++ b/src/equicordplugins/whitelistedEmojis/types.ts
@@ -0,0 +1,26 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export interface ContextMenuEmoji {
+    type: string;
+    id: string;
+    name: string;
+    surrogates?: string;
+}
+
+export interface Target {
+    dataset: ContextMenuEmoji;
+}
+
+export interface SavedEmoji {
+    type: string;
+    id: string;
+    name: string;
+    guildId?: string;
+    surrogates?: string;
+    url?: string;
+    animated?: boolean;
+}
diff --git a/src/equicordplugins/whosWatching/index.tsx b/src/equicordplugins/whosWatching/index.tsx
index 2412d1827..fb31ca22f 100644
--- a/src/equicordplugins/whosWatching/index.tsx
+++ b/src/equicordplugins/whosWatching/index.tsx
@@ -82,6 +82,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "WhosWatching",
     description: "Hover over the screenshare icon to view what users are watching your stream",
+    tags: ["Activity"],
     authors: [EquicordDevs.Fres, Devs.thororen],
     settings,
     patches: [
@@ -93,9 +94,9 @@ export default definePlugin({
             }
         },
         {
-            find: "this.renderEmbeddedActivity()",
+            find: ",setIsForceShowSharingPopout:",
             replacement: {
-                match: /"div"(?=.{0,40}?,this.renderActions\(\))/,
+                match: /"div"(?=.{0,50}stream:\i,canGoLive:\i)/,
                 replace: "$self.WrapperComponent"
             }
         }
diff --git a/src/equicordplugins/wigglyText/index.tsx b/src/equicordplugins/wigglyText/index.tsx
index 1f683e9e6..b3118029f 100644
--- a/src/equicordplugins/wigglyText/index.tsx
+++ b/src/equicordplugins/wigglyText/index.tsx
@@ -112,6 +112,7 @@ const updateStyles = () => {
 export default definePlugin({
     name: "WigglyText",
     description: "Adds a new markdown formatting that makes text wiggly.",
+    tags: ["Appearance", "Customisation", "Fun"],
     authors: [EquicordDevs.nexpid],
     settings,
     settingsAboutComponent: () => (
diff --git a/src/equicordplugins/writeUpperCase/index.ts b/src/equicordplugins/writeUpperCase/index.ts
index 263b1a231..81a9a329a 100644
--- a/src/equicordplugins/writeUpperCase/index.ts
+++ b/src/equicordplugins/writeUpperCase/index.ts
@@ -37,6 +37,7 @@ const presendObject: MessageSendListener = (_, msg) => {
 export default definePlugin({
     name: "WriteUpperCase",
     description: "Changes the first Letter of each Sentence in Message Inputs to Uppercase",
+    tags: ["Appearance", "Customisation", "Chat"],
     authors: [Devs.Samwich, EquicordDevs.KrystalSkull],
     settings,
 
diff --git a/src/equicordplugins/zipPreview/components.tsx b/src/equicordplugins/zipPreview/components.tsx
new file mode 100644
index 000000000..5dc9cffbd
--- /dev/null
+++ b/src/equicordplugins/zipPreview/components.tsx
@@ -0,0 +1,385 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Button } from "@components/Button";
+import { CodeBlock } from "@components/CodeBlock";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Flex } from "@components/Flex";
+import { Heading } from "@components/Heading";
+import { ChevronSmallDownIcon, ChevronSmallUpIcon, FolderIcon } from "@components/Icons";
+import { classNameFactory } from "@utils/css";
+import { copyWithToast } from "@utils/discord";
+import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { useEffect, useMemo, useRef, useState } from "@webpack/common";
+
+import {
+    createImageObjectUrl,
+    getAttachmentFileName,
+    getAttachmentUrl,
+    getCachedZip,
+    getCodeLanguage,
+    isZipFile,
+    makeDownload,
+    MAX_ENTRIES,
+    readTextEntry,
+    ZipEntry,
+    ZipPreviewAttachmentProps,
+    ZipPreviewCacheState
+} from "./utils";
+
+export const cl = classNameFactory("vc-zip-preview-");
+const breadcrumbColorStyle = { color: "var(--text-muted)" };
+
+interface VisibleEntries {
+    directories: string[];
+    files: ZipEntry[];
+}
+
+function getVisibleEntries(entries: ZipEntry[], currentPath: string): VisibleEntries {
+    const dirs = new Set<string>();
+    const files: ZipEntry[] = [];
+    const prefix = currentPath ? `${currentPath}/` : "";
+
+    for (const entry of entries) {
+        if (!entry.path.startsWith(prefix)) continue;
+
+        const remainder = entry.path.slice(prefix.length);
+        const slashIndex = remainder.indexOf("/");
+
+        if (slashIndex === -1) {
+            files.push(entry);
+        } else {
+            dirs.add(remainder.slice(0, slashIndex));
+        }
+    }
+
+    return {
+        directories: Array.from(dirs).sort(),
+        files
+    };
+}
+
+export function ZipPreviewInline(props: ZipPreviewAttachmentProps) {
+    const fileName = getAttachmentFileName(props);
+    const url = getAttachmentUrl(props);
+    const [cacheState, setCacheState] = useState<ZipPreviewCacheState | null>(null);
+    const [isExpanded, setIsExpanded] = useState(false);
+    const [isContentMounted, setIsContentMounted] = useState(false);
+    const [currentPath, setCurrentPath] = useState("");
+    const ToggleIcon = isExpanded ? ChevronSmallUpIcon : ChevronSmallDownIcon;
+    const animationFrameRef = useRef<number | null>(null);
+    const animationTimeoutRef = useRef<number | null>(null);
+    const loadRequestIdRef = useRef(0);
+
+    useEffect(() => {
+        loadRequestIdRef.current++;
+        setCacheState(null);
+        setCurrentPath("");
+        setIsExpanded(false);
+        setIsContentMounted(false);
+    }, [url]);
+
+    useEffect(() => () => {
+        loadRequestIdRef.current++;
+        if (animationFrameRef.current != null) cancelAnimationFrame(animationFrameRef.current);
+        if (animationTimeoutRef.current != null) clearTimeout(animationTimeoutRef.current);
+    }, []);
+
+    if (!isZipFile(fileName) || !url) return null;
+
+    const loadPreview = () => {
+        const loadRequestId = ++loadRequestIdRef.current;
+        const state = getCachedZip(url);
+        setCacheState(state);
+
+        if (state.status === "pending") {
+            state.promise
+                .then(() => {
+                    if (loadRequestIdRef.current === loadRequestId) setCacheState(getCachedZip(url));
+                })
+                .catch(error => {
+                    if (loadRequestIdRef.current !== loadRequestId) return;
+
+                    const message = error instanceof Error ? error.message : "Failed to preview ZIP.";
+                    setCacheState({ status: "rejected", message });
+                });
+        }
+    };
+
+    const setExpanded = (nextIsExpanded: boolean) => {
+        if (animationFrameRef.current != null) cancelAnimationFrame(animationFrameRef.current);
+        if (animationTimeoutRef.current != null) clearTimeout(animationTimeoutRef.current);
+
+        if (nextIsExpanded) {
+            if (!cacheState || cacheState.status === "rejected") loadPreview();
+            setIsContentMounted(true);
+            animationFrameRef.current = requestAnimationFrame(() => {
+                animationFrameRef.current = null;
+                setIsExpanded(true);
+            });
+            return;
+        }
+
+        setIsExpanded(false);
+        animationTimeoutRef.current = window.setTimeout(() => {
+            animationTimeoutRef.current = null;
+            setIsContentMounted(false);
+        }, 180);
+    };
+
+    return (
+        <div className={cl("inline", isContentMounted ? "expanded" : "collapsed", isExpanded ? "open" : "closed")}>
+            {isContentMounted && (
+                <div className={cl("content")} aria-hidden={!isExpanded}>
+                    <div className={cl("content-inner")}>
+                        <ZipPreviewContent cacheState={cacheState} currentPath={currentPath} onNavigate={setCurrentPath} />
+                    </div>
+                </div>
+            )}
+            <button
+                className={cl("toggle")}
+                type="button"
+                aria-expanded={isExpanded}
+                aria-label={isExpanded ? "Collapse ZIP preview" : "Expand ZIP preview"}
+                onClick={event => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    setExpanded(!isExpanded);
+                }}
+            >
+                <ToggleIcon className={cl("toggle-icon")} />
+            </button>
+        </div>
+    );
+}
+
+function ZipPreviewContent({
+    cacheState,
+    currentPath,
+    onNavigate
+}: {
+    cacheState: ZipPreviewCacheState | null;
+    currentPath: string;
+    onNavigate: (path: string) => void;
+}) {
+    if (!cacheState || cacheState.status === "pending") {
+        return <div className={cl("state")}>Loading ZIP preview...</div>;
+    }
+
+    if (cacheState.status === "rejected") {
+        return <div className={cl("state")}>{cacheState.message}</div>;
+    }
+
+    const { entries, truncated } = cacheState.result;
+    if (entries.length === 0) {
+        return <div className={cl("state")}>This ZIP is empty.</div>;
+    }
+
+    return (
+        <>
+            <ZipPreviewBreadcrumb path={currentPath} onNavigate={onNavigate} />
+            {truncated && <div className={cl("state")}>Only showing first {MAX_ENTRIES} entries.</div>}
+            <div className={cl("entries")}>
+                <ZipPreviewFileList entries={entries} currentPath={currentPath} onNavigate={onNavigate} />
+            </div>
+        </>
+    );
+}
+
+function ZipPreviewBreadcrumb({ path, onNavigate }: { path: string; onNavigate: (path: string) => void; }) {
+    if (!path) {
+        return (
+            <div className={cl("breadcrumb")}>
+                <FolderIcon className={cl("breadcrumb-icon")} style={breadcrumbColorStyle} />
+                <span className={cl("breadcrumb-current")} style={breadcrumbColorStyle}>/</span>
+            </div>
+        );
+    }
+
+    const parts = path.split("/");
+
+    return (
+        <div className={cl("breadcrumb")}>
+            <FolderIcon className={cl("breadcrumb-icon")} style={breadcrumbColorStyle} />
+            <button
+                className={cl("breadcrumb-segment")}
+                type="button"
+                onClick={event => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    onNavigate("");
+                }}
+            >
+                /
+            </button>
+            {parts.map((part, index) => {
+                const segmentPath = parts.slice(0, index + 1).join("/");
+                const isLast = index === parts.length - 1;
+
+                return (
+                    <span key={segmentPath}>
+                        {isLast
+                            ? <span className={cl("breadcrumb-current")} style={breadcrumbColorStyle}>{part}/</span>
+                            : (
+                                <button
+                                    className={cl("breadcrumb-segment")}
+                                    type="button"
+                                    onClick={event => {
+                                        event.preventDefault();
+                                        event.stopPropagation();
+                                        onNavigate(segmentPath);
+                                    }}
+                                >
+                                    {part}
+                                </button>
+                            )}
+                    </span>
+                );
+            })}
+        </div>
+    );
+}
+
+function ZipPreviewFileList({ entries, currentPath, onNavigate }: { entries: ZipEntry[]; currentPath: string; onNavigate: (path: string) => void; }) {
+    const { directories, files } = useMemo(() => getVisibleEntries(entries, currentPath), [entries, currentPath]);
+
+    if (directories.length === 0 && files.length === 0) {
+        return <div className={cl("state")}>This folder is empty.</div>;
+    }
+
+    return (
+        <>
+            {directories.map(dir => (
+                <button
+                    key={dir}
+                    className={cl("row", "directory", "button")}
+                    type="button"
+                    onClick={event => {
+                        event.preventDefault();
+                        event.stopPropagation();
+                        onNavigate(currentPath ? `${currentPath}/${dir}` : dir);
+                    }}
+                >
+                    {dir}/
+                </button>
+            ))}
+            {files.map(entry => (
+                <ZipPreviewFileRow key={entry.path} entry={entry} />
+            ))}
+        </>
+    );
+}
+
+function ZipPreviewFileRow({ entry }: { entry: ZipEntry; }) {
+    const previewable = entry.kind !== "unsupported";
+
+    if (!previewable) {
+        return (
+            <div className={cl("row", "file", "unsupported")}>
+                {entry.name} <span className={cl("size")}>({formatBytes(entry.size)})</span>
+            </div>
+        );
+    }
+
+    return (
+        <button
+            className={cl("row", "file", "button")}
+            type="button"
+            onClick={event => {
+                event.preventDefault();
+                event.stopPropagation();
+                openZipEntryModal(entry);
+            }}
+        >
+            {entry.name} <span className={cl("size")}>({formatBytes(entry.size)})</span>
+        </button>
+    );
+}
+
+function openZipEntryModal(entry: ZipEntry) {
+    if (entry.kind === "image") {
+        openImageEntryModal(entry);
+        return;
+    }
+
+    if (entry.kind === "text") {
+        openTextEntryModal(entry);
+    }
+}
+
+function openTextEntryModal(entry: ZipEntry) {
+    const content = readTextEntry(entry);
+    const key = openModal(modalProps => (
+        <ErrorBoundary>
+            <ModalRoot {...modalProps} size={ModalSize.LARGE}>
+                <ModalHeader>
+                    <Heading tag="h2" className={cl("modal-title")}>{entry.name}</Heading>
+                    <ModalCloseButton onClick={() => closeModal(key)} />
+                </ModalHeader>
+                <ModalContent className={cl("modal-content")}>
+                    <div className={cl("code-wrap")}>
+                        <CodeBlock content={content} lang={getCodeLanguage(entry)} />
+                    </div>
+                </ModalContent>
+                <ModalFooter>
+                    <Flex gap={8} justifyContent="flex-end">
+                        <Button variant="secondary" onClick={() => copyWithToast(content, "File contents copied to clipboard!")}>
+                            Copy
+                        </Button>
+                        <Button onClick={() => makeDownload(entry)}>
+                            Download
+                        </Button>
+                    </Flex>
+                </ModalFooter>
+            </ModalRoot>
+        </ErrorBoundary>
+    ));
+}
+
+function openImageEntryModal(entry: ZipEntry) {
+    const key = openModal(modalProps => (
+        <ErrorBoundary>
+            <ModalRoot {...modalProps} size={ModalSize.LARGE}>
+                <ModalHeader>
+                    <Heading tag="h2" className={cl("modal-title")}>{entry.name}</Heading>
+                    <ModalCloseButton onClick={() => closeModal(key)} />
+                </ModalHeader>
+                <ModalContent className={cl("modal-content")}>
+                    <ZipImagePreview entry={entry} />
+                </ModalContent>
+                <ModalFooter>
+                    <Flex gap={8} justifyContent="flex-end">
+                        <Button onClick={() => makeDownload(entry)}>
+                            Download
+                        </Button>
+                    </Flex>
+                </ModalFooter>
+            </ModalRoot>
+        </ErrorBoundary>
+    ));
+}
+
+function ZipImagePreview({ entry }: { entry: ZipEntry; }) {
+    const [url] = useState(() => createImageObjectUrl(entry));
+
+    useEffect(() => {
+        return () => URL.revokeObjectURL(url);
+    }, [url]);
+
+    return (
+        <div className={cl("image-wrap")}>
+            <img className={cl("image")} src={url} alt={entry.name} />
+        </div>
+    );
+}
+
+function formatBytes(bytes: number): string {
+    if (bytes < 1024) return `${bytes} B`;
+    if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(2)} KB`;
+    return `${(bytes / 1024 / 1024).toFixed(2)} MB`;
+}
+
+export const SafeZipPreviewInline = ErrorBoundary.wrap(ZipPreviewInline, { noop: true });
diff --git a/src/equicordplugins/zipPreview/index.tsx b/src/equicordplugins/zipPreview/index.tsx
new file mode 100644
index 000000000..255089321
--- /dev/null
+++ b/src/equicordplugins/zipPreview/index.tsx
@@ -0,0 +1,44 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { EquicordDevs } from "@utils/constants";
+import { classes } from "@utils/misc";
+import definePlugin from "@utils/types";
+
+import { cl, SafeZipPreviewInline } from "./components";
+import managedStyle from "./style.css?managed";
+import { clearZipPreviewCache, getAttachmentFileName, isZipFile, ZipPreviewAttachmentProps } from "./utils";
+
+export default definePlugin({
+    name: "ZipPreview",
+    description: "Previews ZIP contents inside file attachments.",
+    tags: ["Chat", "Utility"],
+    authors: [EquicordDevs.justjxke],
+    managedStyle,
+
+    patches: [
+        {
+            find: "#{intl::IMG_ALT_ATTACHMENT_FILE_TYPE}",
+            replacement: {
+                match: /(?<=renderAdjacentContent:\i}=(\i);.{0,120}className:)(\i\.\i)(,children:\[)/,
+                replace: "$self.fileClassName($2)$3$self.renderZipPreview($1),"
+            }
+        }
+    ],
+
+    stop() {
+        clearZipPreviewCache();
+    },
+
+    renderZipPreview(props: ZipPreviewAttachmentProps) {
+        if (!isZipFile(getAttachmentFileName(props))) return null;
+        return <SafeZipPreviewInline {...props} />;
+    },
+
+    fileClassName(className: string) {
+        return classes(className, cl("file"));
+    }
+});
diff --git a/src/equicordplugins/zipPreview/native.ts b/src/equicordplugins/zipPreview/native.ts
new file mode 100644
index 000000000..f6259ee22
--- /dev/null
+++ b/src/equicordplugins/zipPreview/native.ts
@@ -0,0 +1,114 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { dialog, IpcMainInvokeEvent } from "electron";
+
+const DISCORD_ATTACHMENT_BASE_URL = "https://cdn.discordapp.com/attachments/";
+const MAX_ZIP_BYTES = 50 * 1024 * 1024;
+
+export async function fetchDiscordAttachment(
+    _: IpcMainInvokeEvent,
+    pathAndQuery: string
+): Promise<{ success: boolean; data?: ArrayBuffer; error?: string; }> {
+    try {
+        const attachmentUrl = getDiscordAttachmentUrl(pathAndQuery);
+        if (!attachmentUrl) return { success: false, error: "Invalid Discord attachment path" };
+
+        const previewDialog = await dialog.showMessageBox({
+            title: "Preview ZIP attachment",
+            message: "Discord is about to fetch this ZIP attachment for preview.",
+            type: "question",
+            detail: `Attachment: ${getAttachmentFileName(pathAndQuery)}\n\nIf you did not request this intentionally, choose Cancel.`,
+            buttons: ["Cancel", "Preview ZIP"]
+        });
+        if (previewDialog.response !== 1) return { success: false, error: "ZIP preview was cancelled." };
+
+        const response = await fetch(attachmentUrl);
+        if (!response.ok) return { success: false, error: `Fetch failed: ${response.status} ${response.statusText}` };
+
+        return {
+            success: true,
+            data: await readLimitedResponse(response)
+        };
+    } catch (error) {
+        return { success: false, error: error instanceof Error ? error.message : "Unknown error" };
+    }
+}
+
+async function readLimitedResponse(response: Response): Promise<ArrayBuffer> {
+    const contentLength = Number(response.headers.get("content-length"));
+    if (Number.isFinite(contentLength) && contentLength > MAX_ZIP_BYTES) {
+        throw new Error("ZIP is too large to preview.");
+    }
+
+    if (!response.body) {
+        const buffer = await response.arrayBuffer();
+        if (buffer.byteLength > MAX_ZIP_BYTES) throw new Error("ZIP is too large to preview.");
+        return buffer;
+    }
+
+    const reader = response.body.getReader();
+    const chunks: Uint8Array[] = [];
+    let totalBytes = 0;
+
+    for (;;) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        if (!value) continue;
+
+        totalBytes += value.byteLength;
+        if (totalBytes > MAX_ZIP_BYTES) {
+            await reader.cancel();
+            throw new Error("ZIP is too large to preview.");
+        }
+
+        chunks.push(value);
+    }
+
+    const result = new Uint8Array(totalBytes);
+    let offset = 0;
+    for (const chunk of chunks) {
+        result.set(chunk, offset);
+        offset += chunk.byteLength;
+    }
+
+    return result.buffer;
+}
+
+function getAttachmentFileName(pathAndQuery: string): string {
+    const path = pathAndQuery.split("?", 1)[0];
+    const fileName = path.split("/").at(-1);
+    return fileName ? decodeURIComponent(fileName) : "Unknown attachment";
+}
+
+function getDiscordAttachmentUrl(pathAndQuery: string): URL | null {
+    if (!isValidDiscordAttachmentPathAndQuery(pathAndQuery)) return null;
+
+    const url = new URL(pathAndQuery, DISCORD_ATTACHMENT_BASE_URL);
+    return url.origin === "https://cdn.discordapp.com" && url.pathname.startsWith("/attachments/")
+        ? url
+        : null;
+}
+
+function isValidDiscordAttachmentPathAndQuery(pathAndQuery: string): boolean {
+    if (
+        pathAndQuery.includes("\\")
+        || pathAndQuery.includes("..")
+        || pathAndQuery.includes("://")
+        || pathAndQuery.startsWith("/")
+        || pathAndQuery.startsWith("//")
+    ) {
+        return false;
+    }
+
+    const path = pathAndQuery.split("?", 1)[0];
+    const parts = path.split("/");
+
+    return parts.length >= 3
+        && /^\d+$/.test(parts[0])
+        && /^\d+$/.test(parts[1])
+        && parts.slice(2).every(part => part.length > 0);
+}
diff --git a/src/equicordplugins/zipPreview/style.css b/src/equicordplugins/zipPreview/style.css
new file mode 100644
index 000000000..5c48318ac
--- /dev/null
+++ b/src/equicordplugins/zipPreview/style.css
@@ -0,0 +1,218 @@
+.vc-zip-preview-file {
+    flex-wrap: wrap;
+}
+
+.vc-zip-preview-inline {
+    flex: 0 0 100%;
+    order: 3;
+    box-sizing: border-box;
+    min-width: 0;
+    padding-left: 0;
+    color: var(--text-normal);
+    font-size: 0.875rem;
+    line-height: 1.25rem;
+}
+
+.vc-zip-preview-collapsed {
+    display: flex;
+    justify-content: center;
+    height: 18px;
+    margin-top: 4px;
+}
+
+.vc-zip-preview-expanded {
+    margin-top: 14px;
+}
+
+.vc-zip-preview-content {
+    display: grid;
+    grid-template-rows: 0fr;
+    overflow: hidden;
+    opacity: 0;
+    pointer-events: none;
+    transform: translateY(-4px);
+    transition:
+        grid-template-rows 180ms ease,
+        opacity 140ms ease,
+        transform 180ms ease;
+}
+
+.vc-zip-preview-content-inner {
+    min-height: 0;
+    overflow: hidden;
+}
+
+.vc-zip-preview-open .vc-zip-preview-content {
+    grid-template-rows: 1fr;
+    opacity: 1;
+    pointer-events: auto;
+    transform: translateY(0);
+}
+
+.vc-zip-preview-state {
+    color: var(--text-muted);
+}
+
+.vc-zip-preview-entries {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+}
+
+.vc-zip-preview-row {
+    appearance: none;
+    display: block;
+    box-sizing: border-box;
+    width: 100%;
+    min-width: 0;
+    border: 0;
+    border-radius: 4px;
+    background: none;
+    color: var(--text-link);
+    font: inherit;
+    line-height: 1.25rem;
+    text-align: left;
+    outline: none;
+}
+
+.vc-zip-preview-row:hover,
+.vc-zip-preview-row:focus,
+.vc-zip-preview-row:active {
+    background: none !important;
+    background-color: transparent !important;
+}
+
+.vc-zip-preview-directory {
+    color: var(--text-link);
+}
+
+.vc-zip-preview-button {
+    cursor: pointer;
+    text-decoration: underline;
+    color: var(--text-link);
+}
+
+.vc-zip-preview-button:hover,
+.vc-zip-preview-button:focus,
+.vc-zip-preview-button:active {
+    color: var(--text-link);
+    background: none !important;
+    background-color: transparent !important;
+}
+
+.vc-zip-preview-unsupported {
+    color: var(--text-muted);
+}
+
+.vc-zip-preview-modal-title {
+    flex: 1;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.vc-zip-preview-modal-content {
+    min-height: 240px;
+}
+
+.vc-zip-preview-code-wrap {
+    padding: 16px 0;
+}
+
+.vc-zip-preview-image-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 360px;
+    padding: 16px 0;
+}
+
+.vc-zip-preview-image {
+    display: block;
+    max-width: 100%;
+    max-height: 70vh;
+    object-fit: contain;
+}
+
+.vc-zip-preview-toggle {
+    appearance: none;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 48px;
+    height: 18px;
+    margin: 0 auto;
+    padding: 0;
+    border: 0;
+    background: none;
+    color: var(--text-muted);
+    cursor: pointer;
+    transition: color 0.15s ease;
+    outline: none;
+}
+
+.vc-zip-preview-toggle:hover,
+.vc-zip-preview-toggle:focus,
+.vc-zip-preview-toggle:active {
+    background: none !important;
+    background-color: transparent !important;
+    color: var(--text-link);
+}
+
+.vc-zip-preview-toggle-icon {
+    width: 16px;
+    height: 16px;
+}
+
+.vc-zip-preview-breadcrumb {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    margin-bottom: 4px;
+    color: var(--text-muted);
+}
+
+.vc-zip-preview-breadcrumb > .vc-zip-preview-breadcrumb-icon {
+    flex-shrink: 0;
+    width: 16px;
+    height: 16px;
+    color: var(--text-muted);
+    fill: currentcolor;
+}
+
+.vc-zip-preview-breadcrumb-segment {
+    display: inline;
+    padding: 0;
+    border: 0;
+    background: none;
+    color: var(--text-link);
+    font: inherit;
+    line-height: 1.25rem;
+    text-decoration: underline;
+    cursor: pointer;
+    outline: none;
+}
+
+.vc-zip-preview-breadcrumb-segment:hover,
+.vc-zip-preview-breadcrumb-segment:focus,
+.vc-zip-preview-breadcrumb-segment:active {
+    background: none !important;
+    background-color: transparent !important;
+    color: var(--text-link-low-saturation);
+}
+
+.vc-zip-preview-breadcrumb .vc-zip-preview-breadcrumb-current {
+    color: var(--text-muted);
+}
+
+.vc-zip-preview-size {
+    color: var(--text-muted);
+}
+
+@media (prefers-reduced-motion: reduce) {
+    .vc-zip-preview-content {
+        transition: none;
+        transform: none;
+    }
+}
diff --git a/src/equicordplugins/zipPreview/utils.ts b/src/equicordplugins/zipPreview/utils.ts
new file mode 100644
index 000000000..99f66121f
--- /dev/null
+++ b/src/equicordplugins/zipPreview/utils.ts
@@ -0,0 +1,273 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { PluginNative } from "@utils/types";
+import { saveFile } from "@utils/web";
+import { unzipSync } from "fflate";
+
+const Native = VencordNative?.pluginHelpers?.ZipPreview as PluginNative<typeof import("./native")> | undefined;
+
+export const MAX_ZIP_BYTES = 50 * 1024 * 1024;
+export const MAX_ENTRIES = 1000;
+export const MAX_PREVIEW_BYTES = 10 * 1024 * 1024;
+
+const CANCELLED_PREVIEW_MESSAGE = "ZIP preview was cancelled.";
+const NATIVE_UNAVAILABLE_MESSAGE = "Native helper is unavailable.";
+const IMAGE_EXTENSIONS = new Set(["png", "jpg", "jpeg", "gif", "webp", "avif", "bmp"]);
+const DISCORD_ATTACHMENT_HOSTS = new Set(["cdn.discordapp.com", "media.discordapp.net"]);
+const TEXT_EXTENSIONS = new Set([
+    "c",
+    "cpp",
+    "cs",
+    "css",
+    "csv",
+    "go",
+    "h",
+    "html",
+    "java",
+    "js",
+    "json",
+    "jsx",
+    "log",
+    "lua",
+    "md",
+    "php",
+    "py",
+    "rs",
+    "scss",
+    "sh",
+    "svg",
+    "toml",
+    "ts",
+    "tsx",
+    "txt",
+    "xml",
+    "yaml",
+    "yml"
+]);
+
+export type ZipPreviewKind = "image" | "text" | "unsupported";
+
+export interface ZipEntry {
+    path: string;
+    name: string;
+    size: number;
+    data: Uint8Array;
+    kind: ZipPreviewKind;
+    extension: string;
+}
+
+export interface ZipPreviewResult {
+    entries: ZipEntry[];
+    truncated: boolean;
+}
+
+export type ZipPreviewCacheState =
+    | { status: "pending"; promise: Promise<ZipPreviewResult>; }
+    | { status: "resolved"; result: ZipPreviewResult; }
+    | { status: "rejected"; message: string; };
+
+interface NativeFetchResult {
+    success: boolean;
+    data?: ArrayBuffer;
+    error?: string;
+}
+
+const zipCache = new Map<string, ZipPreviewCacheState>();
+
+export function isZipFile(fileName?: string): boolean {
+    return typeof fileName === "string" && /\.zip$/i.test(fileName);
+}
+
+export function getAttachmentFileName(props: ZipPreviewAttachmentProps): string | undefined {
+    return props.fileName ?? props.item?.originalItem?.filename ?? props.item?.originalItem?.title;
+}
+
+export function getAttachmentUrl(props: ZipPreviewAttachmentProps): string | undefined {
+    return props.url ?? props.item?.downloadUrl ?? props.item?.originalItem?.url ?? props.item?.originalItem?.proxy_url;
+}
+
+export function getCachedZip(url: string): ZipPreviewCacheState {
+    const cached = zipCache.get(url);
+    if (cached) return cached;
+
+    const promise = loadZip(url)
+        .then(result => {
+            zipCache.set(url, { status: "resolved", result });
+            return result;
+        })
+        .catch(error => {
+            const message = error instanceof Error ? error.message : "Failed to preview ZIP.";
+            if (message === CANCELLED_PREVIEW_MESSAGE || message === NATIVE_UNAVAILABLE_MESSAGE) zipCache.delete(url);
+            else zipCache.set(url, { status: "rejected", message });
+            throw error;
+        });
+
+    const pending = { status: "pending" as const, promise };
+    zipCache.set(url, pending);
+    return pending;
+}
+
+export function clearZipPreviewCache() {
+    zipCache.clear();
+}
+
+export function makeDownload(entry: ZipEntry) {
+    const type = entry.kind === "image" ? getImageMimeType(entry.extension) : "text/plain;charset=utf-8";
+    saveFile(new File([entry.data as BlobPart], entry.name, { type }));
+}
+
+export function createImageObjectUrl(entry: ZipEntry): string {
+    return URL.createObjectURL(new Blob([entry.data as BlobPart], { type: getImageMimeType(entry.extension) }));
+}
+
+export function readTextEntry(entry: ZipEntry): string {
+    return new TextDecoder("utf-8").decode(entry.data);
+}
+
+export function getCodeLanguage(entry: ZipEntry): string {
+    const languageMap: Record<string, string> = {
+        js: "javascript",
+        jsx: "jsx",
+        md: "markdown",
+        py: "python",
+        rs: "rust",
+        sh: "bash",
+        ts: "typescript",
+        tsx: "tsx",
+        yml: "yaml"
+    };
+
+    return languageMap[entry.extension] ?? entry.extension;
+}
+
+async function loadZip(url: string): Promise<ZipPreviewResult> {
+    const attachmentPath = getDiscordAttachmentPath(url);
+
+    if (attachmentPath) {
+        const nativeResult = await fetchNativeDiscordAttachment(attachmentPath);
+        if (nativeResult.success && nativeResult.data) {
+            if (nativeResult.data.byteLength > MAX_ZIP_BYTES) throw new Error("ZIP is too large to preview.");
+            return parseZipBuffer(nativeResult.data);
+        }
+
+        throw new Error(nativeResult.error || "Could not fetch ZIP through native Discord attachment fetch.");
+    }
+
+    const response = await fetch(url);
+    if (!response.ok) throw new Error("Could not fetch ZIP.");
+
+    const contentLength = Number(response.headers.get("content-length"));
+    if (Number.isFinite(contentLength) && contentLength > MAX_ZIP_BYTES) {
+        throw new Error("ZIP is too large to preview.");
+    }
+
+    const buffer = await response.arrayBuffer();
+    if (buffer.byteLength > MAX_ZIP_BYTES) throw new Error("ZIP is too large to preview.");
+
+    return parseZipBuffer(buffer);
+}
+
+async function fetchNativeDiscordAttachment(attachmentPath: string): Promise<NativeFetchResult> {
+    if (!Native) return { success: false, error: NATIVE_UNAVAILABLE_MESSAGE };
+    if (typeof Native.fetchDiscordAttachment === "function") return Native.fetchDiscordAttachment(attachmentPath);
+    return { success: false, error: "Native helper does not support attachment fetch." };
+}
+
+export function getDiscordAttachmentPath(url: string): string | null {
+    try {
+        const parsedUrl = new URL(url);
+        if (parsedUrl.protocol !== "https:") return null;
+        if (!DISCORD_ATTACHMENT_HOSTS.has(parsedUrl.hostname)) return null;
+        if (!parsedUrl.pathname.startsWith("/attachments/")) return null;
+
+        const attachmentPath = parsedUrl.pathname.slice("/attachments/".length);
+        if (!isValidDiscordAttachmentPath(attachmentPath)) return null;
+
+        return `${attachmentPath}${parsedUrl.search}`;
+    } catch {
+        return null;
+    }
+}
+
+function isValidDiscordAttachmentPath(path: string): boolean {
+    if (path.includes("\\") || path.includes("..") || path.startsWith("/") || path.startsWith("//")) return false;
+
+    const parts = path.split("/");
+    return parts.length >= 3
+        && /^\d+$/.test(parts[0])
+        && /^\d+$/.test(parts[1])
+        && parts.slice(2).every(part => part.length > 0);
+}
+
+function parseZipBuffer(buffer: ArrayBuffer): ZipPreviewResult {
+    const unzipped = unzipSync(new Uint8Array(buffer));
+    const files = Object.entries(unzipped)
+        .filter(([path]) => !path.endsWith("/"))
+        .sort(([a], [b]) => a.localeCompare(b));
+
+    const truncated = files.length > MAX_ENTRIES;
+    const entries = files.slice(0, MAX_ENTRIES).map(([path, data]) => {
+        const normalizedPath = normalizePath(path);
+        const extension = getExtension(normalizedPath);
+
+        return {
+            path: normalizedPath,
+            name: getFileName(normalizedPath),
+            size: data.byteLength,
+            data,
+            extension,
+            kind: getPreviewKind(extension, data.byteLength)
+        };
+    });
+
+    return {
+        entries,
+        truncated
+    };
+}
+
+function getPreviewKind(extension: string, size: number): ZipPreviewKind {
+    if (size > MAX_PREVIEW_BYTES) return "unsupported";
+    if (IMAGE_EXTENSIONS.has(extension)) return "image";
+    if (TEXT_EXTENSIONS.has(extension)) return "text";
+    return "unsupported";
+}
+
+function getImageMimeType(extension: string): string {
+    if (extension === "jpg") return "image/jpeg";
+    return `image/${extension}`;
+}
+
+function normalizePath(path: string): string {
+    return path.replace(/^\/+/, "").replaceAll("\\", "/");
+}
+
+function getFileName(path: string): string {
+    return path.split("/").at(-1) || path;
+}
+
+function getExtension(path: string): string {
+    const fileName = getFileName(path);
+    const dotIndex = fileName.lastIndexOf(".");
+    return dotIndex === -1 ? "" : fileName.slice(dotIndex + 1).toLowerCase();
+}
+
+export interface ZipPreviewAttachmentProps {
+    fileName?: string;
+    fileSize?: number;
+    url?: string;
+    item?: {
+        downloadUrl?: string;
+        originalItem?: {
+            filename?: string;
+            proxy_url?: string;
+            size?: number;
+            title?: string;
+            url?: string;
+        };
+    };
+}
diff --git a/src/main/applyHostPatch.ts b/src/main/applyHostPatch.ts
new file mode 100644
index 000000000..14d5a22c2
--- /dev/null
+++ b/src/main/applyHostPatch.ts
@@ -0,0 +1,120 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { existsSync, lstatSync, mkdirSync, readdirSync, renameSync, rmdirSync, statSync, unlinkSync, writeFileSync } from "original-fs";
+import { basename, dirname, join } from "path";
+
+const STUB_PACKAGE = JSON.stringify({ name: "discord", main: "index.js" });
+const VERSION_PREFIX = "app-";
+
+const makeStubIndex = (patcherPath: string) =>
+    `require(${JSON.stringify(patcherPath)});`;
+
+/** `_app.asar` next to `app.asar` marks any patched install. */
+export const isAlreadyPatched = (resources: string) =>
+    existsSync(join(resources, "_app.asar"));
+
+/**
+ * apply the folder-shim patch to a discord `resources/` directory.
+ *
+ * renames vanilla `app.asar` to `_app.asar`, creates an `app/` folder
+ * whose `index.js` requires the given patcher script. electron prefers
+ * the folder over the asar of the same name and loads it first.
+ *
+ * idempotent. returns `false` if the directory is already patched or
+ * has no vanilla `app.asar`. throws on partial failure after rolling
+ * back any disk changes already made.
+ */
+export const patchResourcesDir = (resources: string, patcherJsPath: string): boolean => {
+    const app = join(resources, "app.asar");
+    const _app = join(resources, "_app.asar");
+
+    if (isAlreadyPatched(resources)) return false;
+    if (!existsSync(app)) return false;
+    try {
+        if (lstatSync(app).isDirectory()) return false;
+    } catch {
+        return false;
+    }
+
+    const undo: Array<() => void> = [];
+    try {
+        renameSync(app, _app);
+        undo.push(() => renameSync(_app, app));
+
+        mkdirSync(app);
+        undo.push(() => {
+            const indexPath = join(app, "index.js");
+            const pkgPath = join(app, "package.json");
+            if (existsSync(indexPath)) unlinkSync(indexPath);
+            if (existsSync(pkgPath)) unlinkSync(pkgPath);
+            rmdirSync(app);
+        });
+
+        writeFileSync(join(app, "package.json"), STUB_PACKAGE);
+        writeFileSync(join(app, "index.js"), makeStubIndex(patcherJsPath));
+        return true;
+    } catch (err) {
+        for (let i = undo.length - 1; i >= 0; i--) {
+            try {
+                undo[i]();
+            } catch (cleanupErr) {
+                console.error("[Equicord] Rollback step failed", cleanupErr);
+            }
+        }
+        throw err;
+    }
+};
+
+const parsePart = (s: string) => parseInt(s, 10) || 0;
+
+const isNewer = ($new: string, old: string): boolean => {
+    const newParts = $new.slice(VERSION_PREFIX.length).split(".").map(parsePart);
+    const oldParts = old.slice(VERSION_PREFIX.length).split(".").map(parsePart);
+    const len = Math.max(newParts.length, oldParts.length);
+    for (let i = 0; i < len; i++) {
+        const n = newParts[i] ?? 0;
+        const o = oldParts[i] ?? 0;
+        if (n > o) return true;
+        if (n < o) return false;
+    }
+    return false;
+};
+
+/**
+ * find the newest sibling `app-VERSION` directory's `resources/` path.
+ *
+ * squirrel-only layout. returns `null` on non-win32 platforms, or when
+ * the running process is already in the newest sibling.
+ */
+export const findStaleSibling = (currentExeDir: string): string | null => {
+    if (process.platform !== "win32") return null;
+
+    const discordPath = dirname(currentExeDir);
+    const currentVersion = basename(currentExeDir);
+
+    let latest = currentVersion;
+    try {
+        for (const name of readdirSync(discordPath)) {
+            if (!name.startsWith(VERSION_PREFIX)) continue;
+            let isDir = false;
+            try {
+                isDir = statSync(join(discordPath, name)).isDirectory();
+            } catch (statErr) {
+                console.error("[Equicord] Skipping unreadable sibling", name, statErr);
+                continue;
+            }
+            if (!isDir) continue;
+            if (isNewer(name, latest)) latest = name;
+        }
+    } catch (err) {
+        console.error("[Equicord] Failed to scan for sibling versions", err);
+        return null;
+    }
+
+    if (latest === currentVersion) return null;
+    return join(discordPath, latest, "resources");
+};
diff --git a/src/main/hostUpdateHook.ts b/src/main/hostUpdateHook.ts
new file mode 100644
index 000000000..bf359f0b5
--- /dev/null
+++ b/src/main/hostUpdateHook.ts
@@ -0,0 +1,241 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+/**
+ * re-applies the equicord patch to a freshly installed discord host
+ * version at the moment the native updater finishes writing it.
+ *
+ * hooks `discord_desktop_core.startup({ updater })` to capture the live
+ * updater instance, listens for its `host-updated` event, and wraps
+ * `startCurrentVersion` for the post-update relaunch handoff. both paths
+ * are idempotent because `patchResourcesDir` checks for the `_app.asar`
+ * marker before doing anything.
+ *
+ * targets discord's new updater code path. default on win32 and linux.
+ * on darwin the new updater is opt-in via `USE_NEW_UPDATER`, so installs
+ * using the legacy sparkle-style autoUpdater fall through to the normal
+ * reinject flow on first post-update launch.
+ */
+
+import Module from "module";
+import { basename, dirname, join, resolve as resolvePath, sep } from "path";
+
+import { findStaleSibling, patchResourcesDir } from "./applyHostPatch";
+
+interface DiscordVersions {
+    current_host?: number[];
+    current_modules?: Record<string, string>;
+    last_successful_update?: unknown;
+}
+
+interface StartCurrentVersionOptions {
+    allowObsoleteHost?: boolean;
+}
+
+interface DiscordBuildInfo {
+    releaseChannel: string;
+    version: string;
+}
+
+interface DiscordHostUpdater {
+    committedHostVersion?: number[];
+    rootPath?: string;
+    on?(event: "host-updated", handler: () => void): void;
+    queryCurrentVersionsSync?(): DiscordVersions;
+    startCurrentVersion?(queryOptions?: object, options?: StartCurrentVersionOptions): Promise<void>;
+    startCurrentVersionSync?(options?: StartCurrentVersionOptions): void;
+}
+
+interface DiscordUpdaterModule {
+    getUpdater?(): DiscordHostUpdater | null | undefined;
+    tryInitUpdater?(buildInfo: DiscordBuildInfo, repositoryUrl: string, useRustBspatch: boolean): boolean;
+    __equicordTryInitWrapped?: boolean;
+}
+
+interface DiscordDesktopCoreStartupOpts {
+    updater?: DiscordUpdaterModule;
+    [key: string]: unknown;
+}
+
+interface DiscordDesktopCore {
+    startup?(opts: DiscordDesktopCoreStartupOpts): void;
+    __equicordStartupWrapped?: boolean;
+}
+
+const error = (...args: unknown[]) => console.error("[Equicord:HostUpdate]", ...args);
+
+const hookedUpdaters = new WeakSet<DiscordHostUpdater>();
+let hooked = false;
+
+const getPatcherJsPath = () => join(__dirname, "patcher.js");
+
+/**
+ * resolve `resources/` for a given discord version directory.
+ *
+ * on darwin, extracts the bundle name (Discord.app, DiscordCanary.app,
+ * DiscordPTB.app) from `process.execPath`. matches discord's own logic
+ * in `common/updater.js#_getHostExePath`. iterates from the end so a
+ * nested `.app` segment near the binary wins over an outer one.
+ */
+const resourcesPathFor = (versionDir: string): string => {
+    if (process.platform !== "darwin") return join(versionDir, "resources");
+
+    const segs = process.execPath.split(sep);
+    for (let i = segs.length - 1; i >= 0; i--) {
+        if (segs[i].endsWith(".app")) {
+            return join(versionDir, segs[i], "Contents", "Resources");
+        }
+    }
+    return join(versionDir, "Contents", "Resources");
+};
+
+/**
+ * resolve the version dir the current process runs from.
+ *
+ * on darwin, execPath sits four levels deep inside the version dir,
+ * at `<versionDir>/<AppName>.app/Contents/MacOS/<bin>`.
+ */
+const currentVersionDir = (): string => {
+    if (process.platform === "darwin") {
+        return resolvePath(process.execPath, "..", "..", "..", "..");
+    }
+    return dirname(process.execPath);
+};
+
+/**
+ * resolve the new host version array.
+ *
+ * `committedHostVersion` is only populated after `_startCurrentVersionInner`
+ * runs, so during `host-updated` we have to query the native side
+ * directly to get fresh state.
+ */
+const resolveCommittedVersion = (updater: DiscordHostUpdater): number[] | undefined => {
+    if (Array.isArray(updater.committedHostVersion)) return updater.committedHostVersion;
+    try {
+        const versions = updater.queryCurrentVersionsSync?.();
+        if (Array.isArray(versions?.current_host)) return versions.current_host;
+    } catch (err) {
+        error("queryCurrentVersionsSync failed", err);
+    }
+    return undefined;
+};
+
+const retainEquicord = (updater: DiscordHostUpdater, reason: string) => {
+    try {
+        const committed = resolveCommittedVersion(updater);
+        const { rootPath } = updater;
+
+        if (!committed || !rootPath) {
+            /*
+             * updater state unavailable. fall back to filesystem scan
+             * on win32 only because the sibling layout is squirrel
+             * specific.
+             */
+            if (process.platform !== "win32") return;
+            const stale = findStaleSibling(dirname(process.execPath));
+            if (stale) patchResourcesDir(stale, getPatcherJsPath());
+            return;
+        }
+
+        const versionDir = join(rootPath, `app-${committed.join(".")}`);
+        if (resolvePath(versionDir) === resolvePath(currentVersionDir())) return;
+
+        patchResourcesDir(resourcesPathFor(versionDir), getPatcherJsPath());
+    } catch (err) {
+        error(`[${reason}] retain failed:`, err);
+    }
+};
+
+const attachToUpdater = (updater: DiscordHostUpdater | null | undefined) => {
+    if (!updater || hookedUpdaters.has(updater)) return;
+    try {
+        hookedUpdaters.add(updater);
+    } catch (err) {
+        error("Failed to track updater instance", err);
+        return;
+    }
+
+    updater.on?.("host-updated", () => retainEquicord(updater, "host-updated"));
+
+    /*
+     * wrap the post-update relaunch entrypoints. retain runs after the
+     * original so `committedHostVersion` is freshly populated by
+     * `_startCurrentVersionInner`. relaunch is scheduled via
+     * `app.once("will-quit", spawn)` then `app.quit()`, so the patch
+     * still finishes before the new exe is spawned.
+     */
+    const sync = updater.startCurrentVersionSync;
+    if (typeof sync === "function") {
+        const bound = sync.bind(updater);
+        updater.startCurrentVersionSync = (options?: StartCurrentVersionOptions) => {
+            bound(options);
+            try { retainEquicord(updater, "startCurrentVersionSync"); } catch (e) { error(e); }
+        };
+    }
+    const async_ = updater.startCurrentVersion;
+    if (typeof async_ === "function") {
+        const bound = async_.bind(updater);
+        updater.startCurrentVersion = async (queryOptions?: object, options?: StartCurrentVersionOptions) => {
+            await bound(queryOptions, options);
+            try { retainEquicord(updater, "startCurrentVersion"); } catch (e) { error(e); }
+        };
+    }
+};
+
+const wrapStartup = (coreExports: DiscordDesktopCore | null | undefined) => {
+    if (!coreExports?.startup || coreExports.__equicordStartupWrapped) return;
+    coreExports.__equicordStartupWrapped = true;
+
+    const origStartup = coreExports.startup;
+    coreExports.startup = function (opts, ...rest) {
+        try {
+            const updaterModule = opts?.updater;
+            const inst = updaterModule?.getUpdater?.();
+            if (inst) {
+                attachToUpdater(inst);
+            } else if (typeof updaterModule?.tryInitUpdater === "function" && !updaterModule.__equicordTryInitWrapped) {
+                /*
+                 * updater not yet constructed at startup time. wrap the
+                 * factory so we attach once vanilla creates it.
+                 */
+                updaterModule.__equicordTryInitWrapped = true;
+                const origTry = updaterModule.tryInitUpdater.bind(updaterModule);
+                updaterModule.tryInitUpdater = (buildInfo, repositoryUrl, useRustBspatch) => {
+                    const ok = origTry(buildInfo, repositoryUrl, useRustBspatch);
+                    try { attachToUpdater(updaterModule.getUpdater?.()); } catch (e) { error(e); }
+                    return ok;
+                };
+            }
+        } catch (e) {
+            error("wrap updater failed:", e);
+        }
+        return origStartup.call(this, opts, ...rest);
+    };
+};
+
+export const installHostUpdateHook = () => {
+    if (hooked) return;
+    hooked = true;
+
+    /*
+     * intercept `require` to catch the first `discord_desktop_core` load
+     * before vanilla bootstrap calls its `startup`. normalise separators
+     * so absolute requires resolve correctly on windows. once we have
+     * wrapped startup we restore the original require to avoid taxing
+     * every subsequent require call.
+     */
+    const origRequire = Module.prototype.require;
+    Module.prototype.require = function (this: Module, id: string) {
+        const result = origRequire.call(this, id);
+        if (!id.includes("discord_desktop_core")) return result;
+
+        if (basename(id.replace(/\\/g, "/")) === "discord_desktop_core") {
+            try { wrapStartup(result?.default ?? result); } catch (e) { error(e); }
+            Module.prototype.require = origRequire;
+        }
+        return result;
+    } as typeof Module.prototype.require;
+};
diff --git a/src/main/ipcMain.ts b/src/main/ipcMain.ts
index 5b5411479..dc5160cec 100644
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@@ -152,6 +152,7 @@ ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {
         title: "Equicord QuickCSS Editor",
         autoHideMenuBar: true,
         darkTheme: true,
+        backgroundColor: nativeTheme.shouldUseDarkColors ? "#1e1e1e" : "white",
         webPreferences: {
             preload: join(__dirname, "preload.js"),
             contextIsolation: true,
diff --git a/src/main/patchWin32Updater.ts b/src/main/patchWin32Updater.ts
index b0648d3c8..d42f6db62 100644
--- a/src/main/patchWin32Updater.ts
+++ b/src/main/patchWin32Updater.ts
@@ -1,68 +1,24 @@
 /*
  * Vencord, a modification for Discord's desktop app
  * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+/**
+ * fallback for `hostUpdateHook.ts`. scans for a newer squirrel sibling
+ * `app-VERSION` directory on quit and re-applies the patch there.
+ */
 
 import { app } from "electron";
-import { existsSync, mkdirSync, readdirSync, renameSync, statSync, writeFileSync } from "original-fs";
-import { basename, dirname, join } from "path";
+import { dirname, join } from "path";
 
-function isNewer($new: string, old: string) {
-    const newParts = $new.slice(4).split(".").map(Number);
-    const oldParts = old.slice(4).split(".").map(Number);
+import { findStaleSibling, patchResourcesDir } from "./applyHostPatch";
 
-    for (let i = 0; i < oldParts.length; i++) {
-        if (newParts[i] > oldParts[i]) return true;
-        if (newParts[i] < oldParts[i]) return false;
-    }
-    return false;
-}
-
-function patchLatest() {
+app.on("before-quit", () => {
     try {
-        const currentAppPath = dirname(process.execPath);
-        const currentVersion = basename(currentAppPath);
-        const discordPath = join(currentAppPath, "..");
-
-        const latestVersion = readdirSync(discordPath)
-            .filter(name => name.startsWith("app-") && statSync(join(discordPath, name)).isDirectory())
-            .reduce((prev, curr) => isNewer(curr, prev) ? curr : prev, currentVersion as string);
-
-        if (latestVersion === currentVersion) return;
-
-        const resources = join(discordPath, latestVersion, "resources");
-        const app = join(resources, "app.asar");
-        const _app = join(resources, "_app.asar");
-
-        if (!existsSync(app) || statSync(app).isDirectory()) return;
-
-        console.info("[Equicord] Detected Host Update. Repatching...");
-
-        renameSync(app, _app);
-        mkdirSync(app);
-        writeFileSync(join(app, "package.json"), JSON.stringify({
-            name: "discord",
-            main: "index.js"
-        }));
-        writeFileSync(join(app, "index.js"), `require(${JSON.stringify(join(__dirname, "patcher.js"))});`);
+        const stale = findStaleSibling(dirname(process.execPath));
+        if (stale) patchResourcesDir(stale, join(__dirname, "patcher.js"));
     } catch (err) {
         console.error("[Equicord] Failed to repatch latest host update", err);
     }
-}
-
-// Try to patch latest on before-quit
-// Discord's Win32 updater will call app.quit() on restart and open new version on will-quit
-app.on("before-quit", patchLatest);
+});
diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index 911a40473..f067bbaaf 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -44,9 +44,23 @@ if (!IS_VANILLA) {
 
     patchTrayMenu();
 
-    // Repatch after host updates on Windows
-    if (process.platform === "win32") {
+    /*
+     * re-apply the patch when discord ships a new host version. skipped
+     * on vesktop and equibop because they manage their own updates.
+     */
+    if (!IS_VESKTOP && !IS_EQUIBOP) {
+        try {
+            require("./hostUpdateHook").installHostUpdateHook();
+        } catch (err) {
+            console.error("[Equicord] Failed to install host update hook", err);
+        }
+    }
+
+    if (process.platform === "win32" && !IS_VESKTOP && !IS_EQUIBOP) {
+        /* before-quit fallback for the rare case the hook above never sees discord_desktop_core get required */
         require("./patchWin32Updater");
+    }
+    if (process.platform === "win32") {
 
         if (settings.winCtrlQ) {
             const originalBuild = Menu.buildFromTemplate;
diff --git a/src/main/utils/extensions.ts b/src/main/utils/extensions.ts
index 9ecfbfe82..0b19d9286 100644
--- a/src/main/utils/extensions.ts
+++ b/src/main/utils/extensions.ts
@@ -79,6 +79,6 @@ export async function installExt(id: string) {
             .catch(err => console.error(`Failed to extract extension ${id}`, err));
     }
 
-    // @ts-expect-error Electron 36 Deprecates session.defaultSession.loadExtension()
+    // Electron 36 Deprecates session.defaultSession.loadExtension()
     session.defaultSession.extensions ? session.defaultSession.extensions.loadExtension(extDir) : session.defaultSession.loadExtension(extDir);
 }
diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx
index 004213b9f..d0d7fe1aa 100644
--- a/src/plugins/_api/badges/index.tsx
+++ b/src/plugins/_api/badges/index.tsx
@@ -37,6 +37,7 @@ const EQUICORD_CONTRIBUTOR_BADGE = "https://equicord.org/assets/favicon.png";
 const USERPLUGIN_CONTRIBUTOR_BADGE = "https://equicord.org/assets/icons/misc/userplugin.png";
 
 const ContributorBadge: ProfileBadge = {
+    id: "vencord_contributor_badge",
     description: "Vencord Contributor",
     iconSrc: CONTRIBUTOR_BADGE,
     position: BadgePosition.START,
@@ -45,6 +46,7 @@ const ContributorBadge: ProfileBadge = {
 };
 
 const EquicordContributorBadge: ProfileBadge = {
+    id: "equicord_contributor_badge",
     description: "Equicord Contributor",
     iconSrc: EQUICORD_CONTRIBUTOR_BADGE,
     position: BadgePosition.START,
@@ -59,6 +61,7 @@ const EquicordContributorBadge: ProfileBadge = {
 };
 
 const UserPluginContributorBadge: ProfileBadge = {
+    id: "user_plugin_contributor_badge",
     description: "User Plugin Contributor",
     iconSrc: USERPLUGIN_CONTRIBUTOR_BADGE,
     position: BadgePosition.START,
@@ -99,7 +102,7 @@ async function loadAllBadges(noCache = false) {
 
 let intervalId: any;
 
-export function BadgeContextMenu({ badge }: { badge: ProfileBadge & BadgeUserArgs; }) {
+export function BadgeContextMenu({ badge }: { badge: Omit<ProfileBadge, "id"> & BadgeUserArgs; }) {
     return (
         <Menu.Menu
             navId="vc-badge-context"
@@ -219,7 +222,8 @@ export default definePlugin({
     },
 
     getDonorBadges(userId: string) {
-        return DonorBadges[userId]?.map(badge => ({
+        return DonorBadges[userId]?.map((badge, idx) => ({
+            id: `vencord_donor_badge_${idx}`,
             iconSrc: badge.badge,
             description: badge.tooltip,
             position: BadgePosition.START,
@@ -239,7 +243,8 @@ export default definePlugin({
     },
 
     getEquicordDonorBadges(userId: string) {
-        return EquicordDonorBadges[userId]?.map(badge => ({
+        return EquicordDonorBadges[userId]?.map((badge, idx) => ({
+            id: `equicord_donor_badge_${idx}`,
             iconSrc: badge.badge,
             description: badge.tooltip,
             position: BadgePosition.START,
diff --git a/src/plugins/_api/chatButtons.ts b/src/plugins/_api/chatButtons.ts
index c004bdc19..3dc5ecc98 100644
--- a/src/plugins/_api/chatButtons.ts
+++ b/src/plugins/_api/chatButtons.ts
@@ -15,10 +15,16 @@ export default definePlugin({
     patches: [
         {
             find: '"sticker")',
-            replacement: {
-                match: /0===(\i)\.length(?=.{0,25}?\(0,\i\.jsxs?\)\(.{0,75}?children:\1)/,
-                replace: "(Vencord.Api.ChatButtons._injectButtons($1,arguments[0]),$&)"
-            }
+            replacement: [
+                {
+                    match: /0===(\i)\.length(?=.{0,25}?\(0,\i\.jsxs?\)\(.{0,75}?children:\1)/,
+                    replace: "(Vencord.Api.ChatButtons._injectButtons($1,arguments[0]),$&)"
+                },
+                {
+                    match: /(?<="submit"\)\).{0,100}"div",\{className:\i\.\i,children:)(\i)\}/,
+                    replace: "Vencord.Api.ChatButtons._wrapButtons($1)}"
+                }
+            ]
         }
     ]
 });
diff --git a/src/plugins/_api/commands.ts b/src/plugins/_api/commands.ts
index 3a86a3cb9..3e0ccda3c 100644
--- a/src/plugins/_api/commands.ts
+++ b/src/plugins/_api/commands.ts
@@ -26,7 +26,7 @@ export default definePlugin({
     patches: [
         // obtain BUILT_IN_COMMANDS instance
         {
-            find: ',"tenor"',
+            find: '"tableflip","unflip"',
             replacement: [
                 {
                     // Matches BUILT_IN_COMMANDS. This is not exported so this is
@@ -34,7 +34,7 @@ export default definePlugin({
                     // patch simpler
 
                     // textCommands = builtInCommands.filter(...)
-                    match: /(?<=\w=)(\w)(\.filter\(.{0,60}tenor)/,
+                    match: /(?<=\w=)(\w)(\.filter\(.{0,60}"gif")/,
                     replace: "Vencord.Api.Commands._init($1)$2",
                 }
             ],
diff --git a/src/plugins/_api/menuItemDemangler.ts b/src/plugins/_api/menuItemDemangler.ts
index f71e8499b..72b8fee6d 100644
--- a/src/plugins/_api/menuItemDemangler.ts
+++ b/src/plugins/_api/menuItemDemangler.ts
@@ -7,6 +7,7 @@
 import { Devs } from "@utils/constants";
 import { canonicalizeMatch } from "@utils/patches";
 import definePlugin from "@utils/types";
+import { Menu } from "@webpack/common";
 
 // duplicate values have multiple branches with different types. Just include all to be safe
 const nameMap = {
@@ -31,38 +32,40 @@ export default definePlugin({
         {
             find: "Menu API only allows Items",
             replacement: {
-                match: /function.{0,80}type===(\i\.\i)\).{0,50}navigable:.+?Menu API/s,
-                replace: (m, mod) => {
-                    const nameAssignments = [] as string[];
+                match: /(?<=(\(\i\.type===(\i\.\i)\).{0,50}?navigable:.+Menu API).+?)}$/s,
+                replace: (_, m) => {
+                    const registerCalls = [] as string[];
 
-                    // if (t.type === m.MenuItem)
-                    const typeCheckRe = canonicalizeMatch(/\(\i\.type===(\i\.\i)\)/g);
-                    // push({type:"item"})
-                    const pushTypeRe = /type:"(\w+)"/g;
+                    const typeCheckRe = canonicalizeMatch(/\(\i\.type===(\i\.\i)\)/g); // if (t.type === m.MenuItem)
+                    const pushTypeRe = /type:"(\w+)"/g; // push({type:"item"})
 
                     let typeMatch: RegExpExecArray | null;
-                    // for each if (t.type === ...)
                     while ((typeMatch = typeCheckRe.exec(m)) !== null) {
-                        // extract the current menu item
-                        const item = typeMatch[1];
+                        const component = typeMatch[1];
                         // Set the starting index of the second regex to that of the first to start
                         // matching from after the if
                         pushTypeRe.lastIndex = typeCheckRe.lastIndex;
+
                         // extract the first type: "..."
                         const type = pushTypeRe.exec(m)?.[1];
                         if (type && type in nameMap) {
                             const name = nameMap[type];
-                            nameAssignments.push(`Object.defineProperty(${item},"name",{value:"${name}"})`);
+                            registerCalls.push(`$self.registerMenuItem("${name}",${component})`);
                         }
                     }
-                    if (nameAssignments.length < 6) {
-                        console.warn("[MenuItemDemanglerAPI] Expected to at least remap 6 items, only remapped", nameAssignments.length);
+
+                    if (registerCalls.length < 6) {
+                        console.warn("[MenuItemDemanglerAPI] Expected to remap 6 items, only remapped", registerCalls.length);
                     }
 
-                    // Merge all our redefines with the actual module
-                    return `${nameAssignments.join(";")};${m}`;
+                    return `${registerCalls.join(";")};}`;
                 },
             },
         },
     ],
+
+    registerMenuItem(name: string, component: any) {
+        Object.defineProperty(component, "name", { value: name });
+        Menu[name] = component;
+    }
 });
diff --git a/src/plugins/_api/messageAccessories.ts b/src/plugins/_api/messageAccessories.ts
index f0bf45896..f6f224ea7 100644
--- a/src/plugins/_api/messageAccessories.ts
+++ b/src/plugins/_api/messageAccessories.ts
@@ -28,7 +28,7 @@ export default definePlugin({
             find: "#{intl::REMOVE_ATTACHMENT_BODY}",
             replacement: {
                 match: /children:(\[[^\]]{0,100}?this.renderSuppressConfirmModal[^\]]{0,100}?\])/,
-                replace: "children:Vencord.Api.MessageAccessories._modifyAccessories($1,this.props)",
+                replace: "children:Vencord.Api.MessageAccessories._modifyAccessories($1,this?.props)",
             },
         },
     ],
diff --git a/src/plugins/_api/nicknameIcons.ts b/src/plugins/_api/nicknameIcons.ts
index 6d0c220b6..f5d4893e2 100644
--- a/src/plugins/_api/nicknameIcons.ts
+++ b/src/plugins/_api/nicknameIcons.ts
@@ -16,11 +16,11 @@ export default definePlugin({
             find: "#{intl::USER_PROFILE_PRONOUNS}",
             replacement: [
                 {
-                    match: /(?<=,\i\]\}\)\),)null!=\i/,
-                    replace: "($&||Vencord.Api.NicknameIcons._renderIcons({userId:arguments[0].user?.id})?.length)"
+                    match: /(?<=children:\i\}\):\i,)null!=\i/,
+                    replace: "($&||!!Vencord.Api.NicknameIcons._renderIcons({userId:arguments[0].user?.id})?.length)"
                 },
                 {
-                    match: /(?<=shouldUnderlineOnHover:null.{0,300})children:(\i)/,
+                    match: /(?<=shouldUnderlineOnHover:null.{0,300})children:(\i)(?=\}\)\])/,
                     replace: "children:[...Vencord.Api.NicknameIcons._renderIcons({userId:arguments[0].user?.id}),$1]"
                 }
             ]
diff --git a/src/plugins/_core/concatenatedComponentExtractor.tsx b/src/plugins/_core/concatenatedComponentExtractor.tsx
new file mode 100644
index 000000000..7fd23ff77
--- /dev/null
+++ b/src/plugins/_core/concatenatedComponentExtractor.tsx
@@ -0,0 +1,37 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2026 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { setColorPicker, setCreateScroller } from "@webpack/common";
+
+export default definePlugin({
+    name: "ConcatenatedComponentExtractor",
+    description: "Extract components that have been concatenated by the bundler",
+    authors: [Devs.sadan],
+
+    required: true,
+
+    patches: [
+        {
+            find: "#{intl::USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR}),focusProps:",
+            replacement: {
+                match: /(?=function (\i)\(\i\)\{let\{onChange:\i,onClose:\i,[^}]+?showEyeDropper:)/,
+                replace: "$self.setColorPicker($1);"
+            }
+        },
+        {
+            find: /="ltr",orientation:\i="vertical"[^}]+?customTheme:/,
+            replacement: {
+                match: /(?=function (\i)\(\i,\i,\i\)\{.{0,20}?return \i\.forwardRef\(function\(\i,\i\)\{let\{[^}]+?="ltr",orientation:)/,
+                replace: "$self.setCreateScroller($1);"
+            }
+        }
+    ],
+
+    setCreateScroller,
+    setColorPicker,
+});
diff --git a/src/plugins/_core/noTrack.ts b/src/plugins/_core/noTrack.ts
index cd6234dc4..6fcb4daba 100644
--- a/src/plugins/_core/noTrack.ts
+++ b/src/plugins/_core/noTrack.ts
@@ -44,8 +44,8 @@ export default definePlugin({
             find: "AnalyticsActionHandlers.handle",
             predicate: () => settings.store.disableAnalytics,
             replacement: {
-                match: /^.+$/,
-                replace: "()=>{}",
+                match: /\(0,\i\.analyticsTrackingStoreMaker\)/,
+                replace: "(()=>{})",
             },
         },
         {
@@ -86,14 +86,14 @@ export default definePlugin({
         // It has everything it needs preloaded, so, it doesn't include any chunk loading functionality.
         // Because of that, its WebpackInstance doesnt export wreq.m or wreq.c
 
-        // To circuvent this and disable Sentry we are gonna hook when wreq.g of its WebpackInstance is set.
+        // To circuvent this and disable Sentry we are gonna hook when wreq.d of its WebpackInstance is set.
         // When that happens we are gonna forcefully throw an error and abort everything.
-        Object.defineProperty(Function.prototype, "g", {
+        Object.defineProperty(Function.prototype, "d", {
             configurable: true,
 
-            set(this: WebpackRequire, globalObj: WebpackRequire["g"]) {
-                Object.defineProperty(this, "g", {
-                    value: globalObj,
+            set(this: WebpackRequire, esmDeclareFunc: WebpackRequire["d"]) {
+                Object.defineProperty(this, "d", {
+                    value: esmDeclareFunc,
                     configurable: true,
                     enumerable: true,
                     writable: true
@@ -123,7 +123,7 @@ export default definePlugin({
 
                 new Logger("NoTrack", "#8caaee").info("Disabling Sentry by erroring its WebpackInstance");
 
-                Reflect.deleteProperty(Function.prototype, "g");
+                Reflect.deleteProperty(Function.prototype, "d");
                 Reflect.deleteProperty(window, "DiscordSentry");
 
                 throw new Error("Sentry successfully disabled");
@@ -136,7 +136,7 @@ export default definePlugin({
             set() {
                 new Logger("NoTrack", "#8caaee").error("Failed to disable Sentry. Falling back to deleting window.DiscordSentry");
 
-                Reflect.deleteProperty(Function.prototype, "g");
+                Reflect.deleteProperty(Function.prototype, "d");
                 Reflect.deleteProperty(window, "DiscordSentry");
             }
         });
diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index 61c928dae..93e6b2bd3 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -107,6 +107,11 @@ const settings = definePluginSettings({
             { label: "Below Activity Settings", value: "belowActivity" },
             { label: "At the very bottom", value: "bottom" },
         ] as { label: string; value: SettingsLocation; default?: boolean; }[]
+    },
+    includeVencordInfoWhenCopying: {
+        type: OptionType.BOOLEAN,
+        description: "Also copy Vencord info (Vencord, Electron, Chromium) when clicking the version info in the bottom left area of the Settings page",
+        default: true
     }
 });
 
@@ -127,7 +132,7 @@ export default definePlugin({
                     replace: "$&.replace(/^./, c => c.toUpperCase())"
                 },
                 {
-                    match: /"text-xxs\/normal".{0,300}?(?=null!=(\i)&&(.{0,20}\i\.Text.{0,200}?,children:).{0,15}?("span"),({className:\i\.\i,children:\["Build Override: ",\1\.id\]\})\)\}\))/,
+                    match: /"text-xxs\/normal".{0,300}?(?=null!=(\i)&&(.{0,20}\i\.\i.{0,200}?,children:).{0,15}?("span"),({className:\i\.\i,children:\["Build Override: ",\1\.id\]\})\)\}\))/,
                     replace: (m, _buildOverride, makeRow, component, props) => {
                         props = props.replace(/children:\[.+\]/, "");
                         return `${m},$self.makeInfoElements(${component},${props}).map(e=>${makeRow}e})),`;
@@ -254,7 +259,7 @@ export default definePlugin({
             belowNitro: "billing_section",
             aboveActivity: "activity_section",
             belowActivity: "activity_section",
-            bottom: "logout_section"
+            bottom: "utility_section"
         };
 
         const key = places[settingsLocation] ?? places.top;
@@ -317,6 +322,7 @@ export default definePlugin({
     },
 
     getInfoString() {
+        if (!settings.store.includeVencordInfoWhenCopying) return "";
         return "\n" + this.getInfoRows().join("\n");
     },
 
diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx
index a2e1d8172..385472477 100644
--- a/src/plugins/_core/supportHelper.tsx
+++ b/src/plugins/_core/supportHelper.tsx
@@ -289,7 +289,7 @@ export default definePlugin({
     required: true,
     description: "Helps us provide support to you",
     authors: [Devs.Ven],
-    dependencies: ["UserSettingsAPI"],
+    dependencies: ["UserSettingsAPI", "CommandsAPI", "MessageAccessoriesAPI"],
 
     settings,
 
diff --git a/src/plugins/accountPanelServerProfile/index.tsx b/src/plugins/accountPanelServerProfile/index.tsx
index 12f5f5cbb..3dd778b4f 100644
--- a/src/plugins/accountPanelServerProfile/index.tsx
+++ b/src/plugins/accountPanelServerProfile/index.tsx
@@ -9,11 +9,11 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import alwaysExpandProfiles from "@equicordplugins/alwaysExpandProfiles";
 import { Devs } from "@utils/constants";
-import { fetchUserProfile, getCurrentChannel } from "@utils/discord";
+import { fetchUserProfile, getCurrentChannel, openUserProfile } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { User } from "@vencord/discord-types";
 import { findComponentByCodeLazy } from "@webpack";
-import { ContextMenuApi, Menu, UserStore } from "@webpack/common";
+import { ContextMenuApi, Menu, useEffect, UserStore } from "@webpack/common";
 
 interface UserProfileProps {
     popoutProps: Record<string, any>;
@@ -41,9 +41,9 @@ const AccountPanelContextMenu = ErrorBoundary.wrap(() => {
                 action={async e => {
                     if (isPluginEnabled(alwaysExpandProfiles.name)) {
                         const user = await fetchUserProfile(UserStore.getCurrentUser().id, {
-                            guild_id: getCurrentChannel()?.getGuildId()
+                            guild_id: prioritizeServerProfile ? undefined : getCurrentChannel()?.getGuildId()
                         }, false);
-                        return alwaysExpandProfiles.openUserModal(user!.userId);
+                        return openUserProfile(user!.userId);
                     }
                     openAlternatePopout = true;
                     accountPanelRef.current?.click();
@@ -70,6 +70,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "AccountPanelServerProfile",
     description: "Right click your account panel in the bottom left to view your profile in the current server",
+    tags: ["Appearance", "Servers"],
     authors: [Devs.Nuckyz, Devs.relitrix],
     settings,
 
@@ -79,7 +80,7 @@ export default definePlugin({
             group: true,
             replacement: [
                 {
-                    match: /(\.AVATAR,children:.+?renderPopout:(\i)=>){(.+?)}(?=,position)(?<=currentUser:(\i).+?)/,
+                    match: /(\.AVATAR,children:.+?renderPopout:\((\i),\i\)=>)\{(.+?)\}(?=,position)(?<=currentUser:(\i).+?)/,
                     replace: (_, rest, popoutProps, originalPopout, currentUser) => `${rest}$self.UserProfile({popoutProps:${popoutProps},currentUser:${currentUser},originalRenderPopout:()=>{${originalPopout}}})`
                 },
                 {
@@ -124,6 +125,10 @@ export default definePlugin({
             return originalRenderPopout();
         }
 
+        if (isPluginEnabled(alwaysExpandProfiles.name)) {
+            return <ServerProfileLauncher popoutProps={popoutProps} userId={currentUser.id} guildId={currentChannel.getGuildId()!} />;
+        }
+
         return (
             <UserProfile
                 {...popoutProps}
@@ -135,3 +140,14 @@ export default definePlugin({
         );
     }, { noop: true })
 });
+
+function ServerProfileLauncher({ popoutProps, userId, guildId }: { popoutProps: Record<string, any>; userId: string; guildId: string; }) {
+    useEffect(() => {
+        popoutProps.closePopout?.();
+        popoutProps.onRequestClose?.();
+        fetchUserProfile(userId, { guild_id: guildId }, false).then(user => {
+            if (user) openUserProfile(user.userId);
+        });
+    }, []);
+    return null;
+}
diff --git a/src/plugins/alwaysAnimate/index.ts b/src/plugins/alwaysAnimate/index.ts
index 071596253..e66792ee5 100644
--- a/src/plugins/alwaysAnimate/index.ts
+++ b/src/plugins/alwaysAnimate/index.ts
@@ -51,6 +51,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "AlwaysAnimate",
     description: "Animates anything that can be animated",
+    tags: ["Appearance", "Fun"],
     authors: [Devs.FieryFlames],
     settings,
     patches: [
diff --git a/src/plugins/alwaysExpandRoles/index.ts b/src/plugins/alwaysExpandRoles/index.ts
index 7ad1e6fae..502679ea9 100644
--- a/src/plugins/alwaysExpandRoles/index.ts
+++ b/src/plugins/alwaysExpandRoles/index.ts
@@ -33,6 +33,7 @@ migratePluginSettings("AlwaysExpandRoles", "ShowAllRoles");
 export default definePlugin({
     name: "AlwaysExpandRoles",
     description: "Always expands the role list in profile popouts",
+    tags: ["Appearance", "Roles"],
     authors: [Devs.surgedevs],
     isModified: true,
     settings,
diff --git a/src/plugins/alwaysTrust/index.tsx b/src/plugins/alwaysTrust/index.tsx
index a7d975726..1682fc50a 100644
--- a/src/plugins/alwaysTrust/index.tsx
+++ b/src/plugins/alwaysTrust/index.tsx
@@ -60,6 +60,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "AlwaysTrust",
     description: "Removes the annoying untrusted domain and suspicious file popup",
+    tags: ["Utility"],
     authors: [Devs.zt, Devs.Trwy],
     isModified: true,
     settings,
diff --git a/src/plugins/anonymiseFileNames/index.tsx b/src/plugins/anonymiseFileNames/index.tsx
index f136d08a0..9fbfca3a5 100644
--- a/src/plugins/anonymiseFileNames/index.tsx
+++ b/src/plugins/anonymiseFileNames/index.tsx
@@ -60,21 +60,28 @@ const settings = definePluginSettings({
     randomisedLength: {
         description: "Random characters length",
         type: OptionType.NUMBER,
-        default: 7,
-        disabled: () => settings.store.method !== Methods.Random,
+        default: 7
     },
     consistent: {
         description: "Consistent filename",
         type: OptionType.STRING,
-        default: "image",
-        disabled: () => settings.store.method !== Methods.Consistent,
+        default: "image"
     },
+}, {
+    randomisedLength: {
+        disabled() { return this.store.method !== Methods.Random; },
+    },
+    consistent: {
+        disabled() { return this.store.method !== Methods.Consistent; },
+    }
 });
 
 export default definePlugin({
     name: "AnonymiseFileNames",
     authors: [Devs.fawn],
     description: "Anonymise uploaded file names",
+    dependencies: ["CommandsAPI"],
+    tags: ["Privacy", "Utility"],
     isModified: true,
     settings,
 
diff --git a/src/plugins/appleMusic.desktop/index.tsx b/src/plugins/appleMusic.desktop/index.tsx
index e265f4efc..c477f8e2a 100644
--- a/src/plugins/appleMusic.desktop/index.tsx
+++ b/src/plugins/appleMusic.desktop/index.tsx
@@ -157,6 +157,7 @@ function getImageAsset(type: AssetImageType, data: TrackData) {
 export default definePlugin({
     name: "AppleMusicRichPresence",
     description: "Discord rich presence for your Apple Music!",
+    tags: ["Activity", "Media"],
     authors: [Devs.RyanCaoDev],
     hidden: !IS_MAC,
     reporterTestable: ReporterTestable.None,
diff --git a/src/plugins/arRPC.web/index.tsx b/src/plugins/arRPC.web/index.tsx
index e602b18eb..31a813211 100644
--- a/src/plugins/arRPC.web/index.tsx
+++ b/src/plugins/arRPC.web/index.tsx
@@ -42,6 +42,7 @@ migratePluginSettings("WebRichPresence", "WebRichPresence (arRPC)");
 export default definePlugin({
     name: "WebRichPresence",
     description: "Client plugin for arRPC to enable RPC on Discord Web (experimental)",
+    tags: ["Activity", "Utility"],
     authors: [Devs.Ducko],
     reporterTestable: ReporterTestable.None,
     hidden: !IS_EQUIBOP && !IS_VESKTOP && !("legcord" in window),
diff --git a/src/plugins/autoDndWhilePlaying.discordDesktop/index.ts b/src/plugins/autoDndWhilePlaying.discordDesktop/index.ts
index d1dbdc213..2c74fec66 100644
--- a/src/plugins/autoDndWhilePlaying.discordDesktop/index.ts
+++ b/src/plugins/autoDndWhilePlaying.discordDesktop/index.ts
@@ -48,6 +48,7 @@ migratePluginSettings("AutoDNDWhilePlaying", "StatusWhilePlaying");
 export default definePlugin({
     name: "AutoDNDWhilePlaying",
     description: "Automatically updates your online status (online, idle, dnd) when launching games",
+    tags: ["Activity", "Utility"],
     authors: [Devs.thororen],
     isModified: true,
     settings,
diff --git a/src/plugins/betterFolders/FolderSideBar.tsx b/src/plugins/betterFolders/FolderSideBar.tsx
index fb33d9317..ca9be04b2 100644
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@@ -21,19 +21,35 @@ import { findComponentByCodeLazy } from "@webpack";
 import { Animations, ChannelRTCStore, useStateFromStores } from "@webpack/common";
 import type { CSSProperties } from "react";
 
-import { ExpandedGuildFolderStore, settings, SortedGuildStore } from ".";
+import { ExpandedGuildFolderStore, getExpandedFolderIdSet, getParentFolderId, settings, SortedGuildStore } from ".";
 
 const GuildsBar = findComponentByCodeLazy('("guildsnav")');
 
+type GuildTreeNode = {
+    id?: string | number;
+    type?: string;
+    children?: GuildTreeNode[];
+};
+
 function getExpandedFolderIds() {
-    const expandedFolders = ExpandedGuildFolderStore.getExpandedFolders();
-    const folders = SortedGuildStore.getGuildFolders();
+    const expandedFolders = getExpandedFolderIdSet();
+    const tree = SortedGuildStore.getGuildsTree();
+    const expandedFolderIds = new Set<number>();
+    const stack = [...(tree?.root?.children ?? [])];
 
-    const expandedFolderIds = new Set<string>();
+    while (stack.length) {
+        const node = stack.pop();
+        if (!node) continue;
 
-    for (const folder of folders) {
-        if (expandedFolders.has(folder.folderId) && folder.guildIds?.length) {
-            expandedFolderIds.add(folder.folderId);
+        if (node.type === "folder") {
+            const folderId = node.id;
+            if (folderId != null && expandedFolders.has(Number(folderId))) {
+                expandedFolderIds.add(Number(folderId));
+            }
+        }
+
+        if (node.children?.length) {
+            stack.push(...node.children);
         }
     }
 
@@ -52,7 +68,11 @@ export default ErrorBoundary.wrap(guildsBarProps => {
         />
     );
 
-    const visible = !!expandedFolderIds.size;
+    const visible = SortedGuildStore.getGuildFolders().some(folder =>
+        folder.guildIds?.length &&
+        expandedFolderIds.has(Number(folder.folderId)) &&
+        getParentFolderId(folder.folderId) == null
+    );
     const guilds = document.querySelector(guildsBarProps.className.split(" ").map(c => `.${c}`).join(""));
 
     // We need to display none if we are in fullscreen. Yes this seems horrible doing with css, but it's literally how Discord does it.
diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index caaa38991..05d817470 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -19,7 +19,7 @@
 import "./style.css";
 
 import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
+import { Devs, EquicordDevs } from "@utils/constants";
 import { getIntlMessage } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import type { GuildFolder } from "@vencord/discord-types";
@@ -68,28 +68,82 @@ const FolderItem = findComponentByCodeLazy("FolderItem", "onExpandCollapse", "fo
 
 const MAX_TREE_FILTER_DEPTH = 1000;
 let dispatchingFoldersClose = false;
+let pendingNavigationGuildId: string | null | undefined;
+let pendingNavigationCloseServerFolder = false;
+let navigationExpandTimeout: ReturnType<typeof setTimeout> | undefined;
 
 function getGuildFolder(id: string) {
     return SortedGuildStore.getGuildFolders().find((folder: GuildFolder) => folder.guildIds.includes(id));
 }
 
-function expandGuildNavigationPath(guildId: string | null | undefined) {
-    if (!guildId || guildId === "@me") return;
+function getGuildNavigationPathTargets(guildId: string | null | undefined): string[] {
+    if (!guildId || guildId === "@me") return [];
 
-    for (const folderId of getGuildNavigationExpandTargets(
+    return getGuildNavigationExpandTargets(
         getNestedFolderMap(),
         SortedGuildStore.getGuildFolders(),
         guildId,
         ExpandedGuildFolderStore.getExpandedFolders()
-    )) {
-        if (!ExpandedGuildFolderStore.isFolderExpanded(folderId)) {
-            FolderUtils.toggleGuildFolderExpand(folderId);
+    );
+}
+
+export function getExpandedFolderIdSet() {
+    return new Set(Array.from(ExpandedGuildFolderStore.getExpandedFolders(), id => Number(id)));
+}
+
+function isFolderExpanded(folderId: string | number) {
+    return getExpandedFolderIdSet().has(Number(folderId));
+}
+
+function expandGuildNavigationPathNow(guildId: string | null | undefined) {
+    for (const folderId of getGuildNavigationPathTargets(guildId)) {
+        const numericFolderId = Number(folderId);
+        if (!isFolderExpanded(numericFolderId)) {
+            FolderUtils.toggleGuildFolderExpand(numericFolderId);
         }
     }
 }
 
+function flushGuildNavigationPath() {
+    navigationExpandTimeout = undefined;
+
+    const guildId = pendingNavigationGuildId;
+    const shouldCloseServerFolder = pendingNavigationCloseServerFolder;
+    pendingNavigationGuildId = undefined;
+    pendingNavigationCloseServerFolder = false;
+
+    if (!guildId || guildId === "@me") return;
+
+    const folderIds = getGuildNavigationPathTargets(guildId);
+    const guildFolder = getGuildFolder(guildId);
+    const folderId = guildFolder?.folderId;
+    const shouldCloseTargetFolder = shouldCloseServerFolder
+        && folderId != null
+        && folderIds.length === 0
+        && isFolderExpanded(folderId);
+
+    expandGuildNavigationPathNow(guildId);
+
+    if (shouldCloseTargetFolder) {
+        FolderUtils.toggleGuildFolderExpand(folderId);
+    }
+}
+
+function scheduleGuildNavigationPath(guildId: string | null | undefined, closeServerFolder = false) {
+    const isSamePendingGuild = pendingNavigationGuildId === guildId;
+
+    pendingNavigationGuildId = guildId;
+    pendingNavigationCloseServerFolder = isSamePendingGuild
+        ? pendingNavigationCloseServerFolder || closeServerFolder
+        : closeServerFolder;
+
+    if (navigationExpandTimeout != null) return;
+
+    navigationExpandTimeout = setTimeout(flushGuildNavigationPath, 0);
+}
+
 function closeFolders() {
-    for (const id of ExpandedGuildFolderStore.getExpandedFolders())
+    for (const id of getExpandedFolderIdSet())
         FolderUtils.toggleGuildFolderExpand(id);
 }
 
@@ -131,6 +185,8 @@ function filterTreeWithTargetNode(children: any, predicate: (node: any) => boole
 }
 
 function getNestedFolderMap(): Record<string, string> {
+    if (!settings.store.enableNestedFolders) return {};
+
     const nestedFolders = settings.store.nestedFolders ?? {};
     const validFolderIds = new Set<string>(
         SortedGuildStore.getGuildFolders()
@@ -227,6 +283,11 @@ export const settings = definePluginSettings({
         description: "Force a folder to open when switching to a server of that folder",
         default: false
     },
+    enableNestedFolders: {
+        type: OptionType.BOOLEAN,
+        description: "Allow nesting folders inside other folders by dragging.",
+        default: true
+    },
     keepIcons: {
         type: OptionType.BOOLEAN,
         description: "Keep showing guild icons in the primary guild bar folder when it's open in the BetterFolders sidebar",
@@ -254,13 +315,21 @@ const GRID_STYLE_NAME = "vc-betterFolders-sidebar-grid";
 export default definePlugin({
     name: "BetterFolders",
     description: "Shows server folders on dedicated sidebar and adds folder related improvements",
-    authors: [Devs.juby, Devs.AutumnVN, Devs.Nuckyz],
+    tags: ["Organisation", "Servers", "Appearance"],
+    authors: [Devs.juby, Devs.AutumnVN, Devs.Nuckyz, EquicordDevs.justjxke],
     isModified: true,
-
     settings,
     start() {
         settings.store.nestedFolders = getNestedFolderMap();
     },
+    stop() {
+        if (navigationExpandTimeout != null) {
+            clearTimeout(navigationExpandTimeout);
+            navigationExpandTimeout = undefined;
+        }
+        pendingNavigationGuildId = undefined;
+        pendingNavigationCloseServerFolder = false;
+    },
 
     patches: [
         {
@@ -326,7 +395,7 @@ export default definePlugin({
                 {
                     // Modify the expanded prop to use the boolean if the above patch fails, or check if the folder is expanded from the list if it succeeds
                     // Also export the list of expanded folders to the child folder component if the patch above succeeds, else export undefined
-                    match: /(?<=folderNode:(\i),expanded:)\i(?=,)/,
+                    match: /(?<=\(0,\i\.jsxs?\)\(\i,\{folderNode:(\i),expanded:)\i(?=,)/,
                     replace: (isExpandedOrExpandedIds, folderNote) => ""
                         + `typeof ${isExpandedOrExpandedIds}==="boolean"?${isExpandedOrExpandedIds}:${isExpandedOrExpandedIds}.has(${folderNote}.id),`
                         + `betterFoldersExpandedIds:${isExpandedOrExpandedIds} instanceof Set?${isExpandedOrExpandedIds}:void 0`
@@ -446,26 +515,42 @@ export default definePlugin({
                 match: /return \i\.type!==\i\.\i\.GUILD/,
                 replace: "return $self.renderFolderChild(arguments[0],arguments[1],arguments[2])"
             }
+        },
+        {
+            find: "`transitionToGuild - Transitioning to",
+            replacement: {
+                match: /(`transitionToGuild - Transitioning to .{0,80}?guildId:\i,channelId:\i,messageId:\i.{0,40}?`\),)/,
+                replace: "$&$self.handleGuildNavigation(arguments[0]),"
+            }
+        },
+        {
+            find: "`transitionTo - Transitioning to",
+            replacement: {
+                match: /`transitionTo - Transitioning to \$\{\i\}`\);/,
+                replace: "$&$self.handleRouteNavigation(arguments[0]);"
+            }
+        },
+        {
+            find: ".getCompatibleGuildFolders())",
+            replacement: {
+                match: /\i:\(\)=>\i(?=.*?\.FOLDER_ITEM_ANIMATION_DURATION.{0,10}\.animated\)\(\i\.\i\),(\i))/,
+                replace: "$&,FolderItem:()=>$1"
+            }
         }
     ],
 
     flux: {
         GUILD_SELECT({ guildId }: { guildId: string | null; }) {
             if (guildId == null) return;
-            expandGuildNavigationPath(guildId);
+            scheduleGuildNavigationPath(guildId);
         },
 
         CHANNEL_SELECT(data) {
             const guildFolder = getGuildFolder(data.guildId);
 
             if (guildFolder?.folderId) {
-                expandGuildNavigationPath(data.guildId);
-
-                if (settings.store.forceOpen && !ExpandedGuildFolderStore.isFolderExpanded(guildFolder.folderId)) {
-                    FolderUtils.toggleGuildFolderExpand(guildFolder.folderId);
-                }
-                if (settings.store.closeServerFolder && ExpandedGuildFolderStore.isFolderExpanded(guildFolder.folderId)) {
-                    FolderUtils.toggleGuildFolderExpand(guildFolder.folderId);
+                if (settings.store.forceOpen || settings.store.closeServerFolder) {
+                    scheduleGuildNavigationPath(data.guildId, settings.store.closeServerFolder);
                 }
             } else if (settings.store.closeAllFolders) {
                 closeFolders();
@@ -500,6 +585,19 @@ export default definePlugin({
 
     FolderSideBar,
     closeFolders,
+    handleGuildNavigation(guildId: string | null | undefined) {
+        expandGuildNavigationPathNow(guildId);
+    },
+    handleRouteNavigation(route: unknown) {
+        if (typeof route !== "string") return;
+
+        const guildId = route.match(/^\/channels\/([^/]+)/)?.[1];
+        if (!guildId) return;
+
+        if (!settings.store.forceOpen && !settings.store.closeServerFolder) return;
+
+        expandGuildNavigationPathNow(guildId);
+    },
     getGuildMentionCount(guildId: string): number {
         const mentionChannelIds = ReadStateStore.getMentionChannelIds() ?? [];
         let count = 0;
@@ -619,8 +717,6 @@ export default definePlugin({
         props: FolderRenderProps | undefined,
         baseClassName: string
     ): string {
-        if (props?.isBetterFolders) return baseClassName;
-
         const folderNode = props?.folderNode;
         if (folderNode == null) return baseClassName;
 
@@ -651,6 +747,7 @@ export default definePlugin({
 
     handleFolderDrop(dragItem: FolderDragItem, targetNode: GuildTreeNode, _moveToBelow: boolean, isCombine: boolean): boolean {
         if (dragItem.type !== "folder") return false;
+        if (!settings.store.enableNestedFolders) return false;
 
         if (targetNode.type === "folder") {
             const childId = dragItem.nodeId?.toString();
@@ -678,13 +775,14 @@ export default definePlugin({
 
     shouldShowCombineTarget(noCombine: boolean, targetNode: GuildTreeNode): boolean {
         if (noCombine) return false;
+        if (!settings.store.enableNestedFolders) return targetNode.parentId == null;
         return targetNode.parentId == null || targetNode.type === "folder";
     },
 
     getFolderAcceptTypes(targetNode: GuildTreeNode): string[] {
         const GUILD = "guild";
         const FOLDER = "folder";
-        if (targetNode?.type === FOLDER) return [GUILD, FOLDER];
+        if (settings.store.enableNestedFolders && targetNode?.type === FOLDER) return [GUILD, FOLDER];
         return [GUILD];
     },
 
@@ -692,6 +790,7 @@ export default definePlugin({
         if (dragItem.nodeId === targetNode.id) return false;
 
         if (dragItem.type === "folder" && targetNode.type === "folder") {
+            if (!settings.store.enableNestedFolders) return false;
             return !hasParentInChain(targetNode.id?.toString(), dragItem.nodeId?.toString());
         }
 
@@ -715,7 +814,7 @@ export default definePlugin({
 
         if (
             !isBetterFolders ||
-            node.type === "folder" && expandedFolderIds?.has(node.id) ||
+            node.type === "folder" && (node.isBetterFoldersNested === true || expandedFolderIds?.has(node.id)) ||
             node.type === "guild" && node.parentId != null && expandedFolderIds?.has(node.parentId)
         ) {
             return originalComponent();
@@ -754,7 +853,7 @@ export default definePlugin({
             }
 
             try {
-                return filterTreeWithTargetNode(child, child => child?.props?.renderTreeNode != null);
+                return filterTreeWithTargetNode(child, c => c?.props?.renderTreeNode != null);
             } catch {
                 return true;
             }
diff --git a/src/plugins/betterGifAltText/index.ts b/src/plugins/betterGifAltText/index.ts
index 0a381e547..3b95f912e 100644
--- a/src/plugins/betterGifAltText/index.ts
+++ b/src/plugins/betterGifAltText/index.ts
@@ -24,6 +24,7 @@ export default definePlugin({
     authors: [Devs.Ven],
     description:
         "Change GIF alt text from simply being 'GIF' to containing the gif tags / filename",
+    tags: ["Media", "Accessibility", "Customisation"],
     patches: [
         {
             find: ".modalContext})};",
diff --git a/src/plugins/betterGifPicker/index.ts b/src/plugins/betterGifPicker/index.ts
index cb2675886..3718b03eb 100644
--- a/src/plugins/betterGifPicker/index.ts
+++ b/src/plugins/betterGifPicker/index.ts
@@ -20,6 +20,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "BetterGifPicker",
     description: "Makes the gif picker open the favourite category by default",
+    tags: ["Emotes", "Customisation"],
     authors: [Devs.Samwich, EquicordDevs.justjxke],
     isModified: true,
     settings,
diff --git a/src/plugins/betterNotes/index.tsx b/src/plugins/betterNotes/index.tsx
deleted file mode 100644
index 68aa70c61..000000000
--- a/src/plugins/betterNotes/index.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { definePluginSettings, Settings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import { canonicalizeMatch } from "@utils/patches";
-import definePlugin, { OptionType } from "@utils/types";
-
-const settings = definePluginSettings({
-    hide: {
-        type: OptionType.BOOLEAN,
-        description: "Hide notes",
-        default: false,
-        restartNeeded: true
-    },
-    noSpellCheck: {
-        type: OptionType.BOOLEAN,
-        description: "Disable spellcheck in notes",
-        disabled: () => Settings.plugins.BetterNotesBox.hide,
-        default: false
-    }
-});
-
-export default definePlugin({
-    name: "BetterNotesBox",
-    description: "Hide notes or disable spellcheck (Configure in settings!!)",
-    authors: [Devs.Ven],
-    settings,
-
-    patches: [
-        {
-            find: "hideNote:",
-            all: true,
-            // Some modules match the find but the replacement is returned untouched
-            noWarn: true,
-            predicate: () => settings.store.hide,
-            replacement: {
-                match: /hideNote:.+?(?=([,}].*?\)))/g,
-                replace: (m, rest) => {
-                    const destructuringMatch = rest.match(/}=.+/);
-                    if (destructuringMatch) {
-                        const defaultValueMatch = m.match(canonicalizeMatch(/hideNote:(\i)=!?\d/));
-                        return defaultValueMatch ? `hideNote:${defaultValueMatch[1]}=!0` : m;
-                    }
-
-                    return "hideNote:!0";
-                }
-            }
-        },
-        {
-            find: "#{intl::NOTE_PLACEHOLDER}",
-            replacement: {
-                match: /#{intl::NOTE_PLACEHOLDER}\),/,
-                replace: "$&spellCheck:!$self.noSpellCheck,"
-            }
-        }
-    ],
-
-    get noSpellCheck() {
-        return settings.store.noSpellCheck;
-    }
-});
diff --git a/src/plugins/betterRoleContext/index.tsx b/src/plugins/betterRoleContext/index.tsx
index 4a99d8822..230280dff 100644
--- a/src/plugins/betterRoleContext/index.tsx
+++ b/src/plugins/betterRoleContext/index.tsx
@@ -9,12 +9,18 @@ import { getUserSettingLazy } from "@api/UserSettings";
 import { ImageIcon } from "@components/Icons";
 import { copyToClipboard } from "@utils/clipboard";
 import { Devs } from "@utils/constants";
-import { getCurrentGuild, openImageModal } from "@utils/discord";
+import { getCurrentChannel, getCurrentGuild, openImageModal } from "@utils/discord";
+import { isTruthy } from "@utils/guards";
+import { classes } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
-import { GuildRoleStore, Menu, PermissionStore } from "@webpack/common";
+import { Guild, PopoutProps, Role } from "@vencord/discord-types";
+import { findByCodeLazy, findByPropsLazy, findCssClassesLazy } from "@webpack";
+import { GuildRoleStore, Menu, PermissionStore, Popout, useRef } from "@webpack/common";
+import { ComponentType } from "react";
 
 const GuildSettingsActions = findByPropsLazy("open", "selectRole", "updateGuild");
+const MenuItemClasses = findCssClassesLazy("item", "labelContainer", "colorDefault", "label", "iconContainer");
+const loadRoleMembers = findByCodeLazy(".GUILD_ROLE_MEMBER_IDS(", "requestMembersById");
 
 const DeveloperMode = getUserSettingLazy("appearance", "developerMode")!;
 
@@ -65,6 +71,14 @@ function AppearanceIcon() {
     );
 }
 
+function RoleMembersIcon() {
+    return (
+        <svg width="18" height="18" viewBox="0 0 24 24">
+            <path fill="currentColor" d="M12 10a4 4 0 1 0 0-8 4 4 0 0 0 0 8ZM11.53 11A9.53 9.53 0 0 0 2 20.53c0 .81.66 1.47 1.47 1.47h.22c.24 0 .44-.17.5-.4.29-1.12.84-2.17 1.32-2.91.14-.21.43-.1.4.15l-.26 2.61c-.02.3.2.55.5.55h11.7a.5.5 0 0 0 .5-.55l-.27-2.6c-.02-.26.27-.37.41-.16.48.74 1.03 1.8 1.32 2.9.06.24.26.41.5.41h.22c.81 0 1.47-.66 1.47-1.47A9.53 9.53 0 0 0 12.47 11h-.94Z" />
+        </svg>
+    );
+}
+
 const settings = definePluginSettings({
     roleIconFileFormat: {
         type: OptionType.SELECT,
@@ -87,21 +101,131 @@ const settings = definePluginSettings({
     }
 });
 
+interface RoleMemberPopoutProps {
+    popoutProps: PopoutProps;
+    guildId: string;
+    channelId: string;
+    roleId: string;
+}
+type RoleMemberPopout = ComponentType<RoleMemberPopoutProps>;
+
+let RoleMemberPopout: RoleMemberPopout = () => null;
+
+export function buildExtraRoleContextMenuItems(role: Role, guild: Guild, popoutRef?: React.RefObject<any>) {
+    if (!role) return { before: [], after: [] };
+
+    const before = [
+        PermissionStore.getGuildPermissionProps(guild).canManageRoles && (
+            <Menu.MenuItem
+                key="vc-edit-role"
+                id="vc-edit-role"
+                label="Edit Role"
+                action={async () => {
+                    await GuildSettingsActions.open(guild.id, "ROLES");
+                    GuildSettingsActions.selectRole(role.id);
+                }}
+                icon={PencilIcon}
+            />
+        ),
+        role.colorString && (
+            <Menu.MenuItem
+                key="vc-copy-role-color"
+                id="vc-copy-role-color"
+                label="Copy Role Color"
+                action={() => copyToClipboard(role.colorString!)}
+                icon={AppearanceIcon}
+            />
+        )
+    ].filter(isTruthy);
+
+    const after = [
+        role.icon && (
+            <Menu.MenuItem
+                key="vc-view-role-icon"
+                id="vc-view-role-icon"
+                label="View Role Icon"
+                action={() => {
+                    openImageModal({
+                        url: `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/role-icons/${role.id}/${role.icon}.${settings.store.roleIconFileFormat}`,
+                        height: 128,
+                        width: 128
+                    });
+                }}
+                icon={ImageIcon}
+            />
+        ),
+        popoutRef && (
+            <Menu.MenuItem
+                key="vc-view-role-members"
+                id="vc-view-role-members"
+                label="View Role Members"
+                render={() => (
+                    <Popout
+                        position="right"
+                        align="center"
+                        targetElementRef={popoutRef}
+                        preload={() => loadRoleMembers(guild.id, role.id)}
+                        renderPopout={popoutProps => (
+                            <RoleMemberPopout
+                                popoutProps={popoutProps}
+                                guildId={guild.id}
+                                channelId={getCurrentChannel()!.id}
+                                roleId={role.id}
+                            />
+                        )}
+                    >
+                        {popoutProps => (
+                            <div
+                                className={classes(MenuItemClasses.item, MenuItemClasses.labelContainer, MenuItemClasses.colorDefault)}
+                                ref={popoutRef}
+                                role="menuitem"
+                                {...popoutProps}
+                            >
+                                <div className={MenuItemClasses.label}>View Role Members</div>
+                                <div className={MenuItemClasses.iconContainer}>
+                                    <RoleMembersIcon />
+                                </div>
+                            </div>
+                        )}
+                    </Popout>
+                )}
+            />
+        )
+    ].filter(isTruthy);
+
+    return { before, after };
+}
+
 export default definePlugin({
     name: "BetterRoleContext",
     description: "Adds options to copy role color / edit role / view role icon when right clicking roles in the user profile",
+    tags: ["Roles", "Appearance"],
     authors: [Devs.Ven, Devs.goodbee],
     dependencies: ["UserSettingsAPI"],
 
     settings,
 
+    patches: [{
+        find: ".ROLE_MENTION)",
+        replacement: {
+            match: /function (\i)(?=.+?renderPopout:.{0,20}\1,\{guildId:\i,channelId:\i)/,
+            replace: "$self.RoleMembers=$1;$&"
+        }
+    }],
+
     start() {
         // DeveloperMode needs to be enabled for the context menu to be shown
         DeveloperMode.updateSetting(true);
     },
 
+    set RoleMembers(component: RoleMemberPopout) {
+        RoleMemberPopout = component;
+    },
+
     contextMenus: {
         "dev-context"(children, { id }: { id: string; }) {
+            const popoutRef = useRef(null);
+
             const guild = getCurrentGuild();
             if (!guild) return;
 
diff --git a/src/plugins/betterRoleDot/index.ts b/src/plugins/betterRoleDot/index.ts
index 3cdff9bb4..4894e00dc 100644
--- a/src/plugins/betterRoleDot/index.ts
+++ b/src/plugins/betterRoleDot/index.ts
@@ -33,13 +33,14 @@ const settings = definePluginSettings({
         description: "Allow click on role dot in profile popout to copy role color",
         restartNeeded: true,
         default: false
-    },
+    }
 });
 
 export default definePlugin({
     name: "BetterRoleDot",
     authors: [Devs.Ven, Devs.AutumnVN],
     description: "Copy role colour on RoleDot (accessibility setting) click. Also allows using both RoleDot and coloured names simultaneously",
+    tags: ["Roles", "Appearance"],
     settings,
 
     patches: [
diff --git a/src/plugins/betterSessions/index.tsx b/src/plugins/betterSessions/index.tsx
index fcdfbfece..cb016f856 100644
--- a/src/plugins/betterSessions/index.tsx
+++ b/src/plugins/betterSessions/index.tsx
@@ -56,7 +56,7 @@ export default definePlugin({
     name: "BetterSessions",
     description: "Enhances the sessions (devices) menu. Allows you to view exact timestamps, give each session a custom name, and receive notifications about new sessions.",
     authors: [Devs.amia],
-
+    tags: ["Notifications", "Customisation", "Utility"],
     settings: settings,
 
     patches: [
diff --git a/src/plugins/betterSessions/styles.css b/src/plugins/betterSessions/styles.css
index adfc283f0..fafba1ed0 100644
--- a/src/plugins/betterSessions/styles.css
+++ b/src/plugins/betterSessions/styles.css
@@ -7,13 +7,11 @@
 .vc-betterSessions-rename-btn {
     margin-left: 4px;
     translate: 0 -2px;
-    width: fit-content;
 }
 
 .vc-betterSessions-new-btn {
     margin-left: 4px;
     translate: 0 -2px;
-    width: fit-content;
     pointer-events: none;
     padding: 1px 4px;
 }
\ No newline at end of file
diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
index fb95d41ba..f3484e323 100644
--- a/src/plugins/betterSettings/index.tsx
+++ b/src/plugins/betterSettings/index.tsx
@@ -78,6 +78,7 @@ export default definePlugin({
     name: "BetterSettings",
     description: "Enhances your settings-menu-opening experience",
     authors: [Devs.Kyuuhachi],
+    tags: ["Appearance", "Customisation", "Organisation"],
     settings,
 
     start() {
@@ -154,7 +155,7 @@ export default definePlugin({
             predicate: () => settings.store.organizeMenu,
             replacement: [
                 {
-                    match: /children:\[(\i),(?<=\1=.{0,30}\.openUserSettings.+?)/,
+                    match: /children:\[(\i),(?<=\1=(?:function|.{0,30}\.openUserSettings).+?)/, // TODO .{0,30}\.openUserSettings is stable compat
                     replace: "children:[$self.transformSettingsEntries($1),",
                 },
             ]
diff --git a/src/plugins/betterUploadButton/index.ts b/src/plugins/betterUploadButton/index.ts
index 9639dc60a..44fe643d2 100644
--- a/src/plugins/betterUploadButton/index.ts
+++ b/src/plugins/betterUploadButton/index.ts
@@ -23,6 +23,7 @@ export default definePlugin({
     name: "BetterUploadButton",
     authors: [Devs.fawn, Devs.Ven],
     description: "Upload with a single click, open menu with right click",
+    tags: ["Utility", "Shortcuts"],
     patches: [
         {
             find: ".CHAT_INPUT_BUTTON_NOTIFICATION,",
diff --git a/src/plugins/biggerStreamPreview/index.tsx b/src/plugins/biggerStreamPreview/index.tsx
index 2e8beb86a..a1e8959c9 100644
--- a/src/plugins/biggerStreamPreview/index.tsx
+++ b/src/plugins/biggerStreamPreview/index.tsx
@@ -89,6 +89,7 @@ export const userContextPatch: NavContextMenuPatchCallback = (children, { user }
 export default definePlugin({
     name: "BiggerStreamPreview",
     description: "This plugin allows you to enlarge stream previews",
+    tags: ["Media", "Appearance"],
     authors: [Devs.phil],
     contextMenus: {
         "user-context": userContextPatch,
diff --git a/src/plugins/blurNsfw/index.ts b/src/plugins/blurNsfw/index.ts
index d37545836..bd13dfd69 100644
--- a/src/plugins/blurNsfw/index.ts
+++ b/src/plugins/blurNsfw/index.ts
@@ -12,6 +12,15 @@ import definePlugin, { OptionType } from "@utils/types";
 
 let style: HTMLStyleElement;
 
+const settings = definePluginSettings({
+    blurAmount: {
+        type: OptionType.NUMBER,
+        description: "Blur Amount (in pixels)",
+        default: 10,
+        onChange: setCss
+    }
+});
+
 function setCss() {
     style.textContent = `
         .vc-nsfw-img [class*=imageContainer],
@@ -26,23 +35,10 @@ function setCss() {
         `;
 }
 
-const settings = definePluginSettings({
-    blurAmount: {
-        type: OptionType.NUMBER,
-        description: "Blur Amount (in pixels)",
-        default: 10,
-        onChange: setCss
-    },
-    blurAllChannels: {
-        type: OptionType.BOOLEAN,
-        description: "Blur attachments in all channels (not just NSFW)",
-        default: false
-    },
-});
-
 export default definePlugin({
     name: "BlurNSFW",
     description: "Blur attachments in NSFW channels until hovered",
+    tags: ["Privacy", "Appearance"],
     authors: [Devs.Ven],
     isModified: true,
     settings,
@@ -53,7 +49,7 @@ export default definePlugin({
             replacement: [
                 {
                     match: /(\.renderReactions\(\i\).+?className:)/,
-                    replace: '$&(this.props?.channel?.nsfw || $self.settings.store.blurAllChannels ? "vc-nsfw-img ": "")+'
+                    replace: '$&(this?.props?.channel?.nsfw || $self.settings.store.blurAllChannels ? "vc-nsfw-img ": "")+'
                 }
             ]
         }
diff --git a/src/plugins/callTimer/index.tsx b/src/plugins/callTimer/index.tsx
index a006a793c..db4c0e6af 100644
--- a/src/plugins/callTimer/index.tsx
+++ b/src/plugins/callTimer/index.tsx
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { definePluginSettings, migratePluginToSettings, migrateSettingsFromPlugin } from "@api/Settings";
+import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs, EquicordDevs } from "@utils/constants";
 import { useTimer } from "@utils/react";
@@ -106,11 +106,10 @@ let myLastChannelId: string | undefined;
 // Allow user updates on discord first load
 let runOneTime = true;
 
-migratePluginToSettings(false, "CallTimer", "AllCallTimers", "allCallTimers");
-migrateSettingsFromPlugin("CallTimer", "AllCallTimers", "showWithoutHover", "showRoleColor", "trackSelf", "showSeconds", "watchLargeGuilds");
 export default definePlugin({
     name: "CallTimer",
     description: "Add call timers for all users in voice channels and in the connection status.",
+    tags: ["Voice", "Utility"],
     authors: [Devs.Ven, EquicordDevs.MaxHerbold, Devs.D3SOX],
     managedStyle: alignedChatInputFix,
     settings,
@@ -139,8 +138,8 @@ export default definePlugin({
         {
             find: "renderConnectionStatus(){",
             replacement: {
-                match: /(lineClamp:1,children:)(\i)(?=,|}\))/,
-                replace: "$1[$2,$self.renderConnectionTimer(this.props.channel.id)]"
+                match: /(renderConnectionStatus\(\).{0,1000}?lineClamp:1,children:)(\i)(?=,|}\))/,
+                replace: "$1[$2,$self.renderConnectionTimer({ channelId: this?.props?.channel?.id })]"
             }
         }
     ],
@@ -271,11 +270,15 @@ export default definePlugin({
         </ErrorBoundary>;
     },
 
-    ConnectionTimer({ channelId }: { channelId: string; }) {
+    ConnectionTimer: ErrorBoundary.wrap(({ channelId }: { channelId: string; }) => {
         const time = useTimer({
             deps: [channelId]
         });
 
-        return <p style={{ margin: 0, fontFamily: "var(--font-code)" }}>{formatDurationMs(time, settings.store.format === "human")}</p>;
-    }
+        return (
+            <p style={{ margin: 0, fontFamily: "var(--font-code)" }}>
+                {formatDurationMs(time, settings.store.format === "human")}
+            </p>
+        );
+    }, { noop: true }),
 });
diff --git a/src/plugins/characterCounter/index.tsx b/src/plugins/characterCounter/index.tsx
index 209924bc2..0aace6c77 100644
--- a/src/plugins/characterCounter/index.tsx
+++ b/src/plugins/characterCounter/index.tsx
@@ -8,12 +8,14 @@ import "./style.css";
 
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
+import { Devs, EquicordDevs } from "@utils/constants";
 import { classNameFactory } from "@utils/css";
 import definePlugin, { OptionType } from "@utils/types";
-import { UserStore } from "@webpack/common";
+import { findByPropsLazy } from "@webpack";
+import { useEffect, UserStore, useState } from "@webpack/common";
 
 const cl = classNameFactory("vc-charCounter-");
+const SlateUtils = findByPropsLazy("getSelectedText");
 
 const settings = definePluginSettings({
     colorEffects: {
@@ -34,28 +36,43 @@ function getCounterColor(percentage: number) {
 export default definePlugin({
     name: "CharacterCounter",
     description: "Adds a character counter to the chat input",
-    authors: [Devs.thororen],
+    authors: [Devs.thororen, EquicordDevs.creations],
+    tags: ["Utility"],
     settings,
     patches: [
         {
             find: ".CREATE_FORUM_POST||",
             replacement: [
                 {
-                    match: /(?<=textValue:(\i),editorHeight:\i,channelId:\i\.id\}\)),\i/,
-                    replace: ",$self.renderCharCounter({text:$1})"
+                    match: /(?<=,editorRef:(\i),.{0,200}textValue:(\i),editorHeight:\i,channelId:\i\.id\}\)),\i/,
+                    replace: ",$self.renderCharCounter({editorRef:$1,text:$2})"
                 }
             ]
         },
         {
             find: "#{intl::PREMIUM_MESSAGE_LENGTH_UPSELL_TOOLTIP}",
             replacement: {
-                match: /return \i\?\i\(\):\i\(\)(?<=#{intl::PREMIUM_MESSAGE_LENGTH_UPSELL_TOOLTIP_WITHOUT_LINK}.{0,200}?)/,
-                replace: "return null"
+                match: /(?<=\.PREMIUM_UPSELL\);)(?=.{0,50}\.PREMIUM_UPSELL_VIEWED)/,
+                replace: "return null;"
             }
         }
     ],
 
-    renderCharCounter: ErrorBoundary.wrap(({ text }: { text: string; }) => {
+    renderCharCounter: ErrorBoundary.wrap(({ editorRef, text }: { text: string; editorRef: any; }) => {
+        const [selectedCount, setSelectedCount] = useState(0);
+        const showSelected = selectedCount > 0 && (editorRef?.current?.state?.focused ?? false);
+
+        useEffect(() => {
+            const listener = () => {
+                if (!editorRef?.current) return setSelectedCount(0);
+
+                setTimeout(() => setSelectedCount(SlateUtils.getSelectedText(editorRef.current?.getSlateEditor())?.length ?? 0), 50);
+            };
+
+            document.addEventListener("selectionchange", listener);
+            return () => document.removeEventListener("selectionchange", listener);
+        }, []);
+
         if (!text.length) return null;
 
         const premiumType = UserStore.getCurrentUser().premiumType ?? 0;
@@ -65,6 +82,12 @@ export default definePlugin({
 
         return (
             <div className={cl("counter")} style={{ color }}>
+                {showSelected && (
+                    <>
+                        <span className={cl("selected")}>{selectedCount}</span>
+                        /
+                    </>
+                )}
                 <span className={cl("count")}>{text.length}</span>
                 /
                 <span className={cl("max")}>{charMax}</span>
diff --git a/src/plugins/characterCounter/style.css b/src/plugins/characterCounter/style.css
index 072d42bef..87f7d775a 100644
--- a/src/plugins/characterCounter/style.css
+++ b/src/plugins/characterCounter/style.css
@@ -12,4 +12,8 @@
 
 .vc-charCounter-count {
     transition: color 0.3s ease;
+}
+
+.vc-charCounter-selected {
+    color: #4285F4
 }
\ No newline at end of file
diff --git a/src/plugins/clearURLs/index.ts b/src/plugins/clearURLs/index.ts
index 362706079..6affa8f9b 100644
--- a/src/plugins/clearURLs/index.ts
+++ b/src/plugins/clearURLs/index.ts
@@ -50,6 +50,8 @@ interface RuleSet {
 export default definePlugin({
     name: "ClearURLs",
     description: "Automatically removes tracking elements from URLs you send",
+    dependencies: ["MessageEventsAPI"],
+    tags: ["Privacy", "Utility"],
     authors: [Devs.adryd, Devs.thororen],
 
     rules: [] as RuleSet[],
diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
index 984318e29..48e16971d 100644
--- a/src/plugins/clientTheme/index.tsx
+++ b/src/plugins/clientTheme/index.tsx
@@ -29,6 +29,7 @@ export default definePlugin({
     name: "ClientTheme",
     authors: [Devs.Nuckyz],
     description: "Recreation of the old client theme experiment. Add a color to your Discord client theme",
+    tags: ["Appearance", "Customisation"],
     settings,
 
     startAt: StartAt.DOMContentLoaded,
diff --git a/src/plugins/colorSighted/index.ts b/src/plugins/colorSighted/index.ts
index 025cfb94e..0f9201632 100644
--- a/src/plugins/colorSighted/index.ts
+++ b/src/plugins/colorSighted/index.ts
@@ -23,6 +23,7 @@ export default definePlugin({
     name: "ColorSighted",
     description: "Removes the colorblind-friendly icons from statuses, just like 2015-2017 Discord",
     authors: [Devs.lewisakura],
+    tags: ["Appearance", "Accessibility"],
     patches: [
         {
             find: "Masks.STATUS_ONLINE",
diff --git a/src/plugins/consoleJanitor/index.tsx b/src/plugins/consoleJanitor/index.tsx
index f01be7791..93f3a3d20 100644
--- a/src/plugins/consoleJanitor/index.tsx
+++ b/src/plugins/consoleJanitor/index.tsx
@@ -109,6 +109,7 @@ export default definePlugin({
     name: "ConsoleJanitor",
     description: "Disables annoying console messages/errors",
     authors: [Devs.Nuckyz, Devs.sadan],
+    tags: ["Developers", "Console", "Utility"],
     settings,
 
     startAt: StartAt.Init,
@@ -135,7 +136,7 @@ export default definePlugin({
         {
             find: 'The "interpolate" function is deprecated in v10 (use "to" instead)',
             replacement: {
-                match: /,console.warn\(\i\+'The "interpolate" function is deprecated in v10 \(use "to" instead\)'\)/,
+                match: /,console.warn\('react-spring: The "interpolate" function is deprecated in v10 \(use "to" instead\)'\)/,
                 replace: ""
             }
         },
@@ -196,7 +197,7 @@ export default definePlugin({
             find: "Slow dispatch on",
             replacement: [
                 {
-                    match: /\i\.totalTime>\i&&\i\.verbose\([`"]Slow dispatch on.{0,55}\);/,
+                    match: /\i\.totalTime>\d+?&&\i\.verbose\([`"]Slow dispatch on.{0,55}\);/,
                     replace: ""
                 },
             ]
diff --git a/src/plugins/consoleShortcuts/index.ts b/src/plugins/consoleShortcuts/index.ts
index 8b158e6df..f8edc29ad 100644
--- a/src/plugins/consoleShortcuts/index.ts
+++ b/src/plugins/consoleShortcuts/index.ts
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { loadLazyChunks } from "@debug/loadLazyChunks";
 import { Devs } from "@utils/constants";
 import { getCurrentChannel, getCurrentGuild } from "@utils/discord";
 import { runtimeHashMessageKey } from "@utils/intlHash";
@@ -28,7 +29,6 @@ import definePlugin, { PluginNative, StartAt } from "@utils/types";
 import * as Webpack from "@webpack";
 import { extract, filters, findAll, findModuleId, search } from "@webpack";
 import * as Common from "@webpack/common";
-import { loadLazyChunks } from "debug/loadLazyChunks";
 import type { ComponentType } from "react";
 
 const DESKTOP_ONLY = (f: string) => () => {
@@ -245,6 +245,7 @@ export default definePlugin({
     name: "ConsoleShortcuts",
     description: "Adds shorter Aliases for many things on the window. Run `shortcutList` for a list.",
     authors: [Devs.Ven],
+    tags: ["Developers", "Console", "Shortcuts", "Utility"],
     startAt: StartAt.Init,
 
     patches: [
diff --git a/src/plugins/copyEmojiMarkdown/index.tsx b/src/plugins/copyEmojiMarkdown/index.tsx
index e03197fec..dfa46a350 100644
--- a/src/plugins/copyEmojiMarkdown/index.tsx
+++ b/src/plugins/copyEmojiMarkdown/index.tsx
@@ -51,6 +51,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "CopyEmojiMarkdown",
     description: "Allows you to copy emojis as formatted string (<:blobcatcozy:1026533070955872337>)",
+    tags: ["Emotes", "Utility"],
     authors: [Devs.HappyEnderman, Devs.Vishnya],
     settings,
 
diff --git a/src/plugins/copyFileContents/index.tsx b/src/plugins/copyFileContents/index.tsx
index be7ec07a2..c74a5c544 100644
--- a/src/plugins/copyFileContents/index.tsx
+++ b/src/plugins/copyFileContents/index.tsx
@@ -22,6 +22,7 @@ const CheckMarkIcon = () => {
 export default definePlugin({
     name: "CopyFileContents",
     description: "Adds a button to text file attachments to copy their contents",
+    tags: ["Utility"],
     authors: [Devs.Obsidian, Devs.Nuckyz],
     patches: [
         {
diff --git a/src/plugins/copyStickerLinks/index.tsx b/src/plugins/copyStickerLinks/index.tsx
index 635b8d313..bc8fe8e90 100644
--- a/src/plugins/copyStickerLinks/index.tsx
+++ b/src/plugins/copyStickerLinks/index.tsx
@@ -87,6 +87,7 @@ const expressionPickerPatch: NavContextMenuPatchCallback = (children, props: { t
 export default definePlugin({
     name: "CopyStickerLinks",
     description: "Adds the ability to copy & open Sticker links",
+    tags: ["Emotes", "Utility"],
     authors: [Devs.Ven, Devs.Byeoon],
     contextMenus: {
         "message": messageContextMenuPatch,
diff --git a/src/plugins/copyUserURLs/index.tsx b/src/plugins/copyUserURLs/index.tsx
index 744f7ccac..07ac0721d 100644
--- a/src/plugins/copyUserURLs/index.tsx
+++ b/src/plugins/copyUserURLs/index.tsx
@@ -47,6 +47,7 @@ export default definePlugin({
     name: "CopyUserURLs",
     authors: [Devs.castdrian],
     description: "Adds a 'Copy User URL' option to the user context menu.",
+    tags: ["Utility", "Friends"],
     contextMenus: {
         "user-context": UserContextMenuPatch
     }
diff --git a/src/plugins/crashHandler/index.ts b/src/plugins/crashHandler/index.ts
index 37f1d878b..20bcaa902 100644
--- a/src/plugins/crashHandler/index.ts
+++ b/src/plugins/crashHandler/index.ts
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { DataStore } from "@api/index";
 import { showNotification } from "@api/Notifications";
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
@@ -61,8 +62,8 @@ export default definePlugin({
     name: "CrashHandler",
     description: "Utility plugin for handling and possibly recovering from crashes without a restart",
     authors: [Devs.Nuckyz],
+    tags: ["Utility", "Developers"],
     enabledByDefault: true,
-
     settings,
 
     patches: [
@@ -76,6 +77,8 @@ export default definePlugin({
     ],
 
     handleCrash(_this: any, errorState: any) {
+        DataStore.del("KeepCurrentChannel_previousData");
+
         if (IS_DEV) {
             try {
                 if (errorState?.info && "componentStack" in errorState.info) {
diff --git a/src/plugins/ctrlEnterSend/index.ts b/src/plugins/ctrlEnterSend/index.ts
deleted file mode 100644
index 7b0b26b9a..000000000
--- a/src/plugins/ctrlEnterSend/index.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { definePluginSettings } from "@api/Settings";
-import { Devs, IS_MAC } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-
-export default definePlugin({
-    name: "CtrlEnterSend",
-    authors: [Devs.UlyssesZhan],
-    description: "Use Ctrl+Enter to send messages (customizable)",
-    settings: definePluginSettings({
-        submitRule: {
-            description: "The way to send a message",
-            type: OptionType.SELECT,
-            options: [
-                {
-                    label: "Ctrl+Enter (Enter or Shift+Enter for new line) (cmd+enter on macOS)",
-                    value: "ctrl+enter"
-                },
-                {
-                    label: "Shift+Enter (Enter for new line)",
-                    value: "shift+enter"
-                },
-                {
-                    label: "Enter (Shift+Enter for new line; Discord default)",
-                    value: "enter"
-                }
-            ],
-            default: "ctrl+enter"
-        },
-        sendMessageInTheMiddleOfACodeBlock: {
-            description: "Whether to send a message in the middle of a code block",
-            type: OptionType.BOOLEAN,
-            default: true,
-        }
-    }),
-    patches: [
-        // Only one of the two patches will be at effect; Discord often updates to switch between them.
-        // See: https://discord.com/channels/1015060230222131221/1032770730703716362/1261398512017477673
-        {
-            find: ".selectPreviousCommandOption(",
-            replacement: {
-                match: /(?<=(\i)\.which!==\i\.\i.ENTER\|\|).{0,100}(\(0,\i\.\i\)\(\i\)).{0,100}(?=\|\|\(\i\.preventDefault)/,
-                replace: "!$self.shouldSubmit($1,$2)"
-            }
-        },
-        {
-            find: "!this.hasOpenCodeBlock()",
-            replacement: {
-                match: /!(\i).shiftKey&&!(this.hasOpenCodeBlock\(\))&&\(.{0,100}?\)/,
-                replace: "$self.shouldSubmit($1, $2)"
-            }
-        }
-    ],
-    shouldSubmit(event: KeyboardEvent, codeblock: boolean): boolean {
-        let result = false;
-        switch (this.settings.store.submitRule) {
-            case "shift+enter":
-                result = event.shiftKey;
-                break;
-            case "ctrl+enter":
-                result = IS_MAC ? event.metaKey : event.ctrlKey;
-                break;
-            case "enter":
-                result = !event.shiftKey && !event.ctrlKey;
-                break;
-        }
-        if (!this.settings.store.sendMessageInTheMiddleOfACodeBlock) {
-            result &&= !codeblock;
-        }
-        return result;
-    }
-});
diff --git a/src/plugins/customCommands/index.ts b/src/plugins/customCommands/index.ts
index b89e4d958..bc77ab6f6 100644
--- a/src/plugins/customCommands/index.ts
+++ b/src/plugins/customCommands/index.ts
@@ -90,8 +90,10 @@ migratePluginSettings("CustomCommands", "MessageTags");
 export default definePlugin({
     name: "CustomCommands",
     description: "Allows you to create custom slash commands / tags",
-    tags: ["MessageTags"],
+    dependencies: ["CommandsAPI"],
+    searchTerms: ["MessageTags"],
     authors: [Devs.Ven, Devs.Luna,],
+    tags: ["Commands", "Customisation", "Utility"],
     settings,
 
     async start() {
diff --git a/src/plugins/customIdle/index.ts b/src/plugins/customIdle/index.ts
index 60ebf6ba7..3f3dca72f 100644
--- a/src/plugins/customIdle/index.ts
+++ b/src/plugins/customIdle/index.ts
@@ -29,6 +29,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "CustomIdle",
     description: "Allows you to set the time before Discord goes idle (or disable auto-idle)",
+    tags: ["Activity", "Customisation"],
     authors: [Devs.newwares],
     settings,
     patches: [
diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index 44f18f6c1..887e2c912 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -138,8 +138,14 @@ async function createActivity(): Promise<Activity | undefined> {
         case TimestampMode.CUSTOM:
             if (startTime || endTime) {
                 activity.timestamps = {};
-                if (startTime) activity.timestamps.start = startTime;
-                if (endTime) activity.timestamps.end = endTime;
+                if (startTime && endTime && endTime > startTime) {
+                    const anchor = getLoopAnchor();
+                    activity.timestamps.start = anchor;
+                    activity.timestamps.end = anchor + (endTime - startTime);
+                } else {
+                    if (startTime) activity.timestamps.start = startTime;
+                    if (endTime) activity.timestamps.end = endTime;
+                }
             }
             break;
         case TimestampMode.NONE:
@@ -212,17 +218,57 @@ export async function setRpc(disable?: boolean) {
     });
 }
 
+let loopInterval: ReturnType<typeof setInterval> | undefined;
+let loopAnchor = 0;
+
+function getLoopAnchor() {
+    return loopAnchor;
+}
+
+function startTimestampLoop() {
+    const { timestampMode, startTime, endTime } = settings.store;
+    if (timestampMode !== TimestampMode.CUSTOM || !startTime || !endTime) return;
+    const duration = endTime - startTime;
+    if (duration <= 0) return;
+
+    stopTimestampLoop();
+    loopAnchor = Date.now();
+
+    loopInterval = setInterval(() => {
+
+        if (Date.now() >= loopAnchor + duration) {
+            loopAnchor = Date.now();
+            setRpc();
+        }
+    }, 1000);
+}
+
+function stopTimestampLoop() {
+    if (loopInterval !== undefined) {
+        clearInterval(loopInterval);
+        loopInterval = undefined;
+    }
+    loopAnchor = 0;
+}
+
 export default definePlugin({
     name: "CustomRPC",
     description: "Add a fully customisable Rich Presence (Game status) to your Discord profile",
+    tags: ["Activity", "Customisation"],
     authors: [Devs.captain, Devs.AutumnVN, Devs.nin0dev],
     dependencies: ["UserSettingsAPI"],
     // This plugin's patch is not important for functionality, so don't require a restart
     requiresRestart: false,
     settings,
 
-    start: setRpc,
-    stop: () => setRpc(true),
+    start() {
+        startTimestampLoop();
+        setRpc();
+    },
+    stop() {
+        setRpc(true);
+        stopTimestampLoop();
+    },
 
     // Discord hides buttons on your own Rich Presence for some reason. This patch disables that behaviour
     patches: [
diff --git a/src/plugins/dearrow/index.tsx b/src/plugins/dearrow/index.tsx
index 1247472d4..b9a367f8a 100644
--- a/src/plugins/dearrow/index.tsx
+++ b/src/plugins/dearrow/index.tsx
@@ -170,6 +170,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "Dearrow",
     description: "Makes YouTube embed titles and thumbnails less sensationalist, powered by Dearrow",
+    tags: ["Media", "Utility"],
     authors: [Devs.Ven],
     settings,
 
diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index f9a3cf452..0d46e8bbe 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -16,7 +16,7 @@ import { useAuthorizationStore } from "./lib/stores/AuthorizationStore";
 import { useCurrentUserDecorationsStore } from "./lib/stores/CurrentUserDecorationsStore";
 import { useUserDecorAvatarDecoration, useUsersDecorationsStore } from "./lib/stores/UsersDecorationsStore";
 import { settings } from "./settings";
-import { setDecorationGridDecoration, setDecorationGridItem } from "./ui/components";
+import { setAvatarDecorationModalPreview, setDecorationGridDecoration, setDecorationGridItem } from "./ui/components";
 import DecorSection from "./ui/components/DecorSection";
 
 export interface AvatarDecoration {
@@ -27,6 +27,7 @@ export interface AvatarDecoration {
 export default definePlugin({
     name: "Decor",
     description: "Create and use your own custom avatar decorations, or pick your favorite from the presets.",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.FieryFlames],
     patches: [
         // Patch MediaResolver to return correct URL for Decor avatar decorations
@@ -59,7 +60,7 @@ export default definePlugin({
                 },
                 // Remove NEW label from decor avatar decorations
                 {
-                    match: /(?<=\.\i\.PURCHASE)(?=,)(?<=avatarDecoration:(\i).+?)/,
+                    match: /(?<=\i\.PURCHASE)(?=,)(?<=avatarDecoration:(\i).+?)/,
                     replace: "||$1.skuId===$self.SKU_ID"
                 }
             ]
@@ -110,10 +111,12 @@ export default definePlugin({
         // Patch avatar decoration preview to display Decor avatar decorations as if they are purchased
         {
             find: "#{intl::PREMIUM_UPSELL_PROFILE_AVATAR_DECO_INLINE_UPSELL_DESCRIPTION}",
-            replacement: {
-                match: /(#{intl::PREMIUM_UPSELL_PROFILE_AVATAR_DECO_INLINE_UPSELL_DESCRIPTION}.+?return null!=(\i)&&\()(null==\i)/,
-                replace: (_, rest, avatarDecoration, hasPurchase) => `${rest}(${avatarDecoration}.skuId!==$self.SKU_ID&&${avatarDecoration}.skuId!==$self.RAW_SKU_ID&&${hasPurchase})`
-            }
+            replacement: [
+                {
+                    match: /(?<==)\i=>{let{user:\i,guildId:\i,avatarDecoration:/,
+                    replace: "$self.AvatarDecorationModalPreview=$&"
+                }
+            ]
         }
     ],
     settings,
@@ -137,6 +140,10 @@ export default definePlugin({
         setDecorationGridDecoration(e);
     },
 
+    set AvatarDecorationModalPreview(e: any) {
+        setAvatarDecorationModalPreview(e);
+    },
+
     SKU_ID,
     RAW_SKU_ID,
 
diff --git a/src/plugins/decor/ui/components/index.ts b/src/plugins/decor/ui/components/index.ts
index 713f8058b..fa81da177 100644
--- a/src/plugins/decor/ui/components/index.ts
+++ b/src/plugins/decor/ui/components/index.ts
@@ -5,7 +5,6 @@
  */
 
 import { AvatarDecoration } from "@plugins/decor";
-import { findComponentByCodeLazy } from "@webpack";
 import type { ComponentType, HTMLProps, PropsWithChildren } from "react";
 
 type DecorationGridItemComponent = ComponentType<PropsWithChildren<HTMLProps<HTMLDivElement>> & {
@@ -16,7 +15,8 @@ type DecorationGridItemComponent = ComponentType<PropsWithChildren<HTMLProps<HTM
 export let DecorationGridItem: DecorationGridItemComponent;
 export const setDecorationGridItem = v => DecorationGridItem = v;
 
-export const AvatarDecorationModalPreview = findComponentByCodeLazy("#{intl::PREMIUM_UPSELL_PROFILE_AVATAR_DECO_INLINE_UPSELL_DESCRIPTION}");
+export let AvatarDecorationModalPreview: ComponentType<any> = () => null;
+export const setAvatarDecorationModalPreview = v => AvatarDecorationModalPreview = v;
 
 type DecorationGridDecorationComponent = React.ComponentType<HTMLProps<HTMLDivElement> & {
     avatarDecoration: AvatarDecoration;
diff --git a/src/plugins/devCompanion.dev/index.tsx b/src/plugins/devCompanion.dev/index.tsx
index 43449840c..da7b42ebd 100644
--- a/src/plugins/devCompanion.dev/index.tsx
+++ b/src/plugins/devCompanion.dev/index.tsx
@@ -48,6 +48,7 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "DevCompanion",
     description: "Dev Companion Plugin. Please report anything not working or being weird (most likely its a bug) to sadan, either ping or dm, thanks!",
+    tags: ["Developers", "Utility"],
     authors: [Devs.Ven, Devs.sadan],
     reporterTestable: ReporterTestable.None,
     isModified: true,
diff --git a/src/plugins/devCompanion.dev/initWs.tsx b/src/plugins/devCompanion.dev/initWs.tsx
index 89bee1d38..49e931808 100644
--- a/src/plugins/devCompanion.dev/initWs.tsx
+++ b/src/plugins/devCompanion.dev/initWs.tsx
@@ -5,14 +5,14 @@
  */
 
 import { popNotice, showNotice } from "@api/Notices";
+import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
+import { loadLazyChunks } from "@debug/loadLazyChunks";
+import { reporterData } from "@debug/reporterData";
 import { getIntlMessageFromHash } from "@utils/discord";
 import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
 import { filters, findAll, search, wreq } from "@webpack";
 import { React, Toasts, useState } from "@webpack/common";
-import { loadLazyChunks } from "debug/loadLazyChunks";
-import { reporterData } from "debug/reporterData";
-import { Settings } from "Vencord";
 
 import { CLIENT_VERSION, logger, PORT, settings } from ".";
 import { Recieve } from "./types";
diff --git a/src/plugins/devCompanion.dev/types/send.ts b/src/plugins/devCompanion.dev/types/send.ts
index 86260a4e3..e9439e631 100644
--- a/src/plugins/devCompanion.dev/types/send.ts
+++ b/src/plugins/devCompanion.dev/types/send.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { ReporterData } from "debug/reporterData";
+import { ReporterData } from "@debug/reporterData";
 
 export type OutgoingMessage = Base<DiffModule | ExtractModule | ModuleList | RawId | I18nValue | VersionResponse>;
 export type FullOutgoingMessage = OutgoingMessage & Nonce;
diff --git a/src/plugins/devCompanion.dev/util.tsx b/src/plugins/devCompanion.dev/util.tsx
index 4fda47040..7611b8081 100644
--- a/src/plugins/devCompanion.dev/util.tsx
+++ b/src/plugins/devCompanion.dev/util.tsx
@@ -10,8 +10,8 @@ import { Settings } from "@api/Settings";
 import { canonicalizeMatch } from "@utils/patches";
 import { CodeFilter, stringMatches, wreq } from "@webpack";
 import { Toasts } from "@webpack/common";
-import { WebpackPatcher } from "Vencord";
 
+import { WebpackPatcher } from "../../Vencord";
 import { logger, settings as companionSettings } from ".";
 import { FindNode } from "./types/recieve";
 
diff --git a/src/plugins/disableCallIdle/index.ts b/src/plugins/disableCallIdle/index.ts
index 216f1218c..523580e76 100644
--- a/src/plugins/disableCallIdle/index.ts
+++ b/src/plugins/disableCallIdle/index.ts
@@ -22,6 +22,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "DisableCallIdle",
     description: "Disables automatically getting kicked from a DM voice call after 3 minutes and being moved to an AFK voice channel.",
+    tags: ["Voice", "Utility"],
     authors: [Devs.Nuckyz],
     patches: [
         {
diff --git a/src/plugins/dontRoundMyTimestamps/index.ts b/src/plugins/dontRoundMyTimestamps/index.ts
index 4c432c73f..7d8cb9b14 100644
--- a/src/plugins/dontRoundMyTimestamps/index.ts
+++ b/src/plugins/dontRoundMyTimestamps/index.ts
@@ -24,6 +24,7 @@ export default definePlugin({
     name: "DontRoundMyTimestamps",
     authors: [Devs.Lexi],
     description: "Always rounds relative timestamps down, so 7.6y becomes 7y instead of 8y",
+    tags: ["Appearance", "Utility"],
 
     start() {
         moment.relativeTimeRounding(Math.floor);
diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index 3e39182be..ed6e67cee 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -14,14 +14,12 @@ import { Paragraph } from "@components/Paragraph";
 import { Devs, IS_MAC } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findLazy } from "@webpack";
-import { React } from "@webpack/common";
+import { findByPropsLazy } from "@webpack";
+import { ExperimentStore, React } from "@webpack/common";
 
 import hideBugReport from "./hideBugReport.css?managed";
 
 const KbdStyles = findByPropsLazy("key", "combo");
-const BugReporterExperiment = findLazy(m => m?.definition?.name === "2026-01-bug-reporter");
-
 const modKey = IS_MAC ? "cmd" : "ctrl";
 const altKey = IS_MAC ? "opt" : "alt";
 
@@ -37,6 +35,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "Experiments",
     description: "Enable Access to Experiments & other dev-only features in Discord!",
+    tags: ["Developers", "Utility"],
     authors: [
         Devs.Megu,
         Devs.Ven,
@@ -70,8 +69,10 @@ export default definePlugin({
                     match: /(?<=children:\[)(?=null!=.{0,150}"Installation ID:)/,
                     replace: "$self.WarningCard(),"
                 },
+                // for some reason the installation id and copy buttons are on
+                // different lines so it looks stupid when the card above is added
                 {
-                    match: /(?<=marginBottom:16)(?=\},)/,
+                    match: /(?<=,marginBottom:16)(?=\},children:\[)/,
                     replace: ',flexDirection:"row",alignItems:"center"'
                 }
             ]
@@ -122,7 +123,7 @@ export default definePlugin({
         {
             find: "{PlaygroundEmbed:()=>",
             replacement: {
-                match: /PotionIcon.{0,250}getCurrentUser\(\);return/,
+                match: /"Revenue".{0,250}getCurrentUser\(\);return/,
                 replace: "$& true||"
             }
         },
@@ -143,9 +144,8 @@ export default definePlugin({
                     replace: "{return($1)||($self.matchExperiment(arguments[0].url,$2.label))}"
                 }
             ]
-        }
+        },
     ],
-
     matchExperiment(url: string, label: string): boolean {
         const items = url.split("/");
         const labelCleaned = label.replace(/[^a-zA-Z0-9]+/g, "").toLowerCase();
@@ -153,7 +153,7 @@ export default definePlugin({
         return !!labelCleaned && urlEndCleaned !== undefined && labelCleaned === urlEndCleaned;
     },
 
-    start: () => !BugReporterExperiment.getConfig().hasBugReporterAccess && enableStyle(hideBugReport),
+    start: () => ExperimentStore.getUserExperimentBucket("2026-01-bug-reporter") > 0 && enableStyle(hideBugReport),
     stop: () => disableStyle(hideBugReport),
 
     settingsAboutComponent: () => {
diff --git a/src/plugins/expressionCloner/index.tsx b/src/plugins/expressionCloner/index.tsx
index 3a79a05ef..3e80f75b0 100644
--- a/src/plugins/expressionCloner/index.tsx
+++ b/src/plugins/expressionCloner/index.tsx
@@ -232,7 +232,7 @@ function CloneModal({ data }: { data: Sticker | Emoji; }) {
         <>
             <Heading className={Margins.top20}>Custom Name</Heading>
             <CheckedTextInput
-                value={name}
+                initialValue={name}
                 onChange={v => {
                     data.name = v;
                     setName(v);
@@ -411,7 +411,8 @@ migratePluginSettings("ExpressionCloner", "EmoteCloner");
 export default definePlugin({
     name: "ExpressionCloner",
     description: "Allows you to clone Emotes & Stickers to your own server (right click them)",
-    tags: ["StickerCloner", "EmoteCloner", "EmojiCloner"],
+    tags: ["Emotes", "Servers"],
+    searchTerms: ["StickerCloner", "EmoteCloner", "EmojiCloner"],
     authors: [Devs.Ven, Devs.Nuckyz],
     contextMenus: {
         "message": messageContextMenuPatch,
diff --git a/src/plugins/f8break/index.ts b/src/plugins/f8break/index.ts
index 89dd2c92f..5b1b118ce 100644
--- a/src/plugins/f8break/index.ts
+++ b/src/plugins/f8break/index.ts
@@ -22,6 +22,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "F8Break",
     description: "Pause the client when you press F8 with DevTools (+ breakpoints) open.",
+    tags: ["Developers", "Shortcuts"],
     authors: [Devs.lewisakura],
 
     start() {
diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 10559321d..e8d262754 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -23,7 +23,7 @@ import { ApngBlendOp, ApngDisposeOp, parseAPNG } from "@utils/apng";
 import { Devs } from "@utils/constants";
 import { getCurrentGuild } from "@utils/discord";
 import { Logger } from "@utils/Logger";
-import definePlugin, { OptionType, Patch } from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import type { Emoji, Message, Sticker } from "@vencord/discord-types";
 import { StickerFormatType } from "@vencord/discord-types/enums";
 import { findByCodeLazy, findByPropsLazy, proxyLazyWebpack } from "@webpack";
@@ -157,36 +157,44 @@ const hasExternalStickerPerms = (channelId: string) => hasPermission(channelId,
 const hasEmbedPerms = (channelId: string) => hasPermission(channelId, PermissionsBits.EMBED_LINKS);
 const hasAttachmentPerms = (channelId: string) => hasPermission(channelId, PermissionsBits.ATTACH_FILES);
 
-function makeBypassPatches(): Omit<Patch, "plugin"> {
-    const mapping: Array<{ func: string, predicate?: () => boolean; }> = [
-        { func: "canUseCustomStickersEverywhere", predicate: () => settings.store.enableStickerBypass },
-        { func: "canUseHighVideoUploadQuality", predicate: () => settings.store.enableStreamQualityBypass },
-        { func: "canStreamQuality", predicate: () => settings.store.enableStreamQualityBypass },
-        { func: "canUseClientThemes" },
-        { func: "canUsePremiumAppIcons" }
-    ];
-
-    return {
-        find: "canUseCustomStickersEverywhere:",
-        replacement: mapping.map(({ func, predicate }) => ({
-            match: new RegExp(String.raw`(?<=${func}:)\i`),
-            replace: "() => true",
-            predicate
-        }))
-    };
-}
-
 export default definePlugin({
     name: "FakeNitro",
     authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.fawn, Devs.captain, Devs.Nuckyz, Devs.AutumnVN, Devs.sadan],
     description: "Allows you to send fake emojis/stickers, use nitro themes, and stream in nitro quality",
+    tags: ["Emotes", "Appearance", "Customisation", "Chat"],
     dependencies: ["MessageEventsAPI"],
 
     settings,
 
     patches: [
-        // General bypass patches
-        makeBypassPatches(),
+        {
+            find: "canUseCustomStickersEverywhere:",
+            replacement: [
+                {
+                    match: /(?<=canUseCustomStickersEverywhere:function\(\i\)\{)/,
+                    replace: "return true;",
+                    predicate: () => settings.store.enableStickerBypass
+                },
+                {
+                    match: /(?<=canUseHighVideoUploadQuality:function\(\i\)\{)/,
+                    replace: "return true;",
+                    predicate: () => settings.store.enableStreamQualityBypass
+                },
+                {
+                    match: /(?<=canStreamQuality:function\(\i,\i\)\{)/,
+                    replace: "return true;",
+                    predicate: () => settings.store.enableStreamQualityBypass
+                },
+                {
+                    match: /(?<=canUseClientThemes:function\(\i\)\{)/,
+                    replace: "return true;"
+                },
+                {
+                    match: /(?<=canUsePremiumAppIcons:function\(\i\)\{)/,
+                    replace: "return true;"
+                }
+            ],
+        },
         // Patch the emoji picker in voice calls to not be bypassed by fake nitro
         {
             find: '.getByName("fork_and_knife")',
@@ -259,8 +267,8 @@ export default definePlugin({
             replacement: [
                 {
                     // Overwrite incoming connection settings proto with our local settings
-                    match: /function (\i)\((\i)\){(?=.*CONNECTION_OPEN:\1)/,
-                    replace: (m, funcName, props) => `${m}$self.handleProtoChange(${props}.userSettingsProto,${props}.user);`
+                    match: /(?<=CONNECTION_OPEN:function\((\i)\){)/,
+                    replace: (_, props) => `$self.handleProtoChange(${props}.userSettingsProto,${props}.user);`
                 },
                 {
                     // Overwrite non local proto changes with our local settings
@@ -357,7 +365,7 @@ export default definePlugin({
             predicate: () => settings.store.transformEmojis,
             replacement: {
                 // Add the fake nitro emoji notice
-                match: /(?<=emojiDescription:)(\i)(?<=\1=\i\((\i)\).+?)/,
+                match: /(?<=emojiDescription:)(\i)(?<=\1=\(\i=>\{.+?\}\)\((\i)\)[,;].+?)/,
                 replace: (_, reactNode, props) => `$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},!!${props}?.fakeNitroNode?.fake)`
             }
         },
diff --git a/src/plugins/fakeProfileThemes/index.tsx b/src/plugins/fakeProfileThemes/index.tsx
index 589862c4d..ec550f850 100644
--- a/src/plugins/fakeProfileThemes/index.tsx
+++ b/src/plugins/fakeProfileThemes/index.tsx
@@ -200,6 +200,7 @@ function SettingsAboutComponent() {
 export default definePlugin({
     name: "FakeProfileThemes",
     description: "Allows profile theming by hiding the colors in your bio thanks to invisible 3y3 encoding",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.Alyxia, Devs.Remty],
     patches: [
         {
diff --git a/src/plugins/favEmojiFirst/index.tsx b/src/plugins/favEmojiFirst/index.tsx
index f369023c5..e2a7b6251 100644
--- a/src/plugins/favEmojiFirst/index.tsx
+++ b/src/plugins/favEmojiFirst/index.tsx
@@ -11,6 +11,7 @@ import { DataStore } from "@api/index";
 import { definePluginSettings } from "@api/Settings";
 import { BaseText } from "@components/BaseText";
 import { Button } from "@components/Button";
+import { PencilIcon } from "@components/Icons";
 import { Paragraph } from "@components/Paragraph";
 import { Devs, EquicordDevs } from "@utils/constants";
 import { classNameFactory } from "@utils/css";
@@ -18,7 +19,7 @@ import { Logger } from "@utils/Logger";
 import { openModal } from "@utils/modal";
 import definePlugin, { OptionType } from "@utils/types";
 import { Emoji, Message } from "@vencord/discord-types";
-import { findByPropsLazy, findExportedComponentLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { EmojiStore, Menu, TextInput, Toasts, useEffect, useState } from "@webpack/common";
 
 import { ClearAliasesConfirmModal } from "./components/modals/ClearAliasesConfirmModal";
@@ -99,7 +100,6 @@ interface MessageContextMenuArgs {
 const DATA_KEY = "emoji-aliases";
 const logger = new Logger("EmojiAlias");
 const EmojiQueryService = findByPropsLazy("queryEmojiResults");
-const PencilIcon = findExportedComponentLazy("PencilIcon");
 const cl = classNameFactory("vc-emoji-alias-");
 
 let aliasMap: AliasMap = {};
@@ -1101,8 +1101,9 @@ const messageSendListener = (_channelId: string, messageObj: { content: string;
 export default definePlugin({
     name: "FavoriteEmojiFirst",
     authors: [Devs.Aria, Devs.Ven, EquicordDevs.justjxke],
-    tags: ["EmojiAlias"],
+    tags: ["Emotes", "Customisation"],
     description: "Puts your favorite emoji first in the emoji autocomplete and also has emoji alias.",
+    dependencies: ["MessagePopoverAPI"],
     settings,
     contextMenus: {
         "expression-picker": expressionPickerPatch,
@@ -1142,7 +1143,7 @@ export default definePlugin({
                     replace: "$1Infinity"
                 },
                 {
-                    match: /(\i)\.slice\(0,(Math\.max\(\i,\i(?:-\i\.length){2}\))\)/,
+                    match: /(\i)\.slice\(0,(Math\.max\(\d+?,\i(?:-\i\.length){2}\))\)/,
                     replace: "($1.sliceTo = $2, $1)"
                 }
             ]
diff --git a/src/plugins/favGifSearch/index.tsx b/src/plugins/favGifSearch/index.tsx
index 8c720f1fb..7320808db 100644
--- a/src/plugins/favGifSearch/index.tsx
+++ b/src/plugins/favGifSearch/index.tsx
@@ -84,6 +84,7 @@ export default definePlugin({
     name: "FavoriteGifSearch",
     authors: [Devs.Aria],
     description: "Adds a search bar to favorite gifs.",
+    tags: ["Media", "Customisation"],
 
     patches: [
         {
@@ -92,8 +93,8 @@ export default definePlugin({
                 {
                     // https://regex101.com/r/07gpzP/1
                     // ($1 renderHeaderContent=function { ... switch (x) ... case FAVORITES:return) ($2) ($3 case default: ... return r.jsx(($<searchComp>), {...props}))
-                    match: /(renderHeaderContent\(\).{1,150}FAVORITES:return)(.{1,150});(case.{1,200}default:.{0,50}?return\(0,\i\.jsx\)\((?<searchComp>\i\..{1,10}),)/,
-                    replace: "$1 this.state.resultType === 'Favorites' ? $self.renderSearchBar(this, $<searchComp>) : $2;$3"
+                    match: /(renderHeaderContent\(\).{1,150}FAVORITES:return)(.{1,150});(case.{1,200}default:.{0,50}?return\(0,\i\.jsx\)\((?<searchComp>\i\.\i),)/,
+                    replace: "$1 this?.state?.resultType === 'Favorites' ? $self.renderSearchBar(this, $<searchComp>) : $2;$3"
                 },
                 {
                     // to persist filtered favorites when component re-renders.
diff --git a/src/plugins/fixCodeblockGap/index.ts b/src/plugins/fixCodeblockGap/index.ts
index d65d83dc7..e9a7cca28 100644
--- a/src/plugins/fixCodeblockGap/index.ts
+++ b/src/plugins/fixCodeblockGap/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "FixCodeblockGap",
     description: "Removes the gap between codeblocks and text below it",
+    tags: ["Appearance"],
     authors: [Devs.Grzesiek11],
     patches: [
         {
diff --git a/src/plugins/fixImagesQuality/index.tsx b/src/plugins/fixImagesQuality/index.tsx
index 5215b68e9..51abb660a 100644
--- a/src/plugins/fixImagesQuality/index.tsx
+++ b/src/plugins/fixImagesQuality/index.tsx
@@ -24,6 +24,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "FixImagesQuality",
     description: "Improves quality of images by loading them at their original resolution",
+    tags: ["Media", "Appearance"],
     authors: [Devs.Nuckyz, Devs.Ven],
     settings,
 
@@ -32,7 +33,7 @@ export default definePlugin({
             find: ".handleImageLoad)",
             replacement: {
                 match: /getSrc\(\i\)\{/,
-                replace: "$&var _vcSrc=$self.getSrc(this.props,arguments[1]);if(_vcSrc)return _vcSrc;"
+                replace: "$&var _vcSrc=$self.getSrc(this?.props,arguments[1]);if(_vcSrc)return _vcSrc;"
             }
         }
     ],
diff --git a/src/plugins/fixSpotifyEmbeds.desktop/index.tsx b/src/plugins/fixSpotifyEmbeds.desktop/index.tsx
index c5b42742a..4ca6f5fe3 100644
--- a/src/plugins/fixSpotifyEmbeds.desktop/index.tsx
+++ b/src/plugins/fixSpotifyEmbeds.desktop/index.tsx
@@ -23,5 +23,6 @@ export default definePlugin({
     name: "FixSpotifyEmbeds",
     description: "Fixes spotify embeds being incredibly loud by letting you customise the volume",
     authors: [Devs.Ven],
+    tags: ["Media", "Customisation"],
     settings,
 });
diff --git a/src/plugins/fixYoutubeEmbeds.desktop/index.tsx b/src/plugins/fixYoutubeEmbeds.desktop/index.tsx
index 6ea46fd7f..d76bd666e 100644
--- a/src/plugins/fixYoutubeEmbeds.desktop/index.tsx
+++ b/src/plugins/fixYoutubeEmbeds.desktop/index.tsx
@@ -27,6 +27,7 @@ migratePluginSettings("FixYoutubeEmbeds", "YoutubeDescription");
 export default definePlugin({
     name: "FixYoutubeEmbeds",
     description: "Bypasses youtube videos being blocked from display on Discord (for example by UMG)",
+    tags: ["Media", "Utility"],
     authors: [Devs.coolelectronics, Devs.arHSM],
     settings,
     patches: [
diff --git a/src/plugins/fixYoutubeEmbeds.desktop/native.ts b/src/plugins/fixYoutubeEmbeds.desktop/native.ts
index f865a6566..950940b06 100644
--- a/src/plugins/fixYoutubeEmbeds.desktop/native.ts
+++ b/src/plugins/fixYoutubeEmbeds.desktop/native.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { RendererSettings } from "@main/settings";
 import { app } from "electron";
-import { RendererSettings } from "main/settings";
 
 app.on("browser-window-created", (_, win) => {
     win.webContents.on("frame-created", (_, { frame }) => {
diff --git a/src/plugins/forceOwnerCrown/index.ts b/src/plugins/forceOwnerCrown/index.ts
index f7e4b4701..17997568a 100644
--- a/src/plugins/forceOwnerCrown/index.ts
+++ b/src/plugins/forceOwnerCrown/index.ts
@@ -25,6 +25,7 @@ export default definePlugin({
     name: "ForceOwnerCrown",
     description: "Force the owner crown next to usernames even if the server is large.",
     authors: [Devs.D3SOX, Devs.Nickyux],
+    tags: ["Roles", "Appearance", "Servers"],
     patches: [
         {
             find: "#{intl::GUILD_OWNER}),children:",
diff --git a/src/plugins/friendInvites/index.ts b/src/plugins/friendInvites/index.ts
index 0af611bc9..7cd486a7a 100644
--- a/src/plugins/friendInvites/index.ts
+++ b/src/plugins/friendInvites/index.ts
@@ -26,6 +26,8 @@ const FriendInvites = findByPropsLazy("createFriendInvite");
 export default definePlugin({
     name: "FriendInvites",
     description: "Create and manage friend invite links via slash commands (/create friend invite, /view friend invites, /revoke friend invites).",
+    dependencies: ["CommandsAPI"],
+    tags: ["Friends", "Commands"],
     authors: [Devs.afn, Devs.Dziurwa],
     commands: [
         {
diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index 006ea2fce..bc7a2ebed 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -20,84 +20,61 @@ const getCreatedAtDate = findByCodeLazy('month:"short",day:"numeric"');
 const locale = findByPropsLazy("getLocale");
 const Section = findComponentByCodeLazy("headingVariant:", '"section"', "headingIcon:");
 
-export default definePlugin({
-    name: "FriendsSince",
-    description: "Shows when you became friends with someone in the user popout",
-    authors: [Devs.Elvyra, Devs.Antti],
-    patches: [
-        // DM User Sidebar
-        {
-            find: ".SIDEBAR}),nicknameIcons",
-            replacement: {
-                match: /#{intl::USER_PROFILE_MEMBER_SINCE}\),.{0,100}userId:(\i\.id)}\)}\)/,
-                replace: "$&,$self.FriendsSinceComponent({userId:$1,isSidebar:true})"
-            }
-        },
-        // User Profile Modal
-        {
-            find: ",applicationRoleConnection:",
-            replacement: {
-                match: /#{intl::USER_PROFILE_MEMBER_SINCE}\),.{0,100}userId:(\i\.id),.{0,100}}\)}\),/,
-                replace: "$&,$self.FriendsSinceComponent({userId:$1,isSidebar:false}),"
-            }
-        },
-        // User Profile Modal v2
-        {
-            find: ".MODAL_V2,onClose:",
-            replacement: {
-                match: /#{intl::USER_PROFILE_MEMBER_SINCE}\),.{0,100}userId:(\i\.id),.{0,100}}\)}\),/,
-                replace: "$&,$self.FriendsSinceComponent({userId:$1,isSidebar:false}),"
-            }
-        }
-    ],
+const FriendsSinceSection = ErrorBoundary.wrap(({ userId, isSideBar }: { userId: string; isSideBar: boolean; }) => {
+    if (!RelationshipStore.isFriend(userId)) return null;
 
-    FriendsSinceComponent: ErrorBoundary.wrap(({ userId, isSidebar }: { userId: string; isSidebar: boolean; }) => {
-        if (!RelationshipStore.isFriend(userId)) return null;
-
-        const friendsSince = RelationshipStore.getSince(userId);
-        if (!friendsSince) return null;
-
-        if (isSidebar) {
-            return (
-                <Section
-                    heading="Friends Since"
-                    headingVariant="text-xs/semibold"
-                    headingColor="text-strong"
-                >
-                    <BaseText size="sm">
-                        {getCreatedAtDate(friendsSince, locale.getLocale())}
-                    </BaseText>
-                </Section>
-            );
-        }
+    const friendsSince = RelationshipStore.getSince(userId);
+    if (!friendsSince) return null;
 
+    if (isSideBar) {
         return (
             <Section
                 heading="Friends Since"
-                headingVariant="text-xs/medium"
-                headingColor="text-default"
-                className="vc-friendsSince-profile-section"
+                headingVariant="text-xs/semibold"
+                headingColor="text-strong"
             >
-                <div className={WrapperClasses.memberSinceWrapper}>
-                    <div className={ContainerClasses.memberSince}>
-                        {!!getCurrentChannel()?.guild_id && (
-                            <svg
-                                aria-hidden="true"
-                                width="16"
-                                height="16"
-                                viewBox="0 0 24 24"
-                                fill="var(--interactive-icon-default)"
-                            >
-                                <path d="M13 10a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z" />
-                                <path d="M3 5v-.75C3 3.56 3.56 3 4.25 3s1.24.56 1.33 1.25C6.12 8.65 9.46 12 13 12h1a8 8 0 0 1 8 8 2 2 0 0 1-2 2 .21.21 0 0 1-.2-.15 7.65 7.65 0 0 0-1.32-2.3c-.15-.2-.42-.06-.39.17l.25 2c.02.15-.1.28-.25.28H9a2 2 0 0 1-2-2v-2.22c0-1.57-.67-3.05-1.53-4.37A15.85 15.85 0 0 1 3 5Z" />
-                            </svg>
-                        )}
-                        <BaseText size="sm">
-                            {getCreatedAtDate(friendsSince, locale.getLocale())}
-                        </BaseText>
-                    </div>
-                </div>
+                <BaseText size="sm">
+                    {getCreatedAtDate(friendsSince, locale.getLocale())}
+                </BaseText>
             </Section>
         );
-    }, { noop: true }),
+    }
+
+    return (
+        <Section
+            heading="Friends Since"
+            headingVariant="text-xs/medium"
+            headingColor="text-default"
+            className="vc-friendsSince-profile-section"
+        >
+            <div className={WrapperClasses.memberSinceWrapper}>
+                <div className={ContainerClasses.memberSince}>
+                    {!!getCurrentChannel()?.guild_id && (
+                        <svg
+                            aria-hidden="true"
+                            width="16"
+                            height="16"
+                            viewBox="0 0 24 24"
+                            fill="var(--interactive-icon-default)"
+                        >
+                            <path d="M13 10a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z" />
+                            <path d="M3 5v-.75C3 3.56 3.56 3 4.25 3s1.24.56 1.33 1.25C6.12 8.65 9.46 12 13 12h1a8 8 0 0 1 8 8 2 2 0 0 1-2 2 .21.21 0 0 1-.2-.15 7.65 7.65 0 0 0-1.32-2.3c-.15-.2-.42-.06-.39.17l.25 2c.02.15-.1.28-.25.28H9a2 2 0 0 1-2-2v-2.22c0-1.57-.67-3.05-1.53-4.37A15.85 15.85 0 0 1 3 5Z" />
+                        </svg>
+                    )}
+                    <BaseText size="sm">
+                        {getCreatedAtDate(friendsSince, locale.getLocale())}
+                    </BaseText>
+                </div>
+            </div>
+        </Section>
+    );
+}, { noop: true });
+
+export default definePlugin({
+    name: "FriendsSince",
+    description: "Shows when you became friends with someone in the user popout",
+    tags: ["Friends"],
+    authors: [Devs.Elvyra, Devs.Antti],
+    dependencies: ["ProfileSectionsAPI"],
+    renderProfileSection: FriendsSinceSection,
 });
diff --git a/src/plugins/fullSearchContext/index.tsx b/src/plugins/fullSearchContext/index.tsx
index 2f20cd53b..672552d9f 100644
--- a/src/plugins/fullSearchContext/index.tsx
+++ b/src/plugins/fullSearchContext/index.tsx
@@ -81,6 +81,7 @@ migratePluginSettings("FullSearchContext", "SearchReply");
 export default definePlugin({
     name: "FullSearchContext",
     description: "Makes the message context menu in message search results have all options you'd expect",
+    tags: ["Utility"],
     authors: [Devs.Ven, Devs.Aria],
 
     patches: [{
diff --git a/src/plugins/fullUserInChatbox/index.tsx b/src/plugins/fullUserInChatbox/index.tsx
index 9ac4f811d..dfed0036e 100644
--- a/src/plugins/fullUserInChatbox/index.tsx
+++ b/src/plugins/fullUserInChatbox/index.tsx
@@ -23,6 +23,7 @@ interface UserMentionComponentProps {
 export default definePlugin({
     name: "FullUserInChatbox",
     description: "Makes the user mention in the chatbox have more functionalities, like left/right clicking",
+    tags: ["Shortcuts", "Utility"],
     authors: [Devs.sadan],
 
     patches: [
diff --git a/src/plugins/gameActivityToggle/index.tsx b/src/plugins/gameActivityToggle/index.tsx
index 40667fb40..c0ad504ae 100644
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -98,8 +98,9 @@ function GameActivityToggleButton({ iconForeground, hideTooltips, nameplate }: U
 export default definePlugin({
     name: "GameActivityToggle",
     description: "Adds a button next to the mic and deafen button to toggle game activity.",
+    tags: ["Activity", "Shortcuts"],
     authors: [Devs.Nuckyz, Devs.RuukuLada],
-    dependencies: ["UserSettingsAPI"],
+    dependencies: ["UserSettingsAPI", "UserAreaAPI"],
     settings,
 
     userAreaButton: {
diff --git a/src/plugins/gifPaste/index.ts b/src/plugins/gifPaste/index.ts
index 65ea464c4..f690fa293 100644
--- a/src/plugins/gifPaste/index.ts
+++ b/src/plugins/gifPaste/index.ts
@@ -26,13 +26,14 @@ import { ExpressionPickerStore } from "@webpack/common";
 export default definePlugin({
     name: "GifPaste",
     description: "Makes picking a gif in the gif picker insert a link into the chatbox instead of instantly sending it",
+    tags: ["Media", "Chat"],
     authors: [Devs.Ven],
 
     patches: [{
         find: "handleSelectGIF=",
         replacement: {
             match: /handleSelectGIF=(\i)=>\{/,
-            replace: "$&if (!this.props.className) return $self.handleSelect($1);"
+            replace: "$&if (!this?.props?.className) return $self.handleSelect($1);"
         }
     }],
 
diff --git a/src/plugins/greetStickerPicker/index.tsx b/src/plugins/greetStickerPicker/index.tsx
index 0604c54d8..fab9124a1 100644
--- a/src/plugins/greetStickerPicker/index.tsx
+++ b/src/plugins/greetStickerPicker/index.tsx
@@ -20,7 +20,6 @@ import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { Channel, Message } from "@vencord/discord-types";
-import { findLazy } from "@webpack";
 import { ContextMenuApi, FluxDispatcher, Menu, MessageActions } from "@webpack/common";
 
 enum GreetMode {
@@ -42,7 +41,7 @@ const settings = definePluginSettings({
     unholyMultiGreetEnabled?: boolean;
 }>();
 
-const WELCOME_STICKERS = findLazy(m => Array.isArray(m) && m[0]?.name === "Wave");
+let WELCOME_STICKERS: any;
 
 function greet(channel: Channel, message: Message, stickers: string[]) {
     const options = MessageActions.getSendMessageOptionsForReply({
@@ -152,6 +151,7 @@ function GreetMenu({ channel, message }: { message: Message, channel: Channel; }
 export default definePlugin({
     name: "GreetStickerPicker",
     description: "Allows you to use any greet sticker instead of only the random one by right-clicking the 'Wave to say hi!' button",
+    tags: ["Emotes", "Customisation"],
     authors: [Devs.Ven],
 
     settings,
@@ -163,9 +163,20 @@ export default definePlugin({
                 match: /className:\i\.\i,(?=.{0,40}?"sticker")(?<={channel:\i,message:\i}=(\i).+?)/,
                 replace: "$&onContextMenu:(vcEvent)=>$self.pickSticker(vcEvent, $1),"
             }
+        },
+        {
+            find: '"Wumpus waves hello"',
+            replacement: {
+                match: /(?<==)(?=\[{id:"749054660769218631",format_type:\d,description:"Wumpus waves hello")/,
+                replace: "$self.WELCOME_STICKERS="
+            }
         }
     ],
 
+    set WELCOME_STICKERS(value: any) {
+        WELCOME_STICKERS = value;
+    },
+
     pickSticker(
         event: React.UIEvent,
         props: {
diff --git a/src/plugins/hideAttachments/index.tsx b/src/plugins/hideAttachments/index.tsx
index 16579d0a7..b47e053ac 100644
--- a/src/plugins/hideAttachments/index.tsx
+++ b/src/plugins/hideAttachments/index.tsx
@@ -56,8 +56,9 @@ async function toggleHide(channelId: string, messageId: string) {
 export default definePlugin({
     name: "HideMedia",
     description: "Hide attachments and embeds for individual messages via hover button",
+    tags: ["Chat", "Appearance"],
     authors: [Devs.Ven],
-    dependencies: ["MessageUpdaterAPI"],
+    dependencies: ["MessageUpdaterAPI", "MessageAccessoriesAPI", "MessagePopoverAPI"],
 
     patches: [{
         find: "this.renderAttachments(",
diff --git a/src/plugins/iLoveSpam/index.ts b/src/plugins/iLoveSpam/index.ts
index 2e574cb46..b1bb5b6bc 100644
--- a/src/plugins/iLoveSpam/index.ts
+++ b/src/plugins/iLoveSpam/index.ts
@@ -24,6 +24,7 @@ migratePluginSettings("IloveSpam", "iLoveSpam");
 export default definePlugin({
     name: "ILoveSpam",
     description: "Do not hide messages from 'likely spammers'",
+    tags: ["Utility", "Chat"],
     authors: [Devs.botato, Devs.Nyako],
     patches: [
         {
diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index 8eb334cbf..bacecef7e 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { definePluginSettings, Settings } from "@api/Settings";
+import { definePluginSettings } from "@api/Settings";
 import { getUserSettingLazy } from "@api/UserSettings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { HeadingSecondary } from "@components/Heading";
 import { Paragraph } from "@components/Paragraph";
+import CustomRpcPlugin from "@plugins/customRPC";
 import { Devs } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import definePlugin, { OptionType } from "@utils/types";
@@ -85,7 +86,7 @@ function ImportCustomRPCComponent() {
             <div>
                 <Button
                     onClick={() => {
-                        const id = Settings.plugins.CustomRPC?.appID as string | undefined;
+                        const id = CustomRpcPlugin.settings.store.appID;
                         if (!id) {
                             return showToast("CustomRPC application ID is not set.", Toasts.Type.FAILURE);
                         }
@@ -232,6 +233,7 @@ export default definePlugin({
     name: "IgnoreActivities",
     authors: [Devs.Nuckyz, Devs.Kylie],
     description: "Ignore activities from showing up on your status ONLY. You can configure which ones are specifically ignored from the Registered Games and Activities tabs, or use the general settings below",
+    tags: ["Activity", "Privacy", "Customisation"],
     dependencies: ["UserSettingsAPI"],
 
     settings,
diff --git a/src/plugins/imageFilename/index.ts b/src/plugins/imageFilename/index.ts
index 77717e5b5..d421fb43a 100644
--- a/src/plugins/imageFilename/index.ts
+++ b/src/plugins/imageFilename/index.ts
@@ -23,6 +23,7 @@ export default definePlugin({
     name: "ImageFilename",
     authors: [Devs.Ven],
     description: "Display the file name of images & GIFs as a tooltip when hovering over them",
+    tags: ["Media", "Utility"],
     settings,
 
     patches: [
diff --git a/src/plugins/imageLink/index.ts b/src/plugins/imageLink/index.ts
index 08d3a0247..0d01cb1d3 100644
--- a/src/plugins/imageLink/index.ts
+++ b/src/plugins/imageLink/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "ImageLink",
     description: "Never hide image links in messages, even if it's the only content",
+    tags: ["Media", "Appearance"],
     authors: [Devs.Kyuuhachi, Devs.Sqaaakoi],
 
     patches: [
diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index bbd9b82a6..42da4796e 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -155,8 +155,9 @@ const imageContextMenuPatch: NavContextMenuPatchCallback = (children, props) =>
 export default definePlugin({
     name: "ImageZoom",
     description: "Lets you zoom in to images and gifs. Use scroll wheel to zoom in and shift + scroll wheel to increase lens radius / size",
+    tags: ["Media", "Utility"],
     authors: [Devs.Aria],
-    tags: ["ImageUtilities"],
+    searchTerms: ["ImageUtilities"],
 
     managedStyle,
 
@@ -169,7 +170,7 @@ export default definePlugin({
                     replace: `id:"${ELEMENT_ID}",$&`
                 },
                 {
-                    match: /(?<=null!=(\i)\?.{0,20})\i\.\i,{children:\1/,
+                    match: /(?<=null!=(\i)\?.{0,20})\i(?:\.\i)?,{children:\1/, // TODO: (?:\.\i)? is stable compat
                     replace: "'div',{onClick:e=>e.stopPropagation(),children:$1"
                 }
             ]
diff --git a/src/plugins/implicitRelationships/index.ts b/src/plugins/implicitRelationships/index.ts
index e5a547dbc..2ec66fc0b 100644
--- a/src/plugins/implicitRelationships/index.ts
+++ b/src/plugins/implicitRelationships/index.ts
@@ -21,12 +21,25 @@ import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { Constants, FluxDispatcher, GuildStore, RelationshipStore, SnowflakeUtils, UserAffinitiesStore, UserStore } from "@webpack/common";
-import { Settings } from "Vencord";
+
+const settings = definePluginSettings(
+    {
+        sortByAffinity: {
+            type: OptionType.BOOLEAN,
+            default: true,
+            description: "Whether to sort implicit relationships by their affinity to you.",
+            restartNeeded: true
+        },
+    }
+);
 
 export default definePlugin({
     name: "ImplicitRelationships",
     description: "Shows your implicit relationships in the Friends tab.",
+    tags: ["Friends", "Servers"],
     authors: [Devs.Dolfies],
+    settings,
+
     patches: [
         // Counts header
         {
@@ -73,7 +86,7 @@ export default definePlugin({
         {
             find: "getRelationshipCounts(){",
             replacement: {
-                predicate: () => Settings.plugins.ImplicitRelationships.sortByAffinity,
+                predicate: () => settings.store.sortByAffinity,
                 match: /\}\)\.sortBy\((.+?)\)\.value\(\)/,
                 replace: "}).sortBy(row => $self.wrapSort(($1), row)).value()"
             }
@@ -83,8 +96,8 @@ export default definePlugin({
         {
             find: ".REQUEST_GUILD_MEMBERS,",
             replacement: {
-                match: /\.send\(\i\.\i\.REQUEST_GUILD_MEMBERS,{/,
-                replace: "$&nonce:arguments[1].nonce,"
+                match: /\.REQUEST_GUILD_MEMBERS,{/,
+                replace: "$&nonce:arguments[1]?.nonce,"
             }
         },
         {
@@ -102,16 +115,6 @@ export default definePlugin({
             },
         }
     ],
-    settings: definePluginSettings(
-        {
-            sortByAffinity: {
-                type: OptionType.BOOLEAN,
-                default: true,
-                description: "Whether to sort implicit relationships by their affinity to you.",
-                restartNeeded: true
-            },
-        }
-    ),
 
     wrapSort(comparator: Function, row: any) {
         return row.type === 5
diff --git a/src/plugins/ircColors/index.ts b/src/plugins/ircColors/index.ts
index bd3b72e8b..cd405ecfd 100644
--- a/src/plugins/ircColors/index.ts
+++ b/src/plugins/ircColors/index.ts
@@ -21,7 +21,7 @@ import { getCustomColorString } from "@equicordplugins/customUserColors";
 import { hash as h64 } from "@intrnl/xxhash64";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { useMemo } from "@webpack/common";
+import { useMemo, UserStore } from "@webpack/common";
 
 // Calculate a CSS color string based on the user ID
 function calculateNameColorForUser(id?: string) {
@@ -60,6 +60,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "IrcColors",
     description: "Makes username colors in chat unique, like in IRC clients",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.Grzesiek11, Devs.jamesbt365],
     settings,
 
@@ -121,9 +122,25 @@ export default definePlugin({
             return colorString;
         }
 
-        return (!settings.store.applyColorOnlyToUsersWithoutColor || !colorString)
+        const dmColor = (!settings.store.applyColorOnlyToUsersWithoutColor || !colorString)
             ? color
             : colorString;
+
+        // guarantee minimum difference in dms
+        if (context?.channel?.isPrivate?.() && dmColor && userId) {
+            const currentUserId = UserStore.getCurrentUser()?.id;
+            if (currentUserId && userId !== currentUserId) {
+                const currentUserColor = Number(h64(currentUserId) % 360n);
+                const otherUserColor = Number(h64(userId) % 360n);
+                const colorDiff = Math.min(Math.abs(currentUserColor - otherUserColor), 360 - Math.abs(currentUserColor - otherUserColor));
+                if (colorDiff < 45) {
+                    const newColor = (otherUserColor + 180) % 360;
+                    return `hsl(${newColor}, 100%, ${settings.store.lightness}%)`;
+                }
+            }
+        }
+
+        return dmColor;
     },
 
     calculateNameColorForListContext(context: any) {
diff --git a/src/plugins/keepCurrentChannel/index.ts b/src/plugins/keepCurrentChannel/index.ts
index 92a389eb4..61c585aaa 100644
--- a/src/plugins/keepCurrentChannel/index.ts
+++ b/src/plugins/keepCurrentChannel/index.ts
@@ -43,6 +43,7 @@ let previousCache: PreviousChannel | undefined;
 export default definePlugin({
     name: "KeepCurrentChannel",
     description: "Attempt to navigate to the channel you were in before switching accounts or loading Discord.",
+    tags: ["Utility", "Organisation"],
     authors: [Devs.Nuckyz],
 
     patches: [
diff --git a/src/plugins/lastfmRichPresence/index.tsx b/src/plugins/lastfmRichPresence/index.tsx
index 98acdc2e3..4382650cf 100644
--- a/src/plugins/lastfmRichPresence/index.tsx
+++ b/src/plugins/lastfmRichPresence/index.tsx
@@ -97,7 +97,7 @@ const settings = definePluginSettings({
         default: false,
     },
     statusName: {
-        description: "Custom status text",
+        description: "Custom status text. You can use the following variables: {artist} | {album} | {title}",
         type: OptionType.STRING,
         default: "some music",
     },
@@ -176,16 +176,17 @@ const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         default: true,
     },
-    alwaysHideArt: {
-        description: "Disable downloading album art",
+    showAlbumCover: {
+        description: "Show album cover. Disabling this will display a placeholder. Useful if your Music has inappropriate art",
         type: OptionType.BOOLEAN,
-        default: false,
-    },
+        default: true,
+    }
 });
 
 export default definePlugin({
     name: "LastFMRichPresence",
     description: "Little plugin for Last.fm rich presence",
+    tags: ["Activity", "Media"],
     authors: [Devs.dzshn, Devs.RuiNtD, Devs.blahajZip, Devs.archeruwu],
 
     settings,
@@ -257,7 +258,7 @@ export default definePlugin({
     },
 
     getLargeImage(track: TrackData): string | undefined {
-        if (!settings.store.alwaysHideArt && track.imageUrl && !track.imageUrl.includes(LASTFM_PLACEHOLDER_IMAGE_HASH))
+        if (settings.store.showAlbumCover && track.imageUrl && !track.imageUrl.includes(LASTFM_PLACEHOLDER_IMAGE_HASH))
             return track.imageUrl;
 
         if (settings.store.missingArt === "placeholder")
@@ -314,9 +315,15 @@ export default definePlugin({
                 case NameFormat.SongOnly:
                     return trackData.name;
                 case NameFormat.AlbumName:
-                    return trackData.album || settings.store.statusName;
+                    return trackData.album || settings.store.statusName
+                        .replaceAll("{artist}", trackData.artist || "")
+                        .replaceAll("{album}", trackData.album || "")
+                        .replaceAll("{title}", trackData.name || "");
                 default:
-                    return settings.store.statusName;
+                    return settings.store.statusName
+                        .replaceAll("{artist}", trackData.artist || "")
+                        .replaceAll("{album}", trackData.album || "")
+                        .replaceAll("{title}", trackData.name || "");
             }
         })();
 
diff --git a/src/plugins/loadingQuotes/index.ts b/src/plugins/loadingQuotes/index.ts
index 8c63fe5a2..fa0dd55fd 100644
--- a/src/plugins/loadingQuotes/index.ts
+++ b/src/plugins/loadingQuotes/index.ts
@@ -57,6 +57,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "LoadingQuotes",
     description: "Replace Discords loading quotes",
+    tags: ["Appearance", "Fun", "Customisation"],
     authors: [Devs.Ven, Devs.KraXen72, Devs.UlyssesZhan],
 
     settings,
diff --git a/src/plugins/memberCount/index.tsx b/src/plugins/memberCount/index.tsx
index 83c4f85ef..7f94cece4 100644
--- a/src/plugins/memberCount/index.tsx
+++ b/src/plugins/memberCount/index.tsx
@@ -62,6 +62,7 @@ export const cl = classNameFactory("vc-membercount-");
 export default definePlugin({
     name: "MemberCount",
     description: "Shows the number of online members, total members, and users in voice channels on the server — in the member list and tooltip.",
+    tags: ["Servers", "Utility"],
     authors: [Devs.Ven, Devs.Commandtechno, Devs.Apexo],
     settings,
 
diff --git a/src/plugins/mentionAvatars/index.tsx b/src/plugins/mentionAvatars/index.tsx
index b87995c8b..2415410bb 100644
--- a/src/plugins/mentionAvatars/index.tsx
+++ b/src/plugins/mentionAvatars/index.tsx
@@ -48,6 +48,7 @@ function DefaultRoleIcon() {
 export default definePlugin({
     name: "MentionAvatars",
     description: "Shows user avatars and role icons inside mentions",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.Ven, Devs.SerStars],
     patches: [{
         // HEY THOR UPDATE SHOW ME YOUR NAME IF THIS SHIT CHANGES TY :)
@@ -66,7 +67,7 @@ export default definePlugin({
     },
     {
         // show avatar in the chat input box
-        find: ".hasUniqueUsername()?null:`#",
+        find: '"text":"locked"',
         replacement: {
             match: /(?<=,(\i)\).{0,55})`@\$\{(\i)\}`/,
             replace: "$self.renderInputMention($2,$1)"
diff --git a/src/plugins/messageClickActions/ReactEmojiSetting.tsx b/src/plugins/messageClickActions/ReactEmojiSetting.tsx
index d3a36053f..536719fd3 100644
--- a/src/plugins/messageClickActions/ReactEmojiSetting.tsx
+++ b/src/plugins/messageClickActions/ReactEmojiSetting.tsx
@@ -8,7 +8,7 @@ import "./styles.css";
 
 import { Heading } from "@components/Heading";
 import { classNameFactory } from "@utils/css";
-import type { IPluginOptionComponentProps } from "@utils/types";
+import type { PluginSettingComponentProps } from "@utils/types";
 import type { Channel } from "@vencord/discord-types";
 import { findComponentByCodeLazy } from "@webpack";
 import { ChannelStore, IconUtils, Popout, SelectedChannelStore, TextInput, useRef, useState, useStateFromStores } from "@webpack/common";
@@ -182,7 +182,7 @@ function EmojiPreview({ value }: { value: string; }) {
     return <span className={cl("unicode-preview")}>{renderedEmoji.name}</span>;
 }
 
-export function ReactEmojiSetting({ setValue }: IPluginOptionComponentProps) {
+export function ReactEmojiSetting({ setValue }: PluginSettingComponentProps) {
     const [emoji, setEmoji] = useState(settings.store.reactEmoji ?? "💀");
 
     return (
@@ -202,7 +202,7 @@ export function ReactEmojiSetting({ setValue }: IPluginOptionComponentProps) {
     );
 }
 
-export function AdditionalReactEmojisSetting({ setValue }: IPluginOptionComponentProps) {
+export function AdditionalReactEmojisSetting({ setValue }: PluginSettingComponentProps) {
     const { addAdditionalReacts } = settings.use(["addAdditionalReacts"]);
     const [emojiList, setEmojiList] = useState(settings.store.additionalReactEmojis ?? "");
 
diff --git a/src/plugins/messageClickActions/index.ts b/src/plugins/messageClickActions/index.ts
index 42fd83fef..b070db16e 100644
--- a/src/plugins/messageClickActions/index.ts
+++ b/src/plugins/messageClickActions/index.ts
@@ -577,6 +577,7 @@ async function executeAction(
 export default definePlugin({
     name: "MessageClickActions",
     description: "Customize click actions on messages.",
+    tags: ["Chat", "Shortcuts"],
     authors: [Devs.Ven, EquicordDevs.keircn, EquicordDevs.ZcraftElite, EquicordDevs.omaw],
     isModified: true,
 
diff --git a/src/plugins/messageLatency/index.tsx b/src/plugins/messageLatency/index.tsx
index 6f66fb036..0aac594de 100644
--- a/src/plugins/messageLatency/index.tsx
+++ b/src/plugins/messageLatency/index.tsx
@@ -29,6 +29,7 @@ const DISCORD_KT_DELAY = 1471228928;
 export default definePlugin({
     name: "MessageLatency",
     description: "Displays an indicator for messages that took ≥n seconds to send",
+    tags: ["Chat", "Utility"],
     authors: [Devs.arHSM],
 
     settings: definePluginSettings({
diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index 08d02cb82..d7dd8c8e4 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -40,7 +40,7 @@ import {
     RestAPI,
     UserStore
 } from "@webpack/common";
-import { JSX } from "react";
+import { ComponentType, JSX } from "react";
 
 const messageCache = new Map<string, {
     message?: Message;
@@ -48,8 +48,8 @@ const messageCache = new Map<string, {
 }>();
 
 const Embed = findComponentLazy(m => m.prototype?.renderSuppressButton);
-const AutoModEmbed = findComponentByCodeLazy("withFooter", "childrenMessageContent:");
 const ChannelMessage = findComponentByCodeLazy("childrenExecutedCommand:", ".hideAccessories");
+let AutoModEmbed: ComponentType<any> = () => null;
 
 const SearchResultClasses = findCssClassesLazy("message", "searchResult");
 const EmbedClasses = findCssClassesLazy("embedAuthorIcon", "embedAuthor", "embedAuthor", "embedMargin");
@@ -364,11 +364,26 @@ function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
 export default definePlugin({
     name: "MessageLinkEmbeds",
     description: "Adds a preview to messages that link another message",
+    tags: ["Chat", "Appearance"],
     authors: [Devs.TheSun, Devs.Ven, Devs.RyanCaoDev],
     dependencies: ["MessageAccessoriesAPI", "MessageUpdaterAPI", "UserSettingsAPI"],
 
     settings,
 
+    patches: [
+        {
+            find: "!1,withFooter:",
+            replacement: {
+                match: /(?=function (\i)\(\i\){let{message:\i,channel:\i,[^}]+?withFooter:)/,
+                replace: "$self.AutoModEmbed=$1;"
+            }
+        }
+    ],
+
+    set AutoModEmbed(value: any) {
+        AutoModEmbed = value;
+    },
+
     start() {
         addMessageAccessory("MessageLinkEmbeds", props => {
             if (!messageLinkRegex.test(props.message.content))
diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 534f988bc..527439258 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -132,7 +132,7 @@ const patchMessageContextMenu: NavContextMenuPatchCallback = (
                         mlDeleted: true,
                     });
                 } else {
-                    message.editHistory = [];
+                    updateMessage(channel_id, id, { editHistory: [] });
                 }
             }}
         />,
@@ -417,6 +417,7 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "MessageLogger",
     description: "Temporarily logs deleted and edited messages.",
+    tags: ["Chat", "Utility"],
     authors: [Devs.rushii, Devs.Ven, Devs.AutumnVN, Devs.Nickyux, Devs.Kyuuhachi, EquicordDevs.justjxke],
     dependencies: ["MessageUpdaterAPI"],
     isModified: true,
@@ -666,40 +667,41 @@ export default definePlugin({
 
     patches: [
         {
-            // MessageStore
             find: '"MessageStore"',
             replacement: [
                 {
                     // Add deleted=true to all target messages in the MESSAGE_DELETE event
-                    match: /function (?=.+?MESSAGE_DELETE:(\i))\1\((\i)\){let.+?((?:\i\.){2})getOrCreate.+?}(?=function)/,
-                    replace:
-                        "function $1($2){" +
-                        "   var cache = $3getOrCreate($2.channelId);" +
-                        "   cache = $self.handleDelete(cache, $2, false);" +
-                        "   $3commit(cache);" +
-                        "}"
+                    match: /(?<=MESSAGE_DELETE:function\((\i)\)\{)(?=let.{0,100}(\i\.\i)\.getOrCreate)/,
+                    replace: `
+                        let cache = $2.getOrCreate($1.channelId);
+                        cache = $self.handleDelete(cache, $1, false);
+                        $2.commit(cache);
+                        return;
+                    `
                 },
                 {
                     // Add deleted=true to all target messages in the MESSAGE_DELETE_BULK event
-                    match: /function (?=.+?MESSAGE_DELETE_BULK:(\i))\1\((\i)\){let.+?((?:\i\.){2})getOrCreate.+?}(?=function)/,
-                    replace:
-                        "function $1($2){" +
-                        "   var cache = $3getOrCreate($2.channelId);" +
-                        "   cache = $self.handleDelete(cache, $2, true);" +
-                        "   $3commit(cache);" +
-                        "}"
+                    match: /(?<=MESSAGE_DELETE_BULK:function\((\i)\){)(?=let.{0,100}(\i\.\i)\.getOrCreate)/,
+                    replace: `
+                        let cache = $2.getOrCreate($1.channelId);
+                        cache = $self.handleDelete(cache, $1, true);
+                        $2.commit(cache);
+                        return;
+                    `
                 },
                 {
                     // Add current cached content + new edit time to cached message's editHistory
-                    match: /(function (\i)\((\i)\).+?)\.update\((\i)(?=.*MESSAGE_UPDATE:\2)/,
-                    replace: "$1" +
-                        ".update($4,m =>" +
-                        "   (($3.message.flags & 64) === 64 || $self.shouldIgnore($3.message, true)) ? m :" +
-                        "   $3.message.edited_timestamp && $3.message.content !== m.content ?" +
-                        "       m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($3.message, m)]) :" +
-                        "       m" +
-                        ")" +
-                        ".update($4"
+                    match: /(MESSAGE_UPDATE:function\((\i)\).+?)\.update\((\i)/,
+                    replace: `
+                        $1
+                        .update($3, m =>
+                            (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message, true)) ? m :
+                            $2.message.edited_timestamp && $2.message.content !== m.content ?
+                                m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($2.message, m)]) :
+                                m
+                        )
+                        .update($3
+                    `
                 },
                 {
                     // fix up key (edit last message) attempting to edit a deleted message
@@ -813,12 +815,12 @@ export default definePlugin({
             find: '"ReferencedMessageStore"',
             replacement: [
                 {
-                    match: /MESSAGE_DELETE:\i,/,
-                    replace: "MESSAGE_DELETE:()=>{},"
+                    match: /(?<=MESSAGE_DELETE:function\(\i\)\{)/,
+                    replace: "return;"
                 },
                 {
-                    match: /MESSAGE_DELETE_BULK:\i,/,
-                    replace: "MESSAGE_DELETE_BULK:()=>{},"
+                    match: /(?<=MESSAGE_DELETE_BULK:function\(\i\)\{)/,
+                    replace: "return;"
                 }
             ]
         },
@@ -852,8 +854,8 @@ export default definePlugin({
                     replace: '$&$1.type==="MESSAGE_GROUP_DELETED"||',
                 },
                 {
-                    match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\?.*?:/,
-                    replace: '$&$1.type==="MESSAGE_GROUP_DELETED"?$self.DELETED_MESSAGE_COUNT:',
+                    match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\?(\i)=.*?:/,
+                    replace: '$&$1.type==="MESSAGE_GROUP_DELETED"?$2=$self.DELETED_MESSAGE_COUNT:',
                 },
             ],
             predicate: () => settings.store.collapseDeleted,
diff --git a/src/plugins/moreQuickReactions/index.ts b/src/plugins/moreQuickReactions/index.ts
index 25e7ff4f7..4ac676a03 100644
--- a/src/plugins/moreQuickReactions/index.ts
+++ b/src/plugins/moreQuickReactions/index.ts
@@ -52,6 +52,7 @@ migratePluginSettings("MoreQuickReactions", "BetterQuickReact");
 export default definePlugin({
     name: "MoreQuickReactions",
     description: "Improves the quick react buttons in the message context menu.",
+    tags: ["Emotes", "Reactions", "Customisation", "Shortcuts"],
     authors: [Devs.Ven, Devs.Sqaaakoi, Devs.iamme],
     isModified: true,
     settings,
@@ -83,8 +84,12 @@ export default definePlugin({
                 },
                 // Override limit of emojis to display with offset hook.
                 {
-                    match: /(\i)\.length>4&&\((\i)\.length=4\);/,
-                    replace: "let [moreQuickReactionsScrollValue,setMoreQuickReactionsScrollValue]=Vencord.Webpack.Common.React.useState(0);moreQuickReactionsScrollValue;"
+                    match: /"MessageContextMenu"\},\{autoTrackExposure.{0,5}\}\),/,
+                    replace: "$&[moreQuickReactionsScrollValue,setMoreQuickReactionsScrollValue]=Vencord.Webpack.Common.React.useState(0),"
+                },
+                {
+                    match: /\.length>4&&\(\i\.length=4\)/,
+                    replace: ""
                 },
                 // Add a custom class to identify the quick reactions have been modified and a CSS variable for the number of columns to display
                 {
diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index 08cb1bf41..5166cef18 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -25,9 +25,9 @@ import { isNonNullish } from "@utils/guards";
 import { Logger } from "@utils/Logger";
 import definePlugin from "@utils/types";
 import { Channel, User } from "@vencord/discord-types";
-import { findByPropsLazy, findComponentByCodeLazy, findCssClassesLazy } from "@webpack";
+import { findByPropsLazy, findCssClassesLazy } from "@webpack";
 import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, useMemo, UserStore } from "@webpack/common";
-import { JSX } from "react";
+import { ComponentType, JSX } from "react";
 
 const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel");
 const UserUtils = findByPropsLazy("getGlobalName");
@@ -35,7 +35,8 @@ const UserUtils = findByPropsLazy("getGlobalName");
 const ProfileListClasses = findCssClassesLazy("empty", "textContainer", "connectionIcon");
 const TabBarClasses = findCssClassesLazy("tabPanelScroller", "tabBarPanel");
 const MutualsListClasses = findCssClassesLazy("row", "icon", "name", "details");
-const ExpandableList = findComponentByCodeLazy('action:"PRESS_SECTION"', "section");
+
+let ExpandableList: ComponentType<any> = () => null;
 
 function getGroupDMName(channel: Channel) {
     return channel.name ||
@@ -86,6 +87,7 @@ const IS_PATCHED = Symbol("MutualGroupDMs.Patched");
 export default definePlugin({
     name: "MutualGroupDMs",
     description: "Shows mutual group dms in profiles",
+    tags: ["Friends", "Appearance"],
     authors: [Devs.amia],
 
     patches: [
@@ -139,11 +141,19 @@ export default definePlugin({
                     match: /\.openUserProfileModal.+?\)}\)}\)(?<=,(\i)&&(\i)&&(\(0,\i\.jsxs?\)\(\i\.\i,{className:(\i)\.\i}\)).{0,50}?"MUTUAL_FRIENDS".+?)/,
                     replace: (m, hasMutualGuilds, hasMutualFriends, Divider, classes) => "" +
                         `${m},$self.renderDMPageList({user:arguments[0].user,hasDivider:${hasMutualGuilds}||${hasMutualFriends},Divider:${Divider},listStyle:${classes}.list})`
+                },
+                {
+                    match: /(?=function (\i)\(\i\){let{section:\i,header:\i[^}]+?onExpand:)/,
+                    replace: "$self.ExpandableList=$1;"
                 }
             ]
         }
     ],
 
+    set ExpandableList(value: any) {
+        ExpandableList = value;
+    },
+
     getMutualGroupDms(userId: string) {
         try {
             return getMutualGroupDms(userId);
diff --git a/src/plugins/newGuildSettings/index.tsx b/src/plugins/newGuildSettings/index.tsx
index dd7f05a91..cbbba3d18 100644
--- a/src/plugins/newGuildSettings/index.tsx
+++ b/src/plugins/newGuildSettings/index.tsx
@@ -151,7 +151,8 @@ function applyDefaultSettings(guildId: string | null) {
 export default definePlugin({
     name: "NewGuildSettings",
     description: "Automatically mute new servers and change various other settings upon joining",
-    tags: ["MuteNewGuild", "mute", "server"],
+    tags: ["Servers", "Customisation"],
+    searchTerms: ["MuteNewGuild", "mute", "server"],
     authors: [Devs.Glitch, Devs.Nuckyz, Devs.carince, Devs.Mopi, Devs.GabiRP],
     isModified: true,
     contextMenus: {
diff --git a/src/plugins/noBlockedMessages/index.ts b/src/plugins/noBlockedMessages/index.ts
index 3c50240fa..5780d8b57 100644
--- a/src/plugins/noBlockedMessages/index.ts
+++ b/src/plugins/noBlockedMessages/index.ts
@@ -90,21 +90,28 @@ export default definePlugin({
     name: "NoBlockedMessages",
     description: "Hide all blocked/ignored messages from chat completely.",
     authors: [Devs.rushii, Devs.Samu, Devs.jamesbt365, Devs.Elvyra, EquicordDevs.Etorix],
+    tags: ["Accessibility", "Chat"],
     isModified: true,
     settings,
     patches: [
-        ...[
-            '"MessageStore"',
-            '"ReadStateStore"'
-        ].map(find => ({
-            find,
+        {
+            find: '"MessageStore"',
             replacement: [
                 {
-                    match: /(?<=function (\i)\((\i)\){)(?=.*MESSAGE_CREATE:\1)/,
-                    replace: (_, _funcName, props) => `if($self.disableNotification(${props}.message)){return;};`
+                    match: /(?<=MESSAGE_CREATE:function\((\i)\){)/,
+                    replace: (_, props) => `if($self.disableNotification(${props}.message))return;`
                 }
             ]
-        })),
+        },
+        {
+            find: '"ReadStateStore"',
+            replacement: [
+                {
+                    match: /(?<=MESSAGE_CREATE:function\((\i)\){)/,
+                    replace: (_, props) => `if($self.disableNotification(${props}.message))return;`
+                }
+            ]
+        },
         {
             find: "`forum-post-action-bar-",
             replacement: [
diff --git a/src/plugins/noDeepLinks.web/index.ts b/src/plugins/noDeepLinks.web/index.ts
index 019df659a..b1770a3a0 100644
--- a/src/plugins/noDeepLinks.web/index.ts
+++ b/src/plugins/noDeepLinks.web/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "DisableDeepLinks",
     description: "Disables Discord's stupid deep linking feature which tries to force you to use their Desktop App",
+    tags: ["Utility"],
     authors: [Devs.Ven],
     required: true,
 
diff --git a/src/plugins/noDefaultHangStatus/README.md b/src/plugins/noDefaultHangStatus/README.md
deleted file mode 100644
index e6bc9f83a..000000000
--- a/src/plugins/noDefaultHangStatus/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# NoDefaultHangStatus
-
-Disable the default hang status when joining voice channels
-
-![Visualization](https://github.com/Vendicated/Vencord/assets/24937357/329a9742-236f-48f7-94ff-c3510eca505a)
diff --git a/src/plugins/noDefaultHangStatus/index.ts b/src/plugins/noDefaultHangStatus/index.ts
deleted file mode 100644
index 1301f0d25..000000000
--- a/src/plugins/noDefaultHangStatus/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { migrateSettingToPlugin } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-
-migrateSettingToPlugin("NoDefaultHangStatus", "EquicordHelper", "noDefaultHangStatus");
-export default definePlugin({
-    name: "NoDefaultHangStatus",
-    description: "Disable the default hang status when joining voice channels",
-    authors: [Devs.D3SOX],
-
-    patches: [
-        {
-            find: ".CHILLING)",
-            replacement: {
-                match: /{enableHangStatus:(\i),/,
-                replace: "{_enableHangStatus:$1=false,"
-            }
-        }
-    ]
-});
diff --git a/src/plugins/noDevtoolsWarning/index.ts b/src/plugins/noDevtoolsWarning/index.ts
index 5c35fa67b..d5dcad53c 100644
--- a/src/plugins/noDevtoolsWarning/index.ts
+++ b/src/plugins/noDevtoolsWarning/index.ts
@@ -23,6 +23,7 @@ export default definePlugin({
     name: "NoDevtoolsWarning",
     description: "Disables the 'HOLD UP' banner in the console. As a side effect, also prevents Discord from hiding your token, which prevents random logouts.",
     authors: [Devs.Ven],
+    tags: ["Developers", "Console"],
     patches: [{
         find: "setDevtoolsCallbacks",
         replacement: {
diff --git a/src/plugins/noF1/index.ts b/src/plugins/noF1/index.ts
index a40be5acc..36e088e46 100644
--- a/src/plugins/noF1/index.ts
+++ b/src/plugins/noF1/index.ts
@@ -22,6 +22,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "NoF1",
     description: "Disables F1 help bind.",
+    tags: ["Utility"],
     authors: [Devs.Cyn],
     patches: [
         {
diff --git a/src/plugins/noMaskedUrlPaste/index.ts b/src/plugins/noMaskedUrlPaste/index.ts
index 64f522cae..fc10f8970 100644
--- a/src/plugins/noMaskedUrlPaste/index.ts
+++ b/src/plugins/noMaskedUrlPaste/index.ts
@@ -11,6 +11,7 @@ export default definePlugin({
     name: "NoMaskedUrlPaste",
     authors: [Devs.CatNoir],
     description: "Pasting a link while having text selected will not paste as masked URL",
+    tags: ["Chat", "Utility"],
     patches: [
         {
             find: ".selection,preventEmojiSurrogates:",
diff --git a/src/plugins/noMiddleClickPaste/index.ts b/src/plugins/noMiddleClickPaste/index.ts
new file mode 100644
index 000000000..3d45739c7
--- /dev/null
+++ b/src/plugins/noMiddleClickPaste/index.ts
@@ -0,0 +1,29 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs, IS_LINUX } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+function preventMiddleClick(e: MouseEvent) {
+    if (e.button === 1) {
+        e.preventDefault();
+    }
+}
+
+export default definePlugin({
+    name: "NoMiddleClickPaste",
+    description: "Disable Linux middle-click paste - Linux only",
+    authors: [Devs.Darxoon],
+    hidden: !IS_LINUX,
+
+    start() {
+        window.addEventListener("mouseup", preventMiddleClick);
+    },
+
+    stop() {
+        window.removeEventListener("mouseup", preventMiddleClick);
+    },
+});
diff --git a/src/plugins/noMosaic/index.ts b/src/plugins/noMosaic/index.ts
deleted file mode 100644
index 4ec64cc39..000000000
--- a/src/plugins/noMosaic/index.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-
-const settings = definePluginSettings({
-    inlineVideo: {
-        description: "Play videos without carousel modal",
-        type: OptionType.BOOLEAN,
-        default: true,
-        restartNeeded: true
-    }
-});
-
-export default definePlugin({
-    name: "NoMosaic",
-    authors: [Devs.AutumnVN],
-    description: "Removes Discord image mosaic",
-    tags: ["image", "mosaic", "media"],
-
-    settings,
-
-    patches: [
-        {
-            find: '"PLAINTEXT_PREVIEW":"OTHER"',
-            replacement: {
-                match: /=>"IMAGE"===\i\|\|"VIDEO"===\i(?:\|\|("VISUAL_PLACEHOLDER"===\i))?;/,
-                replace: (_, visualPlaceholderPred) => visualPlaceholderPred != null ? `=>${visualPlaceholderPred};` : "=>false;"
-            }
-        },
-        {
-            find: "renderAttachments(",
-            predicate: () => settings.store.inlineVideo,
-            replacement: {
-                match: /url:(\i)\.url\}\);return /,
-                replace: "$&$1.content_type?.startsWith('image/')&&"
-            }
-        },
-    ]
-});
diff --git a/src/plugins/noOnboardingDelay/index.ts b/src/plugins/noOnboardingDelay/index.ts
index 285109761..b5f963463 100644
--- a/src/plugins/noOnboardingDelay/index.ts
+++ b/src/plugins/noOnboardingDelay/index.ts
@@ -22,6 +22,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "NoOnboardingDelay",
     description: "Skips the slow and annoying onboarding delay",
+    tags: ["Utility", "Servers"],
     authors: [Devs.nekohaxx],
     patches: [
         {
diff --git a/src/plugins/noPendingCount/index.ts b/src/plugins/noPendingCount/index.ts
index b1a7ffad8..5bede8b49 100644
--- a/src/plugins/noPendingCount/index.ts
+++ b/src/plugins/noPendingCount/index.ts
@@ -47,6 +47,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "NoPendingCount",
     description: "Removes the ping count of incoming friend requests, message requests, and nitro offers.",
+    tags: ["Notifications", "Appearance"],
     authors: [Devs.amia],
 
     settings: settings,
diff --git a/src/plugins/noProfileThemes/index.ts b/src/plugins/noProfileThemes/index.ts
index 7c440df80..7d81c098f 100644
--- a/src/plugins/noProfileThemes/index.ts
+++ b/src/plugins/noProfileThemes/index.ts
@@ -23,13 +23,14 @@ import { UserStore } from "@webpack/common";
 export default definePlugin({
     name: "NoProfileThemes",
     description: "Completely removes Nitro profile themes from everyone but yourself",
+    tags: ["Appearance"],
     authors: [Devs.TheKodeToad],
     patches: [
         {
             find: "hasThemeColors(){",
             replacement: {
                 match: /get canUsePremiumProfileCustomization\(\){return /,
-                replace: "$&$self.isCurrentUser(this.userId)&&"
+                replace: "$&$self.isCurrentUser(this?.userId)&&"
             }
         },
     ],
diff --git a/src/plugins/noReplyMention/index.tsx b/src/plugins/noReplyMention/index.tsx
index a08a04b8b..2e2bb9c6b 100644
--- a/src/plugins/noReplyMention/index.tsx
+++ b/src/plugins/noReplyMention/index.tsx
@@ -62,6 +62,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "NoReplyMention",
     description: "Disables reply pings by default",
+    tags: ["Chat", "Notifications"],
     authors: [Devs.DustyAngel47, Devs.rae, Devs.pylix, Devs.outfoxxed],
     settings,
 
diff --git a/src/plugins/noServerEmojis/index.ts b/src/plugins/noServerEmojis/index.ts
index 6550dabb8..fd764dbf3 100644
--- a/src/plugins/noServerEmojis/index.ts
+++ b/src/plugins/noServerEmojis/index.ts
@@ -26,6 +26,7 @@ export default definePlugin({
     name: "NoServerEmojis",
     authors: [Devs.UlyssesZhan],
     description: "Do not show server emojis in the autocomplete menu.",
+    tags: ["Emotes", "Servers"],
     settings,
 
     patches: [
diff --git a/src/plugins/noSystemBadge.discordDesktop/index.ts b/src/plugins/noSystemBadge.discordDesktop/index.ts
index 0fbb5332a..c01c0b87a 100644
--- a/src/plugins/noSystemBadge.discordDesktop/index.ts
+++ b/src/plugins/noSystemBadge.discordDesktop/index.ts
@@ -22,6 +22,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "NoSystemBadge",
     description: "Disables the taskbar and system tray unread count badge.",
+    tags: ["Notifications", "Appearance"],
     authors: [Devs.rushii],
     patches: [
         {
diff --git a/src/plugins/noTypingAnimation/index.ts b/src/plugins/noTypingAnimation/index.ts
index 74bcdd50e..6eca410fa 100644
--- a/src/plugins/noTypingAnimation/index.ts
+++ b/src/plugins/noTypingAnimation/index.ts
@@ -11,6 +11,7 @@ export default definePlugin({
     name: "NoTypingAnimation",
     authors: [Devs.AutumnVN],
     description: "Disables the CPU-intensive typing dots animation",
+    tags: ["Appearance"],
     patches: [
         {
             find: "dotCycle",
diff --git a/src/plugins/noUnblockToJump/index.ts b/src/plugins/noUnblockToJump/index.ts
index 5d876fc7b..6c1f504b6 100644
--- a/src/plugins/noUnblockToJump/index.ts
+++ b/src/plugins/noUnblockToJump/index.ts
@@ -22,6 +22,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "NoUnblockToJump",
     description: "Allows you to jump to messages of blocked or ignored users and likely spammers without unblocking them",
+    tags: ["Utility"],
     authors: [Devs.dzshn],
     patches: [
         {
diff --git a/src/plugins/notificationVolume/index.ts b/src/plugins/notificationVolume/index.ts
index d320d76f1..5959c0dd1 100644
--- a/src/plugins/notificationVolume/index.ts
+++ b/src/plugins/notificationVolume/index.ts
@@ -21,6 +21,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "NotificationVolume",
     description: "Save your ears and set a separate volume for notifications and in-app sounds",
+    tags: ["Notifications", "Voice"],
     authors: [Devs.philipbry],
     settings,
     patches: [
diff --git a/src/plugins/onePingPerDM/index.ts b/src/plugins/onePingPerDM/index.ts
index 05dba7e80..87727fa32 100644
--- a/src/plugins/onePingPerDM/index.ts
+++ b/src/plugins/onePingPerDM/index.ts
@@ -47,7 +47,8 @@ const settings = definePluginSettings({
 
 export default definePlugin({
     name: "OnePingPerDM",
-    description: "If unread messages are sent by a user in DMs multiple times, you'll only receive one audio ping.",
+    description: "If unread messages are sent by a user in DMs multiple times, you'll only receive one audio ping. Read the messages to reset the limit",
+    tags: ["Notifications", "Customisation"],
     authors: [Devs.ProffDea],
     isModified: true,
     settings,
diff --git a/src/plugins/openInApp/index.ts b/src/plugins/openInApp/index.ts
index 05e5b1c29..60012f735 100644
--- a/src/plugins/openInApp/index.ts
+++ b/src/plugins/openInApp/index.ts
@@ -84,6 +84,7 @@ const Native = VencordNative.pluginHelpers.OpenInApp as PluginNative<typeof impo
 export default definePlugin({
     name: "OpenInApp",
     description: "Open links in their respective apps instead of your browser",
+    tags: ["Utility"],
     authors: [Devs.Ven, Devs.surgedevs],
     settings: pluginSettings,
 
diff --git a/src/plugins/overrideForumDefaults/index.tsx b/src/plugins/overrideForumDefaults/index.tsx
index a377fff5d..c1152bda6 100644
--- a/src/plugins/overrideForumDefaults/index.tsx
+++ b/src/plugins/overrideForumDefaults/index.tsx
@@ -30,6 +30,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "OverrideForumDefaults",
     description: "Allows you to override default forum layout/sort order. you can still change it on a per-channel basis",
+    tags: ["Servers", "Organisation", "Customisation"],
     authors: [Devs.Inbestigator],
     patches: [
         {
diff --git a/src/plugins/pauseInvitesForever/index.tsx b/src/plugins/pauseInvitesForever/index.tsx
index 7ffba7c55..4e681dbe9 100644
--- a/src/plugins/pauseInvitesForever/index.tsx
+++ b/src/plugins/pauseInvitesForever/index.tsx
@@ -43,8 +43,9 @@ function disableInvites(guildId: string) {
 
 export default definePlugin({
     name: "PauseInvitesForever",
-    tags: ["DisableInvitesForever"],
+    searchTerms: ["DisableInvitesForever"],
     description: "Brings back the option to pause invites indefinitely that stupit Discord removed.",
+    tags: ["Servers"],
     authors: [Devs.Dolfies, Devs.amia],
 
     patches: [
diff --git a/src/plugins/permissionFreeWill/index.ts b/src/plugins/permissionFreeWill/index.ts
index 781c64bc7..2a8e5d469 100644
--- a/src/plugins/permissionFreeWill/index.ts
+++ b/src/plugins/permissionFreeWill/index.ts
@@ -27,6 +27,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "PermissionFreeWill",
     description: "Disables the client-side restrictions for channel permission management.",
+    tags: ["Servers", "Roles"],
     authors: [Devs.lewisakura],
 
     patches: [
diff --git a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
index 22fe73151..9f42f3b8f 100644
--- a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
@@ -20,14 +20,15 @@ import { BaseText } from "@components/BaseText";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { InfoIcon, OwnerCrownIcon } from "@components/Icons";
-import { cl, getGuildPermissionSpecMap } from "@plugins/permissionsViewer/utils";
+import { buildExtraRoleContextMenuItems } from "@plugins/betterRoleContext";
+import { cl, getGuildPermissionSpecMap, loadGetGuildPermissionSpecMap } from "@plugins/permissionsViewer/utils";
 import { copyToClipboard } from "@utils/clipboard";
 import { getIntlMessage, getUniqueUsername } from "@utils/discord";
-import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModalLazy } from "@utils/modal";
 import { Guild, Role, RoleOrUserPermission, UnicodeEmoji, User } from "@vencord/discord-types";
 import { PermissionOverwriteType } from "@vencord/discord-types/enums";
 import { findByCodeLazy } from "@webpack";
-import { ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildRoleStore, i18n, Menu, PermissionsBits, ScrollerThin, Tooltip, useEffect, useMemo, UserStore, useState, useStateFromStores } from "@webpack/common";
+import { ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildRoleStore, i18n, Menu, PermissionsBits, ScrollerThin, Tooltip, useEffect, useMemo, useRef, UserStore, useState, useStateFromStores } from "@webpack/common";
 
 import { settings } from "..";
 import { PermissionAllowedIcon, PermissionDefaultIcon, PermissionDeniedIcon } from "./icons";
@@ -205,29 +206,51 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
     );
 }
 
+function IDIcon() {
+    return (
+        <svg width="18" height="18" viewBox="0 0 24 24">
+            <path fill="currentColor" d="M15.3 14.48c-.46.45-1.08.67-1.86.67h-1.39V9.2h1.39c.78 0 1.4.22 1.86.67.46.45.68 1.22.68 2.31 0 1.1-.22 1.86-.68 2.31Z" />
+            <path fill="currentColor" fillRule="evenodd" clipRule="evenodd" d="M5 2a3 3 0 0 0-3 3v14a3 3 0 0 0 3 3h14a3 3 0 0 0 3-3V5a3 3 0 0 0-3-3H5Zm1 15h2.04V7.34H6V17Zm4-9.66V17h3.44c1.46 0 2.6-.42 3.38-1.25.8-.83 1.2-2.02 1.2-3.58s-.4-2.75-1.2-3.58c-.79-.83-1.92-1.25-3.38-1.25H10Z" />
+        </svg>
+    );
+}
+
+function ViewAsRoleIcon() {
+    return (
+        <svg width="18" height="18" viewBox="0 0 24 24">
+            <path fill="currentColor" d="M20.7 12.7a1 1 0 0 0 0-1.4l-5-5a1 1 0 1 0-1.4 1.4l3.29 3.3H4a1 1 0 1 0 0 2h13.59l-3.3 3.3a1 1 0 0 0 1.42 1.4l5-5Z" />
+        </svg>
+    );
+}
+
 function RoleContextMenu({ guild, roleId, onClose }: { guild: Guild; roleId: string; onClose: () => void; }) {
+    const popoutRef = useRef(null);
+    const role = GuildRoleStore.getRole(guild.id, roleId);
+    const { before, after } = buildExtraRoleContextMenuItems(role, guild, popoutRef);
+
     return (
         <Menu.Menu
             navId={cl("role-context-menu")}
             onClose={ContextMenuApi.closeContextMenu}
             aria-label="Role Options"
         >
+            {before}
+
             <Menu.MenuItem
                 id={cl("copy-role-id")}
                 label={getIntlMessage("COPY_ID_ROLE")}
-                action={() => {
-                    copyToClipboard(roleId);
-                }}
+                icon={IDIcon}
+                action={() => copyToClipboard(roleId)}
             />
 
+            {after}
+
             {(settings.store as any).unsafeViewAsRole && (
                 <Menu.MenuItem
                     id={cl("view-as-role")}
                     label={getIntlMessage("VIEW_AS_ROLE")}
+                    icon={ViewAsRoleIcon}
                     action={() => {
-                        const role = GuildRoleStore.getRole(guild.id, roleId);
-                        if (!role) return;
-
                         onClose();
                         FluxDispatcher.dispatch({
                             type: "IMPERSONATE_UPDATE",
@@ -267,12 +290,16 @@ function UserContextMenu({ userId }: { userId: string; }) {
 const RolesAndUsersPermissions = ErrorBoundary.wrap(RolesAndUsersPermissionsComponent);
 
 export default function openRolesAndUsersPermissionsModal(permissions: Array<RoleOrUserPermission>, guild: Guild, header: string) {
-    return openModal(modalProps => (
-        <RolesAndUsersPermissions
-            modalProps={modalProps}
-            permissions={permissions}
-            guild={guild}
-            header={header}
-        />
-    ));
+    return openModalLazy(async () => {
+        await loadGetGuildPermissionSpecMap();
+
+        return modalProps => (
+            <RolesAndUsersPermissions
+                modalProps={modalProps}
+                permissions={permissions}
+                guild={guild}
+                header={header}
+            />
+        );
+    });
 }
diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index 8c8c8f73a..b8b011b73 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -29,13 +29,13 @@ import definePlugin, { OptionType } from "@utils/types";
 import type { Guild, RoleOrUserPermission } from "@vencord/discord-types";
 import { PermissionOverwriteType } from "@vencord/discord-types/enums";
 import { findCssClassesLazy } from "@webpack";
-import { Button, ChannelStore, Dialog, GuildMemberStore, GuildRoleStore, GuildStore, match, Menu, PermissionsBits, Popout, useRef, UserStore } from "@webpack/common";
+import { Button, ChannelStore, Dialog, GuildMemberStore, GuildRoleStore, GuildStore, match, Menu, PermissionsBits, Popout, useEffect, useRef, UserStore } from "@webpack/common";
 
 import openRolesAndUsersPermissionsModal from "./components/RolesAndUsersPermissions";
 import UserPermissions from "./components/UserPermissions";
-import { getSortedRolesForMember, sortPermissionOverwrites } from "./utils";
+import { getSortedRolesForMember, loadGetGuildPermissionSpecMap, sortPermissionOverwrites } from "./utils";
 
-const PopoutClasses = findCssClassesLazy("container", "scroller", "list");
+const PopoutClasses = findCssClassesLazy("container", "popoutRoleDot");
 
 export const enum PermissionsSortOrder {
     HighestRole,
@@ -160,6 +160,7 @@ function makeContextMenuPatch(childId: string | string[], type?: MenuItemParentT
 export default definePlugin({
     name: "PermissionsViewer",
     description: "View the permissions a user or channel has, and the roles of a server",
+    tags: ["Servers", "Roles", "Utility"],
     authors: [Devs.Nuckyz, Devs.Ven],
     settings,
 
@@ -174,11 +175,12 @@ export default definePlugin({
     ],
 
     ViewPermissionsButton: ErrorBoundary.wrap(({ className, guild, userId }: { className: string; guild: Guild; userId: string; }) => {
+        const buttonRef = useRef(null);
+        useEffect(() => void loadGetGuildPermissionSpecMap(), []);
+
         const guildMember = GuildMemberStore.getMember(guild.id, userId);
         if (!guildMember) return null;
 
-        const buttonRef = useRef(null);
-
         return (
             <Popout
                 position="bottom"
diff --git a/src/plugins/permissionsViewer/utils.ts b/src/plugins/permissionsViewer/utils.ts
index 3e07e82d6..7d3a45c11 100644
--- a/src/plugins/permissionsViewer/utils.ts
+++ b/src/plugins/permissionsViewer/utils.ts
@@ -19,10 +19,12 @@
 import { classNameFactory } from "@utils/css";
 import { Guild, GuildMember, Role } from "@vencord/discord-types";
 import { PermissionOverwriteType } from "@vencord/discord-types/enums";
-import { findByPropsLazy } from "@webpack";
+import { extractAndLoadChunksLazy, findByPropsLazy } from "@webpack";
 import { GuildRoleStore } from "@webpack/common";
 
 import { PermissionsSortOrder, settings } from ".";
+
+export const loadGetGuildPermissionSpecMap = extractAndLoadChunksLazy([".PRIMARY,badgeTooltipDelay:"]);
 export const { getGuildPermissionSpecMap } = findByPropsLazy("getGuildPermissionSpecMap");
 
 export const cl = classNameFactory("vc-permviewer-");
diff --git a/src/plugins/petpet/index.ts b/src/plugins/petpet/index.ts
index 08cecaeec..285fca355 100644
--- a/src/plugins/petpet/index.ts
+++ b/src/plugins/petpet/index.ts
@@ -110,6 +110,8 @@ migratePluginSettings("PetPet", "petpet");
 export default definePlugin({
     name: "PetPet",
     description: "Adds a /petpet slash command to create headpet gifs from any image",
+    dependencies: ["CommandsAPI"],
+    tags: ["Fun", "Commands"],
     authors: [Devs.Ven, Devs.u32],
     commands: [
         {
diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index d1324dc82..d98f982d4 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -24,6 +24,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "PictureInPicture",
     description: "Adds picture in picture to videos (next to the Download button)",
+    tags: ["Media", "Utility"],
     authors: [Devs.Lumap],
     settings,
     patches: [
diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 1fde12481..906d4dd04 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -67,6 +67,7 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "PinDMs",
     description: "Allows you to pin private channels to the top of your DM list. To pin/unpin or re-order pins, right click DMs",
+    tags: ["Friends", "Organisation"],
     authors: [Devs.Ven, Devs.Aria],
     settings,
     contextMenus,
@@ -114,7 +115,7 @@ export default definePlugin({
                 {
                     // Override scrollToChannel to properly account for pinned channels
                     match: /(?<=scrollTo\(\{to:\i\}\):\(\i\+=)(\d+)\*\(.+?(?=,)/,
-                    replace: "$self.getScrollOffset(arguments[0],$1,this.props.padding,this.state.preRenderedChildren,$&)"
+                    replace: "$self.getScrollOffset(arguments[0],$1,this?.props?.padding,this?.state?.preRenderedChildren,$&)"
                 },
                 {
                     match: /(scrollToChannel\(\i\){.{1,300})(this\.props\.privateChannelIds)/,
diff --git a/src/plugins/plainFolderIcon/index.ts b/src/plugins/plainFolderIcon/index.ts
index d7f0bd622..8efd66cd5 100644
--- a/src/plugins/plainFolderIcon/index.ts
+++ b/src/plugins/plainFolderIcon/index.ts
@@ -24,6 +24,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "PlainFolderIcon",
     description: "Dont show the small guild icons in folders",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.botato],
 
     patches: [
diff --git a/src/plugins/platformIndicators/index.tsx b/src/plugins/platformIndicators/index.tsx
index 0e1c8e04d..be877413d 100644
--- a/src/plugins/platformIndicators/index.tsx
+++ b/src/plugins/platformIndicators/index.tsx
@@ -219,6 +219,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "PlatformIndicators",
     description: "Adds platform indicators (Desktop, Mobile, Web...) to users",
+    dependencies: ["MemberListDecoratorsAPI", "MessageDecorationsAPI", "NicknameIconsAPI"],
+    tags: ["Appearance"],
     authors: [Devs.kemo, Devs.TheSun, Devs.Nuckyz, Devs.Ven, EquicordDevs.neoarz],
     isModified: true,
     settings,
diff --git a/src/plugins/previewMessage/index.tsx b/src/plugins/previewMessage/index.tsx
index 491a0d509..d49a82d01 100644
--- a/src/plugins/previewMessage/index.tsx
+++ b/src/plugins/previewMessage/index.tsx
@@ -120,6 +120,8 @@ const PreviewButton: ChatBarButtonFactory = ({ isAnyChat, isEmpty, type: { attac
 export default definePlugin({
     name: "PreviewMessage",
     description: "Lets you preview your message before sending it.",
+    dependencies: ["ChatInputButtonAPI"],
+    tags: ["Chat", "Utility"],
     authors: [Devs.Aria],
     // start early to ensure we're the first plugin to add our button
     // This makes the popping in less awkward
diff --git a/src/plugins/quickMention/index.tsx b/src/plugins/quickMention/index.tsx
index 8331605d2..edad6b5f0 100644
--- a/src/plugins/quickMention/index.tsx
+++ b/src/plugins/quickMention/index.tsx
@@ -41,6 +41,8 @@ export default definePlugin({
     name: "QuickMention",
     authors: [Devs.kemo],
     description: "Adds a quick mention button to the message actions bar",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Chat", "Shortcuts"],
 
     messagePopoverButton: {
         icon: Icon,
diff --git a/src/plugins/quickReply/index.ts b/src/plugins/quickReply/index.ts
index 372a417ae..1c963873a 100644
--- a/src/plugins/quickReply/index.ts
+++ b/src/plugins/quickReply/index.ts
@@ -60,6 +60,7 @@ export default definePlugin({
     name: "QuickReply",
     authors: [Devs.fawn, Devs.Ven, Devs.pylix],
     description: "Reply to (ctrl + up/down) and edit (ctrl + shift + up/down) messages via keybinds",
+    tags: ["Chat", "Shortcuts"],
     settings,
 
     start() {
@@ -142,7 +143,7 @@ function getNextMessage(isUp: boolean, isReply: boolean) {
         if (!isReply && m.author.id !== meId) return false; // editing only own messages
         if (!MessageTypeSets.REPLYABLE.has(m.type) || m.hasFlag(MessageFlags.EPHEMERAL)) return false;
         if (settings.store.ignoreBlockedAndIgnored && RelationshipStore.isBlockedOrIgnored(m.author.id)) return false;
-        if (hasNoBlockedMessages && NoBlockedMessagesPlugin.isSuppressed(m)) return false;
+        if (hasNoBlockedMessages && NoBlockedMessagesPlugin.isSuppressed(m).suppressed) return false;
 
         return true;
     });
diff --git a/src/plugins/reactErrorDecoder/index.ts b/src/plugins/reactErrorDecoder/index.ts
index 45ab297a6..ac700a47f 100644
--- a/src/plugins/reactErrorDecoder/index.ts
+++ b/src/plugins/reactErrorDecoder/index.ts
@@ -24,7 +24,8 @@ let ERROR_CODES: Record<string, string> | undefined;
 
 export default definePlugin({
     name: "ReactErrorDecoder",
-    description: 'Replaces "Minifed React Error" with the actual error.',
+    description: 'Replaces "Minified React Error" with the actual error.',
+    tags: ["Developers"],
     authors: [Devs.Cyn, Devs.maisymoe],
     patches: [
         {
diff --git a/src/plugins/readAllNotificationsButton/index.tsx b/src/plugins/readAllNotificationsButton/index.tsx
index 3a06c385b..65c113a21 100644
--- a/src/plugins/readAllNotificationsButton/index.tsx
+++ b/src/plugins/readAllNotificationsButton/index.tsx
@@ -66,6 +66,7 @@ const ReadAllButton = () => (
 export default definePlugin({
     name: "ReadAllNotificationsButton",
     description: "Read all server notifications with a single button click!",
+    tags: ["Notifications", "Shortcuts"],
     authors: [Devs.kemo, EquicordDevs.KrystalSkull],
     dependencies: ["ServerListAPI"],
 
diff --git a/src/plugins/relationshipNotifier/index.ts b/src/plugins/relationshipNotifier/index.ts
index d913dde48..ddb432e43 100644
--- a/src/plugins/relationshipNotifier/index.ts
+++ b/src/plugins/relationshipNotifier/index.ts
@@ -26,6 +26,7 @@ import { syncAndRunChecks, syncFriends, syncGroups, syncGuilds } from "./utils";
 export default definePlugin({
     name: "RelationshipNotifier",
     description: "Notifies you when a friend, group chat, or server removes you.",
+    tags: ["Friends", "Notifications"],
     authors: [Devs.nick],
     settings,
 
diff --git a/src/plugins/replaceGoogleSearch/index.tsx b/src/plugins/replaceGoogleSearch/index.tsx
index e12048b18..434923251 100644
--- a/src/plugins/replaceGoogleSearch/index.tsx
+++ b/src/plugins/replaceGoogleSearch/index.tsx
@@ -131,6 +131,7 @@ migratePluginSettings("ReplaceGoogleSearch", "Search");
 export default definePlugin({
     name: "ReplaceGoogleSearch",
     description: "Replaces the Google search with different Engine(s)",
+    tags: ["Utility", "Customisation"],
     authors: [Devs.Moxxie, Devs.Ethan],
 
     settings,
diff --git a/src/plugins/replyTimestamp/index.tsx b/src/plugins/replyTimestamp/index.tsx
index 65e969241..021caea59 100644
--- a/src/plugins/replyTimestamp/index.tsx
+++ b/src/plugins/replyTimestamp/index.tsx
@@ -58,6 +58,7 @@ function ReplyTimestamp({
 export default definePlugin({
     name: "ReplyTimestamp",
     description: "Shows a timestamp on replied-message previews",
+    tags: ["Chat", "Appearance"],
     authors: [Devs.Kyuuhachi],
 
     patches: [
diff --git a/src/plugins/revealAllSpoilers/index.ts b/src/plugins/revealAllSpoilers/index.ts
index 173632d7a..a1176d7b5 100644
--- a/src/plugins/revealAllSpoilers/index.ts
+++ b/src/plugins/revealAllSpoilers/index.ts
@@ -27,7 +27,7 @@ export default definePlugin({
     name: "RevealAllSpoilers",
     description: "Reveal all spoilers in a message by Ctrl-clicking a spoiler, or in the chat with Ctrl+Shift-click",
     authors: [Devs.whqwert],
-
+    tags: ["Accessibility", "Chat", "Shortcuts", "Utility"],
     patches: [
         {
             find: ".removeObscurity,",
diff --git a/src/plugins/reverseImageSearch/index.tsx b/src/plugins/reverseImageSearch/index.tsx
index 10d3fad19..68845c0a1 100644
--- a/src/plugins/reverseImageSearch/index.tsx
+++ b/src/plugins/reverseImageSearch/index.tsx
@@ -102,8 +102,9 @@ const imageContextMenuPatch: NavContextMenuPatchCallback = (children, props) =>
 export default definePlugin({
     name: "ReverseImageSearch",
     description: "Adds ImageSearch to image context menus",
+    tags: ["Media", "Utility"],
     authors: [Devs.Ven, Devs.Nuckyz],
-    tags: ["ImageUtilities"],
+    searchTerms: ["ImageUtilities"],
 
     patches: [
         {
diff --git a/src/plugins/reviewDB/components/ReviewModal.tsx b/src/plugins/reviewDB/components/ReviewModal.tsx
index 7414148d1..89fc0740f 100644
--- a/src/plugins/reviewDB/components/ReviewModal.tsx
+++ b/src/plugins/reviewDB/components/ReviewModal.tsx
@@ -22,13 +22,20 @@ import { Auth } from "@plugins/reviewDB/auth";
 import { ReviewType } from "@plugins/reviewDB/entities";
 import { REVIEWS_PER_PAGE, UserReviewsData } from "@plugins/reviewDB/reviewDbApi";
 import { cl } from "@plugins/reviewDB/utils";
-import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModalLazy } from "@utils/modal";
 import { useForceUpdater } from "@utils/react";
-import { Paginator, useRef, useState } from "@webpack/common";
+import * as t from "@vencord/discord-types";
+import { DefaultExtractAndLoadChunksRegex, extractAndLoadChunksLazy, findComponentByCodeLazy } from "@webpack";
+import { useRef, useState } from "@webpack/common";
+import { ComponentProps } from "react";
 
 import ReviewComponent from "./ReviewComponent";
 import ReviewsView, { ReviewsInputComponent } from "./ReviewsView";
 
+export const Paginator = findComponentByCodeLazy<ComponentProps<t.Paginator>>('rel:"prev",children:');
+// This matches a massive module with ~230k chars so we need an anchor before to prevent REDOS
+export const requirePaginator = extractAndLoadChunksLazy(['name:"SearchResults"'], new RegExp(`name:"StageChannelCall",renderLoader:.+?(?:${DefaultExtractAndLoadChunksRegex.source}).{0,30}?name:"SearchResults"`));
+
 function Modal({ modalProps, modalKey, discordId, name, type }: { modalProps: any; modalKey: string, discordId: string; name: string; type: ReviewType; }) {
     const [data, setData] = useState<UserReviewsData>();
     const [signal, refetch] = useForceUpdater(true);
@@ -101,13 +108,15 @@ function Modal({ modalProps, modalKey, discordId, name, type }: { modalProps: an
 export function openReviewsModal(discordId: string, name: string, type: ReviewType) {
     const modalKey = "vc-rdb-modal-" + Date.now();
 
-    openModal(props => (
-        <Modal
-            modalKey={modalKey}
-            modalProps={props}
-            discordId={discordId}
-            name={name}
-            type={type}
-        />
-    ), { modalKey });
+    openModalLazy(async () => {
+        await requirePaginator();
+        return props => (
+            <Modal
+                modalKey={modalKey}
+                modalProps={props}
+                discordId={discordId}
+                name={name}
+                type={type} />
+        );
+    }, { modalKey });
 }
diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
index e858d13b8..2564eff20 100644
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@@ -66,10 +66,11 @@ export default function ReviewsView({
         fallbackValue: null,
         deps: [refetchSignal, signal, page],
         onSuccess: data => {
-            if (settings.store.hideBlockedUsers)
-                data!.reviews = data!.reviews?.filter(r => !RelationshipStore.isBlocked(r.sender.discordID));
+            if (settings.store.hideBlockedUsers) data!.reviews = data!.reviews?.filter(r => !RelationshipStore.isBlocked(r.sender.discordID));
+            const systemReviews = data!.reviews.filter(r => r.type === ReviewType.System);
+            const normalReviews = data!.reviews.filter(r => r.type !== ReviewType.System);
 
-            data!.reviews.reverse();
+            data!.reviews = [...systemReviews, ...normalReviews.reverse()];
             scrollToTop?.();
             onFetchReviews(data!);
         }
diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx
index 393237e0e..dca4e7217 100644
--- a/src/plugins/reviewDB/index.tsx
+++ b/src/plugins/reviewDB/index.tsx
@@ -69,6 +69,8 @@ const userContextPatch: NavContextMenuPatchCallback = (children, { user }: { use
 export default definePlugin({
     name: "ReviewDB",
     description: "Review other users (Adds a new settings to profiles)",
+    dependencies: ["ProfileCollectionsAPI"],
+    tags: ["Friends", "Servers"],
     authors: [Devs.mantikafasi, Devs.Ven],
     isModified: true,
 
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index 5972bb240..efcfe6770 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -76,6 +76,7 @@ export default definePlugin({
     name: "RoleColorEverywhere",
     authors: [Devs.KingFish, Devs.lewisakura, Devs.AutumnVN, Devs.Kyuuhachi, Devs.jamesbt365],
     description: "Adds the top role color anywhere possible",
+    tags: ["Roles", "Appearance"],
     settings,
 
     patches: [
@@ -107,8 +108,8 @@ export default definePlugin({
             find: 'tutorialId:"whos-online',
             replacement: [
                 {
-                    match: /,"aria-hidden":!0,children:\[.{0,200}— ",\i\]\}\)\]/,
-                    replace: ',"aria-hidden":!0,children:[$self.RoleGroupColor(arguments[0])]'
+                    match: /(#{intl::CHANNEL_MEMBERS_A11Y_LABEL}.+}\):null,).{0,100}?— ",\i\]\}\)\]/,
+                    replace: (_, rest) => `${rest}$self.RoleGroupColor(arguments[0])]`
                 },
             ],
             predicate: () => settings.store.memberList
diff --git a/src/plugins/secretRingTone/index.ts b/src/plugins/secretRingTone/index.ts
index f2913afd1..4ebbe3b84 100644
--- a/src/plugins/secretRingTone/index.ts
+++ b/src/plugins/secretRingTone/index.ts
@@ -20,6 +20,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "SecretRingToneEnabler",
     description: "Always play the secret version of the discord ringtone (except during special ringtone events)",
+    tags: ["Notifications", "Fun"],
     authors: [Devs.AndrewDLO, Devs.FieryFlames, Devs.RamziAH],
     settings,
     patches: [
diff --git a/src/plugins/seeSummaries/index.tsx b/src/plugins/seeSummaries/index.tsx
index faa642fc7..1b5ff70c5 100644
--- a/src/plugins/seeSummaries/index.tsx
+++ b/src/plugins/seeSummaries/index.tsx
@@ -9,11 +9,10 @@ import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import { hasGuildFeature } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { ChannelStore, GuildStore } from "@webpack/common";
 
 const SummaryStore = findByPropsLazy("allSummaries", "findSummary");
-const createSummaryFromServer = findByCodeLazy(".people)),startId:", ".type}");
 
 const settings = definePluginSettings({
     summaryExpiryThresholdDays: {
@@ -39,7 +38,7 @@ interface Summary {
     unsafe: boolean;
 }
 
-interface ChannelSummaries {
+interface ChannelSummary {
     type: string;
     channel_id: string;
     guild_id: string;
@@ -48,10 +47,26 @@ interface ChannelSummaries {
     // custom property
     time?: number;
 }
+// TODO: these types are wrong and evil and incorrect
+function createChannelSummaryFromServer(s: Summary, channelId: string): ChannelSummary {
+    return {
+        id: s.id,
+        topic: s.topic,
+        summShort: s.summ_short,
+        people: Array.from(new Set(s.people)),
+        startId: s.start_id,
+        endId: s.end_id,
+        count: s.count,
+        channelId,
+        source: s.source,
+        type: s.type as any,
+    } as any as ChannelSummary;
+}
 
 export default definePlugin({
     name: "Summaries",
     description: "Enables Discord's experimental Summaries feature on every server, displaying AI generated summaries of conversations",
+    tags: ["Chat", "Fun"],
     authors: [Devs.mantikafasi],
     settings,
     patches: [
@@ -70,9 +85,13 @@ export default definePlugin({
             }
         }
     ],
+
     flux: {
         CONVERSATION_SUMMARY_UPDATE(data) {
-            const incomingSummaries: ChannelSummaries[] = data.summaries.map((summary: any) => ({ ...createSummaryFromServer(summary), time: Date.now() }));
+            const incomingSummaries: ChannelSummary[] = data.summaries.map((summary: any) => ({
+                ...createChannelSummaryFromServer(summary, undefined!),
+                time: Date.now()
+            }));
 
             // idk if this is good for performance but it doesnt seem to be a problem in my experience
             DataStore.update("summaries-data", summaries => {
diff --git a/src/plugins/sendTimestamps/index.tsx b/src/plugins/sendTimestamps/index.tsx
index 65c1f11d7..930bf498e 100644
--- a/src/plugins/sendTimestamps/index.tsx
+++ b/src/plugins/sendTimestamps/index.tsx
@@ -170,6 +170,8 @@ const SendTimestampButton: ChatBarButtonFactory = ({ isAnyChat }) => {
 export default definePlugin({
     name: "SendTimestamps",
     description: "Send timestamps easily via chat box button & text shortcuts. Read the extended description!",
+    dependencies: ["ChatInputButtonAPI", "MessagePopoverAPI"],
+    tags: ["Chat", "Commands"],
     authors: [Devs.Ven, Devs.Tyler, Devs.Grzesiek11],
     settings,
 
diff --git a/src/plugins/serverInfo/GuildInfoModal.tsx b/src/plugins/serverInfo/GuildInfoModal.tsx
index 886acd264..7369f455c 100644
--- a/src/plugins/serverInfo/GuildInfoModal.tsx
+++ b/src/plugins/serverInfo/GuildInfoModal.tsx
@@ -20,7 +20,7 @@ import { FluxDispatcher, GuildChannelStore, GuildMemberStore, GuildRoleStore, Gu
 import { settings } from ".";
 
 const IconClasses = findCssClassesLazy("icon", "acronym", "childWrapper");
-const FriendRow = findComponentByCodeLazy("discriminatorClass:", ".isMobileOnline", "getAvatarURL");
+const FriendRow = findComponentByCodeLazy("discriminatorClass:", ".isMobileOnline", "avatarSrc:");
 
 const cl = classNameFactory("vc-gp-");
 
diff --git a/src/plugins/serverInfo/index.tsx b/src/plugins/serverInfo/index.tsx
index 22a58ed4d..e68342efa 100644
--- a/src/plugins/serverInfo/index.tsx
+++ b/src/plugins/serverInfo/index.tsx
@@ -50,9 +50,10 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "ServerInfo",
     description: "Allows you to view info about a server",
+    tags: ["Servers", "Utility"],
     authors: [Devs.Ven, Devs.Nuckyz, EquicordDevs.Z1xus],
     dependencies: ["DynamicImageModalAPI"],
-    tags: ["guild", "info", "ServerProfile"],
+    searchTerms: ["guild", "info", "ServerProfile"],
     isModified: true,
     contextMenus: {
         "guild-context": Patch,
diff --git a/src/plugins/serverListIndicators/index.tsx b/src/plugins/serverListIndicators/index.tsx
index ed71c1f0a..0d31102c9 100644
--- a/src/plugins/serverListIndicators/index.tsx
+++ b/src/plugins/serverListIndicators/index.tsx
@@ -141,6 +141,7 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "ServerListIndicators",
     description: "Add online friend count or server count in the server list",
+    tags: ["Servers", "Appearance"],
     authors: [Devs.dzshn, EquicordDevs.Panniku],
     dependencies: ["ServerListAPI"],
     settings,
diff --git a/src/plugins/shikiCodeblocks.desktop/components/Code.tsx b/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
index 5c924f8e9..a4667d490 100644
--- a/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
+++ b/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { cl } from "@plugins/shikiCodeblocks.desktop/utils/misc";
+import { cl, hljs } from "@plugins/shikiCodeblocks.desktop/utils/misc";
 import type { IThemedToken } from "@vap/shiki";
-import { hljs } from "@webpack/common";
 import { JSX } from "react";
 
 import { ThemeBase } from "./Highlighter";
diff --git a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
index e64fc4a24..4ffe510ac 100644
--- a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
+++ b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
@@ -22,9 +22,9 @@ import { shiki } from "@plugins/shikiCodeblocks.desktop/api/shiki";
 import { useShikiSettings } from "@plugins/shikiCodeblocks.desktop/hooks/useShikiSettings";
 import { useTheme } from "@plugins/shikiCodeblocks.desktop/hooks/useTheme";
 import { hex2Rgb } from "@plugins/shikiCodeblocks.desktop/utils/color";
-import { cl, shouldUseHljs } from "@plugins/shikiCodeblocks.desktop/utils/misc";
+import { cl, hljs, requireHljs, shouldUseHljs } from "@plugins/shikiCodeblocks.desktop/utils/misc";
 import { useAwaiter, useIntersection } from "@utils/react";
-import { hljs, React } from "@webpack/common";
+import { React, useEffect } from "@webpack/common";
 
 import { ButtonRow } from "./ButtonRow";
 import { Code } from "./Code";
@@ -43,13 +43,25 @@ export interface HighlighterProps {
     isPreview: boolean;
 }
 
-export const createHighlighter = (props: HighlighterProps) => (
-    <pre className={cl("container")}>
-        <ErrorBoundary>
-            <Highlighter {...props} />
-        </ErrorBoundary>
-    </pre>
-);
+let didLoadHljs = false;
+export const HighlighterContainer = (props: HighlighterProps) => {
+    const [_, _err, isPending] = useAwaiter(requireHljs);
+
+    useEffect(() => {
+        if (!isPending) didLoadHljs = true;
+    }, [isPending]);
+
+    if (!didLoadHljs && isPending) return null;
+
+    return (
+        <pre className={cl("container")}>
+            <ErrorBoundary>
+                <Highlighter {...props} />
+            </ErrorBoundary>
+        </pre>
+    );
+};
+
 export const Highlighter = ({
     lang,
     content,
diff --git a/src/plugins/shikiCodeblocks.desktop/index.ts b/src/plugins/shikiCodeblocks.desktop/index.tsx
similarity index 87%
rename from src/plugins/shikiCodeblocks.desktop/index.ts
rename to src/plugins/shikiCodeblocks.desktop/index.tsx
index ea333f655..f8fce7dcc 100644
--- a/src/plugins/shikiCodeblocks.desktop/index.ts
+++ b/src/plugins/shikiCodeblocks.desktop/index.tsx
@@ -24,7 +24,7 @@ import definePlugin, { ReporterTestable } from "@utils/types";
 import previewExampleText from "file://previewExample.tsx";
 
 import { shiki } from "./api/shiki";
-import { createHighlighter } from "./components/Highlighter";
+import { HighlighterContainer } from "./components/Highlighter";
 import deviconStyle from "./devicon.css?managed";
 import { settings } from "./settings";
 import { DeviconSetting } from "./types";
@@ -33,6 +33,7 @@ import { clearStyles } from "./utils/createStyle";
 export default definePlugin({
     name: "ShikiCodeblocks",
     description: "Brings vscode-style codeblocks into Discord, powered by Shiki",
+    tags: ["Appearance", "Chat", "Customisation"],
     authors: [Devs.Vap],
     reporterTestable: ReporterTestable.Patches,
     settings,
@@ -53,6 +54,7 @@ export default definePlugin({
             }
         }
     ],
+
     start: async () => {
         if (settings.store.useDevIcon !== DeviconSetting.Disabled)
             enableStyle(deviconStyle);
@@ -63,20 +65,12 @@ export default definePlugin({
         shiki.destroy();
         clearStyles();
     },
-    settingsAboutComponent: () => createHighlighter({
-        lang: "tsx",
-        content: previewExampleText,
-        isPreview: true
-    }),
+
+    settingsAboutComponent: () => <HighlighterContainer lang="tsx" content={previewExampleText} isPreview />,
 
     // exports
     shiki,
-    createHighlighter,
     renderHighlighter: ({ lang, content }: { lang: string; content: string; }) => {
-        return createHighlighter({
-            lang,
-            content,
-            isPreview: false,
-        });
+        return <HighlighterContainer lang={lang?.toLowerCase()} content={content} isPreview={false} />;
     },
 });
diff --git a/src/plugins/shikiCodeblocks.desktop/utils/misc.ts b/src/plugins/shikiCodeblocks.desktop/utils/misc.ts
index 1b2fd27c5..70920fda1 100644
--- a/src/plugins/shikiCodeblocks.desktop/utils/misc.ts
+++ b/src/plugins/shikiCodeblocks.desktop/utils/misc.ts
@@ -20,10 +20,13 @@ import { resolveLang } from "@plugins/shikiCodeblocks.desktop/api/languages";
 import { HighlighterProps } from "@plugins/shikiCodeblocks.desktop/components/Highlighter";
 import { HljsSetting } from "@plugins/shikiCodeblocks.desktop/types";
 import { classNameFactory } from "@utils/css";
-import { hljs } from "@webpack/common";
+import { DefaultExtractAndLoadChunksRegex, extractAndLoadChunksLazy, findByPropsLazy } from "@webpack";
 
 export const cl = classNameFactory("vc-shiki-");
 
+export const hljs: typeof import("highlight.js").default = findByPropsLazy("highlight", "registerLanguage");
+export const requireHljs = extractAndLoadChunksLazy(["codeBlock:{react("], new RegExp(`"hljs".+?${DefaultExtractAndLoadChunksRegex.source}`));
+
 export const shouldUseHljs = ({
     lang,
     tryHljs,
diff --git a/src/plugins/showAllMessageButtons/index.ts b/src/plugins/showAllMessageButtons/index.ts
index 2d1f4bcb1..92c1479f8 100644
--- a/src/plugins/showAllMessageButtons/index.ts
+++ b/src/plugins/showAllMessageButtons/index.ts
@@ -5,7 +5,7 @@
  */
 
 import { definePluginSettings } from "@api/Settings";
-import { Devs, EquicordDevs } from "@utils/constants";
+import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { MessageActions, PinActions } from "@webpack/common";
 
@@ -25,7 +25,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "ShowAllMessageButtons",
     description: "Always show all message buttons no matter if you are holding the shift key or not.",
-    authors: [Devs.Nuckyz, EquicordDevs.mochienya],
+    tags: ["Chat", "Utility"],
+    authors: [Devs.Nuckyz],
     settings,
 
     patches: [
diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index 1c5d3ec5d..0bf38c331 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -161,12 +161,14 @@ function CompactConnectionComponent({ connection, theme }: { connection: Connect
 export default definePlugin({
     name: "ShowConnections",
     description: "Show connected accounts in user popouts",
+    tags: ["Friends", "Appearance"],
     authors: [Devs.TheKodeToad],
     settings,
 
     patches: [
         {
-            find: /\.POPOUT,onClose:\i}\),nicknameIcons:.+?\.isProvisional/,
+            // Same find as ReviewDB
+            find: "#{intl::USER_PROFILE_FRIEND_REQUEST_TOAST}",
             replacement: {
                 match: /userId:\i\.id,guild:\i\}\)(?=])/,
                 replace: "$&,$self.profilePopoutComponent(arguments[0])"
diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 7805deafb..a1a3b9055 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -17,7 +17,6 @@
 */
 
 import { isPluginEnabled } from "@api/PluginManager";
-import { Settings } from "@api/Settings";
 import { BaseText } from "@components/BaseText";
 import ErrorBoundary from "@components/ErrorBoundary";
 import PermissionsViewerPlugin from "@plugins/permissionsViewer";
@@ -28,6 +27,7 @@ import { formatDuration } from "@utils/text";
 import type { Channel, RoleOrUserPermission } from "@vencord/discord-types";
 import { findByPropsLazy, findComponentByCodeLazy, findCssClassesLazy } from "@webpack";
 import { EmojiStore, FluxDispatcher, GuildMemberStore, GuildStore, Parser, PermissionsBits, PermissionStore, SnowflakeUtils, Timestamp, Tooltip, useEffect, useState } from "@webpack/common";
+import { ComponentType } from "react";
 
 import { cl, settings } from "..";
 
@@ -66,9 +66,11 @@ const enum ChannelFlags {
 }
 
 const ChatScrollClasses = findCssClassesLazy("auto", "managedReactiveScroller", "customTheme");
-const ChannelBeginHeader = findComponentByCodeLazy("#{intl::ROLE_REQUIRED_SINGLE_USER_MESSAGE}");
 const TagComponent = findComponentByCodeLazy("#{intl::FORUM_TAG_A11Y_FILTER_BY_TAG}");
 
+let ChannelBeginHeader: ComponentType<any> = () => null;
+export const setChannelBeginHeader = v => ChannelBeginHeader = v;
+
 const EmojiParser = findByPropsLazy("convertSurrogateToName");
 const EmojiUtils = findByPropsLazy("getURL", "getEmojiColors");
 
@@ -143,7 +145,7 @@ function HiddenChannelLockScreen({ channel }: { channel: Channel; }) {
             });
         }
 
-        if (Settings.plugins.PermissionsViewer.enabled) {
+        if (isPluginEnabled(PermissionsViewerPlugin.name)) {
             setPermissions(sortPermissionOverwrites(Object.values(permissionOverwrites).map(overwrite => ({
                 type: overwrite.type,
                 id: overwrite.id,
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 85b9b3ddf..2b6bb2243 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -27,7 +27,7 @@ import definePlugin, { OptionType } from "@utils/types";
 import type { Channel, Role } from "@vencord/discord-types";
 import { ChannelStore, PermissionsBits, PermissionStore, Tooltip } from "@webpack/common";
 
-import HiddenChannelLockScreen from "./components/HiddenChannelLockScreen";
+import HiddenChannelLockScreen, { setChannelBeginHeader } from "./components/HiddenChannelLockScreen";
 
 export const cl = classNameFactory("vc-shc-");
 
@@ -82,6 +82,7 @@ function isUncategorized(objChannel: { channel: Channel; comparator: number; })
 export default definePlugin({
     name: "ShowHiddenChannels",
     description: "Show channels that you do not have access to view.",
+    tags: ["Servers", "Utility"],
     authors: [Devs.BigDuck, Devs.AverageReactEnjoyer, Devs.D3SOX, Devs.Ven, Devs.Nuckyz, Devs.Nickyux, Devs.dzshn, EquicordDevs.Oggetto],
     isModified: true,
     settings,
@@ -150,7 +151,7 @@ export default definePlugin({
                     "renderInviteButton",
                 ].map(func => ({
                     match: new RegExp(`(?<=${func}\\(\\){)`, "g"), // Global because Discord has multiple declarations of the same functions
-                    replace: "if($self.isHiddenChannel(this.props.channel))return null;"
+                    replace: "if($self.isHiddenChannel(this?.props?.channel))return null;"
                 }))
             ]
         },
@@ -160,7 +161,7 @@ export default definePlugin({
             // Render null instead of the buttons if the channel is hidden
             replacement: {
                 match: /(?<=renderOpenChatButton(?:",|=)\(\)=>{)/,
-                replace: "if($self.isHiddenChannel(this.props.channel))return null;"
+                replace: "if($self.isHiddenChannel(this?.props?.channel))return null;"
             }
         },
         {
@@ -168,8 +169,8 @@ export default definePlugin({
             predicate: () => settings.store.showMode === ShowMode.LockIcon,
             replacement: {
                 // Lock Icon
-                match: /(?=switch\((\i)\.type\).{0,30}\.GUILD_ANNOUNCEMENT.{0,70}\(0,\i\.\i\))/,
-                replace: (_, channel) => `if($self.isHiddenChannel(${channel}))return $self.LockIcon;`
+                match: /(?<=(\i)\.isNSFW\(\);)switch\(\i\.type\)/,
+                replace: (m, channel) => `if($self.isHiddenChannel(${channel}))return $self.LockIcon;${m}`
             }
         },
         {
@@ -239,7 +240,7 @@ export default definePlugin({
         },
         {
             // Make the state of the old version of unreads box not include hidden channels
-            find: "ignoreRecents:!0",
+            find: "GUILD_EVENT)}),[",
             replacement: {
                 match: /(?<=\.id\)\))(?=&&\(0,\i\.\i\)\((\i)\))/,
                 replace: "&&!$self.isHiddenChannel($1)"
@@ -267,11 +268,11 @@ export default definePlugin({
                 },
                 {
                     match: /(?<=renderSidebar\(\){)/,
-                    replace: "if($self.isHiddenChannel(this.props.channel))return null;"
+                    replace: "if($self.isHiddenChannel(this?.props?.channel))return null;"
                 },
                 {
                     match: /(?<=renderChat\(\){)/,
-                    replace: "if($self.isHiddenChannel(this.props.channel))return $self.HiddenChannelLockScreen(this.props.channel);"
+                    replace: "if($self.isHiddenChannel(this?.props?.channel))return $self.HiddenChannelLockScreen(this?.props?.channel);"
                 }
             ]
         },
@@ -324,7 +325,7 @@ export default definePlugin({
                 },
                 {
                     // Patch the header to only return allowed users and roles if it's a hidden channel or locked channel (Like when it's used on the HiddenChannelLockScreen)
-                    match: /return\(0,\i\.jsxs?\)\(\i\.\i,{channelId:(\i)\.id(?=.+?(\(0,\i\.jsxs?\)\("div",{className:\i\.\i,children:\[.{0,100}\i\.length>0.+?\]}\)),)/,
+                    match: /return\(0,\i\.jsxs?\)\(\i\.\i,{channelId:(\i)\.id,children:\[(?=.{0,1000}?(\(0,\i\.jsxs?\)\("div",{className:\i\.\i,children:\[.{0,100}\i\.length>0.+?\]}\)),)/,
                     replace: (m, channel, allowedUsersAndRolesComponent) => `if($self.isHiddenChannel(${channel},true)){return${allowedUsersAndRolesComponent};}${m}`
                 },
                 {
@@ -377,22 +378,22 @@ export default definePlugin({
                 {
                     // Render our HiddenChannelLockScreen component instead of the main voice channel component
                     match: /renderContent\(\i\){.+?this\.renderVoiceChannelEffects.+?children:/,
-                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel,true)?$self.HiddenChannelLockScreen(this.props.channel):"
+                    replace: "$&!this?.props?.inCall&&$self.isHiddenChannel(this?.props?.channel,true)?$self.HiddenChannelLockScreen(this?.props?.channel):"
                 },
                 {
                     // Disable gradients for the HiddenChannelLockScreen of voice channels
                     match: /renderContent\(\i\){.+?disableGradients:/,
-                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel,true)||"
+                    replace: "$&!this?.props?.inCall&&$self.isHiddenChannel(this?.props?.channel,true)||"
                 },
                 {
                     // Disable useless components for the HiddenChannelLockScreen of voice channels
                     match: /(?:{|,)render(?!Header|ExternalHeader).{0,30}?:/g,
-                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel,true)?()=>null:"
+                    replace: "$&!this?.props?.inCall&&$self.isHiddenChannel(this?.props?.channel,true)?()=>null:"
                 },
                 {
                     // Disable bad CSS class which mess up hidden voice channels styling
                     match: /(?=\i\|\|\i!==\i\.\i\.FULL_SCREEN.{0,100}?this\._callContainerRef)/,
-                    replace: '$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel,true)?"":'
+                    replace: '$&!this?.props?.inCall&&$self.isHiddenChannel(this?.props?.channel,true)?"":'
                 }
             ]
         },
@@ -498,9 +499,20 @@ export default definePlugin({
                 match: /(getVoiceStateForUser.{0,150}?)&&\i\.\i\.canWithPartialContext.{0,20}VIEW_CHANNEL.+?}\)(?=\?)/,
                 replace: "$1"
             }
+        },
+        {
+            find: "#{intl::ROLE_REQUIRED_SINGLE_USER_MESSAGE}",
+            replacement: {
+                match: /(?=function (\i)\(\i\){let{channel:.{0,200}?getSortedRoles\()/,
+                replace: "$self.ChannelBeginHeader=$1;"
+            }
         }
     ],
 
+    set ChannelBeginHeader(value: any) {
+        setChannelBeginHeader(value);
+    },
+
     swapViewChannelWithConnectPermission(mergedPermissions: bigint, channel: Channel) {
         if (!PermissionStore.can(PermissionsBits.CONNECT, channel)) {
             mergedPermissions &= ~PermissionsBits.VIEW_CHANNEL;
diff --git a/src/plugins/showHiddenThings/index.ts b/src/plugins/showHiddenThings/index.ts
index 9a329474d..5ef238327 100644
--- a/src/plugins/showHiddenThings/index.ts
+++ b/src/plugins/showHiddenThings/index.ts
@@ -37,8 +37,9 @@ const settings = definePluginSettings({
 
 export default definePlugin({
     name: "ShowHiddenThings",
-    tags: ["ShowTimeouts", "ShowInvitesPaused", "ShowModView", "DisableDiscoveryFilters"],
+    searchTerms: ["ShowTimeouts", "ShowInvitesPaused", "ShowModView", "DisableDiscoveryFilters"],
     description: "Displays various hidden & moderator-only things regardless of permissions.",
+    tags: ["Servers", "Utility"],
     authors: [Devs.Dolfies],
     settings,
 
diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx
index 7c8e24582..66370e952 100644
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@@ -26,7 +26,7 @@ import { JSX } from "react";
 const SMYNC = classNameFactory();
 const UserStore = findStoreLazy("UserStore");
 const wrapEmojis = findByCodeLazy("lastIndex;return");
-const adjustColor = findByCodeLazy("light1", "dark1", "toonStroke");
+const adjustColor = findByCodeLazy("light1", '.get("hsl.s"))');
 const AccessibilityStore = findStoreLazy("AccessibilityStore");
 
 const roleColorPattern = /^role((?:\+|-)\d{0,4})?$/iu;
@@ -244,6 +244,8 @@ function validTemplate(value: string) {
     if (invalidOptions) {
         return false;
     }
+
+    return true;
 }
 
 function getProcessedNames(
@@ -765,10 +767,12 @@ function handleHoveringMessage(message: any, isHovering: boolean) {
     const repliedId = message?.messageReference?.message_id;
     const groupId = message?.showMeYourNameGroupId ?? "";
 
+    const effectiveIsHovering = settings.store.alwaysShowEffects || isHovering;
+
     useEffect(() => {
         if (!message) return;
 
-        if (isHovering) {
+        if (effectiveIsHovering) {
             addHoveringMessage(messageId);
             addHoveringMessage(groupId);
             addHoveringReply(repliedId);
@@ -777,7 +781,7 @@ function handleHoveringMessage(message: any, isHovering: boolean) {
             removeHoveringMessage(groupId);
             removeHoveringReply(repliedId);
         }
-    }, [messageId, groupId, isHovering]);
+    }, [messageId, groupId, effectiveIsHovering]);
 }
 
 function addHoveringMessage(id: string) {
@@ -1021,6 +1025,11 @@ const settings = definePluginSettings({
         default: false,
         description: "Only display custom names when in DMs, and not in servers.",
     },
+    alwaysShowEffects: {
+        type: OptionType.BOOLEAN,
+        default: false,
+        description: "Always show effects as if you were hovering.",
+    },
     includedNames: {
         type: OptionType.STRING,
         description: "The order to display usernames, display names, nicknames, friend names, and custom names. Use the following placeholders: {user}, {display}, {nick}, {friend}, {custom}. You can provide multiple name options to use as fallbacks if one is unavailable by separating them with commas as such: {custom, friend, nick}. You can have up to three prefixes and three suffixes per name.",
@@ -1069,7 +1078,8 @@ export default definePlugin({
     name: "ShowMeYourName",
     description: "Display any permutation of custom nicknames, friend nicknames, server nicknames, display names, and usernames in chat.",
     authors: [EquicordDevs.Etorix, Devs.Rini, Devs.TheKodeToad, Devs.sadan, Devs.prism],
-    tags: ["SMYN", "Nicknames", "Custom Nicknames",],
+    tags: ["Appearance", "Customisation"],
+    searchTerms: ["SMYN", "Nicknames", "Custom Nicknames"],
     isModified: true,
     settings,
 
@@ -1121,7 +1131,7 @@ export default definePlugin({
             // because the name is the same as the username.
             find: "location:\"DiscordTag\"});",
             replacement: {
-                match: /(?<=forceUsername:(\i),.{0,550}?displayNameStyles:)\i!==\i\?(\i.displayNameStyles):null/,
+                match: /(?<=,forceUsername:(\i),.*?displayNameStyles:)\i!==\i\?(\i.displayNameStyles):null/,
                 replace: "!$1?$2:null"
             },
         },
@@ -1137,10 +1147,12 @@ export default definePlugin({
             // Track hovering on messages to animate gradients.
             // Attach the group ID to their messages to allow animating gradients within a group.
             find: "CUSTOM_GIFT?\"\":",
-            replacement: {
-                match: /(isHovered:(\i).{0,1300}?\(\i,\i,\i\);)(let \i=\i.id===\i)/,
-                replace: "$1arguments[0].message.showMeYourNameGroupId=!!arguments[0].groupId?`g-${arguments[0].groupId}`:null;$self.handleHoveringMessage(arguments[0].message,$2);$3"
-            },
+            replacement: [
+                {
+                    match: /(hasHovered:\i,isHovered:(\i).{0,2000})(let \i=\i.id===\i,\i=)/,
+                    replace: "$1arguments[0].message.showMeYourNameGroupId=!!arguments[0].groupId?`g-${arguments[0].groupId}`:null;$self.handleHoveringMessage(arguments[0].message,$2);$3",
+                },
+            ],
         },
         {
             // Replace names in mentions.
@@ -1178,8 +1190,8 @@ export default definePlugin({
             // Replace names in profile popouts.
             find: "shouldWrap:!0,loop:!0,inProfile:!0",
             replacement: {
-                match: /(tags:\i,)nickname:(\i)/,
-                replace: "$1showMeYourNameNickname:$2=$self.getTypingMemberListProfilesReactionsVoiceNameText({...arguments[0],type:\"profilesPopout\"})??(arguments[0].nickname)"
+                match: /displayName:(\i),(?=trailing:\i,|size:\i=|displayNameSize:\i)/g,
+                replace: "showMeYourNameNickname:$1=$self.getTypingMemberListProfilesReactionsVoiceNameText({...arguments[0],type:\"profilesPopout\"})??(arguments[0].nickname),"
             },
         },
         {
diff --git a/src/plugins/showTimeoutDuration/index.tsx b/src/plugins/showTimeoutDuration/index.tsx
index bcc5cd760..7fc356038 100644
--- a/src/plugins/showTimeoutDuration/index.tsx
+++ b/src/plugins/showTimeoutDuration/index.tsx
@@ -9,14 +9,13 @@ import "./styles.css";
 import { definePluginSettings } from "@api/Settings";
 import { BaseText } from "@components/BaseText";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { TooltipContainer } from "@components/TooltipContainer";
 import { Devs } from "@utils/constants";
 import { getIntlMessage } from "@utils/discord";
 import { canonicalizeMatch } from "@utils/patches";
 import definePlugin, { OptionType } from "@utils/types";
 import { Message } from "@vencord/discord-types";
 import { findComponentLazy } from "@webpack";
-import { ChannelStore, GuildMemberStore } from "@webpack/common";
+import { ChannelStore, GuildMemberStore, Tooltip } from "@webpack/common";
 import { ReactNode } from "react";
 
 const countDownFilter = canonicalizeMatch(/#{intl::MAX_AGE_NEVER}/);
@@ -69,6 +68,7 @@ function renderTimeout(message: Message, inline: boolean) {
 export default definePlugin({
     name: "ShowTimeoutDuration",
     description: "Shows how much longer a user's timeout will last, either in the timeout icon tooltip or next to it",
+    tags: ["Servers", "Utility"],
     authors: [Devs.Ven, Devs.Sqaaakoi],
 
     settings,
@@ -87,15 +87,23 @@ export default definePlugin({
 
     TooltipWrapper: ErrorBoundary.wrap(({ message, children, text }: { message: Message; children: ReactNode; text: ReactNode; }) => {
         if (settings.store.displayStyle === DisplayStyle.Tooltip)
-            return <TooltipContainer text={renderTimeout(message, false)}>{children}</TooltipContainer>;
+            return (
+                <Tooltip text={renderTimeout(message, false)}>
+                    {tooltipProps => <span {...tooltipProps}>{children}</span>}
+                </Tooltip>
+            );
 
         return (
-            <div className="vc-std-wrapper">
-                <TooltipContainer text={text}>{children}</TooltipContainer>
-                <BaseText size="md" color="text-danger">
-                    {renderTimeout(message, true)} timeout remaining
-                </BaseText>
-            </div>
+            <Tooltip text={renderTimeout(message, false)}>
+                {tooltipProps => (
+                    <div {...tooltipProps} className="vc-std-wrapper">
+                        {children}
+                        <BaseText tag="span" size="md" color="text-danger">
+                            {renderTimeout(message, true)} timeout remaining
+                        </BaseText>
+                    </div>
+                )}
+            </Tooltip>
         );
     }, { noop: true })
 });
diff --git a/src/plugins/showTimeoutDuration/styles.css b/src/plugins/showTimeoutDuration/styles.css
index a6f830c38..cb8fc677b 100644
--- a/src/plugins/showTimeoutDuration/styles.css
+++ b/src/plugins/showTimeoutDuration/styles.css
@@ -1,6 +1,8 @@
 .vc-std-wrapper {
     display: flex;
     align-items: center;
+    width: max-content;
+    max-width: 100%;
 }
 
 .vc-std-wrapper [class*="communicationDisabled"] {
diff --git a/src/plugins/silentMessageToggle/index.tsx b/src/plugins/silentMessageToggle/index.tsx
index 61f543217..9e6eb724c 100644
--- a/src/plugins/silentMessageToggle/index.tsx
+++ b/src/plugins/silentMessageToggle/index.tsx
@@ -110,6 +110,8 @@ export default definePlugin({
     name: "SilentMessageToggle",
     authors: [Devs.Nuckyz, Devs.CatNoir, EquicordDevs.Z1xus],
     description: "Adds a button to the chat bar to toggle sending a silent message.",
+    dependencies: ["ChatInputButtonAPI"],
+    tags: ["Chat", "Utility"],
     settings,
 
     chatBarButton: {
diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx
index e84edcb85..31cbd60ec 100644
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@@ -296,7 +296,9 @@ function shouldHideMembersListTypingIndicators(): boolean {
 export default definePlugin({
     name: "SilentTyping",
     authors: [Devs.Ven, Devs.Rini, Devs.ImBanana, EquicordDevs.Etorix],
-    description: "Hide your typing indicator from chat.",
+    description: "Hide that you are typing",
+    dependencies: ["CommandsAPI", "ChatInputButtonAPI"],
+    tags: ["Chat", "Privacy"],
     isModified: true,
     settings,
 
diff --git a/src/plugins/sortFriendRequests/index.tsx b/src/plugins/sortFriendRequests/index.tsx
index 27efd88c6..b10e0817e 100644
--- a/src/plugins/sortFriendRequests/index.tsx
+++ b/src/plugins/sortFriendRequests/index.tsx
@@ -56,6 +56,7 @@ export default definePlugin({
     name: "SortFriends",
     authors: [Devs.Megu, EquicordDevs.CallMeGii],
     description: "Sorts friend requests by date of receipt",
+    tags: ["Friends", "Organisation"],
     isModified: true,
     settings,
 
diff --git a/src/plugins/spotifyCrack/index.ts b/src/plugins/spotifyCrack/index.ts
index 505e53a12..07c659057 100644
--- a/src/plugins/spotifyCrack/index.ts
+++ b/src/plugins/spotifyCrack/index.ts
@@ -38,6 +38,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "SpotifyCrack",
     description: "Free listen along, no auto-pausing in voice chat, and allows activity to continue playing when idling",
+    tags: ["Media", "Utility", "Activity"],
     authors: [Devs.Cyn, Devs.Nuckyz],
     settings,
 
diff --git a/src/plugins/spotifyShareCommands/index.ts b/src/plugins/spotifyShareCommands/index.ts
index b4a85eb16..b0d5e0fd2 100644
--- a/src/plugins/spotifyShareCommands/index.ts
+++ b/src/plugins/spotifyShareCommands/index.ts
@@ -98,6 +98,8 @@ function makeCommand(name: string, formatUrl: (track: Track) => string): Command
 export default definePlugin({
     name: "SpotifyShareCommands",
     description: "Share your current Spotify track, album or artist via slash command (/track, /album, /artist)",
+    dependencies: ["CommandsAPI"],
+    tags: ["Media", "Commands"],
     authors: [Devs.katlyn],
     commands: [
         makeCommand("track", track => `https://open.spotify.com/track/${track.id}`),
diff --git a/src/plugins/startupTimings/index.tsx b/src/plugins/startupTimings/index.tsx
index 4a8c06807..d61d004eb 100644
--- a/src/plugins/startupTimings/index.tsx
+++ b/src/plugins/startupTimings/index.tsx
@@ -27,6 +27,7 @@ import StartupTimingPage from "./StartupTimingPage";
 export default definePlugin({
     name: "StartupTimings",
     description: "Adds Startup Timings to the Settings menu",
+    tags: ["Developers"],
     authors: [Devs.Megu],
     start() {
         SettingsPlugin.customEntries.push({
diff --git a/src/plugins/stickerPaste/index.ts b/src/plugins/stickerPaste/index.ts
index 8a0082073..0dd0bd2b3 100644
--- a/src/plugins/stickerPaste/index.ts
+++ b/src/plugins/stickerPaste/index.ts
@@ -10,6 +10,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "StickerPaste",
     description: "Makes picking a sticker in the sticker picker insert it into the chatbox instead of instantly sending",
+    tags: ["Emotes", "Chat"],
     authors: [Devs.ImBanana],
 
     patches: [
diff --git a/src/plugins/streamerModeOnStream/index.ts b/src/plugins/streamerModeOnStream/index.ts
index 26b4a279c..49609ac61 100644
--- a/src/plugins/streamerModeOnStream/index.ts
+++ b/src/plugins/streamerModeOnStream/index.ts
@@ -37,6 +37,7 @@ function toggleStreamerMode({ streamKey }: StreamEvent, value: boolean) {
 export default definePlugin({
     name: "StreamerModeOn",
     description: "Automatically enables streamer mode when you start streaming in Discord",
+    tags: ["Privacy", "Utility"],
     authors: [Devs.IcedMarina],
     flux: {
         STREAM_CREATE: d => toggleStreamerMode(d, true),
diff --git a/src/plugins/superReactionTweaks/index.ts b/src/plugins/superReactionTweaks/index.ts
index 0ca873efa..2ea268040 100644
--- a/src/plugins/superReactionTweaks/index.ts
+++ b/src/plugins/superReactionTweaks/index.ts
@@ -37,6 +37,7 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "SuperReactionTweaks",
     description: "Customize the limit of Super Reactions playing at once, and super react by default",
+    tags: ["Reactions", "Emotes"],
     authors: [Devs.FieryFlames, Devs.ant0n],
     patches: [
         {
@@ -52,7 +53,7 @@ export default definePlugin({
         {
             find: ".EMOJI_PICKER_CONSTANTS_EMOJI_CONTAINER_PADDING_HORIZONTAL)",
             replacement: {
-                match: /(openPopoutType:void 0(?=.+?isBurstReaction:(\i).+?(\i===\i\.\i.REACTION)).+?\[\2,\i\]=\i\.useState\().+?\)/,
+                match: /(openPopoutType:void 0(?=.+?isBurstReaction:(\i).+?;(\i===\i\.\i\.REACTION)&&\i\.push\().+?\[\2,\i\]=\i\.useState\()!1\)/,
                 replace: (_, rest, _isBurstReactionVariable, isReactionIntention) => `${rest}$self.shouldSuperReactByDefault&&${isReactionIntention})`
             }
         }
diff --git a/src/plugins/textReplace/index.tsx b/src/plugins/textReplace/index.tsx
index 289f4ee4f..68938e8dc 100644
--- a/src/plugins/textReplace/index.tsx
+++ b/src/plugins/textReplace/index.tsx
@@ -303,10 +303,11 @@ const TEXT_REPLACE_RULES_EXEMPT_CHANNEL_IDS = [
 
 export default definePlugin({
     name: "TextReplace",
-    description: "Replace text in your or others' messages. You can find pre-made rules in the #textreplace-rules channel in Vencord's Server.",
+    description: "Replace text in your messages. You can find pre-made rules in the #textreplace-rules channel in Vencord's Server",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Chat", "Customisation", "Utility"],
     authors: [Devs.AutumnVN, Devs.TheKodeToad, EquicordDevs.Etorix],
     isModified: true,
-
     settings,
     modifyIncomingMessage,
 
diff --git a/src/plugins/themeAttributes/index.ts b/src/plugins/themeAttributes/index.ts
index e71dec0ad..37a4f2a9d 100644
--- a/src/plugins/themeAttributes/index.ts
+++ b/src/plugins/themeAttributes/index.ts
@@ -13,6 +13,7 @@ import { UserStore } from "@webpack/common";
 export default definePlugin({
     name: "ThemeAttributes",
     description: "Adds data attributes to various elements for theming purposes",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.Ven, Devs.Board],
 
     patches: [
@@ -22,7 +23,7 @@ export default definePlugin({
             find: ".tabBarRef",
             replacement: {
                 match: /style:this\.getStyle\(\),role:"tab"/,
-                replace: "$&,'data-tab-id':this.props.id"
+                replace: "$&,'data-tab-id':this?.props?.id"
             }
         },
 
@@ -57,7 +58,7 @@ export default definePlugin({
     ],
 
     getAvatarStyles(src: string | null) {
-        if (!src || src.startsWith("data:")) return {};
+        if (typeof src !== "string" || src.startsWith("data:")) return {};
 
         return Object.fromEntries(
             [128, 256, 512, 1024, 2048, 4096].map(size => [
diff --git a/src/plugins/translate/TranslateIcon.tsx b/src/plugins/translate/TranslateIcon.tsx
index ed623328e..6b814c331 100644
--- a/src/plugins/translate/TranslateIcon.tsx
+++ b/src/plugins/translate/TranslateIcon.tsx
@@ -18,13 +18,13 @@
 
 import { ChatBarButton, ChatBarButtonFactory } from "@api/ChatButtons";
 import { Paragraph } from "@components/Paragraph";
+import { TooltipContainer } from "@components/TooltipContainer";
 import { classes } from "@utils/misc";
-import { openModal } from "@utils/modal";
 import { IconComponent } from "@utils/types";
-import { Alerts, Tooltip, useEffect, useState } from "@webpack/common";
+import { Alerts, useEffect, useState } from "@webpack/common";
 
 import { settings } from "./settings";
-import { TranslateModal } from "./TranslateModal";
+import { openTranslateModal } from "./TranslateModal";
 import { cl } from "./utils";
 
 export const TranslateIcon: IconComponent = ({ height = 20, width = 20, className }) => {
@@ -79,10 +79,7 @@ export const TranslateChatBarIcon: ChatBarButtonFactory = ({ isMainChat }) => {
             tooltip="Open Translate Modal"
             onClick={e => {
                 if (e.shiftKey) return toggle();
-
-                openModal(props => (
-                    <TranslateModal rootProps={props} />
-                ));
+                else openTranslateModal();
             }}
             onContextMenu={toggle}
             buttonProps={{
@@ -95,9 +92,9 @@ export const TranslateChatBarIcon: ChatBarButtonFactory = ({ isMainChat }) => {
 
     if (shouldShowTranslateEnabledTooltip && settings.store.showAutoTranslateTooltip)
         return (
-            <Tooltip text="Auto Translate Enabled" forceOpen>
-                {() => button}
-            </Tooltip>
+            <TooltipContainer text="Auto Translate Enabled" forceOpen>
+                {button}
+            </TooltipContainer>
         );
 
     return button;
diff --git a/src/plugins/translate/TranslateModal.tsx b/src/plugins/translate/TranslateModal.tsx
index f53c89711..be3e67117 100644
--- a/src/plugins/translate/TranslateModal.tsx
+++ b/src/plugins/translate/TranslateModal.tsx
@@ -16,11 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { BaseText } from "@components/BaseText";
 import { Divider } from "@components/Divider";
 import { FormSwitch } from "@components/FormSwitch";
-import { HeadingPrimary, HeadingSecondary } from "@components/Heading";
+import { HeadingSecondary } from "@components/Heading";
 import { Margins } from "@utils/margins";
-import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot } from "@utils/modal";
+import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
 import { SearchableSelect, useMemo } from "@webpack/common";
 
 import { settings } from "./settings";
@@ -77,9 +78,9 @@ export function TranslateModal({ rootProps }: { rootProps: ModalProps; }) {
     return (
         <ModalRoot {...rootProps}>
             <ModalHeader className={cl("modal-header")}>
-                <HeadingPrimary className={cl("modal-title")}>
+                <BaseText tag="h2" size="lg" weight="semibold" className={cl("modal-title")}>
                     Translate
-                </HeadingPrimary>
+                </BaseText>
                 <ModalCloseButton onClick={rootProps.onClose} />
             </ModalHeader>
 
@@ -99,3 +100,7 @@ export function TranslateModal({ rootProps }: { rootProps: ModalProps; }) {
         </ModalRoot>
     );
 }
+
+export function openTranslateModal() {
+    openModal(props => <TranslateModal rootProps={props} />);
+}
diff --git a/src/plugins/translate/index.tsx b/src/plugins/translate/index.tsx
index d5d36c121..405eb2112 100644
--- a/src/plugins/translate/index.tsx
+++ b/src/plugins/translate/index.tsx
@@ -62,8 +62,10 @@ let tooltipTimeout: any;
 
 export default definePlugin({
     name: "Translate",
-    description: "Translate messages with Google Translate or DeepL",
-    authors: [Devs.Ven, Devs.AshtonMemer],
+    description: "Translate messages with Google Translate, DeepL or Kagi.",
+    dependencies: ["ChatInputButtonAPI", "MessageAccessoriesAPI", "MessagePopoverAPI"],
+    tags: ["Chat", "Utility"],
+    authors: [Devs.Ven, Devs.AshtonMemer, Devs.koish1],
     settings,
     contextMenus: {
         "message": messageCtxPatch
diff --git a/src/plugins/translate/languages.ts b/src/plugins/translate/languages.ts
index 1023983f8..2f433e377 100644
--- a/src/plugins/translate/languages.ts
+++ b/src/plugins/translate/languages.ts
@@ -33,6 +33,7 @@ copy(Object.fromEntries(
 
 export type GoogleLanguage = keyof typeof GoogleLanguages;
 export type DeeplLanguage = keyof typeof DeeplLanguages;
+export type KagiLanguage = keyof typeof KagiLanguages;
 
 export const GoogleLanguages = {
     "auto": "Detect language",
@@ -318,3 +319,286 @@ export function deeplLanguageToGoogleLanguage(language: string) {
             return language;
     }
 }
+
+// Generated using:
+// curl https://translate.kagi.com/api/list-languages | jq 'map({(.language | ascii_downcase): .name}) | add | to_entries | sort_by(.value) | from_entries'
+// Add "auto": "Detect language", as Kagi has no "language" for Detect Language, however anything not
+// in the list will work as auto. Using "auto" will have this work using Google Translate defaults.
+// Retrieved 2026-05-02. Meme languages and redundant entries removed.
+export const KagiLanguages = {
+    "auto": "Detect language",
+    "om": "(Afan)/Oromoor/Oriya",
+    "ab": "Abkhazian",
+    "ace": "Acehnese",
+    "ach": "Acholi",
+    "aa": "Afar",
+    "af": "Afrikaans",
+    "ak": "Akan",
+    "sq": "Albanian",
+    "alz": "Alur",
+    "am": "Amharic",
+    "ar": "Arabic",
+    "an": "Aragonese",
+    "hy": "Armenian",
+    "as": "Assamese",
+    "av": "Avaric",
+    "ae": "Avestan",
+    "ava": "Awadhi",
+    "ay": "Aymara",
+    "az": "Azerbaijani",
+    "ban": "Balinese",
+    "bal": "Baluchi",
+    "bm": "Bambara",
+    "bci": "Baoulé",
+    "ba": "Bashkir",
+    "eu": "Basque",
+    "btk": "Batak",
+    "bar": "Bavarian",
+    "be": "Belarusian",
+    "bem": "Bemba",
+    "bn": "Bengali",
+    "bew": "Betawi",
+    "bho": "Bhojpuri",
+    "dz": "Bhutani",
+    "bh": "Bihari",
+    "bcl": "Bikol",
+    "bi": "Bislama",
+    "bs": "Bosnian",
+    "br": "Breton",
+    "bg": "Bulgarian",
+    "my": "Burmese",
+    "bua": "Buryat",
+    "km": "Cambodian",
+    "yue": "Cantonese",
+    "ca": "Catalan",
+    "ceb": "Cebuano",
+    "ch": "Chamorro",
+    "ce": "Chechen",
+    "chr": "Cherokee",
+    "ny": "Chichewa",
+    "zh_cn": "Chinese (Simplified)",
+    "zh_tw": "Chinese (Traditional)",
+    "cu": "Church Slavonic",
+    "chk": "Chuukese",
+    "cv": "Chuvash",
+    "kw": "Cornish",
+    "co": "Corsican",
+    "cr": "Cree",
+    "crh": "Crimean Tatar",
+    "hr": "Croatian",
+    "cs": "Czech",
+    "da": "Danish",
+    "din": "Dinka",
+    "div": "Divehi",
+    "doi": "Dogri",
+    "dov": "Dombe",
+    "nl": "Dutch",
+    "dyu": "Dyula",
+    "en_gb": "English (UK)",
+    "en_us": "English (US)",
+    "eo": "Esperanto",
+    "et": "Estonian",
+    "ee": "Ewe",
+    "fo": "Faroese",
+    "fj": "Fiji",
+    "fil": "Filipino",
+    "fi": "Finnish",
+    "fon": "Fon",
+    "fr": "French",
+    "fy": "Frisian",
+    "fur": "Friulian",
+    "ff": "Fulah",
+    "gaa": "Ga",
+    "gl": "Galician",
+    "lg": "Ganda",
+    "ka": "Georgian",
+    "de": "German",
+    "hac": "Gorani (Hawrami)",
+    "el": "Greek",
+    "kl": "Greenlandic",
+    "gn": "Guarani",
+    "gu": "Gujarati",
+    "ht": "Haitian",
+    "ha": "Hausa",
+    "haw": "Hawaiian",
+    "he": "Hebrew",
+    "hz": "Herero",
+    "hil": "Hiligaynon",
+    "hi": "Hindi",
+    "ho": "Hiri Motu",
+    "hu": "Hungarian",
+    "hrx": "Hunsrik",
+    "iba": "Iban",
+    "is": "Icelandic",
+    "io": "Ido",
+    "ig": "Igbo",
+    "ilo": "Ilocano",
+    "id": "Indonesian",
+    "ia": "Interlingua",
+    "ie": "Interlingue",
+    "iu": "Inuktitut",
+    "ik": "Inupiak",
+    "ga": "Irish Gaelic",
+    "it": "Italian",
+    "jam": "Jamaican Patois",
+    "ja": "Japanese",
+    "jv": "Javanese",
+    "cpe": "Jingpo",
+    "kn": "Kannada",
+    "kr": "Kanuri",
+    "ks": "Kashmiri",
+    "kk": "Kazakh",
+    "kha": "Khasi",
+    "ki": "Kikuyu",
+    "rw": "Kinyarwanda",
+    "ky": "Kirghiz",
+    "rn": "Kirundi",
+    "ktu": "Kituba",
+    "kv": "Komi",
+    "kg": "Kongo",
+    "kok": "Konkani",
+    "ko": "Korean",
+    "kj": "Kuanyama",
+    "ku": "Kurdish (Kurmanji)",
+    "ckb": "Kurdish (Sorani)",
+    "sdh": "Kurdish (Xwarin)",
+    "lo": "Laothian",
+    "ltg": "Latgalian",
+    "la": "Latin",
+    "lv": "Latvian",
+    "lij": "Ligurian",
+    "li": "Limburgan",
+    "lim": "Limburgish",
+    "ln": "Lingala",
+    "lt": "Lithuanian",
+    "lmo": "Lombard",
+    "lu": "Luba_Katanga",
+    "luo": "Luo",
+    "lb": "Luxembourgish",
+    "mk": "Macedonian",
+    "mad": "Madurese",
+    "mai": "Maithili",
+    "mak": "Makassar",
+    "mg": "Malagasy",
+    "ms": "Malay",
+    "ml": "Malayalam",
+    "mt": "Maltese",
+    "gv": "Manx Gaelic",
+    "mi": "Maori",
+    "mr": "Marathi",
+    "mh": "Marshallese",
+    "mwr": "Marwadi",
+    "mo": "Moldavian",
+    "mn": "Mongolian",
+    "cnr": "Montenegrin",
+    "nqo": "NKo",
+    "nhe": "Nahuatl",
+    "na": "Nauru",
+    "nv": "Navajo",
+    "ndc": "Ndau",
+    "ng": "Ndonga",
+    "new": "Nepalbhasa",
+    "ne": "Nepali",
+    "nd": "North Ndebele",
+    "se": "Northern Sami",
+    "ns": "Northern Sotho",
+    "no": "Norwegian",
+    "nb": "Norwegian (Bokmål)",
+    "nn": "Norwegian (Nynorsk)",
+    "nus": "Nuer",
+    "oc": "Occitan",
+    "oj": "Ojibwa",
+    "or": "Oriya",
+    "os": "Ossetian",
+    "pi": "Pali",
+    "pag": "Pangasinan",
+    "pap": "Papiamento",
+    "ps": "Pashto/Pushto",
+    "fa": "Persian",
+    "pl": "Polish",
+    "pt_br": "Portuguese (Brazil)",
+    "pt_pt": "Portuguese (Portugal)",
+    "pa": "Punjabi",
+    "qu": "Quechua",
+    "kek": "Qʼeqchiʼ",
+    "rm": "Rhaeto_Romanic",
+    "rom": "Romani",
+    "ro": "Romanian",
+    "ru": "Russian",
+    "sm": "Samoan",
+    "sg": "Sangro",
+    "sa": "Sanskrit",
+    "sat": "Santali",
+    "sc": "Sardinian",
+    "sco": "Scots",
+    "gd": "Scottish Gaelic",
+    "sr": "Serbian",
+    "sh": "Serbo_Croatian",
+    "st": "Sesotho",
+    "seto": "Seto",
+    "shn": "Shan",
+    "sn": "Shona",
+    "ii": "Sichuan Yi",
+    "scn": "Sicilian",
+    "szl": "Silesian",
+    "sd": "Sindhi",
+    "si": "Sinhalese",
+    "ss": "Siswati",
+    "sk": "Slovak",
+    "sl": "Slovenian",
+    "so": "Somali",
+    "sb": "Sorbian",
+    "nr": "South Ndebele",
+    "sma": "Southern Sami",
+    "es": "Spanish",
+    "su": "Sundanese",
+    "sus": "Susu",
+    "sx": "Sutu",
+    "sw": "Swahili",
+    "sv": "Swedish",
+    "gsw": "Swiss German",
+    "syr": "Syriac",
+    "tl": "Tagalog",
+    "ty": "Tahitian",
+    "tg": "Tajik",
+    "ta": "Tamil",
+    "tt": "Tatar",
+    "te": "Telugu",
+    "tet": "Tetum",
+    "th": "Thai",
+    "bo": "Tibetan",
+    "ti": "Tigrinya",
+    "tiv": "Tiv",
+    "tpi": "Tok Pisin",
+    "to": "Tonga",
+    "ts": "Tsonga",
+    "tn": "Tswana",
+    "tum": "Tumbuka",
+    "tr": "Turkish",
+    "tk": "Turkmen",
+    "tyv": "Tuvan",
+    "tw": "Twi",
+    "udm": "Udmurt",
+    "ug": "Uighur",
+    "uk": "Ukrainian",
+    "ur": "Urdu",
+    "uz": "Uzbek",
+    "ve": "Venda",
+    "vec": "Venetian",
+    "vi": "Vietnamese",
+    "vo": "Volapuk",
+    "vro": "Võro",
+    "wa": "Walloon",
+    "war": "Waray",
+    "cy": "Welsh",
+    "wo": "Wolof",
+    "xh": "Xhosa",
+    "sah": "Yakut",
+    "yi": "Yiddish",
+    "yo": "Yoruba",
+    "yua": "Yucatec Maya",
+    "zap": "Zapotec",
+    "diq": "Zazaki",
+    "za": "Zhuang",
+    "zu": "Zulu"
+} as const;
diff --git a/src/plugins/translate/native.ts b/src/plugins/translate/native.ts
index 3415e95e9..93c7a25f8 100644
--- a/src/plugins/translate/native.ts
+++ b/src/plugins/translate/native.ts
@@ -27,3 +27,28 @@ export async function makeDeeplTranslateRequest(_: IpcMainInvokeEvent, pro: bool
         return { status: -1, data: String(e) };
     }
 }
+
+export async function makeKagiTranslateRequest(_: IpcMainInvokeEvent, token: string, text: string, sourceLang: string, targetLang: string) {
+    const url = "https://translate.kagi.com/api/translate";
+
+    try {
+        const res = await fetch(url, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                "Cookie": `kagi_session=${token}`
+            },
+            body: JSON.stringify({
+                text,
+                from: sourceLang,
+                to: targetLang,
+                model: "standard"
+            }),
+        });
+
+        const data = await res.json();
+        return { status: res.status, data };
+    } catch (e) {
+        return { status: -1, data: String(e) };
+    }
+}
diff --git a/src/plugins/translate/settings.ts b/src/plugins/translate/settings.tsx
similarity index 57%
rename from src/plugins/translate/settings.ts
rename to src/plugins/translate/settings.tsx
index 5ab3883a4..cbb39e696 100644
--- a/src/plugins/translate/settings.ts
+++ b/src/plugins/translate/settings.tsx
@@ -17,68 +17,89 @@
 */
 
 import { definePluginSettings } from "@api/Settings";
+import { Button } from "@components/Button";
 import { OptionType } from "@utils/types";
 
+import { openTranslateModal } from "./TranslateModal";
+
 export const settings = definePluginSettings({
     receivedInput: {
         type: OptionType.STRING,
-        description: "Language that received messages should be translated from",
+        description: "Language incoming messages are translated from",
         default: "auto",
         hidden: true
     },
     receivedOutput: {
         type: OptionType.STRING,
-        description: "Language that received messages should be translated to",
+        description: "Language incoming messages are translated to",
         default: "en",
         hidden: true
     },
     sentInput: {
         type: OptionType.STRING,
-        description: "Language that your own messages should be translated from",
+        description: "Language your messages are translated from",
         default: "auto",
         hidden: true
     },
     sentOutput: {
         type: OptionType.STRING,
-        description: "Language that your own messages should be translated to",
+        description: "Language your messages are translated to",
         default: "en",
         hidden: true
     },
-
     service: {
         type: OptionType.SELECT,
-        description: IS_WEB ? "Translation service (Not supported on Web!)" : "Translation service",
-        disabled: () => IS_WEB,
+        description: IS_WEB ? "Translation provider (not available on web)" : "Translation provider",
+        hidden: IS_WEB,
         options: [
             { label: "Google Translate", value: "google", default: true },
-            { label: "DeepL Free", value: "deepl" },
-            { label: "DeepL Pro", value: "deepl-pro" }
+            { label: "DeepL Free — API key required", value: "deepl" },
+            { label: "DeepL Pro — API key required", value: "deepl-pro" },
+            { label: "Kagi Translate — API key required", value: "kagi" }
         ] as const,
         onChange: resetLanguageDefaults
     },
     deeplApiKey: {
         type: OptionType.STRING,
-        description: "DeepL API key",
-        default: "",
-        placeholder: "Get your API key from https://deepl.com/your-account",
-        disabled: () => IS_WEB
+        description: "Your DeepL API key (from deepl.com/your-account)",
+        default: ""
+    },
+    kagiSession: {
+        type: OptionType.STRING,
+        description: "Your Kagi session token (from kagi.com/settings?p=user_details)",
+        default: ""
     },
     autoTranslate: {
         type: OptionType.BOOLEAN,
-        description: "Automatically translate your messages before sending. You can also shift/right click the translate button to toggle this",
+        description: "Automatically translate your messages before sending. You can also Shift+click or right-click the translate button to toggle this",
         default: false
     },
     showAutoTranslateTooltip: {
         type: OptionType.BOOLEAN,
-        description: "Show a tooltip on the ChatBar button whenever a message is automatically translated",
+        description: "Show a tooltip on the chat bar button when a message is auto-translated",
         default: true
+    },
+    manageTranslateSettings: {
+        type: OptionType.COMPONENT,
+        component: () => (
+            <Button onClick={openTranslateModal}>
+                Customize translation languages & Auto-Translate
+            </Button>
+        )
+    }
+}, {
+    deeplApiKey: {
+        hidden() { return this.store.service !== "deepl" && this.store.service !== "deepl-pro"; }
+    },
+    kagiSession: {
+        hidden() { return this.store.service !== "kagi"; }
     }
 }).withPrivateSettings<{
     showAutoTranslateAlert: boolean;
 }>();
 
 export function resetLanguageDefaults() {
-    if (IS_WEB || settings.store.service === "google") {
+    if (IS_WEB || settings.store.service === "google" || settings.store.service === "kagi") {
         settings.store.receivedInput = "auto";
         settings.store.receivedOutput = "en";
         settings.store.sentInput = "auto";
diff --git a/src/plugins/translate/utils.ts b/src/plugins/translate/utils.ts
index 4ee16c93e..2c77db511 100644
--- a/src/plugins/translate/utils.ts
+++ b/src/plugins/translate/utils.ts
@@ -21,7 +21,7 @@ import { onlyOnce } from "@utils/onlyOnce";
 import { PluginNative } from "@utils/types";
 import { showToast, Toasts } from "@webpack/common";
 
-import { DeeplLanguages, deeplLanguageToGoogleLanguage, GoogleLanguages } from "./languages";
+import { DeeplLanguages, deeplLanguageToGoogleLanguage, GoogleLanguages, KagiLanguages } from "./languages";
 import { resetLanguageDefaults, settings } from "./settings";
 
 export const cl = classNameFactory("vc-trans-");
@@ -40,19 +40,43 @@ interface DeeplData {
     }[];
 }
 
+interface KagiData {
+    translation: string;
+    detected_language: {
+        label: string;
+    };
+}
+
 export interface TranslationValue {
     sourceLanguage: string;
     text: string;
 }
 
-export const getLanguages = () => IS_WEB || settings.store.service === "google"
-    ? GoogleLanguages
-    : DeeplLanguages;
+export const getLanguages = () => {
+    if (IS_WEB) {
+        return GoogleLanguages;
+    }
+    switch (settings.store.service) {
+        case "google":
+            return GoogleLanguages;
+        case "kagi":
+            return KagiLanguages;
+        default:
+            return DeeplLanguages;
+    }
+};
 
 export async function translate(kind: "received" | "sent", text: string): Promise<TranslationValue> {
-    const translate = IS_WEB || settings.store.service === "google"
-        ? googleTranslate
-        : deeplTranslate;
+    const translate = IS_WEB ? googleTranslate : (() => {
+        switch (settings.store.service) {
+            case "google":
+                return googleTranslate;
+            case "kagi":
+                return kagiTranslate;
+            default:
+                return deeplTranslate;
+        }
+    })();
 
     try {
         return await translate(
@@ -153,3 +177,25 @@ async function deeplTranslate(text: string, sourceLang: string, targetLang: stri
         text: translations[0].text
     };
 }
+
+async function kagiTranslate(text: string, sourceLang: string, targetLang: string): Promise<TranslationValue> {
+    const { status, data } = await Native.makeKagiTranslateRequest(
+        settings.store.kagiSession, text, sourceLang, targetLang
+    );
+
+    switch (status) {
+        case 200:
+            break;
+        case 401:
+            throw "Invalid or expired Kagi session token";
+        default:
+            throw new Error(`Failed to translate "${text}" (${sourceLang} -> ${targetLang})\n${status} ${data}`);
+    }
+
+    const { detected_language, translation }: KagiData = data;
+
+    return {
+        sourceLanguage: detected_language.label,
+        text: translation
+    };
+}
diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index ecfb841ee..b5c02af04 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -18,9 +18,10 @@
 
 import "./style.css";
 
-import { definePluginSettings, Settings } from "@api/Settings";
+import { isPluginEnabled } from "@api/PluginManager";
+import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { buildSeveralUsers } from "@plugins/typingTweaks";
+import TypingTweaksPlugin, { buildSeveralUsers } from "@plugins/typingTweaks";
 import { Devs } from "@utils/constants";
 import { getIntlMessage } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
@@ -85,7 +86,7 @@ function TypingIndicator({ channelId, guildId }: { channelId: string; guildId: s
             break;
         }
         default: {
-            tooltipText = Settings.plugins.TypingTweaks.enabled
+            tooltipText = isPluginEnabled(TypingTweaksPlugin.name)
                 ? buildSeveralUsers({ users: [a, b].map(UserStore.getUser), count: typingUsersArray.length - 2, guildId })
                 : getIntlMessage("SEVERAL_USERS_TYPING");
             break;
@@ -166,6 +167,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "TypingIndicator",
     description: "Adds an indicator if someone is typing on a channel.",
+    tags: ["Notifications", "Appearance", "Servers"],
     authors: [Devs.Nuckyz, Devs.fawn, Devs.Sqaaakoi],
     isModified: true,
     settings,
diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx
index 1b72581d3..4832478bf 100644
--- a/src/plugins/typingTweaks/index.tsx
+++ b/src/plugins/typingTweaks/index.tsx
@@ -114,6 +114,7 @@ migratePluginToSettings(true, "TypingTweaks", "AmITyping", "amITyping");
 export default definePlugin({
     name: "TypingTweaks",
     description: "Show avatars and role colours in the typing indicator",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.zt, Devs.sadan, EquicordDevs.MrDiamond],
     settings,
     isModified: true,
diff --git a/src/plugins/unindent/index.ts b/src/plugins/unindent/index.ts
index 1a548a68e..9ebbf8deb 100644
--- a/src/plugins/unindent/index.ts
+++ b/src/plugins/unindent/index.ts
@@ -23,6 +23,8 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "Unindent",
     description: "Trims leading indentation from codeblocks",
+    dependencies: ["MessageEventsAPI"],
+    tags: ["Chat", "Utility"],
     authors: [Devs.Ven],
 
     patches: [
diff --git a/src/plugins/unlockedAvatarZoom/index.ts b/src/plugins/unlockedAvatarZoom/index.ts
index dc8de74db..fbab2b734 100644
--- a/src/plugins/unlockedAvatarZoom/index.ts
+++ b/src/plugins/unlockedAvatarZoom/index.ts
@@ -20,6 +20,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "UnlockedAvatarZoom",
     description: "Allows you to zoom in further in the image crop tool when changing your avatar",
+    tags: ["Media", "Utility"],
     authors: [Devs.nakoyasha],
     settings,
     patches: [
diff --git a/src/plugins/unsuppressEmbeds/index.tsx b/src/plugins/unsuppressEmbeds/index.tsx
index 9f4baeee3..6ad1a6850 100644
--- a/src/plugins/unsuppressEmbeds/index.tsx
+++ b/src/plugins/unsuppressEmbeds/index.tsx
@@ -62,6 +62,7 @@ export default definePlugin({
     name: "UnsuppressEmbeds",
     authors: [Devs.rad, Devs.HypedDomi],
     description: "Allows you to unsuppress embeds in messages",
+    tags: ["Chat", "Utility"],
     contextMenus: {
         "message": messageContextMenuPatch
     }
diff --git a/src/plugins/userMessagesPronouns/index.ts b/src/plugins/userMessagesPronouns/index.ts
index 56721e11f..1088e2f20 100644
--- a/src/plugins/userMessagesPronouns/index.ts
+++ b/src/plugins/userMessagesPronouns/index.ts
@@ -28,6 +28,7 @@ export default definePlugin({
     name: "UserMessagesPronouns",
     authors: [Devs.Tyman, Devs.TheKodeToad, Devs.Ven, Devs.Elvyra],
     description: "Adds pronouns to chat user messages",
+    tags: ["Chat", "Appearance"],
     settings,
 
     patches: [
diff --git a/src/plugins/userVoiceShow/index.tsx b/src/plugins/userVoiceShow/index.tsx
index ec97530e5..fb6f0c8df 100644
--- a/src/plugins/userVoiceShow/index.tsx
+++ b/src/plugins/userVoiceShow/index.tsx
@@ -48,6 +48,8 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "UserVoiceShow",
     description: "Shows an indicator when a user is in a Voice Channel",
+    tags: ["Voice", "Appearance", "Friends"],
+    dependencies: ["MemberListDecoratorsAPI", "MessageDecorationsAPI", "NicknameIconsAPI"],
     authors: [Devs.Nuckyz, Devs.LordElias, EquicordDevs.omaw],
     settings,
     renderNicknameIcon({ userId }) {
diff --git a/src/plugins/usrbg/index.tsx b/src/plugins/usrbg/index.tsx
index b77efb8f7..8d1c40d72 100644
--- a/src/plugins/usrbg/index.tsx
+++ b/src/plugins/usrbg/index.tsx
@@ -54,6 +54,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "USRBG",
     description: "Displays user banners from USRBG, allowing anyone to get a banner without Nitro",
+    tags: ["Appearance", "Customisation"],
     authors: [Devs.AutumnVN, Devs.katlyn, Devs.pylix, Devs.TheKodeToad],
     settings,
     patches: [
diff --git a/src/plugins/validReply/index.ts b/src/plugins/validReply/index.ts
index 2ca072040..988d67cf4 100644
--- a/src/plugins/validReply/index.ts
+++ b/src/plugins/validReply/index.ts
@@ -33,6 +33,7 @@ const createMessageRecord = findByCodeLazy(".createFromServer(", ".isBlockedForM
 export default definePlugin({
     name: "ValidReply",
     description: 'Fixes "Message could not be loaded" upon hovering over the reply',
+    tags: ["Chat", "Utility"],
     authors: [Devs.newwares],
     patches: [
         {
diff --git a/src/plugins/validUser/index.tsx b/src/plugins/validUser/index.tsx
index 2ff829a12..3fa17ef6f 100644
--- a/src/plugins/validUser/index.tsx
+++ b/src/plugins/validUser/index.tsx
@@ -177,8 +177,9 @@ function MentionWrapper({ data, UserMention, RoleMention, parse, props }: Mentio
 export default definePlugin({
     name: "ValidUser",
     description: "Fix mentions for unknown users showing up as '@unknown-user' (hover over a mention to fix it)",
+    tags: ["Chat", "Utility"],
     authors: [Devs.Ven, Devs.Dolfies],
-    tags: ["MentionCacheFix"],
+    searchTerms: ["MentionCacheFix"],
 
     patches: [
         {
diff --git a/src/plugins/vcDoubleClick/index.ts b/src/plugins/vcDoubleClick/index.ts
index d9310f51f..dec46ef7c 100644
--- a/src/plugins/vcDoubleClick/index.ts
+++ b/src/plugins/vcDoubleClick/index.ts
@@ -28,13 +28,15 @@ const timers = {} as Record<string, {
 export default definePlugin({
     name: "VoiceChatDoubleClick",
     description: "Join voice chats via double click instead of single click",
+    tags: ["Voice"],
     authors: [Devs.Ven, Devs.D3SOX, Devs.sadan],
     patches: [
-        ...[
-            ".handleVoiceStatusClick", // voice channels
-            ".handleClickChat" // stage channels
-        ].map(find => ({
-            find,
+        // Stage Channels & Voice Channels
+        // the find is for stage channels, but it also handles voice
+        // channels because they're both in the same concatenated module
+        // the find for voice channels was `.handleVoiceStatusClick`
+        {
+            find: ".handleClickChat",
             // hack: these are not React onClick, it is a custom prop handled by Discord
             // thus, replacing this with onDoubleClick won't work, and you also cannot check
             // e.detail since instead of the event they pass the channel.
@@ -45,10 +47,10 @@ export default definePlugin({
                     replace: "onClick:()=>{$self.schedule(()=>{this.handleClick()},this)",
                 },
             ]
-        })),
+        },
         {
             // channel mentions
-            find: 'className:"channelMention",children',
+            find: 'className:"channelMention",children:[null!=',
             replacement: {
                 match: /onClick:(\i)(?=,.{0,30}className:"channelMention".+?(\i)\.inContent)/,
                 replace: (_, onClick, props) => ""
diff --git a/src/plugins/vcNarrator/index.tsx b/src/plugins/vcNarrator/index.tsx
index bf0393b25..28fde0b20 100644
--- a/src/plugins/vcNarrator/index.tsx
+++ b/src/plugins/vcNarrator/index.tsx
@@ -142,6 +142,7 @@ function playSample(type: string) {
 export default definePlugin({
     name: "VcNarrator",
     description: "Announces when users join, leave, or move voice channels via narrator",
+    tags: ["Voice", "Accessibility"],
     authors: [Devs.Ven],
     reporterTestable: ReporterTestable.None,
 
diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index 5dc2d0eda..d7a74223b 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -179,7 +179,8 @@ export default definePlugin({
     name: "ViewIcons",
     authors: [Devs.Ven, Devs.TheKodeToad, Devs.Nuckyz, Devs.nyx],
     description: "Makes avatars and banners in user profiles clickable, adds View Icon/Banner entries in the user, server and group channel context menu.",
-    tags: ["ImageUtilities"],
+    tags: ["Media", "Servers", "Appearance"],
+    searchTerms: ["ImageUtilities"],
     dependencies: ["DynamicImageModalAPI"],
 
     settings,
@@ -196,10 +197,10 @@ export default definePlugin({
     patches: [
         // Avatar component used in User DMs "User Profile" popup in the right and User Profile Modal pfp
         {
-            find: "imageClassName:null!=",
+            find: "return{avatarProps:{",
             replacement: {
-                match: /avatarSrc:(\i),eventHandlers:(\i).+?"div",.{0,100}className:\i,/,
-                replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openAvatar($1)},",
+                match: /(?<=avatarProps:(\i),eventHandlers:(\i).{0,50}?)return null==/,
+                replace: 'Object.assign($2,{style:{cursor:"pointer"},onClick:()=>$self.openAvatar($1.src)});$&',
             }
         },
         // Banners
diff --git a/src/plugins/viewRaw/index.tsx b/src/plugins/viewRaw/index.tsx
index aad99622c..b0e8f2e39 100644
--- a/src/plugins/viewRaw/index.tsx
+++ b/src/plugins/viewRaw/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { NavContextMenuPatchCallback } from "@api/ContextMenu";
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { BaseText } from "@components/BaseText";
 import { CodeBlock } from "@components/CodeBlock";
@@ -125,31 +125,35 @@ const settings = definePluginSettings({
             { label: "Left Click to view the raw content.", value: "Left", default: true },
             { label: "Right click to view the raw content.", value: "Right" }
         ]
+    },
+    messageContextMenu: {
+        description: "Show in message context menu",
+        type: OptionType.BOOLEAN,
+        default: false
     }
 });
 
-function MakeContextCallback(name: "Guild" | "Role" | "User" | "Channel"): NavContextMenuPatchCallback {
+function MakeContextCallback(name: "Guild" | "Role" | "User" | "Channel" | "Message"): NavContextMenuPatchCallback {
     return (children, props) => {
         const value = props[name.toLowerCase()];
         if (!value) return;
         if (props.label === getIntlMessage("CHANNEL_ACTIONS_MENU_LABEL")) return; // random shit like notification settings
-
-        const lastChild = children.at(-1);
-        if (lastChild?.key === "developer-actions") {
-            const p = lastChild.props;
-            if (!Array.isArray(p.children))
-                p.children = [p.children];
-
-            children = p.children;
-        }
+        const isMessage = name === "Message";
+        if (isMessage && !settings.store.messageContextMenu) return;
 
         // typescript parser goes crazy if this is inline
         const id = `vc-view-${name.toLowerCase()}-raw`;
-        children.splice(-1, 0,
+        const action = isMessage
+            ? () => openViewRawModalMessage(value)
+            : () => openViewRawModal(JSON.stringify(value, null, 4), name);
+
+        const devContainer = findGroupChildrenByChildId(`devmode-copy-id-${value.id}`, children);
+
+        (devContainer ?? children).splice(-1, 0,
             <Menu.MenuItem
                 id={id}
                 label="View Raw"
-                action={() => openViewRawModal(JSON.stringify(value, null, 4), name)}
+                action={action}
                 icon={CopyIcon}
             />
         );
@@ -176,6 +180,8 @@ const devContextCallback: NavContextMenuPatchCallback = (children, { id }: { id:
 export default definePlugin({
     name: "ViewRaw",
     description: "Copy and view the raw content/data of any message, channel or guild",
+    dependencies: ["MessagePopoverAPI"],
+    tags: ["Chat", "Developers"],
     authors: [Devs.KingFish, Devs.Ven, Devs.rad, Devs.ImLvna],
     settings,
 
@@ -186,7 +192,8 @@ export default definePlugin({
         "thread-context": MakeContextCallback("Channel"),
         "gdm-context": MakeContextCallback("Channel"),
         "user-context": MakeContextCallback("User"),
-        "dev-context": devContextCallback
+        "dev-context": devContextCallback,
+        "message": MakeContextCallback("Message"),
     },
 
     messagePopoverButton: {
diff --git a/src/plugins/voiceDownload/index.tsx b/src/plugins/voiceDownload/index.tsx
index eac912e47..8dbc9b705 100644
--- a/src/plugins/voiceDownload/index.tsx
+++ b/src/plugins/voiceDownload/index.tsx
@@ -12,6 +12,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "VoiceDownload",
     description: "Adds a download to voice messages. (Opens a new browser tab)",
+    tags: ["Voice", "Media"],
     authors: [Devs.puv],
     patches: [
         {
diff --git a/src/plugins/voiceMessages/components/VoicePreview.tsx b/src/plugins/voiceMessages/components/VoicePreview.tsx
index f077d7427..8c47c4fd2 100644
--- a/src/plugins/voiceMessages/components/VoicePreview.tsx
+++ b/src/plugins/voiceMessages/components/VoicePreview.tsx
@@ -17,18 +17,16 @@
 */
 
 import { useTimer } from "@utils/react";
-import { findComponentByCodeLazy } from "@webpack";
 
-import { cl } from "..";
+import { cl, VoiceMessage } from "..";
 
 const PREVIEW_IDLE_LABEL = "----";
 const PREVIEW_RECORDING_LABEL = "RECORDING";
 
-interface VoiceMessageProps {
+export interface VoiceMessageProps {
     src: string;
     waveform: string;
 }
-const VoiceMessage = findComponentByCodeLazy<VoiceMessageProps>("waveform:", "onVolumeChange");
 
 export type VoicePreviewOptions = {
     src?: string;
diff --git a/src/plugins/voiceMessages/index.tsx b/src/plugins/voiceMessages/index.tsx
index acad7fa6f..710460351 100644
--- a/src/plugins/voiceMessages/index.tsx
+++ b/src/plugins/voiceMessages/index.tsx
@@ -26,7 +26,7 @@ import { Microphone } from "@components/Icons";
 import { Link } from "@components/Link";
 import { Paragraph } from "@components/Paragraph";
 import { lastState as silentMessageEnabled } from "@plugins/silentMessageToggle";
-import { Devs, EquicordDevs } from "@utils/constants";
+import { Devs } from "@utils/constants";
 import { classNameFactory } from "@utils/css";
 import { Margins } from "@utils/margins";
 import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
@@ -35,9 +35,10 @@ import definePlugin, { OptionType } from "@utils/types";
 import { chooseFile } from "@utils/web";
 import { CloudUploadPlatform } from "@vencord/discord-types/enums";
 import { Button, CloudUploader, Constants, FluxDispatcher, Forms, lodash, Menu, MessageActions, PendingReplyStore, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
+import { ComponentType } from "react";
 
 import { VoiceRecorderDesktop } from "./components/DesktopRecorder";
-import { VoicePreview } from "./components/VoicePreview";
+import { VoiceMessageProps, VoicePreview } from "./components/VoicePreview";
 import { VoiceRecorderWeb } from "./components/WebRecorder";
 
 const VOICE_MESSAGE_FLAG = 1 << 13;
@@ -61,6 +62,8 @@ export type VoiceRecorder = React.ComponentType<{
     onRecordingChange?(recording: boolean): void;
 }>;
 
+export let VoiceMessage: ComponentType<VoiceMessageProps> = () => null;
+
 type AudioMetadata = {
     waveform: string,
     duration: number,
@@ -271,10 +274,23 @@ export const settings = definePluginSettings({
 
 export default definePlugin({
     name: "VoiceMessages",
-    description: "Allows you to send voice messages like on mobile. To do so, right click the upload button and click Send Voice Message.",
-    authors: [Devs.Ven, Devs.Vap, Devs.Nickyux, EquicordDevs.Z1xus, Devs.prism],
+    description: "Allows you to send voice messages like on mobile. To do so, right click the upload button and click Send Voice Message",
+    tags: ["Voice"],
+    authors: [Devs.Ven, Devs.Vap, Devs.Nickyux],
     settings,
+    patches: [
+        {
+            find: "#{intl::PAUSE_VOICE_MESSAGE_A11Y_LABEL}",
+            replacement: {
+                match: /(?<=\i=)(?=\i\.memo\(.{0,50}?=1,onVolumeChange:[^}]+?waveform:[^}]+?playbackCacheKey:)/,
+                replace: "$self.VoiceMessage=",
+            }
+        }
+    ],
 
+    set VoiceMessage(value) {
+        VoiceMessage = value;
+    },
     contextMenus: {
         "channel-attach": ctxMenuPatch
     }
diff --git a/src/plugins/volumeBooster/index.ts b/src/plugins/volumeBooster/index.ts
index 4ab0c332a..ea4b5cd35 100644
--- a/src/plugins/volumeBooster/index.ts
+++ b/src/plugins/volumeBooster/index.ts
@@ -51,6 +51,7 @@ export default definePlugin({
     name: "VolumeBooster",
     authors: [Devs.Nuckyz, Devs.sadan],
     description: "Allows you to set the user and stream volume above the default maximum",
+    tags: ["Voice", "Utility"],
     settings,
 
     patches: [
@@ -98,7 +99,7 @@ export default definePlugin({
             find: "AudioContextSettingsMigrated",
             replacement: [
                 {
-                    match: /(?<=isLocalMute\(\i,\i\),volume:(\i).+?\i\(\i,\i,)\1(?=\))/,
+                    match: /(?<=isLocalMute\(\i,\i\),volume:(\i).+?\(0,\i\.\i\)\(\i,\i,\{volume:)\1(?=\}\))/,
                     replace: "$&>200?200:$&"
                 },
                 {
diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index 2076404ab..dd86c9652 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -88,6 +88,7 @@ function fixImageUrl(urlString: string) {
 export default definePlugin({
     name: "WebContextMenus",
     description: "Re-adds context menus missing in the web version of Discord: Links & Images (Copy/Open Link/Image), Text Area (Copy, Cut, Paste, SpellCheck)",
+    tags: ["Utility"],
     authors: [Devs.Ven],
     enabledByDefault: true,
     required: requiredByPlatform,
diff --git a/src/plugins/webKeybinds.web/index.ts b/src/plugins/webKeybinds.web/index.ts
index b9b49c35c..f8563dc88 100644
--- a/src/plugins/webKeybinds.web/index.ts
+++ b/src/plugins/webKeybinds.web/index.ts
@@ -26,6 +26,7 @@ const KeyBinds = findByPropsLazy("JUMP_TO_GUILD", "SERVER_NEXT");
 export default definePlugin({
     name: "WebKeybinds",
     description: "Re-adds keybinds missing in the web version of Discord: ctrl+t, ctrl+shift+t, ctrl+tab, ctrl+shift+tab, ctrl+1-9, ctrl+,. Only works fully on Vesktop/Legcord, not inside your browser",
+    tags: ["Shortcuts"],
     authors: [Devs.Ven],
     enabledByDefault: true,
 
diff --git a/src/plugins/webScreenShareFixes.web/index.ts b/src/plugins/webScreenShareFixes.web/index.ts
index e7fbc178e..ac06a00e2 100644
--- a/src/plugins/webScreenShareFixes.web/index.ts
+++ b/src/plugins/webScreenShareFixes.web/index.ts
@@ -11,6 +11,7 @@ export default definePlugin({
     name: "WebScreenShareFixes",
     authors: [Devs.Kaitlyn],
     description: "Removes 2500kbps bitrate cap on chromium and vesktop clients.",
+    tags: ["Voice"],
     enabledByDefault: true,
 
     patches: [
diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index cb2d6f977..c2c7dbb9c 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -26,9 +26,20 @@ import definePlugin, { OptionType } from "@utils/types";
 import { CustomEmoji, Message, ReactionEmoji, User } from "@vencord/discord-types";
 import { ChannelStore, Constants, FluxDispatcher, React, RestAPI, useEffect, useLayoutEffect, UserStore, UserSummaryItem } from "@webpack/common";
 
+interface ReactionCacheEntry {
+    fetched: boolean;
+    users: Map<string, User>;
+}
+
+interface ReactionProps {
+    message: Message;
+    emoji: CustomEmoji;
+    type: number;
+}
+
 let Scroll: any = null;
 const queue = new Queue();
-let reactions: Record<string, ReactionCacheEntry>;
+let reactions: Record<string, ReactionCacheEntry> = {};
 
 function fetchReactions(msg: Message, emoji: ReactionEmoji, type: number) {
     const key = emoji.name + (emoji.id ? `:${emoji.id}` : "");
@@ -76,6 +87,50 @@ function handleClickAvatar(event: React.UIEvent<HTMLElement, Event>) {
     event.stopPropagation();
 }
 
+function ReactionUsers({ message, emoji, type }: ReactionProps) {
+    const forceUpdate = useForceUpdater();
+
+    useLayoutEffect(() => { // bc need to prevent autoscrolling
+        if (Scroll?.scrollCounter > 0) {
+            Scroll.setAutomaticAnchor(null);
+        }
+    });
+
+    useEffect(() => {
+        const cb = (e: any) => {
+            if (e?.messageId === message.id)
+                forceUpdate();
+        };
+        FluxDispatcher.subscribe("MESSAGE_REACTION_ADD_USERS", cb);
+
+        return () => FluxDispatcher.unsubscribe("MESSAGE_REACTION_ADD_USERS", cb);
+    }, [message.id, forceUpdate]);
+
+    const reactions = getReactionsWithQueue(message, emoji, type);
+    const users = Array.from(reactions, ([id]) => UserStore.getUser(id)).filter(Boolean);
+
+    return (
+        <div
+            style={{ marginLeft: "0.5em", transform: "scale(0.9)" }}
+        >
+            <div
+                onClick={handleClickAvatar}
+                onKeyDown={handleClickAvatar}
+                style={settings.store.avatarClick ? {} : { pointerEvents: "none" }}
+            >
+                <UserSummaryItem
+                    users={users}
+                    guildId={ChannelStore.getChannel(message.channel_id)?.guild_id}
+                    renderIcon={false}
+                    max={5}
+                    showDefaultAvatarsForNullUsers
+                    showUserPopout
+                />
+            </div>
+        </div>
+    );
+}
+
 const settings = definePluginSettings({
     avatarClick: {
         description: "Toggle clicking avatars in reactions",
@@ -88,6 +143,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "WhoReacted",
     description: "Renders the avatars of users who reacted to a message",
+    tags: ["Reactions", "Chat", "Appearance"],
     authors: [Devs.Ven, Devs.KannaDev, Devs.newwares],
     isModified: true,
     settings,
@@ -95,15 +151,15 @@ export default definePlugin({
         {
             find: ",reactionRef:",
             replacement: {
-                match: /(\i)\?null:\(0,\i\.jsx\)\(\i\.\i,{className:\i\.reactionCount,.*?}\),/,
-                replace: "$&$1?null:$self.renderUsers(this.props),"
+                match: /(\i)\?null:\(0,\i\.jsx\)\(\i\.\i,{className:\i\.reactionCount,.*?}\),(?<=(emoji:\i,message:\i,type:\i).+?)/,
+                replace: "$&$1?null:$self.renderUsers({$2}),"
             }
         },
         {
             find: '"MessageReactionsStore"',
             replacement: {
-                match: /function (\i)\(\){(\i)={}(?=.*CONNECTION_OPEN:\1)/,
-                replace: "$&;$self.reactions=$2;"
+                match: /CONNECTION_OPEN:function\(\){(\i)={}/,
+                replace: "$&;$self.reactions=$1;"
             }
         },
         {
@@ -116,86 +172,17 @@ export default definePlugin({
         }
     ],
 
+    renderUsers: ErrorBoundary.wrap((props: ReactionProps) => {
+        return props.message.reactions.length > 10
+            ? null
+            : <ReactionUsers {...props} />;
+    }, { noop: true }),
+
     setScrollObj(scroll: any) {
         Scroll = scroll;
     },
 
-    renderUsers(props: RootObject) {
-        return props.message.reactions.length > 10 ? null : (
-            <ErrorBoundary noop>
-                <this.UsersComponent {...props} />
-            </ErrorBoundary>
-        );
-    },
-
-    UsersComponent({ message, emoji, type }: RootObject) {
-        const forceUpdate = useForceUpdater();
-
-        useLayoutEffect(() => { // bc need to prevent autoscrolling
-            if (Scroll?.scrollCounter > 0) {
-                Scroll.setAutomaticAnchor(null);
-            }
-        });
-
-        useEffect(() => {
-            const cb = (e: any) => {
-                if (e?.messageId === message.id)
-                    forceUpdate();
-            };
-            FluxDispatcher.subscribe("MESSAGE_REACTION_ADD_USERS", cb);
-
-            return () => FluxDispatcher.unsubscribe("MESSAGE_REACTION_ADD_USERS", cb);
-        }, [message.id, forceUpdate]);
-
-        const reactions = getReactionsWithQueue(message, emoji, type);
-        const users = Array.from(reactions, ([id]) => UserStore.getUser(id)).filter(Boolean);
-
-        return (
-            <div
-                style={{ marginLeft: "0.5em", transform: "scale(0.9)" }}
-            >
-                <div
-                    onClick={handleClickAvatar}
-                    onKeyDown={handleClickAvatar}
-                    style={settings.store.avatarClick ? {} : { pointerEvents: "none" }}
-                >
-                    <UserSummaryItem
-                        users={users}
-                        guildId={ChannelStore.getChannel(message.channel_id)?.guild_id}
-                        renderIcon={false}
-                        max={5}
-                        showDefaultAvatarsForNullUsers
-                        showUserPopout
-                    />
-                </div>
-            </div>
-        );
-    },
-
     set reactions(value: any) {
         reactions = value;
     }
 });
-
-interface ReactionCacheEntry {
-    fetched: boolean;
-    users: Map<string, User>;
-}
-
-interface RootObject {
-    message: Message;
-    readOnly: boolean;
-    isLurking: boolean;
-    isPendingMember: boolean;
-    useChatFontScaling: boolean;
-    emoji: CustomEmoji;
-    count: number;
-    burst_user_ids: any[];
-    burst_count: number;
-    burst_colors: any[];
-    burst_me: boolean;
-    me: boolean;
-    type: number;
-    hideEmoji: boolean;
-    remainingBurstCurrency: number;
-}
diff --git a/src/plugins/xsOverlay/index.tsx b/src/plugins/xsOverlay/index.tsx
index ff07da6e7..52d2bc912 100644
--- a/src/plugins/xsOverlay/index.tsx
+++ b/src/plugins/xsOverlay/index.tsx
@@ -188,8 +188,9 @@ const Native = VencordNative.pluginHelpers.XSOverlay as PluginNative<typeof impo
 export default definePlugin({
     name: "XSOverlay",
     description: "Forwards discord notifications to XSOverlay, for easy viewing in VR",
+    tags: ["Notifications"],
     authors: [Devs.Nyako],
-    tags: ["vr", "notify"],
+    searchTerms: ["vr", "notify"],
     reporterTestable: ReporterTestable.None,
     settings,
 
diff --git a/src/plugins/youtubeAdblock.desktop/index.ts b/src/plugins/youtubeAdblock.desktop/index.ts
index 48f911795..1c94edf1f 100644
--- a/src/plugins/youtubeAdblock.desktop/index.ts
+++ b/src/plugins/youtubeAdblock.desktop/index.ts
@@ -11,5 +11,6 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "YoutubeAdblock",
     description: "Block ads in YouTube embeds and the WatchTogether activity via AdGuard",
+    tags: ["Media", "Utility"],
     authors: [Devs.ImLvna, Devs.Ven],
 });
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 1540f350b..f95af20b7 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -620,6 +620,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "jamesbt365",
         id: 158567567487795200n
     },
+    Darxoon: {
+        name: "Darxoon",
+        id: 409745838898937866n
+    },
     samsam: {
         name: "samsam",
         id: 400482410279469056n
@@ -628,6 +632,11 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Cootshk",
         id: 921605971577548820n
     },
+    koish1: {
+        name: "koish1",
+        id: 291089948709486593n,
+        badge: false,
+    },
     thororen: {
         name: "thororen",
         id: 848339671629299742n
@@ -880,8 +889,8 @@ export const EquicordDevs = Object.freeze({
         id: 1271128098301022240n
     },
     nin0dev: {
-        name: "nin0dev",
-        id: 886685857560539176n
+        name: "nin0",
+        id: 1395533040914141235n
     },
     D3SOX: {
         name: "D3SOX",
@@ -997,7 +1006,7 @@ export const EquicordDevs = Object.freeze({
         id: 984392761929256980n
     },
     creations: {
-        name: "Creation's",
+        name: "creations",
         id: 209830981060788225n
     },
     Leko: {
@@ -1214,7 +1223,7 @@ export const EquicordDevs = Object.freeze({
     },
     prism: {
         name: "prism",
-        id: 390884143749136386n,
+        id: 390884143749136386n
     },
     square: {
         name: "square",
@@ -1242,7 +1251,7 @@ export const EquicordDevs = Object.freeze({
     },
     PWall: {
         name: "PWall",
-        id: 0n,
+        id: 0n
     },
     busyboxkitty: {
         name: "busyboxkitty",
@@ -1250,31 +1259,31 @@ export const EquicordDevs = Object.freeze({
     },
     BioTomateDE: {
         name: "BioTomateDE",
-        id: 553499669226061844n,
+        id: 553499669226061844n
     },
     korzi: {
         name: "korzi",
-        id: 740966310875365416n,
+        id: 740966310875365416n
     },
     davri: {
         name: "Davri",
-        id: 457579346282938368n,
+        id: 457579346282938368n
     },
     yash: {
         name: "yash",
-        id: 889150838658977874n,
+        id: 889150838658977874n
     },
     Leon135: {
         name: "Leon135",
-        id: 309275452231385088n,
+        id: 309275452231385088n
     },
     bbpltergiest: {
         name: "bbpltergiest",
-        id: 279448683672502274n,
+        id: 279448683672502274n
     },
     mshl: {
         name: "m.shl",
-        id: 1025245410224263258n,
+        id: 1025245410224263258n
     },
     ScattrdBlade: {
         name: "ScattrdBlade",
@@ -1282,7 +1291,39 @@ export const EquicordDevs = Object.freeze({
     },
     Ape: {
         name: "Ape",
-        id: 722832640360841308n,
+        id: 722832640360841308n
+    },
+    Kiri: {
+        name: "Kiri",
+        id: 310525496771346434n
+    },
+    pointy: {
+        name: "pointy",
+        id: 99914384989519872n
+    },
+    dka: {
+        name: "DKA",
+        id: 119386840624005121n
+    },
+    Gir0fa: {
+        name: "gir0fa",
+        id: 1282734265955520545n
+    },
+    yonn2222: {
+        name: "yonn2222",
+        id: 821835831844012103n
+    },
+    Moowi: {
+        name: "Moowi",
+        id: 246128594756173824n
+    },
+    sketchmyname: {
+        name: "sketchmyname",
+        id: 1412164910443663491n
+    },
+    NassCT: {
+        name: "NassCT",
+        id: 354996937868705793n
     },
 } satisfies Record<string, Dev>);
 
diff --git a/src/utils/text.ts b/src/utils/text.ts
index 76f7f1eca..eb925df4e 100644
--- a/src/utils/text.ts
+++ b/src/utils/text.ts
@@ -180,7 +180,6 @@ export function toInlineCode(s: string) {
     return "``" + ZWSP + s.replaceAll("`", ZWSP + "`" + ZWSP) + ZWSP + "``";
 }
 
-// @ts-expect-error Missing RegExp.escape
 export const escapeRegExp: (s: string) => string = RegExp.escape ?? function (s: string) {
     return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 };
diff --git a/src/utils/types.ts b/src/utils/types.ts
index ac078d5e5..e8722822b 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -18,7 +18,7 @@
 
 import { AudioProcessor } from "@api/AudioPlayer";
 import type { ProfileBadge } from "@api/Badges";
-import type { ChatBarButtonData } from "@api/ChatButtons";
+import type { ChatBarButtonData, ChatBarButtonWrapper } from "@api/ChatButtons";
 import type { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { HeaderBarButtonData } from "@api/HeaderBar";
 import type { MemberListDecoratorFactory } from "@api/MemberListDecorators";
@@ -28,6 +28,7 @@ import type { MessageClickListener, MessageEditListener, MessageSendListener } f
 import type { MessagePopoverButtonData } from "@api/MessagePopover";
 import type { NicknameIconFactory } from "@api/NicknameIcons";
 import { ProfileCollectionFactory } from "@api/ProfileCollections";
+import { ProfileSectionFactory } from "@api/ProfileSections";
 import type { UserAreaButtonData } from "@api/UserArea";
 import type { Command, FluxEvents } from "@vencord/discord-types";
 import type { ReactNode } from "react";
@@ -46,6 +47,32 @@ export function makeRange(start: number, end: number, step = 1) {
     return ranges;
 }
 
+export const PluginTags = [
+    "Accessibility",
+    "Activity",
+    "Appearance",
+    "Chat",
+    "Commands",
+    "Console",
+    "Customisation",
+    "Developers",
+    "Emotes",
+    "Friends",
+    "Fun",
+    "Media",
+    "Notifications",
+    "Organisation",
+    "Privacy",
+    "Reactions",
+    "Roles",
+    "Servers",
+    "Shortcuts",
+    "Utility",
+    "Voice"
+] as const;
+
+export type PluginTag = typeof PluginTags[number];
+
 export type ReplaceFn = (match: string, ...groups: string[]) => string;
 
 export interface PatchReplacement {
@@ -105,6 +132,9 @@ export type IconProps = { height?: number | string; width?: number | string; cla
 export interface PluginDef {
     name: string;
     description: string;
+    /** Additional search terms that will bring up your plugin */
+    searchTerms?: string[];
+    tags?: PluginTag[];
     authors: PluginAuthor[];
     start?(): void;
     stop?(): void;
@@ -144,12 +174,6 @@ export interface PluginDef {
      * Which parts of the plugin can be tested by the reporter. Defaults to all parts
      */
     reporterTestable?: number;
-    /**
-     * Optionally provide settings that the user can configure in the Plugins tab of settings.
-     * @deprecated Use `settings` instead
-     */
-    // TODO: Remove when everything is migrated to `settings`
-    options?: Record<string, PluginOptionsItem>;
     /**
      * Optionally provide settings that the user can configure in the Plugins tab of settings.
      */
@@ -182,8 +206,6 @@ export interface PluginDef {
      */
     toolboxActions?: Record<string, () => void> | (() => ReactNode);
 
-    tags?: string[];
-
     /**
      * Managed style to automatically enable and disable when the plugin is enabled or disabled
      */
@@ -204,12 +226,16 @@ export interface PluginDef {
 
     renderMemberListDecorator?: MemberListDecoratorFactory;
 
-    // Custom
+    /*
+    * Custom apis added by Equicord and were placed here for quicker identification rather then mixing them in
+    */
     renderNicknameIcon?: NicknameIconFactory;
     headerBarButton?: HeaderBarButtonData;
     audioProcessor?: AudioProcessor;
     userAreaButton?: UserAreaButtonData;
     renderProfileCollection?: ProfileCollectionFactory;
+    chatBarButtonWrapper?: ChatBarButtonWrapper;
+    renderProfileSection?: ProfileSectionFactory;
 
     /**
      * A Vencord plugin that is modified for extra features in Equicord
@@ -250,22 +276,21 @@ export const enum OptionType {
 
 export type SettingsDefinition = Record<string, PluginSettingDef>;
 export type SettingsChecks<D extends SettingsDefinition> = {
-    [K in keyof D]?: D[K] extends PluginSettingComponentDef ? IsDisabled<DefinedSettings<D>> :
-    (IsDisabled<DefinedSettings<D>> & IsValid<PluginSettingType<D[K]>, DefinedSettings<D>>);
+    [K in keyof D]?: D[K] extends PluginSettingComponentDef ? IsDisabledOrHidden<DefinedSettings<D>> :
+    (IsDisabledOrHidden<DefinedSettings<D>> & IsValid<PluginSettingType<D[K]>, DefinedSettings<D>>);
 };
 
 export type PluginSettingDef =
-    (PluginSettingCommon & PluginSettingCustomDef & Pick<PluginSettingCommon, "onChange">) |
-    (PluginSettingComponentDef & Omit<PluginSettingCommon, "description" | "placeholder">) | ((
-        | PluginSettingStringDef
-        | PluginSettingNumberDef
-        | PluginSettingBooleanDef
-        | PluginSettingSelectDef
-        | PluginSettingSliderDef
-        | PluginSettingBigIntDef
-    ) & PluginSettingCommon);
+    | PluginSettingCustomDef
+    | PluginSettingComponentDef
+    | PluginSettingStringDef
+    | PluginSettingNumberDef
+    | PluginSettingBooleanDef
+    | PluginSettingSelectDef
+    | PluginSettingSliderDef
+    | PluginSettingBigIntDef;
 
-export interface PluginSettingCommon {
+export interface PluginSettingDefCommon extends IsDisabledOrHidden, IsValid<unknown> {
     description: string;
     placeholder?: string;
     onChange?(newValue: any): void;
@@ -274,50 +299,50 @@ export interface PluginSettingCommon {
      */
     restartNeeded?: boolean;
     componentProps?: Record<string, any>;
-    /**
-     * Hide this setting from the settings UI
-     */
-    hidden?: boolean;
     /**
      * Set this if the setting only works on Browser or Desktop, not both
      */
     target?: "WEB" | "DESKTOP" | "BOTH";
 }
 
-interface IsDisabled<D = unknown> {
+interface IsDisabledOrHidden<D extends DefinedSettings = DefinedSettings> {
     /**
-     * Checks if this setting should be disabled
+     * Whether this setting should be disabled
      */
-    disabled?(this: D): boolean;
+    disabled?: boolean | ((this: D) => boolean);
+    /**
+     * Whether this setting should be hidden from the user
+     */
+    hidden?: boolean | ((this: D) => boolean);
 }
 
-interface IsValid<T, D = unknown> {
+interface IsValid<T, D extends DefinedSettings = DefinedSettings> {
     /**
-     * Prevents the user from saving settings if this is false or a string
+     * Whether the value the user provided is valid. Either return a boolean for a generic error message or a string for a custom error message.
      */
     isValid?(this: D, value: T): boolean | string;
 }
 
-export interface PluginSettingStringDef {
+export interface PluginSettingStringDef extends PluginSettingDefCommon {
     type: OptionType.STRING;
     default?: string;
     /** Whether to use a multiline text area */
     multiline?: boolean;
 }
-export interface PluginSettingNumberDef {
+export interface PluginSettingNumberDef extends PluginSettingDefCommon {
     type: OptionType.NUMBER;
     default?: number;
 }
-export interface PluginSettingBigIntDef {
+export interface PluginSettingBigIntDef extends PluginSettingDefCommon {
     type: OptionType.BIGINT;
     default?: BigInt;
 }
-export interface PluginSettingBooleanDef {
+export interface PluginSettingBooleanDef extends PluginSettingDefCommon {
     type: OptionType.BOOLEAN;
     default?: boolean;
 }
 
-export interface PluginSettingSelectDef {
+export interface PluginSettingSelectDef extends PluginSettingDefCommon {
     type: OptionType.SELECT;
     options: readonly PluginSettingSelectOption[];
 }
@@ -328,12 +353,13 @@ export interface PluginSettingSelectOption {
     default?: boolean;
 }
 
-export interface PluginSettingCustomDef {
+export interface PluginSettingCustomDef extends PluginSettingDefCommon {
     type: OptionType.CUSTOM;
     default?: any;
+    onChange?: PluginSettingDefCommon["onChange"];
 }
 
-export interface PluginSettingSliderDef {
+export interface PluginSettingSliderDef extends PluginSettingDefCommon {
     type: OptionType.SLIDER;
     /**
      * All the possible values in the slider. Needs at least two values.
@@ -349,11 +375,14 @@ export interface PluginSettingSliderDef {
     stickToMarkers?: boolean;
 }
 
-export interface IPluginOptionComponentProps {
+export interface PluginSettingComponentDef extends Omit<PluginSettingDefCommon, "description" | "placeholder"> {
+    type: OptionType.COMPONENT;
+    component: (props: PluginSettingComponentProps) => ReactNode | Promise<ReactNode>;
+    default?: any;
+}
+export interface PluginSettingComponentProps {
     /**
      * Run this when the value changes.
-     *
-     * NOTE: The user will still need to click save to apply these changes.
      */
     setValue(newValue: any): void;
     /**
@@ -362,12 +391,6 @@ export interface IPluginOptionComponentProps {
     option: PluginSettingComponentDef;
 }
 
-export interface PluginSettingComponentDef {
-    type: OptionType.COMPONENT;
-    component: (props: IPluginOptionComponentProps) => ReactNode | Promise<ReactNode>;
-    default?: any;
-}
-
 /** Maps a `PluginSettingDef` to its value type */
 type PluginSettingType<O extends PluginSettingDef> = O extends PluginSettingStringDef ? string :
     O extends PluginSettingNumberDef ? number :
@@ -390,56 +413,32 @@ type SettingsStore<D extends SettingsDefinition> = {
 /** An instance of defined plugin settings */
 export interface DefinedSettings<
     Def extends SettingsDefinition = SettingsDefinition,
-    Checks extends SettingsChecks<Def> = {},
     PrivateSettings extends object = {}
 > {
-    /** Shorthand for `Vencord.Settings.plugins.PluginName`, but with typings */
+    /** Definitions of each setting */
+    def: Def;
+    /** Reactive Read/Write settings store - This is a Proxy, use .plain for a plain object */
     store: SettingsStore<Def> & PrivateSettings;
-    /** Shorthand for `Vencord.PlainSettings.plugins.PluginName`, but with typings */
+    /** Pure Read-only settings object */
     plain: SettingsStore<Def> & PrivateSettings;
     /**
      * React hook for getting the settings for this plugin
-     * @param filter optional filter to avoid rerenders for irrelevent settings
+     * @param filter optional filter to avoid rerenders for irrelevant settings
      */
     use<F extends Extract<keyof Def | keyof PrivateSettings, string>>(filter?: F[]): Pick<SettingsStore<Def> & PrivateSettings, F>;
-    /** Definitions of each setting */
-    def: Def;
-    /** Setting methods with return values that could rely on other settings */
-    checks: Checks;
     /**
      * Name of the plugin these settings belong to,
      * will be an empty string until plugin is initialized
      */
     pluginName: string;
-
-    withPrivateSettings<T extends object>(): DefinedSettings<Def, Checks, T>;
+    /** Extend this Settings object type with more properties, useful for non-user-facing settings */
+    withPrivateSettings<T extends object>(): DefinedSettings<Def, T>;
 }
 
 export type PartialExcept<T, R extends keyof T> = Partial<T> & Required<Pick<T, R>>;
 
 export type IpcRes<V = any> = { ok: true; value: V; } | { ok: false, error: any; };
 
-/* -------------------------------------------- */
-/*             Legacy Options Types             */
-/* -------------------------------------------- */
-
-export type PluginOptionBase = PluginSettingCommon & IsDisabled;
-export type PluginOptionsItem =
-    | PluginOptionString
-    | PluginOptionNumber
-    | PluginOptionBoolean
-    | PluginOptionSelect
-    | PluginOptionSlider
-    | PluginOptionComponent
-    | PluginOptionCustom;
-export type PluginOptionString = PluginSettingStringDef & PluginSettingCommon & IsDisabled & IsValid<string>;
-export type PluginOptionNumber = (PluginSettingNumberDef | PluginSettingBigIntDef) & PluginSettingCommon & IsDisabled & IsValid<number | BigInt>;
-export type PluginOptionBoolean = PluginSettingBooleanDef & PluginSettingCommon & IsDisabled & IsValid<boolean>;
-export type PluginOptionSelect = PluginSettingSelectDef & PluginSettingCommon & IsDisabled & IsValid<PluginSettingSelectOption>;
-export type PluginOptionSlider = PluginSettingSliderDef & PluginSettingCommon & IsDisabled & IsValid<number>;
-export type PluginOptionComponent = PluginSettingComponentDef & Omit<PluginSettingCommon, "description" | "placeholder">;
-export type PluginOptionCustom = PluginSettingCustomDef & Pick<PluginSettingCommon, "onChange">;
-
 export type PluginNative<PluginExports extends Record<string, (event: Electron.IpcMainInvokeEvent, ...args: any[]) => any>> = {
     [key in keyof PluginExports]:
     PluginExports[key] extends (event: Electron.IpcMainInvokeEvent, ...args: infer Args) => infer Return
diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts
index 2a1ca4efb..f0f5610aa 100644
--- a/src/webpack/common/components.ts
+++ b/src/webpack/common/components.ts
@@ -56,25 +56,33 @@ export const Tooltip = waitForComponent<t.Tooltip>("Tooltip", m => m.prototype?.
 /** @deprecated import from @vencord/components */
 export const TooltipContainer = TooltipContainerComponent as never;
 
-export const TextInput = waitForComponent<t.TextInput>("TextInput", filters.componentByCode("#{intl::MAXIMUM_LENGTH_ERROR}", '"input"'));
-export const TextArea = waitForComponent<t.TextArea>("TextArea", filters.componentByCode("this.getPaddingRight()},id:"));
-export const Select = waitForComponent<t.Select>("Select", filters.componentByCode('"Select"'));
-export const SearchableSelect = waitForComponent<t.SearchableSelect>("SearchableSelect", filters.componentByCode('"SearchableSelect"'));
+// FIXME: t.TextInput was for the old void components, and is not 100% correct for the mana component
+export const TextInput = waitForComponent<t.TextInput>("TextInput", filters.componentByCode('setHasValue?.(""!==', '="text",'));
+export const TextArea = waitForComponent<t.TextArea>("TextArea", filters.componentByCode("!0,rows:", "showRemainingCharacterCount:"));
+export const Select = waitForComponent<t.Select>("Select", filters.componentByCode('selectionMode:"single",onSelectionChange:', "isSelected:"));
+export const SearchableSelect = waitForComponent<t.SearchableSelect>("SearchableSelect", filters.componentByCode('?"multiple":"single",required:'));
 export const Slider = waitForComponent<t.Slider>("Slider", filters.componentByCode("markDash", "this.renderMark("));
 export const Popout = waitForComponent<t.Popout>("Popout", filters.componentByCode("ref:this.ref,", "renderPopout:this.renderPopout,"));
 export const Dialog = waitForComponent<t.Dialog>("Dialog", filters.componentByCode('role:"dialog",tabIndex:-1'));
 export const TabBar = waitForComponent("TabBar", filters.componentByCode("ref:this.tabBarRef,className:"));
-export const Paginator = waitForComponent<t.Paginator>("Paginator", filters.componentByCode('rel:"prev",children:'));
 // TODO: remake this component
 export const Clickable = waitForComponent<t.Clickable>("Clickable", filters.componentByCode("this.context?this.renderNonInteractive():"));
 export const Avatar = waitForComponent<t.Avatar>("Avatar", filters.componentByCode(".size-1.375*"));
 
-export const ColorPicker = waitForComponent<t.ColorPicker>("ColorPicker", filters.componentByCode("#{intl::USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR}", "showEyeDropper"));
+export let ColorPicker: t.ColorPicker = () => null;
+export function setColorPicker(component: t.ColorPicker) {
+    ColorPicker = component;
+}
 
 export const UserSummaryItem = waitForComponent("UserSummaryItem", filters.componentByCode("defaultRenderUser", "showDefaultAvatarsForNullUsers"));
 
-export let createScroller: (scrollbarClassName: string, fadeClassName: string, customThemeClassName: string) => t.ScrollerThin;
+export let createScroller: ((scrollbarClassName: string, fadeClassName: string, customThemeClassName: string) => t.ScrollerThin) | undefined;
+export function setCreateScroller(cs: NonNullable<typeof createScroller>) {
+    createScroller = cs;
+}
+
 export let createListScroller: (scrollBarClassName: string, fadeClassName: string, someOtherClassIdkMan: string, resizeObserverClass: typeof ResizeObserver) => t.ListScrollerThin;
+waitFor(filters.byCode("getScrollerNode:", "resizeObserver:", "sectionHeight:"), m => createListScroller = m);
 
 const listScrollerClassnames = ["thin", "auto", "fade"] as const;
 export const scrollerClasses = findCssClassesLazy("thin", "auto", "fade", "customTheme", "none");
@@ -88,12 +96,9 @@ export const listScrollerClasses = proxyLazyWebpack(() => {
     return mapMangledCssClasses(mod, listScrollerClassnames);
 });
 
-waitFor(filters.byCode('="ltr",orientation:', "customTheme:", "forwardRef"), m => createScroller = m);
-waitFor(filters.byCode("getScrollerNode:", "resizeObserver:", "sectionHeight:"), m => createListScroller = m);
-
-export const ScrollerNone = LazyComponent(() => createScroller(scrollerClasses.none, scrollerClasses.fade, scrollerClasses.customTheme));
-export const ScrollerThin = LazyComponent(() => createScroller(scrollerClasses.thin, scrollerClasses.fade, scrollerClasses.customTheme));
-export const ScrollerAuto = LazyComponent(() => createScroller(scrollerClasses.auto, scrollerClasses.fade, scrollerClasses.customTheme));
+export const ScrollerNone = LazyComponent(() => createScroller?.(scrollerClasses.none, scrollerClasses.fade, scrollerClasses.customTheme)!);
+export const ScrollerThin = LazyComponent(() => createScroller?.(scrollerClasses.thin, scrollerClasses.fade, scrollerClasses.customTheme)!);
+export const ScrollerAuto = LazyComponent(() => createScroller?.(scrollerClasses.auto, scrollerClasses.fade, scrollerClasses.customTheme)!);
 
 export const ListScrollerThin = LazyComponent(() => createListScroller(listScrollerClasses.thin, listScrollerClasses.fade, "", ResizeObserver));
 export const ListScrollerAuto = LazyComponent(() => createListScroller(listScrollerClasses.auto, listScrollerClasses.fade, "", ResizeObserver));
diff --git a/src/webpack/common/menu.ts b/src/webpack/common/menu.ts
index 4029877f2..d0a7dbf34 100644
--- a/src/webpack/common/menu.ts
+++ b/src/webpack/common/menu.ts
@@ -17,29 +17,10 @@
 */
 
 import type * as t from "@vencord/discord-types";
-import { filters, mapMangledModuleLazy, waitFor, wreq } from "@webpack";
+import { filters, mapMangledModuleLazy, waitFor } from "@webpack";
 
 export const Menu = {} as t.Menu;
 
-// Relies on .name properties added by the MenuItemDemanglerAPI
-waitFor(m => m.name === "MenuCheckboxItem", (_, id) => {
-    // We have to do this manual require by ID because m in this case is the MenuCheckBoxItem instead of the entire module
-    const exports = wreq(id);
-
-    for (const exportKey in exports) {
-        // Some exports might have not been initialized yet due to circular imports, so try catch it.
-        try {
-            var exportValue = exports[exportKey];
-        } catch {
-            continue;
-        }
-
-        if (typeof exportValue === "function" && exportValue.name.startsWith("Menu")) {
-            Menu[exportValue.name] = exportValue;
-        }
-    }
-});
-
 waitFor(filters.componentByCode('path:["empty"]'), m => Menu.Menu = m);
 waitFor(filters.componentByCode("SLIDER)", "handleSize:16"), m => Menu.MenuSliderControl = m);
 waitFor(filters.componentByCode(".SEARCH)", ".focus()", "query:"), m => Menu.MenuSearchControl = m);
diff --git a/src/webpack/common/react.ts b/src/webpack/common/react.ts
index b8b0e7532..a6ca363c3 100644
--- a/src/webpack/common/react.ts
+++ b/src/webpack/common/react.ts
@@ -31,7 +31,7 @@ export const ReactDOM: typeof import("react-dom") = findByPropsLazy("createPorta
 // 299 is an error code used in createRoot and createPortal
 export const createRoot: typeof import("react-dom/client").createRoot = findByCodeLazy("(299));", ".onRecoverableError");
 
-waitFor("useState", m => {
+waitFor(["createElement", "useEffect"], m => {
     React = m;
     ({ useEffect, useState, useLayoutEffect, useMemo, useRef, useReducer, useCallback } = React);
 });
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 4318c89ae..c51b817a0 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -46,11 +46,9 @@ export const Constants: t.Constants = mapMangledModuleLazy('ME:"/users/@me"', {
 export const RestAPI: t.RestAPI = findLazy(m => typeof m === "object" && m.del && m.put);
 export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYear");
 
-export const hljs: typeof import("highlight.js").default = findByPropsLazy("highlight", "registerLanguage");
-
 export const useDrag = findByCodeLazy("useDrag::spec.begin was deprecated");
 // you cant make a better finder i love that they remove display names sm
-export const useDrop = findByCodeLazy(".options);return", ".collect,");
+export const useDrop = findByCodeLazy(".disconnectDropTarget()", ".dropTargetOptions=");
 
 export const { match, P }: { match: typeof TSPattern["match"], P: typeof TSPattern["P"]; } = mapMangledModuleLazy("@ts-pattern/matcher", {
     match: filters.byCode("return new"),
@@ -108,27 +106,35 @@ export interface ToastOptions {
     duration?: number;
 }
 
+interface ToastsExports {
+    showToast: (data: ToastData) => void;
+    popToast(): void;
+}
+
+const ToastsExports = mapMangledModuleLazy(".currentToastMap.has(", {
+    showToast: filters.byCode(".currentToastMap.has("),
+    popToast: filters.byCode(".delete(")
+});
+
+export function createToast(message: string, type: string, options?: ToastOptions): ToastData {
+    return {
+        message,
+        id: Toasts.genId(),
+        type,
+        options
+    };
+}
+
 export const Toasts = {
     Type: ToastType,
     Position: ToastPosition,
-    // what's less likely than getting 0 from Math.random()? Getting it twice in a row
     genId: () => (Math.random() || Math.random()).toString(36).slice(2),
 
-    // hack to merge with the following interface, dunno if there's a better way
-    ...{} as {
-        show(data: ToastData): void;
-        pop(): void;
-        create(message: string, type: string, options?: ToastOptions): ToastData;
-    }
+    show: ToastsExports.showToast,
+    pop: ToastsExports.popToast,
+    create: createToast,
 };
 
-// This is the same module but this is easier
-waitFor("showToast", m => {
-    Toasts.show = m.showToast;
-    Toasts.pop = m.popToast;
-    Toasts.create = m.createToast;
-});
-
 /**
  * Show a simple toast. If you need more options, use Toasts.show manually
  */
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index fb31cbc23..faed80d29 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -5,19 +5,20 @@
  */
 
 import { Settings } from "@api/Settings";
+import { reporterData } from "@debug/reporterData";
+import { traceFunctionWithResults } from "@debug/Tracer";
 import { makeLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
 import { interpolateIfDefined } from "@utils/misc";
 import { Patch, PatchReplacement } from "@utils/types";
 import { WebpackRequire } from "@vencord/discord-types/webpack";
-import { reporterData } from "debug/reporterData";
 
-import { traceFunctionWithResults } from "../debug/Tracer";
 import { AnyModuleFactory, AnyWebpackRequire, MaybePatchedModuleFactory, PatchedModuleFactory } from "./types";
 import { _blacklistBadModules, _initWebpack, factoryListeners, findModuleFactory, moduleListeners, waitForSubscriptions, wreq } from "./webpack";
 
 export const patches = [] as Patch[];
 
+export const SYM_ORIGINAL_MODULE_FACTORIES = Symbol("WebpackPatcher.originalModuleFactories");
 export const SYM_IS_PROXIED_FACTORY = Symbol("WebpackPatcher.isProxiedFactory");
 export const SYM_ORIGINAL_FACTORY = Symbol("WebpackPatcher.originalFactory");
 export const SYM_PATCHED_SOURCE = Symbol("WebpackPatcher.patchedSource");
@@ -37,7 +38,7 @@ export const getBuildNumber = makeLazy(() => {
             return Number(buildNumberMatch[1]);
         }
 
-        const hardcodedFactoryStr = String(wreq.m[446023]);
+        const hardcodedFactoryStr = String(wreq.m[927815]);
         if (hardcodedFactoryStr.includes("Trying to open a changelog for an invalid build number")) {
             const hardcodedBuildNumber = matchBuildNumber(hardcodedFactoryStr);
 
@@ -112,7 +113,7 @@ define(Function.prototype, "m", {
         // Currently, sentry and libdiscore Webpack instances are not meant to be patched.
         // As an extra measure, take advatange of the fact their files include the names and return early if it's one of them.
         // Later down we also include other measures to avoid patching them.
-        if (["sentry", "libdiscore"].some(name => fileName?.toLowerCase()?.includes(name))) {
+        if (["sentry", "libdiscore", "fast-connect"].some(name => fileName?.toLowerCase()?.includes(name))) {
             return;
         }
 
@@ -129,7 +130,7 @@ define(Function.prototype, "m", {
                 // libdiscore init Webpack instance always returns a constant string for the js filename of a chunk.
                 // In that case, avoid patching this instance,
                 // as it runs before the main Webpack instance and will make the WebpackRequire fallback not work properly, or init an wrongful main WebpackRequire.
-                if (bundlePath !== "/assets/" || /(?:=>|{return)"[^"]/.exec(String(this.u))) {
+                if (bundlePath !== "/assets/" || /(?:=>|{return)"[^"]+?"[^=]/.exec(String(this.u))) {
                     return;
                 }
 
@@ -186,7 +187,7 @@ define(Function.prototype, "m", {
 
             // Proxy (and maybe patch) pre-populated factories
             for (const moduleId in originalModules) {
-                updateExistingOrProxyFactory(originalModules, moduleId, originalModules[moduleId], originalModules, true);
+                proxyFactoryAndUpdateExisting(originalModules, moduleId, originalModules[moduleId], originalModules, true);
             }
 
             define(originalModules, Symbol.toStringTag, {
@@ -236,20 +237,30 @@ const moduleFactoriesHandler: ProxyHandler<AnyWebpackRequire["m"]> = {
     },
     */
 
-    set: updateExistingOrProxyFactory
+    get(target, p, receiver) {
+        if (p === SYM_ORIGINAL_MODULE_FACTORIES) {
+            return target;
+        }
+
+        return Reflect.get(target, p, receiver);
+    },
+
+    set: proxyFactoryAndUpdateExisting
 };
 
 // The proxy for patching lazily and/or running factories with our wrapper.
 const moduleFactoryHandler: ProxyHandler<MaybePatchedModuleFactory> = {
     apply(target, thisArg: unknown, argArray: Parameters<AnyModuleFactory>) {
-        // SYM_ORIGINAL_FACTORY means the factory has already been patched
+        // If SYM_ORIGINAL_FACTORY exists in the proxy target, it means the proxy target is already a patched factory.
+        // In that case, just run it.
         if (target[SYM_ORIGINAL_FACTORY] != null) {
             return runFactoryWithWrap(target as PatchedModuleFactory, thisArg, argArray);
         }
 
-        // SAFETY: Factories have `name` as their key in the module factories object, and that is always their module id
+        // SAFETY: Factories have `name` as their key in the module factories object, and that is always their module id.
         const moduleId: string = target.name;
 
+        // Patch the proxy target, which is the original factory.
         const patchedFactory = patchFactory(moduleId, target);
         return runFactoryWithWrap(patchedFactory, thisArg, argArray);
     },
@@ -259,9 +270,10 @@ const moduleFactoryHandler: ProxyHandler<MaybePatchedModuleFactory> = {
             return true;
         }
 
+        // If the proxy target is a patched factory, SYM_ORIGINAL_FACTORY will have the original factory. Otherwise the target itself will be it.
         const originalFactory: AnyModuleFactory = target[SYM_ORIGINAL_FACTORY] ?? target;
 
-        // Redirect these properties to the original factory, including making `toString` return the original factory `toString`
+        // Redirect getting these properties from the original factory, including making `toString` return the original factory `toString`
         if (p === "toString" || p === SYM_PATCHED_SOURCE || p === SYM_PATCHED_BY) {
             const v = Reflect.get(originalFactory, p, originalFactory);
             return p === "toString" ? v.bind(originalFactory) : v;
@@ -271,62 +283,55 @@ const moduleFactoryHandler: ProxyHandler<MaybePatchedModuleFactory> = {
     }
 };
 
-function updateExistingOrProxyFactory(moduleFactories: AnyWebpackRequire["m"], moduleId: PropertyKey, newFactory: AnyModuleFactory, receiver: any, ignoreExistingInTarget = false) {
-    if (updateExistingFactory(moduleFactories, moduleId, newFactory, receiver, ignoreExistingInTarget)) {
+function proxyFactoryAndUpdateExisting(moduleFactories: AnyWebpackRequire["m"], moduleId: PropertyKey, newFactory: AnyModuleFactory, receiver: any, ignoreExistingInTarget = false) {
+    notifyFactoryListeners(moduleId, newFactory);
+    const proxiedFactory = new Proxy(Settings.eagerPatches ? patchFactory(moduleId, newFactory) : newFactory, moduleFactoryHandler);
+
+    if (updateExistingFactory(moduleFactories, moduleId, newFactory, proxiedFactory, ignoreExistingInTarget)) {
         return true;
     }
 
-    notifyFactoryListeners(moduleId, newFactory);
-
-    const proxiedFactory = new Proxy(Settings.eagerPatches ? patchFactory(moduleId, newFactory) : newFactory, moduleFactoryHandler);
     return Reflect.set(moduleFactories, moduleId, proxiedFactory, receiver);
 }
 
 /**
- * Update a duplicated factory that exists in any of the Webpack instances we track with a new original factory.
+ * Update a duplicated factory that exists in any of the Webpack instances we track with a new original and proxied factory.
  *
  * @param moduleFactories The module factories where this new original factory is being set
  * @param moduleId The id of the module
  * @param newFactory The new original factory
+ * @param newProxiedFactory The new original and proxied factory
  * @param receiver The receiver of the factory
  * @param ignoreExistingInTarget Whether to ignore checking if the factory already exists in the moduleFactories where it is being set
  * @returns Whether the original factory was updated, or false if it doesn't exist in any of the tracked Webpack instances
  */
-function updateExistingFactory(moduleFactories: AnyWebpackRequire["m"], moduleId: PropertyKey, newFactory: AnyModuleFactory, receiver: any, ignoreExistingInTarget) {
+function updateExistingFactory(moduleFactories: AnyWebpackRequire["m"], moduleId: PropertyKey, newFactory: AnyModuleFactory, newProxiedFactory: AnyModuleFactory, ignoreExistingInTarget: boolean) {
     let existingFactory: AnyModuleFactory | undefined;
-    let moduleFactoriesWithFactory: AnyWebpackRequire["m"] | undefined;
     for (const wreq of allWebpackInstances) {
-        if (ignoreExistingInTarget && wreq.m === moduleFactories) {
+        const instanceModuleFactories = wreq.m[SYM_ORIGINAL_MODULE_FACTORIES] ?? wreq.m;
+
+        if (ignoreExistingInTarget && instanceModuleFactories === moduleFactories) {
             continue;
         }
 
         if (Object.hasOwn(wreq.m, moduleId)) {
-            existingFactory = wreq.m[moduleId];
-            moduleFactoriesWithFactory = wreq.m;
+            existingFactory = wreq.m[moduleId]; // Must use wreq.m here instead of instanceModuleFactories to use our proxy in case the module factories are already proxied.
             break;
         }
     }
 
     if (existingFactory != null) {
-        // If existingFactory exists in any of the Webpack instances we track, it's either wrapped in our proxy, or it has already been required.
-        // In the case it is wrapped in our proxy, and the instance we are setting does not already have it, we need to make sure the instance contains our proxy too.
-        if (moduleFactoriesWithFactory !== moduleFactories && existingFactory[SYM_IS_PROXIED_FACTORY]) {
-            Reflect.set(moduleFactories, moduleId, existingFactory, receiver);
-        }
-        // Else, if it is not wrapped in our proxy, set this new original factory in all the instances
-        else {
-            defineInWebpackInstances(moduleId, newFactory);
-        }
-
-        // Update existingFactory with the new original, if it does have a current original factory
+        // SYM_ORIGINAL_FACTORY means the factory has already been patched. In this case, only update existingFactory original factory to the new one.
         if (existingFactory[SYM_ORIGINAL_FACTORY] != null) {
             existingFactory[SYM_ORIGINAL_FACTORY] = newFactory;
-        }
 
-        // Persist patched source and patched by in the new original factory
-        if (IS_DEV) {
-            newFactory[SYM_PATCHED_SOURCE] = existingFactory[SYM_PATCHED_SOURCE];
-            newFactory[SYM_PATCHED_BY] = existingFactory[SYM_PATCHED_BY];
+            // Persist patched source and patched by in the new original factory
+            if (IS_DEV) {
+                newFactory[SYM_PATCHED_SOURCE] = existingFactory[SYM_PATCHED_SOURCE];
+                newFactory[SYM_PATCHED_BY] = existingFactory[SYM_PATCHED_BY];
+            }
+        } else {
+            defineInWebpackInstances(moduleId, newProxiedFactory);
         }
 
         return true;
diff --git a/src/webpack/types.ts b/src/webpack/types.ts
index 328aa8bc4..db6aa7c63 100644
--- a/src/webpack/types.ts
+++ b/src/webpack/types.ts
@@ -6,11 +6,15 @@
 
 import { Module, ModuleExports, WebpackRequire } from "@vencord/discord-types/webpack";
 
-import { SYM_ORIGINAL_FACTORY, SYM_PATCHED_BY, SYM_PATCHED_SOURCE } from "./patchWebpack";
+import { SYM_ORIGINAL_FACTORY, SYM_ORIGINAL_MODULE_FACTORIES, SYM_PATCHED_BY, SYM_PATCHED_SOURCE } from "./patchWebpack";
 
 export type AnyWebpackRequire = ((moduleId: PropertyKey) => ModuleExports) & Partial<Omit<WebpackRequire, "m">> & {
     /** The module factories, where all modules that have been loaded are stored (pre-loaded or loaded by lazy chunks) */
-    m: Record<PropertyKey, AnyModuleFactory>;
+    m: AnyModuleFactories;
+};
+
+export type AnyModuleFactories = Record<PropertyKey, AnyModuleFactory> & {
+    [SYM_ORIGINAL_MODULE_FACTORIES]?: Record<PropertyKey, AnyModuleFactory>;
 };
 
 /** exports can be anything, however initially it is always an empty object */
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 5917d9073..0e8300ace 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { traceFunction } from "@debug/Tracer";
 import { makeLazy, proxyLazy } from "@utils/lazy";
 import { LazyComponent } from "@utils/lazyReact";
 import { Logger } from "@utils/Logger";
@@ -24,7 +25,6 @@ import { escapeRegExp } from "@utils/text";
 import type { FluxStore } from "@vencord/discord-types";
 import type { ModuleExports, ModuleFactory, WebpackRequire } from "@vencord/discord-types/webpack";
 
-import { traceFunction } from "../debug/Tracer";
 import type { AnyModuleFactory, AnyWebpackRequire } from "./types";
 
 const logger = new Logger("Webpack");
@@ -727,12 +727,12 @@ export async function extractAndLoadChunks(code: CodeFilter, matcher = DefaultEx
     }
 
     const numEntryPoint = Number(entryPointId);
-    const entryPoint = Number.isNaN(numEntryPoint) ? entryPointId : numEntryPoint;
+    const entryPoint = Number.isNaN(numEntryPoint) ? entryPointId : String(numEntryPoint);
 
     if (rawChunkIds) {
         const chunkIds = Array.from(rawChunkIds.matchAll(ChunkIdsRegex)).map(m => {
             const numChunkId = Number(m[1]);
-            return Number.isNaN(numChunkId) ? m[1] : numChunkId;
+            return Number.isNaN(numChunkId) ? m[1] : String(numChunkId);
         });
 
         await Promise.all(chunkIds.map(id => wreq.e(id)));
diff --git a/tsconfig.json b/tsconfig.json
index 1f98a1af4..fc7a573ce 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,43 +19,48 @@
         "noImplicitAny": false,
         "target": "ESNEXT",
         "jsx": "preserve",
-        "baseUrl": "./src/",
         "paths": {
             "@main/*": [
-                "./main/*"
+                "./src/main/*"
             ],
             "@api/*": [
-                "./api/*"
+                "./src/api/*"
             ],
             "@components/*": [
-                "./components/*"
+                "./src/components/*"
+            ],
+            "@debug/*": [
+                "./src/debug/*"
             ],
             "@utils/*": [
-                "./utils/*"
+                "./src/utils/*"
             ],
             "@plugins/*": [
-                "./plugins/*"
+                "./src/plugins/*"
             ],
             "@shared/*": [
-                "./shared/*"
+                "./src/shared/*"
             ],
             "@webpack/common": [
-                "./webpack/common"
+                "./src/webpack/common"
             ],
             "@webpack/common/*": [
-                "./webpack/common/*"
+                "./src/webpack/common/*"
             ],
             "@webpack": [
-                "./webpack/webpack"
+                "./src/webpack/webpack"
             ],
             "@webpack/patcher": [
-                "./webpack/patchWebpack"
+                "./src/webpack/patchWebpack"
             ],
             "@webpack/wreq.d": [
-                "./webpack/wreq.d"
+                "./src/webpack/wreq.d"
+            ],
+            "@webpack/types": [
+                "./src/webpack/types"
             ],
             "@equicordplugins/*": [
-                "./equicordplugins/*"
+                "./src/equicordplugins/*"
             ]
         },
         "plugins": [