diff --git a/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl b/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl
index eedda647..dae07699 100644
--- a/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl
@@ -838,6 +838,15 @@ installDockerRclonePlugin() {
   fi
 }
 
+# @description Installs a terminal theme that matches across various terminals by utilizing the `~/.local/bin/install-terminal-theme` script
+installTerminalTheme() {
+  if command -v install-terminal-theme > /dev/null; then
+    install-terminal-theme
+  else
+    logg warn 'install-terminal-theme is not available'
+  fi
+}
+
 # @description
 #     This script loads crontab jobs that are defined and housed in your Install Doctor fork.
 loadCronjobs() {
@@ -1002,6 +1011,7 @@ if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
   gnomeExtensionSettings
   grubSettings
   installDockerRclonePlugin
+  installTerminalTheme
   loadCronjobs
   macOSSettings
   makeLocalBinExecutable
@@ -1028,6 +1038,7 @@ else
   gnomeExtensionSettings &
   grubSettings &
   installDockerRclonePlugin &
+  installTerminalTheme &
   loadCronjobs &
   macOSSettings &
   makeLocalBinExecutable &
diff --git a/home/dot_config/shell/macos.sh.tmpl b/home/dot_config/shell/macos.sh.tmpl
index bb71411c..f6687975 100644
--- a/home/dot_config/shell/macos.sh.tmpl
+++ b/home/dot_config/shell/macos.sh.tmpl
@@ -13,10 +13,9 @@ logg info 'A sudo password is required to apply some of the macOS optimizations.
 sudo echo "Sudo access granted."
 
 # Log commands
-if [ "$DEBUG" = 'true' ]; then
+if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then
 	set -x
 fi
-set -x
 
 # Enable SSH access
 sudo systemsetup -setremotelogin {{ .macosRemoteLogin }}
@@ -841,20 +840,6 @@ defaults write com.operasoftware.OperaDeveloper PMPrintingExpandedStateForPrint2
 # Don’t show the preferences window on next start
 # defaults write com.irradiatedsoftware.SizeUp ShowPrefsOnNextStart -bool false
 
-###############################################################################
-# Sublime Text                                                                #
-###############################################################################
-
-# Install Sublime Text settings
-# cp -r init/Preferences.sublime-settings ~/Library/Application\ Support/Sublime\ Text*/Packages/User/Preferences.sublime-settings 2> /dev/null
-
-###############################################################################
-# Spectacle.app                                                               #
-###############################################################################
-
-# Set up my preferred keyboard shortcuts
-# cp -r init/spectacle.json ~/Library/Application\ Support/Spectacle/Shortcuts.json 2> /dev/null
-
 ###############################################################################
 # Transmission.app                                                            #
 ###############################################################################