diff --git a/.gitignore b/.gitignore
index 8fa66f02f..5608b3d5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ custom
 *.swp
 !custom/example.zshcache
 cache/
+.DS_Store
diff --git a/plugins/gvm/_gvm b/plugins/gvm/_gvm
new file mode 100644
index 000000000..42216f8a8
--- /dev/null
+++ b/plugins/gvm/_gvm
@@ -0,0 +1,43 @@
+#compdef gvm
+#autoload
+
+# gvm zsh completion, based on homebrew completion
+
+local -a _1st_arguments
+_1st_arguments=(
+  'install:install a candidate version'
+  'uninstall:uninstall a candidate version'
+  'list:list available candidate versions'
+  'use:use a candidate version in current shell'
+  'current:display current candidate version'
+  'version:display the current version of gvm'
+  'default:set the default candidate version for every shell'
+  'selfupdate:update the gvm'
+  'broadcast:display the last broadcast message'
+  'help:show the gvm help message'
+)
+
+local -a _2nd_arguments
+_2nd_arguments=(
+  'groovy:dynamic jvm programming language'
+  'grails:full-stack web framework'
+  'griffon:framework for building desktop application'
+  'gradle:build tool using groovy dsl'
+  'lazybones:project creation tool that uses packaged project templates'
+  'vertx:event driven application framework'
+)
+
+local expl
+
+_arguments \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "gvm subcommand" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  install|uninstall|list|use|current|default)
+    _describe -t commands "gvm subcommand" _2nd_arguments ;;
+esac
\ No newline at end of file
diff --git a/themes/yerinle.zsh-theme b/themes/yerinle.zsh-theme
new file mode 100644
index 000000000..8d34391cc
--- /dev/null
+++ b/themes/yerinle.zsh-theme
@@ -0,0 +1,24 @@
+# /|/ Code by Stephen
+# /|/ "Rixius" Middleton
+# 
+# name in folder (github)
+# ± if in github repo, or ≥ if otherwise Time in 24-hour format is on right.
+function collapse_pwd {
+    echo $(pwd | sed -e "s,^$HOME,~,")
+}
+function prompt_char {
+    echo -n "%{$bg[black]%}%{$fg[blue]%}"
+    git branch >/dev/null 2>/dev/null && echo "±%{$reset_color%}" && return
+    echo "≥%{$reset_color%}"
+}
+RIXIUS_PRE="%{$bg[black]%}%{$fg[blue]%}"
+
+PROMPT='
+%{$RIXIUS_PRE%}%n%{$reset_color%} in %{$fg_bold[green]%}$(collapse_pwd)%{$reset_color%}$(git_prompt_info)
+$(prompt_char) '
+RPROMPT='%{$RIXIUS_PRE%}%T%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RIXIUS_PRE%}!%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$RIXIUS_PRE%}√%{$reset_color%}"
diff --git a/themes/yinka.zsh-theme b/themes/yinka.zsh-theme
new file mode 100644
index 000000000..1396bdbc1
--- /dev/null
+++ b/themes/yinka.zsh-theme
@@ -0,0 +1,31 @@
+# /|/ Based on Code by Stephen
+# /|/ "Rixius" Middleton
+#
+# 
+# name in folder (github)
+# ± if in github repo, or ≥ if otherwise Time in 24-hour format is on right.
+function collapse_pwd {
+    echo $(pwd | sed -e "s,^$HOME,~,")
+}
+function prompt_char {
+	echo -n "%{$bg[black]%}%{$fg[blue]%}"
+    git branch >/dev/null 2>/dev/null && echo "±%{$reset_color%}" && return
+    echo "≥%{$reset_color%}"
+}
+RIXIUS_PRE="%{$bg[black]%}%{$fg[blue]%}"
+
+PROMPT='
+%{$RIXIUS_PRE%}%n%{$reset_color%} in %{$fg_bold[green]%}$(collapse_pwd)%{$reset_color%}$(git_prompt_info)
+$(prompt_char) '
+RPROMPT='%{$RIXIUS_PRE%}%T%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RIXIUS_PRE%}!%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$RIXIUS_PRE%}√%{$reset_color%}"
+
+# LS colors, made with http://geoff.greer.fm/lscolors/
+export LSCOLORS="Gxfxcxdxbxegedabagacad"
+export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
+
+