diff --git a/libs/lib-core.sh b/libs/lib-core.sh
index 0e1d2347..526f9716 100755
--- a/libs/lib-core.sh
+++ b/libs/lib-core.sh
@@ -69,11 +69,16 @@ DASH_TO_DOCK_DIR_HOME="${MY_HOME}/.local/share/gnome-shell/extensions/dash-to-do
 GNOME_SHELL_EXTENSION_DIR="${MY_HOME}/.local/share/gnome-shell/extensions"
 FIREFOX_SRC_DIR="${REPO_DIR}/other/firefox"
 FIREFOX_DIR_HOME="${MY_HOME}/.mozilla/firefox"
-FIREFOX_THEME_DIR="${MY_HOME}/.mozilla/firefox/firefox-themes"
+
+if [[ -d "$HOME/.config/mozilla/firefox" ]]; then
+  FIREFOX_DIR_HOME="${MY_HOME}/.config/mozilla/firefox"
+fi
+
+FIREFOX_THEME_DIR="${FIREFOX_DIR_HOME}/firefox-themes"
 FIREFOX_FLATPAK_DIR_HOME="${MY_HOME}/.var/app/org.mozilla.firefox/.mozilla/firefox"
-FIREFOX_FLATPAK_THEME_DIR="${MY_HOME}/.var/app/org.mozilla.firefox/.mozilla/firefox/firefox-themes"
+FIREFOX_FLATPAK_THEME_DIR="${FIREFOX_FLATPAK_DIR_HOME}/.mozilla/firefox/firefox-themes"
 FIREFOX_SNAP_DIR_HOME="${MY_HOME}/snap/firefox/common/.mozilla/firefox"
-FIREFOX_SNAP_THEME_DIR="${MY_HOME}/snap/firefox/common/.mozilla/firefox/firefox-themes"
+FIREFOX_SNAP_THEME_DIR="${FIREFOX_SNAP_DIR_HOME}/firefox-themes"
 export WHITESUR_TMP_DIR="/tmp/WhiteSur.lock"
 
 if [[ -w "/root" ]]; then