diff --git a/diagnose b/diagnose
index 4d32ae656..f44bb3c27 100755
--- a/diagnose
+++ b/diagnose
@@ -7,9 +7,9 @@ cd "$(dirname "$0")";export base="$(pwd)"
 logfile=diagnose.log;rm $logfile
 export LANG=C;export LC_ALL=C
 
-function d() { ii_diagnose "$@" 2>&1 | tee -a $logfile ; }
-function e() { ii_box "$@" | tee -a $logfile ; }
-function ii_box() {
+x() { ii_exec "$@" 2>&1 | tee -a $logfile ; }
+e() { ii_box "$@" | tee -a $logfile ; }
+ii_box() {
   length=$(echo "$1" | wc -L);total_width=$((length + 2))
   #line=$(printf "═%.0s" $(seq 1 $total_width))
   #border_up="╔${line}╗";border_down="╚${line}╝"
@@ -21,31 +21,45 @@ function ii_box() {
   echo "$border_vertical $1 $border_vertical"
   echo "$border_down"
 }
-function ii_diagnose() {
+ii_exec() {
   printf "\n[===diagnose===] $*\n"
   "$@"
   err=$?;if [ ! $err -eq 0 ];then echo "[---EXIT $err---]";else echo "[---SUCCESS---]";fi
 }
+ii_check_distro() {
+  lsb_release -a || cat /etc/os-release || cat /etc/lsb-release
+}
+
+e "Checking git repo info"
+x git remote get-url origin
+x git rev-parse HEAD
 
 e "Checking distro"
-d cat /etc/*-release
-d lsb_release -a
+x ii_check_distro 
 
 e "Checking variables"
-d declare -p ILLOGICAL_IMPULSE_VIRTUAL_ENV
-d declare -p XDG_BIN_HOME
-d declare -p XDG_CACHE_HOME
-d declare -p XDG_CONFIG_HOME
-d declare -p XDG_DATA_HOME
-d declare -p XDG_STATE_HOME
+x declare -p XDG_BIN_HOME # ~/.local/bin
+x declare -p XDG_CACHE_HOME # ~/.cache
+x declare -p XDG_CONFIG_HOME # ~/.config
+x declare -p XDG_DATA_HOME # ~/.local/share
+x declare -p XDG_STATE_HOME # ~/.local/state
+x declare -p ILLOGICAL_IMPULSE_VIRTUAL_ENV # $XDG_STATE_HOME/ags/.venv
 
-e "Checking directories"
-d ls -l $ILLOGICAL_IMPULSE_VIRTUAL_ENV/bin
-d ls -l ~/.local/share/glib-2.0
-d ls -l ~/.local/share/gradience
+e "Checking directories/files"
+x ls -l $ILLOGICAL_IMPULSE_VIRTUAL_ENV/bin/gradience-cli
+x ls $XDG_DATA_HOME/glib-2.0/schemas
+x ls $XDG_DATA_HOME/gradience
+x cat ~/.config/ags/
 
 e "Checking command existence"
-d command -v pacman
+commands=(pacman zypper apt dnf yum Hyprland)
+for i in "${commands[@]}";do x command -v $i;done
+
+e "Checking versions"
+x Hyprland --version
+x ags --version
 
 #e "Checking Color Generators"
-#d ~/.config/ags/scripts/color_generation/applycolor.sh
+#x ~/.config/ags/scripts/color_generation/applycolor.sh
+
+e "Finished. Output saved as \"dianose.log\"."