diff --git a/custom/example.zsh b/custom/example.zsh
index 21a8d8be7..c194f49d7 100644
--- a/custom/example.zsh
+++ b/custom/example.zsh
@@ -1,12 +1,12 @@
 # Put files in this folder to add your own custom functionality.
 # See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization
-# 
+#
 # Files in the custom/ directory will be:
 # - loaded automatically by the init script, in alphabetical order
 # - loaded last, after all built-ins in the lib/ directory, to override them
 # - ignored by git by default
-# 
+#
 # Example: add custom/shortcuts.zsh for shortcuts to your local projects
-# 
+#
 # brainstormr=~/Projects/development/planetargon/brainstormr
 # cd $brainstormr
diff --git a/custom/themes/example.zsh-theme b/custom/themes/example.zsh-theme
index 494d029e8..5551207f8 100644
--- a/custom/themes/example.zsh-theme
+++ b/custom/themes/example.zsh-theme
@@ -1,6 +1,6 @@
 # Put your custom themes in this folder.
 # See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-themes
-# 
+#
 # Example:
 
 PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% "
diff --git a/lib/compfix.zsh b/lib/compfix.zsh
index b09b283f2..2fe9d9e64 100644
--- a/lib/compfix.zsh
+++ b/lib/compfix.zsh
@@ -13,7 +13,7 @@ function handle_completion_insecurities() {
   #     /usr/share/zsh/5.0.6
   #
   # Since the ignorable first line is printed to stderr and thus not captured,
-  # stderr is squelched to prevent this output from leaking to the user. 
+  # stderr is squelched to prevent this output from leaking to the user.
   local -aU insecure_dirs
   insecure_dirs=( ${(f@):-"$(compaudit 2>/dev/null)"} )
 
diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index eaeba7d23..d67e6fab4 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -30,7 +30,7 @@
 #
 # This is written in a defensive style so it still works (and can detect) cases when
 # basic functionality like echo and which have been redefined. In particular, almost
-# everything is invoked with "builtin" or "command", to work in the face of user 
+# everything is invoked with "builtin" or "command", to work in the face of user
 # redefinitions.
 #
 # OPTIONS
@@ -59,7 +59,7 @@ function omz_diagnostic_dump() {
   emulate -L zsh
 
   builtin echo "Generating diagnostic dump; please be patient..."
-  
+
   local thisfcn=omz_diagnostic_dump
   local -A opts
   local opt_verbose opt_noverbose opt_outfile
@@ -90,7 +90,7 @@ function omz_diagnostic_dump() {
   builtin echo
   builtin echo Diagnostic dump file created at: "$outfile"
   builtin echo
-  builtin echo To share this with OMZ developers, post it as a gist on GitHub 
+  builtin echo To share this with OMZ developers, post it as a gist on GitHub
   builtin echo at "https://gist.github.com" and share the link to the gist.
   builtin echo
   builtin echo "WARNING: This dump file contains all your zsh and omz configuration files,"
@@ -105,8 +105,8 @@ function _omz_diag_dump_one_big_text() {
   builtin echo oh-my-zsh diagnostic dump
   builtin echo
   builtin echo $outfile
-  builtin echo 
-  
+  builtin echo
+
   # Basic system and zsh information
   command date
   command uname -a
@@ -151,7 +151,7 @@ function _omz_diag_dump_one_big_text() {
 
   # Core command definitions
   _omz_diag_dump_check_core_commands || return 1
-  builtin echo  
+  builtin echo
 
   # ZSH Process state
   builtin echo Process state:
@@ -167,7 +167,7 @@ function _omz_diag_dump_one_big_text() {
   #TODO: Should this include `env` instead of or in addition to `export`?
   builtin echo Exported:
   builtin echo $(builtin export | command sed 's/=.*//')
-  builtin echo 
+  builtin echo
   builtin echo Locale:
   command locale
   builtin echo
@@ -181,7 +181,7 @@ function _omz_diag_dump_one_big_text() {
   builtin echo
   builtin echo 'compaudit output:'
   compaudit
-  builtin echo 
+  builtin echo
   builtin echo '$fpath directories:'
   command ls -lad $fpath
   builtin echo
@@ -224,7 +224,7 @@ function _omz_diag_dump_one_big_text() {
   local cfgfile cfgfiles
   # Some files for bash that zsh does not use are intentionally included
   # to help with diagnosing behavior differences between bash and zsh
-  cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout 
+  cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout
     $zdotdir/.zshenv $zdotdir/.zprofile $zdotdir/.zshrc $zdotdir/.zlogin $zdotdir/.zlogout
     ~/.zsh.pre-oh-my-zsh
     /etc/bashrc /etc/profile ~/.bashrc ~/.profile ~/.bash_profile ~/.bash_logout )
@@ -258,8 +258,8 @@ function _omz_diag_dump_check_core_commands() {
   # (For back-compatibility, if any of these are newish, they should be removed,
   # or at least made conditional on the version of the current running zsh.)
   # "history" is also excluded because OMZ is known to redefine that
-  reserved_words=( do done esac then elif else fi for case if while function 
-    repeat time until select coproc nocorrect foreach end '!' '[[' '{' '}' 
+  reserved_words=( do done esac then elif else fi for case if while function
+    repeat time until select coproc nocorrect foreach end '!' '[[' '{' '}'
     )
   builtins=( alias autoload bg bindkey break builtin bye cd chdir command
     comparguments compcall compctl compdescribe compfiles compgroups compquote comptags
@@ -331,7 +331,7 @@ function _omz_diag_dump_os_specific_version() {
   case "$OSTYPE" in
     darwin*)
       osname=$(command sw_vers -productName)
-      osver=$(command sw_vers -productVersion)      
+      osver=$(command sw_vers -productVersion)
       builtin echo "OS Version: $osname $osver build $(sw_vers -buildVersion)"
       ;;
     cygwin)
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 137ca3b6f..2fb20298a 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -152,7 +152,7 @@ unset zcompdump_revision zcompdump_fpath zcompdump_refresh
 # zcompile the completion dump file if the .zwc is older or missing.
 if command mkdir "${ZSH_COMPDUMP}.lock" 2>/dev/null; then
   zrecompile -q -p "$ZSH_COMPDUMP"
-  command rm -rf "$ZSH_COMPDUMP.zwc.old" "${ZSH_COMPDUMP}.lock" 
+  command rm -rf "$ZSH_COMPDUMP.zwc.old" "${ZSH_COMPDUMP}.lock"
 fi
 
 _omz_source() {
diff --git a/plugins/ansible/README.md b/plugins/ansible/README.md
index ce21e7075..dd0e1ce03 100644
--- a/plugins/ansible/README.md
+++ b/plugins/ansible/README.md
@@ -28,6 +28,6 @@ plugins=(... ansible)
 
 ## Maintainer
 
-### [Deepankumar](https://github.com/deepan10) 
+### [Deepankumar](https://github.com/deepan10)
 
 [https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin](https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin)
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 071dd1f0b..0c43031df 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -280,7 +280,7 @@ if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
   test -s "${AWS_STATE_FILE}" || return
 
   aws_state=($(cat $AWS_STATE_FILE))
-  
+
   export AWS_DEFAULT_PROFILE="${aws_state[1]}"
   export AWS_PROFILE="$AWS_DEFAULT_PROFILE"
   export AWS_EB_PROFILE="$AWS_DEFAULT_PROFILE"
diff --git a/plugins/branch/README.md b/plugins/branch/README.md
index a15dd22df..2b6d12d29 100644
--- a/plugins/branch/README.md
+++ b/plugins/branch/README.md
@@ -39,7 +39,7 @@ index 2fd5f2cd..9d89a464 100644
  PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )"
 -PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)'
 +PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(branch_prompt_info)'
- 
+
  ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}"
  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ```
diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index d7a28d4e2..1210897c4 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -2,7 +2,7 @@
 
 _source-from-omz-settings() {
   local _chruby_path _chruby_auto
-  
+
   zstyle -s :omz:plugins:chruby path _chruby_path || return 1
   zstyle -s :omz:plugins:chruby auto _chruby_auto || return 1
 
@@ -23,7 +23,7 @@ _source-from-homebrew() {
   if [[ -h /usr/local/opt/chruby ]];then
     _brew_prefix="/usr/local/opt/chruby"
   else
-    # ok , it is not default prefix 
+    # ok , it is not default prefix
     # this call to brew is expensive ( about 400 ms ), so at least let's make it only once
     _brew_prefix=$(brew --prefix chruby)
   fi
diff --git a/plugins/cloudfoundry/README.md b/plugins/cloudfoundry/README.md
index 89dd9d1ce..567a9056b 100644
--- a/plugins/cloudfoundry/README.md
+++ b/plugins/cloudfoundry/README.md
@@ -50,7 +50,7 @@ Alternatively, seek out the [online documentation][3]. And don't forget, there a
 
 ## Contributors
 
-Contributed to `oh_my_zsh` by [benwilcock][2].  
+Contributed to `oh_my_zsh` by [benwilcock][2].
 
 [1]: https://docs.cloudfoundry.org/cf-cli/install-go-cli.html
 [2]: https://github.com/benwilcock
diff --git a/plugins/coffee/README.md b/plugins/coffee/README.md
index 2baade844..c2ab192b6 100644
--- a/plugins/coffee/README.md
+++ b/plugins/coffee/README.md
@@ -24,7 +24,7 @@ Also provides the following aliases:
 * **cfc:** Copies the compiled JS to your clipboard. Very useful when you want
            to run the code in a JS console.
 
-* **cfp:** Compiles from your currently copied clipboard. Useful when you want 
+* **cfp:** Compiles from your currently copied clipboard. Useful when you want
            to compile large/multi-line snippets
 
 * **cfpc:** Paste coffeescript from clipboard, compile to JS, then copy the
diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/compleat.plugin.zsh
index 38f1b396a..7fbd2b953 100644
--- a/plugins/compleat/compleat.plugin.zsh
+++ b/plugins/compleat/compleat.plugin.zsh
@@ -7,7 +7,7 @@
 
 if (( ${+commands[compleat]} )); then
   local prefix="${commands[compleat]:h:h}"
-  local setup="${prefix}/share/compleat-1.0/compleat_setup" 
+  local setup="${prefix}/share/compleat-1.0/compleat_setup"
 
   if [[ -f "$setup" ]]; then
     if ! bashcompinit >/dev/null 2>&1; then
@@ -15,6 +15,6 @@ if (( ${+commands[compleat]} )); then
       bashcompinit -i
     fi
 
-    source "$setup" 
+    source "$setup"
   fi
 fi
diff --git a/plugins/copybuffer/copybuffer.plugin.zsh b/plugins/copybuffer/copybuffer.plugin.zsh
index e67f920f0..88bda32a0 100644
--- a/plugins/copybuffer/copybuffer.plugin.zsh
+++ b/plugins/copybuffer/copybuffer.plugin.zsh
@@ -1,4 +1,4 @@
-# copy the active line from the command line buffer 
+# copy the active line from the command line buffer
 # onto the system clipboard
 
 copybuffer () {
diff --git a/plugins/dash/README.md b/plugins/dash/README.md
index 0ca3e4e44..970c6541f 100644
--- a/plugins/dash/README.md
+++ b/plugins/dash/README.md
@@ -19,7 +19,7 @@ dash
 
 - Query for something in dash app: `dash query`
 ```
-dash golang 
+dash golang
 ```
 
 - You can optionally provide a keyword: `dash [keyword:]query`
diff --git a/plugins/dotnet/dotnet.plugin.zsh b/plugins/dotnet/dotnet.plugin.zsh
index 40ee7efae..ed7c55024 100644
--- a/plugins/dotnet/dotnet.plugin.zsh
+++ b/plugins/dotnet/dotnet.plugin.zsh
@@ -11,7 +11,7 @@ _dotnet_completion() {
 compdef _dotnet_completion dotnet
 
 # Aliases bellow are here for backwards compatibility
-# added by Shaun Tabone (https://github.com/xontab) 
+# added by Shaun Tabone (https://github.com/xontab)
 
 alias dn='dotnet new'
 alias dr='dotnet run'
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index f9e476ebf..f7be56cf7 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -24,7 +24,7 @@ unset _omz_emoji_plugin_dir
 
 # This is a combining character that can be placed after any other character to surround
 # it in a "keycap" symbol.
-# The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc. 
+# The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc.
 # It's unclear whether this should be in the $emoji array, because those characters are all ones
 # which can be displayed on their own.
 
@@ -63,9 +63,9 @@ function random_emoji() {
   [[ $list_size -eq 0 ]] && return 1
   local random_index=$(( ( RANDOM % $list_size ) + 1 ))
   local name=${names[$random_index]}
-  if [[ "$group" == "flags" ]]; then 
+  if [[ "$group" == "flags" ]]; then
     echo ${emoji_flags[$name]}
-  else 
+  else
     echo ${emoji[$name]}
   fi
 }
@@ -86,22 +86,22 @@ function display_emoji() {
   # terminals treat these emoji chars as single-width.
   local counter=1
   for i in $names; do
-    if [[ "$group" == "flags" ]]; then 
+    if [[ "$group" == "flags" ]]; then
       printf '%s  ' "$emoji_flags[$i]"
-    else 
-      printf '%s  ' "$emoji[$i]" 
+    else
+      printf '%s  ' "$emoji[$i]"
     fi
     # New line every 20 emoji, to avoid weirdnesses
     if (($counter % 20 == 0)); then
-      printf "\n" 
+      printf "\n"
     fi
     let counter=$counter+1
   done
   print
   for i in $names; do
-    if [[ "$group" == "flags" ]]; then 
+    if [[ "$group" == "flags" ]]; then
       echo "${emoji_flags[$i]}  = $i"
-    else 
+    else
       echo "${emoji[$i]}  = $i"
     fi
   done
diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index 661169a8b..b48d121dc 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -4,7 +4,7 @@
 #        AUTHOR: Alexis Hildebrandt (afh[at]surryhill.net)
 #       VERSION: 1.0.0
 #       DEPENDS: emoji plugin
-#       
+#
 # There are different sets of emoji characters available, to choose a different
 # set export emotty_set to the name of the set you would like to use, e.g.:
 # % export emotty_set=nature
diff --git a/plugins/encode64/README.md b/plugins/encode64/README.md
index 7cdf8c3f3..e3e25a742 100644
--- a/plugins/encode64/README.md
+++ b/plugins/encode64/README.md
@@ -40,7 +40,7 @@ plugins=(... encode64)
 
 ### Encoding a file
 
-Encode a file's contents to base64 and save output to text file.  
+Encode a file's contents to base64 and save output to text file.
 **NOTE:** Takes provided file and saves encoded content as new file with `.txt` extension
 
 - From parameter
diff --git a/plugins/fancy-ctrl-z/README.md b/plugins/fancy-ctrl-z/README.md
index f1b1dfa5c..82a4fd75e 100644
--- a/plugins/fancy-ctrl-z/README.md
+++ b/plugins/fancy-ctrl-z/README.md
@@ -1,14 +1,14 @@
 # Use Ctrl-Z to switch back to Vim
 
-I frequently need to execute random commands in my shell. To achieve it I pause 
+I frequently need to execute random commands in my shell. To achieve it I pause
 Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.
-The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back 
-to Vim. I could not find a solution, so I developed one on my own that 
+The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back
+to Vim. I could not find a solution, so I developed one on my own that
 works wonderfully with ZSH.
 
 Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
 
-Credits: 
+Credits:
 - original idea by @sheerun
 - added to OMZ by @mbologna
 
diff --git a/plugins/fastfile/README.md b/plugins/fastfile/README.md
index 32f619ffd..7291fde38 100644
--- a/plugins/fastfile/README.md
+++ b/plugins/fastfile/README.md
@@ -71,13 +71,13 @@ them, add `<variable>=<value>` to your zshrc file, before Oh My Zsh is sourced.
 For example: `fastfile_var_prefix='@'`.
 
 - `fastfile_var_prefix`: prefix for the global aliases created. Controls the prefix of the
-  created global aliases.  
+  created global aliases.
   **Default:** `§` (section sign), easy to type in a german keyboard via the combination
   [`⇧ Shift`+`3`](https://en.wikipedia.org/wiki/German_keyboard_layout#/media/File:KB_Germany.svg),
   or using `⌥ Option`+`6` in macOS.
 
 - `fastfile_dir`: directory where the fastfile shortcuts are stored. Needs to end
-  with a trailing slash.  
+  with a trailing slash.
   **Default:** `$HOME/.fastfile/`.
 
 ## Author
diff --git a/plugins/forklift/forklift.plugin.zsh b/plugins/forklift/forklift.plugin.zsh
index 85889481b..848aedabf 100644
--- a/plugins/forklift/forklift.plugin.zsh
+++ b/plugins/forklift/forklift.plugin.zsh
@@ -58,7 +58,7 @@ function fl {
     tell application forkLiftSetapp
         activate
         set forkLiftVersion to version
-    end tell	
+    end tell
   else if forkLift3 is not null and application forkLift3 is running then
     tell application forkLift3
         activate
@@ -84,7 +84,7 @@ function fl {
     else if forkLift is not null then
         set appName to forkLift
     end if
-    
+
     tell application appName
         activate
         set forkLiftVersion to version
diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 7312e3d26..9e372f498 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -62,7 +62,7 @@ function fzf_setup_using_base_dir() {
 
 function fzf_setup_using_debian() {
   if (( ! $+commands[apt] && ! $+commands[apt-get] )); then
-    # Not a debian based distro 
+    # Not a debian based distro
     return 1
   fi
 
diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index 6023bf2b4..adc2bd3bb 100644
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -14,7 +14,7 @@ __gnu_utils() {
   local -a gcmds
   local gcmd
 
-  # coreutils 
+  # coreutils
   gcmds=('g[' 'gbase64' 'gbasename' 'gcat' 'gchcon' 'gchgrp' 'gchmod'
   'gchown' 'gchroot' 'gcksum' 'gcomm' 'gcp' 'gcsplit' 'gcut' 'gdate'
   'gdd' 'gdf' 'gdir' 'gdircolors' 'gdirname' 'gdu' 'gecho' 'genv' 'gexpand'
@@ -41,7 +41,7 @@ __gnu_utils() {
   for gcmd in "${gcmds[@]}"; do
     # Do nothing if the command isn't found
     (( ${+commands[$gcmd]} )) || continue
-    
+
     # This method allows for builtin commands to be primary but it's
     # lost if hash -r or rehash is executed, or if $PATH is updated.
     # Thus, a preexec hook is needed, which will only run if whoami
diff --git a/plugins/grails/grails.plugin.zsh b/plugins/grails/grails.plugin.zsh
index ddc257428..e5dceb530 100644
--- a/plugins/grails/grails.plugin.zsh
+++ b/plugins/grails/grails.plugin.zsh
@@ -7,7 +7,7 @@ _enumerateGrailsScripts() {
     then
         directories+=(plugins/*/scripts)
     fi
-    
+
     # Enumerate all of the Groovy files
     files=()
     for dir in $directories;
@@ -17,13 +17,13 @@ _enumerateGrailsScripts() {
             files+=($dir/[^_]*.groovy)
         fi
     done
-    
+
     # Don't try to basename ()
     if [ ${#files} -eq 0 ];
     then
         return
     fi
-    
+
     scripts=()
     for file in $files
     do
@@ -42,19 +42,19 @@ _enumerateGrailsScripts() {
     done
     echo $scripts
 }
- 
+
 _grails() {
     if (( CURRENT == 2 )); then
         scripts=( $(_enumerateGrailsScripts) )
-        
+
         if [ ${#scripts} -ne 0 ];
         then
             _multi_parts / scripts
             return
         fi
     fi
-    
+
     _files
 }
- 
+
 compdef _grails grails
diff --git a/plugins/history-substring-search/README.md b/plugins/history-substring-search/README.md
index 71a389535..4be744c4c 100644
--- a/plugins/history-substring-search/README.md
+++ b/plugins/history-substring-search/README.md
@@ -57,13 +57,13 @@ Using [antigen](https://github.com/zsh-users/antigen):
 
 1. Add the `antigen bundle` command just before `antigen apply`, like this:
 
-``` 
+```
 antigen bundle zsh-users/zsh-history-substring-search
 antigen apply
 ```
- 
+
 2. Then, **after** `antigen apply`, add the key binding configurations, like this:
- 
+
 ```
 # zsh-history-substring-search configuration
 bindkey '^[[A' history-substring-search-up # or '\eOA'
@@ -120,7 +120,7 @@ Usage
           bindkey "$terminfo[kcuu1]" history-substring-search-up
           bindkey "$terminfo[kcud1]" history-substring-search-down
 
-      Users have also observed that `[OA` and `[OB` are correct values, 
+      Users have also observed that `[OA` and `[OB` are correct values,
       _even if_ these were not the observed values. If you are having trouble
       with the observed values, give these a try.
 
diff --git a/plugins/ionic/ionic.plugin.zsh b/plugins/ionic/ionic.plugin.zsh
index cf388af1b..e3913b549 100644
--- a/plugins/ionic/ionic.plugin.zsh
+++ b/plugins/ionic/ionic.plugin.zsh
@@ -3,13 +3,13 @@ alias ih="ionic --help"
 alias ist="ionic start"
 alias ii="ionic info"
 alias is="ionic serve"
-alias icba="ionic cordova build android" 
-alias icbi="ionic cordova build ios" 
-alias icra="ionic cordova run android" 
-alias icri="ionic cordova run ios" 
-alias icrsa="ionic cordova resources android" 
+alias icba="ionic cordova build android"
+alias icbi="ionic cordova build ios"
+alias icra="ionic cordova run android"
+alias icri="ionic cordova run ios"
+alias icrsa="ionic cordova resources android"
 alias icrsi="ionic cordova resources ios"
-alias icpaa="ionic cordova platform add android" 
+alias icpaa="ionic cordova platform add android"
 alias icpai="ionic cordova platform add ios"
 alias icpra="ionic cordova platform rm android"
 alias icpri="ionic cordova platform rm ios"
diff --git a/plugins/iterm2/README.md b/plugins/iterm2/README.md
index 3d11622df..86bd77f1d 100644
--- a/plugins/iterm2/README.md
+++ b/plugins/iterm2/README.md
@@ -9,7 +9,7 @@ plugins=(... iterm2)
 ```
 
 Optionally, the plugin also applies the [Shell Integration Script for iTerm2](https://iterm2.com/documentation-shell-integration.html).
-You can enable the integration with zstyle. It's important to add this line 
+You can enable the integration with zstyle. It's important to add this line
 before the line sourcing oh-my-zsh:
 
 ```
diff --git a/plugins/iterm2/iterm2.plugin.zsh b/plugins/iterm2/iterm2.plugin.zsh
index d00232a30..03a63a70c 100644
--- a/plugins/iterm2/iterm2.plugin.zsh
+++ b/plugins/iterm2/iterm2.plugin.zsh
@@ -8,7 +8,7 @@
 if [[ "$OSTYPE" == darwin* ]] && [[ -n "$ITERM_SESSION_ID" ]] ; then
 
   # maybe make it the default in the future and allow opting out?
-  if zstyle -t ':omz:plugins:iterm2' shell-integration; then 
+  if zstyle -t ':omz:plugins:iterm2' shell-integration; then
     # Handle $0 according to the standard:
     # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
     0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
diff --git a/plugins/iterm2/iterm2_shell_integration.zsh b/plugins/iterm2/iterm2_shell_integration.zsh
index 7871ddded..281332e0d 100644
--- a/plugins/iterm2/iterm2_shell_integration.zsh
+++ b/plugins/iterm2/iterm2_shell_integration.zsh
@@ -2,12 +2,12 @@
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
diff --git a/plugins/jira/README.md b/plugins/jira/README.md
index b1d8a8bc6..1c6930298 100644
--- a/plugins/jira/README.md
+++ b/plugins/jira/README.md
@@ -35,7 +35,7 @@ This plugin supplies one command, `jira`, through which all its features are exp
 
 ### Jira Branch usage notes
 
-The branch name may have prefixes ending in "/": "feature/MP-1234", and also suffixes 
+The branch name may have prefixes ending in "/": "feature/MP-1234", and also suffixes
 starting with "_": "MP-1234_fix_dashboard". In both these cases, the issue opened will be "MP-1234"
 
 This is also checks if the prefix is in the name, and adds it if not, so: "MP-1234" opens the issue "MP-1234",
diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
index a82ebaf84..3c159da22 100644
--- a/plugins/juju/juju.plugin.zsh
+++ b/plugins/juju/juju.plugin.zsh
@@ -184,7 +184,7 @@ jmodel() {
   fi
 
   local model="$(yq e ".controllers.$(jcontroller).current-model" < ~/.local/share/juju/models.yaml | cut -d/ -f2)"
-  
+
   if [[ -z "$model" ]]; then
     echo "--"
     return 1
diff --git a/plugins/kn/kn.plugin.zsh b/plugins/kn/kn.plugin.zsh
index f60177dd9..483d1d68c 100644
--- a/plugins/kn/kn.plugin.zsh
+++ b/plugins/kn/kn.plugin.zsh
@@ -4,5 +4,5 @@
 
 if [ $commands[kn] ]; then
   source <(kn completion zsh)
-  compdef _kn kn 
+  compdef _kn kn
 fi
diff --git a/plugins/macports/_port b/plugins/macports/_port
index 897598a46..f40f6550b 100644
--- a/plugins/macports/_port
+++ b/plugins/macports/_port
@@ -1,6 +1,6 @@
 #compdef port
 
-local subcmds 
+local subcmds
 
 # we cache the list of ports
 # we shall use some cache policy to avoid problems with new ports
@@ -31,8 +31,8 @@ subcmds=(
 'file'
 'help'
 'info'
-'install' 
-'installed' 
+'install'
+'installed'
 'list'
 'livecheck'
 'location'
@@ -51,7 +51,7 @@ subcmds=(
 'test'
 'unarchive'
 'uninstall'
-'upgrade' 
+'upgrade'
 'variants'
 'version'
 )
diff --git a/plugins/marked2/README.md b/plugins/marked2/README.md
index 101343abb..2f825bc4a 100644
--- a/plugins/marked2/README.md
+++ b/plugins/marked2/README.md
@@ -1,6 +1,6 @@
 ## marked2
 
-Plugin for Marked 2, a previewer for Markdown files on Mac OS X 
+Plugin for Marked 2, a previewer for Markdown files on Mac OS X
 
 ### Requirements
 
diff --git a/plugins/marktext/README.md b/plugins/marktext/README.md
index 71d287451..254e4e7ac 100644
--- a/plugins/marktext/README.md
+++ b/plugins/marktext/README.md
@@ -1,6 +1,6 @@
 ## marktext
 
-Plugin for MarkText, a previewer for Markdown files on Mac OS X 
+Plugin for MarkText, a previewer for Markdown files on Mac OS X
 
 ### Requirements
 
diff --git a/plugins/mongo-atlas/README.md b/plugins/mongo-atlas/README.md
index ef1b5e0d2..94183c544 100644
--- a/plugins/mongo-atlas/README.md
+++ b/plugins/mongo-atlas/README.md
@@ -1,6 +1,6 @@
 # MongoDB Atlas plugin
 
-This plugin adds completion for [Atlas](https://www.mongodb.com/docs/atlas/cli/stable/) a command line interface built specifically for 
+This plugin adds completion for [Atlas](https://www.mongodb.com/docs/atlas/cli/stable/) a command line interface built specifically for
 MongoDB Atlas.
 
 To use it, add `mongo-atlas` to the plugins array in your zshrc file:
diff --git a/plugins/n98-magerun/n98-magerun.plugin.zsh b/plugins/n98-magerun/n98-magerun.plugin.zsh
index d79aee7eb..2744ad96e 100644
--- a/plugins/n98-magerun/n98-magerun.plugin.zsh
+++ b/plugins/n98-magerun/n98-magerun.plugin.zsh
@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
 # FILE: n98-magerun.plugin.zsh
-# DESCRIPTION: oh-my-zsh n98-magerun plugin file. Adapted from composer plugin 
+# DESCRIPTION: oh-my-zsh n98-magerun plugin file. Adapted from composer plugin
 # AUTHOR: Andrew Dwyer (andrewrdwyer at gmail dot com)
 # AUTHOR: Jisse Reitsma (jisse at yireo dot com)
 # VERSION: 1.1.0
diff --git a/plugins/nmap/nmap.plugin.zsh b/plugins/nmap/nmap.plugin.zsh
index 406870f00..f649dafc2 100644
--- a/plugins/nmap/nmap.plugin.zsh
+++ b/plugins/nmap/nmap.plugin.zsh
@@ -27,6 +27,6 @@ alias nmap_detect_versions="sudo nmap -sV -p1-65535 -O --osscan-guess -T4 -Pn"
 alias nmap_check_for_vulns="nmap --script=vuln"
 alias nmap_full_udp="sudo nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 "
 alias nmap_traceroute="sudo nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute "
-alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all " 
+alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all "
 alias nmap_web_safe_osscan="sudo nmap -p 80,443 -O -v --osscan-guess --fuzzy "
 alias nmap_ping_scan="nmap -n -sP"
diff --git a/plugins/nomad/_nomad b/plugins/nomad/_nomad
index 4c6cb2fcb..87f80aa84 100644
--- a/plugins/nomad/_nomad
+++ b/plugins/nomad/_nomad
@@ -89,7 +89,7 @@ __plan() {
     '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
     '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
     '-no-color[Disables colored command output.]' \
-    '-diff[Determines whether the diff between the remote job and planned job is shown. Defaults to true.]' 
+    '-diff[Determines whether the diff between the remote job and planned job is shown. Defaults to true.]'
 }
 
 __run() {
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 23377b085..c333f76ed 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -58,7 +58,7 @@ alias npmt="npm test"
 # Run npm scripts
 alias npmR="npm run"
 
-# Run npm publish 
+# Run npm publish
 alias npmP="npm publish"
 
 # Run npm init
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 6a5afecfa..c2e8de94b 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -16,7 +16,7 @@ if [[ -z "$NVM_DIR" ]]; then
   fi
 fi
 
-if [[ -z "$NVM_DIR" ]] || [[ ! -f "$NVM_DIR/nvm.sh" ]]; then 
+if [[ -z "$NVM_DIR" ]] || [[ ! -f "$NVM_DIR/nvm.sh" ]]; then
   return
 fi
 
diff --git a/plugins/otp/README.md b/plugins/otp/README.md
index 8331fd02b..52ad9525b 100644
--- a/plugins/otp/README.md
+++ b/plugins/otp/README.md
@@ -16,7 +16,7 @@ Provided aliases:
   email address). Then the OTP key needs to be pasted, followed by a CTRL+D character
   inserted on an empty line.
 
-- `ot`: generates a MFA code based on the given key and copies it to the clipboard 
+- `ot`: generates a MFA code based on the given key and copies it to the clipboard
   (on Linux it relies on xsel, on MacOS X it uses pbcopy instead).
 
 The plugin uses `$HOME/.otp` to store its internal files.
diff --git a/plugins/pm2/_pm2 b/plugins/pm2/_pm2
index faa6a3404..66320b810 100644
--- a/plugins/pm2/_pm2
+++ b/plugins/pm2/_pm2
@@ -79,7 +79,7 @@ _id_names() {
     local app_list
     app_list=`pm2 list -m`
 
-    local -a names ids 
+    local -a names ids
     names=(`echo $app_list | grep '+---' | awk '{print $2}'`)
     ids=(`echo $app_list | grep 'pm2 id' | awk '{print $4}'`)
 
diff --git a/plugins/poetry-env/README.md b/plugins/poetry-env/README.md
index a7d16563e..bd99d2a91 100644
--- a/plugins/poetry-env/README.md
+++ b/plugins/poetry-env/README.md
@@ -1,6 +1,6 @@
 # Poetry Environment Plugin
 
-This plugin automatically changes poetry environment when you cd into or out of the project directory. 
+This plugin automatically changes poetry environment when you cd into or out of the project directory.
 Note: Script looks for pyproject.toml file to determine poetry if its a poetry environment
 
 To use it, add `poetry-env` to the plugins array in your zshrc file:
diff --git a/plugins/ros/_ros b/plugins/ros/_ros
index 6a04d3c8f..c73a7b353 100644
--- a/plugins/ros/_ros
+++ b/plugins/ros/_ros
@@ -18,7 +18,7 @@ _1st_arguments=(
 'config:Get and set options'
 'version:Show the roswell version information'
 "help:Use \"ros help [command]\" for more information about a command."$'\n\t\t'"Use \"ros help [topic]\" for more information about the topic."
-) 
+)
 
 #local expl
 
diff --git a/plugins/sbt/sbt.plugin.zsh b/plugins/sbt/sbt.plugin.zsh
index 851302c68..1e977140b 100644
--- a/plugins/sbt/sbt.plugin.zsh
+++ b/plugins/sbt/sbt.plugin.zsh
@@ -4,7 +4,7 @@
 #        AUTHOR:  Mirko Caserta (mirko.caserta@gmail.com)
 #       VERSION:  1.0.2
 # ------------------------------------------------------------------------------
- 
+
 # aliases - mnemonic: prefix is 'sb'
 alias sbc='sbt compile'
 alias sbcc='sbt clean compile'
diff --git a/plugins/screen/screen.plugin.zsh b/plugins/screen/screen.plugin.zsh
index c1db8ad92..26531c40b 100644
--- a/plugins/screen/screen.plugin.zsh
+++ b/plugins/screen/screen.plugin.zsh
@@ -8,7 +8,7 @@ if [[ "$TERM" == screen* ]]; then
     _GET_HOST='echo $HOST | sed "s/\..*//"'
   fi
 
-  # use the current user as the prefix of the current tab title 
+  # use the current user as the prefix of the current tab title
   TAB_TITLE_PREFIX='"`'$_GET_HOST'`:`'$_GET_PATH' | sed "s:..*/::"`$PROMPT_CHAR"'
   # when at the shell prompt, show a truncated version of the current path (with
   # standard ~ replacement) as the rest of the title.
diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index d4b0b6735..6d785d9e1 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -1,5 +1,5 @@
 ###########################
-# Settings 
+# Settings
 
 # These can be overwritten any time.
 # If they are not set yet, they will be
diff --git a/plugins/systemadmin/README.md b/plugins/systemadmin/README.md
index 3a9d9de66..bd6b08760 100644
--- a/plugins/systemadmin/README.md
+++ b/plugins/systemadmin/README.md
@@ -1,7 +1,7 @@
 # Systemadmin plugin
 
 This plugin adds a series of aliases and functions which make a System Administrator's life easier.
- 
+
 To use it, add `systemadmin` to the plugins array in your zshrc file:
 
 ```zsh
diff --git a/plugins/thor/README.md b/plugins/thor/README.md
index 09c705d9a..484c88b84 100644
--- a/plugins/thor/README.md
+++ b/plugins/thor/README.md
@@ -1,6 +1,6 @@
 # Thor plugin
 
-This plugin adds completion for [Thor](http://whatisthor.com/), 
+This plugin adds completion for [Thor](http://whatisthor.com/),
 a ruby toolkit for building powerful command-line interfaces.
 
 To use it, add `thor` to the plugins array in your zshrc file:
diff --git a/plugins/ufw/README.md b/plugins/ufw/README.md
index ac377cd17..ffcc6d6f7 100644
--- a/plugins/ufw/README.md
+++ b/plugins/ufw/README.md
@@ -10,7 +10,7 @@ plugins=(... ufw)
 
 Some of the commands include:
 
-* `allow <port>/<optional: protocol>` add an allow rule 
+* `allow <port>/<optional: protocol>` add an allow rule
 * `default` set default policy
 * `delete <port>/<optional: protocol>` delete RULE
 * `deny <port>/<optional: protocol>` add deny rule
diff --git a/plugins/vagrant-prompt/README.md b/plugins/vagrant-prompt/README.md
index c5bc55d17..dd0ca363b 100644
--- a/plugins/vagrant-prompt/README.md
+++ b/plugins/vagrant-prompt/README.md
@@ -1,6 +1,6 @@
 This plugin prompts the status of the Vagrant VMs. It supports single-host and
 multi-host configurations as well.
 
-Look inside the source for documentation about custom variables. 
+Look inside the source for documentation about custom variables.
 
 Alberto Re <alberto.re@gmail.com>
diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index 84ba30105..6e781f296 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -55,7 +55,7 @@ INSERT_MODE_INDICATOR="%F{yellow}+%f"
 
 ### Adding mode indicators to your prompt
 
-`Vi-mode` by default will add mode indicators to `RPROMPT` **unless** that is defined by 
+`Vi-mode` by default will add mode indicators to `RPROMPT` **unless** that is defined by
 a preceding plugin.
 
 If `PROMPT` or `RPROMPT` is not defined to your liking, you can add mode info manually. The `vi_mode_prompt_info` function is available to insert mode indicator information.
diff --git a/plugins/vim-interaction/README.md b/plugins/vim-interaction/README.md
index 681648018..c2b45f1d8 100644
--- a/plugins/vim-interaction/README.md
+++ b/plugins/vim-interaction/README.md
@@ -3,7 +3,7 @@
 The plugin presents a function called `callvim` whose usage is:
 
     usage: callvim [-b cmd] [-a cmd] [file ... fileN]
-    
+
       -b cmd     Run this command in GVIM before editing the first file
       -a cmd     Run this command in GVIM after editing the first file
       file       The file to edit
diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index b73f9b4da..a12b52bd5 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -2,7 +2,7 @@
 # See README.md
 #
 # Derek Wyatt (derek@{myfirstnamemylastname}.org
-# 
+#
 
 function callvim {
   if [[ $# == 0 ]]; then
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index e037241e4..1a3ae37b8 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -52,7 +52,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       else
         ENV_NAME=""
       fi
-      
+
       if [[ -n $CD_VIRTUAL_ENV && "$ENV_NAME" != "$CD_VIRTUAL_ENV" ]]; then
         # We've just left the repo, deactivate the environment
         # Note: this only happens if the virtualenv was activated automatically
diff --git a/plugins/wd/README.md b/plugins/wd/README.md
index 1d1980632..0ad74e805 100644
--- a/plugins/wd/README.md
+++ b/plugins/wd/README.md
@@ -153,7 +153,7 @@ wd ..
 wd ...
 ```
 
-This is a wrapper for the zsh's `dirs` function.  
+This is a wrapper for the zsh's `dirs` function.
 _You might need to add `setopt AUTO_PUSHD` to your `.zshrc` if you are not using [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh)._
 
 * Remove warp point:
diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
index 8d5cf15a2..52ecb12e6 100644
--- a/plugins/wd/_wd.sh
+++ b/plugins/wd/_wd.sh
@@ -77,7 +77,7 @@ function _wd() {
             # complete sub directories from the warp point
             _path_files -W "(${points[$target]})" -/ && ret=0
           fi
-          
+
           # don't complete anything if warp point is not valid
           ;;
       esac
diff --git a/plugins/z/MANUAL.md b/plugins/z/MANUAL.md
index 67a207dbb..106d8c107 100644
--- a/plugins/z/MANUAL.md
+++ b/plugins/z/MANUAL.md
@@ -188,7 +188,7 @@ Add a backslash to the end of the last line add `'zsh-z'` to the list, e.g.,
 Then relaunch `zsh`.
 
 ### For [zcomet](https://github.com/agkozak/zcomet) users
-        
+
 Simply add
 
     zcomet load agkozak/zsh-z
diff --git a/themes/Soliah.zsh-theme b/themes/Soliah.zsh-theme
index c3dd6af89..e297fe9ca 100644
--- a/themes/Soliah.zsh-theme
+++ b/themes/Soliah.zsh-theme
@@ -5,10 +5,10 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
 
 # Text to display if the branch is dirty
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" 
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
 
 # Text to display if the branch is clean
-ZSH_THEME_GIT_PROMPT_CLEAN="" 
+ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 # Colors vary depending on time lapsed.
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
@@ -36,7 +36,7 @@ function rvm_gemset() {
         GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
         if [[ -n $GEMSET ]]; then
             echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
-        fi 
+        fi
     fi
 }
 
@@ -52,12 +52,12 @@ function git_time_since_commit() {
             # Totals
             MINUTES=$((seconds_since_last_commit / 60))
             HOURS=$((seconds_since_last_commit/3600))
-           
+
             # Sub-hours and sub-minutes
             DAYS=$((seconds_since_last_commit / 86400))
             SUB_HOURS=$((HOURS % 24))
             SUB_MINUTES=$((MINUTES % 60))
-            
+
             if [[ -n $(git status -s 2> /dev/null) ]]; then
                 if [ "$MINUTES" -gt 30 ]; then
                     COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index c2fdbed23..cc097057f 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -79,7 +79,7 @@ ps1_command_tip() {
       command wget -qO- https://www.commandlinefu.com/commands/random/plaintext
     elif (( ${+commands[curl]} )); then
       command curl -fsL https://www.commandlinefu.com/commands/random/plaintext
-    fi 
+    fi
   } | sed '1d;/^$/d'
 }
 
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index aa274a5bb..bd0405efb 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -111,7 +111,7 @@ prompt_git() {
     dirty=$(parse_git_dirty)
     ref=$(git symbolic-ref HEAD 2> /dev/null) || \
     ref="◈ $(git describe --exact-match --tags HEAD 2> /dev/null)" || \
-    ref="➦ $(git rev-parse --short HEAD 2> /dev/null)" 
+    ref="➦ $(git rev-parse --short HEAD 2> /dev/null)"
     if [[ -n $dirty ]]; then
       prompt_segment yellow black
     else
diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index 206274462..0e39d9077 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -15,7 +15,7 @@ __RPROMPT='$(vi_mode_prompt_info)%{$(echotc UP 1)%}$(_git_time_since_commit) $(g
 if [[ -z $RPROMPT ]]; then
   RPROMPT=$__RPROMPT
 else
-  RPROMPT="${RPROMPT} ${__RPROMPT}"  
+  RPROMPT="${RPROMPT} ${__RPROMPT}"
 fi
 
 function _user_host() {
diff --git a/themes/crunch.zsh-theme b/themes/crunch.zsh-theme
index 8278661ab..d86ce1e4a 100644
--- a/themes/crunch.zsh-theme
+++ b/themes/crunch.zsh-theme
@@ -1,15 +1,15 @@
 # CRUNCH - created from Steve Eley's cat waxing.
 # Initially hacked from the Dallas theme. Thanks, Dallas Reedy.
 #
-# This theme assumes you do most of your oh-my-zsh'ed "colorful" work at a single machine, 
-# and eschews the standard space-consuming user and hostname info.  Instead, only the 
+# This theme assumes you do most of your oh-my-zsh'ed "colorful" work at a single machine,
+# and eschews the standard space-consuming user and hostname info.  Instead, only the
 # things that vary in my own workflow are shown:
 #
 # * The time (not the date)
 # * The RVM version and gemset (omitting the 'ruby' name if it's MRI)
 # * The current directory
 # * The Git branch and its 'dirty' state
-# 
+#
 # Colors are at the top so you can mess with those separately if you like.
 # For the most part I stuck with Dallas's.
 
diff --git a/themes/eastwood.zsh-theme b/themes/eastwood.zsh-theme
index 88134f8e6..31e24fa7f 100644
--- a/themes/eastwood.zsh-theme
+++ b/themes/eastwood.zsh-theme
@@ -1,5 +1,5 @@
 # RVM settings
-if [[ -s ~/.rvm/scripts/rvm ]] ; then 
+if [[ -s ~/.rvm/scripts/rvm ]] ; then
   RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
 else
   if which rbenv &> /dev/null; then
diff --git a/themes/emotty.zsh-theme b/themes/emotty.zsh-theme
index ba0840950..0fea7d916 100644
--- a/themes/emotty.zsh-theme
+++ b/themes/emotty.zsh-theme
@@ -11,7 +11,7 @@
 #
 # There are pre-defined different emoji sets to choose from, e.g.:
 # emoji, stellar, floral, zodiac, love (see emotty plugin).
-# 
+#
 # To choose a different emotty set than the default (emoji)
 # % export emotty_set=nature
 #
@@ -95,7 +95,7 @@ zstyle ':vcs_info:*' stagedstr "${green}${vcs_staged_glyph}"
 # %(k|f) reset (back|fore)ground color
 zstyle ':vcs_info:*' max-exports 3
 zstyle ':vcs_info:*' nvcsformats "${prompt_glyph}" '%3~' ''
-zstyle ':vcs_info:*' formats "${yellow}%u%c%b${vcs_branch_glyph}%f" '%S|' "$FX[bold]%r$FX[no-bold]" 
+zstyle ':vcs_info:*' formats "${yellow}%u%c%b${vcs_branch_glyph}%f" '%S|' "$FX[bold]%r$FX[no-bold]"
 zstyle ':vcs_info:*' actionformats "${red}%K{white}%a${vcs_action_glyph}%k%f" '%S|' "$FX[bold]%r$FX[no-bold]"
 
 red_if_root="%(!.%F{red}.)"
diff --git a/themes/essembeh.zsh-theme b/themes/essembeh.zsh-theme
index 43d4093b1..50b3f7772 100644
--- a/themes/essembeh.zsh-theme
+++ b/themes/essembeh.zsh-theme
@@ -8,7 +8,7 @@
 #   - prefix to detect docker containers or chroot
 #   - git plugin to display current branch and status
 
-# git plugin 
+# git plugin
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}("
 ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
@@ -35,7 +35,7 @@ if [[ -n "$SSH_CONNECTION" ]]; then
 	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[$(echo $SSH_CONNECTION | awk '{print $1}')]%{$reset_color%} "
 	# use red color to highlight a remote connection
 	ZSH_ESSEMBEH_COLOR="red"
-elif [[ -r /etc/debian_chroot ]]; then 
+elif [[ -r /etc/debian_chroot ]]; then
 	# prefix prompt in case of chroot
 	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[chroot:$(cat /etc/debian_chroot)]%{$reset_color%} "
 elif [[ -r /.dockerenv ]]; then
diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme
index ea051c58e..df59280d7 100644
--- a/themes/josh.zsh-theme
+++ b/themes/josh.zsh-theme
@@ -15,7 +15,7 @@ function josh_prompt {
   branch_size=${#branch}
   ruby_size=${#ruby_version}
   user_machine_size=${#${(%):-%n@%m-}}
-  
+
   if [[ ${#branch} -eq 0 ]]
     then (( ruby_size = ruby_size + 1 ))
   else
@@ -24,15 +24,15 @@ function josh_prompt {
       (( branch_size = branch_size + 2 ))
     fi
   fi
-  
+
   (( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))
 
   while [ ${#prompt} -lt $spare_width ]; do
     prompt=" $prompt"
   done
-  
+
   prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(ruby_prompt_info)%{$reset_color%} $(git_current_branch)"
-  
+
   echo $prompt
 }
 
diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index 01fae4b95..e3b746c7a 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -3,10 +3,10 @@
 # Grab the current date (%W) and time (%t):
 JUNKFOOD_TIME_="%{$fg_bold[red]%}#%{$fg_bold[white]%}( %{$fg_bold[yellow]%}%W%{$reset_color%}@%{$fg_bold[white]%}%t )( %{$reset_color%}"
 
-# Grab the current machine name 
+# Grab the current machine name
 JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%} ):%{$reset_color%}"
 
-# Grab the current username 
+# Grab the current username
 JUNKFOOD_CURRENT_USER_="%{$fg_bold[green]%}%n%{$reset_color%}"
 
 # Grab the current filepath, use shortcuts: ~/Desktop
diff --git a/themes/mlh.zsh-theme b/themes/mlh.zsh-theme
index c059bf850..94718f8f2 100644
--- a/themes/mlh.zsh-theme
+++ b/themes/mlh.zsh-theme
@@ -15,7 +15,7 @@
 # To customize symbols (e.g MLH_AT_SYMBOL), simply set them as environment variables
 # for example in your ~/.zshrc file, like this:
 # MLH_AT_SYMBOL=" at "
-# 
+#
 # Settings *must* be set before sourcing oh-my-zsh.sh the .zshrc file.
 #
 # To easily discover colors and their codes, type `spectrum_ls` in the terminal
diff --git a/themes/mortalscumbag.zsh-theme b/themes/mortalscumbag.zsh-theme
index 36301cb76..c9994c0f9 100644
--- a/themes/mortalscumbag.zsh-theme
+++ b/themes/mortalscumbag.zsh-theme
@@ -1,6 +1,6 @@
 function my_git_prompt() {
   tester=$(git rev-parse --git-dir 2> /dev/null) || return
-  
+
   INDEX=$(git status --porcelain 2> /dev/null)
   STATUS=""
 
diff --git a/themes/sonicradish.zsh-theme b/themes/sonicradish.zsh-theme
index 508611830..db6170969 100644
--- a/themes/sonicradish.zsh-theme
+++ b/themes/sonicradish.zsh-theme
@@ -1,4 +1,4 @@
-#!/usr/bin/env zsh 
+#!/usr/bin/env zsh
 #local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
 setopt promptsubst
diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme
index e9e9d6ef8..358891992 100644
--- a/themes/wedisagree.zsh-theme
+++ b/themes/wedisagree.zsh-theme
@@ -5,9 +5,9 @@
 # - Place that bundle in ~/Library/Application\ Support/SIMBL/Plugins (create that folder if it doesn't exist)
 # - Open Terminal preferences. Go to Settings -> Text -> More
 # - Change default colours to your liking.
-# 
+#
 # Here are the colours from Textmate's Monokai theme:
-# 
+#
 # Black: 0, 0, 0
 # Red: 229, 34, 34
 # Green: 166, 227, 45
@@ -28,7 +28,7 @@ PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
 RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}'
 
 # Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
-# $(ruby_prompt_info) 
+# $(ruby_prompt_info)
 
 # local time, color coded by last return code
 time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
@@ -53,7 +53,7 @@ ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
 
 # More symbols to choose from:
 # ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
-# ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵  ⩶ ⨠ 
+# ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵  ⩶ ⨠
 # ⬅ ⬆ ⬇ ⬈ ⬉ ⬊ ⬋ ⬒ ⬓ ⬔ ⬕ ⬖ ⬗ ⬘ ⬙ ⬟  ⬤ 〒 ǀ ǁ ǂ ĭ Ť Ŧ
 
 # Determine if we are using a gemset.
@@ -61,7 +61,7 @@ function rvm_gemset() {
     GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
     if [[ -n $GEMSET ]]; then
         echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
-    fi 
+    fi
 }
 
 # Determine the time since last commit. If branch is clean,
@@ -76,12 +76,12 @@ function git_time_since_commit() {
             # Totals
             MINUTES=$((seconds_since_last_commit / 60))
             HOURS=$((seconds_since_last_commit/3600))
-           
+
             # Sub-hours and sub-minutes
             DAYS=$((seconds_since_last_commit / 86400))
             SUB_HOURS=$((HOURS % 24))
             SUB_MINUTES=$((MINUTES % 60))
-            
+
             if [[ -n $(git status -s 2> /dev/null) ]]; then
                 if [ "$MINUTES" -gt 30 ]; then
                     COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"