diff --git a/git/gitconfig.j2 b/git/gitconfig.j2
index 1cff690..a6b6a21 100644
--- a/git/gitconfig.j2
+++ b/git/gitconfig.j2
@@ -33,7 +33,7 @@
 
     k = "!gitk --all"
 
-    serve = !git daemon --reuseaddr --verbose  --base-path=. --export-all ./.git
+    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
 
     last = "log -1 HEAD"
 
@@ -126,7 +126,7 @@
 [includeIf "gitdir:/var/lib/dotfiles/.git"]
     path = /var/lib/dotfiles/gitcfg
 [delta]
-    navigate = true    # use n and N to move between diff sections
+    navigate = true # use n and N to move between diff sections
 
     # delta detects terminal colors automatically; set one of these to disable auto-detection
     # dark = true
diff --git a/i3/config.j2 b/i3/config.j2
index cb61240..1ba2b2d 100644
--- a/i3/config.j2
+++ b/i3/config.j2
@@ -64,8 +64,8 @@
     set $up    k
     set $right l
 
-    set $splith v
-    set $splitv c
+    set $splith       v
+    set $splitv       c
     set $split_toggle x
 
     set $fullscreen f
@@ -95,7 +95,6 @@
 
     set $screenshot o
 
-
 ################################################################################
 ### WORKSPACE ASSIGNMENTS ######################################################
 ################################################################################
@@ -111,7 +110,6 @@ workspace $workspace8 output {{ machine.screen.8 }}
 workspace $workspace9 output {{ machine.screen.9 }}
 workspace $workspace10 output {{ machine.screen.0 }}
 
-
 assign [class="^KeePassXC$"] $workspace8
 
 # See https://github.com/i3/i3/issues/2060
@@ -206,8 +204,9 @@ assign [class="^Wine$"] $workspace10
 
     ### START APPLICATIONS #####################################################
 
-    bindsym $mod+d exec --no-startup-id $scriptdir/appmenu
-    bindsym $mod+Return exec $terminal
+    bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi run -display-combi "run"
+
+    bindsym $mod+Return       exec $terminal
     bindsym $mod+Shift+Return exec $calc
 
     bindsym F1 exec --no-startup-id $scriptdir/shutdown-menu
diff --git a/install_scripts/bootstrap.sh b/install_scripts/bootstrap.sh
index be882ad..9437835 100755
--- a/install_scripts/bootstrap.sh
+++ b/install_scripts/bootstrap.sh
@@ -3,7 +3,7 @@
 set -o nounset
 set -o errexit
 
-host="${1}"   ; shift
+host="${1}" ; shift
 
 pacman -Sy --noconfirm git # yes its a partial upgrade, but thats just the live cd
 
diff --git a/playbook.yml b/playbook.yml
index c22fade..a09eb29 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -468,8 +468,8 @@
 
               filename="$(</var/lib/makepkg/{{ item.name }}/pkgname)"
 
-              name=$(pacman -Qi --file "${filename}"  | grep '^Name' | awk '{print $3}')
-              version=$(pacman -Qi --file "${filename}"  | grep '^Version' | awk '{print $3}')
+              name=$(pacman -Qi --file "${filename}" | grep '^Name' | awk '{print $3}')
+              version=$(pacman -Qi --file "${filename}" | grep '^Version' | awk '{print $3}')
 
               if [[ "$(pacman -Q "${name}")" == "${name} ${version}" ]] ; then
                 exit 0
diff --git a/zsh/zprofile.j2 b/zsh/zprofile.j2
index dd3a6b4..913ed1a 100644
--- a/zsh/zprofile.j2
+++ b/zsh/zprofile.j2
@@ -80,9 +80,9 @@ feature_dir="${XDG_RUNTIME_DIR}/features/"
 rm -rf "${feature_dir}"/
 mkdir -p "${feature_dir}"
 
-[[ $MACHINE_HAS_NEXTCLOUD     == "true" ]] && touch "${feature_dir}"/nextcloud
-[[ $MACHINE_HAS_KEEPASSXC     == "true" ]] && touch "${feature_dir}"/keepassxc
-[[ $MACHINE_HAS_STEAM         == "true" ]] && touch "${feature_dir}"/steam
+[[ $MACHINE_HAS_NEXTCLOUD == "true" ]] && touch "${feature_dir}"/nextcloud
+[[ $MACHINE_HAS_KEEPASSXC == "true" ]] && touch "${feature_dir}"/keepassxc
+[[ $MACHINE_HAS_STEAM     == "true" ]] && touch "${feature_dir}"/steam
 
 [[ $MACHINE_TYPE == "laptop" ]] && touch "${feature_dir}"/machine_is_laptop