diff --git a/bspwm-install-martin-dte-debian.sh b/bspwm-install-martin-dte-debian.sh
index b5b8600..ade964d 100644
--- a/bspwm-install-martin-dte-debian.sh
+++ b/bspwm-install-martin-dte-debian.sh
@@ -2,101 +2,17 @@
 
 cd ~/bspwm-install-ma-dte
 
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
-#echo " "
-#echo "     Creates folders."
-#echo " "
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
-mkdir ~/.config
-mkdir ~/.themes
-mkdir ~/.icons
-mkdir ~/.fonts
-mkdir ~/wallpapers
+# Do, mkdir, copy, copy, echo files.
+. ~/bspwm-install-ma-dte/install-scripts/mkdir-cp-chmod-echo-files.sh
+
 
 # Not for production version
 #read -p "Troubleshooting - Press a key to continue the installation."
 
-#Copy files to...
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
-#echo " "
-#echo "     Copy files to..."
-#echo " "
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
-
-cp -r ~/bspwm-install-ma-dte/config/* ~/.config/
-cp -r ~/bspwm-install-ma-dte/fonts/* ~/.fonts/
-cp -r ~/bspwm-install-ma-dte/themes/* ~/.themes/
-cp -r ~/bspwm-install-ma-dte/wallpapers/* ~/wallpapers/
-
-# Echo config to files. YES / NO
-echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
-echo " "
-echo "     Echo config to files..."
-echo " "
-echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
-
-sudo sh -c "echo 'deb http://deb.debian.org/debian/ testing main contrib non-free' >> /etc/apt/sources.list"
-sudo sh -c "echo 'deb-src http://deb.debian.org/debian/ testing main contrib non-free' >> /etc/apt/sources.list"
-
-echo "     Add UPUP alias to bash config."
-sudo sh -c "echo 'alias upup="sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y"' >> ~/.bash_aliases"
-
-# Echo Nitrogen config to files.
-echo "dirs=$HOME/wallpapers;" >> $HOME/.config/nitrogen/nitrogen.cfg
-
-touch .config/nitrogen/bg-saved.cfg
-echo "[xin_-1]" >> $HOME/.config/nitrogen/bg-saved.cfg
-echo "file=$HOME/wallpapers/1080p/pexels-fiona-art-3631430.jpg" >> $HOME/.config/nitrogen/bg-saved.cfg
-echo "mode=5" >> $HOME/.config/nitrogen/bg-saved.cfg
-echo "bgcolor=#191a1b" >> $HOME/.config/nitrogen/bg-saved.cfg
-
-
-#chmod +x files.
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
-#echo " "
-#echo "     chmod +x files."
-#echo " "
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
-chmod +x ~/.config/bspwm/bspwmrc
-chmod +x ~/.config/sxhkd/sxhkdrc
-
-chmod +x ~/.config/polybar/run-polybar.sh
-chmod +x ~/.config/rofi/rofi-beats
-
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
-#echo " "
-#echo "     All DONE - User + .config files..."
-#echo " "
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
-
-# Not for production version
-#read -p "Troubleshooting - Press a key to continue the installation."
-
-. ~/bspwm-install-ma-dte/install-scripts/apt-install-all-packages.sh
 
 # Add ROOT Level - Software & Packages.
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
-#echo " "
-#echo "     APT Install Software & Packages"
-#echo " "
-#echo "     Enter your user password, to continue if necessary"
-#echo " "
-#echo "     continues the software installation in 5 seconds"
-#echo " "
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
-sleep 5
+. ~/bspwm-install-ma-dte/install-scripts/apt-install-all-packages.sh
 
-#sudo apt update
-#sudo apt install -y xorg x11-xserver-utils arandr dialog bspwm sxhkd sddm picom polybar network-manager kitty psmisc ranger rofi thunar thunar-archive-plugin thunar-font-manager font-manager gvfs-backends flameshot neovim nitrogen lxpolkit lxappearance htop mc imagemagick npm feh sxiv pulseaudio pulsemixer mpd ncmpcpp notify-osd npm xscreensaver neofetch firefox-esr
-
-#wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-#sudo apt install -y ~/bspwm-install-ma-dte/google-chrome-stable_current_amd64.deb
-
-# More Software & Packages ON / OFF
-#sudo apt install -y zsh git wireguard wireguard-tools libreoffice libreoffice-l10n-da inkscape gimp rawtherapee darktable okular virt-manager
-
-# Not for production version
-#read -p "Troubleshooting - Press a key to continue the installation."
 
 # Alacritty - Building and installing ON / OFF
 #echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
@@ -108,8 +24,16 @@ sleep 5
 
 #. ~/bspwm-install-ma-dte/install-scripts/install-alacritty-debian.sh
 
+
 # Last step setup menu installing.
 . last-step-setup-menu.sh
+echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+echo " "
+echo " "
+echo "     Enter your user password, to continue if necessary"
+echo " "
+echo " "
+echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
 
 # Clean up and delete folders and other installation files ON / OFF
 #cd ~
diff --git a/config/polybar/config b/config/polybar/config
index 00f88af..ef4d5b4 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -147,7 +147,7 @@ enable-scroll = false
 
 label-focused = %index%
 label-focused-background = ${colors.background-alt}
-label-focused-underline= ${colors.primary}
+label-focused-underline= ${colors.underline-c1}
 label-focused-padding = 2
 
 label-occupied = %index%
diff --git a/install-scripts/apt-install-all-packages.sh b/install-scripts/apt-install-all-packages.sh
index 82e936e..365327e 100644
--- a/install-scripts/apt-install-all-packages.sh
+++ b/install-scripts/apt-install-all-packages.sh
@@ -10,7 +10,7 @@ echo " "
 echo "     continues the software installation in 5 seconds"
 echo " "
 echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
-sleep 5
+sleep 4
 
 sudo apt update
 sudo apt install -y xorg x11-xserver-utils arandr dialog bspwm sxhkd sddm picom polybar i3lock-fancy network-manager kitty psmisc ranger rofi thunar thunar-archive-plugin thunar-font-manager font-manager gvfs-backends flameshot neovim nitrogen lxpolkit xbacklight lxappearance htop mc imagemagick npm feh sxiv pulseaudio pulsemixer mpd ncmpcpp notify-osd npm xscreensaver curl neofetch firefox-esr
diff --git a/copy-vm-keys.sh b/install-scripts/copy-vm-keys.sh
similarity index 100%
rename from copy-vm-keys.sh
rename to install-scripts/copy-vm-keys.sh
diff --git a/install-scripts/mkdir-cp-chmod-echo-files.sh b/install-scripts/mkdir-cp-chmod-echo-files.sh
new file mode 100644
index 0000000..1d5efdc
--- /dev/null
+++ b/install-scripts/mkdir-cp-chmod-echo-files.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
+#echo " "
+#echo "     Creates folders."
+#echo " "
+#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
+mkdir ~/.config
+mkdir ~/.themes
+mkdir ~/.icons
+mkdir ~/.fonts
+mkdir ~/wallpapers
+
+# Not for production version
+#read -p "Troubleshooting - Press a key to continue the installation."
+
+#Copy files to...
+#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
+#echo " "
+#echo "     Copy files to..."
+#echo " "
+#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
+
+cp -r ~/bspwm-install-ma-dte/config/* ~/.config/
+cp -r ~/bspwm-install-ma-dte/fonts/* ~/.fonts/
+cp -r ~/bspwm-install-ma-dte/themes/* ~/.themes/
+cp -r ~/bspwm-install-ma-dte/wallpapers/* ~/wallpapers/
+
+# Echo config to files. YES / NO
+echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+echo " "
+echo "     Echo config to files..."
+echo " "
+echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+
+sudo sh -c "echo 'deb http://deb.debian.org/debian/ testing main contrib non-free' >> /etc/apt/sources.list"
+sudo sh -c "echo 'deb-src http://deb.debian.org/debian/ testing main contrib non-free' >> /etc/apt/sources.list"
+
+echo "     Add UPUP alias to bash config."
+sudo sh -c "echo 'alias upup="sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y"' >> ~/.bash_aliases"
+
+# Echo Nitrogen config to files.
+echo "dirs=$HOME/wallpapers;" >> $HOME/.config/nitrogen/nitrogen.cfg
+
+touch .config/nitrogen/bg-saved.cfg
+echo "[xin_-1]" >> $HOME/.config/nitrogen/bg-saved.cfg
+echo "file=$HOME/wallpapers/1080p/pexels-fiona-art-3631430.jpg" >> $HOME/.config/nitrogen/bg-saved.cfg
+echo "mode=5" >> $HOME/.config/nitrogen/bg-saved.cfg
+echo "bgcolor=#191a1b" >> $HOME/.config/nitrogen/bg-saved.cfg
+
+
+#chmod +x files.
+#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
+#echo " "
+#echo "     chmod +x files."
+#echo " "
+#echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
+chmod +x ~/.config/bspwm/bspwmrc
+chmod +x ~/.config/sxhkd/sxhkdrc
+
+chmod +x ~/.config/polybar/run-polybar.sh
+chmod +x ~/.config/rofi/rofi-beats
+
+#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+#echo " "
+#echo "     All DONE - User + .config files..."
+#echo " "
+#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+
diff --git a/last-step-setup-menu.sh b/last-step-setup-menu.sh
index d8ae9bc..20a23a1 100644
--- a/last-step-setup-menu.sh
+++ b/last-step-setup-menu.sh
@@ -39,7 +39,7 @@ case $CHOICE in
             sudo apt install -y intel-microcode nvidia-detect nvidia-driver && sudo reboot
             ;;
         5)
-            . ~/bspwm-install-ma-dte/copy-vm-keys.sh && sudo reboot
+            . ~/bspwm-install-ma-dte/install-scripts/copy-vm-keys.sh && echo "xrandr -s 1920x1080 &" >> $HOME/.config/bspwm/bspwmrc && sudo reboot
             ;;
         6)
             sudo reboot