diff --git a/.config/yadm/_install_dependencies.sh b/.config/yadm/_install_dependencies.sh
new file mode 100755
index 0000000..0b35e8d
--- /dev/null
+++ b/.config/yadm/_install_dependencies.sh
@@ -0,0 +1,9 @@
+#!/bin/env bash
+
+echo "Installing general apps"
+
+yay -S --needed neovim \
+  kitty \
+  btop \
+  zoxide fzf \
+  superfile
diff --git a/.config/yadm/_install_desktop_env.sh b/.config/yadm/_install_desktop_env.sh
new file mode 100755
index 0000000..7d2d8a6
--- /dev/null
+++ b/.config/yadm/_install_desktop_env.sh
@@ -0,0 +1,29 @@
+#!/bin/env bash
+
+echo "Installing dependencies for $XDG_SESSION_DESKTOP"
+
+if [ $XDG_SESSION_DESKTOP = "i3" ]; then
+  yay -S --needed polybar \
+    betterlockscreen \
+    dunst \
+    pulseaudio-control \
+    nitrogen
+
+fi
+
+if [ $XDG_SESSION_DESKTOP = "Hyprland" ]; then
+  yay -S --needed waybar \
+    hyprlock \
+    swww \
+    hyprswitch \
+    nwg-dock-hyprland \
+    nwg-drawer \
+    swaync \
+    wlogout wayland-logout \
+    hyprpicker \
+    pulseaudio-control \
+    wl-clipboard \
+    grim \
+    slurp
+
+fi
diff --git a/.config/yadm/_install_fonts.sh b/.config/yadm/_install_fonts.sh
new file mode 100755
index 0000000..7b4ae36
--- /dev/null
+++ b/.config/yadm/_install_fonts.sh
@@ -0,0 +1,5 @@
+#!/bin/env bash
+
+yay -S --needed getnf
+getnf -i "JetBrainsMono"
+fc-cache
diff --git a/.config/yadm/_install_keymap.sh b/.config/yadm/_install_keymap.sh
new file mode 100755
index 0000000..577163a
--- /dev/null
+++ b/.config/yadm/_install_keymap.sh
@@ -0,0 +1,7 @@
+#!/bin/env bash
+
+echo "# Installing keymapping"
+
+yay -S --needed evremap
+sudo ln -s ~/.config/evremap.toml /etc/evremap.toml
+systemctl --user enable --now evremap
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index bb3bdfb..69d4b76 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -21,47 +21,12 @@ debug() {
 CYAN='\033[0;36m'
 NC='\033[0m'
 
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
+
 # install dependencies
-if confirm "Install dependencies (general)?"; then
-  yay -S --needed neovim \
-    kitty \
-    btop \
-    zoxide fzf \
-    evremap \
-    superfile
-fi
+source "$SCRIPT_DIR/_install_dependencies.sh"
 
-if [ $XDG_SESSION_DESKTOP = "i3" ]; then
-  echo -e "${CYAN}# Installing dependencies (for i3)${NC}"
-  yay -S --needed polybar \
-    betterlockscreen \
-    dunst \
-    pulseaudio-control \
-    nitrogen
+source "$SCRIPT_DIR/_install_desktop_env.sh"
 
-fi
-
-if [ $XDG_SESSION_DESKTOP = "Hyprland" ]; then
-  echo -e "${CYAN}# Installing dependencies (for Hyprland)${NC}"
-  yay -S --needed waybar \
-    hyprlock \
-    swww \
-    hyprswitch \
-    nwg-dock-hyprland \
-    nwg-drawer \
-    swaync \
-    wlogout wayland-logout \
-    hyprpicker \
-    pulseaudio-control \
-    wl-clipboard \
-    grim \
-    slurp
-
-fi
-
-echo "# Appling setup"
-sudo ln -s ~/.config/evremap.toml /etc/evremap.toml
-systemctl --user enable --now evremap
-
-getnf -i "JetBrainsMono"
-fc-cache
+source "$SCRIPT_DIR/_install_keymap.sh"
+source "$SCRIPT_DIR/_install_fonts.sh"