diff --git a/.config/yadm/bootstrap.d/_install_gtk_gruvbox.sh b/.config/yadm/bootstrap.d/_install_gtk_gruvbox.sh
index f4abc66..6958fce 100755
--- a/.config/yadm/bootstrap.d/_install_gtk_gruvbox.sh
+++ b/.config/yadm/bootstrap.d/_install_gtk_gruvbox.sh
@@ -1,4 +1,4 @@
 #!/bin/env sh
 
 echo "# Installing GTK Theme (gruvbox)"
-yay -S gruvbox-material-gtk-theme-git gruvbox-material-icon-theme-git
+yay -S --needed gruvbox-material-gtk-theme-git gruvbox-material-icon-theme-git
diff --git a/.config/yadm/bootstrap.d/_install_keymap.sh b/.config/yadm/bootstrap.d/_install_keymap.sh
index 577163a..a8db326 100755
--- a/.config/yadm/bootstrap.d/_install_keymap.sh
+++ b/.config/yadm/bootstrap.d/_install_keymap.sh
@@ -3,5 +3,4 @@
 echo "# Installing keymapping"
 
 yay -S --needed evremap
-sudo ln -s ~/.config/evremap.toml /etc/evremap.toml
-systemctl --user enable --now evremap
+sudo ln -s -f ~/.config/evremap.toml /etc/evremap.toml
diff --git a/.config/yadm/bootstrap.d/install_git_credentials.sh b/.config/yadm/bootstrap.d/install_git_credentials.sh
new file mode 100755
index 0000000..5787309
--- /dev/null
+++ b/.config/yadm/bootstrap.d/install_git_credentials.sh
@@ -0,0 +1,6 @@
+#!/bin/env sh
+
+yay -S --needed kwallet kwalletmanager \
+  git-credential-oauth
+
+git credential-oauth configure