diff --git a/src/equicordplugins/cuteNekos/index.ts b/src/equicordplugins/cuteNekos/index.ts
index e7d7a0f56..5d9a48ad9 100644
--- a/src/equicordplugins/cuteNekos/index.ts
+++ b/src/equicordplugins/cuteNekos/index.ts
@@ -17,7 +17,7 @@ async function getcuteneko(): Promise<string> {
 
 export default definePlugin({
     name: "CuteNekos",
-    authors: [Devs.echo],
+    authors: [Devs.amy],
     description: "Send Nekos to others",
     commands: [{
         name: "nekos",
diff --git a/src/equicordplugins/equicordToolbox/index.tsx b/src/equicordplugins/equicordToolbox/index.tsx
index 7db5eff04..a98b73818 100644
--- a/src/equicordplugins/equicordToolbox/index.tsx
+++ b/src/equicordplugins/equicordToolbox/index.tsx
@@ -163,9 +163,9 @@ export default definePlugin({
 
     patches: [
         {
-            find: '"HeaderBar"});',
+            find: "=!0,toolbar:",
             replacement: {
-                match: /(?<=function.{0,100}\()\i.Fragment,/,
+                match: /(?<=function (\i).{0,100}\()\i.Fragment,(?=.+?toolbar:\1\(\))/,
                 replace: "$self.ToolboxFragmentWrapper,"
             }
         }
diff --git a/src/equicordplugins/holyNotes/index.tsx b/src/equicordplugins/holyNotes/index.tsx
index 94c1d9f42..7edfbe363 100644
--- a/src/equicordplugins/holyNotes/index.tsx
+++ b/src/equicordplugins/holyNotes/index.tsx
@@ -79,7 +79,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: '"HeaderBar"});',
+            find: "=!0,toolbar:",
             replacement: {
                 match: /(function \i\(\i\){)(.{1,200}toolbar.{1,100}mobileToolbar)/,
                 replace: "$1$self.toolbarAction(arguments[0]);$2"
diff --git a/src/equicordplugins/messageLoggerEnhanced/index.tsx b/src/equicordplugins/messageLoggerEnhanced/index.tsx
index bb9f4aef6..45cd6c822 100644
--- a/src/equicordplugins/messageLoggerEnhanced/index.tsx
+++ b/src/equicordplugins/messageLoggerEnhanced/index.tsx
@@ -262,7 +262,7 @@ export default definePlugin({
             }
         },
         {
-            find: '"HeaderBar"});',
+            find: "=!0,toolbar:",
             predicate: () => settings.store.ShowLogsButton,
             replacement: {
                 match: /(function \i\(\i\){)(.{1,200}toolbar.{1,100}mobileToolbar)/,
diff --git a/src/equicordplugins/moreCommands/index.ts b/src/equicordplugins/moreCommands/index.ts
index c3b791b47..9eb126ff3 100644
--- a/src/equicordplugins/moreCommands/index.ts
+++ b/src/equicordplugins/moreCommands/index.ts
@@ -32,7 +32,7 @@ function mock(input: string): string {
 export default definePlugin({
     name: "MoreCommands",
     description: "Echo, Lenny, Mock, and More",
-    authors: [Devs.Arjix, Devs.echo, Devs.Samu, EquicordDevs.zyqunix],
+    authors: [Devs.Arjix, Devs.amy, Devs.Samu, EquicordDevs.zyqunix],
     commands: [
         {
             name: "echo",
diff --git a/src/equicordplugins/questCompleter.discordDesktop/index.tsx b/src/equicordplugins/questCompleter.discordDesktop/index.tsx
index 9c49e9e53..ba7234593 100644
--- a/src/equicordplugins/questCompleter.discordDesktop/index.tsx
+++ b/src/equicordplugins/questCompleter.discordDesktop/index.tsx
@@ -277,7 +277,7 @@ export default definePlugin({
             predicate: () => !settings.store.useNavBar
         },
         {
-            find: '"HeaderBar"});',
+            find: "=!0,toolbar:",
             replacement: {
                 match: /(function \i\(\i\){)(.{1,200}toolbar.{1,200}mobileToolbar)/,
                 replace: "$1$self.toolbarAction(arguments[0]);$2"
diff --git a/src/equicordplugins/soggy/index.tsx b/src/equicordplugins/soggy/index.tsx
index 2d6c23fe4..48a351e1f 100644
--- a/src/equicordplugins/soggy/index.tsx
+++ b/src/equicordplugins/soggy/index.tsx
@@ -136,7 +136,7 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: '"HeaderBar"});',
+            find: "=!0,toolbar:",
             replacement: {
                 match: /(function \i\(\i\){)(.{1,200}toolbar.{1,450}mobileToolbar)/,
                 replace: "$1$self.addIconToToolBar(arguments[0]);$2"
diff --git a/src/equicordplugins/soundBoardLogger/index.tsx b/src/equicordplugins/soundBoardLogger/index.tsx
index 64c2eaf70..1c208f307 100644
--- a/src/equicordplugins/soundBoardLogger/index.tsx
+++ b/src/equicordplugins/soundBoardLogger/index.tsx
@@ -20,13 +20,13 @@ import { getListeners } from "./utils";
 
 export default definePlugin({
     name: "SoundBoardLogger",
-    authors: [Devs.Moxxie, EquicordDevs.Fres, Devs.echo, EquicordDevs.thororen],
+    authors: [Devs.Moxxie, EquicordDevs.Fres, Devs.amy, EquicordDevs.thororen],
     description: "Logs all soundboards that are played in a voice chat and allows you to download them",
     dependencies: ["ChatInputButtonAPI"],
     patches: [
         {
             predicate: () => settings.store.IconLocation === "toolbar",
-            find: '"HeaderBar"});',
+            find: "=!0,toolbar:",
             replacement: {
                 match: /(function \i\(\i\){)(.{1,500}toolbar.{1,500}mobileToolbar)/,
                 replace: "$1$self.addSBIconToToolBar(arguments[0]);$2"
diff --git a/src/equicordplugins/uwuifier/index.ts b/src/equicordplugins/uwuifier/index.ts
index 99631fde6..8e632f904 100644
--- a/src/equicordplugins/uwuifier/index.ts
+++ b/src/equicordplugins/uwuifier/index.ts
@@ -151,7 +151,7 @@ function uwuifyArray(arr) {
 export default definePlugin({
     name: "UwUifier",
     description: "Make everything uwu",
-    authors: [Devs.echo],
+    authors: [Devs.amy],
     dependencies: ["MessageEventsAPI"],
     settings,