diff --git a/3-dotfiles.sh b/3-dotfiles.sh
index db18c73..f1514aa 100755
--- a/3-dotfiles.sh
+++ b/3-dotfiles.sh
@@ -25,7 +25,7 @@ echo "                                    "
 echo "by Stephan Raabe (2023)"
 echo "-------------------------------------"
 echo ""
-echo "The script will ask for permission to remove the following existing folders and files."
+echo "The script will ask for permission to remove existing folders and files."
 echo "But you can decide to keep your local versions by answering with No (Nn)."
 echo "Symbolic links will be created from ~/dotfiles into your home and .config directories."
 echo ""
@@ -50,7 +50,7 @@ done
 # Create .config folder
 # ------------------------------------------------------
 echo ""
-echo "-> Check existing .config folder"
+echo "-> Check if .config folder exists"
 
 if [ -d ~/.config ]; then
     echo ".config folder already exists."
@@ -62,30 +62,52 @@ fi
 # ------------------------------------------------------
 # Create symbolic links
 # ------------------------------------------------------
+# name symlink source target
+
+echo ""
+echo "-------------------------------------"
+echo "-> Install general dotfiles"
+echo "-------------------------------------"
 echo ""
-echo "-> Install dotfiles with symbolic links"
 
-_installSymLink ~/.config/picom ~/dotfiles/picom/ ~/.config
-_installSymLink ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
-_installSymLink ~/.config/ranger ~/dotfiles/ranger/ ~/.config
-_installSymLink ~/.config/rofi ~/dotfiles/rofi/ ~/.config
-_installSymLink ~/.config/vim ~/dotfiles/vim/ ~/.config
-_installSymLink ~/.config/nvim ~/dotfiles/nvim/ ~/.config
-_installSymLink ~/.config/dunst ~/dotfiles/dunst/ ~/.config
-_installSymLink ~/.config/wal ~/dotfiles/wal/ ~/.config
-_installSymLink ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml
-_installSymLink ~/.config/hypr ~/dotfiles/hypr/ ~/.config
-_installSymLink ~/.config/waybar ~/dotfiles/waybar/ ~/.config
-_installSymLink ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config
-_installSymLink ~/.config/wlogout ~/dotfiles/wlogout/ ~/.config
-_installSymLink ~/.config/qtile ~/dotfiles/qtile/ ~/.config
-_installSymLink ~/.config/polybar ~/dotfiles/polybar/ ~/.config
-_installSymLink ~/.xinitrc ~/dotfiles/qtile/.xinitrc ~/.xinitrc
+_installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
+_installSymLink ranger ~/.config/ranger ~/dotfiles/ranger/ ~/.config
+_installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config
+_installSymLink nvim ~/.config/nvim ~/dotfiles/nvim/ ~/.config
+_installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml
+_installSymLink rofi ~/.config/rofi ~/dotfiles/rofi/ ~/.config
+_installSymLink dunst ~/.config/dunst ~/dotfiles/dunst/ ~/.config
+_installSymLink wal ~/.config/wal ~/dotfiles/wal/ ~/.config
 
-_installSymLink ~/.gtkrc-2.0 ~/dotfiles/gtk/.gtkrc-2.0 ~/.gtkrc-2.0
-_installSymLink ~/.config/gtk-3.0 ~/dotfiles/gtk/gtk-3.0/ ~/.config/
-_installSymLink ~/.Xresources ~/dotfiles/gtk/.Xresources ~/.Xresources
-_installSymLink ~/.icons ~/dotfiles/gtk/.icons/ ~/
+echo "-------------------------------------"
+echo "-> Install GTK dotfiles"
+echo "-------------------------------------"
+echo ""
+
+_installSymLink .gtkrc-2.0 ~/.gtkrc-2.0 ~/dotfiles/gtk/.gtkrc-2.0 ~/.gtkrc-2.0
+_installSymLink gtk-3.0 ~/.config/gtk-3.0 ~/dotfiles/gtk/gtk-3.0/ ~/.config/
+_installSymLink .Xresouces ~/.Xresources ~/dotfiles/gtk/.Xresources ~/.Xresources
+_installSymLink .icons ~/.icons ~/dotfiles/gtk/.icons/ ~/
+
+echo "-------------------------------------"
+echo "-> Install Qtile dotfiles"
+echo "-------------------------------------"
+echo ""
+
+_installSymLink qtile ~/.config/qtile ~/dotfiles/qtile/ ~/.config
+_installSymLink polybar ~/.config/polybar ~/dotfiles/polybar/ ~/.config
+_installSymLink picom ~/.config/picom ~/dotfiles/picom/ ~/.config
+_installSymLink .xinitrc ~/.xinitrc ~/dotfiles/qtile/.xinitrc ~/.xinitrc
+
+echo "-------------------------------------"
+echo "-> Install Hyprland dotfiles"
+echo "-------------------------------------"
+echo ""
+
+_installSymLink hypr ~/.config/hypr ~/dotfiles/hypr/ ~/.config
+_installSymLink waybar ~/.config/waybar ~/dotfiles/waybar/ ~/.config
+_installSymLink swaylock ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config
+_installSymLink wlogout ~/.config/wlogout ~/dotfiles/wlogout/ ~/.config
 
 # ------------------------------------------------------
 # DONE
diff --git a/scripts/library.sh b/scripts/library.sh
index 507e12d..76a2da8 100755
--- a/scripts/library.sh
+++ b/scripts/library.sh
@@ -84,31 +84,36 @@ _installPackagesYay() {
 # Create symbolic links
 # ------------------------------------------------------
 _installSymLink() {
-    symlink="$1";
-    linksource="$2";
-    linktarget="$3";
+    name="$1"
+    symlink="$2";
+    linksource="$3";
+    linktarget="$4";
     
     while true; do
-        read -p "DO YOU WANT TO INSTALL ${symlink}? (Yy/Nn): " yn
+        read -p "DO YOU WANT TO INSTALL ${name}? (Existing dotfiles will be removed!) (Yy/Nn): " yn
         case $yn in
             [Yy]* )
                 if [ -L "${symlink}" ]; then
                     rm ${symlink}
                     ln -s ${linksource} ${linktarget} 
-		            echo "Symlink ${symlink} created."
+		            echo "Symlink ${linksource} -> ${linktarget} created."
+                    echo ""
     		    else
 	    	        if [ -d ${symlink} ]; then
                         rm -rf ${symlink}/ 
 		    		    ln -s ${linksource} ${linktarget}
-                        echo "Symlink for directory ${symlink}/ created."
+                        echo "Symlink for directory ${linksource} -> ${linktarget} created."
+                        echo ""
            		    else
 	    	            if [ -f ${symlink} ]; then
                             rm ${symlink} 
                     		ln -s ${linksource} ${linktarget} 
-                            echo "Symlink to file ${symlink} created."
+                            echo "Symlink to file ${linksource} -> ${linktarget} created."
+                            echo ""
 		                else
 		                    ln -s ${linksource} ${linktarget} 
 	                        echo "New symlink ${linksource} -> ${linktarget} created."
+                            echo ""
                 	    fi
                 	fi
         	    fi
diff --git a/waybar/colors-waybar.css b/waybar/colors-waybar.css
index ee57af0..2a27d52 100644
--- a/waybar/colors-waybar.css
+++ b/waybar/colors-waybar.css
@@ -1,20 +1,20 @@
-@define-color foreground #bfc0c1;
-@define-color background #020507;
-@define-color cursor #bfc0c1;
+@define-color foreground #bfbfc0;
+@define-color background #000204;
+@define-color cursor #bfbfc0;
 
-@define-color color0 #020507;
-@define-color color1 #3F8D62;
-@define-color color2 #54986D;
-@define-color color3 #5CA174;
-@define-color color4 #8FBA7A;
-@define-color color5 #77B188;
-@define-color color6 #A8CE88;
-@define-color color7 #bfc0c1;
-@define-color color8 #414345;
-@define-color color9 #3F8D62;
-@define-color color10 #54986D;
-@define-color color11 #5CA174;
-@define-color color12 #8FBA7A;
-@define-color color13 #77B188;
-@define-color color14 #A8CE88;
-@define-color color15 #bfc0c1;
+@define-color color0 #000204;
+@define-color color1 #26506F;
+@define-color color2 #496773;
+@define-color color3 #0F588A;
+@define-color color4 #186DA7;
+@define-color color5 #157DBF;
+@define-color color6 #2597DB;
+@define-color color7 #bfbfc0;
+@define-color color8 #3f4142;
+@define-color color9 #26506F;
+@define-color color10 #496773;
+@define-color color11 #0F588A;
+@define-color color12 #186DA7;
+@define-color color13 #157DBF;
+@define-color color14 #2597DB;
+@define-color color15 #bfbfc0;