chore: prep for flatpak

chore: lint
fix: make minimize only run on autostart
2023-12-09 23:09:54 +00:00 · 2023-12-09 23:01:35 +00:00 · 2023-12-09 23:00:47 +00:00
103 changed files with 4572 additions and 7929 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -0,0 +1,63 @@
+{
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "ignorePatterns": ["dist", "node_modules"],
+    "plugins": [
+        "@typescript-eslint",
+        "license-header",
+        "simple-import-sort",
+        "unused-imports",
+        "path-alias",
+        "prettier"
+    ],
+    "settings": {
+        "import/resolver": {
+            "alias": {
+                "map": []
+            }
+        }
+    },
+    "rules": {
+        "license-header/header": ["error", "scripts/header.txt"],
+        "eqeqeq": ["error", "always", { "null": "ignore" }],
+        "spaced-comment": ["error", "always", { "markers": ["!"] }],
+        "yoda": "error",
+        "prefer-destructuring": ["error", { "object": true, "array": false }],
+        "operator-assignment": ["error", "always"],
+        "no-useless-computed-key": "error",
+        "no-unneeded-ternary": ["error", { "defaultAssignment": false }],
+        "no-invalid-regexp": "error",
+        "no-constant-condition": ["error", { "checkLoops": false }],
+        "no-duplicate-imports": "error",
+        "no-extra-semi": "error",
+        "dot-notation": "error",
+        "no-useless-escape": "error",
+        "no-fallthrough": "error",
+        "for-direction": "error",
+        "no-async-promise-executor": "error",
+        "no-cond-assign": "error",
+        "no-dupe-else-if": "error",
+        "no-duplicate-case": "error",
+        "no-irregular-whitespace": "error",
+        "no-loss-of-precision": "error",
+        "no-misleading-character-class": "error",
+        "no-prototype-builtins": "error",
+        "no-regex-spaces": "error",
+        "no-shadow-restricted-names": "error",
+        "no-unexpected-multiline": "error",
+        "no-unsafe-optional-chaining": "error",
+        "no-useless-backreference": "error",
+        "use-isnan": "error",
+        "prefer-const": "error",
+        "prefer-spread": "error",
+
+        "simple-import-sort/imports": "error",
+        "simple-import-sort/exports": "error",
+
+        "unused-imports/no-unused-imports": "error",
+
+        "path-alias/no-relative": "error",
+
+        "prettier/prettier": "error"
+    }
+}
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-    - name: Vencord Support Server
-      url: https://discord.gg/D9uwnFnqmd
-      about: "Need Help? Join our support server and ask in the #vesktop-support channel!"
--- a/.github/ISSUE_TEMPLATE/dev-issue.yml
+++ b/.github/ISSUE_TEMPLATE/dev-issue.yml
@@ -1,15 +0,0 @@
-name: Vesktop Developer Issue
-description: Reserved for Vesktop Developers. Join our support server for support.
-
-body:
-    - type: markdown
-      attributes:
-          value: |
-              ![Are you a developer? No? This form is not for you!](https://github.com/Vencord/Vesktop/blob/main/.github/ISSUE_TEMPLATE/developer-banner.png?raw=true)
-              GitHub Issues are for developers, not support. Please use our [support server](https://vencord.dev/discord) if you are not a developer.
-    - type: textarea
-      id: content
-      attributes:
-          label: Content
-      validations:
-          required: true
--- a/.github/ISSUE_TEMPLATE/developer-banner.png
+++ b/.github/ISSUE_TEMPLATE/developer-banner.png
--- a/.github/workflows/meta.yml
+++ b/.github/workflows/meta.yml
@@ -6,37 +6,33 @@ on:
            - published
    workflow_dispatch:

-permissions:
-  contents: write
-
 jobs:
    update:
        runs-on: ubuntu-latest

        steps:
-            - uses: actions/checkout@v4
-            - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
+        - uses: actions/checkout@v3
+        - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json

-            - name: Use Node.js 20
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
+        - name: Use Node.js 18.18.2
+          uses: actions/setup-node@v3
+          with:
+              node-version: 18.18.2

-            - name: Install dependencies
-              run: pnpm i
+        - name: Install dependencies
+          run: pnpm i

-            - name: Update metainfo
-              run: pnpm updateMeta
+        - name: Update metainfo
+          run: pnpm updateMeta

-            - name: Commit and merge in changes
-              run: |
-                  git config user.name "github-actions[bot]"
-                  git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-                  gh release upload "${{ github.event.release.tag_name }}" meta/dev.vencord.Vesktop.metainfo.xml
-
-                  git add meta/dev.vencord.Vesktop.metainfo.xml
-                  git commit -m "metainfo: add entry for ${{ github.event.release.tag_name }}"
-                  git push origin main
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        - name: Commit and merge in changes
+          run: |
+              git config user.name "github-actions[bot]"
+              git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+              git checkout -b ci/meta-update
+              git add meta/dev.vencord.Vesktop.metainfo.xml
+              git commit -m "Insert release changes for ${{ github.event.release.tag_name }}"
+              git push origin ci/meta-update
+              gh pr create -B main -H ci/meta-update -t "Metainfo for ${{ github.event.release.tag_name }}" -b "This PR updates the metainfo for release ${{ github.event.release.tag_name }}. @lewisakura @Vendicated"
+          env:
+              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,7 +4,6 @@ on:
    push:
        tags:
            - v*
-    workflow_dispatch:

 jobs:
    release:
@@ -22,13 +21,13 @@ jobs:
                      platform: windows

        steps:
-            - uses: actions/checkout@v4
-            - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
+            - uses: actions/checkout@v3
+            - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json

-            - name: Use Node.js 20
-              uses: actions/setup-node@v4
+            - name: Use Node.js 18.18.2
+              uses: actions/setup-node@v3
              with:
-                  node-version: 20
+                  node-version: 18.18.2
                  cache: "pnpm"

            - name: Install dependencies
@@ -38,22 +37,7 @@ jobs:
              run: pnpm build

            - name: Run Electron Builder
-              if: ${{ matrix.platform != 'mac' }}
              run: |
                  pnpm electron-builder --${{ matrix.platform }} --publish always
              env:
                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: Run Electron Builder
-              if: ${{ matrix.platform == 'mac' }}
-              run: |
-                  echo "$API_KEY" > apple.p8
-                  pnpm electron-builder --${{ matrix.platform }} --publish always
-              env:
-                GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                CSC_LINK: ${{ secrets.APPLE_SIGNING_CERT }}
-                CSC_KEY_PASSWORD: ${{ secrets.APPLE_SIGNING_CERT_PASSWORD }}
-                API_KEY: ${{ secrets.APPLE_API_KEY }}
-                APPLE_API_KEY: apple.p8
-                APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
-                APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,13 +11,13 @@ jobs:
        runs-on: ubuntu-latest

        steps:
-            - uses: actions/checkout@v4
-            - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
+            - uses: actions/checkout@v3
+            - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json

-            - name: Use Node.js 20
-              uses: actions/setup-node@v4
+            - name: Use Node.js 18.18.2
+              uses: actions/setup-node@v3
              with:
-                  node-version: 20
+                  node-version: 18.18.2
                  cache: "pnpm"

            - name: Install dependencies
--- a/.github/workflows/update-vencord-dev.yml
+++ b/.github/workflows/update-vencord-dev.yml
@@ -1,28 +0,0 @@
-name: Update vencord.dev Vesktop version
-
-on:
-    release:
-        types:
-            - published
-
-jobs:
-    update:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Update scripts/_latestVesktopVersion.txt file in vencord.dev repo
-              run: |
-                  git config --global user.name "$USERNAME"
-                  git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-                  git clone https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git repo
-
-                  cd repo
-                  echo "${{ github.event.release.tag_name }}" > scripts/_latestVesktopVersion.txt
-                  
-                  git add scripts/_latestVesktopVersion.txt
-                  git commit -m "Update Vesktop version to ${{ github.event.release.tag_name }}"
-                  git push https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git
-              env:
-                  API_TOKEN: ${{ secrets.VENCORD_DEV_GITHUB_TOKEN }}
-                  GH_REPO: Vencord/vencord.dev
-                  USERNAME: GitHub-Actions
--- a/.github/workflows/winget-submission.yml
+++ b/.github/workflows/winget-submission.yml
@@ -13,10 +13,10 @@ on:
 jobs:
  winget:
    name: Publish winget package
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
    steps:
      - name: Submit package to Winget Community Repo
-        uses: vedantmgoyal2009/winget-releaser@0db4f0a478166abd0fa438c631849f0b8dcfb99f
+        uses: vedantmgoyal2009/winget-releaser@e68d386d5d6a1cef8cb0fb5e62b77ebcb83e7d58 # v2
        with:
          identifier: Vencord.Vesktop
          token: ${{ secrets.WINGET_PAT }}
--- a/.npmrc
+++ b/.npmrc
@@ -1,2 +1 @@
 node-linker=hoisted
-package-manager-strict=false
--- a/README.md
+++ b/README.md
@@ -1,73 +1,51 @@
 # Vesktop

-Vesktop is a custom Discord desktop app
-
-**Main features**:
- Vencord preinstalled
- Much more lightweight and faster than the official Discord app
- Linux Screenshare with sound & wayland
- Much better privacy, since Discord has no access to your system
+Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with [Vencord](https://github.com/Vendicated/Vencord) pre-installed

 **Not yet supported**:
 - Global Keybinds
- see the [Roadmap](https://github.com/Vencord/Vesktop/issues/324)
+
+Bug reports, feature requests & contributions are highly appreciated!!

 ![](https://github.com/Vencord/Vesktop/assets/45497981/8608a899-96a9-4027-9725-2cb02ba189fd)
-![](https://github.com/Vencord/Vesktop/assets/45497981/8701e5de-52c4-4346-a990-719cb971642e)
+![grafik](https://github.com/Vencord/Vesktop/assets/45497981/8701e5de-52c4-4346-a990-719cb971642e)
+

 ## Installing

 ### Windows

-If you don't know the difference, pick the Installer.
-
- [Installer](https://vencord.dev/download/vesktop/universal/windows)
- Portable:
-  - [x64 / amd64](https://vencord.dev/download/vesktop/amd64/windows-portable)
-  - [Arm® 64](https://vencord.dev/download/vesktop/arm64/windows-portable)
+Download and run Vesktop-Setup-VERSION.exe from [releases](https://github.com/Vencord/Vesktop/releases/latest)

 ### Mac

-Download the latest [Vesktop.dmg](https://vencord.dev/download/vesktop/universal/dmg) or use [Homebrew](https://brew.sh/)
-
-```sh
-brew install vesktop
-```
+Download and run Vesktop-VERSION.dmg from [releases](https://github.com/Vencord/Vesktop/releases/latest)

 ### Linux

-[![Download on Flathub](https://dl.flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/dev.vencord.Vesktop)
+[![](https://dl.flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/dev.vencord.Vesktop)

-If you don't know the difference, pick amd64.
+#### Arch based

- amd64 / x86_64
-  - [AppImage](https://vencord.dev/download/vesktop/amd64/appimage)
-  - [Ubuntu/Debian (.deb)](https://vencord.dev/download/vesktop/amd64/deb)
-  - [Fedora/RHEL (.rpm)](https://vencord.dev/download/vesktop/amd64/rpm)
-  - [tarball](https://vencord.dev/download/vesktop/amd64/tar)
- Arm® 64 / aarch64
-  - [AppImage](https://vencord.dev/download/vesktop/arm64/appimage)
-  - [Ubuntu/Debian (.deb)](https://vencord.dev/download/vesktop/arm64/deb)
-  - [Fedora/RHEL (.rpm)](https://vencord.dev/download/vesktop/arm64/rpm)
-  - [tarball](https://vencord.dev/download/vesktop/arm64/tar)
+Install [vencord-desktop-git](https://aur.archlinux.org/packages/vencord-desktop-git) from the AUR using your favourite AUR helper, for example [yay](https://github.com/Jguer/yay)

-#### Community packages
+#### Ubuntu/Debian based

-Below you can find unofficial packages created by the community. They are not officially supported by us, so before reporting issues, please first confirm the issue also happens on official builds. When in doubt, consult with their packager first. The flatpak and AppImage should work on any distro that [supports them](https://flatpak.org/setup/), so I recommend you just use those instead!
+Download Vesktop-VERSION.deb from [releases](https://github.com/Vencord/Vesktop/releases/latest)

- Arch Linux: [Vesktop on the Arch user repository](https://aur.archlinux.org/packages?K=vesktop)
- NixOS: https://wiki.nixos.org/wiki/Discord#Vesktop
- Slackware: [Vesktop on the SlackBuilds](https://slackbuilds.org/result/?search=vesktop)
- Windows - Scoop: https://scoop.sh/#/apps?q=Vesktop
+#### Fedora/RHEL based

-## Building from Source
+Download Vesktop-VERSION.rpm from [releases](https://github.com/Vencord/Vesktop/releases/latest)

-You need to have the following dependencies installed:
- [Git](https://git-scm.com/downloads)
- [Node.js](https://nodejs.org/en/download)
- pnpm: `npm install --global pnpm`
+#### Other

-Packaging will create builds in the dist/ folder
+Either download Vesktop-VERSION.AppImage and just run it directly or grab Vesktop-VERSION.tar.gz, extract it somewhere and run `vencorddesktop`.
+
+If other packages are created, feel free to open an issue and we'll link them here.
+
+## Building
+
+Packaging will create builds in the dist/ folder. You can then install them like mentioned above or distribute them

 ```sh
 git clone https://github.com/Vencord/Vesktop
@@ -79,12 +57,18 @@ pnpm i
 # Either run it without packaging
 pnpm start

-# Or package (will build packages for your OS)
+# Or package
 pnpm package
-
-# Or only build the Linux Pacman package
+# Or only build the pacman target
 pnpm package --linux pacman
-
 # Or package to a directory only
 pnpm package:dir
 ```
+
+## Motivation
+
+The official Discord Desktop app is very resource heavy compared to Discord in your Browser. There are multiple alternative Electron apps (ArmCord, WebCord, probably more) that prove how much of a performance gain you can gain by using a custom app. ArmCord already supports Vencord but makes it pretty limited for us. Making our own standalone app gives us much more control.
+
+This is just a random idea I (V) got, and might not actually ever be finished heh
+
+Gluon also seems very attractive for this because of how lightweight it can be and because unlike electron, streaming just works out of the box like in any chromium browser. However, at the time of writing this, it still lacks some features necessary to make it work (synchronous ipc or a way to get node process variables into the onLoad function for instance, plus onLoad seems to load a little too late sometimes)
--- a/build/background.tiff
+++ b/build/background.tiff
--- a/build/entitlements.mac.plist
+++ b/build/entitlements.mac.plist
@@ -1,21 +0,0 @@
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-	<true/>
-	<key>com.apple.security.cs.allow-jit</key>
-	<true/>
-	<key>com.apple.security.network.client</key>
-	<true/>
-	<key>com.apple.security.device.audio-input</key>
-	<true/>
-	<key>com.apple.security.device.camera</key>
-	<true/>
-	<key>com.apple.security.device.bluetooth</key>
-	<true/>
-	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
-	<true/>
-	<key>com.apple.security.cs.disable-library-validation</key>
-	<true/>
-  </dict>
-</plist>
--- a/build/installer.nsh
+++ b/build/installer.nsh
@@ -1,8 +1,8 @@
 !macro preInit
 SetRegView 64
-  WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\vesktop"
-  WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\vesktop"
+  WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\VencordDesktop"
+  WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\VencordDesktop"
 SetRegView 32
-  WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\vesktop"
-  WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\vesktop"
+  WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\VencordDesktop"
+  WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\VencordDesktop"
 !macroend
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,103 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-//@ts-check
-
-import stylistic from "@stylistic/eslint-plugin";
-import pathAlias from "eslint-plugin-path-alias";
-import simpleHeader from "eslint-plugin-simple-header";
-import importSort from "eslint-plugin-simple-import-sort";
-import unusedImports from "eslint-plugin-unused-imports";
-import tseslint from "typescript-eslint";
-import prettier from "eslint-plugin-prettier";
-
-export default tseslint.config(
-    { ignores: ["dist"] },
-
-    {
-        files: ["src/**/*.{tsx,ts,mts,mjs,js,jsx}"],
-        plugins: {
-            simpleHeader,
-            stylistic,
-            importSort,
-            unusedImports,
-            pathAlias,
-            prettier
-        },
-        settings: {
-            "import/resolver": {
-                alias: {
-                    map: []
-                }
-            }
-        },
-        languageOptions: {
-            parser: tseslint.parser,
-            parserOptions: {
-                project: true,
-                tsconfigRootDir: import.meta.dirname
-            }
-        },
-        rules: {
-            "simpleHeader/header": [
-                "error",
-                {
-                    files: ["scripts/header.txt"],
-                    templates: { author: [".*", "Vendicated and Vesktop contributors"] }
-                }
-            ],
-
-            // ESLint Rules
-
-            yoda: "error",
-            eqeqeq: ["error", "always", { null: "ignore" }],
-            "prefer-destructuring": [
-                "error",
-                {
-                    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 }],
-            "no-invalid-regexp": "error",
-            "no-constant-condition": ["error", { checkLoops: false }],
-            "no-duplicate-imports": "error",
-            "dot-notation": "error",
-            "no-useless-escape": "error",
-            "no-fallthrough": "error",
-            "for-direction": "error",
-            "no-async-promise-executor": "error",
-            "no-cond-assign": "error",
-            "no-dupe-else-if": "error",
-            "no-duplicate-case": "error",
-            "no-irregular-whitespace": "error",
-            "no-loss-of-precision": "error",
-            "no-misleading-character-class": "error",
-            "no-prototype-builtins": "error",
-            "no-regex-spaces": "error",
-            "no-shadow-restricted-names": "error",
-            "no-unexpected-multiline": "error",
-            "no-unsafe-optional-chaining": "error",
-            "no-useless-backreference": "error",
-            "use-isnan": "error",
-            "prefer-const": "error",
-            "prefer-spread": "error",
-
-            // Styling Rules
-            "stylistic/spaced-comment": ["error", "always", { markers: ["!"] }],
-            "stylistic/no-extra-semi": "error",
-
-            // Plugin Rules
-            "importSort/imports": "error",
-            "importSort/exports": "error",
-            "unusedImports/no-unused-imports": "error",
-            "pathAlias/no-relative": "error",
-            "prettier/prettier": "error"
-        }
-    }
-);
--- a/meta/dev.vencord.Vesktop.metainfo.xml
+++ b/meta/dev.vencord.Vesktop.metainfo.xml
@@ -28,110 +28,6 @@
    </screenshot>
  </screenshots>
  <releases>
-    <release version="1.5.5" date="2025-02-06" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.5</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>Now remembers your previous Screenshare resolution &amp; FPS</li>
-          <li>You can now disable the splash screen in Vesktop Settings</li>
-          <li>Now supports deep links (opening Discord Message Links in Vesktop) by @Covkie</li>
-          <li>Now supports discord:// uri scheme, allowing it to open things like invites from your Browser even while closed by @Covkie</li>
-          <li>Added 4k resolution to screenshare by @makindotcc</li>
-          <li>Fixed some performance issues caused by a recent Discord update</li>
-          <li>Updated Electron to v34 &amp; chromium to v132, bringing new features and fixes</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.4" date="2024-12-05" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.4</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>Upgraded electron to version 33 which brings many improvements and bug fixes</li>
-          <li>AudioShare: add even more granular selection, Allow device sharing by @Curve</li>
-          <li>Enable speech-dispatcher support for TTS on linux by @adryd325</li>
-          <li>fixed screenshare picker window subtitle alignment by @ryawaa</li>
-          <li>fixed splash corners by @Covkie</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.3" date="2024-07-04" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.3</url>
-      <description>
-        <p>Features</p>
-        <ul>
-          <li>added arm64 Windows support</li>
-          <li>windows &amp; macOS builds are now universal</li>
-          <li>added option to configure spellcheck languages</li>
-          <li>will auto-update from now on</li>
-          <li>updated electron to 31 &amp; Chromium to 126</li>
-          <li>macOS: Added customized dmg background by @khcrysalis</li>
-          <li>Windows Portable: store settings in portable folder by @MrGarlic1</li>
-          <li>linux audioshare: added granular selection, more options, better ui by @Curve</li>
-          <li>changed default screen-sharing quality to 720p 30 FPS by @Tiagoquix</li>
-        </ul>
-        <p>Fixes</p>
-        <ul>
-          <li>macOS: Added workaround for making things in draggable area clickable by @HAHALOSAH</li>
-          <li>fixed Screenshare UI for non-linux systems by @PolisanTheEasyNick</li>
-          <li>fixed opening on screen that was disconnected by @MrGarlic1</li>
-          <li>mac: hide native window controls with custom titlebar enabled by @MrGarlic1</li>
-          <li>fixed some broken patches by @D3SOX</li>
-          <li>fixed framerate in constraints by @kittykel</li>
-          <li>fixed some first launch switches not applying</li>
-          <li>fixed potential sandbox escape via custom vencord location</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.2" date="2024-05-01" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.2</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>Fixed scrollbars looking wrong (actually Discord's fault)</li>
-          <li>Tray: Added left click hide/show feature by @0bCdian</li>
-          <li>MacOS: Fixed the app not properly requesting microphone permissions by @ssalggnikool</li>
-          <li>Linux: Various fixed related to audio screenshare by @Curve</li>
-          <li>Linux: Overhauled &amp; improved screenshare with better framerate by @kaitlynkittyy</li>
-          <li>Users can now pass --enable/disable-features command line flags by @takase1121</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.1" date="2024-03-12" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.1</url>
-      <description>
-        <p>New Features</p>
-        <ul>
-          <li>Added categories to Vesktop settings to reduce visual clutter by @justin13888</li>
-          <li>Added support for Vencord's transparent window options</li>
-        </ul>
-        <p>Fixes</p>
-        <ul>
-          <li>Fixed ugly error popups when starting Vesktop without working internet connection</li>
-          <li>Fixed popout title bars on Windows</li>
-          <li>Fixed spellcheck entries</li>
-          <li>Fixed screenshare audio using microphone on debian, by @Curve</li>
-          <li>Fixed a bug where autostart on Linux won't preserve command line flags</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.0" date="2024-01-16" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.0</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>fully renamed to Vesktop. You will likely have to login to Discord again. You might have to re-create your vesktop shortcut</li>
-          <li>added option to disable smooth scrolling by @ZirixCZ</li>
-          <li>added setting to disable hardware acceleration by @zt64</li>
-          <li>fixed adding connections</li>
-          <li>fixed / improved discord popouts</li>
-          <li>you can now use the custom discord titlebar on linux/mac</li>
-          <li>the splash window is now draggable</li>
-          <li>now signed on mac</li>
-        </ul>
-      </description>
-    </release>
    <release version="0.4.4" date="2023-12-02" type="stable">
      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.4.4</url>
      <description>
@@ -238,7 +134,7 @@
  <url type="vcs-browser">https://github.com/Vencord/Vesktop</url>
  <categories>
    <category>InstantMessaging</category>
-    <category>Network</category>
+    <category>AudioVideo</category>
  </categories>
  <requires>
    <control>pointing</control>
@@ -250,7 +146,11 @@
    <control>voice</control>
    <display_length compare="ge">760</display_length>
    <display_length compare="le">1200</display_length>
+    <internet>always</internet>
  </recommends>
+  <supports>
+    <internet>always</internet>
+  </supports>
  <content_rating type="oars-1.1">
    <content_attribute id="social-chat">intense</content_attribute>
    <content_attribute id="social-audio">intense</content_attribute>
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
-    "name": "vesktop",
-    "version": "1.5.6",
+    "name": "VencordDesktop",
+    "version": "0.4.4",
    "private": true,
-    "description": "Vesktop is a custom Discord desktop app",
+    "description": "",
    "keywords": [],
    "homepage": "https://vencord.dev/",
-    "license": "GPL-3.0-or-later",
+    "license": "GPL-3.0",
    "author": "Vendicated <vendicated@riseup.net>",
    "main": "dist/js/main.js",
    "scripts": {
@@ -13,7 +13,7 @@
        "build:dev": "pnpm build --dev",
        "package": "pnpm build && electron-builder",
        "package:dir": "pnpm build && electron-builder --dir",
-        "lint": "eslint",
+        "lint": "eslint . --ext .js,.jsx,.ts,.tsx,.mts,.mjs",
        "lint:fix": "pnpm lint --fix",
        "start": "pnpm build && electron .",
        "start:dev": "pnpm build:dev && electron .",
@@ -21,64 +21,55 @@
        "test": "pnpm lint && pnpm testTypes",
        "testTypes": "tsc --noEmit",
        "watch": "pnpm build --watch",
-        "updateMeta": "tsx scripts/utils/updateMeta.mts",
-        "updateArrpcDB": "node ./node_modules/arrpc/update_db.js",
-        "postinstall": "pnpm updateArrpcDB"
+        "updateMeta": "tsx scripts/utils/updateMeta.mts"
    },
    "dependencies": {
-        "arrpc": "github:OpenAsar/arrpc#2234e9c9111f4c42ebcc3aa6a2215bfd979eef77",
-        "electron-updater": "^6.6.2"
+        "arrpc": "github:OpenAsar/arrpc#3e22fd776273afaa4a80c51deb86077ffdd4d2ae"
    },
    "optionalDependencies": {
-        "@vencord/venmic": "^6.1.0"
+        "@vencord/venmic": "^2.1.3"
    },
    "devDependencies": {
        "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-        "@stylistic/eslint-plugin": "^4.2.0",
-        "@types/node": "^22.13.17",
-        "@types/react": "18.3.1",
-        "@vencord/types": "^1.11.5",
-        "dotenv": "^16.4.7",
-        "electron": "^35.1.5",
-        "electron-builder": "^26.0.12",
-        "esbuild": "^0.25.2",
-        "eslint": "^9.23.0",
+        "@types/node": "^20.10.0",
+        "@types/react": "^18.2.39",
+        "@typescript-eslint/eslint-plugin": "^6.13.1",
+        "@typescript-eslint/parser": "^6.13.1",
+        "@vencord/types": "^0.1.2",
+        "dotenv": "^16.3.1",
+        "electron": "^27.1.2",
+        "electron-builder": "^24.9.1",
+        "esbuild": "^0.19.8",
+        "eslint": "^8.54.0",
+        "eslint-config-prettier": "^9.0.0",
        "eslint-import-resolver-alias": "^1.1.2",
-        "eslint-plugin-path-alias": "^2.1.0",
-        "eslint-plugin-prettier": "^5.2.5",
-        "eslint-plugin-simple-header": "^1.2.2",
-        "eslint-plugin-simple-import-sort": "^12.1.1",
-        "eslint-plugin-unused-imports": "^4.1.4",
-        "prettier": "^3.5.3",
+        "eslint-plugin-license-header": "^0.6.0",
+        "eslint-plugin-path-alias": "^1.0.0",
+        "eslint-plugin-prettier": "^5.0.1",
+        "eslint-plugin-simple-import-sort": "^10.0.0",
+        "eslint-plugin-unused-imports": "^3.0.0",
+        "prettier": "^3.1.0",
        "source-map-support": "^0.5.21",
-        "tsx": "^4.19.3",
-        "type-fest": "^4.39.0",
-        "typescript": "^5.8.2",
-        "typescript-eslint": "^8.29.0",
-        "xml-formatter": "^3.6.5"
+        "tsx": "^4.6.0",
+        "type-fest": "^4.8.2",
+        "typescript": "^5.3.2",
+        "xml-formatter": "^3.6.0"
    },
-    "packageManager": "pnpm@10.7.1",
+    "packageManager": "pnpm@8.11.0",
    "engines": {
        "node": ">=18",
        "pnpm": ">=8"
    },
    "build": {
-        "appId": "dev.vencord.vesktop",
+        "appId": "dev.vencord.desktop",
        "productName": "Vesktop",
        "files": [
            "!*",
-            "!node_modules",
            "dist/js",
            "static",
            "package.json",
            "LICENSE"
        ],
-        "protocols": {
-            "name": "Discord",
-            "schemes": [
-                "discord"
-            ]
-        },
        "beforePack": "scripts/build/sandboxFix.js",
        "linux": {
            "icon": "build/icon.icns",
@@ -115,14 +106,12 @@
                }
            ],
            "desktop": {
-                "entry": {
-                    "Name": "Vesktop",
-                    "GenericName": "Internet Messenger",
-                    "Type": "Application",
-                    "Categories": "Network;InstantMessaging;Chat;",
-                    "Keywords": "discord;vencord;electron;chat;",
-                    "MimeType": "x-scheme-handler/discord"
-                }
+                "Name": "Vesktop",
+                "GenericName": "Internet Messenger",
+                "Type": "Application",
+                "Categories": "Network;InstantMessaging;Chat;",
+                "Keywords": "discord;vencord;electron;chat;",
+                "StartupWMClass": "VencordDesktop"
            }
        },
        "mac": {
@@ -130,40 +119,18 @@
                {
                    "target": "default",
                    "arch": [
-                        "universal"
+                        "x64",
+                        "arm64"
                    ]
                }
            ],
-            "category": "public.app-category.social-networking",
-            "darkModeSupport": true,
+            "category": "Network",
            "extendInfo": {
                "NSMicrophoneUsageDescription": "This app needs access to the microphone",
                "NSCameraUsageDescription": "This app needs access to the camera",
                "com.apple.security.device.audio-input": true,
                "com.apple.security.device.camera": true
-            },
-            "notarize": true
-        },
-        "dmg": {
-            "background": "build/background.tiff",
-            "icon": "build/icon.icns",
-            "iconSize": 105,
-            "window": {
-                "width": 512,
-                "height": 340
-            },
-            "contents": [
-                {
-                    "x": 140,
-                    "y": 160
-                },
-                {
-                    "x": 372,
-                    "y": 160,
-                    "type": "link",
-                    "path": "/Applications"
-                }
-            ]
+            }
        },
        "nsis": {
            "include": "build/installer.nsh",
@@ -171,39 +138,12 @@
        },
        "win": {
            "target": [
-                {
-                    "target": "nsis",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                },
-                {
-                    "target": "zip",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                }
+                "nsis",
+                "zip"
            ]
        },
        "publish": {
            "provider": "github"
-        },
-        "rpm": {
-            "fpm": [
-                "--rpm-rpmbuild-define=_build_id_links none"
-            ]
        }
-    },
-    "pnpm": {
-        "patchedDependencies": {
-            "arrpc@3.5.0": "patches/arrpc@3.5.0.patch"
-        },
-        "onlyBuiltDependencies": [
-            "@vencord/venmic",
-            "electron",
-            "esbuild"
-        ]
    }
 }
--- a/patches/arrpc@3.5.0.patch
+++ b/patches/arrpc@3.5.0.patch
@@ -1,27 +0,0 @@
-diff --git a/src/process/index.js b/src/process/index.js
-index 389b0845256a34b4536d6da99edb00d17f13a6b4..f17a0ac687e9110ebfd33cb91fd2f6250d318643 100644
--- a/src/process/index.js
-+++ b/src/process/index.js
-@@ -5,8 +5,20 @@ import fs from 'node:fs';
- import { dirname, join } from 'path';
- import { fileURLToPath } from 'url';
- 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const DetectableDB = JSON.parse(fs.readFileSync(join(__dirname, 'detectable.json'), 'utf8'));
-+const DetectableDB = require('./detectable.json');
-+DetectableDB.push(
-+  {
-+    aliases: ["Obs"],
-+    executables: [
-+      { is_launcher: false, name: "obs", os: "linux" },
-+      { is_launcher: false, name: "obs.exe", os: "win32" },
-+      { is_launcher: false, name: "obs.app", os: "darwin" }
-+    ],
-+    hook: true,
-+    id: "STREAMERMODE",
-+    name: "OBS"
-+  }
-+);
- 
- import * as Natives from './native/index.js';
- const Native = Natives[process.platform];
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/scripts/build/build.mts
+++ b/scripts/build/build.mts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { BuildContext, BuildOptions, context } from "esbuild";
@@ -63,6 +63,12 @@ await Promise.all([
        outfile: "dist/js/preload.js",
        footer: { js: "//# sourceURL=VCDPreload" }
    }),
+    createContext({
+        ...NodeCommonOpts,
+        entryPoints: ["src/updater/preload.ts"],
+        outfile: "dist/js/updaterPreload.js",
+        footer: { js: "//# sourceURL=VCDUpdaterPreload" }
+    }),
    createContext({
        ...CommonOpts,
        globalName: "Vesktop",
--- a/scripts/build/injectReact.mjs
+++ b/scripts/build/injectReact.mjs
@@ -1,3 +1,9 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
 export const VencordFragment = /* #__PURE__*/ Symbol.for("react.fragment");
 export let VencordCreateElement = (...args) =>
    (VencordCreateElement = Vencord.Webpack.Common.React.createElement)(...args);
--- a/scripts/build/sandboxFix.js
+++ b/scripts/build/sandboxFix.js
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 // Based on https://github.com/gergof/electron-builder-sandbox-fix/blob/master/lib/index.js
--- a/scripts/build/vencordDep.mts
+++ b/scripts/build/vencordDep.mts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { globalExternalsWithRegExp } from "@fal-works/esbuild-plugin-global-externals";
--- a/scripts/header.txt
+++ b/scripts/header.txt
@@ -1,5 +1,5 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) {year} {author}
- * SPDX-License-Identifier: GPL-3.0-or-later
+ * Copyright (c) 2023 Vendicated and Vencord contributors
 */
--- a/scripts/start.ts
+++ b/scripts/start.ts
@@ -8,4 +8,4 @@ import "./utils/dotenv";

 import { spawnNodeModuleBin } from "./utils/spawn.mjs";

-spawnNodeModuleBin("electron", [process.cwd(), ...(process.env.ELECTRON_LAUNCH_FLAGS?.split(" ") ?? [])]);
+spawnNodeModuleBin("electron", [".", ...(process.env.ELECTRON_LAUNCH_FLAGS?.split(" ") ?? [])]);
--- a/scripts/startWatch.mts
+++ b/scripts/startWatch.mts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import "./start";
--- a/scripts/utils/dotenv.ts
+++ b/scripts/utils/dotenv.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { config } from "dotenv";
--- a/scripts/utils/spawn.mts
+++ b/scripts/utils/spawn.mts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { spawn as spaaawn, SpawnOptions } from "child_process";
--- a/scripts/utils/updateMeta.mts
+++ b/scripts/utils/updateMeta.mts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { promises as fs } from "node:fs";
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -1,13 +1,13 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 declare global {
    export var VesktopNative: typeof import("preload/VesktopNative").VesktopNative;
    export var Vesktop: typeof import("renderer/index");
-    export var VesktopPatchGlobals: any;
+    export var VCDP: any;

    export var IS_DEV: boolean;
 }
--- a/src/main/about.ts
+++ b/src/main/about.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { BrowserWindow } from "electron";
--- a/src/main/appBadge.ts
+++ b/src/main/appBadge.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { app, NativeImage, nativeImage } from "electron";
@@ -29,10 +29,10 @@ export function setBadgeCount(count: number) {
            break;
        case "darwin":
            if (count === 0) {
-                app.dock!.setBadge("");
+                app.dock.setBadge("");
                break;
            }
-            app.dock!.setBadge(count === -1 ? "•" : count.toString());
+            app.dock.setBadge(count === -1 ? "•" : count.toString());
            break;
        case "win32":
            const [index, description] = getBadgeIndexAndDescription(count);
--- a/src/main/arrpc.ts
+++ b/src/main/arrpc.ts
@@ -1,13 +1,13 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import Server from "arrpc";
-import { IpcCommands } from "shared/IpcEvents";
+import { IpcEvents } from "shared/IpcEvents";

-import { sendRendererCommand } from "./ipcCommands";
+import { mainWin } from "./mainWindow";
 import { Settings } from "./settings";

 let server: any;
@@ -19,15 +19,16 @@ export async function initArRPC() {

    try {
        server = await new Server();
-        server.on("activity", (data: any) => sendRendererCommand(IpcCommands.RPC_ACTIVITY, JSON.stringify(data)));
-        server.on("invite", async (invite: string, callback: (valid: boolean) => void) => {
+        server.on("activity", (data: any) => mainWin.webContents.send(IpcEvents.ARRPC_ACTIVITY, JSON.stringify(data)));
+        server.on("invite", (invite: string, callback: (valid: boolean) => void) => {
            invite = String(invite);
            if (!inviteCodeRegex.test(invite)) return callback(false);

-            await sendRendererCommand(IpcCommands.RPC_INVITE, invite).then(callback);
-        });
-        server.on("link", async (data: any, deepCallback: (valid: boolean) => void) => {
-            await sendRendererCommand(IpcCommands.RPC_DEEP_LINK, data).then(deepCallback);
+            mainWin.webContents
+                // Safety: Result of JSON.stringify should always be safe to equal
+                // Also, just to be super super safe, invite is regex validated above
+                .executeJavaScript(`Vesktop.openInviteModal(${JSON.stringify(invite)})`)
+                .then(callback);
        });
    } catch (e) {
        console.error("Failed to start arRPC server", e);
--- a/src/main/autoStart.ts
+++ b/src/main/autoStart.ts
@@ -1,55 +1,60 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { app } from "electron";
-import { existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, rmSync, writeFileSync } from "fs";
 import { join } from "path";

 interface AutoStart {
    isEnabled(): boolean;
+    wasAutoStarted(): boolean;
    enable(): void;
    disable(): void;
 }

+const isFlatpak = process.env.FLATPAK_ID !== undefined;
+
 function makeAutoStartLinux(): AutoStart {
    const configDir = process.env.XDG_CONFIG_HOME || join(process.env.HOME!, ".config");
    const dir = join(configDir, "autostart");
-    const file = join(dir, "vesktop.desktop");
-
-    // IM STUPID
-    const legacyName = join(dir, "vencord.desktop");
-    if (existsSync(legacyName)) renameSync(legacyName, file);
-
-    // "Quoting must be done by enclosing the argument between double quotes and escaping the double quote character,
-    // backtick character ("`"), dollar sign ("$") and backslash character ("\") by preceding it with an additional backslash character"
-    // https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables
-    const commandLine = process.argv.map(arg => '"' + arg.replace(/["$`\\]/g, "\\$&") + '"').join(" ");
+    const file = join(dir, "vencord.desktop");

    return {
-        isEnabled: () => existsSync(file),
+        isEnabled: () => existsSync(file), // TODO: flatpak
+        wasAutoStarted: () => process.argv.includes("--autostart"),
        enable() {
-            const desktopFile = `
+            if (isFlatpak) {
+            } else {
+                const desktopFile = `
 [Desktop Entry]
 Type=Application
-Name=Vesktop
-Comment=Vesktop autostart script
-Exec=${commandLine}
-StartupNotify=false
+Version=1.0
+Name=Vencord
+Comment=Vencord autostart script
+Exec=${process.execPath} --autostart
 Terminal=false
+StartupNotify=false
 `.trim();

-            mkdirSync(dir, { recursive: true });
-            writeFileSync(file, desktopFile);
+                mkdirSync(dir, { recursive: true });
+                writeFileSync(file, desktopFile);
+            }
        },
-        disable: () => rmSync(file, { force: true })
+        disable: () => {
+            if (isFlatpak) {
+            } else {
+                rmSync(file, { force: true });
+            }
+        }
    };
 }

 const autoStartWindowsMac: AutoStart = {
    isEnabled: () => app.getLoginItemSettings().openAtLogin,
+    wasAutoStarted: () => app.getLoginItemSettings().wasOpenedAtLogin,
    enable: () => app.setLoginItemSettings({ openAtLogin: true }),
    disable: () => app.setLoginItemSettings({ openAtLogin: false })
 };
--- a/src/main/constants.ts
+++ b/src/main/constants.ts
@@ -1,45 +1,13 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { app } from "electron";
-import { existsSync, mkdirSync, readdirSync, renameSync, rmdirSync } from "fs";
-import { dirname, join } from "path";
-
-const vesktopDir = dirname(process.execPath);
-
-export const PORTABLE =
-    process.platform === "win32" &&
-    !process.execPath.toLowerCase().endsWith("electron.exe") &&
-    !existsSync(join(vesktopDir, "Uninstall Vesktop.exe"));
-
-const LEGACY_DATA_DIR = join(app.getPath("appData"), "VencordDesktop", "VencordDesktop");
-export const DATA_DIR =
-    process.env.VENCORD_USER_DATA_DIR || (PORTABLE ? join(vesktopDir, "Data") : join(app.getPath("userData")));
-
-mkdirSync(DATA_DIR, { recursive: true });
-
-// TODO: remove eventually
-if (existsSync(LEGACY_DATA_DIR)) {
-    try {
-        console.warn("Detected legacy settings dir", LEGACY_DATA_DIR + ".", "migrating to", DATA_DIR);
-        for (const file of readdirSync(LEGACY_DATA_DIR)) {
-            renameSync(join(LEGACY_DATA_DIR, file), join(DATA_DIR, file));
-        }
-        rmdirSync(LEGACY_DATA_DIR);
-        renameSync(
-            join(app.getPath("appData"), "VencordDesktop", "IndexedDB"),
-            join(DATA_DIR, "sessionData", "IndexedDB")
-        );
-    } catch (e) {
-        console.error("Migration failed", e);
-    }
-}
-const SESSION_DATA_DIR = join(DATA_DIR, "sessionData");
-app.setPath("sessionData", SESSION_DATA_DIR);
+import { join } from "path";

+export const DATA_DIR = process.env.VENCORD_USER_DATA_DIR || join(app.getPath("userData"), "VencordDesktop");
 export const VENCORD_SETTINGS_DIR = join(DATA_DIR, "settings");
 export const VENCORD_QUICKCSS_FILE = join(VENCORD_SETTINGS_DIR, "quickCss.css");
 export const VENCORD_SETTINGS_FILE = join(VENCORD_SETTINGS_DIR, "settings.json");
@@ -48,8 +16,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes");
 // needs to be inline require because of circular dependency
 // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised
 export const VENCORD_FILES_DIR =
-    (require("./settings") as typeof import("./settings")).State.store.vencordDir ||
-    join(SESSION_DATA_DIR, "vencordFiles");
+    (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || join(DATA_DIR, "vencordDist");

 export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`;

@@ -59,16 +26,14 @@ export const MIN_HEIGHT = 500;
 export const DEFAULT_WIDTH = 1280;
 export const DEFAULT_HEIGHT = 720;

-export const DISCORD_HOSTNAMES = ["discord.com", "canary.discord.com", "ptb.discord.com"];
-
-const VersionString = `AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${process.versions.chrome.split(".")[0]}.0.0.0 Safari/537.36`;
-const BrowserUserAgents = {
-    darwin: `Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) ${VersionString}`,
-    linux: `Mozilla/5.0 (X11; Linux x86_64) ${VersionString}`,
-    windows: `Mozilla/5.0 (Windows NT 10.0; Win64; x64) ${VersionString}`
+const UserAgents = {
+    darwin: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36",
+    linux: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36",
+    windows:
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"
 };

-export const BrowserUserAgent = BrowserUserAgents[process.platform] || BrowserUserAgents.windows;
+export const UserAgent = UserAgents[process.platform] || UserAgents.windows;

 export const enum MessageBoxChoice {
    Default,
--- a/src/main/firstLaunch.ts
+++ b/src/main/firstLaunch.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { app } from "electron";
@@ -14,21 +14,20 @@ import { ICON_PATH, VIEW_DIR } from "shared/paths";
 import { autoStart } from "./autoStart";
 import { DATA_DIR } from "./constants";
 import { createWindows } from "./mainWindow";
-import { Settings, State } from "./settings";
+import { Settings } from "./settings";
 import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";

 interface Data {
+    minimizeToTray: boolean;
    discordBranch: "stable" | "canary" | "ptb";
-    minimizeToTray?: "on";
-    autoStart?: "on";
-    importSettings?: "on";
-    richPresence?: "on";
+    autoStart: boolean;
+    importSettings: boolean;
+    richPresence: boolean;
 }

 export function createFirstLaunchTour() {
    const win = new BrowserWindow({
        ...SplashProps,
-        transparent: false,
        frame: true,
        autoHideMenuBar: true,
        height: 470,
@@ -45,11 +44,10 @@ export function createFirstLaunchTour() {
        if (!msg.startsWith("form:")) return;
        const data = JSON.parse(msg.slice(5)) as Data;

-        console.log(data);
-        State.store.firstLaunch = false;
+        Settings.store.minimizeToTray = data.minimizeToTray;
        Settings.store.discordBranch = data.discordBranch;
-        Settings.store.minimizeToTray = !!data.minimizeToTray;
-        Settings.store.arRPC = !!data.richPresence;
+        Settings.store.firstLaunch = false;
+        Settings.store.arRPC = data.richPresence;

        if (data.autoStart) autoStart.enable();

--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -1,82 +1,46 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import "./ipc";

-import { app, BrowserWindow, nativeTheme } from "electron";
-import { autoUpdater } from "electron-updater";
+import { app, BrowserWindow } from "electron";
+import { checkUpdates } from "updater/main";

 import { DATA_DIR } from "./constants";
 import { createFirstLaunchTour } from "./firstLaunch";
 import { createWindows, mainWin } from "./mainWindow";
 import { registerMediaPermissionsHandler } from "./mediaPermissions";
 import { registerScreenShareHandler } from "./screenShare";
-import { Settings, State } from "./settings";
-import { isDeckGameMode } from "./utils/steamOS";
+import { Settings } from "./settings";

 if (IS_DEV) {
    require("source-map-support").install();
-} else {
-    autoUpdater.checkForUpdatesAndNotify();
 }

-console.log("Vesktop v" + app.getVersion());
-
 // Make the Vencord files use our DATA_DIR
 process.env.VENCORD_USER_DATA_DIR = DATA_DIR;

 function init() {
-    app.setAsDefaultProtocolClient("discord");
-
-    const { disableSmoothScroll, hardwareAcceleration } = Settings.store;
-
-    const enabledFeatures = app.commandLine.getSwitchValue("enable-features").split(",");
-    const disabledFeatures = app.commandLine.getSwitchValue("disable-features").split(",");
-
-    if (hardwareAcceleration === false) {
-        app.disableHardwareAcceleration();
-    } else {
-        enabledFeatures.push(
-            "AcceleratedVideoDecodeLinuxGL",
-            "AcceleratedVideoEncoder",
-            "AcceleratedVideoDecoder",
-            "AcceleratedVideoDecodeLinuxZeroCopyGL"
-        );
-    }
+    const { disableSmoothScroll } = Settings.store;

    if (disableSmoothScroll) {
        app.commandLine.appendSwitch("disable-smooth-scrolling");
    }

-    // disable renderer backgrounding to prevent the app from unloading when in the background
-    // https://github.com/electron/electron/issues/2822
-    // https://github.com/GoogleChrome/chrome-launcher/blob/5a27dd574d47a75fec0fb50f7b774ebf8a9791ba/docs/chrome-flags-for-tools.md#task-throttling
-    app.commandLine.appendSwitch("disable-renderer-backgrounding");
-    app.commandLine.appendSwitch("disable-background-timer-throttling");
-    app.commandLine.appendSwitch("disable-backgrounding-occluded-windows");
-    if (process.platform === "win32") {
-        disabledFeatures.push("CalculateNativeWinOcclusion");
-    }
-
    // work around chrome 66 disabling autoplay by default
    app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required");
+
    // WinRetrieveSuggestionsOnlyOnDemand: Work around electron 13 bug w/ async spellchecking on Windows.
    // HardwareMediaKeyHandling,MediaSessionService: Prevent Discord from registering as a media service.
    //
    // WidgetLayering (Vencord Added): Fix DevTools context menus https://github.com/electron/electron/issues/38790
-    disabledFeatures.push("WinRetrieveSuggestionsOnlyOnDemand", "HardwareMediaKeyHandling", "MediaSessionService");
-
-    // Support TTS on Linux using speech-dispatcher
-    app.commandLine.appendSwitch("enable-speech-dispatcher");
-
-    app.commandLine.appendSwitch("enable-features", [...new Set(enabledFeatures)].filter(Boolean).join(","));
-    app.commandLine.appendSwitch("disable-features", [...new Set(disabledFeatures)].filter(Boolean).join(","));
-
-    // In the Flatpak on SteamOS the theme is detected as light, but SteamOS only has a dark mode, so we just override it
-    if (isDeckGameMode) nativeTheme.themeSource = "dark";
+    app.commandLine.appendSwitch(
+        "disable-features",
+        "WinRetrieveSuggestionsOnlyOnDemand,HardwareMediaKeyHandling,MediaSessionService,WidgetLayering"
+    );

    app.on("second-instance", (_event, _cmdLine, _cwd, data: any) => {
        if (data.IS_DEV) app.quit();
@@ -88,7 +52,8 @@ function init() {
    });

    app.whenReady().then(async () => {
-        if (process.platform === "win32") app.setAppUserModelId("dev.vencord.vesktop");
+        checkUpdates();
+        if (process.platform === "win32") app.setAppUserModelId("dev.vencord.desktop");

        registerScreenShareHandler();
        registerMediaPermissionsHandler();
@@ -114,19 +79,13 @@ if (!app.requestSingleInstanceLock({ IS_DEV })) {
 }

 async function bootstrap() {
-    if (!Object.hasOwn(State.store, "firstLaunch")) {
+    if (!Object.hasOwn(Settings.store, "firstLaunch")) {
        createFirstLaunchTour();
    } else {
        createWindows();
    }
 }

-// MacOS only event
-export let darwinURL: string | undefined;
-app.on("open-url", (_, url) => {
-    darwinURL = url;
-});
-
 app.on("window-all-closed", () => {
    if (process.platform !== "darwin") app.quit();
 });
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -1,23 +1,13 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

-if (process.platform === "linux") import("./venmic");
+if (process.platform === "linux") import("./virtmic");

 import { execFile } from "child_process";
-import {
-    app,
-    BrowserWindow,
-    clipboard,
-    dialog,
-    IpcMainInvokeEvent,
-    nativeImage,
-    RelaunchOptions,
-    session,
-    shell
-} from "electron";
+import { app, BrowserWindow, dialog, RelaunchOptions, session, shell } from "electron";
 import { mkdirSync, readFileSync, watch } from "fs";
 import { open, readFile } from "fs/promises";
 import { release } from "os";
@@ -29,10 +19,8 @@ import { setBadgeCount } from "./appBadge";
 import { autoStart } from "./autoStart";
 import { VENCORD_FILES_DIR, VENCORD_QUICKCSS_FILE, VENCORD_THEMES_DIR } from "./constants";
 import { mainWin } from "./mainWindow";
-import { Settings, State } from "./settings";
+import { Settings } from "./settings";
 import { handle, handleSync } from "./utils/ipcWrappers";
-import { PopoutWindows } from "./utils/popout";
-import { isDeckGameMode, showGamePage } from "./utils/steamOS";
 import { isValidVencordInstall } from "./utils/vencordLoader";

 handleSync(IpcEvents.GET_VENCORD_PRELOAD_FILE, () => join(VENCORD_FILES_DIR, "vencordDesktopPreload.js"));
@@ -59,14 +47,11 @@ handle(IpcEvents.SET_SETTINGS, (_, settings: typeof Settings.store, path?: strin
    Settings.setData(settings, path);
 });

-handle(IpcEvents.RELAUNCH, async () => {
+handle(IpcEvents.RELAUNCH, () => {
    const options: RelaunchOptions = {
        args: process.argv.slice(1).concat(["--relaunch"])
    };
-    if (isDeckGameMode) {
-        // We can't properly relaunch when running under gamescope, but we can at least navigate to our page in Steam.
-        await showGamePage();
-    } else if (app.isPackaged && process.env.APPIMAGE) {
+    if (app.isPackaged && process.env.APPIMAGE) {
        execFile(process.env.APPIMAGE, options.args);
    } else {
        app.relaunch(options);
@@ -78,34 +63,35 @@ handle(IpcEvents.SHOW_ITEM_IN_FOLDER, (_, path) => {
    shell.showItemInFolder(path);
 });

-function getWindow(e: IpcMainInvokeEvent, key?: string) {
-    return key ? PopoutWindows.get(key)! : (BrowserWindow.fromWebContents(e.sender) ?? mainWin);
-}
-
 handle(IpcEvents.FOCUS, () => {
+    if (process.platform === "win32") mainWin.minimize(); // Windows is weird
+
+    mainWin.restore();
    mainWin.show();
-    mainWin.setSkipTaskbar(false);
 });

-handle(IpcEvents.CLOSE, (e, key?: string) => {
-    getWindow(e, key).close();
+handle(IpcEvents.CLOSE, e => {
+    (BrowserWindow.fromWebContents(e.sender) ?? e.sender).close();
 });

-handle(IpcEvents.MINIMIZE, (e, key?: string) => {
-    getWindow(e, key).minimize();
+handle(IpcEvents.MINIMIZE, e => {
+    mainWin.minimize();
 });

-handle(IpcEvents.MAXIMIZE, (e, key?: string) => {
-    const win = getWindow(e, key);
-    if (win.isMaximized()) {
-        win.unmaximize();
+handle(IpcEvents.MAXIMIZE, e => {
+    if (mainWin.isMaximized()) {
+        mainWin.unmaximize();
    } else {
-        win.maximize();
+        mainWin.maximize();
    }
 });

-handleSync(IpcEvents.SPELLCHECK_GET_AVAILABLE_LANGUAGES, e => {
-    e.returnValue = session.defaultSession.availableSpellCheckerLanguages;
+handle(IpcEvents.SPELLCHECK_SET_LANGUAGES, (_, languages: string[]) => {
+    const ses = session.defaultSession;
+
+    const available = ses.availableSpellCheckerLanguages;
+    const applicable = languages.filter(l => available.includes(l)).slice(0, 3);
+    if (applicable.length) ses.setSpellCheckerLanguages(applicable);
 });

 handle(IpcEvents.SPELLCHECK_REPLACE_MISSPELLING, (e, word: string) => {
@@ -116,14 +102,7 @@ handle(IpcEvents.SPELLCHECK_ADD_TO_DICTIONARY, (e, word: string) => {
    e.sender.session.addWordToSpellCheckerDictionary(word);
 });

-handleSync(IpcEvents.GET_VENCORD_DIR, e => (e.returnValue = State.store.vencordDir));
-
-handle(IpcEvents.SELECT_VENCORD_DIR, async (_e, value?: null) => {
-    if (value === null) {
-        delete State.store.vencordDir;
-        return "ok";
-    }
-
+handle(IpcEvents.SELECT_VENCORD_DIR, async () => {
    const res = await dialog.showOpenDialog(mainWin!, {
        properties: ["openDirectory"]
    });
@@ -132,31 +111,11 @@ handle(IpcEvents.SELECT_VENCORD_DIR, async (_e, value?: null) => {
    const dir = res.filePaths[0];
    if (!isValidVencordInstall(dir)) return "invalid";

-    State.store.vencordDir = dir;
-
-    return "ok";
+    return dir;
 });

 handle(IpcEvents.SET_BADGE_COUNT, (_, count: number) => setBadgeCount(count));

-handle(IpcEvents.CLIPBOARD_COPY_IMAGE, async (_, buf: ArrayBuffer, src: string) => {
-    clipboard.write({
-        html: `<img src="${src.replaceAll('"', '\\"')}">`,
-        image: nativeImage.createFromBuffer(Buffer.from(buf))
-    });
-});
-
-function openDebugPage(page: string) {
-    const win = new BrowserWindow({
-        autoHideMenuBar: true
-    });
-
-    win.loadURL(page);
-}
-
-handle(IpcEvents.DEBUG_LAUNCH_GPU, () => openDebugPage("chrome://gpu"));
-handle(IpcEvents.DEBUG_LAUNCH_WEBRTC_INTERNALS, () => openDebugPage("chrome://webrtc-internals"));
-
 function readCss() {
    return readFile(VENCORD_QUICKCSS_FILE, "utf-8").catch(() => "");
 }
--- a/src/main/ipcCommands.ts
+++ b/src/main/ipcCommands.ts
@@ -1,56 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { randomUUID } from "crypto";
-import { ipcMain } from "electron";
-import { IpcEvents } from "shared/IpcEvents";
-
-import { mainWin } from "./mainWindow";
-
-const resolvers = new Map<string, Record<"resolve" | "reject", (data: any) => void>>();
-
-export interface IpcMessage {
-    nonce: string;
-    message: string;
-    data?: any;
-}
-
-export interface IpcResponse {
-    nonce: string;
-    ok: boolean;
-    data?: any;
-}
-
-/**
- * Sends a message to the renderer process and waits for a response.
- * `data` must be serializable as it will be sent over IPC.
- *
- * You must add a handler for the message in the renderer process.
- */
-export function sendRendererCommand<T = any>(message: string, data?: any) {
-    const nonce = randomUUID();
-
-    const promise = new Promise<T>((resolve, reject) => {
-        resolvers.set(nonce, { resolve, reject });
-    });
-
-    mainWin.webContents.send(IpcEvents.IPC_COMMAND, { nonce, message, data });
-
-    return promise;
-}
-
-ipcMain.on(IpcEvents.IPC_COMMAND, (_event, { nonce, ok, data }: IpcResponse) => {
-    const resolver = resolvers.get(nonce);
-    if (!resolver) throw new Error(`Unknown message: ${nonce}`);
-
-    if (ok) {
-        resolver.resolve(data);
-    } else {
-        resolver.reject(data);
-    }
-
-    resolvers.delete(nonce);
-});
--- a/src/main/mainWindow.ts
+++ b/src/main/mainWindow.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import {
@@ -12,13 +12,11 @@ import {
    Menu,
    MenuItemConstructorOptions,
    nativeTheme,
-    screen,
-    session,
    Tray
 } from "electron";
 import { rm } from "fs/promises";
 import { join } from "path";
-import { IpcCommands, IpcEvents } from "shared/IpcEvents";
+import { IpcEvents } from "shared/IpcEvents";
 import { isTruthy } from "shared/utils/guards";
 import { once } from "shared/utils/once";
 import type { SettingsStore } from "shared/utils/SettingsStore";
@@ -26,19 +24,18 @@ import type { SettingsStore } from "shared/utils/SettingsStore";
 import { ICON_PATH } from "../shared/paths";
 import { createAboutWindow } from "./about";
 import { initArRPC } from "./arrpc";
+import { autoStart } from "./autoStart";
 import {
-    BrowserUserAgent,
    DATA_DIR,
    DEFAULT_HEIGHT,
    DEFAULT_WIDTH,
    MessageBoxChoice,
    MIN_HEIGHT,
    MIN_WIDTH,
+    UserAgent,
    VENCORD_FILES_DIR
 } from "./constants";
-import { darwinURL } from "./index";
-import { sendRendererCommand } from "./ipcCommands";
-import { Settings, State, VencordSettings } from "./settings";
+import { Settings, VencordSettings } from "./settings";
 import { createSplashWindow } from "./splash";
 import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
 import { applyDeckKeyboardFix, askToApplySteamLayout, isDeckGameMode } from "./utils/steamOS";
@@ -77,23 +74,20 @@ const [addSettingsListener, removeSettingsListeners] = makeSettingsListenerHelpe
 const [addVencordSettingsListener, removeVencordSettingsListeners] = makeSettingsListenerHelpers(VencordSettings);

 function initTray(win: BrowserWindow) {
-    const onTrayClick = () => {
-        if (Settings.store.clickTrayToShowHide && win.isVisible()) win.hide();
-        else win.show();
-    };
    const trayMenu = Menu.buildFromTemplate([
        {
            label: "Open",
            click() {
                win.show();
-            }
+            },
+            enabled: false
        },
        {
            label: "About",
            click: createAboutWindow
        },
        {
-            label: "Repair Vencord",
+            label: "Update Vencord",
            async click() {
                await downloadVencordFiles();
                app.relaunch();
@@ -110,14 +104,14 @@ function initTray(win: BrowserWindow) {
            type: "separator"
        },
        {
-            label: "Restart",
+            label: "Relaunch",
            click() {
                app.relaunch();
                app.quit();
            }
        },
        {
-            label: "Quit",
+            label: "Quit Vesktop",
            click() {
                isQuitting = true;
                app.quit();
@@ -128,7 +122,15 @@ function initTray(win: BrowserWindow) {
    tray = new Tray(ICON_PATH);
    tray.setToolTip("Vesktop");
    tray.setContextMenu(trayMenu);
-    tray.on("click", onTrayClick);
+    tray.on("click", () => win.show());
+
+    win.on("show", () => {
+        trayMenu.items[0].enabled = false;
+    });
+
+    win.on("hide", () => {
+        trayMenu.items[0].enabled = true;
+    });
 }

 async function clearData(win: BrowserWindow) {
@@ -200,13 +202,16 @@ function initMenuBar(win: BrowserWindow) {
                      label: "Settings",
                      accelerator: "CmdOrCtrl+,",
                      async click() {
-                          sendRendererCommand(IpcCommands.NAVIGATE_SETTINGS);
+                          mainWin.webContents.executeJavaScript(
+                              "Vencord.Webpack.Common.SettingsRouter.open('My Account')"
+                          );
                      }
                  },
                  {
                      type: "separator"
                  },
                  {
+                      label: "Hide Vesktop", // Should probably remove the label, but it says "Hide VencordDesktop" instead of "Hide Vesktop"
                      role: "hide"
                  },
                  {
@@ -253,7 +258,8 @@ function initMenuBar(win: BrowserWindow) {
        },
        { role: "fileMenu" },
        { role: "editMenu" },
-        { role: "viewMenu" }
+        { role: "viewMenu" },
+        { role: "windowMenu" }
    ]);

    Menu.setApplicationMenu(menu);
@@ -263,16 +269,14 @@ function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
    // We want the default window behaivour to apply in game mode since it expects everything to be fullscreen and maximized.
    if (isDeckGameMode) return {};

-    const { x, y, width, height } = State.store.windowBounds ?? {};
+    const { x, y, width, height } = Settings.store.windowBounds ?? {};

    const options = {
        width: width ?? DEFAULT_WIDTH,
        height: height ?? DEFAULT_HEIGHT
    } as BrowserWindowConstructorOptions;

-    const storedDisplay = screen.getAllDisplays().find(display => display.id === State.store.displayId);
-
-    if (x != null && y != null && storedDisplay) {
+    if (x != null && y != null) {
        options.x = x;
        options.y = y;
    }
@@ -298,7 +302,7 @@ function getDarwinOptions(): BrowserWindowConstructorOptions {
        options.vibrancy = "sidebar";
        options.backgroundColor = "#ffffff00";
    } else {
-        if (splashTheming !== false) {
+        if (splashTheming) {
            options.backgroundColor = splashBackground;
        } else {
            options.backgroundColor = nativeTheme.shouldUseDarkColors ? "#313338" : "#ffffff";
@@ -310,8 +314,8 @@ function getDarwinOptions(): BrowserWindowConstructorOptions {

 function initWindowBoundsListeners(win: BrowserWindow) {
    const saveState = () => {
-        State.store.maximized = win.isMaximized();
-        State.store.minimized = win.isMinimized();
+        Settings.store.maximized = win.isMaximized();
+        Settings.store.minimized = win.isMinimized();
    };

    win.on("maximize", saveState);
@@ -319,8 +323,7 @@ function initWindowBoundsListeners(win: BrowserWindow) {
    win.on("unmaximize", saveState);

    const saveBounds = () => {
-        State.store.windowBounds = win.getBounds();
-        State.store.displayId = screen.getDisplayMatching(State.store.windowBounds).id;
+        Settings.store.windowBounds = win.getBounds();
    };

    win.on("resize", saveBounds);
@@ -332,7 +335,6 @@ function initSettingsListeners(win: BrowserWindow) {
        if (enable) initTray(win);
        else tray?.destroy();
    });
-
    addSettingsListener("disableMinSize", disable => {
        if (disable) {
            // 0 no work
@@ -361,42 +363,12 @@ function initSettingsListeners(win: BrowserWindow) {
    addSettingsListener("enableMenu", enabled => {
        win.setAutoHideMenuBar(enabled ?? false);
    });
-
-    addSettingsListener("spellCheckLanguages", languages => initSpellCheckLanguages(win, languages));
-}
-
-async function initSpellCheckLanguages(win: BrowserWindow, languages?: string[]) {
-    languages ??= await sendRendererCommand(IpcCommands.GET_LANGUAGES);
-    if (!languages) return;
-
-    const ses = session.defaultSession;
-
-    const available = ses.availableSpellCheckerLanguages;
-    const applicable = languages.filter(l => available.includes(l)).slice(0, 5);
-    if (applicable.length) ses.setSpellCheckerLanguages(applicable);
 }

 function initSpellCheck(win: BrowserWindow) {
    win.webContents.on("context-menu", (_, data) => {
        win.webContents.send(IpcEvents.SPELLCHECK_RESULT, data.misspelledWord, data.dictionarySuggestions);
    });
-
-    initSpellCheckLanguages(win, Settings.store.spellCheckLanguages);
-}
-
-function initStaticTitle(win: BrowserWindow) {
-    const listener = (e: { preventDefault: Function }) => e.preventDefault();
-
-    if (Settings.store.staticTitle) win.on("page-title-updated", listener);
-
-    addSettingsListener("staticTitle", enabled => {
-        if (enabled) {
-            win.setTitle("Vesktop");
-            win.on("page-title-updated", listener);
-        } else {
-            win.off("page-title-updated", listener);
-        }
-    });
 }

 function createMainWindow() {
@@ -404,43 +376,28 @@ function createMainWindow() {
    removeSettingsListeners();
    removeVencordSettingsListeners();

-    const { staticTitle, transparencyOption, enableMenu, customTitleBar, splashTheming, splashBackground } =
-        Settings.store;
+    const { staticTitle, transparencyOption, enableMenu, discordWindowsTitleBar } = Settings.store;

-    const { frameless, transparent } = VencordSettings.store;
+    const { frameless } = VencordSettings.store;

-    const noFrame = frameless === true || customTitleBar === true;
-    const backgroundColor =
-        splashTheming !== false ? splashBackground : nativeTheme.shouldUseDarkColors ? "#313338" : "#ffffff";
+    const noFrame = frameless === true || (process.platform === "win32" && discordWindowsTitleBar === true);

    const win = (mainWin = new BrowserWindow({
-        show: Settings.store.enableSplashScreen === false,
-        backgroundColor,
+        show: false,
        webPreferences: {
            nodeIntegration: false,
            sandbox: false,
            contextIsolation: true,
            devTools: true,
            preload: join(__dirname, "preload.js"),
-            spellcheck: true,
-            // disable renderer backgrounding to prevent the app from unloading when in the background
-            backgroundThrottling: false
+            spellcheck: true
        },
        icon: ICON_PATH,
        frame: !noFrame,
-        ...(transparent && {
-            transparent: true,
-            backgroundColor: "#00000000"
-        }),
        ...(transparencyOption &&
            transparencyOption !== "none" && {
                backgroundColor: "#00000000",
-                backgroundMaterial: transparencyOption
-            }),
-        // Fix transparencyOption for custom discord titlebar
-        ...(customTitleBar &&
-            transparencyOption &&
-            transparencyOption !== "none" && {
+                backgroundMaterial: transparencyOption,
                transparent: true
            }),
        ...(staticTitle && { title: "Vesktop" }),
@@ -449,7 +406,6 @@ function createMainWindow() {
        autoHideMenuBar: enableMenu
    }));
    win.setMenuBarVisibility(false);
-    if (process.platform === "darwin" && customTitleBar) win.setWindowButtonVisibility(false);

    win.on("close", e => {
        const useTray = !isDeckGameMode && Settings.store.minimizeToTray !== false && Settings.store.tray !== false;
@@ -463,53 +419,43 @@ function createMainWindow() {
        return false;
    });

+    if (Settings.store.staticTitle) win.on("page-title-updated", e => e.preventDefault());
+
    initWindowBoundsListeners(win);
    if (!isDeckGameMode && (Settings.store.tray ?? true) && process.platform !== "darwin") initTray(win);
    initMenuBar(win);
    makeLinksOpenExternally(win);
    initSettingsListeners(win);
    initSpellCheck(win);
-    initStaticTitle(win);

-    win.webContents.setUserAgent(BrowserUserAgent);
+    win.webContents.setUserAgent(UserAgent);

-    // if the open-url event is fired (in index.ts) while starting up, darwinURL will be set. If not fall back to checking the process args (which Windows and Linux use for URI calling.)
-    loadUrl(darwinURL || process.argv.find(arg => arg.startsWith("discord://")));
+    const subdomain =
+        Settings.store.discordBranch === "canary" || Settings.store.discordBranch === "ptb"
+            ? `${Settings.store.discordBranch}.`
+            : "";
+
+    win.loadURL(`https://${subdomain}discord.com/app`);

    return win;
 }

 const runVencordMain = once(() => require(join(VENCORD_FILES_DIR, "vencordDesktopMain.js")));

-export function loadUrl(uri: string | undefined) {
-    const branch = Settings.store.discordBranch;
-    const subdomain = branch === "canary" || branch === "ptb" ? `${branch}.` : "";
-    mainWin.loadURL(`https://${subdomain}discord.com/${uri ? new URL(uri).pathname.slice(1) || "app" : "app"}`);
-}
-
 export async function createWindows() {
-    const startMinimized = process.argv.includes("--start-minimized");
-
-    let splash: BrowserWindow | undefined;
-    if (Settings.store.enableSplashScreen !== false) {
-        splash = createSplashWindow(startMinimized);
-
-        // SteamOS letterboxes and scales it terribly, so just full screen it
-        if (isDeckGameMode) splash.setFullScreen(true);
-    }
-
+    const shouldStartMinimized = Settings.store.startMinimized && autoStart.wasAutoStarted();
+    const splash = createSplashWindow(shouldStartMinimized);
+    // SteamOS letterboxes and scales it terribly, so just full screen it
+    if (isDeckGameMode) splash.setFullScreen(true);
    await ensureVencordFiles();
    runVencordMain();

    mainWin = createMainWindow();

    mainWin.webContents.on("did-finish-load", () => {
-        splash?.destroy();
+        splash.destroy();

-        if (!startMinimized) {
-            if (splash) mainWin!.show();
-            if (State.store.maximized && !isDeckGameMode) mainWin!.maximize();
-        }
+        if (!shouldStartMinimized || isDeckGameMode) mainWin!.show();

        if (isDeckGameMode) {
            // always use entire display
@@ -517,19 +463,11 @@ export async function createWindows() {

            askToApplySteamLayout(mainWin);
        }
-
-        mainWin.once("show", () => {
-            if (State.store.maximized && !mainWin!.isMaximized() && !isDeckGameMode) {
-                mainWin!.maximize();
-            }
-        });
    });

-    mainWin.webContents.on("did-navigate", (_, url: string, responseCode: number) => {
-        // check url to ensure app doesn't loop
-        if (responseCode >= 300 && new URL(url).pathname !== `/app`) {
-            loadUrl(undefined);
-            console.warn(`'did-navigate': Caught bad page response: ${responseCode}, redirecting to main app`);
+    mainWin.once("show", () => {
+        if (Settings.store.maximized && !mainWin!.isMaximized() && !isDeckGameMode) {
+            mainWin!.maximize();
        }
    });

--- a/src/main/mediaPermissions.ts
+++ b/src/main/mediaPermissions.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { session, systemPreferences } from "electron";
@@ -12,13 +12,11 @@ export function registerMediaPermissionsHandler() {
    session.defaultSession.setPermissionRequestHandler(async (_webContents, permission, callback, details) => {
        let granted = true;

-        if ("mediaTypes" in details) {
-            if (details.mediaTypes?.includes("audio")) {
-                granted &&= await systemPreferences.askForMediaAccess("microphone");
-            }
-            if (details.mediaTypes?.includes("video")) {
-                granted &&= await systemPreferences.askForMediaAccess("camera");
-            }
+        if (details.mediaTypes?.includes("audio")) {
+            granted = await systemPreferences.askForMediaAccess("microphone");
+        }
+        if (details.mediaTypes?.includes("video")) {
+            granted &&= await systemPreferences.askForMediaAccess("camera");
        }

        callback(granted);
--- a/src/main/screenShare.ts
+++ b/src/main/screenShare.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { desktopCapturer, session, Streams } from "electron";
@@ -49,8 +49,8 @@ export function registerScreenShareHandler() {
        if (isWayland) {
            const video = data[0];
            if (video) {
-                const stream = await request
-                    .frame!.executeJavaScript(
+                const stream = await request.frame
+                    .executeJavaScript(
                        `Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify([video])},true)`
                    )
                    .catch(() => null);
@@ -61,8 +61,8 @@ export function registerScreenShareHandler() {
            return;
        }

-        const choice = await request
-            .frame!.executeJavaScript(`Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify(data)})`)
+        const choice = await request.frame
+            .executeJavaScript(`Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify(data)})`)
            .then(e => e as StreamPick)
            .catch(e => {
                console.error("Error during screenshare picker", e);
@@ -77,7 +77,7 @@ export function registerScreenShareHandler() {
        const streams: Streams = {
            video: source
        };
-        if (choice.audio && process.platform === "win32") streams.audio = "loopbackWithMute";
+        if (choice.audio && process.platform === "win32") streams.audio = "loopback";

        callback(streams);
    });
--- a/src/main/settings.ts
+++ b/src/main/settings.ts
@@ -1,18 +1,17 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
-import type { Settings as TSettings, State as TState } from "shared/settings";
+import type { Settings as TSettings } from "shared/settings";
 import { SettingsStore } from "shared/utils/SettingsStore";

 import { DATA_DIR, VENCORD_SETTINGS_FILE } from "./constants";

 const SETTINGS_FILE = join(DATA_DIR, "settings.json");
-const STATE_FILE = join(DATA_DIR, "state.json");

 function loadSettings<T extends object = any>(file: string, name: string) {
    let settings = {} as T;
@@ -21,7 +20,7 @@ function loadSettings<T extends object = any>(file: string, name: string) {
        try {
            settings = JSON.parse(content);
        } catch (err) {
-            console.error(`Failed to parse ${name}.json:`, err);
+            console.error(`Failed to parse ${name} settings.json:`, err);
        }
    } catch {}

@@ -34,19 +33,5 @@ function loadSettings<T extends object = any>(file: string, name: string) {
    return store;
 }

-export const Settings = loadSettings<TSettings>(SETTINGS_FILE, "Vesktop settings");
-
-export const VencordSettings = loadSettings<any>(VENCORD_SETTINGS_FILE, "Vencord settings");
-
-if (Object.hasOwn(Settings.plain, "firstLaunch") && !existsSync(STATE_FILE)) {
-    console.warn("legacy state in settings.json detected. migrating to state.json");
-    const state = {} as TState;
-    for (const prop of ["firstLaunch", "maximized", "minimized", "steamOSLayoutVersion", "windowBounds"] as const) {
-        state[prop] = Settings.plain[prop];
-        delete Settings.plain[prop];
-    }
-    Settings.markAsChanged();
-    writeFileSync(STATE_FILE, JSON.stringify(state, null, 4));
-}
-
-export const State = loadSettings<TState>(STATE_FILE, "Vesktop state");
+export const Settings = loadSettings<TSettings>(SETTINGS_FILE, "Vesktop");
+export const VencordSettings = loadSettings<any>(VENCORD_SETTINGS_FILE, "Vencord");
--- a/src/main/splash.ts
+++ b/src/main/splash.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { BrowserWindow } from "electron";
@@ -22,7 +22,7 @@ export function createSplashWindow(startMinimized = false) {

    const { splashBackground, splashColor, splashTheming } = Settings.store;

-    if (splashTheming !== false) {
+    if (splashTheming) {
        if (splashColor) {
            const semiTransparentSplashColor = splashColor.replace("rgb(", "rgba(").replace(")", ", 0.2)");

--- a/src/main/utils/http.ts
+++ b/src/main/utils/http.ts
@@ -1,58 +1,45 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { createWriteStream } from "fs";
-import { Readable } from "stream";
-import { pipeline } from "stream/promises";
-import { setTimeout } from "timers/promises";
+import type { IncomingMessage } from "http";
+import { get, RequestOptions } from "https";
+import { finished } from "stream/promises";

-interface FetchieOptions {
-    retryOnNetworkError?: boolean;
-}
-
-export async function downloadFile(url: string, file: string, options: RequestInit = {}, fetchieOpts?: FetchieOptions) {
-    const res = await fetchie(url, options, fetchieOpts);
-    await pipeline(
-        // @ts-expect-error odd type error
-        Readable.fromWeb(res.body!),
-        createWriteStream(file, {
-            autoClose: true
-        })
+export async function downloadFile(url: string, file: string, options: RequestOptions = {}) {
+    const res = await simpleReq(url, options);
+    await finished(
+        res.pipe(
+            createWriteStream(file, {
+                autoClose: true
+            })
+        )
    );
 }

-const ONE_MINUTE_MS = 1000 * 60;
+export function simpleReq(url: string, options: RequestOptions = {}) {
+    return new Promise<IncomingMessage>((resolve, reject) => {
+        get(url, options, res => {
+            const { statusCode, statusMessage, headers } = res;
+            if (statusCode! >= 400) return void reject(`${statusCode}: ${statusMessage} - ${url}`);
+            if (statusCode! >= 300) return simpleReq(headers.location!, options).then(resolve).catch(reject);

-export async function fetchie(url: string, options?: RequestInit, { retryOnNetworkError }: FetchieOptions = {}) {
-    let res: Response | undefined;
-
-    try {
-        res = await fetch(url, options);
-    } catch (err) {
-        if (retryOnNetworkError) {
-            console.error("Failed to fetch", url + ".", "Gonna retry with backoff.");
-
-            for (let tries = 0, delayMs = 500; tries < 20; tries++, delayMs = Math.min(2 * delayMs, ONE_MINUTE_MS)) {
-                await setTimeout(delayMs);
-                try {
-                    res = await fetch(url, options);
-                    break;
-                } catch {}
-            }
-        }
-
-        if (!res) throw new Error(`Failed to fetch ${url}\n${err}`);
-    }
-
-    if (res.ok) return res;
-
-    let msg = `Got non-OK response for ${url}: ${res.status} ${res.statusText}`;
-
-    const reason = await res.text().catch(() => "");
-    if (reason) msg += `\n${reason}`;
-
-    throw new Error(msg);
+            resolve(res);
+        });
+    });
+}
+
+export async function simpleGet(url: string, options: RequestOptions = {}) {
+    const res = await simpleReq(url, options);
+
+    return new Promise<Buffer>((resolve, reject) => {
+        const chunks = [] as Buffer[];
+
+        res.once("error", reject);
+        res.on("data", chunk => chunks.push(chunk));
+        res.once("end", () => resolve(Buffer.concat(chunks)));
+    });
 }
--- a/src/main/utils/ipcWrappers.ts
+++ b/src/main/utils/ipcWrappers.ts
@@ -1,20 +1,24 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { ipcMain, IpcMainEvent, IpcMainInvokeEvent, WebFrameMain } from "electron";
-import { DISCORD_HOSTNAMES } from "main/constants";
 import { IpcEvents } from "shared/IpcEvents";

-export function validateSender(frame: WebFrameMain | null) {
-    if (!frame) throw new Error("ipc: No sender frame");
-
+export function validateSender(frame: WebFrameMain) {
    const { hostname, protocol } = new URL(frame.url);
    if (protocol === "file:") return;

-    if (!DISCORD_HOSTNAMES.includes(hostname)) throw new Error("ipc: Disallowed host " + hostname);
+    switch (hostname) {
+        case "discord.com":
+        case "ptb.discord.com":
+        case "canary.discord.com":
+            break;
+        default:
+            throw new Error("ipc: Disallowed host " + hostname);
+    }
 }

 export function handleSync(event: IpcEvents, cb: (e: IpcMainEvent, ...args: any[]) => any) {
--- a/src/main/utils/makeLinksOpenExternally.ts
+++ b/src/main/utils/makeLinksOpenExternally.ts
@@ -1,71 +1,40 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { BrowserWindow, shell } from "electron";
-import { DISCORD_HOSTNAMES } from "main/constants";

 import { Settings } from "../settings";
-import { createOrFocusPopup, setupPopout } from "./popout";
-import { execSteamURL, isDeckGameMode, steamOpenURL } from "./steamOS";
-
-export function handleExternalUrl(url: string, protocol?: string): { action: "deny" | "allow" } {
-    if (protocol == null) {
-        try {
-            protocol = new URL(url).protocol;
-        } catch {
-            return { action: "deny" };
-        }
-    }
-
-    switch (protocol) {
-        case "http:":
-        case "https:":
-            if (Settings.store.openLinksWithElectron) {
-                return { action: "allow" };
-            }
-        // eslint-disable-next-line no-fallthrough
-        case "mailto:":
-        case "spotify:":
-            if (isDeckGameMode) {
-                steamOpenURL(url);
-            } else {
-                shell.openExternal(url);
-            }
-            break;
-        case "steam:":
-            if (isDeckGameMode) {
-                execSteamURL(url);
-            } else {
-                shell.openExternal(url);
-            }
-            break;
-    }
-
-    return { action: "deny" };
-}

 export function makeLinksOpenExternally(win: BrowserWindow) {
-    win.webContents.setWindowOpenHandler(({ url, frameName, features }) => {
+    win.webContents.setWindowOpenHandler(({ url }) => {
+        switch (url) {
+            case "about:blank":
+            case "https://discord.com/popout":
+                return { action: "allow" };
+        }
+
        try {
-            var { protocol, hostname, pathname } = new URL(url);
+            var { protocol } = new URL(url);
        } catch {
            return { action: "deny" };
        }

-        if (frameName.startsWith("DISCORD_") && pathname === "/popout" && DISCORD_HOSTNAMES.includes(hostname)) {
-            return createOrFocusPopup(frameName, features);
+        switch (protocol) {
+            case "http:":
+            case "https:":
+                if (Settings.store.openLinksWithElectron) {
+                    return { action: "allow" };
+                }
+            // eslint-disable-next-line no-fallthrough
+            case "mailto:":
+            case "steam:":
+            case "spotify:":
+                shell.openExternal(url);
        }

-        if (url === "about:blank" || (frameName === "authorize" && DISCORD_HOSTNAMES.includes(hostname)))
-            return { action: "allow" };
-
-        return handleExternalUrl(url, protocol);
-    });
-
-    win.webContents.on("did-create-window", (win, { frameName }) => {
-        if (frameName.startsWith("DISCORD_")) setupPopout(win, frameName);
+        return { action: "deny" };
    });
 }
--- a/src/main/utils/popout.ts
+++ b/src/main/utils/popout.ts
@@ -1,116 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { BrowserWindow, BrowserWindowConstructorOptions } from "electron";
-import { Settings } from "main/settings";
-
-import { handleExternalUrl } from "./makeLinksOpenExternally";
-
-const ALLOWED_FEATURES = new Set([
-    "width",
-    "height",
-    "left",
-    "top",
-    "resizable",
-    "movable",
-    "alwaysOnTop",
-    "frame",
-    "transparent",
-    "hasShadow",
-    "closable",
-    "skipTaskbar",
-    "backgroundColor",
-    "menubar",
-    "toolbar",
-    "location",
-    "directories",
-    "titleBarStyle"
-]);
-
-const MIN_POPOUT_WIDTH = 320;
-const MIN_POPOUT_HEIGHT = 180;
-const DEFAULT_POPOUT_OPTIONS: BrowserWindowConstructorOptions = {
-    title: "Discord Popout",
-    backgroundColor: "#2f3136",
-    minWidth: MIN_POPOUT_WIDTH,
-    minHeight: MIN_POPOUT_HEIGHT,
-    frame: Settings.store.customTitleBar !== true,
-    titleBarStyle: process.platform === "darwin" ? "hidden" : undefined,
-    trafficLightPosition:
-        process.platform === "darwin"
-            ? {
-                  x: 10,
-                  y: 3
-              }
-            : undefined,
-    webPreferences: {
-        nodeIntegration: false,
-        contextIsolation: true
-    },
-    autoHideMenuBar: Settings.store.enableMenu
-};
-
-export const PopoutWindows = new Map<string, BrowserWindow>();
-
-function focusWindow(window: BrowserWindow) {
-    window.setAlwaysOnTop(true);
-    window.focus();
-    window.setAlwaysOnTop(false);
-}
-
-function parseFeatureValue(feature: string) {
-    if (feature === "yes") return true;
-    if (feature === "no") return false;
-
-    const n = Number(feature);
-    if (!isNaN(n)) return n;
-
-    return feature;
-}
-
-function parseWindowFeatures(features: string) {
-    const keyValuesParsed = features.split(",");
-
-    return keyValuesParsed.reduce((features, feature) => {
-        const [key, value] = feature.split("=");
-        if (ALLOWED_FEATURES.has(key)) features[key] = parseFeatureValue(value);
-
-        return features;
-    }, {});
-}
-
-export function createOrFocusPopup(key: string, features: string) {
-    const existingWindow = PopoutWindows.get(key);
-    if (existingWindow) {
-        focusWindow(existingWindow);
-        return <const>{ action: "deny" };
-    }
-
-    return <const>{
-        action: "allow",
-        overrideBrowserWindowOptions: {
-            ...DEFAULT_POPOUT_OPTIONS,
-            ...parseWindowFeatures(features)
-        }
-    };
-}
-
-export function setupPopout(win: BrowserWindow, key: string) {
-    win.setMenuBarVisibility(false);
-
-    PopoutWindows.set(key, win);
-
-    /* win.webContents.on("will-navigate", (evt, url) => {
-        // maybe prevent if not origin match
-    })*/
-
-    win.webContents.setWindowOpenHandler(({ url }) => handleExternalUrl(url));
-
-    win.once("closed", () => {
-        win.removeAllListeners();
-        PopoutWindows.delete(key);
-    });
-}
--- a/src/main/utils/steamOS.ts
+++ b/src/main/utils/steamOS.ts
@@ -1,15 +1,18 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

+import { exec as callbackExec } from "child_process";
 import { BrowserWindow, dialog } from "electron";
-import { writeFile } from "fs/promises";
-import { join } from "path";
+import { sleep } from "shared/utils/sleep";
+import { promisify } from "util";

 import { MessageBoxChoice } from "../constants";
-import { State } from "../settings";
+import { Settings } from "../settings";
+
+const exec = promisify(callbackExec);

 // Bump this to re-show the prompt
 const layoutVersion = 2;
@@ -17,8 +20,6 @@ const layoutVersion = 2;
 const layoutId = "3080264545"; // Vesktop Layout v2
 const numberRegex = /^[0-9]*$/;

-let steamPipeQueue = Promise.resolve();
-
 export const isDeckGameMode = process.env.SteamOS === "1" && process.env.SteamGamepadUI === "1";

 export function applyDeckKeyboardFix() {
@@ -41,37 +42,23 @@ function getAppId(): string | null {
    return null;
 }

-export function execSteamURL(url: string) {
-    // This doesn't allow arbitrary execution despite the weird syntax.
-    steamPipeQueue = steamPipeQueue.then(() =>
-        writeFile(
-            join(process.env.HOME || "/home/deck", ".steam", "steam.pipe"),
-            // replace ' to prevent argument injection
-            `'${process.env.HOME}/.local/share/Steam/ubuntu12_32/steam' '-ifrunning' '${url.replaceAll("'", "%27")}'\n`,
-            "utf-8"
-        )
-    );
-}
-
-export function steamOpenURL(url: string) {
-    execSteamURL(`steam://openurl/${url}`);
-}
-
-export async function showGamePage() {
-    const appId = getAppId();
-    if (!appId) return;
-    await execSteamURL(`steam://nav/games/details/${appId}`);
+async function execSteamURL(url: string): Promise<void> {
+    await exec(`steam -ifrunning ${url}`);
 }

 async function showLayout(appId: string) {
-    execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
+    await execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
+    // because the UI doesn't consistently reload after the data for the config has loaded...
+    // HOW HAS NOBODY AT VALVE RUN INTO THIS YET
+    await sleep(100);
+    await execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
 }

 export async function askToApplySteamLayout(win: BrowserWindow) {
    const appId = getAppId();
    if (!appId) return;
-    if (State.store.steamOSLayoutVersion === layoutVersion) return;
-    const update = Boolean(State.store.steamOSLayoutVersion);
+    if (Settings.store.steamOSLayoutVersion === layoutVersion) return;
+    const update = Boolean(Settings.store.steamOSLayoutVersion);

    // Touch screen breaks in some menus when native touch mode is enabled on latest SteamOS beta, remove most of the update specific text once that's fixed.
    const { response } = await dialog.showMessageBox(win, {
@@ -87,8 +74,8 @@ ${update ? "Click" : "Tap"} no to keep your current layout.`,
        type: "question"
    });

-    if (State.store.steamOSLayoutVersion !== layoutVersion) {
-        State.store.steamOSLayoutVersion = layoutVersion;
+    if (Settings.store.steamOSLayoutVersion !== layoutVersion) {
+        Settings.store.steamOSLayoutVersion = layoutVersion;
    }

    if (response === MessageBoxChoice.Cancel) return;
--- a/src/main/utils/vencordLoader.ts
+++ b/src/main/utils/vencordLoader.ts
@@ -1,15 +1,15 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

-import { mkdirSync } from "fs";
-import { access, constants as FsConstants, writeFile } from "fs/promises";
+import { existsSync, mkdirSync } from "fs";
+import type { RequestOptions } from "https";
 import { join } from "path";

 import { USER_AGENT, VENCORD_FILES_DIR } from "../constants";
-import { downloadFile, fetchie } from "./http";
+import { downloadFile, simpleGet } from "./http";

 const API_BASE = "https://api.github.com";

@@ -31,46 +31,37 @@ export interface ReleaseData {
 }

 export async function githubGet(endpoint: string) {
-    const opts: RequestInit = {
+    const opts: RequestOptions = {
        headers: {
            Accept: "application/vnd.github+json",
            "User-Agent": USER_AGENT
        }
    };

-    if (process.env.GITHUB_TOKEN) (opts.headers! as any).Authorization = `Bearer ${process.env.GITHUB_TOKEN}`;
+    if (process.env.GITHUB_TOKEN) opts.headers!.Authorization = `Bearer ${process.env.GITHUB_TOKEN}`;

-    return fetchie(API_BASE + endpoint, opts, { retryOnNetworkError: true });
+    return simpleGet(API_BASE + endpoint, opts);
 }

 export async function downloadVencordFiles() {
    const release = await githubGet("/repos/Vendicated/Vencord/releases/latest");

-    const { assets }: ReleaseData = await release.json();
+    const { assets } = JSON.parse(release.toString("utf-8")) as ReleaseData;

    await Promise.all(
        assets
            .filter(({ name }) => FILES_TO_DOWNLOAD.some(f => name.startsWith(f)))
-            .map(({ name, browser_download_url }) =>
-                downloadFile(browser_download_url, join(VENCORD_FILES_DIR, name), {}, { retryOnNetworkError: true })
-            )
+            .map(({ name, browser_download_url }) => downloadFile(browser_download_url, join(VENCORD_FILES_DIR, name)))
    );
 }

-const existsAsync = (path: string) =>
-    access(path, FsConstants.F_OK)
-        .then(() => true)
-        .catch(() => false);
-
-export async function isValidVencordInstall(dir: string) {
-    const results = await Promise.all(["package.json", ...FILES_TO_DOWNLOAD].map(f => existsAsync(join(dir, f))));
-    return !results.includes(false);
+export function isValidVencordInstall(dir: string) {
+    return FILES_TO_DOWNLOAD.every(f => existsSync(join(dir, f)));
 }

 export async function ensureVencordFiles() {
-    if (await isValidVencordInstall(VENCORD_FILES_DIR)) return;
-
+    if (isValidVencordInstall(VENCORD_FILES_DIR)) return;
    mkdirSync(VENCORD_FILES_DIR, { recursive: true });

-    await Promise.all([downloadVencordFiles(), writeFile(join(VENCORD_FILES_DIR, "package.json"), "{}")]);
+    await downloadVencordFiles();
 }
--- a/src/main/venmic.ts
+++ b/src/main/venmic.ts
@@ -1,135 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { LinkData, Node, PatchBay as PatchBayType } from "@vencord/venmic";
-import { app, ipcMain } from "electron";
-import { join } from "path";
-import { IpcEvents } from "shared/IpcEvents";
-import { STATIC_DIR } from "shared/paths";
-
-import { Settings } from "./settings";
-
-let PatchBay: typeof PatchBayType | undefined;
-let patchBayInstance: PatchBayType | undefined;
-
-let imported = false;
-let initialized = false;
-
-let hasPipewirePulse = false;
-let isGlibCxxOutdated = false;
-
-function importVenmic() {
-    if (imported) {
-        return;
-    }
-
-    imported = true;
-
-    try {
-        PatchBay = (require(join(STATIC_DIR, `dist/venmic-${process.arch}.node`)) as typeof import("@vencord/venmic"))
-            .PatchBay;
-
-        hasPipewirePulse = PatchBay.hasPipeWire();
-    } catch (e: any) {
-        console.error("Failed to import venmic", e);
-        isGlibCxxOutdated = (e?.stack || e?.message || "").toLowerCase().includes("glibc");
-    }
-}
-
-function obtainVenmic() {
-    if (!imported) {
-        importVenmic();
-    }
-
-    if (PatchBay && !initialized) {
-        initialized = true;
-
-        try {
-            patchBayInstance = new PatchBay();
-        } catch (e: any) {
-            console.error("Failed to instantiate venmic", e);
-        }
-    }
-
-    return patchBayInstance;
-}
-
-function getRendererAudioServicePid() {
-    return (
-        app
-            .getAppMetrics()
-            .find(proc => proc.name === "Audio Service")
-            ?.pid?.toString() ?? "owo"
-    );
-}
-
-ipcMain.handle(IpcEvents.VIRT_MIC_LIST, () => {
-    const audioPid = getRendererAudioServicePid();
-
-    const { granularSelect } = Settings.store.audio ?? {};
-
-    const targets = obtainVenmic()
-        ?.list(granularSelect ? ["node.name"] : undefined)
-        .filter(s => s["application.process.id"] !== audioPid);
-
-    return targets ? { ok: true, targets, hasPipewirePulse } : { ok: false, isGlibCxxOutdated };
-});
-
-ipcMain.handle(IpcEvents.VIRT_MIC_START, (_, include: Node[]) => {
-    const pid = getRendererAudioServicePid();
-    const { ignoreDevices, ignoreInputMedia, ignoreVirtual, workaround } = Settings.store.audio ?? {};
-
-    const data: LinkData = {
-        include,
-        exclude: [{ "application.process.id": pid }],
-        ignore_devices: ignoreDevices
-    };
-
-    if (ignoreInputMedia ?? true) {
-        data.exclude.push({ "media.class": "Stream/Input/Audio" });
-    }
-
-    if (ignoreVirtual) {
-        data.exclude.push({ "node.virtual": "true" });
-    }
-
-    if (workaround) {
-        data.workaround = [{ "application.process.id": pid, "media.name": "RecordStream" }];
-    }
-
-    return obtainVenmic()?.link(data);
-});
-
-ipcMain.handle(IpcEvents.VIRT_MIC_START_SYSTEM, (_, exclude: Node[]) => {
-    const pid = getRendererAudioServicePid();
-
-    const { workaround, ignoreDevices, ignoreInputMedia, ignoreVirtual, onlySpeakers, onlyDefaultSpeakers } =
-        Settings.store.audio ?? {};
-
-    const data: LinkData = {
-        include: [],
-        exclude: [{ "application.process.id": pid }, ...exclude],
-        only_speakers: onlySpeakers,
-        ignore_devices: ignoreDevices,
-        only_default_speakers: onlyDefaultSpeakers
-    };
-
-    if (ignoreInputMedia ?? true) {
-        data.exclude.push({ "media.class": "Stream/Input/Audio" });
-    }
-
-    if (ignoreVirtual) {
-        data.exclude.push({ "node.virtual": "true" });
-    }
-
-    if (workaround) {
-        data.workaround = [{ "application.process.id": pid, "media.name": "RecordStream" }];
-    }
-
-    return obtainVenmic()?.link(data);
-});
-
-ipcMain.handle(IpcEvents.VIRT_MIC_STOP, () => obtainVenmic()?.unlink());
--- a/src/main/virtmic.ts
+++ b/src/main/virtmic.ts
@@ -0,0 +1,77 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import { app, ipcMain } from "electron";
+import { join } from "path";
+import { IpcEvents } from "shared/IpcEvents";
+import { STATIC_DIR } from "shared/paths";
+
+let initialized = false;
+let patchBay: import("@vencord/venmic").PatchBay | undefined;
+let isGlibcxxToOld = false;
+
+function getRendererAudioServicePid() {
+    return (
+        app
+            .getAppMetrics()
+            .find(proc => proc.name === "Audio Service")
+            ?.pid?.toString() ?? "owo"
+    );
+}
+
+function obtainVenmic() {
+    if (!initialized) {
+        initialized = true;
+        try {
+            const { PatchBay } = require(
+                join(STATIC_DIR, `dist/venmic-${process.arch}.node`)
+            ) as typeof import("@vencord/venmic");
+            patchBay = new PatchBay();
+        } catch (e: any) {
+            console.error("Failed to initialise venmic. Make sure you're using pipewire", e);
+            isGlibcxxToOld = (e?.stack || e?.message || "").toLowerCase().includes("glibc");
+        }
+    }
+
+    return patchBay;
+}
+
+ipcMain.handle(IpcEvents.VIRT_MIC_LIST, () => {
+    const audioPid = getRendererAudioServicePid();
+    const list = obtainVenmic()
+        ?.list()
+        .filter(s => s["application.process.id"] !== audioPid)
+        .map(s => s["application.name"]);
+
+    return list
+        ? { ok: true, targets: [...new Set(list)] } // Remove duplicates
+        : { ok: false, isGlibcxxToOld };
+});
+
+ipcMain.handle(
+    IpcEvents.VIRT_MIC_START,
+    (_, targets: string[]) =>
+        obtainVenmic()?.link({
+            props: targets.map(target => ({ key: "application.name", value: target })),
+            mode: "include"
+        })
+);
+
+ipcMain.handle(
+    IpcEvents.VIRT_MIC_START_SYSTEM,
+    () =>
+        obtainVenmic()?.link({
+            props: [
+                {
+                    key: "application.process.id",
+                    value: getRendererAudioServicePid()
+                }
+            ],
+            mode: "exclude"
+        })
+);
+
+ipcMain.handle(IpcEvents.VIRT_MIC_STOP, () => obtainVenmic()?.unlink());
--- a/src/preload/VesktopNative.ts
+++ b/src/preload/VesktopNative.ts
@@ -1,13 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

-import { Node } from "@vencord/venmic";
 import { ipcRenderer } from "electron";
-import { IpcMessage, IpcResponse } from "main/ipcCommands";
 import type { Settings } from "shared/settings";
+import type { LiteralUnion } from "type-fest";

 import { IpcEvents } from "../shared/IpcEvents";
 import { invoke, sendSync } from "./typedIpc";
@@ -34,15 +33,14 @@ export const VesktopNative = {
    },
    fileManager: {
        showItemInFolder: (path: string) => invoke<void>(IpcEvents.SHOW_ITEM_IN_FOLDER, path),
-        getVencordDir: () => sendSync<string | undefined>(IpcEvents.GET_VENCORD_DIR),
-        selectVencordDir: (value?: null) => invoke<"cancelled" | "invalid" | "ok">(IpcEvents.SELECT_VENCORD_DIR, value)
+        selectVencordDir: () => invoke<LiteralUnion<"cancelled" | "invalid", string>>(IpcEvents.SELECT_VENCORD_DIR)
    },
    settings: {
        get: () => sendSync<Settings>(IpcEvents.GET_SETTINGS),
        set: (settings: Settings, path?: string) => invoke<void>(IpcEvents.SET_SETTINGS, settings, path)
    },
    spellcheck: {
-        getAvailableLanguages: () => sendSync<string[]>(IpcEvents.SPELLCHECK_GET_AVAILABLE_LANGUAGES),
+        setLanguages: (languages: readonly string[]) => invoke<void>(IpcEvents.SPELLCHECK_SET_LANGUAGES, languages),
        onSpellcheckResult(cb: SpellCheckerResultCallback) {
            spellCheckCallbacks.add(cb);
        },
@@ -54,9 +52,9 @@ export const VesktopNative = {
    },
    win: {
        focus: () => invoke<void>(IpcEvents.FOCUS),
-        close: (key?: string) => invoke<void>(IpcEvents.CLOSE, key),
-        minimize: (key?: string) => invoke<void>(IpcEvents.MINIMIZE, key),
-        maximize: (key?: string) => invoke<void>(IpcEvents.MAXIMIZE, key)
+        close: () => invoke<void>(IpcEvents.CLOSE),
+        minimize: () => invoke<void>(IpcEvents.MINIMIZE),
+        maximize: () => invoke<void>(IpcEvents.MAXIMIZE)
    },
    capturer: {
        getLargeThumbnail: (id: string) => invoke<string>(IpcEvents.CAPTURER_GET_LARGE_THUMBNAIL, id)
@@ -64,25 +62,14 @@ export const VesktopNative = {
    /** only available on Linux. */
    virtmic: {
        list: () =>
-            invoke<
-                { ok: false; isGlibCxxOutdated: boolean } | { ok: true; targets: Node[]; hasPipewirePulse: boolean }
-            >(IpcEvents.VIRT_MIC_LIST),
-        start: (include: Node[]) => invoke<void>(IpcEvents.VIRT_MIC_START, include),
-        startSystem: (exclude: Node[]) => invoke<void>(IpcEvents.VIRT_MIC_START_SYSTEM, exclude),
+            invoke<{ ok: false; isGlibcxxToOld: boolean } | { ok: true; targets: string[] }>(IpcEvents.VIRT_MIC_LIST),
+        start: (targets: string[]) => invoke<void>(IpcEvents.VIRT_MIC_START, targets),
+        startSystem: () => invoke<void>(IpcEvents.VIRT_MIC_START_SYSTEM),
        stop: () => invoke<void>(IpcEvents.VIRT_MIC_STOP)
    },
-    clipboard: {
-        copyImage: (imageBuffer: Uint8Array, imageSrc: string) =>
-            invoke<void>(IpcEvents.CLIPBOARD_COPY_IMAGE, imageBuffer, imageSrc)
-    },
-    debug: {
-        launchGpu: () => invoke<void>(IpcEvents.DEBUG_LAUNCH_GPU),
-        launchWebrtcInternals: () => invoke<void>(IpcEvents.DEBUG_LAUNCH_WEBRTC_INTERNALS)
-    },
-    commands: {
-        onCommand(cb: (message: IpcMessage) => void) {
-            ipcRenderer.on(IpcEvents.IPC_COMMAND, (_, message) => cb(message));
-        },
-        respond: (response: IpcResponse) => ipcRenderer.send(IpcEvents.IPC_COMMAND, response)
+    arrpc: {
+        onActivity(cb: (data: string) => void) {
+            ipcRenderer.on(IpcEvents.ARRPC_ACTIVITY, (_, data: string) => cb(data));
+        }
    }
 };
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { contextBridge, ipcRenderer, webFrame } from "electron";
@@ -40,3 +40,5 @@ if (IS_DEV) {
    });
 }
 // #endregion
+
+VesktopNative.spellcheck.setLanguages(window.navigator.languages);
--- a/src/preload/typedIpc.ts
+++ b/src/preload/typedIpc.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { ipcRenderer } from "electron";
--- a/src/renderer/appBadge.ts
+++ b/src/renderer/appBadge.ts
@@ -1,13 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { filters, waitFor } from "@vencord/types/webpack";
 import { RelationshipStore } from "@vencord/types/webpack/common";

-import { VesktopLogger } from "./logger";
 import { Settings } from "./settings";

 let GuildReadStateStore: any;
@@ -27,7 +26,7 @@ export function setBadge() {

        VesktopNative.app.setBadgeCount(totalCount);
    } catch (e) {
-        VesktopLogger.error("Failed to update badge count", e);
+        console.error(e);
    }
 }

--- a/src/renderer/arrpc.ts
+++ b/src/renderer/arrpc.ts
@@ -1,68 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Logger } from "@vencord/types/utils";
-import { findLazy, findStoreLazy, onceReady } from "@vencord/types/webpack";
-import { FluxDispatcher, InviteActions } from "@vencord/types/webpack/common";
-import { IpcCommands } from "shared/IpcEvents";
-
-import { onIpcCommand } from "./ipcCommands";
-import { Settings } from "./settings";
-
-const logger = new Logger("VesktopRPC", "#5865f2");
-const StreamerModeStore = findStoreLazy("StreamerModeStore");
-
-const arRPC = Vencord.Plugins.plugins["WebRichPresence (arRPC)"] as any as {
-    handleEvent(e: MessageEvent): void;
-};
-
-onIpcCommand(IpcCommands.RPC_ACTIVITY, async jsonData => {
-    if (!Settings.store.arRPC) return;
-
-    await onceReady;
-
-    const data = JSON.parse(jsonData);
-
-    if (data.socketId === "STREAMERMODE" && StreamerModeStore.autoToggle) {
-        FluxDispatcher.dispatch({
-            type: "STREAMER_MODE_UPDATE",
-            key: "enabled",
-            value: data.activity?.application_id === "STREAMERMODE"
-        });
-        return;
-    }
-
-    arRPC.handleEvent(new MessageEvent("message", { data: jsonData }));
-});
-
-onIpcCommand(IpcCommands.RPC_INVITE, async code => {
-    const { invite } = await InviteActions.resolveInvite(code, "Desktop Modal");
-    if (!invite) return false;
-
-    VesktopNative.win.focus();
-
-    FluxDispatcher.dispatch({
-        type: "INVITE_MODAL_OPEN",
-        invite,
-        code,
-        context: "APP"
-    });
-
-    return true;
-});
-
-const { DEEP_LINK } = findLazy(m => m.DEEP_LINK?.handler);
-
-onIpcCommand(IpcCommands.RPC_DEEP_LINK, async data => {
-    logger.debug("Opening deep link:", data);
-    try {
-        DEEP_LINK.handler({ args: data });
-        return true;
-    } catch (err) {
-        logger.error("Failed to open deep link:", err);
-        return false;
-    }
-});
--- a/src/renderer/components/ScreenSharePicker.tsx
+++ b/src/renderer/components/ScreenSharePicker.tsx
@@ -1,12 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import "./screenSharePicker.css";

-import { closeModal, Logger, Modals, ModalSize, openModal, useAwaiter } from "@vencord/types/utils";
+import { closeModal, Modals, openModal, useAwaiter } from "@vencord/types/utils";
 import { findStoreLazy, onceReady } from "@vencord/types/webpack";
 import {
    Button,
@@ -19,37 +19,23 @@ import {
    UserStore,
    useState
 } from "@vencord/types/webpack/common";
-import { Node } from "@vencord/venmic";
 import type { Dispatch, SetStateAction } from "react";
 import { addPatch } from "renderer/patches/shared";
-import { State, useSettings, useVesktopState } from "renderer/settings";
-import { classNameFactory, isLinux, isWindows } from "renderer/utils";
+import { isLinux, isWindows } from "renderer/utils";

-const StreamResolutions = ["480", "720", "1080", "1440", "2160"] as const;
+const StreamResolutions = ["480", "720", "1080", "1440"] as const;
 const StreamFps = ["15", "30", "60"] as const;

-const cl = classNameFactory("vcd-screen-picker-");
-
 const MediaEngineStore = findStoreLazy("MediaEngineStore");

 export type StreamResolution = (typeof StreamResolutions)[number];
 export type StreamFps = (typeof StreamFps)[number];

-type SpecialSource = "None" | "Entire System";
-
-type AudioSource = SpecialSource | Node;
-type AudioSources = SpecialSource | Node[];
-
-interface AudioItem {
-    name: string;
-    value: AudioSource;
-}
-
 interface StreamSettings {
+    resolution: StreamResolution;
+    fps: StreamFps;
    audio: boolean;
-    contentHint?: string;
-    includeSources?: AudioSources;
-    excludeSources?: AudioSources;
+    audioSource?: string;
 }

 export interface StreamPick extends StreamSettings {
@@ -62,9 +48,7 @@ interface Source {
    url: string;
 }

-export let currentSettings: StreamSettings | null = null;
-
-const logger = new Logger("VesktopScreenShare");
+let currentSettings: StreamSettings | null = null;

 addPatch({
    patches: [
@@ -77,11 +61,10 @@ addPatch({
        }
    ],
    patchStreamQuality(opts: any) {
-        const { screenshareQuality } = State.store;
-        if (!screenshareQuality) return;
+        if (!currentSettings) return;

-        const framerate = Number(screenshareQuality.frameRate);
-        const height = Number(screenshareQuality.resolution);
+        const framerate = Number(currentSettings.fps);
+        const height = Number(currentSettings.resolution);
        const width = Math.round(height * (16 / 9));

        Object.assign(opts, {
@@ -89,14 +72,6 @@ addPatch({
            bitrateMax: 8000000,
            bitrateTarget: 600000
        });
-        if (opts?.encode) {
-            Object.assign(opts.encode, {
-                framerate,
-                width,
-                height,
-                pixelCount: height * width
-            });
-        }
        Object.assign(opts.capture, {
            framerate,
            width,
@@ -108,14 +83,11 @@ addPatch({

 if (isLinux) {
    onceReady.then(() => {
-        FluxDispatcher.subscribe("STREAM_CLOSE", ({ streamKey }: { streamKey: string }) => {
-            const owner = streamKey.split(":").at(-1);
-
-            if (owner !== UserStore.getCurrentUser().id) {
-                return;
+        FluxDispatcher.subscribe("VOICE_STATE_UPDATES", e => {
+            for (const state of e.voiceStates) {
+                if (state.userId === UserStore.getCurrentUser().id && state.oldChannelId && !state.channelId)
+                    VesktopNative.virtmic.stop();
            }
-
-            VesktopNative.virtmic.stop();
        });
    });
 }
@@ -130,17 +102,13 @@ export function openScreenSharePicker(screens: Source[], skipPicker: boolean) {
                    modalProps={props}
                    submit={async v => {
                        didSubmit = true;
-
-                        if (v.includeSources && v.includeSources !== "None") {
-                            if (v.includeSources === "Entire System") {
-                                await VesktopNative.virtmic.startSystem(
-                                    !v.excludeSources || isSpecialSource(v.excludeSources) ? [] : v.excludeSources
-                                );
+                        if (v.audioSource && v.audioSource !== "None") {
+                            if (v.audioSource === "Entire System") {
+                                await VesktopNative.virtmic.startSystem();
                            } else {
-                                await VesktopNative.virtmic.start(v.includeSources);
+                                await VesktopNative.virtmic.start([v.audioSource]);
                            }
                        }
-
                        resolve(v);
                    }}
                    close={() => {
@@ -162,188 +130,20 @@ export function openScreenSharePicker(screens: Source[], skipPicker: boolean) {

 function ScreenPicker({ screens, chooseScreen }: { screens: Source[]; chooseScreen: (id: string) => void }) {
    return (
-        <div className={cl("screen-grid")}>
+        <div className="vcd-screen-picker-grid">
            {screens.map(({ id, name, url }) => (
-                <label key={id} className={cl("screen-label")}>
-                    <input
-                        type="radio"
-                        className={cl("screen-radio")}
-                        name="screen"
-                        value={id}
-                        onChange={() => chooseScreen(id)}
-                    />
+                <label key={id}>
+                    <input type="radio" name="screen" value={id} onChange={() => chooseScreen(id)} />

                    <img src={url} alt="" />
-                    <Text className={cl("screen-name")} variant="text-sm/normal">
-                        {name}
-                    </Text>
+                    <Text variant="text-sm/normal">{name}</Text>
                </label>
            ))}
        </div>
    );
 }

-function AudioSettingsModal({
-    modalProps,
-    close,
-    setAudioSources
-}: {
-    modalProps: any;
-    close: () => void;
-    setAudioSources: (s: AudioSources) => void;
-}) {
-    const Settings = useSettings();
-
-    return (
-        <Modals.ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
-            <Modals.ModalHeader className={cl("header")}>
-                <Forms.FormTitle tag="h2" className={cl("header-title")}>
-                    Venmic Settings
-                </Forms.FormTitle>
-                <Modals.ModalCloseButton onClick={close} />
-            </Modals.ModalHeader>
-            <Modals.ModalContent className={cl("modal")}>
-                <Switch
-                    hideBorder
-                    onChange={v => (Settings.audio = { ...Settings.audio, workaround: v })}
-                    value={Settings.audio?.workaround ?? false}
-                    note={
-                        <>
-                            Work around an issue that causes the microphone to be shared instead of the correct audio.
-                            Only enable if you're experiencing this issue.
-                        </>
-                    }
-                >
-                    Microphone Workaround
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={v => (Settings.audio = { ...Settings.audio, onlySpeakers: v })}
-                    value={Settings.audio?.onlySpeakers ?? true}
-                    note={
-                        <>
-                            When sharing entire desktop audio, only share apps that play to a speaker. You may want to
-                            disable this when using "mix bussing".
-                        </>
-                    }
-                >
-                    Only Speakers
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={v => (Settings.audio = { ...Settings.audio, onlyDefaultSpeakers: v })}
-                    value={Settings.audio?.onlyDefaultSpeakers ?? true}
-                    note={
-                        <>
-                            When sharing entire desktop audio, only share apps that play to the <b>default</b> speakers.
-                            You may want to disable this when using "mix bussing".
-                        </>
-                    }
-                >
-                    Only Default Speakers
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={v => (Settings.audio = { ...Settings.audio, ignoreInputMedia: v })}
-                    value={Settings.audio?.ignoreInputMedia ?? true}
-                    note={<>Exclude nodes that are intended to capture audio.</>}
-                >
-                    Ignore Inputs
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={v => (Settings.audio = { ...Settings.audio, ignoreVirtual: v })}
-                    value={Settings.audio?.ignoreVirtual ?? false}
-                    note={
-                        <>
-                            Exclude virtual nodes, such as nodes belonging to loopbacks. This might be useful when using
-                            "mix bussing".
-                        </>
-                    }
-                >
-                    Ignore Virtual
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={v =>
-                        (Settings.audio = {
-                            ...Settings.audio,
-                            ignoreDevices: v,
-                            deviceSelect: v ? false : Settings.audio?.deviceSelect
-                        })
-                    }
-                    value={Settings.audio?.ignoreDevices ?? true}
-                    note={<>Exclude device nodes, such as nodes belonging to microphones or speakers.</>}
-                >
-                    Ignore Devices
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={value => {
-                        Settings.audio = { ...Settings.audio, granularSelect: value };
-                        setAudioSources("None");
-                    }}
-                    value={Settings.audio?.granularSelect ?? false}
-                    note={<>Allow to select applications more granularly.</>}
-                >
-                    Granular Selection
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={value => {
-                        Settings.audio = { ...Settings.audio, deviceSelect: value };
-                        setAudioSources("None");
-                    }}
-                    value={Settings.audio?.deviceSelect ?? false}
-                    disabled={Settings.audio?.ignoreDevices}
-                    note={
-                        <>
-                            Allow to select devices such as microphones. Requires <b>Ignore Devices</b> to be turned
-                            off.
-                        </>
-                    }
-                >
-                    Device Selection
-                </Switch>
-            </Modals.ModalContent>
-            <Modals.ModalFooter className={cl("footer")}>
-                <Button color={Button.Colors.TRANSPARENT} onClick={close}>
-                    Back
-                </Button>
-            </Modals.ModalFooter>
-        </Modals.ModalRoot>
-    );
-}
-
-function OptionRadio<Settings extends object, Key extends keyof Settings>(props: {
-    options: Array<string> | ReadonlyArray<string>;
-    labels?: Array<string>;
-    settings: Settings;
-    settingsKey: Key;
-    onChange: (option: string) => void;
-}) {
-    const { options, settings, settingsKey, labels, onChange } = props;
-
-    return (
-        <div className={cl("option-radios")}>
-            {(options as string[]).map((option, idx) => (
-                <label className={cl("option-radio")} data-checked={settings[settingsKey] === option} key={option}>
-                    <Text variant="text-sm/bold">{labels?.[idx] ?? option}</Text>
-                    <input
-                        className={cl("option-input")}
-                        type="radio"
-                        name="fps"
-                        value={option}
-                        checked={settings[settingsKey] === option}
-                        onChange={() => onChange(option)}
-                    />
-                </label>
-            ))}
-        </div>
-    );
-}
-
-function StreamSettingsUi({
+function StreamSettings({
    source,
    settings,
    setSettings,
@@ -354,9 +154,6 @@ function StreamSettingsUi({
    setSettings: Dispatch<SetStateAction<StreamSettings>>;
    skipPicker: boolean;
 }) {
-    const Settings = useSettings();
-    const qualitySettings = State.store.screenshareQuality!;
-
    const [thumb] = useAwaiter(
        () => (skipPicker ? Promise.resolve(source.url) : VesktopNative.capturer.getLargeThumbnail(source.id)),
        {
@@ -365,90 +162,70 @@ function StreamSettingsUi({
        }
    );

-    const openSettings = () => {
-        const key = openModal(props => (
-            <AudioSettingsModal
-                modalProps={props}
-                close={() => props.onClose()}
-                setAudioSources={sources =>
-                    setSettings(s => ({ ...s, includeSources: sources, excludeSources: sources }))
-                }
-            />
-        ));
-    };
-
    return (
        <div>
            <Forms.FormTitle>What you're streaming</Forms.FormTitle>
-            <Card className={cl("card", "preview")}>
-                <img src={thumb} alt="" className={cl(isLinux ? "preview-img-linux" : "preview-img")} />
+            <Card className="vcd-screen-picker-card vcd-screen-picker-preview">
+                <img src={thumb} alt="" />
                <Text variant="text-sm/normal">{source.name}</Text>
            </Card>

            <Forms.FormTitle>Stream Settings</Forms.FormTitle>

-            <Card className={cl("card")}>
-                <div className={cl("quality")}>
-                    <section className={cl("quality-section")}>
+            <Card className="vcd-screen-picker-card">
+                <div className="vcd-screen-picker-quality">
+                    <section>
                        <Forms.FormTitle>Resolution</Forms.FormTitle>
-                        <OptionRadio
-                            options={StreamResolutions}
-                            settings={qualitySettings}
-                            settingsKey="resolution"
-                            onChange={value => (qualitySettings.resolution = value)}
-                        />
+                        <div className="vcd-screen-picker-radios">
+                            {StreamResolutions.map(res => (
+                                <label className="vcd-screen-picker-radio" data-checked={settings.resolution === res}>
+                                    <Text variant="text-sm/bold">{res}</Text>
+                                    <input
+                                        type="radio"
+                                        name="resolution"
+                                        value={res}
+                                        checked={settings.resolution === res}
+                                        onChange={() => setSettings(s => ({ ...s, resolution: res }))}
+                                    />
+                                </label>
+                            ))}
+                        </div>
                    </section>

-                    <section className={cl("quality-section")}>
+                    <section>
                        <Forms.FormTitle>Frame Rate</Forms.FormTitle>
-                        <OptionRadio
-                            options={StreamFps}
-                            settings={qualitySettings}
-                            settingsKey="frameRate"
-                            onChange={value => (qualitySettings.frameRate = value)}
-                        />
-                    </section>
-                </div>
-                <div className={cl("quality")}>
-                    <section className={cl("quality-section")}>
-                        <Forms.FormTitle>Content Type</Forms.FormTitle>
-                        <div>
-                            <OptionRadio
-                                options={["motion", "detail"]}
-                                labels={["Prefer Smoothness", "Prefer Clarity"]}
-                                settings={settings}
-                                settingsKey="contentHint"
-                                onChange={option => setSettings(s => ({ ...s, contentHint: option }))}
-                            />
-                            <div className={cl("hint-description")}>
-                                <p>
-                                    Choosing "Prefer Clarity" will result in a significantly lower framerate in exchange
-                                    for a much sharper and clearer image.
-                                </p>
-                            </div>
+                        <div className="vcd-screen-picker-radios">
+                            {StreamFps.map(fps => (
+                                <label className="vcd-screen-picker-radio" data-checked={settings.fps === fps}>
+                                    <Text variant="text-sm/bold">{fps}</Text>
+                                    <input
+                                        type="radio"
+                                        name="fps"
+                                        value={fps}
+                                        checked={settings.fps === fps}
+                                        onChange={() => setSettings(s => ({ ...s, fps }))}
+                                    />
+                                </label>
+                            ))}
                        </div>
-                        {isWindows && (
-                            <Switch
-                                value={settings.audio}
-                                onChange={checked => setSettings(s => ({ ...s, audio: checked }))}
-                                hideBorder
-                                className={cl("audio")}
-                            >
-                                Stream With Audio
-                            </Switch>
-                        )}
                    </section>
                </div>

+                {isWindows && (
+                    <Switch
+                        value={settings.audio}
+                        onChange={checked => setSettings(s => ({ ...s, audio: checked }))}
+                        hideBorder
+                        className="vcd-screen-picker-audio"
+                    >
+                        Stream With Audio
+                    </Switch>
+                )}
+
                {isLinux && (
                    <AudioSourcePickerLinux
-                        openSettings={openSettings}
-                        includeSources={settings.includeSources}
-                        excludeSources={settings.excludeSources}
-                        deviceSelect={Settings.audio?.deviceSelect}
-                        granularSelect={Settings.audio?.granularSelect}
-                        setIncludeSources={sources => setSettings(s => ({ ...s, includeSources: sources }))}
-                        setExcludeSources={sources => setSettings(s => ({ ...s, excludeSources: sources }))}
+                        audioSource={settings.audioSource}
+                        setAudioSource={source => setSettings(s => ({ ...s, audioSource: source }))}
                    />
                )}
            </Card>
@@ -456,228 +233,47 @@ function StreamSettingsUi({
    );
 }

-function isSpecialSource(value?: AudioSource | AudioSources): value is SpecialSource {
-    return typeof value === "string";
-}
-
-function hasMatchingProps(value: Node, other: Node) {
-    return Object.keys(value).every(key => value[key] === other[key]);
-}
-
-function mapToAudioItem(node: AudioSource, granularSelect?: boolean, deviceSelect?: boolean): AudioItem[] {
-    if (isSpecialSource(node)) {
-        return [{ name: node, value: node }];
-    }
-
-    const rtn: AudioItem[] = [];
-
-    const mediaClass = node["media.class"];
-
-    if (mediaClass?.includes("Video") || mediaClass?.includes("Midi")) {
-        return rtn;
-    }
-
-    if (!deviceSelect && node["device.id"]) {
-        return rtn;
-    }
-
-    const name = node["application.name"];
-
-    if (name) {
-        rtn.push({ name: name, value: { "application.name": name } });
-    }
-
-    if (!granularSelect) {
-        return rtn;
-    }
-
-    const rawName = node["node.name"];
-
-    if (!name) {
-        rtn.push({ name: rawName, value: { "node.name": rawName } });
-    }
-
-    const binary = node["application.process.binary"];
-
-    if (!name && binary) {
-        rtn.push({ name: binary, value: { "application.process.binary": binary } });
-    }
-
-    const pid = node["application.process.id"];
-
-    const first = rtn[0];
-    const firstValues = first.value as Node;
-
-    if (pid) {
-        rtn.push({
-            name: `${first.name} (${pid})`,
-            value: { ...firstValues, "application.process.id": pid }
-        });
-    }
-
-    const mediaName = node["media.name"];
-
-    if (mediaName) {
-        rtn.push({
-            name: `${first.name} [${mediaName}]`,
-            value: { ...firstValues, "media.name": mediaName }
-        });
-    }
-
-    if (mediaClass) {
-        rtn.push({
-            name: `${first.name} [${mediaClass}]`,
-            value: { ...firstValues, "media.class": mediaClass }
-        });
-    }
-
-    return rtn;
-}
-
-function isItemSelected(sources?: AudioSources) {
-    return (value: AudioSource) => {
-        if (!sources) {
-            return false;
-        }
-
-        if (isSpecialSource(sources) || isSpecialSource(value)) {
-            return sources === value;
-        }
-
-        return sources.some(source => hasMatchingProps(source, value));
-    };
-}
-
-function updateItems(setSources: (s: AudioSources) => void, sources?: AudioSources) {
-    return (value: AudioSource) => {
-        if (isSpecialSource(value)) {
-            setSources(value);
-            return;
-        }
-
-        if (isSpecialSource(sources)) {
-            setSources([value]);
-            return;
-        }
-
-        if (isItemSelected(sources)(value)) {
-            setSources(sources?.filter(x => !hasMatchingProps(x, value)) ?? "None");
-            return;
-        }
-
-        setSources([...(sources || []), value]);
-    };
-}
-
 function AudioSourcePickerLinux({
-    includeSources,
-    excludeSources,
-    deviceSelect,
-    granularSelect,
-    openSettings,
-    setIncludeSources,
-    setExcludeSources
+    audioSource,
+    setAudioSource
 }: {
-    includeSources?: AudioSources;
-    excludeSources?: AudioSources;
-    deviceSelect?: boolean;
-    granularSelect?: boolean;
-    openSettings: () => void;
-    setIncludeSources: (s: AudioSources) => void;
-    setExcludeSources: (s: AudioSources) => void;
+    audioSource?: string;
+    setAudioSource(s: string): void;
 }) {
    const [sources, _, loading] = useAwaiter(() => VesktopNative.virtmic.list(), {
-        fallbackValue: { ok: true, targets: [], hasPipewirePulse: true }
+        fallbackValue: { ok: true, targets: [] }
    });
-
-    const hasPipewirePulse = sources.ok ? sources.hasPipewirePulse : true;
-    const [ignorePulseWarning, setIgnorePulseWarning] = useState(false);
-
-    if (!sources.ok && sources.isGlibCxxOutdated) {
-        return (
-            <Forms.FormText>
-                Failed to retrieve Audio Sources because your C++ library is too old to run
-                <a href="https://github.com/Vencord/venmic" target="_blank">
-                    venmic
-                </a>
-                . See{" "}
-                <a href="https://gist.github.com/Vendicated/b655044ffbb16b2716095a448c6d827a" target="_blank">
-                    this guide
-                </a>{" "}
-                for possible solutions.
-            </Forms.FormText>
-        );
-    }
-
-    if (!hasPipewirePulse && !ignorePulseWarning) {
-        return (
-            <Text variant="text-sm/normal">
-                Could not find pipewire-pulse. See{" "}
-                <a href="https://gist.github.com/the-spyke/2de98b22ff4f978ebf0650c90e82027e#install" target="_blank">
-                    this guide
-                </a>{" "}
-                on how to switch to pipewire. <br />
-                You can still continue, however, please{" "}
-                <b>beware that you can only share audio of apps that are running under pipewire</b>.{" "}
-                <a onClick={() => setIgnorePulseWarning(true)}>I know what I'm doing!</a>
-            </Text>
-        );
-    }
-
-    const specialSources: SpecialSource[] = ["None", "Entire System"] as const;
-
-    const uniqueName = (value: AudioItem, index: number, list: AudioItem[]) =>
-        list.findIndex(x => x.name === value.name) === index;
-
-    const allSources = sources.ok
-        ? [...specialSources, ...sources.targets]
-              .map(target => mapToAudioItem(target, granularSelect, deviceSelect))
-              .flat()
-              .filter(uniqueName)
-        : [];
+    const allSources = sources.ok ? ["None", "Entire System", ...sources.targets] : null;

    return (
-        <>
-            <div className={cl({ quality: includeSources === "Entire System" })}>
-                <section>
-                    <Forms.FormTitle>{loading ? "Loading Sources..." : "Audio Sources"}</Forms.FormTitle>
-                    <Select
-                        options={allSources.map(({ name, value }) => ({
-                            label: name,
-                            value: value,
-                            default: name === "None"
-                        }))}
-                        isSelected={isItemSelected(includeSources)}
-                        select={updateItems(setIncludeSources, includeSources)}
-                        serialize={String}
-                        popoutPosition="top"
-                        closeOnSelect={false}
-                    />
-                </section>
-                {includeSources === "Entire System" && (
-                    <section>
-                        <Forms.FormTitle>Exclude Sources</Forms.FormTitle>
-                        <Select
-                            options={allSources
-                                .filter(x => x.name !== "Entire System")
-                                .map(({ name, value }) => ({
-                                    label: name,
-                                    value: value,
-                                    default: name === "None"
-                                }))}
-                            isSelected={isItemSelected(excludeSources)}
-                            select={updateItems(setExcludeSources, excludeSources)}
-                            serialize={String}
-                            popoutPosition="top"
-                            closeOnSelect={false}
-                        />
-                    </section>
-                )}
-            </div>
-            <Button color={Button.Colors.TRANSPARENT} onClick={openSettings} className={cl("settings-button")}>
-                Open Audio Settings
-            </Button>
-        </>
+        <section>
+            <Forms.FormTitle>Audio</Forms.FormTitle>
+            {loading && <Forms.FormTitle>Loading Audio sources...</Forms.FormTitle>}
+            {!sources.ok &&
+                (sources.isGlibcxxToOld ? (
+                    <Forms.FormText>
+                        Failed to retrieve Audio Sources because your c++ library is too old to run venmic. If you would
+                        like to stream with Audio, see{" "}
+                        <a href="https://gist.github.com/Vendicated/b655044ffbb16b2716095a448c6d827a" target="_blank">
+                            this guide
+                        </a>
+                    </Forms.FormText>
+                ) : (
+                    <Forms.FormText>
+                        Failed to retrieve Audio Sources. If you would like to stream with Audio, make sure you're using
+                        Pipewire, not Pulseaudio
+                    </Forms.FormText>
+                ))}
+
+            {allSources && (
+                <Select
+                    options={allSources.map(s => ({ label: s, value: s, default: s === "None" }))}
+                    isSelected={s => s === audioSource}
+                    select={setAudioSource}
+                    serialize={String}
+                />
+            )}
+        </section>
    );
 }

@@ -696,26 +292,23 @@ function ModalComponent({
 }) {
    const [selected, setSelected] = useState<string | undefined>(skipPicker ? screens[0].id : void 0);
    const [settings, setSettings] = useState<StreamSettings>({
-        contentHint: "motion",
-        audio: true,
-        includeSources: "None"
-    });
-    const qualitySettings = (useVesktopState().screenshareQuality ??= {
-        resolution: "720",
-        frameRate: "30"
+        resolution: "1080",
+        fps: "60",
+        audio: true
    });

    return (
-        <Modals.ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
-            <Modals.ModalHeader className={cl("header")}>
+        <Modals.ModalRoot {...modalProps}>
+            <Modals.ModalHeader className="vcd-screen-picker-header">
                <Forms.FormTitle tag="h2">ScreenShare</Forms.FormTitle>
                <Modals.ModalCloseButton onClick={close} />
            </Modals.ModalHeader>
-            <Modals.ModalContent className={cl("modal")}>
+
+            <Modals.ModalContent className="vcd-screen-picker-modal">
                {!selected ? (
                    <ScreenPicker screens={screens} chooseScreen={setSelected} />
                ) : (
-                    <StreamSettingsUi
+                    <StreamSettings
                        source={screens.find(s => s.id === selected)!}
                        settings={settings}
                        setSettings={setSettings}
@@ -723,63 +316,36 @@ function ModalComponent({
                    />
                )}
            </Modals.ModalContent>
-            <Modals.ModalFooter className={cl("footer")}>
+
+            <Modals.ModalFooter className="vcd-screen-picker-footer">
                <Button
                    disabled={!selected}
                    onClick={() => {
                        currentSettings = settings;
-                        try {
-                            const frameRate = Number(qualitySettings.frameRate);
-                            const height = Number(qualitySettings.resolution);
+
+                        // If there are 2 connections, the second one is the existing stream.
+                        // In that case, we patch its quality
+                        const conn = [...MediaEngineStore.getMediaEngine().connections][1];
+                        if (conn && conn.videoStreamParameters.length > 0) {
+                            const height = Number(settings.resolution);
                            const width = Math.round(height * (16 / 9));
-
-                            const conn = [...MediaEngineStore.getMediaEngine().connections].find(
-                                connection => connection.streamUserId === UserStore.getCurrentUser().id
-                            );
-
-                            if (conn) {
-                                conn.videoStreamParameters[0].maxFrameRate = frameRate;
-                                conn.videoStreamParameters[0].maxResolution.height = height;
-                                conn.videoStreamParameters[0].maxResolution.width = width;
-                            }
-
-                            submit({
-                                id: selected!,
-                                ...settings
-                            });
-
-                            setTimeout(async () => {
-                                const conn = [...MediaEngineStore.getMediaEngine().connections].find(
-                                    connection => connection.streamUserId === UserStore.getCurrentUser().id
-                                );
-                                if (!conn) return;
-
-                                const track = conn.input.stream.getVideoTracks()[0];
-
-                                const constraints = {
-                                    ...track.getConstraints(),
-                                    frameRate: { min: frameRate, ideal: frameRate },
-                                    width: { min: 640, ideal: width, max: width },
-                                    height: { min: 480, ideal: height, max: height },
-                                    advanced: [{ width: width, height: height }],
-                                    resizeMode: "none"
-                                };
-
-                                try {
-                                    await track.applyConstraints(constraints);
-
-                                    logger.info(
-                                        "Applied constraints successfully. New constraints:",
-                                        track.getConstraints()
-                                    );
-                                } catch (e) {
-                                    logger.error("Failed to apply constraints.", e);
+                            Object.assign(conn.videoStreamParameters[0], {
+                                maxFrameRate: Number(settings.fps),
+                                maxPixelCount: width * height,
+                                maxBitrate: 8000000,
+                                maxResolution: {
+                                    type: "fixed",
+                                    width,
+                                    height
                                }
-                            }, 100);
-                        } catch (error) {
-                            logger.error("Error while submitting stream.", error);
+                            });
                        }

+                        submit({
+                            id: selected!,
+                            ...settings
+                        });
+
                        close();
                    }}
                >
--- a/src/renderer/components/Settings.tsx
+++ b/src/renderer/components/Settings.tsx
@@ -0,0 +1,201 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import "./settings.css";
+
+import { Margins } from "@vencord/types/utils";
+import { Button, Forms, Select, Switch, Text, Toasts, useState } from "@vencord/types/webpack/common";
+import { setBadge } from "renderer/appBadge";
+import { useSettings } from "renderer/settings";
+import { isMac, isWindows } from "renderer/utils";
+import { isTruthy } from "shared/utils/guards";
+
+export default function SettingsUi() {
+    const Settings = useSettings();
+    const supportsWindowsTransparency = VesktopNative.app.supportsWindowsTransparency();
+
+    const { autostart } = VesktopNative;
+    const [autoStartEnabled, setAutoStartEnabled] = useState(autostart.isEnabled());
+
+    const allSwitches: Array<false | [keyof typeof Settings, string, string, boolean?, (() => boolean)?]> = [
+        isWindows && [
+            "discordWindowsTitleBar",
+            "Discord Titlebar",
+            "Use Discord's custom title bar instead of the Windows one. Requires a full restart."
+        ],
+        !isMac && ["tray", "Tray Icon", "Add a tray icon for Vesktop", true],
+        !isMac && [
+            "minimizeToTray",
+            "Minimize to tray",
+            "Hitting X will make Vesktop minimize to the tray instead of closing",
+            true,
+            () => Settings.tray ?? true
+        ],
+        ["arRPC", "Rich Presence", "Enables Rich Presence via arRPC", false],
+        [
+            "disableMinSize",
+            "Disable minimum window size",
+            "Allows you to make the window as small as your heart desires"
+        ],
+        ["staticTitle", "Static Title", 'Makes the window title "Vesktop" instead of changing to the current page'],
+        ["enableMenu", "Enable Menu Bar", "Enables the application menu bar. Press ALT to toggle visibility."],
+        ["disableSmoothScroll", "Disable smooth scrolling", "Disables smooth scrolling in Vesktop", false],
+        ["splashTheming", "Splash theming", "Adapt the splash window colors to your custom theme", false],
+        [
+            "openLinksWithElectron",
+            "Open Links in app (experimental)",
+            "Opens links in a new Vesktop window instead of your web browser"
+        ],
+        ["checkUpdates", "Check for updates", "Automatically check for Vesktop updates", true],
+        ["startMinimized", "Start minimized", "Vesktop remains in minimized mode on start", false]
+    ];
+
+    const switches = allSwitches.filter(isTruthy);
+
+    return (
+        <Forms.FormSection>
+            <Text variant="heading-lg/semibold" style={{ color: "var(--header-primary)" }} tag="h2">
+                Vesktop Settings
+            </Text>
+
+            <Forms.FormTitle className={Margins.top16 + " " + Margins.bottom8}>Discord Branch</Forms.FormTitle>
+            <Select
+                placeholder="Stable"
+                options={[
+                    { label: "Stable", value: "stable", default: true },
+                    { label: "Canary", value: "canary" },
+                    { label: "PTB", value: "ptb" }
+                ]}
+                closeOnSelect={true}
+                select={v => (Settings.discordBranch = v)}
+                isSelected={v => v === Settings.discordBranch}
+                serialize={s => s}
+            />
+
+            <Forms.FormDivider className={Margins.top16 + " " + Margins.bottom16} />
+
+            <Switch
+                value={autoStartEnabled}
+                onChange={async v => {
+                    await autostart[v ? "enable" : "disable"]();
+                    setAutoStartEnabled(v);
+                }}
+                note="Automatically start Vesktop on computer start-up"
+            >
+                Start With System
+            </Switch>
+
+            <Switch
+                value={Settings.appBadge ?? true}
+                onChange={v => {
+                    Settings.appBadge = v;
+                    if (v) setBadge();
+                    else VesktopNative.app.setBadgeCount(0);
+                }}
+                note="Show mention badge on the app icon"
+            >
+                Notification Badge
+            </Switch>
+
+            {switches.map(([key, text, note, def, predicate]) => (
+                <Switch
+                    value={(Settings[key as any] ?? def ?? false) && predicate?.() !== false}
+                    disabled={predicate && !predicate()}
+                    onChange={v => (Settings[key as any] = v)}
+                    note={note}
+                    key={key}
+                >
+                    {text}
+                </Switch>
+            ))}
+
+            {supportsWindowsTransparency && (
+                <>
+                    <Forms.FormTitle className={Margins.top16 + " " + Margins.bottom8}>
+                        Transparency Options
+                    </Forms.FormTitle>
+                    <Forms.FormText className={Margins.bottom8}>
+                        Requires a full restart. You will need a theme that supports transparency for this to work.
+                    </Forms.FormText>
+
+                    <Select
+                        placeholder="None"
+                        options={[
+                            {
+                                label: "None",
+                                value: "none",
+                                default: true
+                            },
+                            {
+                                label: "Mica (incorporates system theme + desktop wallpaper to paint the background)",
+                                value: "mica"
+                            },
+                            { label: "Tabbed (variant of Mica with stronger background tinting)", value: "tabbed" },
+                            {
+                                label: "Acrylic (blurs the window behind Vesktop for a translucent background)",
+                                value: "acrylic"
+                            }
+                        ]}
+                        closeOnSelect={true}
+                        select={v => (Settings.transparencyOption = v)}
+                        isSelected={v => v === Settings.transparencyOption}
+                        serialize={s => s}
+                    />
+
+                    <Forms.FormDivider className={Margins.top16 + " " + Margins.bottom16} />
+                </>
+            )}
+
+            <Forms.FormTitle>Vencord Location</Forms.FormTitle>
+            <Forms.FormText>
+                Vencord files are loaded from{" "}
+                {Settings.vencordDir ? (
+                    <a
+                        href="about:blank"
+                        onClick={e => {
+                            e.preventDefault();
+                            VesktopNative.fileManager.showItemInFolder(Settings.vencordDir!);
+                        }}
+                    >
+                        {Settings.vencordDir}
+                    </a>
+                ) : (
+                    "the default location"
+                )}
+            </Forms.FormText>
+            <div className="vcd-location-btns">
+                <Button
+                    size={Button.Sizes.SMALL}
+                    onClick={async () => {
+                        const choice = await VesktopNative.fileManager.selectVencordDir();
+                        switch (choice) {
+                            case "cancelled":
+                                return;
+                            case "invalid":
+                                Toasts.show({
+                                    message:
+                                        "You did not choose a valid Vencord install. Make sure you're selecting the dist dir!",
+                                    id: Toasts.genId(),
+                                    type: Toasts.Type.FAILURE
+                                });
+                                return;
+                        }
+                        Settings.vencordDir = choice;
+                    }}
+                >
+                    Change
+                </Button>
+                <Button
+                    size={Button.Sizes.SMALL}
+                    color={Button.Colors.RED}
+                    onClick={() => (Settings.vencordDir = void 0)}
+                >
+                    Reset
+                </Button>
+            </div>
+        </Forms.FormSection>
+    );
+}
--- a/src/renderer/components/index.ts
+++ b/src/renderer/components/index.ts
@@ -1,7 +1,8 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 export * as ScreenShare from "./ScreenSharePicker";
+export { default as Settings } from "./Settings";
--- a/src/renderer/components/screenSharePicker.css
+++ b/src/renderer/components/screenSharePicker.css
@@ -2,7 +2,7 @@
    padding: 1em;
 }

-.vcd-screen-picker-header-title {
+.vcd-screen-picker-header h1 {
    margin: 0;
 }

@@ -11,36 +11,34 @@
    gap: 1em;
 }

-.vcd-screen-picker-card {
-    flex-grow: 1;
-}
-
-
-/* Screen Grid */
-.vcd-screen-picker-screen-grid {
+.vcd-screen-picker-grid {
    display: grid;
    grid-template-columns: 1fr 1fr;
    gap: 2em 1em;
 }

-.vcd-screen-picker-screen-radio {
+.vcd-screen-picker-grid input {
    appearance: none;
    cursor: pointer;
 }

-.vcd-screen-picker-screen-label {
+.vcd-screen-picker-selected img {
+    border: 2px solid var(--brand-experiment);
+    border-radius: 3px;
+}
+
+.vcd-screen-picker-grid label {
    overflow: hidden;
-    padding: 8px;
+    padding: 4px 0px;
    cursor: pointer;
-    display: grid;
-    justify-items: center;
 }

-.vcd-screen-picker-screen-label:hover {
-    outline: 2px solid var(--brand-500);
+.vcd-screen-picker-grid label:hover {
+    outline: 2px solid var(--brand-experiment);
 }

-.vcd-screen-picker-screen-name {
+
+.vcd-screen-picker-grid div {
    white-space: nowrap;
    text-overflow: ellipsis;
    overflow: hidden;
@@ -54,13 +52,8 @@
    box-sizing: border-box;
 }

-.vcd-screen-picker-preview-img-linux {
-    width: 60%;
-    margin-bottom: 0.5em;
-}
-
-.vcd-screen-picker-preview-img {
-    width: 90%;
+.vcd-screen-picker-preview img {
+    width: 100%;
    margin-bottom: 0.5em;
 }

@@ -72,64 +65,60 @@
    margin-bottom: 1em;
 }

-
-/* Option Radios */
-
-.vcd-screen-picker-option-radios {
-    display: flex;
-    width: 100%;
-    border-radius: 3px;
+.vcd-screen-picker-radio input {
+    display: none;
 }

-.vcd-screen-picker-option-radio {
-    flex: 1 1 auto;
-    text-align: center;
+.vcd-screen-picker-radio {
    background-color: var(--background-secondary);
    border: 1px solid var(--primary-800);
    padding: 0.3em;
    cursor: pointer;
 }

-.vcd-screen-picker-option-radio:first-child {
-    border-radius: 3px 0 0 3px;
+.vcd-screen-picker-radio h2 {
+    margin: 0;
 }

-.vcd-screen-picker-option-radio:last-child {
-    border-radius: 0 3px 3px 0;
+.vcd-screen-picker-radio[data-checked="true"] {
+    background-color: var(--brand-experiment);
+    border-color: var(--brand-experiment);
 }

-.vcd-screen-picker-option-input {
-    display: none;
-}
-
-.vcd-screen-picker-option-radio[data-checked="true"] {
-    background-color: var(--brand-500);
-    border-color: var(--brand-500);
+.vcd-screen-picker-radio[data-checked="true"] h2 {
+    color: var(--interactive-active);
 }

 .vcd-screen-picker-quality {
    display: flex;
    gap: 1em;
+
    margin-bottom: 0.5em;
 }

-.vcd-screen-picker-quality-section {
+.vcd-screen-picker-quality section {
    flex: 1 1 auto;
 }

-.vcd-screen-picker-settings-button {
-    margin-left: auto;
-    margin-top: 0.3rem;
+.vcd-screen-picker-radios {
+    display: flex;
+    width: 100%;
+    border-radius: 3px;
 }

+.vcd-screen-picker-radios label {
+    flex: 1 1 auto;
+    text-align: center;
+}
+
+.vcd-screen-picker-radios label:first-child {
+    border-radius: 3px 0 0 3px;
+}
+
+.vcd-screen-picker-radios label:last-child {
+    border-radius: 0 3px 3px 0;
+}

 .vcd-screen-picker-audio {
    margin-bottom: 0;
 }
-
-.vcd-screen-picker-hint-description {
-    color: var(--header-secondary);
-    font-size: 14px;
-    line-height: 20px;
-    font-weight: 400;
-}
--- a/src/renderer/components/settings.css
+++ b/src/renderer/components/settings.css
@@ -0,0 +1,6 @@
+.vcd-location-btns {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 0.5em;
+    margin-top: 0.5em;
+}
--- a/src/renderer/components/settings/AutoStartToggle.tsx
+++ b/src/renderer/components/settings/AutoStartToggle.tsx
@@ -1,26 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Switch, useState } from "@vencord/types/webpack/common";
-
-import { SettingsComponent } from "./Settings";
-
-export const AutoStartToggle: SettingsComponent = () => {
-    const [autoStartEnabled, setAutoStartEnabled] = useState(VesktopNative.autostart.isEnabled());
-
-    return (
-        <Switch
-            value={autoStartEnabled}
-            onChange={async v => {
-                await VesktopNative.autostart[v ? "enable" : "disable"]();
-                setAutoStartEnabled(v);
-            }}
-            note="Automatically start Vesktop on computer start-up"
-        >
-            Start With System
-        </Switch>
-    );
-};
--- a/src/renderer/components/settings/DeveloperOptions.tsx
+++ b/src/renderer/components/settings/DeveloperOptions.tsx
@@ -1,120 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import {
-    Margins,
-    ModalCloseButton,
-    ModalContent,
-    ModalHeader,
-    ModalRoot,
-    ModalSize,
-    openModal,
-    useForceUpdater
-} from "@vencord/types/utils";
-import { Button, Forms, Text, Toasts } from "@vencord/types/webpack/common";
-import { Settings } from "shared/settings";
-
-import { SettingsComponent } from "./Settings";
-
-export const DeveloperOptionsButton: SettingsComponent = ({ settings }) => {
-    return <Button onClick={() => openDeveloperOptionsModal(settings)}>Open Developer Settings</Button>;
-};
-
-function openDeveloperOptionsModal(settings: Settings) {
-    openModal(props => (
-        <ModalRoot {...props} size={ModalSize.MEDIUM}>
-            <ModalHeader>
-                <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>
-                    Vesktop Developer Options
-                </Text>
-                <ModalCloseButton onClick={props.onClose} />
-            </ModalHeader>
-
-            <ModalContent>
-                <div style={{ padding: "1em 0" }}>
-                    <Forms.FormTitle tag="h5">Vencord Location</Forms.FormTitle>
-                    <VencordLocationPicker settings={settings} />
-
-                    <Forms.FormTitle tag="h5" className={Margins.top16}>
-                        Debugging
-                    </Forms.FormTitle>
-                    <div className="vcd-settings-button-grid">
-                        <Button onClick={() => VesktopNative.debug.launchGpu()}>Open chrome://gpu</Button>
-                        <Button onClick={() => VesktopNative.debug.launchWebrtcInternals()}>
-                            Open chrome://webrtc-internals
-                        </Button>
-                    </div>
-                </div>
-            </ModalContent>
-        </ModalRoot>
-    ));
-}
-
-const VencordLocationPicker: SettingsComponent = ({ settings }) => {
-    const forceUpdate = useForceUpdater();
-    const vencordDir = VesktopNative.fileManager.getVencordDir();
-
-    return (
-        <>
-            <Forms.FormText>
-                Vencord files are loaded from{" "}
-                {vencordDir ? (
-                    <a
-                        href="about:blank"
-                        onClick={e => {
-                            e.preventDefault();
-                            VesktopNative.fileManager.showItemInFolder(vencordDir!);
-                        }}
-                    >
-                        {vencordDir}
-                    </a>
-                ) : (
-                    "the default location"
-                )}
-            </Forms.FormText>
-            <div className="vcd-settings-button-grid">
-                <Button
-                    size={Button.Sizes.SMALL}
-                    onClick={async () => {
-                        const choice = await VesktopNative.fileManager.selectVencordDir();
-                        switch (choice) {
-                            case "cancelled":
-                                break;
-                            case "ok":
-                                Toasts.show({
-                                    message: "Vencord install changed. Fully restart Vesktop to apply.",
-                                    id: Toasts.genId(),
-                                    type: Toasts.Type.SUCCESS
-                                });
-                                break;
-                            case "invalid":
-                                Toasts.show({
-                                    message:
-                                        "You did not choose a valid Vencord install. Make sure you're selecting the dist dir!",
-                                    id: Toasts.genId(),
-                                    type: Toasts.Type.FAILURE
-                                });
-                                break;
-                        }
-                        forceUpdate();
-                    }}
-                >
-                    Change
-                </Button>
-                <Button
-                    size={Button.Sizes.SMALL}
-                    color={Button.Colors.RED}
-                    onClick={async () => {
-                        await VesktopNative.fileManager.selectVencordDir(null);
-                        forceUpdate();
-                    }}
-                >
-                    Reset
-                </Button>
-            </div>
-        </>
-    );
-};
--- a/src/renderer/components/settings/DiscordBranchPicker.tsx
+++ b/src/renderer/components/settings/DiscordBranchPicker.tsx
@@ -1,26 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Select } from "@vencord/types/webpack/common";
-
-import { SettingsComponent } from "./Settings";
-
-export const DiscordBranchPicker: SettingsComponent = ({ settings }) => {
-    return (
-        <Select
-            placeholder="Stable"
-            options={[
-                { label: "Stable", value: "stable", default: true },
-                { label: "Canary", value: "canary" },
-                { label: "PTB", value: "ptb" }
-            ]}
-            closeOnSelect={true}
-            select={v => (settings.discordBranch = v)}
-            isSelected={v => v === settings.discordBranch}
-            serialize={s => s}
-        />
-    );
-};
--- a/src/renderer/components/settings/NotificationBadgeToggle.tsx
+++ b/src/renderer/components/settings/NotificationBadgeToggle.tsx
@@ -1,26 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Switch } from "@vencord/types/webpack/common";
-import { setBadge } from "renderer/appBadge";
-
-import { SettingsComponent } from "./Settings";
-
-export const NotificationBadgeToggle: SettingsComponent = ({ settings }) => {
-    return (
-        <Switch
-            value={settings.appBadge ?? true}
-            onChange={v => {
-                settings.appBadge = v;
-                if (v) setBadge();
-                else VesktopNative.app.setBadgeCount(0);
-            }}
-            note="Show mention badge on the app icon"
-        >
-            Notification Badge
-        </Switch>
-    );
-};
--- a/src/renderer/components/settings/Settings.tsx
+++ b/src/renderer/components/settings/Settings.tsx
@@ -1,182 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import "./settings.css";
-
-import { ErrorBoundary } from "@vencord/types/components";
-import { Forms, Switch, Text } from "@vencord/types/webpack/common";
-import { ComponentType } from "react";
-import { Settings, useSettings } from "renderer/settings";
-import { isMac, isWindows } from "renderer/utils";
-
-import { AutoStartToggle } from "./AutoStartToggle";
-import { DeveloperOptionsButton } from "./DeveloperOptions";
-import { DiscordBranchPicker } from "./DiscordBranchPicker";
-import { NotificationBadgeToggle } from "./NotificationBadgeToggle";
-import { WindowsTransparencyControls } from "./WindowsTransparencyControls";
-
-interface BooleanSetting {
-    key: keyof typeof Settings.store;
-    title: string;
-    description: string;
-    defaultValue: boolean;
-    disabled?(): boolean;
-    invisible?(): boolean;
-}
-
-export type SettingsComponent = ComponentType<{ settings: typeof Settings.store }>;
-
-const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>> = {
-    "Discord Branch": [DiscordBranchPicker],
-    "System Startup & Performance": [
-        AutoStartToggle,
-        {
-            key: "hardwareAcceleration",
-            title: "Hardware Acceleration",
-            description: "Enable hardware acceleration",
-            defaultValue: true
-        }
-    ],
-    "User Interface": [
-        {
-            key: "customTitleBar",
-            title: "Discord Titlebar",
-            description: "Use Discord's custom title bar instead of the native system one. Requires a full restart.",
-            defaultValue: isWindows
-        },
-        {
-            key: "staticTitle",
-            title: "Static Title",
-            description: 'Makes the window title "Vesktop" instead of changing to the current page',
-            defaultValue: false
-        },
-        {
-            key: "enableMenu",
-            title: "Enable Menu Bar",
-            description: "Enables the application menu bar. Press ALT to toggle visibility.",
-            defaultValue: false,
-            disabled: () => Settings.store.customTitleBar ?? isWindows
-        },
-        {
-            key: "enableSplashScreen",
-            title: "Enable Splash Screen",
-            description:
-                "Shows a small splash screen while Vesktop is loading. Disabling this option will show the main window earlier while it's still loading.",
-            defaultValue: true
-        },
-        {
-            key: "splashTheming",
-            title: "Splash theming",
-            description: "Adapt the splash window colors to your custom theme",
-            defaultValue: true
-        },
-        WindowsTransparencyControls
-    ],
-    Behaviour: [
-        {
-            key: "tray",
-            title: "Tray Icon",
-            description: "Add a tray icon for Vesktop",
-            defaultValue: true,
-            invisible: () => isMac
-        },
-        {
-            key: "minimizeToTray",
-            title: "Minimize to tray",
-            description: "Hitting X will make Vesktop minimize to the tray instead of closing",
-            defaultValue: true,
-            invisible: () => isMac,
-            disabled: () => Settings.store.tray === false
-        },
-        {
-            key: "clickTrayToShowHide",
-            title: "Hide/Show on tray click",
-            description: "Left clicking tray icon will toggle the vesktop window visibility.",
-            defaultValue: false
-        },
-        {
-            key: "disableMinSize",
-            title: "Disable minimum window size",
-            description: "Allows you to make the window as small as your heart desires",
-            defaultValue: false
-        },
-        {
-            key: "disableSmoothScroll",
-            title: "Disable smooth scrolling",
-            description: "Disables smooth scrolling",
-            defaultValue: false
-        }
-    ],
-    Notifications: [NotificationBadgeToggle],
-    Miscellaneous: [
-        {
-            key: "arRPC",
-            title: "Rich Presence",
-            description: "Enables Rich Presence via arRPC",
-            defaultValue: false
-        },
-
-        {
-            key: "openLinksWithElectron",
-            title: "Open Links in app (experimental)",
-            description: "Opens links in a new Vesktop window instead of your web browser",
-            defaultValue: false
-        }
-    ],
-    "Developer Options": [DeveloperOptionsButton]
-};
-
-function SettingsSections() {
-    const Settings = useSettings();
-
-    const sections = Object.entries(SettingsOptions).map(([title, settings]) => (
-        <Forms.FormSection
-            title={title}
-            key={title}
-            className="vcd-settings-section"
-            titleClassName="vcd-settings-title"
-        >
-            {settings.map(Setting => {
-                if (typeof Setting === "function") return <Setting settings={Settings} />;
-
-                const { defaultValue, title, description, key, disabled, invisible } = Setting;
-                if (invisible?.()) return null;
-
-                return (
-                    <Switch
-                        value={Settings[key as any] ?? defaultValue}
-                        onChange={v => (Settings[key as any] = v)}
-                        note={description}
-                        disabled={disabled?.()}
-                        key={key}
-                    >
-                        {title}
-                    </Switch>
-                );
-            })}
-        </Forms.FormSection>
-    ));
-
-    return <>{sections}</>;
-}
-
-export default ErrorBoundary.wrap(
-    function SettingsUI() {
-        return (
-            <Forms.FormSection>
-                <Text variant="heading-lg/semibold" style={{ color: "var(--header-primary)" }} tag="h2">
-                    Vesktop Settings
-                </Text>
-
-                <SettingsSections />
-            </Forms.FormSection>
-        );
-    },
-    {
-        message:
-            "Failed to render the Vesktop Settings tab. If this issue persists, try to right click the Vesktop tray icon, then click 'Repair Vencord'. And make sure your Vesktop is up to date."
-    }
-);
--- a/src/renderer/components/settings/WindowsTransparencyControls.tsx
+++ b/src/renderer/components/settings/WindowsTransparencyControls.tsx
@@ -1,49 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Margins } from "@vencord/types/utils";
-import { Forms, Select } from "@vencord/types/webpack/common";
-
-import { SettingsComponent } from "./Settings";
-
-export const WindowsTransparencyControls: SettingsComponent = ({ settings }) => {
-    if (!VesktopNative.app.supportsWindowsTransparency()) return null;
-
-    return (
-        <>
-            <Forms.FormTitle className={Margins.top16 + " " + Margins.bottom8}>Transparency Options</Forms.FormTitle>
-            <Forms.FormText className={Margins.bottom8}>
-                Requires a full restart. You will need a theme that supports transparency for this to work.
-            </Forms.FormText>
-
-            <Select
-                placeholder="None"
-                options={[
-                    {
-                        label: "None",
-                        value: "none",
-                        default: true
-                    },
-                    {
-                        label: "Mica (incorporates system theme + desktop wallpaper to paint the background)",
-                        value: "mica"
-                    },
-                    { label: "Tabbed (variant of Mica with stronger background tinting)", value: "tabbed" },
-                    {
-                        label: "Acrylic (blurs the window behind Vesktop for a translucent background)",
-                        value: "acrylic"
-                    }
-                ]}
-                closeOnSelect={true}
-                select={v => (settings.transparencyOption = v)}
-                isSelected={v => v === settings.transparencyOption}
-                serialize={s => s}
-            />
-
-            <Forms.FormDivider className={Margins.top16 + " " + Margins.bottom16} />
-        </>
-    );
-};
--- a/src/renderer/components/settings/settings.css
+++ b/src/renderer/components/settings/settings.css
@@ -1,14 +0,0 @@
-.vcd-settings-button-grid {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 0.5em;
-    margin-top: 0.5em;
-}
-
-.vcd-settings-section {
-    margin-top: 1.5rem;
-}
-
-.vcd-settings-title {
-    margin-bottom: 0.5rem;
-}
--- a/src/renderer/fixes.css
+++ b/src/renderer/fixes.css
@@ -1,4 +0,0 @@
-/* Workaround for making things in the draggable area clickable again on macOS */
-.platform-osx [class*=topic_], .platform-osx [class*=notice_] button {
-    -webkit-app-region: no-drag;
-}
--- a/src/renderer/fixes.ts
+++ b/src/renderer/fixes.ts
@@ -1,12 +1,14 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

-import "./fixes.css";
+import "./hideGarbage.css";

-import { localStorage } from "./utils";
+import { waitFor } from "@vencord/types/webpack";
+
+import { isFirstRun, isWindows, localStorage } from "./utils";

 // Make clicking Notifications focus the window
 const originalSetOnClick = Object.getOwnPropertyDescriptor(Notification.prototype, "onclick")!.set!;
@@ -20,5 +22,23 @@ Object.defineProperty(Notification.prototype, "onclick", {
    configurable: true
 });

-// Hide "Download Discord Desktop now!!!!" banner
-localStorage.setItem("hideNag", "true");
+if (isFirstRun) {
+    // Hide "Download Discord Desktop now!!!!" banner
+    localStorage.setItem("hideNag", "true");
+
+    // Enable Desktop Notifications by default
+    waitFor("setDesktopType", m => {
+        m.setDesktopType("all");
+    });
+}
+
+// FIXME: Remove eventually.
+// Originally, Vencord always used a Windows user agent. This seems to cause captchas
+// Now, we use a platform specific UA - HOWEVER, discord FOR SOME REASON????? caches
+// device props in localStorage. This code fixes their cache to properly update the platform in SuperProps
+if (!isWindows)
+    try {
+        const deviceProperties = localStorage.getItem("deviceProperties");
+        if (deviceProperties && JSON.parse(deviceProperties).os === "Windows")
+            localStorage.removeItem("deviceProperties");
+    } catch {}
--- a/src/renderer/hideGarbage.css
+++ b/src/renderer/hideGarbage.css
@@ -0,0 +1,5 @@
+/* Download Desktop button in guilds list */
+[class^=listItem_]:has([data-list-item-id=guildsnav___app-download-button]),
+[class^=listItem_]:has(+ [class^=listItem_] [data-list-item-id=guildsnav___app-download-button]) {
+    display: none;
+}
--- a/src/renderer/index.ts
+++ b/src/renderer/index.ts
@@ -1,29 +1,45 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

-import "./themedSplash";
-import "./ipcCommands";
+import "./fixes";
 import "./appBadge";
 import "./patches";
-import "./fixes";
-import "./arrpc";
+import "./themedSplash";
+
+console.log("read if cute :3");

 export * as Components from "./components";
+import { findByPropsLazy } from "@vencord/types/webpack";
+import { FluxDispatcher } from "@vencord/types/webpack/common";

-import SettingsUi from "./components/settings/Settings";
-import { VesktopLogger } from "./logger";
+import SettingsUi from "./components/Settings";
 import { Settings } from "./settings";
 export { Settings };

-import type SettingsPlugin from "@vencord/types/plugins/_core/settings";
+const InviteActions = findByPropsLazy("resolveInvite");

-VesktopLogger.log("read if cute :3");
-VesktopLogger.log("Vesktop v" + VesktopNative.app.getVersion());
+export async function openInviteModal(code: string) {
+    const { invite } = await InviteActions.resolveInvite(code, "Desktop Modal");
+    if (!invite) return false;

-const customSettingsSections = (Vencord.Plugins.plugins.Settings as any as typeof SettingsPlugin).customSections;
+    VesktopNative.win.focus();
+
+    FluxDispatcher.dispatch({
+        type: "INVITE_MODAL_OPEN",
+        invite,
+        code,
+        context: "APP"
+    });
+
+    return true;
+}
+
+const customSettingsSections = (
+    Vencord.Plugins.plugins.Settings as any as { customSections: ((ID: Record<string, unknown>) => any)[] }
+).customSections;

 customSettingsSections.push(() => ({
    section: "Vesktop",
@@ -31,3 +47,13 @@ customSettingsSections.push(() => ({
    element: SettingsUi,
    className: "vc-vesktop-settings"
 }));
+
+const arRPC = Vencord.Plugins.plugins["WebRichPresence (arRPC)"] as any as {
+    handleEvent(e: MessageEvent): void;
+};
+
+VesktopNative.arrpc.onActivity(data => {
+    if (!Settings.store.arRPC) return;
+
+    arRPC.handleEvent(new MessageEvent("message", { data }));
+});
--- a/src/renderer/ipcCommands.ts
+++ b/src/renderer/ipcCommands.ts
@@ -1,49 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { SettingsRouter } from "@vencord/types/webpack/common";
-import { IpcCommands } from "shared/IpcEvents";
-
-type IpcCommandHandler = (data: any) => any;
-
-const handlers = new Map<string, IpcCommandHandler>();
-
-function respond(nonce: string, ok: boolean, data: any) {
-    VesktopNative.commands.respond({ nonce, ok, data });
-}
-
-VesktopNative.commands.onCommand(async ({ message, nonce, data }) => {
-    const handler = handlers.get(message);
-    if (!handler) {
-        return respond(nonce, false, `No handler for message: ${message}`);
-    }
-
-    try {
-        const result = await handler(data);
-        respond(nonce, true, result);
-    } catch (err) {
-        respond(nonce, false, String(err));
-    }
-});
-
-export function onIpcCommand(channel: string, handler: IpcCommandHandler) {
-    if (handlers.has(channel)) {
-        throw new Error(`Handler for message ${channel} already exists`);
-    }
-
-    handlers.set(channel, handler);
-}
-
-export function offIpcCommand(channel: string) {
-    handlers.delete(channel);
-}
-
-/* Generic Handlers */
-
-onIpcCommand(IpcCommands.NAVIGATE_SETTINGS, () => {
-    SettingsRouter.open("My Account");
-});
-onIpcCommand(IpcCommands.GET_LANGUAGES, () => navigator.languages);
--- a/src/renderer/logger.ts
+++ b/src/renderer/logger.ts
@@ -1,9 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Logger } from "@vencord/types/utils";
-
-export const VesktopLogger = new Logger("Vesktop", "#d3869b");
--- a/src/renderer/patches/allowDevToolsKeybind.ts
+++ b/src/renderer/patches/allowDevToolsKeybind.ts
@@ -1,19 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vesktop contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: '"mod+alt+i"',
-            replacement: {
-                match: /"discord\.com"===location\.host/,
-                replace: "false"
-            }
-        }
-    ]
-});
--- a/src/renderer/patches/enableNotificationsByDefault.ts
+++ b/src/renderer/patches/enableNotificationsByDefault.ts
@@ -1,21 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: '"NotificationSettingsStore',
-            replacement: {
-                // FIXME: fix eslint rule
-                // eslint-disable-next-line no-useless-escape
-                match: /\.isPlatformEmbedded(?=\?\i\.\i\.ALL)/g,
-                replace: "$&||true"
-            }
-        }
-    ]
-});
--- a/src/renderer/patches/hideDownloadAppsButton.ts
+++ b/src/renderer/patches/hideDownloadAppsButton.ts
@@ -1,19 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: '"app-download-button"',
-            replacement: {
-                match: /return(?=.{0,50}id:"app-download-button")/,
-                replace: "return null;return"
-            }
-        }
-    ]
-});
--- a/src/renderer/patches/hideSwitchDevice.tsx
+++ b/src/renderer/patches/hideSwitchDevice.tsx
@@ -1,24 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: "lastOutputSystemDevice.justChanged",
-            replacement: {
-                // eslint-disable-next-line no-useless-escape
-                match: /(\i)\.\i\.getState\(\).neverShowModal/,
-                replace: "$& || $self.shouldIgnore($1)"
-            }
-        }
-    ],
-
-    shouldIgnore(state: any) {
-        return Object.keys(state?.default?.lastDeviceConnected ?? {})?.[0] === "vencord-screen-share";
-    }
-});
--- a/src/renderer/patches/hideVenmicInput.tsx
+++ b/src/renderer/patches/hideVenmicInput.tsx
@@ -1,25 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: 'setSinkId"in',
-            replacement: {
-                // eslint-disable-next-line no-useless-escape
-                match: /return (\i)\?navigator\.mediaDevices\.enumerateDevices/,
-                replace: "return $1 ? $self.filteredDevices"
-            }
-        }
-    ],
-
-    async filteredDevices() {
-        const original = await navigator.mediaDevices.enumerateDevices();
-        return original.filter(x => x.label !== "vencord-screen-share");
-    }
-});
--- a/src/renderer/patches/index.ts
+++ b/src/renderer/patches/index.ts
@@ -1,18 +1,11 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 // TODO: Possibly auto generate glob if we have more patches in the future
-import "./enableNotificationsByDefault";
-import "./platformClass";
-import "./allowDevToolsKeybind";
-import "./hideSwitchDevice";
-import "./hideVenmicInput";
-import "./screenShareFixes";
 import "./spellCheck";
+import "./platformClass";
 import "./windowsTitleBar";
-import "./streamerMode";
-import "./windowMethods";
-import "./hideDownloadAppsButton";
+import "./screenShareAudio";
--- a/src/renderer/patches/platformClass.tsx
+++ b/src/renderer/patches/platformClass.tsx
@@ -1,11 +1,11 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { Settings } from "renderer/settings";
-import { isMac } from "renderer/utils";
+import { isMac, isWindows } from "renderer/utils";

 import { addPatch } from "./shared";

@@ -22,8 +22,8 @@ addPatch({
    ],

    getPlatformClass() {
-        if (Settings.store.customTitleBar) return "platform-win";
        if (isMac) return "platform-osx";
+        if (isWindows && Settings.store.discordWindowsTitleBar) return "platform-win";
        return "platform-web";
    }
 });
--- a/src/renderer/patches/screenShareAudio.ts
+++ b/src/renderer/patches/screenShareAudio.ts
@@ -1,16 +1,11 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

-import { Logger } from "@vencord/types/utils";
-import { currentSettings } from "renderer/components/ScreenSharePicker";
-import { State } from "renderer/settings";
 import { isLinux } from "renderer/utils";

-const logger = new Logger("VesktopStreamFixes");
-
 if (isLinux) {
    const original = navigator.mediaDevices.getDisplayMedia;

@@ -28,29 +23,6 @@ if (isLinux) {
        const stream = await original.call(this, opts);
        const id = await getVirtmic();

-        const frameRate = Number(State.store.screenshareQuality?.frameRate ?? 30);
-        const height = Number(State.store.screenshareQuality?.resolution ?? 720);
-        const width = Math.round(height * (16 / 9));
-        const track = stream.getVideoTracks()[0];
-
-        track.contentHint = String(currentSettings?.contentHint);
-
-        const constraints = {
-            ...track.getConstraints(),
-            frameRate: { min: frameRate, ideal: frameRate },
-            width: { min: 640, ideal: width, max: width },
-            height: { min: 480, ideal: height, max: height },
-            advanced: [{ width: width, height: height }],
-            resizeMode: "none"
-        };
-
-        track
-            .applyConstraints(constraints)
-            .then(() => {
-                logger.info("Applied constraints successfully. New constraints: ", track.getConstraints());
-            })
-            .catch(e => logger.error("Failed to apply constraints.", e));
-
        if (id) {
            const audio = await navigator.mediaDevices.getUserMedia({
                audio: {
--- a/src/renderer/patches/shared.ts
+++ b/src/renderer/patches/shared.ts
@@ -1,12 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { Patch } from "@vencord/types/utils/types";

-window.VesktopPatchGlobals = {};
+window.VCDP = {};

 interface PatchData {
    patches: Omit<Patch, "plugin">[];
@@ -16,10 +16,15 @@ interface PatchData {
 export function addPatch<P extends PatchData>(p: P) {
    const { patches, ...globals } = p;

-    for (const patch of patches) {
-        // TODO: Update types
-        Vencord.Plugins.addPatch(patch, "Vesktop", "VesktopPatchGlobals");
+    for (const patch of patches as Patch[]) {
+        if (!Array.isArray(patch.replacement)) patch.replacement = [patch.replacement];
+        for (const r of patch.replacement) {
+            if (typeof r.replace === "string") r.replace = r.replace.replaceAll("$self", "VCDP");
+        }
+
+        patch.plugin = "Vesktop";
+        Vencord.Plugins.patches.push(patch);
    }

-    Object.assign(VesktopPatchGlobals, globals);
+    Object.assign(VCDP, globals);
 }
--- a/src/renderer/patches/spellCheck.tsx
+++ b/src/renderer/patches/spellCheck.tsx
@@ -1,13 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { addContextMenuPatch } from "@vencord/types/api/ContextMenu";
 import { findStoreLazy } from "@vencord/types/webpack";
-import { FluxDispatcher, Menu, useMemo, useStateFromStores } from "@vencord/types/webpack/common";
-import { useSettings } from "renderer/settings";
+import { ContextMenu, FluxDispatcher, Menu } from "@vencord/types/webpack/common";

 import { addPatch } from "./shared";

@@ -47,20 +46,10 @@ addPatch({
    }
 });

-addContextMenuPatch("textarea-context", children => {
-    const spellCheckEnabled = useStateFromStores([SpellCheckStore], () => SpellCheckStore.isEnabled());
+addContextMenuPatch("textarea-context", children => () => {
    const hasCorrections = Boolean(word && corrections?.length);

-    const availableLanguages = useMemo(VesktopNative.spellcheck.getAvailableLanguages, []);
-
-    const settings = useSettings();
-    const spellCheckLanguages = (settings.spellCheckLanguages ??= [...new Set(navigator.languages)]);
-
-    const pasteSectionIndex = children.findIndex(c => c?.props?.children?.some(c => c?.props?.id === "paste"));
-
-    children.splice(
-        pasteSectionIndex === -1 ? children.length : pasteSectionIndex,
-        0,
+    children.push(
        <Menu.MenuGroup>
            {hasCorrections && (
                <>
@@ -79,39 +68,16 @@ addContextMenuPatch("textarea-context", children => {
                    />
                </>
            )}
-
-            <Menu.MenuItem id="vcd-spellcheck-settings" label="Spellcheck Settings">
-                <Menu.MenuCheckboxItem
-                    id="vcd-spellcheck-enabled"
-                    label="Enable Spellcheck"
-                    checked={spellCheckEnabled}
-                    action={() => {
-                        FluxDispatcher.dispatch({ type: "SPELLCHECK_TOGGLE" });
-                    }}
-                />
-
-                <Menu.MenuItem id="vcd-spellcheck-languages" label="Languages" disabled={!spellCheckEnabled}>
-                    {availableLanguages.map(lang => {
-                        const isEnabled = spellCheckLanguages.includes(lang);
-                        return (
-                            <Menu.MenuCheckboxItem
-                                id={"vcd-spellcheck-lang-" + lang}
-                                label={lang}
-                                checked={isEnabled}
-                                disabled={!isEnabled && spellCheckLanguages.length >= 5}
-                                action={() => {
-                                    const newSpellCheckLanguages = spellCheckLanguages.filter(l => l !== lang);
-                                    if (newSpellCheckLanguages.length === spellCheckLanguages.length) {
-                                        newSpellCheckLanguages.push(lang);
-                                    }
-
-                                    settings.spellCheckLanguages = newSpellCheckLanguages;
-                                }}
-                            />
-                        );
-                    })}
-                </Menu.MenuItem>
-            </Menu.MenuItem>
+            <Menu.MenuCheckboxItem
+                id="vcd-spellcheck-enabled"
+                label="Enable Spellcheck"
+                checked={SpellCheckStore.isEnabled()}
+                action={() => {
+                    FluxDispatcher.dispatch({ type: "SPELLCHECK_TOGGLE" });
+                    // Haven't found a good way to update state, so just close for now 🤷‍♀️
+                    ContextMenu.close();
+                }}
+            />
        </Menu.MenuGroup>
    );
 });
--- a/src/renderer/patches/streamerMode.ts
+++ b/src/renderer/patches/streamerMode.ts
@@ -1,21 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: ".STREAMER_MODE_ENABLE,",
-            replacement: {
-                // remove if (platformEmbedded) check from streamer mode toggle
-                // eslint-disable-next-line no-useless-escape
-                match: /if\(\i\.\i\)(?=return.{0,200}?"autoToggle")/g,
-                replace: ""
-            }
-        }
-    ]
-});
--- a/src/renderer/patches/windowMethods.tsx
+++ b/src/renderer/patches/windowMethods.tsx
@@ -1,28 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: ",setSystemTrayApplications",
-            replacement: [
-                {
-                    // eslint-disable-next-line no-useless-escape
-                    match: /\i\.window\.(close|minimize|maximize)/g,
-                    replace: `VesktopNative.win.$1`
-                },
-                {
-                    // TODO: Fix eslint rule
-                    // eslint-disable-next-line no-useless-escape
-                    match: /(focus(\(\i\)){).{0,150}?\.focus\(\i,\i\)/,
-                    replace: "$1VesktopNative.win.focus$2"
-                }
-            ]
-        }
-    ]
-});
--- a/src/renderer/patches/windowsTitleBar.tsx
+++ b/src/renderer/patches/windowsTitleBar.tsx
@@ -1,14 +1,14 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { Settings } from "renderer/settings";

 import { addPatch } from "./shared";

-if (Settings.store.customTitleBar)
+if (Settings.store.discordWindowsTitleBar)
    addPatch({
        patches: [
            {
@@ -19,25 +19,11 @@ if (Settings.store.customTitleBar)
                        // eslint-disable-next-line no-useless-escape
                        match: /case \i\.\i\.WINDOWS:/,
                        replace: 'case "WEB":'
-                    }
-                ]
-            },
-            // Visual Refresh
-            {
-                find: '"data-windows":',
-                replacement: [
-                    {
-                        // TODO: Fix eslint rule
-                        // eslint-disable-next-line no-useless-escape
-                        match: /\i===\i\.PlatformTypes\.WINDOWS/g,
-                        replace: "true"
                    },
-                    {
-                        // TODO: Fix eslint rule
-                        // eslint-disable-next-line no-useless-escape
-                        match: /\i===\i\.PlatformTypes\.WEB/g,
-                        replace: "false"
-                    }
+                    ...["close", "minimize", "maximize"].map(op => ({
+                        match: new RegExp(String.raw`\i\.\i\.${op}\b`),
+                        replace: `VesktopNative.win.${op}`
+                    }))
                ]
            }
        ]
--- a/src/renderer/settings.ts
+++ b/src/renderer/settings.ts
@@ -1,15 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { useEffect, useReducer } from "@vencord/types/webpack/common";
 import { SettingsStore } from "shared/utils/SettingsStore";

-import { VesktopLogger } from "./logger";
-import { localStorage } from "./utils";
-
 export const Settings = new SettingsStore(VesktopNative.settings.get());
 Settings.addGlobalChangeListener((o, p) => VesktopNative.settings.set(o, p));

@@ -31,38 +28,3 @@ export function getValueAndOnChange(key: keyof typeof Settings.store) {
        onChange: (value: any) => (Settings.store[key] = value)
    };
 }
-
-interface TState {
-    screenshareQuality?: {
-        resolution: string;
-        frameRate: string;
-    };
-}
-
-const stateKey = "VesktopState";
-
-const currentState: TState = (() => {
-    const stored = localStorage.getItem(stateKey);
-    if (!stored) return {};
-    try {
-        return JSON.parse(stored);
-    } catch (e) {
-        VesktopLogger.error("Failed to parse stored state", e);
-        return {};
-    }
-})();
-
-export const State = new SettingsStore<TState>(currentState);
-State.addGlobalChangeListener((o, p) => localStorage.setItem(stateKey, JSON.stringify(o)));
-
-export function useVesktopState() {
-    const [, update] = useReducer(x => x + 1, 0);
-
-    useEffect(() => {
-        State.addGlobalChangeListener(update);
-
-        return () => State.removeGlobalChangeListener(update);
-    }, []);
-
-    return State.store;
-}
--- a/src/renderer/themedSplash.ts
+++ b/src/renderer/themedSplash.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { Settings } from "./settings";
@@ -10,49 +10,15 @@ function isValidColor(color: CSSStyleValue | undefined): color is CSSUnparsedVal
    return color instanceof CSSUnparsedValue && typeof color[0] === "string" && CSS.supports("color", color[0]);
 }

-// https://gist.github.com/earthbound19/e7fe15fdf8ca3ef814750a61bc75b5ce
-function clamp(value: number, min: number, max: number) {
-    return Math.max(Math.min(value, max), min);
-}
-const linearToGamma = (c: number) => (c >= 0.0031308 ? 1.055 * Math.pow(c, 1 / 2.4) - 0.055 : 12.92 * c);
-
-function oklabToSRGB({ L, a, b }: { L: number; a: number; b: number }) {
-    let l = L + a * +0.3963377774 + b * +0.2158037573;
-    let m = L + a * -0.1055613458 + b * -0.0638541728;
-    let s = L + a * -0.0894841775 + b * -1.291485548;
-    l **= 3;
-    m **= 3;
-    s **= 3;
-    let R = l * +4.0767416621 + m * -3.3077115913 + s * +0.2309699292;
-    let G = l * -1.2684380046 + m * +2.6097574011 + s * -0.3413193965;
-    let B = l * -0.0041960863 + m * -0.7034186147 + s * +1.707614701;
-    R = 255 * linearToGamma(R);
-    G = 255 * linearToGamma(G);
-    B = 255 * linearToGamma(B);
-    R = Math.round(clamp(R, 0, 255));
-    G = Math.round(clamp(G, 0, 255));
-    B = Math.round(clamp(B, 0, 255));
-
-    return `rgb(${R}, ${G}, ${B})`;
-}
-
 function resolveColor(color: string) {
    const span = document.createElement("span");
    span.style.color = color;
    span.style.display = "none";

    document.body.append(span);
-    let rgbColor = getComputedStyle(span).color;
+    const rgbColor = getComputedStyle(span).color;
    span.remove();

-    if (rgbColor.startsWith("oklab(")) {
-        // scam
-        const [_, L, a, b] = rgbColor.match(/oklab\((.+?)[, ]+(.+?)[, ]+(.+?)\)/) ?? [];
-        if (L && a && b) {
-            rgbColor = oklabToSRGB({ L: parseFloat(L), a: parseFloat(a), b: parseFloat(b) });
-        }
-    }
-
    return rgbColor;
 }

--- a/src/renderer/utils.ts
+++ b/src/renderer/utils.ts
@@ -1,10 +1,9 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

-// Discord deletes this from the window so we need to capture it in a variable
 export const { localStorage } = window;

 export const isFirstRun = (() => {
@@ -19,26 +18,3 @@ const { platform } = navigator;
 export const isWindows = platform.startsWith("Win");
 export const isMac = platform.startsWith("Mac");
 export const isLinux = platform.startsWith("Linux");
-
-type ClassNameFactoryArg = string | string[] | Record<string, unknown> | false | null | undefined | 0 | "";
-/**
- * @param prefix The prefix to add to each class, defaults to `""`
- * @returns A classname generator function
- * @example
- * const cl = classNameFactory("plugin-");
- *
- * cl("base", ["item", "editable"], { selected: null, disabled: true })
- * // => "plugin-base plugin-item plugin-editable plugin-disabled"
- */
-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);
-            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));
-        }
-        return Array.from(classNames, name => prefix + name).join(" ");
-    };
--- a/src/shared/IpcEvents.ts
+++ b/src/shared/IpcEvents.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 export const enum IpcEvents {
@@ -23,14 +23,13 @@ export const enum IpcEvents {
    GET_SETTINGS = "VCD_GET_SETTINGS",
    SET_SETTINGS = "VCD_SET_SETTINGS",

-    GET_VENCORD_DIR = "VCD_GET_VENCORD_DIR",
    SELECT_VENCORD_DIR = "VCD_SELECT_VENCORD_DIR",

    UPDATER_GET_DATA = "VCD_UPDATER_GET_DATA",
    UPDATER_DOWNLOAD = "VCD_UPDATER_DOWNLOAD",
    UPDATE_IGNORE = "VCD_UPDATE_IGNORE",

-    SPELLCHECK_GET_AVAILABLE_LANGUAGES = "VCD_SPELLCHECK_GET_AVAILABLE_LANGUAGES",
+    SPELLCHECK_SET_LANGUAGES = "VCD_SPELLCHECK_SET_LANGUAGES",
    SPELLCHECK_RESULT = "VCD_SPELLCHECK_RESULT",
    SPELLCHECK_REPLACE_MISSPELLING = "VCD_SPELLCHECK_REPLACE_MISSPELLING",
    SPELLCHECK_ADD_TO_DICTIONARY = "VCD_SPELLCHECK_ADD_TO_DICTIONARY",
@@ -48,20 +47,5 @@ export const enum IpcEvents {
    VIRT_MIC_START_SYSTEM = "VCD_VIRT_MIC_START_ALL",
    VIRT_MIC_STOP = "VCD_VIRT_MIC_STOP",

-    ARRPC_ACTIVITY = "VCD_ARRPC_ACTIVITY",
-
-    CLIPBOARD_COPY_IMAGE = "VCD_CLIPBOARD_COPY_IMAGE",
-
-    DEBUG_LAUNCH_GPU = "VCD_DEBUG_LAUNCH_GPU",
-    DEBUG_LAUNCH_WEBRTC_INTERNALS = "VCD_DEBUG_LAUNCH_WEBRTC",
-
-    IPC_COMMAND = "VCD_IPC_COMMAND"
-}
-
-export const enum IpcCommands {
-    RPC_ACTIVITY = "rpc:activity",
-    RPC_INVITE = "rpc:invite",
-    RPC_DEEP_LINK = "rpc:link",
-    NAVIGATE_SETTINGS = "navigate:settings",
-    GET_LANGUAGES = "navigator.languages"
+    ARRPC_ACTIVITY = "VCD_ARRPC_ACTIVITY"
 }
--- a/src/shared/browserWinProperties.ts
+++ b/src/shared/browserWinProperties.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import type { BrowserWindowConstructorOptions } from "electron";
--- a/src/shared/paths.ts
+++ b/src/shared/paths.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { join } from "path";
--- a/src/shared/settings.d.ts
+++ b/src/shared/settings.d.ts
@@ -1,13 +1,14 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import type { Rectangle } from "electron";

 export interface Settings {
    discordBranch?: "stable" | "canary" | "ptb";
+    vencordDir?: string;
    transparencyOption?: "none" | "mica" | "tabbed" | "acrylic";
    tray?: boolean;
    minimizeToTray?: boolean;
@@ -15,44 +16,23 @@ export interface Settings {
    staticTitle?: boolean;
    enableMenu?: boolean;
    disableSmoothScroll?: boolean;
-    hardwareAcceleration?: boolean;
    arRPC?: boolean;
    appBadge?: boolean;
-    disableMinSize?: boolean;
-    clickTrayToShowHide?: boolean;
-    customTitleBar?: boolean;
+    discordWindowsTitleBar?: boolean;
+    startMinimized?: boolean;
+
+    maximized?: boolean;
+    minimized?: boolean;
+    windowBounds?: Rectangle;
+    disableMinSize?: boolean;
+
+    checkUpdates?: boolean;
+    skippedUpdate?: string;
+    firstLaunch?: boolean;

-    enableSplashScreen?: boolean;
    splashTheming?: boolean;
    splashColor?: string;
    splashBackground?: string;

-    spellCheckLanguages?: string[];
-
-    audio?: {
-        workaround?: boolean;
-
-        deviceSelect?: boolean;
-        granularSelect?: boolean;
-
-        ignoreVirtual?: boolean;
-        ignoreDevices?: boolean;
-        ignoreInputMedia?: boolean;
-
-        onlySpeakers?: boolean;
-        onlyDefaultSpeakers?: boolean;
-    };
-}
-
-export interface State {
-    maximized?: boolean;
-    minimized?: boolean;
-    windowBounds?: Rectangle;
-    displayId: int;
-
-    firstLaunch?: boolean;
-
    steamOSLayoutVersion?: number;
-
-    vencordDir?: string;
 }
--- a/src/shared/utils/SettingsStore.ts
+++ b/src/shared/utils/SettingsStore.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 import { LiteralUnion } from "type-fest";
@@ -26,11 +26,11 @@ export class SettingsStore<T extends object> {
    /**
     * The store object. Making changes to this object will trigger the applicable change listeners
     */
-    declare public store: T;
+    public declare store: T;
    /**
     * The plain data. Changes to this object will not trigger any change listeners
     */
-    declare public plain: T;
+    public declare plain: T;

    public constructor(plain: T) {
        this.plain = plain;
@@ -59,19 +59,6 @@ export class SettingsStore<T extends object> {
                self.pathListeners.get(setPath)?.forEach(cb => cb(value));

                return true;
-            },
-            deleteProperty(target, key: string) {
-                if (!(key in target)) return true;
-
-                const res = Reflect.deleteProperty(target, key);
-                if (!res) return false;
-
-                const setPath = `${path}${path && "."}${key}`;
-
-                self.globalListeners.forEach(cb => cb(root, setPath));
-                self.pathListeners.get(setPath)?.forEach(cb => cb(undefined));
-
-                return res;
            }
        });
    }
@@ -157,11 +144,4 @@ export class SettingsStore<T extends object> {
        listeners.delete(cb);
        if (!listeners.size) this.pathListeners.delete(path as string);
    }
-
-    /**
-     * Call all global change listeners
-     */
-    public markAsChanged() {
-        this.globalListeners.forEach(cb => cb(this.plain, ""));
-    }
 }
--- a/src/shared/utils/debounce.ts
+++ b/src/shared/utils/debounce.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 /**
--- a/src/shared/utils/guards.ts
+++ b/src/shared/utils/guards.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 export function isTruthy<T>(item: T): item is Exclude<T, 0 | "" | false | null | undefined> {
--- a/src/shared/utils/once.ts
+++ b/src/shared/utils/once.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 /**
--- a/src/shared/utils/sleep.ts
+++ b/src/shared/utils/sleep.ts
@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
 * Vesktop, a desktop app aiming to give you a snappier Discord Experience
 * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
 */

 export function sleep(ms: number): Promise<void> {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lewis Crichton	bb09596485	chore: prep for flatpak	2023-12-09 23:09:54 +00:00
Lewis Crichton	894ec4b902	chore: lint	2023-12-09 23:01:35 +00:00
Lewis Crichton	dd44602730	fix: make minimize only run on autostart	2023-12-09 23:00:47 +00:00