From 278e75a7df0a4e514d2d7c966e60ab09dfb8c796 Mon Sep 17 00:00:00 2001
From: cocobo1 <CocoboTheOne@gmail.com>
Date: Sun, 25 Jan 2026 15:21:34 +0200
Subject: [PATCH] fix: revert theme system

---
 src/lib/addons/themes/colors/updater.ts | 52 +++++++++----------------
 1 file changed, 19 insertions(+), 33 deletions(-)

diff --git a/src/lib/addons/themes/colors/updater.ts b/src/lib/addons/themes/colors/updater.ts
index 8c3d85b..6a3c80f 100644
--- a/src/lib/addons/themes/colors/updater.ts
+++ b/src/lib/addons/themes/colors/updater.ts
@@ -9,7 +9,6 @@ const origRawColor = { ...tokenRef.RawColor };
 const AppearanceManager = findByPropsLazy("updateTheme");
 const ThemeStore = findByStoreNameLazy("ThemeStore");
 const FormDivider = findByPropsLazy("DIVIDER_COLORS");
-import { colorsPref } from "./preferences";
 
 let _inc = 1;
 
@@ -28,45 +27,32 @@ export const _colorRef: InternalColorRef = {
     lastSetDiscordTheme: "darker"
 };
 
-export function updateBunnyColor(colorManifest: ColorManifest | null, { update = true } ) {
+export function updateBunnyColor(colorManifest: ColorManifest | null, { update = true }) {
     if (settings.safeMode?.enabled) return;
 
-    const resolveType = (type = "dark") => (colorsPref.type ?? type) === "dark" ? "darker" : "light";
     const internalDef = colorManifest ? parseColorManifest(colorManifest) : null;
+    const ref = Object.assign(_colorRef, {
+        current: internalDef,
+        key: `bn-theme-${++_inc}`,
+        lastSetDiscordTheme: !ThemeStore.theme.startsWith("bn-theme-")
+            ? ThemeStore.theme
+            : _colorRef.lastSetDiscordTheme
+    });
 
-        if (resolveType() == "light" || update) {
-            var ref = Object.assign(_colorRef, {
-                current: internalDef,
-                key: `bn-theme-${++_inc}`,
-                lastSetDiscordTheme: !ThemeStore.theme.startsWith("bn-theme-") || !ThemeStore.theme.startsWith("darker")
-                    ? ThemeStore.theme
-                    : _colorRef.lastSetDiscordTheme
-            });
-        } else {
-            var ref = Object.assign(_colorRef, {
-                current: internalDef,
-                key: `dark`,
-                lastSetDiscordTheme: !ThemeStore.theme.startsWith("bn-theme-") || !ThemeStore.theme.startsWith("darker")
-                    ? ThemeStore.theme
-                    : _colorRef.lastSetDiscordTheme
-            });
-        }
+    if (internalDef != null) {
+        tokenRef.Theme[ref.key.toUpperCase()] = ref.key;
+        FormDivider.DIVIDER_COLORS[ref.key] = FormDivider.DIVIDER_COLORS[ref.current!.reference];
 
-        if (internalDef != null) {
-            tokenRef.Theme[ref.key.toUpperCase()] = ref.key;
-            FormDivider.DIVIDER_COLORS[ref.key] = FormDivider.DIVIDER_COLORS[ref.current!.reference];
-
-            Object.keys(tokenRef.Shadow).forEach(k => tokenRef.Shadow[k][ref.key] = tokenRef.Shadow[k][ref.current!.reference]);
-            Object.keys(tokenRef.SemanticColor).forEach(k => {
-                tokenRef.SemanticColor[k][ref.key] = {
-                    ...tokenRef.SemanticColor[k][ref.current!.reference]
-                };
-            });
-        }
+        Object.keys(tokenRef.Shadow).forEach(k => tokenRef.Shadow[k][ref.key] = tokenRef.Shadow[k][ref.current!.reference]);
+        Object.keys(tokenRef.SemanticColor).forEach(k => {
+            tokenRef.SemanticColor[k][ref.key] = {
+                ...tokenRef.SemanticColor[k][ref.current!.reference]
+            };
+        });
+    }
 
     if (update) {
         AppearanceManager.setShouldSyncAppearanceSettings(false);
-        AppearanceManager.updateTheme(internalDef != null ? ref.key : "darker");
+        AppearanceManager.updateTheme(internalDef != null ? ref.key : ref.lastSetDiscordTheme);
     }
 }
-