diff --git a/neofetch b/neofetch
index ecea09e8..ac1a647b 100755
--- a/neofetch
+++ b/neofetch
@@ -456,21 +456,18 @@ x32="x86"
 case "$os" in
     "Linux" )
         if type -p lsb_release >/dev/null 2>&1; then
-            distro="$(lsb_release -d 2>/dev/null | awk -F':' '/Description/ {printf $2}')"
+            distro="$(lsb_release -d 2>/dev/null | awk -F ':' '/Description/ {printf $2}')"
             distro=${distro/[[:space:]]}
 
         elif type -p crux >/dev/null 2>&1; then
             distro="$(crux)"
 
         else
-            distro="$(grep -h '^NAME=' /etc/*ease)"
+            distro="$(awk -F 'NAME="|"' '/^NAME=/ {printf $2}' /etc/*ease)"
 
             # Workaround for distros that store the value differently.
-            [ -z "$distro" ] && distro="$(grep -h 'TAILS_PRODUCT_NAME' /etc/*ease)"
+            [ -z "$distro" ] && distro="$(awk -F 'TAILS_PRODUCT_NAME="|"' '/^TAILS_PRODUCT_NAME=/ {printf $2}' /etc/*ease)"
             [ -z "$distro" ] && distro="$(awk '/BLAG/ {print $1; exit}' /etc/*ease)"
-
-            distro=${distro/*NAME\=}
-            distro=${distro//\"}
         fi
     ;;