diff --git a/bspwm-install-martin-dte-debian.sh b/bspwm-install-martin-dte-debian.sh
index b9834e4..b5b8600 100644
--- a/bspwm-install-martin-dte-debian.sh
+++ b/bspwm-install-martin-dte-debian.sh
@@ -8,22 +8,11 @@ cd ~/bspwm-install-ma-dte
 #echo " "
 #echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
 mkdir ~/.config
+mkdir ~/.themes
+mkdir ~/.icons
 mkdir ~/.fonts
 mkdir ~/wallpapers
 
-# ADD new apt testing YES / NO
-echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
-echo " "
-echo "     APT add testing main contrib non-free."
-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"
-
 # Not for production version
 #read -p "Troubleshooting - Press a key to continue the installation."
 
@@ -35,12 +24,32 @@ sudo sh -c "echo 'alias upup="sudo apt update && sudo apt upgrade -y && sudo apt
 #echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
 
 cp -r ~/bspwm-install-ma-dte/config/* ~/.config/
-cp -r ~/bspwm-install-ma-dte/wallpapers/* ~/wallpapers/
 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 til config files
+# 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 "-'-'-'-'-'-'-'-'-'-'-'-'-"
diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index 6f69525..c87e7a6 100644
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -55,7 +55,10 @@ picom &
 feh --bg-fill ~/wallpapers/default-wallpaper.jpg &
 nitrogen --restore &
 pulseaudio --kill &
-sleep 2
+sleep 3
 pulseaudio --start &
+
 xscreensaver -nosplash &
+
+sleep 3
 $HOME/.config/polybar/run-polybar.sh &
diff --git a/config/polybar/config b/config/polybar/config
index 683a5ea..00f88af 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -85,7 +85,6 @@ font-2 = "Font Awesome 6 Free:style=Regular:size=12;2"
 font-3 = "Font Awesome 5 Free:style=Regular:size=12;2"
 font-4 = "Material Icons:style=Regular:size=12;2"
 font-5 = "DejaVuSansMono Nerd Font:style=Book:size=12;2"
-
 ;font-6 = "DejaVu Sans:style=Regular:size=11;2"
 
 modules-left = bspwm
@@ -144,6 +143,8 @@ label-unmounted-foreground = ${colors.foreground-alt}
 [module/bspwm]
 type = internal/bspwm
 
+enable-scroll = false
+
 label-focused = %index%
 label-focused-background = ${colors.background-alt}
 label-focused-underline= ${colors.primary}
diff --git a/install-scripts/apt-install-all-packages.sh b/install-scripts/apt-install-all-packages.sh
index a0403ee..c84bea6 100644
--- a/install-scripts/apt-install-all-packages.sh
+++ b/install-scripts/apt-install-all-packages.sh
@@ -21,3 +21,7 @@ sudo apt install -y ~/bspwm-install-ma-dte/google-chrome-stable_current_amd64.de
 
 # 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
+
+
+# More Themes Extra Packages ON / OFF
+sudo apt install -y papirus-icon-theme breeze-cursor-theme gnome-themes-extra
\ No newline at end of file