diff --git a/README.md b/README.md
index cad1f084..fc7f9981 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,11 @@ Welcome to my dungeon. Here, I keep all my configuration files in case I have a
 
 ## Installation
 
-Just run `git clone --recurse-submodules github.com/yigitcolakoglu/dotfiles.git ~/.dotfiles`. This will download everything you need. After that, I have a list of all the packages I have installed on my machine in the directory chroot/. If you have any problems regarding the setup, you should first check whether you have missing packages. After the clone process, it is pretty straightforward, you can run the `install.sh` script which creates necessary symlinks. Finally, DO NOT FORGET to run sudo make clean install in each directory under suckless, I also have a script named build.sh in that directory which does that automatically. 
+Just run 
+```sh
+git clone --recurse-submodules https://github.com/theFr1nge/dotfiles.git ~/.dotfiles && ~/.dotfiles/install.sh
+```
+This will download everything you need. After that, I have a list of all the packages I have installed on my machine in the directory chroot/. If you have any problems regarding the setup, you should first check whether you have missing packages. After the clone process, it is pretty straightforward, you can run the `install.sh` script which creates necessary symlinks. Finally, DO NOT FORGET to run sudo make clean install in each directory under suckless, I also have a script named build.sh in that directory which does that automatically. 
 
 ## Some eye candy
 
@@ -26,9 +30,3 @@ Just run `git clone --recurse-submodules github.com/yigitcolakoglu/dotfiles.git
 
 ![Workspace 1](screenshots/w4.jpg) 
 
-## TODOs
-
-* Improve the go function written in surf
-* Add the documentation for all the keybinds 
-* ~Improve the way indicators look~
-* ~!!! High priority add an indicator for insert mode~
diff --git a/chroot/AUR.txt b/chroot/AUR.txt
index 23e97a63..99651c93 100644
--- a/chroot/AUR.txt
+++ b/chroot/AUR.txt
@@ -6,7 +6,6 @@ betterdiscordctl-git
 betterlockscreen
 bitwarden
 bitwarden-dmenu
-canon-pixma-ts5055-complete
 canto-next-git
 capt-src
 checkupdates+aur
diff --git a/gtk/themes/themes b/gtk/themes/themes
new file mode 120000
index 00000000..52afc161
--- /dev/null
+++ b/gtk/themes/themes
@@ -0,0 +1 @@
+/home/yigit/.dotfiles/gtk/themes
\ No newline at end of file
diff --git a/install.sh b/install.sh
index f3596815..8b936ac0 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,49 @@
 #!/bin/bash
 
+# Install packages
+echo "Running update"
+sudo pacman -Syu
+sudo pacman --needed -S $(cat ~/.dotfiles/chroot/nonAUR.txt)
+yay -S --needed $(cat ~/.dotfiles/chroot/AUR.txt)
+
+# Initial cleanup
+echo "Backing up your previous dotfiles to ~/.dotfiles_backup"
+mkdir -p ~/.dotfiles_backup
+mkdir -p ~/.config
+mkdir -p ~/.dotfiles_backup/.config
+
+rsync -avzh --ignore-errors \
+  ~/.completions \
+  ~/.aliases \
+  ~/.cmds \
+  ~/.zshrc \
+  ~/.Xresources \
+  ~/.xmodmap \
+  ~/.xinitrc \
+  ~/.tmux.conf \
+  ~/.surf \
+  ~/.scripts \
+  ~/.keyboard \
+  ~/.fzf.zsh \
+  ~/.themes \
+  ~/.vim \
+  ~/.vimrc \
+  ~/.dotfiles_backup
+
+rsync -avzh --ignore-errors \
+  ~/.config/htop \
+  ~/.config/.profile \
+  ~/.config/systemd \
+  ~/.config/termite \
+  ~/.config/zathura \
+  ~/.config/dunst \
+  ~/.config/gtk-4.0 \
+  ~/.config/gtk-3.0 \
+  ~/.config/gtk-2.0 \
+  ~/.config/antibody \
+  ~/.config/suckless \
+  ~/.dotfiles_backup/.config
+
 # Vim
 ln -s ~/.dotfiles/vim/vimrc ~/.vimrc
 ln -s ~/.dotfiles/vim/vim ~/.vim
@@ -15,6 +59,7 @@ ln -s ~/.dotfiles/misc/dunst ~/.config/dunst
 ln -s ~/.dotfiles/misc/zathura ~/.config/zathura
 ln -s ~/.dotfiles/misc/termite/ ~/.config/termite
 ln -s ~/.dotfiles/misc/systemd ~/.config/systemd
+ln -s ~/.dotfiles/misc/neofetch ~/.config/neofetch
 ln -s ~/.dotfiles/misc/profile ~/.config/.profile
 ln -s ~/.dotfiles/misc/htop ~/.config/htop
 ln -s ~/.dotfiles/misc/.fzf.zsh ~/.fzf.zsh
@@ -45,3 +90,6 @@ ln -s ~/.dotfiles/zsh/cmds ~/.cmds
 ln -s ~/.dotfiles/zsh/aliases ~/.aliases
 ln -s ~/.dotfiles/zsh/completions ~/.completions
 
+# Install vim and tmux plugins
+mkdir -p ~/.tmux/plugins
+vim -c ':PlugInstall'
diff --git a/misc/.fzf.zsh b/misc/.fzf.zsh
new file mode 100644
index 00000000..f0fac174
--- /dev/null
+++ b/misc/.fzf.zsh
@@ -0,0 +1,13 @@
+# Setup fzf
+# ---------
+if [[ ! "$PATH" == */home/yigit/.fzf/bin* ]]; then
+  export PATH="${PATH:+${PATH}:}/home/yigit/.fzf/bin"
+fi
+
+# Auto-completion
+# ---------------
+[[ $- == *i* ]] && source "/home/yigit/.fzf/shell/completion.zsh" 2> /dev/null
+
+# Key bindings
+# ------------
+source "/home/yigit/.fzf/shell/key-bindings.zsh"
diff --git a/misc/neofetch/neofetch b/misc/neofetch/neofetch
new file mode 120000
index 00000000..9996a09f
--- /dev/null
+++ b/misc/neofetch/neofetch
@@ -0,0 +1 @@
+/home/yigit/.dotfiles/misc/neofetch
\ No newline at end of file
diff --git a/scripts/scripts b/scripts/scripts
new file mode 120000
index 00000000..1ccce449
--- /dev/null
+++ b/scripts/scripts
@@ -0,0 +1 @@
+/home/yigit/.dotfiles/scripts
\ No newline at end of file
diff --git a/suckless/build.sh b/suckless/build.sh
index 999edba3..d9634e80 100755
--- a/suckless/build.sh
+++ b/suckless/build.sh
@@ -3,12 +3,13 @@
 for d in */ ; do
   echo "Building in $d..."
   cd $d
-  sudo make clean install
+  sudo make install
   if [ $? -ne 0 ]; then
     echo "An error occured..."
     exit 1
+  fi
   cd ..
   echo "Done..."
 done
 
-echo "All builds done, you might want to check whether any errors has occures
+echo "All builds done, you might want to check whether any errors has occures"
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 4eeeb917..95a800d3 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -152,5 +152,8 @@ set -g @tmux_power_show_download_speed true
 set -g @tmux_power_prefix_highlight_pos 'L'
 set -g @tmux_power_show_web_reachable true
 
+if "test ! -d ~/.tmux/plugins/tpm" \
+   "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
+
 run '~/.tmux/plugins/tpm/tpm'
 
diff --git a/vim/vim/plugin/plugins.vim b/vim/vim/plugin/plugins.vim
index e202cc53..70cb0a06 100644
--- a/vim/vim/plugin/plugins.vim
+++ b/vim/vim/plugin/plugins.vim
@@ -27,7 +27,7 @@ Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
 Plug 'sheerun/vim-polyglot'
 Plug 'M4R7iNP/vim-inky'
 Plug 'vim-airline/vim-airline'
-Plug 'ycm-core/YouCompleteMe'
+Plug 'ycm-core/YouCompleteMe', { 'do': './install.py' }
 Plug 'vim-scripts/indentpython.vim'
 Plug 'frazrepo/vim-rainbow'
 Plug 'preservim/nerdcommenter'
@@ -37,7 +37,7 @@ Plug 'ryanoasis/vim-devicons'
 Plug 'puremourning/vimspector'
 Plug 'lervag/vimtex'
 Plug 'gi1242/vim-tex-autoclose'
-Plug 'ActivityWatch/aw-watcher-vim'
+" Plug 'ActivityWatch/aw-watcher-vim'
 Plug 'wakatime/vim-wakatime'
 Plug 'gu-fan/riv.vim'
 Plug 'gu-fan/InstantRst'
diff --git a/vim/vim/vim b/vim/vim/vim
new file mode 120000
index 00000000..9714be5d
--- /dev/null
+++ b/vim/vim/vim
@@ -0,0 +1 @@
+/home/yigit/.dotfiles/vim/vim
\ No newline at end of file