diff --git a/.local/bin/package-lister b/.local/bin/package-lister
index 885fc964..fc5e38fd 100755
--- a/.local/bin/package-lister
+++ b/.local/bin/package-lister
@@ -31,6 +31,20 @@ EOF
 	guix --version >"$PKG_ROOT/guix-version"
 fi
 
-echo >&2 "* Uncommitted files:"
-git -C "$PKG_ROOT" diff --name-only .
-git -C "$PKG_ROOT" diff --cached --name-only .
+YELLOW='\033[0;33m\033[1m'
+BOLD='\033[0m\033[1m'
+NORMAL='\033[0m'
+message() {
+	echo -e "$YELLOW:: $@$NORMAL"
+}
+status() {
+	local title=$1
+	local body=$2
+
+	[ -z "$body" ] && return
+	message "$title"
+	echo "$body"
+}
+
+status "Unpushed files" "$(git -C "$PKG_ROOT" diff --cached --name-only .)"
+status "Unstaged files" "$(git -C "$PKG_ROOT" diff --name-only .)"