From 45d08171b6c1b6b2cca4d908cc31ad59b72f5d24 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sat, 11 Jan 2025 15:09:34 +0800
Subject: [PATCH] Fixed #1188

---
 libs/lib-install.sh | 8 +++++++-
 tweaks.sh           | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libs/lib-install.sh b/libs/lib-install.sh
index 7fcdf6f5..70739a2a 100755
--- a/libs/lib-install.sh
+++ b/libs/lib-install.sh
@@ -670,7 +670,11 @@ install_firefox_theme() {
     local TARGET_DIR="${FIREFOX_THEME_DIR}"
   fi
 
-  local theme_type="${darker}${adaptive}${colorscheme}"
+  if [[ "${colorscheme}" == '-nord' && "${adaptive}" == '-adaptive' ]]; then
+    local theme_type="${adaptive}"
+  else
+    local theme_type="${darker}${adaptive}${colorscheme}"
+  fi
 
   remove_firefox_theme
 
@@ -682,11 +686,13 @@ install_firefox_theme() {
   [[ -f "${TARGET_DIR}"/customChrome.css ]] && mv "${TARGET_DIR}"/customChrome.css            "${TARGET_DIR}"/customChrome.css.bak
   cp -rf "${FIREFOX_SRC_DIR}"/customChrome.css                                                "${TARGET_DIR}"
   cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,pages}                                            "${TARGET_DIR}/${theme_name}"
+
   if [[ "${colorscheme}" == '-nord' ]]; then
     cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons-nord                                      "${TARGET_DIR}/${theme_name}"/titlebuttons
   else
     cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons                                           "${TARGET_DIR}/${theme_name}"
   fi
+
   cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                                    "${TARGET_DIR}/${theme_name}"
   cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                              "${TARGET_DIR}/${theme_name}"/parts
   [[ -f "${TARGET_DIR}"/userChrome.css ]] && mv "${TARGET_DIR}"/userChrome.css                "${TARGET_DIR}"/userChrome.css.bak
diff --git a/tweaks.sh b/tweaks.sh
index 9307ca2a..86293f5a 100755
--- a/tweaks.sh
+++ b/tweaks.sh
@@ -339,7 +339,6 @@ else
   fi
 
   if [[ "${firefox}" == 'true' || "${edit_firefox}" == 'true' ]]; then
-
     if [[ "${darker}" == '-darker' && "${adaptive}" == '-adaptive' ]]; then
       prompt -w "FIREFOX: You can't use 'adaptive' and 'darker' at the same time. \n"
       prompt -i "FIREFOX: Setting to adaptive only... \n"