diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index cc1545db9..959f642f3 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -198,7 +198,7 @@ export default definePlugin({
     patchedSettings: new WeakSet(),
 
     addSettings(elements: any[], element: { header?: string; settings: string[]; }, sectionTypes: SectionTypes) {
-        if (this.patchedSettings.has(elements) || !this.isRightSpot(element)) return;
+        if (this.patchedSettings.has(elements)) return;
 
         this.patchedSettings.add(elements);
 
diff --git a/src/plugins/dearrow/index.tsx b/src/plugins/dearrow/index.tsx
index 89199da8f..5fb438256 100644
--- a/src/plugins/dearrow/index.tsx
+++ b/src/plugins/dearrow/index.tsx
@@ -69,7 +69,7 @@ async function embedDidMount(this: Component<Props>) {
 
         if (hasTitle && replaceElements !== ReplaceElements.ReplaceThumbnailsOnly) {
             embed.dearrow.oldTitle = embed.rawTitle;
-            embed.rawTitle = titles[0].title.replace(/ >(\S)/g, " $1");
+            embed.rawTitle = titles[0].title.replace(/(^|\s)>(\S)/g, "$1$2");
         }
 
         if (hasThumb && replaceElements !== ReplaceElements.ReplaceTitlesOnly) {
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 32bfe7e97..48c55c660 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -19,6 +19,7 @@
 import { registerCommand, unregisterCommand } from "@api/Commands";
 import { addContextMenuPatch, removeContextMenuPatch } from "@api/ContextMenu";
 import { Settings } from "@api/Settings";
+import { onceDefined } from "@shared/onceDefined";
 import { Logger } from "@utils/Logger";
 import { canonicalizeFind } from "@utils/patches";
 import { Patch, Plugin, ReporterTestable, StartAt } from "@utils/types";
@@ -33,7 +34,7 @@ const logger = new Logger("PluginManager", "#a6d189");
 
 export const PMLogger = logger;
 export const plugins = Plugins;
-export const patches = [] as Patch[];
+export let patches = [] as Patch[];
 
 /** Whether we have subscribed to flux events of all the enabled plugins when FluxDispatcher was ready */
 let enabledPluginsSubscribedFlux = false;
@@ -42,6 +43,16 @@ const subscribedFluxEventsPlugins = new Set<string>();
 const pluginsValues = Object.values(Plugins);
 const settings = Settings.plugins;
 
+const forceDisabled = new Set([
+    "MessageLogger",
+    "ShowHiddenChannels",
+    "MoreUserTags",
+    "Decor",
+    "IgnoreActivities",
+    "NoBlockedMessages",
+    "BetterFolders",
+    "NoPendingCount"
+]);
 export function isPluginEnabled(p: string) {
     return (
         Plugins[p]?.required ||
@@ -122,9 +133,17 @@ for (const p of pluginsValues) {
     }
 }
 
+onceDefined(window, "GLOBAL_ENV", v => {
+    if (v.SENTRY_TAGS.buildId !== "366c746173a6ca0a801e9f4a4d7b6745e6de45d4") {
+        patches = patches.filter(p => !forceDisabled.has(p.plugin));
+    }
+});
+
 export const startAllPlugins = traceFunction("startAllPlugins", function startAllPlugins(target: StartAt) {
     logger.info(`Starting plugins (stage ${target})`);
     for (const name in Plugins) {
+        if (window.GLOBAL_ENV?.SENTRY_TAGS.buildId !== "366c746173a6ca0a801e9f4a4d7b6745e6de45d4" && forceDisabled.has(name)) continue;
+
         if (isPluginEnabled(name) && (!IS_REPORTER || isReporterTestable(Plugins[name], ReporterTestable.Start))) {
             const p = Plugins[name];