MessageLinkEmbeds: Use api

Add ComponentUpdaterAPI
2023-06-24 16:55:57 +02:00 · 2023-06-24 16:46:09 +02:00
338 changed files with 4394 additions and 9127 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -4,7 +4,7 @@
    "ignorePatterns": ["dist", "browser"],
    "plugins": [
        "@typescript-eslint",
-        "simple-header",
+        "header",
        "simple-import-sort",
        "unused-imports",
        "path-alias"
@ -26,12 +26,35 @@
        // Since it's only been a month and Vencord has already been stolen
        // by random skids who rebranded it to "AlphaCord" and erased all license
        // information
-        "simple-header/header": [
+        "header/header": [
-            "error",
+            2,
            "block",
            [
                {
-                "files": ["scripts/header-new.txt", "scripts/header-old.txt"],
+                    "pattern": "!?",
-                "templates": { "author": [".*", "Vendicated and contributors"] }
+                    "template": " "
-            }
+                },
                " * Vencord, a modification for Discord's desktop app",
                {
                    "pattern": " \\* Copyright \\(c\\) \\d{4}",
                    "template": " * 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/>.",
                ""
            ],
            2
        ],
        "quotes": ["error", "double", { "avoidEscape": true }],
        "jsx-quotes": ["error", "prefer-double"],
@ -51,10 +74,7 @@
        "eqeqeq": ["error", "always", { "null": "ignore" }],
        "spaced-comment": ["error", "always", { "markers": ["!"] }],
        "yoda": "error",
-        "prefer-destructuring": ["error", {
+        "prefer-destructuring": ["error", { "object": true, "array": false }],
                "VariableDeclarator": { "array": false, "object": true },
                "AssignmentExpression": { "array": false, "object": false }
        }],
        "operator-assignment": ["error", "always"],
        "no-useless-computed-key": "error",
        "no-unneeded-ternary": ["error", { "defaultAssignment": false }],
--- a/.github/ISSUE_TEMPLATE/blank.yml
+++ b/.github/ISSUE_TEMPLATE/blank.yml
@ -1,23 +1,14 @@
-name: Blank Issue
+name: Blank Template
-description: Create a blank issue. 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.
+description: Use this only if your issue does not fit into another template. **DO NOT ASK FOR SUPPORT OR REQUEST PLUGINS**
 labels: []
 body:
  - type: markdown
    attributes:
      value: |
        # READ THIS BEFORE OPENING AN ISSUE
        This form is ONLY FOR DEVELOPERS. YOUR ISSUE WILL BE CLOSED AND YOU WILL POSSIBLY BE BLOCKED FROM THE REPOSITORY IF YOU IGNORE THIS.
        DO NOT USE THIS FORM, unless
        - you are a vencord contributor
        - you were given explicit permission to use this form by a moderator in our support server
        - you are filing a security related report
  - type: textarea
-    id: content
+    id: info-sec
    attributes:
-      label: Content
+      label: Tell us all about it.
      description: Go nuts, let us know what you're wanting to bring attention to.
      placeholder: ...
    validations:
      required: true
@ -25,6 +16,7 @@ body:
    id: agreement-check
    attributes:
      label: Request Agreement
      description: DO NOT USE THIS TEMPLATE FOR SUPPORT OR PLUGIN REQUESTS!!! For Support, **join our Discord**. For plugin requests, **use discussions**
      options:
-        - label: I have read the requirements for opening an issue above
+        - label: This is not a support or plugin request
          required: true
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,22 +1,9 @@
 name: Bug/Crash Report
-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.
+description: Create a bug or crash report for Vencord
 labels: [bug]
 title: "[Bug] <title>"
 body:
  - type: markdown
    attributes:
      value: |
        # READ THIS BEFORE OPENING AN ISSUE
        This form is ONLY FOR DEVELOPERS. YOUR ISSUE WILL BE CLOSED AND YOU WILL POSSIBLY BE BLOCKED FROM THE REPOSITORY IF YOU IGNORE THIS.
        DO NOT USE THIS FORM, unless
        - you are a vencord contributor
        - you were given explicit permission to use this form by a moderator in our support server
        DO NOT USE THIS FORM FOR SECURITY RELATED ISSUES. [CREATE A SECURITY ADVISORY INSTEAD.](https://github.com/Vendicated/Vencord/security/advisories/new)
  - type: input
    id: discord
    attributes:
@ -77,5 +64,3 @@ body:
      options:
        - label: I am using Discord Stable or tried on Stable and this bug happens there as well
          required: true
        - label: I have read the requirements for opening an issue above
          required: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@ -0,0 +1,32 @@
 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
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -38,11 +38,11 @@ jobs:
              run: pnpm build --standalone
            - name: Generate plugin list
-              run: pnpm generatePluginJson dist/plugins.json dist/plugin-readmes.json
+              run: pnpm generatePluginJson dist/plugins.json
            - name: Clean up obsolete files
              run: |
-                  rm -rf dist/*-unpacked dist/monaco Vencord.user.css vencordDesktopRenderer.css vencordDesktopRenderer.css.map
+                  rm -rf dist/*-unpacked Vencord.user.css vencordDesktopRenderer.css vencordDesktopRenderer.css.map
            - name: Get some values needed for the release
              id: release_values
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@ -36,10 +36,26 @@ jobs:
            - name: Publish extension
              run: |
                  # Do not fail so that even if chrome fails, firefox gets a shot. But also store exit code to fail workflow later
                  EXIT_CODE=0
                  # Chrome
                  cd dist/chromium-unpacked
-                  pnpx chrome-webstore-upload-cli@2.1.0 upload --auto-publish
+                  pnpx chrome-webstore-upload-cli@2.1.0 upload --auto-publish || EXIT_CODE=$?
                  # Firefox
                  cd ../firefox-unpacked
                  npm i -g web-ext@7.4.0 web-ext-submit@7.4.0
                  web-ext-submit || EXIT_CODE=$?
                  exit $EXIT_CODE
              env:
                  # Chrome
                  EXTENSION_ID: ${{ secrets.CHROME_EXTENSION_ID }}
                  CLIENT_ID: ${{ secrets.CHROME_CLIENT_ID }}
                  CLIENT_SECRET: ${{ secrets.CHROME_CLIENT_SECRET }}
                  REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }}
                  # Firefox
                  WEB_EXT_API_KEY: ${{ secrets.WEBEXT_USER }}
                  WEB_EXT_API_SECRET: ${{ secrets.WEBEXT_SECRET }}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -65,7 +65,7 @@ Also pay attention to the following:
    -   Match any but a guaranteed terminating character: `[^;]+`, for example to match the entire assigned value in `var a=b||c||func();`,
        `var .{1,2}=([^;]+);`
    -   If you don't care about that part, just match a bunch of chars: `.{0,50}`, for example to extract the variable "b" in `createElement("div",{a:"foo",c:"bar"},b)`, `createElement\("div".{0,30},(.{1,2})\),`. Note the `.{0,30}`, this is essentially the same as `.+`, but safer as you can't end up accidently eating thousands of characters
-   Additionally, as you might have noticed, all of the above approaches use regex groups (`(...)`) to capture the variable name. You can then use those groups in your replacement to access those variables dynamically
+-   Additionally, as you might have noticed, all of the appove approaches use regex groups (`(...)`) to capture the variable name. You can then use those groups in your replacement to access those variables dynamically
 #### "replace"
--- a/README.md
+++ b/README.md
@ -4,7 +4,8 @@
 The cutest Discord client mod
-![image](https://github.com/Vendicated/Vencord/assets/45497981/706722b1-32de-4d99-bee9-93993b504334)
+![](https://user-images.githubusercontent.com/45497981/235015332-0453d3eb-1da6-4601-963e-ef5e454123a1.png)
 *A screenshot of Vencord featuring the [ClearVision-v6 theme](https://github.com/ClearVision/ClearVision-v6) (Vencord does not come with it pre-installed, it is only an example)*
 ## Features
@ -22,30 +23,34 @@ The cutest Discord client mod
 ## Installing / Uninstalling
-Visit https://vencord.dev/download
+Click the below button to install Vencord to the Discord Desktop app
 [![Download and run the Installer](https://img.shields.io/github/v/release/Vencord/Installer?label=Download%20Vencord%20Installer&style=for-the-badge)](https://github.com/Vencord/Installer#vencord-installer)
 ## Installing on Browser
 [![Get it on the Firefox Webstore](https://blog.mozilla.org/addons/files/2015/11/get-the-addon.png)](https://addons.mozilla.org/en-GB/firefox/addon/vencord-web/) [![Get it on the Chrome Webstore](https://storage.googleapis.com/web-dev-uploads/image/WlD8wC6g8khYWPJUsQceQkhXSlv1/UV4C4ybeBTsZt43U4xis.png)](https://chrome.google.com/webstore/detail/vencord-web/cbghhgpcnddeihccjmnadmkaejncjndb)
 Or use the [UserScript](https://raw.githubusercontent.com/Vencord/builds/main/Vencord.user.js) - Please note that the CSS Editor, Themes loaded from remote sources and co. will not work in the UserScript. Use the extension if you need any of those
 <details>
 <summary>Alternative Downloads</summary>
 ## Vencord Desktop
 > **Warning**
 > This is an alternative app. It currently doesn't support keybinds and possibly some more features. If you just want to install to the normal Discord Desktop app, scroll up
 As an alternative to the Discord Desktop app, Vencord also has its own standalone Desktop app that is snappier and lighter than Discord's official Desktop app
 [![Download Vencord Desktop](https://img.shields.io/github/v/release/Vencord/Desktop?label=Download%20Vencord%20Desktop&style=for-the-badge)](https://github.com/Vencord/Desktop#vencord-desktop)
 </details>
 ## Join our Support/Community Server
 https://discord.gg/D9uwnFnqmd
 ## Sponsors
 | **Thanks a lot to all Vencord [sponsors](https://github.com/sponsors/Vendicated)!!** |
 |:--:| 
 | [![](https://meow.vendicated.dev/sponsors.png)](https://github.com/sponsors/Vendicated) |
 | *generated using [github-sponsor-graph](https://github.com/Vendicated/github-sponsor-graph)* |
 ## Star History
 <a href="https://star-history.com/#Vendicated/Vencord&Timeline">
  <picture>
    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=Vendicated/Vencord&type=Timeline&theme=dark" />
    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=Vendicated/Vencord&type=Timeline" />
    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=Vendicated/Vencord&type=Timeline" />
  </picture>
 </a>
 ## Disclaimer
 Discord is trademark of Discord Inc. and solely mentioned for the sake of descriptivity.
--- a/browser/VencordNativeStub.ts
+++ b/browser/VencordNativeStub.ts
@ -19,13 +19,10 @@
 /// <reference path="../src/modules.d.ts" />
 /// <reference path="../src/globals.d.ts" />
-import monacoHtmlLocal from "~fileContent/monacoWin.html";
+import monacoHtml from "~fileContent/../src/components/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/main/themes";
 // Discord deletes this so need to store in variable
 const { localStorage } = window;
@ -37,21 +34,8 @@ const NOOP_ASYNC = async () => { };
 const setCssDebounced = debounce((css: string) => VencordNative.quickCss.set(css));
 const themeStore = DataStore.createStore("VencordThemes", "VencordThemeData");
 // probably should make this less cursed at some point
 window.VencordNative = {
    themes: {
        uploadTheme: (fileName: string, fileData: string) => DataStore.set(fileName, fileData, themeStore),
        deleteTheme: (fileName: string) => DataStore.del(fileName, themeStore),
        getThemesDir: async () => "",
        getThemesList: () => DataStore.entries(themeStore).then(entries =>
            entries.map(([name, css]) => getThemeInfo(css, name.toString()))
        ),
        getThemeData: (fileName: string) => DataStore.get(fileName, themeStore),
        getSystemValues: async () => ({}),
    },
    native: {
        getVersions: () => ({}),
        openExternal: async (url) => void open(url, "_blank")
@ -73,7 +57,6 @@ window.VencordNative = {
        addChangeListener(cb) {
            cssListeners.add(cb);
        },
        addThemeChangeListener: NOOP,
        openFile: NOOP_ASYNC,
        async openEditor() {
            const features = `popup,width=${Math.min(window.innerWidth, 1000)},height=${Math.min(window.innerHeight, 1000)}`;
@ -83,7 +66,6 @@ window.VencordNative = {
                return;
            }
            win.baseUrl = EXTENSION_BASE_URL;
            win.setCss = setCssDebounced;
            win.getCurrentCss = () => VencordNative.quickCss.get();
            win.getTheme = () =>
@ -91,7 +73,7 @@ window.VencordNative = {
                    ? "vs-light"
                    : "vs-dark";
-            win.document.write(IS_EXTENSION ? monacoHtmlLocal : monacoHtmlCdn);
+            win.document.write(monacoHtml);
        },
    },
@ -99,7 +81,5 @@ window.VencordNative = {
        get: () => localStorage.getItem("VencordSettings") || "{}",
        set: async (s: string) => localStorage.setItem("VencordSettings", s),
        getSettingsDir: async () => "LocalStorage"
-    },
+    }
    pluginHelpers: {} as any,
 };
--- a/browser/content.js
+++ b/browser/content.js
@ -4,11 +4,6 @@ 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";
--- a/browser/manifest.json
+++ b/browser/manifest.json
@ -28,7 +28,7 @@
    "web_accessible_resources": [
        {
-            "resources": ["dist/*", "third-party/*"],
+            "resources": ["dist/Vencord.js", "dist/Vencord.css"],
            "matches": ["*://*.discord.com/*"]
        }
    ],
--- a/browser/monaco.ts
+++ b/browser/monaco.ts
@ -1,43 +0,0 @@
 /*
 * 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();
    });
 });
--- a/browser/monacoWin.html
+++ b/browser/monacoWin.html
@ -1,37 +0,0 @@
 <!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>
--- a/browser/patch-worker.js
+++ b/browser/patch-worker.js
@ -1,135 +0,0 @@
 /*
 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;
            }
        }
    });
 })();
--- a/docs/1_INSTALLING.md
+++ b/docs/1_INSTALLING.md
@ -1,6 +1,5 @@
-> [!WARNING]  
+> **Warning**
 > These instructions are only for advanced users. If you're not a Developer, you should use our [graphical installer](https://github.com/Vendicated/VencordInstaller#usage) instead.
 > No support will be provided for installing in this fashion. If you cannot figure it out, you should just stick to a regular install.  
 # Installation Guide
@ -63,7 +62,7 @@ Then fully close Discord from your taskbar or task manager, and restart it. Venc
 If you're using Discord already, go into the `Updater` tab in settings.
-Sometimes it may be necessary to manually update if the GUI updater fails.
+Sometimes it may be neccessary to manually update if the GUI updater fails.
 To pull latest changes:
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
    "name": "vencord",
    "private": "true",
-    "version": "1.6.3",
+    "version": "1.2.9",
    "description": "The cutest Discord client mod",
    "homepage": "https://github.com/Vendicated/Vencord#readme",
    "bugs": {
@ -11,7 +11,7 @@
        "type": "git",
        "url": "git+https://github.com/Vendicated/Vencord.git"
    },
-    "license": "GPL-3.0-or-later",
+    "license": "GPL-3.0",
    "author": "Vendicated",
    "directories": {
        "doc": "docs"
@ -31,18 +31,13 @@
        "watch": "node scripts/build/build.mjs --watch"
    },
    "dependencies": {
        "@sapphi-red/web-noise-suppressor": "0.3.3",
        "@vap/core": "0.0.12",
        "@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",
        "virtual-merge": "^1.0.1"
    },
    "devDependencies": {
        "@types/chrome": "^0.0.246",
        "@types/diff": "^5.0.3",
        "@types/lodash": "^4.14.194",
        "@types/node": "^18.16.3",
@ -54,8 +49,9 @@
        "diff": "^5.1.0",
        "discord-types": "^1.3.26",
        "esbuild": "^0.15.18",
-        "eslint": "^8.46.0",
+        "eslint": "^8.28.0",
        "eslint-import-resolver-alias": "^1.1.2",
        "eslint-plugin-header": "^3.1.1",
        "eslint-plugin-path-alias": "^1.0.0",
        "eslint-plugin-simple-import-sort": "^10.0.0",
        "eslint-plugin-unused-imports": "^2.0.0",
@ -67,14 +63,13 @@
        "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.10.2",
+    "packageManager": "pnpm@8.1.1",
    "pnpm": {
        "patchedDependencies": {
            "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",
-            "eslint@8.46.0": "patches/eslint@8.46.0.patch"
+            "eslint@8.28.0": "patches/eslint@8.28.0.patch"
        },
        "peerDependencyRules": {
            "ignoreMissing": [
@ -94,7 +89,7 @@
        "build": {
            "overwriteDest": true
        },
-        "sourceDir": "./dist/firefox-unpacked"
+        "sourceDir": "./dist/extension-v2-unpacked"
    },
    "engines": {
        "node": ">=18",
--- a/patches/eslint@8.28.0.patch
+++ b/patches/eslint@8.28.0.patch
@ -1,8 +1,8 @@
 diff --git a/lib/rules/no-useless-escape.js b/lib/rules/no-useless-escape.js
-index 0e0f6f09f2c35f3276173c08f832cde9f2cf56a0..7dc22851715f3574d935f513c1b5e35552985711 100644
+index 2046a148a17fd1d5f3a4bbc9f45f7700259d11fa..f4898c6b57355a4fd72c43a9f32bf1a36a6ccf4a 100644
 --- a/lib/rules/no-useless-escape.js
 +++ b/lib/rules/no-useless-escape.js
-@@ -65,13 +65,31 @@ module.exports = {
+@@ -97,12 +97,30 @@ module.exports = {
             escapeBackslash: "Replace the `\\` with `\\\\` to include the actual backslash character."
         },
@ -25,25 +25,21 @@ index 0e0f6f09f2c35f3276173c08f832cde9f2cf56a0..7dc22851715f3574d935f513c1b5e355
     create(context) {
 +        const options = context.options[0] || {};
-+        const { extra, extraCharClass } = options;
+        const { extra, extraCharClass } = options || ''
-         const sourceCode = context.sourceCode;
+         const sourceCode = context.getSourceCode();
         const parser = new RegExpParser();
-+        const NON_CHARCLASS_ESCAPES = union(REGEX_NON_CHARCLASS_ESCAPES, new Set(extra));
+        const NON_CHARCLASS_ESCAPES = union(REGEX_NON_CHARCLASS_ESCAPES, new Set(extra))
-+        const CHARCLASS_ESCAPES = union(REGEX_GENERAL_ESCAPES, new Set(extraCharClass));
+        const CHARCLASS_ESCAPES = union(REGEX_GENERAL_ESCAPES, new Set(extraCharClass))
 +
         /**
          * Reports a node
          * @param {ASTNode} node The node to report
-@@ -200,9 +218,9 @@ module.exports = {
+@@ -238,7 +256,7 @@ module.exports = {
-                     let allowedEscapes;
+                     .filter(charInfo => charInfo.escaped)
-                     if (characterClassStack.length) {
+                     // Filter out characters that are valid to escape, based on their position in the regular expression.
-                        allowedEscapes = unicodeSets ? REGEX_CLASSSET_CHARACTER_ESCAPES : REGEX_GENERAL_ESCAPES;
+-                    .filter(charInfo => !(charInfo.inCharClass ? REGEX_GENERAL_ESCAPES : REGEX_NON_CHARCLASS_ESCAPES).has(charInfo.text))
-+                        allowedEscapes = unicodeSets ? REGEX_CLASSSET_CHARACTER_ESCAPES : CHARCLASS_ESCAPES;
+                    .filter(charInfo => !(charInfo.inCharClass ? CHARCLASS_ESCAPES : NON_CHARCLASS_ESCAPES).has(charInfo.text))
-                     } else {
+ 
-                        allowedEscapes = REGEX_NON_CHARCLASS_ESCAPES;
+                     // Report all the remaining characters.
-+                        allowedEscapes = NON_CHARCLASS_ESCAPES;
+                     .forEach(charInfo => report(node, charInfo.index, charInfo.text));
                     }
                     if (allowedEscapes.has(escapedChar)) {
                         return;
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -1,39 +1,23 @@
 lockfileVersion: '6.0'
 settings:
  autoInstallPeers: true
  excludeLinksFromLockfile: false
 patchedDependencies:
  eslint-plugin-path-alias@1.0.0:
    hash: m6sma4g6bh67km3q6igf6uxaja
    path: patches/eslint-plugin-path-alias@1.0.0.patch
-  eslint@8.46.0:
+  eslint@8.28.0:
-    hash: xm46kqcmdgzlmm4aifkfpxaho4
+    hash: 7wc6icvgtg3uswirb5tpsbjnbe
-    path: patches/eslint@8.46.0.patch
+    path: patches/eslint@8.28.0.patch
 dependencies:
  '@sapphi-red/web-noise-suppressor':
    specifier: 0.3.3
    version: 0.3.3
  '@vap/core':
    specifier: 0.0.12
    version: 0.0.12
  '@vap/shiki':
    specifier: 0.10.5
    version: 0.10.5
  eslint-plugin-simple-header:
    specifier: ^1.0.2
    version: 1.0.2
  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
@ -42,9 +26,6 @@ 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
@ -65,10 +46,10 @@ devDependencies:
    version: 2.4.2
  '@typescript-eslint/eslint-plugin':
    specifier: ^5.59.1
-    version: 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
+    version: 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.28.0)(typescript@5.0.4)
  '@typescript-eslint/parser':
    specifier: ^5.59.1
-    version: 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+    version: 5.59.1(eslint@8.28.0)(typescript@5.0.4)
  diff:
    specifier: ^5.1.0
    version: 5.1.0
@ -79,20 +60,23 @@ devDependencies:
    specifier: ^0.15.18
    version: 0.15.18
  eslint:
-    specifier: ^8.46.0
+    specifier: ^8.28.0
-    version: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+    version: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
  eslint-import-resolver-alias:
    specifier: ^1.1.2
    version: 1.1.2
  eslint-plugin-header:
    specifier: ^3.1.1
    version: 3.1.1(eslint@8.28.0)
  eslint-plugin-path-alias:
    specifier: ^1.0.0
-    version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0)
+    version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.28.0)
  eslint-plugin-simple-import-sort:
    specifier: ^10.0.0
-    version: 10.0.0(eslint@8.46.0)
+    version: 10.0.0(eslint@8.28.0)
  eslint-plugin-unused-imports:
    specifier: ^2.0.0
-    version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0)
+    version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.28.0)
  highlight.js:
    specifier: 10.6.0
    version: 10.6.0
@ -120,17 +104,9 @@ devDependencies:
  typescript:
    specifier: ^5.0.4
    version: 5.0.4
  zip-local:
    specifier: ^0.3.5
    version: 0.3.5
 packages:
  /@aashutoshrathi/word-wrap@1.2.6:
    resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
    engines: {node: '>=0.10.0'}
    dev: true
  /@babel/code-frame@7.21.4:
    resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
    engines: {node: '>=6.9.0'}
@ -423,7 +399,7 @@ packages:
    dev: true
    optional: true
-  /@eslint-community/eslint-utils@4.4.0(eslint@8.46.0):
+  /@eslint-community/eslint-utils@4.4.0(eslint@8.28.0):
    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -432,8 +408,8 @@ packages:
      eslint:
        optional: true
    dependencies:
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
-      eslint-visitor-keys: 3.4.2
+      eslint-visitor-keys: 3.4.0
    dev: true
  /@eslint-community/regexpp@4.5.1:
@ -441,20 +417,15 @@ packages:
    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
    dev: true
-  /@eslint-community/regexpp@4.6.2:
+  /@eslint/eslintrc@1.3.3:
-    resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
+    resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==}
    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
    dev: true
  /@eslint/eslintrc@2.1.1:
    resolution: {integrity: sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dependencies:
      ajv: 6.12.6
      debug: 4.3.4
-      espree: 9.6.1
+      espree: 9.4.1
-      globals: 13.20.0
+      globals: 13.17.0
-      ignore: 5.2.4
+      ignore: 5.2.0
      import-fresh: 3.3.0
      js-yaml: 4.1.0
      minimatch: 3.1.2
@ -463,13 +434,8 @@ packages:
      - supports-color
    dev: true
-  /@eslint/js@8.46.0:
+  /@humanwhocodes/config-array@0.11.7:
-    resolution: {integrity: sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==}
+    resolution: {integrity: sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dev: true
  /@humanwhocodes/config-array@0.11.10:
    resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==}
    engines: {node: '>=10.10.0'}
    dependencies:
      '@humanwhocodes/object-schema': 1.2.1
@ -532,35 +498,10 @@ packages:
      - supports-color
    dev: true
  /@sapphi-red/web-noise-suppressor@0.3.3:
    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
@ -628,7 +569,7 @@ packages:
      '@types/node': 18.16.3
    dev: true
-  /@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4):
+  /@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.28.0)(typescript@5.0.4):
    resolution: {integrity: sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -642,12 +583,12 @@ packages:
        optional: true
    dependencies:
      '@eslint-community/regexpp': 4.5.1
-      '@typescript-eslint/parser': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/parser': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
      '@typescript-eslint/scope-manager': 5.59.1
-      '@typescript-eslint/type-utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/type-utils': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
-      '@typescript-eslint/utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/utils': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
      debug: 4.3.4
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
      grapheme-splitter: 1.0.4
      ignore: 5.2.4
      natural-compare-lite: 1.4.0
@ -658,7 +599,7 @@ packages:
      - supports-color
    dev: true
-  /@typescript-eslint/parser@5.59.1(eslint@8.46.0)(typescript@5.0.4):
+  /@typescript-eslint/parser@5.59.1(eslint@8.28.0)(typescript@5.0.4):
    resolution: {integrity: sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -674,7 +615,7 @@ packages:
      '@typescript-eslint/types': 5.59.1
      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
      debug: 4.3.4
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
      typescript: 5.0.4
    transitivePeerDependencies:
      - supports-color
@ -688,7 +629,7 @@ packages:
      '@typescript-eslint/visitor-keys': 5.59.1
    dev: true
-  /@typescript-eslint/type-utils@5.59.1(eslint@8.46.0)(typescript@5.0.4):
+  /@typescript-eslint/type-utils@5.59.1(eslint@8.28.0)(typescript@5.0.4):
    resolution: {integrity: sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -701,9 +642,9 @@ packages:
        optional: true
    dependencies:
      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
-      '@typescript-eslint/utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/utils': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
      debug: 4.3.4
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
      tsutils: 3.21.0(typescript@5.0.4)
      typescript: 5.0.4
    transitivePeerDependencies:
@ -736,7 +677,7 @@ packages:
      - supports-color
    dev: true
-  /@typescript-eslint/utils@5.59.1(eslint@8.46.0)(typescript@5.0.4):
+  /@typescript-eslint/utils@5.59.1(eslint@8.28.0)(typescript@5.0.4):
    resolution: {integrity: sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -745,13 +686,13 @@ packages:
      eslint:
        optional: true
    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.28.0)
      '@types/json-schema': 7.0.11
      '@types/semver': 7.3.13
      '@typescript-eslint/scope-manager': 5.59.1
      '@typescript-eslint/types': 5.59.1
      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
      eslint-scope: 5.1.1
      semver: 7.5.0
    transitivePeerDependencies:
@ -781,16 +722,16 @@ packages:
      vscode-textmate: 5.2.0
    dev: false
-  /acorn-jsx@5.3.2(acorn@8.10.0):
+  /acorn-jsx@5.3.2(acorn@8.8.0):
    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
    peerDependencies:
      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
    dependencies:
-      acorn: 8.10.0
+      acorn: 8.8.0
    dev: true
-  /acorn@8.10.0:
+  /acorn@8.8.0:
-    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
+    resolution: {integrity: sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==}
    engines: {node: '>=0.4.0'}
    hasBin: true
    dev: true
@ -880,10 +821,6 @@ 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'}
@ -1509,7 +1446,18 @@ packages:
        optional: true
    dev: true
-  /eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0):
+  /eslint-plugin-header@3.1.1(eslint@8.28.0):
    resolution: {integrity: sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==}
    peerDependencies:
      eslint: '>=7.7.0'
    peerDependenciesMeta:
      eslint:
        optional: true
    dependencies:
      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
    dev: true
  /eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.28.0):
    resolution: {integrity: sha512-FXus57yC+Zd3sMv46pbloXYwFeNVNHJqlACr9V68FG/IzGFBBokGJpmjDbEjpt8ZCeVSndUubeDWWl2A8sCNVQ==}
    peerDependencies:
      eslint: ^7
@ -1517,18 +1465,14 @@ packages:
      eslint:
        optional: true
    dependencies:
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
      nanomatch: 1.2.13
    transitivePeerDependencies:
      - supports-color
    dev: true
    patched: true
-  /eslint-plugin-simple-header@1.0.2:
+  /eslint-plugin-simple-import-sort@10.0.0(eslint@8.28.0):
    resolution: {integrity: sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==}
    dev: false
  /eslint-plugin-simple-import-sort@10.0.0(eslint@8.46.0):
    resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==}
    peerDependencies:
      eslint: '>=5.0.0'
@ -1536,10 +1480,10 @@ packages:
      eslint:
        optional: true
    dependencies:
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
    dev: true
-  /eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0):
+  /eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.28.0):
    resolution: {integrity: sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -1551,8 +1495,8 @@ packages:
      eslint:
        optional: true
    dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.28.0)(typescript@5.0.4)
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
      eslint-rule-composer: 0.3.0
    dev: true
@ -1569,34 +1513,49 @@ packages:
      estraverse: 4.3.0
    dev: true
-  /eslint-scope@7.2.2:
+  /eslint-scope@7.1.1:
-    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dependencies:
      esrecurse: 4.3.0
      estraverse: 5.3.0
    dev: true
  /eslint-utils@3.0.0(eslint@8.28.0):
    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
    peerDependencies:
      eslint: '>=5'
    peerDependenciesMeta:
      eslint:
        optional: true
    dependencies:
      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
      eslint-visitor-keys: 2.1.0
    dev: true
  /eslint-visitor-keys@2.1.0:
    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
    engines: {node: '>=10'}
    dev: true
  /eslint-visitor-keys@3.3.0:
    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dev: true
  /eslint-visitor-keys@3.4.0:
    resolution: {integrity: sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dev: true
-  /eslint-visitor-keys@3.4.2:
+  /eslint@8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe):
-    resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==}
+    resolution: {integrity: sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dev: true
  /eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4):
    resolution: {integrity: sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    hasBin: true
    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0)
+      '@eslint/eslintrc': 1.3.3
-      '@eslint-community/regexpp': 4.6.2
+      '@humanwhocodes/config-array': 0.11.7
      '@eslint/eslintrc': 2.1.1
      '@eslint/js': 8.46.0
      '@humanwhocodes/config-array': 0.11.10
      '@humanwhocodes/module-importer': 1.0.1
      '@nodelib/fs.walk': 1.2.8
      ajv: 6.12.6
@ -1605,46 +1564,60 @@ packages:
      debug: 4.3.4
      doctrine: 3.0.0
      escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.2
+      eslint-scope: 7.1.1
-      eslint-visitor-keys: 3.4.2
+      eslint-utils: 3.0.0(eslint@8.28.0)
-      espree: 9.6.1
+      eslint-visitor-keys: 3.3.0
-      esquery: 1.5.0
+      espree: 9.4.0
      esquery: 1.4.0
      esutils: 2.0.3
      fast-deep-equal: 3.1.3
      file-entry-cache: 6.0.1
      find-up: 5.0.0
      glob-parent: 6.0.2
-      globals: 13.20.0
+      globals: 13.17.0
-      graphemer: 1.4.0
+      grapheme-splitter: 1.0.4
-      ignore: 5.2.4
+      ignore: 5.2.0
      import-fresh: 3.3.0
      imurmurhash: 0.1.4
      is-glob: 4.0.3
      is-path-inside: 3.0.3
      js-sdsl: 4.1.5
      js-yaml: 4.1.0
      json-stable-stringify-without-jsonify: 1.0.1
      levn: 0.4.1
      lodash.merge: 4.6.2
      minimatch: 3.1.2
      natural-compare: 1.4.0
-      optionator: 0.9.3
+      optionator: 0.9.1
      regexpp: 3.2.0
      strip-ansi: 6.0.1
      strip-json-comments: 3.1.1
      text-table: 0.2.0
    transitivePeerDependencies:
      - supports-color
    dev: true
    patched: true
-  /espree@9.6.1:
+  /espree@9.4.0:
-    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    resolution: {integrity: sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dependencies:
-      acorn: 8.10.0
+      acorn: 8.8.0
-      acorn-jsx: 5.3.2(acorn@8.10.0)
+      acorn-jsx: 5.3.2(acorn@8.8.0)
-      eslint-visitor-keys: 3.4.2
+      eslint-visitor-keys: 3.3.0
    dev: true
-  /esquery@1.5.0:
+  /espree@9.4.1:
-    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
+    resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dependencies:
      acorn: 8.8.0
      acorn-jsx: 5.3.2(acorn@8.8.0)
      eslint-visitor-keys: 3.3.0
    dev: true
  /esquery@1.4.0:
    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
    engines: {node: '>=0.10'}
    dependencies:
      estraverse: 5.3.0
@ -1885,8 +1858,8 @@ packages:
      which: 1.3.1
    dev: true
-  /globals@13.20.0:
+  /globals@13.17.0:
-    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
+    resolution: {integrity: sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==}
    engines: {node: '>=8'}
    dependencies:
      type-fest: 0.20.2
@ -1908,18 +1881,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
  /graphemer@1.4.0:
    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
    dev: true
  /hard-rejection@2.1.0:
    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
    engines: {node: '>=6'}
@ -2007,6 +1972,11 @@ packages:
    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
    dev: true
  /ignore@5.2.0:
    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
    engines: {node: '>= 4'}
    dev: true
  /ignore@5.2.4:
    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
    engines: {node: '>= 4'}
@ -2198,6 +2168,10 @@ packages:
    engines: {node: '>=0.10.0'}
    dev: true
  /js-sdsl@4.1.5:
    resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==}
    dev: true
  /js-tokens@4.0.0:
    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
    dev: true
@ -2229,12 +2203,6 @@ 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'}
@ -2405,10 +2373,6 @@ 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
@ -2521,16 +2485,16 @@ packages:
      wrappy: 1.0.2
    dev: true
-  /optionator@0.9.3:
+  /optionator@0.9.1:
-    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
+    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
    engines: {node: '>= 0.8.0'}
    dependencies:
      '@aashutoshrathi/word-wrap': 1.2.6
      deep-is: 0.1.4
      fast-levenshtein: 2.0.6
      levn: 0.4.1
      prelude-ls: 1.2.1
      type-check: 0.4.0
      word-wrap: 1.2.3
    dev: true
  /p-limit@2.3.0:
@ -2566,10 +2530,6 @@ 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'}
@ -2721,11 +2681,6 @@ 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
@ -2779,6 +2734,11 @@ packages:
      safe-regex: 1.1.0
    dev: true
  /regexpp@3.2.0:
    resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
    engines: {node: '>=8'}
    dev: true
  /require-directory@2.1.1:
    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
    engines: {node: '>=0.10.0'}
@ -3363,6 +3323,11 @@ packages:
      isexe: 2.0.0
    dev: true
  /word-wrap@1.2.3:
    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
    engines: {node: '>=0.10.0'}
    dev: true
  /wrap-ansi@7.0.0:
    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
    engines: {node: '>=10'}
@ -3440,18 +3405,3 @@ packages:
    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
    engines: {node: '>=10'}
    dev: true
  /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
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@ -18,19 +18,14 @@
 */
 import esbuild from "esbuild";
 import { readdir } from "fs/promises";
 import { join } from "path";
-import { BUILD_TIMESTAMP, commonOpts, existsAsync, globPlugins, isStandalone, updaterDisabled, VERSION, watch } from "./common.mjs";
+import { commonOpts, globPlugins, isStandalone, VERSION, watch } from "./common.mjs";
 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,
+    BUILD_TIMESTAMP: Date.now(),
 };
 if (defines.IS_STANDALONE === "false")
    // If this is a local build (not standalone), optimise
@ -45,61 +40,26 @@ const nodeCommonOpts = {
    format: "cjs",
    platform: "node",
    target: ["esnext"],
-    external: ["electron", "original-fs", "~pluginNatives", ...commonOpts.external],
+    minify: true,
    bundle: true,
    external: ["electron", ...commonOpts.external],
    define: defines,
 };
 const sourceMapFooter = s => watch ? "" : `//# sourceMappingURL=vencord://${s}.js.map`;
 const sourcemap = watch ? "inline" : "external";
 /**
 * @type {import("esbuild").Plugin}
 */
 const globNativesPlugin = {
    name: "glob-natives-plugin",
    setup: build => {
        const filter = /^~pluginNatives$/;
        build.onResolve({ filter }, args => {
            return {
                namespace: "import-natives",
                path: args.path
            };
        });
        build.onLoad({ filter, namespace: "import-natives" }, async () => {
            const pluginDirs = ["plugins", "userplugins"];
            let code = "";
            let natives = "\n";
            let i = 0;
            for (const dir of pluginDirs) {
                const dirPath = join("src", dir);
                if (!await existsAsync(dirPath)) continue;
                const plugins = await readdir(dirPath);
                for (const p of plugins) {
                    if (!await existsAsync(join(dirPath, p, "native.ts"))) continue;
                    const nameParts = p.split(".");
                    const namePartsWithoutTarget = nameParts.length === 1 ? nameParts : nameParts.slice(0, -1);
                    // pluginName.thing.desktop -> PluginName.thing
                    const cleanPluginName = p[0].toUpperCase() + namePartsWithoutTarget.join(".").slice(1);
                    const mod = `p${i}`;
                    code += `import * as ${mod} from "./${dir}/${p}/native";\n`;
                    natives += `${JSON.stringify(cleanPluginName)}:${mod},\n`;
                    i++;
                }
            }
            code += `export default {${natives}};`;
            return {
                contents: code,
                resolveDir: "./src"
            };
        });
    }
 };
 await Promise.all([
-    // Discord Desktop main & renderer & preload
+    // common preload
    esbuild.build({
        ...nodeCommonOpts,
        entryPoints: ["src/preload.ts"],
        outfile: "dist/preload.js",
        footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("preload") },
        sourcemap,
    }),
    // Discord Desktop main & renderer
    esbuild.build({
        ...nodeCommonOpts,
        entryPoints: ["src/main/index.ts"],
@ -109,12 +69,8 @@ await Promise.all([
        define: {
            ...defines,
            IS_DISCORD_DESKTOP: true,
-            IS_VESKTOP: false
+            IS_VENCORD_DESKTOP: false
-        },
+        }
        plugins: [
            ...nodeCommonOpts.plugins,
            globNativesPlugin
        ]
    }),
    esbuild.build({
        ...commonOpts,
@ -131,24 +87,13 @@ await Promise.all([
        ],
        define: {
            ...defines,
            IS_WEB: false,
            IS_DISCORD_DESKTOP: true,
-            IS_VESKTOP: false
+            IS_VENCORD_DESKTOP: false
        }
    }),
    esbuild.build({
        ...nodeCommonOpts,
        entryPoints: ["src/preload.ts"],
        outfile: "dist/preload.js",
        footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("preload") },
        sourcemap,
        define: {
            ...defines,
            IS_DISCORD_DESKTOP: true,
            IS_VESKTOP: false
        }
    }),
-    // Vencord Desktop main & renderer & preload
+    // Vencord Desktop main & renderer
    esbuild.build({
        ...nodeCommonOpts,
        entryPoints: ["src/main/index.ts"],
@ -158,12 +103,8 @@ await Promise.all([
        define: {
            ...defines,
            IS_DISCORD_DESKTOP: false,
-            IS_VESKTOP: true
+            IS_VENCORD_DESKTOP: true
-        },
+        }
        plugins: [
            ...nodeCommonOpts.plugins,
            globNativesPlugin
        ]
    }),
    esbuild.build({
        ...commonOpts,
@ -180,20 +121,9 @@ await Promise.all([
        ],
        define: {
            ...defines,
            IS_WEB: false,
            IS_DISCORD_DESKTOP: false,
-            IS_VESKTOP: true
+            IS_VENCORD_DESKTOP: true
        }
    }),
    esbuild.build({
        ...nodeCommonOpts,
        entryPoints: ["src/preload.ts"],
        outfile: "dist/vencordDesktopPreload.js",
        footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("vencordDesktopPreload") },
        sourcemap,
        define: {
            ...defines,
            IS_DISCORD_DESKTOP: false,
            IS_VESKTOP: true
        }
    }),
 ]).catch(err => {
--- a/scripts/build/buildWeb.mjs
+++ b/scripts/build/buildWeb.mjs
@ -17,13 +17,14 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import esbuild from "esbuild";
 import { readFileSync } from "fs";
 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";
+import esbuild from "esbuild";
 import { zip } from "fflate";
 import { readFileSync } from "fs";
 import { appendFile, mkdir, readFile, rm, writeFile } from "fs/promises";
 import { join } from "path";
 import { commonOpts, globPlugins, VERSION, watch } from "./common.mjs";
 /**
 * @type {esbuild.BuildOptions}
@ -41,69 +42,28 @@ const commonOptions = {
    target: ["esnext"],
    define: {
        IS_WEB: "true",
        IS_EXTENSION: "false",
        IS_STANDALONE: "true",
        IS_DEV: JSON.stringify(watch),
        IS_DISCORD_DESKTOP: "false",
-        IS_VESKTOP: "false",
+        IS_VENCORD_DESKTOP: "false",
        IS_UPDATER_DISABLED: "true",
        VERSION: JSON.stringify(VERSION),
-        BUILD_TIMESTAMP,
+        BUILD_TIMESTAMP: Date.now(),
    }
 };
 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: {
-                ...(commonOptions?.define),
+                "window": "unsafeWindow",
-                window: "unsafeWindow",
+                ...(commonOptions?.define)
            },
            outfile: "dist/Vencord.user.js",
            banner: {
@ -118,41 +78,12 @@ await Promise.all(
 );
 /**
- * @type {(dir: string) => Promise<string[]>}
+  * @type {(target: string, files: string[], shouldZip: boolean) => Promise<void>}
 */
-async function globDir(dir) {
+async function buildPluginZip(target, files, shouldZip) {
    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) {
    const entries = {
-        "dist/Vencord.js": await readFile("dist/extension.js"),
+        "dist/Vencord.js": await readFile("dist/browser.js"),
-        "dist/Vencord.css": await readFile("dist/extension.css"),
+        "dist/Vencord.css": await readFile("dist/browser.css"),
        ...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")) {
@ -168,6 +99,21 @@ async function buildExtension(target, files) {
        }))),
    };
    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);
@ -177,6 +123,7 @@ async function buildExtension(target, files) {
        }));
        console.info("Unpacked Extension written to dist/" + target);
    }
 }
 const appendCssRuntime = readFile("dist/Vencord.user.css", "utf-8").then(content => {
@ -194,12 +141,8 @@ const appendCssRuntime = readFile("dist/Vencord.user.css", "utf-8").then(content
 await Promise.all([
    appendCssRuntime,
-    buildExtension("chromium-unpacked", ["modifyResponseHeaders.json", "content.js", "manifest.json", "icon.png"]),
+    buildPluginZip("extension.zip", ["modifyResponseHeaders.json", "content.js", "manifest.json", "icon.png"], true),
-    buildExtension("firefox-unpacked", ["background.js", "content.js", "manifestv2.json", "icon.png"]),
+    buildPluginZip("chromium-unpacked", ["modifyResponseHeaders.json", "content.js", "manifest.json", "icon.png"], false),
    buildPluginZip("firefox-unpacked", ["background.js", "content.js", "manifestv2.json", "icon.png"], false),
 ]);
 Zip.sync.zip("dist/chromium-unpacked").compress().save("dist/extension-chrome.zip");
 console.info("Packed Chromium Extension written to dist/extension-chrome.zip");
 Zip.sync.zip("dist/firefox-unpacked").compress().save("dist/extension-firefox.zip");
 console.info("Packed Firefox Extension written to dist/extension-firefox.zip");
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@ -20,39 +20,29 @@ import "../suppressExperimentalWarnings.js";
 import "../checkNodeVersion.js";
 import { exec, execSync } from "child_process";
-import { constants as FsConstants, readFileSync } from "fs";
+import { existsSync, readFileSync } from "fs";
-import { access, readdir, readFile } from "fs/promises";
+import { readdir, readFile } from "fs/promises";
 import { join, relative } from "path";
 import { promisify } from "util";
 // wtf is this assert syntax
 import PackageJSON from "../../package.json" assert { type: "json" };
 import { getPluginTarget } from "../utils.mjs";
 export const VERSION = PackageJSON.version;
-// https://reproducible-builds.org/docs/source-date-epoch/
+export const BUILD_TIMESTAMP = Date.now();
 export const BUILD_TIMESTAMP = Number(process.env.SOURCE_DATE_EPOCH) || Date.now();
 export const watch = process.argv.includes("--watch");
 export const isStandalone = JSON.stringify(process.argv.includes("--standalone"));
-export const updaterDisabled = JSON.stringify(process.argv.includes("--disable-updater"));
+export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
 export const gitHash = process.env.VENCORD_HASH || execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
 export const banner = {
    js: `
 // Vencord ${gitHash}
 // Standalone: ${isStandalone}
 // Platform: ${isStandalone === "false" ? process.platform : "Universal"}
 // Updater disabled: ${updaterDisabled}
 `.trim()
 };
 const isWeb = process.argv.slice(0, 2).some(f => f.endsWith("buildWeb.mjs"));
 export function existsAsync(path) {
    return access(path, FsConstants.F_OK)
        .then(() => true)
        .catch(() => false);
 }
 // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
 /**
 * @type {import("esbuild").Plugin}
@ -85,19 +75,20 @@ export const globPlugins = kind => ({
            let plugins = "\n";
            let i = 0;
            for (const dir of pluginDirs) {
-                if (!await existsAsync(`./src/${dir}`)) continue;
+                if (!existsSync(`./src/${dir}`)) continue;
                const files = await readdir(`./src/${dir}`);
                for (const file of files) {
                    if (file.startsWith("_") || file.startsWith(".")) continue;
                    if (file === "index.ts") continue;
-                    const target = getPluginTarget(file);
+                    const fileBits = file.split(".");
-                    if (target) {
+                    if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1))) {
-                        if (target === "dev" && !watch) continue;
+                        const mod = fileBits.at(-2);
-                        if (target === "web" && kind === "discordDesktop") continue;
+                        if (mod === "dev" && !watch) continue;
-                        if (target === "desktop" && kind === "web") continue;
+                        if (mod === "web" && kind === "discordDesktop") continue;
-                        if (target === "discordDesktop" && kind !== "discordDesktop") continue;
+                        if (mod === "desktop" && kind === "web") continue;
-                        if (target === "vencordDesktop" && kind !== "vencordDesktop") continue;
+                        if (mod === "discordDesktop" && kind !== "discordDesktop") continue;
                        if (mod === "vencordDesktop" && kind !== "vencordDesktop") continue;
                    }
                    const mod = `p${i}`;
@ -142,14 +133,11 @@ export const gitRemotePlugin = {
            namespace: "git-remote", path: args.path
        }));
        build.onLoad({ filter, namespace: "git-remote" }, async () => {
            let remote = process.env.VENCORD_REMOTE;
            if (!remote) {
            const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" });
-                remote = res.stdout.trim()
+            const remote = res.stdout.trim()
                .replace("https://github.com/", "")
                .replace("git@github.com:", "")
                .replace(/.git$/, "");
            }
            return { contents: `export default "${remote}"` };
        });
--- a/scripts/generatePluginList.ts
+++ b/scripts/generatePluginList.ts
@ -18,12 +18,9 @@
 import { Dirent, readdirSync, readFileSync, writeFileSync } from "fs";
 import { access, readFile } from "fs/promises";
-import { join, sep } from "path";
+import { join } 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";
 interface Dev {
    name: string;
    id: string;
@ -40,7 +37,6 @@ interface PluginData {
    required: boolean;
    enabledByDefault: boolean;
    target: "discordDesktop" | "vencordDesktop" | "web" | "dev";
    filePath: string;
 }
 const devs = {} as Record<string, Dev>;
@ -155,29 +151,21 @@ async function parseFile(fileName: string) {
                case "required":
                case "enabledByDefault":
                    data[key] = value.kind === SyntaxKind.TrueKeyword;
                    if (!data[key] && value.kind !== SyntaxKind.FalseKeyword) throw fail(`${key} is not a boolean literal`);
                    break;
            }
        }
        if (!data.name || !data.description || !data.authors) throw fail("name, description or authors are missing");
-        const target = getPluginTarget(fileName);
+        const fileBits = fileName.split(".");
-        if (target) {
+        if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1)!)) {
-            if (!["web", "discordDesktop", "vencordDesktop", "desktop", "dev"].includes(target)) throw fail(`invalid target ${target}`);
+            const mod = fileBits.at(-2)!;
-            data.target = target as any;
+            if (!["web", "discordDesktop", "vencordDesktop", "dev"].includes(mod)) throw fail(`invalid target ${fileBits.at(-2)}`);
            data.target = mod as any;
        }
-        data.filePath = posixNormalize(fileName)
+        return data;
            .split(sep)
            .join(posixSep)
            .replace(/\/index\.([jt]sx?)$/, "")
            .replace(/^src\/plugins\//, "");
        let readme = "";
        try {
            readme = readFileSync(join(fileName, "..", "README.md"), "utf-8");
        } catch { }
        return [data, readme] as const;
    }
    throw fail("no default export called 'definePlugin' found");
@ -206,24 +194,18 @@ function isPluginFile({ name }: { name: string; }) {
 (async () => {
    parseDevs();
-    const plugins = [] as PluginData[];
+    const plugins = ["src/plugins", "src/plugins/_core"].flatMap(dir =>
    const readmes = {} as Record<string, string>;
    await Promise.all(["src/plugins", "src/plugins/_core"].flatMap(dir =>
        readdirSync(dir, { withFileTypes: true })
            .filter(isPluginFile)
-            .map(async dirent => {
+            .map(async dirent =>
-                const [data, readme] = await parseFile(await getEntryPoint(dir, dirent));
+                parseFile(await getEntryPoint(dir, dirent))
-                plugins.push(data);
+            )
-                if (readme) readmes[data.name] = readme;
+    );
            })
    ));
-    const data = JSON.stringify(plugins);
+    const data = JSON.stringify(await Promise.all(plugins));
-    if (process.argv.length > 3) {
+    if (process.argv.length > 2) {
        writeFileSync(process.argv[2], data);
        writeFileSync(process.argv[3], JSON.stringify(readmes));
    } else {
        console.log(data);
    }
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@ -61,13 +61,6 @@ const report = {
    otherErrors: [] as string[]
 };
 const IGNORED_DISCORD_ERRORS = [
    "KeybindStore: Looking for callback action",
    "Unable to process domain list delta: Client revision number is null",
    "Downloading the full bad domains file",
    /\[GatewaySocket\].{0,110}Cannot access '/
 ] as Array<string | RegExp>;
 function toCodeBlock(s: string) {
    s = s.replace(/```/g, "`\u200B`\u200B`");
    return "```" + s + " ```";
@ -93,8 +86,6 @@ async function printReport() {
        console.log(`  - Error: ${toCodeBlock(p.error)}`);
    });
    report.otherErrors = report.otherErrors.filter(e => !IGNORED_DISCORD_ERRORS.some(regex => e.match(regex)));
    console.log("## Discord Errors");
    report.otherErrors.forEach(e => {
        console.log(`- ${toCodeBlock(e)}`);
@ -180,7 +171,7 @@ page.on("console", async e => {
                    plugin,
                    type,
                    id,
-                    match: regex.replace(/\[A-Za-z_\$\]\[\\w\$\]\*/g, "\\i"),
+                    match: regex,
                    error: cause
                });
                break;
@ -268,11 +259,11 @@ function runTime(token: string) {
            const { wreq } = Vencord.Webpack;
            console.error("[PUP_DEBUG]", "Loading all chunks...");
-            const ids = Function("return" + wreq.u.toString().match(/(?<=\()\{.+?\}/s)![0])();
+            const ids = Function("return" + wreq.u.toString().match(/\{.+\}/s)![0])();
            for (const id in ids) {
                const isWasm = await fetch(wreq.p + wreq.u(id))
                    .then(r => r.text())
-                    .then(t => t.includes(".module.wasm") || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push"));
+                    .then(t => t.includes(".module.wasm"));
                if (!isWasm)
                    await wreq.e(id as any);
@ -289,7 +280,7 @@ function runTime(token: string) {
            setTimeout(() => console.log("PUPPETEER_TEST_DONE_SIGNAL"), 1000);
        }, 1000));
    } catch (e) {
-        console.error("[PUP_DEBUG]", "A fatal error occurred");
+        console.error("[PUP_DEBUG]", "A fatal error occured");
        console.error("[PUP_DEBUG]", e);
        process.exit(1);
    }
--- a/scripts/header-new.txt
+++ b/scripts/header-new.txt
@ -1,3 +0,0 @@
 Vencord, a Discord client mod
 Copyright (c) {year} {author}
 SPDX-License-Identifier: GPL-3.0-or-later
--- a/scripts/header-old.txt
+++ b/scripts/header-old.txt
@ -1,17 +0,0 @@
 /*
 * Vencord, a modification for Discord's desktop app
 * Copyright (c) {year} {author}
 *
 * 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/>.
 */
--- a/scripts/utils.mjs
+++ b/scripts/utils.mjs
@ -1,30 +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/>.
 */
 /**
 * @param {string} filePath
 * @returns {string | null}
 */
 export function getPluginTarget(filePath) {
    const pathParts = filePath.split(/[/\\]/);
    if (/^index\.tsx?$/.test(pathParts.at(-1))) pathParts.pop();
    const identifier = pathParts.at(-1).replace(/\.tsx?$/, "");
    const identiferBits = identifier.split(".");
    return identiferBits.length === 1 ? null : identiferBits.at(-1);
 }
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@ -27,7 +27,6 @@ export { PlainSettings, Settings };
 import "./utils/quickCss";
 import "./webpack/patchWebpack";
 import { get as dsGet } from "./api/DataStore";
 import { showNotification } from "./api/Notifications";
 import { PlainSettings, Settings } from "./api/Settings";
 import { patches, PMLogger, startAllPlugins } from "./plugins";
@ -39,22 +38,6 @@ import { onceReady } from "./webpack";
 import { SettingsRouter } from "./webpack/common";
 async function syncSettings() {
    // pre-check for local shared settings
    if (
        Settings.cloud.authenticated &&
        await dsGet("Vencord_cloudSecret") === null // this has been enabled due to local settings share or some other bug
    ) {
        // show a notification letting them know and tell them how to fix it
        showNotification({
            title: "Cloud Integrations",
            body: "We've noticed you have cloud integrations enabled in another client! Due to limitations, you will " +
                "need to re-authenticate to continue using them. Click here to go to the settings page to do so!",
            color: "var(--yellow-360)",
            onClick: () => SettingsRouter.open("VencordCloud")
        });
        return;
    }
    if (
        Settings.cloud.settingsSync && // if it's enabled
        Settings.cloud.authenticated // if cloud integrations are enabled
@ -136,7 +119,7 @@ if (IS_DISCORD_DESKTOP && Settings.winNativeTitleBar && navigator.platform.toLow
    document.addEventListener("DOMContentLoaded", () => {
        document.head.append(Object.assign(document.createElement("style"), {
            id: "vencord-native-titlebar-style",
-            textContent: "[class*=titleBar]{display: none!important}"
+            textContent: "[class*=titleBar-]{display: none!important}"
        }));
    }, { once: true });
 }
--- a/src/VencordNative.ts
+++ b/src/VencordNative.ts
@ -1,14 +1,24 @@
 /*
- * Vencord, a Discord client mod
+ * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
+ * Copyright (c) 2022
- * SPDX-License-Identifier: GPL-3.0-or-later
+ *
- */
+ * 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 { IpcEvents } from "@utils/IpcEvents";
 import { IpcRes } from "@utils/types";
 import { ipcRenderer } from "electron";
 import { PluginIpcMappings } from "main/ipcPlugins";
 import type { UserThemeHeader } from "main/themes";
 function invoke<T = any>(event: IpcEvents, ...args: any[]) {
    return ipcRenderer.invoke(event, ...args) as Promise<T>;
@ -18,26 +28,7 @@ export function sendSync<T = any>(event: IpcEvents, ...args: any[]) {
    return ipcRenderer.sendSync(event, ...args) as T;
 }
 const PluginHelpers = {} as Record<string, Record<string, (...args: any[]) => Promise<any>>>;
 const pluginIpcMap = sendSync<PluginIpcMappings>(IpcEvents.GET_PLUGIN_IPC_METHOD_MAP);
 for (const [plugin, methods] of Object.entries(pluginIpcMap)) {
    const map = PluginHelpers[plugin] = {};
    for (const [methodName, method] of Object.entries(methods)) {
        map[methodName] = (...args: any[]) => invoke(method as IpcEvents, ...args);
    }
 }
 export default {
    themes: {
        uploadTheme: (fileName: string, fileData: string) => invoke<void>(IpcEvents.UPLOAD_THEME, fileName, fileData),
        deleteTheme: (fileName: string) => invoke<void>(IpcEvents.DELETE_THEME, fileName),
        getThemesDir: () => invoke<string>(IpcEvents.GET_THEMES_DIR),
        getThemesList: () => invoke<Array<UserThemeHeader>>(IpcEvents.GET_THEMES_LIST),
        getThemeData: (fileName: string) => invoke<string | undefined>(IpcEvents.GET_THEME_DATA, fileName),
        getSystemValues: () => invoke<Record<string, string>>(IpcEvents.GET_THEME_SYSTEM_VALUES),
    },
    updater: {
        getUpdates: () => invoke<IpcRes<Record<"hash" | "author" | "message", string>[]>>(IpcEvents.GET_UPDATES),
        update: () => invoke<IpcRes<boolean>>(IpcEvents.UPDATE),
@ -59,10 +50,6 @@ export default {
            ipcRenderer.on(IpcEvents.QUICK_CSS_UPDATE, (_, css) => cb(css));
        },
        addThemeChangeListener(cb: () => void) {
            ipcRenderer.on(IpcEvents.THEME_UPDATE, () => cb());
        },
        openFile: () => invoke<void>(IpcEvents.OPEN_QUICKCSS),
        openEditor: () => invoke<void>(IpcEvents.OPEN_MONACO_EDITOR),
    },
@ -71,6 +58,4 @@ export default {
        getVersions: () => process.versions as Partial<NodeJS.ProcessVersions>,
        openExternal: (url: string) => invoke<void>(IpcEvents.OPEN_EXTERNAL, url)
    },
    pluginHelpers: PluginHelpers
 };
--- a/src/api/Commands/commandHelpers.ts
+++ b/src/api/Commands/commandHelpers.ts
@ -17,14 +17,14 @@
 */
 import { mergeDefaults } from "@utils/misc";
-import { findByPropsLazy } from "@webpack";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
 import { SnowflakeUtils } from "@webpack/common";
 import { Message } from "discord-types/general";
 import type { PartialDeep } from "type-fest";
 import { Argument } from "./types";
-const MessageCreator = findByPropsLazy("createBotMessage");
+const createBotMessage = findByCodeLazy('username:"Clyde"');
 const MessageSender = findByPropsLazy("receiveMessage");
 export function generateId() {
@ -38,7 +38,7 @@ export function generateId() {
 * @returns {Message}
 */
 export function sendBotMessage(channelId: string, message: PartialDeep<Message>): Message {
-    const botMessage = MessageCreator.createBotMessage({ channelId, content: "", embeds: [] });
+    const botMessage = createBotMessage({ channelId, content: "", embeds: [] });
    MessageSender.receiveMessage(channelId, mergeDefaults(message, botMessage));
--- a/src/plugins/voiceMessages/utils.ts
+++ b/src/plugins/voiceMessages/utils.ts
@ -16,6 +16,14 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-import { classNameFactory } from "@api/Styles";
+import { proxyLazy } from "@utils/lazy";
-export const cl = classNameFactory("vc-vmsg-");
+const p = proxyLazy<typeof import("plugins/_api/componentUpdater").default>(() => Vencord.Plugins.plugins.ComponentUpdaterAPI as any);
 /**
 * Rerender a specific message
 * @param messageId The id of the message to rerender
 */
 export function updateMessageComponent(messageId: string) {
    p.forceUpdaters.get(messageId)?.();
 }
--- a/src/api/ContextMenu.ts
+++ b/src/api/ContextMenu.ts
@ -69,7 +69,7 @@ export function addGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallback)
 * Remove a context menu patch
 * @param navId The navId(s) for the context menu(s) to remove the patch
 * @param patch The patch to be removed
- * @returns Whether the patch was successfully removed from the context menu(s)
+ * @returns Wheter the patch was sucessfully removed from the context menu(s)
 */
 export function removeContextMenuPatch<T extends string | Array<string>>(navId: T, patch: NavContextMenuPatchCallback): T extends string ? boolean : Array<boolean> {
    const navIds = Array.isArray(navId) ? navId : [navId as string];
@ -82,7 +82,7 @@ export function removeContextMenuPatch<T extends string | Array<string>>(navId:
 /**
 * Remove a global context menu patch
 * @param patch The patch to be removed
- * @returns Whether the patch was successfully removed
+ * @returns Wheter the patch was sucessfully removed
 */
 export function removeGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallback): boolean {
    return globalPatches.delete(patch);
--- a/src/api/DataStore/index.ts
+++ b/src/api/DataStore/index.ts
@ -1,4 +1,4 @@
-/* eslint-disable simple-header/header */
+/* eslint-disable header/header */
 /*!
 * idb-keyval v6.2.0
--- a/src/api/MemberListDecorators.ts
+++ b/src/api/MemberListDecorators.ts
@ -20,6 +20,7 @@ import { Channel, User } from "discord-types/general/index.js";
 interface DecoratorProps {
    activities: any[];
    canUseAvatarDecorations: boolean;
    channel: Channel;
    /**
     * Only for DM members
@ -51,9 +52,9 @@ export function removeDecorator(identifier: string) {
    decorators.delete(identifier);
 }
-export function __getDecorators(props: DecoratorProps): (JSX.Element | null)[] {
+export function __addDecoratorsToList(props: DecoratorProps): (JSX.Element | null)[] {
    const isInGuild = !!(props.guildId);
-    return Array.from(decorators.values(), decoratorObj => {
+    return [...decorators.values()].map(decoratorObj => {
        const { decorator, onlyIn } = decoratorObj;
        // this can most likely be done cleaner
        if (!onlyIn || (onlyIn === "guilds" && isInGuild) || (onlyIn === "dms" && !isInGuild)) {
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@ -34,7 +34,6 @@ export interface Settings {
    useQuickCss: boolean;
    enableReactDevtools: boolean;
    themeLinks: string[];
    enabledThemes: string[];
    frameless: boolean;
    transparent: boolean;
    winCtrlQ: boolean;
@ -69,7 +68,6 @@ const DefaultSettings: Settings = {
    autoUpdateNotification: true,
    useQuickCss: true,
    themeLinks: [],
    enabledThemes: [],
    enableReactDevtools: false,
    frameless: false,
    transparent: false,
@ -109,7 +107,7 @@ const saveSettingsOnFrequentAction = debounce(async () => {
    }
 }, 60_000);
-type SubscriptionCallback = ((newValue: any, path: string) => void) & { _paths?: Array<string>; };
+type SubscriptionCallback = ((newValue: any, path: string) => void) & { _path?: string; };
 const subscriptions = new Set<SubscriptionCallback>();
 const proxyCache = {} as Record<string, any>;
@ -166,7 +164,7 @@ function makeProxy(settings: any, root = settings, path = ""): Settings {
            const setPath = `${path}${path && "."}${p}`;
            delete proxyCache[setPath];
            for (const subscription of subscriptions) {
-                if (!subscription._paths || subscription._paths.includes(setPath)) {
+                if (!subscription._path || subscription._path === setPath) {
                    subscription(v, setPath);
                }
            }
@ -237,8 +235,7 @@ type ResolvePropDeep<T, P> = P extends "" ? T :
 export function addSettingsListener<Path extends keyof Settings>(path: Path, onUpdate: (newValue: Settings[Path], path: Path) => void): void;
 export function addSettingsListener<Path extends string>(path: Path, onUpdate: (newValue: Path extends "" ? any : ResolvePropDeep<Settings, Path>, path: Path extends "" ? string : Path) => void): void;
 export function addSettingsListener(path: string, onUpdate: (newValue: any, path: string) => void) {
-    if (path)
+    (onUpdate as SubscriptionCallback)._path = path;
        ((onUpdate as SubscriptionCallback)._paths ??= []).push(path);
    subscriptions.add(onUpdate);
 }
--- a/src/api/SettingsStore.ts
+++ b/src/api/SettingsStore.ts
@ -0,0 +1,69 @@
 /*
 * 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 { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
 import { findModuleId, wreq } from "@webpack";
 import { Settings } from "./Settings";
 interface Setting<T> {
    /**
     * Get the setting value
     */
    getSetting(): T;
    /**
     * Update the setting value
     * @param value The new value
     */
    updateSetting(value: T | ((old: T) => T)): Promise<void>;
    /**
     * React hook for automatically updating components when the setting is updated
     */
    useSetting(): T;
    settingsStoreApiGroup: string;
    settingsStoreApiName: string;
 }
 const SettingsStores: Array<Setting<any>> | undefined = proxyLazy(() => {
    const modId = findModuleId('"textAndImages","renderSpoilers"');
    if (modId == null) return new Logger("SettingsStoreAPI").error("Didn't find stores module.");
    const mod = wreq(modId);
    if (mod == null) return;
    return Object.values(mod).filter((s: any) => s?.settingsStoreApiGroup) as any;
 });
 /**
 * Get the store for a setting
 * @param group The setting group
 * @param name The name of the setting
 */
 export function getSettingStore<T = any>(group: string, name: string): Setting<T> | undefined {
    if (!Settings.plugins.SettingsStoreAPI.enabled) throw new Error("Cannot use SettingsStoreAPI without setting as dependency.");
    return SettingsStores?.find(s => s?.settingsStoreApiGroup === group && s?.settingsStoreApiName === name);
 }
 /**
 * getSettingStore but lazy
 */
 export function getSettingStoreLazy<T = any>(group: string, name: string) {
    return proxyLazy(() => getSettingStore<T>(group, name));
 }
--- a/src/api/Styles.ts
+++ b/src/api/Styles.ts
@ -141,7 +141,7 @@ export const compileStyle = (style: Style) => {
 */
 export const classNameToSelector = (name: string, prefix = "") => name.split(" ").map(n => `.${prefix}${n}`).join("");
-type ClassNameFactoryArg = string | string[] | Record<string, unknown> | false | null | undefined | 0 | "";
+type ClassNameFactoryArg = string | string[] | Record<string, unknown>;
 /**
 * @param prefix The prefix to add to each class, defaults to `""`
 * @returns A classname generator function
@ -154,9 +154,9 @@ type ClassNameFactoryArg = string | string[] | Record<string, unknown> | false |
 export const classNameFactory = (prefix: string = "") => (...args: ClassNameFactoryArg[]) => {
    const classNames = new Set<string>();
    for (const arg of args) {
-        if (arg && typeof arg === "string") classNames.add(arg);
+        if (typeof arg === "string") classNames.add(arg);
        else if (Array.isArray(arg)) arg.forEach(name => classNames.add(name));
-        else if (arg && typeof arg === "object") Object.entries(arg).forEach(([name, value]) => value && classNames.add(name));
+        else if (typeof arg === "object") Object.entries(arg).forEach(([name, value]) => value && classNames.add(name));
    }
    return Array.from(classNames, name => prefix + name).join(" ");
 };
--- a/src/api/index.ts
+++ b/src/api/index.ts
@ -18,6 +18,7 @@
 import * as $Badges from "./Badges";
 import * as $Commands from "./Commands";
 import * as $ComponentUpdater from "./ComponentUpdater";
 import * as $ContextMenu from "./ContextMenu";
 import * as $DataStore from "./DataStore";
 import * as $MemberListDecorators from "./MemberListDecorators";
@ -29,6 +30,7 @@ import * as $Notices from "./Notices";
 import * as $Notifications from "./Notifications";
 import * as $ServerList from "./ServerList";
 import * as $Settings from "./Settings";
 import * as $SettingsStore from "./SettingsStore";
 import * as $Styles from "./Styles";
 /**
@ -90,6 +92,10 @@ export const MemberListDecorators = $MemberListDecorators;
 * An API allowing you to persist data
 */
 export const Settings = $Settings;
 /**
 * An API allowing you to read, manipulate and automatically update components based on Discord settings
 */
 export const SettingsStore = $SettingsStore;
 /**
 * An API allowing you to dynamically load styles
 * a
@ -104,3 +110,8 @@ export const Notifications = $Notifications;
 * An api allowing you to patch and add/remove items to/from context menus
 */
 export const ContextMenu = $ContextMenu;
 /**
 * An api allowing you to update/rerender components
 */
 export const ComponentUpdater = $ComponentUpdater;
--- a/src/components/CodeBlock.tsx
+++ b/src/components/CodeBlock.tsx
@ -1,21 +0,0 @@
 /*
 * Vencord, a Discord client mod
 * Copyright (c) 2023 Vendicated and contributors
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 import { findByPropsLazy } from "@webpack";
 import { Parser } from "@webpack/common";
 const CodeContainerClasses = findByPropsLazy("markup", "codeContainer");
 /**
 * Renders code in a Discord codeblock
 */
 export function CodeBlock(props: { content?: string, lang: string; }) {
    return (
        <div className={CodeContainerClasses.markup}>
            {Parser.defaultRules.codeBlock.react(props, null, {})}
        </div>
    );
 }
--- 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?: string | number;
+    height?: number;
-    width?: string | number;
+    width?: 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"
-                fillRule="nonzero"
+                fill-rule="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,13 +121,9 @@ export function InfoIcon(props: IconProps) {
        <Icon
            {...props}
            className={classes(props.className, "vc-info-icon")}
-            viewBox="0 0 24 24"
+            viewBox="0 0 12 12"
        >
-            <path
+            <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" />
                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>
    );
 }
@ -143,8 +139,8 @@ export function OwnerCrownIcon(props: IconProps) {
        >
            <path
                fill="currentColor"
-                fillRule="evenodd"
+                fill-rule="evenodd"
-                clipRule="evenodd"
+                clip-rule="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>
@ -163,6 +159,8 @@ 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>
@ -192,66 +190,3 @@ export function ImageInvisible(props: IconProps) {
        </Icon>
    );
 }
 export function Microphone(props: IconProps) {
    return (
        <Icon
            {...props}
            className={classes(props.className, "vc-microphone")}
            viewBox="0 0 24 24"
        >
            <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>
    );
 }
 export function DeleteIcon(props: IconProps) {
    return (
        <Icon
            {...props}
            className={classes(props.className, "vc-delete-icon")}
            viewBox="0 0 24 24"
        >
            <path
                fill="currentColor"
                d="M15 3.999V2H9V3.999H3V5.999H21V3.999H15Z"
            />
            <path
                fill="currentColor"
                d="M5 6.99902V18.999C5 20.101 5.897 20.999 7 20.999H17C18.103 20.999 19 20.101 19 18.999V6.99902H5ZM11 17H9V11H11V17ZM15 17H13V11H15V17Z"
            />
        </Icon>
    );
 }
--- a/src/components/PluginSettings/ContributorModal.tsx
+++ b/src/components/PluginSettings/ContributorModal.tsx
@ -1,113 +0,0 @@
 /*
 * Vencord, a Discord client mod
 * Copyright (c) 2023 Vendicated and contributors
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 import "./contributorModal.css";
 import { useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { DevsById } from "@utils/constants";
 import { fetchUserProfile, getTheme, Theme } from "@utils/discord";
 import { ModalContent, ModalRoot, openModal } from "@utils/modal";
 import { Forms, MaskedLink, showToast, useEffect, useMemo, UserProfileStore, useStateFromStores } from "@webpack/common";
 import { User } from "discord-types/general";
 import Plugins from "~plugins";
 import { PluginCard } from ".";
 const WebsiteIconDark = "/assets/e1e96d89e192de1997f73730db26e94f.svg";
 const WebsiteIconLight = "/assets/730f58bcfd5a57a5e22460c445a0c6cf.svg";
 const GithubIconLight = "/assets/3ff98ad75ac94fa883af5ed62d17c459.svg";
 const GithubIconDark = "/assets/6a853b4c87fce386cbfef4a2efbacb09.svg";
 const cl = classNameFactory("vc-author-modal-");
 export function openContributorModal(user: User) {
    openModal(modalProps =>
        <ModalRoot {...modalProps}>
            <ErrorBoundary>
                <ModalContent className={cl("root")}>
                    <ContributorModal user={user} />
                </ModalContent>
            </ErrorBoundary>
        </ModalRoot>
    );
 }
 function GithubIcon() {
    const src = getTheme() === Theme.Light ? GithubIconLight : GithubIconDark;
    return <img src={src} alt="GitHub" />;
 }
 function WebsiteIcon() {
    const src = getTheme() === Theme.Light ? WebsiteIconLight : WebsiteIconDark;
    return <img src={src} alt="Website" />;
 }
 function ContributorModal({ user }: { user: User; }) {
    useSettings();
    const profile = useStateFromStores([UserProfileStore], () => UserProfileStore.getUserProfile(user.id));
    useEffect(() => {
        if (!profile && !user.bot && user.id)
            fetchUserProfile(user.id);
    }, [user.id]);
    const githubName = profile?.connectedAccounts?.find(a => a.type === "github")?.name;
    const website = profile?.connectedAccounts?.find(a => a.type === "domain")?.name;
    const plugins = useMemo(() => {
        const allPlugins = Object.values(Plugins);
        const pluginsByAuthor = DevsById[user.id]
            ? allPlugins.filter(p => p.authors.includes(DevsById[user.id]))
            : allPlugins.filter(p => p.authors.some(a => a.name === user.username));
        return pluginsByAuthor
            .filter(p => !p.name.endsWith("API"))
            .sort((a, b) => Number(a.required ?? false) - Number(b.required ?? false));
    }, [user.id, user.username]);
    return (
        <>
            <div className={cl("header")}>
                <img
                    className={cl("avatar")}
                    src={user.getAvatarURL(void 0, 512, true)}
                    alt=""
                />
                <Forms.FormTitle tag="h2" className={cl("name")}>{user.username}</Forms.FormTitle>
                <div className={cl("links")}>
                    {website && (
                        <MaskedLink
                            href={"https://" + website}
                        >
                            <WebsiteIcon />
                        </MaskedLink>
                    )}
                    {githubName && (
                        <MaskedLink href={`https://github.com/${githubName}`}>
                            <GithubIcon />
                        </MaskedLink>
                    )}
                </div>
            </div>
            <div className={cl("plugins")}>
                {plugins.map(p =>
                    <PluginCard
                        key={p.name}
                        plugin={p}
                        disabled={p.required ?? false}
                        onRestartNeeded={() => showToast("Restart to apply changes!")}
                    />
                )}
            </div>
        </>
    );
 }
--- a/src/components/PluginSettings/PluginModal.tsx
+++ b/src/components/PluginSettings/PluginModal.tsx
@ -18,16 +18,17 @@
 import { generateId } from "@api/Commands";
 import { useSettings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { proxyLazy } from "@utils/lazy";
 import { Margins } from "@utils/margins";
-import { classes, isObjectEmpty } from "@utils/misc";
+import { classes } from "@utils/misc";
 import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
 import { LazyComponent } from "@utils/react";
 import { OptionType, Plugin } from "@utils/types";
 import { findByCode, findByPropsLazy } from "@webpack";
-import { Button, Clickable, FluxDispatcher, Forms, React, Text, Tooltip, UserStore, UserUtils } from "@webpack/common";
+import { Button, FluxDispatcher, Forms, React, Text, Tooltip, UserStore, UserUtils } from "@webpack/common";
 import { User } from "discord-types/general";
 import { Constructor } from "type-fest";
@ -40,7 +41,7 @@ import {
    SettingSliderComponent,
    SettingTextComponent
 } from "./components";
-import { openContributorModal } from "./ContributorModal";
+import hideBotTagStyle from "./userPopoutHideBotTag.css?managed";
 const UserSummaryItem = LazyComponent(() => findByCode("defaultRenderUser", "showDefaultAvatarsForNullUsers"));
 const AvatarStyles = findByPropsLazy("moreUsers", "emptyUser", "avatarContainer", "clickableAvatar");
@ -88,19 +89,30 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
    const canSubmit = () => Object.values(errors).every(e => !e);
-    const hasSettings = Boolean(pluginSettings && plugin.options && !isObjectEmpty(plugin.options));
+    const hasSettings = Boolean(pluginSettings && plugin.options);
    React.useEffect(() => {
        enableStyle(hideBotTagStyle);
        let originalUser: User;
        (async () => {
            for (const user of plugin.authors.slice(0, 6)) {
                const author = user.id
-                    ? await UserUtils.getUser(`${user.id}`)
+                    ? await UserUtils.fetchUser(`${user.id}`)
                        // only show name & pfp and no actions so users cannot harass plugin devs for support (send dms, add as friend, etc)
                        .then(u => (originalUser = u, makeDummyUser(u)))
                        .catch(() => makeDummyUser({ username: user.name }))
                    : makeDummyUser({ username: user.name });
                setAuthors(a => [...a, author]);
            }
        })();
        return () => {
            disableStyle(hideBotTagStyle);
            if (originalUser)
                FluxDispatcher.dispatch({ type: "USER_UPDATE", user: originalUser });
        };
    }, []);
    async function saveAndClose() {
@ -202,19 +214,6 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                            showDefaultAvatarsForNullUsers
                            showUserPopout
                            renderMoreUsers={renderMoreUsers}
                            renderUser={(user: User) => (
                                <Clickable
                                    className={AvatarStyles.clickableAvatar}
                                    onClick={() => openContributorModal(user)}
                                >
                                    <img
                                        className={AvatarStyles.avatar}
                                        src={user.getAvatarURL(void 0, 80, true)}
                                        alt={user.username}
                                        title={user.username}
                                    />
                                </Clickable>
                            )}
                        />
                    </div>
                </Forms.FormSection>
@ -227,7 +226,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                        </Forms.FormSection>
                    </div>
                )}
-                <Forms.FormSection className={Margins.bottom16}>
+                <Forms.FormSection>
                    <Forms.FormTitle tag="h3">Settings</Forms.FormTitle>
                    {renderSettings()}
                </Forms.FormSection>
@ -238,7 +237,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                        <Button
                            onClick={onClose}
                            size={Button.Sizes.SMALL}
-                            color={Button.Colors.PRIMARY}
+                            color={Button.Colors.WHITE}
                            look={Button.Looks.LINK}
                        >
                            Cancel
--- a/src/components/PluginSettings/components/SettingBooleanComponent.tsx
+++ b/src/components/PluginSettings/components/SettingBooleanComponent.tsx
@ -16,9 +16,8 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import { wordsFromCamel, wordsToTitle } from "@utils/text";
 import { PluginOptionBoolean } from "@utils/types";
-import { Forms, React, Switch } from "@webpack/common";
+import { Forms, React, Select } from "@webpack/common";
 import { ISettingElementProps } from ".";
@ -32,6 +31,11 @@ export function SettingBooleanComponent({ option, pluginSettings, definedSetting
        onError(error !== null);
    }, [error]);
    const options = [
        { label: "Enabled", value: true, default: def === true },
        { label: "Disabled", value: false, default: typeof def === "undefined" || def === false },
    ];
    function handleChange(newValue: boolean): void {
        const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
        if (typeof isValid === "string") setError(isValid);
@ -45,17 +49,18 @@ export function SettingBooleanComponent({ option, pluginSettings, definedSetting
    return (
        <Forms.FormSection>
-            <Switch
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
-                value={state}
+            <Select
-                onChange={handleChange}
+                isDisabled={option.disabled?.call(definedSettings) ?? false}
-                note={option.description}
+                options={options}
-                disabled={option.disabled?.call(definedSettings) ?? false}
+                placeholder={option.placeholder ?? "Select an option"}
                maxVisibleItems={5}
                closeOnSelect={true}
                select={handleChange}
                isSelected={v => v === state}
                serialize={v => String(v)}
                {...option.componentProps}
-                hideBorder
+            />
                style={{ marginBottom: "0.5em" }}
            >
                {wordsToTitle(wordsFromCamel(id))}
            </Switch>
            {error && <Forms.FormText style={{ color: "var(--text-danger)" }}>{error}</Forms.FormText>}
        </Forms.FormSection>
    );
--- a/src/components/PluginSettings/components/SettingTextComponent.tsx
+++ b/src/components/PluginSettings/components/SettingTextComponent.tsx
@ -33,11 +33,12 @@ export function SettingTextComponent({ option, pluginSettings, definedSettings,
        const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
        if (typeof isValid === "string") setError(isValid);
        else if (!isValid) setError("Invalid input provided.");
-        else setError(null);
+        else {
-
+            setError(null);
            setState(newValue);
            onChange(newValue);
        }
    }
    return (
        <Forms.FormSection>
--- a/src/components/PluginSettings/contributorModal.css
+++ b/src/components/PluginSettings/contributorModal.css
@ -1,58 +0,0 @@
 .vc-author-modal-root {
    padding: 1em;
 }
 .vc-author-modal-header {
    display: flex;
    align-items: center;
    margin-bottom: 1em;
 }
 .vc-author-modal-name {
    text-transform: none;
    flex-grow: 0;
    background: var(--background-tertiary);
    border-radius: 0 9999px 9999px 0;
    padding: 6px 0.8em 6px 0.5em;
    font-size: 20px;
    height: 20px;
    position: relative;
    text-wrap: nowrap;
 }
 .vc-author-modal-name::before {
    content: "";
    display: block;
    position: absolute;
    height: 100%;
    width: 16px;
    background: var(--background-tertiary);
    z-index: -1;
    left: -16px;
    top: 0;
 }
 .vc-author-modal-avatar {
    height: 32px;
    width: 32px;
    border-radius: 50%;
 }
 .vc-author-modal-links {
    margin-left: auto;
    display: flex;
    gap: 0.2em;
 }
 .vc-author-modal-links img {
    height: 32px;
    width: 32px;
    border-radius: 50%;
    border: 4px solid var(--background-tertiary);
    box-sizing: border-box
 }
 .vc-author-modal-plugins {
    display: grid;
    gap: 0.5em;
 }
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@ -22,19 +22,20 @@ 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 { Flex } from "@components/Flex";
 import { Badge } from "@components/PluginSettings/components";
 import PluginModal from "@components/PluginSettings/PluginModal";
-import { AddonCard } from "@components/VencordSettings/AddonCard";
+import { Switch } from "@components/Switch";
 import { SettingsTab } from "@components/VencordSettings/shared";
 import { ChangeList } from "@utils/ChangeList";
 import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
-import { classes, isObjectEmpty } from "@utils/misc";
+import { classes } from "@utils/misc";
 import { openModalLazy } from "@utils/modal";
-import { useAwaiter } from "@utils/react";
+import { LazyComponent, useAwaiter } from "@utils/react";
 import { Plugin } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByCode, findByPropsLazy } from "@webpack";
-import { Alerts, Button, Card, Forms, lodash, Parser, React, Select, Text, TextInput, Toasts, Tooltip } from "@webpack/common";
+import { Alerts, Button, Card, Forms, Parser, React, Select, Text, TextInput, Toasts, Tooltip } from "@webpack/common";
 import Plugins from "~plugins";
@ -47,6 +48,8 @@ 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({
@ -90,7 +93,7 @@ interface PluginCardProps extends React.HTMLProps<HTMLDivElement> {
    isNew?: boolean;
 }
-export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLeave, isNew }: PluginCardProps) {
+function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLeave, isNew }: PluginCardProps) {
    const settings = Settings.plugins[plugin.name];
    const isEnabled = () => settings.enabled ?? false;
@ -149,31 +152,31 @@ export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, on
    }
    return (
-        <AddonCard
+        <Flex className={cl("card", { "card-disabled": disabled })} flexDirection="column" onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave}>
-            name={plugin.name}
+            <div className={cl("card-header")}>
-            description={plugin.description}
+                <Text variant="text-md/bold" className={cl("name")}>
-            isNew={isNew}
+                    {plugin.name}{isNew && <Badge text="NEW" color="#ED4245" />}
-            enabled={isEnabled()}
+                </Text>
            setEnabled={toggleEnabled}
            disabled={disabled}
            onMouseEnter={onMouseEnter}
            onMouseLeave={onMouseLeave}
            infoButton={
                <button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
-                    {plugin.options && !isObjectEmpty(plugin.options)
+                    {plugin.options
                        ? <CogWheel />
-                        : <InfoIcon />}
+                        : <InfoIcon width="24" height="24" />}
                </button>
-            }
+                <Switch
                    checked={isEnabled()}
                    onChange={toggleEnabled}
                    disabled={disabled}
                />
            </div>
            <Text className={cl("note")} variant="text-sm/normal">{plugin.description}</Text>
        </Flex >
    );
 }
 const enum SearchStatus {
    ALL,
    ENABLED,
-    DISABLED,
+    DISABLED
    NEW
 }
 export default function PluginSettings() {
@ -226,7 +229,6 @@ export default function PluginSettings() {
        const enabled = settings.plugins[plugin.name]?.enabled;
        if (enabled && searchValue.status === SearchStatus.DISABLED) return false;
        if (!enabled && searchValue.status === SearchStatus.ENABLED) return false;
        if (searchValue.status === SearchStatus.NEW && !newPlugins?.includes(plugin.name)) return false;
        if (!searchValue.value.length) return true;
        const v = searchValue.value.toLowerCase();
@ -251,7 +253,7 @@ export default function PluginSettings() {
        }
        DataStore.set("Vencord_existingPlugins", existingTimestamps);
-        return lodash.isEqual(newPlugins, sortedPluginNames) ? [] : newPlugins;
+        return window._.isEqual(newPlugins, sortedPluginNames) ? [] : newPlugins;
    }));
    type P = JSX.Element | JSX.Element[];
@ -319,8 +321,7 @@ export default function PluginSettings() {
                        options={[
                            { label: "Show All", value: SearchStatus.ALL, default: true },
                            { label: "Show Enabled", value: SearchStatus.ENABLED },
-                            { label: "Show Disabled", value: SearchStatus.DISABLED },
+                            { label: "Show Disabled", value: SearchStatus.DISABLED }
                            { label: "Show New", value: SearchStatus.NEW }
                        ]}
                        serialize={String}
                        select={onStatusChange}
--- a/src/components/PluginSettings/styles.css
+++ b/src/components/PluginSettings/styles.css
@ -23,6 +23,38 @@
    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
 }
 .vc-plugins-card {
    background-color: var(--background-secondary-alt);
    color: var(--interactive-active);
    border-radius: 8px;
    display: block;
    height: 100%;
    padding: 12px;
    width: 100%;
    transition: 0.1s ease-out;
    transition-property: box-shadow, transform, background, opacity;
 }
 .vc-plugins-card-disabled {
    opacity: 0.6;
 }
 .vc-plugins-card:hover {
    background-color: var(--background-tertiary);
    transform: translateY(-1px);
    box-shadow: var(--elevation-high);
 }
 .vc-plugins-card-header {
    margin-top: auto;
    display: flex;
    width: 100%;
    justify-content: flex-end;
    height: 1.5rem;
    align-items: center;
    gap: 8px;
 }
 .vc-plugins-info-button {
    height: 24px;
    width: 24px;
@ -54,6 +86,27 @@
    text-align: center;
 }
 .vc-plugins-note {
    height: 36px;
    overflow: hidden;
    text-overflow: ellipsis;
    display: -webkit-box;
    -webkit-line-clamp: 2;
    line-clamp: 2;
    -webkit-box-orient: vertical;
    /* stylelint-disable-next-line property-no-unknown */
    box-orient: vertical;
 }
 .vc-plugins-name {
    display: flex;
    width: 100%;
    align-items: center;
    flex-grow: 1;
    gap: 8px;
    cursor: "default";
 }
 .vc-plugins-dep-name {
    margin: 0 auto;
 }
--- a/src/components/PluginSettings/userPopoutHideBotTag.css
+++ b/src/components/PluginSettings/userPopoutHideBotTag.css
@ -0,0 +1,3 @@
 [class|="userPopoutOuter"] [class*="botTag"] {
    display: none;
 }
--- a/src/components/VencordSettings/AddonCard.tsx
+++ b/src/components/VencordSettings/AddonCard.tsx
@ -1,77 +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 "./addonCard.css";
 import { classNameFactory } from "@api/Styles";
 import { Badge } from "@components/Badge";
 import { Switch } from "@components/Switch";
 import { Text } from "@webpack/common";
 import type { MouseEventHandler, ReactNode } from "react";
 const cl = classNameFactory("vc-addon-");
 interface Props {
    name: ReactNode;
    description: ReactNode;
    enabled: boolean;
    setEnabled: (enabled: boolean) => void;
    disabled?: boolean;
    isNew?: boolean;
    onMouseEnter?: MouseEventHandler<HTMLDivElement>;
    onMouseLeave?: MouseEventHandler<HTMLDivElement>;
    infoButton?: ReactNode;
    footer?: ReactNode;
    author?: ReactNode;
 }
 export function AddonCard({ disabled, isNew, name, infoButton, footer, author, enabled, setEnabled, description, onMouseEnter, onMouseLeave }: Props) {
    return (
        <div
            className={cl("card", { "card-disabled": disabled })}
            onMouseEnter={onMouseEnter}
            onMouseLeave={onMouseLeave}
        >
            <div className={cl("header")}>
                <div className={cl("name-author")}>
                    <Text variant="text-md/bold" className={cl("name")}>
                        {name}{isNew && <Badge text="NEW" color="#ED4245" />}
                    </Text>
                    {!!author && (
                        <Text variant="text-md/normal" className={cl("author")}>
                            {author}
                        </Text>
                    )}
                </div>
                {infoButton}
                <Switch
                    checked={enabled}
                    onChange={setEnabled}
                    disabled={disabled}
                />
            </div>
            <Text className={cl("note")} variant="text-sm/normal">{description}</Text>
            {footer}
        </div>
    );
 }
--- a/src/components/VencordSettings/CloudTab.tsx
+++ b/src/components/VencordSettings/CloudTab.tsx
@ -86,7 +86,7 @@ function SettingsSyncSection() {
                <Button
                    size={Button.Sizes.SMALL}
                    disabled={!sectionEnabled}
-                    onClick={() => putCloudSettings(true)}
+                    onClick={() => putCloudSettings()}
                >Sync to Cloud</Button>
                <Tooltip text="This will overwrite your local settings with the ones on the cloud. Use wisely!">
                    {({ onMouseLeave, onMouseEnter }) => (
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@ -17,7 +17,6 @@
 */
 import { CheckedTextInput } from "@components/CheckedTextInput";
 import { CodeBlock } from "@components/CodeBlock";
 import { debounce } from "@utils/debounce";
 import { Margins } from "@utils/margins";
 import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
@ -300,7 +299,7 @@ function PatchHelper() {
            {!!(find && match && replacement) && (
                <>
                    <Forms.FormTitle className={Margins.top20}>Code</Forms.FormTitle>
-                    <CodeBlock lang="js" content={code} />
+                    <div style={{ userSelect: "text" }}>{Parser.parse(makeCodeblock(code, "ts"))}</div>
                    <Button onClick={() => Clipboard.copy(code)}>Copy to Clipboard</Button>
                </>
            )}
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@ -17,35 +17,16 @@
 */
 import { useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import { Flex } from "@components/Flex";
 import { DeleteIcon } from "@components/Icons";
 import { Link } from "@components/Link";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
-import { findByPropsLazy, findLazy } from "@webpack";
+import { findLazy } from "@webpack";
-import { Button, Card, FluxDispatcher, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
+import { Card, Forms, React, TextArea } from "@webpack/common";
 import { UserThemeHeader } from "main/themes";
 import type { ComponentType, Ref, SyntheticEvent } from "react";
 import { AddonCard } from "./AddonCard";
 import { SettingsTab, wrapTab } from "./shared";
 type FileInput = ComponentType<{
    ref: Ref<HTMLInputElement>;
    onChange: (e: SyntheticEvent<HTMLInputElement>) => void;
    multiple?: boolean;
    filters?: { name?: string; extensions: string[]; }[];
 }>;
 const InviteActions = findByPropsLazy("resolveInvite");
 const FileInput: FileInput = findLazy(m => m.prototype?.activateUploadDialogue && m.prototype.setRef);
 const TextAreaProps = findLazy(m => typeof m.textarea === "string");
 const cl = classNameFactory("vc-settings-theme-");
 function Validator({ link }: { link: string; }) {
    const [res, err, pending] = useAwaiter(() => fetch(link).then(res => {
        if (res.status > 300) throw `${res.status} ${res.statusText}`;
@ -94,191 +75,10 @@ function Validators({ themeLinks }: { themeLinks: string[]; }) {
    );
 }
 interface ThemeCardProps {
    theme: UserThemeHeader;
    enabled: boolean;
    onChange: (enabled: boolean) => void;
    onDelete: () => void;
 }
 function ThemeCard({ theme, enabled, onChange, onDelete }: ThemeCardProps) {
    return (
        <AddonCard
            name={theme.name}
            description={theme.description}
            author={theme.author}
            enabled={enabled}
            setEnabled={onChange}
            infoButton={
                IS_WEB && (
                    <div style={{ cursor: "pointer", color: "var(--status-danger" }} onClick={onDelete}>
                        <DeleteIcon />
                    </div>
                )
            }
            footer={
                <Flex flexDirection="row" style={{ gap: "0.2em" }}>
                    {!!theme.website && <Link href={theme.website}>Website</Link>}
                    {!!(theme.website && theme.invite) && " • "}
                    {!!theme.invite && (
                        <Link
                            href={`https://discord.gg/${theme.invite}`}
                            onClick={async e => {
                                e.preventDefault();
                                const { invite } = await InviteActions.resolveInvite(theme.invite, "Desktop Modal");
                                if (!invite) return showToast("Invalid or expired invite");
                                FluxDispatcher.dispatch({
                                    type: "INVITE_MODAL_OPEN",
                                    invite,
                                    code: theme.invite,
                                    context: "APP"
                                });
                            }}
                        >
                            Discord Server
                        </Link>
                    )}
                </Flex>
            }
        />
    );
 }
 enum ThemeTab {
    LOCAL,
    ONLINE
 }
 function ThemesTab() {
-    const settings = useSettings(["themeLinks", "enabledThemes"]);
+    const settings = useSettings(["themeLinks"]);
    const [themeText, setThemeText] = React.useState(settings.themeLinks.join("\n"));
    const fileInputRef = useRef<HTMLInputElement>(null);
    const [currentTab, setCurrentTab] = useState(ThemeTab.LOCAL);
    const [themeText, setThemeText] = useState(settings.themeLinks.join("\n"));
    const [userThemes, setUserThemes] = useState<UserThemeHeader[] | null>(null);
    const [themeDir, , themeDirPending] = useAwaiter(VencordNative.themes.getThemesDir);
    useEffect(() => {
        refreshLocalThemes();
    }, []);
    async function refreshLocalThemes() {
        const themes = await VencordNative.themes.getThemesList();
        setUserThemes(themes);
    }
    // When a local theme is enabled/disabled, update the settings
    function onLocalThemeChange(fileName: string, value: boolean) {
        if (value) {
            if (settings.enabledThemes.includes(fileName)) return;
            settings.enabledThemes = [...settings.enabledThemes, fileName];
        } else {
            settings.enabledThemes = settings.enabledThemes.filter(f => f !== fileName);
        }
    }
    async function onFileUpload(e: SyntheticEvent<HTMLInputElement>) {
        e.stopPropagation();
        e.preventDefault();
        if (!e.currentTarget?.files?.length) return;
        const { files } = e.currentTarget;
        const uploads = Array.from(files, file => {
            const { name } = file;
            if (!name.endsWith(".css")) return;
            return new Promise<void>((resolve, reject) => {
                const reader = new FileReader();
                reader.onload = () => {
                    VencordNative.themes.uploadTheme(name, reader.result as string)
                        .then(resolve)
                        .catch(reject);
                };
                reader.readAsText(file);
            });
        });
        await Promise.all(uploads);
        refreshLocalThemes();
    }
    function renderLocalThemes() {
        return (
            <>
                <Card className="vc-settings-card">
                    <Forms.FormTitle tag="h5">Find Themes:</Forms.FormTitle>
                    <div style={{ marginBottom: ".5em", display: "flex", flexDirection: "column" }}>
                        <Link style={{ marginRight: ".5em" }} href="https://betterdiscord.app/themes">
                            BetterDiscord Themes
                        </Link>
                        <Link href="https://github.com/search?q=discord+theme">GitHub</Link>
                    </div>
                    <Forms.FormText>If using the BD site, click on "Download" and place the downloaded .theme.css file into your themes folder.</Forms.FormText>
                </Card>
                <Forms.FormSection title="Local Themes">
                    <Card className="vc-settings-quick-actions-card">
                        <>
                            {IS_WEB ?
                                (
                                    <Button
                                        size={Button.Sizes.SMALL}
                                        disabled={themeDirPending}
                                    >
                                        Upload Theme
                                        <FileInput
                                            ref={fileInputRef}
                                            onChange={onFileUpload}
                                            multiple={true}
                                            filters={[{ extensions: ["css"] }]}
                                        />
                                    </Button>
                                ) : (
                                    <Button
                                        onClick={() => showItemInFolder(themeDir!)}
                                        size={Button.Sizes.SMALL}
                                        disabled={themeDirPending}
                                    >
                                        Open Themes Folder
                                    </Button>
                                )}
                            <Button
                                onClick={refreshLocalThemes}
                                size={Button.Sizes.SMALL}
                            >
                                Load missing Themes
                            </Button>
                            <Button
                                onClick={() => VencordNative.quickCss.openEditor()}
                                size={Button.Sizes.SMALL}
                            >
                                Edit QuickCSS
                            </Button>
                        </>
                    </Card>
                    <div className={cl("grid")}>
                        {userThemes?.map(theme => (
                            <ThemeCard
                                key={theme.fileName}
                                enabled={settings.enabledThemes.includes(theme.fileName)}
                                onChange={enabled => onLocalThemeChange(theme.fileName, enabled)}
                                onDelete={async () => {
                                    onLocalThemeChange(theme.fileName, false);
                                    await VencordNative.themes.deleteTheme(theme.fileName);
                                    refreshLocalThemes();
                                }}
                                theme={theme}
                            />
                        ))}
                    </div>
                </Forms.FormSection>
            </>
        );
    }
    // When the user leaves the online theme textbox, update the settings
    function onBlur() {
        settings.themeLinks = [...new Set(
            themeText
@ -289,56 +89,42 @@ function ThemesTab() {
        )];
    }
    function renderOnlineThemes() {
    return (
-            <>
+        <SettingsTab title="Themes">
            <Card className="vc-settings-card vc-text-selectable">
-                    <Forms.FormTitle tag="h5">Paste links to css files here</Forms.FormTitle>
+                <Forms.FormTitle tag="h5">Paste links to .theme.css files here</Forms.FormTitle>
                <Forms.FormText>One link per line</Forms.FormText>
-                    <Forms.FormText>Make sure to use direct links to files (raw or github.io)!</Forms.FormText>
+                <Forms.FormText><strong>Make sure to use the raw links or github.io links!</strong></Forms.FormText>
                <Forms.FormDivider className={Margins.top8 + " " + Margins.bottom8} />
                <Forms.FormTitle tag="h5">Find Themes:</Forms.FormTitle>
                <div style={{ marginBottom: ".5em" }}>
                    <Link style={{ marginRight: ".5em" }} href="https://betterdiscord.app/themes">
                        BetterDiscord Themes
                    </Link>
                    <Link href="https://github.com/search?q=discord+theme">GitHub</Link>
                </div>
                <Forms.FormText>If using the BD site, click on "Source" somewhere below the Download button</Forms.FormText>
                <Forms.FormText>In the GitHub repository of your theme, find X.theme.css, click on it, then click the "Raw" button</Forms.FormText>
                <Forms.FormText>
                    If the theme has configuration that requires you to edit the file:
                    <ul>
                        <li>• Make a <Link href="https://github.com/signup">GitHub</Link> account</li>
                        <li>• Click the fork button on the top right</li>
                        <li>• Edit the file</li>
                        <li>• Use the link to your own repository instead</li>
                    </ul>
                </Forms.FormText>
            </Card>
-
+            <Forms.FormTitle tag="h5">Themes</Forms.FormTitle>
                <Forms.FormSection title="Online Themes" tag="h5">
            <TextArea
                value={themeText}
                onChange={setThemeText}
-                        className={classes(TextAreaProps.textarea, "vc-settings-theme-links")}
+                className={`${TextAreaProps.textarea} vc-settings-theme-links`}
                placeholder="Theme Links"
                spellCheck={false}
                onBlur={onBlur}
                        rows={10}
            />
            <Validators themeLinks={settings.themeLinks} />
                </Forms.FormSection>
            </>
        );
    }
    return (
        <SettingsTab title="Themes">
            <TabBar
                type="top"
                look="brand"
                className="vc-settings-tab-bar"
                selectedItem={currentTab}
                onItemSelect={setCurrentTab}
            >
                <TabBar.Item
                    className="vc-settings-tab-bar-item"
                    id={ThemeTab.LOCAL}
                >
                    Local Themes
                </TabBar.Item>
                <TabBar.Item
                    className="vc-settings-tab-bar-item"
                    id={ThemeTab.ONLINE}
                >
                    Online Themes
                </TabBar.Item>
            </TabBar>
            {currentTab === ThemeTab.LOCAL && renderLocalThemes()}
            {currentTab === ThemeTab.ONLINE && renderOnlineThemes()}
        </SettingsTab>
    );
 }
--- a/src/components/VencordSettings/UpdaterTab.tsx
+++ b/src/components/VencordSettings/UpdaterTab.tsx
@ -46,7 +46,7 @@ function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>
                if (code === "ENOENT")
                    var err = `Command \`${path}\` not found.\nPlease install it and try again`;
                else {
-                    var err = `An error occurred while running \`${cmd}\`:\n`;
+                    var err = `An error occured while running \`${cmd}\`:\n`;
                    err += stderr || `Code \`${code}\`. See the console for more info`;
                }
@ -249,4 +249,4 @@ function Updater() {
    );
 }
-export default IS_UPDATER_DISABLED ? null : wrapTab(Updater, "Updater");
+export default IS_WEB ? null : wrapTab(Updater, "Updater");
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@ -16,6 +16,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import { openNotificationLogModal } from "@api/Notifications/notificationLog";
 import { Settings, useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
@ -257,11 +258,7 @@ function DonateCard({ image }: DonateCardProps) {
                src={image}
                alt=""
                height={128}
-                style={{
+                style={{ marginLeft: "auto", transform: image === DEFAULT_DONATE_IMAGE ? "rotate(10deg)" : "" }}
                    imageRendering: image === SHIGGY_DONATE_IMAGE ? "pixelated" : void 0,
                    marginLeft: "auto",
                    transform: image === DEFAULT_DONATE_IMAGE ? "rotate(10deg)" : void 0
                }}
            />
        </Card>
    );
--- a/src/components/VencordSettings/addonCard.css
+++ b/src/components/VencordSettings/addonCard.css
@ -1,64 +0,0 @@
 .vc-addon-card {
    background-color: var(--background-secondary-alt);
    color: var(--interactive-active);
    border-radius: 8px;
    display: block;
    height: 100%;
    padding: 12px;
    width: 100%;
    transition: 0.1s ease-out;
    transition-property: box-shadow, transform, background, opacity;
    box-sizing: border-box;
 }
 .vc-addon-card-disabled {
    opacity: 0.6;
 }
 .vc-addon-card:hover {
    background-color: var(--background-tertiary);
    transform: translateY(-1px);
    box-shadow: var(--elevation-high);
 }
 .vc-addon-header {
    margin-top: auto;
    display: flex;
    width: 100%;
    justify-content: flex-end;
    align-items: center;
    gap: 8px;
    margin-bottom: 0.5em;
 }
 .vc-addon-note {
    height: 36px;
    overflow: hidden;
    text-overflow: ellipsis;
    display: -webkit-box;
    -webkit-line-clamp: 2;
    line-clamp: 2;
    -webkit-box-orient: vertical;
    /* stylelint-disable-next-line property-no-unknown */
    box-orient: vertical;
 }
 .vc-addon-name-author {
    width: 100%;
 }
 .vc-addon-name {
    display: flex;
    width: 100%;
    align-items: center;
    flex-grow: 1;
    gap: 8px;
 }
 .vc-addon-author {
    font-size: 0.8em;
 }
 .vc-addon-author::before {
    content: "by ";
 }
--- a/src/components/VencordSettings/settingsStyles.css
+++ b/src/components/VencordSettings/settingsStyles.css
@ -1,6 +1,6 @@
 .vc-settings-tab-bar {
    margin-top: 20px;
-    margin-bottom: 10px;
+    margin-bottom: -2px;
    border-bottom: 2px solid var(--background-modifier-accent);
 }
@ -43,7 +43,6 @@
    color: var(--text-normal) !important;
    padding: 0.5em;
    border: 1px solid var(--background-modifier-accent);
    max-height: unset;
 }
 .vc-cloud-settings-sync-grid {
--- a/src/components/VencordSettings/shared.tsx
+++ b/src/components/VencordSettings/shared.tsx
@ -17,7 +17,6 @@
 */
 import "./settingsStyles.css";
 import "./themesStyles.css";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { handleComponentFailed } from "@components/handleComponentFailed";
--- a/src/components/VencordSettings/themesStyles.css
+++ b/src/components/VencordSettings/themesStyles.css
@ -1,29 +0,0 @@
 .vc-settings-theme-grid {
    display: grid;
    grid-gap: 16px;
    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
 }
 .vc-settings-theme-card {
    display: flex;
    flex-direction: column;
    background-color: var(--background-secondary-alt);
    color: var(--interactive-active);
    border-radius: 8px;
    padding: 1em;
    width: 100%;
    transition: 0.1s ease-out;
    transition-property: box-shadow, transform, background, opacity;
 }
 .vc-settings-theme-card-text {
    text-overflow: ellipsis;
    height: 1.2em;
    margin-bottom: 2px;
    white-space: nowrap;
    overflow: hidden;
 }
 .vc-settings-theme-author::before {
    content: "by ";
 }
--- a/src/components/monacoWin.html
+++ b/src/components/monacoWin.html
@ -5,8 +5,8 @@
        <title>Vencord QuickCSS Editor</title>
        <link
            rel="stylesheet"
-            href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.40.0/min/vs/editor/editor.main.min.css"
+            href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/editor/editor.main.min.css"
-            integrity="sha512-MOoQ02h80hklccfLrXFYkCzG+WVjORflOp9Zp8dltiaRP+35LYnO4LKOklR64oMGfGgJDLO8WJpkM1o5gZXYZQ=="
+            integrity="sha512-wB3xfL98hWg1bpkVYSyL0js/Jx9s7FsDg9aYO6nOMSJTgPuk/PFqxXQJKKSUjteZjeYrfgo9NFBOA1r9HwDuZw=="
            crossorigin="anonymous"
            referrerpolicy="no-referrer"
        />
@ -29,8 +29,8 @@
    <body>
        <div id="container"></div>
        <script
-            src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.40.0/min/vs/loader.min.js"
+            src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/loader.min.js"
-            integrity="sha512-QzMpXeCPciAHP4wbYlV2PYgrQcaEkDQUjzkPU4xnjyVSD9T36/udamxtNBqb4qK4/bMQMPZ8ayrBe9hrGdBFjQ=="
+            integrity="sha512-A+6SvPGkIN9Rf0mUXmW4xh7rDvALXf/f0VtOUiHlDUSPknu2kcfz1KzLpOJyL2pO+nZS13hhIjLqVgiQExLJrw=="
            crossorigin="anonymous"
            referrerpolicy="no-referrer"
        ></script>
@ -38,7 +38,7 @@
        <script>
            require.config({
                paths: {
-                    vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.40.0/min/vs",
+                    vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs",
                },
            });
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@ -33,12 +33,10 @@ 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;
    export var IS_DISCORD_DESKTOP: boolean;
-    export var IS_VESKTOP: boolean;
+    export var IS_VENCORD_DESKTOP: boolean;
    export var VERSION: string;
    export var BUILD_TIMESTAMP: number;
@ -60,8 +58,8 @@ declare global {
     * If you really must use it, mark your plugin as Desktop App only by naming it Foo.desktop.ts(x)
     */
    export var DiscordNative: any;
-    export var Vesktop: any;
+    export var VencordDesktop: any;
-    export var VesktopNative: any;
+    export var VencordDesktopNative: any;
    interface Window {
        webpackChunkdiscord_app: {
--- a/src/main/index.ts
+++ b/src/main/index.ts
@ -19,32 +19,21 @@
 import { app, protocol, session } from "electron";
 import { join } from "path";
-import { ensureSafePath, getSettings } from "./ipcMain";
+import { getSettings } from "./ipcMain";
-import { IS_VANILLA, THEMES_DIR } from "./utils/constants";
+import { IS_VANILLA } from "./utils/constants";
 import { installExt } from "./utils/extensions";
-if (IS_VESKTOP || !IS_VANILLA) {
+if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
    app.whenReady().then(() => {
        // Source Maps! Maybe there's a better way but since the renderer is executed
        // from a string I don't think any other form of sourcemaps would work
        protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
            let url = unsafeUrl.slice("vencord://".length);
            if (url.endsWith("/")) url = url.slice(0, -1);
            if (url.startsWith("/themes/")) {
                const theme = url.slice("/themes/".length);
                const safeUrl = ensureSafePath(THEMES_DIR, theme);
                if (!safeUrl) {
                    cb({ statusCode: 403 });
                    return;
                }
                cb(safeUrl.replace(/\?v=\d+$/, ""));
                return;
            }
            switch (url) {
                case "renderer.js.map":
                case "vencordDesktopRenderer.js.map":
                case "preload.js.map":
                case "vencordDesktopPreload.js.map":
                case "patcher.js.map":
                case "vencordDesktopMain.js.map":
                    cb(join(__dirname, url));
@ -62,10 +51,6 @@ if (IS_VESKTOP || !IS_VANILLA) {
        } catch { }
        const findHeader = (headers: Record<string, string[]>, headerName: Lowercase<string>) => {
            return Object.keys(headers).find(h => h.toLowerCase() === headerName);
        };
        // Remove CSP
        type PolicyResult = Record<string, string[]>;
@ -77,7 +62,6 @@ if (IS_VESKTOP || !IS_VANILLA) {
                    result[directiveKey] = directiveValue;
                }
            });
            return result;
        };
        const stringifyPolicy = (policy: PolicyResult): string =>
@ -86,39 +70,31 @@ if (IS_VESKTOP || !IS_VANILLA) {
                .map(directive => directive.flat().join(" "))
                .join("; ");
-        const patchCsp = (headers: Record<string, string[]>) => {
+        function patchCsp(headers: Record<string, string[]>, header: string) {
-            const header = findHeader(headers, "content-security-policy");
+            if (header in headers) {
            if (header) {
                const csp = parsePolicy(headers[header][0]);
                for (const directive of ["style-src", "connect-src", "img-src", "font-src", "media-src", "worker-src"]) {
-                    csp[directive] ??= [];
+                    csp[directive] = ["*", "blob:", "data:", "'unsafe-inline'"];
                    csp[directive].push("*", "blob:", "data:", "vencord:", "'unsafe-inline'");
                }
                // TODO: Restrict this to only imported packages with fixed version.
                // Perhaps auto generate with esbuild
                csp["script-src"] ??= [];
                csp["script-src"].push("'unsafe-eval'", "https://unpkg.com", "https://cdnjs.cloudflare.com");
                headers[header] = [stringifyPolicy(csp)];
            }
-        };
+        }
        session.defaultSession.webRequest.onHeadersReceived(({ responseHeaders, resourceType }, cb) => {
            if (responseHeaders) {
                if (resourceType === "mainFrame")
-                    patchCsp(responseHeaders);
+                    patchCsp(responseHeaders, "content-security-policy");
                // Fix hosts that don't properly set the css content type, such as
                // raw.githubusercontent.com
-                if (resourceType === "stylesheet") {
+                if (resourceType === "stylesheet")
-                    const header = findHeader(responseHeaders, "content-type");
+                    responseHeaders["content-type"] = ["text/css"];
                    if (header)
                        responseHeaders[header] = ["text/css"];
            }
            }
            cb({ cancel: false, responseHeaders });
        });
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@ -17,60 +17,25 @@
 */
 import "./updater";
 import "./ipcPlugins";
 import { debounce } from "@utils/debounce";
 import { IpcEvents } from "@utils/IpcEvents";
 import { Queue } from "@utils/Queue";
-import { BrowserWindow, ipcMain, shell, systemPreferences } from "electron";
+import { BrowserWindow, ipcMain, shell } from "electron";
 import { mkdirSync, readFileSync, watch } from "fs";
-import { open, readdir, readFile, writeFile } from "fs/promises";
+import { open, readFile, writeFile } from "fs/promises";
-import { join, normalize } from "path";
+import { join } from "path";
-import monacoHtml from "~fileContent/monacoWin.html;base64";
+import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
-import { getThemeInfo, stripBOM, UserThemeHeader } from "./themes";
+import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./utils/constants";
 import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE, THEMES_DIR } from "./utils/constants";
 import { makeLinksOpenExternally } from "./utils/externalLinks";
 mkdirSync(SETTINGS_DIR, { recursive: true });
 mkdirSync(THEMES_DIR, { recursive: true });
 export function ensureSafePath(basePath: string, path: string) {
    const normalizedBasePath = normalize(basePath);
    const newPath = join(basePath, path);
    const normalizedPath = normalize(newPath);
    return normalizedPath.startsWith(normalizedBasePath) ? normalizedPath : null;
 }
 function readCss() {
    return readFile(QUICKCSS_PATH, "utf-8").catch(() => "");
 }
 async function listThemes(): Promise<UserThemeHeader[]> {
    const files = await readdir(THEMES_DIR).catch(() => []);
    const themeInfo: UserThemeHeader[] = [];
    for (const fileName of files) {
        if (!fileName.endsWith(".css")) continue;
        const data = await getThemeData(fileName).then(stripBOM).catch(() => null);
        if (data == null) continue;
        themeInfo.push(getThemeInfo(data, fileName));
    }
    return themeInfo;
 }
 function getThemeData(fileName: string) {
    fileName = fileName.replace(/\?v=\d+$/, "");
    const safePath = ensureSafePath(THEMES_DIR, fileName);
    if (!safePath) return Promise.reject(`Unsafe path ${fileName}`);
    return readFile(safePath, "utf-8");
 }
 export function readSettings() {
    try {
        return readFileSync(SETTINGS_FILE, "utf-8");
@ -109,14 +74,6 @@ ipcMain.handle(IpcEvents.SET_QUICK_CSS, (_, css) =>
    cssWriteQueue.push(() => writeFile(QUICKCSS_PATH, 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());
@ -132,10 +89,6 @@ export function initIpc(mainWindow: BrowserWindow) {
            mainWindow.webContents.postMessage(IpcEvents.QUICK_CSS_UPDATE, await readCss());
        }, 50));
    });
    watch(THEMES_DIR, { persistent: false }, debounce(() => {
        mainWindow.webContents.postMessage(IpcEvents.THEME_UPDATE, void 0);
    }));
 }
 ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {
@ -144,14 +97,11 @@ ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {
        autoHideMenuBar: true,
        darkTheme: true,
        webPreferences: {
-            preload: join(__dirname, IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js"),
+            preload: join(__dirname, "preload.js"),
            contextIsolation: true,
            nodeIntegration: false,
            sandbox: false
        }
    });
    makeLinksOpenExternally(win);
    await win.loadURL(`data:text/html;base64,${monacoHtml}`);
 });
--- a/src/main/ipcPlugins.ts
+++ b/src/main/ipcPlugins.ts
@ -1,42 +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 { IpcEvents } from "@utils/IpcEvents";
 import { ipcMain } from "electron";
 import PluginNatives from "~pluginNatives";
 const PluginIpcMappings = {} as Record<string, Record<string, string>>;
 export type PluginIpcMappings = typeof PluginIpcMappings;
 for (const [plugin, methods] of Object.entries(PluginNatives)) {
    const entries = Object.entries(methods);
    if (!entries.length) continue;
    const mappings = PluginIpcMappings[plugin] = {};
    for (const [methodName, method] of entries) {
        const key = `VencordPluginNative_${plugin}_${methodName}`;
        ipcMain.handle(key, method);
        mappings[methodName] = key;
    }
 }
 ipcMain.on(IpcEvents.GET_PLUGIN_IPC_METHOD_MAP, e => {
    e.returnValue = PluginIpcMappings;
 });
--- a/src/main/patchWin32Updater.ts
+++ b/src/main/patchWin32Updater.ts
@ -16,10 +16,22 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-import { app } from "electron";
+import { app, autoUpdater } from "electron";
-import { existsSync, mkdirSync, readdirSync, renameSync, statSync, writeFileSync } from "original-fs";
+import { existsSync, mkdirSync, readdirSync, renameSync, statSync, writeFileSync } from "fs";
 import { basename, dirname, join } from "path";
 const { setAppUserModelId } = app;
 // Apparently requiring Discords updater too early leads into issues,
 // copied this workaround from powerCord
 app.setAppUserModelId = function (id: string) {
    app.setAppUserModelId = setAppUserModelId;
    setAppUserModelId.call(this, id);
    patchUpdater();
 };
 function isNewer($new: string, old: string) {
    const newParts = $new.slice(4).split(".").map(Number);
    const oldParts = old.slice(4).split(".").map(Number);
@ -65,6 +77,23 @@ function patchLatest() {
    }
 }
-// Try to patch latest on before-quit
+// Windows Host Updates install to a new folder app-{HOST_VERSION}, so we
-// Discord's Win32 updater will call app.quit() on restart and open new version on will-quit
+// need to reinject
-app.on("before-quit", patchLatest);
+function patchUpdater() {
    try {
        const autoStartScript = join(require.main!.filename, "..", "autoStart", "win32.js");
        const { update } = require(autoStartScript);
        require.cache[autoStartScript]!.exports.update = function () {
            update.apply(this, arguments);
            patchLatest();
        };
    } catch {
        // OpenAsar uses electrons autoUpdater on Windows
        const { quitAndInstall } = autoUpdater;
        autoUpdater.quitAndInstall = function () {
            patchLatest();
            quitAndInstall.call(this);
        };
    }
 }
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@ -71,7 +71,7 @@ if (!IS_VANILLA) {
        constructor(options: BrowserWindowConstructorOptions) {
            if (options?.webPreferences?.preload && options.title) {
                const original = options.webPreferences.preload;
-                options.webPreferences.preload = join(__dirname, IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js");
+                options.webPreferences.preload = join(__dirname, "preload.js");
                options.webPreferences.sandbox = false;
                if (settings.frameless) {
                    options.frame = false;
--- a/src/main/themes/LICENSE
+++ b/src/main/themes/LICENSE
@ -1,177 +0,0 @@
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
   1. Definitions.
      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.
      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.
      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.
      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.
      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.
      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:
      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and
      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and
      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.
   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.
   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.
   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
--- a/src/main/themes/index.ts
+++ b/src/main/themes/index.ts
@ -1,81 +0,0 @@
 /* eslint-disable simple-header/header */
 /*!
 * BetterDiscord addon meta parser
 * Copyright 2023 BetterDiscord contributors
 * Copyright 2023 Vendicated and Vencord contributors
 *
 * 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.
 */
 const splitRegex = /[^\S\r\n]*?\r?(?:\r\n|\n)[^\S\r\n]*?\*[^\S\r\n]?/;
 const escapedAtRegex = /^\\@/;
 export interface UserThemeHeader {
    fileName: string;
    name: string;
    author: string;
    description: string;
    version?: string;
    license?: string;
    source?: string;
    website?: string;
    invite?: string;
 }
 function makeHeader(fileName: string, opts: Partial<UserThemeHeader> = {}): UserThemeHeader {
    return {
        fileName,
        name: opts.name ?? fileName.replace(/\.css$/i, ""),
        author: opts.author ?? "Unknown Author",
        description: opts.description ?? "A Discord Theme.",
        version: opts.version,
        license: opts.license,
        source: opts.source,
        website: opts.website,
        invite: opts.invite
    };
 }
 export function stripBOM(fileContent: string) {
    if (fileContent.charCodeAt(0) === 0xFEFF) {
        fileContent = fileContent.slice(1);
    }
    return fileContent;
 }
 export function getThemeInfo(css: string, fileName: string): UserThemeHeader {
    if (!css) return makeHeader(fileName);
    const block = css.split("/**", 2)?.[1]?.split("*/", 1)?.[0];
    if (!block) return makeHeader(fileName);
    const header: Partial<UserThemeHeader> = {};
    let field = "";
    let accum = "";
    for (const line of block.split(splitRegex)) {
        if (line.length === 0) continue;
        if (line.charAt(0) === "@" && line.charAt(1) !== " ") {
            header[field] = accum.trim();
            const l = line.indexOf(" ");
            field = line.substring(1, l);
            accum = line.substring(l + 1);
        }
        else {
            accum += " " + line.replace("\\n", "\n").replace(escapedAtRegex, "@");
        }
    }
    header[field] = accum.trim();
    delete header[""];
    return makeHeader(fileName, header);
 }
--- a/src/main/updater/common.ts
+++ b/src/main/updater/common.ts
@ -16,11 +16,12 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 export const VENCORD_FILES = [
    IS_DISCORD_DESKTOP ? "patcher.js" : "vencordDesktopMain.js",
-    IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js",
+    "preload.js",
    IS_DISCORD_DESKTOP ? "renderer.js" : "vencordDesktopRenderer.js",
-    IS_DISCORD_DESKTOP ? "renderer.css" : "vencordDesktopRenderer.css",
+    "renderer.css"
 ];
 export function serializeErrors(func: (...args: any[]) => any) {
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@ -49,9 +49,7 @@ async function getRepo() {
 async function calculateGitChanges() {
    await git("fetch");
-    const branch = await git("branch", "--show-current");
+    const res = await git("log", "HEAD...origin/main", "--pretty=format:%an/%h/%s");
    const res = await git("log", `HEAD...origin/${branch.stdout.trim()}`, "--pretty=format:%an/%h/%s");
    const commits = res.stdout.trim();
    return commits ? commits.split("\n").map(line => {
--- a/src/main/updater/index.ts
+++ b/src/main/updater/index.ts
@ -16,5 +16,4 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-if (!IS_UPDATER_DISABLED)
+import(IS_STANDALONE ? "./http" : "./git");
    import(IS_STANDALONE ? "./http" : "./git");
--- a/src/main/utils/constants.ts
+++ b/src/main/utils/constants.ts
@ -25,15 +25,13 @@ export const DATA_DIR = process.env.VENCORD_USER_DATA_DIR ?? (
        : join(app.getPath("userData"), "..", "Vencord")
 );
 export const SETTINGS_DIR = join(DATA_DIR, "settings");
 export const THEMES_DIR = join(DATA_DIR, "themes");
 export const QUICKCSS_PATH = join(SETTINGS_DIR, "quickCss.css");
 export const SETTINGS_FILE = join(SETTINGS_DIR, "settings.json");
 export const ALLOWED_PROTOCOLS = [
    "https:",
    "http:",
    "steam:",
-    "spotify:",
+    "spotify:"
    "com.epicgames.launcher:",
 ];
 export const IS_VANILLA = /* @__PURE__ */ process.argv.includes("--vanilla");
--- a/src/main/utils/crxToZip.ts
+++ b/src/main/utils/crxToZip.ts
@ -1,4 +1,4 @@
-/* eslint-disable simple-header/header */
+/* eslint-disable header/header */
 /*!
 * crxToZip
--- a/src/main/utils/externalLinks.ts
+++ b/src/main/utils/externalLinks.ts
@ -1,48 +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 { type BrowserWindow, shell } from "electron";
 export function makeLinksOpenExternally(win: BrowserWindow) {
    win.webContents.setWindowOpenHandler(({ url }) => {
        switch (url) {
            case "about:blank":
            case "https://discord.com/popout":
            case "https://ptb.discord.com/popout":
            case "https://canary.discord.com/popout":
                return { action: "allow" };
        }
        try {
            var { protocol } = new URL(url);
        } catch {
            return { action: "deny" };
        }
        switch (protocol) {
            case "http:":
            case "https:":
            case "mailto:":
            case "steam:":
            case "spotify:":
                shell.openExternal(url);
        }
        return { action: "deny" };
    });
 }
--- a/src/modules.d.ts
+++ b/src/modules.d.ts
@ -24,11 +24,6 @@ declare module "~plugins" {
    export default plugins;
 }
 declare module "~pluginNatives" {
    const pluginNatives: Record<string, Record<string, (event: Electron.IpcMainInvokeEvent, ...args: unknown[]) => unknown>>;
    export default pluginNatives;
 }
 declare module "~git-hash" {
    const hash: string;
    export default hash;
--- a/src/plugins/_api/badges.tsx
+++ b/src/plugins/_api/badges.tsx
@ -80,24 +80,22 @@ export default definePlugin({
            find: "Messages.PROFILE_USER_BADGES,role:",
            replacement: [
                {
-                    match: /&&(\i)\.push\(\{id:"premium".+?\}\);/,
+                    match: /(?<=(\i)\.isTryItOutFlow,)(.{0,300})null==\i\?void 0:(\i)\.getBadges\(\)/,
-                    replace: "$&$1.unshift(...Vencord.Api.Badges._getBadges(arguments[0]));",
+                    replace: (_, props, restCode, badgesMod) => `vencordProps=${props},${restCode}Vencord.Api.Badges._getBadges(vencordProps).concat(${badgesMod}?.getBadges()??[])`,
                },
                {
                    // alt: "", aria-hidden: false, src: originalSrc
-                    match: /alt:" ","aria-hidden":!0,src:(?=(\i)\.src)/,
+                    match: /alt:" ","aria-hidden":!0,src:(?=(\i)\.src)/g,
                    // ...badge.props, ..., src: badge.image ?? ...
                    replace: "...$1.props,$& $1.image??"
                },
                // replace their component with ours if applicable
                {
-                    match: /(?<=text:(\i)\.description,spacing:12,)children:/,
+                    match: /children:function(?<=(\i)\.(?:tooltip|description),spacing:\d.+?)/g,
-                    replace: "children:$1.component ? () => $self.renderBadgeComponent($1) :"
+                    replace: "children:$1.component ? () => $self.renderBadgeComponent($1) : function"
                },
                // conditionally override their onClick with badge.onClick if it exists
                {
-                    match: /href:(\i)\.link/,
+                    match: /onClick:function(?=.{0,200}href:(\i)\.link)/,
-                    replace: "...($1.onClick && { onClick: $1.onClick }),$&"
+                    replace: "onClick:$1.onClick??function"
                }
            ]
        }
--- a/src/plugins/_api/commands.ts
+++ b/src/plugins/_api/commands.ts
@ -26,7 +26,7 @@ export default definePlugin({
    patches: [
        // obtain BUILT_IN_COMMANDS instance
        {
-            find: ',"tenor"',
+            find: '"giphy","tenor"',
            replacement: [
                {
                    // Matches BUILT_IN_COMMANDS. This is not exported so this is
@ -34,7 +34,7 @@ export default definePlugin({
                    // patch simpler
                    // textCommands = builtInCommands.filter(...)
-                    match: /(?<=\w=)(\w)(\.filter\(.{0,60}tenor)/,
+                    match: /(?<=\w=)(\w)(\.filter\(.{0,30}giphy)/,
                    replace: "Vencord.Api.Commands._init($1)$2",
                }
            ],
@ -44,8 +44,8 @@ export default definePlugin({
            find: "Unexpected value for option",
            replacement: {
                // return [2, cmd.execute(args, ctx)]
-                match: /,(\i)\.execute\((\i),(\i)\)/,
+                match: /,(.{1,2})\.execute\((.{1,2}),(.{1,2})\)]/,
-                replace: (_, cmd, args, ctx) => `,Vencord.Api.Commands._handleCommand(${cmd}, ${args}, ${ctx})`
+                replace: (_, cmd, args, ctx) => `,Vencord.Api.Commands._handleCommand(${cmd}, ${args}, ${ctx})]`
            }
        },
        // Show plugin name instead of "Built-In"
--- a/src/plugins/_api/componentUpdater.ts
+++ b/src/plugins/_api/componentUpdater.ts
@ -0,0 +1,51 @@
 /*
 * 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 { useForceUpdater } from "@utils/react";
 import definePlugin from "@utils/types";
 import { useEffect } from "@webpack/common";
 import { Channel, Message } from "discord-types/general";
 const forceUpdaters = new Map<string, () => void>();
 function useUpdater(data: { channel: Channel; message: Message; }) {
    const forceUpdater = useForceUpdater();
    useEffect(() => {
        forceUpdaters.set(data.message.id, forceUpdater);
        return () => void forceUpdaters.delete(data.message.id);
    }, [data.message.id]);
 }
 export default definePlugin({
    name: "ComponentUpdaterAPI",
    description: "API to update / force rerender several components, such as messages",
    authors: [Devs.Ven],
    patches: [{
        find: ".renderContentOnly;",
        replacement: {
            match: /=(\i)\.renderContentOnly;/,
            replace: "$&$self.useUpdater($1);"
        }
    }],
    useUpdater,
    forceUpdaters
 });
--- a/src/plugins/_api/contextMenu.ts
+++ b/src/plugins/_api/contextMenu.ts
@ -29,8 +29,8 @@ export default definePlugin({
        {
            find: "♫ (つ｡◕‿‿◕｡)つ ♪",
            replacement: {
-                match: /let{navId:/,
+                match: /(?<=function \i\((\i)\){)(?=var \i,\i=\i\.navId)/,
-                replace: "Vencord.Api.ContextMenu._patchContextMenu(arguments[0]);$&"
+                replace: (_, props) => `Vencord.Api.ContextMenu._patchContextMenu(${props});`
            }
        },
        {
--- a/src/plugins/_api/memberListDecorators.ts
+++ b/src/plugins/_api/memberListDecorators.ts
@ -22,25 +22,20 @@ import definePlugin from "@utils/types";
 export default definePlugin({
    name: "MemberListDecoratorsAPI",
    description: "API to add decorators to member list (both in servers and DMs)",
-    authors: [Devs.TheSun, Devs.Ven],
+    authors: [Devs.TheSun],
    patches: [
        {
-            find: ".lostPermission)",
+            find: "lostPermissionTooltipText,",
-            replacement: [
+            replacement: {
-                {
+                match: /Fragment,{children:\[(.{30,80})\]/,
-                    match: /let\{[^}]*lostPermissionTooltipText:\i[^}]*\}=(\i),/,
+                replace: "Fragment,{children:Vencord.Api.MemberListDecorators.__addDecoratorsToList(this.props).concat($1)"
                    replace: "$&vencordProps=$1,"
                }, {
                    match: /decorators:.{0,100}?children:\[/,
                    replace: "$&...(typeof vencordProps=='undefined'?[]:Vencord.Api.MemberListDecorators.__getDecorators(vencordProps)),"
            }
            ]
        },
        {
            find: "PrivateChannel.renderAvatar",
            replacement: {
-                match: /decorators:(\i\.isSystemDM\(\))\?(.+?):null/,
+                match: /(subText:(.{1,2})\.renderSubtitle\(\).{1,50}decorators):(.{30,100}:null)/,
-                replace: "decorators:[...Vencord.Api.MemberListDecorators.__getDecorators(arguments[0]), $1?$2:null]"
+                replace: "$1:Vencord.Api.MemberListDecorators.__addDecoratorsToList($2.props).concat($3)"
            }
        }
    ],
--- a/src/plugins/_api/messageAccessories.ts
+++ b/src/plugins/_api/messageAccessories.ts
@ -27,8 +27,9 @@ export default definePlugin({
        {
            find: ".Messages.REMOVE_ATTACHMENT_BODY",
            replacement: {
-                match: /(?<=.container\)?,children:)(\[.+?\])/,
+                match: /(.container\)?,children:)(\[[^\]]+\])(}\)\};return)/,
-                replace: "Vencord.Api.MessageAccessories._modifyAccessories($1,this.props)",
+                replace: (_, pre, accessories, post) =>
                    `${pre}Vencord.Api.MessageAccessories._modifyAccessories(${accessories},this.props)${post}`,
            },
        },
    ],
--- a/src/plugins/_api/messageDecorations.ts
+++ b/src/plugins/_api/messageDecorations.ts
@ -25,10 +25,10 @@ export default definePlugin({
    authors: [Devs.TheSun],
    patches: [
        {
-            find: '"Message Username"',
+            find: ".withMentionPrefix",
            replacement: {
-                match: /\.Messages\.GUILD_COMMUNICATION_DISABLED_BOTTOM_SHEET_TITLE.+?}\),\i(?=\])/,
+                match: /(.roleDot.{10,50}{children:.{1,2})}\)/,
-                replace: "$&,...Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0])"
+                replace: "$1.concat(Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0]))})"
            }
        }
    ],
--- a/src/plugins/_api/messageEvents.ts
+++ b/src/plugins/_api/messageEvents.ts
@ -27,8 +27,10 @@ export default definePlugin({
        {
            find: '"MessageActionCreators"',
            replacement: {
-                match: /async editMessage\(.+?\)\{/,
+                // editMessage: function (...) {
-                replace: "$&await Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
+                match: /\beditMessage:(function\(.+?\))\{/,
                // editMessage: async function (...) { await handlePreEdit(...); ...
                replace: "editMessage:async $1{await Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
            }
        },
        {
@ -36,7 +38,7 @@ export default definePlugin({
            replacement: {
                // props.chatInputType...then((function(isMessageValid)... var parsedMessage = b.c.parse(channel,... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply);
                // Lookbehind: validateMessage)({openWarningPopout:..., type: i.props.chatInputType, content: t, stickers: r, ...}).then((function(isMessageValid)
-                match: /(type:this\.props\.chatInputType.+?\.then\()(\i=>\{.+?let (\i)=\i\.\i\.parse\((\i),.+?let (\i)=\i\.\i\.getSendMessageOptionsForReply\(\i\);)(?<=\)\(({.+?})\)\.then.+?)/,
+                match: /(props\.chatInputType.+?\.then\(\()(function.+?var (\i)=\i\.\i\.parse\((\i),.+?var (\i)=\i\.\i\.getSendMessageOptionsForReply\(\i\);)(?<=\)\(({.+?})\)\.then.+?)/,
                // props.chatInputType...then((async function(isMessageValid)... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply); if(await Vencord.api...) return { shoudClear:true, shouldRefocus:true };
                replace: (_, rest1, rest2, parsedMessage, channel, replyOptions, extra) => "" +
                    `${rest1}async ${rest2}` +
@ -47,10 +49,10 @@ export default definePlugin({
        {
            find: '("interactionUsernameProfile',
            replacement: {
-                match: /let\{id:\i}=(\i),{id:\i}=(\i);return \i\.useCallback\((\i)=>\{/,
+                match: /var \i=(\i)\.id,\i=(\i)\.id;return \i\.useCallback\(\(?function\((\i)\){/,
                replace: (m, message, channel, event) =>
                    // the message param is shadowed by the event param, so need to alias them
-                    `const vcMsg=${message},vcChan=${channel};${m}Vencord.Api.MessageEvents._handleClick(vcMsg, vcChan, ${event});`
+                    `var _msg=${message},_chan=${channel};${m}Vencord.Api.MessageEvents._handleClick(_msg, _chan, ${event});`
            }
        }
    ]
--- a/src/plugins/_api/notices.ts
+++ b/src/plugins/_api/notices.ts
@ -29,12 +29,12 @@ export default definePlugin({
            find: 'displayName="NoticeStore"',
            replacement: [
                {
-                    match: /\i=null;(?=.{0,80}getPremiumSubscription\(\))/g,
+                    match: /(?=;\i=null;.{0,70}getPremiumSubscription)/g,
-                    replace: "if(Vencord.Api.Notices.currentNotice)return false;$&"
+                    replace: ";if(Vencord.Api.Notices.currentNotice)return false"
                },
                {
-                    match: /(?<=,NOTICE_DISMISS:function\(\i\){)return null!=(\i)/,
+                    match: /(?<=,NOTICE_DISMISS:function\(\i\){)(?=if\(null==(\i)\))/,
-                    replace: "if($1.id==\"VencordNotice\")return($1=null,Vencord.Api.Notices.nextNotice(),true);$&"
+                    replace: (_, notice) => `if(${notice}.id=="VencordNotice")return(${notice}=null,Vencord.Api.Notices.nextNotice(),true);`
                }
            ]
        }
--- a/src/plugins/_api/serverList.ts
+++ b/src/plugins/_api/serverList.ts
@ -27,15 +27,15 @@ export default definePlugin({
        {
            find: "Messages.DISCODO_DISABLED",
            replacement: {
-                match: /(?<=Messages\.DISCODO_DISABLED.+?return)(\(.{0,75}?tutorialContainer.+?}\))(?=}function)/,
+                match: /(Messages\.DISCODO_DISABLED\);return)(.*?homeIcon.*?)(\}function)/,
-                replace: "[$1].concat(Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.Above))"
+                replace: "$1[$2].concat(Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.Above))$3"
            }
        },
        {
            find: "Messages.SERVERS,children",
            replacement: {
-                match: /(?<=Messages\.SERVERS,children:).+?default:return null\}\}\)/,
+                match: /(Messages\.SERVERS,children:)(.+?default:return null\}\}\)\))/,
-                replace: "Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.In).concat($&)"
+                replace: "$1Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.In).concat($2)"
            }
        }
    ]
--- a/src/plugins/_api/settingsStore.ts
+++ b/src/plugins/_api/settingsStore.ts
@ -0,0 +1,38 @@
 /*
 * Vencord, a modification for Discord's desktop app
 * Copyright (c) 2022 Vendicated and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 export default definePlugin({
    name: "SettingsStoreAPI",
    description: "Patches Discord's SettingsStores to expose their group and name",
    authors: [Devs.Nuckyz],
    patches: [
        {
            find: '"textAndImages","renderSpoilers"',
            replacement: [
                {
                    match: /(?<=INFREQUENT_USER_ACTION.{0,20}),useSetting:function/,
                    replace: ",settingsStoreApiGroup:arguments[0],settingsStoreApiName:arguments[1]$&"
                }
            ]
        }
    ]
 });
--- a/src/plugins/_core/noTrack.ts
+++ b/src/plugins/_core/noTrack.ts
@ -22,11 +22,11 @@ import definePlugin from "@utils/types";
 export default definePlugin({
    name: "NoTrack",
    description: "Disable Discord's tracking ('science'), metrics and Sentry crash reporting",
-    authors: [Devs.Cyn, Devs.Ven, Devs.Nuckyz, Devs.Arrow],
+    authors: [Devs.Cyn, Devs.Ven, Devs.Nuckyz],
    required: true,
    patches: [
        {
-            find: "AnalyticsActionHandlers.handle",
+            find: "TRACKING_URL:",
            replacement: {
                match: /^.+$/,
                replace: "()=>{}",
@ -43,22 +43,14 @@ export default definePlugin({
            find: ".METRICS,",
            replacement: [
                {
-                    match: /this\._intervalId=/,
+                    match: /this\._intervalId.+?12e4\)/,
-                    replace: "this._intervalId=undefined&&"
+                    replace: ""
                },
                {
-                    match: /(increment\(\i\){)/,
+                    match: /(?<=increment=function\(\i\){)/,
-                    replace: "$1return;"
+                    replace: "return;"
                }
            ]
        },
        {
            find: ".installedLogHooks)",
            replacement: {
                // if getDebugLogging() returns false, the hooks don't get installed.
                match: "getDebugLogging(){",
                replace: "getDebugLogging(){return false;"
        }
        },
    ]
 });
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@ -19,6 +19,7 @@
 import { addContextMenuPatch } from "@api/ContextMenu";
 import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { React, SettingsRouter } from "@webpack/common";
@ -39,9 +40,8 @@ export default definePlugin({
        addContextMenuPatch("user-settings-cog", children => () => {
            const section = children.find(c => Array.isArray(c) && c.some(it => it?.props?.id === "VencordSettings")) as any;
            section?.forEach(c => {
-                const id = c?.props?.id;
+                if (c?.props?.id?.startsWith("Vencord")) {
-                if (id?.startsWith("Vencord") || id?.startsWith("Vesktop")) {
+                    c.props.action = () => SettingsRouter.open(c.props.id);
                    c.props.action = () => SettingsRouter.open(id);
                }
            });
        });
@ -63,74 +63,77 @@ export default definePlugin({
        replacement: {
            get match() {
                switch (Settings.plugins.Settings.settingsLocation) {
-                    case "top": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS\}/;
+                    case "top": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.USER_SETTINGS\}/;
-                    case "aboveNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS\}/;
+                    case "aboveNitro": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.BILLING_SETTINGS\}/;
-                    case "belowNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS\}/;
+                    case "belowNitro": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.APP_SETTINGS\}/;
-                    case "belowActivity": return /(?<=\{section:(\i\.\i)\.DIVIDER},)\{section:"changelog"/;
+                    case "aboveActivity": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.ACTIVITY_SETTINGS\}/;
-                    case "bottom": return /\{section:(\i\.\i)\.CUSTOM,\s*element:.+?}/;
+                    case "belowActivity": return /(?<=\{section:(.{1,2})\.ID\.DIVIDER},)\{section:"changelog"/;
-                    case "aboveActivity":
+                    case "bottom": return /\{section:(.{1,2})\.ID\.CUSTOM,\s*element:.+?}/;
-                    default:
+                    default: {
-                        return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS\}/;
+                        new Logger("Settings").error(
                            new Error("No switch case matched????? Don't mess with the settings, silly")
                        );
                        // matches nothing
                        return /(?!a)a/;
                    }
                }
            },
            replace: "...$self.makeSettingsCategories($1),$&"
        }
    }],
-    customSections: [] as ((SectionTypes: Record<string, unknown>) => any)[],
+    customSections: [] as ((ID: Record<string, unknown>) => any)[],
-    makeSettingsCategories(SectionTypes: Record<string, unknown>) {
+    makeSettingsCategories({ ID }: { ID: Record<string, unknown>; }) {
        return [
            {
-                section: SectionTypes.HEADER,
+                section: ID.HEADER,
-                label: "Vencord",
+                label: "Vencord"
                className: "vc-settings-header"
            },
            {
                section: "VencordSettings",
                label: "Vencord",
-                element: require("@components/VencordSettings/VencordTab").default,
+                element: require("@components/VencordSettings/VencordTab").default
                className: "vc-settings"
            },
            {
                section: "VencordPlugins",
                label: "Plugins",
                element: require("@components/VencordSettings/PluginsTab").default,
                className: "vc-plugins"
            },
            {
                section: "VencordThemes",
                label: "Themes",
                element: require("@components/VencordSettings/ThemesTab").default,
                className: "vc-themes"
            },
-            !IS_UPDATER_DISABLED && {
+            !IS_WEB && {
                section: "VencordUpdater",
                label: "Updater",
                element: require("@components/VencordSettings/UpdaterTab").default,
                className: "vc-updater"
            },
            {
                section: "VencordCloud",
                label: "Cloud",
                element: require("@components/VencordSettings/CloudTab").default,
                className: "vc-cloud"
            },
            {
                section: "VencordSettingsSync",
                label: "Backup & Restore",
                element: require("@components/VencordSettings/BackupAndRestoreTab").default,
                className: "vc-backup-restore"
            },
            IS_DEV && {
                section: "VencordPatchHelper",
                label: "Patch Helper",
                element: require("@components/VencordSettings/PatchHelperTab").default,
                className: "vc-patch-helper"
            },
-            ...this.customSections.map(func => func(SectionTypes)),
+            // TODO: make this use customSections
            IS_VENCORD_DESKTOP && {
                section: "VencordDesktop",
                label: "Desktop Settings",
                element: VencordDesktop.Components.Settings,
            },
            ...this.customSections.map(func => func(ID)),
            {
-                section: SectionTypes.DIVIDER
+                section: ID.DIVIDER
            }
        ].filter(Boolean);
    },
@ -169,7 +172,7 @@ export default definePlugin({
    get additionalInfo() {
        if (IS_DEV) return " (Dev)";
        if (IS_WEB) return " (Web)";
-        if (IS_VESKTOP) return ` (Vesktop v${VesktopNative.app.getVersion()})`;
+        if (IS_VENCORD_DESKTOP) return ` (VencordDesktop v${VencordDesktopNative.app.getVersion()})`;
        if (IS_STANDALONE) return " (Standalone)";
        return "";
    },
--- a/src/plugins/showTimeouts/index.ts
+++ b/src/plugins/showTimeouts/index.ts
@ -20,16 +20,18 @@ import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 export default definePlugin({
-    name: "ShowTimeouts",
+    name: "AlwaysAnimate",
-    description: "Display member timeout icons in chat regardless of permissions.",
+    description: "Animates anything that can be animated, besides status emojis.",
-    authors: [Devs.Dolfies],
+    authors: [Devs.FieryFlames],
    patches: [
        {
-            find: "showCommunicationDisabledStyles",
+            find: ".canAnimate",
            all: true,
            replacement: {
-                match: /&&\i\.\i\.canManageUser\(\i\.\i\.MODERATE_MEMBERS,\i\.author,\i\)/,
+                match: /\.canAnimate\b/g,
-                replace: "",
+                replace: ".canAnimate || true"
-            },
+            }
-        },
+        }
-    ],
+    ]
 });
--- a/src/plugins/alwaysAnimate/index.ts
+++ b/src/plugins/alwaysAnimate/index.ts
@ -1,51 +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";
 export default definePlugin({
    name: "AlwaysAnimate",
    description: "Animates anything that can be animated",
    authors: [Devs.FieryFlames],
    patches: [
        {
            find: "canAnimate:",
            all: true,
            // Some modules match the find but the replacement is returned untouched
            noWarn: true,
            replacement: {
                match: /canAnimate:.+?(?=([,}].*?\)))/g,
                replace: (m, rest) => {
                    const destructuringMatch = rest.match(/}=.+/);
                    if (destructuringMatch == null) return "canAnimate:!0";
                    return m;
                }
            }
        },
        {
            // Status emojis
            find: ".Messages.GUILD_OWNER,",
            replacement: {
                match: /(?<=\.activityEmoji,.+?animate:)\i/,
                replace: "!0"
            }
        }
    ]
 });
--- a/src/plugins/alwaysTrust/index.ts
+++ b/src/plugins/alwaysTrust/index.ts
@ -27,15 +27,15 @@ export default definePlugin({
        {
            find: ".displayName=\"MaskedLinkStore\"",
            replacement: {
-                match: /(?<=isTrustedDomain\(\i\){)return \i\(\i\)/,
+                match: /\.isTrustedDomain=function\(.\){return.+?};/,
-                replace: "return true"
+                replace: ".isTrustedDomain=function(){return true};"
            }
        },
        {
-            find: "isSuspiciousDownload:",
+            find: '"7z","ade","adp"',
            replacement: {
-                match: /function \i\(\i\){(?=.{0,60}\.parse\(\i\))/,
+                match: /JSON\.parse\('\[.+?'\)/,
-                replace: "$&return null;"
+                replace: "[]"
            }
        }
    ]
--- a/src/plugins/anonymiseFileNames/index.ts
+++ b/src/plugins/anonymiseFileNames/index.ts
@ -26,8 +26,6 @@ const enum Methods {
    Timestamp,
 }
 const tarExtMatcher = /\.tar\.\w+$/;
 export default definePlugin({
    name: "AnonymiseFileNames",
    authors: [Devs.obscurity],
@ -69,8 +67,7 @@ export default definePlugin({
    anonymise(file: string) {
        let name = "image";
-        const tarMatch = tarExtMatcher.exec(file);
+        const extIdx = file.lastIndexOf(".");
        const extIdx = tarMatch?.index ?? file.lastIndexOf(".");
        const ext = extIdx !== -1 ? file.slice(extIdx) : "";
        switch (Settings.plugins.AnonymiseFileNames.method) {
--- a/src/plugins/arRPC.web/index.tsx
+++ b/src/plugins/arRPC.web/index.tsx
@ -20,19 +20,26 @@ import { popNotice, showNotice } from "@api/Notices";
 import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { filters, findByCodeLazy, mapMangledModuleLazy } from "@webpack";
-import { ApplicationAssetUtils, FluxDispatcher, Forms, Toasts } from "@webpack/common";
+import { FluxDispatcher, Forms, Toasts } from "@webpack/common";
-const RpcUtils = findByPropsLazy("fetchApplicationsRPC", "getRemoteIconURL");
+const assetManager = mapMangledModuleLazy(
    "getAssetImage: size must === [number, number] for Twitch",
    {
        getAsset: filters.byCode("apply("),
    }
 );
 const lookupRpcApp = findByCodeLazy(".APPLICATION_RPC(");
 async function lookupAsset(applicationId: string, key: string): Promise<string> {
-    return (await ApplicationAssetUtils.fetchAssetIds(applicationId, [key]))[0];
+    return (await assetManager.getAsset(applicationId, [key, undefined]))[0];
 }
 const apps: any = {};
 async function lookupApp(applicationId: string): Promise<string> {
    const socket: any = {};
-    await RpcUtils.fetchApplicationsRPC(socket, applicationId);
+    await lookupRpcApp(socket, applicationId);
    return socket.application;
 }
@ -51,26 +58,6 @@ export default definePlugin({
        </>
    ),
    async handleEvent(e: MessageEvent<any>) {
        const data = JSON.parse(e.data);
        const { activity } = data;
        const assets = activity?.assets;
        if (assets?.large_image) assets.large_image = await lookupAsset(activity.application_id, assets.large_image);
        if (assets?.small_image) assets.small_image = await lookupAsset(activity.application_id, assets.small_image);
        if (activity) {
            const appId = activity.application_id;
            apps[appId] ||= await lookupApp(appId);
            const app = apps[appId];
            activity.name ||= app.name;
        }
        FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", ...data });
    },
    async start() {
        // ArmCord comes with its own arRPC implementation, so this plugin just confuses users
        if ("armcord" in window) return;
@ -78,7 +65,22 @@ export default definePlugin({
        if (ws) ws.close();
        ws = new WebSocket("ws://127.0.0.1:1337"); // try to open WebSocket
-        ws.onmessage = this.handleEvent;
+        ws.onmessage = async e => { // on message, set status to data
            const data = JSON.parse(e.data);
            if (data.activity?.assets?.large_image) data.activity.assets.large_image = await lookupAsset(data.activity.application_id, data.activity.assets.large_image);
            if (data.activity?.assets?.small_image) data.activity.assets.small_image = await lookupAsset(data.activity.application_id, data.activity.assets.small_image);
            if (data.activity) {
                const appId = data.activity.application_id;
                apps[appId] ||= await lookupApp(appId);
                const app = apps[appId];
                data.activity.name ||= app.name;
            }
            FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", ...data });
        };
        const connectionSuccessful = await new Promise(res => setTimeout(() => res(ws.readyState === WebSocket.OPEN), 1000)); // check if open after 1s
        if (!connectionSuccessful) {
--- a/src/plugins/banger/index.ts
+++ b/src/plugins/banger/index.ts
@ -27,7 +27,7 @@ export default definePlugin({
        {
            find: "BAN_CONFIRM_TITLE.",
            replacement: {
-                match: /src:\i\("\d+"\)/g,
+                match: /src:\w\(\d+\)/g,
                replace: "src: Vencord.Settings.plugins.BANger.source"
            }
        }
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@ -16,44 +16,56 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import { Settings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { LazyComponent } from "@utils/react";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { find, findByPropsLazy, findStoreLazy } from "@webpack";
+import { i18n, React, useStateFromStores } from "@webpack/common";
 import { useStateFromStores } from "@webpack/common";
 import type { CSSProperties } from "react";
-import { ExpandedGuildFolderStore, settings } from ".";
+const cl = classNameFactory("vc-bf-");
 const classes = findByPropsLazy("sidebar", "guilds");
 const ChannelRTCStore = findStoreLazy("ChannelRTCStore");
 const Animations = findByPropsLazy("a", "animated", "useTransition");
-const GuildsBar = LazyComponent(() => find(m => m.type?.toString().includes('("guildsnav")')));
+const ChannelRTCStore = findStoreLazy("ChannelRTCStore");
 const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
-export default ErrorBoundary.wrap(guildsBarProps => {
+function Guilds(props: {
    className: string;
    bfGuildFolders: any[];
 }) {
    // @ts-expect-error
    const res = Vencord.Plugins.plugins.BetterFolders.Guilds(props);
    // TODO: Make this better
    const scrollerProps = res.props.children?.props?.children?.props?.children?.[1]?.props;
    if (scrollerProps?.children) {
        const servers = scrollerProps.children.find(c => c?.props?.["aria-label"] === i18n.Messages.SERVERS);
        if (servers) scrollerProps.children = servers;
    }
    return res;
 }
 export default ErrorBoundary.wrap(() => {
    const expandedFolders = useStateFromStores([ExpandedGuildFolderStore], () => ExpandedGuildFolderStore.getExpandedFolders());
-    const isFullscreen = useStateFromStores([ChannelRTCStore], () => ChannelRTCStore.isFullscreenInContext());
+    const fullscreen = useStateFromStores([ChannelRTCStore], () => ChannelRTCStore.isFullscreenInContext());
    const guilds = document.querySelector(`.${classes.guilds}`);
    const visible = !!expandedFolders.size;
    const className = cl("folder-sidebar", { fullscreen });
    const Sidebar = (
-        <GuildsBar
+        <Guilds
-            {...guildsBarProps}
+            className={classes.guilds}
-            isBetterFolders={true}
+            bfGuildFolders={Array.from(expandedFolders)}
            betterFoldersExpandedIds={expandedFolders}
        />
    );
-    const visible = !!expandedFolders.size;
+    if (!guilds || !Settings.plugins.BetterFolders.sidebarAnim)
    const guilds = document.querySelector(guildsBarProps.className.split(" ").map(c => `.${c}`).join(""));
    // We need to display none if we are in fullscreen. Yes this seems horrible doing with css, but it's literally how Discord does it.
    // Also display flex otherwise to fix scrolling
    const barStyle = {
        display: isFullscreen ? "none" : "flex",
    } as CSSProperties;
    if (!guilds || !settings.store.sidebarAnim) {
        return visible
-            ? <div style={barStyle}>{Sidebar}</div>
+            ? <div className={className}>{Sidebar}</div>
            : null;
    }
    return (
        <Animations.Transition
@ -63,13 +75,11 @@ export default ErrorBoundary.wrap(guildsBarProps => {
            leave={{ width: 0 }}
            config={{ duration: 200 }}
        >
-            {(animationStyle, show) =>
+            {(style, show) => show && (
-                show && (
+                <Animations.animated.div style={style} className={className}>
                    <Animations.animated.div style={{ ...animationStyle, ...barStyle }}>
                    {Sidebar}
                </Animations.animated.div>
-                )
+            )}
            }
        </Animations.Transition>
    );
 }, { noop: true });
--- a/src/plugins/betterFolders/betterFolders.css
+++ b/src/plugins/betterFolders/betterFolders.css
@ -0,0 +1,17 @@
 .vc-bf-folder-sidebar [class*="wrapper-"] > [class*="listItem-"]:first-of-type,
 .vc-bf-folder-sidebar [class*="unreadMentionsIndicator"] {
    display: none;
 }
 .vc-bf-folder-sidebar [class*="expandedFolderBackground-"] {
    background-color: transparent;
 }
 .vc-bf-folder-sidebar {
    display: flex;
 }
 .vc-bf-fullscreen {
    width: 0 !important;
    visibility: hidden;
 }
--- a/src/plugins/betterFolders/index.ts
+++ b/src/plugins/betterFolders/index.ts
@ -0,0 +1,177 @@
 /*
 * 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 "./betterFolders.css";
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
 import { FluxDispatcher } from "@webpack/common";
 import FolderSideBar from "./FolderSideBar";
 const GuildsTree = findLazy(m => m.prototype?.convertToFolder);
 const GuildFolderStore = findStoreLazy("SortedGuildStore");
 const ExpandedFolderStore = findStoreLazy("ExpandedGuildFolderStore");
 const FolderUtils = findByPropsLazy("move", "toggleGuildFolderExpand");
 const settings = definePluginSettings({
    sidebar: {
        type: OptionType.BOOLEAN,
        description: "Display servers from folder on dedicated sidebar",
        default: true,
    },
    sidebarAnim: {
        type: OptionType.BOOLEAN,
        description: "Animate opening the folder sidebar",
        default: true,
    },
    closeAllFolders: {
        type: OptionType.BOOLEAN,
        description: "Close all folders when selecting a server not in a folder",
        default: false,
    },
    closeAllHomeButton: {
        type: OptionType.BOOLEAN,
        description: "Close all folders when clicking on the home button",
        default: false,
    },
    closeOthers: {
        type: OptionType.BOOLEAN,
        description: "Close other folders when opening a folder",
        default: false,
    },
    forceOpen: {
        type: OptionType.BOOLEAN,
        description: "Force a folder to open when switching to a server of that folder",
        default: false,
    },
 });
 export default definePlugin({
    name: "BetterFolders",
    description: "Shows server folders on dedicated sidebar and adds folder related improvements",
    authors: [Devs.juby, Devs.AutumnVN],
    patches: [
        {
            find: '("guildsnav")',
            predicate: () => settings.store.sidebar,
            replacement: [
                {
                    match: /(\i)\(\){return \i\(\(0,\i\.jsx\)\("div",{className:\i\(\)\.guildSeparator}\)\)}/,
                    replace: "$&$self.Separator=$1;"
                },
                // Folder component patch
                {
                    match: /\i\(\(function\(\i,\i,\i\){var \i=\i\.key;return.+\(\i\)},\i\)}\)\)/,
                    replace: "arguments[0].bfHideServers?null:$&"
                },
                // BEGIN Guilds component patch
                {
                    match: /(\i)\.themeOverride,(.{15,25}\(function\(\){var \i=)(\i\.\i\.getGuildsTree\(\))/,
                    replace: "$1.themeOverride,bfPatch=$1.bfGuildFolders,$2bfPatch?$self.getGuildsTree(bfPatch,$3):$3"
                },
                {
                    match: /return(\(0,\i\.jsx\))(\(\i,{)(folderNode:\i,setNodeRef:\i\.setNodeRef,draggable:!0,.+},\i\.id\));case/,
                    replace: "var bfHideServers=typeof bfPatch==='undefined',folder=$1$2bfHideServers,$3;return !bfHideServers&&arguments[1]?[$1($self.Separator,{}),folder]:folder;case"
                },
                // END
                {
                    match: /\("guildsnav"\);return\(0,\i\.jsx\)\(.{1,6},{navigator:\i,children:\(0,\i\.jsx\)\(/,
                    replace: "$&$self.Guilds="
                }
            ]
        },
        {
            find: "APPLICATION_LIBRARY,render",
            predicate: () => settings.store.sidebar,
            replacement: {
                match: /(\(0,\i\.jsx\))\(\i\..,{className:\i\(\)\.guilds,themeOverride:\i}\)/,
                replace: "$&,$1($self.FolderSideBar,{})"
            }
        },
        {
            find: '("guildsnav")',
            predicate: () => settings.store.closeAllHomeButton,
            replacement: {
                match: ",onClick:function(){if(!__OVERLAY__){",
                replace: "$&$self.closeFolders();"
            }
        }
    ],
    settings,
    start() {
        const getGuildFolder = (id: string) => GuildFolderStore.getGuildFolders().find(f => f.guildIds.includes(id));
        FluxDispatcher.subscribe("CHANNEL_SELECT", this.onSwitch = data => {
            if (!settings.store.closeAllFolders && !settings.store.forceOpen)
                return;
            if (this.lastGuildId !== data.guildId) {
                this.lastGuildId = data.guildId;
                const guildFolder = getGuildFolder(data.guildId);
                if (guildFolder?.folderId) {
                    if (settings.store.forceOpen && !ExpandedFolderStore.isFolderExpanded(guildFolder.folderId))
                        FolderUtils.toggleGuildFolderExpand(guildFolder.folderId);
                } else if (settings.store.closeAllFolders)
                    this.closeFolders();
            }
        });
        FluxDispatcher.subscribe("TOGGLE_GUILD_FOLDER_EXPAND", this.onToggleFolder = e => {
            if (settings.store.closeOthers && !this.dispatching)
                FluxDispatcher.wait(() => {
                    const expandedFolders = ExpandedFolderStore.getExpandedFolders();
                    if (expandedFolders.size > 1) {
                        this.dispatching = true;
                        for (const id of expandedFolders) if (id !== e.folderId)
                            FolderUtils.toggleGuildFolderExpand(id);
                        this.dispatching = false;
                    }
                });
        });
    },
    stop() {
        FluxDispatcher.unsubscribe("CHANNEL_SELECT", this.onSwitch);
        FluxDispatcher.unsubscribe("TOGGLE_GUILD_FOLDER_EXPAND", this.onToggleFolder);
    },
    FolderSideBar,
    getGuildsTree(folders, oldTree) {
        const tree = new GuildsTree();
        tree.root.children = oldTree.root.children.filter(e => folders.includes(e.id));
        tree.nodes = folders.map(id => oldTree.nodes[id]);
        return tree;
    },
    closeFolders() {
        for (const id of ExpandedFolderStore.getExpandedFolders())
            FolderUtils.toggleGuildFolderExpand(id);
    },
 });
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@ -1,307 +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 { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import { proxyLazy } from "@utils/lazy";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByProps, findByPropsLazy, findStoreLazy } from "@webpack";
 import { FluxDispatcher, i18n } from "@webpack/common";
 import FolderSideBar from "./FolderSideBar";
 enum FolderIconDisplay {
    Never,
    Always,
    MoreThanOneFolderExpanded
 }
 const GuildsTree = proxyLazy(() => findByProps("GuildsTree").GuildsTree);
 const SortedGuildStore = findStoreLazy("SortedGuildStore");
 export const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
 const FolderUtils = findByPropsLazy("move", "toggleGuildFolderExpand");
 let lastGuildId = null as string | null;
 let dispatchingFoldersClose = false;
 function getGuildFolder(id: string) {
    return SortedGuildStore.getGuildFolders().find(folder => folder.guildIds.includes(id));
 }
 function closeFolders() {
    for (const id of ExpandedGuildFolderStore.getExpandedFolders())
        FolderUtils.toggleGuildFolderExpand(id);
 }
 export const settings = definePluginSettings({
    sidebar: {
        type: OptionType.BOOLEAN,
        description: "Display servers from folder on dedicated sidebar",
        restartNeeded: true,
        default: true
    },
    sidebarAnim: {
        type: OptionType.BOOLEAN,
        description: "Animate opening the folder sidebar",
        default: true
    },
    closeAllFolders: {
        type: OptionType.BOOLEAN,
        description: "Close all folders when selecting a server not in a folder",
        default: false
    },
    closeAllHomeButton: {
        type: OptionType.BOOLEAN,
        description: "Close all folders when clicking on the home button",
        restartNeeded: true,
        default: false
    },
    closeOthers: {
        type: OptionType.BOOLEAN,
        description: "Close other folders when opening a folder",
        default: false
    },
    forceOpen: {
        type: OptionType.BOOLEAN,
        description: "Force a folder to open when switching to a server of that folder",
        default: false
    },
    keepIcons: {
        type: OptionType.BOOLEAN,
        description: "Keep showing guild icons in the primary guild bar folder when it's open in the BetterFolders sidebar",
        restartNeeded: true,
        default: false
    },
    showFolderIcon: {
        type: OptionType.SELECT,
        description: "Show the folder icon above the folder guilds in the BetterFolders sidebar",
        options: [
            { label: "Never", value: FolderIconDisplay.Never },
            { label: "Always", value: FolderIconDisplay.Always, default: true },
            { label: "When more than one folder is expanded", value: FolderIconDisplay.MoreThanOneFolderExpanded }
        ],
        restartNeeded: true
    }
 });
 export default definePlugin({
    name: "BetterFolders",
    description: "Shows server folders on dedicated sidebar and adds folder related improvements",
    authors: [Devs.juby, Devs.AutumnVN, Devs.Nuckyz],
    settings,
    patches: [
        {
            find: '("guildsnav")',
            predicate: () => settings.store.sidebar,
            replacement: [
                // Create the isBetterFolders variable in the GuildsBar component
                {
                    match: /(?<=let{disableAppDownload:\i=\i\.isPlatformEmbedded,isOverlay:.+?)(?=}=\i,)/,
                    replace: ",isBetterFolders"
                },
                // If we are rendering the Better Folders sidebar, we filter out guilds that are not in folders and unexpanded folders
                {
                    match: /(useStateFromStoresArray\).{0,25}let \i)=(\i\.\i.getGuildsTree\(\))/,
                    replace: (_, rest, guildsTree) => `${rest}=$self.getGuildTree(!!arguments[0].isBetterFolders,${guildsTree},arguments[0].betterFoldersExpandedIds)`
                },
                // If we are rendering the Better Folders sidebar, we filter out everything but the servers and folders from the GuildsBar Guild List children
                {
                    match: /lastTargetNode:\i\[\i\.length-1\].+?Fragment.+?\]}\)\]/,
                    replace: "$&.filter($self.makeGuildsBarGuildListFilter(!!arguments[0].isBetterFolders))"
                },
                // If we are rendering the Better Folders sidebar, we filter out everything but the scroller for the guild list from the GuildsBar Tree children
                {
                    match: /unreadMentionsIndicatorBottom,barClassName.+?}\)\]/,
                    replace: "$&.filter($self.makeGuildsBarTreeFilter(!!arguments[0].isBetterFolders))"
                },
                // Export the isBetterFolders variable to the folders component
                {
                    match: /(?<=\.Messages\.SERVERS.+?switch\((\i)\.type\){case \i\.\i\.FOLDER:.+?folderNode:\i,)/,
                    replace: 'isBetterFolders:typeof isBetterFolders!=="undefined"?isBetterFolders:false,'
                }
            ]
        },
        {
            // This is the parent folder component
            find: ".MAX_GUILD_FOLDER_NAME_LENGTH,",
            predicate: () => settings.store.sidebar && settings.store.showFolderIcon !== FolderIconDisplay.Always,
            replacement: [
                {
                    // Modify the expanded state to instead return the list of expanded folders
                    match: /(useStateFromStores\).{0,20}=>)(\i\.\i)\.isFolderExpanded\(\i\)/,
                    replace: (_, rest, ExpandedGuildFolderStore) => `${rest}${ExpandedGuildFolderStore}.getExpandedFolders()`,
                },
                {
                    // Modify the expanded prop to use the boolean if the above patch fails, or check if the folder is expanded from the list if it succeeds
                    // Also export the list of expanded folders to the child folder component if the patch above succeeds, else export undefined
                    match: /(?<=folderNode:(\i),expanded:)\i(?=,)/,
                    replace: (isExpandedOrExpandedIds, folderNote) => ""
                        + `typeof ${isExpandedOrExpandedIds}==="boolean"?${isExpandedOrExpandedIds}:${isExpandedOrExpandedIds}.has(${folderNote}.id),`
                        + `betterFoldersExpandedIds:${isExpandedOrExpandedIds} instanceof Set?${isExpandedOrExpandedIds}:void 0`
                }
            ]
        },
        {
            find: ".FOLDER_ITEM_GUILD_ICON_MARGIN);",
            predicate: () => settings.store.sidebar,
            replacement: [
                // We use arguments[0] to access the isBetterFolders variable in this nested folder component (the parent exports all the props so we don't have to patch it)
                // If we are rendering the normal GuildsBar sidebar, we make Discord think the folder is always collapsed to show better icons (the mini guild icons) and avoid transitions
                {
                    predicate: () => settings.store.keepIcons,
                    match: /(?<=let{folderNode:\i,setNodeRef:\i,.+?expanded:(\i),.+?;)(?=let)/,
                    replace: (_, isExpanded) => `${isExpanded}=!!arguments[0].isBetterFolders&&${isExpanded};`
                },
                // Disable expanding and collapsing folders transition in the normal GuildsBar sidebar
                {
                    predicate: () => !settings.store.keepIcons,
                    match: /(?<=\.Messages\.SERVER_FOLDER_PLACEHOLDER.+?useTransition\)\()/,
                    replace: "!!arguments[0].isBetterFolders&&"
                },
                // If we are rendering the normal GuildsBar sidebar, we avoid rendering guilds from folders that are expanded
                {
                    predicate: () => !settings.store.keepIcons,
                    match: /expandedFolderBackground,.+?,(?=\i\(\(\i,\i,\i\)=>{let{key.{0,45}ul)(?<=selected:\i,expanded:(\i),.+?)/,
                    replace: (m, isExpanded) => `${m}!arguments[0].isBetterFolders&&${isExpanded}?null:`
                },
                {
                    // Decide if we should render the expanded folder background if we are rendering the Better Folders sidebar
                    predicate: () => settings.store.showFolderIcon !== FolderIconDisplay.Always,
                    match: /(?<=\.wrapper,children:\[)/,
                    replace: "$self.shouldShowFolderIconAndBackground(!!arguments[0].isBetterFolders,arguments[0].betterFoldersExpandedIds)&&"
                },
                {
                    // Decide if we should render the expanded folder icon if we are rendering the Better Folders sidebar
                    predicate: () => settings.store.showFolderIcon !== FolderIconDisplay.Always,
                    match: /(?<=\.expandedFolderBackground.+?}\),)(?=\i,)/,
                    replace: "!$self.shouldShowFolderIconAndBackground(!!arguments[0].isBetterFolders,arguments[0].betterFoldersExpandedIds)?null:"
                }
            ]
        },
        {
            find: "APPLICATION_LIBRARY,render",
            predicate: () => settings.store.sidebar,
            replacement: {
                // Render the Better Folders sidebar
                match: /(?<=({className:\i\.guilds,themeOverride:\i})\))/,
                replace: ",$self.FolderSideBar($1)"
            }
        },
        {
            find: ".Messages.DISCODO_DISABLED",
            predicate: () => settings.store.closeAllHomeButton,
            replacement: {
                // Close all folders when clicking the home button
                match: /(?<=onClick:\(\)=>{)(?=.{0,200}"discodo")/,
                replace: "$self.closeFolders();"
            }
        }
    ],
    flux: {
        CHANNEL_SELECT(data) {
            if (!settings.store.closeAllFolders && !settings.store.forceOpen)
                return;
            if (lastGuildId !== data.guildId) {
                lastGuildId = data.guildId;
                const guildFolder = getGuildFolder(data.guildId);
                if (guildFolder?.folderId) {
                    if (settings.store.forceOpen && !ExpandedGuildFolderStore.isFolderExpanded(guildFolder.folderId)) {
                        FolderUtils.toggleGuildFolderExpand(guildFolder.folderId);
                    }
                } else if (settings.store.closeAllFolders) {
                    closeFolders();
                }
            }
        },
        TOGGLE_GUILD_FOLDER_EXPAND(data) {
            if (settings.store.closeOthers && !dispatchingFoldersClose) {
                dispatchingFoldersClose = true;
                FluxDispatcher.wait(() => {
                    const expandedFolders = ExpandedGuildFolderStore.getExpandedFolders();
                    if (expandedFolders.size > 1) {
                        for (const id of expandedFolders) if (id !== data.folderId)
                            FolderUtils.toggleGuildFolderExpand(id);
                    }
                    dispatchingFoldersClose = false;
                });
            }
        }
    },
    getGuildTree(isBetterFolders: boolean, oldTree: any, expandedFolderIds?: Set<any>) {
        if (!isBetterFolders || expandedFolderIds == null) return oldTree;
        const newTree = new GuildsTree();
        // Children is every folder and guild which is not in a folder, this filters out only the expanded folders
        newTree.root.children = oldTree.root.children.filter(guildOrFolder => expandedFolderIds.has(guildOrFolder.id));
        // Nodes is every folder and guild, even if it's in a folder, this filters out only the expanded folders and guilds inside them
        newTree.nodes = Object.fromEntries(
            Object.entries(oldTree.nodes)
                .filter(([_, guildOrFolder]: any[]) => expandedFolderIds.has(guildOrFolder.id) || expandedFolderIds.has(guildOrFolder.parentId))
        );
        return newTree;
    },
    makeGuildsBarGuildListFilter(isBetterFolders: boolean) {
        return child => {
            if (isBetterFolders) {
                return child?.props?.["aria-label"] === i18n.Messages.SERVERS;
            }
            return true;
        };
    },
    makeGuildsBarTreeFilter(isBetterFolders: boolean) {
        return child => {
            if (isBetterFolders) {
                return "onScroll" in child.props;
            }
            return true;
        };
    },
    shouldShowFolderIconAndBackground(isBetterFolders: boolean, expandedFolderIds?: Set<any>) {
        if (!isBetterFolders) return true;
        switch (settings.store.showFolderIcon) {
            case FolderIconDisplay.Never:
                return false;
            case FolderIconDisplay.Always:
                return true;
            case FolderIconDisplay.MoreThanOneFolderExpanded:
                return (expandedFolderIds?.size ?? 0) > 1;
            default:
                return true;
        }
    },
    FolderSideBar: guildsBarProps => <FolderSideBar {...guildsBarProps} />,
    closeFolders
 });
--- a/src/plugins/betterGifAltText/index.ts
+++ b/src/plugins/betterGifAltText/index.ts
@ -16,6 +16,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
@ -34,18 +35,16 @@ export default definePlugin({
            },
        },
        {
-            find: ".Messages.GIF,",
+            find: 'preload:"none","aria',
            replacement: {
-                match: /alt:(\i)=(\i\.default\.Messages\.GIF)(?=,[^}]*\}=(\i))/,
+                match: /(?<==(.{1,3})\.alt.{0,20})\?.{0,5}\.Messages\.GIF/,
                replace:
-                    // rename prop so we can always use default value
+                    "?($1.alt='GIF',$self.altify($1))",
                    "alt_$$:$1=$self.altify($3)||$2",
            },
        },
    ],
    altify(props: any) {
        props.alt ??= "GIF";
        if (props.alt !== "GIF") return props.alt;
        let url: string = props.original || props.src;
--- a/src/plugins/betterNotes/index.tsx
+++ b/src/plugins/betterNotes/index.tsx
@ -19,9 +19,6 @@
 import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 const UserPopoutSectionCssClasses = findByPropsLazy("section", "lastSection");
 export default definePlugin({
    name: "BetterNotesBox",
@ -32,31 +29,17 @@ export default definePlugin({
        {
            find: "hideNote:",
            all: true,
            // Some modules match the find but the replacement is returned untouched
            noWarn: true,
            predicate: () => Vencord.Settings.plugins.BetterNotesBox.hide,
            replacement: {
-                match: /hideNote:.+?(?=([,}].*?\)))/g,
+                match: /hideNote:.+?(?=[,}])/g,
-                replace: (m, rest) => {
+                replace: "hideNote:true",
                    const destructuringMatch = rest.match(/}=.+/);
                    if (destructuringMatch == null) return "hideNote:!0";
                    return m;
            }
-            }
+        }, {
        },
        {
            find: "Messages.NOTE_PLACEHOLDER",
            replacement: {
                match: /\.NOTE_PLACEHOLDER,/,
                replace: "$&spellCheck:!Vencord.Settings.plugins.BetterNotesBox.noSpellCheck,"
            }
        },
        {
            find: ".Messages.NOTE}",
            replacement: {
                match: /(?<=return \i\?)null(?=:\(0,\i\.jsxs)/,
                replace: "$self.patchPadding(arguments[0])"
            }
        }
    ],
@ -73,12 +56,5 @@ export default definePlugin({
            disabled: () => Settings.plugins.BetterNotesBox.hide,
            default: false
        }
    },
    patchPadding(e: any) {
        if (!e.lastSection) return;
        return (
            <div className={UserPopoutSectionCssClasses.lastSection}></div>
        );
    }
 });
--- a/src/plugins/betterRoleDot/index.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, Devs.AutumnVN],
+    authors: [Devs.Ven],
    description:
        "Copy role colour on RoleDot (accessibility setting) click. Also allows using both RoleDot and coloured names simultaneously",
@ -38,31 +38,11 @@ export default definePlugin({
        {
            find: '"dot"===',
            all: true,
            noWarn: true,
            predicate: () => Settings.plugins.BetterRoleDot.bothStyles,
            replacement: {
                match: /"(?:username|dot)"===\i(?!\.\i)/g,
                replace: "true",
            },
        },
        {
            find: ".ADD_ROLE_A11Y_LABEL",
            predicate: () => Settings.plugins.BetterRoleDot.copyRoleColorInProfilePopout && !Settings.plugins.BetterRoleDot.bothStyles,
            noWarn: true,
            replacement: {
                match: /"dot"===\i/,
                replace: "true"
            }
        },
        {
            find: ".roleVerifiedIcon",
            predicate: () => Settings.plugins.BetterRoleDot.copyRoleColorInProfilePopout && !Settings.plugins.BetterRoleDot.bothStyles,
            noWarn: true,
            replacement: {
                match: /"dot"===\i/,
                replace: "true"
            }
        }
    ],
@ -70,14 +50,7 @@ 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
        }
    },
--- a/src/plugins/betterUploadButton/index.ts
+++ b/src/plugins/betterUploadButton/index.ts
@ -29,8 +29,9 @@ export default definePlugin({
            replacement: {
                // Discord merges multiple props here with Object.assign()
                // This patch passes a third object to it with which we override onClick and onContextMenu
-                match: /CHAT_ATTACH_UPLOAD_OR_INVITE,onDoubleClick:(.+?:void 0),\.\.\.(\i),/,
+                match: /CHAT_ATTACH_UPLOAD_OR_INVITE,onDoubleClick:(.+?:void 0)\},(.{1,3})\)/,
-                replace: "$&onClick:$1,onContextMenu:$2.onClick,",
+                replace: (m, onDblClick, otherProps) =>
                    `${m.slice(0, -1)},{onClick:${onDblClick},onContextMenu:${otherProps}.onClick})`,
            },
        },
    ],
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
V	5d1d054b7e	MessageLinkEmbeds: Use api	2023-06-24 16:55:57 +02:00
V	a11d5a9111	Add ComponentUpdaterAPI	2023-06-24 16:46:09 +02:00