diff --git a/Makefile b/Makefile
index f7880995..b607f549 100644
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,18 @@ linux_arm:
 	GOARCH=arm GOOS=linux go build $(BENCH)
 	mv bench bench_1.0_linux_arm
 
-back_dotsfile:
-	cp ~/.zsh_local etc/dotsfile
-	cp ~/.tmux.conf etc/dotsfile
-	cp ~/.vimrc etc/dotsfile
+
+DOCS=etc/dotsfile
+back_dotsfile:
+	cp ~/.zshrc $(DOCS)
+	cp ~/.tmux.conf $(DOCS)
+	cp ~/.vimrc $(DOCS)
+
+load_dotsfile: ~/.zshrc ~/.tmux.conf ~/.vimrc
+~/.zshrc: $(DOCS)/.zshrc
+	cp $(DOCS)/.zshrc ~/
+~/.tmux.conf: $(DOCS)/.tmux.conf
+	cp $(DOCS)/.tmux.conf ~/
+~/.vimrc: $(DOCS)/.vimrc
+	cp $(DOCS)/.vimrc ~/
 
diff --git a/etc/dotsfile/.zsh_local b/etc/dotsfile/.zsh_local
deleted file mode 100644
index e69de29b..00000000
diff --git a/etc/dotsfile/.zshrc b/etc/dotsfile/.zshrc
new file mode 100644
index 00000000..61dc9fd5
--- /dev/null
+++ b/etc/dotsfile/.zshrc
@@ -0,0 +1,108 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH=$HOME/.oh-my-zsh # {{{
+
+# Set name of the theme to load. Optionally, if you set this to "random"
+# it'll load a random theme each time that oh-my-zsh is loaded.
+# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
+ZSH_THEME="robbyrussell"
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion. Case
+# sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment the following line to disable bi-weekly auto-update checks.
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(tmux git)
+
+source $ZSH/oh-my-zsh.sh
+source ~/.oh-my-zsh/plugins/z/z.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# ssh
+# export SSH_KEY_PATH="~/.ssh/dsa_id"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+# }}}
+
+export PROMPT=$LOCAL_PROMPT'%![%*]%c$ '
+export EDITOR=vim
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+[ -f ~/.zsh_local ] && source ~/.zsh_local
+
+alias RR="source ~/.zshrc"
+
+alias t='tmux'
+alias v='vim'
+alias g='git'
+
+bindkey -e
+bindkey jk accept-line
+bindkey "^N" down-line-or-beginning-search
+bindkey "^P" up-line-or-beginning-search
+
+bindkey -M vicmd j down-line-or-beginning-search
+bindkey -M vicmd k up-line-or-beginning-search
+