diff --git a/Plugins.md b/Plugins.md
index 0482fc3..851b3be 100644
--- a/Plugins.md
+++ b/Plugins.md
@@ -18,137 +18,271 @@ You should always read the source for the plugin before using it to avoid surpri
 
 Below is a list of bundled plugins
 
+- [adb](#adb)
+- [ansible](#ansible)
+- [ant](#ant)
 - [apache2-macports](#apache2-macports)
+- [arcanist](#arcanist)
 - [archlinux](#archlinux)
 - [asdf](#asdf)
+- [autoenv](#autoenv)
 - [autojump](#autojump)
 - [autopep8](#autopep8)
 - [aws](#aws)
+- [battery](#battery)
+- [bbedit](#bbedit)
+- [bgnotify](#bgnotify)
+- [boot2docker](#boot2docker)
 - [bower](#bower)
+- [branch](#branch)
 - [brew](#brew)
 - [bundler](#bundler)
 - [cabal](#cabal)
 - [cake](#cake)
+- [cakephp3](#cakephp3)
 - [capistrano](#capistrano)
+- [cargo](#cargo)
 - [cask](#cask)
 - [catimg](#catimg)
 - [celery](#celery)
 - [chruby](#chruby)
 - [chucknorris](#chucknorris)
-- [command-not-found](#command-not-found)
-- [composer](#composer)
 - [cloudapp](#cloudapp)
 - [cloudfoundry](#cloudfoundry)
+- [codeclimate](#codeclimate)
 - [coffee](#coffee)
+- [colemak](#colemak)
+- [colored-man-pages](#colored-man-pages)
+- [colorize](#colorize)
+- [command-not-found](#command-not-found)
 - [common-aliases](#common-aliases)
 - [compleat](#compleat)
+- [composer](#composer)
+- [copybuffer](#copybuffer)
+- [copydir](#copydir)
 - [copyfile](#copyfile)
+- [cp](#cp)
 - [cpanm](#cpanm)
+- [dash](#dash)
 - [debian](#debian)
 - [dircycle](#dircycle)
 - [dirhistory](#dirhistory)
 - [dirpersist](#dirpersist)
 - [django](#django)
 - [dnf](#dnf)
+- [dnote](#dnote)
 - [docker](#docker)
+- [doctl](#doctl)
+- [dotenv](#dotenv)
+- [droplr](#droplr)
+- [drush](#drush)
+- [eecms](#eecms)
+- [emacs](#emacs)
+- [ember-cli](#ember-cli)
+- [emoji](#emoji)
+- [emoji-clock](#emoji-clock)
+- [emotty](#emotty)
 - [encode64](#encode64)
 - [extract](#extract)
 - [fabric](#fabric)
-- [fbterm](#fbterm)
-- [Forklift](#Forklift)
+- [fancy-ctrl-z](#fancy-ctrl-z)
 - [fasd](#fasd)
+- [fastfile](#fastfile)
+- [fbterm](#fbterm)
+- [fd](#fd)
+- [fedora](#fedora)
+- [firewalld](#firewalld)
+- [forklift](#forklift)
+- [fossil](#fossil)
+- [frontend-search](#frontend-search)
+- [fzf](#fzf)
 - [gas](#gas)
+- [gatsby](#gatsby)
+- [gb](#gb)
 - [geeknote](#geeknote)
 - [gem](#gem)
-- [gpg-agent](#gpg-agent)
 - [git](#git)
-- [gitfast](#gitfast)
+- [git-auto-fetch](#git-auto-fetch)
 - [git-extras](#git-extras)
+- [gitfast](#gitfast)
 - [git-flow](#git-flow)
 - [git-flow-avh](#git-flow-avh)
-- [git-hubflow](#git-hubflow)
-- [git-remote-branch](#git-remote-branch)
 - [github](#github)
+- [git-hubflow](#git-hubflow)
+- [gitignore](#gitignore)
+- [git-prompt](https://github.com/ohmyzsh/ohmyzsh/blob/master/plugins/git-prompt/README.md)
+- [git-remote-branch](#git-remote-branch)
+- [glassfish](#glassfish)
+- [globalias](#globalias)
+- [gnu-utils](#gnu-utils)
+- [go](#go)
+- [golang](#golang)
+- [gpg-agent](#gpg-agent)
 - [gradle](#gradle)
 - [grails](#grails)
-- [httpie](#httpie)
+- [grunt](#grunt)
+- [gulp](#gulp)
+- [hanami](#hanami)
+- [helm](#helm)
+- [heroku](#heroku)
 - [history](#history)
+- [history-substring-search](#history-substring-search)
+- [homestead](#homestead)
+- [httpie](#httpie)
+- [iterm2](#iterm2)
+- [jake-node](#jake-node)
+- [jenv](#jenv)
+- [jhbuild](#jhbuild)
 - [jira](#jira)
+- [jruby](#jruby)
 - [jsontools](#jsontools)
+- [jump](#jump)
+- [kate](#kate)
+- [keychain](#keychain)
+- [kitchen](#kitchen)
 - [knife](#knife)
+- [knife_ssh](#knife_ssh)
+- [kops](#kops)
 - [kubectl](#kubectl)
+- [kube-ps1](#kube-ps1)
+- [laravel](#laravel)
 - [laravel4](#laravel4)
+- [laravel5](#laravel5)
 - [last-working-dir](#last-working-dir)
 - [lein](#lein)
 - [lighthouse](#lighthouse)
 - [lol](#lol)
 - [macports](#macports)
+- [magic-enter](#magic-enter)
+- [man](#man)
+- [marked2](#marked2)
 - [mercurial](#mercurial)
 - [meteor](#meteor)
+- [minikube](#minikube)
 - [mix](#mix)
+- [mix-fast](#mix-fast)
+- [mosh](#mosh)
 - [mvn](#mvn)
 - [mysql-macports](#mysql-macports)
+- [n98-magerun](#n98-magerun)
 - [nanoc](#nanoc)
 - [ng](#ng)
+- [nmap](#nmap)
 - [node](#node)
+- [nomad](#nomad)
 - [npm](#npm)
+- [npx](#npx)
+- [nvm](#nvm)
+- [oc](#oc)
 - [osx](#osx)
+- [otp](#otp)
 - [pass](#pass)
+- [paver](#paver)
+- [pep8](#pep8)
+- [percol](#percol)
 - [per-directory-history](#per-directory-history)
 - [perl](#perl)
 - [perms](#perms)
-- [pep8](#pep8)
 - [phing](#phing)
 - [pip](#pip)
+- [pipenv](#pipenv)
+- [pj](#pj)
 - [please](#please)
 - [pod](#pod)
+- [postgres](#postgres)
 - [pow](#pow)
+- [powder](#powder)
 - [powify](#powify)
+- [profiles](#profiles)
 - [pyenv](#pyenv)
 - [pylint](#pylint)
 - [python](#python)
 - [rails](#rails)
+- [rake](#rake)
+- [rake-fast](#rake-fast)
 - [rand-quote](#rand-quote)
+- [rbenv](#rbenv)
+- [rbfu](#rbfu)
+- [react-native](#react-native)
+- [rebar](#rebar)
 - [redis-cli](#redis-cli)
 - [repo](#repo)
+- [ripgrep](#ripgrep)
+- [ros](#ros)
+- [rsync](#rsync)
 - [ruby](#ruby)
+- [rust](#rust)
 - [rvm](#rvm)
+- [safe-paste](#safe-paste)
+- [salt](#salt)
 - [sbt](#sbt)
 - [scala](#scala)
+- [scd](#scd)
 - [screen](#screen)
+- [scw](#scw)
 - [sdk](#sdk)
+- [sfdx](#sfdx)
+- [sfffe](#sfffe)
+- [shrink-path](#shrink-path)
+- [singlechar](#singlechar)
+- [spring](#spring)
 - [sprunge](#sprunge)
 - [ssh-agent](#ssh-agent)
+- [stack](#stack)
 - [sublime](#sublime)
 - [sudo](#sudo)
 - [supervisor](#supervisor)
 - [suse](#suse)
+- [svcat](#svcat)
 - [svn](#svn)
 - [svn-fast-info](#svn-fast-info)
+- [swiftpm](#swiftpm)
+- [symfony](#symfony)
 - [symfony2](#symfony2)
+- [systemadmin](#systemadmin)
 - [systemd](#systemd)
 - [taskwarrior](#taskwarrior)
 - [terminalapp](#terminalapp)
 - [terminitor](#terminitor)
+- [terraform](#terraform)
+- [textastic](#textastic)
 - [textmate](#textmate)
-- [tig](#tig)
+- [thefuck](#thefuck)
+- [themes](#themes)
 - [thor](#thor)
+- [tig](#tig)
+- [timer](#timer)
 - [tmux](#tmux)
+- [tmux-cssh](#tmux-cssh)
 - [tmuxinator](#tmuxinator)
+- [torrent](#torrent)
+- [transfer](#transfer)
 - [tugboat](#tugboat)
+- [ubuntu](#ubuntu)
+- [ufw](#ufw)
 - [urltools](#urltools)
 - [vagrant](#vagrant)
+- [vagrant-prompt](#vagrant-prompt)
+- [vault](#vault)
+- [vim-interaction](#vim-interaction)
 - [vi-mode](#vi-mode)
+- [virtualenv](#virtualenv)
 - [virtualenvwrapper](#virtualenvwrapper)
 - [vscode](#vscode)
+- [vundle](#vundle)
+- [wakeonlan](#wakeonlan)
+- [wd](#wd)
 - [web-search](#web-search)
+- [wp-cli](#wp-cli)
+- [xcode](#xcode)
 - [yarn](#yarn)
 - [yii](#yii)
 - [yii2](#yii2)
 - [yum](#yum)
-- [zeus](#zeus)
-- [wd](#wd)
 - [z](#z)
+- [zeus](#zeus)
+- [zsh-navigation-tools](#zsh-navigation-tools)
+- [zsh_reload](#zsh_reload)
 
 ## apache2-macports