diff --git a/neofetch b/neofetch
index d49f62c1..c48ac298 100755
--- a/neofetch
+++ b/neofetch
@@ -28,13 +28,12 @@ get_os() {
     # $kernel_name is set in a function called cache_uname and is
     # just the output of 'uname -s'.
     case "$kernel_name" in
-        "Linux")   os="Linux" ;;
+        "Linux" | "GNU"*)   os="Linux" ;;
         "Darwin")  os="$(sw_vers -productName)" ;;
         *"BSD" | "DragonFly" | "Bitrig") os="BSD" ;;
         "CYGWIN"*) os="Windows" ;;
         "SunOS") os="Solaris" ;;
         "Haiku") os="Haiku" ;;
-        "GNU"*) os="GNU" ;;
         *) printf "%s\n" "Unknown OS detected: $kernel_name"; exit 1 ;;
     esac
 }
@@ -43,7 +42,7 @@ get_distro() {
     [[ "$distro" ]] && return
 
     case "$os" in
-        "Linux" | "GNU")
+        "Linux")
             if [[ "$(< /proc/version)" == *"Microsoft"* || "$(< /proc/sys/kernel/osrelease)" == *"Microsoft"* ]]; then
                 case "$distro_shorthand" in
                     "on")   distro="$(lsb_release -sir) [Windows 10]" ;;
@@ -307,7 +306,7 @@ get_uptime() {
         *)
             # Get uptime in seconds
             case "$os" in
-                "Linux" | "Windows" | "GNU")
+                "Linux" | "Windows")
                     seconds="$(< /proc/uptime)"
                     seconds="${seconds/.*}"
                 ;;
@@ -382,7 +381,7 @@ get_packages() {
     local PATH="${PATH#:}"
 
     case "$os" in
-        "Linux" | "iPhone OS" | "Solaris" | "GNU")
+        "Linux" | "iPhone OS" | "Solaris")
             type -p pacman >/dev/null && \
                 packages="$(pacman -Qq --color never | wc -l)"
 
@@ -957,7 +956,7 @@ get_cpu_usage() {
 
 get_gpu() {
     case "$os" in
-        "Linux" | "GNU")
+        "Linux")
             gpu="$(PATH="/sbin:$PATH" lspci -mm | awk -F '\\"|\\" \\"' '/"Display|"3D|"VGA/ {print $3 " " $4}')"
 
             case "$gpu" in
@@ -1067,7 +1066,7 @@ get_gpu() {
 
 get_memory() {
     case "$os" in
-        "Linux" | "Windows" | "GNU")
+        "Linux" | "Windows")
             # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable
             # Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716
             while IFS=":" read -r a b; do
@@ -1220,7 +1219,7 @@ get_song() {
 
 get_resolution() {
     case "$os" in
-        "Linux" | "BSD" | "Solaris" | "GNU")
+        "Linux" | "BSD" | "Solaris")
             if type -p xrandr >/dev/null; then
                 case "$refresh_rate" in
                     "on") resolution="$(xrandr --nograb --current | awk 'match($0,/[0-9]*\.[0-9]*\*/) {printf $1 " @ " substr($0,RSTART,RLENGTH) "Hz, "}')" ;;
@@ -1686,7 +1685,7 @@ get_users() {
 
 get_install_date() {
     case "$os" in
-        "Linux" | "GNU" | "iPhone OS")
+        "Linux" | "iPhone OS")
             install_date="$(ls -alct --full-time / | awk '/lost\+found|private/ {printf  $6 " " $7}')"
         ;;
 
@@ -1931,7 +1930,7 @@ get_w3m_img_path() {
 
 get_wallpaper() {
     case "$os" in
-        "Linux" | "BSD" | "Solaris" | "GNU")
+        "Linux" | "BSD" | "Solaris")
             # Get DE if user has disabled the function.
             (( "$de_run" != 1 )) && get_de
 
@@ -2547,23 +2546,23 @@ get_distro_colors() {
         ;;
 
         *)
-            case "$os" in
+            case "$kernel_name" in
                 "Linux")
                     ascii_distro="linux"
                     set_colors fg 8 3
                 ;;
 
-                "BSD")
+                *"BSD")
                     ascii_distro="bsd"
                     set_colors 1 7 4 3 6
                 ;;
 
-                "GNU")
+                "GNU"*)
                     ascii_distro="gnu"
                     set_colors fg
                 ;;
 
-                "Solaris")
+                "SunOS")
                     ascii_distro="solaris"
                     set_colors 3
                 ;;