diff --git a/runs/after/espanso b/runs/after/espanso
new file mode 100755
index 0000000..22a73c0
--- /dev/null
+++ b/runs/after/espanso
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -e
+set -o nounset
+set -o pipefail
+
+install() {
+	log "	Setting up espanso."
+	sudo setcap "cap_dac_override+p" "$(which espanso)"
+	espanso service register
+	espanso service start
+}
+
+arg=${1:-""}
+[[ $arg == "install" ]] && install && exit 0
diff --git a/runs/after/system b/runs/after/system
new file mode 100755
index 0000000..25820ab
--- /dev/null
+++ b/runs/after/system
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -e
+set -o nounset
+set -o pipefail
+
+install() {
+	log "	Setting user shell to 'zsh'."
+	sudo chsh --shell "$(which zsh)"
+	log "	Enabling up systemd services."
+	systemctl --user daemon-reload
+	systemctl --user enable --now logout-task.service
+	systemctl --user enable --now battery-monitor.timer
+	systemctl --user enable --now tmux-kill-sessions.timer
+	sudo systemctl enable --now pcscd.service
+	sudo systemctl enable --now firewalld.service
+}
+
+arg=${1:-""}
+[[ $arg == "install" ]] && install
diff --git a/runs/before/espanso b/runs/before/espanso
new file mode 100755
index 0000000..9fa43f3
--- /dev/null
+++ b/runs/before/espanso
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+set -o nounset
+set -o pipefail
+
+uninstall() {
+	log "	Tearing down espanso."
+	espanso service stop
+	espanso service unregister
+}
+
+arg=${1:-""}
+[[ $arg == "uninstall" ]] && uninstall && exit 0
diff --git a/runs/utils/run-handler b/runs/utils/run-handler
index 196eb19..bb79ea1 100755
--- a/runs/utils/run-handler
+++ b/runs/utils/run-handler
@@ -18,7 +18,7 @@ GREP_STR=${RUN_GREP_STR:-""}
 
 log() {
 	logging log --source "$THIS_FILE" --echo "$@"
-} && export -f log
+}
 
 run_before_or_after() {
 	local dir file run