diff --git a/src/plugins/imageFilename/index.ts b/src/plugins/imageFilename/index.ts
index 9a0c1994b..1256361af 100644
--- a/src/plugins/imageFilename/index.ts
+++ b/src/plugins/imageFilename/index.ts
@@ -27,7 +27,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: '"calc(100% + 1px)":"100%"',
+            find: ".RESPONSIVE?",
             replacement: {
                 match: /(?="data-role":"img","data-safe-src":)(?<=href:(\i).{0,30})/,
                 replace: "title:$self.getTitle($1),"
diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index 1d75319a8..d5bf3fee5 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -28,9 +28,9 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: ".removeMosaicItemHoverButton),",
+            find: '["VIDEO","CLIP","AUDIO"]',
             replacement: {
-                match: /(\.nonMediaMosaicItem\]:.{0,40}children:)(\i.slice\(\i\))(?<=showDownload:(\i).+?isVisualMediaType:(\i).+?)/,
+                match: /("div",{className:.+?children:)(\i.slice\(\i\))(?<=showDownload:(\i).+?isVisualMediaType:(\i).+?)/,
                 replace: (_, rest, origChildren, showDownload, isVisualMediaType) => `${rest}[${showDownload}&&${isVisualMediaType}&&$self.PictureInPictureButton(),...${origChildren}]`
             }
         }
diff --git a/src/plugins/themeAttributes/index.ts b/src/plugins/themeAttributes/index.ts
index 2f45a040f..ab3082844 100644
--- a/src/plugins/themeAttributes/index.ts
+++ b/src/plugins/themeAttributes/index.ts
@@ -28,9 +28,9 @@ export default definePlugin({
 
         // Add data-author-id and data-is-self to all messages
         {
-            find: ".messageListItem",
+            find: ".referencedUsernameProfile,referencedAvatarProfile:",
             replacement: {
-                match: /\.messageListItem(?=,"aria)/,
+                match: /\.\i(?=,"aria-setsize":-1,children:.+?#{intl::MESSAGE_A11Y_ROLE_DESCRIPTION})/,
                 replace: "$&,...$self.getMessageProps(arguments[0])"
             }
         },