diff --git a/.Xresources b/.Xresources
new file mode 100644
index 0000000..5da3aa0
--- /dev/null
+++ b/.Xresources
@@ -0,0 +1 @@
+Xcursor.theme: Bibata-Modern-Classic
diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
index 3b89536..cad7a9a 100644
--- a/.gtkrc-2.0
+++ b/.gtkrc-2.0
@@ -5,7 +5,7 @@ include "/home/raabe/.gtkrc-2.0.mine"
 gtk-theme-name="Adapta-Nokto"
 gtk-icon-theme-name="Tela-circle-orange-dark"
 gtk-font-name="Cantarell 11"
-gtk-cursor-theme-name="Adwaita"
+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
diff --git a/.icons/default/index.theme b/.icons/default/index.theme
new file mode 100644
index 0000000..f21ab4d
--- /dev/null
+++ b/.icons/default/index.theme
@@ -0,0 +1,5 @@
+# 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 b9de9a2..50df93c 100755
--- a/1-install.sh
+++ b/1-install.sh
@@ -24,7 +24,7 @@ sudo pacman -S alacritty scrot nitrogen picom starship slock neomutt neovim rofi
 # Install required packages
 # ------------------------------------------------------
 echo "-> Install AUR packages"
-yay -S brave-bin pywal timeshift tela-circle-icon-theme-orange pfetch preload
+yay -S brave-bin pywal timeshift tela-circle-icon-theme-orange pfetch preload bibata-cursor-theme
 
 # ------------------------------------------------------
 # Enable services
@@ -56,10 +56,18 @@ ln -s ~/dotfiles/dunst ~/.config
 ln -s ~/dotfiles/starship/starship.toml ~/.config/starship.toml
 rm ~/.bashrc
 ln -s ~/dotfiles/.bashrc ~/.bashrc
+
+# ------------------------------------------------------
+# Install Theme, Icons and Cursor
+# ------------------------------------------------------
 rm ~/.gtkrc-2.0
 ln -s ~/dotfiles/.gtkrc-2.0 ~/.gtkrc-2.0
 rm -r ~/.config/gtk-3.0/
 ln -s ~/dotfiles/gtk-3.0/ ~/.config/
+rm ~/.Xresources
+ln -s ~/dotfiles/.Xresources ~/.Xresources
+rm -r ~/.icons
+ln -s ~/dotfiles/.icons/ ~/
 
 # ------------------------------------------------------
 # Clone wallpapers
diff --git a/dunst/dunstrc b/dunst/dunstrc
index eed1feb..899c261 100644
--- a/dunst/dunstrc
+++ b/dunst/dunstrc
@@ -24,7 +24,7 @@
     # dynamic width from 0 to 300
     # width = (0, 300)
     # constant width of 300
-    width = (0,300)
+    width = 300
 
     # The maximum height of a single notification, excluding the frame.
     height = (0,300)
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 61e64ba..828b32d 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -2,7 +2,7 @@
 gtk-theme-name=Adapta-Nokto-Eta
 gtk-icon-theme-name=Tela-circle-orange-dark
 gtk-font-name=Cantarell 11
-gtk-cursor-theme-name=Adwaita
+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
diff --git a/scripts/updatewal.sh b/scripts/updatewal.sh
index 9ec4ebe..c4c4f86 100755
--- a/scripts/updatewal.sh
+++ b/scripts/updatewal.sh
@@ -23,7 +23,9 @@ qtile cmd-obj -o cmd -f reload_config
 # Get new theme
 source "$HOME/.cache/wal/colors.sh"
 
+newwall=$(echo $wallpaper | sed 's|/home/raabe/wallpaper/||g')
+
 # Send notification
-notify-send "Theme updated" "Theme updated with image. \n $wallpaper"
+notify-send "Theme updated" "with image $newwall"
 
 echo "Done."