diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 734bbaca8..e7afec3c6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,5 @@
 name: Bug/Crash Report
-description: Create a bug or crash report for Vencord
+description: Create a bug or crash report for Vencord. ALWAYS FIRST USE OUR SUPPORT CHANNEL! ONLY USE THIS FORM IF YOU ARE A CONTRIBUTOR OR WERE TOLD TO DO SO IN THE SUPPORT CHANNEL.
 labels: [bug]
 title: "[Bug] <title>"
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
deleted file mode 100644
index 115f7f700..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Feature Request
-description: Create a feature request for Vencord. To request new plugins, please use the Discussions tab
-labels: [enhancement]
-title: "[Feature Request] <title>"
-
-body:
-  - type: input
-    id: discord
-    attributes:
-      label: Discord Account
-      description: Who on Discord is making this request? Not required but encouraged for easier follow-up
-      placeholder: username#0000
-    validations:
-      required: false
-
-  - type: textarea
-    id: feature-basic-description
-    attributes:
-      label: What is it that you'd like to see?
-      description: Describe the feature you want added as detailed as possible
-      placeholder: I think ... would be a cool feature to add. This would be awesome, thanks!
-    validations:
-      required: true
-
-  - type: checkboxes
-    id: agreement-check
-    attributes:
-      label: Request Agreement
-      description: DO NOT USE THIS TEMPLATE FOR PLUGIN REQUESTS!!! For plugin requests, **use discussions**
-      options:
-        - label: This is not a plugin request
-          required: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d9e2789d7..9ed7d5ca7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
 
             - name: Clean up obsolete files
               run: |
-                  rm -rf dist/*-unpacked Vencord.user.css vencordDesktopRenderer.css vencordDesktopRenderer.css.map
+                  rm -rf dist/*-unpacked dist/monaco Vencord.user.css vencordDesktopRenderer.css vencordDesktopRenderer.css.map
 
             - name: Get some values needed for the release
               id: release_values
diff --git a/browser/VencordNativeStub.ts b/browser/VencordNativeStub.ts
index db263ee63..6c1a957c5 100644
--- a/browser/VencordNativeStub.ts
+++ b/browser/VencordNativeStub.ts
@@ -19,9 +19,11 @@
 /// <reference path="../src/modules.d.ts" />
 /// <reference path="../src/globals.d.ts" />
 
-import monacoHtml from "~fileContent/../src/components/monacoWin.html";
+import monacoHtmlLocal from "~fileContent/monacoWin.html";
+import monacoHtmlCdn from "~fileContent/../src/main/monacoWin.html";
 import * as DataStore from "../src/api/DataStore";
 import { debounce } from "../src/utils";
+import { EXTENSION_BASE_URL } from "../src/utils/web-metadata";
 import { getTheme, Theme } from "../src/utils/discord";
 import { getThemeInfo } from "../src/utils/themes/bd";
 
@@ -46,7 +48,8 @@ window.VencordNative = {
         getThemesList: () => DataStore.entries(themeStore).then(entries =>
             entries.map(([name, css]) => getThemeInfo(css, name.toString()))
         ),
-        getThemeData: (fileName: string) => DataStore.get(fileName, themeStore)
+        getThemeData: (fileName: string) => DataStore.get(fileName, themeStore),
+        getSystemValues: async () => ({}),
     },
 
     native: {
@@ -80,6 +83,7 @@ window.VencordNative = {
                 return;
             }
 
+            win.baseUrl = EXTENSION_BASE_URL;
             win.setCss = setCssDebounced;
             win.getCurrentCss = () => VencordNative.quickCss.get();
             win.getTheme = () =>
@@ -87,7 +91,7 @@ window.VencordNative = {
                     ? "vs-light"
                     : "vs-dark";
 
-            win.document.write(monacoHtml);
+            win.document.write(IS_EXTENSION ? monacoHtmlLocal : monacoHtmlCdn);
         },
     },
 
diff --git a/browser/background.js b/browser/background.js
deleted file mode 100644
index 1f2d5ec17..000000000
--- a/browser/background.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @template T
- * @param {T[]} arr
- * @param {(v: T) => boolean} predicate
- */
-function removeFirst(arr, predicate) {
-    const idx = arr.findIndex(predicate);
-    if (idx !== -1) arr.splice(idx, 1);
-}
-
-chrome.webRequest.onHeadersReceived.addListener(
-    ({ responseHeaders, type, url }) => {
-        if (!responseHeaders) return;
-
-        if (type === "main_frame") {
-            // In main frame requests, the CSP needs to be removed to enable fetching of custom css
-            // as desired by the user
-            removeFirst(responseHeaders, h => h.name.toLowerCase() === "content-security-policy");
-        } else if (type === "stylesheet" && url.startsWith("https://raw.githubusercontent.com/")) {
-            // Most users will load css from GitHub, but GitHub doesn't set the correct content type,
-            // so we fix it here
-            removeFirst(responseHeaders, h => h.name.toLowerCase() === "content-type");
-            responseHeaders.push({
-                name: "Content-Type",
-                value: "text/css"
-            });
-        }
-        return { responseHeaders };
-    },
-    { urls: ["https://raw.githubusercontent.com/*", "*://*.discord.com/*"], types: ["main_frame", "stylesheet"] },
-    ["blocking", "responseHeaders"]
-);
diff --git a/browser/content.js b/browser/content.js
index e47ef8377..4810fe3c8 100644
--- a/browser/content.js
+++ b/browser/content.js
@@ -4,6 +4,11 @@ if (typeof browser === "undefined") {
 
 const script = document.createElement("script");
 script.src = browser.runtime.getURL("dist/Vencord.js");
+script.id = "vencord-script";
+Object.assign(script.dataset, {
+    extensionBaseUrl: browser.runtime.getURL(""),
+    version: browser.runtime.getManifest().version
+});
 
 const style = document.createElement("link");
 style.type = "text/css";
diff --git a/browser/manifest.json b/browser/manifest.json
index 49536a71c..69bf0cec0 100644
--- a/browser/manifest.json
+++ b/browser/manifest.json
@@ -28,7 +28,7 @@
 
     "web_accessible_resources": [
         {
-            "resources": ["dist/Vencord.js", "dist/Vencord.css"],
+            "resources": ["dist/*", "third-party/*"],
             "matches": ["*://*.discord.com/*"]
         }
     ],
diff --git a/browser/manifestv2.json b/browser/manifestv2.json
index 3cac9450a..a6feada7e 100644
--- a/browser/manifestv2.json
+++ b/browser/manifestv2.json
@@ -26,11 +26,7 @@
         }
     ],
 
-    "background": {
-        "scripts": ["background.js"]
-    },
-
-    "web_accessible_resources": ["dist/Vencord.js", "dist/Vencord.css"],
+    "web_accessible_resources": ["dist/*", "third-party/*"],
 
     "browser_specific_settings": {
         "gecko": {
diff --git a/browser/monaco.ts b/browser/monaco.ts
new file mode 100644
index 000000000..ead061d65
--- /dev/null
+++ b/browser/monaco.ts
@@ -0,0 +1,43 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./patch-worker";
+
+import * as monaco from "monaco-editor/esm/vs/editor/editor.main.js";
+
+declare global {
+    const baseUrl: string;
+    const getCurrentCss: () => Promise<string>;
+    const setCss: (css: string) => void;
+    const getTheme: () => string;
+}
+
+const BASE = "/dist/monaco/vs";
+
+self.MonacoEnvironment = {
+    getWorkerUrl(_moduleId: unknown, label: string) {
+        const path = label === "css" ? "/language/css/css.worker.js" : "/editor/editor.worker.js";
+        return new URL(BASE + path, baseUrl).toString();
+    }
+};
+
+getCurrentCss().then(css => {
+    const editor = monaco.editor.create(
+        document.getElementById("container")!,
+        {
+            value: css,
+            language: "css",
+            theme: getTheme(),
+        }
+    );
+    editor.onDidChangeModelContent(() =>
+        setCss(editor.getValue())
+    );
+    window.addEventListener("resize", () => {
+        // make monaco re-layout
+        editor.layout();
+    });
+});
diff --git a/browser/monacoWin.html b/browser/monacoWin.html
new file mode 100644
index 000000000..a55b0e547
--- /dev/null
+++ b/browser/monacoWin.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <title>Vencord QuickCSS Editor</title>
+        <style>
+            html,
+            body,
+            #container {
+                position: absolute;
+                left: 0;
+                top: 0;
+                width: 100%;
+                height: 100%;
+                margin: 0;
+                padding: 0;
+                overflow: hidden;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="container"></div>
+
+        <script>
+            const script = document.createElement("script");
+            script.src = new URL("/dist/monaco/index.js", baseUrl);
+
+            const style = document.createElement("link");
+            style.type = "text/css";
+            style.rel = "stylesheet";
+            style.href = new URL("/dist/monaco/index.css", baseUrl);
+
+            document.body.append(style, script);
+        </script>
+    </body>
+</html>
diff --git a/browser/patch-worker.js b/browser/patch-worker.js
new file mode 100644
index 000000000..428ea6cc0
--- /dev/null
+++ b/browser/patch-worker.js
@@ -0,0 +1,135 @@
+/*
+Copyright 2013 Rob Wu <gwnRob@gmail.com>
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+// Target: Chrome 20+
+
+// W3-compliant Worker proxy.
+// This module replaces the global Worker object.
+// When invoked, the default Worker object is called.
+// If this call fails with SECURITY_ERR, the script is fetched
+//  using async XHR, and transparently proxies all calls and
+//  setters/getters to the new Worker object.
+// Note: This script does not magically circumvent the Same origin policy.
+
+(function () {
+    'use strict';
+    var Worker_ = window.Worker;
+    var URL = window.URL || window.webkitURL;
+    // Create dummy worker for the following purposes:
+    // 1. Don't override the global Worker object if the fallback isn't
+    //    going to work (future API changes?)
+    // 2. Use it to trigger early validation of postMessage calls
+    // Note: Blob constructor is supported since Chrome 20, but since
+    // some of the used Chrome APIs are only supported as of Chrome 20,
+    //  I don't bother adding a BlobBuilder fallback.
+    var dummyWorker = new Worker_(
+        URL.createObjectURL(new Blob([], { type: 'text/javascript' })));
+    window.Worker = function Worker(scriptURL) {
+        if (arguments.length === 0) {
+            throw new TypeError('Not enough arguments');
+        }
+        try {
+            return new Worker_(scriptURL);
+        } catch (e) {
+            if (e.code === 18/*DOMException.SECURITY_ERR*/) {
+                return new WorkerXHR(scriptURL);
+            } else {
+                throw e;
+            }
+        }
+    };
+    // Bind events and replay queued messages
+    function bindWorker(worker, workerURL) {
+        if (worker._terminated) {
+            return;
+        }
+        worker.Worker = new Worker_(workerURL);
+        worker.Worker.onerror = worker._onerror;
+        worker.Worker.onmessage = worker._onmessage;
+        var o;
+        while ((o = worker._replayQueue.shift())) {
+            worker.Worker[o.method].apply(worker.Worker, o.arguments);
+        }
+        while ((o = worker._messageQueue.shift())) {
+            worker.Worker.postMessage.apply(worker.Worker, o);
+        }
+    }
+    function WorkerXHR(scriptURL) {
+        var worker = this;
+        var x = new XMLHttpRequest();
+        x.responseType = 'blob';
+        x.onload = function () {
+            // http://stackoverflow.com/a/10372280/938089
+            var workerURL = URL.createObjectURL(x.response);
+            bindWorker(worker, workerURL);
+        };
+        x.open('GET', scriptURL);
+        x.send();
+        worker._replayQueue = [];
+        worker._messageQueue = [];
+    }
+    WorkerXHR.prototype = {
+        constructor: Worker_,
+        terminate: function () {
+            if (!this._terminated) {
+                this._terminated = true;
+                if (this.Worker)
+                    this.Worker.terminate();
+            }
+        },
+        postMessage: function (message, transfer) {
+            if (!(this instanceof WorkerXHR))
+                throw new TypeError('Illegal invocation');
+            if (this.Worker) {
+                this.Worker.postMessage.apply(this.Worker, arguments);
+            } else {
+                // Trigger validation:
+                dummyWorker.postMessage(message);
+                // Alright, push the valid message to the queue.
+                this._messageQueue.push(arguments);
+            }
+        }
+    };
+    // Implement the EventTarget interface
+    [
+        'addEventListener',
+        'removeEventListener',
+        'dispatchEvent'
+    ].forEach(function (method) {
+        WorkerXHR.prototype[method] = function () {
+            if (!(this instanceof WorkerXHR)) {
+                throw new TypeError('Illegal invocation');
+            }
+            if (this.Worker) {
+                this.Worker[method].apply(this.Worker, arguments);
+            } else {
+                this._replayQueue.push({ method: method, arguments: arguments });
+            }
+        };
+    });
+    Object.defineProperties(WorkerXHR.prototype, {
+        onmessage: {
+            get: function () { return this._onmessage || null; },
+            set: function (func) {
+                this._onmessage = typeof func === 'function' ? func : null;
+            }
+        },
+        onerror: {
+            get: function () { return this._onerror || null; },
+            set: function (func) {
+                this._onerror = typeof func === 'function' ? func : null;
+            }
+        }
+    });
+})();
\ No newline at end of file
diff --git a/package.json b/package.json
index 118ab7af9..c0b3998f1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.4.7",
+    "version": "1.5.2",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {
@@ -36,11 +36,14 @@
         "@vap/shiki": "0.10.5",
         "eslint-plugin-simple-header": "^1.0.2",
         "fflate": "^0.7.4",
+        "gifenc": "github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3",
+        "monaco-editor": "^0.43.0",
         "nanoid": "^4.0.2",
         "usercss-meta": "^0.12.0",
         "virtual-merge": "^1.0.1"
     },
     "devDependencies": {
+        "@types/chrome": "^0.0.246",
         "@types/diff": "^5.0.3",
         "@types/less": "^3.0.4",
         "@types/lodash": "^4.14.194",
@@ -68,7 +71,8 @@
         "stylelint-config-standard": "^33.0.0",
         "tsx": "^3.12.7",
         "type-fest": "^3.9.0",
-        "typescript": "^5.0.4"
+        "typescript": "^5.0.4",
+        "zip-local": "^0.3.5"
     },
     "packageManager": "pnpm@8.1.1",
     "pnpm": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 778ca7536..d62be17f2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,5 +1,9 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 patchedDependencies:
   '@types/less@3.0.4':
     hash: krcufrsfhsuxuoj7hocqugs6zi
@@ -27,6 +31,12 @@ dependencies:
   fflate:
     specifier: ^0.7.4
     version: 0.7.4
+  gifenc:
+    specifier: github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3
+    version: github.com/mattdesl/gifenc/64842fca317b112a8590f8fef2bf3825da8f6fe3
+  monaco-editor:
+    specifier: ^0.43.0
+    version: 0.43.0
   nanoid:
     specifier: ^4.0.2
     version: 4.0.2
@@ -38,6 +48,9 @@ dependencies:
     version: 1.0.1
 
 devDependencies:
+  '@types/chrome':
+    specifier: ^0.0.246
+    version: 0.0.246
   '@types/diff':
     specifier: ^5.0.3
     version: 5.0.3
@@ -122,6 +135,9 @@ devDependencies:
   typescript:
     specifier: ^5.0.4
     version: 5.0.4
+  zip-local:
+    specifier: ^0.3.5
+    version: 0.3.5
 
 packages:
 
@@ -535,10 +551,31 @@ packages:
     resolution: {integrity: sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw==}
     dev: false
 
+  /@types/chrome@0.0.246:
+    resolution: {integrity: sha512-MxGxEomGxsJiL9xe/7ZwVgwdn8XVKWbPvxpVQl3nWOjrS0Ce63JsfzxUc4aU3GvRcUPYsfufHmJ17BFyKxeA4g==}
+    dependencies:
+      '@types/filesystem': 0.0.33
+      '@types/har-format': 1.2.13
+    dev: true
+
   /@types/diff@5.0.3:
     resolution: {integrity: sha512-amrLbRqTU9bXMCc6uX0sWpxsQzRIo9z6MJPkH1pkez/qOxuqSZVuryJAWoBRq94CeG8JxY+VK4Le9HtjQR5T9A==}
     dev: true
 
+  /@types/filesystem@0.0.33:
+    resolution: {integrity: sha512-2KedRPzwu2K528vFkoXnnWdsG0MtUwPjuA7pRy4vKxlxHEe8qUDZibYHXJKZZr2Cl/ELdCWYqyb/MKwsUuzBWw==}
+    dependencies:
+      '@types/filewriter': 0.0.30
+    dev: true
+
+  /@types/filewriter@0.0.30:
+    resolution: {integrity: sha512-lB98tui0uxc7erbj0serZfJlHKLNJHwBltPnbmO1WRpL5T325GOHRiQfr2E29V2q+S1brDO63Fpdt6vb3bES9Q==}
+    dev: true
+
+  /@types/har-format@1.2.13:
+    resolution: {integrity: sha512-PwBsCBD3lDODn4xpje3Y1di0aDJp4Ww7aSfMRVw6ysnxD4I7Wmq2mBkSKaDtN403hqH5sp6c9xQUvFYY3+lkBg==}
+    dev: true
+
   /@types/json-schema@7.0.11:
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
     dev: true
@@ -873,6 +910,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /async@1.5.2:
+    resolution: {integrity: sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==}
+    dev: true
+
   /atob@2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
@@ -1897,6 +1938,10 @@ packages:
     resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
     dev: true
 
+  /graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+    dev: true
+
   /grapheme-splitter@1.0.4:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
     dev: true
@@ -2214,6 +2259,12 @@ packages:
     resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
     dev: false
 
+  /jszip@2.7.0:
+    resolution: {integrity: sha512-JIsRKRVC3gTRo2vM4Wy9WBC3TRcfnIZU8k65Phi3izkvPH975FowRYtKGT6PxevA0XnJ/yO8b0QwV0ydVyQwfw==}
+    dependencies:
+      pako: 1.0.11
+    dev: true
+
   /kind-of@3.2.2:
     resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
     engines: {node: '>=0.10.0'}
@@ -2384,6 +2435,10 @@ packages:
     resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
     dev: true
 
+  /monaco-editor@0.43.0:
+    resolution: {integrity: sha512-cnoqwQi/9fml2Szamv1XbSJieGJ1Dc8tENVMD26Kcfl7xGQWp7OBKMjlwKVGYFJ3/AXJjSOGvcqK7Ry/j9BM1Q==}
+    dev: false
+
   /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
     dev: true
@@ -2541,6 +2596,10 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /pako@1.0.11:
+    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
+    dev: true
+
   /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
@@ -2692,6 +2751,11 @@ packages:
       - utf-8-validate
     dev: true
 
+  /q@1.5.1:
+    resolution: {integrity: sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==}
+    engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
+    dev: true
+
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
@@ -3412,6 +3476,17 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
+  /zip-local@0.3.5:
+    resolution: {integrity: sha512-GRV3D5TJY+/PqyeRm5CYBs7xVrKTKzljBoEXvocZu0HJ7tPEcgpSOYa2zFIsCZWgKWMuc4U3yMFgFkERGFIB9w==}
+    dependencies:
+      async: 1.5.2
+      graceful-fs: 4.2.11
+      jszip: 2.7.0
+      q: 1.5.1
+    dev: true
+
+  github.com/mattdesl/gifenc/64842fca317b112a8590f8fef2bf3825da8f6fe3:
+    resolution: {tarball: https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3}
+    name: gifenc
+    version: 1.0.3
+    dev: false
diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs
index ce84fed5d..c8978a4b3 100755
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@@ -25,6 +25,8 @@ const defines = {
     IS_STANDALONE: isStandalone,
     IS_DEV: JSON.stringify(watch),
     IS_UPDATER_DISABLED: updaterDisabled,
+    IS_WEB: false,
+    IS_EXTENSION: false,
     VERSION: JSON.stringify(VERSION),
     BUILD_TIMESTAMP,
 };
@@ -77,7 +79,6 @@ await Promise.all([
         ],
         define: {
             ...defines,
-            IS_WEB: false,
             IS_DISCORD_DESKTOP: true,
             IS_VESKTOP: false
         }
@@ -123,7 +124,6 @@ await Promise.all([
         ],
         define: {
             ...defines,
-            IS_WEB: false,
             IS_DISCORD_DESKTOP: false,
             IS_VESKTOP: true
         }
diff --git a/scripts/build/buildWeb.mjs b/scripts/build/buildWeb.mjs
index aab82d069..e4eeb53ea 100644
--- a/scripts/build/buildWeb.mjs
+++ b/scripts/build/buildWeb.mjs
@@ -17,12 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
 import esbuild from "esbuild";
-import { zip } from "fflate";
 import { readFileSync } from "fs";
-import { appendFile, mkdir, readFile, rm, writeFile } from "fs/promises";
+import { appendFile, mkdir, readdir, readFile, rm, writeFile } from "fs/promises";
 import { join } from "path";
+import Zip from "zip-local";
 
 import { BUILD_TIMESTAMP, commonOpts, globPlugins, VERSION, watch } from "./common.mjs";
 
@@ -42,6 +41,7 @@ const commonOptions = {
     target: ["esnext"],
     define: {
         IS_WEB: "true",
+        IS_EXTENSION: "false",
         IS_STANDALONE: "true",
         IS_DEV: JSON.stringify(watch),
         IS_DISCORD_DESKTOP: "false",
@@ -52,19 +52,58 @@ const commonOptions = {
     }
 };
 
+const MonacoWorkerEntryPoints = [
+    "vs/language/css/css.worker.js",
+    "vs/editor/editor.worker.js"
+];
+
+const RnNoiseFiles = [
+    "dist/rnnoise.wasm",
+    "dist/rnnoise_simd.wasm",
+    "dist/rnnoise/workletProcessor.js",
+    "LICENSE"
+];
+
 await Promise.all(
     [
+        esbuild.build({
+            entryPoints: MonacoWorkerEntryPoints.map(entry => `node_modules/monaco-editor/esm/${entry}`),
+            bundle: true,
+            minify: true,
+            format: "iife",
+            outbase: "node_modules/monaco-editor/esm/",
+            outdir: "dist/monaco"
+        }),
+        esbuild.build({
+            entryPoints: ["browser/monaco.ts"],
+            bundle: true,
+            minify: true,
+            format: "iife",
+            outfile: "dist/monaco/index.js",
+            loader: {
+                ".ttf": "file"
+            }
+        }),
         esbuild.build({
             ...commonOptions,
             outfile: "dist/browser.js",
             footer: { js: "//# sourceURL=VencordWeb" },
         }),
+        esbuild.build({
+            ...commonOptions,
+            outfile: "dist/extension.js",
+            define: {
+                ...commonOptions?.define,
+                IS_EXTENSION: "true",
+            },
+            footer: { js: "//# sourceURL=VencordWeb" },
+        }),
         esbuild.build({
             ...commonOptions,
             inject: ["browser/GMPolyfill.js", ...(commonOptions?.inject || [])],
             define: {
-                "window": "unsafeWindow",
-                ...(commonOptions?.define)
+                ...(commonOptions?.define),
+                window: "unsafeWindow",
             },
             outfile: "dist/Vencord.user.js",
             banner: {
@@ -79,12 +118,41 @@ await Promise.all(
 );
 
 /**
-  * @type {(target: string, files: string[], shouldZip: boolean) => Promise<void>}
+ * @type {(dir: string) => Promise<string[]>}
  */
-async function buildPluginZip(target, files, shouldZip) {
+async function globDir(dir) {
+    const files = [];
+
+    for (const child of await readdir(dir, { withFileTypes: true })) {
+        const p = join(dir, child.name);
+        if (child.isDirectory())
+            files.push(...await globDir(p));
+        else
+            files.push(p);
+    }
+
+    return files;
+}
+
+/**
+ * @type {(dir: string, basePath?: string) => Promise<Record<string, string>>}
+ */
+async function loadDir(dir, basePath = "") {
+    const files = await globDir(dir);
+    return Object.fromEntries(await Promise.all(files.map(async f => [f.slice(basePath.length), await readFile(f)])));
+}
+
+/**
+  * @type {(target: string, files: string[]) => Promise<void>}
+ */
+async function buildExtension(target, files, noMonaco = false) {
     const entries = {
-        "dist/Vencord.js": await readFile("dist/browser.js"),
-        "dist/Vencord.css": await readFile("dist/browser.css"),
+        "dist/Vencord.js": await readFile("dist/extension.js"),
+        "dist/Vencord.css": await readFile("dist/extension.css"),
+        ...(noMonaco ? {} : await loadDir("dist/monaco")),
+        ...Object.fromEntries(await Promise.all(RnNoiseFiles.map(async file =>
+            [`third-party/rnnoise/${file.replace(/^dist\//, "")}`, await readFile(`node_modules/@sapphi-red/web-noise-suppressor/${file}`)]
+        ))),
         ...Object.fromEntries(await Promise.all(files.map(async f => {
             let content = await readFile(join("browser", f));
             if (f.startsWith("manifest")) {
@@ -100,31 +168,15 @@ async function buildPluginZip(target, files, shouldZip) {
         }))),
     };
 
-    if (shouldZip) {
-        return new Promise((resolve, reject) => {
-            zip(entries, {}, (err, data) => {
-                if (err) {
-                    reject(err);
-                } else {
-                    const out = join("dist", target);
-                    writeFile(out, data).then(() => {
-                        console.info("Extension written to " + out);
-                        resolve();
-                    }).catch(reject);
-                }
-            });
-        });
-    } else {
-        await rm(target, { recursive: true, force: true });
-        await Promise.all(Object.entries(entries).map(async ([file, content]) => {
-            const dest = join("dist", target, file);
-            const parentDirectory = join(dest, "..");
-            await mkdir(parentDirectory, { recursive: true });
-            await writeFile(dest, content);
-        }));
+    await rm(target, { recursive: true, force: true });
+    await Promise.all(Object.entries(entries).map(async ([file, content]) => {
+        const dest = join("dist", target, file);
+        const parentDirectory = join(dest, "..");
+        await mkdir(parentDirectory, { recursive: true });
+        await writeFile(dest, content);
+    }));
 
-        console.info("Unpacked Extension written to dist/" + target);
-    }
+    console.info("Unpacked Extension written to dist/" + target);
 }
 
 const appendCssRuntime = readFile("dist/Vencord.user.css", "utf-8").then(content => {
@@ -142,8 +194,9 @@ const appendCssRuntime = readFile("dist/Vencord.user.css", "utf-8").then(content
 
 await Promise.all([
     appendCssRuntime,
-    buildPluginZip("extension.zip", ["modifyResponseHeaders.json", "content.js", "manifest.json", "icon.png"], true),
-    buildPluginZip("chromium-unpacked", ["modifyResponseHeaders.json", "content.js", "manifest.json", "icon.png"], false),
-    buildPluginZip("firefox-unpacked", ["background.js", "content.js", "manifestv2.json", "icon.png"], false),
+    buildExtension("chromium-unpacked", ["modifyResponseHeaders.json", "content.js", "manifest.json", "icon.png"]),
+    buildExtension("firefox-unpacked", ["content.js", "manifestv2.json", "icon.png"], true),
 ]);
 
+Zip.sync.zip("dist/chromium-unpacked").compress().save("dist/extension.zip");
+console.info("Packed Chromium Extension written to dist/extension.zip");
diff --git a/scripts/generatePluginList.ts b/scripts/generatePluginList.ts
index b788178cd..e8aa33a46 100644
--- a/scripts/generatePluginList.ts
+++ b/scripts/generatePluginList.ts
@@ -18,7 +18,8 @@
 
 import { Dirent, readdirSync, readFileSync, writeFileSync } from "fs";
 import { access, readFile } from "fs/promises";
-import { join } from "path";
+import { join, sep } from "path";
+import { normalize as posixNormalize, sep as posixSep } from "path/posix";
 import { BigIntLiteral, createSourceFile, Identifier, isArrayLiteralExpression, isCallExpression, isExportAssignment, isIdentifier, isObjectLiteralExpression, isPropertyAccessExpression, isPropertyAssignment, isSatisfiesExpression, isStringLiteral, isVariableStatement, NamedDeclaration, NodeArray, ObjectLiteralExpression, ScriptTarget, StringLiteral, SyntaxKind } from "typescript";
 
 import { getPluginTarget } from "./utils.mjs";
@@ -39,6 +40,7 @@ interface PluginData {
     required: boolean;
     enabledByDefault: boolean;
     target: "discordDesktop" | "vencordDesktop" | "web" | "dev";
+    filePath: string;
 }
 
 const devs = {} as Record<string, Dev>;
@@ -165,6 +167,12 @@ async function parseFile(fileName: string) {
             data.target = target as any;
         }
 
+        data.filePath = posixNormalize(fileName)
+            .split(sep)
+            .join(posixSep)
+            .replace(/\/index\.([jt]sx?)$/, "")
+            .replace(/^src\/plugins\//, "");
+
         let readme = "";
         try {
             readme = readFileSync(join(fileName, "..", "README.md"), "utf-8");
diff --git a/src/VencordNative.ts b/src/VencordNative.ts
index 5426fa359..398cdc42c 100644
--- a/src/VencordNative.ts
+++ b/src/VencordNative.ts
@@ -22,7 +22,8 @@ export default {
         deleteTheme: (fileName: string) => invoke<void>(IpcEvents.DELETE_THEME, fileName),
         getThemesDir: () => invoke<string>(IpcEvents.GET_THEMES_DIR),
         getThemesList: () => invoke<Array<{ fileName: string; content: string; }>>(IpcEvents.GET_THEMES_LIST),
-        getThemeData: (fileName: string) => invoke<string | undefined>(IpcEvents.GET_THEME_DATA, fileName)
+        getThemeData: (fileName: string) => invoke<string | undefined>(IpcEvents.GET_THEME_DATA, fileName),
+        getSystemValues: () => invoke<Record<string, string>>(IpcEvents.GET_THEME_SYSTEM_VALUES),
     },
 
     updater: {
diff --git a/src/components/Icons.tsx b/src/components/Icons.tsx
index a24045efd..26364fc94 100644
--- a/src/components/Icons.tsx
+++ b/src/components/Icons.tsx
@@ -28,8 +28,8 @@ interface BaseIconProps extends IconProps {
 
 interface IconProps extends SVGProps<SVGSVGElement> {
     className?: string;
-    height?: number;
-    width?: number;
+    height?: string | number;
+    width?: string | number;
 }
 
 function Icon({ height = 24, width = 24, className, children, viewBox, ...svgProps }: PropsWithChildren<BaseIconProps>) {
@@ -97,7 +97,7 @@ export function OpenExternalIcon(props: IconProps) {
         >
             <polygon
                 fill="currentColor"
-                fill-rule="nonzero"
+                fillRule="nonzero"
                 points="13 20 11 20 11 8 5.5 13.5 4.08 12.08 12 4.16 19.92 12.08 18.5 13.5 13 8"
             />
         </Icon>
@@ -121,9 +121,13 @@ export function InfoIcon(props: IconProps) {
         <Icon
             {...props}
             className={classes(props.className, "vc-info-icon")}
-            viewBox="0 0 12 12"
+            viewBox="0 0 24 24"
         >
-            <path fill="currentColor" d="M6 1C3.243 1 1 3.244 1 6c0 2.758 2.243 5 5 5s5-2.242 5-5c0-2.756-2.243-5-5-5zm0 2.376a.625.625 0 110 1.25.625.625 0 010-1.25zM7.5 8.5h-3v-1h1V6H5V5h1a.5.5 0 01.5.5v2h1v1z" />
+            <path
+                fill="currentColor"
+                transform="translate(2 2)"
+                d="M9,7 L11,7 L11,5 L9,5 L9,7 Z M10,18 C5.59,18 2,14.41 2,10 C2,5.59 5.59,2 10,2 C14.41,2 18,5.59 18,10 C18,14.41 14.41,18 10,18 L10,18 Z M10,4.4408921e-16 C4.4771525,-1.77635684e-15 4.4408921e-16,4.4771525 0,10 C-1.33226763e-15,12.6521649 1.0535684,15.195704 2.92893219,17.0710678 C4.80429597,18.9464316 7.3478351,20 10,20 C12.6521649,20 15.195704,18.9464316 17.0710678,17.0710678 C18.9464316,15.195704 20,12.6521649 20,10 C20,7.3478351 18.9464316,4.80429597 17.0710678,2.92893219 C15.195704,1.0535684 12.6521649,2.22044605e-16 10,0 L10,4.4408921e-16 Z M9,15 L11,15 L11,9 L9,9 L9,15 L9,15 Z"
+            />
         </Icon>
     );
 }
@@ -139,8 +143,8 @@ export function OwnerCrownIcon(props: IconProps) {
         >
             <path
                 fill="currentColor"
-                fill-rule="evenodd"
-                clip-rule="evenodd"
+                fillRule="evenodd"
+                clipRule="evenodd"
                 d="M13.6572 5.42868C13.8879 5.29002 14.1806 5.30402 14.3973 5.46468C14.6133 5.62602 14.7119 5.90068 14.6473 6.16202L13.3139 11.4954C13.2393 11.7927 12.9726 12.0007 12.6666 12.0007H3.33325C3.02725 12.0007 2.76058 11.792 2.68592 11.4954L1.35258 6.16202C1.28792 5.90068 1.38658 5.62602 1.60258 5.46468C1.81992 5.30468 2.11192 5.29068 2.34325 5.42868L5.13192 7.10202L7.44592 3.63068C7.46173 3.60697 7.48377 3.5913 7.50588 3.57559C7.5192 3.56612 7.53255 3.55663 7.54458 3.54535L6.90258 2.90268C6.77325 2.77335 6.77325 2.56068 6.90258 2.43135L7.76458 1.56935C7.89392 1.44002 8.10658 1.44002 8.23592 1.56935L9.09792 2.43135C9.22725 2.56068 9.22725 2.77335 9.09792 2.90268L8.45592 3.54535C8.46794 3.55686 8.48154 3.56651 8.49516 3.57618C8.51703 3.5917 8.53897 3.60727 8.55458 3.63068L10.8686 7.10202L13.6572 5.42868ZM2.66667 12.6673H13.3333V14.0007H2.66667V12.6673Z"
             />
         </Icon>
@@ -159,8 +163,6 @@ export function ScreenshareIcon(props: IconProps) {
         >
             <path
                 fill="currentColor"
-                fill-rule="evenodd"
-                clip-rule="evenodd"
                 d="M2 4.5C2 3.397 2.897 2.5 4 2.5H20C21.103 2.5 22 3.397 22 4.5V15.5C22 16.604 21.103 17.5 20 17.5H13V19.5H17V21.5H7V19.5H11V17.5H4C2.897 17.5 2 16.604 2 15.5V4.5ZM13.2 14.3375V11.6C9.864 11.6 7.668 12.6625 6 15C6.672 11.6625 8.532 8.3375 13.2 7.6625V5L18 9.6625L13.2 14.3375Z"
             />
         </Icon>
@@ -198,8 +200,39 @@ export function Microphone(props: IconProps) {
             className={classes(props.className, "vc-microphone")}
             viewBox="0 0 24 24"
         >
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M14.99 11C14.99 12.66 13.66 14 12 14C10.34 14 9 12.66 9 11V5C9 3.34 10.34 2 12 2C13.66 2 15 3.34 15 5L14.99 11ZM12 16.1C14.76 16.1 17.3 14 17.3 11H19C19 14.42 16.28 17.24 13 17.72V21H11V17.72C7.72 17.23 5 14.41 5 11H6.7C6.7 14 9.24 16.1 12 16.1ZM12 4C11.2 4 11 4.66667 11 5V11C11 11.3333 11.2 12 12 12C12.8 12 13 11.3333 13 11V5C13 4.66667 12.8 4 12 4Z" fill="currentColor" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M14.99 11C14.99 12.66 13.66 14 12 14C10.34 14 9 12.66 9 11V5C9 3.34 10.34 2 12 2C13.66 2 15 3.34 15 5L14.99 11ZM12 16.1C14.76 16.1 17.3 14 17.3 11H19C19 14.42 16.28 17.24 13 17.72V22H11V17.72C7.72 17.23 5 14.41 5 11H6.7C6.7 14 9.24 16.1 12 16.1Z" fill="currentColor" />
+            <path fillRule="evenodd" clipRule="evenodd" d="M14.99 11C14.99 12.66 13.66 14 12 14C10.34 14 9 12.66 9 11V5C9 3.34 10.34 2 12 2C13.66 2 15 3.34 15 5L14.99 11ZM12 16.1C14.76 16.1 17.3 14 17.3 11H19C19 14.42 16.28 17.24 13 17.72V21H11V17.72C7.72 17.23 5 14.41 5 11H6.7C6.7 14 9.24 16.1 12 16.1ZM12 4C11.2 4 11 4.66667 11 5V11C11 11.3333 11.2 12 12 12C12.8 12 13 11.3333 13 11V5C13 4.66667 12.8 4 12 4Z" fill="currentColor" />
+            <path fillRule="evenodd" clipRule="evenodd" d="M14.99 11C14.99 12.66 13.66 14 12 14C10.34 14 9 12.66 9 11V5C9 3.34 10.34 2 12 2C13.66 2 15 3.34 15 5L14.99 11ZM12 16.1C14.76 16.1 17.3 14 17.3 11H19C19 14.42 16.28 17.24 13 17.72V22H11V17.72C7.72 17.23 5 14.41 5 11H6.7C6.7 14 9.24 16.1 12 16.1Z" fill="currentColor" />
         </Icon >
     );
 }
+
+export function CogWheel(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            className={classes(props.className, "vc-cog-wheel")}
+            viewBox="0 0 24 24"
+        >
+            <path
+                clipRule="evenodd"
+                fill="currentColor"
+                d="M19.738 10H22V14H19.739C19.498 14.931 19.1 15.798 18.565 16.564L20 18L18 20L16.565 18.564C15.797 19.099 14.932 19.498 14 19.738V22H10V19.738C9.069 19.498 8.203 19.099 7.436 18.564L6 20L4 18L5.436 16.564C4.901 15.799 4.502 14.932 4.262 14H2V10H4.262C4.502 9.068 4.9 8.202 5.436 7.436L4 6L6 4L7.436 5.436C8.202 4.9 9.068 4.502 10 4.262V2H14V4.261C14.932 4.502 15.797 4.9 16.565 5.435L18 3.999L20 5.999L18.564 7.436C19.099 8.202 19.498 9.069 19.738 10ZM12 16C14.2091 16 16 14.2091 16 12C16 9.79086 14.2091 8 12 8C9.79086 8 8 9.79086 8 12C8 14.2091 9.79086 16 12 16Z"
+            />
+        </Icon>
+    );
+}
+
+export function ReplyIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            className={classes(props.className, "vc-reply-icon")}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill="currentColor"
+                d="M10 8.26667V4L3 11.4667L10 18.9333V14.56C15 14.56 18.5 16.2667 21 20C20 14.6667 17 9.33333 10 8.26667Z"
+            />
+        </Icon>
+    );
+}
diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index 3712f3de1..22657e730 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -22,6 +22,7 @@ import * as DataStore from "@api/DataStore";
 import { showNotice } from "@api/Notices";
 import { Settings, useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
+import { CogWheel, InfoIcon } from "@components/Icons";
 import PluginModal from "@components/PluginSettings/PluginModal";
 import { AddonCard } from "@components/VencordSettings/AddonCard";
 import { SettingsTab } from "@components/VencordSettings/shared";
@@ -30,9 +31,9 @@ import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
 import { classes, isObjectEmpty } from "@utils/misc";
 import { openModalLazy } from "@utils/modal";
-import { LazyComponent, useAwaiter } from "@utils/react";
+import { useAwaiter } from "@utils/react";
 import { Plugin } from "@utils/types";
-import { findByCode, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { Alerts, Button, Card, Forms, Parser, React, Select, Text, TextInput, Toasts, Tooltip } from "@webpack/common";
 
 import Plugins from "~plugins";
@@ -46,8 +47,6 @@ const logger = new Logger("PluginSettings", "#a6d189");
 const InputStyles = findByPropsLazy("inputDefault", "inputWrapper");
 const ButtonClasses = findByPropsLazy("button", "disabled", "enabled");
 
-const CogWheel = LazyComponent(() => findByCode("18.564C15.797 19.099 14.932 19.498 14 19.738V22H10V19.738C9.069"));
-const InfoIcon = LazyComponent(() => findByCode("4.4408921e-16 C4.4771525,-1.77635684e-15 4.4408921e-16"));
 
 function showErrorToast(message: string) {
     Toasts.show({
@@ -163,7 +162,7 @@ export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, on
                 <button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
                     {plugin.options && !isObjectEmpty(plugin.options)
                         ? <CogWheel />
-                        : <InfoIcon width="24" height="24" />}
+                        : <InfoIcon />}
                 </button>
             }
         />
diff --git a/src/components/ThemeSettings/ThemesTab.tsx b/src/components/ThemeSettings/ThemesTab.tsx
index d5f054fef..d6e910baf 100644
--- a/src/components/ThemeSettings/ThemesTab.tsx
+++ b/src/components/ThemeSettings/ThemesTab.tsx
@@ -24,6 +24,7 @@ import { Flex } from "@components/Flex";
 import { Link } from "@components/Link";
 import { AddonCard } from "@components/VencordSettings/AddonCard";
 import { SettingsTab, wrapTab } from "@components/VencordSettings/shared";
+import { IsFirefox } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { openModal } from "@utils/modal";
@@ -354,12 +355,14 @@ function ThemesTab() {
                             >
                                 Load missing Themes
                             </Button>
-                            <Button
-                                onClick={() => VencordNative.quickCss.openEditor()}
-                                size={Button.Sizes.SMALL}
-                            >
-                                Edit QuickCSS
-                            </Button>
+                            {!IsFirefox && (
+                                <Button
+                                    onClick={() => VencordNative.quickCss.openEditor()}
+                                    size={Button.Sizes.SMALL}
+                                >
+                                    Edit QuickCSS
+                                </Button>
+                            )}
                         </>
                     </Card>
 
diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index a80b79a4b..520e4daad 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -21,6 +21,7 @@ import { Settings, useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import DonateButton from "@components/DonateButton";
 import { ErrorCard } from "@components/ErrorCard";
+import { IsFirefox } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import { identity } from "@utils/misc";
 import { relaunch, showItemInFolder } from "@utils/native";
@@ -109,12 +110,14 @@ function VencordSettings() {
                                 Restart Client
                             </Button>
                         )}
-                        <Button
-                            onClick={() => VencordNative.quickCss.openEditor()}
-                            size={Button.Sizes.SMALL}
-                            disabled={settingsDir === "Loading..."}>
-                            Open QuickCSS File
-                        </Button>
+                        {!IsFirefox && (
+                            <Button
+                                onClick={() => VencordNative.quickCss.openEditor()}
+                                size={Button.Sizes.SMALL}
+                                disabled={settingsDir === "Loading..."}>
+                                Open QuickCSS File
+                            </Button>
+                        )}
                         {!IS_WEB && (
                             <Button
                                 onClick={() => showItemInFolder(settingsDir)}
@@ -257,7 +260,11 @@ function DonateCard({ image }: DonateCardProps) {
                 src={image}
                 alt=""
                 height={128}
-                style={{ marginLeft: "auto", transform: image === DEFAULT_DONATE_IMAGE ? "rotate(10deg)" : "" }}
+                style={{
+                    imageRendering: image === SHIGGY_DONATE_IMAGE ? "pixelated" : void 0,
+                    marginLeft: "auto",
+                    transform: image === DEFAULT_DONATE_IMAGE ? "rotate(10deg)" : void 0
+                }}
             />
         </Card>
     );
diff --git a/src/globals.d.ts b/src/globals.d.ts
index daccf33dd..94b5f15e8 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -33,6 +33,7 @@ declare global {
      * replace: `${IS_WEB}?foo:bar`
      */
     export var IS_WEB: boolean;
+    export var IS_EXTENSION: boolean;
     export var IS_DEV: boolean;
     export var IS_STANDALONE: boolean;
     export var IS_UPDATER_DISABLED: boolean;
diff --git a/src/main/ipcMain.ts b/src/main/ipcMain.ts
index 95a7c3862..10721bc37 100644
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@@ -22,12 +22,12 @@ import "./ipcPlugins";
 import { debounce } from "@utils/debounce";
 import { IpcEvents } from "@utils/IpcEvents";
 import { Queue } from "@utils/Queue";
-import { BrowserWindow, ipcMain, shell } from "electron";
+import { BrowserWindow, ipcMain, shell, systemPreferences } from "electron";
 import { mkdirSync, readFileSync, watch } from "fs";
 import { open, readdir, readFile, writeFile } from "fs/promises";
 import { join, normalize } from "path";
 
-import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
+import monacoHtml from "~fileContent/monacoWin.html;base64";
 
 import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE, THEMES_DIR } from "./utils/constants";
 import { makeLinksOpenExternally } from "./utils/externalLinks";
@@ -101,6 +101,10 @@ ipcMain.handle(IpcEvents.SET_QUICK_CSS, (_, css) =>
 ipcMain.handle(IpcEvents.GET_THEMES_DIR, () => THEMES_DIR);
 ipcMain.handle(IpcEvents.GET_THEMES_LIST, () => listThemes());
 ipcMain.handle(IpcEvents.GET_THEME_DATA, (_, fileName) => getThemeData(fileName));
+ipcMain.handle(IpcEvents.GET_THEME_SYSTEM_VALUES, () => ({
+    // win & mac only
+    "os-accent-color": `#${systemPreferences.getAccentColor?.() || ""}`
+}));
 
 ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR);
 ipcMain.on(IpcEvents.GET_SETTINGS, e => e.returnValue = readSettings());
diff --git a/src/components/monacoWin.html b/src/main/monacoWin.html
similarity index 100%
rename from src/components/monacoWin.html
rename to src/main/monacoWin.html
diff --git a/src/plugins/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx
similarity index 82%
rename from src/plugins/supportHelper.tsx
rename to src/plugins/_core/supportHelper.tsx
index f36cc0fdb..2e86869d3 100644
--- a/src/plugins/supportHelper.tsx
+++ b/src/plugins/_core/supportHelper.tsx
@@ -17,7 +17,7 @@
 */
 
 import { DataStore } from "@api/index";
-import { Devs, SUPPORT_CHANNEL_ID } from "@utils/constants";
+import { Devs, IsFirefox, SUPPORT_CHANNEL_ID } from "@utils/constants";
 import { isPluginDev } from "@utils/misc";
 import { makeCodeblock } from "@utils/text";
 import definePlugin from "@utils/types";
@@ -27,9 +27,10 @@ import { Alerts, Forms, UserStore } from "@webpack/common";
 import gitHash from "~git-hash";
 import plugins from "~plugins";
 
-import settings from "./_core/settings";
+import settings from "./settings";
 
 const REMEMBER_DISMISS_KEY = "Vencord-SupportHelper-Dismiss";
+const FIREFOX_DISMISS_KEY = "Vencord-Firefox-Warning-Dismiss";
 
 const AllowedChannelIds = [
     SUPPORT_CHANNEL_ID,
@@ -115,6 +116,22 @@ ${makeCodeblock(enabledPlugins.join(", ") + "\n\n" + enabledApiPlugins.join(", "
                     onConfirm: rememberDismiss
                 });
             }
+
+            if (IsFirefox) {
+                const rememberDismiss = () => DataStore.set(FIREFOX_DISMISS_KEY, true);
+
+                Alerts.show({
+                    title: "Hold on!",
+                    body: <div>
+                        <Forms.FormText>You are using Firefox.</Forms.FormText>
+                        <Forms.FormText>Due to Firefox's stupid extension guidelines, most themes and many plugins will not function correctly.</Forms.FormText>
+                        <Forms.FormText>Do not report bugs. Do not ask for help with broken plugins.</Forms.FormText>
+                        <Forms.FormText>Instead, use a chromium browser, Discord Desktop, or Vesktop.</Forms.FormText>
+                    </div>,
+                    onCancel: rememberDismiss,
+                    onConfirm: rememberDismiss
+                });
+            }
         }
     }
 });
diff --git a/src/plugins/alwaysAnimate.ts b/src/plugins/alwaysAnimate/index.ts
similarity index 100%
rename from src/plugins/alwaysAnimate.ts
rename to src/plugins/alwaysAnimate/index.ts
diff --git a/src/plugins/alwaysTrust.ts b/src/plugins/alwaysTrust/index.ts
similarity index 100%
rename from src/plugins/alwaysTrust.ts
rename to src/plugins/alwaysTrust/index.ts
diff --git a/src/plugins/anonymiseFileNames.ts b/src/plugins/anonymiseFileNames/index.ts
similarity index 100%
rename from src/plugins/anonymiseFileNames.ts
rename to src/plugins/anonymiseFileNames/index.ts
diff --git a/src/plugins/arRPC.web.tsx b/src/plugins/arRPC.web/index.tsx
similarity index 100%
rename from src/plugins/arRPC.web.tsx
rename to src/plugins/arRPC.web/index.tsx
diff --git a/src/plugins/banger.ts b/src/plugins/banger/index.ts
similarity index 100%
rename from src/plugins/banger.ts
rename to src/plugins/banger/index.ts
diff --git a/src/plugins/betterGifAltText.ts b/src/plugins/betterGifAltText/index.ts
similarity index 100%
rename from src/plugins/betterGifAltText.ts
rename to src/plugins/betterGifAltText/index.ts
diff --git a/src/plugins/betterNotes.ts b/src/plugins/betterNotes/index.ts
similarity index 100%
rename from src/plugins/betterNotes.ts
rename to src/plugins/betterNotes/index.ts
diff --git a/src/plugins/betterRoleDot.ts b/src/plugins/betterRoleDot/index.ts
similarity index 70%
rename from src/plugins/betterRoleDot.ts
rename to src/plugins/betterRoleDot/index.ts
index 773176d8e..e8f69b897 100644
--- a/src/plugins/betterRoleDot.ts
+++ b/src/plugins/betterRoleDot/index.ts
@@ -23,7 +23,7 @@ import { Clipboard, Toasts } from "@webpack/common";
 
 export default definePlugin({
     name: "BetterRoleDot",
-    authors: [Devs.Ven],
+    authors: [Devs.Ven, Devs.AutumnVN],
     description:
         "Copy role colour on RoleDot (accessibility setting) click. Also allows using both RoleDot and coloured names simultaneously",
 
@@ -43,6 +43,23 @@ export default definePlugin({
                 match: /"(?:username|dot)"===\i(?!\.\i)/g,
                 replace: "true",
             },
+        },
+
+        {
+            find: ".ADD_ROLE_A11Y_LABEL",
+            predicate: () => Settings.plugins.BetterRoleDot.copyRoleColorInProfilePopout && !Settings.plugins.BetterRoleDot.bothStyles,
+            replacement: {
+                match: /"dot"===\i/,
+                replace: "true"
+            }
+        },
+        {
+            find: ".roleVerifiedIcon",
+            predicate: () => Settings.plugins.BetterRoleDot.copyRoleColorInProfilePopout && !Settings.plugins.BetterRoleDot.bothStyles,
+            replacement: {
+                match: /"dot"===\i/,
+                replace: "true"
+            }
         }
     ],
 
@@ -50,7 +67,14 @@ export default definePlugin({
         bothStyles: {
             type: OptionType.BOOLEAN,
             description: "Show both role dot and coloured names",
+            restartNeeded: true,
             default: false,
+        },
+        copyRoleColorInProfilePopout: {
+            type: OptionType.BOOLEAN,
+            description: "Allow click on role dot in profile popout to copy role color",
+            restartNeeded: true,
+            default: false
         }
     },
 
diff --git a/src/plugins/betterUploadButton.ts b/src/plugins/betterUploadButton/index.ts
similarity index 100%
rename from src/plugins/betterUploadButton.ts
rename to src/plugins/betterUploadButton/index.ts
diff --git a/src/plugins/blurNsfw.ts b/src/plugins/blurNsfw/index.ts
similarity index 100%
rename from src/plugins/blurNsfw.ts
rename to src/plugins/blurNsfw/index.ts
diff --git a/src/plugins/callTimer.tsx b/src/plugins/callTimer/index.tsx
similarity index 100%
rename from src/plugins/callTimer.tsx
rename to src/plugins/callTimer/index.tsx
diff --git a/src/plugins/clearURLs/defaultRules.ts b/src/plugins/clearURLs/defaultRules.ts
index 644d2cf2c..d6914b905 100644
--- a/src/plugins/clearURLs/defaultRules.ts
+++ b/src/plugins/clearURLs/defaultRules.ts
@@ -127,6 +127,8 @@ export const defaultRules = [
     "redircnt@yandex.*",
     "feature@youtube.com",
     "kw@youtube.com",
+    "si@youtube.com",
+    "pp@youtube.com",
     "si@youtu.be",
     "wt_zmc",
     "utm_source",
diff --git a/src/plugins/colorSighted.ts b/src/plugins/colorSighted/index.ts
similarity index 100%
rename from src/plugins/colorSighted.ts
rename to src/plugins/colorSighted/index.ts
diff --git a/src/plugins/consoleShortcuts.ts b/src/plugins/consoleShortcuts/index.ts
similarity index 100%
rename from src/plugins/consoleShortcuts.ts
rename to src/plugins/consoleShortcuts/index.ts
diff --git a/src/plugins/copyUserURLs.tsx b/src/plugins/copyUserURLs/index.tsx
similarity index 100%
rename from src/plugins/copyUserURLs.tsx
rename to src/plugins/copyUserURLs/index.tsx
diff --git a/src/plugins/crashHandler.ts b/src/plugins/crashHandler/index.ts
similarity index 100%
rename from src/plugins/crashHandler.ts
rename to src/plugins/crashHandler/index.ts
diff --git a/src/plugins/customRPC.tsx b/src/plugins/customRPC/index.tsx
similarity index 100%
rename from src/plugins/customRPC.tsx
rename to src/plugins/customRPC/index.tsx
diff --git a/src/plugins/devCompanion.dev.tsx b/src/plugins/devCompanion.dev/index.tsx
similarity index 100%
rename from src/plugins/devCompanion.dev.tsx
rename to src/plugins/devCompanion.dev/index.tsx
diff --git a/src/plugins/disableDMCallIdle.ts b/src/plugins/disableDMCallIdle/index.ts
similarity index 100%
rename from src/plugins/disableDMCallIdle.ts
rename to src/plugins/disableDMCallIdle/index.ts
diff --git a/src/plugins/emoteCloner.tsx b/src/plugins/emoteCloner/index.tsx
similarity index 98%
rename from src/plugins/emoteCloner.tsx
rename to src/plugins/emoteCloner/index.tsx
index 0900422a8..7acb6ecb5 100644
--- a/src/plugins/emoteCloner.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -24,11 +24,9 @@ import { Margins } from "@utils/margins";
 import { ModalContent, ModalHeader, ModalRoot, openModalLazy } from "@utils/modal";
 import definePlugin from "@utils/types";
 import { findByCodeLazy, findStoreLazy } from "@webpack";
-import { EmojiStore, FluxDispatcher, Forms, GuildStore, Menu, PermissionStore, React, RestAPI, Toasts, Tooltip, UserStore } from "@webpack/common";
+import { EmojiStore, FluxDispatcher, Forms, GuildStore, Menu, PermissionsBits, PermissionStore, React, RestAPI, Toasts, Tooltip, UserStore } from "@webpack/common";
 import { Promisable } from "type-fest";
 
-const MANAGE_EMOJIS_AND_STICKERS = 1n << 30n;
-
 const StickersStore = findStoreLazy("StickersStore");
 const uploadEmoji = findByCodeLazy('"EMOJI_UPLOAD_START"', "GUILD_EMOJIS(");
 
@@ -120,7 +118,7 @@ function getGuildCandidates(data: Data) {
 
     return Object.values(GuildStore.getGuilds()).filter(g => {
         const canCreate = g.ownerId === meId ||
-            BigInt(PermissionStore.getGuildPermissions({ id: g.id }) & MANAGE_EMOJIS_AND_STICKERS) === MANAGE_EMOJIS_AND_STICKERS;
+            (PermissionStore.getGuildPermissions({ id: g.id }) & PermissionsBits.CREATE_GUILD_EXPRESSIONS) === PermissionsBits.CREATE_GUILD_EXPRESSIONS;
         if (!canCreate) return false;
 
         if (data.t === "Sticker") return true;
diff --git a/src/plugins/experiments.tsx b/src/plugins/experiments/index.tsx
similarity index 100%
rename from src/plugins/experiments.tsx
rename to src/plugins/experiments/index.tsx
diff --git a/src/plugins/f8break.ts b/src/plugins/f8break/index.ts
similarity index 100%
rename from src/plugins/f8break.ts
rename to src/plugins/f8break/index.ts
diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro/index.ts
similarity index 96%
rename from src/plugins/fakeNitro.ts
rename to src/plugins/fakeNitro/index.ts
index f56239f57..07191e14b 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -19,7 +19,7 @@
 import { addPreEditListener, addPreSendListener, removePreEditListener, removePreSendListener } from "@api/MessageEvents";
 import { definePluginSettings, Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { ApngBlendOp, ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
+import { ApngBlendOp, ApngDisposeOp, importApngJs } from "@utils/dependencies";
 import { getCurrentGuild } from "@utils/discord";
 import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
@@ -27,6 +27,7 @@ import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
 import { ChannelStore, EmojiStore, FluxDispatcher, Parser, PermissionStore, UserStore } from "@webpack/common";
 import type { Message } from "discord-types/general";
+import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
 
 const DRAFT_TYPE = 0;
@@ -102,6 +103,11 @@ interface StickerPack {
     stickers: Sticker[];
 }
 
+const enum FakeNoticeType {
+    Sticker,
+    Emoji
+}
+
 const fakeNitroEmojiRegex = /\/emojis\/(\d+?)\.(png|webp|gif)/;
 const fakeNitroStickerRegex = /\/stickers\/(\d+?)\./;
 const fakeNitroGifStickerRegex = /\/attachments\/\d+?\/\d+?\/(\d+?)\.gif/;
@@ -305,16 +311,24 @@ export default definePlugin({
                 },
                 {
                     match: /(emojiSection.{0,50}description:)(\i)(?<=(\i)\.sticker,.+?)(?=,)/,
-                    replace: (_, rest, reactNode, props) => `${rest}$self.addFakeNotice("STICKER",${reactNode},!!${props}.renderableSticker?.fake)`
+                    replace: (_, rest, reactNode, props) => `${rest}$self.addFakeNotice(${FakeNoticeType.Sticker},${reactNode},!!${props}.renderableSticker?.fake)`
                 }
             ]
         },
         {
-            find: ".Messages.EMOJI_POPOUT_PREMIUM_JOINED_GUILD_DESCRIPTION",
+            find: ".EMOJI_UPSELL_POPOUT_MORE_EMOJIS_OPENED,",
             predicate: () => settings.store.transformEmojis,
             replacement: {
-                match: /((\i)=\i\.node,\i=\i\.expressionSourceGuild)(.+?return )(.{0,450}Messages\.EMOJI_POPOUT_PREMIUM_JOINED_GUILD_DESCRIPTION.+?}\))/,
-                replace: (_, rest1, node, rest2, reactNode) => `${rest1},fakeNitroNode=${node}${rest2}$self.addFakeNotice("EMOJI",${reactNode},fakeNitroNode.fake)`
+                match: /isDiscoverable:\i,shouldHideRoleSubscriptionCTA:\i,(?<=(\i)=\i\.node.+?)/,
+                replace: (m, node) => `${m}fakeNitroNode:${node},`
+            }
+        },
+        {
+            find: ".Messages.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION",
+            predicate: () => settings.store.transformEmojis,
+            replacement: {
+                match: /(?<=\.Messages\.EMOJI_POPOUT_ADDED_PACK_DESCRIPTION.+?return ).{0,1200}\.Messages\.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION.+?(?=}\()/,
+                replace: reactNode => `$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},!!arguments[0]?.fakeNitroNode?.fake)`
             }
         }
     ],
@@ -610,18 +624,18 @@ export default definePlugin({
         return link.target && fakeNitroEmojiRegex.test(link.target);
     },
 
-    addFakeNotice(type: "STICKER" | "EMOJI", node: Array<ReactNode>, fake: boolean) {
+    addFakeNotice(type: FakeNoticeType, node: Array<ReactNode>, fake: boolean) {
         if (!fake) return node;
 
         node = Array.isArray(node) ? node : [node];
 
         switch (type) {
-            case "STICKER": {
+            case FakeNoticeType.Sticker: {
                 node.push(" This is a FakeNitro sticker and renders like a real sticker only for you. Appears as a link to non-plugin users.");
 
                 return node;
             }
-            case "EMOJI": {
+            case FakeNoticeType.Emoji: {
                 node.push(" This is a FakeNitro emoji and renders like a real emoji only for you. Appears as a link to non-plugin users.");
 
                 return node;
@@ -650,15 +664,11 @@ export default definePlugin({
     },
 
     async sendAnimatedSticker(stickerLink: string, stickerId: string, channelId: string) {
-        const [{ parseURL }, {
-            GIFEncoder,
-            quantize,
-            applyPalette
-        }] = await Promise.all([importApngJs(), getGifEncoder()]);
+        const { parseURL } = importApngJs();
 
         const { frames, width, height } = await parseURL(stickerLink);
 
-        const gif = new GIFEncoder();
+        const gif = GIFEncoder();
         const resolution = Settings.plugins.FakeNitro.stickerSize;
 
         const canvas = document.createElement("canvas");
diff --git a/src/plugins/fakeProfileThemes.tsx b/src/plugins/fakeProfileThemes/index.tsx
similarity index 100%
rename from src/plugins/fakeProfileThemes.tsx
rename to src/plugins/fakeProfileThemes/index.tsx
diff --git a/src/plugins/favEmojiFirst/README.md b/src/plugins/favEmojiFirst/README.md
index dc844802b..10a62a6be 100644
--- a/src/plugins/favEmojiFirst/README.md
+++ b/src/plugins/favEmojiFirst/README.md
@@ -2,5 +2,5 @@
 
 Puts your favorite emoji first in the emoji autocomplete.
 
-![FavEmojis](https://i.imgur.com/mEFCoZG.png)
-![Example](https://i.imgur.com/wY3Tc43.png)
+![a screenshot of the favourite emojis section](https://github.com/Vendicated/Vencord/assets/45497981/419c8c16-1afc-46e0-9cc2-20b9c3489711)
+![a comparison of the emoji picker before and after enabling this plugin](https://github.com/Vendicated/Vencord/assets/45497981/4f57626d-cfc6-4155-a47c-2eac191231bb)
diff --git a/src/plugins/favGifSearch/README.md b/src/plugins/favGifSearch/README.md
index c0768859c..af120dace 100644
--- a/src/plugins/favGifSearch/README.md
+++ b/src/plugins/favGifSearch/README.md
@@ -2,4 +2,4 @@
 
 Adds a search bar to favorite gifs.
 
-![Screenshot](https://i.imgur.com/Bcgb7PD.png)
+![Screenshot](https://github.com/Vendicated/Vencord/assets/45497981/19552adc-d921-4153-976e-e9361dc8fdaf)
diff --git a/src/plugins/favGifSearch/index.tsx b/src/plugins/favGifSearch/index.tsx
index d10c51536..d2966e95c 100644
--- a/src/plugins/favGifSearch/index.tsx
+++ b/src/plugins/favGifSearch/index.tsx
@@ -60,7 +60,7 @@ interface Instance {
 }
 
 
-const containerClasses: { searchBar: string; } = findByPropsLazy("searchBar", "searchHeader", "gutterSize");
+const containerClasses: { searchBar: string; } = findByPropsLazy("searchBar", "searchHeader", "searchInput");
 
 export const settings = definePluginSettings({
     searchOption: {
diff --git a/src/plugins/fixInbox.tsx b/src/plugins/fixInbox.tsx
deleted file mode 100644
index ef2184db3..000000000
--- a/src/plugins/fixInbox.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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/>.
-*/
-
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { Forms } from "@webpack/common";
-
-export default definePlugin({
-    name: "FixInbox",
-    description: "Fixes the Unreads Inbox from crashing Discord when you're in lots of guilds.",
-    authors: [Devs.Megu],
-
-    patches: [{
-        find: "INBOX_OPEN:function",
-        replacement: {
-            // This function normally dispatches a subscribe event to every guild.
-            // this is badbadbadbadbad so we just get rid of it.
-            match: /INBOX_OPEN:function.+?\{/,
-            replace: "$&return true;"
-        }
-    }],
-
-    settingsAboutComponent() {
-        return (
-            <Forms.FormSection>
-                <Forms.FormTitle tag="h3">What's the problem?</Forms.FormTitle>
-                <Forms.FormText style={{ marginBottom: 8 }}>
-                    By default, Discord emits a GUILD_SUBSCRIPTIONS event for every guild you're in.
-                    When you're in a lot of guilds, this can cause the gateway to ratelimit you.
-                    This causes the client to crash and get stuck in an infinite ratelimit loop as it tries to reconnect.
-                </Forms.FormText>
-
-                <Forms.FormTitle tag="h3">How does it work?</Forms.FormTitle>
-                <Forms.FormText>
-                    This plugin works by stopping the client from sending GUILD_SUBSCRIPTIONS events to the gateway when you open the unreads inbox.
-                    This means that not all unreads will be shown, instead only already-subscribed guilds' unreads will be shown, but your client won't crash anymore.
-                </Forms.FormText>
-            </Forms.FormSection>
-        );
-    }
-});
diff --git a/src/plugins/fixSpotifyEmbeds.desktop.ts b/src/plugins/fixSpotifyEmbeds.desktop/index.ts
similarity index 100%
rename from src/plugins/fixSpotifyEmbeds.desktop.ts
rename to src/plugins/fixSpotifyEmbeds.desktop/index.ts
diff --git a/src/plugins/forceOwnerCrown.ts b/src/plugins/forceOwnerCrown/index.ts
similarity index 100%
rename from src/plugins/forceOwnerCrown.ts
rename to src/plugins/forceOwnerCrown/index.ts
diff --git a/src/plugins/friendInvites.ts b/src/plugins/friendInvites/index.ts
similarity index 67%
rename from src/plugins/friendInvites.ts
rename to src/plugins/friendInvites/index.ts
index fc59efa2a..92209986d 100644
--- a/src/plugins/friendInvites.ts
+++ b/src/plugins/friendInvites/index.ts
@@ -1,6 +1,6 @@
 /*
  * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
+ * 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
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ApplicationCommandInputType, sendBotMessage } from "@api/Commands";
+import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@@ -35,30 +35,47 @@ export default definePlugin({
             name: "create friend invite",
             description: "Generates a friend invite link.",
             inputType: ApplicationCommandInputType.BOT,
-            execute: async (_, ctx) => {
-                if (!UserStore.getCurrentUser().phone)
+            options: [{
+                name: "Uses",
+                description: "How many uses?",
+                choices: [
+                    { label: "1", name: "1", value: "1" },
+                    { label: "5", name: "5", value: "5" }
+                ],
+                required: false,
+                type: ApplicationCommandOptionType.INTEGER
+            }],
+
+            execute: async (args, ctx) => {
+                const uses = findOption<number>(args, "Uses", 5);
+
+                if (uses === 1 && !UserStore.getCurrentUser().phone)
                     return sendBotMessage(ctx.channel.id, {
-                        content: "You need to have a phone number connected to your account to create a friend invite!"
+                        content: "You need to have a phone number connected to your account to create a friend invite with 1 use!"
                     });
 
-                const random = uuid.v4();
-                const invite = await RestAPI.post({
-                    url: "/friend-finder/find-friends",
-                    body: {
-                        modified_contacts: {
-                            [random]: [1, "", ""]
-                        },
-                        phone_contact_methods_count: 1
-                    }
-                }).then(res =>
-                    FriendInvites.createFriendInvite({
-                        code: res.body.invite_suggestions[0][3],
+                let invite: any;
+                if (uses === 1) {
+                    const random = uuid.v4();
+                    const { body: { invite_suggestions } } = await RestAPI.post({
+                        url: "/friend-finder/find-friends",
+                        body: {
+                            modified_contacts: {
+                                [random]: [1, "", ""]
+                            },
+                            phone_contact_methods_count: 1
+                        }
+                    });
+                    invite = await FriendInvites.createFriendInvite({
+                        code: invite_suggestions[0][3],
                         recipient_phone_number_or_email: random,
                         contact_visibility: 1,
                         filter_visibilities: [],
                         filtered_invite_suggestions_index: 1
-                    })
-                );
+                    });
+                } else {
+                    invite = await FriendInvites.createFriendInvite();
+                }
 
                 sendBotMessage(ctx.channel.id, {
                     content: `
@@ -67,7 +84,7 @@ export default definePlugin({
                         Max uses: \`${invite.max_uses}\`
                     `.trim().replace(/\s+/g, " ")
                 });
-            },
+            }
         },
         {
             name: "view friend invites",
@@ -95,7 +112,7 @@ export default definePlugin({
             execute: async (_, ctx) => {
                 await FriendInvites.revokeFriendInvites();
 
-                return void sendBotMessage(ctx.channel.id, {
+                sendBotMessage(ctx.channel.id, {
                     content: "All friend invites have been revoked."
                 });
             },
diff --git a/src/plugins/gifPaste.ts b/src/plugins/gifPaste/index.ts
similarity index 100%
rename from src/plugins/gifPaste.ts
rename to src/plugins/gifPaste/index.ts
diff --git a/src/plugins/greetStickerPicker.tsx b/src/plugins/greetStickerPicker/index.tsx
similarity index 100%
rename from src/plugins/greetStickerPicker.tsx
rename to src/plugins/greetStickerPicker/index.tsx
diff --git a/src/plugins/hideAttachments.tsx b/src/plugins/hideAttachments/index.tsx
similarity index 100%
rename from src/plugins/hideAttachments.tsx
rename to src/plugins/hideAttachments/index.tsx
diff --git a/src/plugins/iLoveSpam.ts b/src/plugins/iLoveSpam/index.ts
similarity index 100%
rename from src/plugins/iLoveSpam.ts
rename to src/plugins/iLoveSpam/index.ts
diff --git a/src/plugins/ignoreActivities.tsx b/src/plugins/ignoreActivities/index.tsx
similarity index 100%
rename from src/plugins/ignoreActivities.tsx
rename to src/plugins/ignoreActivities/index.tsx
diff --git a/src/plugins/imageZoom/README.md b/src/plugins/imageZoom/README.md
index 8e3b7efd6..75cfd4fd8 100644
--- a/src/plugins/imageZoom/README.md
+++ b/src/plugins/imageZoom/README.md
@@ -2,5 +2,5 @@
 
 Lets you zoom in to images and gifs. Use scroll wheel to zoom in and shift + scroll wheel to increase lens radius / size
 
-![Example](https://i.imgur.com/VJdo4aq.png)
-![ContextMenu](https://i.imgur.com/0oaRM2s.png)
+![the plugin in action](https://github.com/Vendicated/Vencord/assets/45497981/408cd77d-c5f4-40bc-8de2-f977a31b3e5f)
+![the context menu options offered by the plugin](https://github.com/Vendicated/Vencord/assets/45497981/3bede636-f1ce-493f-af46-788b920cb81c)
diff --git a/src/plugins/invisibleChat/components/DecryptionModal.tsx b/src/plugins/invisibleChat.desktop/components/DecryptionModal.tsx
similarity index 100%
rename from src/plugins/invisibleChat/components/DecryptionModal.tsx
rename to src/plugins/invisibleChat.desktop/components/DecryptionModal.tsx
diff --git a/src/plugins/invisibleChat/components/EncryptionModal.tsx b/src/plugins/invisibleChat.desktop/components/EncryptionModal.tsx
similarity index 100%
rename from src/plugins/invisibleChat/components/EncryptionModal.tsx
rename to src/plugins/invisibleChat.desktop/components/EncryptionModal.tsx
diff --git a/src/plugins/invisibleChat/index.tsx b/src/plugins/invisibleChat.desktop/index.tsx
similarity index 100%
rename from src/plugins/invisibleChat/index.tsx
rename to src/plugins/invisibleChat.desktop/index.tsx
diff --git a/src/plugins/keepCurrentChannel.ts b/src/plugins/keepCurrentChannel/index.ts
similarity index 100%
rename from src/plugins/keepCurrentChannel.ts
rename to src/plugins/keepCurrentChannel/index.ts
diff --git a/src/plugins/lastfm.tsx b/src/plugins/lastfm/index.tsx
similarity index 100%
rename from src/plugins/lastfm.tsx
rename to src/plugins/lastfm/index.tsx
diff --git a/src/plugins/loadingQuotes.ts b/src/plugins/loadingQuotes/index.ts
similarity index 100%
rename from src/plugins/loadingQuotes.ts
rename to src/plugins/loadingQuotes/index.ts
diff --git a/src/plugins/memberCount.tsx b/src/plugins/memberCount/index.tsx
similarity index 100%
rename from src/plugins/memberCount.tsx
rename to src/plugins/memberCount/index.tsx
diff --git a/src/plugins/messageClickActions/README.md b/src/plugins/messageClickActions/README.md
new file mode 100644
index 000000000..5162105a1
--- /dev/null
+++ b/src/plugins/messageClickActions/README.md
@@ -0,0 +1,5 @@
+# MessageClickActions
+
+Allows you to double click to edit/reply to a message or delete it if you hold the backspace key
+
+![](https://github.com/Vendicated/Vencord/assets/55940580/6885aca2-4021-4910-b636-bb40f877a816)
diff --git a/src/plugins/messageClickActions.ts b/src/plugins/messageClickActions/index.ts
similarity index 92%
rename from src/plugins/messageClickActions.ts
rename to src/plugins/messageClickActions/index.ts
index 5fd6a491b..128cb7c16 100644
--- a/src/plugins/messageClickActions.ts
+++ b/src/plugins/messageClickActions/index.ts
@@ -21,18 +21,17 @@ import { definePluginSettings, Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { FluxDispatcher, PermissionStore, UserStore } from "@webpack/common";
+import { FluxDispatcher, PermissionsBits, PermissionStore, UserStore } from "@webpack/common";
 
 let isDeletePressed = false;
 const keydown = (e: KeyboardEvent) => e.key === "Backspace" && (isDeletePressed = true);
 const keyup = (e: KeyboardEvent) => e.key === "Backspace" && (isDeletePressed = false);
 
-const MANAGE_CHANNELS = 1n << 4n;
 
 const settings = definePluginSettings({
     enableDeleteOnClick: {
         type: OptionType.BOOLEAN,
-        description: "Enable delete on click",
+        description: "Enable delete on click while holding backspace",
         default: true
     },
     enableDoubleClickToEdit: {
@@ -72,6 +71,7 @@ export default definePlugin({
             if (!isDeletePressed) {
                 if (event.detail < 2) return;
                 if (settings.store.requireModifier && !event.ctrlKey && !event.shiftKey) return;
+                if (!PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return;
 
                 if (isMe) {
                     if (!settings.store.enableDoubleClickToEdit || EditStore.isEditing(channel.id, msg.id)) return;
@@ -89,7 +89,7 @@ export default definePlugin({
                         showMentionToggle: channel.guild_id !== null
                     });
                 }
-            } else if (settings.store.enableDeleteOnClick && (isMe || PermissionStore.can(MANAGE_CHANNELS, channel))) {
+            } else if (settings.store.enableDeleteOnClick && (isMe || PermissionStore.can(PermissionsBits.MANAGE_MESSAGES, channel))) {
                 if (msg.deleted) {
                     FluxDispatcher.dispatch({
                         type: "MESSAGE_DELETE",
diff --git a/src/plugins/messageLinkEmbeds.tsx b/src/plugins/messageLinkEmbeds/index.tsx
similarity index 100%
rename from src/plugins/messageLinkEmbeds.tsx
rename to src/plugins/messageLinkEmbeds/index.tsx
diff --git a/src/plugins/messageTags.ts b/src/plugins/messageTags/index.ts
similarity index 100%
rename from src/plugins/messageTags.ts
rename to src/plugins/messageTags/index.ts
diff --git a/src/plugins/moreCommands.ts b/src/plugins/moreCommands/index.ts
similarity index 100%
rename from src/plugins/moreCommands.ts
rename to src/plugins/moreCommands/index.ts
diff --git a/src/plugins/moreKaomoji.ts b/src/plugins/moreKaomoji/index.ts
similarity index 100%
rename from src/plugins/moreKaomoji.ts
rename to src/plugins/moreKaomoji/index.ts
diff --git a/src/plugins/moreUserTags.tsx b/src/plugins/moreUserTags/index.tsx
similarity index 98%
rename from src/plugins/moreUserTags.tsx
rename to src/plugins/moreUserTags/index.tsx
index dbe8cc29f..595a8edde 100644
--- a/src/plugins/moreUserTags.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@@ -185,7 +185,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "MoreUserTags",
     description: "Adds tags for webhooks and moderative roles (owner, admin, etc.)",
-    authors: [Devs.Cyn, Devs.TheSun, Devs.RyanCaoDev, Devs.LordElias],
+    authors: [Devs.Cyn, Devs.TheSun, Devs.RyanCaoDev, Devs.LordElias, Devs.AutumnVN],
     settings,
     patches: [
         // add tags to the tag list
@@ -232,9 +232,8 @@ export default definePlugin({
         {
             find: ".renderBot=function(){",
             replacement: {
-                match: /this.props.user;return null!=(\i)&&.{0,10}\?(.{0,50})\.botTag/,
-                replace: "this.props.user;var type=$self.getTag({...this.props,origType:$1.bot?0:null,location:'not-chat'});\
-return type!==null?$2.botTag,type"
+                match: /\.BOT;return null!=(\i)&&.{0,10}\?(.{0,50})\.botTag,type:\i/,
+                replace: ".BOT;var type=$self.getTag({...this.props,origType:$1.bot?0:null,location:'not-chat'});return type!==null?$2.botTag,type"
             }
         },
         // pass channel id down props to be used in profiles
diff --git a/src/plugins/moyai.ts b/src/plugins/moyai/index.ts
similarity index 100%
rename from src/plugins/moyai.ts
rename to src/plugins/moyai/index.ts
diff --git a/src/plugins/muteNewGuild.tsx b/src/plugins/muteNewGuild/index.tsx
similarity index 100%
rename from src/plugins/muteNewGuild.tsx
rename to src/plugins/muteNewGuild/index.tsx
diff --git a/src/plugins/mutualGroupDMs.tsx b/src/plugins/mutualGroupDMs/index.tsx
similarity index 100%
rename from src/plugins/mutualGroupDMs.tsx
rename to src/plugins/mutualGroupDMs/index.tsx
diff --git a/src/plugins/noBlockedMessages.ts b/src/plugins/noBlockedMessages/index.ts
similarity index 100%
rename from src/plugins/noBlockedMessages.ts
rename to src/plugins/noBlockedMessages/index.ts
diff --git a/src/plugins/noDevtoolsWarning.ts b/src/plugins/noDevtoolsWarning/index.ts
similarity index 100%
rename from src/plugins/noDevtoolsWarning.ts
rename to src/plugins/noDevtoolsWarning/index.ts
diff --git a/src/plugins/noF1.ts b/src/plugins/noF1/index.ts
similarity index 100%
rename from src/plugins/noF1.ts
rename to src/plugins/noF1/index.ts
diff --git a/src/plugins/noPendingCount.ts b/src/plugins/noPendingCount/index.ts
similarity index 100%
rename from src/plugins/noPendingCount.ts
rename to src/plugins/noPendingCount/index.ts
diff --git a/src/plugins/noProfileThemes.ts b/src/plugins/noProfileThemes/index.ts
similarity index 100%
rename from src/plugins/noProfileThemes.ts
rename to src/plugins/noProfileThemes/index.ts
diff --git a/src/plugins/noRPC.discordDesktop.ts b/src/plugins/noRPC.discordDesktop/index.ts
similarity index 100%
rename from src/plugins/noRPC.discordDesktop.ts
rename to src/plugins/noRPC.discordDesktop/index.ts
diff --git a/src/plugins/noReplyMention.tsx b/src/plugins/noReplyMention/index.tsx
similarity index 100%
rename from src/plugins/noReplyMention.tsx
rename to src/plugins/noReplyMention/index.tsx
diff --git a/src/plugins/noScreensharePreview.ts b/src/plugins/noScreensharePreview/index.ts
similarity index 100%
rename from src/plugins/noScreensharePreview.ts
rename to src/plugins/noScreensharePreview/index.ts
diff --git a/src/plugins/noSystemBadge.discordDesktop.ts b/src/plugins/noSystemBadge.discordDesktop/index.ts
similarity index 100%
rename from src/plugins/noSystemBadge.discordDesktop.ts
rename to src/plugins/noSystemBadge.discordDesktop/index.ts
diff --git a/src/plugins/noUnblockToJump.ts b/src/plugins/noUnblockToJump/index.ts
similarity index 100%
rename from src/plugins/noUnblockToJump.ts
rename to src/plugins/noUnblockToJump/index.ts
diff --git a/src/plugins/nsfwGateBypass.ts b/src/plugins/nsfwGateBypass/index.ts
similarity index 100%
rename from src/plugins/nsfwGateBypass.ts
rename to src/plugins/nsfwGateBypass/index.ts
diff --git a/src/plugins/oneko.ts b/src/plugins/oneko/index.ts
similarity index 100%
rename from src/plugins/oneko.ts
rename to src/plugins/oneko/index.ts
diff --git a/src/plugins/openInApp.ts b/src/plugins/openInApp/index.ts
similarity index 100%
rename from src/plugins/openInApp.ts
rename to src/plugins/openInApp/index.ts
diff --git a/src/plugins/partyMode.ts b/src/plugins/partyMode/index.ts
similarity index 100%
rename from src/plugins/partyMode.ts
rename to src/plugins/partyMode/index.ts
diff --git a/src/plugins/petpet.ts b/src/plugins/petpet/index.ts
similarity index 97%
rename from src/plugins/petpet.ts
rename to src/plugins/petpet/index.ts
index 9b1c2f162..0bfd21af1 100644
--- a/src/plugins/petpet.ts
+++ b/src/plugins/petpet/index.ts
@@ -18,10 +18,10 @@
 
 import { ApplicationCommandInputType, ApplicationCommandOptionType, Argument, CommandContext, findOption, sendBotMessage } from "@api/Commands";
 import { Devs } from "@utils/constants";
-import { getGifEncoder } from "@utils/dependencies";
 import { makeLazy } from "@utils/lazy";
 import definePlugin from "@utils/types";
 import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { applyPalette, GIFEncoder, quantize } from "gifenc";
 
 const DRAFT_TYPE = 0;
 const DEFAULT_DELAY = 20;
@@ -124,7 +124,6 @@ export default definePlugin({
                 }
             ],
             execute: async (opts, cmdCtx) => {
-                const { GIFEncoder, quantize, applyPalette } = await getGifEncoder();
                 const frames = await getFrames();
 
                 const noServerPfp = findOption(opts, "no-server-pfp", false);
@@ -143,7 +142,7 @@ export default definePlugin({
                 const delay = findOption(opts, "delay", DEFAULT_DELAY);
                 const resolution = findOption(opts, "resolution", DEFAULT_RESOLUTION);
 
-                const gif = new GIFEncoder();
+                const gif = GIFEncoder();
 
                 const canvas = document.createElement("canvas");
                 canvas.width = canvas.height = resolution;
diff --git a/src/plugins/pictureInPicture.tsx b/src/plugins/pictureInPicture/index.tsx
similarity index 100%
rename from src/plugins/pictureInPicture.tsx
rename to src/plugins/pictureInPicture/index.tsx
diff --git a/src/plugins/plainFolderIcon.ts b/src/plugins/plainFolderIcon/index.ts
similarity index 100%
rename from src/plugins/plainFolderIcon.ts
rename to src/plugins/plainFolderIcon/index.ts
diff --git a/src/plugins/platformIndicators.tsx b/src/plugins/platformIndicators/index.tsx
similarity index 100%
rename from src/plugins/platformIndicators.tsx
rename to src/plugins/platformIndicators/index.tsx
diff --git a/src/plugins/previewMessage/README.md b/src/plugins/previewMessage/README.md
index e0043b25e..34eee3f61 100644
--- a/src/plugins/previewMessage/README.md
+++ b/src/plugins/previewMessage/README.md
@@ -2,4 +2,5 @@
 
 Lets you preview your message before sending it.
 
-![Example](https://i.imgur.com/etqbkzu.png)
+![the plugin in action](https://github.com/Vendicated/Vencord/assets/45497981/3ce32860-e5cd-4ea2-bdab-e121f1703579)
+
diff --git a/src/plugins/quickMention/README.md b/src/plugins/quickMention/README.md
new file mode 100644
index 000000000..fd862610d
--- /dev/null
+++ b/src/plugins/quickMention/README.md
@@ -0,0 +1,5 @@
+# QuickMention
+
+Adds a mention icon to the messages action bar
+
+![](https://github.com/Vendicated/Vencord/assets/55940580/82d3fec7-4196-4917-b3c2-6e652b2aff9e)
diff --git a/src/plugins/quickMention.tsx b/src/plugins/quickMention/index.tsx
similarity index 90%
rename from src/plugins/quickMention.tsx
rename to src/plugins/quickMention/index.tsx
index d0699b907..9720c7d33 100644
--- a/src/plugins/quickMention.tsx
+++ b/src/plugins/quickMention/index.tsx
@@ -20,7 +20,7 @@ import { addButton, removeButton } from "@api/MessagePopover";
 import { Devs } from "@utils/constants";
 import { insertTextIntoChatInputBox } from "@utils/discord";
 import definePlugin from "@utils/types";
-import { ChannelStore } from "@webpack/common";
+import { ChannelStore, PermissionsBits, PermissionStore } from "@webpack/common";
 
 export default definePlugin({
     name: "QuickMention",
@@ -30,11 +30,14 @@ export default definePlugin({
 
     start() {
         addButton("QuickMention", msg => {
+            const channel = ChannelStore.getChannel(msg.channel_id);
+            if (!PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return null;
+
             return {
                 label: "Quick Mention",
                 icon: this.Icon,
                 message: msg,
-                channel: ChannelStore.getChannel(msg.channel_id),
+                channel,
                 onClick: () => insertTextIntoChatInputBox(`<@${msg.author.id}> `)
             };
         });
diff --git a/src/plugins/quickReply/README.md b/src/plugins/quickReply/README.md
new file mode 100644
index 000000000..bd3067910
--- /dev/null
+++ b/src/plugins/quickReply/README.md
@@ -0,0 +1,6 @@
+# QuickReply
+
+Reply to (ctrl + up/down) and edit (ctrl + shift + up/down) messages via keybinds
+
+![](https://github.com/Vendicated/Vencord/assets/55940580/df79a27a-6529-4c70-8870-3c17d3637e4f)
+
diff --git a/src/plugins/quickReply.ts b/src/plugins/quickReply/index.ts
similarity index 91%
rename from src/plugins/quickReply.ts
rename to src/plugins/quickReply/index.ts
index 06797bc60..7a39ec07e 100644
--- a/src/plugins/quickReply.ts
+++ b/src/plugins/quickReply/index.ts
@@ -20,7 +20,7 @@ import { definePluginSettings, Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher as Dispatcher, MessageStore, SelectedChannelStore, UserStore } from "@webpack/common";
+import { ChannelStore, FluxDispatcher as Dispatcher, MessageStore, PermissionsBits, PermissionStore, SelectedChannelStore, UserStore } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 const Kangaroo = findByPropsLazy("jumpToMessage");
@@ -172,6 +172,7 @@ function shouldMention(message) {
 
 // handle next/prev reply
 function nextReply(isUp: boolean) {
+    if (!PermissionStore.can(PermissionsBits.SEND_MESSAGES, ChannelStore.getChannel(SelectedChannelStore.getChannelId()))) return;
     const message = getNextMessage(isUp, true);
 
     if (!message)
@@ -179,7 +180,6 @@ function nextReply(isUp: boolean) {
             type: "DELETE_PENDING_REPLY",
             channelId: SelectedChannelStore.getChannelId(),
         });
-
     const channel = ChannelStore.getChannel(message.channel_id);
     const meId = UserStore.getCurrentUser().id;
 
@@ -196,21 +196,20 @@ function nextReply(isUp: boolean) {
 
 // handle next/prev edit
 function nextEdit(isUp: boolean) {
+    if (!PermissionStore.can(PermissionsBits.SEND_MESSAGES, ChannelStore.getChannel(SelectedChannelStore.getChannelId()))) return;
     const message = getNextMessage(isUp, false);
 
     if (!message)
-        Dispatcher.dispatch({
+        return Dispatcher.dispatch({
             type: "MESSAGE_END_EDIT",
             channelId: SelectedChannelStore.getChannelId()
         });
-    else {
-        Dispatcher.dispatch({
-            type: "MESSAGE_START_EDIT",
-            channelId: message.channel_id,
-            messageId: message.id,
-            content: message.content,
-            _isQuickEdit: true
-        });
-        jumpIfOffScreen(message.channel_id, message.id);
-    }
+    Dispatcher.dispatch({
+        type: "MESSAGE_START_EDIT",
+        channelId: message.channel_id,
+        messageId: message.id,
+        content: message.content,
+        _isQuickEdit: true
+    });
+    jumpIfOffScreen(message.channel_id, message.id);
 }
diff --git a/src/plugins/reactErrorDecoder.ts b/src/plugins/reactErrorDecoder/index.ts
similarity index 100%
rename from src/plugins/reactErrorDecoder.ts
rename to src/plugins/reactErrorDecoder/index.ts
diff --git a/src/plugins/readAllNotificationsButton.tsx b/src/plugins/readAllNotificationsButton/index.tsx
similarity index 100%
rename from src/plugins/readAllNotificationsButton.tsx
rename to src/plugins/readAllNotificationsButton/index.tsx
diff --git a/src/plugins/revealAllSpoilers.ts b/src/plugins/revealAllSpoilers/index.ts
similarity index 100%
rename from src/plugins/revealAllSpoilers.ts
rename to src/plugins/revealAllSpoilers/index.ts
diff --git a/src/plugins/reverseImageSearch.tsx b/src/plugins/reverseImageSearch/index.tsx
similarity index 100%
rename from src/plugins/reverseImageSearch.tsx
rename to src/plugins/reverseImageSearch/index.tsx
diff --git a/src/plugins/reviewDB/components/ReviewBadge.tsx b/src/plugins/reviewDB/components/ReviewBadge.tsx
index e65dff247..3c02c3542 100644
--- a/src/plugins/reviewDB/components/ReviewBadge.tsx
+++ b/src/plugins/reviewDB/components/ReviewBadge.tsx
@@ -28,8 +28,8 @@ export default function ReviewBadge(badge: Badge) {
             {({ onMouseEnter, onMouseLeave }) => (
                 <img
                     className={cl("badge")}
-                    width="24px"
-                    height="24px"
+                    width="22px"
+                    height="22px"
                     onMouseEnter={onMouseEnter}
                     onMouseLeave={onMouseLeave}
                     src={badge.icon}
diff --git a/src/plugins/reviewDB/components/ReviewComponent.tsx b/src/plugins/reviewDB/components/ReviewComponent.tsx
index fa4cad4c8..1278a5084 100644
--- a/src/plugins/reviewDB/components/ReviewComponent.tsx
+++ b/src/plugins/reviewDB/components/ReviewComponent.tsx
@@ -20,7 +20,7 @@ import { openUserProfile } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { LazyComponent } from "@utils/react";
 import { filters, findBulk } from "@webpack";
-import { Alerts, moment, Timestamp, UserStore } from "@webpack/common";
+import { Alerts, moment, Parser, Timestamp, UserStore } from "@webpack/common";
 
 import { Review, ReviewType } from "../entities";
 import { deleteReview, reportReview } from "../reviewDbApi";
@@ -30,12 +30,12 @@ import { DeleteButton, ReportButton } from "./MessageButton";
 import ReviewBadge from "./ReviewBadge";
 
 export default LazyComponent(() => {
-    // this is terrible, blame mantika
+    // this is terrible, blame ven
     const p = filters.byProps;
     const [
         { cozyMessage, buttons, message, buttonsInner, groupStart },
         { container, isHeader },
-        { avatar, clickable, username, messageContent, wrapper, cozy },
+        { avatar, clickable, username, wrapper, cozy },
         buttonClasses,
         botTag
     ] = findBulk(
@@ -124,12 +124,10 @@ export default LazyComponent(() => {
                         </Timestamp>)
                 }
 
-                <p
-                    className={classes(messageContent)}
-                    style={{ fontSize: 15, marginTop: 4, color: "var(--text-normal)" }}
-                >
-                    {review.comment}
-                </p>
+                <div className={cl("review-comment")}>
+                    {Parser.parseGuildEventDescription(review.comment)}
+                </div>
+
                 {review.id !== 0 && (
                     <div className={classes(container, isHeader, buttons)} style={{
                         padding: "0px",
diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
index ada0fa0b1..e5bc426d7 100644
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@@ -16,11 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { classes } from "@utils/misc";
-import { useAwaiter, useForceUpdater } from "@utils/react";
-import { findByPropsLazy } from "@webpack";
-import { Forms, React, RelationshipStore, UserStore } from "@webpack/common";
-import type { KeyboardEvent } from "react";
+import { LazyComponent, useAwaiter, useForceUpdater } from "@utils/react";
+import { find, findByPropsLazy } from "@webpack";
+import { Forms, React, RelationshipStore, useRef, UserStore } from "@webpack/common";
 
 import { Review } from "../entities";
 import { addReview, getReviews, Response, REVIEWS_PER_PAGE } from "../reviewDbApi";
@@ -28,7 +26,12 @@ import { settings } from "../settings";
 import { authorize, cl, showToast } from "../utils";
 import ReviewComponent from "./ReviewComponent";
 
-const Classes = findByPropsLazy("inputDefault", "editable");
+
+const Editor = findByPropsLazy("start", "end", "addMark");
+const Transform = findByPropsLazy("unwrapNodes");
+const InputTypes = findByPropsLazy("VOICE_CHANNEL_STATUS", "SIDEBAR");
+
+const InputComponent = LazyComponent(() => find(m => m?.type?.render?.toString().includes("CHANNEL_TEXT_AREA).AnalyticsLocationProvider")));
 
 interface UserProps {
     discordId: string;
@@ -113,48 +116,82 @@ function ReviewList({ refetch, reviews, hideOwnReview }: { refetch(): void; revi
     );
 }
 
+
 export function ReviewsInputComponent({ discordId, isAuthor, refetch, name }: { discordId: string, name: string; isAuthor: boolean; refetch(): void; }) {
     const { token } = settings.store;
+    const editorRef = useRef<any>(null);
+    const inputType = InputTypes.FORM;
+    inputType.disableAutoFocus = true;
 
-    function onKeyPress({ key, target }: KeyboardEvent<HTMLTextAreaElement>) {
-        if (key === "Enter") {
-            addReview({
-                userid: discordId,
-                comment: (target as HTMLInputElement).value,
-                star: -1
-            }).then(res => {
-                if (res?.success) {
-                    (target as HTMLInputElement).value = ""; // clear the input
-                    refetch();
-                } else if (res?.message) {
-                    showToast(res.message);
-                }
-            });
-        }
-    }
+    const channel = {
+        flags_: 256,
+        guild_id_: null,
+        id: "0",
+        getGuildId: () => null,
+        isPrivate: () => true,
+        isActiveThread: () => false,
+        isArchivedLockedThread: () => false,
+        isDM: () => true,
+        roles: { "0": { permissions: 0n } },
+        getRecipientId: () => "0",
+        hasFlag: () => false,
+    };
 
     return (
-        <textarea
-            className={classes(Classes.inputDefault, "enter-comment", cl("input"))}
-            onKeyDownCapture={e => {
-                if (e.key === "Enter") {
-                    e.preventDefault(); // prevent newlines
-                }
-            }}
-            placeholder={
-                !token
-                    ? "You need to authorize to review users!"
-                    : isAuthor
-                        ? `Update review for @${name}`
-                        : `Review @${name}`
-            }
-            onKeyDown={onKeyPress}
-            onClick={() => {
+        <>
+            <div onClick={() => {
                 if (!token) {
                     showToast("Opening authorization window...");
                     authorize();
                 }
-            }}
-        />
+            }}>
+                <InputComponent
+                    className={cl("input")}
+                    channel={channel}
+                    placeholder={
+                        !token
+                            ? "You need to authorize to review users!"
+                            : isAuthor
+                                ? `Update review for @${name}`
+                                : `Review @${name}`
+                    }
+                    type={inputType}
+                    disableThemedBackground={true}
+                    setEditorRef={ref => editorRef.current = ref}
+                    textValue=""
+                    onSubmit={
+                        async res => {
+                            const response = await addReview({
+                                userid: discordId,
+                                comment: res.value,
+                            });
+
+                            if (response?.success) {
+                                refetch();
+
+                                const slateEditor = editorRef.current.ref.current.getSlateEditor();
+
+                                // clear editor
+                                Transform.delete(slateEditor, {
+                                    at: {
+                                        anchor: Editor.start(slateEditor, []),
+                                        focus: Editor.end(slateEditor, []),
+                                    }
+                                });
+                            } else if (response?.message) {
+                                showToast(response.message);
+                            }
+
+                            // even tho we need to return this, it doesnt do anything
+                            return {
+                                shouldClear: false,
+                                shouldRefocus: true,
+                            };
+                        }
+                    }
+                />
+            </div>
+
+        </>
     );
 }
diff --git a/src/plugins/reviewDB/entities.ts b/src/plugins/reviewDB/entities.ts
index 141510177..fefb1d3f4 100644
--- a/src/plugins/reviewDB/entities.ts
+++ b/src/plugins/reviewDB/entities.ts
@@ -29,6 +29,13 @@ export const enum ReviewType {
     System = 3
 }
 
+export const enum NotificationType {
+    Info = 0,
+    Ban = 1,
+    Unban = 2,
+    Warning = 3
+}
+
 export interface Badge {
     name: string;
     description: string;
@@ -45,6 +52,13 @@ export interface BanInfo {
     banEndDate: number;
 }
 
+export interface Notification {
+    id: number;
+    title: string;
+    content: string;
+    type: NotificationType;
+}
+
 export interface ReviewDBUser {
     ID: number;
     discordID: string;
@@ -54,6 +68,7 @@ export interface ReviewDBUser {
     warningCount: number;
     badges: any[];
     banInfo: BanInfo | null;
+    notification: Notification | null;
     lastReviewID: number;
     type: UserType;
 }
diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx
index de09ac751..a51971392 100644
--- a/src/plugins/reviewDB/index.tsx
+++ b/src/plugins/reviewDB/index.tsx
@@ -24,13 +24,13 @@ import ExpandableHeader from "@components/ExpandableHeader";
 import { OpenExternalIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { Alerts, Menu, useState } from "@webpack/common";
+import { Alerts, Menu, Parser, useState } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
 
 import { openReviewsModal } from "./components/ReviewModal";
 import ReviewsView from "./components/ReviewsView";
-import { UserType } from "./entities";
-import { getCurrentUserInfo } from "./reviewDbApi";
+import { NotificationType } from "./entities";
+import { getCurrentUserInfo, readNotification } from "./reviewDbApi";
 import { settings } from "./settings";
 import { showToast } from "./utils";
 
@@ -78,40 +78,33 @@ export default definePlugin({
 
             addContextMenuPatch("guild-header-popout", guildPopoutPatch);
 
-            if (user.banInfo) {
-                const endDate = new Date(user.banInfo.banEndDate);
-                if (endDate.getTime() > Date.now() && (s.user?.banInfo?.banEndDate ?? 0) < endDate.getTime()) {
-                    Alerts.show({
-                        title: "You have been banned from ReviewDB",
-                        body: (
-                            <>
-                                <p>
-                                    You are banned from ReviewDB {
-                                        user.type === UserType.Banned
-                                            ? "permanently"
-                                            : "until " + endDate.toLocaleString()
-                                    }
-                                </p>
-                                {user.banInfo.reviewContent && (
-                                    <p>Offending Review: {user.banInfo.reviewContent}</p>
-                                )}
-                                <p>Continued offenses will result in a permanent ban.</p>
-                            </>
-                        ),
-                        cancelText: "Appeal",
-                        confirmText: "Ok",
-                        onCancel: () =>
-                            VencordNative.native.openExternal(
-                                "https://reviewdb.mantikafasi.dev/api/redirect?"
-                                + new URLSearchParams({
-                                    token: settings.store.token!,
-                                    page: "dashboard/appeal"
-                                })
-                            )
-                    });
-                }
-            }
+            if (user.notification) {
+                const props = user.notification.type === NotificationType.Ban ? {
+                    cancelText: "Appeal",
+                    confirmText: "Ok",
+                    onCancel: () =>
+                        VencordNative.native.openExternal(
+                            "https://reviewdb.mantikafasi.dev/api/redirect?"
+                            + new URLSearchParams({
+                                token: settings.store.token!,
+                                page: "dashboard/appeal"
+                            })
+                        )
+                } : {};
 
+                Alerts.show({
+                    title: user.notification.title,
+                    body: (
+                        Parser.parse(
+                            user.notification.content,
+                            false
+                        )
+                    ),
+                    ...props
+                });
+
+                readNotification(user.notification.id);
+            }
             s.user = user;
         }, 4000);
     },
diff --git a/src/plugins/reviewDB/reviewDbApi.ts b/src/plugins/reviewDB/reviewDbApi.ts
index e8008c8ca..5370a9b34 100644
--- a/src/plugins/reviewDB/reviewDbApi.ts
+++ b/src/plugins/reviewDB/reviewDbApi.ts
@@ -140,3 +140,12 @@ export function getCurrentUserInfo(token: string): Promise<ReviewDBUser> {
         method: "POST",
     }).then(r => r.json());
 }
+
+export function readNotification(id: number) {
+    return fetch(API_URL + `/api/reviewdb/notifications?id=${id}`, {
+        method: "PATCH",
+        headers: {
+            "Authorization": settings.store.token || "",
+        },
+    });
+}
diff --git a/src/plugins/reviewDB/style.css b/src/plugins/reviewDB/style.css
index 83cf087d3..f4d890fd6 100644
--- a/src/plugins/reviewDB/style.css
+++ b/src/plugins/reviewDB/style.css
@@ -14,7 +14,16 @@
     overflow: hidden;
     background: transparent;
     border: 1px solid var(--profile-message-input-border-color);
-    font-size: 14px;
+}
+
+.vc-rdb-modal-footer > div {
+    width: 100%;
+    margin: 6px 16px;
+}
+
+/* When input becomes disabled(while sending review), input adds unneccesary padding to left, this prevents it */
+.vc-rdb-input > div > div {
+    padding-left: 0 !important;
 }
 
 .vc-rdb-placeholder {
@@ -24,13 +33,12 @@
     color: var(--text-muted);
 }
 
-.vc-rdb-modal-footer {
-    padding: 0;
+.vc-rdb-input * {
+    font-size: 14px;
 }
 
-.vc-rdb-modal-footer > div {
-    width: 100%;
-    margin: 6px 16px;
+.vc-rdb-modal-footer {
+    padding: 0;
 }
 
 .vc-rdb-modal-footer .vc-rdb-input {
@@ -49,3 +57,20 @@
 .vc-rdb-modal-reviews {
     margin-top: 16px;
 }
+
+.vc-rdb-review {
+    margin-top: 8px;
+    margin-bottom: 8px;
+}
+
+.vc-rdb-review-comment img {
+    vertical-align: text-top;
+}
+
+.vc-rdb-review-comment {
+    overflow-y: hidden;
+    margin-top: 1px;
+    margin-bottom: 8px;
+    color: var(--text-normal);
+    font-size: 15px;
+}
diff --git a/src/plugins/roleColorEverywhere.tsx b/src/plugins/roleColorEverywhere/index.tsx
similarity index 100%
rename from src/plugins/roleColorEverywhere.tsx
rename to src/plugins/roleColorEverywhere/index.tsx
diff --git a/src/plugins/searchReply/README.md b/src/plugins/searchReply/README.md
index 6938defc7..b06798f74 100644
--- a/src/plugins/searchReply/README.md
+++ b/src/plugins/searchReply/README.md
@@ -2,4 +2,5 @@
 
 Adds a reply button to search results.
 
-![Screenshot](https://i.imgur.com/SjIEHpw.png)
+![the plugin in action](https://github.com/Vendicated/Vencord/assets/45497981/07e741d3-0f97-4e5c-82b0-80712ecf2cbb)
+
diff --git a/src/plugins/searchReply/index.tsx b/src/plugins/searchReply/index.tsx
index 9e5343644..98f26e08e 100644
--- a/src/plugins/searchReply/index.tsx
+++ b/src/plugins/searchReply/index.tsx
@@ -17,23 +17,22 @@
 */
 
 import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { ReplyIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
-import { LazyComponent } from "@utils/react";
 import definePlugin from "@utils/types";
-import { findByCode, findByCodeLazy } from "@webpack";
-import { ChannelStore, i18n, Menu, SelectedChannelStore } from "@webpack/common";
+import { findByCodeLazy } from "@webpack";
+import { ChannelStore, i18n, Menu, PermissionsBits, PermissionStore, SelectedChannelStore } from "@webpack/common";
 import { Message } from "discord-types/general";
 
-const ReplyIcon = LazyComponent(() => findByCode("M10 8.26667V4L3 11.4667L10 18.9333V14.56C15 14.56 18.5 16.2667 21 20C20 14.6667 17 9.33333 10 8.26667Z"));
 
 const replyFn = findByCodeLazy("showMentionToggle", "TEXTAREA_FOCUS", "shiftKey");
 
 const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { message }: { message: Message; }) => () => {
     // make sure the message is in the selected channel
     if (SelectedChannelStore.getChannelId() !== message.channel_id) return;
-
     const channel = ChannelStore.getChannel(message?.channel_id);
     if (!channel) return;
+    if (!PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return;
 
     // dms and group chats
     const dmGroup = findGroupChildrenByChildId("pin", children);
diff --git a/src/plugins/secretRingTone.ts b/src/plugins/secretRingTone/index.ts
similarity index 100%
rename from src/plugins/secretRingTone.ts
rename to src/plugins/secretRingTone/index.ts
diff --git a/src/plugins/serverListIndicators.tsx b/src/plugins/serverListIndicators/index.tsx
similarity index 100%
rename from src/plugins/serverListIndicators.tsx
rename to src/plugins/serverListIndicators/index.tsx
diff --git a/src/plugins/shikiCodeblocks/api/languages.ts b/src/plugins/shikiCodeblocks.desktop/api/languages.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/api/languages.ts
rename to src/plugins/shikiCodeblocks.desktop/api/languages.ts
diff --git a/src/plugins/shikiCodeblocks/api/shiki.ts b/src/plugins/shikiCodeblocks.desktop/api/shiki.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/api/shiki.ts
rename to src/plugins/shikiCodeblocks.desktop/api/shiki.ts
diff --git a/src/plugins/shikiCodeblocks/api/themes.ts b/src/plugins/shikiCodeblocks.desktop/api/themes.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/api/themes.ts
rename to src/plugins/shikiCodeblocks.desktop/api/themes.ts
diff --git a/src/plugins/shikiCodeblocks/components/ButtonRow.tsx b/src/plugins/shikiCodeblocks.desktop/components/ButtonRow.tsx
similarity index 100%
rename from src/plugins/shikiCodeblocks/components/ButtonRow.tsx
rename to src/plugins/shikiCodeblocks.desktop/components/ButtonRow.tsx
diff --git a/src/plugins/shikiCodeblocks/components/Code.tsx b/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
similarity index 100%
rename from src/plugins/shikiCodeblocks/components/Code.tsx
rename to src/plugins/shikiCodeblocks.desktop/components/Code.tsx
diff --git a/src/plugins/shikiCodeblocks/components/CopyButton.tsx b/src/plugins/shikiCodeblocks.desktop/components/CopyButton.tsx
similarity index 100%
rename from src/plugins/shikiCodeblocks/components/CopyButton.tsx
rename to src/plugins/shikiCodeblocks.desktop/components/CopyButton.tsx
diff --git a/src/plugins/shikiCodeblocks/components/Header.tsx b/src/plugins/shikiCodeblocks.desktop/components/Header.tsx
similarity index 100%
rename from src/plugins/shikiCodeblocks/components/Header.tsx
rename to src/plugins/shikiCodeblocks.desktop/components/Header.tsx
diff --git a/src/plugins/shikiCodeblocks/components/Highlighter.tsx b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
similarity index 100%
rename from src/plugins/shikiCodeblocks/components/Highlighter.tsx
rename to src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
diff --git a/src/plugins/shikiCodeblocks/devicon.css b/src/plugins/shikiCodeblocks.desktop/devicon.css
similarity index 100%
rename from src/plugins/shikiCodeblocks/devicon.css
rename to src/plugins/shikiCodeblocks.desktop/devicon.css
diff --git a/src/plugins/shikiCodeblocks/hooks/useCopyCooldown.ts b/src/plugins/shikiCodeblocks.desktop/hooks/useCopyCooldown.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/hooks/useCopyCooldown.ts
rename to src/plugins/shikiCodeblocks.desktop/hooks/useCopyCooldown.ts
diff --git a/src/plugins/shikiCodeblocks/hooks/useShikiSettings.ts b/src/plugins/shikiCodeblocks.desktop/hooks/useShikiSettings.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/hooks/useShikiSettings.ts
rename to src/plugins/shikiCodeblocks.desktop/hooks/useShikiSettings.ts
diff --git a/src/plugins/shikiCodeblocks/hooks/useTheme.ts b/src/plugins/shikiCodeblocks.desktop/hooks/useTheme.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/hooks/useTheme.ts
rename to src/plugins/shikiCodeblocks.desktop/hooks/useTheme.ts
diff --git a/src/plugins/shikiCodeblocks/index.ts b/src/plugins/shikiCodeblocks.desktop/index.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/index.ts
rename to src/plugins/shikiCodeblocks.desktop/index.ts
diff --git a/src/plugins/shikiCodeblocks/previewExample.tsx b/src/plugins/shikiCodeblocks.desktop/previewExample.tsx
similarity index 100%
rename from src/plugins/shikiCodeblocks/previewExample.tsx
rename to src/plugins/shikiCodeblocks.desktop/previewExample.tsx
diff --git a/src/plugins/shikiCodeblocks/settings.ts b/src/plugins/shikiCodeblocks.desktop/settings.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/settings.ts
rename to src/plugins/shikiCodeblocks.desktop/settings.ts
diff --git a/src/plugins/shikiCodeblocks/shiki.css b/src/plugins/shikiCodeblocks.desktop/shiki.css
similarity index 100%
rename from src/plugins/shikiCodeblocks/shiki.css
rename to src/plugins/shikiCodeblocks.desktop/shiki.css
diff --git a/src/plugins/shikiCodeblocks/types.ts b/src/plugins/shikiCodeblocks.desktop/types.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/types.ts
rename to src/plugins/shikiCodeblocks.desktop/types.ts
diff --git a/src/plugins/shikiCodeblocks/utils/color.ts b/src/plugins/shikiCodeblocks.desktop/utils/color.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/utils/color.ts
rename to src/plugins/shikiCodeblocks.desktop/utils/color.ts
diff --git a/src/plugins/shikiCodeblocks/utils/createStyle.ts b/src/plugins/shikiCodeblocks.desktop/utils/createStyle.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/utils/createStyle.ts
rename to src/plugins/shikiCodeblocks.desktop/utils/createStyle.ts
diff --git a/src/plugins/shikiCodeblocks/utils/misc.ts b/src/plugins/shikiCodeblocks.desktop/utils/misc.ts
similarity index 100%
rename from src/plugins/shikiCodeblocks/utils/misc.ts
rename to src/plugins/shikiCodeblocks.desktop/utils/misc.ts
diff --git a/src/plugins/showAllMessageButtons.ts b/src/plugins/showAllMessageButtons/index.ts
similarity index 100%
rename from src/plugins/showAllMessageButtons.ts
rename to src/plugins/showAllMessageButtons/index.ts
diff --git a/src/plugins/showTimeouts.ts b/src/plugins/showTimeouts/index.ts
similarity index 100%
rename from src/plugins/showTimeouts.ts
rename to src/plugins/showTimeouts/index.ts
diff --git a/src/plugins/silentMessageToggle.tsx b/src/plugins/silentMessageToggle/index.tsx
similarity index 100%
rename from src/plugins/silentMessageToggle.tsx
rename to src/plugins/silentMessageToggle/index.tsx
diff --git a/src/plugins/silentTyping.tsx b/src/plugins/silentTyping/index.tsx
similarity index 100%
rename from src/plugins/silentTyping.tsx
rename to src/plugins/silentTyping/index.tsx
diff --git a/src/plugins/sortFriendRequests.tsx b/src/plugins/sortFriendRequests/index.tsx
similarity index 100%
rename from src/plugins/sortFriendRequests.tsx
rename to src/plugins/sortFriendRequests/index.tsx
diff --git a/src/plugins/spotifyCrack.ts b/src/plugins/spotifyCrack/index.ts
similarity index 100%
rename from src/plugins/spotifyCrack.ts
rename to src/plugins/spotifyCrack/index.ts
diff --git a/src/plugins/spotifyShareCommands.ts b/src/plugins/spotifyShareCommands/index.ts
similarity index 100%
rename from src/plugins/spotifyShareCommands.ts
rename to src/plugins/spotifyShareCommands/index.ts
diff --git a/src/plugins/textReplace.tsx b/src/plugins/textReplace/index.tsx
similarity index 98%
rename from src/plugins/textReplace.tsx
rename to src/plugins/textReplace/index.tsx
index 1e8aca7b4..45fb6f9bf 100644
--- a/src/plugins/textReplace.tsx
+++ b/src/plugins/textReplace/index.tsx
@@ -213,15 +213,12 @@ function applyRules(content: string): string {
     if (content.length === 0)
         return content;
 
-    // pad so that rules can use " word " to only match whole "word"
-    content = " " + content + " ";
-
     if (stringRules) {
         for (const rule of stringRules) {
             if (!rule.find || !rule.replace) continue;
             if (rule.onlyIfIncludes && !content.includes(rule.onlyIfIncludes)) continue;
 
-            content = content.replaceAll(rule.find, rule.replace.replaceAll("\\n", "\n"));
+            content = ` ${content} `.replaceAll(rule.find, rule.replace.replaceAll("\\n", "\n")).replace(/^\s|\s$/g, "");
         }
     }
 
diff --git a/src/plugins/timeBarAllActivities.ts b/src/plugins/timeBarAllActivities/index.ts
similarity index 100%
rename from src/plugins/timeBarAllActivities.ts
rename to src/plugins/timeBarAllActivities/index.ts
diff --git a/src/plugins/typingIndicator.tsx b/src/plugins/typingIndicator/index.tsx
similarity index 99%
rename from src/plugins/typingIndicator.tsx
rename to src/plugins/typingIndicator/index.tsx
index 2b4de824f..5f7df4770 100644
--- a/src/plugins/typingIndicator.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -24,7 +24,7 @@ import definePlugin, { OptionType } from "@utils/types";
 import { find, findLazy, findStoreLazy } from "@webpack";
 import { ChannelStore, GuildMemberStore, RelationshipStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
 
-import { buildSeveralUsers } from "./typingTweaks";
+import { buildSeveralUsers } from "../typingTweaks";
 
 const ThreeDots = LazyComponent(() => find(m => m.type?.render?.toString()?.includes("().dots")));
 
diff --git a/src/plugins/typingTweaks.tsx b/src/plugins/typingTweaks/index.tsx
similarity index 100%
rename from src/plugins/typingTweaks.tsx
rename to src/plugins/typingTweaks/index.tsx
diff --git a/src/plugins/unindent.ts b/src/plugins/unindent/index.ts
similarity index 100%
rename from src/plugins/unindent.ts
rename to src/plugins/unindent/index.ts
diff --git a/src/plugins/unsuppressEmbeds.tsx b/src/plugins/unsuppressEmbeds/index.tsx
similarity index 100%
rename from src/plugins/unsuppressEmbeds.tsx
rename to src/plugins/unsuppressEmbeds/index.tsx
diff --git a/src/plugins/urbanDictionary.ts b/src/plugins/urbanDictionary/index.ts
similarity index 100%
rename from src/plugins/urbanDictionary.ts
rename to src/plugins/urbanDictionary/index.ts
diff --git a/src/plugins/validUser.tsx b/src/plugins/validUser/index.tsx
similarity index 100%
rename from src/plugins/validUser.tsx
rename to src/plugins/validUser/index.tsx
diff --git a/src/plugins/vcDoubleClick.ts b/src/plugins/vcDoubleClick/index.ts
similarity index 100%
rename from src/plugins/vcDoubleClick.ts
rename to src/plugins/vcDoubleClick/index.ts
diff --git a/src/plugins/vcNarrator.tsx b/src/plugins/vcNarrator/index.tsx
similarity index 99%
rename from src/plugins/vcNarrator.tsx
rename to src/plugins/vcNarrator/index.tsx
index fe3efdf6e..4447e080d 100644
--- a/src/plugins/vcNarrator.tsx
+++ b/src/plugins/vcNarrator/index.tsx
@@ -66,6 +66,7 @@ function clean(str: string) {
 
     return str.normalize("NFKC")
         .replace(replacer, "")
+        .replace(/_{2,}/g, "_")
         .trim();
 }
 
diff --git a/src/plugins/viewIcons.tsx b/src/plugins/viewIcons/index.tsx
similarity index 100%
rename from src/plugins/viewIcons.tsx
rename to src/plugins/viewIcons/index.tsx
diff --git a/src/plugins/viewRaw.tsx b/src/plugins/viewRaw/index.tsx
similarity index 100%
rename from src/plugins/viewRaw.tsx
rename to src/plugins/viewRaw/index.tsx
diff --git a/src/plugins/volumeBooster.discordDesktop.ts b/src/plugins/volumeBooster.discordDesktop/index.ts
similarity index 100%
rename from src/plugins/volumeBooster.discordDesktop.ts
rename to src/plugins/volumeBooster.discordDesktop/index.ts
diff --git a/src/plugins/webContextMenus.web.ts b/src/plugins/webContextMenus.web/index.ts
similarity index 100%
rename from src/plugins/webContextMenus.web.ts
rename to src/plugins/webContextMenus.web/index.ts
diff --git a/src/plugins/webKeybinds.vencordDesktop.ts b/src/plugins/webKeybinds.vencordDesktop/index.ts
similarity index 100%
rename from src/plugins/webKeybinds.vencordDesktop.ts
rename to src/plugins/webKeybinds.vencordDesktop/index.ts
diff --git a/src/plugins/whoReacted.tsx b/src/plugins/whoReacted/index.tsx
similarity index 100%
rename from src/plugins/whoReacted.tsx
rename to src/plugins/whoReacted/index.tsx
diff --git a/src/plugins/wikisearch.ts b/src/plugins/wikisearch/index.ts
similarity index 100%
rename from src/plugins/wikisearch.ts
rename to src/plugins/wikisearch/index.ts
diff --git a/src/utils/IpcEvents.ts b/src/utils/IpcEvents.ts
index cb51f81ed..16bcfa659 100644
--- a/src/utils/IpcEvents.ts
+++ b/src/utils/IpcEvents.ts
@@ -26,6 +26,7 @@ export const enum IpcEvents {
     GET_THEMES_DIR = "VencordGetThemesDir",
     GET_THEMES_LIST = "VencordGetThemesList",
     GET_THEME_DATA = "VencordGetThemeData",
+    GET_THEME_SYSTEM_VALUES = "VencordGetThemeSystemValues",
     GET_SETTINGS_DIR = "VencordGetSettingsDir",
     GET_SETTINGS = "VencordGetSettings",
     SET_SETTINGS = "VencordSetSettings",
diff --git a/src/utils/apng-canvas.js b/src/utils/apng-canvas.js
new file mode 100644
index 000000000..5149dcc01
--- /dev/null
+++ b/src/utils/apng-canvas.js
@@ -0,0 +1,1168 @@
+/* eslint-disable */
+
+const self = module.exports;
+/**
+ * apng-canvas v2.1.2
+ *
+ * @copyright 2011-2019 David Mzareulyan
+ * @link https://github.com/davidmz/apng-canvas
+ * @license MIT
+ */
+!(function i(o, a, s) {
+    function u(n, t) {
+        if (!a[n]) {
+            if (!o[n]) {
+                var e = "function" == typeof require && require;
+                if (!t && e) return e(n, !0);
+                if (c) return c(n, !0);
+                throw new Error("Cannot find module '" + n + "'");
+            }
+            var r = (a[n] = { exports: {} });
+            o[n][0].call(
+                r.exports,
+                function (t) {
+                    var e = o[n][1][t];
+                    return u(e || t);
+                },
+                r,
+                r.exports,
+                i,
+                o,
+                a,
+                s
+            );
+        }
+        return a[n].exports;
+    }
+    for (
+        var c = "function" == typeof require && require, t = 0;
+        t < s.length;
+        t++
+    )
+        u(s[t]);
+    return u;
+})(
+    {
+        1: [
+            function (Y, n, r) {
+                (function (G, q) {
+                    var t, e;
+                    (t = this),
+                        (e = function () {
+                            "use strict";
+                            function u(t) {
+                                return "function" == typeof t;
+                            }
+                            var n = Array.isArray
+                                ? Array.isArray
+                                : function (t) {
+                                    return (
+                                        "[object Array]" ===
+                                        Object.prototype.toString.call(t)
+                                    );
+                                },
+                                r = 0,
+                                e = void 0,
+                                i = void 0,
+                                a = function (t, e) {
+                                    (l[r] = t),
+                                        (l[r + 1] = e),
+                                        2 === (r += 2) && (i ? i(d) : g());
+                                };
+                            var t =
+                                "undefined" != typeof window
+                                    ? window
+                                    : void 0,
+                                o = t || {},
+                                s =
+                                    o.MutationObserver ||
+                                    o.WebKitMutationObserver,
+                                c =
+                                    "undefined" == typeof self &&
+                                    void 0 !== G &&
+                                    "[object process]" === {}.toString.call(G),
+                                f =
+                                    "undefined" != typeof Uint8ClampedArray &&
+                                    "undefined" != typeof importScripts &&
+                                    "undefined" != typeof MessageChannel;
+                            function h() {
+                                var t = setTimeout;
+                                return function () {
+                                    return t(d, 1);
+                                };
+                            }
+                            var l = new Array(1e3);
+                            function d() {
+                                for (var t = 0; t < r; t += 2) {
+                                    (0, l[t])(l[t + 1]),
+                                        (l[t] = void 0),
+                                        (l[t + 1] = void 0);
+                                }
+                                r = 0;
+                            }
+                            var p,
+                                v,
+                                A,
+                                m,
+                                g = void 0;
+                            function w(t, e) {
+                                var n = this,
+                                    r = new this.constructor(b);
+                                void 0 === r[_] && j(r);
+                                var i = n._state;
+                                if (i) {
+                                    var o = arguments[i - 1];
+                                    a(function () {
+                                        return L(i, r, o, n._result);
+                                    });
+                                } else U(n, r, t, e);
+                                return r;
+                            }
+                            function y(t) {
+                                if (
+                                    t &&
+                                    "object" == typeof t &&
+                                    t.constructor === this
+                                )
+                                    return t;
+                                var e = new this(b);
+                                return T(e, t), e;
+                            }
+                            g = c
+                                ? function () {
+                                    return G.nextTick(d);
+                                }
+                                : s
+                                    ? ((v = 0),
+                                        (A = new s(d)),
+                                        (m = document.createTextNode("")),
+                                        A.observe(m, { characterData: !0 }),
+                                        function () {
+                                            m.data = v = ++v % 2;
+                                        })
+                                    : f
+                                        ? (((p = new MessageChannel()).port1.onmessage =
+                                            d),
+                                            function () {
+                                                return p.port2.postMessage(0);
+                                            })
+                                        : void 0 === t && "function" == typeof Y
+                                            ? (function () {
+                                                try {
+                                                    var t =
+                                                        Function("return this")().require(
+                                                            "vertx"
+                                                        );
+                                                    return void 0 !==
+                                                        (e =
+                                                            t.runOnLoop || t.runOnContext)
+                                                        ? function () {
+                                                            e(d);
+                                                        }
+                                                        : h();
+                                                } catch (t) {
+                                                    return h();
+                                                }
+                                            })()
+                                            : h();
+                            var _ = Math.random().toString(36).substring(2);
+                            function b() { }
+                            var E = void 0,
+                                P = 1,
+                                x = 2;
+                            function N(t, r, i) {
+                                a(function (e) {
+                                    var n = !1,
+                                        t = (function (t, e, n, r) {
+                                            try {
+                                                t.call(e, n, r);
+                                            } catch (t) {
+                                                return t;
+                                            }
+                                        })(
+                                            i,
+                                            r,
+                                            function (t) {
+                                                n ||
+                                                    ((n = !0),
+                                                        r !== t
+                                                            ? T(e, t)
+                                                            : O(e, t));
+                                            },
+                                            function (t) {
+                                                n || ((n = !0), R(e, t));
+                                            },
+                                            e._label
+                                        );
+                                    !n && t && ((n = !0), R(e, t));
+                                }, t);
+                            }
+                            function C(t, e, n) {
+                                e.constructor === t.constructor &&
+                                    n === w &&
+                                    e.constructor.resolve === y
+                                    ? (function (e, t) {
+                                        t._state === P
+                                            ? O(e, t._result)
+                                            : t._state === x
+                                                ? R(e, t._result)
+                                                : U(
+                                                    t,
+                                                    void 0,
+                                                    function (t) {
+                                                        return T(e, t);
+                                                    },
+                                                    function (t) {
+                                                        return R(e, t);
+                                                    }
+                                                );
+                                    })(t, e)
+                                    : void 0 === n
+                                        ? O(t, e)
+                                        : u(n)
+                                            ? N(t, e, n)
+                                            : O(t, e);
+                            }
+                            function T(e, t) {
+                                if (e === t)
+                                    R(
+                                        e,
+                                        new TypeError(
+                                            "You cannot resolve a promise with itself"
+                                        )
+                                    );
+                                else if (
+                                    (function (t) {
+                                        var e = typeof t;
+                                        return (
+                                            null !== t &&
+                                            ("object" == e || "function" == e)
+                                        );
+                                    })(t)
+                                ) {
+                                    var n = void 0;
+                                    try {
+                                        n = t.then;
+                                    } catch (t) {
+                                        return void R(e, t);
+                                    }
+                                    C(e, t, n);
+                                } else O(e, t);
+                            }
+                            function B(t) {
+                                t._onerror && t._onerror(t._result), I(t);
+                            }
+                            function O(t, e) {
+                                t._state === E &&
+                                    ((t._result = e),
+                                        (t._state = P),
+                                        0 !== t._subscribers.length && a(I, t));
+                            }
+                            function R(t, e) {
+                                t._state === E &&
+                                    ((t._state = x), (t._result = e), a(B, t));
+                            }
+                            function U(t, e, n, r) {
+                                var i = t._subscribers,
+                                    o = i.length;
+                                (t._onerror = null),
+                                    (i[o] = e),
+                                    (i[o + P] = n),
+                                    (i[o + x] = r),
+                                    0 === o && t._state && a(I, t);
+                            }
+                            function I(t) {
+                                var e = t._subscribers,
+                                    n = t._state;
+                                if (0 !== e.length) {
+                                    for (
+                                        var r = void 0,
+                                        i = void 0,
+                                        o = t._result,
+                                        a = 0;
+                                        a < e.length;
+                                        a += 3
+                                    )
+                                        (r = e[a]),
+                                            (i = e[a + n]),
+                                            r ? L(n, r, i, o) : i(o);
+                                    t._subscribers.length = 0;
+                                }
+                            }
+                            function L(t, e, n, r) {
+                                var i = u(n),
+                                    o = void 0,
+                                    a = void 0,
+                                    s = !0;
+                                if (i) {
+                                    try {
+                                        o = n(r);
+                                    } catch (t) {
+                                        (s = !1), (a = t);
+                                    }
+                                    if (e === o)
+                                        return void R(
+                                            e,
+                                            new TypeError(
+                                                "A promises callback cannot return that same promise."
+                                            )
+                                        );
+                                } else o = r;
+                                e._state !== E ||
+                                    (i && s
+                                        ? T(e, o)
+                                        : !1 === s
+                                            ? R(e, a)
+                                            : t === P
+                                                ? O(e, o)
+                                                : t === x && R(e, o));
+                            }
+                            var D = 0;
+                            function j(t) {
+                                (t[_] = D++),
+                                    (t._state = void 0),
+                                    (t._result = void 0),
+                                    (t._subscribers = []);
+                            }
+                            var k =
+                                ((F.prototype._enumerate = function (t) {
+                                    for (
+                                        var e = 0;
+                                        this._state === E && e < t.length;
+                                        e++
+                                    )
+                                        this._eachEntry(t[e], e);
+                                }),
+                                    (F.prototype._eachEntry = function (e, t) {
+                                        var n = this._instanceConstructor,
+                                            r = n.resolve;
+                                        if (r === y) {
+                                            var i = void 0,
+                                                o = void 0,
+                                                a = !1;
+                                            try {
+                                                i = e.then;
+                                            } catch (t) {
+                                                (a = !0), (o = t);
+                                            }
+                                            if (i === w && e._state !== E)
+                                                this._settledAt(
+                                                    e._state,
+                                                    t,
+                                                    e._result
+                                                );
+                                            else if ("function" != typeof i)
+                                                this._remaining--,
+                                                    (this._result[t] = e);
+                                            else if (n === S) {
+                                                var s = new n(b);
+                                                a ? R(s, o) : C(s, e, i),
+                                                    this._willSettleAt(s, t);
+                                            } else
+                                                this._willSettleAt(
+                                                    new n(function (t) {
+                                                        return t(e);
+                                                    }),
+                                                    t
+                                                );
+                                        } else this._willSettleAt(r(e), t);
+                                    }),
+                                    (F.prototype._settledAt = function (t, e, n) {
+                                        var r = this.promise;
+                                        r._state === E &&
+                                            (this._remaining--,
+                                                t === x
+                                                    ? R(r, n)
+                                                    : (this._result[e] = n)),
+                                            0 === this._remaining &&
+                                            O(r, this._result);
+                                    }),
+                                    (F.prototype._willSettleAt = function (t, e) {
+                                        var n = this;
+                                        U(
+                                            t,
+                                            void 0,
+                                            function (t) {
+                                                return n._settledAt(P, e, t);
+                                            },
+                                            function (t) {
+                                                return n._settledAt(x, e, t);
+                                            }
+                                        );
+                                    }),
+                                    F);
+                            function F(t, e) {
+                                (this._instanceConstructor = t),
+                                    (this.promise = new t(b)),
+                                    this.promise[_] || j(this.promise),
+                                    n(e)
+                                        ? ((this.length = e.length),
+                                            (this._remaining = e.length),
+                                            (this._result = new Array(
+                                                this.length
+                                            )),
+                                            0 === this.length
+                                                ? O(this.promise, this._result)
+                                                : ((this.length =
+                                                    this.length || 0),
+                                                    this._enumerate(e),
+                                                    0 === this._remaining &&
+                                                    O(
+                                                        this.promise,
+                                                        this._result
+                                                    )))
+                                        : R(
+                                            this.promise,
+                                            new Error(
+                                                "Array Methods must be provided an Array"
+                                            )
+                                        );
+                            }
+                            var S =
+                                ((M.prototype.catch = function (t) {
+                                    return this.then(null, t);
+                                }),
+                                    (M.prototype.finally = function (e) {
+                                        var n = this.constructor;
+                                        return u(e)
+                                            ? this.then(
+                                                function (t) {
+                                                    return n
+                                                        .resolve(e())
+                                                        .then(function () {
+                                                            return t;
+                                                        });
+                                                },
+                                                function (t) {
+                                                    return n
+                                                        .resolve(e())
+                                                        .then(function () {
+                                                            throw t;
+                                                        });
+                                                }
+                                            )
+                                            : this.then(e, e);
+                                    }),
+                                    M);
+                            function M(t) {
+                                (this[_] = D++),
+                                    (this._result = this._state = void 0),
+                                    (this._subscribers = []),
+                                    b !== t &&
+                                    ("function" != typeof t &&
+                                        (function () {
+                                            throw new TypeError(
+                                                "You must pass a resolver function as the first argument to the promise constructor"
+                                            );
+                                        })(),
+                                        this instanceof M
+                                            ? (function (e, t) {
+                                                try {
+                                                    t(
+                                                        function (t) {
+                                                            T(e, t);
+                                                        },
+                                                        function (t) {
+                                                            R(e, t);
+                                                        }
+                                                    );
+                                                } catch (t) {
+                                                    R(e, t);
+                                                }
+                                            })(this, t)
+                                            : (function () {
+                                                throw new TypeError(
+                                                    "Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function."
+                                                );
+                                            })());
+                            }
+                            return (
+                                (S.prototype.then = w),
+                                (S.all = function (t) {
+                                    return new k(this, t).promise;
+                                }),
+                                (S.race = function (i) {
+                                    var o = this;
+                                    return n(i)
+                                        ? new o(function (t, e) {
+                                            for (
+                                                var n = i.length, r = 0;
+                                                r < n;
+                                                r++
+                                            )
+                                                o.resolve(i[r]).then(t, e);
+                                        })
+                                        : new o(function (t, e) {
+                                            return e(
+                                                new TypeError(
+                                                    "You must pass an array to race."
+                                                )
+                                            );
+                                        });
+                                }),
+                                (S.resolve = y),
+                                (S.reject = function (t) {
+                                    var e = new this(b);
+                                    return R(e, t), e;
+                                }),
+                                (S._setScheduler = function (t) {
+                                    i = t;
+                                }),
+                                (S._setAsap = function (t) {
+                                    a = t;
+                                }),
+                                (S._asap = a),
+                                (S.polyfill = function () {
+                                    var t = void 0;
+                                    if (void 0 !== q) t = q;
+                                    else if ("undefined" != typeof self)
+                                        t = self;
+                                    else
+                                        try {
+                                            t = Function("return this")();
+                                        } catch (t) {
+                                            throw new Error(
+                                                "polyfill failed because global object is unavailable in this environment"
+                                            );
+                                        }
+                                    var e = t.Promise;
+                                    if (e) {
+                                        var n = null;
+                                        try {
+                                            n = Object.prototype.toString.call(
+                                                e.resolve()
+                                            );
+                                        } catch (t) { }
+                                        if ("[object Promise]" === n && !e.cast)
+                                            return;
+                                    }
+                                    t.Promise = S;
+                                }),
+                                (S.Promise = S)
+                            );
+                        }),
+                        "object" == typeof r && void 0 !== n
+                            ? (n.exports = e())
+                            : "function" == typeof define && define.amd
+                                ? define(e)
+                                : (t.ES6Promise = e());
+                }).call(
+                    this,
+                    Y("VCmEsw"),
+                    "undefined" != typeof self
+                        ? self
+                        : "undefined" != typeof window
+                            ? window
+                            : {}
+                );
+            },
+            { VCmEsw: 2 },
+        ],
+        2: [
+            function (t, e, n) {
+                var r = (e.exports = {});
+                function i() { }
+                (r.nextTick = (function () {
+                    var t = "undefined" != typeof window && window.setImmediate,
+                        e =
+                            "undefined" != typeof window &&
+                            window.postMessage &&
+                            window.addEventListener;
+                    if (t)
+                        return function (t) {
+                            return window.setImmediate(t);
+                        };
+                    if (e) {
+                        var n = [];
+                        return (
+                            window.addEventListener(
+                                "message",
+                                function (t) {
+                                    var e = t.source;
+                                    (e !== window && null !== e) ||
+                                        "process-tick" !== t.data ||
+                                        (t.stopPropagation(),
+                                            0 < n.length && n.shift()());
+                                },
+                                !0
+                            ),
+                            function (t) {
+                                n.push(t),
+                                    window.postMessage("process-tick", "*");
+                            }
+                        );
+                    }
+                    return function (t) {
+                        setTimeout(t, 0);
+                    };
+                })()),
+                    (r.title = "browser"),
+                    (r.browser = !0),
+                    (r.env = {}),
+                    (r.argv = []),
+                    (r.on = i),
+                    (r.addListener = i),
+                    (r.once = i),
+                    (r.off = i),
+                    (r.removeListener = i),
+                    (r.removeAllListeners = i),
+                    (r.emit = i),
+                    (r.binding = function (t) {
+                        throw new Error("process.binding is not supported");
+                    }),
+                    (r.cwd = function () {
+                        return "/";
+                    }),
+                    (r.chdir = function (t) {
+                        throw new Error("process.chdir is not supported");
+                    });
+            },
+            {},
+        ],
+        3: [
+            function (t, e, n) {
+                "use strict";
+                e.exports = function () {
+                    (this.width = 0),
+                        (this.height = 0),
+                        (this.numPlays = 0),
+                        (this.playTime = 0),
+                        (this.frames = []),
+                        (this.play = function () {
+                            s ||
+                                u ||
+                                (this.rewind(),
+                                    (s = !0),
+                                    requestAnimationFrame(e));
+                        }),
+                        (this.rewind = function () {
+                            (o = i = 0), (a = null), (u = s = !1);
+                        }),
+                        (this.addContext = function (t) {
+                            if (0 < c.length) {
+                                var e = c[0].getImageData(
+                                    0,
+                                    0,
+                                    this.width,
+                                    this.height
+                                );
+                                t.putImageData(e, 0, 0);
+                            }
+                            c.push(t), (t._apng_animation = this);
+                        }),
+                        (this.removeContext = function (t) {
+                            var e = c.indexOf(t);
+                            -1 !== e &&
+                                (c.splice(e, 1),
+                                    0 === c.length && this.rewind(),
+                                    "_apng_animation" in t &&
+                                    delete t._apng_animation);
+                        }),
+                        (this.isPlayed = function () {
+                            return s;
+                        }),
+                        (this.isFinished = function () {
+                            return u;
+                        });
+                    var r = this,
+                        i = 0,
+                        o = 0,
+                        a = null,
+                        s = !1,
+                        u = !1,
+                        c = [],
+                        e = function (t) {
+                            for (; s && i <= t;) n(t);
+                            s && requestAnimationFrame(e);
+                        },
+                        n = function (t) {
+                            var e = o++ % r.frames.length,
+                                n = r.frames[e];
+                            if (
+                                0 == r.numPlays ||
+                                o / r.frames.length <= r.numPlays
+                            ) {
+                                for (
+                                    0 == e &&
+                                    (c.forEach(function (t) {
+                                        t.clearRect(
+                                            0,
+                                            0,
+                                            r.width,
+                                            r.height
+                                        );
+                                    }),
+                                        (a = null),
+                                        2 == n.disposeOp && (n.disposeOp = 1)),
+                                    a && 1 == a.disposeOp
+                                        ? c.forEach(function (t) {
+                                            t.clearRect(
+                                                a.left,
+                                                a.top,
+                                                a.width,
+                                                a.height
+                                            );
+                                        })
+                                        : a &&
+                                        2 == a.disposeOp &&
+                                        c.forEach(function (t) {
+                                            t.putImageData(
+                                                a.iData,
+                                                a.left,
+                                                a.top
+                                            );
+                                        }),
+                                    (a = n).iData = null,
+                                    2 == a.disposeOp &&
+                                    (a.iData = c[0].getImageData(
+                                        n.left,
+                                        n.top,
+                                        n.width,
+                                        n.height
+                                    )),
+                                    0 == n.blendOp &&
+                                    c.forEach(function (t) {
+                                        t.clearRect(
+                                            n.left,
+                                            n.top,
+                                            n.width,
+                                            n.height
+                                        );
+                                    }),
+                                    c.forEach(function (t) {
+                                        t.drawImage(n.img, n.left, n.top);
+                                    }),
+                                    0 == i && (i = t);
+                                    t > i + r.playTime;
+
+                                )
+                                    i += r.playTime;
+                                i += n.delay;
+                            } else u = !(s = !1);
+                        };
+                };
+            },
+            {},
+        ],
+        4: [
+            function (t, e, n) {
+                "use strict";
+                for (var a = new Uint32Array(256), r = 0; r < 256; r++) {
+                    for (var i = r, o = 0; o < 8; o++)
+                        i = 1 & i ? 3988292384 ^ (i >>> 1) : i >>> 1;
+                    a[r] = i;
+                }
+                e.exports = function (t, e, n) {
+                    for (
+                        var r = -1,
+                        i = (e = e || 0),
+                        o = e + (n = n || t.length - e);
+                        i < o;
+                        i++
+                    )
+                        r = (r >>> 8) ^ a[255 & (r ^ t[i])];
+                    return -1 ^ r;
+                };
+            },
+            {},
+        ],
+        5: [
+            function (a, t, e) {
+                (function (t) {
+                    "use strict";
+                    var e = a("./support-test"),
+                        n = a("./parser"),
+                        r = a("./loader"),
+                        i = (t.APNG = {});
+                    (i.checkNativeFeatures = e.checkNativeFeatures),
+                        (i.ifNeeded = e.ifNeeded),
+                        (i.parseBuffer = function (t) {
+                            return n(t);
+                        });
+                    var o = {};
+                    (i.parseURL = function (t) {
+                        return t in o || (o[t] = r(t).then(n)), o[t];
+                    }),
+                        (i.animateContext = function (t, e) {
+                            return i.parseURL(t).then(function (t) {
+                                return t.addContext(e), t.play(), t;
+                            });
+                        }),
+                        (i.animateImage = function (s) {
+                            return (
+                                s.setAttribute("data-is-apng", "progress"),
+                                i.parseURL(s.src).then(
+                                    function (t) {
+                                        s.setAttribute("data-is-apng", "yes");
+                                        var e =
+                                            document.createElement("canvas");
+                                        (e.width = t.width),
+                                            (e.height = t.height),
+                                            Array.prototype.slice
+                                                .call(s.attributes)
+                                                .forEach(function (t) {
+                                                    -1 ==
+                                                        [
+                                                            "alt",
+                                                            "src",
+                                                            "usemap",
+                                                            "ismap",
+                                                            "data-is-apng",
+                                                            "width",
+                                                            "height",
+                                                        ].indexOf(t.nodeName) &&
+                                                        e.setAttributeNode(
+                                                            t.cloneNode(!1)
+                                                        );
+                                                }),
+                                            e.setAttribute(
+                                                "data-apng-src",
+                                                s.src
+                                            ),
+                                            "" != s.alt &&
+                                            e.appendChild(
+                                                document.createTextNode(
+                                                    s.alt
+                                                )
+                                            );
+                                        var n = "",
+                                            r = "",
+                                            i = 0,
+                                            o = "";
+                                        "" != s.style.width &&
+                                            "auto" != s.style.width
+                                            ? (n = s.style.width)
+                                            : s.hasAttribute("width") &&
+                                            (n =
+                                                s.getAttribute("width") +
+                                                "px"),
+                                            "" != s.style.height &&
+                                                "auto" != s.style.height
+                                                ? (r = s.style.height)
+                                                : s.hasAttribute("height") &&
+                                                (r =
+                                                    s.getAttribute("height") +
+                                                    "px"),
+                                            "" != n &&
+                                            "" == r &&
+                                            ((i = parseFloat(n)),
+                                                (o = n.match(/\D+$/)[0]),
+                                                (r =
+                                                    Math.round(
+                                                        (e.height * i) / e.width
+                                                    ) + o)),
+                                            "" != r &&
+                                            "" == n &&
+                                            ((i = parseFloat(r)),
+                                                (o = r.match(/\D+$/)[0]),
+                                                (n =
+                                                    Math.round(
+                                                        (e.width * i) / e.height
+                                                    ) + o)),
+                                            (e.style.width = n),
+                                            (e.style.height = r);
+                                        var a = s.parentNode;
+                                        a.insertBefore(e, s),
+                                            a.removeChild(s),
+                                            t.addContext(e.getContext("2d")),
+                                            t.play();
+                                    },
+                                    function () {
+                                        s.setAttribute("data-is-apng", "no");
+                                    }
+                                )
+                            );
+                        }),
+                        (i.releaseCanvas = function (t) {
+                            var e = t.getContext("2d");
+                            "_apng_animation" in e &&
+                                e._apng_animation.removeContext(e);
+                        });
+                }).call(
+                    this,
+                    "undefined" != typeof self
+                        ? self
+                        : "undefined" != typeof window
+                            ? window
+                            : {}
+                );
+            },
+            { "./loader": 6, "./parser": 7, "./support-test": 8 },
+        ],
+        6: [
+            function (t, e, n) {
+                "use strict";
+                var i = i || t("es6-promise").Promise;
+                e.exports = function (r) {
+                    return new i(function (t, e) {
+                        var n = new XMLHttpRequest();
+                        n.open("GET", r),
+                            (n.responseType = "arraybuffer"),
+                            (n.onload = function () {
+                                200 == this.status ? t(this.response) : e(this);
+                            }),
+                            n.send();
+                    });
+                };
+            },
+            { "es6-promise": 1 },
+        ],
+        7: [
+            function (t, e, n) {
+                "use strict";
+                var r = r || t("es6-promise").Promise,
+                    m = t("./animation"),
+                    o = t("./crc32"),
+                    g = new Uint8Array([137, 80, 78, 71, 13, 10, 26, 10]);
+                e.exports = function (t) {
+                    var A = new Uint8Array(t);
+                    return new r(function (t, e) {
+                        for (var n = 0; n < g.length; n++)
+                            if (g[n] != A[n])
+                                return void e(
+                                    "Not a PNG file (invalid file signature)"
+                                );
+                        var r = !1;
+                        if (
+                            (w(A, function (t) {
+                                return "acTL" != t || !(r = !0);
+                            }),
+                                r)
+                        ) {
+                            var a = [],
+                                s = [],
+                                u = null,
+                                c = null,
+                                f = new m();
+                            if (
+                                (w(A, function (t, e, n, r) {
+                                    switch (t) {
+                                        case "IHDR":
+                                            (u = e.subarray(n + 8, n + 8 + r)),
+                                                (f.width = y(e, n + 8)),
+                                                (f.height = y(e, n + 12));
+                                            break;
+                                        case "acTL":
+                                            f.numPlays = y(e, n + 8 + 4);
+                                            break;
+                                        case "fcTL":
+                                            c && f.frames.push(c),
+                                                ((c = {}).width = y(
+                                                    e,
+                                                    n + 8 + 4
+                                                )),
+                                                (c.height = y(e, n + 8 + 8)),
+                                                (c.left = y(e, n + 8 + 12)),
+                                                (c.top = y(e, n + 8 + 16));
+                                            var i = _(e, n + 8 + 20),
+                                                o = _(e, n + 8 + 22);
+                                            0 == o && (o = 100),
+                                                (c.delay = (1e3 * i) / o),
+                                                c.delay <= 10 &&
+                                                (c.delay = 100),
+                                                (f.playTime += c.delay),
+                                                (c.disposeOp = b(
+                                                    e,
+                                                    n + 8 + 24
+                                                )),
+                                                (c.blendOp = b(e, n + 8 + 25)),
+                                                (c.dataParts = []);
+                                            break;
+                                        case "fdAT":
+                                            c &&
+                                                c.dataParts.push(
+                                                    e.subarray(
+                                                        n + 8 + 4,
+                                                        n + 8 + r
+                                                    )
+                                                );
+                                            break;
+                                        case "IDAT":
+                                            c &&
+                                                c.dataParts.push(
+                                                    e.subarray(n + 8, n + 8 + r)
+                                                );
+                                            break;
+                                        case "IEND":
+                                            s.push(E(e, n, 12 + r));
+                                            break;
+                                        default:
+                                            a.push(E(e, n, 12 + r));
+                                    }
+                                }),
+                                    c && f.frames.push(c),
+                                    0 != f.frames.length)
+                            )
+                                for (
+                                    var i = 0,
+                                    o = new Blob(a),
+                                    h = new Blob(s),
+                                    l = 0;
+                                    l < f.frames.length;
+                                    l++
+                                ) {
+                                    c = f.frames[l];
+                                    var d = [];
+                                    d.push(g),
+                                        u.set(P(c.width), 0),
+                                        u.set(P(c.height), 4),
+                                        d.push(x("IHDR", u)),
+                                        d.push(o);
+                                    for (var p = 0; p < c.dataParts.length; p++)
+                                        d.push(x("IDAT", c.dataParts[p]));
+                                    d.push(h);
+                                    var v = URL.createObjectURL(
+                                        new Blob(d, { type: "image/png" })
+                                    );
+                                    delete c.dataParts,
+                                        (d = null),
+                                        (c.img = document.createElement("img")),
+                                        (c.img.onload = function () {
+                                            URL.revokeObjectURL(this.src),
+                                                ++i == f.frames.length && t(f);
+                                        }),
+                                        (c.img.onerror = function () {
+                                            e("Image creation error");
+                                        }),
+                                        (c.img.src = v);
+                                }
+                            else e("Not an animated PNG");
+                        } else e("Not an animated PNG");
+                    });
+                };
+                var w = function (t, e) {
+                    var n = 8;
+                    do {
+                        var r = y(t, n),
+                            i = a(t, n + 4, 4),
+                            o = e(i, t, n, r);
+                        n += 12 + r;
+                    } while (!1 !== o && "IEND" != i && n < t.length);
+                },
+                    y = function (t, e) {
+                        var n = 0;
+                        n += (t[0 + e] << 24) >>> 0;
+                        for (var r = 1; r < 4; r++)
+                            n += t[r + e] << (8 * (3 - r));
+                        return n;
+                    },
+                    _ = function (t, e) {
+                        for (var n = 0, r = 0; r < 2; r++)
+                            n += t[r + e] << (8 * (1 - r));
+                        return n;
+                    },
+                    b = function (t, e) {
+                        return t[e];
+                    },
+                    E = function (t, e, n) {
+                        var r = new Uint8Array(n);
+                        return r.set(t.subarray(e, e + n)), r;
+                    },
+                    a = function (t, e, n) {
+                        var r = Array.prototype.slice.call(
+                            t.subarray(e, e + n)
+                        );
+                        return String.fromCharCode.apply(String, r);
+                    },
+                    P = function (t) {
+                        return [
+                            (t >>> 24) & 255,
+                            (t >>> 16) & 255,
+                            (t >>> 8) & 255,
+                            255 & t,
+                        ];
+                    },
+                    x = function (t, e) {
+                        var n = t.length + e.length,
+                            r = new Uint8Array(new ArrayBuffer(n + 8));
+                        r.set(P(e.length), 0),
+                            r.set(
+                                (function (t) {
+                                    for (var e = [], n = 0; n < t.length; n++)
+                                        e.push(t.charCodeAt(n));
+                                    return e;
+                                })(t),
+                                4
+                            ),
+                            r.set(e, 8);
+                        var i = o(r, 4, n);
+                        return r.set(P(i), n + 4), r;
+                    };
+            },
+            { "./animation": 3, "./crc32": 4, "es6-promise": 1 },
+        ],
+        8: [
+            function (o, a, t) {
+                (function (t) {
+                    "use strict";
+                    var e,
+                        n,
+                        r = r || o("es6-promise").Promise,
+                        i =
+                            ((e = function (e) {
+                                var n = document.createElement("canvas"),
+                                    r = {
+                                        TypedArrays: "ArrayBuffer" in t,
+                                        BlobURLs: "URL" in t,
+                                        requestAnimationFrame:
+                                            "requestAnimationFrame" in t,
+                                        pageProtocol:
+                                            "http:" == location.protocol ||
+                                            "https:" == location.protocol,
+                                        canvas:
+                                            "getContext" in
+                                            document.createElement("canvas"),
+                                        APNG: !1,
+                                    };
+                                if (r.canvas) {
+                                    var i = new Image();
+                                    (i.onload = function () {
+                                        var t = n.getContext("2d");
+                                        t.drawImage(i, 0, 0),
+                                            (r.APNG =
+                                                0 ===
+                                                t.getImageData(0, 0, 1, 1)
+                                                    .data[3]),
+                                            e(r);
+                                    }),
+                                        (i.src =
+                                            "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACGFjVEwAAAABAAAAAcMq2TYAAAANSURBVAiZY2BgYPgPAAEEAQB9ssjfAAAAGmZjVEwAAAAAAAAAAQAAAAEAAAAAAAAAAAD6A+gBAbNU+2sAAAARZmRBVAAAAAEImWNgYGBgAAAABQAB6MzFdgAAAABJRU5ErkJggg==");
+                                } else e(r);
+                            }),
+                                (n = null),
+                                function (t) {
+                                    return (n = n || new r(e)), t && n.then(t), n;
+                                });
+                    a.exports = {
+                        checkNativeFeatures: i,
+                        ifNeeded: function (r) {
+                            return (
+                                void 0 === r && (r = !1),
+                                i().then(function (t) {
+                                    if (t.APNG && !r) reject();
+                                    else {
+                                        var e = !0;
+                                        for (var n in t)
+                                            t.hasOwnProperty(n) &&
+                                                "APNG" != n &&
+                                                (e = e && t[n]);
+                                    }
+                                })
+                            );
+                        },
+                    };
+                }).call(
+                    this,
+                    "undefined" != typeof self
+                        ? self
+                        : "undefined" != typeof window
+                            ? window
+                            : {}
+                );
+            },
+            { "es6-promise": 1 },
+        ],
+    },
+    {},
+    [5]
+);
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index cd6a7a221..7264c40d9 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -265,7 +265,7 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     },
     Dziurwa: {
         name: "Dziurwa",
-        id: 1034579679526526976n
+        id: 1001086404203389018n
     },
     AutumnVN: {
         name: "AutumnVN",
@@ -385,3 +385,5 @@ export const DevsById = /* #__PURE__*/ (() =>
             .map(([_, v]) => [v.id, v] as const)
     ))
 )() as Record<string, Dev>;
+
+export const IsFirefox = IS_EXTENSION && navigator.userAgent.toLowerCase().includes("firefox");
diff --git a/src/utils/dependencies.ts b/src/utils/dependencies.ts
index 94d8b002c..e39ca1925 100644
--- a/src/utils/dependencies.ts
+++ b/src/utils/dependencies.ts
@@ -20,23 +20,15 @@ import type StylusRenderer = require("stylus/lib/renderer");
 import type LessStatic from "less";
 
 import { makeLazy } from "./lazy";
+import { EXTENSION_BASE_URL } from "./web-metadata";
 
 /*
     Add dynamically loaded dependencies for plugins here.
  */
 
-// https://github.com/mattdesl/gifenc
-// this lib is way better than gif.js and all other libs, they're all so terrible but this one is nice
-// @ts-ignore ts mad
-export const getGifEncoder = makeLazy(() => import("https://unpkg.com/gifenc@1.0.3/dist/gifenc.esm.js"));
-
 // needed to parse APNGs in the nitroBypass plugin
-export const importApngJs = makeLazy(async () => {
-    const exports = {};
-    const winProxy = new Proxy(window, { set: (_, k, v) => exports[k] = v });
-    Function("self", await fetch("https://cdnjs.cloudflare.com/ajax/libs/apng-canvas/2.1.1/apng-canvas.min.js").then(r => r.text()))(winProxy);
-    // @ts-ignore
-    return exports.APNG as { parseURL(url: string): Promise<ApngFrameData>; };
+export const importApngJs = makeLazy(() => {
+    return require("./apng-canvas").APNG as { parseURL(url: string): Promise<ApngFrameData>; };
 });
 
 // https://wiki.mozilla.org/APNG_Specification#.60fcTL.60:_The_Frame_Control_Chunk
@@ -78,14 +70,23 @@ export interface ApngFrameData {
     playTime: number;
 }
 
-const shikiWorkerDist = "https://unpkg.com/@vap/shiki-worker@0.0.8/dist";
-export const shikiWorkerSrc = `${shikiWorkerDist}/${IS_DEV ? "index.js" : "index.min.js"}`;
-export const shikiOnigasmSrc = "https://unpkg.com/@vap/shiki@0.10.3/dist/onig.wasm";
-
-export const rnnoiseDist = "https://unpkg.com/@sapphi-red/web-noise-suppressor@0.3.3/dist";
+// On web (extensions), use extension uri as basepath (load files from extension)
+// On desktop (electron), load from cdn
+export const rnnoiseDist = IS_EXTENSION
+    ? new URL("/third-party/rnnoise", EXTENSION_BASE_URL).toString()
+    : "https://unpkg.com/@sapphi-red/web-noise-suppressor@0.3.3/dist";
 export const rnnoiseWasmSrc = (simd = false) => `${rnnoiseDist}/rnnoise${simd ? "_simd" : ""}.wasm`;
 export const rnnoiseWorkletSrc = `${rnnoiseDist}/rnnoise/workletProcessor.js`;
 
+
+// The below code is only used on the Desktop (electron) build of Vencord.
+// Browser (extension) builds do not contain these remote imports.
+
+export const shikiWorkerSrc = `https://unpkg.com/@vap/shiki-worker@0.0.8/dist/${IS_DEV ? "index.js" : "index.min.js"}`;
+export const shikiOnigasmSrc = "https://unpkg.com/@vap/shiki@0.10.3/dist/onig.wasm";
+
+// @ts-expect-error
+export const getStegCloak = /* #__PURE__*/ makeLazy(() => import("https://unpkg.com/stegcloak-dist@1.0.0/index.js"));
 // @ts-expect-error SHUT UP
 export const getStegCloak = makeLazy(() => import("https://unpkg.com/stegcloak-dist@1.0.0/index.js"));
 
diff --git a/src/utils/lazy.ts b/src/utils/lazy.ts
index 55aae5eaf..4bac45bc2 100644
--- a/src/utils/lazy.ts
+++ b/src/utils/lazy.ts
@@ -16,9 +16,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-export function makeLazy<T>(factory: () => T): () => T {
+export function makeLazy<T>(factory: () => T, attempts = 5): () => T {
+    let tries = 0;
     let cache: T;
-    return () => cache ?? (cache = factory());
+    return () => {
+        if (!cache && attempts > tries++) {
+            cache = factory();
+            if (!cache && attempts === tries)
+                console.error("Lazy factory failed:", factory);
+        }
+        return cache;
+    };
 }
 
 // Proxies demand that these properties be unmodified, so proxyLazy
@@ -85,6 +93,8 @@ export function proxyLazy<T>(factory: () => T, attempts = 5): T {
         [kGET]() {
             if (!proxyDummy[kCACHE] && attempts > tries++) {
                 proxyDummy[kCACHE] = factory();
+                if (!proxyDummy[kCACHE] && attempts === tries)
+                    console.error("Lazy factory failed:", factory);
             }
             return proxyDummy[kCACHE];
         }
diff --git a/src/utils/quickCss.ts b/src/utils/quickCss.ts
index 836ea58ee..344fdf5ec 100644
--- a/src/utils/quickCss.ts
+++ b/src/utils/quickCss.ts
@@ -25,12 +25,27 @@ import { compileUsercss } from "./themes/usercss/compiler";
 let style: HTMLStyleElement;
 let themesStyle: HTMLStyleElement;
 
+function createStyle(id: string) {
+    const style = document.createElement("style");
+    style.id = id;
+    document.documentElement.append(style);
+    return style;
+}
+
+async function initSystemValues() {
+    const values = await VencordNative.themes.getSystemValues();
+    const variables = Object.entries(values)
+        .filter(([, v]) => v !== "#")
+        .map(([k, v]) => `--${k}: ${v};`)
+        .join("");
+
+    createStyle("vencord-os-theme-values").textContent = `:root{${variables}}`;
+}
+
 export async function toggle(isEnabled: boolean) {
     if (!style) {
         if (isEnabled) {
-            style = document.createElement("style");
-            style.id = "vencord-custom-css";
-            document.documentElement.appendChild(style);
+            style = createStyle("vencord-custom-css");
             VencordNative.quickCss.addChangeListener(css => {
                 style.textContent = css;
                 // At the time of writing this, changing textContent resets the disabled state
@@ -43,11 +58,7 @@ export async function toggle(isEnabled: boolean) {
 }
 
 async function initThemes() {
-    if (!themesStyle) {
-        themesStyle = document.createElement("style");
-        themesStyle.id = "vencord-themes";
-        document.documentElement.appendChild(themesStyle);
-    }
+    themesStyle ??= createStyle("vencord-themes");
 
     const { themeLinks, enabledThemes, userCssVars } = Settings;
 
@@ -92,6 +103,7 @@ async function initThemes() {
 }
 
 document.addEventListener("DOMContentLoaded", () => {
+    initSystemValues();
     initThemes();
 
     toggle(Settings.useQuickCss);
diff --git a/src/utils/react.tsx b/src/utils/react.tsx
index e8c108153..0181c95b8 100644
--- a/src/utils/react.tsx
+++ b/src/utils/react.tsx
@@ -21,6 +21,8 @@ import { React, useEffect, useMemo, useReducer, useState } from "@webpack/common
 import { makeLazy } from "./lazy";
 import { checkIntersecting } from "./misc";
 
+export const NoopComponent = () => null;
+
 /**
  * Check if an element is on screen
  * @param intersectOnly If `true`, will only update the state when the element comes into view
@@ -125,13 +127,14 @@ export function useForceUpdater(withDep?: true) {
  * A lazy component. The factory method is called on first render. For example useful
  * for const Component = LazyComponent(() => findByDisplayName("...").default)
  * @param factory Function returning a Component
+ * @param attempts How many times to try to get the component before giving up
  * @returns Result of factory function
  */
 
-export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>) {
-    const get = makeLazy(factory);
+export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>, attempts = 5) {
+    const get = makeLazy(factory, attempts);
     return (props: T) => {
-        const Component = get();
+        const Component = get() ?? NoopComponent;
         return <Component {...props} />;
     };
 }
diff --git a/src/utils/settingsSync.ts b/src/utils/settingsSync.ts
index 8766cbbbb..ec32e2b1e 100644
--- a/src/utils/settingsSync.ts
+++ b/src/utils/settingsSync.ts
@@ -23,6 +23,7 @@ import { deflateSync, inflateSync } from "fflate";
 
 import { getCloudAuth, getCloudUrl } from "./cloud";
 import { Logger } from "./Logger";
+import { relaunch } from "./native";
 import { chooseFile, saveFile } from "./web";
 
 export async function importSettings(data: string) {
@@ -229,7 +230,7 @@ export async function getCloudSettings(shouldNotify = true, force = false) {
                 title: "Cloud Settings",
                 body: "Your settings have been updated! Click here to restart to fully apply changes!",
                 color: "var(--green-360)",
-                onClick: () => window.DiscordNative.app.relaunch(),
+                onClick: IS_WEB ? () => location.reload() : relaunch,
                 noPersist: true
             });
 
diff --git a/src/utils/web-metadata.ts b/src/utils/web-metadata.ts
new file mode 100644
index 000000000..26409a211
--- /dev/null
+++ b/src/utils/web-metadata.ts
@@ -0,0 +1,14 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export let EXTENSION_BASE_URL: string;
+export let EXTENSION_VERSION: string;
+
+if (IS_EXTENSION) {
+    const script = document.querySelector("#vencord-script") as HTMLScriptElement;
+    EXTENSION_BASE_URL = script.dataset.extensionBaseUrl!;
+    EXTENSION_VERSION = script.dataset.version!;
+}
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 8a5fc4061..b4a896086 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -75,10 +75,19 @@ if (IS_DEV && IS_DISCORD_DESKTOP) {
     }, 0);
 }
 
+function handleModuleNotFound(method: string, ...filter: unknown[]) {
+    const err = new Error(`webpack.${method} found no module`);
+    logger.error(err, "Filter:", filter);
+
+    // Strict behaviour in DevBuilds to fail early and make sure the issue is found
+    if (IS_DEV && !devToolsOpen)
+        throw err;
+}
+
 /**
  * Find the first module that matches the filter
  */
-export const find = traceFunction("find", function find(filter: FilterFn, getDefault = true, isWaitFor = false) {
+export const find = traceFunction("find", function find(filter: FilterFn, { isIndirect = false, isWaitFor = false }: { isIndirect?: boolean; isWaitFor?: boolean; } = {}) {
     if (typeof filter !== "function")
         throw new Error("Invalid filter. Expected a function got " + typeof filter);
 
@@ -93,7 +102,7 @@ export const find = traceFunction("find", function find(filter: FilterFn, getDef
         if (typeof mod.exports !== "object") continue;
 
         if (mod.exports.default && filter(mod.exports.default)) {
-            const found = getDefault ? mod.exports.default : mod.exports;
+            const found = mod.exports.default;
             return isWaitFor ? [found, Number(key)] : found;
         }
 
@@ -106,17 +115,8 @@ export const find = traceFunction("find", function find(filter: FilterFn, getDef
         }
     }
 
-    if (!isWaitFor) {
-        const err = new Error("Didn't find module matching this filter");
-        if (IS_DEV) {
-            logger.error(err);
-            logger.error(filter);
-            if (!devToolsOpen)
-                // Strict behaviour in DevBuilds to fail early and make sure the issue is found
-                throw err;
-        } else {
-            logger.warn(err);
-        }
+    if (!isIndirect) {
+        handleModuleNotFound("find", filter);
     }
 
     return isWaitFor ? [null, null] : null;
@@ -125,11 +125,11 @@ export const find = traceFunction("find", function find(filter: FilterFn, getDef
 /**
  * find but lazy
  */
-export function findLazy(filter: FilterFn, getDefault = true) {
-    return proxyLazy(() => find(filter, getDefault));
+export function findLazy(filter: FilterFn) {
+    return proxyLazy(() => find(filter));
 }
 
-export function findAll(filter: FilterFn, getDefault = true) {
+export function findAll(filter: FilterFn) {
     if (typeof filter !== "function")
         throw new Error("Invalid filter. Expected a function got " + typeof filter);
 
@@ -144,7 +144,7 @@ export function findAll(filter: FilterFn, getDefault = true) {
             continue;
 
         if (mod.exports.default && filter(mod.exports.default))
-            ret.push(getDefault ? mod.exports.default : mod.exports);
+            ret.push(mod.exports.default);
         else for (const nestedMod in mod.exports) if (nestedMod.length <= 3) {
             const nested = mod.exports[nestedMod];
             if (nested && filter(nested)) ret.push(nested);
@@ -304,42 +304,51 @@ export function mapMangledModuleLazy<S extends string>(code: string, mappers: Re
  * Find the first module that has the specified properties
  */
 export function findByProps(...props: string[]) {
-    return find(filters.byProps(...props));
+    const res = find(filters.byProps(...props), { isIndirect: true });
+    if (!res)
+        handleModuleNotFound("findByProps", ...props);
+    return res;
 }
 
 /**
  * findByProps but lazy
  */
 export function findByPropsLazy(...props: string[]) {
-    return findLazy(filters.byProps(...props));
+    return proxyLazy(() => findByProps(...props));
 }
 
 /**
  * Find a function by its code
  */
 export function findByCode(...code: string[]) {
-    return find(filters.byCode(...code));
+    const res = find(filters.byCode(...code), { isIndirect: true });
+    if (!res)
+        handleModuleNotFound("findByCode", ...code);
+    return res;
 }
 
 /**
  * findByCode but lazy
  */
 export function findByCodeLazy(...code: string[]) {
-    return findLazy(filters.byCode(...code));
+    return proxyLazy(() => findByCode(...code));
 }
 
 /**
  * Find a store by its displayName
  */
 export function findStore(name: string) {
-    return find(filters.byStoreName(name));
+    const res = find(filters.byStoreName(name), { isIndirect: true });
+    if (!res)
+        handleModuleNotFound("findStore", name);
+    return res;
 }
 
 /**
  * findByDisplayName but lazy
  */
 export function findStoreLazy(name: string) {
-    return findLazy(filters.byStoreName(name));
+    return proxyLazy(() => findStore(name));
 }
 
 /**
@@ -354,7 +363,7 @@ export function waitFor(filter: string | string[] | FilterFn, callback: Callback
     else if (typeof filter !== "function")
         throw new Error("filter must be a string, string[] or function, got " + typeof filter);
 
-    const [existing, id] = find(filter!, true, true);
+    const [existing, id] = find(filter!, { isIndirect: true, isWaitFor: true });
     if (existing) return void callback(existing, id);
 
     subscriptions.set(filter, callback);