diff --git a/install.sh b/install.sh
index 80b40c0..cea993d 100644
--- a/install.sh
+++ b/install.sh
@@ -2,7 +2,7 @@
 #
 # Qtile - Debian install - Martin - ITmail.dk
 # nano qtile-install.sh && chmod +x qtile-install.sh && ./qtile-install.sh
-# bash -c "$(wget -O- http://git.local:3005/mara/made-install/main/install.sh)"
+# bash -c "$(wget -O- http://192.168.18.34:3005/mara/made-install/raw/branch/main/install.sh)"
 
 # Whiptail colors
 export NEWT_COLORS='
@@ -112,14 +112,15 @@ else
     echo "apt-transport-https is already installed."
 fi
 
-
-# Core System APT install
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Core System APT install ${NC}"
 sudo apt install -y xserver-xorg x11-utils xinit arandr autorandr picom mesa-utils htop feh wget curl git alsa-utils alsa-tools pulseaudio numlockx cups xsensors xbacklight brightnessctl unzip
 sudo apt install -y sddm --no-install-recommends
 
 sudo apt install -y nitrogen dunst notify-osd xarchiver mpv flameshot speedcrunch mc gvfs-backends mpd mpc ncmpcpp
 
-# Audio on system - https://alsa.opensrc.org - https://wiki.debian.org/ALSA
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Audio on system - https://alsa.opensrc.org - https://wiki.debian.org/ALSA ${NC}"
 # See hardware run: "pacmd list-sinks" or "lspci | grep -i audio" or... sudo dmesg  | grep 'snd\|firmware\|audio'
 # Test file run: "aplay /usr/share/sounds/alsa/Front_Center.wav"
 # sudo adduser $USER audio
@@ -127,7 +128,8 @@ sudo alsactl init
 
 systemctl --user enable pulseaudio
 
-# CPU Microcode install start
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} CPU Microcode install start ${NC}"
 export LC_ALL=C # All subsequent command output will be in English
 CPUVENDOR=$(lscpu | grep "Vendor ID:" | awk '{print $3}')
 
@@ -136,7 +138,7 @@ if [ "$CPUVENDOR" == "GenuineIntel" ]; then
     sudo apt install -y intel-microcode
     fi
 else
-    echo -e "${GREEN} Intel Microcode OK${NC}"
+    echo -e "${GREEN} Intel Microcode OK ${NC}"
 fi
 
 if [ "$CPUVENDOR" == "AuthenticAMD" ]; then
@@ -144,20 +146,22 @@ if [ "$CPUVENDOR" == "AuthenticAMD" ]; then
     sudo apt install -y amd64-microcode
     fi
 else
-    echo -e "${GREEN} Amd64 Microcode OK${NC}"
+    echo -e "${GREEN} Amd64 Microcode OK ${NC}"
 fi
 unset LC_ALL # unset the LC_ALL=C 
-# CPU Microcode install end
+echo -e "${YELLOW} CPU Microcode install END ${NC}"
+# -------------------------------------------------------------------------------------------------
 
-#echo 'alias ls="ls --color=auto --group-directories-first -v -lah"' >> ~/.bashrc
-#echo 'alias upup="sudo apt update && sudo apt upgrade -y && sudo apt clean && sudo apt autoremove -y"' >> ~/.bashrc
+echo -e "${YELLOW} Alias echo to ~/.bashrc ${NC}"
+echo 'alias ls="ls --color=auto --group-directories-first -v -lah"' >> ~/.bashrc
+echo 'alias upup="sudo apt update && sudo apt upgrade -y && sudo apt clean && sudo apt autoremove -y"' >> ~/.bashrc
 
-
-# Qtile Core Dependencies apt install
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Qtile Core Dependencies apt install ${NC}"
 sudo apt install -y python3-pip python3-xcffib python3-cairocffi python3-cffi libpangocairo-1.0-0 python-dbus-dev libxkbcommon-dev libxkbcommon-x11-dev python3-venv python3-psutil
 
-
-# Set User folders via xdg-user-dirs-update.
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Set User folders via xdg-user-dirs-update. ${NC}"
 xdg-user-dirs-update
 
 
@@ -171,8 +175,8 @@ xdg-user-dirs-update
 #mkdir -p ~/.config/picom
 #cp picom.sample.conf ~/.config/picom/picom.conf
 
-
-echo -e "${YELLOW} Install Qtile from source via github and Pip${NC}"
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Install Qtile from source via github and Pip ${NC}"
 cd /tmp/
 sudo rm -rf qtile
 git clone https://github.com/qtile/qtile.git && cd qtile && pip install . --break-system-packages --no-warn-script-location
@@ -210,7 +214,10 @@ else
 	echo "File autostart.sh already exists."
 fi
 
-echo -e "${YELLOW} MPD START - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -${NC}"
+# -------------------------------------------------------------------------------------------------
+
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} MPD Setup & config START ${NC}"
 
 mkdir -p ~/.config/mpd/playlists
 mkdir -p ~/.local/state/mpd
@@ -290,10 +297,11 @@ fi
 # mpd --stderr --no-daemon --verbose
 # aplay --list-pcm
 
-echo -e "${YELLOW} MPD END - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${NC}"
+echo -e "${YELLOW} MPD END ${NC}"
+# -------------------------------------------------------------------------------------------------
 
-
-echo -e "${YELLOW} Wallpapers START - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${NC}"
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Wallpapers START ${NC}"
 
 if [ ! -d ~/Wallpapers ]; then
 mkdir -p ~/Wallpapers
@@ -336,7 +344,6 @@ else
 fi
 
 if [ ! -f ~/.config/nitrogen/nitrogen.cfg ]; then
-#touch ~/.config/nitrogen/nitrogen.cfg
 cat << "NITROGENCONFIG" > ~/.config/nitrogen/nitrogen.cfg
 [geometry]
 posx=5
@@ -357,8 +364,10 @@ else
 	echo "Nitrogen config file already exists."
 fi
 
-echo -e "${YELLOW} Wallpapers END - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${NC}"
+echo -e "${YELLOW} Wallpapers END ${NC}"
+# -------------------------------------------------------------------------------------------------
 
+# -------------------------------------------------------------------------------------------------
 echo -e "${YELLOW} Nerd Fonts START - https://www.nerdfonts.com/font-downloads - https://www.nerdfonts.com/cheat-sheet - - - ${NC}"
 if [ ! -d ~/.fonts ]; then
 mkdir -p ~/.fonts
@@ -373,10 +382,11 @@ unzip -q -n /tmp/DejaVuSansMono.zip -d ~/.fonts
 rm -f ~/.fonts/*.md
 rm -f ~/.fonts/*.txt
 
-echo -e "${YELLOW} Nerd Fonts END - https://www.nerdfonts.com/font-downloads - - - - - - - - - - - - - - - - -"
+echo -e "${YELLOW} Nerd Fonts END - https://www.nerdfonts.com/font-downloads "
+# -------------------------------------------------------------------------------------------------
 
-
-echo -e "${YELLOW} Themes START ------------------------------------------------------------------"
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Themes START ${NC}"
 # ls -d /usr/share/themes/*
 # ls -d /usr/share/icons/*
 # ls -d /usr/share/
@@ -445,10 +455,11 @@ sudo sed -i 's/Adwaita/Nordzy-cursors/g' /usr/share/icons/default/index.theme
 
 sudo fc-cache -f -v
 
-echo -e "${YELLOW} Themes END ------------------------------------------------------------------ ${NC}"
+echo -e "${YELLOW} Themes END ${NC}"
+# -------------------------------------------------------------------------------------------------
 
-
-echo -e "${YELLOW} xrandr-set-max + Xsession START -------------------------------------------------------- ${NC}"
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} xrandr-set-max + Xsession START ${NC}"
 
 if [ ! -f /usr/local/bin/xrandr-set-max ]; then
 # Define the content of the script
@@ -489,10 +500,11 @@ fi
 #	echo "/etc/X11/Xsession.d/90_xrandr-set-max already exists."
 #fi
 
-echo -e "${YELLOW} xrandr-set-max + Xsession END ---------------------------------------------------------- ${NC}"
+echo -e "${YELLOW} xrandr-set-max + Xsession END ${NC}"
+# -------------------------------------------------------------------------------------------------
 
-
-echo -e "${YELLOW} Download Unsplash Wallpapers BIN START -------------------------------------- ${NC}"
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Download Unsplash Wallpapers BIN START ${NC}"
 sudo bash -c 'cat << "UNSPLASHDOWNLOADBIN" >> /usr/local/bin/unsplash-download-wallpapers
 #!/bin/bash
 
@@ -528,10 +540,11 @@ UNSPLASHDOWNLOADBIN'
 
 sudo chmod +x /usr/local/bin/unsplash-download-wallpapers
 
-echo -e "${YELLOW} Download Unsplash Wallpapers BIN END ------------------------------------- ${NC}"
+echo -e "${YELLOW} Download Unsplash Wallpapers BIN END ${NC}"
+# -------------------------------------------------------------------------------------------------
 
-
-echo -e "${YELLOW} Rofi Run menu START - - - - - - - - - - - - - - - - - - ${NC}"
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Rofi Run menu START ${NC}"
 if [ ! -d ~/.config/rofi ]; then
 mkdir -p ~/.config/rofi
 
@@ -630,10 +643,11 @@ else
 	echo "Rofi config file already exists."
 fi
 
-echo -e "${YELLOW} Rofi Run menu END - - - - - - - - - - - - - - - - - - ${NC}"
+echo -e "${YELLOW} Rofi Run menu END ${NC}"
+# -------------------------------------------------------------------------------------------------
 
-
-echo -e "${YELLOW} Kitty config file START ------------------------------------------------------------------------- ${NC}"
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Kitty config file START ${NC}"
 
 if [ ! -f ~/.config/kitty/kitty.conf ]; then
 mkdir -p ~/.config/kitty/
@@ -2121,14 +2135,15 @@ else
 	echo "Kitty config already exists."
 fi
 
-# -------------------------------------------------------------------------------------------------
-echo -e "${YELLOW} Kitty config file END --------------------------------------------------------------------------- ${NC}"
+
+echo -e "${YELLOW} Kitty config file END ${NC}"
 # -------------------------------------------------------------------------------------------------
 
-
-echo -e "${YELLOW} Edit GRUB BOOT TIMEOUT START --------------------------------------- ${NC}"
+# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Edit GRUB BOOT TIMEOUT START ${NC}"
 sudo sed -i 's+GRUB_TIMEOUT=5+GRUB_TIMEOUT=1+g' /etc/default/grub && sudo update-grub
-echo -e "${YELLOW} Edit GRUB BOOT TIMEOUT END ----------------------------------------- ${NC}"
+echo -e "${YELLOW} Edit GRUB BOOT TIMEOUT END ${NC}"
+# -------------------------------------------------------------------------------------------------
 
 # Execute the commands based on user choices
 for i in "${!choices[@]}"; do
@@ -2146,8 +2161,7 @@ done
 
 
 # -------------------------------------------------------------------------------------------------
-echo -e "${YELLOW} Qtile Config file START ------------------------------------------------------------------------- ${NC}"
-# -------------------------------------------------------------------------------------------------
+echo -e "${YELLOW} Qtile Config file START ${NC}"
 
 if [ ! -f ~/.config/qtile/config.py ]; then
 
@@ -2466,7 +2480,8 @@ else
 fi
 
 # -------------------------------------------------------------------------------------------------
-echo -e "${YELLOW} Qtile Config file END --------------------------------------------------------------------------- ${NC}"
+echo -e "${YELLOW} Qtile Config file END ${NC}"
+
 # -------------------------------------------------------------------------------------------------
 
 # Install closing screen ##### ##### ##### ##### ##### ##### ##### ##### ##### ####
@@ -2485,6 +2500,7 @@ if (whiptail --title "Installation Complete" --yesno "Installation is complete,
     echo -e "${GREEN} "
     echo -e "${GREEN} ${NC}"
 else
+    cd ~
     clear
     echo -e "${GREEN} -'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
     echo -e "${GREEN} "