diff --git a/.dotter/global.toml b/.dotter/global.toml
index fdf2f83..1ba4b5c 100644
--- a/.dotter/global.toml
+++ b/.dotter/global.toml
@@ -12,10 +12,15 @@ js_linter = "\"standard\""
 js_fixer = "\"standard\""
 
 [zsh.files]
-zshrc = "~/.zshrc"
 zprofile = "~/.zprofile"
 zsh = "~/.zsh"
 
+[zsh_zplug.files]
+zshrc_zplug = "~/.zshrc"
+
+[zsh_zinit.files]
+zshrc_zinit = "~/.zshrc"
+
 [shell.files]
 # Optional variables email+git_username
 gitconfig = "~/.gitconfig"
diff --git a/.gitignore b/.gitignore
index 9be7a1d..90a3907 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /global.toml
 .dotter/cache.toml
 .dotter/local.toml
+.dotter/cache/
+.dotter/cache.toml
diff --git a/ssh/config b/ssh/config
index d9d7259..0227c74 100644
--- a/ssh/config
+++ b/ssh/config
@@ -3,3 +3,15 @@ Host *
   UserKnownHostsFile /dev/null
   ForwardAgent yes
 
+Host git.lawsnote.com
+  Port 2222
+  User git
+  HostName git.lawsnote.com
+
+Host dev
+  User mtfos
+  HostName 192.168.200.14
+
+Host vpn
+  User root
+  HostName 192.168.201.254
diff --git a/zprofile b/zprofile
index 25970b3..bdb4891 100644
--- a/zprofile
+++ b/zprofile
@@ -22,11 +22,12 @@ else
     start_agent;
 fi
 
+export FLUTTER_ROOT="$HOME/apps/flutter"
 export GOPATH="$HOME/go"
 export GOROOT="$HOME/apps/go"
 export NODE_ROOT="$HOME/apps/node"
 
-export PATH="$GOPATH/bin:$GOROOT/bin:$NODE_ROOT/bin:$PATH"
+export PATH="$GOPATH/bin:$GOROOT/bin:$NODE_ROOT/bin:$FLUTTER_ROOT/bin:$PATH"
 
 if [ -f "$HOME/.cargo/env" ]; then
   . "$HOME/.cargo/env"
@@ -35,3 +36,9 @@ fi
 if [ -d "$HOME/bin" ]; then
   export PATH="$HOME/bin:$PATH"
 fi
+
+# The next line updates PATH for the Google Cloud SDK.
+if [ -f '/Users/jay/apps/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/jay/apps/google-cloud-sdk/path.zsh.inc'; fi
+
+# The next line enables shell command completion for gcloud.
+if [ -f '/Users/jay/apps/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/jay/apps/google-cloud-sdk/completion.zsh.inc'; fi
diff --git a/zsh/20_keybind.zsh b/zsh/20_keybind.zsh
index e716391..e3ca6c8 100644
--- a/zsh/20_keybind.zsh
+++ b/zsh/20_keybind.zsh
@@ -4,6 +4,8 @@ bindkey -v
 autoload -U edit-command-line
 zle -N edit-command-line
 
+bindkey ',' autosuggest-accept
+
 bindkey -M viins '^X^E' edit-command-line
 # Add emacs-like keybind to viins mode
 bindkey -M viins '^F'  forward-char
diff --git a/zsh/zsh.sh b/zsh/zsh.sh
new file mode 100644
index 0000000..b7bf9ee
--- /dev/null
+++ b/zsh/zsh.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+dir=$(dirname $0)
+
+for i in $(ls $dir/*.zsh);
+do
+        source "$i"
+done
diff --git a/zshrc_zinit b/zshrc_zinit
new file mode 100644
index 0000000..7a729d3
--- /dev/null
+++ b/zshrc_zinit
@@ -0,0 +1,34 @@
+source ~/.zinit/bin/zinit.zsh
+
+# theme
+zinit ice wait
+zinit light "tinyRatP/ys"
+
+zinit light zsh-users/zsh-completions
+zinit light zsh-users/zsh-autosuggestions
+zinit light zdharma-continuum/fast-syntax-highlighting
+zinit light zsh-users/zsh-completions
+zinit light mattbangert/kubectl-zsh-plugin
+
+# OhMyZSH Plugs
+zinit snippet OMZ::lib/completion.zsh
+zinit snippet OMZ::lib/git.zsh
+zinit snippet OMZ::lib/theme-and-appearance.zsh
+zinit snippet OMZP::tmux
+zinit ice as="completion"
+zinit snippet OMZ::plugins/docker/_docker
+zinit snippet OMZP::composer
+zinit snippet OMZ::plugins/sudo/sudo.plugin.zsh
+zinit ice lucid wait='1'
+zinit snippet OMZ::plugins/git/git.plugin.zsh
+
+# Load OMZ extract folder
+zinit ice svn
+zinit snippet OMZ::plugins/extract
+
+# auto load other zshfiles
+[ -f "$HOME/.zsh/zsh.sh" ] && source "$HOME/.zsh/zsh.sh"
+
+[ -f "$HOME/.zprofile" ] && source "$HOME/.zprofile"
+
+# vim: set ft=zsh:
diff --git a/zshrc b/zshrc_zplug
similarity index 100%
rename from zshrc
rename to zshrc_zplug