diff --git a/.zimrc b/.zimrc
index c00bd9a..7aa48fc 100644
--- a/.zimrc
+++ b/.zimrc
@@ -7,7 +7,7 @@
 zmodule environment
 zmodule git
 zmodule input
-zmodule termtitle
+zmodule ad1217/termtitle
 zmodule utility
 
 # Prompt
diff --git a/.zshrc b/.zshrc
index a24f56a..579a320 100644
--- a/.zshrc
+++ b/.zshrc
@@ -19,7 +19,9 @@ SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
 WORDCHARS=${WORDCHARS//[\/]}
 
 # Set window title format
-zstyle ':zim:termtitle' format '%~:zsh'
+zstyle ':zim:termtitle' format '%~:${1:-zsh}'
+# Set window title before running a command
+zstyle ':zim:termtitle' hooks 'precmd' 'preexec'
 
 # Append `../` to your input for each `.` you type after an initial `..`
 zstyle ':zim:input' double-dot-expand yes