diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e55ae50
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+# OS
+.DS_Store
+
+# IDEs
+.idea/
diff --git a/oh-my-zsh/handmade.aliases.zsh b/.oh-my-zsh/custom/spy4x.aliases.zsh
similarity index 100%
rename from oh-my-zsh/handmade.aliases.zsh
rename to .oh-my-zsh/custom/spy4x.aliases.zsh
diff --git a/.oh-my-zsh/custom/spy4x.zsh-theme b/.oh-my-zsh/custom/spy4x.zsh-theme
new file mode 100644
index 0000000..0bba8be
--- /dev/null
+++ b/.oh-my-zsh/custom/spy4x.zsh-theme
@@ -0,0 +1,21 @@
+# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+
+local current_dir='%{$terminfo[bold]$fg[green]%} %~%{$reset_color%}'
+local rvm_ruby=''
+if which rvm-prompt &> /dev/null; then
+  rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
+else
+  if which rbenv &> /dev/null; then
+    rvm_ruby='%{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}'
+  fi
+fi
+local git_branch='$(git_prompt_info)%{$reset_color%}'
+
+PROMPT="╭─${current_dir} ${rvm_ruby} ${git_branch}
+╰─%B$%b "
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
diff --git a/oh-my-zsh/.zshrc b/.zshrc
similarity index 94%
rename from oh-my-zsh/.zshrc
rename to .zshrc
index b9ad681..056e948 100644
--- a/oh-my-zsh/.zshrc
+++ b/.zshrc
@@ -5,7 +5,7 @@ export ZSH=$HOME/.oh-my-zsh
 # 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="handmade"
+ZSH_THEME="spy4x"
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
@@ -41,7 +41,7 @@ ZSH_THEME="handmade"
 # Would you like to use another custom folder than $ZSH/custom?
 # ZSH_CUSTOM=/path/to/new-custom-folder
 
-DEFAULT_USER="handmade"
+DEFAULT_USER=`whoami`
 
 # 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/
@@ -53,7 +53,6 @@ source $ZSH/oh-my-zsh.sh
 
 # User configuration
 
-export PATH="/Users/handmade/opt/nodejs/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"
 # export MANPATH="/usr/local/man:$MANPATH"
 
 # You may need to manually set your language environment
diff --git a/oh-my-zsh/where-to-put.png b/oh-my-zsh/where-to-put.png
deleted file mode 100644
index d086a26..0000000
Binary files a/oh-my-zsh/where-to-put.png and /dev/null differ