diff --git a/ufetch-alpine b/ufetch-alpine
index 334192a..20e13dc 100755
--- a/ufetch-alpine
+++ b/ufetch-alpine
@@ -11,8 +11,20 @@ kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(apk info | wc -l)"
 shell="$(basename ${SHELL})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -46,6 +58,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}           \  \  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}            \    ${lc}WM:        ${ic}${WM}${reset}
+${c0}            \    ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-arch b/ufetch-arch
index fba3c97..609850c 100755
--- a/ufetch-arch
+++ b/ufetch-arch
@@ -11,8 +11,20 @@ kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
 shell="$(basename ${SHELL})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -46,6 +58,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}
-${c1}  ///        \\\\\  ${lc}WM:        ${ic}${WM}${reset}
+${c1}  ///        \\\\\  ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-crux b/ufetch-crux
index 4ec60ca..36356b1 100755
--- a/ufetch-crux
+++ b/ufetch-crux
@@ -11,8 +11,20 @@ kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pkginfo -i | wc -l)"
 shell="$(basename ${SHELL})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -47,6 +59,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}WM:        ${ic}${WM}${reset}
+${c2}  \/${c0}-____${c2}\/   ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-debian b/ufetch-debian
index fc414d3..e5fa45b 100755
--- a/ufetch-debian
+++ b/ufetch-debian
@@ -11,8 +11,20 @@ kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename ${SHELL})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -46,6 +58,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}WM:        ${ic}${WM}${reset}
+${c0}             ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-fedora b/ufetch-fedora
index 88e23a2..d649570 100755
--- a/ufetch-fedora
+++ b/ufetch-fedora
@@ -11,8 +11,20 @@ kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(yum list installed | wc -l)"
 shell="$(basename ${SHELL})"
+
 if [ -z "${WM}" ]; then
-	WM="$(wmctrl -m | grep 'Name:' | sed 's/Name\: //')"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -45,6 +57,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}WM:        ${ic}${WM}${reset}
+${c0}  /____/       ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-freebsd b/ufetch-freebsd
index 9c9b486..2766f63 100755
--- a/ufetch-freebsd
+++ b/ufetch-freebsd
@@ -11,8 +11,20 @@ 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})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -46,6 +58,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}WM:        ${ic}${WM}${reset}
+${c1}    \`-_____-\`    ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-gentoo b/ufetch-gentoo
index ffcaa80..6abdd9e 100755
--- a/ufetch-gentoo
+++ b/ufetch-gentoo
@@ -11,8 +11,20 @@ kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(ls -d /var/db/pkg/*/* | wc -l)"
 shell="$(basename ${SHELL})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -47,7 +59,7 @@ ${c0}   \$\$\$\$${c1}( )${c0}\$${c1}\$\$b   ${lc}KERNEL:    ${ic}${kernel}${rese
 ${c0}   Q\$\$\$\$\$\$\$\$${c1}\$\$B  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}     "\$\$\$\$\$${c1}\$\$P   ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}    d\$\$\$\$${c1}\$\$P"    ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}  \$\$\$\$\$${c1}\$\$P       ${lc}WM:        ${ic}${WM}${reset}
+${c0}  \$\$\$\$\$${c1}\$\$P       ${lc}${envtype}:        ${ic}${WM}${reset}
 ${c0}  \`Q\$\$${c1}P"${reset}
 
 EOF
diff --git a/ufetch-linux b/ufetch-linux
index 9e4c24b..69b3487 100755
--- a/ufetch-linux
+++ b/ufetch-linux
@@ -10,8 +10,20 @@ os='Linux'	# I'd just like to interject for a moment...
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 shell="$(basename ${SHELL})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -45,7 +57,7 @@ ${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}WM:        ${ic}${WM}${reset}
+${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}${envtype}:        ${ic}${WM}${reset}
 ${c2}  \/${c0}-____${c2}\/${reset}
 
 EOF
diff --git a/ufetch-manjaro b/ufetch-manjaro
index 68a07aa..ad57f9f 100755
--- a/ufetch-manjaro
+++ b/ufetch-manjaro
@@ -11,8 +11,20 @@ kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
 shell="$(basename ${SHELL})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -45,6 +57,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}WM:        ${ic}${WM}${reset}
+${c0}  ████ ████ ████  ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-nixos b/ufetch-nixos
index 5d370d3..845d804 100755
--- a/ufetch-nixos
+++ b/ufetch-nixos
@@ -11,8 +11,20 @@ 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})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -46,6 +58,6 @@ ${c1}     //   \\${c0}//   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  ==//     ${c0}//==  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}   //${c0}\\${c1}___${fc}//     ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}  // ${c0}/\\  ${c1}\\==   ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}    // \\  ${c1}\\    ${lc}WM:        ${ic}${WM}${reset}
+${c0}    // \\  ${c1}\\    ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-openbsd b/ufetch-openbsd
index 066fa50..f46873e 100755
--- a/ufetch-openbsd
+++ b/ufetch-openbsd
@@ -11,8 +11,20 @@ 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})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -48,6 +60,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}WM:        ${ic}${WM}${reset}
+${c0}     /-_____-\    ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-raspbian b/ufetch-raspbian
index ad66da5..23f5c26 100755
--- a/ufetch-raspbian
+++ b/ufetch-raspbian
@@ -11,8 +11,20 @@ kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
 shell="$(basename ${SHELL})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -46,6 +58,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}WM:        ${ic}${WM}${reset}
+${c1}              ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-void b/ufetch-void
index 628eb22..408576e 100755
--- a/ufetch-void
+++ b/ufetch-void
@@ -11,8 +11,20 @@ kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(xbps-query -l | wc -l)"
 shell="$(basename ${SHELL})"
+
 if [ -z "${WM}" ]; then
-	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	if [ "${XDG_CURRENT_DESKTOP}" ]; then
+		envtype='DE'
+		WM="${XDG_CURRENT_DESKTOP}"
+	elif [ "${DESKTOP_SESSION}" ]; then
+		envtype='DE'
+		WM="${DESKTOP_SESSION}"
+	else
+		envtype='WM'
+		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+	fi
+else
+	envtype='WM'
 fi
 
 ## DEFINE COLORS
@@ -46,6 +58,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}WM:        ${ic}${WM}${reset}
+${c1}   \_______\     ${lc}${envtype}:        ${ic}${WM}${reset}
 
 EOF