diff --git a/.local/bin/fetch b/.local/bin/fetch
index d45ccc5..254c08b 100755
--- a/.local/bin/fetch
+++ b/.local/bin/fetch
@@ -18,8 +18,8 @@ os='Arch Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename "$SHELL")"
-wm="$(tail -n 1 "$XDG_CONFIG_HOME/X11/xinitrc" | cut -d ' ' -f 2)"
+shell="$($SHELL --version | sed -e 's/(.*)//')"
+wm="$(tail -n 1 "$XDG_CONFIG_HOME/X11/xinitrc" | rev | cut -d ' ' -f 1 | rev)"
 
 # parse the '/proc/meminfo' file splitting on ':' and 'k'.
 # the format of the file is 'key:   000kB' and an additional