diff --git a/install.sh b/install.sh
index 107aa004c2d233ff6a6ab1ea149aa4baaf08962f..faa2a68778f1982e00e0e689fbaf84117b0dfeb4 100644
--- a/install.sh
+++ b/install.sh
@@ -19,7 +19,6 @@ function build_libs_from_sources(){
   build_from_git "https://git.suckless.org/wmname" "sudo make install"
   build_from_git "https://github.com/robbyrussell/oh-my-zsh.git" "sh ./tools/install.sh"
   build_from_git "https://github.com/actionless/pikaur.git" "makepkg -fsri"
-  build_from_git "https://gitlab.le-memese.com/s3rius/music_bg.git" "makepkg -fsri"
   build_from_git "https://gitlab.le-memese.com/s3rius/awatch.git" "makepkg -fsri"
 }
 
@@ -32,6 +31,7 @@ function update_firefox_profile(){
 }
 
 function copy_dotfiles(){
+  mkdir -p "$HOME/.local/bin/"
   sed "s#{{dwm_dir}}#$(pwd)/dwm#g" ./update_desktop.sh > "$HOME/.local/bin/update_desktop"
   chmod 777 "$HOME/.local/bin/update_desktop"
   cp -v ./dotfiles/.zshrc      "$HOME"
@@ -49,21 +49,20 @@ function copy_dotfiles(){
   git clone https://github.com/bobthecow/git-flow-completion ~/.oh-my-zsh/custom/plugins/git-flow-completion
 }
 
-function enable_services(){
-  systemctl --user enable music_bg.service
+function update_repo(){
+for remote in `git branch -r | grep -v '\->'`; do
+	git branch --track "${remote#origin/}" "$remote"
+done
 }
 
 function main(){
   # shellcheck disable=SC2046
   sudo pacman -Syu --needed $(cat ./pacman.deps)
+  build_libs_from_sources
   # shellcheck disable=SC2046
   pikaur -Syu --needed --noconfirm --noedit $(cat ./pikaur.deps)
-  update_firefox_profile
-  build_libs_from_sources
-  enable_services
   copy_dotfiles
-  git remote update
-  git pull --all
+  update_repo
   echo "######## Installation complete ########"
   echo "Now you can build your desktop."
   echo "To do so just run \`update_desktop -f\`"
diff --git a/pacman.deps b/pacman.deps
index b0b7831105480d86ffee7aa86e3ea6b288bb2f91..d7ff438cfcbafa4ab99052169177e4ee8cebae8b 100644
--- a/pacman.deps
+++ b/pacman.deps
@@ -23,6 +23,8 @@ unclutter
 vim
 xdg-utils
 xorg
+xorg-xinit
 xorg-xclock
 xterm
+konsole
 zsh
diff --git a/pikaur.deps b/pikaur.deps
index 6285136ed826220aa97eba6d117026d2745cc89b..b779a786a77b9d90b5813fe243494d3c3c8082bc 100644
--- a/pikaur.deps
+++ b/pikaur.deps
@@ -4,4 +4,3 @@ gotop
 paper-icon-theme-git
 ttf-symbola
 ttf-ubraille
-tuijam