diff --git a/src/plugins/ircColors/index.ts b/src/plugins/ircColors/index.ts
index d547a0e1..74175269 100644
--- a/src/plugins/ircColors/index.ts
+++ b/src/plugins/ircColors/index.ts
@@ -66,7 +66,7 @@ export default definePlugin({
         {
             find: '="SYSTEM_TAG"',
             replacement: {
-                match: /(?<=className:\i\.username,style:.{0,50}:void 0,)/,
+                match: /(?<=\i.gradientClassName]\),style:.{0,80}:void 0,)/,
                 replace: "style:{color:$self.calculateNameColorForMessageContext(arguments[0])},"
             }
         },
diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx
index bb22ee79..1f04f1f3 100644
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@@ -50,7 +50,7 @@ export default definePlugin({
         {
             find: '?"@":""',
             replacement: {
-                match: /(?<=children:)\(\i\?"@":""\)\+\i(?=,|\})/,
+                match: /(?<=onContextMenu:\i,children:)\i\+\i/,
                 replace: "$self.renderUsername(arguments[0])"
             }
         },