diff --git a/README.md b/README.md
index 40cc0b6d8..49eb937cb 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch
 ### Extra included plugins
 
 <details>
-<summary>188 additional plugins</summary>
+<summary>192 additional plugins</summary>
 
 ### All Platforms
 
@@ -22,6 +22,7 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch
 - Anammox by Kyuuhachi
 - AudiobookShelfRPC by vMohammad
 - AtSomeone by Joona
+- AutoJump by omaw
 - BannersEverywhere by ImLvna & AutumnVN
 - BetterActivities by D3SOX, Arjix, AutumnVN
 - BetterAudioPlayer by Creations
@@ -57,6 +58,7 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch
 - Encryptcord by Inbestigator
 - EquicordHelper by thororen & nyx
 - Equissant by SomeAspy & thororen
+- ExpandedUserTags by Cyn, TheSun, RyanCaoDev, LordElias, AutumnVN, hen
 - ExportContacts by dat_insanity
 - FakeProfileThemesAndEffects by ryan
 - CopyProfileColors by Crxa
@@ -81,6 +83,7 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch
 - GlobalBadges by HypedDomi & Hosted by Wolfie
 - GoogleThat by Samwich
 - GuildPickerDumper by Cortex, Samwich, Synth, thororen
+- GuildTagSettings by thororen
 - HideChatButtons by iamme
 - HideServers by bepvte
 - HolyNotes by Wolfie
@@ -117,7 +120,6 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch
 - MoreCommands by Arjix, echo, Samu
 - MoreKaomoji by JacobTm & voidbbg
 - MoreStickers by Leko & Arjix
-- MoreUserTags by Cyn, TheSun, RyanCaoDev, LordElias, AutumnVN, hen
 - Morse by zyqunix
 - Moyai by Megu & Nuckyz
 - NeverPausePreviews by vappstar
@@ -131,13 +133,13 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch
 - NoOnboarding by omaw & Glitch
 - NoRoleHeaders by Samwich
 - NotificationTitle by Kyuuhachi
+- OrbolayBridge by SpikeHD
 - PartyMode by UwUDev
 - PingNotifications by smuki
 - PinIcon by iamme
 - PlatformSpoofer by Drag
 - PolishWording by Samwich
 - PurgeMessages by bhop & nyx
-- QuestCompleter by Amia
 - QuestionMarkReplacement by nyx
 - Quoter by Samwich
 - RandomVoice by xijexo, omaw, thororen
@@ -210,6 +212,7 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch
 - ClipsEnhancements by niko
 - MediaDownloader by Colorman
 - NoRPC by Cyn
+- QuestCompleter by Amia
 - StatusWhilePlaying by thororen
 
 ### Equicord Devbuilds Only
diff --git a/src/equicordplugins/equicordHelper/index.tsx b/src/equicordplugins/equicordHelper/index.tsx
index 93a814f68..5efc3380d 100644
--- a/src/equicordplugins/equicordHelper/index.tsx
+++ b/src/equicordplugins/equicordHelper/index.tsx
@@ -18,25 +18,10 @@
 
 import "@equicordplugins/_misc/styles.css";
 
-import { definePluginSettings } from "@api/Settings";
-import { disableStyle, enableStyle } from "@api/Styles";
 import { EquicordDevs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
+import definePlugin from "@utils/types";
 import { Forms } from "@webpack/common";
 
-import clanBadges from "../_misc/clanBadges.css?managed";
-
-const settings = definePluginSettings({
-    hideClanBadges: {
-        type: OptionType.BOOLEAN,
-        description: "Hide clan badges",
-        default: false,
-        onChange: value => {
-            if (value) enableStyle(clanBadges);
-            else disableStyle(clanBadges);
-        }
-    }
-});
 
 export default definePlugin({
     name: "EquicordHelper",
@@ -52,11 +37,8 @@ export default definePlugin({
             - Unknown Resolution/FPS Fixed?
             <br />
             - Whitelists all domains in CSP
-            <br />
-            - Option to hide Clan Badges
         </Forms.FormText>
     </>,
-    settings,
     required: true,
     patches: [
         // Fixes Unknown Resolution/FPS Crashing
@@ -73,11 +55,5 @@ export default definePlugin({
                 }
             ]
         }
-    ],
-    start() {
-        if (settings.store.hideClanBadges) enableStyle(clanBadges);
-    },
-    stop() {
-        if (settings.store.hideClanBadges) disableStyle(clanBadges);
-    }
+    ]
 });
diff --git a/src/equicordplugins/guildTagSettings/index.ts b/src/equicordplugins/guildTagSettings/index.ts
new file mode 100644
index 000000000..c8d772f29
--- /dev/null
+++ b/src/equicordplugins/guildTagSettings/index.ts
@@ -0,0 +1,67 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and Megumin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import "@equicordplugins/_misc/styles.css";
+
+import { definePluginSettings } from "@api/Settings";
+import { disableStyle, enableStyle } from "@api/Styles";
+import { EquicordDevs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+import clanBadges from "../_misc/clanBadges.css?managed";
+
+const settings = definePluginSettings({
+    hideTags: {
+        type: OptionType.BOOLEAN,
+        description: "Hide tags",
+        default: false,
+        onChange: value => {
+            if (value) enableStyle(clanBadges);
+            else disableStyle(clanBadges);
+        }
+    },
+    disableAdoptTagPrompt: {
+        type: OptionType.BOOLEAN,
+        description: "Disable the prompt to adopt tags",
+        default: true,
+        restartNeeded: true
+    }
+});
+
+export default definePlugin({
+    name: "GuildTagSettings",
+    description: "Settings for Guild Tags",
+    authors: [EquicordDevs.thororen],
+    settings,
+    patches: [
+        {
+            find: "GuildTagCoachmark",
+            replacement: {
+                match: /return.{0,100}spacing/g,
+                replace: "return null;$&"
+            },
+            predicate: () => settings.store.disableAdoptTagPrompt
+        }
+    ],
+    start() {
+        if (settings.store.hideTags) enableStyle(clanBadges);
+    },
+    stop() {
+        if (settings.store.hideTags) disableStyle(clanBadges);
+    }
+});