diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl
index b80b4aca..25f46560 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl
@@ -16,7 +16,7 @@
 {{- end }}
 
 logg 'Installing common dependencies using `pacman`'
-logg info 'Dependencies: `{{ $packages | sortAlpha | uniq | join "` `" -}}`'
+logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 ### Install base dependencies
 sudo pacman -Sy --noconfirm --needed {{ $packages | sortAlpha | uniq | join " " -}}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl
index 76b263ce..f0a5aad3 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl
@@ -7,7 +7,7 @@
 # TODO - Add Python dependencies like in ubuntu/archlinux
 
 logg 'Installing common dependencies using `dnf`'
-logg info 'Dependencies: `{{ $packages | sortAlpha | uniq | join "` `" -}}`'
+logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 ### Install base dependencies
 sudo dnf install -y {{ $packages | sortAlpha | uniq | join " " -}}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl
index 910d5824..8a9416f8 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "darwin" }}
 
 # Required for styled logging
 {{- includeTemplate "universal/logg" }}
@@ -21,10 +20,9 @@ eval $(/usr/local/bin/brew shellenv)
 {{- end }}
 
 logg 'Installing base dependencies for macOS using `brew bundle`'
-logg info 'Dependencies: `asdf` `jq` `node` `go-task/tap/go-task` `volta` `yq` `m-cli` `zx`'
-logg info 'GNU compatibility dependencies: `coreutils` `findutils` `gawk` `gnu-getopt` `gnu-indent` `gnu-tar` `gnu-sed` `gnutls` `grep`'
+logg info 'Dependencies: asdf jq node `go-task/tap/go-task volta yq m-cli zx'
+logg info 'GNU compatibility dependencies: coreutils findutils gawk gnu-getopt gnu-indent gnu-tar gnu-sed gnutls grep'
 
 brew bundle --verbose --no-lock --file=/dev/stdin <<EOF
 {{ includeTemplate "darwin/Brewfile" . }}
 EOF
-{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_11-install-darwin-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_11-install-darwin-packages.tmpl
index c43e0457..fdd567e3 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_11-install-darwin-packages.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_11-install-darwin-packages.tmpl
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "darwin" }}
 {{- $supportedManagers := list "whalebrew" "brew" "port" "go" "cargo" "npm" "pipx" "gem" "cask" "binary" }}
 #{- $packageMap := (get .installerMap $packageName) }}
 #{- if (hasKey $packageMap "_deps") }}
@@ -10,4 +9,3 @@
 
 # Examples of /etc/os-release values https://gist.github.com/natefoo/814c5bf936922dad97ff
 # Example fromJson with include from file https://github.com/twpayne/chezmoi/issues/1369
-{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl
index 019c5e69..4d3d88a0 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "ubuntu" }}
 
 # Required for styled logging
 {{- includeTemplate "universal/logg" }}
@@ -31,8 +30,7 @@
 source "$HOME/.config/shell/exports"
 
 logg 'Installing common dependencies using `apt-get`'
-logg info 'Dependencies: `{{ $packages | sortAlpha | uniq | join "` `" -}}`'
+logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 sudo apt-get update
 sudo apt-get install -y --no-install-recommends {{ $packages | sortAlpha | uniq | join " " -}}
-{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_11-install-debian-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_11-install-debian-packages.tmpl
index 644ba5da..6d8cb043 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_11-install-debian-packages.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_11-install-debian-packages.tmpl
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "debian" }}
 {{ $supportedManagers := list "flatpak" "snap" "whalebrew" "apt" "brew" "go" "cargo" "npm" "pipx" "gem" "appimage" "binary" }}
-{{- end }}
+# TODO
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl
index 87457d70..f0a5aad3 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "fedora" }}
 
 # Required for styled logging
 {{- includeTemplate "universal/logg" }}
@@ -8,8 +7,7 @@
 # TODO - Add Python dependencies like in ubuntu/archlinux
 
 logg 'Installing common dependencies using `dnf`'
-logg info 'Dependencies: `{{ $packages | sortAlpha | uniq | join "` `" -}}`'
+logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 ### Install base dependencies
 sudo dnf install -y {{ $packages | sortAlpha | uniq | join " " -}}
-{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_11-install-fedora-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_11-install-fedora-packages.tmpl
index d60f7eda..22c00792 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_11-install-fedora-packages.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_11-install-fedora-packages.tmpl
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "fedora" }}
 {{ $supportedManagers := list "flatpak" "snap" "whalebrew" "dnf" "brew" "go" "cargo" "npm" "pipx" "gem" "appimage" "binary" }}
-{{- end }}
+# TODO
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies.tmpl
index 94778e14..107cc1dd 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies.tmpl
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "opensuse" }}
 {{ $supportedManagers := list "whalebrew" "pkg" "go" "cargo" "npm" "gem" }}
-{{- end }}
+# TODO
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl
index 52d21a22..a3b1a8a1 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "freebsd" }}
 
 # Required for styled logging
 {{- includeTemplate "universal/logg" }}
@@ -8,9 +7,7 @@
 # TODO - Add Python dependencies like in ubuntu/archlinux
 
 logg 'Installing common dependencies using `pkg`'
-logg info 'Dependencies: `{{ $packages | sortAlpha | uniq | join "` `" -}}`'
+logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 ### Install base dependencies
 sudo pkg install -y {{ $packages | sortAlpha | uniq | join " " -}}
-{{- end }}
-
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-packages.tmpl
index f5746351..2be97981 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-packages.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-packages.tmpl
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "opensuse" }}
 {{ $supportedManagers := list "flatpak" "snap" "whalebrew" "zypper" "brew" "go" "cargo" "npm" "pipx" "gem" "appimage" "binary" }}
-{{- end }}
+# TODO
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl
index acbfe184..7ed11da2 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "opensuse" }}
 
 # Required for styled logging
 {{- includeTemplate "universal/logg" }}
@@ -8,9 +7,7 @@
 # TODO - Add Python dependencies like in ubuntu/archlinux
 
 logg 'Installing common dependencies using `zypper`'
-logg info 'Dependencies: `{{ $packages | sortAlpha | uniq | join "` `" -}}`'
+logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 ### Install base dependencies
 sudo zypper install -y {{ $packages | sortAlpha | uniq | join " " -}}
-
-{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl
index 019c5e69..4d3d88a0 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "ubuntu" }}
 
 # Required for styled logging
 {{- includeTemplate "universal/logg" }}
@@ -31,8 +30,7 @@
 source "$HOME/.config/shell/exports"
 
 logg 'Installing common dependencies using `apt-get`'
-logg info 'Dependencies: `{{ $packages | sortAlpha | uniq | join "` `" -}}`'
+logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 sudo apt-get update
 sudo apt-get install -y --no-install-recommends {{ $packages | sortAlpha | uniq | join " " -}}
-{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_11-install-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_11-install-packages.tmpl
index a38d9ce4..e11a82ae 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_11-install-packages.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_11-install-packages.tmpl
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
-{{- if eq .host.distro.id "ubuntu" }}
 {{- $supportedManagers := list "flatpak" "snap" "whalebrew" "apt" "brew" "go" "cargo" "npm" "pipx" "gem" "appimage" "binary" }}
-{{- end }}
+# TODO
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl
index 7995b02d..d9554350 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-{{- if or (eq .host.distro.id "darwin") (eq .host.distro.family "linux") }}
 
 # dot_tool-versions.tmpl hash: {{ include "dot_tool-versions.tmpl" | sha256sum }}
 
@@ -13,4 +12,3 @@ if [ -f "$ASDF_DIR/asdf.sh" ] && [ -f ~/.tool-versions ]; then
 else
   logg warn 'The `$ASDF_DIR/asdf.sh` or `~/.tool-versions` file is not present'
 fi
-{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab.tmpl
index fdd536a5..f3509468 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab.tmpl
@@ -1,10 +1,12 @@
 #!/usr/bin/env sh
-{{- if and (or (eq .host.distro.id "darwin") (eq .host.distro.family "linux")) false }}
+{{- if false }}
 
 # {{ output "sha256sum" (joinPath .chezmoi.sourceDir "private_dot_config/crontab/config")  }}
 
+# Required for PATHs (including logging)
 source "$HOME/.config/shell/exports"
-logg 'Installing crontab jobs'
 
+logg 'Installing crontab jobs'
 crontab < "$XDG_CONFIG_HOME/crontab/config"
 {{- end }}
+# TODO
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl
index cc2211dc..e5be5fbe 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-{{- if or (eq .host.distro.id "darwin") (eq .host.distro.family "linux") }}
 
 # {{ output "sha256sum" (joinPath .chezmoi.sourceDir ".chezmoidata.yaml")  }}
 
@@ -168,4 +167,3 @@ if command -v zoxide >/dev/null; then
 elif [ -f "$COMPLETION_DIR/zoxide.bash" ]; then
   rm "$COMPLETION_DIR/zoxide.bash"
 fi
-{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl
index 02a91acf..a5970dbd 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl
@@ -8,3 +8,4 @@ logg 'Bootstrapping Z4H'
 
 Z4H_BOOTSTRAPPING=1 exec zsh && exit 0
 {{- end }}
+# TODO
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps
similarity index 97%
rename from dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps.tmpl
rename to dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps
index 640e8e23..f909d193 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-{{- if or (eq .host.distro.id "darwin") (eq .host.distro.family "linux") }}
 
 # @description Installs glow (a markdown renderer) from GitHub releases
 # @example installGlow
@@ -69,4 +68,3 @@ echo "Ensuring Gum and Glow are installed (for logging)"
 installGlow &
 installGum &
 wait
-{{- end }}