diff --git a/src/equicordplugins/dragify/index.tsx b/src/equicordplugins/dragify/index.tsx
index 32058d694..47b6a5469 100644
--- a/src/equicordplugins/dragify/index.tsx
+++ b/src/equicordplugins/dragify/index.tsx
@@ -233,8 +233,8 @@ export default definePlugin({
         {
             find: ']="BADGES"',
             replacement: {
-                match: /(?<="username"===.{0,100})(onClick:\i,onContextMenu:\i,)(?=children:)/,
-                replace: "$1draggable:!0,onDragStart:e=>$self.onUserDragStart(e,arguments[0].author),\"data-dragify-user\":!0,\"data-user-id\":arguments[0].author.id,"
+                match: /(?<=textDecorationColor:.{0,300})(?=onClick:\i,onContextMenu:\i,)/,
+                replace: "draggable:!0,onDragStart:e=>$self.onUserDragStart(e,arguments[0].author),\"data-dragify-user\":!0,\"data-user-id\":arguments[0].author.id,"
             }
         },
         // Call avatars (DM/group call tiles)
diff --git a/src/plugins/accountPanelServerProfile/index.tsx b/src/plugins/accountPanelServerProfile/index.tsx
index 0d2fc2c35..8d90ff5eb 100644
--- a/src/plugins/accountPanelServerProfile/index.tsx
+++ b/src/plugins/accountPanelServerProfile/index.tsx
@@ -87,7 +87,7 @@ export default definePlugin({
                     replace: "$&$self.onPopoutClose();"
                 },
                 {
-                    match: /#{intl::SET_STATUS}\)(?<=innerRef:(\i),style:.+?)/,
+                    match: /(?:#{intl::5fWB8U::raw}|#{intl::SET_STATUS})\)(?<=ref:(\i),style:.+?)/,
                     replace: "$&,onContextMenu:($self.grabRef($1),$self.openAccountPanelContextMenu)"
                 }
             ]
diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index 1e870dae8..e2783e92d 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -104,11 +104,7 @@ export default definePlugin({
             find,
             replacement: [
                 {
-                    match: /(?<=userValue:)((\i)(?:.{0,10})?\.avatarDecoration)/,
-                    replace: "$self.useUserDecorAvatarDecoration($2)??$1"
-                },
-                {
-                    match: /(?<=userValue:)((\i)(?:.{0,10})?\.avatarDecoration)/,
+                    match: /(?<=userValue:)((\i(?:\.author)?)\?\.avatarDecoration)/,
                     replace: "$self.useUserDecorAvatarDecoration($2)??$1"
                 }
             ]