diff --git a/ufetch-alpine b/ufetch-alpine
index ea0ebe0..d9a50c1 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
@@ -44,11 +44,10 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${blue}"		# labels
-nc="${reset}${bold}${blue}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${blue}"			# first color
-c1="${reset}${white}"			# second color
+lc="${reset}${bold}${blue}"         # labels
+nc="${reset}${bold}${blue}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${blue}"                # first color
 
 ## OUTPUT
 
diff --git a/ufetch-antergos b/ufetch-antergos
index 40ff40d..8524545 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
@@ -44,11 +44,11 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${blue}"		# labels
-nc="${reset}${bold}${blue}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${blue}"		# first color
-c1="${reset}${bold}${white}"		# second color
+lc="${reset}${bold}${blue}"         # labels
+nc="${reset}${bold}${blue}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${blue}"         # first color
+c1="${reset}${bold}${white}"        # second color
 
 ## OUTPUT
 
diff --git a/ufetch-arch b/ufetch-arch
index 34195d0..3d8e994 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
@@ -44,10 +44,10 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${blue}"     # labels
-nc="${reset}${bold}${blue}"     # user and hostname
-ic="${reset}${bold}${white}"    # info
-c0="${reset}${bold}${blue}"     # first color
+lc="${reset}${bold}${blue}"         # labels
+nc="${reset}${bold}${blue}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${blue}"         # first color
 
 ## OUTPUT
 
diff --git a/ufetch-archbang b/ufetch-archbang
index 288baad..703a786 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
@@ -44,10 +44,10 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${blue}"     # labels
-nc="${reset}${bold}${blue}"     # user and hostname
-ic="${reset}${bold}${white}"    # info
-c0="${reset}${bold}${blue}"     # first color
+lc="${reset}${bold}${blue}"         # labels
+nc="${reset}${bold}${blue}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${blue}"         # first color
 
 ## OUTPUT
 
diff --git a/ufetch-arco b/ufetch-arco
index 45c7540..59f1f6b 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
@@ -44,10 +44,10 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${blue}"		# labels
-nc="${reset}${bold}${blue}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${blue}"		# first color
+lc="${reset}${bold}${blue}"         # labels
+nc="${reset}${bold}${blue}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${blue}"         # first color
 
 ## OUTPUT
 
diff --git a/ufetch-artix b/ufetch-artix
index 1b06362..78deec2 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
@@ -44,12 +44,12 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${cyan}" 	# labels
-nc="${reset}${bold}${cyan}" 	# user and hostname
-ic="${reset}${bold}${white}" 	# info
-c0="${reset}${bold}${cyan}" 	# first color
-c1="${reset}${bold}${blue}" 	# second color
-c2="${reset}${bold}${green}" 	# third color
+lc="${reset}${bold}${cyan}"         # labels
+nc="${reset}${bold}${cyan}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${cyan}"         # first color
+c1="${reset}${bold}${blue}"         # second color
+c2="${reset}${bold}${green}"        # third color
 
 ## OUTPUT
 
diff --git a/ufetch-aux b/ufetch-aux
index ebc888f..ba7bf24 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
 
@@ -18,10 +18,10 @@ bold=`tput bold`
 reset=`tput sgr0`
 
 # you can change these
-lc="${reset}${bold}"	# labels
-nc="${reset}${bold}"	# user and hostname
-ic="${reset}"			# info
-c0="${reset}"			# first color
+lc="${reset}${bold}"                # labels
+nc="${reset}${bold}"                # user and hostname
+ic="${reset}"                       # info
+c0="${reset}"                       # first color
 
 ## OUTPUT
 
diff --git a/ufetch-centos b/ufetch-centos
index cedf6c3..e2cb57c 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
@@ -44,13 +44,13 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${magenta}"		# labels
-nc="${reset}${bold}${magenta}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${green}"		# first color
-c1="${reset}${bold}${yellow}"		# second color
-c2="${reset}${bold}${magenta}"		# third color
-c3="${reset}${bold}${blue}"		# fourth color
+lc="${reset}${bold}${magenta}"      # labels
+nc="${reset}${bold}${magenta}"      # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${green}"        # first color
+c1="${reset}${bold}${yellow}"       # second color
+c2="${reset}${bold}${magenta}"      # third color
+c3="${reset}${bold}${blue}"         # fourth color
 
 ## OUTPUT
 
diff --git a/ufetch-crux b/ufetch-crux
index 3c8a6ba..2dd5d95 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
@@ -44,12 +44,12 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${cyan}"		# labels
-nc="${reset}${bold}${cyan}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${cyan}"			# first color
-c1="${reset}${white}"			# second color
-c2="${reset}${yellow}"			# third color
+lc="${reset}${bold}${cyan}"         # labels
+nc="${reset}${bold}${cyan}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${cyan}"                # first color
+c1="${reset}${white}"               # second color
+c2="${reset}${yellow}"              # third color
 
 ## OUTPUT
 
diff --git a/ufetch-debian b/ufetch-debian
index b838267..9f9d6f2 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
@@ -44,17 +44,17 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${red}"		# labels
-nc="${reset}${bold}${red}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${red}"		# first color
-c1="${reset}${red}"			# second color
+lc="${reset}${bold}${red}"          # labels
+nc="${reset}${bold}${red}"          # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${red}"          # first color
+c1="${reset}${red}"                 # second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c0}    _____    ${lc}${USER}${ic}@${lc}${host}${reset}
+${c0}    _____    ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}   /  __ \\   ${lc}OS:        ${ic}${os}${reset}
 ${c0}  |  /    |  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  |  ${c1}\\___-   ${lc}UPTIME:    ${ic}${uptime}${reset}
diff --git a/ufetch-elementary b/ufetch-elementary
index 6a6017a..3f7aa8c 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
@@ -44,17 +44,17 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${green}"		# labels
-nc="${reset}${bold}${green}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${white}"		# first color
-c1="${reset}${white}"		# second color
+lc="${reset}${bold}${green}"        # labels
+nc="${reset}${bold}${green}"        # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${white}"        # first color
+c1="${reset}${white}"               # second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c1}    _______    ${lc}${USER}${ic}@${lc}${host}${reset}
+${c1}    _______    ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c1}   / ${c0}____  ${c1}\\   ${lc}OS:        ${ic}${os}${reset}
 ${c1}  /  ${c0}|  /  /${c1}\\  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  |${c0}__\\ /  /${c1} |  ${lc}UPTIME:    ${ic}${uptime}${reset}
diff --git a/ufetch-fedora b/ufetch-fedora
index 132da59..75f0b95 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
@@ -44,11 +44,11 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${blue}"		# labels
-nc="${reset}${bold}${blue}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${white}"		# first color
-c1="${reset}${bold}${cyan}"		# second color
+lc="${reset}${bold}${blue}"         # labels
+nc="${reset}${bold}${blue}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${white}"        # first color
+c1="${reset}${bold}${cyan}"         # second color
 
 ## OUTPUT
 
diff --git a/ufetch-freebsd b/ufetch-freebsd
index cd3ebc1..4d9f002 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
@@ -44,11 +44,11 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${red}"		# labels
-nc="${reset}${bold}${red}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${red}"		# first color
-c1="${reset}${red}"			# second color
+lc="${reset}${bold}${red}"          # labels
+nc="${reset}${bold}${red}"          # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${red}"          # first color
+c1="${reset}${red}"                 # second color
 
 ## OUTPUT
 
diff --git a/ufetch-gentoo b/ufetch-gentoo
index 1a47af9..6a5cb11 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
@@ -44,11 +44,11 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${magenta}"		# labels
-nc="${reset}${bold}${magenta}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${magenta}"		# first color
-c1="${reset}${magenta}"			# second color
+lc="${reset}${bold}${magenta}"      # labels
+nc="${reset}${bold}${magenta}"      # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${magenta}"      # first color
+c1="${reset}${magenta}"             # second color
 
 ## OUTPUT
 
diff --git a/ufetch-linux b/ufetch-linux
index 7e92a25..8c7f23b 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
@@ -43,12 +43,12 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${black}"		# labels
-nc="${reset}${bold}${black}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${black}"		# first color
-c1="${reset}${white}"			# second color
-c2="${reset}${yellow}"			# third color
+lc="${reset}${bold}${black}"        # labels
+nc="${reset}${bold}${black}"        # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${black}"        # first color
+c1="${reset}${white}"               # second color
+c2="${reset}${yellow}"              # third color
 
 ## OUTPUT
 
diff --git a/ufetch-linuxlite b/ufetch-linuxlite
index b153d73..beb266c 100755
--- a/ufetch-linuxlite
+++ b/ufetch-linuxlite
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# ufetch-linuxlite - tiny system info for Linux Lite
+# ufetch-linuxlite - tiny system info for linux lite
 
 ## INFO
 
@@ -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
@@ -44,17 +44,17 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${yellow}"		# labels
-nc="${reset}${bold}${yellow}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${yellow}"		# first color
-c1="${reset}${bold}${white}"		# second color
+lc="${reset}${bold}${yellow}"       # labels
+nc="${reset}${bold}${yellow}"       # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${yellow}"       # first color
+c1="${reset}${bold}${white}"        # second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c0}     /\\   ${lc}${USER}${ic}@${lc}${host}${reset}
+${c0}     /\\   ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}    /  \\  ${lc}OS:        ${ic}${os}${reset}
 ${c0}   / ${c1}/ ${c0}/  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  > ${c1}/ ${c0}/   ${lc}UPTIME:    ${ic}${uptime}${reset}
diff --git a/ufetch-macos b/ufetch-macos
index 5b5078b..648cc34 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
@@ -43,10 +43,10 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}"		# labels
-nc="${reset}${bold}"		# user and hostname
-ic="${reset}"			# info
-c0="${reset}"			# first color
+lc="${reset}${bold}"                # labels
+nc="${reset}${bold}"                # user and hostname
+ic="${reset}"                       # info
+c0="${reset}"                       # first color
 
 ## OUTPUT
 
diff --git a/ufetch-mageia b/ufetch-mageia
index a0f67ff..450963b 100755
--- a/ufetch-mageia
+++ b/ufetch-mageia
@@ -4,12 +4,13 @@
 
 ## INFO
 
-# user is already defined host="$(hostname)" os="$(lsb_release -ds)"
-os="$(lsb_release -ds | tr -d \")"
+# user is already defined
+host="$(hostname)"
+os="$(lsb_release -ds)"
 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
@@ -43,11 +44,11 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${blue}"		# labels
-nc="${reset}${bold}${blue}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${white}"		# first color
-c1="${reset}${bold}${cyan}"		# second color
+lc="${reset}${bold}${blue}"         # labels
+nc="${reset}${bold}${blue}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${white}"        # first color
+c1="${reset}${bold}${cyan}"         # second color
 
 ## OUTPUT
 
diff --git a/ufetch-manjaro b/ufetch-manjaro
index 5cd780a..d09c7ed 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
@@ -44,10 +44,10 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${green}"		# labels
-nc="${reset}${bold}${green}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${green}"			# first color
+lc="${reset}${bold}${green}"        # labels
+nc="${reset}${bold}${green}"        # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${green}"        # first color
 
 ## OUTPUT
 
diff --git a/ufetch-mint b/ufetch-mint
index e17372f..7ab4c1a 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
@@ -44,17 +44,17 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${green}"		# labels
-nc="${reset}${bold}${green}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${green}"		# first color
-c1="${reset}${bold}${white}"		# second color
+lc="${reset}${bold}${green}"        # labels
+nc="${reset}${bold}${green}"        # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${green}"        # first color
+c1="${reset}${bold}${white}"        # second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c0}   ___________   ${lc}${USER}${ic}@${lc}${host}${reset}
+${c0}   ___________   ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}  |_          \\  ${lc}OS:        ${ic}${os}${reset}
 ${c0}    | ${c1}| _____ ${c0}|  ${lc}KERNEL:    ${ic}${kernel}${reset} 
 ${c0}    | ${c1}| | | | ${c0}|  ${lc}UPTIME:    ${ic}${uptime}${reset}
diff --git a/ufetch-mxlinux b/ufetch-mxlinux
index 39f312f..948038a 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
@@ -44,16 +44,16 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${white}"		# labels
-nc="${reset}${bold}${white}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${white}"		# first color
+lc="${reset}${bold}${white}"        # labels
+nc="${reset}${bold}${white}"        # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${white}"        # first color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c0}      \\\\  /     ${lc}${USER}${ic}@${lc}${host}${reset}
+${c0}      \\\\  /     ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}       \\\\/      ${lc}OS:        ${ic}${os}${reset}
 ${c0}        \\\\      ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     /\\/ \\\\     ${lc}UPTIME:    ${ic}${uptime}${reset}
diff --git a/ufetch-nixos b/ufetch-nixos
index d04a61e..31e8af5 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
@@ -44,17 +44,17 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${blue}"		# labels
-nc="${reset}${bold}${blue}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${blue}"			# first color
-c1="${reset}${bold}${blue}"		# second color
+lc="${reset}${bold}${blue}"         # labels
+nc="${reset}${bold}${blue}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${blue}"                # first color
+c1="${reset}${bold}${blue}"         # second color
 
 ## OUTPUT
 
 sed 's/\\/\\\\/g' <<EOF
 
-${c0}    \\   ${c1}\\ //    ${nc}${USER}${ic}@${rc}${nc}${host}${reset}
+${c0}    \\   ${c1}\\ //    ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}   ==\\___${c1}\\/ ${c0}//  ${lc}OS:        ${ic}${os}${reset}
 ${c1}     //    \\${c0}//   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  ==//      ${c0}//==  ${lc}UPTIME:    ${ic}${uptime}${reset}
diff --git a/ufetch-openbsd b/ufetch-openbsd
index 3c61e62..df6f1de 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
@@ -44,12 +44,12 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${yellow}"		# labels
-nc="${reset}${bold}${yellow}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${yellow}"			# first color
-c1="${reset}${white}"			# second color
-c2="${reset}${bold}${yellow}"		# third color
+lc="${reset}${bold}${yellow}"       # labels
+nc="${reset}${bold}${yellow}"       # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${yellow}"              # first color
+c1="${reset}${white}"               # second color
+c2="${reset}${bold}${yellow}"       # third color
 
 
 ## OUTPUT
diff --git a/ufetch-parabola b/ufetch-parabola
index 83eef7d..1718e0b 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
@@ -44,11 +44,10 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${magenta}"		# labels
-nc="${reset}${bold}${magenta}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${magenta}"		# first color
-c1="${reset}${magenta}"			# second color
+lc="${reset}${bold}${magenta}"      # labels
+nc="${reset}${bold}${magenta}"      # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${magenta}"      # first color
 
 ## OUTPUT
 
diff --git a/ufetch-popos b/ufetch-popos
index 58f8ca5..cee32a1 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
@@ -44,20 +44,20 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${cyan}"		# labels
-nc="${reset}${bold}${cyan}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${cyan}"		# first color
+lc="${reset}${bold}${cyan}"         # labels
+nc="${reset}${bold}${cyan}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${cyan}"         # first color
 
 ## OUTPUT
 
 cat <<EOF
 ${c0}  ______          
-${c0}  \\   _ \\        __  ${lc}${USER}${ic}@${lc}${host}${reset}          
+${c0}  \\   _ \\        __  ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}   \\ \\ \\ \\      / /  ${lc}OS:        ${ic}${os}${reset}
-${c0}    \\ \\_\\ \\    / /   ${lc}KERNEL:    ${ic}${kernel}${reset}    
+${c0}    \\ \\_\\ \\    / /   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     \\  ___\\  /_/    ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c0}      \\ \\    _       ${lc}PACKAGES:  ${ic}${packages}${reset} 
+${c0}      \\ \\    _       ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}     __\\_\\__(_)_     ${lc}SHELL:     ${ic}${shell}${reset}
 ${c0}    (___________)    ${lc}${envtype}        ${ic}${WM}${reset}
 
diff --git a/ufetch-pureos b/ufetch-pureos
index 05fc826..897e746 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
@@ -44,16 +44,16 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${blue}"     # labels
-nc="${reset}${bold}${blue}"     # user and hostname
-ic="${reset}${bold}${white}"    # info
-c0="${reset}${bold}${white}"    # first color
+lc="${reset}${bold}${blue}"         # labels
+nc="${reset}${bold}${blue}"         # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${white}"        # first color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c0}   _____________   ${lc}${USER}${ic}@${lc}${host}${reset}
+${c0}   _____________   ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}  |  _________  |  ${lc}OS:        ${ic}${os}${reset}
 ${c0}  | |         | |  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  | |         | |  ${lc}UPTIME:    ${ic}${uptime}${reset}
diff --git a/ufetch-raspbian b/ufetch-raspbian
index 8e6139e..175ec6e 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
@@ -44,17 +44,17 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${red}"		# labels
-nc="${reset}${bold}${red}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${green}"		# first color
-c1="${reset}${bold}${red}"		# second color
+lc="${reset}${bold}${red}"          # labels
+nc="${reset}${bold}${red}"          # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${green}"        # first color
+c1="${reset}${bold}${red}"          # second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c0}    __  __    ${lc}${USER}${ic}@${lc}${host}${reset}
+${c0}    __  __    ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}   (_\\)(/_)   ${lc}OS:        ${ic}${os}${reset}
 ${c1}   (_(__)_)   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  (_(_)(_)_)  ${lc}UPTIME:    ${ic}${uptime}${reset}
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..44d4f65 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
@@ -44,10 +44,10 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${green}"		# labels
-nc="${reset}${bold}${green}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${green}"		# first color
+lc="${reset}${bold}${green}"        # labels
+nc="${reset}${bold}${green}"        # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${green}"        # first color
 
 ## OUTPUT
 
diff --git a/ufetch-ubuntu b/ufetch-ubuntu
index ac984fd..a592b1b 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
@@ -44,16 +44,16 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${yellow}"		# labels
-nc="${reset}${bold}${yellow}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${yellow}"		# first color
+lc="${reset}${bold}${yellow}"       # labels
+nc="${reset}${bold}${yellow}"       # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${yellow}"       # first color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c0}           _   ${lc}${USER}${ic}@${lc}${host}${reset}
+${c0}           _   ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}       ---(_)  ${lc}OS:        ${ic}${os}${reset}
 ${c0}   _/  ---  \\  ${lc}KERNEL:    ${ic}${kernel}${reset} 
 ${c0}  (_) |   |    ${lc}UPTIME:    ${ic}${uptime}${reset}
diff --git a/ufetch-void b/ufetch-void
index 19cc6f4..10e2321 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
@@ -44,11 +44,11 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${green}"		# labels
-nc="${reset}${bold}${green}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${green}"		# first color
-c1="${reset}${green}"			# second color
+lc="${reset}${bold}${green}"        # labels
+nc="${reset}${bold}${green}"        # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${green}"        # first color
+c1="${reset}${green}"               # second color
 
 ## OUTPUT
 
diff --git a/ufetch-voyager b/ufetch-voyager
index 7d2da91..f3bf21f 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
@@ -44,16 +44,16 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${yellow}"		# labels
-nc="${reset}${bold}${yellow}"		# user and hostname
-ic="${reset}${bold}${white}"		# info
-c0="${reset}${bold}${yellow}"		# first color
+lc="${reset}${bold}${yellow}"       # labels
+nc="${reset}${bold}${yellow}"       # user and hostname
+ic="${reset}${bold}${white}"        # info
+c0="${reset}${bold}${yellow}"       # first color
 
 ## OUTPUT
 
 cat <<EOF
 ${c0}   _____   ____
-${c0}  |     | |    |  ${lc}${USER}${ic}@${lc}${host}${reset}
+${c0}  |     | |    |  ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}  |     | |    |  ${lc}OS:        ${ic}${os}${reset}
 ${c0}  |     | |    |  ${lc}KERNEL:    ${ic}${kernel}${reset} 
 ${c0}  |     | |____|  ${lc}UPTIME:    ${ic}${uptime}${reset}