diff --git a/src/equicordplugins/lastActive/index.tsx b/src/equicordplugins/lastActive/index.tsx
index c07e4367..4325bee6 100644
--- a/src/equicordplugins/lastActive/index.tsx
+++ b/src/equicordplugins/lastActive/index.tsx
@@ -7,24 +7,10 @@
 import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { EquicordDevs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
-import { Menu, NavigationRouter, Toasts } from "@webpack/common";
-const MessageStore = findByPropsLazy("getMessages", "getMessage");
-const ChannelStore = findByPropsLazy("getChannel", "getDMFromUserId");
-const UserStore = findByPropsLazy("getUser", "getCurrentUser");
-const MessageActions = findByPropsLazy("fetchMessages", "searchMessages");
+import { Menu, MessageActions, MessageStore, NavigationRouter, Toasts, UserStore } from "@webpack/common";
 
 async function findLastMessageFromUser(channelId: string, userId: string) {
     try {
-
-        if (!MessageStore || !MessageActions) {
-            Toasts.show({
-                type: Toasts.Type.FAILURE,
-                message: "Required Discord modules not found.",
-                id: Toasts.genId()
-            });
-            return null;
-        }
         const messageCollection = MessageStore.getMessages(channelId);
         let messages = messageCollection?.toArray() || [];
         let userMessage = messages.filter(m => m?.author?.id === userId).pop();
@@ -77,23 +63,7 @@ async function jumpToLastActive(channel: any, targetUserId?: string) {
 
             userId = targetUserId;
         } else {
-            if (!UserStore?.getCurrentUser) {
-                Toasts.show({
-                    type: Toasts.Type.FAILURE,
-                    message: "Could not determine user. Try again later.",
-                    id: Toasts.genId()
-                });
-                return;
-            }
             const currentUser = UserStore.getCurrentUser();
-            if (!currentUser || !currentUser.id) {
-                Toasts.show({
-                    type: Toasts.Type.FAILURE,
-                    message: "Could not determine current user. Try again later.",
-                    id: Toasts.genId()
-                });
-                return;
-            }
             userId = currentUser.id;
         }
         const messageId = await findLastMessageFromUser(channelId, userId);
diff --git a/src/plugins/_api/dynamicImageModalApi.ts b/src/plugins/_api/dynamicImageModalApi.ts
index 759ef001..d91a5a93 100644
--- a/src/plugins/_api/dynamicImageModalApi.ts
+++ b/src/plugins/_api/dynamicImageModalApi.ts
@@ -13,13 +13,6 @@ export default definePlugin({
     authors: [Devs.sadan, Devs.Nuckyz],
     description: "Allows you to omit either width or height when opening an image modal",
     patches: [
-        {
-            find: ".contain,SCALE_DOWN:",
-            replacement: {
-                match: /(?<="IMAGE"===\i\?)\i(?=\?)/,
-                replace: "true"
-            }
-        },
         {
             find: ".dimensionlessImage,",
             replacement: {
diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index 1a17b616..25a0ab7d 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -162,14 +162,6 @@ export default definePlugin({
     managedStyle,
 
     patches: [
-        {
-            find: ".contain,SCALE_DOWN:",
-            replacement: {
-                match: /imageClassName:/,
-                replace: `id:"${ELEMENT_ID}",$&`
-            }
-        },
-
         {
             find: ".dimensionlessImage,",
             replacement: [
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index ff3911f5..f16161fa 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -85,7 +85,7 @@ export default definePlugin({
             find: ".USER_MENTION)",
             replacement: [
                 {
-                    match: /(?<=onContextMenu:\i,color:)\i(?=\},\i\),\{children)(?<=user:(\i),channel:(\i).{0,500}?)/,
+                    match: /(?<=onContextMenu:\i,color:)\i(?=,onClick)(?<=user:(\i),channel:(\i).+?)/,
                     replace: "$self.getColorInt($1?.id,$2?.id)",
                 }
             ],
diff --git a/src/utils/discord.css b/src/utils/discord.css
deleted file mode 100644
index 8d4f811a..00000000
--- a/src/utils/discord.css
+++ /dev/null
@@ -1,24 +0,0 @@
-
-.vc-position-inherit {
-    position: inherit;
-}
-
-/**
- * copy pasted from discord css. not really webpack-findable since it's the only class in the module
-**/
-
-.vc-image-modal {
-    background: transparent !important;
-    box-shadow: none !important;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border-radius: 0;
-}
-
-@media(width <= 485px) {
-    .vc-image-modal {
-        overflow: visible;
-        overflow: initial;
-    }
-}
diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index ec96d0d4..fff6d9fc 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -143,9 +143,6 @@ export function sendMessage(
  */
 export function openImageModal(item: Except<MediaModalItem, "type">, mediaModalProps?: Omit<MediaModalProps, "items">) {
     return openMediaModal({
-        className: "vc-image-modal",
-        fit: "vc-position-inherit",
-        shouldAnimateCarousel: true,
         items: [{
             type: "IMAGE",
             original: item.original ?? item.url,
diff --git a/src/utils/modal.tsx b/src/utils/modal.tsx
index d06e5803..eebdb95e 100644
--- a/src/utils/modal.tsx
+++ b/src/utils/modal.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { filters, findModuleId, mapMangledModuleLazy, proxyLazyWebpack, wreq } from "@webpack";
+import { filters, findByCodeLazy, mapMangledModuleLazy } from "@webpack";
 import type { ComponentType, PropsWithChildren, ReactNode, Ref } from "react";
 
 import { LazyComponent } from "./react";
@@ -138,16 +138,10 @@ export type MediaModalProps = {
     fit?: string;
     shouldRedactExplicitContent?: boolean;
     shouldHideMediaOptions?: boolean;
-    shouldAnimateCarousel?: boolean;
 };
 
-export const openMediaModal: (props: MediaModalProps) => void = proxyLazyWebpack(() => {
-    const mediaModalKeyModuleId = findModuleId('"Zoomed Media Modal"');
-    if (mediaModalKeyModuleId == null) return;
-
-    const openMediaModalModule = wreq(findModuleId(mediaModalKeyModuleId, "modalKey:") as any);
-    return Object.values<any>(openMediaModalModule).find(v => String(v).includes("modalKey:"));
-});
+// modal key: "Media Viewer Modal"
+export const openMediaModal: (props: MediaModalProps) => void = findByCodeLazy("hasMediaOptions", "shouldHideMediaOptions");
 
 interface ModalAPI {
     /**