diff --git a/themes/master.zsh-theme b/themes/master.zsh-theme
index 24e1e8c52..6425e08bc 100644
--- a/themes/master.zsh-theme
+++ b/themes/master.zsh-theme
@@ -1,7 +1,19 @@
+# Aliases
+alias edit="sublime ~/.zshrc"
+alias showFiles="defaults write com.apple.finder AppleShowAllFiles YES; killall Finder"
+alias hideFiles="defaults write com.apple.finder AppleShowAllFiles NO; killall Finder"
+alias compC="g++ -std=c++11"
+alias aOut="./a.out"
+alias server="python -m SimpleHTTPServer"
+alias theme="sublime ~/.oh-my-zsh/themes/master.zsh-theme"
+
+# Prompt
 local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
 PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
+# Macros
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
+