diff --git a/src/equicordplugins/betterGifLoad/index.ts b/src/equicordplugins/betterGifLoad/index.ts
index a1dd6c692..ace809693 100644
--- a/src/equicordplugins/betterGifLoad/index.ts
+++ b/src/equicordplugins/betterGifLoad/index.ts
@@ -85,7 +85,7 @@ export default definePlugin({
                     replace: "src:$self.parseLink(this.props.src,[this.props.coords.width,this.props.coords.height]),",
                 },
                 {
-                    match: /(this\.handleCanPlay,\i)\.src=(\i)/,
+                    match: /(this\.handleCanPlay,\i)\.src=\i/,
                     replace: "$1.src=$self.parseLink(this.props.src,[this.props.coords.width,this.props.coords.height])",
                 },
             ],
diff --git a/src/equicordplugins/betterPlusReacts/index.ts b/src/equicordplugins/betterPlusReacts/index.ts
index 995a759a5..b857b9f28 100644
--- a/src/equicordplugins/betterPlusReacts/index.ts
+++ b/src/equicordplugins/betterPlusReacts/index.ts
@@ -26,7 +26,7 @@ export default definePlugin({
                     replace: "$&.replace(/^\\++/, '+')"
                 },
                 {
-                    match: /=(\i\.\i\.getMessages\(\i\.id\))\.last\(\)(?=.{78,85}.getByName\((\i)\.)/,
+                    match: /=\i\.\i\.getMessages\(\i\.id\)\.last\(\)(?=.{78,85}.getByName\(\i\.)/,
                     replace: "=$self.getMsgReference()"
                 }
             ]
diff --git a/src/equicordplugins/bypassPinPrompt/index.ts b/src/equicordplugins/bypassPinPrompt/index.ts
index c90c44b93..fcd4f627c 100644
--- a/src/equicordplugins/bypassPinPrompt/index.ts
+++ b/src/equicordplugins/bypassPinPrompt/index.ts
@@ -21,7 +21,7 @@ export default definePlugin({
             find,
             replacement: [
                 {
-                    match: /(\i\.\i\.(unpin|pin)Message\(\i,\i\.id\)):\i\.\i\.confirm(Unpin|Pin)\(\i,\i\)/g,
+                    match: /(\i\.\i\.(?:unpin|pin)Message\(\i,\i\.id\)):\i\.\i\.confirm(?:Unpin|Pin)\(\i,\i\)/g,
                     replace: "$1:$1"
                 }
             ]
diff --git a/src/equicordplugins/contentWarning/index.tsx b/src/equicordplugins/contentWarning/index.tsx
index 0c6982df5..3ff1e1c3b 100644
--- a/src/equicordplugins/contentWarning/index.tsx
+++ b/src/equicordplugins/contentWarning/index.tsx
@@ -158,8 +158,8 @@ export default definePlugin({
         {
             find: ".VOICE_HANGOUT_INVITE?",
             replacement: {
-                match: /(compact:\i}=(\i).+?)(\(0,.+\}\)\]\}\))/,
-                replace: "$1 $self.modify(arguments[0].message,$3)"
+                match: /(compact:\i}=\i.+?)(\(0,.+\}\)\]\}\))/,
+                replace: "$1 $self.modify(arguments[0].message,$2)"
             }
         }
     ],
diff --git a/src/equicordplugins/declutter/index.tsx b/src/equicordplugins/declutter/index.tsx
index ef0761e50..b78ce81ac 100644
--- a/src/equicordplugins/declutter/index.tsx
+++ b/src/equicordplugins/declutter/index.tsx
@@ -326,7 +326,7 @@ export default definePlugin({
             // Channel list server boost progress bar
             find: "useGuildActionRow",
             replacement: {
-                match: /(GUILD_NEW_MEMBER_ACTIONS_PROGRESS_BAR\)):(\i(?:\.premiumProgressBarEnabled)?)/,
+                match: /(GUILD_NEW_MEMBER_ACTIONS_PROGRESS_BAR\)):\i(?:\.premiumProgressBarEnabled)?/,
                 replace: "$1:null"
             },
             predicate: () => settings.store.removeServerBoostInfo,
diff --git a/src/equicordplugins/dragify/index.tsx b/src/equicordplugins/dragify/index.tsx
index fa45ed4a2..e108e5966 100644
--- a/src/equicordplugins/dragify/index.tsx
+++ b/src/equicordplugins/dragify/index.tsx
@@ -199,7 +199,7 @@ export default definePlugin({
         {
             find: "POPOUT)},children:",
             replacement: {
-                match: /(?<=getUser\(\i\.ownerId\).{0,100})className:\i\.\i,onClick:\i=>\{\(0,\i\.\i\)\((\i),/,
+                match: /(?<=getUser\(\i\.ownerId\).{0,100})className:\i\.\i,onClick:\i=>\{\(0,\i\.\i\)\(\i,/,
                 replace: "draggable:!0,onDragStart:e=>$self.onChannelDragStart(e,{id:arguments[0]?.thread?.id,guild_id:arguments[0]?.thread?.guild_id}),$&"
             }
         },
diff --git a/src/equicordplugins/equicordHelper/index.tsx b/src/equicordplugins/equicordHelper/index.tsx
index b654a4cfa..27197c8d4 100644
--- a/src/equicordplugins/equicordHelper/index.tsx
+++ b/src/equicordplugins/equicordHelper/index.tsx
@@ -199,7 +199,7 @@ export default definePlugin({
         {
             find: "discarding speculative database",
             replacement: {
-                match: /await (\i)\((\i)\)(?=;.{0,15}this\.databases)/,
+                match: /await \i\(\i\)(?=;.{0,15}this\.databases)/,
                 replace: "$&.catch(()=>null)"
             }
         },
diff --git a/src/equicordplugins/favouriteAnything/index.tsx b/src/equicordplugins/favouriteAnything/index.tsx
index 1bbe94482..af751d873 100644
--- a/src/equicordplugins/favouriteAnything/index.tsx
+++ b/src/equicordplugins/favouriteAnything/index.tsx
@@ -50,7 +50,7 @@ export default definePlugin({
             // Override the default renderAdjacentContent prop value for all types of embed components (renderImageComponent, renderVideoComponent...)
             find: "#{intl::MEDIA_MOSAIC_ALT_TEXT_POPOUT_TITLE}",
             replacement: {
-                match: /renderAdjacentContent:(\i)/g,
+                match: /renderAdjacentContent:\i/g,
                 replace: "$&=$self.renderEmbedAccessory"
             }
         },
diff --git a/src/equicordplugins/messagePeek/index.tsx b/src/equicordplugins/messagePeek/index.tsx
index 7c6b55e9b..a4c27faa5 100644
--- a/src/equicordplugins/messagePeek/index.tsx
+++ b/src/equicordplugins/messagePeek/index.tsx
@@ -250,7 +250,7 @@ export default definePlugin({
         {
             find: "PrivateChannel.renderAvatar",
             replacement: {
-                match: /,subText:(\i)\.isSystemDM\(\).{0,500}:null,(?=name:)/,
+                match: /,subText:\i\.isSystemDM\(\).{0,500}:null,(?=name:)/,
                 replace: ",subText:$self.getSubText(arguments[0]),"
             }
         }
diff --git a/src/equicordplugins/moreUserTags/index.tsx b/src/equicordplugins/moreUserTags/index.tsx
index 395144257..d9fb3361a 100644
--- a/src/equicordplugins/moreUserTags/index.tsx
+++ b/src/equicordplugins/moreUserTags/index.tsx
@@ -51,7 +51,7 @@ export default definePlugin({
                     replace: "default:$2=$self.getTagText($self.localTags[$1]);",
                 },
                 {
-                    match: /(?<=type:(\i).*?)\.BOT:(?=default:)/,
+                    match: /(?<=type:\i.*?)\.BOT:(?=default:)/,
                     replace: "$&return null;",
                     predicate: () => settings.store.dontShowBotTag
                 },
diff --git a/src/equicordplugins/questify/index.tsx b/src/equicordplugins/questify/index.tsx
index 0d53af613..942def042 100644
--- a/src/equicordplugins/questify/index.tsx
+++ b/src/equicordplugins/questify/index.tsx
@@ -170,7 +170,7 @@ export default definePlugin({
             find: '("ActivityStatus"),',
             predicate: () => getQuestifySettings().disableQuestsEverything || getQuestifySettings().disableMembersListPromo,
             replacement: {
-                match: /(,hasQuest:)(?=\i=!1)/,
+                match: /,hasQuest:(?=\i=!1)/,
                 replace: ",questifyInvalid1:"
             }
         },
@@ -283,7 +283,7 @@ export default definePlugin({
                     replace: "$1+($2>=1e6?0.8:$2>=1e3?0.4:0)"
                 },
                 {
-                    match: /(?<=children:\i.to\(\i=>`\${\i)(.toFixed\(0\))/,
+                    match: /(?<=children:\i.to\(\i=>`\${\i).toFixed\(0\)/,
                     replace: ".toLocaleString(undefined,{maximumFractionDigits:0})"
                 }
             ]
@@ -338,7 +338,7 @@ export default definePlugin({
             replacement: [
                 {
                     // Overwrite button props for UNENROLLED Quests.
-                    match: /(?<=onClick:(\(\)=>{.[^}]+}),text:(\i),icon:\i,fullWidth:!0)/,
+                    match: /(?<=onClick:\(\)=>{.[^}]+},text:\i,icon:\i,fullWidth:!0)/,
                     replace: ",...($self.getQuestButtonProps(arguments[0])??{})"
                 },
                 {
diff --git a/src/equicordplugins/unlimitedAccounts/index.ts b/src/equicordplugins/unlimitedAccounts/index.ts
index eeb41a955..35e41eec5 100644
--- a/src/equicordplugins/unlimitedAccounts/index.ts
+++ b/src/equicordplugins/unlimitedAccounts/index.ts
@@ -57,7 +57,7 @@ export default definePlugin({
                     replace: "$1$self.getMaxAccounts()",
                 },
                 {
-                    match: /(\i.length(<|>=))5/g,
+                    match: /(\i.length(?:<|>=))5/g,
                     replace: "$1$self.getMaxAccounts()",
                 },
             ]
diff --git a/src/equicordplugins/unreadBadgeCount/index.tsx b/src/equicordplugins/unreadBadgeCount/index.tsx
index a9135df54..145ae5025 100644
--- a/src/equicordplugins/unreadBadgeCount/index.tsx
+++ b/src/equicordplugins/unreadBadgeCount/index.tsx
@@ -42,7 +42,7 @@ export default definePlugin({
             find: "UNREAD_IMPORTANT:",
             replacement: [
                 {
-                    match: /\.Children\.count.+?:null(?<=,channel:(\i).+?)/,
+                    match: /\.Children\.count.+?:null(?<=,channel:\i.+?)/,
                     replace: "$&,$self.CountBadge({channel: arguments[0].channel})",
                 },
             ]