diff --git a/.gitignore b/.gitignore
index 0037380..c3e0e93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 id_rsa
 id_rsa.pub
+id_rsa-cert.pub
 known_hosts
diff --git a/roles/bootstrap/vars/main.yaml b/roles/bootstrap/vars/main.yaml
index 1b09145..be86589 100644
--- a/roles/bootstrap/vars/main.yaml
+++ b/roles/bootstrap/vars/main.yaml
@@ -2,16 +2,20 @@
 packages_all:
   - ack
   - build-essential
+  - dmenu
   - fish
+  - grim
   - htop
   - ispell
-  - grimshot
   - tmux
   - sway
   - swaylock
   - waybar
   - vim
+  - wdisplays
 packages_debian:
-  - vim
+  - foot
 packages_ubuntu:
-  - vim
+  # required for foot compilation
+  - meson
+  - ninja-build
diff --git a/roles/dotfiles/files/home/vimrc b/roles/dotfiles/files/home/vimrc
index 261e68c..b3006a3 100644
--- a/roles/dotfiles/files/home/vimrc
+++ b/roles/dotfiles/files/home/vimrc
@@ -1,6 +1,7 @@
 set number
 set colorcolumn=80
 set background=dark
+set cursorline
 syntax on
 colorscheme monokai
 
diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml
index 711c72a..b36f140 100644
--- a/roles/dotfiles/tasks/main.yml
+++ b/roles/dotfiles/tasks/main.yml
@@ -9,6 +9,32 @@
     paths: "{{ role_path }}/files/home"
     file_type: any
   register: home_files
+- name: Create a backup dir
+  file:
+    path: "~/tmp/dotfiles_backup"
+    state: directory
+- name: Backup home files
+  copy:
+    src: "{{ item.path }}"
+    dest: "~/tmp/dotfiles_backup"
+    remote_src: True
+  loop: "{{ home_files.files }}"
+- name: Backup config files
+  copy:
+    src: "{{ item.path }}"
+    dest: "~/tmp/dotfiles_backup"
+    remote_src: True
+  loop: "{{ config_files.files }}"
+- name: Remove exisiting home files
+  file:
+    path: "~/.{{ item.path | basename }}/"
+    state: absent
+  loop: "{{ home_files.files }}"
+- name: Remove exisiting config files
+  file:
+    path: "~/.config/{{ item.path | basename }}/"
+    state: absent
+  loop: "{{ config_files.files }}"
 - name: Link home files
   file:
     src: "{{ item.path }}"