diff --git a/.aliases b/.aliases
new file mode 100644
index 0000000..adb25aa
--- /dev/null
+++ b/.aliases
@@ -0,0 +1,13 @@
+alias a="ls -la"
+alias al="zsh_stats"
+alias ga="git add"
+alias gaa="git add ."
+alias gcm="git commit -m"
+alias gd="git diff"
+alias gl="git log"
+alias gh="git hist"
+alias grm="git rm"
+alias gs="git status"
+alias l="ls -lvh --color=auto"
+alias s="cd ~/Source"
+alias v="vim"
diff --git a/.bashrc b/.bashrc
deleted file mode 100755
index bce8767..0000000
--- a/.bashrc
+++ /dev/null
@@ -1,70 +0,0 @@
-# [----------------------------------------------------------------------------]
-# [----------------------------- PROMPT ---------------------------------------]
-# [----------------------------------------------------------------------------]
-hostn=$(hostname -s)
-usern=$(whoami)
-
-function prompt {
-  ctime=$(date +%T)
-  prmpt="[${PWD}][${ctime}]"
-  let FILLS=${COLUMNS}-${#prmpt}
-  LINE=""
-
-  if [[ "$PWD" =~ "/home/$usern" ]]; then
-    let FILLS=$FILLS+5+${#usern}
-  fi
-
-  for (( f=0; f<$FILLS; f++ ))  
-  do   
-    LINE=$LINE"\e[0;34;44m-"  
-  done   
-
-  PS1="\e[44;1;37m[\t] \w ${LINE}\e[0m\n"
-  if [ "$SSH_CONNECTION" == "" ]; then
-    PS1="$PS1\[\e[1;32;40m\][\u@\h]"
-  else
-    PS1="$PS1\[\e[1;33;40m\][\u@\h]"
-  fi
-  PS1="$PS1\$(if [ \$? = 0 ]; then echo -e \"\$\"; else echo -e \"\[\e[0;31m\]\$\"; fi)\[\e[0m\] "
-} 
-PROMPT_COMMAND=prompt
-
-# [----------------------------------------------------------------------------]
-# [----------------------------- ALIAS  ---------------------------------------]
-# [----------------------------------------------------------------------------]
-
-# Common parameters
-alias ls='ls -v --color=auto'
-alias ll='ls -lavh'
-alias grep='grep --color'
-
-# Seems like a better idea than it actually is?
-#alias sudo='sudo env PATH=$PATH'
-
-# move around
-alias ..='cd ..'
-alias ...='cd ../..'
-alias ....='cd ../../..'
-
-# for git
-alias get='git'
-alias ga='git add'
-alias gaa='git add .'
-alias gs='git status'
-alias gl='git log'
-alias gcm='git commit -m'
-alias gcf='git commit -F'
-
-# random
-alias calc='bc <<<'
-
-# [----------------------------------------------------------------------------]
-# [------------------------------ OTHER ---------------------------------------]
-# [----------------------------------------------------------------------------]
-# Case insensitive matching
-shopt -s nocaseglob
-
-# [----------------------------------------------------------------------------]
-# [------------------------------ PATH ----------------------------------------]
-# [----------------------------------------------------------------------------]
-PATH=$PATH:$HOME/bin
diff --git a/.gitconfig b/.gitconfig
index e5f15e1..07a102a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,13 @@
 [user]
-	name = Andrew Tomaka
-	email = atomaka@gmail.com
+    name = Andrew Tomaka
+    email = atomaka@gmail.com
+[github]
+    user = atomaka
+
+[apply]
+    whitespace = fix
+[alias]
+    hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
 [color]
     ui = auto
 [color "branch"]
@@ -16,12 +23,12 @@
     added = yellow
     changed = green
     untracked = cyan
-[merge]
-    tool = vimdiff
-[apply]
-    whitespace = fix
-[core]
+[core]    
     excludesfile = ~/.gitignore_global
     autocrlf = input
     editor = subl
-    filemode = false
\ No newline at end of file
+    filemode = false
+[merge]
+    tool = vimdiff
+[push]
+    default = upstream
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b66fe48
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".oh-my-zsh"]
+	path = .oh-my-zsh
+	url = https://github.com/robbyrussell/oh-my-zsh.git
diff --git a/.inputrc b/.inputrc
deleted file mode 100755
index 54de828..0000000
--- a/.inputrc
+++ /dev/null
@@ -1,2 +0,0 @@
-set completion-ignore-case On
-TAB: menu-complete
diff --git a/.oh-my-zsh b/.oh-my-zsh
new file mode 160000
index 0000000..b6ea876
--- /dev/null
+++ b/.oh-my-zsh
@@ -0,0 +1 @@
+Subproject commit b6ea876971b2270a2c73a07a6f6a337604132c6f
diff --git a/.profile b/.profile
deleted file mode 100755
index 86795d7..0000000
--- a/.profile
+++ /dev/null
@@ -1 +0,0 @@
-source ~/.bashrc
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..374f961
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,27 @@
+" Options
+set nocompatible        " Disable vi compatibility
+set ffs=unix,dos        " File format prefer unix endings
+set eol                 " Add newlien at end of file
+set shellslash          " Forward slashes
+set nobk                " No backup files
+set textwidth=80
+set laststatus=2        " Always show status line
+set showmode            " Show current mode
+set history=100         " History length
+set cul                 " Highlight current line
+set nowrap              " Disable wrapping by default
+set backspace=2         " Backspace over indent, eol, start of insert
+set hlsearch            " Search highlights
+set wrapscan            " Wraped search
+set incsearch           " Search as yuo type
+set ignorecase          " Ignore case with search
+set smartcase           " Search will not ignore uppercase
+set showcmd             " Show command as you type
+set hls                 " Highlight search (hlsearch?)
+set ruler               " Show cursor position
+set autoindent
+" Tabs are 2 spaces
+set tabstop=2
+set softtabstop=2
+set shiftwidth=2
+set expandtab
diff --git a/.zshrc b/.zshrc
new file mode 100644
index 0000000..3f875c8
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,63 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.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="robbyrussell"
+
+# List directory when changing (github/r00k)
+chpwd() {
+  ls -lvh --color=auto
+}
+
+# Larger history
+HISTSIZE=10000
+HISTFILE=~/.zsh_history
+SAVEHIST=10000
+
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Comment this out to disable bi-weekly auto-update checks
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment to change how often before auto-updates occur? (in days)
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want to disable command autocorrection
+# DISABLE_CORRECTION="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment 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"
+
+# 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)
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
+
+# Aliases file
+source $HOME/.aliases
+
+# Add personal bin folder
+PATH=$PATH:$HOME/bin
+
+# Customize to your needs...