From 84b3cf860d4935d6b1b785d7ee243c76ef7a8824 Mon Sep 17 00:00:00 2001
From: jschx <git.grz8p@simplelogin.com>
Date: Sat, 24 Mar 2018 14:01:24 -0500
Subject: [PATCH] More consistency fixes

---
 ufetch-alpine  | 49 +++++++++++++++++++++++------------------------
 ufetch-arch    | 49 +++++++++++++++++++++++------------------------
 ufetch-crux    | 47 +++++++++++++++++++++++----------------------
 ufetch-debian  | 47 ++++++++++++++++++++++-----------------------
 ufetch-fedora  | 50 +++++++++++++++++++++++-------------------------
 ufetch-freebsd | 46 +++++++++++++++++++++-----------------------
 ufetch-gentoo  | 50 +++++++++++++++++++++++-------------------------
 ufetch-macos   | 52 ++++++++++++++++++++++++--------------------------
 ufetch-manjaro | 50 +++++++++++++++++++++++-------------------------
 ufetch-nixos   | 45 +++++++++++++++++++++----------------------
 ufetch-openbsd | 47 ++++++++++++++++++++++-----------------------
 ufetch-void    | 49 +++++++++++++++++++++++------------------------
 12 files changed, 283 insertions(+), 298 deletions(-)

diff --git a/ufetch-alpine b/ufetch-alpine
index 140a575..334192a 100755
--- a/ufetch-alpine
+++ b/ufetch-alpine
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# ufetch-alpine - tiny system info for alpine linux
-#
+# ufetch-alpine - tiny system info for alpine
 
 ## INFO
 
 # user is already defined
-hostname="$(hostname)"
+host="$(hostname)"
 os='Alpine Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
@@ -19,34 +18,34 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c4}"	# labels
-nc="${rc}${bc}${c4}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-fc="${rc}${c4}"			# first color
-sc="${rc}${c7}"			# second color
+lc="${reset}${bold}${blue}"		# labels
+nc="${reset}${bold}${blue}"		# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${blue}"			# first color
+c1="${reset}${white}"			# second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}     /\ /\       ${nc}${USER}${ic}@${nc}${hostname}${rc}
-${fc}    /${sc}/${fc} \  \      ${lc}OS:        ${ic}${os}${rc}
-${fc}   /${sc}/${fc}   \  \     ${lc}KERNEL:    ${ic}${kernel}${rc}
-${fc}  /${sc}//${fc}    \  \    ${lc}UPTIME:    ${ic}${uptime}${rc}
-${fc}  ${sc}//${fc}      \  \   ${lc}PACKAGES:  ${ic}${packages}${rc}
-${fc}           \  \  ${lc}SHELL:     ${ic}${shell}${rc}
-${fc}            \    ${lc}WM:        ${ic}${WM}${rc}
+${c0}     /\ /\       ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}    /${c1}/ ${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}           \  \  ${lc}SHELL:     ${ic}${shell}${reset}
+${c0}            \    ${lc}WM:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-arch b/ufetch-arch
index 3c54664..fba3c97 100755
--- a/ufetch-arch
+++ b/ufetch-arch
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# ufetch-arch - tiny system info for arch linux
-#
+# ufetch-arch - tiny system info for arch
 
 ## INFO
 
 # user is already defined
-hostname="$(hostname)"
+host="$(hostname)"
 os='Arch Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
@@ -19,34 +18,34 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c6}"	# labels
-nc="${rc}${bc}${c6}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-fc="${rc}${bc}${c6}"	# first color
-sc="${rc}${c6}"			# second color
+lc="${reset}${bold}${cyan}"		# labels
+nc="${reset}${bold}${cyan}"		# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${bold}${cyan}"		# first color
+c1="${reset}${cyan}"			# second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}        /\        ${nc}${USER}${ic}@${nc}${hostname}${rc}
-${fc}       /^^\       ${lc}OS:        ${ic}${os}${rc}
-${fc}      /\   \      ${lc}KERNEL:    ${ic}${kernel}${rc}
-${fc}     /  ${sc}__  \     ${lc}UPTIME:    ${ic}${uptime}${rc}
-${sc}    /  (  )  \    ${lc}PACKAGES:  ${ic}${packages}${rc}
-${sc}   / __|  |__\\\\   ${lc}SHELL:     ${ic}${shell}${rc}
-${sc}  ///        \\\\\  ${lc}WM:        ${ic}${WM}${rc}
+${c0}        /\        ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}       /^^\       ${lc}OS:        ${ic}${os}${reset}
+${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}
 
 EOF
diff --git a/ufetch-crux b/ufetch-crux
index 194b6c9..4ec60ca 100755
--- a/ufetch-crux
+++ b/ufetch-crux
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
 # ufetch-crux - tiny system info for crux
-#
 
 ## INFO
 
 # user is already defined
-hostname="$(hostname)"
+host="$(hostname)"
 os="$(crux)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
@@ -19,33 +18,35 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c6}"	# labels
-nc="${rc}${bc}${c6}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-pc="${rc}${c6}"			# penguin
+lc="${reset}${bold}${cyan}"		# labels
+nc="${reset}${bold}${cyan}"		# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${cyan}"			# first color
+c1="${reset}${white}"			# second color
+c2="${reset}${yellow}"			# third color
 
 ## OUTPUT
 
 cat <<EOF
 
-${pc}      ___     ${nc}${USER}${ic}@${nc}${hostname}${rc}
-${pc}     (${c7}.· ${pc}|    ${lc}OS:        ${ic}${os}${rc}
-${pc}     (${c3}<> ${pc}|    ${lc}KERNEL:    ${ic}${kernel}${rc}
-${pc}    / ${c7}__  ${pc}\\   ${lc}UPTIME:    ${ic}${uptime}${rc}
-${pc}   ( ${c7}/  \\ ${pc}/|  ${lc}PACKAGES:  ${ic}${packages}${rc}
-${c3}  _${pc}/\\ ${c7}__)${pc}/${c3}_${pc})  ${lc}SHELL:     ${ic}${shell}${rc}
-${c3}  \/${pc}-____${c3}\/   ${lc}WM:        ${ic}${WM}${rc}
+${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}PACKAGES:  ${ic}${packages}${reset}
+${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}SHELL:     ${ic}${shell}${reset}
+${c2}  \/${c0}-____${c2}\/   ${lc}WM:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-debian b/ufetch-debian
index 1e8d541..fc414d3 100755
--- a/ufetch-debian
+++ b/ufetch-debian
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
 # ufetch-debian - tiny system info for debian
-#
 
 ## INFO
 
 # user is already defined
-hostname="$(hostname)"
+host="$(hostname)"
 os='Debian'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
@@ -19,34 +18,34 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c1}"	# labels
-nc="${rc}${bc}${c1}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-fc="${rc}${bc}${c1}"	# first color
-sc="${rc}${c1}"			# second color
+lc="${reset}${bold}${red}"		# labels
+nc="${reset}${bold}${red}"		# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${bold}${red}"		# first color
+c1="${reset}${red}"				# second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}    _____    ${lc}${USER}${ic}@${lc}${hostname}${rc}
-${fc}   /  __ \\   ${lc}OS:        ${ic}${os}${rc}
-${fc}  |  /    |  ${lc}KERNEL:    ${ic}${kernel}${rc}
-${fc}  |  ${sc}\\___-   ${lc}UPTIME:    ${ic}${uptime}${rc}
-${sc}  -_         ${lc}PACKAGES:  ${ic}${packages}${rc}
-${sc}    --_      ${lc}SHELL:     ${ic}${shell}${rc}
-${fc}             ${lc}WM:        ${ic}${WM}${rc}
+${c0}    _____    ${lc}${USER}${ic}@${lc}${host}${reset}
+${c0}   /  __ \\   ${lc}OS:        ${ic}${os}${reset}
+${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}
 
 EOF
diff --git a/ufetch-fedora b/ufetch-fedora
index ba9e304..88e23a2 100755
--- a/ufetch-fedora
+++ b/ufetch-fedora
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# ufetch-fedora - tiny system info for Fedora linux
-#
+# ufetch-fedora - tiny system info for fedora
 
 ## INFO
 
 # user is already defined
-hostname="$(hostname)"
+host="$(hostname)"
 os="$(cat /etc/fedora-release)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
@@ -19,34 +18,33 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c4}"	# labels
-nc="${rc}${bc}${c4}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-fc="${rc}${c4}"			# first color
-sc="${rc}${c7}"			# second color
+lc="${reset}${bold}${blue}"		# labels
+nc="${reset}${bold}${blue}"		# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${white}"			# first color
 
 ## OUTPUT
 
 cat <<EOF
-
-${fc}  :::${sc}/fFF${fc}:::   ${nc}${USER}${ic}@${nc}${hostname}${rc}
-${fc} ::::${sc}fFF${fc}:::::  ${lc}OS:        ${ic}${os}${rc}
-${fc} ::${sc}fffFFfff${fc}::  ${lc}KERNEL:    ${ic}${kernel}${rc}
-${fc} ::${sc}fffFFfff${fc}::  ${lc}UPTIME:    ${ic}${uptime}${rc}
-${fc} ::::${sc}fFF${fc}::::   ${lc}PACKAGES:  ${ic}${packages}${rc}
-${fc} ::::${sc}fFF${fc}:::    ${lc}SHELL:     ${ic}${shell}${rc}
-${fc} :::${sc}FFf/${fc}::     ${lc}WM:        ${ic}${WM}${rc}
+${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}PACKAGES:  ${ic}${packages}${reset}
+${c0}   __/  |      ${lc}SHELL:     ${ic}${shell}${reset}
+${c0}  /____/       ${lc}WM:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-freebsd b/ufetch-freebsd
index ddea719..69887e8 100755
--- a/ufetch-freebsd
+++ b/ufetch-freebsd
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # ufetch-freebsd - tiny system info for freebsd
-#
 
 ## INFO
 
@@ -19,35 +18,34 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput md)"		# bold
-c0="$(tput AF 0)"	# black
-c1="$(tput AF 1)"	# red
-c2="$(tput AF 2)"	# green
-c3="$(tput AF 3)"	# yellow
-c4="$(tput AF 4)"	# blue
-c5="$(tput AF 5)"	# magenta
-c6="$(tput AF 6)"	# cyan
-c7="$(tput AF 7)"	# white
-rc="$(tput me)"		# reset
+bold="$(tput md)"
+black="$(tput AF 0)"
+red="$(tput AF 1)"
+green="$(tput AF 2)"
+yellow="$(tput AF 3)"
+blue="$(tput AF 4)"
+magenta="$(tput AF 5)"
+cyan="$(tput AF 6)"
+white="$(tput AF 7)"
+reset="$(tput me)"
 
 # you can change these
-lc="${rc}${bc}${c1}"	# labels
-nc="${rc}${bc}${c1}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-fc="${rc}${c1}"			# first color
-sc="${rc}${bc}${c1}"	# second color
-
+lc="${reset}${bold}${red}"		# labels
+nc="${reset}${bold}${red}"		# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${red}"				# first color
+c1="${reset}${bold}${red}"		# second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}   ${sc}/\\ ${fc}_____ ${sc}/\   ${nc}${USER}${ic}@${nc}${host}${rc}
-${fc}   ${sc}\_)     (_/   ${lc}OS:        ${ic}${os}${rc}
-${fc}   /         \   ${lc}KERNEL:    ${ic}${kernel}${rc}
-${fc}  |           |  ${lc}UPTIME:    ${ic}${uptime}${rc}
-${fc}  |           |  ${lc}PACKAGES:  ${ic}${packages}${rc}
-${fc}   \         /   ${lc}SHELL:     ${ic}${shell}${rc}
-${fc}    --_____--    ${lc}WM:        ${ic}${WM}${rc}
+${c0}   ${c1}/\\ ${c0}_____ ${c1}/\   ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}   ${c1}\_)     (_/   ${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}
 
 EOF
diff --git a/ufetch-gentoo b/ufetch-gentoo
index c76fc14..ffcaa80 100755
--- a/ufetch-gentoo
+++ b/ufetch-gentoo
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# ufetch-gentoo - tiny system info for gentoo linux
-#
+# ufetch-gentoo - tiny system info for gentoo
 
 ## INFO
 
@@ -15,41 +14,40 @@ shell="$(basename ${SHELL})"
 if [ -z "${WM}" ]; then
 	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 fi
-cpu="$(uname -p)"
 
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c5}"	# labels
-nc="${rc}${bc}${c5}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-fc="${rc}${bc}${c5}"	# first color
-sc="${rc}${c5}"			# second color
+lc="${reset}${bold}${magenta}"	# labels
+nc="${reset}${bold}${magenta}"	# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${bold}${magenta}"	# first color
+c1="${reset}${magenta}"			# second color
 
 ## OUTPUT
 # art from gentoo prefix project's bootstrap-prefix.sh
 
 cat <<EOF
 
-${fc}     .vir.       ${nc}${USER}${ic}@${nc}${host}${rc}
-${fc}   .d\$\$\$\$${sc}\$\$b.    ${lc}OS:        ${ic}${os}${rc}
-${fc}   \$\$\$\$${sc}( )${pc}\$${sc}\$\$b   ${lc}KERNEL:    ${ic}${kernel}${rc}
-${fc}   Q\$\$\$\$\$\$\$\$${sc}\$\$B  ${lc}UPTIME:    ${ic}${uptime}${rc}
-${fc}     "\$\$\$\$\$${sc}\$\$P   ${lc}PACKAGES:  ${ic}${packages}${rc}
-${fc}    d\$\$\$\$${sc}\$\$P"    ${lc}SHELL:     ${ic}${shell}${rc}
-${fc}  \$\$\$\$\$${sc}\$\$P       ${lc}WM:        ${ic}${WM}${rc}
-${fc}  \`Q\$\$${sc}P"         ${lc}CPU:       ${ic}${cpu}${rc}
+${c0}     .vir.       ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}   .d\$\$\$\$${c1}\$\$b.    ${lc}OS:        ${ic}${os}${reset}
+${c0}   \$\$\$\$${c1}( )${c0}\$${c1}\$\$b   ${lc}KERNEL:    ${ic}${kernel}${reset}
+${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}  \`Q\$\$${c1}P"${reset}
 
 EOF
diff --git a/ufetch-macos b/ufetch-macos
index ab6ae1f..49a0338 100755
--- a/ufetch-macos
+++ b/ufetch-macos
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # ufetch-macos - tiny system info for macos
-#
 
 ## INFO
 
@@ -30,38 +29,37 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c4}"	# labels
-nc="${rc}${bc}${c4}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-pc="${rc}${c2}"			# primary color
-sc="${rc}${c3}"			# secondary color
-tc="${rc}${c1}"		# tertiary color
-qc="${rc}${c5}"		# quaternary color
-uc="${rc}${c6}"		# quinary color
-
+lc="${reset}${bold}${blue}"		# labels
+nc="${reset}${bold}${blue}"		# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${green}"			# first color
+c1="${reset}${yellow}"			# second color
+c2="${reset}${red}"				# third color
+c3="${reset}${magenta}"			# fourth color
+c4="${reset}${cyan}"			# fifth color
 
 ## OUTPUT
 
 cat <<EOF
 
-${pc}        .:'    ${nc}${USER}${ic}@${nc}${host}${rc}
-${pc}     _ :'_     ${lc}OS:        ${ic}${os}${rc}
-${sc}  .'\`_\`-'_\`\`.  ${lc}KERNEL:    ${ic}${kernel}${rc}
-${tc} :________.-'  ${lc}UPTIME:    ${ic}${uptime}${rc}
-${tc} :_______:     ${lc}PACKAGES:  ${ic}${packages}${rc}
-${qc}  :_______\`-;  ${lc}SHELL:     ${ic}${shell}${rc}
-${uc}   \`._.-._.'   ${lc}WM:        ${ic}${WM}${rc}
+${c0}         .:'    ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}      _ :'_     ${lc}OS:        ${ic}${os}${reset}
+${c1}   .'\`_\`-'_\`\`.  ${lc}KERNEL:    ${ic}${kernel}${reset}
+${c2}  :________.-'  ${lc}UPTIME:    ${ic}${uptime}${reset}
+${c2}  :_______:     ${lc}PACKAGES:  ${ic}${packages}${reset}
+${c3}   :_______\`-;  ${lc}SHELL:     ${ic}${shell}${reset}
+${c4}    \`._.-._.'   ${lc}WM:        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-manjaro b/ufetch-manjaro
index 2557860..68a07aa 100755
--- a/ufetch-manjaro
+++ b/ufetch-manjaro
@@ -1,13 +1,12 @@
 #!/bin/sh
 #
-# ufetch-manjaro - tiny system info for manjaro linux
-#
+# ufetch-manjaro - tiny system info for manjaro
 
 ## INFO
 
 # user is already defined
-hostname="$(hostname)"
-os='Manjaro Linux'
+host="$(hostname)"
+os='Manjaro'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
@@ -19,34 +18,33 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c6}"	# labels
-nc="${rc}${bc}${c6}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-fc="${rc}${bc}${c6}"	# first color
-sc="${rc}${c6}"			# second color
+lc="${reset}${bold}${green}"	# labels
+nc="${reset}${bold}${green}"	# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${green}"			# first color
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}  █████████ ████  ${nc}${USER}${ic}@${nc}${hostname}${rc}
-${fc}  █████████ ████  ${lc}OS:        ${ic}${os}${rc}
-${fc}  ████      ████  ${lc}KERNEL:    ${ic}${kernel}${rc}
-${fc}  ████ ████ ████  ${lc}UPTIME:    ${ic}${uptime}${rc}
-${fc}  ████ ████ ████  ${lc}PACKAGES:  ${ic}${packages}${rc}
-${fc}  ████ ████ ████  ${lc}SHELL:     ${ic}${shell}${rc}
-${fc}  ████ ████ ████  ${lc}WM:        ${ic}${WM}${rc}
+${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}
 
 EOF
diff --git a/ufetch-nixos b/ufetch-nixos
index b354a93..5d370d3 100755
--- a/ufetch-nixos
+++ b/ufetch-nixos
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # ufetch-nixos - tiny system info for nixos
-#
 
 ## INFO
 
@@ -19,34 +18,34 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c4}"	# labels
-nc="${rc}${bc}${c4}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-fc="${rc}${c4}"			# first color
-sc="${rc}${bc}${c4}"	# second color
+lc="${reset}${bold}${blue}"		# labels
+nc="${reset}${bold}${blue}"		# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${blue}"			# first color
+c1="${reset}${bold}${blue}"		# second color
 
 ## OUTPUT
 
 sed 's/\\/\\\\/g' <<EOF
 
-${fc}    \\  ${sc}\\ //    ${nc}${USER}${ic}@${rc}${nc}${host}${rc}
-${fc}   ==\\__${sc}\\/ ${fc}//  ${lc}OS:        ${ic}${os}${rc}
-${sc}     //   \\${fc}//   ${lc}KERNEL:    ${ic}${kernel}${rc}
-${sc}  ==//     ${fc}//==  ${lc}UPTIME:    ${ic}${uptime}${rc}
-${sc}   //${fc}\\${sc}___${fc}//     ${lc}PACKAGES:  ${ic}${packages}${rc}
-${sc}  // ${fc}/\\  ${sc}\\==   ${lc}SHELL:     ${ic}${shell}${rc}
-${fc}    // \\  ${sc}\\    ${lc}WM:        ${ic}${WM}${rc}
+${c0}    \\  ${c1}\\ //    ${nc}${USER}${ic}@${rc}${nc}${host}${reset}
+${c0}   ==\\__${c1}\\/ ${c0}//  ${lc}OS:        ${ic}${os}${reset}
+${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}
 
 EOF
diff --git a/ufetch-openbsd b/ufetch-openbsd
index aebbc53..c8b5ec9 100755
--- a/ufetch-openbsd
+++ b/ufetch-openbsd
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # ufetch-openbsd - tiny system info for openbsd
-#
 
 ## INFO
 
@@ -19,36 +18,36 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c3}"	# labels
-nc="${rc}${bc}${c3}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-fc="${rc}${c3}"			# first color
-sc="${rc}${c7}"			# second color
-tc="${rc}${bc}${c3}"	# third color
+lc="${reset}${bold}${yellow}"	# labels
+nc="${reset}${bold}${yellow}"	# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${yellow}"			# first color
+c1="${reset}${white}"			# second color
+c2="${reset}${bold}${yellow}"	# third color
 
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}       _____      ${nc}${USER}${ic}@${nc}${host}${rc}
-${fc}     \-     -/    ${lc}OS:        ${ic}${os}${rc}
-${fc}  \_/         \   ${lc}KERNEL:    ${ic}${kernel}${rc}
-${fc}  |        ${sc}O O${fc} |  ${lc}UPTIME:    ${ic}${uptime}${rc}
-${fc}  |_  ${tc}<   ${fc})  ${tc}3 ${fc})  ${lc}PACKAGES:  ${ic}${packages}${rc}
-${fc}  / \         /   ${lc}SHELL:     ${ic}${shell}${rc}
-${fc}     /-_____-\    ${lc}WM:        ${ic}${WM}${rc}
+${c0}       _____      ${nc}${USER}${ic}@${nc}${host}${rc}
+${c0}     \-     -/    ${lc}OS:        ${ic}${os}${rc}
+${c0}  \_/         \   ${lc}KERNEL:    ${ic}${kernel}${rc}
+${c0}  |        ${c1}O O ${c0}|  ${lc}UPTIME:    ${ic}${uptime}${rc}
+${c0}  |_  ${c2}<   ${c0})  ${c2}3 ${c0})  ${lc}PACKAGES:  ${ic}${packages}${rc}
+${c0}  / \         /   ${lc}SHELL:     ${ic}${shell}${rc}
+${c0}     /-_____-\    ${lc}WM:        ${ic}${WM}${rc}
 
 EOF
diff --git a/ufetch-void b/ufetch-void
index 3da0ee5..628eb22 100755
--- a/ufetch-void
+++ b/ufetch-void
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# ufetch-void - tiny system info for void linux
-#
+# ufetch-void - tiny system info for void
 
 ## INFO
 
 # user is already defined
-hostname="$(hostname)"
+host="$(hostname)"
 os='Void Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
@@ -19,34 +18,34 @@ fi
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"		# bold
-c0="$(tput setaf 0)"	# black
-c1="$(tput setaf 1)"	# red
-c2="$(tput setaf 2)"	# green
-c3="$(tput setaf 3)"	# yellow
-c4="$(tput setaf 4)"	# blue
-c5="$(tput setaf 5)"	# magenta
-c6="$(tput setaf 6)"	# cyan
-c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"		# reset
+bold="$(tput bold)"
+black="$(tput setaf 0)"
+red="$(tput setaf 1)"
+green="$(tput setaf 2)"
+yellow="$(tput setaf 3)"
+blue="$(tput setaf 4)"
+magenta="$(tput setaf 5)"
+cyan="$(tput setaf 6)"
+white="$(tput setaf 7)"
+reset="$(tput sgr0)"
 
 # you can change these
-lc="${rc}${bc}${c2}"	# labels
-nc="${rc}${bc}${c2}"	# user and hostname
-ic="${rc}${bc}${c7}"	# info
-fc="${rc}${bc}${c2}"	# first color
-sc="${rc}${c2}"			# second color
+lc="${reset}${bold}${green}"	# labels
+nc="${reset}${bold}${green}"	# user and hostname
+ic="${reset}${bold}${white}"	# info
+c0="${reset}${bold}${green}"	# first color
+c1="${reset}${green}"			# second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}      _______    ${nc}${USER}${ic}@${nc}${hostname}${rc}
-${sc}   _ ${fc}\______ \   ${lc}OS:        ${ic}${os}${rc}
-${sc}  | \  ${fc}___  \ |  ${lc}KERNEL:    ${ic}${kernel}${rc}
-${sc}  | | ${fc}/   \ | |  ${lc}UPTIME:    ${ic}${uptime}${rc}
-${sc}  | | ${fc}\___/ | |  ${lc}PACKAGES:  ${ic}${packages}${rc}
-${sc}  | \______ ${fc}\_|  ${lc}SHELL:     ${ic}${shell}${rc}
-${sc}   \_______\     ${lc}WM:        ${ic}${WM}${rc}
+${c0}      _______    ${nc}${USER}${ic}@${nc}${host}${reset}
+${c1}   _ ${c0}\______ \   ${lc}OS:        ${ic}${os}${reset}
+${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}
 
 EOF