diff --git a/vimrc.new b/vimrc.new
new file mode 100644
index 0000000..561dab6
--- /dev/null
+++ b/vimrc.new
@@ -0,0 +1,32 @@
+execute pathogen#infect()
+
+" Pathogen modules used:
+" * git://github.com/altercation/vim-colors-solarized.git
+" * https://github.com/sheerun/vim-wombat-scheme.git
+" * git://github.com/tpope/vim-fugitive.git
+" * git://github.com/tpope/vim-git.git
+" * https://github.com/tpope/vim-sensible.git
+"
+" Standalone colorschemes used:
+" * https://github.com/jnurmine/Zenburn.git
+" * https://github.com/sjl/badwolf.git
+
+syntax on
+filetype plugin indent on
+
+set softtabstop=2
+set shiftwidth=2
+set number
+"set smartindent
+set cindent
+set list
+set listchars=tab:▻\ ,trail:◈
+
+" Align the asterisks of c-style comments
+set comments-=s1:/*,mb:*,ex:*/
+set comments+=s:/*,mb:\ *,ex:\ */
+set comments+=fb:*
+
+"set background=dark
+"let g:badwolf_darkgutter=1
+colorscheme zenburn
diff --git a/zsh/zshenv b/zsh/zshenv
new file mode 100644
index 0000000..56b5f78
--- /dev/null
+++ b/zsh/zshenv
@@ -0,0 +1 @@
+export ZDOTDIR=$HOME/.zsh
diff --git a/zsh/zshrc b/zsh/zshrc
new file mode 100644
index 0000000..199e9be
--- /dev/null
+++ b/zsh/zshrc
@@ -0,0 +1,97 @@
+# Path to your oh-my-zsh installation.
+export ZSH=/home/ovandenb/.zsh/oh-my-zsh
+
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+ZSH_THEME="fishy"
+
+# 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="yyyy-mm-dd"
+HISTFILE="$ZDOTDIR/.zsh_history"
+
+# 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=(sudo systemd themes tmux todo zsh_reload)
+plugins=(ansible sudo systemd themes tmux todo web-search zsh_reload)
+
+# User configuration
+ZSH_TMUX_AUTOSTART=false
+ZSH_TMUX_AUTOCONNECT=false
+ZSH_TMUX_FIXTERM=false
+ZSH_TMUX_GENERATE_SESSIONNAME=true
+#ZSH_TMUX_SESSIONNAME=`egrep '^[a-z]{4}$' /usr/share/dict/words | sort -R | tail -1`
+
+export PATH="/home/ovandenb/bin:/home/ovandenb/gocode/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/home/ovandenb/.local/bin:/home/ovandenb/bin/packer"
+# export MANPATH="/usr/local/man:$MANPATH"
+
+source $ZSH/oh-my-zsh.sh
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+export GOPATH="$HOME/gocode"
+export EDITOR="vim"
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+#
+#export TERM='gnome-256color'
+
+# 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_EOL_MARK="⏎"