diff --git a/ufetch-alpine b/ufetch-alpine
index d9a50c1..bd40643 100755
--- a/ufetch-alpine
+++ b/ufetch-alpine
@@ -12,19 +12,29 @@ uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//'
 packages="$(apk info | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}      / /\\ \\  /\\      ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     / /  \\ \\/  \\     ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}    / /    \\ \\/\\ \\    ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}   / / /|   \\ \\ \\ \\   ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}  /_/ /_|    \\_\\ \\_\\  ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}  /_/ /_|    \\_\\ \\_\\  ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-antergos b/ufetch-antergos
index 8524545..c864529 100755
--- a/ufetch-antergos
+++ b/ufetch-antergos
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -60,6 +70,6 @@ ${c0}     /  ${c1}.\`   ${c0}\\     ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}    / ${c1}.\` .\` . ${c0}\\    ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}   / ${c1}\` .\`.\` .\` ${c0}\\   ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}  |    ${c1}\`.\`  \`   ${c0}|  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}   \\___________/   ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}   \\___________/   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-arch b/ufetch-arch
index 3d8e994..b25f446 100755
--- a/ufetch-arch
+++ b/ufetch-arch
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}      /\\   \\       ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     /  __  \\      ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}    /  (  )  \\     ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}   / __|  |__\\\\    ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}  /.\`        \`.\\   ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}  /.\`        \`.\\   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-archbang b/ufetch-archbang
index 703a786..cbf18da 100755
--- a/ufetch-archbang
+++ b/ufetch-archbang
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}      /  \ /      ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     /   // \     ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}    /   //   \    ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}   / ___()___ \   ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}  /.\`        \`.\  ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}  /.\`        \`.\  ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-arco b/ufetch-arco
index 59f1f6b..9ccc3ed 100755
--- a/ufetch-arco
+++ b/ufetch-arco
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}      / /\\ \\      ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     / /  \\ \\     ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}    / /    \\ \\    ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}   / / _____\\ \\   ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}  /_/  \`----.\\_\\  ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}  /_/  \`----.\\_\\  ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-artix b/ufetch-artix
index 78deec2..bcfb605 100755
--- a/ufetch-artix
+++ b/ufetch-artix
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -54,14 +64,14 @@ c2="${reset}${bold}${green}"        # third color
 ## OUTPUT
 
 cat <<EOF
-${c1}              _                           
-${c0}           _ ${c1}/ /         ${nc}${USER}${ic}@${nc}${host}${reset}
-${c0}        _ / ${c1}/ /\\         ${lc}OS:        ${ic}${os}${reset}  
-${c0}       / / ${c1}/ /\\ \\        ${lc}KERNEL:    ${ic}${kernel}${reset}
-${c0}      / / ${c1}/ /  \\ \\ ${c2}_     ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c2}   _ ${c0}/ / ${c1}/ /${c2}------\`_|    ${lc}PACKAGES:  ${ic}${packages}${reset}
-${c2}  |_${c0}/ / ${c1}/_/${c2}-------\`      ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}   / /_/          ${c1}\\ \\    ${lc}${envtype}        ${ic}${WM}${reset}
-${c0}  /_/              ${c1}\\_\\  
+${c1}              _${reset}
+${c0}           _ ${c1}/ /        ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}        _ / ${c1}/ /\\        ${lc}OS:        ${ic}${os}${reset}  
+${c0}       / / ${c1}/ /\\ \\       ${lc}KERNEL:    ${ic}${kernel}${reset}
+${c0}      / / ${c1}/ /  \\ \\ ${c2}_    ${lc}UPTIME:    ${ic}${uptime}${reset}
+${c2}   _ ${c0}/ / ${c1}/ /${c2}------\`_|   ${lc}PACKAGES:  ${ic}${packages}${reset}
+${c2}  |_${c0}/ / ${c1}/_/${c2}-------\`     ${lc}SHELL:     ${ic}${shell}${reset}
+${c0}   / /_/          ${c1}\\ \\   ${lc}${uitype}:        ${ic}${ui}${reset}
+${c0}  /_/              ${c1}\\_\\${reset}
 
 EOF
diff --git a/ufetch-aux b/ufetch-aux
index ba7bf24..22cbdaa 100755
--- a/ufetch-aux
+++ b/ufetch-aux
@@ -9,8 +9,14 @@ host=`hostname`
 os=`uname -sr`
 kernel=`uname -v`
 uptime=`uptime | awk '{print $3" "$4}' | tr -d ,`
+packages='unknown'
 shell=`basename "$SHELL"`
 
+## UI DETECTION
+
+ui='unknown'
+uitype='UI'
+
 ## DEFINE COLORS
 
 # probably don't change these
@@ -25,12 +31,12 @@ c0="${reset}"                       # first color
 
 ## OUTPUT
 
-echo "
-${c0}         (/
-${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}
-${c0}   \         /  ${lc}SHELL:   ${ic}${shell}${reset}
-${c0}    \`._.-._.\`
+echo "${c0}          _${reset}
+${c0}         (/     ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}    .---__--.   ${lc}OS:        ${ic}${os}${reset}
+${c0}   /         \  ${lc}KERNEL:    ${ic}${kernel}${reset}
+${c0}  |         /   ${lc}PACKAGES:  ${ic}${packages}${reset}
+${c0}  |         \\_  ${lc}UPTIME:    ${ic}${uptime}${reset}
+${c0}   \         /  ${lc}SHELL:     ${ic}${shell}${reset}
+${c0}    \`._.-._.\`   ${lc}${uitype}:        ${ic}${ui}${reset}
 "
diff --git a/ufetch-centos b/ufetch-centos
index e2cb57c..cde1051 100755
--- a/ufetch-centos
+++ b/ufetch-centos
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(yum list installed | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -62,6 +72,6 @@ ${c0}   | \\ ${c1}|${c2} / |   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c2}  <---- ${c3}---->  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c3}   | / ${c0}|${c1} \\ |   ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c3}   |/__${c0}|${c1}__\\|   ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}       v       ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}       v       ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-crux b/ufetch-crux
index 2dd5d95..d4a41f5 100755
--- a/ufetch-crux
+++ b/ufetch-crux
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(pkginfo -i | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -61,6 +71,6 @@ ${c0}     (${c2}<> ${c0}|    ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}    / ${c1}__  ${c0}\\   ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}   ( ${c1}/  \\ ${c0}/|  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}SHELL:     ${ic}${shell}${reset}
-${c2}  \/${c0}-____${c2}\/   ${lc}${envtype}        ${ic}${WM}${reset}
+${c2}  \/${c0}-____${c2}\/   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-debian b/ufetch-debian
index 9f9d6f2..4bd0f93 100755
--- a/ufetch-debian
+++ b/ufetch-debian
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -60,6 +70,6 @@ ${c0}  |  /    |  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  |  ${c1}\\___-   ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}  -_         ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}    --_      ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}             ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}             ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-elementary b/ufetch-elementary
index 3f7aa8c..e764249 100755
--- a/ufetch-elementary
+++ b/ufetch-elementary
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -44,8 +54,8 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${green}"        # labels
-nc="${reset}${bold}${green}"        # user and hostname
+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}${white}"               # second color
@@ -60,6 +70,6 @@ ${c1}  /  ${c0}|  /  /${c1}\\  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  |${c0}__\\ /  /${c1} |  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}  \\   ${c0}/__/${c1}  /  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}   \\_______/   ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}               ${lc}${envtype}        ${ic}${WM}${reset}
+${c1}               ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-fedora b/ufetch-fedora
index 75f0b95..ed60e70 100755
--- a/ufetch-fedora
+++ b/ufetch-fedora
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(yum list installed | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -60,6 +70,6 @@ ${c1}    __${c0}_|  |_${c1}_/ /  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}   / ${c0}(_    _)${c1}_/   ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}  / /  ${c0}|  |       ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}  \\ \\${c0}__/  |       ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}   \\${c0}(_____/       ${lc}${envtype}        ${ic}${WM}${reset}
+${c1}   \\${c0}(_____/       ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-freebsd b/ufetch-freebsd
index 4d9f002..e6e679b 100755
--- a/ufetch-freebsd
+++ b/ufetch-freebsd
@@ -12,19 +12,29 @@ 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")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -60,6 +70,6 @@ ${c0}  \/       (__/  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  |           |  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}  |           |  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}   \         /   ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}    \`-_____-\`    ${lc}${envtype}        ${ic}${WM}${reset}
+${c1}    \`-_____-\`    ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-gentoo b/ufetch-gentoo
index 6a5cb11..ffb1b6b 100755
--- a/ufetch-gentoo
+++ b/ufetch-gentoo
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(ls -d /var/db/pkg/*/* | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -54,12 +64,12 @@ c1="${reset}${magenta}"             # second color
 
 cat <<EOF
 
-${c0}     .-----.      ${nc}${USER}${ic}@${nc}${host}${reset}
-${c0}   .\`    _  \`.    ${lc}OS:        ${ic}${os}${reset}
-${c0}   \`.   (${c1}_)   ${c0}\`.  ${lc}KERNEL:    ${ic}${kernel}${reset}
-${c0}     \`${c1}.        /  ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c1}    .\`       .\`   ${lc}PACKAGES:  ${ic}${packages}${reset}
-${c1}   /       .\`     ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}   \____.-\`       ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}    .-----.      ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}  .\`    _  \`.    ${lc}OS:        ${ic}${os}${reset}
+${c0}  \`.   (${c1}_)   ${c0}\`.  ${lc}KERNEL:    ${ic}${kernel}${reset}
+${c0}    \`${c1}.        /  ${lc}UPTIME:    ${ic}${uptime}${reset}
+${c1}   .\`       .\`   ${lc}PACKAGES:  ${ic}${packages}${reset}
+${c1}  /       .\`     ${lc}SHELL:     ${ic}${shell}${reset}
+${c1}  \____.-\`       ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-linux b/ufetch-linux
index 8c7f23b..7175645 100755
--- a/ufetch-linux
+++ b/ufetch-linux
@@ -9,21 +9,32 @@ 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]*//')"
+packages='unknown'
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -58,8 +69,8 @@ ${c0}      ___     ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}     (${c1}.. ${c0}\    ${lc}OS:        ${ic}${os}${reset}
 ${c0}     (${c2}<> ${c0}|    ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}    /${c1}/  \\ ${c0}\\   ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c0}   ( ${c1}|  | ${c0}/|  ${lc}SHELL:     ${ic}${shell}${reset}
-${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}${envtype}        ${ic}${WM}${reset}
-${c2}  \/${c0}-____${c2}\/${reset}
+${c0}   ( ${c1}|  | ${c0}/|  ${lc}PACKAGES:  ${ic}${packages}${reset} 
+${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}SHELL:     ${ic}${shell}${reset}
+${c2}  \/${c0}-____${c2}\/${reset}   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-linuxlite b/ufetch-linuxlite
index beb266c..d6da0eb 100755
--- a/ufetch-linuxlite
+++ b/ufetch-linuxlite
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -60,6 +70,6 @@ ${c0}   / ${c1}/ ${c0}/  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  > ${c1}/ ${c0}/   ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}  \\ ${c1}\\ ${c0}\\   ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}   \\_${c1}\\${c0}_\\  ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}      \\   ${lc}${envtype}        ${ic}${WM}${reset}
+${c1}      \\   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-macos b/ufetch-macos
index 648cc34..222fafd 100755
--- a/ufetch-macos
+++ b/ufetch-macos
@@ -9,6 +9,10 @@ host="$(hostname)"
 os="$(sw_vers -productName) $(sw_vers -productVersion)"
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
+shell="$(basename "$SHELL")"
+
+## PACKAGE MANAGER DETECTION
+
 if [ -x "$(command -v pkgin)" ]; then
 	packages="$(pkgin list | wc -l)"
 elif [ -x "$(command -v brew)" ]; then
@@ -18,12 +22,22 @@ elif [ -x "$(command -v brew)" ]; then
 elif [ -x "$(command -v port)" ]; then
 	packages="$(port installed | wc -l)"
 else
-	packages='no package manager'
+	packages='unknown'
 fi
+
 packages="$(echo ${packages} | sed -e 's/^[ /t]*//')"
-shell="$(basename "$SHELL")"
-if [ -z "${WM}" ]; then
-	WM='Quartz Compositor'
+
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+	ui="${DE}"
+	uitype='DE'
+elif [ -n "${WM}" ]; then
+	ui="${WM}"
+	uitype='WM'
+else
+	ui='Aqua'
+	uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -51,13 +65,13 @@ c0="${reset}"                       # first color
 ## OUTPUT
 
 cat <<EOF
-
+${c0}          _${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}
 ${c0}  |         \\_  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}   \         /  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}    \`._.-._.\`   ${lc}WM:        ${ic}${WM}${reset}
+${c0}    \`._.-._.\`   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-mageia b/ufetch-mageia
index 450963b..e889fbc 100755
--- a/ufetch-mageia
+++ b/ufetch-mageia
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(yum list installed | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -60,6 +70,6 @@ ${c1}     **     ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}   /\\__/\\   ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}  /      \\  ${lc}PACKAGES:  ${ic}${packages}${reset} 
 ${c0}  \\      /  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}   \\____/   ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}   \\____/   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-manjaro b/ufetch-manjaro
index d09c7ed..e9aade9 100755
--- a/ufetch-manjaro
+++ b/ufetch-manjaro
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}  ||||      ||||  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  |||| |||| ||||  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}  |||| |||| ||||  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}  |||| |||| ||||  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}  |||| |||| ||||  ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}  |||| |||| ||||  ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-mint b/ufetch-mint
index 7ab4c1a..cfccb0a 100755
--- a/ufetch-mint
+++ b/ufetch-mint
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -47,8 +57,9 @@ fi
 lc="${reset}${bold}${green}"        # labels
 nc="${reset}${bold}${green}"        # user and hostname
 ic="${reset}${bold}${white}"        # info
-c0="${reset}${bold}${green}"        # first color
+c0="${reset}${green}"               # first color
 c1="${reset}${bold}${white}"        # second color
+c2="${reset}${bold}${green}"        # third color
 
 ## OUTPUT
 
@@ -59,7 +70,7 @@ ${c0}  |_          \\  ${lc}OS:        ${ic}${os}${reset}
 ${c0}    | ${c1}| _____ ${c0}|  ${lc}KERNEL:    ${ic}${kernel}${reset} 
 ${c0}    | ${c1}| | | | ${c0}|  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}    | ${c1}| | | | ${c0}|  ${lc}PACKAGES:  ${ic}${packages}${reset} 
-${c0}    | ${c1}\\___${c0}__/ |  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}    \\_________/  ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}    | ${c1}\\__${c2}___/ ${c0}|  ${lc}SHELL:     ${ic}${shell}${reset}
+${c0}    \\_________/  ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-mxlinux b/ufetch-mx
similarity index 61%
rename from ufetch-mxlinux
rename to ufetch-mx
index 948038a..48fd8db 100755
--- a/ufetch-mxlinux
+++ b/ufetch-mx
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# ufetch-mxlinux - tiny system info for mxlinux
+# ufetch-mx - tiny system info for mx
 
 ## INFO
 
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}        \\\\      ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     /\\/ \\\\     ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}    /  \\  /\\    ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}   /    \\/  \\   ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}  /__________\\  ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}  /__________\\  ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-netbsd b/ufetch-netbsd
index be449c5..b8378c9 100755
--- a/ufetch-netbsd
+++ b/ufetch-netbsd
@@ -12,19 +12,29 @@ uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//'
 packages="$(pkgin list | wc -l | sed -e 's/^[ \t]*//')"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -60,6 +70,6 @@ ${c0}    \\\       ${c1}\`.____    ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     \\\\${c1}-______,----\`-  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}      \\\               ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}       \\\              ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}        \\\             ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}        \\\             ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-nixos b/ufetch-nixos
index 31e8af5..4d84517 100755
--- a/ufetch-nixos
+++ b/ufetch-nixos
@@ -12,19 +12,29 @@ 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")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -60,6 +70,6 @@ ${c1}     //    \\${c0}//   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  ==//      ${c0}//==  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}   //${c0}\\${c1}____${c0}//     ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}  // ${c0}/\\   ${c1}\\==   ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}    // \\   ${c1}\\    ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}    // \\   ${c1}\\    ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-openbsd b/ufetch-openbsd
index d604533..0ca40dd 100755
--- a/ufetch-openbsd
+++ b/ufetch-openbsd
@@ -12,19 +12,29 @@ 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")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+	ui="${DE}"
+	uitype='DE'
+elif [ -n "${WM}" ]; then
+	ui="${WM}"
+	uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+	ui="${XDG_CURRENT_DESKTOP}"
+	uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+	ui="${DESKTOP_SESSION}"
+	uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
 else
-	envtype='WM:'
+	ui='unknown'
+	uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -61,6 +71,6 @@ ${c0}  \_/         \   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  |        ${c1}O O ${c0}|  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}  |_  ${c2}<   ${c0})  ${c2}3 ${c0})  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}  / \         /   ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}     /-_____-\    ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}     /-_____-\    ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-parabola b/ufetch-parabola
index 1718e0b..73927e0 100755
--- a/ufetch-parabola
+++ b/ufetch-parabola
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -51,7 +61,7 @@ c0="${reset}${bold}${magenta}"      # first color
 
 ## OUTPUT
 
-cat<<EOF
+cat <<EOF
 
 ${c0}    __ __ __  _    ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}  .\`_//_//_/ / \`.  ${lc}OS:        ${ic}${os}${reset}
@@ -59,6 +69,6 @@ ${c0}            /  .\`  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}           / .\`    ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}          /.\`      ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}         /\`        ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}                   ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}                   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-popos b/ufetch-popos
index cee32a1..efe2f95 100755
--- a/ufetch-popos
+++ b/ufetch-popos
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}    \\ \\_\\ \\    / /   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     \\  ___\\  /_/    ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}      \\ \\    _       ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}     __\\_\\__(_)_     ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}    (___________)    ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}    (___________)    ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-pureos b/ufetch-pureos
index 897e746..2847e77 100755
--- a/ufetch-pureos
+++ b/ufetch-pureos
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}  | |         | |  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  | |         | |  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}  | |_________| |  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}  |_____________|  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}                   ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}                   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-raspbian b/ufetch-raspbian
index 175ec6e..48788b8 100755
--- a/ufetch-raspbian
+++ b/ufetch-raspbian
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -60,6 +70,6 @@ ${c1}   (_(__)_)   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  (_(_)(_)_)  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}   (_(__)_)   ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}     (__)     ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}              ${lc}${envtype}        ${ic}${WM}${reset}
+${c1}              ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-slackware b/ufetch-slackware
index 2fc2f02..7927795 100755
--- a/ufetch-slackware
+++ b/ufetch-slackware
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(ls /var/log/packages | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -57,6 +67,6 @@ ${c0}    | |______    ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}    \\______  \\   ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}     ______| |   ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}  | |________/   ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}  |____________  ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}  |____________  ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-suse b/ufetch-suse
index 44d4f65..ed2cc68 100755
--- a/ufetch-suse
+++ b/ufetch-suse
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(rpm -qa --last | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}       / .\\ \\  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}       \\__/ |  ${lc}UPTIME:    ${ic}${uptime}${reset}  
 ${c0}     _______|  ${lc}PACKAGES:  ${ic}${packages}${reset} 
 ${c0}     \\_______  ${lc}SHELL:     ${ic}${shell}${reset}  
-${c0}  __________/  ${lc}${envtype}        ${ic}${WM}${reset} 
+${c0}  __________/  ${lc}${uitype}:        ${ic}${ui}${reset} 
 
 EOF
diff --git a/ufetch-ubuntu b/ufetch-ubuntu
index a592b1b..a1e2d5b 100755
--- a/ufetch-ubuntu
+++ b/ufetch-ubuntu
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}   _/  ---  \\  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  (_) |   |    ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}    \\  --- _/  ${lc}PACKAGES:  ${ic}${packages}${reset} 
 ${c0}       ---(_)  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}               ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}               ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-void b/ufetch-void
index 10e2321..88054b8 100755
--- a/ufetch-void
+++ b/ufetch-void
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(xbps-query -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -60,6 +70,6 @@ ${c1}   /\   ${c0}___ \`- \   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  | |  ${c0}/   \  | |  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}  | |  ${c0}\___/  | |  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}   \ \`-_____  ${c0}\/   ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}    \`-______\      ${lc}${envtype}        ${ic}${WM}${reset}
+${c1}    \`-______\      ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
diff --git a/ufetch-voyager b/ufetch-voyager
index f3bf21f..f2d435a 100755
--- a/ufetch-voyager
+++ b/ufetch-voyager
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +69,6 @@ ${c0}  |     | |    |  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  |     | |____|  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}  |     | _____   ${lc}PACKAGES:  ${ic}${packages}${reset} 
 ${c0}  |     ||     |  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}  |_____||_____|  ${lc}${envtype}        ${ic}${WM}${reset}
+${c0}  |_____||_____|  ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF