diff --git a/src/plugins/blurNsfw/index.ts b/src/plugins/blurNsfw/index.ts
index c4023f09..c1670fe8 100644
--- a/src/plugins/blurNsfw/index.ts
+++ b/src/plugins/blurNsfw/index.ts
@@ -43,7 +43,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".embedWrapper,embed",
+            find: "}renderEmbeds(",
             replacement: [{
                 match: /\.container/,
                 replace: "$&+(this.props.channel.nsfw? ' vc-nsfw-img': '')"
diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx
index ac727f69..ba92e82a 100644
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@@ -48,10 +48,9 @@ export default definePlugin({
     authors: [Devs.Rini, Devs.TheKodeToad],
     patches: [
         {
-            find: '"BaseUsername"',
+            find: '="SYSTEM_TAG"',
             replacement: {
-                /* TODO: remove \i+\i once change makes it to stable */
-                match: /(?<=onContextMenu:\i,children:)(?:\i\+\i|\i)/,
+                match: /(?<=onContextMenu:\i,children:)\i/,
                 replace: "$self.renderUsername(arguments[0])"
             }
         },