diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 7c22e21..2f013d5 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -15,7 +15,7 @@ set-window-option -g pane-base-index 1
 
 set -g default-terminal "screen-256color"
 set -ga terminal-overrides ",xterm-256color*:Tc" # tell Tmux that outside terminal supports true color
-set -g default-shell zsh
+# set -g default-shell zsh
 
 # force a reload of the config file
 unbind r
diff --git a/zsh/.aliases.sh b/zsh/.aliases.sh
index ff35b24..1d01d2d 100644
--- a/zsh/.aliases.sh
+++ b/zsh/.aliases.sh
@@ -89,7 +89,7 @@ get_current_activity() {
 }
 
 cl_search() {
-    hg whatsout | xargs -i sh -c "echo {} && grep $1 {}"
+    hg whatsout | xargs -i sh -c "echo {} && grep '$1' {}"
 }
 
 cl_replace() {
@@ -106,6 +106,26 @@ objfs_cp() {
     fileutil cp -f $1 $tmp && unzip $tmp $2 && unlink $tmp
 }
 
+from_cloud(){
+    scp baggins.c.googlers.com:$1 ~/Downloads/
+    echo "Saved $1 to downloads"
+}
+
+to_cloud(){
+    scp $1 baggins.c.googlers.com:~/Downloads
+    echo "Saved $1 to downloads"
+}
+
+from_mac(){
+    scp cnieves-macbookpro.roam.internal:$1 ~/Downloads/
+    echo "Saved $1 to downloads"
+}
+
+to_mac(){
+    scp $1 cnieves-macbookpro.roam.internal:~/Downloads
+    echo "Saved $1 to downloads"
+}
+
 alias acid=/google/bin/releases/mobile-devx-platform/acid/acid
 alias apido='/google/data/ro/teams/oneplatform/apido'
 alias bugs=/google/data/rw/users/mk/mkannan/www/bin/bugs
diff --git a/zsh/.bash_profile.local b/zsh/.bash_profile.local
index 3d563f6..1e2f59b 100644
--- a/zsh/.bash_profile.local
+++ b/zsh/.bash_profile.local
@@ -58,5 +58,5 @@ source ~/g3path.zsh
 source /etc/bash_completion.d/hgd
 
 export HGSHORT_CMDS="ls cat head tail mv cp rm chmod g4 diff merge patch meld trim less more"
-alias hgd='source /google/src/head/depot/google3/experimental/fig_contrib/hgshort/hgd.sh'
 export ACID_STARTUP_SCRIPT_PATH=~/acid_startup.sh
+alias hgd='source /google/src/head/depot/google3/experimental/fig_contrib/hgshort/hgd.sh'
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 451adc3..d1884cd 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,15 +1,13 @@
 # set -xv
 
 # source ~/fig_prompt
-export ZSH="$HOME/.oh-my-zsh"
-source $ZSH/oh-my-zsh.sh
-
 if [ -f ${HOME}/.zplug/init.zsh ]; then
     source ${HOME}/.zplug/init.zsh
 fi
 
-# zplug "zsh-users/zsh-syntax-highlighting", defer:2
-# zplug "mafredri/zsh-async", from:"github", use:"async.zsh"
+zplug "zsh-users/zsh-syntax-highlighting", defer:2
+zplug "mafredri/zsh-async", from:"github", use:"async.zsh"
+zplug load
 
 # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
 # Initialization code that may require console input (password prompts, [y/n]
@@ -19,7 +17,7 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
 fi
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
-plugins=(zsh-async zsh-autosuggestions)
+plugins=(zsh-autosuggestions)
 
 ZSH_THEME=powerlevel10k/powerlevel10k
 DISABLE_AUTO_TITLE=true
@@ -238,3 +236,5 @@ autoload -Uz add-zsh-hook
 export FZF_DEFAULT_OPTS="--preview 'echo {}' --preview-window down:3:wrap --bind ?:toggle-preview"
 
 source ~/.bash_profile
+export ZSH="$HOME/.oh-my-zsh"
+source $ZSH/oh-my-zsh.sh