diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index cacd99c..a84a342 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -59,7 +59,7 @@ processes=("polybar" "sxhkd" "dunst" "mpd")
 pidof -q picom || { picom --config "$HOME"/.config/picom/picom.conf & }
 
 # Set random wallpaper for actual rice
-feh -z --no-fehbg --bg-fill "$HOME"/pics/wallpapers
+feh -z --no-fehbg --bg-fill $(xdg-user-dir PICTURES)/wallpapers
 
 # Reload sxhkd daemon
 sxhkd -c "$HOME"/.config/sxhkd/sxhkdrc &
diff --git a/misc/bin/wallselector b/misc/bin/wallselector
index 37a3935..0f9c5b5 100644
--- a/misc/bin/wallselector
+++ b/misc/bin/wallselector
@@ -11,7 +11,7 @@ elif ! command -v convert > /dev/null 2>&1; then
 fi
 
 # Set some variables
-wall_dir="${HOME}/pics/wallpapers"
+wall_dir="$(xdg-user-dir PICTURES)wallpapers"
 cacheDir="${HOME}/.cache/wallselector"
 rofi_command="rofi -dmenu -theme ${HOME}/.config/rofi/wallselector.rasi -theme-str ${rofi_override}"
 
diff --git a/setup.sh b/setup.sh
index 7daca62..d792544 100644
--- a/setup.sh
+++ b/setup.sh
@@ -55,7 +55,7 @@ logo "Installing needed packages.."
 dependencies=(alacritty base-devel brightnessctl bspwm dunst feh git imagemagick jgmenu \
               jq libnotify libwebp lsd maim mpc mpd ncmpcpp neofetch neovim \
               pacman-contrib pamixer papirus-icon-theme physlock picom playerctl \
-	       	  polkit-gnome polybar ranger rofi rustup sxhkd \
+	       	  polkit-gnome polybar ranger rofi sxhkd \
 	      	  ttf-inconsolata ttf-jetbrains-mono ttf-jetbrains-mono-nerd ttf-joypixels \
               ttf-terminus-nerd ueberzug webp-pixbuf-loader xclip xdg-user-dirs xdo xdotool \
 	      	  xorg-xdpyinfo xorg-xkill xorg-xprop xorg-xrandr xorg-xsetroot xorg-xwininfo \
@@ -80,16 +80,6 @@ done
 sleep 3
 clear
 
-########## ---------- Preparing Folders ---------- ##########
-
-# Checks if the file user-dirs.dirs does not exist in ~/.config
-	if [ ! -e "$HOME/.config/user-dirs.dirs" ]; then
-		xdg-user-dirs-update
-		echo "Creating xdg-user-dirs"
-	fi
-sleep 2 
-clear
-
 ########## ---------- Cloning the Rice! ---------- ##########
 
 logo "Downloading dotfiles"
@@ -157,6 +147,14 @@ for files in ~/dotfiles/config/*; do
   fi
 done
 
+# Checks if the file user-dirs.dirs does not exist in ~/.config
+	if [ ! -e "$HOME/.config/user-dirs.dirs" ]; then
+		xdg-user-dirs-update
+		echo "Creating xdg-user-dirs"
+	fi
+sleep 2 
+clear
+
 for files in ~/dotfiles/misc/bin/*; do
   cp -R "${files}" ~/.local/bin/
   if [ $? -eq 0 ]; then
@@ -202,7 +200,7 @@ for files in ~/dotfiles/misc/assets/*; do
 done
 
 for files in ~/dotfiles/home/pics/*; do
-  cp -R "${files}" ~/pics/
+  cp -R "${files}" $(xdg-user-dir PICTURES)
   if [ $? -eq 0 ]; then
 	printf "%s%s%s file copied successfully!%s\n" "${BLD}" "${CGR}" "${files}" "${CNC}"
 	sleep 1