diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/git/git.plugin.zsh b/git/git.plugin.zsh
index 41e0170..a962d6d 100644
--- a/git/git.plugin.zsh
+++ b/git/git.plugin.zsh
@@ -3,6 +3,7 @@ alias gadda="gadd -A"
 alias gstatus="git status"
 alias gdiff="git diff"
 alias glog="git log"
+alias glogg="git log --graph"
 alias glast="glog -p -1"
 alias gcheckout="git checkout"
 alias gcheckoutb="gcheckout -b"
@@ -14,8 +15,11 @@ alias gcommit="git commit"
 alias gcommitm="git commit -m"
 alias gamend="gcommit --amend"
 alias gbranch="git branch"
-alias rnmbranch="gbranch -m"
+alias gbranchd="git branch -D"
+alias grnmbranch="gbranch -m"
 alias gpushb="git push origin"
+alias gundoc="git reset HEAD~"
+alias greset="git checkout --"
 
 function gpush() {
 	BRANCH=""
diff --git a/macos/macos.plugin.zsh b/macos/macos.plugin.zsh
index 3442378..1f694c4 100644
--- a/macos/macos.plugin.zsh
+++ b/macos/macos.plugin.zsh
@@ -1,5 +1,28 @@
 alias allowanywhere="sudo spctl --master-disable"
+alias resetaudio="sudo killall coreaudiod"
 
 function screensaver() {
-	open -a ScreenSaverEngine.app
+  open -a ScreenSaverEngine.app
+}
+
+function finder() {
+  DIR="."
+  if [[ $# -gt 0 ]];
+  then
+    DIR="$1"
+  fi
+  open $DIR
+}
+
+function quick-look() {
+  (( $# > 0 )) && qlmanage -p $* &>/dev/null &
+}
+
+# Show/hide hidden filed in the Finder
+alias showfiles="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
+alias hidefiles="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
+
+# Remove .DS_Store files recursively in a directory, default .
+function rmdsstore() {
+  find "${@:-.}" -type f -name .DS_Store -delete
 }
diff --git a/shell/shell.plugin.zsh b/shell/shell.plugin.zsh
new file mode 100644
index 0000000..b57b9ab
--- /dev/null
+++ b/shell/shell.plugin.zsh
@@ -0,0 +1,3 @@
+alias la="ls -a"
+alias ll="ls -l"
+alias lla="ls -l -a"
diff --git a/zsh-autosuggestions b/zsh-autosuggestions
new file mode 160000
index 0000000..43f3bc4
--- /dev/null
+++ b/zsh-autosuggestions
@@ -0,0 +1 @@
+Subproject commit 43f3bc4010b2c697d2252fdd8b36a577ea125881
diff --git a/zshrc b/zshrc
new file mode 100644
index 0000000..6006ac3
--- /dev/null
+++ b/zshrc
@@ -0,0 +1,125 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+export ANDROID_HOME=$HOME/Library/Android/sdk
+export PATH=$PATH:$ANDROID_HOME/emulator
+export PATH=$PATH:$ANDROID_HOME/tools
+export PATH=$PATH:$ANDROID_HOME/tools/bin
+export PATH=$PATH:$ANDROID_HOME/platform-tools
+export PATH="/usr/local/sbin:$PATH"
+
+# Path to your oh-my-zsh installation.
+export ZSH="/Users/owenlejeune/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
+# ZSH_THEME="robbyrussell"
+ZSH_THEME="pygmalion"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in ~/.oh-my-zsh/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# 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 automatically update without prompting.
+# DISABLE_UPDATE_PROMPT="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS=true
+
+# 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.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# 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?
+# Standard 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=(autoenv
+	colored-man-pages
+	colorize
+	git
+	homebrew
+	macos
+	oneplus
+	shell
+	subliminal
+	telnet
+	thefuck
+	wd
+	xcode)
+
+source $ZSH/oh-my-zsh.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"
+
+# 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="vim ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+alias ohmyzsh="atom ~/.oh-my-zsh"
+alias zshsource="source ~/.zshrc"
+alias reset="cd && clear"
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"