diff --git a/.Xresources b/.Xresources
deleted file mode 100644
index 5da3aa0..0000000
--- a/.Xresources
+++ /dev/null
@@ -1 +0,0 @@
-Xcursor.theme: Bibata-Modern-Classic
diff --git a/.gitignore b/.gitignore
index 23e1a5f..c18dd8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 __pycache__/
-spotifyd/spotifyd.conf
diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
deleted file mode 100644
index d998e26..0000000
--- a/.gtkrc-2.0
+++ /dev/null
@@ -1,18 +0,0 @@
-# DO NOT EDIT! This file will be overwritten by LXAppearance.
-# Any customization should be done in ~/.gtkrc-2.0.mine instead.
-
-include "/home/raabe/.gtkrc-2.0.mine"
-gtk-theme-name="Breeze-Dark"
-gtk-icon-theme-name="breeze-dark"
-gtk-font-name="Cantarell 11"
-gtk-cursor-theme-name="Bibata-Modern-Classic"
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle="hintfull"
diff --git a/.icons/default/index.theme b/.icons/default/index.theme
deleted file mode 100644
index f21ab4d..0000000
--- a/.icons/default/index.theme
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is written by LXAppearance. Do not edit.
-[Icon Theme]
-Name=Default
-Comment=Default Cursor Theme
-Inherits=Bibata-Modern-Classic
diff --git a/1-install.sh b/1-install.sh
index bd74a3a..56ee216 100755
--- a/1-install.sh
+++ b/1-install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#/bin/bash
 #  ___           _        _ _  
 # |_ _|_ __  ___| |_ __ _| | | 
 #  | || '_ \/ __| __/ _` | | | 
@@ -122,15 +122,6 @@ fi
 
 clear
 
-# ------------------------------------------------------
-# Remove pywal folder from .config
-# ------------------------------------------------------
-echo ""
-if [ -d ~/.config/wal/ ]; then
-    rm -r ~/.config/wal/
-    echo "~/.config/wal/ removed."
-fi
-
 # ------------------------------------------------------
 # Install .bashrc
 # ------------------------------------------------------
diff --git a/3-dotfiles.sh b/3-dotfiles.sh
index de86ad0..db18c73 100755
--- a/3-dotfiles.sh
+++ b/3-dotfiles.sh
@@ -81,10 +81,11 @@ _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 ~/.gtkrc-2.0 ~/dotfiles/.gtkrc-2.0 ~/.gtkrc-2.0
-_installSymLink ~/.config/gtk-3.0 ~/dotfiles/gtk-3.0/ ~/.config/
-_installSymLink ~/.Xresources ~/dotfiles/.Xresources ~/.Xresources
-_installSymLink ~/.icons ~/dotfiles/.icons/ ~/
+
+_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/ ~/
 
 # ------------------------------------------------------
 # DONE
diff --git a/gtk-3.0/bookmarks b/gtk-3.0/bookmarks
deleted file mode 100644
index 8d57c89..0000000
--- a/gtk-3.0/bookmarks
+++ /dev/null
@@ -1,5 +0,0 @@
-file:///home/raabe/wallpaper
-file:///home/raabe/Downloads
-file:///home/raabe/Pictures/screenshots
-file:///home/raabe/Videos
-file:///home/raabe/Videos/Recordings
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
deleted file mode 100644
index da9e678..0000000
--- a/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[Settings]
-gtk-theme-name=Breeze-Dark
-gtk-icon-theme-name=breeze-dark
-gtk-font-name=Cantarell 11
-gtk-cursor-theme-name="Bibata-Modern-Classic"
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=0
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
diff --git a/waybar/colors-waybar.css b/waybar/colors-waybar.css
index b96ca9e..ee57af0 100644
--- a/waybar/colors-waybar.css
+++ b/waybar/colors-waybar.css
@@ -1,20 +1,20 @@
-@define-color foreground #bfbfc0;
-@define-color background #000103;
-@define-color cursor #bfbfc0;
+@define-color foreground #bfc0c1;
+@define-color background #020507;
+@define-color cursor #bfc0c1;
 
-@define-color color0 #000103;
-@define-color color1 #046C90;
-@define-color color2 #037197;
-@define-color color3 #4F788D;
-@define-color color4 #188AA6;
-@define-color color5 #058BB2;
-@define-color color6 #10A7CF;
-@define-color color7 #bfbfc0;
-@define-color color8 #3f4042;
-@define-color color9 #046C90;
-@define-color color10 #037197;
-@define-color color11 #4F788D;
-@define-color color12 #188AA6;
-@define-color color13 #058BB2;
-@define-color color14 #10A7CF;
-@define-color color15 #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;