diff --git a/README.md b/README.md
index f2a29bf..f3ac11d 100644
--- a/README.md
+++ b/README.md
@@ -4,18 +4,20 @@ My current setup is [Linux Mint Vera](https://linuxmint.com/edition.php?id=302)
 
 ## Before installing
 
-- Put Ansible Vault password in .vault_password
-- Install git and curl
+- `sudo apt-get install curl git python3-distutils`
+- `export PATH=$PATH:~/.local/bin`
 - Install Ansible: https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html
 
 ## TODO
 
-- Telegram (maybe only possible to download)
+- Telegram (maybe only possible to download) (third party PPA might be easiest)
 - thunderbird config
 - i3 app shortcuts
 - firefox config? extensions? host own synchronizer?
 - i3 stutters
 - i3 sleep
+- Smart script to manage screens: if external screen is connected, only show on that screen. Otherwise, show on laptop screen.
+- drop-in includement of bashrc parts
 
 #### Neovim
 
diff --git a/inventory/host_vars/self.yml b/inventory/host_vars/self.yml
index 827f31f..e1249c2 100644
--- a/inventory/host_vars/self.yml
+++ b/inventory/host_vars/self.yml
@@ -1,4 +1,4 @@
-distribution_release: jammy
+distribution_release: focal
 first_name: Pim
 last_name: Kunis
 full_name: "{{ first_name }} {{ last_name }}"
diff --git a/playbooks/laptop.yml b/playbooks/laptop.yml
index df8979c..d3bd821 100644
--- a/playbooks/laptop.yml
+++ b/playbooks/laptop.yml
@@ -27,7 +27,5 @@
       tags: [virtualbox]
     - role: vscodium
       tags: [vscodium]
-    - role: strawberry
-      tags: [strawberry]
     - role: nicotine
       tags: [nicotine]
diff --git a/roles/alacritty/tasks/main.yml b/roles/alacritty/tasks/main.yml
index 3485b4f..baa666d 100644
--- a/roles/alacritty/tasks/main.yml
+++ b/roles/alacritty/tasks/main.yml
@@ -3,11 +3,11 @@
   apt_key:
     keyserver: keyserver.ubuntu.com
     id: 3A160895CC2CE253085D08A552B24DF7D43B5377
-    keyring: /etc/apt/keyrings/alacritty.gpg
+    keyring: /etc/apt/trusted.gpg.d/alacritty.gpg
 - name: Install PPA repository
   become: true
   apt_repository:
-    repo: "deb [signed-by=/etc/apt/keyrings/alacritty.gpg] https://ppa.launchpadcontent.net/aslatter/ppa/ubuntu {{ distribution_release }} main"
+    repo: "deb [signed-by=/etc/apt/trusted.gpg.d/alacritty.gpg] https://ppa.launchpadcontent.net/aslatter/ppa/ubuntu {{ distribution_release }} main"
   register: apt_repository
 - name: Update APT cache
   become: true
diff --git a/roles/bash/files/fzf.bash b/roles/bash/files/fzf.bash
index 39d3587..1a9c847 100644
--- a/roles/bash/files/fzf.bash
+++ b/roles/bash/files/fzf.bash
@@ -1,4 +1,4 @@
-export FZF_DEFAULT_COMMAND=fd
+export FZF_DEFAULT_COMMAND=fdfind
 
 # Options to fzf command
 export FZF_COMPLETION_OPTS='--border --info=inline'
@@ -31,5 +31,5 @@ _fzf_comprun() {
   esac
 }
 
+source /usr/share/doc/fzf/examples/completion.bash
 source /usr/share/doc/fzf/examples/key-bindings.bash
-source /usr/share/bash-completion/completions/fzf
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 854efbc..f6f1eb4 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -1,3 +1,9 @@
+- name: Enable non-free packages
+  become: true
+  replace:
+    path: "/etc/apt/sources.list"
+    regexp: "^(.*main.*?)( contrib non-free)?$"
+    replace: '\1 contrib non-free'
 - name: APT upgrade
   become: true
   apt:
diff --git a/roles/i3/tasks/main.yml b/roles/i3/tasks/main.yml
index 5a32596..935b35f 100644
--- a/roles/i3/tasks/main.yml
+++ b/roles/i3/tasks/main.yml
@@ -3,8 +3,9 @@
   apt:
     pkg:
       - i3-wm
-      - rofi
+      - i3status
       - i3lock
+      - rofi
       - nitrogen
 - name: Create i3 config directory
   file:
diff --git a/roles/keepassxc/files/keepassxc.ini b/roles/keepassxc/files/keepassxc.ini
index 068f9ce..9ab2192 100644
--- a/roles/keepassxc/files/keepassxc.ini
+++ b/roles/keepassxc/files/keepassxc.ini
@@ -6,7 +6,7 @@ CustomProxyLocation=
 Enabled=true
 
 [FdoSecrets]
-Enabled=false
+Enabled=true
 
 [GUI]
 MinimizeOnClose=true
diff --git a/roles/keepassxc/tasks/main.yml b/roles/keepassxc/tasks/main.yml
index b7b4961..404add2 100644
--- a/roles/keepassxc/tasks/main.yml
+++ b/roles/keepassxc/tasks/main.yml
@@ -1,4 +1,5 @@
 - name: Uninstall gnome-keyring
+  become: true
   apt:
     name: gnome-keyring
     state: absent
diff --git a/roles/neovim/tasks/main.yml b/roles/neovim/tasks/main.yml
index 1611660..c66a63b 100644
--- a/roles/neovim/tasks/main.yml
+++ b/roles/neovim/tasks/main.yml
@@ -3,11 +3,11 @@
   apt_key:
     keyserver: keyserver.ubuntu.com
     id: 9DBB0BE9366964F134855E2255F96FCF8231B6DD
-    keyring: /etc/apt/keyrings/neovim.gpg
+    keyring: /etc/apt/trusted.gpg.d/neovim.gpg
 - name: Install Neovim PPA
   become: true
   apt_repository:
-    repo: "deb [signed-by=/etc/apt/keyrings/neovim.gpg] https://ppa.launchpadcontent.net/neovim-ppa/unstable/ubuntu {{ distribution_release }} main"
+    repo: "deb [signed-by=/etc/apt/trusted.gpg.d/neovim.gpg] https://ppa.launchpadcontent.net/neovim-ppa/unstable/ubuntu {{ distribution_release }} main"
   register: apt_repository
 - name: Update APT cache
   become: true
diff --git a/roles/nicotine/tasks/main.yml b/roles/nicotine/tasks/main.yml
index 18063b8..585c596 100644
--- a/roles/nicotine/tasks/main.yml
+++ b/roles/nicotine/tasks/main.yml
@@ -3,11 +3,11 @@
   apt_key:
     keyserver: keyserver.ubuntu.com
     id: 6CEB6050A30E5769
-    keyring: /etc/apt/keyrings/nicotine.gpg
+    keyring: /etc/apt/trusted.gpg.d/nicotine.gpg
 - name: Install PPA repository
   become: true
   apt_repository:
-    repo: "deb [signed-by=/etc/apt/keyrings/nicotine.gpg] https://ppa.launchpadcontent.net/nicotine-team/stable/ubuntu {{ distribution_release }} main"
+    repo: "deb [signed-by=/etc/apt/trusted.gpg.d/nicotine.gpg] https://ppa.launchpadcontent.net/nicotine-team/stable/ubuntu {{ distribution_release }} main"
   register: apt_repository
 - name: Update APT cache
   become: true
diff --git a/roles/strawberry/tasks/main.yml b/roles/strawberry/tasks/main.yml
index 857cc1b..e10cef0 100644
--- a/roles/strawberry/tasks/main.yml
+++ b/roles/strawberry/tasks/main.yml
@@ -3,11 +3,11 @@
   apt_key:
     keyserver: keyserver.ubuntu.com
     id: BE5ED0F9261CAAD9A1E5B1A4CD6289E999EA819D
-    keyring: /etc/apt/keyrings/strawberry.gpg
+    keyring: /etc/apt/trusted.gpg.d/strawberry.gpg
 - name: Install PPA repository
   become: true
   apt_repository:
-    repo: "deb [signed-by=/etc/apt/keyrings/strawberry.gpg] https://ppa.launchpadcontent.net/jonaski/strawberry/ubuntu {{ distribution_release }} main"
+    repo: "deb [signed-by=/etc/apt/trusted.gpg.d/strawberry.gpg] https://ppa.launchpadcontent.net/jonaski/strawberry/ubuntu {{ distribution_release }} main"
   register: apt_repository
 - name: Update APT cache
   become: true
diff --git a/roles/syncthing/tasks/main.yml b/roles/syncthing/tasks/main.yml
index 66c2d9a..fee13e0 100644
--- a/roles/syncthing/tasks/main.yml
+++ b/roles/syncthing/tasks/main.yml
@@ -3,11 +3,11 @@
   apt_key:
     keyserver: keyserver.ubuntu.com
     id: "37C84554E7E0A261E4F76E1ED26E6ED000654A3E"
-    keyring: /etc/apt/keyrings/syncthing.gpg
+    keyring: /etc/apt/trusted.gpg.d/syncthing.gpg
 - name: Install APT repository
   become: true
   apt_repository:
-    repo: "deb [signed-by=/etc/apt/keyrings/syncthing.gpg] https://apt.syncthing.net/ syncthing stable"
+    repo: "deb [signed-by=/etc/apt/trusted.gpg.d/syncthing.gpg] https://apt.syncthing.net/ syncthing stable"
   register: apt_repository
 - name: Update APT cache
   become: true
diff --git a/roles/system/tasks/main.yml b/roles/system/tasks/main.yml
index e31cda6..187f944 100644
--- a/roles/system/tasks/main.yml
+++ b/roles/system/tasks/main.yml
@@ -28,11 +28,11 @@
   apt_key:
     keyserver: keyserver.ubuntu.com
     id: "798AEC654E5C15428C8E42EEAA16FCBCA621E701"
-    keyring: /etc/apt/keyrings/hashicorp.gpg
+    keyring: /etc/apt/trusted.gpg.d/hashicorp.gpg
 - name: Install Hashicorp repository
   become: true
   apt_repository:
-    repo: "deb [signed-by=/etc/apt/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com {{ distribution_release }} main"
+    repo: "deb [signed-by=/etc/apt/trusted.gpg.d/hashicorp.gpg] https://apt.releases.hashicorp.com {{ distribution_release }} main"
   register: apt_repository
 - name: Update APT cache
   become: true
@@ -60,8 +60,3 @@
     enabled: true
     scope: user
     state: started
-- name: Disable Mint Report
-  become: true
-  file:
-    path: /etc/xdg/autostart/mintreport.desktop
-    state: absent
diff --git a/roles/wireguard/templates/home.conf.j2 b/roles/wireguard/templates/home.conf.j2
index 6d10195..597767d 100644
--- a/roles/wireguard/templates/home.conf.j2
+++ b/roles/wireguard/templates/home.conf.j2
@@ -1,10 +1,10 @@
 [Interface]
-Privatekey={{ private_key }}
+Privatekey={{ wg_private_key }}
 Address = 10.225.191.4/24,fd11:5ee:bad:c0de::4/64
 DNS=192.168.10.1
 
 [Peer]
 Publickey=fa3mQ7ximJbH7cu2ZbWidto5xBGxEEfWvCCiUDk00Hg=
-PresharedKey={{ preshared_key }}
+PresharedKey={{ wg_preshared_key }}
 Endpoint=wg.geokunis2.nl:51820
 AllowedIPs = 0.0.0.0/0, ::0/0
diff --git a/roles/wireguard/vars/main.yml b/roles/wireguard/vars/main.yml
index b4059f7..9851c2c 100644
--- a/roles/wireguard/vars/main.yml
+++ b/roles/wireguard/vars/main.yml
@@ -1,4 +1,4 @@
-private_key: !vault |
+wg_private_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           66373536666638303935653866346565636236613831616139316437336564653732646538333431
           3366386633353633313932373730373738663534303138630a336539366539623832343034396438
@@ -6,7 +6,7 @@ private_key: !vault |
           6637383765663066380a613330326566313764663635326335353964343438316336613130393462
           61663539656433336135396362623862623336613464346139356466633365663939346366346335
           3561326462646131346238633334613539623161653838386435
-preshared_key: !vault |
+wg_preshared_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           30323832316230326261663365363938306161623639643261376164373563346665643261656632
           6432616232633465356565653638333830396561613435300a666662353138346638636631366661