diff --git a/install.sh b/install.sh
index 71131aaf..3e0c6a70 100755
--- a/install.sh
+++ b/install.sh
@@ -13,7 +13,7 @@
 ###############################################################################
 
 readonly REPO_DIR="$(dirname "$(readlink -m "${0}")")"
-source "${REPO_DIR}/shell/lib-install.sh"
+source "${REPO_DIR}/libs/lib-install.sh"
 
 # Customization, default values
 colors=("${COLOR_VARIANTS[@]}")
diff --git a/shell/lib-core.sh b/libs/lib-core.sh
similarity index 100%
rename from shell/lib-core.sh
rename to libs/lib-core.sh
diff --git a/shell/lib-flatpak.sh b/libs/lib-flatpak.sh
similarity index 100%
rename from shell/lib-flatpak.sh
rename to libs/lib-flatpak.sh
diff --git a/shell/lib-install.sh b/libs/lib-install.sh
similarity index 99%
rename from shell/lib-install.sh
rename to libs/lib-install.sh
index f003132e..ac8b8be8 100755
--- a/shell/lib-install.sh
+++ b/libs/lib-install.sh
@@ -8,8 +8,8 @@
 #                                VARIABLES                                    #
 ###############################################################################
 
-source "${REPO_DIR}/shell/lib-core.sh"
-source "${REPO_DIR}/shell/lib-flatpak.sh"
+source "${REPO_DIR}/libs/lib-core.sh"
+source "${REPO_DIR}/libs/lib-flatpak.sh"
 WHITESUR_SOURCE+=("lib-install.sh")
 
 ###############################################################################
@@ -892,7 +892,7 @@ gtk_base() {
     sed $SED_OPT "/\$scheme/s/standard/nord/"                                   "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss"
   fi
 
-  if [[ "${GNOME_VERSION}" -ge '47-0' ]]; then
+  if [[ "${GNOME_VERSION}" -ge '47-0' && "${libadwaita}" == 'true' ]]; then
     sed $SED_OPT "/\$gnome_version/s/old/new/"                                  "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss"
   fi
 }
diff --git a/make-release.sh b/make-release.sh
index d0b51806..3e104ec3 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -2,7 +2,7 @@
 
 readonly REPO_DIR="$(dirname "$(readlink -m "${0}")")"
 readonly RELEASE_DIR="${REPO_DIR}/release"
-source "${REPO_DIR}/shell/lib-install.sh"
+source "${REPO_DIR}/libs/lib-install.sh"
 
 # Customization, default values
 colors=("${COLOR_VARIANTS[@]}")
diff --git a/tweaks.sh b/tweaks.sh
index 42b8d3c7..1914d698 100755
--- a/tweaks.sh
+++ b/tweaks.sh
@@ -13,7 +13,7 @@
 ###############################################################################
 
 readonly REPO_DIR="$(dirname "$(readlink -m "${0}")")"
-source "${REPO_DIR}/shell/lib-install.sh"
+source "${REPO_DIR}/libs/lib-install.sh"
 
 # Customization, default values
 colors=("${COLOR_VARIANTS[@]}")