diff --git a/ufetch-alpine b/ufetch-alpine
index ea0ebe0..81198ba 100755
--- a/ufetch-alpine
+++ b/ufetch-alpine
@@ -10,7 +10,7 @@ os='Alpine Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
 packages="$(apk info | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-antergos b/ufetch-antergos
index 40ff40d..bc037f3 100755
--- a/ufetch-antergos
+++ b/ufetch-antergos
@@ -10,7 +10,7 @@ os='Antergos'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-arch b/ufetch-arch
index 34195d0..d03d3d3 100755
--- a/ufetch-arch
+++ b/ufetch-arch
@@ -10,7 +10,7 @@ os='Arch Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-archbang b/ufetch-archbang
index 288baad..729dc05 100755
--- a/ufetch-archbang
+++ b/ufetch-archbang
@@ -10,7 +10,7 @@ os='ArchBang'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-arco b/ufetch-arco
index 45c7540..d1b7ed1 100755
--- a/ufetch-arco
+++ b/ufetch-arco
@@ -10,7 +10,7 @@ os='ArcoLinux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-artix b/ufetch-artix
index 1b06362..3ff5785 100755
--- a/ufetch-artix
+++ b/ufetch-artix
@@ -10,7 +10,7 @@ os='Artix Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-aux b/ufetch-aux
index ebc888f..f06cb88 100755
--- a/ufetch-aux
+++ b/ufetch-aux
@@ -9,7 +9,7 @@ host=`hostname`
 os=`uname -sr`
 kernel=`uname -v`
 uptime=`uptime | awk '{print $3" "$4}' | tr -d ,`
-shell=`basename ${SHELL}`
+shell=`basename "$SHELL"`
 
 ## DEFINE COLORS
 
diff --git a/ufetch-centos b/ufetch-centos
index cedf6c3..d285fdf 100755
--- a/ufetch-centos
+++ b/ufetch-centos
@@ -10,7 +10,7 @@ os="$(cat /etc/centos-release | sed 's/release //')"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(yum list installed | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-crux b/ufetch-crux
index 3c8a6ba..10036bc 100755
--- a/ufetch-crux
+++ b/ufetch-crux
@@ -10,7 +10,7 @@ os="$(crux)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pkginfo -i | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-debian b/ufetch-debian
index e6f8f46..17e2be0 100755
--- a/ufetch-debian
+++ b/ufetch-debian
@@ -10,7 +10,7 @@ os='Debian'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-elementary b/ufetch-elementary
index 3760ab9..9eb4250 100755
--- a/ufetch-elementary
+++ b/ufetch-elementary
@@ -10,7 +10,7 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-fedora b/ufetch-fedora
index 132da59..e43f256 100755
--- a/ufetch-fedora
+++ b/ufetch-fedora
@@ -10,7 +10,7 @@ os="$(cat /etc/fedora-release)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(yum list installed | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-freebsd b/ufetch-freebsd
index cd3ebc1..c359f0e 100755
--- a/ufetch-freebsd
+++ b/ufetch-freebsd
@@ -10,7 +10,7 @@ os="$(uname -sr)"
 kernel="$(uname -iK)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
 packages="$(pkg info | wc -l | sed -e 's/^[ \t]*//')"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-gentoo b/ufetch-gentoo
index 1a47af9..fdebf3c 100755
--- a/ufetch-gentoo
+++ b/ufetch-gentoo
@@ -10,7 +10,7 @@ os='Gentoo Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(ls -d /var/db/pkg/*/* | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-linux b/ufetch-linux
index 7e92a25..9b066aa 100755
--- a/ufetch-linux
+++ b/ufetch-linux
@@ -9,7 +9,7 @@ host="$(hostname)"
 os='Linux'	# I'd just like to interject for a moment...
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-linuxlite b/ufetch-linuxlite
index 082a12e..f35bf61 100755
--- a/ufetch-linuxlite
+++ b/ufetch-linuxlite
@@ -10,7 +10,7 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-macos b/ufetch-macos
index 5b5078b..05ab3ce 100755
--- a/ufetch-macos
+++ b/ufetch-macos
@@ -21,7 +21,7 @@ else
 	packages='no package manager'
 fi
 packages="$(echo ${packages} | sed -e 's/^[ /t]*//')"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 if [ -z "${WM}" ]; then
 	WM='Quartz Compositor'
 fi
diff --git a/ufetch-mageia b/ufetch-mageia
index a0f67ff..b9e8249 100755
--- a/ufetch-mageia
+++ b/ufetch-mageia
@@ -9,7 +9,7 @@ os="$(lsb_release -ds | tr -d \")"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(yum list installed | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-manjaro b/ufetch-manjaro
index 5cd780a..8ab10f0 100755
--- a/ufetch-manjaro
+++ b/ufetch-manjaro
@@ -10,7 +10,7 @@ os='Manjaro'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-mint b/ufetch-mint
index dcdc06a..4a9f2cf 100755
--- a/ufetch-mint
+++ b/ufetch-mint
@@ -10,7 +10,7 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-mxlinux b/ufetch-mxlinux
index 2810269..c5f06d8 100755
--- a/ufetch-mxlinux
+++ b/ufetch-mxlinux
@@ -10,7 +10,7 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-nixos b/ufetch-nixos
index 126822f..7502e65 100755
--- a/ufetch-nixos
+++ b/ufetch-nixos
@@ -10,7 +10,7 @@ os="$(nixos-version)"
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
 packages="$(ls -d -1 /nix/store/ | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-openbsd b/ufetch-openbsd
index 3c61e62..1aed1a9 100755
--- a/ufetch-openbsd
+++ b/ufetch-openbsd
@@ -10,7 +10,7 @@ os="$(uname -sr)"
 kernel="$(uname -v)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
 packages="$(ls -d /var/db/pkg/* | wc -l | sed -e 's/^[ \t]*//')"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-parabola b/ufetch-parabola
index 83eef7d..22cd44a 100755
--- a/ufetch-parabola
+++ b/ufetch-parabola
@@ -10,7 +10,7 @@ os='Parabola GNU/Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-popos b/ufetch-popos
index e542d5e..9cf2fe6 100755
--- a/ufetch-popos
+++ b/ufetch-popos
@@ -10,7 +10,7 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-pureos b/ufetch-pureos
index e796ee9..94c6f41 100755
--- a/ufetch-pureos
+++ b/ufetch-pureos
@@ -10,7 +10,7 @@ os='PureOS'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-raspbian b/ufetch-raspbian
index 2d3b6f7..c31ac91 100755
--- a/ufetch-raspbian
+++ b/ufetch-raspbian
@@ -10,7 +10,7 @@ os='Raspbian'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-slackware b/ufetch-slackware
index e758f3a..2fc2f02 100755
--- a/ufetch-slackware
+++ b/ufetch-slackware
@@ -10,7 +10,7 @@ os="$(cat /etc/slackware-version)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(ls /var/log/packages | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-suse b/ufetch-suse
index ac2c502..c81227b 100755
--- a/ufetch-suse
+++ b/ufetch-suse
@@ -10,7 +10,7 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(rpm -qa --last | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-ubuntu b/ufetch-ubuntu
index 5d9c724..8b195d4 100755
--- a/ufetch-ubuntu
+++ b/ufetch-ubuntu
@@ -10,7 +10,7 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-void b/ufetch-void
index 19cc6f4..5d127ff 100755
--- a/ufetch-void
+++ b/ufetch-void
@@ -10,7 +10,7 @@ os='Void Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(xbps-query -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
diff --git a/ufetch-voyager b/ufetch-voyager
index 5a1e44f..d596fdb 100755
--- a/ufetch-voyager
+++ b/ufetch-voyager
@@ -10,7 +10,7 @@ os="Voyager Live $(lsb_release -r | awk '{print $2}')"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename ${SHELL})"
+shell="$(basename "$SHELL")"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then