diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks
new file mode 100644
index 0000000..e69de29
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
new file mode 100644
index 0000000..54d958c
--- /dev/null
+++ b/.config/gtk-3.0/settings.ini
@@ -0,0 +1,17 @@
+[Settings]
+gtk-theme-name=Gruvbox-Material-Dark
+gtk-icon-theme-name=Adwaita
+gtk-font-name=Cantarell 11
+gtk-cursor-theme-name=default
+gtk-cursor-theme-size=24
+gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=0
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=0
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintslight
+gtk-xft-rgba=rgb
+gtk-application-prefer-dark-theme=0
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 69d4b76..e142034 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -1,32 +1,29 @@
 #!/bin/bash
 
-confirm() {
-  # call with a prompt string or use a default
-  read -r -p "${1} [y/N] " response
-  case "$response" in
-  [yY][eE][sS] | [yY])
-    1
-    ;;
-  *)
-    0
-    ;;
-  esac
-}
+# Save this file as ~/.config/yadm/bootstrap and make it executable. It will
+# execute all executable files (excluding templates and editor backups) in the
+# ~/.config/yadm/bootstrap.d directory when run.
 
-debug() {
-  echo "Debug:"
-  echo "XDG_SESSION_DESKTOP $XDG_SESSION_DESKTOP"
-}
+set -eu
 
-CYAN='\033[0;36m'
-NC='\033[0m'
+# Directory to look for bootstrap executables in
+BOOTSTRAP_D="${BASH_SOURCE[0]}.d"
 
-SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
+if [[ ! -d "$BOOTSTRAP_D" ]]; then
+  echo "Error: bootstrap directory '$BOOTSTRAP_D' not found" >&2
+  exit 1
+fi
 
-# install dependencies
-source "$SCRIPT_DIR/_install_dependencies.sh"
+declare -a bootstraps
+while IFS= read -r bootstrap; do
+  if [[ -x "$bootstrap" && ! "$bootstrap" =~ "##" && ! "$bootstrap" =~ ~$ ]]; then
+    bootstraps+=("$bootstrap")
+  fi
+done < <(find -L "$BOOTSTRAP_D" -type f | sort)
 
-source "$SCRIPT_DIR/_install_desktop_env.sh"
-
-source "$SCRIPT_DIR/_install_keymap.sh"
-source "$SCRIPT_DIR/_install_fonts.sh"
+for bootstrap in "${bootstraps[@]}"; do
+  if ! "$bootstrap"; then
+    echo "Error: bootstrap '$bootstrap' failed" >&2
+    exit 1
+  fi
+done
diff --git a/.config/yadm/_install_dependencies.sh b/.config/yadm/bootstrap.d/_install_dependencies.sh
similarity index 100%
rename from .config/yadm/_install_dependencies.sh
rename to .config/yadm/bootstrap.d/_install_dependencies.sh
diff --git a/.config/yadm/_install_desktop_env.sh b/.config/yadm/bootstrap.d/_install_desktop_env.sh
similarity index 100%
rename from .config/yadm/_install_desktop_env.sh
rename to .config/yadm/bootstrap.d/_install_desktop_env.sh
diff --git a/.config/yadm/_install_fonts.sh b/.config/yadm/bootstrap.d/_install_fonts.sh
similarity index 100%
rename from .config/yadm/_install_fonts.sh
rename to .config/yadm/bootstrap.d/_install_fonts.sh
diff --git a/.config/yadm/bootstrap.d/_install_gtk_gruvbox.sh b/.config/yadm/bootstrap.d/_install_gtk_gruvbox.sh
new file mode 100755
index 0000000..f4abc66
--- /dev/null
+++ b/.config/yadm/bootstrap.d/_install_gtk_gruvbox.sh
@@ -0,0 +1,4 @@
+#!/bin/env sh
+
+echo "# Installing GTK Theme (gruvbox)"
+yay -S gruvbox-material-gtk-theme-git gruvbox-material-icon-theme-git
diff --git a/.config/yadm/_install_keymap.sh b/.config/yadm/bootstrap.d/_install_keymap.sh
similarity index 100%
rename from .config/yadm/_install_keymap.sh
rename to .config/yadm/bootstrap.d/_install_keymap.sh
diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
new file mode 100644
index 0000000..ee42267
--- /dev/null
+++ b/.gtkrc-2.0
@@ -0,0 +1,19 @@
+# DO NOT EDIT! This file will be overwritten by nwg-look.
+# Any customization should be done in ~/.gtkrc-2.0.mine instead.
+
+include "/home/michel/.gtkrc-2.0.mine"
+gtk-theme-name="Gruvbox-Material-Dark"
+gtk-icon-theme-name="Adwaita"
+gtk-font-name="Cantarell 11"
+gtk-cursor-theme-name="default"
+gtk-cursor-theme-size=24
+gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=0
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=0
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle="hintslight"
+gtk-xft-rgba="rgb"