diff --git a/bspwm-install-martin-dte-debian.sh b/bspwm-install-martin-dte-debian.sh
index 2458d2c..ee2ffe4 100644
--- a/bspwm-install-martin-dte-debian.sh
+++ b/bspwm-install-martin-dte-debian.sh
@@ -10,25 +10,18 @@ cd ~/bspwm-install-ma-dte
 #read -p "Troubleshooting - Press a key to continue the installation."
 
 
-# Add ROOT Level - Software & Packages.
-. ~/bspwm-install-ma-dte/install-scripts/apt-install-all-packages.sh
+# Add Software & Packages.
+. ~/bspwm-install-ma-dte/install-scripts/apt-install-packages.sh
 
-# Add pulseaudio to system startup.
+# Add Pulseaudio to system startup as user.
 systemctl --user enable pulseaudio
 
-# Alacritty - Building and installing ON / OFF
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
-#echo " "
-#echo "     Alacritty - Building and installing"
-#echo " "
-#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
-# Alacritty - Building and installing ON / OFF
-
-#. ~/bspwm-install-ma-dte/install-scripts/install-alacritty-debian.sh
-
+# Last Software & Packages.
+. ~/bspwm-install-ma-dte/install-scripts/apt-install-last-packages.sh
 
 # Last step setup menu installing.
 . last-step-setup-menu.sh
+
 echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
 echo " "
 echo " "
@@ -43,5 +36,5 @@ echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
 sleep 1
 
 read -p "You are ready to reboot... Press [Enter] key to Reboot System."
-echo " "
+
 sudo reboot
diff --git a/config/polybar/config b/config/polybar/config
index 14261b0..58b57c7 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -26,10 +26,8 @@
 ;=========================================================================
 
 [colors]
-;background = ${xrdb:color0:#222}
 background = #F209141E
 background-alt = #09141E
-;foreground = ${xrdb:color7:#222}
 foreground = #ebebeb
 foreground-alt = #555
 primary = #333D53
@@ -65,9 +63,9 @@ background = ${colors.background}
 foreground = ${colors.foreground}
 
 line-size = 3
-line-color = #f00
+line-color = #dbdbdb
 
-;# Option to provide a transparent can in x number of Pixels or a solid color around polubar
+;# Ttransparent or Solid color border around Polybar. (Size in Pixels) 
 border-size = 0
 border-color = #00000000
 
@@ -89,7 +87,7 @@ font-5 = "DejaVuSansMono Nerd Font:style=Book:size=12;2"
 
 modules-left = bspwm xwindow
 ;modules-center = mpd
-modules-right = pulseaudio cpu memory wlan eth date temperature battery powermenu session
+modules-right = pulseaudio cpu memory wlan eth date temperature battery session
 
 ; Models list - filesystem xbacklight alsa pulseaudio xkeyboard memory cpu wlan eth battery temperature date powermenu
 
@@ -448,40 +446,11 @@ ramp-1 = 
 ramp-2 = 
 ramp-foreground = ${colors.foreground-alt}
 
-[module/powermenu]
-type = custom/menu
-
-expand-right = true
-
-format-spacing = 1
-
-label-open = 
-label-open-foreground = ${colors.icon-c1}
-label-close = x
-label-close-foreground = ${colors.icon-c1}
-label-separator = "	"
-label-separator-foreground = ${colors.foreground-alt}
-
-menu-0-0 = 
-menu-0-0-exec = menu-open-1
-menu-0-1 = 
-menu-0-1-exec = menu-open-2
-
-menu-1-0 = 
-menu-1-0-exec = menu-open-0
-menu-1-1 = 
-menu-1-1-exec = systemctl reboot
-
-menu-2-0 = 
-menu-2-0-exec = systemctl poweroff
-menu-2-1 = 
-menu-2-1-exec = menu-open-0
-
 
 [module/session]
 type = custom/text
 
-click-left = powermenu.sh
+click-left = ~/.config/rofi/powermenu.sh
 content = %{T4}%{T-}
 content-background = ${colors.shade-2}
 content-foreground = ${colors.shade-5}
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index 71b56b8..ae9059f 100644
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -9,11 +9,11 @@ configuration {
 @theme "/dev/null"
 
 * {
-  bg: #11121D;
-  bg-alt: #444b6a;
+  bg: #10171c;
+  bg-alt: #344959;
 
-  fg: #FFFFFF;
-  fg-alt: #787c99;
+  fg: #EBEBEB;
+  fg-alt: #768ca3;
 
   background-color: @bg;
   
@@ -78,5 +78,4 @@ prompt {
 /* vim: ft=sass
 
 // Theme location is "/usr/share/rofi/themes/name.rasi"
-
 //@theme "/usr/share/rofi/themes/Arc-Dark.rasi"
diff --git a/user-scripts/powermenu.sh b/config/rofi/powermenu.sh
similarity index 56%
rename from user-scripts/powermenu.sh
rename to config/rofi/powermenu.sh
index 66ae7fe..d88ea58 100644
--- a/user-scripts/powermenu.sh
+++ b/config/rofi/powermenu.sh
@@ -3,8 +3,8 @@
 chosen=$(printf "  Power Off\n  Restart\n  Lock" | rofi -dmenu -i -theme-str '@import "powermenu.rasi"')
 
 case "$chosen" in
-	"  Power Off") poweroff ;;
-	"  Restart") reboot ;;
-	"  Lock") i3lock-fancy -gpf DejaVu Sans -- scrot -z ;;
+	"  Power Off") systemctl poweroff ;;
+	"  Restart") systemctl reboot ;;
+	"  Lock") i3lock-fancy -gp -- scrot -z ;;
 	*) exit 1 ;;
 esac
\ No newline at end of file
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index 334c09b..f9251d4 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -1,6 +1,11 @@
 #
-# Hotkey - Config
+#        Hotkey - Config
 #
+###################################
+# Reload sxhkd config file.
+super + alt + ctrl + Escape
+	pkill -USR1 -x sxhkd
+###################################
 
 # Terminal´s primary and secondary.
 super + Return
@@ -14,11 +19,6 @@ super + shift + Return
 super + r
 	rofi -show run
 
-# Reload sxhkd config file.
-super + alt + ctrl + Escape
-	pkill -USR1 -x sxhkd
-
-
 super + b
 	google-chrome
 
@@ -26,7 +26,7 @@ super + shift + b
 	firefox
 
 super + e
-	thunar
+	pcmanfm
 
 super + alt + ctrl + a
 	kitty -e pulsemixer
@@ -34,7 +34,8 @@ super + alt + ctrl + a
 super + ctrl + m
 	. ~/.config/rofi/rofi-beats.sh
 
-
+super + ctrl + alt + w
+	. ~/.config/rofi/rofi-wifi-menu.sh
 
 #
 # BSPwm Hotkeys
diff --git a/fonts/Fira Code Bold Nerd Font Complete Mono.otf b/fonts/Fira Code Bold Nerd Font Complete Mono.otf
new file mode 100644
index 0000000..2d01abd
Binary files /dev/null and b/fonts/Fira Code Bold Nerd Font Complete Mono.otf differ
diff --git a/fonts/Fira Code Bold Nerd Font Complete.otf b/fonts/Fira Code Bold Nerd Font Complete.otf
new file mode 100644
index 0000000..98c4353
Binary files /dev/null and b/fonts/Fira Code Bold Nerd Font Complete.otf differ
diff --git a/fonts/Fira Code Light Nerd Font Complete Mono.otf b/fonts/Fira Code Light Nerd Font Complete Mono.otf
new file mode 100644
index 0000000..1280c0d
Binary files /dev/null and b/fonts/Fira Code Light Nerd Font Complete Mono.otf differ
diff --git a/fonts/Fira Code Light Nerd Font Complete.otf b/fonts/Fira Code Light Nerd Font Complete.otf
new file mode 100644
index 0000000..147cca6
Binary files /dev/null and b/fonts/Fira Code Light Nerd Font Complete.otf differ
diff --git a/fonts/Fira Code Medium Nerd Font Complete Mono.otf b/fonts/Fira Code Medium Nerd Font Complete Mono.otf
new file mode 100644
index 0000000..d1c0352
Binary files /dev/null and b/fonts/Fira Code Medium Nerd Font Complete Mono.otf differ
diff --git a/fonts/Fira Code Medium Nerd Font Complete.otf b/fonts/Fira Code Medium Nerd Font Complete.otf
new file mode 100644
index 0000000..754330b
Binary files /dev/null and b/fonts/Fira Code Medium Nerd Font Complete.otf differ
diff --git a/fonts/Fira Code Regular Nerd Font Complete Mono.otf b/fonts/Fira Code Regular Nerd Font Complete Mono.otf
new file mode 100644
index 0000000..a02a9c0
Binary files /dev/null and b/fonts/Fira Code Regular Nerd Font Complete Mono.otf differ
diff --git a/fonts/Fira Code Regular Nerd Font Complete.otf b/fonts/Fira Code Regular Nerd Font Complete.otf
new file mode 100644
index 0000000..20f5847
Binary files /dev/null and b/fonts/Fira Code Regular Nerd Font Complete.otf differ
diff --git a/fonts/Fira Code Retina Nerd Font Complete Mono.otf b/fonts/Fira Code Retina Nerd Font Complete Mono.otf
new file mode 100644
index 0000000..e1d46be
Binary files /dev/null and b/fonts/Fira Code Retina Nerd Font Complete Mono.otf differ
diff --git a/fonts/Fira Code Retina Nerd Font Complete.otf b/fonts/Fira Code Retina Nerd Font Complete.otf
new file mode 100644
index 0000000..e354a3a
Binary files /dev/null and b/fonts/Fira Code Retina Nerd Font Complete.otf differ
diff --git a/fonts/Fura Code Bold Nerd Font Complete Mono.otf b/fonts/Fura Code Bold Nerd Font Complete Mono.otf
new file mode 100644
index 0000000..9ac59ab
Binary files /dev/null and b/fonts/Fura Code Bold Nerd Font Complete Mono.otf differ
diff --git a/fonts/Fura Code Bold Nerd Font Complete.otf b/fonts/Fura Code Bold Nerd Font Complete.otf
new file mode 100644
index 0000000..2780f2a
Binary files /dev/null and b/fonts/Fura Code Bold Nerd Font Complete.otf differ
diff --git a/fonts/Fura Code Light Nerd Font Complete Mono.otf b/fonts/Fura Code Light Nerd Font Complete Mono.otf
new file mode 100644
index 0000000..c621024
Binary files /dev/null and b/fonts/Fura Code Light Nerd Font Complete Mono.otf differ
diff --git a/fonts/Fura Code Light Nerd Font Complete.otf b/fonts/Fura Code Light Nerd Font Complete.otf
new file mode 100644
index 0000000..4143767
Binary files /dev/null and b/fonts/Fura Code Light Nerd Font Complete.otf differ
diff --git a/fonts/Fura Code Medium Nerd Font Complete Mono.otf b/fonts/Fura Code Medium Nerd Font Complete Mono.otf
new file mode 100644
index 0000000..6caacf3
Binary files /dev/null and b/fonts/Fura Code Medium Nerd Font Complete Mono.otf differ
diff --git a/fonts/Fura Code Medium Nerd Font Complete.otf b/fonts/Fura Code Medium Nerd Font Complete.otf
new file mode 100644
index 0000000..1dd6735
Binary files /dev/null and b/fonts/Fura Code Medium Nerd Font Complete.otf differ
diff --git a/fonts/Fura Code Regular Nerd Font Complete Mono.otf b/fonts/Fura Code Regular Nerd Font Complete Mono.otf
new file mode 100644
index 0000000..56d3872
Binary files /dev/null and b/fonts/Fura Code Regular Nerd Font Complete Mono.otf differ
diff --git a/fonts/Fura Code Regular Nerd Font Complete.otf b/fonts/Fura Code Regular Nerd Font Complete.otf
new file mode 100644
index 0000000..6e65585
Binary files /dev/null and b/fonts/Fura Code Regular Nerd Font Complete.otf differ
diff --git a/fonts/Fura Code Retina Nerd Font Complete Mono.otf b/fonts/Fura Code Retina Nerd Font Complete Mono.otf
new file mode 100644
index 0000000..3f224a4
Binary files /dev/null and b/fonts/Fura Code Retina Nerd Font Complete Mono.otf differ
diff --git a/fonts/Fura Code Retina Nerd Font Complete.otf b/fonts/Fura Code Retina Nerd Font Complete.otf
new file mode 100644
index 0000000..af45df1
Binary files /dev/null and b/fonts/Fura Code Retina Nerd Font Complete.otf differ
diff --git a/install-scripts/apt-install-last-packages.sh b/install-scripts/apt-install-last-packages.sh
new file mode 100644
index 0000000..671b19c
--- /dev/null
+++ b/install-scripts/apt-install-last-packages.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Install - Software & Packages.
+echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+echo " "
+echo "     Download, Building & Install Software"
+echo " "
+echo "     Enter your user password, to continue if necessary"
+echo " "
+echo "     continues the installation in 3 seconds"
+echo " "
+echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+sleep 3
+
+# Alacritty - Building and installing ON / OFF
+#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+#echo " "
+#echo "     Alacritty - Building and installing"
+#echo " "
+#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+# Alacritty - Building and installing ON / OFF
+
+#. ~/bspwm-install-ma-dte/install-scripts/install-alacritty-debian.sh
+
+
+# Google Chrome - Download + Install  ON / OFF
+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
+
diff --git a/install-scripts/apt-install-all-packages.sh b/install-scripts/apt-install-packages.sh
similarity index 87%
rename from install-scripts/apt-install-all-packages.sh
rename to install-scripts/apt-install-packages.sh
index 392d98d..73dafe0 100644
--- a/install-scripts/apt-install-all-packages.sh
+++ b/install-scripts/apt-install-packages.sh
@@ -27,16 +27,11 @@ sudo apt install -y zsh git wireguard wireguard-tools libreoffice libreoffice-gt
 # Maybe maybe Software & Packages ON / OFF
 sudo apt install -y dunst
 
+# Themes Extra Packages ON / OFF
+sudo apt install -y papirus-icon-theme breeze-cursor-theme gnome-themes-extra
+
+
 # Other packages not included or removed 
 # virt-manager xscreensaver thunar thunar-archive-plugin thunar-font-manager
 # qt5ct .profile add export QT_QPA_PLATFORMTHEME="qt5ct"
 
-
-# Google Chrome - Download + Install  ON / OFF
-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
-
-
-
-# Themes Extra Packages ON / OFF
-sudo apt install -y papirus-icon-theme breeze-cursor-theme gnome-themes-extra
diff --git a/install-scripts/mkdir-cp-chmod-echo-files.sh b/install-scripts/mkdir-cp-chmod-echo-files.sh
index 961bd32..039b181 100644
--- a/install-scripts/mkdir-cp-chmod-echo-files.sh
+++ b/install-scripts/mkdir-cp-chmod-echo-files.sh
@@ -33,8 +33,12 @@ cp -r ~/bspwm-install-ma-dte/fonts/* ~/.fonts/
 cp -r ~/bspwm-install-ma-dte/themes/* ~/.themes/
 cp -r ~/bspwm-install-ma-dte/music/* ~/music/
 cp -r ~/bspwm-install-ma-dte/wallpapers/* ~/wallpapers/
-cp -r ~/bspwm-install-ma-dte/local-files/* ~/.local/
-cp -r ~/bspwm-install-ma-dte/user-scripts/* ~/.local/bin
+
+#cp ~/bspwm-install-ma-dte/local-files/* ~/.local/
+
+# Not for production version
+#read -p "Troubleshooting - Press a key to continue the installation."
+
 
 # Echo config to files. YES / NO
 echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
@@ -60,6 +64,10 @@ echo "file=$HOME/wallpapers/default-wallpaper.jpg" >> ~/.config/nitrogen/bg-save
 echo "mode=5" >> ~/.config/nitrogen/bg-saved.cfg
 echo "bgcolor=#191a1b" >> ~/.config/nitrogen/bg-saved.cfg
 
+# Not for production version
+#read -p "Troubleshooting - Press a key to continue the installation."
+
+
 #chmod +x files.
 #echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
 #echo " "
@@ -71,7 +79,13 @@ chmod +x ~/.config/bspwm/bspwmrc
 chmod +x ~/.config/sxhkd/sxhkdrc
 
 chmod +x ~/.config/polybar/run-polybar.sh
-chmod +x ~/.config/rofi/rofi-beats
+chmod +x ~/.config/rofi/powermenu.sh
+chmod +x ~/.config/rofi/rofi-wifi-menu.sh
+chmod +x ~/.config/rofi/rofi-beats.sh
+
+# Not for production version
+#read -p "Troubleshooting - Press a key to continue the installation."
+
 
 #echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
 #echo " "
diff --git a/user-scripts/changebrightness.sh b/local-files/user-scripts/changebrightness.sh
similarity index 100%
rename from user-scripts/changebrightness.sh
rename to local-files/user-scripts/changebrightness.sh
diff --git a/user-scripts/changevolume.sh b/local-files/user-scripts/changevolume.sh
similarity index 100%
rename from user-scripts/changevolume.sh
rename to local-files/user-scripts/changevolume.sh
diff --git a/config/picom/dur-picom.conf b/miscellaneous/dur-picom.conf
similarity index 100%
rename from config/picom/dur-picom.conf
rename to miscellaneous/dur-picom.conf