From 94691093b36bb3c31840e45fdf3359795d2e4d63 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 30 Apr 2026 13:49:06 -0400
Subject: [PATCH] Declutter: Fix Decor Conflict

---
 src/equicordplugins/declutter/index.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/equicordplugins/declutter/index.tsx b/src/equicordplugins/declutter/index.tsx
index 63ebcdc0e..e37f9218d 100644
--- a/src/equicordplugins/declutter/index.tsx
+++ b/src/equicordplugins/declutter/index.tsx
@@ -11,6 +11,7 @@ import { definePluginSettings, migrateOldSettingToNewPlugin, migratePluginSettin
 import { Divider } from "@components/Divider";
 import { HeadingSecondary } from "@components/Heading";
 import { Notice } from "@components/Notice";
+import decor from "@plugins/decor";
 import { classNameFactory } from "@utils/css";
 import { Devs, EquicordDevs } from "@utils/index";
 import definePlugin, { OptionType } from "@utils/types";
@@ -170,10 +171,10 @@ export default definePlugin({
             // Avatar decoration
             find: "{avatarDecoration:void 0!==",
             replacement: {
-                match: /\{avatarDecoration:void 0!==(\i)\?\1:\i,canAnimate:/,
-                replace: "{avatarDecoration:void 0!==$1?$1:null,canAnimate:"
+                match: /\{avatarDecoration:(.{0,30}void 0!==\i\?\i:)\i/,
+                replace: "{avatarDecoration:$1null"
             },
-            predicate: () => settings.store.removeAvatarDecoration && !isPluginEnabled("Decor"),
+            predicate: () => settings.store.removeAvatarDecoration && !isPluginEnabled(decor.name),
         },
         {
             // Nameplate