diff --git a/src/equicordplugins/forwardAnywhere/index.ts b/src/equicordplugins/forwardAnywhere/index.ts
index 806e8aa7..d84f7e1e 100644
--- a/src/equicordplugins/forwardAnywhere/index.ts
+++ b/src/equicordplugins/forwardAnywhere/index.ts
@@ -4,15 +4,28 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { definePluginSettings } from "@api/Settings";
 import { EquicordDevs } from "@utils/constants";
 import { sendMessage } from "@utils/discord";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { Message } from "discord-types/general";
 
+const settings = definePluginSettings({
+    textHeader: {
+        description: "What header to preface text with",
+        type: OptionType.SELECT,
+        options: [
+            { label: ">", value: ">", default: true },
+            { label: "-#", value: "-#" }
+        ]
+    }
+});
+
 export default definePlugin({
     name: "ForwardAnywhere",
     description: "If a forward fails send it as a normal message also allows nsfw forwards",
     authors: [EquicordDevs.thororen],
+    settings,
     patches: [
         {
             find: "#{intl::MESSAGE_FORWARDING_NSFW_NOT_ALLOWED}",
@@ -32,7 +45,7 @@ export default definePlugin({
     sendForward(channels: any, message: Message) {
         for (const c of channels) {
             sendMessage(c.id, {
-                content: `${message.content}\n\n> Forwarded from <#${message.channel_id}>`
+                content: `${message.content}\n${settings.store.textHeader} Forwarded from <#${message.channel_id}>`
             });
         }
     }
diff --git a/src/equicordplugins/githubRepos/index.tsx b/src/equicordplugins/githubRepos/index.tsx
index 7faa03c9..65eccb64 100644
--- a/src/equicordplugins/githubRepos/index.tsx
+++ b/src/equicordplugins/githubRepos/index.tsx
@@ -76,7 +76,7 @@ export default definePlugin({
             }
         },
         {
-            find: "action:\"PRESS_APP_CONNECTION\"",
+            find: "#{intl::CONNECTIONS}),scrollIntoView",
             replacement: {
                 match: /(?<=user:(\i).{0,15}displayProfile:(\i).*?CONNECTIONS.{0,100}\}\)\}\))/,
                 replace: ",$self.ProfilePopoutComponent({ user: $1, displayProfile: $2 })"
diff --git a/src/equicordplugins/toastNotifications/components/Notifications.tsx b/src/equicordplugins/toastNotifications/components/Notifications.tsx
index fa10e2ae..204ac6e3 100644
--- a/src/equicordplugins/toastNotifications/components/Notifications.tsx
+++ b/src/equicordplugins/toastNotifications/components/Notifications.tsx
@@ -27,11 +27,6 @@ let NotificationQueue: JSX.Element[] = [];
 let notificationID = 0;
 let RootContainer: Root;
 
-/**
- * getNotificationContainer()
- * Gets the root container for the notifications, creating it if it doesn't exist.
- * @returns {Root} The root DOM container.
- */
 function getNotificationContainer() {
     if (!RootContainer) {
         const container = document.createElement("div");
diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index 07723bcc..ad4e8eab 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -32,7 +32,7 @@ export default definePlugin({
         },
         // User Profile Modal
         {
-            find: "action:\"PRESS_APP_CONNECTION\"",
+            find: "#{intl::CONNECTIONS}),scrollIntoView",
             replacement: {
                 match: /#{intl::USER_PROFILE_MEMBER_SINCE}\),.{0,100}userId:(\i\.id),.{0,100}}\)}\),/,
                 replace: "$&,$self.FriendsSinceComponent({userId:$1,isSidebar:false}),"
diff --git a/src/utils/quickCss.ts b/src/utils/quickCss.ts
index 71092e51..17fa15e5 100644
--- a/src/utils/quickCss.ts
+++ b/src/utils/quickCss.ts
@@ -17,8 +17,7 @@
 */
 
 import { Settings, SettingsStore } from "@api/Settings";
-import { ThemeStore } from "@webpack/common";
-
+import { findByCodeLazy } from "@webpack";
 
 let style: HTMLStyleElement;
 let themesStyle: HTMLStyleElement;
@@ -62,6 +61,7 @@ async function initThemes() {
 
     const enabledlinks: string[] = [...enabledThemeLinks];
     // "darker" and "midnight" both count as dark
+    const ThemeStore = findByCodeLazy("ThemeStore");
     const activeTheme = ThemeStore.theme === "light" ? "light" : "dark";
 
     const links = enabledlinks
@@ -99,14 +99,6 @@ document.addEventListener("DOMContentLoaded", () => {
     SettingsStore.addChangeListener("enabledThemeLinks", initThemes);
     SettingsStore.addChangeListener("enabledThemes", initThemes);
 
-    let currentTheme = ThemeStore.theme;
-    ThemeStore.addChangeListener(() => {
-        if (currentTheme === ThemeStore.theme) return;
-
-        currentTheme = ThemeStore.theme;
-        initThemes();
-    });
-
     if (!IS_WEB)
         VencordNative.quickCss.addThemeChangeListener(initThemes);
 });
diff --git a/src/webpack/common/react.ts b/src/webpack/common/react.ts
index 1bb874e8..90f071d2 100644
--- a/src/webpack/common/react.ts
+++ b/src/webpack/common/react.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { findByPropsLazy, waitFor } from "@webpack";
+import { findByPropsLazy, waitFor } from "../webpack";
 
 export let React: typeof import("react");
 export let useState: typeof React.useState;