diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index f223521..6f9c23c 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -53,9 +53,9 @@ set-option -g status-interval 2
 bind Escape confirm-before "kill-server"
 
 # Automatically set window title
-set-window-option -g automatic-rename off
-set-window-option -g allow-rename on
-#set-option -g set-titles on
+set-option -g automatic-rename off
+# set-option -g automatic-rename on
+# set-option -g automatic-rename-format '#{?#{m/r:^(/google/src)?/cloud/,#{pane_current_path}},#{s|^(/google/src)?/cloud/[^/]+/([^/]+).+$|\2|:pane_current_path},#{b:pane_current_path}}'
 
 set-window-option -g xterm-keys on
 set-option -g xterm-keys on
diff --git a/zsh/.bash_profile.google b/zsh/.bash_profile.google
index cef75fa..4d7c117 100644
--- a/zsh/.bash_profile.google
+++ b/zsh/.bash_profile.google
@@ -21,17 +21,6 @@ function gcert() {
   source /google/bin/releases/knock/knock.sh
 }
 
-function tmux_title() {
-  if [[ $PWD =~ /google/src/cloud/[^/]+/([^/]+)/.* ]]; then
-    tmx2 rename-window "${match[1]}"
-  else
-    tmx2 rename-window "$(basename "`pwd`")"
-  fi
-}
-if [[ ! -z "$TMUX" ]]; then
-  precmd_functions+=(tmux_title)
-fi
-
 
 FORTUNES=/google/data/ro/users/di/diamondm/engfortunes/fortune.sh
 if [ -f "$FORTUNES" ]; then
diff --git a/zsh/.zshrc b/zsh/.zshrc
index f8e8ba6..2669414 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -30,7 +30,8 @@ zplug "zsh-users/zsh-syntax-highlighting", defer:2
 zplug "mafredri/zsh-async", from:"github", use:"async.zsh"
 zplug "zsh-users/zsh-autosuggestions"
 zplug "zsh-users/zsh-history-substring-search"
-zplug "modules/prompt", from:prezto
+zplug "modules/command-not-found", from:prezto
+zplug "modules/completion", from:prezto
 zplug "romkatv/powerlevel10k", as:theme, depth:1
 # zplug "stedolan/jq", from:gh-r, as:command, rename-to:jq
 
@@ -100,9 +101,6 @@ typeset -Ag color colour
 
 prompt_google3() {
     if [[ $PWD =~ '/google/src/cloud/[^/]+/(.+)/google3(.*)' ]]; then
-        # Use CitC client names as window titles in screen/tmux
-        print -n "\e]2;${match[1]}\a" >/dev/tty
-
         GPROMPT=$(print -r -- "//${match[2]#/}")
     else
         GPROMPT=$(print -r -- "$PWD")
@@ -112,9 +110,6 @@ prompt_google3() {
 
 prompt_workspace() {
     if [[ $PWD =~ '/google/src/cloud/[^/]+/(.+)/google3(.*)' ]]; then
-        # Use CitC client names as window titles in screen/tmux
-        print -n "\e]2;${match[1]}\a" >/dev/tty
-
         GPROMPT=$(print -r -- "$match[1]")
         # #fff is different than white i guess
         p10k segment -b 63 -f '#fff' -t $GPROMPT