From dd30cf104c9ca42d89d26a134382ca421869ce7e Mon Sep 17 00:00:00 2001
From: Aleksandr Kozlov <avlkozlov@avito.ru>
Date: Mon, 22 Jan 2018 12:54:02 +0300
Subject: [PATCH 001/591] Added kgpall alias

---
 plugins/kubectl/kubectl.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 88177b5a0..3c6e8045c 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -24,6 +24,7 @@ alias klp='k logs pods'
 alias kep='k edit pods'
 alias kdp='k describe pods'
 alias kdelp='k delete pods'
+alias kgpall='k get pods --all-namespaces -o wide'
 
 # Service management.
 alias kgs='k get svc'

From edbd86cd956266ee80f6b128588f5673f0cdb3c7 Mon Sep 17 00:00:00 2001
From: Sayan Roy <sayan98.roy@gmail.com>
Date: Sun, 7 Jun 2020 12:14:55 +0530
Subject: [PATCH 002/591] Updating some gem command reference

# Updating some gem command reference
gem_info,gem help , etc.
---
 plugins/ruby/ruby.plugin.zsh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 177b35b31..88e769d39 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -12,3 +12,14 @@ alias rb="ruby"
 alias gin="gem install"
 alias gun="gem uninstall"
 alias gli="gem list"
+alias gi="gem info"
+alias giall="gem info --all"
+alias gca="gem cert --add"
+alias gcr="gem cert --remove"
+alias gcb="gem cert --build"
+alias gclup="gem cleanup -n"
+alias ggi="gem generate_index"
+alias gh="gem help"
+alias gl="gem lock"
+alias go="gem open"
+alias goe="gem open -e"

From c268d176bf5e1efbf31bb1f3c00c182c1b369e9b Mon Sep 17 00:00:00 2001
From: Sayan Roy <sayan98.roy@gmail.com>
Date: Tue, 9 Jun 2020 00:48:50 +0530
Subject: [PATCH 003/591] Updating the README.md

---
 plugins/ruby/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index ad2755bbf..a4a9c5036 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -18,3 +18,14 @@ plugins=(... ruby)
 | gin   | `gem install`                          | Install a gem into the local repository              |
 | gun   | `gem uninstall`                        | Uninstall gems from the local repository             |
 | gli   | `gem list`                             | Display gems installed locally                       |
+| gi    | `gem info`                             | Show information for the given gem                   |
+| giall | `gem info --all`                        | Display all gem versions                             |
+| gca   | `gem cert --add`                       | Add a trusted certificate                            |
+| gcr   | `gem cert --remove`                    | Remove a trusted certificate                         |
+| gcb   | `gem cert --build`                     | Build private key and self-signed certificate        |
+| gclup | `gem cleanup -n`                       | Do not uninstall gem                                 |
+| ggi   | `gem generate_index`                   | Generate index file for gem server                   |
+| gh    | `gem help`                             | Provide additional help                              |
+| gl    | `gem lock`                             | Generate a lockdown list of gems                     |
+| go    | `gem open`                             | Open gem source in default editor                    |
+| goe   | `gem open -e`                          | Open gem sources in preferred editor                 |

From e751d2519d586a2c022beeb0b40dfe9b7a1ed6eb Mon Sep 17 00:00:00 2001
From: Sayan Roy <sayan98.roy@gmail.com>
Date: Wed, 1 Jul 2020 08:58:27 +0530
Subject: [PATCH 004/591] spacing changed

---
 plugins/ruby/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index a4a9c5036..a2de11991 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -19,7 +19,7 @@ plugins=(... ruby)
 | gun   | `gem uninstall`                        | Uninstall gems from the local repository             |
 | gli   | `gem list`                             | Display gems installed locally                       |
 | gi    | `gem info`                             | Show information for the given gem                   |
-| giall | `gem info --all`                        | Display all gem versions                             |
+| giall | `gem info --all`                       | Display all gem versions                             |
 | gca   | `gem cert --add`                       | Add a trusted certificate                            |
 | gcr   | `gem cert --remove`                    | Remove a trusted certificate                         |
 | gcb   | `gem cert --build`                     | Build private key and self-signed certificate        |

From 70ab2928a5ecd2513d4f6a67beb10f79d64d5172 Mon Sep 17 00:00:00 2001
From: "kalle (jag)" <kalle.jillheden@gmail.com>
Date: Mon, 3 May 2021 16:35:28 +0200
Subject: [PATCH 005/591] feat(plugins): add `gh` plugin for GitHub CLI (#9557)

---
 plugins/gh/.gitignore    |  1 +
 plugins/gh/README.md     | 23 +++++++++++++++++++++++
 plugins/gh/gh.plugin.zsh | 13 +++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 plugins/gh/.gitignore
 create mode 100644 plugins/gh/README.md
 create mode 100644 plugins/gh/gh.plugin.zsh

diff --git a/plugins/gh/.gitignore b/plugins/gh/.gitignore
new file mode 100644
index 000000000..fa1244ab5
--- /dev/null
+++ b/plugins/gh/.gitignore
@@ -0,0 +1 @@
+_gh
diff --git a/plugins/gh/README.md b/plugins/gh/README.md
new file mode 100644
index 000000000..54e046a1c
--- /dev/null
+++ b/plugins/gh/README.md
@@ -0,0 +1,23 @@
+# GitHub CLI plugin
+
+This plugin adds completion for the [GitHub CLI](https://cli.github.com/).
+
+To use it, add `gh` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... gh)
+```
+
+This plugin does not add any aliases.
+
+## Cache
+
+This plugin caches the completion script and is automatically updated when the
+plugin is loaded, which is usually when you start up a new terminal emulator.
+
+The cache is stored at:
+
+- `$ZSH/plugins/gh/_gh` completions script
+
+- `$ZSH_CACHE_DIR/gh_version` version of GitHub CLI, used to invalidate
+  the cache.
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
new file mode 100644
index 000000000..8e055ec35
--- /dev/null
+++ b/plugins/gh/gh.plugin.zsh
@@ -0,0 +1,13 @@
+# Autocompletion for the GitHub CLI (gh).
+
+if (( $+commands[gh] )); then
+  if [[ ! -r "$ZSH_CACHE_DIR/gh_version" \
+    || "$(gh --version)" != "$(< "$ZSH_CACHE_DIR/gh_version")"
+    || ! -f "$ZSH/plugins/gh/_gh" ]]; then
+    gh completion --shell zsh > $ZSH/plugins/gh/_gh
+    gh --version > $ZSH_CACHE_DIR/gh_version
+  fi
+  autoload -Uz _gh
+  _comps[gh]=_gh
+fi
+

From f4de8c5b3a977d67ecbd302f24463dc00667eb40 Mon Sep 17 00:00:00 2001
From: sevendials <christj@gmail.com>
Date: Mon, 3 May 2021 07:49:41 -0700
Subject: [PATCH 006/591] fix(command-not-found): remove invalid argument for
 PackageKit (#9876)

`pk-command-not-found` doesn't accept `--` as an argument. This is what happens when `--` is the first argument:

```
$  gem
zsh: --: command not found...
```
---
 plugins/command-not-found/command-not-found.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index cbf9a0a8e..3ec13429c 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -38,7 +38,7 @@ fi
 if [[ -x /usr/libexec/pk-command-not-found ]]; then
   command_not_found_handler() {
     if [[ -S /var/run/dbus/system_bus_socket && -x /usr/libexec/packagekitd ]]; then
-      /usr/libexec/pk-command-not-found -- "$@"
+      /usr/libexec/pk-command-not-found "$@"
       return $?
     fi
 

From 4e8ffe88d4311edcd084de5efd4ee6688e9e70f7 Mon Sep 17 00:00:00 2001
From: Ben Goldberg <ben@benaaron.dev>
Date: Mon, 3 May 2021 10:59:45 -0400
Subject: [PATCH 007/591] fix(cargo): complete flags for default cargo aliases
 (#9692)

By default, cargo provides alias for some commonly used functions. This patch
makes it that those alias will complete the same as their full commands.

Default alias:
b -> build
c -> check
t -> test
r -> run

Since cargo allows users to define custom alias it would be nice if
oh-my-zsh automatically detected those and preformed completions as such
but that would be a much more complex patch.
---
 plugins/cargo/_cargo | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index ffc9fcdc8..ebff99310 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -77,7 +77,7 @@ _cargo() {
                         '*:args:_default'
                         ;;
 
-                build)
+                build|b)
                     _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
                         '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
                         "${command_scope_spec[@]}" \
@@ -86,7 +86,7 @@ _cargo() {
                         '--build-plan[output the build plan in JSON]' \
                         ;;
 
-                check)
+                check|c)
                     _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
                         '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
                         "${command_scope_spec[@]}" \
@@ -224,7 +224,7 @@ _cargo() {
                     _arguments -s -S $common $manifest
                         ;;
 
-                run)
+                run|r)
                     _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
                         '--example=[name of the bin target]:name' \
                         '--bin=[name of the bin target]:name' \
@@ -259,7 +259,7 @@ _cargo() {
                         '*: :_guard "^-*" "query"'
                         ;;
 
-                test)
+                test|t)
                     _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
                         '--test=[test name]: :_cargo_test_names' \
                         '--no-fail-fast[run all tests regardless of failure]' \

From d646884add277d134235a9b18ab755388d6e0d8d Mon Sep 17 00:00:00 2001
From: "Babak K. Shandiz" <babak.k.shandiz@gmail.com>
Date: Mon, 3 May 2021 20:05:13 +0430
Subject: [PATCH 008/591] feat(git): add aliases `gcas` and `gcasm` for commit
 with sign-off (#8881)

---
 plugins/git/README.md      | 2 ++
 plugins/git/git.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 6ad19543e..4f051db8d 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -41,6 +41,8 @@ plugins=(... git)
 | gcan!                | git commit -v -a --no-edit --amend                                                                                               |
 | gcans!               | git commit -v -a -s --no-edit --amend                                                                                            |
 | gcam                 | git commit -a -m                                                                                                                 |
+| gcas                 | git commit -a -s                                                                                                                 |
+| gcasm                | git commit -a -s -m                                                                                                                  |
 | gcsm                 | git commit -s -m                                                                                                                 |
 | gcb                  | git checkout -b                                                                                                                  |
 | gcf                  | git config --list                                                                                                                |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e815d0787..35ebfbfa3 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -80,6 +80,8 @@ alias gcan!='git commit -v -a --no-edit --amend'
 alias gcans!='git commit -v -a -s --no-edit --amend'
 alias gcam='git commit -a -m'
 alias gcsm='git commit -s -m'
+alias gcas='git commit -a -s'
+alias gcasm='git commit -a -s -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
 alias gcl='git clone --recurse-submodules'

From 1bda62dffadf175091fe144cb423db348e3029df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 21 May 2021 21:57:34 +0200
Subject: [PATCH 009/591] feat(shrink-path): add ability to toggle off path
 shrinking (#9794)

---
 plugins/shrink-path/README.md              | 87 +++++++++++++++-------
 plugins/shrink-path/shrink-path.plugin.zsh | 12 +++
 2 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/plugins/shrink-path/README.md b/plugins/shrink-path/README.md
index 33dc3f8ae..71a242b2c 100644
--- a/plugins/shrink-path/README.md
+++ b/plugins/shrink-path/README.md
@@ -1,43 +1,50 @@
-# A plugin to shrink directory paths for brevity and pretty-printing
+# shrink-path
 
+A plugin to shrink directory paths for brevity and pretty-printing.
+
+To use it, add `shrink-path` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... shrink-path)
+```
 
 ## Examples
 
 For this directory tree:
 ```
-    /home/
-      me/
-        f o o/     # The prefix f is ambiguous between "f o o" and "f i g".
-          bar/
-            quux/
-          biz/     # The prefix b is ambiguous between bar and biz.
-        f i g/
-          baz/
+/home/
+  me/
+    f o o/     # The prefix f is ambiguous between "f o o" and "f i g".
+      bar/
+        quux/
+      biz/     # The prefix b is ambiguous between bar and biz.
+    f i g/
+      baz/
 ```
 here are the results of calling `shrink_path <option> /home/me/foo/bar/quux`:
 ```
-    Option        Result
-    <none>        /h/m/f o/ba/q
-    -l|--last     /h/m/f o/ba/q
-    -s|--short    /h/m/f/b/q
-    -t|--tilde    ~/f o/ba/q
-    -f|--fish     ~/f/b/quux
-    -g|--glob     /h*/m*/f o*/ba*/q*
-    -3            /hom/me/f o/bar/quu
-    -e '$' -3     /hom$/me/f o$/bar/quu$
-    -q            /h/m/f\ o/ba/q
-    -g -q         /h*/m*/f\ o*/ba*/q*
+Option        Result
+<none>        /h/m/f o/ba/q
+-l|--last     /h/m/f o/ba/q
+-s|--short    /h/m/f/b/q
+-t|--tilde    ~/f o/ba/q
+-f|--fish     ~/f/b/quux
+-g|--glob     /h*/m*/f o*/ba*/q*
+-3            /hom/me/f o/bar/quu
+-e '$' -3     /hom$/me/f o$/bar/quu$
+-q            /h/m/f\ o/ba/q
+-g -q         /h*/m*/f\ o*/ba*/q*
+-x            /home/me/foo/bar/quux
 ```
 
-
 ## Usage
 
 For a fish-style working directory in your command prompt, add the following to
 your theme or zshrc:
 
-```
-    setopt prompt_subst
-    PS1='%n@%m $(shrink_path -f)>'
+```zsh
+setopt prompt_subst
+PS1='%n@%m $(shrink_path -f)>'
 ```
 
 The following options are available:
@@ -54,17 +61,45 @@ The following options are available:
                      ellipsis character(s) (defaulting to 1).
     -e SYMBOL        Postfix symbol(s) to indicate that a directory name had been truncated.
     -q, --quote      Quote special characters in the shrunk path
+    -x, --expand     Print the full path. This takes precedence over the other options
 ```
 
 The long options can also be set via zstyle, like
-```
-    zstyle :prompt:shrink_path fish yes
+```zsh
+zstyle :prompt:shrink_path fish yes
 ```
 
 Note: Directory names containing two or more consecutive spaces are not yet
 supported.
 
 
+## Trick: toggle shrinking with a keyboard shortcut
+
+You can use the `expand` option to disable the path shrinking. You can combine that
+with a key binding widget to toggle path shrinking on and off.
+
+```zsh
+# Toggle off path shrinking
+zstyle ':prompt:shrink_path' expand true
+# Toggle on path shrinking
+zstyle -d ':prompt:shrink_path' expand
+```
+
+Combined with a widget:
+
+```zsh
+# Widget definition
+shrink-path-toggle() {
+  zstyle -t ':prompt:shrink_path' expand \
+    && zstyle -d ':prompt:shrink_path' expand \
+    || zstyle ':prompt:shrink_path' expand true
+  zle reset-prompt
+}
+zle -N shrink-path-toggle
+# Key binding to ALT+SHIFT+S
+bindkey "^[S" shrink-path-toggle
+```
+
 ## License
 
 Copyright (C) 2008 by Daniel Friesel <derf@xxxxxxxxxxxxxxxxxx>
diff --git a/plugins/shrink-path/shrink-path.plugin.zsh b/plugins/shrink-path/shrink-path.plugin.zsh
index f0ed65138..373fd5b05 100644
--- a/plugins/shrink-path/shrink-path.plugin.zsh
+++ b/plugins/shrink-path/shrink-path.plugin.zsh
@@ -45,6 +45,7 @@ shrink_path () {
         typeset -i length=1
         typeset ellipsis=""
         typeset -i quote=0
+        typeset -i expand=0
 
         if zstyle -t ':prompt:shrink_path' fish; then
                 lastfull=1
@@ -60,6 +61,7 @@ shrink_path () {
         zstyle -t ':prompt:shrink_path' tilde && tilde=1
         zstyle -t ':prompt:shrink_path' glob && ellipsis='*'
         zstyle -t ':prompt:shrink_path' quote && quote=1
+        zstyle -t ':prompt:shrink_path' expand && expand=1
 
         while [[ $1 == -* ]]; do
                 case $1 in
@@ -85,6 +87,8 @@ shrink_path () {
                                 print '                 ellipsis character(s) (defaulting to 1).'
                                 print ' -e SYMBOL       Postfix symbol(s) to indicate that a directory name had been truncated.'
                                 print ' -q, --quote     Quote special characters in the shrunk path'
+                                print ' -x, --expand    Print the full path. This takes precedence over the other options'
+                                print ''
                                 print 'The long options can also be set via zstyle, like'
                                 print '  zstyle :prompt:shrink_path fish yes'
                                 return 0
@@ -109,6 +113,9 @@ shrink_path () {
                         -q|--quote)
                                 quote=1
                         ;;
+                        -x|--expand)
+                                expand=1
+                        ;;
                 esac
                 shift
         done
@@ -120,6 +127,11 @@ shrink_path () {
 
         [[ -d $dir ]] || return 0
 
+        if (( expand )) {
+                echo "$dir"
+                return 0
+        }
+
         if (( named )) {
                 for part in ${(k)nameddirs}; {
                         [[ $dir == ${nameddirs[$part]}(/*|) ]] && dir=${dir/#${nameddirs[$part]}/\~$part}

From 7ab15bee033a1ce6791b05f4636221cba7b9505e Mon Sep 17 00:00:00 2001
From: rhuitl <robert@huitl.de>
Date: Fri, 21 May 2021 22:00:58 +0200
Subject: [PATCH 010/591] feat(dirhistory): add ALT+UP/DOWN key bindings for
 iTerm2 (#8502)

---
 plugins/dirhistory/dirhistory.plugin.zsh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index ec1606940..0ee8c6e6a 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -2,7 +2,7 @@
 #   Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories 
 #   that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT.
 # 
-#   Navigate directory hierarchy using ALT-UP and ALT-DOWN. (mac keybindings not yet implemented)
+#   Navigate directory hierarchy using ALT-UP and ALT-DOWN.
 #   ALT-UP moves to higher hierarchy (cd ..)
 #   ALT-DOWN moves into the first directory found in alphabetical order
 #
@@ -125,7 +125,7 @@ zle -N dirhistory_zle_dirhistory_back
 bindkey "\e[3D" dirhistory_zle_dirhistory_back
 bindkey "\e[1;3D" dirhistory_zle_dirhistory_back
 # Mac teminal (alt+left/right)
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
   bindkey "^[b" dirhistory_zle_dirhistory_back
 fi
 # Putty:
@@ -136,7 +136,7 @@ bindkey "\eO3D" dirhistory_zle_dirhistory_back
 zle -N dirhistory_zle_dirhistory_future
 bindkey "\e[3C" dirhistory_zle_dirhistory_future
 bindkey "\e[1;3C" dirhistory_zle_dirhistory_future
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
   bindkey "^[f" dirhistory_zle_dirhistory_future
 fi
 bindkey "\e\e[C" dirhistory_zle_dirhistory_future
@@ -175,8 +175,9 @@ zle -N dirhistory_zle_dirhistory_up
 # xterm in normal mode
 bindkey "\e[3A" dirhistory_zle_dirhistory_up
 bindkey "\e[1;3A" dirhistory_zle_dirhistory_up
-# Mac teminal (alt+up)
-    #bindkey "^[?" dirhistory_zle_dirhistory_up #dont know it
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  bindkey "^[[A" dirhistory_zle_dirhistory_up
+fi
 # Putty:
 bindkey "\e\e[A" dirhistory_zle_dirhistory_up
 # GNU screen:
@@ -185,7 +186,8 @@ bindkey "\eO3A" dirhistory_zle_dirhistory_up
 zle -N dirhistory_zle_dirhistory_down
 bindkey "\e[3B" dirhistory_zle_dirhistory_down
 bindkey "\e[1;3B" dirhistory_zle_dirhistory_down
-# Mac teminal (alt+down)
-    #bindkey "^[?" dirhistory_zle_dirhistory_down #dont know it
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  bindkey "^[[B" dirhistory_zle_dirhistory_down
+fi
 bindkey "\e\e[B" dirhistory_zle_dirhistory_down
 bindkey "\eO3B" dirhistory_zle_dirhistory_down

From 308b2314f846fba1c0e6e4a64efc95feaa304a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 28 May 2021 10:47:02 +0200
Subject: [PATCH 011/591] fix(dirhistory): fix ALT+Left/Right key bindings for
 iTerm2 (#9940)

---
 plugins/dirhistory/dirhistory.plugin.zsh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 0ee8c6e6a..cbac84600 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -124,10 +124,14 @@ zle -N dirhistory_zle_dirhistory_back
 # xterm in normal mode
 bindkey "\e[3D" dirhistory_zle_dirhistory_back
 bindkey "\e[1;3D" dirhistory_zle_dirhistory_back
-# Mac teminal (alt+left/right)
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
+# Terminal.app
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
   bindkey "^[b" dirhistory_zle_dirhistory_back
 fi
+# iTerm2
+if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  bindkey "^[^[[D" dirhistory_zle_dirhistory_back
+fi
 # Putty:
 bindkey "\e\e[D" dirhistory_zle_dirhistory_back
 # GNU screen:
@@ -136,9 +140,14 @@ bindkey "\eO3D" dirhistory_zle_dirhistory_back
 zle -N dirhistory_zle_dirhistory_future
 bindkey "\e[3C" dirhistory_zle_dirhistory_future
 bindkey "\e[1;3C" dirhistory_zle_dirhistory_future
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
+# Terminal.app
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
   bindkey "^[f" dirhistory_zle_dirhistory_future
 fi
+# iTerm2
+if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  bindkey "^[^[[C" dirhistory_zle_dirhistory_future
+fi
 bindkey "\e\e[C" dirhistory_zle_dirhistory_future
 bindkey "\eO3C" dirhistory_zle_dirhistory_future
 

From 059ee71fc812f104bd8ac3dae2f5f01a8d3f032a Mon Sep 17 00:00:00 2001
From: Keita Urashima <ursm@ursm.jp>
Date: Fri, 28 May 2021 18:14:58 +0900
Subject: [PATCH 012/591] fix(gentoo): fix the color of the prompt symbol
 (#9885)

This commit fixes an issue where the prompt symbol is white when vcs_info is displayed in the gentoo theme.
---
 themes/gentoo.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/gentoo.zsh-theme b/themes/gentoo.zsh-theme
index e18bce890..7ac461036 100644
--- a/themes/gentoo.zsh-theme
+++ b/themes/gentoo.zsh-theme
@@ -25,4 +25,4 @@ gentoo_precmd() {
 autoload -U add-zsh-hook
 add-zsh-hook precmd gentoo_precmd
 
-PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %F{blue}%(!.%1~.%~) ${vcs_info_msg_0_}%(!.#.$)%k%b%f '
+PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %F{blue}%(!.%1~.%~) ${vcs_info_msg_0_}%F{blue}%(!.#.$)%k%b%f '

From c95b4a393a9eb4f4a4ca0535ed500bdf5e2fbe96 Mon Sep 17 00:00:00 2001
From: "Gustavo J. Acosta" <gtaw_acosta@protonmail.com>
Date: Fri, 28 May 2021 05:19:28 -0400
Subject: [PATCH 013/591] chore(chucknorris): fix typo (#9916)

---
 plugins/chucknorris/fortunes/chucknorris | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
index 0eb6e2e99..0ddb6c03b 100644
--- a/plugins/chucknorris/fortunes/chucknorris
+++ b/plugins/chucknorris/fortunes/chucknorris
@@ -312,7 +312,7 @@ Chuck Norris. Enough said.
 %
 Chuck Norris: even Naruto can't believe it.
 %
-Chunk Norris can make sour milk turn fresh.
+Chuck Norris can make sour milk turn fresh.
 %
 Contrary to popular belief, Rome WAS built in a day, by Chuck Norris.
 %

From 706b2f3765d41bee2853b17724888d1a3f6f00d9 Mon Sep 17 00:00:00 2001
From: Corey Hinkle <bugg123@gmail.com>
Date: Fri, 28 May 2021 05:27:16 -0400
Subject: [PATCH 014/591] feat(extract): add support for .ear files (#9901)

Co-authored-by: Corey Hinkle <corey.hinkle@five9.com>
---
 plugins/extract/README.md          | 1 +
 plugins/extract/_extract           | 2 +-
 plugins/extract/extract.plugin.zsh | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/extract/README.md b/plugins/extract/README.md
index b2b731e39..f2e6ad1d1 100644
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@@ -22,6 +22,7 @@ plugins=(... extract)
 | `aar`             | Android library file                 |
 | `bz2`             | Bzip2 file                           |
 | `deb`             | Debian package                       |
+| `ear`             | Enterprise Application aRchive       |
 | `gz`              | Gzip file                            |
 | `ipa`             | iOS app package                      |
 | `ipsw`            | iOS firmware file                    |
diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index f96f0d450..267c4d4e1 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,5 +3,5 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|deb|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
     && return 0
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 46e69f08d..e390e2dcc 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -55,7 +55,7 @@ extract() {
 			(*.lz4) lz4 -d "$1" ;;
 			(*.lzma) unlzma "$1" ;;
 			(*.z) uncompress "$1" ;;
-			(*.zip|*.war|*.jar|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d $extract_dir ;;
+			(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d $extract_dir ;;
 			(*.rar) unrar x -ad "$1" ;;
 			(*.rpm) mkdir "$extract_dir" && cd "$extract_dir" && rpm2cpio "../$1" | cpio --quiet -id && cd .. ;;
 			(*.7z) 7za x "$1" ;;

From 02ce2c4a2f563c4e092410fe3ddc8b29b6de7fdc Mon Sep 17 00:00:00 2001
From: Roc <rochappy.sun@gmail.com>
Date: Sat, 12 Jun 2021 09:50:29 +0800
Subject: [PATCH 015/591] add python alias (#7736)

---
 plugins/python/python.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index c3c1474c1..276eb6f91 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -1,3 +1,6 @@
+# python command
+alias py='python'
+
 # Find python file
 alias pyfind='find . -name "*.py"'
 

From a206271460ce49e842b1b410c0424b8c9a0a3d14 Mon Sep 17 00:00:00 2001
From: Nuno Goncalves <nunojpg@gmail.com>
Date: Sat, 12 Jun 2021 04:03:25 +0200
Subject: [PATCH 016/591] ssh-agent: improvements (#6309)

* ssh-agent: lock this script with a mkdir style mutex

This script is a kind of singleton pattern and is not reentrant.
If several shells are oppened in a fast sequence, then several
independent ssh-agents would be created, which is not acceptable.
A mutex is required.

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

* ssh-agent: only start agent if .ssh dir exists

To use the same profile system-wide, it might happen
that the .ssh directory does not exist
(typically $HOME/.ssh/). This would trigger a error.

Creating the directory would be a option, but it
usually will not make sense to do so because it means
the user doesn't have ssh keys or config.

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

* ssh-agent: adds lazy option to disable key loading on start

Option is documented on updated README.md

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

* ssh-agent: simplify agent-forwarding checking

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

Co-authored-by: Robby Russell <robby@planetargon.com>
---
 plugins/ssh-agent/README.md            | 12 +++++++++--
 plugins/ssh-agent/ssh-agent.plugin.zsh | 29 +++++++++++++++++++-------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index 8765a9c7e..aa96f9cc9 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -19,9 +19,17 @@ To enable **agent forwarding support** add the following to your zshrc file:
 zstyle :omz:plugins:ssh-agent agent-forwarding on
 ```
 
-----
+To **NOT load any identities on start** use the `lazy` style.
+This is particularly usefull when combined with the AddKeysToAgent
+(available from OpenSSH 7.2), since it allows to enter the password only
+on first use.
 
-To **load multiple identities** use the `identities` style, For example:
+```zsh
+zstyle :omz:plugins:ssh-agent lazy yes
+```
+
+To **load multiple identities** use the `identities` style. This have no
+effect if `lazy` is enabled.
 
 ```zsh
 zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index d45406f63..494cf1393 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,4 +1,16 @@
-typeset _agent_forwarding _ssh_env_cache
+lockdir=/tmp/oh-my-zsh-ssh-agent.lock
+
+while true; do
+    if mkdir "$lockdir" 2>/dev/null
+    then    # directory did not exist, but was created successfully
+        trap 'rm -rf "$lockdir"' 0    # remove directory when script finishes
+        break    # continue with script
+    else
+        sleep 0.1  # sleep for 0.2 and try again
+    fi
+done
+
+typeset _ssh_env_cache
 
 function _start_agent() {
 	local lifetime
@@ -56,10 +68,7 @@ function _add_identities() {
 # Get the filename to store/lookup the environment from
 _ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
 
-# test if agent-forwarding is enabled
-zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding
-
-if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
+if zstyle -t :omz:plugins:ssh-agent agent-forwarding && [[ -n "$SSH_AUTH_SOCK" ]]; then
 	# Add a nifty symlink for screen/tmux if agent forwarding
 	[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 elif [[ -f "$_ssh_env_cache" ]]; then
@@ -73,12 +82,16 @@ elif [[ -f "$_ssh_env_cache" ]]; then
 	ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
 		_start_agent
 	}
-else
+elif [[ -d $HOME/.ssh ]]; then
 	_start_agent
 fi
 
-_add_identities
+if ! zstyle -t :omz:plugins:ssh-agent lazy; then
+	_add_identities
+fi
 
 # tidy up after ourselves
-unset _agent_forwarding _ssh_env_cache
+unset _ssh_env_cache
 unfunction _start_agent _add_identities
+
+rm -rf "$lockdir"

From e47a8e2321be9e7af49872588619c031a757d6ea Mon Sep 17 00:00:00 2001
From: hqingyi <huangb.qingy@gmail.com>
Date: Sat, 12 Jun 2021 10:45:05 +0800
Subject: [PATCH 017/591] feat(plugins): add aliases cheatsheet plugin (#4662)

* add: explore alias quickly with aliases plugin.

* change: add compatibility with python2 & python3.

- add compatibility.
- add termcolor.py.
- remove aliass(search), just use acs.
- detect python.
---
 plugins/aliases/aliases.plugin.zsh |  10 ++
 plugins/aliases/cheatsheet.py      |  55 ++++++++++
 plugins/aliases/termcolor.py       | 168 +++++++++++++++++++++++++++++
 3 files changed, 233 insertions(+)
 create mode 100644 plugins/aliases/aliases.plugin.zsh
 create mode 100644 plugins/aliases/cheatsheet.py
 create mode 100644 plugins/aliases/termcolor.py

diff --git a/plugins/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh
new file mode 100644
index 000000000..28d8fba24
--- /dev/null
+++ b/plugins/aliases/aliases.plugin.zsh
@@ -0,0 +1,10 @@
+# with lots of 3rd-party amazing aliases installed, just need something to explore it quickly.
+#
+# - acs: alias cheatsheet
+#   group alias by command, pass addition argv to grep.
+ALIASES_PLUGIN_ROOT=$(cd `dirname $0` && pwd)
+function acs(){
+    which python >>/dev/null
+    [[ $? -eq 1 ]] && echo "[error]no python executable detected!" && return
+    alias | python $ALIASES_PLUGIN_ROOT/cheatsheet.py $@
+}
diff --git a/plugins/aliases/cheatsheet.py b/plugins/aliases/cheatsheet.py
new file mode 100644
index 000000000..d6d507b92
--- /dev/null
+++ b/plugins/aliases/cheatsheet.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+import sys
+import itertools
+import termcolor
+
+def parse(line):
+    left = line[0:line.find('=')].strip()
+    right = line[line.find('=')+1:].strip('\'"\n ')
+    try:
+        cmd = next(part for part in right.split() if len([char for char in '=<>' if char in part])==0)
+    except StopIteration:
+        cmd = right
+    return (left, right, cmd)
+
+def cheatsheet(lines):
+    exps = [ parse(line) for line in lines ]
+    cheatsheet = {'_default': []}
+    for key, group in itertools.groupby(exps, lambda exp:exp[2]):
+        group_list = [ item for item in group ]
+        if len(group_list)==1:
+            target_aliases = cheatsheet['_default']
+        else:
+            if key not in cheatsheet:
+                cheatsheet[key] = []
+            target_aliases = cheatsheet[key]
+        target_aliases.extend(group_list)
+    return cheatsheet
+
+def pretty_print_group(key, aliases, hightlight=None):
+    if len(aliases) == 0:
+        return
+    group_hl_formatter = lambda g, hl: termcolor.colored(hl, 'yellow').join([termcolor.colored(part, 'red') for part in ('[%s]' % g).split(hl)])
+    alias_hl_formatter = lambda alias, hl: termcolor.colored(hl, 'yellow').join([termcolor.colored(part, 'green') for part in ('\t%s = %s' % alias[0:2]).split(hl)])
+    group_formatter = lambda g: termcolor.colored('[%s]' % g, 'red')
+    alias_formatter = lambda alias: termcolor.colored('\t%s = %s' % alias[0:2], 'green')
+    if hightlight and len(hightlight)>0:
+        print (group_hl_formatter(key, hightlight))
+        print ('\n'.join([alias_hl_formatter(alias, hightlight) for alias in aliases]))
+    else:
+        print (group_formatter(key))
+        print ('\n'.join([alias_formatter(alias) for alias in aliases]))
+    print ('')
+
+def pretty_print(cheatsheet, wfilter):
+    sorted_key = sorted(cheatsheet.keys())
+    for key in sorted_key:
+        aliases = cheatsheet.get(key)
+        if not wfilter:
+            pretty_print_group(key, aliases, wfilter)
+        else:
+            pretty_print_group(key, [ alias for alias in aliases if alias[0].find(wfilter)>-1 or alias[1].find(wfilter)>-1], wfilter)
+
+if __name__ == '__main__':
+    lines = sys.stdin.readlines()
+    pretty_print(cheatsheet(lines), sys.argv[1] if len(sys.argv)>1 else None)
diff --git a/plugins/aliases/termcolor.py b/plugins/aliases/termcolor.py
new file mode 100644
index 000000000..f11b824b2
--- /dev/null
+++ b/plugins/aliases/termcolor.py
@@ -0,0 +1,168 @@
+# coding: utf-8
+# Copyright (c) 2008-2011 Volvox Development Team
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Konstantin Lepa <konstantin.lepa@gmail.com>
+
+"""ANSII Color formatting for output in terminal."""
+
+from __future__ import print_function
+import os
+
+
+__ALL__ = [ 'colored', 'cprint' ]
+
+VERSION = (1, 1, 0)
+
+ATTRIBUTES = dict(
+        list(zip([
+            'bold',
+            'dark',
+            '',
+            'underline',
+            'blink',
+            '',
+            'reverse',
+            'concealed'
+            ],
+            list(range(1, 9))
+            ))
+        )
+del ATTRIBUTES['']
+
+
+HIGHLIGHTS = dict(
+        list(zip([
+            'on_grey',
+            'on_red',
+            'on_green',
+            'on_yellow',
+            'on_blue',
+            'on_magenta',
+            'on_cyan',
+            'on_white'
+            ],
+            list(range(40, 48))
+            ))
+        )
+
+
+COLORS = dict(
+        list(zip([
+            'grey',
+            'red',
+            'green',
+            'yellow',
+            'blue',
+            'magenta',
+            'cyan',
+            'white',
+            ],
+            list(range(30, 38))
+            ))
+        )
+
+
+RESET = '\033[0m'
+
+
+def colored(text, color=None, on_color=None, attrs=None):
+    """Colorize text.
+
+    Available text colors:
+        red, green, yellow, blue, magenta, cyan, white.
+
+    Available text highlights:
+        on_red, on_green, on_yellow, on_blue, on_magenta, on_cyan, on_white.
+
+    Available attributes:
+        bold, dark, underline, blink, reverse, concealed.
+
+    Example:
+        colored('Hello, World!', 'red', 'on_grey', ['blue', 'blink'])
+        colored('Hello, World!', 'green')
+    """
+    if os.getenv('ANSI_COLORS_DISABLED') is None:
+        fmt_str = '\033[%dm%s'
+        if color is not None:
+            text = fmt_str % (COLORS[color], text)
+
+        if on_color is not None:
+            text = fmt_str % (HIGHLIGHTS[on_color], text)
+
+        if attrs is not None:
+            for attr in attrs:
+                text = fmt_str % (ATTRIBUTES[attr], text)
+
+        text += RESET
+    return text
+
+
+def cprint(text, color=None, on_color=None, attrs=None, **kwargs):
+    """Print colorize text.
+
+    It accepts arguments of print function.
+    """
+
+    print((colored(text, color, on_color, attrs)), **kwargs)
+
+
+if __name__ == '__main__':
+    print('Current terminal type: %s' % os.getenv('TERM'))
+    print('Test basic colors:')
+    cprint('Grey color', 'grey')
+    cprint('Red color', 'red')
+    cprint('Green color', 'green')
+    cprint('Yellow color', 'yellow')
+    cprint('Blue color', 'blue')
+    cprint('Magenta color', 'magenta')
+    cprint('Cyan color', 'cyan')
+    cprint('White color', 'white')
+    print(('-' * 78))
+
+    print('Test highlights:')
+    cprint('On grey color', on_color='on_grey')
+    cprint('On red color', on_color='on_red')
+    cprint('On green color', on_color='on_green')
+    cprint('On yellow color', on_color='on_yellow')
+    cprint('On blue color', on_color='on_blue')
+    cprint('On magenta color', on_color='on_magenta')
+    cprint('On cyan color', on_color='on_cyan')
+    cprint('On white color', color='grey', on_color='on_white')
+    print('-' * 78)
+
+    print('Test attributes:')
+    cprint('Bold grey color', 'grey', attrs=['bold'])
+    cprint('Dark red color', 'red', attrs=['dark'])
+    cprint('Underline green color', 'green', attrs=['underline'])
+    cprint('Blink yellow color', 'yellow', attrs=['blink'])
+    cprint('Reversed blue color', 'blue', attrs=['reverse'])
+    cprint('Concealed Magenta color', 'magenta', attrs=['concealed'])
+    cprint('Bold underline reverse cyan color', 'cyan',
+            attrs=['bold', 'underline', 'reverse'])
+    cprint('Dark blink concealed white color', 'white',
+            attrs=['dark', 'blink', 'concealed'])
+    print(('-' * 78))
+
+    print('Test mixing:')
+    cprint('Underline red on grey color', 'red', 'on_grey',
+            ['underline'])
+    cprint('Reversed green on red color', 'green', 'on_red', ['reverse'])
+

From 5cdba87025b9dca3c6f2378a58595c613464fc63 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Fri, 11 Jun 2021 19:43:24 -0700
Subject: [PATCH 018/591] Aliases: Adding a README file for the plugin. #4662

---
 plugins/aliases/README.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 plugins/aliases/README.md

diff --git a/plugins/aliases/README.md b/plugins/aliases/README.md
new file mode 100644
index 000000000..481c1bd4e
--- /dev/null
+++ b/plugins/aliases/README.md
@@ -0,0 +1,21 @@
+## Aliases Cheatsheet
+
+**Maintainer:** [@hqingyi](https://github.com/hqingyi)
+
+With lots of 3rd-party amazing aliases installed, this plugin helps list the shortcuts
+that are currently available based on the plugins you have enabled.
+
+Enable this plugin by adding it to your `plugins` definition in `~/.zshrc`.
+
+  ```
+  plugins=(aliases)
+  ```
+
+Requirements: Python needs to be installed.
+
+### Usage
+
+```
+  acs: group all alias
+  acs $keywordquickly filter alias & highlight
+```

From 270db708059909b575cd747789580f8a3dbf7baa Mon Sep 17 00:00:00 2001
From: Logicer <81077770+Logicer16@users.noreply.github.com>
Date: Sat, 12 Jun 2021 13:03:21 +1000
Subject: [PATCH 019/591] fix(update): correct description of how changelog is
 displayed (#9943)

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 417e06fe8..38fac3ce0 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -72,7 +72,7 @@ if git pull --rebase --stat origin master; then
     # Save the commit prior to updating
     git config oh-my-zsh.lastVersion "$last_commit"
 
-    # Display changelog with less if available, otherwise just print it to the terminal
+    # Print changelog to the terminal
     if [[ "$1" = --interactive ]]; then
       "$ZSH/tools/changelog.sh" HEAD "$last_commit"
     fi

From 00ccb449907d322c6bfa53f17e96cbf48651fee3 Mon Sep 17 00:00:00 2001
From: Hugo Stijns <hugo@boosboos.net>
Date: Sat, 12 Jun 2021 05:04:58 +0200
Subject: [PATCH 020/591] fix(vagrant): Allow dot in Vagrant box name (#4803)

---
 plugins/vagrant/_vagrant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 3e16dbebf..e88835506 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -69,7 +69,7 @@ __box_list ()
 
 __vm_list ()
 {
-    _wanted application expl 'command' compadd $(command grep "${VAGRANT_CWD:-.}/Vagrantfile" -oe '^[^#]*\.vm\.define *[:"]\([a-zA-Z0-9_-]\+\)' 2>/dev/null | awk '{print substr($2, 2)}')
+    _wanted application expl 'command' compadd $(command grep "${VAGRANT_CWD:-.}/Vagrantfile" -oe '^[^#]*\.vm\.define *[:"]\([a-zA-Z0-9\._-]\+\)' 2>/dev/null | awk '{print substr($2, 2)}')
     _wanted application expl 'command' compadd $(command ls "${VAGRANT_CWD:-.}/.vagrant/machines/" 2>/dev/null)
 }
 

From 580c28dedd60e9262cd7240a9417e0302a6476da Mon Sep 17 00:00:00 2001
From: Eric Liu <lazybios@gmail.com>
Date: Sat, 12 Jun 2021 11:07:21 +0800
Subject: [PATCH 021/591] feat(rails): add 'rails server --bind' alias (#4977)

---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 5b0be4f85..aa7576916 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -52,6 +52,7 @@ alias ru='rails runner'
 alias rs='rails server'
 alias rsd='rails server --debugger'
 alias rsp='rails server --port'
+alias rsb='rails server --bind'
 
 # Rake aliases
 alias rdm='rake db:migrate'

From 42f56c5601f814ca34239324eefc9cb96cb4cdbc Mon Sep 17 00:00:00 2001
From: Dzianis Dashkevich <dskecse@gmail.com>
Date: Sat, 12 Jun 2021 06:10:00 +0300
Subject: [PATCH 022/591] feat(rails): Add `rdmd` and `rdmu` aliases to Rails
 plugin (#6126)

* `rdmd` is aliased to `rake db:migrate:down`
* `rdmu` is aliased to `rake db:migrate:up`
* These tasks allow you to run a specific migration up or down by
specifying the appropriate `VERSION` env variable, which contains
the numerical prefix of the migration's filename
---
 plugins/rails/rails.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index aa7576916..34aebbc2c 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -56,7 +56,9 @@ alias rsb='rails server --bind'
 
 # Rake aliases
 alias rdm='rake db:migrate'
+alias rdmd='rake db:migrate:down'
 alias rdms='rake db:migrate:status'
+alias rdmu='rake db:migrate:up'
 alias rdr='rake db:rollback'
 alias rdc='rake db:create'
 alias rds='rake db:seed'

From 81db2af60131025f1bb1e25b27fc530066cdba3a Mon Sep 17 00:00:00 2001
From: Dzianis Dashkevich <dskecse@gmail.com>
Date: Sat, 12 Jun 2021 06:12:13 +0300
Subject: [PATCH 023/591] feat(rails): Add `rdmr` (`rake db:migrate:redo`)
 alias to Rails plugin (#6124)

Co-authored-by: Robby Russell <robby@planetargon.com>
---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 34aebbc2c..29b413434 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -56,6 +56,7 @@ alias rsb='rails server --bind'
 
 # Rake aliases
 alias rdm='rake db:migrate'
+alias rdmr='rake db:migrate:redo'
 alias rdmd='rake db:migrate:down'
 alias rdms='rake db:migrate:status'
 alias rdmu='rake db:migrate:up'

From 0869a57cb585ad6279abf108c742e3c6650ed9d5 Mon Sep 17 00:00:00 2001
From: Wenli Wan <swwl1992@gmail.com>
Date: Sat, 12 Jun 2021 11:49:04 +0800
Subject: [PATCH 024/591] fix(kubectl): remove duplicated alias for kubectl
 plugin `kgsa` (#9927)

---
 plugins/kubectl/README.md          | 1 -
 plugins/kubectl/kubectl.plugin.zsh | 1 -
 2 files changed, 2 deletions(-)

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index 8937b2b80..f6651c8cd 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -107,7 +107,6 @@ plugins=(... kubectl)
 | ksss    | `kubectl scale statefulset`         | Scale a statefulset                                                                              |
 | krsss   | `kubectl rollout status statefulset`| Check the rollout status of a deployment                                                         |
 |         |                                     | **Service Accounts management**                                                                  |
-| kgsa    | `kubectl get sa`                    | List all service accounts                                                                        |
 | kdsa    | `kubectl describe sa`               | Describe a service account in details                                                            |
 | kdelsa  | `kubectl delete sa`                 | Delete the service account                                                                       |
 |         |                                     | **DaemonSet management**                                                                         |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 56135274f..58a401120 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -151,7 +151,6 @@ alias kdpvc='kubectl describe pvc'
 alias kdelpvc='kubectl delete pvc'
 
 # Service account management.
-alias kgsa="kubectl get sa"
 alias kdsa="kubectl describe sa"
 alias kdelsa="kubectl delete sa"
 

From 94ea7b4516561c8a7587c7b74351bd6dd4f74583 Mon Sep 17 00:00:00 2001
From: Dom Sekotill <dom.sekotill@kodo.org.uk>
Date: Sat, 12 Jun 2021 04:52:22 +0100
Subject: [PATCH 025/591] fix(virtualenvwrapper): several changes for checking
 git directory, including fixes (#5663)

* Test only for the presence of a .git directory in virtualenvwrapper

Instead of using both $(git rev-parse --show-toplevel) and a check for
a .git directory, use just the latter. As well as being redundant
the former does not work quite so well when using multiple worktrees;
each worktree will be treated as a separate project.

* Unset ENV_NAME & deactivate if no virtualenv found

This addresses #4603 without breaking current behaviour (where current
behaviour is correct).

When changing directories, if there is no environment matching
ENV_NAME, ENV_NAME is emptied and deactivate called if there is a
current environment active (based on CD_VIRTUAL_ENV).

* Use path comparison not string comparison for paths

This will solve part of issue #4255 where WORKON_HOME is defined with a
trailing slash or not normalised in some way, as well as instances
where symlinks are used, and any other instances where constructed
paths don't exactly match even though they go to the same file.

Co-authored-by: Robby Russell <robby@planetargon.com>
---
 .../virtualenvwrapper.plugin.zsh              | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 88217a7f5..c30216f51 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -35,27 +35,19 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
   function workon_cwd {
     if [[ -z "$WORKON_CWD" ]]; then
       local WORKON_CWD=1
-      # Check if this is a Git repo
-      local GIT_REPO_ROOT=""
-      local GIT_TOPLEVEL="$(git rev-parse --show-toplevel 2> /dev/null)"
-      if [[ $? == 0 ]]; then
-        GIT_REPO_ROOT="$GIT_TOPLEVEL"
-      fi
       # Get absolute path, resolving symlinks
       local PROJECT_ROOT="${PWD:A}"
       while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" \
-               && ! -d "$PROJECT_ROOT/.git"  && "$PROJECT_ROOT" != "$GIT_REPO_ROOT" ]]; do
+          && ! -d "$PROJECT_ROOT/.git" ]]; do
         PROJECT_ROOT="${PROJECT_ROOT:h}"
       done
-      if [[ "$PROJECT_ROOT" == "/" ]]; then
-        PROJECT_ROOT="."
-      fi
+
       # Check for virtualenv name override
       if [[ -f "$PROJECT_ROOT/.venv" ]]; then
         ENV_NAME="$(cat "$PROJECT_ROOT/.venv")"
       elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
         ENV_NAME="$PROJECT_ROOT/.venv"
-      elif [[ "$PROJECT_ROOT" != "." ]]; then
+      elif [[ "$PROJECT_ROOT" != "/" ]]; then
         ENV_NAME="${PROJECT_ROOT:t}"
       else
         ENV_NAME=""
@@ -68,14 +60,21 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       fi
       if [[ "$ENV_NAME" != "" ]]; then
         # Activate the environment only if it is not already active
-        if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
+        if [[ ! "$VIRTUAL_ENV" -ef "$WORKON_HOME/$ENV_NAME" ]]; then
           if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
             workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
           elif [[ -e "$ENV_NAME/bin/activate" ]]; then
             source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
+          else
+            ENV_NAME=""
           fi
         fi
       fi
+      if [[ "$ENV_NAME" == "" && -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
+        # We've just left the repo, deactivate the environment
+        # Note: this only happens if the virtualenv was activated automatically
+        deactivate && unset CD_VIRTUAL_ENV
+      fi
     fi
   }
 

From a2e6a85bf30332005262c312bdd110ae9548a259 Mon Sep 17 00:00:00 2001
From: Francesco Giannelli <bassobassista@gmail.com>
Date: Sat, 12 Jun 2021 05:57:04 +0200
Subject: [PATCH 026/591] fix(plugins): cache thefuck aliases (#5522)

---
 plugins/thefuck/thefuck.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
index b8586c70d..2ab4eb6e2 100644
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -5,7 +5,8 @@ if [[ -z $commands[thefuck] ]]; then
 fi
 
 # Register alias
-eval "$(thefuck --alias)"
+[[ ! -a $ZSH_CACHE_DIR/thefuck ]] && thefuck --alias > $ZSH_CACHE_DIR/thefuck
+source $ZSH_CACHE_DIR/thefuck
 
 fuck-command-line() {
     local FUCK="$(THEFUCK_REQUIRE_CONFIRMATION=0 thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"

From a3d90624df4ca9c4f438e8905f5c56399747db73 Mon Sep 17 00:00:00 2001
From: Gabo Esquivel <contact@gaboesquivel.com>
Date: Fri, 11 Jun 2021 22:06:06 -0600
Subject: [PATCH 027/591] feature(plugins): add bower commands aliases (#3387)

---
 plugins/bower/bower.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/bower/bower.plugin.zsh b/plugins/bower/bower.plugin.zsh
index 6019b9d37..3a40b3af0 100644
--- a/plugins/bower/bower.plugin.zsh
+++ b/plugins/bower/bower.plugin.zsh
@@ -1,4 +1,6 @@
 alias bi="bower install"
+alias bisd="bower install --save-dev"
+alias bis="bower install --save"
 alias bl="bower list"
 alias bs="bower search"
 

From f68d65d32a4fce41f08ac229614b7e46baf5e916 Mon Sep 17 00:00:00 2001
From: Mitchel Humpherys <mitch.special@gmail.com>
Date: Fri, 11 Jun 2021 21:09:08 -0700
Subject: [PATCH 028/591] feat(take): add support to `take' for taking remote
 urls (#2029)

Download, extract, and cd into the resulting directory.

Co-authored-by: Mitchel Humpherys <mitchelh@codeaurora.org>
---
 lib/functions.zsh | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index c4340f16c..9cc735196 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -13,7 +13,7 @@ function upgrade_oh_my_zsh() {
   omz update
 }
 
-function take() {
+function takedir() {
   mkdir -p $@ && cd ${@:$#}
 }
 
@@ -37,6 +37,30 @@ function open_command() {
   ${=open_cmd} "$@" &>/dev/null
 }
 
+function takeurl() {
+  data=$(mktemp)
+  curl -L $1 > $data
+  tar xf $data
+  thedir=$(tar tf $data | head -1)
+  rm $data
+  cd $thedir
+}
+
+function takegit() {
+  git clone $1
+  cd $(basename ${1%%.git})
+}
+
+function take() {
+  if [[ $1 =~ ^(https?|ftp).*\.tar\.(gz|bz2|xz)$ ]]; then
+    takeurl $1
+  elif [[ $1 =~ ^([A-Za-z0-9]\+@|https?|git|ssh|ftps?|rsync).*\.git/?$ ]]; then
+    takegit $1
+  else
+    takedir $1
+  fi
+}
+
 #
 # Get the value of an alias.
 #

From 9bdbe08aa2c2ba4106f17082a9ee303b51167ba1 Mon Sep 17 00:00:00 2001
From: Daniel Wu <daniel.y.woo@gmail.com>
Date: Sat, 12 Jun 2021 21:06:09 +0800
Subject: [PATCH 029/591] feat(plugins): add gpr alias for /git pull -rebase/
 which is easier to remember (#9964)

---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 4f051db8d..93c9cc915 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -116,6 +116,7 @@ plugins=(... git)
 | gpf                  | git push --force-with-lease                                                                                                      |
 | gpf!                 | git push --force                                                                                                                 |
 | gpoat                | git push origin --all && git push origin --tags                                                                                  |
+| gpr                  | git pull --rebase                                                                                                                |
 | gpu                  | git push upstream                                                                                                                |
 | gpv                  | git push -v                                                                                                                      |
 | gr                   | git remote                                                                                                                       |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 35ebfbfa3..a364b6162 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -215,6 +215,7 @@ alias gpd='git push --dry-run'
 alias gpf='git push --force-with-lease'
 alias gpf!='git push --force'
 alias gpoat='git push origin --all && git push origin --tags'
+alias gpr='git pull --rebase'
 alias gpu='git push upstream'
 alias gpv='git push -v'
 

From 6779e10759c7c45f18a3ade1efac4d87b5ded7f1 Mon Sep 17 00:00:00 2001
From: Frani <frani@users.noreply.github.com>
Date: Sat, 12 Jun 2021 10:08:27 -0300
Subject: [PATCH 030/591] feat(plugins): Add new isodate plugin for friendly
 date formatting commands (#9963)

* add isodate plugin
---
 plugins/isodate/README.md          | 22 ++++++++++++++++++++++
 plugins/isodate/isodate.plugin.zsh |  7 +++++++
 2 files changed, 29 insertions(+)
 create mode 100644 plugins/isodate/README.md
 create mode 100644 plugins/isodate/isodate.plugin.zsh

diff --git a/plugins/isodate/README.md b/plugins/isodate/README.md
new file mode 100644
index 000000000..1ec75b2d4
--- /dev/null
+++ b/plugins/isodate/README.md
@@ -0,0 +1,22 @@
+# Isodate plugin
+
+**Maintainer:** [@Frani](https://github.com/frani)
+
+This plugin adds completion for the [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601),
+as well as some aliases for common Date commands.
+
+To use it, add `isodate` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... isodate)
+```
+
+## Aliases
+
+| Alias         | Command                              | Description                                                                |
+|---------------|--------------------------------------|----------------------------------------------------------------------------|
+| isodate       | `date +%Y-%m-%dT%H:%M:%S%z`          | Display the current date with UTC offset and ISO 8601-2 extended format    |
+| isodate_utc   | `date -u +%Y-%m-%dT%H:%M:%SZ`        | Display the current date in UTC and ISO 8601-2 extended format             |
+| isodate_basic | `date -u +%Y%m%dT%H%M%SZ`            | Display the current date in UTC and ISO 8601 basic format                  |
+| unixstamp     | `date +%s`                           | Display the current date as a Unix timestamp (seconds since the Unix epoch)|
+| date_locale   | `date +"%c"`                         | Display the current date using the default locale's format                 |
diff --git a/plugins/isodate/isodate.plugin.zsh b/plugins/isodate/isodate.plugin.zsh
new file mode 100644
index 000000000..1a827e785
--- /dev/null
+++ b/plugins/isodate/isodate.plugin.zsh
@@ -0,0 +1,7 @@
+# work with date ISO 8601 easy
+
+alias isodate="date +%Y-%m-%dT%H:%M:%S%z"
+alias isodate_utc="date -u +%Y-%m-%dT%H:%M:%SZ"
+alias isodate_basic="date -u +%Y%m%dT%H%M%SZ"
+alias unixstamp="date +%s"
+alias date_locale="date +"%c""

From 3cdc36fc1eb096804a448ded93da1667e1b3f230 Mon Sep 17 00:00:00 2001
From: Oshadha Gunawardena <oshadha.rocky@gmail.com>
Date: Sat, 12 Jun 2021 18:53:29 +0530
Subject: [PATCH 031/591] feat(plugins): Add a new showpkg alias to ubuntu
 plugin (#4653)

Add an alias for ```showpkg``` to get the reverse and recursive dependencies on a package
---
 plugins/ubuntu/ubuntu.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index a53752fb2..989ffd1ff 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -15,6 +15,9 @@ alias agli='apt list --installed'
 # List available updates only
 alias aglu='apt list --upgradable'
 
+alias acsp='apt-cache showpkg'
+compdef _acsp acsp='apt-cache showpkg'
+
 # superuser operations ######################################################
 
 alias afu='sudo apt-file update'

From 81a6cc5050136399ea0c664bacb8f83a999fe866 Mon Sep 17 00:00:00 2001
From: Mirko Lelansky <mlelansky@mail.de>
Date: Sat, 12 Jun 2021 16:01:26 +0200
Subject: [PATCH 032/591] feat(plugins): Add helper function to get current
 mercurial bookmark (#4970)

Add a new function to get the current mercurial bookmark which can be
used in the theme prompts for example.
---
 plugins/mercurial/mercurial.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index f13430476..a50dcb523 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -63,3 +63,9 @@ function hgic() {
 function hgoc() {
     hg outgoing "$@" | grep "changeset" | wc -l
 }
+
+function hg_get_bookmark_name() {
+  if [ $(in_hg) ]; then
+    echo $(hg id -B)
+  fi
+}

From 8aca13ff78e61e83e0e4aa0acb62f42c75e26eb9 Mon Sep 17 00:00:00 2001
From: javier wilson <javier.wilson@gmail.com>
Date: Sat, 12 Jun 2021 08:02:10 -0600
Subject: [PATCH 033/591] feat(supervisord): autocomplete for restart command
 (#5144)


From 26e9cead1a7c9264962986fdc3038ad7266c92bd Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Sat, 12 Jun 2021 14:10:06 +0000
Subject: [PATCH 034/591] feat(plugins): Plugin "debian": Switch order of "apt"
 and "aptitude" for detection (#7533)

* Switch order of "apt" and "aptitude" for detection

"apt" is installed by default at Debian (maybe Ubuntu too), while "aptitude" does not seem to be installed by default.
For that, it may be better for most of the users to prefer "aptitude" if installed.

* plugins/debian/README: Change of order mirroded into documentation
---
 plugins/debian/README.md         |  2 +-
 plugins/debian/debian.plugin.zsh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/debian/README.md b/plugins/debian/README.md
index da5675c66..922d68cb3 100644
--- a/plugins/debian/README.md
+++ b/plugins/debian/README.md
@@ -10,7 +10,7 @@ plugins=(... debian)
 
 ## Settings
 
-- `$apt_pref`: use apt or aptitude if installed, fallback is apt-get.
+- `$apt_pref`: use aptitude or apt if installed, fallback is apt-get.
 - `$apt_upgr`: use upgrade or safe-upgrade (for aptitude).
 
 Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh My Zsh) to override this behavior.
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 108396784..bde97cd30 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -1,13 +1,13 @@
-# Use apt or aptitude if installed, fallback is apt-get
+# Use aptitude or apt if installed, fallback is apt-get
 # You can just set apt_pref='apt-get' to override it.
 
 if [[ -z $apt_pref || -z $apt_upgr ]]; then
-    if [[ -e $commands[apt] ]]; then
-        apt_pref='apt'
-        apt_upgr='upgrade'
-    elif [[ -e $commands[aptitude] ]]; then
+    if [[ -e $commands[aptitude] ]]; then
         apt_pref='aptitude'
         apt_upgr='safe-upgrade'
+    elif [[ -e $commands[apt] ]]; then
+        apt_pref='apt'
+        apt_upgr='upgrade'
     else
         apt_pref='apt-get'
         apt_upgr='upgrade'

From e701fa49e7fc5f8aaef4ba680e012a14bce00c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rolf=20Schr=C3=B6der?= <rolf.schr@gmail.com>
Date: Sat, 12 Jun 2021 16:12:07 +0200
Subject: [PATCH 035/591] feat(plugins): New plugins for samtools and bedtools
 (#3574)

* Add first impl of samtools autocompletion

* Just autocomplete with files all the time

* Add init impl of bedtools completion

* Add readme.md for bedtools plugin

* Add readme for samtools

Co-authored-by: Rolf Schroeder <rolf.schroeder@centogene.com>
---
 plugins/bedtools/README.md |  5 +++
 plugins/bedtools/_bedtools | 64 ++++++++++++++++++++++++++++++++++++++
 plugins/samtools/README.md |  5 +++
 plugins/samtools/_samtools | 40 ++++++++++++++++++++++++
 4 files changed, 114 insertions(+)
 create mode 100644 plugins/bedtools/README.md
 create mode 100644 plugins/bedtools/_bedtools
 create mode 100644 plugins/samtools/README.md
 create mode 100644 plugins/samtools/_samtools

diff --git a/plugins/bedtools/README.md b/plugins/bedtools/README.md
new file mode 100644
index 000000000..c4de4e3a9
--- /dev/null
+++ b/plugins/bedtools/README.md
@@ -0,0 +1,5 @@
+# Bedtools plugin
+
+This plugin adds support for the [bedtools suite](http://bedtools.readthedocs.org/en/latest/):
+
+* Adds autocomplete options for all bedtools sub commands.
diff --git a/plugins/bedtools/_bedtools b/plugins/bedtools/_bedtools
new file mode 100644
index 000000000..ef6c4179a
--- /dev/null
+++ b/plugins/bedtools/_bedtools
@@ -0,0 +1,64 @@
+#compdef bedtools
+#autoload
+
+local curcontext="$curcontext" state line ret=1
+local -a _files
+
+_arguments -C \
+  '1: :->cmds' \
+  '2:: :->args' && ret=0
+
+case $state in
+  cmds)
+    _values "bedtools command" \
+        "--contact[Feature requests, bugs, mailing lists, etc.]" \
+        "--help[Print this help menu.]" \
+        "--version[What version of bedtools are you using?.]" \
+        "annotate[Annotate coverage of features from multiple files.]" \
+        "bamtobed[Convert BAM alignments to BED (& other) formats.]" \
+        "bamtofastq[Convert BAM records to FASTQ records.]" \
+        "bed12tobed6[Breaks BED12 intervals into discrete BED6 intervals.]" \
+        "bedpetobam[Convert BEDPE intervals to BAM records.]" \
+        "bedtobam[Convert intervals to BAM records.]" \
+        "closest[Find the closest, potentially non-overlapping interval.]" \
+        "cluster[Cluster (but don't merge) overlapping/nearby intervals.]" \
+        "complement[Extract intervals _not_ represented by an interval file.]" \
+        "coverage[Compute the coverage over defined intervals.]" \
+        "expand[Replicate lines based on lists of values in columns.]" \
+        "fisher[Calculate Fisher statistic b/w two feature files.]" \
+        "flank[Create new intervals from the flanks of existing intervals.]" \
+        "genomecov[Compute the coverage over an entire genome.]" \
+        "getfasta[Use intervals to extract sequences from a FASTA file.]" \
+        "groupby[Group by common cols. & summarize oth. cols. (~ SQL "groupBy")]" \
+        "igv[Create an IGV snapshot batch script.]" \
+        "intersect[Find overlapping intervals in various ways.]" \
+        "jaccard[Calculate the Jaccard statistic b/w two sets of intervals.]" \
+        "links[Create a HTML page of links to UCSC locations.]" \
+        "makewindows[Make interval "windows" across a genome.]" \
+        "map[Apply a function to a column for each overlapping interval.]" \
+        "maskfasta[Use intervals to mask sequences from a FASTA file.]" \
+        "merge[Combine overlapping/nearby intervals into a single interval.]" \
+        "multicov[Counts coverage from multiple BAMs at specific intervals.]" \
+        "multiinter[Identifies common intervals among multiple interval files.]" \
+        "nuc[Profile the nucleotide content of intervals in a FASTA file.]" \
+        "overlap[Computes the amount of overlap from two intervals.]" \
+        "pairtobed[Find pairs that overlap intervals in various ways.]" \
+        "pairtopair[Find pairs that overlap other pairs in various ways.]" \
+        "random[Generate random intervals in a genome.]" \
+        "reldist[Calculate the distribution of relative distances b/w two files.]" \
+        "sample[Sample random records from file using reservoir sampling.]" \
+        "shuffle[Randomly redistrubute intervals in a genome.]" \
+        "slop[Adjust the size of intervals.]" \
+        "sort[Order the intervals in a file.]" \
+        "subtract[Remove intervals based on overlaps b/w two files.]" \
+        "tag[Tag BAM alignments based on overlaps with interval files.]" \
+        "unionbedg[Combines coverage intervals from multiple BEDGRAPH files.]" \
+        "window[Find overlapping intervals within a window around an interval.]" \
+    ret=0
+    ;;
+  *)
+    _files
+    ;;
+esac
+
+return ret
diff --git a/plugins/samtools/README.md b/plugins/samtools/README.md
new file mode 100644
index 000000000..f4baf41f7
--- /dev/null
+++ b/plugins/samtools/README.md
@@ -0,0 +1,5 @@
+# Samtools plugin
+
+This plugin adds support for [samtools](http://www.htslib.org/):
+
+* Adds autocomplete options for all samtools sub commands.
diff --git a/plugins/samtools/_samtools b/plugins/samtools/_samtools
new file mode 100644
index 000000000..ddb002ae2
--- /dev/null
+++ b/plugins/samtools/_samtools
@@ -0,0 +1,40 @@
+#compdef samtools
+#autoload
+
+local curcontext="$curcontext" state line ret=1
+local -a _files
+
+_arguments -C \
+  '1: :->cmds' \
+  '2:: :->args' && ret=0
+
+case $state in
+  cmds)
+    _values "samtools command" \
+        "view[SAM<->BAM conversion]" \
+        "sort[sort alignment file]" \
+        "mpileup[multi-way pileup]" \
+        "depth[compute the depth]" \
+        "faidx[index/extract FASTA]" \
+        "tview[text alignment viewer]" \
+        "index[index alignment]" \
+        "idxstats[BAM index stats (r595 or later)]" \
+        "fixmate[fix mate information]" \
+        "flagstat[simple stats]" \
+        "calmd[recalculate MD/NM tags and '=' bases]" \
+        "merge[merge sorted alignments]" \
+        "rmdup[remove PCR duplicates]" \
+        "reheader[replace BAM header]" \
+        "cat[concatenate BAMs]" \
+        "bedcov[read depth per BED region]" \
+        "targetcut[cut fosmid regions (for fosmid pool only)]" \
+        "phase[phase heterozygotes]" \
+        "bamshuf[shuffle and group alignments by name]"
+    ret=0
+    ;;
+  *)
+    _files
+    ;;
+esac
+
+return ret

From 5b3657a454efdd5d27753c049cc2e2f1c4d82bc7 Mon Sep 17 00:00:00 2001
From: Guillermo Alcantara <guillermo.alcantara@gmail.com>
Date: Sat, 12 Jun 2021 10:49:08 -0500
Subject: [PATCH 036/591] feat(plugins): Add Ag completion (#3534)

* Add Ag completion

A replacement for ack/grep https://github.com/ggreer/the_silver_searcher

* Create README.md

As requested in the PR: https://github.com/ohmyzsh/ohmyzsh/pull/3534
---
 plugins/ag/README.md | 13 +++++++++
 plugins/ag/_ag       | 66 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 plugins/ag/README.md
 create mode 100644 plugins/ag/_ag

diff --git a/plugins/ag/README.md b/plugins/ag/README.md
new file mode 100644
index 000000000..6acc54067
--- /dev/null
+++ b/plugins/ag/README.md
@@ -0,0 +1,13 @@
+# The Silver Searcher
+
+This plugin provides completion support for [`ag`](https://github.com/ggreer/the_silver_searcher).
+
+To use it, add ag to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... aws)
+```
+
+## INSTALLATION NOTES
+
+Besides oh-my-zsh, `ag` needs to be installed by following these steps: https://github.com/ggreer/the_silver_searcher#installing.
diff --git a/plugins/ag/_ag b/plugins/ag/_ag
new file mode 100644
index 000000000..25b0c27a7
--- /dev/null
+++ b/plugins/ag/_ag
@@ -0,0 +1,66 @@
+#compdef ag
+#autoload
+
+typeset -A opt_args
+
+# Took the liberty of not listing every option… specially aliases and -D
+_ag () {
+  local -a _1st_arguments
+  _1st_arguments=(
+    '--ackmate:Print results in AckMate-parseable format'
+    {'-A','--after'}':[LINES] Print lines after match (Default: 2)'
+    {'-B','--before'}':[LINES] Print lines before match (Default: 2)'
+    '--break:Print newlines between matches in different files'
+    '--nobreak:Do not print newlines between matches in different files'
+    {'-c','--count'}':Only print the number of matches in each file'
+    '--color:Print color codes in results (Default: On)'
+    '--nocolor:Do not print color codes in results'
+    '--color-line-number:Color codes for line numbers (Default: 1;33)'
+    '--color-match:Color codes for result match numbers (Default: 30;43)'
+    '--color-path:Color codes for path names (Default: 1;32)'
+    '--column:Print column numbers in results'
+    {'-H','--heading'}':Print file names (On unless searching a single file)'
+    '--noheading:Do not print file names (On unless searching a single file)'
+    '--line-numbers:Print line numbers even for streams'
+    {'-C','--context'}':[LINES] Print lines before and after matches (Default: 2)'
+    '-g:[PATTERN] Print filenames matching PATTERN'
+    {'-l','--files-with-matches'}':Only print filenames that contain matches'
+    {'-L','--files-without-matches'}':Only print filenames that do not contain matches'
+    '--no-numbers:Do not print line numbers'
+    {'-o','--only-matching'}':Prints only the matching part of the lines'
+    '--print-long-lines:Print matches on very long lines (Default: 2k characters)'
+    '--passthrough:When searching a stream, print all lines even if they do not match'
+    '--silent:Suppress all log messages, including errors'
+    '--stats:Print stats (files scanned, time taken, etc.)'
+    '--vimgrep:Print results like vim :vimgrep /pattern/g would'
+    {'-0','--null'}':Separate filenames with null (for "xargs -0")'
+
+    {'-a','--all-types'}':Search all files (does not include hidden files / .gitignore)'
+    '--depth:[NUM] Search up to NUM directories deep (Default: 25)'
+    {'-f','--follow'}':Follow symlinks'
+    {'-G','--file-search-regex'}':[PATTERN] Limit search to filenames matching PATTERN'
+    '--hidden:Search hidden files (obeys .*ignore files)'
+    {'-i','--ignore-case'}':Match case insensitively'
+    '--ignore:[PATTERN] Ignore files/directories matching PATTERN'
+    {'-m','--max-count'}':[NUM] Skip the rest of a file after NUM matches (Default: 10k)'
+    {'-p','--path-to-agignore'}':[PATH] Use .agignore file at PATH'
+    {'-Q','--literal'}':Do not parse PATTERN as a regular expression'
+    {'-s','--case-sensitive'}':Match case'
+    {'-S','--smart-case'}':Insensitive match unless PATTERN has uppercase (Default: On)'
+    '--search-binary:Search binary files for matches'
+    {'-t','--all-text'}':Search all text files (Hidden files not included)'
+    {'-u','--unrestricted'}':Search all files (ignore .agignore and _all_)'
+    {'-U','--skip-vcs-ignores'}':Ignore VCS files (stil obey .agignore)'
+    {'-v','--invert-match'}':Invert match'
+    {'-w','--word-regexp'}':Only match whole words'
+    {'-z','--search-zip'}':Search contents of compressed (e.g., gzip) files'
+
+    '--list-file-types:list of supported file types'
+  )
+
+  if [[ $words[-1] =~ "^-" ]]; then
+    _describe -t commands "ag options" _1st_arguments && ret=0
+  else
+    _files && ret=0
+  fi
+}

From baced0cdcf491b1ecf7176f5bba16a3a95dd0460 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sun, 13 Jun 2021 08:10:29 -0700
Subject: [PATCH 037/591] style(kubectl): Being more explicit alias to the main
 CLI tool instead of to another alias (#6567)

---
 plugins/kubectl/kubectl.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index b79b7c941..3630facaa 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -43,7 +43,7 @@ alias kgpwide='kgp -o wide'
 alias kep='kubectl edit pods'
 alias kdp='kubectl describe pods'
 alias kdelp='kubectl delete pods'
-alias kgpall='k get pods --all-namespaces -o wide'
+alias kgpall='kubectl get pods --all-namespaces -o wide'
 
 # get pod by label: kgpl "app=myapp" -n myns
 alias kgpl='kgp -l'

From 5152d381bb828a4ed41fdbb430eb05970a8bb25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Szyd=C5=82o?= <st4nson@gmail.com>
Date: Sun, 13 Jun 2021 17:23:13 +0200
Subject: [PATCH 038/591] feat(kubectx): adding a new plugin for 'kubectx'
 (#6114)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
Co-authored-by: Robby Russell <robby@planetargon.com>
---
 lib/prompt_info_functions.zsh      |   1 +
 plugins/kubectx/README.md          |  26 ++++++++++++++++++++++++++
 plugins/kubectx/kubectx.plugin.zsh |  14 ++++++++++++++
 plugins/kubectx/prod.png           | Bin 0 -> 3834 bytes
 plugins/kubectx/stage.png          | Bin 0 -> 3829 bytes
 5 files changed, 41 insertions(+)
 create mode 100644 plugins/kubectx/README.md
 create mode 100644 plugins/kubectx/kubectx.plugin.zsh
 create mode 100644 plugins/kubectx/prod.png
 create mode 100644 plugins/kubectx/stage.png

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 48f033da6..e29fb27a5 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -19,6 +19,7 @@ function chruby_prompt_info \
   virtualenv_prompt_info \
   jenv_prompt_info \
   tf_prompt_info \
+  kubectx_prompt_info \
 {
   return 1
 }
diff --git a/plugins/kubectx/README.md b/plugins/kubectx/README.md
new file mode 100644
index 000000000..9a1df2617
--- /dev/null
+++ b/plugins/kubectx/README.md
@@ -0,0 +1,26 @@
+# kubectx - show active kubectl context
+
+This plugins adds ```kubectx_prompt_info()``` function. It shows name of the
+active kubectl context (```kubectl config current-context```).
+
+You can use it to customize prompt and know if You are on prod cluster ;)
+
+_Example_. Add to **.zshrc**:
+
+```
+RPS1='$(kubectx_prompt_info)'
+```
+
+### custom ctx names
+
+One can rename default context name for better readability.
+
+_Example_. Add to **.zshrc**:
+```
+kubectx_mapping[minikube] = "mini"
+kubectx_mapping[context_name_from_kubeconfig]="$emoji[wolf_face]"
+kubectx_mapping[production_cluster]="%{$fg[yellow]%}prod!%{$reset_color%}"
+```
+
+![staging](stage.png)
+![production](prod.png)
diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
new file mode 100644
index 000000000..56b7217f1
--- /dev/null
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -0,0 +1,14 @@
+typeset -A kubectx_mapping
+
+function kubectx_prompt_info() {
+  if [ $commands[kubectl] ]; then
+    local current_ctx=`kubectl config current-context`
+
+    #if associative array declared
+    if [[ -n $kubectx_mapping ]]; then
+      echo "${kubectx_mapping[$current_ctx]}"
+    else
+      echo $current_ctx
+    fi
+  fi
+}
diff --git a/plugins/kubectx/prod.png b/plugins/kubectx/prod.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c194a66d357e3089e26470e54bcd9cd1614aca0
GIT binary patch
literal 3834
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

literal 0
HcmV?d00001

diff --git a/plugins/kubectx/stage.png b/plugins/kubectx/stage.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac15b392997ee141c324548c6924fe92a82f72f9
GIT binary patch
literal 3829
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
OVDNPHb6Mw<&;$UT_K@oU

literal 0
HcmV?d00001


From adcb5c5e07850c0b8c05f61ca5cb7534dc434c2b Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Sun, 13 Jun 2021 19:16:34 +0200
Subject: [PATCH 039/591] style(mlh): update the official theme of Major League
 Hacking (#9971)

* allow for customization of RPROMPT (exit code and timestamp)

* improve code and comments
---
 themes/mlh.zsh-theme | 55 ++++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/themes/mlh.zsh-theme b/themes/mlh.zsh-theme
index a21a546bc..33f238ed9 100644
--- a/themes/mlh.zsh-theme
+++ b/themes/mlh.zsh-theme
@@ -1,11 +1,12 @@
-# The Official Theme of 
-##     ## ##       ##     ## 
-###   ### ##       ##     ## 
-#### #### ##       ##     ## 
-## ### ## ##       ######### 
-##     ## ##       ##     ## 
-##     ## ##       ##     ## 
-##     ## ######## ##     ## 
+# The Official Theme of Major League Hacking
+
+##     ## ##       ##     ##
+###   ### ##       ##     ##
+#### #### ##       ##     ##
+## ### ## ##       #########
+##     ## ##       ##     ##
+##     ## ##       ##     ##
+##     ## ######## ##     ##
 
 # # # # # # # # # # # # # # # # # #
 # # # Feel free to customize! # # #
@@ -13,11 +14,17 @@
 
 # To easily discover colors and their codes, type `spectrum_ls` in the terminal
 
+# enable or disable particular elements
+PRINT_EXIT_CODE=true
+PRINT_TIME=true
+
+# symbols
 AT_SYMBOL=" @ "
 IN_SYMBOL=" in "
 ON_SYMBOL=" on "
-SYMBOL="$"
+SHELL_SYMBOL="$"
 
+# colors
 USER_COLOR="%F{001}"
 DEVICE_COLOR="%F{033}"
 DIR_COLOR="%F{220}"
@@ -25,35 +32,39 @@ BRANCH_COLOR="%F{001}"
 TIME_COLOR="%F{033}"
 
 username() {
-    echo "$USER_COLOR%n%f"
+  echo "$USER_COLOR%n%f"
 }
 
-# Returns device name 
+# Prints device name
 device() {
-    echo "$DEVICE_COLOR%m%f"
+  echo "$DEVICE_COLOR%m%f"
 }
 
-# The current directory
+# Prints the current directory
 directory() {
-    echo "$DIR_COLOR%1~%f"
+  echo "$DIR_COLOR%1~%f"
 }
 
-# Current time with milliseconds
+# Prints current time
 current_time() {
-    echo "$TIME_COLOR%*%f"
+  if [ "$PRINT_TIME" = true ]; then
+    echo " $TIME_COLOR%*%f"
+  fi
 }
 
-# Return status of the last command
-return_status() {
-    echo "%(?..%F{001}out %?)%f"
+# Prints exit code of the last executed command
+exit_code() {
+  if [ "$PRINT_EXIT_CODE" = true ]; then
+    echo "%(?..%F{001}exit %?)%f"
+  fi
 }
 
-# Set the git_prompt_info text
+# Set git_prompt_info text
 ZSH_THEME_GIT_PROMPT_PREFIX="${ON_SYMBOL}${BRANCH_COLOR}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 # %B and %b make the text bold
-PROMPT='%b$(username)$AT_SYMBOL$(device)$IN_SYMBOL$(directory)$(git_prompt_info)%b $SYMBOL '
-RPROMPT="$(return_status) $(current_time)"
+PROMPT='%b$(username)$AT_SYMBOL$(device)$IN_SYMBOL$(directory)$(git_prompt_info)%b $SHELL_SYMBOL '
+RPROMPT="$(exit_code)$(current_time)"

From 960483b76b536a525bb6b458f5705b2653064e46 Mon Sep 17 00:00:00 2001
From: Sagar Yadav <47110215+SagarYadav17@users.noreply.github.com>
Date: Sun, 13 Jun 2021 22:53:58 +0530
Subject: [PATCH 040/591] feat(pip): add alias for updating all requirements
 via pip (#9965)

* feat(plugins): add alias for pip commands

* feat(plugins): updated README.md and add alias
---
 plugins/pip/README.md      |  9 +++++++++
 plugins/pip/pip.plugin.zsh | 11 +++++++++++
 2 files changed, 20 insertions(+)

diff --git a/plugins/pip/README.md b/plugins/pip/README.md
index f07b5c058..88d88227e 100644
--- a/plugins/pip/README.md
+++ b/plugins/pip/README.md
@@ -17,3 +17,12 @@ or you can run `zsh-pip-cache-packages` directly.
 
 To reset the cache, run `zsh-pip-clear-cache` and it will be rebuilt next
 the next time you autocomplete `pip install`.
+
+## Aliases
+
+| Alias    | Description                                   |
+| :------- | :-------------------------------------------- |
+| pipreq   | Create requirements file                      |
+| pipir    | Install packages from `requirements.txt` file |
+| pipupall | Update all installed packages                 |
+| pipunall | Uninstall all installed packages              |
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index a46e7658c..629147bae 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -84,3 +84,14 @@ zsh-pip-test-clean-packages() {
 
 alias pip="noglob pip" # allows square brackets for pip command invocation
 
+# Create requirements file
+alias pipreq="pip freeze > requirements.txt"
+
+# Update all installed packages
+alias pipupall="pipreq && sed -i 's/==/>=/g' requirements.txt && pip install -r requirements.txt --upgrade && rm -rf requirements.txt"
+
+# Install packages from requirements file
+alias pipir="pip install -r requirements.txt"
+
+# Uninstalled all installed packages
+alias pipunall="pipreq && pip uninstall -r requirements.txt -y && rm -rf requirements.txt"

From 3ea66642e8d86b597e6c789358b82540859b178a Mon Sep 17 00:00:00 2001
From: Lasse Peters <lasse.peters@mailbox.org>
Date: Sun, 13 Jun 2021 19:25:27 +0200
Subject: [PATCH 041/591] feat(git): Add alias for 'git checkout
 --recurse-submodules' (#9958)

---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 93c9cc915..e00f4cf92 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -53,6 +53,7 @@ plugins=(... git)
 | gcd                  | git checkout develop                                                                                                             |
 | gcmsg                | git commit -m                                                                                                                    |
 | gco                  | git checkout                                                                                                                     |
+| gcor                 | git checkout --recurse-submodules                                                                                                |
 | gcount               | git shortlog -sn                                                                                                                 |
 | gcp                  | git cherry-pick                                                                                                                  |
 | gcpa                 | git cherry-pick --abort                                                                                                          |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index a364b6162..6664551eb 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -91,6 +91,7 @@ alias gcm='git checkout $(git_main_branch)'
 alias gcd='git checkout develop'
 alias gcmsg='git commit -m'
 alias gco='git checkout'
+alias gcor='git checkout --recurse-submodules'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
 alias gcpa='git cherry-pick --abort'

From 36cc94f3dcd8d6214b5a4bedf180bc723eb49a3f Mon Sep 17 00:00:00 2001
From: Ajeet D'Souza <98ajeet@gmail.com>
Date: Sun, 13 Jun 2021 23:00:58 +0530
Subject: [PATCH 042/591] feat(zoxide): add new plugin for zoxide (a smarter cd
 CLI tool) (#9950)

---
 .github/CODEOWNERS               |  1 +
 plugins/zoxide/README.md         | 14 ++++++++++++++
 plugins/zoxide/zoxide.plugin.zsh |  5 +++++
 3 files changed, 20 insertions(+)
 create mode 100644 plugins/zoxide/README.md
 create mode 100644 plugins/zoxide/zoxide.plugin.zsh

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1b1340554..6c3eac6e7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,3 +7,4 @@ plugins/gitfast/                    @felipec
 plugins/sdk/                        @rgoldberg
 plugins/universalarchive/           @Konfekt
 plugins/wp-cli/                     @joshmedeski
+plugins/zoxide/                     @ajeetdsouza
diff --git a/plugins/zoxide/README.md b/plugins/zoxide/README.md
new file mode 100644
index 000000000..f326effe6
--- /dev/null
+++ b/plugins/zoxide/README.md
@@ -0,0 +1,14 @@
+# zoxide plugin
+
+Initializes [zoxide](https://github.com/ajeetdsouza/zoxide), a smarter cd
+command for your terminal.
+
+![Tutorial](https://raw.githubusercontent.com/ajeetdsouza/zoxide/97dc08347d9dbf5b5a4516b79e0ac27366b962ce/contrib/tutorial.webp)
+
+To use it, add `zoxide` to the plugins array in your `.zshrc` file:
+
+```zsh
+plugins=(... zoxide)
+```
+
+**Note:** you have to [install zoxide](https://github.com/ajeetdsouza/zoxide#step-1-install-zoxide) first.
diff --git a/plugins/zoxide/zoxide.plugin.zsh b/plugins/zoxide/zoxide.plugin.zsh
new file mode 100644
index 000000000..e5658b8f0
--- /dev/null
+++ b/plugins/zoxide/zoxide.plugin.zsh
@@ -0,0 +1,5 @@
+if (( $+commands[zoxide] )); then
+  eval "$(zoxide init zsh)"
+else
+  echo '[oh-my-zsh] zoxide not found, please install it from https://github.com/ajeetdsouza/zoxide'
+fi

From 70a0577712bc8f78e14173c8032df3701ea2887f Mon Sep 17 00:00:00 2001
From: "Guo, Quan" <1118270+guoquan@users.noreply.github.com>
Date: Mon, 14 Jun 2021 01:32:47 +0800
Subject: [PATCH 043/591] feat(nvm): introduce customizable list of command
 that triggers lazy loading (#9946)

* Add customizable list of command that triggers lazy loading

* Add $NVM_LAZY_CMD

* Add instruction to `NVM_LAZY_CMD` in README.md
---
 plugins/nvm/README.md      | 6 +++++-
 plugins/nvm/nvm.plugin.zsh | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/nvm/README.md b/plugins/nvm/README.md
index 700613085..0c2bbf9f0 100644
--- a/plugins/nvm/README.md
+++ b/plugins/nvm/README.md
@@ -21,7 +21,11 @@ These settings should go in your zshrc file, before Oh My Zsh is sourced:
 
 - **`NVM_LAZY`**: if you want the plugin to defer the load of nvm to speed-up the start of your zsh session,
   set `NVM_LAZY` to `1`. This will use the `--no-use` parameter when loading nvm, and will create a function
-  for `node`, `npm` and `yarn`, so when you call either of these three, nvm will load with `nvm use default`.
+  for `node`, `npm`, `yarn`, and the command(s) specified by `NVM_LAZY_CMD`, so when you call either of them,
+  nvm will load with `nvm use default`.
+
+- **`NVM_LAZY_CMD`**: if you want additional command(s) to trigger lazy loading of nvm, set `NVM_LAZY_CMD` to
+  the command or an array of the commands.
 
 - **`NVM_AUTOLOAD`**: if `NVM_AUTOLOAD` is set to `1`, the plugin will automatically load a node version when
   if finds a [`.nvmrc` file](https://github.com/nvm-sh/nvm#nvmrc) in the current working directory indicating
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 1e9b26e7a..3ef8cc1d8 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -28,8 +28,8 @@ fi
 
 # Call nvm when first using node, npm or yarn
 if (( $+NVM_LAZY )); then
-  function node npm yarn {
-    unfunction node npm yarn
+  function node npm yarn $NVM_LAZY_CMD {
+    unfunction node npm yarn $NVM_LAZY_CMD
     nvm use default
     command "$0" "$@"
   }

From 027189b294d14a7d313cdbf611982843f921555d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Duszyk?= <mdevel@protonmail.com>
Date: Sun, 13 Jun 2021 19:40:07 +0200
Subject: [PATCH 044/591] perf(mercurial): speed up mercurial plugin (#4591)

* speed up mercurial plugin

* removed unnecesay limit to current dir from hg status
---
 plugins/mercurial/mercurial.plugin.zsh | 27 +++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index a50dcb523..f4efc2b4a 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -19,37 +19,38 @@ alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
 
 function in_hg() {
-  if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then
+  if $(hg branch > /dev/null 2>&1); then
     echo 1
   fi
 }
 
 function hg_get_branch_name() {
-  if [ $(in_hg) ]; then
-    echo $(hg branch)
+  branch=`hg branch 2>/dev/null`
+  if [ $? -eq 0 ]; then
+    echo $branch
   fi
+  unset branch
 }
 
 function hg_prompt_info {
-  if [ $(in_hg) ]; then
-    _DISPLAY=$(hg_get_branch_name)
+  _DISPLAY=`hg branch 2>/dev/null`
+  if [ $? -eq 0 ]; then
     echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR"
-    unset _DISPLAY
   fi
+  unset _DISPLAY
 }
 
 function hg_dirty_choose {
-  if [ $(in_hg) ]; then
-    hg status 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'
+  hg status -mar 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'
+  if [ $? -eq 0 ]; then
     if [ $pipestatus[-1] -eq 0 ]; then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
-    else
-      # Otherwise, no lines were found, or an error occurred. Return clean.
-      echo $2
+      return
     fi
   fi
+  echo $2
 }
 
 function hg_dirty {
@@ -57,11 +58,11 @@ function hg_dirty {
 }
 
 function hgic() {
-    hg incoming "$@" | grep "changeset" | wc -l
+  hg incoming "$@" | grep "changeset" | wc -l
 }
 
 function hgoc() {
-    hg outgoing "$@" | grep "changeset" | wc -l
+  hg outgoing "$@" | grep "changeset" | wc -l
 }
 
 function hg_get_bookmark_name() {

From 241c7dde2b6afc4025fc74774f51a71fb3b128d3 Mon Sep 17 00:00:00 2001
From: Shubham Chaudhary <shubhamchaudhary92@gmail.com>
Date: Sun, 13 Jun 2021 13:50:36 -0400
Subject: [PATCH 045/591] feat(supervisor): Add aliases for supervisor (#5819)

---
 plugins/supervisor/supervisor.plugin.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/supervisor/supervisor.plugin.zsh b/plugins/supervisor/supervisor.plugin.zsh
index cf1997c5b..f11f0ed3f 100644
--- a/plugins/supervisor/supervisor.plugin.zsh
+++ b/plugins/supervisor/supervisor.plugin.zsh
@@ -1 +1,14 @@
 # DECLARION: This plugin was created by hhatto. What I did is just making a portal from https://bitbucket.org/hhatto/zshcompfunc4supervisor.
+
+alias sup='sudo supervisorctl'
+alias supad='sudo supervisorctl add'
+alias supa='sudo supervisorctl avail'
+alias suprl='sudo supervisorctl reload'
+alias suprm='sudo supervisorctl remove'
+alias suprr='sudo supervisorctl reread'
+alias suprs='sudo supervisorctl restart'
+alias sups='sudo supervisorctl status'
+alias supsr='sudo supervisorctl start'
+alias supso='sudo supervisorctl stop'
+alias supt='sudo supervisorctl tail'
+alias supu='sudo supervisorctl update'

From bd5d0066b908af0db1c4e8b1fb18888d8965d3a0 Mon Sep 17 00:00:00 2001
From: Myoungdo Park <cuspymd@gmail.com>
Date: Mon, 14 Jun 2021 02:58:44 +0900
Subject: [PATCH 046/591] feat(pm2): Adding a pm2 plugin (#7684)

* Add pm2 plugin

* Add description of pm2 plugin
---
 plugins/pm2/README.md      |  19 +++++
 plugins/pm2/_pm2           | 168 +++++++++++++++++++++++++++++++++++++
 plugins/pm2/pm2.plugin.zsh |   6 ++
 3 files changed, 193 insertions(+)
 create mode 100644 plugins/pm2/README.md
 create mode 100644 plugins/pm2/_pm2
 create mode 100644 plugins/pm2/pm2.plugin.zsh

diff --git a/plugins/pm2/README.md b/plugins/pm2/README.md
new file mode 100644
index 000000000..5dfd540b6
--- /dev/null
+++ b/plugins/pm2/README.md
@@ -0,0 +1,19 @@
+# pm2 plugin
+
+The plugin adds several aliases and completions for common [pm2](http://pm2.keymetrics.io/) commands.
+
+To use it, add `pm2` to the plugins array of your zshrc file:
+```
+plugins=(... pm2)
+```
+
+## Aliases
+
+| Alias  | Command              |
+|--------|----------------------|
+| p2s  | `pm2 start` |
+| p2o  | `pm2 stop` |
+| p2d | `pm2 delete` |
+| p2r   | `pm2 restart` |
+| p2i   | `pm2 list` |
+| p2l   |  `pm2 logs` |
diff --git a/plugins/pm2/_pm2 b/plugins/pm2/_pm2
new file mode 100644
index 000000000..6f1e89df5
--- /dev/null
+++ b/plugins/pm2/_pm2
@@ -0,0 +1,168 @@
+#!/bin/zsh -f
+#compdef pm2
+#autoload
+
+local -a _1st_arguments
+
+_1st_arguments=(
+    "start:start and daemonize an app"
+    "trigger:trigger process action"
+    "deploy:deploy your json"
+    "startOrRestart:start or restart JSON file"
+    "startOrReload:start or gracefully reload JSON file"
+    "pid:return pid of [app_name] or all"
+    "stop:stop a process"
+    "restart:restart a process"
+    "scale:scale up/down a process in cluster mode depending on total_number param"
+    "profile\:mem:Sample PM2 heap memory"
+    "profile\:cpu:Profile PM2 cpu"
+    "reload:reload processes (note that its for app using HTTP/HTTPS)"
+    "id:get process id by name"
+    "inspect:inspect a process"
+    "delete:stop and delete a process from pm2 process list"
+    "sendSignal:send a system signal to the target process"
+    "ping:ping pm2 daemon - if not up it will launch it"
+    "updatePM2:update in-memory PM2 with local PM2"
+    "install:install or update a module and run it forever"
+    "module\:update:update a module and run it forever"
+    "module\:generate:Generate a sample module in current folder"
+    "uninstall:stop and uninstall a module"
+    "package:Check & Package TAR type module"
+    "publish:Publish the module you are currently on"
+    "set:sets the specified config <key> <value>"
+    "multiset:multiset eg \"key1 val1 key2 val2\""
+    "get:get value for <key>"
+    "config:get / set module config values"
+    "unset:clears the specified config <key>"
+    "report:give a full pm2 report for https\://github.com/Unitech/pm2/issues"
+    "link:link with the pm2 monitoring dashboard"
+    "unlink:unlink with the pm2 monitoring dashboard"
+    "monitor:monitor target process"
+    "unmonitor:unmonitor target process"
+    "open:open the pm2 monitoring dashboard"
+    "plus:enable pm2 plus"
+    "login:Login to pm2 plus"
+    "logout:Logout from pm2 plus"
+    "web:launch a health API on 0.0.0.0\:9615"
+    "dump:dump all processes for resurrecting them later"
+    "cleardump:Create empty dump file"
+    "send:send stdin to <pm_id>"
+    "attach:attach stdin/stdout to application identified by <pm_id>"
+    "resurrect:resurrect previously dumped processes"
+    "unstartup:disable the pm2 startup hook"
+    "startup:enable the pm2 startup hook"
+    "logrotate:copy default logrotate configuration"
+    "ecosystem:generate a process conf file. (mode = null or simple)"
+    "reset:reset counters for process"
+    "describe:describe all parameters of a process id"
+    "list:list all processes"
+    "jlist:list all processes in JSON format"
+    "prettylist:print json in a prettified JSON"
+    "monit:launch termcaps monitoring"
+    "imonit:launch legacy termcaps monitoring"
+    "dashboard:launch dashboard with monitoring and logs"
+    "flush:flush logs"
+    "reloadLogs:reload all logs"
+    "logs:stream logs file. Default stream all logs"
+    "kill:kill daemon"
+    "pull:updates repository for a given app"
+    "forward:updates repository to the next commit for a given app"
+    "backward:downgrades repository to the previous commit for a given app"
+    "deepUpdate:performs a deep update of PM2"
+    "serve:serve a directory over http via port"
+    "examples:display pm2 usage examples"
+)
+
+local -a id_names
+
+_id_names() {
+    local app_list
+    app_list=`pm2 list -m`
+
+    local -a names ids 
+    names=(`echo $app_list | grep '+---' | awk '{print $2}'`)
+    ids=(`echo $app_list | grep 'pm2 id' | awk '{print $4}'`)
+
+    if (( ${#ids} > 0 )); then
+        for i in {1..${#ids}}; do
+            id_names+=( "${ids[i]}:${names[i]}" )
+        done
+    fi
+}
+
+_arguments \
+    '(-v --version)'{-v,--version}'[output version]' \
+    '(-h --help)'{-h,--help}'[output usage information]' \
+    '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+    _describe "command" _1st_arguments
+    return
+fi
+
+local -a id_comp id_all_comp id_all_files_comp start_options logs_options
+id_comp=('1: :->id_comp')
+id_all_comp=('1: :->id_all_comp')
+id_all_files_comp=('1: :->id_all_files_comp')
+start_options=(
+    '--watch[Watch folder for changes]'
+    '--fresh[Rebuild Dockerfile]'
+    '--daemon[Run container in Daemon mode (debug purposes)]'
+    '--container[Start application in container mode]'
+    '--dist[with --container; change local Dockerfile to containerize all files in current directory]'
+    '--image-name[with --dist; set the exported image name]'
+    '--node-version[with --container, set a specific major Node.js version]'
+    '--dockerdaemon[for debugging purpose]'
+    '(-h --help)'{-h,--help}'[output usage information]'
+    $id_all_files_comp
+)
+logs_options=(
+    '--json[json log output]'
+    '--format[formated log output]'
+    '--raw[raw output]'
+    '--err[only shows error output]'
+    '--out[only shows standard output]'
+    '--lines[output the last N lines, instead of the last 15 by default]'
+    '--timestamp[add timestamps (default format YYYY-MM-DD-HH:mm:ss)]'
+    '--nostream[print logs without lauching the log stream]'
+    '(-h --help)'{-h,--help}'[output usage information]'
+    $id_all_comp
+)
+
+case "$words[1]" in
+    start)
+        _arguments $start_options && return 0
+        ;;
+    logs)
+        _arguments $logs_options && return 0
+        ;;
+    stop|restart|delete|reload|reset)
+        _arguments $id_all_comp && return 0
+        ;;
+    env|inspect|monitor|unmonitor|discribe)
+        _arguments $id_comp && return 0
+        ;;
+    deploy|startOrRestart|startOrReload)
+        _files ;;
+esac
+
+case "$state" in
+    id_comp)
+        _id_names
+        _alternative \
+            'args:app args:(($id_names))'
+        ;;
+    id_all_comp)
+        _id_names
+        id_names+=(all)
+        _alternative \
+            'args:app args:(($id_names))'
+        ;;
+    id_all_files_comp)
+        _id_names
+        id_names+=(all)
+        _alternative \
+            'args:app args:(($id_names))' \
+            'files:filename:_files'
+        ;;
+esac
diff --git a/plugins/pm2/pm2.plugin.zsh b/plugins/pm2/pm2.plugin.zsh
new file mode 100644
index 000000000..f05d8db8b
--- /dev/null
+++ b/plugins/pm2/pm2.plugin.zsh
@@ -0,0 +1,6 @@
+alias p2s='pm2 start'
+alias p2o='pm2 stop'
+alias p2d='pm2 delete'
+alias p2r='pm2 restart'
+alias p2i='pm2 list'
+alias p2l='pm2 logs'

From 08751210e3204c4ba330bce1ff52b1906b92f850 Mon Sep 17 00:00:00 2001
From: Nick Revin <n@nrvn.cc>
Date: Sun, 13 Jun 2021 21:59:31 +0400
Subject: [PATCH 047/591] feat(git): Add aliases for 'git commit -S -s [-m]'
 (#7616)

I thought it would be useful to add these aliases.

There are already aliases for `git commit -S` and `git commit -s` but there is none for both simultaneously =)
---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6664551eb..2a7c7290d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -97,6 +97,8 @@ alias gcp='git cherry-pick'
 alias gcpa='git cherry-pick --abort'
 alias gcpc='git cherry-pick --continue'
 alias gcs='git commit -S'
+alias gcss='git commit -S -s'
+alias gcssm='git commit -S -s -m'
 
 alias gd='git diff'
 alias gdca='git diff --cached'

From 77087aaa8d9ff92ef84ae727411f0eca100ed5de Mon Sep 17 00:00:00 2001
From: Fabio Vitale <cometspk@gmail.com>
Date: Sun, 13 Jun 2021 20:05:09 +0200
Subject: [PATCH 048/591] refactor(git-glow): Add config interpolation for
 git-flow messages (#7481)

Changed commands:
gcd: uses gitflow.branch.develop to get user-set development branch
gch: uses gitflow.prefix.hotfix to get user-set hotfix prefix
gcr: uses gitflow.prefix.release to get user-set release prefix

Co-authored-by: Fabio 'c0m3tx' Vitale <c0m3tx@gmail.com>
---
 plugins/git-flow/git-flow.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 916cd5693..8f0714b16 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -23,9 +23,9 @@
 #Alias
 alias gfl='git flow'
 alias gfli='git flow init'
-alias gcd='git checkout develop'
-alias gch='git checkout hotfix'
-alias gcr='git checkout release'
+alias gcd='git checkout $(git config gitflow.branch.develop)'
+alias gch='git checkout $(git config gitflow.prefix.hotfix)'
+alias gcr='git checkout $(git config gitflow.prefix.release)'
 alias gflf='git flow feature'
 alias gflh='git flow hotfix'
 alias gflr='git flow release'

From 3e7998aec33ff7551d06d4510f9e8769aab5db93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 14 Jun 2021 10:57:50 +0200
Subject: [PATCH 049/591] Revert "ssh-agent: improvements (#6309)"

This reverts commit a206271460ce49e842b1b410c0424b8c9a0a3d14.
---
 plugins/ssh-agent/README.md            | 12 ++---------
 plugins/ssh-agent/ssh-agent.plugin.zsh | 29 +++++++-------------------
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index aa96f9cc9..8765a9c7e 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -19,17 +19,9 @@ To enable **agent forwarding support** add the following to your zshrc file:
 zstyle :omz:plugins:ssh-agent agent-forwarding on
 ```
 
-To **NOT load any identities on start** use the `lazy` style.
-This is particularly usefull when combined with the AddKeysToAgent
-(available from OpenSSH 7.2), since it allows to enter the password only
-on first use.
+----
 
-```zsh
-zstyle :omz:plugins:ssh-agent lazy yes
-```
-
-To **load multiple identities** use the `identities` style. This have no
-effect if `lazy` is enabled.
+To **load multiple identities** use the `identities` style, For example:
 
 ```zsh
 zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 494cf1393..d45406f63 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,16 +1,4 @@
-lockdir=/tmp/oh-my-zsh-ssh-agent.lock
-
-while true; do
-    if mkdir "$lockdir" 2>/dev/null
-    then    # directory did not exist, but was created successfully
-        trap 'rm -rf "$lockdir"' 0    # remove directory when script finishes
-        break    # continue with script
-    else
-        sleep 0.1  # sleep for 0.2 and try again
-    fi
-done
-
-typeset _ssh_env_cache
+typeset _agent_forwarding _ssh_env_cache
 
 function _start_agent() {
 	local lifetime
@@ -68,7 +56,10 @@ function _add_identities() {
 # Get the filename to store/lookup the environment from
 _ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
 
-if zstyle -t :omz:plugins:ssh-agent agent-forwarding && [[ -n "$SSH_AUTH_SOCK" ]]; then
+# test if agent-forwarding is enabled
+zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding
+
+if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
 	# Add a nifty symlink for screen/tmux if agent forwarding
 	[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 elif [[ -f "$_ssh_env_cache" ]]; then
@@ -82,16 +73,12 @@ elif [[ -f "$_ssh_env_cache" ]]; then
 	ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
 		_start_agent
 	}
-elif [[ -d $HOME/.ssh ]]; then
+else
 	_start_agent
 fi
 
-if ! zstyle -t :omz:plugins:ssh-agent lazy; then
-	_add_identities
-fi
+_add_identities
 
 # tidy up after ourselves
-unset _ssh_env_cache
+unset _agent_forwarding _ssh_env_cache
 unfunction _start_agent _add_identities
-
-rm -rf "$lockdir"

From e32d4b1e195f4c7777844beea97af42bd93434eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 17 Jun 2021 18:54:52 +0200
Subject: [PATCH 050/591] fix(lib): remove `kubectx` stub prompt function from
 lib

Fixes #9974
---
 lib/prompt_info_functions.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index e29fb27a5..48f033da6 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -19,7 +19,6 @@ function chruby_prompt_info \
   virtualenv_prompt_info \
   jenv_prompt_info \
   tf_prompt_info \
-  kubectx_prompt_info \
 {
   return 1
 }

From 0e7d7b87f33b5ec8c75a3a0a9b16fae082d06348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 7 Jul 2021 10:40:05 +0200
Subject: [PATCH 051/591] feat(changelog): ignore merge commits

---
 tools/changelog.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 836afef14..56ea42cb1 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -114,6 +114,11 @@ function parse-commit {
     fi
   }
 
+  # Ignore commit if it is a merge commit
+  if [[ $(command git show -s --format=%p $1 | wc -w) -gt 1 ]]; then
+    return
+  fi
+
   # Parse commit with hash $1
   local hash="$1" subject body warning rhash
   subject="$(command git show -s --format=%s $hash)"

From c44b99e901d7ef58f60247995152de1b937e2e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 28 Jun 2021 15:54:24 +0200
Subject: [PATCH 052/591] fix(dotenv): draw confirmation prompt in next empty
 line

Without this fix the confirmation prompt appears wherever the cursor is,
which means that it might appear in the command line when using a widget
that changes the directory without redrawing the prompt (an example of
this are the dircycle and dirhistory plugins).
---
 plugins/dotenv/dotenv.plugin.zsh | 66 ++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index 24f285df5..40ec5c46f 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -11,41 +11,51 @@
 ## Functions
 
 source_env() {
-  if [[ -f $ZSH_DOTENV_FILE ]]; then
-    if [[ "$ZSH_DOTENV_PROMPT" != false ]]; then
-      local confirmation dirpath="${PWD:A}"
+  if [[ ! -f "$ZSH_DOTENV_FILE" ]]; then
+    return
+  fi
 
-      # make sure there is an (dis-)allowed file
-      touch "$ZSH_DOTENV_ALLOWED_LIST"
-      touch "$ZSH_DOTENV_DISALLOWED_LIST"
+  if [[ "$ZSH_DOTENV_PROMPT" != false ]]; then
+    local confirmation dirpath="${PWD:A}"
 
-      # early return if disallowed
-      if grep -q "$dirpath" "$ZSH_DOTENV_DISALLOWED_LIST" &>/dev/null; then
-        return;
-      fi
+    # make sure there is an (dis-)allowed file
+    touch "$ZSH_DOTENV_ALLOWED_LIST"
+    touch "$ZSH_DOTENV_DISALLOWED_LIST"
 
-      # check if current directory's .env file is allowed or ask for confirmation
-      if ! grep -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
-        # print same-line prompt and output newline character if necessary
-        echo -n "dotenv: found '$ZSH_DOTENV_FILE' file. Source it? ([Y]es/[n]o/[a]lways/n[e]ver) "
-        read -k 1 confirmation; [[ "$confirmation" != $'\n' ]] && echo
-
-        # check input
-        case "$confirmation" in
-          [nN]) return ;;
-          [aA]) echo "$dirpath" >> "$ZSH_DOTENV_ALLOWED_LIST" ;;
-          [eE]) echo "$dirpath" >> "$ZSH_DOTENV_DISALLOWED_LIST"; return ;;
-          *) ;; # interpret anything else as a yes
-        esac
-      fi
+    # early return if disallowed
+    if command grep -q "$dirpath" "$ZSH_DOTENV_DISALLOWED_LIST" &>/dev/null; then
+      return
     fi
 
-    # test .env syntax
-    zsh -fn $ZSH_DOTENV_FILE || echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
+    # check if current directory's .env file is allowed or ask for confirmation
+    if ! command grep -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
+      # get cursor column and print new line before prompt if not at line beginning
+      local column
+      echo -ne "\e[6n" > /dev/tty
+      read -t 1 -s -d R column < /dev/tty
+      column="${column##*\[*;}"
+      [[ $column -eq 1 ]] || echo
 
-    setopt localoptions allexport
-    source $ZSH_DOTENV_FILE
+      # print same-line prompt and output newline character if necessary
+      echo -n "dotenv: found '$ZSH_DOTENV_FILE' file. Source it? ([Y]es/[n]o/[a]lways/n[e]ver) "
+      read -k 1 confirmation
+      [[ "$confirmation" = $'\n' ]] || echo
+
+      # check input
+      case "$confirmation" in
+        [nN]) return ;;
+        [aA]) echo "$dirpath" >> "$ZSH_DOTENV_ALLOWED_LIST" ;;
+        [eE]) echo "$dirpath" >> "$ZSH_DOTENV_DISALLOWED_LIST"; return ;;
+        *) ;; # interpret anything else as a yes
+      esac
+    fi
   fi
+
+  # test .env syntax
+  zsh -fn $ZSH_DOTENV_FILE || echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
+
+  setopt localoptions allexport
+  source $ZSH_DOTENV_FILE
 }
 
 autoload -U add-zsh-hook

From 36f444ed7325720ec05f182781ec7d6c9a4d675c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 8 Jul 2021 16:11:16 +0200
Subject: [PATCH 053/591] fix(update): fix error exit code on update check
 (#10033)

This patch removes the 'exit 1' status code when the update check
finishes or is ended with CTRL+C.

Fixes #10033
---
 tools/check_for_upgrade.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 29a48b880..e87da3487 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -48,14 +48,17 @@ function update_ohmyzsh() {
     return
   fi
 
-  # Remove lock directory on exit. `return 1` is important for when trapping a SIGINT:
+  # Remove lock directory on exit. `return $ret` is important for when trapping a SIGINT:
   #  The return status from the function is handled specially. If it is zero, the signal is
   #  assumed to have been handled, and execution continues normally. Otherwise, the shell
   #  will behave as interrupted except that the return status of the trap is retained.
+  #  This means that for a CTRL+C, the trap needs to return the same exit status so that
+  #  the shell actually exits what it's running.
   trap "
-  unset -f current_epoch update_last_updated_file update_ohmyzsh
-  command rm -rf '$ZSH/log/update.lock'
-  return 1
+    ret=\$?
+    unset -f current_epoch update_last_updated_file update_ohmyzsh 2>/dev/null
+    command rm -rf '$ZSH/log/update.lock'
+    return \$ret
   " EXIT INT QUIT
 
   # Create or update .zsh-update file if missing or malformed

From 5b4e3ee7f1c48505a3ec56ce38e444b88feda7a4 Mon Sep 17 00:00:00 2001
From: Robert Lankford <rlankfo@gmail.com>
Date: Mon, 12 Jul 2021 10:16:26 -0500
Subject: [PATCH 054/591] feat(gnu-utils): include ggrep in gcmds (#10044)

Co-authored-by: Robert Lankford <robert.lankford@nuorder.com>
---
 plugins/gnu-utils/gnu-utils.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index 23e00c295..539e7fe4d 100644
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -36,7 +36,7 @@ __gnu_utils() {
   gcmds+=('gfind' 'gxargs' 'glocate')
 
   # Not part of either coreutils or findutils, installed separately.
-  gcmds+=('gsed' 'gtar' 'gtime' 'gmake')
+  gcmds+=('gsed' 'gtar' 'gtime' 'gmake' 'ggrep')
 
   for gcmd in "${gcmds[@]}"; do
     # Do nothing if the command isn't found

From e4f6f1698d4bf2cebe3fd0e2f5bae9f163780a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 12 Jul 2021 17:34:34 +0200
Subject: [PATCH 055/591] fix(copybuffer): show error below the command line

---
 plugins/copybuffer/copybuffer.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/copybuffer/copybuffer.plugin.zsh b/plugins/copybuffer/copybuffer.plugin.zsh
index 483ed5a5f..87a658d93 100644
--- a/plugins/copybuffer/copybuffer.plugin.zsh
+++ b/plugins/copybuffer/copybuffer.plugin.zsh
@@ -5,7 +5,7 @@ copybuffer () {
   if which clipcopy &>/dev/null; then
     printf "%s" "$BUFFER" | clipcopy
   else
-    echo "clipcopy function not found. Please make sure you have Oh My Zsh installed correctly."
+    zle -M "clipcopy not found. Please make sure you have Oh My Zsh installed correctly."
   fi
 }
 

From 23f9348e2c2341df71b1891eb4607f60ddd5a204 Mon Sep 17 00:00:00 2001
From: Sergei Shvetsov <sshvetsov@users.noreply.github.com>
Date: Tue, 13 Jul 2021 15:05:33 +0700
Subject: [PATCH 056/591] fix(aws): allow for profile switch w/o MFA configured
 (#9924)

---
 plugins/aws/aws.plugin.zsh | 70 +++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index e1566b113..2d095635b 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -62,47 +62,47 @@ function acp() {
       read -r sess_duration
     fi
     mfa_opt=(--serial-number "$mfa_serial" --token-code "$mfa_token" --duration-seconds "${sess_duration:-3600}")
+  fi
 
-    # Now see whether we need to just MFA for the current role, or assume a different one
-    local role_arn="$(aws configure get role_arn --profile $profile)"
-    local sess_name="$(aws configure get role_session_name --profile $profile)"
+  # Now see whether we need to just MFA for the current role, or assume a different one
+  local role_arn="$(aws configure get role_arn --profile $profile)"
+  local sess_name="$(aws configure get role_session_name --profile $profile)"
 
-    if [[ -n "$role_arn" ]]; then
-      # Means we need to assume a specified role
-      aws_command=(aws sts assume-role --role-arn "$role_arn" "${mfa_opt[@]}")
+  if [[ -n "$role_arn" ]]; then
+    # Means we need to assume a specified role
+    aws_command=(aws sts assume-role --role-arn "$role_arn" "${mfa_opt[@]}")
 
-      # Check whether external_id is configured to use while assuming the role
-      local external_id="$(aws configure get external_id --profile $profile)"
-      if [[ -n "$external_id" ]]; then
-        aws_command+=(--external-id "$external_id")
-      fi
-
-      # Get source profile to use to assume role
-      local source_profile="$(aws configure get source_profile --profile $profile)"
-      if [[ -z "$sess_name" ]]; then
-        sess_name="${source_profile:-profile}"
-      fi
-      aws_command+=(--profile="${source_profile:-profile}" --role-session-name "${sess_name}")
-
-      echo "Assuming role $role_arn using profile ${source_profile:-profile}"
-    else
-      # Means we only need to do MFA
-      aws_command=(aws sts get-session-token --profile="$profile" "${mfa_opt[@]}")
-      echo "Obtaining session token for profile $profile"
+    # Check whether external_id is configured to use while assuming the role
+    local external_id="$(aws configure get external_id --profile $profile)"
+    if [[ -n "$external_id" ]]; then
+      aws_command+=(--external-id "$external_id")
     fi
 
-    # Format output of aws command for easier processing
-    aws_command+=(--query '[Credentials.AccessKeyId,Credentials.SecretAccessKey,Credentials.SessionToken]' --output text)
-
-    # Run the aws command to obtain credentials
-    local -a credentials
-    credentials=(${(ps:\t:)"$(${aws_command[@]})"})
-
-    if [[ -n "$credentials" ]]; then
-      aws_access_key_id="${credentials[1]}"
-      aws_secret_access_key="${credentials[2]}"
-      aws_session_token="${credentials[3]}"
+    # Get source profile to use to assume role
+    local source_profile="$(aws configure get source_profile --profile $profile)"
+    if [[ -z "$sess_name" ]]; then
+      sess_name="${source_profile:-profile}"
     fi
+    aws_command+=(--profile="${source_profile:-profile}" --role-session-name "${sess_name}")
+
+    echo "Assuming role $role_arn using profile ${source_profile:-profile}"
+  else
+    # Means we only need to do MFA
+    aws_command=(aws sts get-session-token --profile="$profile" "${mfa_opt[@]}")
+    echo "Obtaining session token for profile $profile"
+  fi
+
+  # Format output of aws command for easier processing
+  aws_command+=(--query '[Credentials.AccessKeyId,Credentials.SecretAccessKey,Credentials.SessionToken]' --output text)
+
+  # Run the aws command to obtain credentials
+  local -a credentials
+  credentials=(${(ps:\t:)"$(${aws_command[@]})"})
+
+  if [[ -n "$credentials" ]]; then
+    aws_access_key_id="${credentials[1]}"
+    aws_secret_access_key="${credentials[2]}"
+    aws_session_token="${credentials[3]}"
   fi
 
   # Switch to AWS profile

From 4eadb9cf758b632b113bb793d5f1e38f4c304392 Mon Sep 17 00:00:00 2001
From: Mahdyar Hasanpour <thisismahdyar@gmail.com>
Date: Fri, 16 Jul 2021 14:11:00 +0430
Subject: [PATCH 057/591] chore: convert the repo issue templates to issue
 forms (#10050)

---
 .github/ISSUE_TEMPLATE/bug_report.md       | 46 ---------------
 .github/ISSUE_TEMPLATE/bug_report.yml      | 69 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md  | 29 ---------
 .github/ISSUE_TEMPLATE/feature_request.yml | 32 ++++++++++
 4 files changed, 101 insertions(+), 75 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 88a6b814d..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve Oh My Zsh
-labels: 'Bug'
-
----
-
-<!--
-Fill this out before posting. You can delete irrelevant sections, but
-an issue where no sections have been filled will be deleted without comment.
--->
-
-**Describe the bug**
-A clear description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior, for example:
-1. Enable this plugin '...'
-2. Run command '...' or try the autocomplete command '...'
-3. See error
-
-**Expected behavior**
-A brief description of what should happen.
-
-**Screenshots and/or Recordings**
-If applicable, add screenshots to help explain your problem.
-You can also record an asciinema session: https://asciinema.org/
-
-**Self Check**
-
-- Have you tried reaching out on the [Discord server](https://discord.gg/ohmyzsh)? 
-  This can help cut down on filling up issues. We always have a few people
-  online that are in a variety of timezones that are willing to help you!
-
-- Also searching existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=) might help you get quicker support
-
-**Desktop (please complete the following information):**
-
- - OS / Distro: [e.g. Arch Linux, macOS]
- - If on Windows what version of WSL: [e.g. WSL1, WSL2]
- - Latest ohmyzsh update?: [e.g. Yes/No]
- - ZSH Version: [e.g. 5.6]
- - Terminal emulator: [e.g. iTerm2]
-
-**Additional context**
-Add any other context about the problem here. This can be themes, plugins, custom configs.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..af2973fec
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,69 @@
+name: Bug report
+description: Create a report to help us improve Oh My Zsh
+labels: 'Bug'
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Self Check
+        - Try searching existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed) for similar issues.
+        - Try reaching out on the [Discord server](https://discord.gg/ohmyzsh) for help.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the bug
+      description: A clear description of what the bug is.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Steps to reproduce the problem.
+      placeholder: |
+        For example:
+        1. Enable plugin '...'
+        2. Run command '...' or try to complete command '...'
+        3. See error
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Expected behavior
+      description: A brief description of what should happen.
+  - type: textarea
+    attributes:
+      label: Screenshots and recordings
+      description: |
+        If applicable, add screenshots to help explain your problem. You can also record an asciinema session: https://asciinema.org/
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: OS / Distro
+      placeholder: e.g. Windows 10, Ubuntu 20.04, Arch Linux, macOS 10.15...
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Zsh version
+      description: Run `echo $ZSH_VERSION` to check.
+      placeholder: e.g. 5.6
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Terminal emulator
+      placeholder: e.g. iTerm2, Gnome Terminal...
+  - type: dropdown
+    attributes:
+      label: If using WSL on Windows, which version of WSL
+      description: Run `wsl -l -v` to check.
+      options:
+        - WSL1
+        - WSL2
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here. This can be themes, plugins, custom settings...
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 788f77368..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: Feature request
-about: Suggest a feature for Oh My Zsh
-labels: 'Feature'
-
----
-
-<!--
-Fill this out before posting. You can delete irrelevant sections, but
-an issue where no sections have been filled will be deleted without comment.
--->
-
-**Is your feature request related to a particular plugin or theme? If so, specify it.**
-The name of the plugin, theme or alias that you would like us to improve. [...]
-
-**Is your feature request related to a problem? Please describe.**
-A description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A description of what you want to happen. [...]
-
-**Describe alternatives you've considered**
-A description of any alternative solutions or features you've considered. This can also include other plugins or themes.
-
-**Additional context**
-Add any other context, screenshots or discord conversations about the feature request here. Also if you have any PRs related to this issue that are already open that you would like us to look at.
-
-**Related Issues**
-Is there any open or closed issues that is related to this feature request? If so please link them below! [...]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..dc4baf2b1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,32 @@
+name: Feature request
+description: Suggest a feature for Oh My Zsh
+labels: 'Feature'
+body:
+  - type: input
+    attributes:
+      label: If the feature request is for a plugin or theme, specify it here.
+      description: The name of the plugin or theme that you would like us to improve.
+      placeholder: e.g. Git plugin, Agnoster theme
+  - type: textarea
+    attributes:
+      label: If the feature solves a problem you have, specify it here.
+      description: A description of what the problem is. 
+      placeholder: Ex. I'm always frustrated when...
+  - type: textarea
+    attributes:
+      label: Describe the proposed feature.
+      description: A description of what you want to happen. Be as specific as possible.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A description of any alternative solutions or features you've considered. This can also include other plugins or themes.
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context, screenshots or Discord conversations about the feature request here. Also if you have any PRs related to this issue that are already open that you would like us to look at.
+  - type: textarea
+    attributes:
+      label: Related Issues
+      description: Is there any open or closed issues that is related to this feature request? If so please link them below!

From dac3314c76e799cddbbe5cf63870d31861626059 Mon Sep 17 00:00:00 2001
From: "MalaGaM @ ARTiSPRETiS" <malagam.artispretis@gmail.com>
Date: Fri, 16 Jul 2021 11:48:19 +0200
Subject: [PATCH 058/591] chore(github): add links to supported tools (#10057)

---
 plugins/github/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/github/README.md b/plugins/github/README.md
index 70b863f64..af2b8a4e7 100644
--- a/plugins/github/README.md
+++ b/plugins/github/README.md
@@ -2,8 +2,8 @@
 
 This plugin supports working with GitHub from the command line. It provides a few things:
 
-* Sets up the `hub` wrapper and completions for the `git` command if you have `hub` installed.
-* Completion for the `github` Ruby gem.
+* Sets up the `hub` wrapper and completions for the `git` command if you have [`hub`](https://github.com/github/hub) installed.
+* Completion for the [`github` Ruby gem](https://github.com/defunkt/github-gem).
 * Convenience functions for working with repos and URLs.
 
 ### Functions

From d9ad99531f74df8b0d6622feeab5e253528b43d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=BDiga=20=C5=A0ebenik?=
 <sebenik@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:39:51 +0200
Subject: [PATCH 059/591] feat(plugins): add fnm plugin (#9864)

Co-authored-by: Ziga Sebenik <ziga.sebenik@oryxgaming.com>
---
 plugins/fnm/.gitignore     |  2 ++
 plugins/fnm/README.md      |  9 +++++++++
 plugins/fnm/fnm.plugin.zsh | 12 ++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 plugins/fnm/.gitignore
 create mode 100644 plugins/fnm/README.md
 create mode 100644 plugins/fnm/fnm.plugin.zsh

diff --git a/plugins/fnm/.gitignore b/plugins/fnm/.gitignore
new file mode 100644
index 000000000..0b2bc9ab7
--- /dev/null
+++ b/plugins/fnm/.gitignore
@@ -0,0 +1,2 @@
+_fnm
+
diff --git a/plugins/fnm/README.md b/plugins/fnm/README.md
new file mode 100644
index 000000000..00fab5cd4
--- /dev/null
+++ b/plugins/fnm/README.md
@@ -0,0 +1,9 @@
+# fnm plugin
+
+This plugin adds autocompletion for [fnm](https://github.com/Schniz/fnm) - a Node.js version manager.
+
+To use it, add `fnm` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... fnm)
+```
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
new file mode 100644
index 000000000..5ce558dcb
--- /dev/null
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -0,0 +1,12 @@
+# COMPLETION FUNCTION
+if (( $+commands[fnm] )); then
+  if [[ ! -f $ZSH_CACHE_DIR/fnm_version ]] \
+    || [[ "$(fnm --version)" != "$(< "$ZSH_CACHE_DIR/fnm_version")" ]] \
+    || [[ ! -f $ZSH/plugins/fnm/_fnm ]]; then
+      fnm completions --shell=zsh > $ZSH/plugins/fnm/_fnm
+      fnm --version > $ZSH_CACHE_DIR/fnm_version
+  fi
+  autoload -Uz _fnm
+  _comps[fnm]=_fnm
+fi
+

From c8a258698de6a56145211657f05f8b554a8140b7 Mon Sep 17 00:00:00 2001
From: Neil Girdhar <mistersheik@gmail.com>
Date: Mon, 26 Jul 2021 05:45:02 -0400
Subject: [PATCH 060/591] fix(pyenv): fix pyenv PATH settings with a warning
 (#9935)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change fixes the setting of $PATH for pyenv and its shims, while warning
the user about non-interactive shells.

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/pyenv/pyenv.plugin.zsh | 81 ++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 29 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 82ba6ff8c..fedde6342 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -3,44 +3,67 @@
 
 # Load pyenv only if command not already available
 if command -v pyenv &> /dev/null && [[ "$(uname -r)" != *icrosoft* ]]; then
-    FOUND_PYENV=1
+  FOUND_PYENV=1
 else
-    FOUND_PYENV=0
+  FOUND_PYENV=0
 fi
 
+# Look for pyenv and try to load it (will only work on interactive shells)
 if [[ $FOUND_PYENV -ne 1 ]]; then
-    pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv" "/usr/local/opt/pyenv")
-    for dir in $pyenvdirs; do
-        if [[ -d $dir/bin ]]; then
-            export PATH="$PATH:$dir/bin"
-            FOUND_PYENV=1
-            break
-        fi
-    done
-fi
-
-if [[ $FOUND_PYENV -ne 1 ]]; then
-    if (( $+commands[brew] )) && dir=$(brew --prefix pyenv 2>/dev/null); then
-        if [[ -d $dir/bin ]]; then
-            export PATH="$PATH:$dir/bin"
-            FOUND_PYENV=1
-        fi
+  pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv" "/usr/local/opt/pyenv")
+  for dir in $pyenvdirs; do
+    if [[ -d "$dir/bin" ]]; then
+      FOUND_PYENV=1
+      break
     fi
+  done
+
+  if [[ $FOUND_PYENV -ne 1 ]]; then
+    if (( $+commands[brew] )) && dir=$(brew --prefix pyenv 2>/dev/null); then
+      if [[ -d "$dir/bin" ]]; then
+        FOUND_PYENV=1
+      fi
+    fi
+  fi
+
+  # If we found pyenv, load it but show a caveat about non-interactive shells
+  if [[ $FOUND_PYENV -eq 1 ]]; then
+    cat <<EOF
+Found pyenv, but it is badly configured. pyenv might not work for
+non-interactive shells (for example, when run from a script).
+${bold_color}
+To fix this message, add these lines to the '.profile' and '.zprofile' files
+in your home directory:
+
+export PYENV_ROOT="${dir/#$HOME/\$HOME}"
+export PATH="\$PYENV_ROOT/bin:\$PATH"
+eval "\$(pyenv init --path)"
+${reset_color}
+For more info go to https://github.com/pyenv/pyenv/#installation.
+EOF
+
+    # Configuring in .zshrc only makes pyenv available for interactive shells
+    export PYENV_ROOT=$dir
+    export PATH="$PYENV_ROOT/bin:$PATH"
+    eval "$(pyenv init --path)"
+  fi
 fi
 
 if [[ $FOUND_PYENV -eq 1 ]]; then
-    eval "$(pyenv init - --no-rehash zsh)"
-    if (( $+commands[pyenv-virtualenv-init] )); then
-        eval "$(pyenv virtualenv-init - zsh)"
-    fi
-    function pyenv_prompt_info() {
-        echo "$(pyenv version-name)"
-    }
+  eval "$(pyenv init - --no-rehash zsh)"
+
+  if (( ${+commands[pyenv-virtualenv-init]} )); then
+    eval "$(pyenv virtualenv-init - zsh)"
+  fi
+
+  function pyenv_prompt_info() {
+    echo "$(pyenv version-name)"
+  }
 else
-    # fallback to system python
-    function pyenv_prompt_info() {
-        echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')"
-    }
+  # Fall back to system python
+  function pyenv_prompt_info() {
+    echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')"
+  }
 fi
 
 unset FOUND_PYENV pyenvdirs dir

From 5377cc37c0f71fe22484303a4c6f387aa339f3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 26 Jul 2021 11:46:15 +0200
Subject: [PATCH 061/591] fix(pyenv): fix for ignoring pyenv-win commands

The previous fix ignored any pyenv command found in $PATH while on
WSL, regardless of whether it was correctly set up or not.

This change only ignores the pyenv command if it's proved to come
from pyenv-win by looking at its full path.
---
 plugins/pyenv/pyenv.plugin.zsh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index fedde6342..813f64b42 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -1,11 +1,13 @@
 # This plugin loads pyenv into the current shell and provides prompt info via
 # the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available.
 
-# Load pyenv only if command not already available
-if command -v pyenv &> /dev/null && [[ "$(uname -r)" != *icrosoft* ]]; then
-  FOUND_PYENV=1
-else
+# Look for pyenv in $PATH and verify that it's not a part of pyenv-win in WSL
+if ! command -v pyenv &>/dev/null; then
   FOUND_PYENV=0
+elif [[ "${commands[pyenv]}" = */pyenv-win/* && "$(uname -r)" = *icrosoft* ]]; then
+  FOUND_PYENV=0
+else
+  FOUND_PYENV=1
 fi
 
 # Look for pyenv and try to load it (will only work on interactive shells)

From 9c34c359c4c1ebb1bd0211d40c3bca0c6aa2ca97 Mon Sep 17 00:00:00 2001
From: Aayush Kapoor <xeoneux@icloud.com>
Date: Fri, 6 Aug 2021 19:21:19 +0530
Subject: [PATCH 062/591] chore(ag): fix README (#10001)

---
 plugins/ag/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ag/README.md b/plugins/ag/README.md
index 6acc54067..1983aaa41 100644
--- a/plugins/ag/README.md
+++ b/plugins/ag/README.md
@@ -5,7 +5,7 @@ This plugin provides completion support for [`ag`](https://github.com/ggreer/the
 To use it, add ag to the plugins array in your zshrc file.
 
 ```zsh
-plugins=(... aws)
+plugins=(... ag)
 ```
 
 ## INSTALLATION NOTES

From ab58594173c04f7fe2155a169d8906ef761ba0fc Mon Sep 17 00:00:00 2001
From: Max Eisner <4730112+max-ae@users.noreply.github.com>
Date: Tue, 10 Aug 2021 16:31:49 +0200
Subject: [PATCH 063/591] feat(git): add `develop` branch name detection
 (#9881)

---
 plugins/git/README.md      | 35 ++++++++++++++++++-----------------
 plugins/git/git.plugin.zsh | 19 ++++++++++++++++---
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index e00f4cf92..522257d2d 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -23,7 +23,7 @@ plugins=(... git)
 | gb                   | git branch                                                                                                                       |
 | gba                  | git branch -a                                                                                                                    |
 | gbd                  | git branch -d                                                                                                                    |
-| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*($(git_main_branch)\|development\|develop\|devel\|dev)\s*$)" \| command xargs -n 1 git branch -d |
+| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*($(git_main_branch)\|$(git_develop_branch))\s*$)" \| command xargs -n 1 git branch -d |
 | gbD                  | git branch -D                                                                                                                    |
 | gbl                  | git blame -b -w                                                                                                                  |
 | gbnm                 | git branch --no-merged                                                                                                           |
@@ -49,8 +49,8 @@ plugins=(... git)
 | gcl                  | git clone --recurse-submodules                                                                                                   |
 | gclean               | git clean -id                                                                                                                    |
 | gpristine            | git reset --hard && git clean -dffx                                                                                              |
-| gcm                  | git checkout $(git_main_branch)                                                                                                                |
-| gcd                  | git checkout develop                                                                                                             |
+| gcm                  | git checkout $(git_main_branch)                                                                                                  |
+| gcd                  | git checkout $(git_develop_branch)                                                                                               |
 | gcmsg                | git commit -m                                                                                                                    |
 | gco                  | git checkout                                                                                                                     |
 | gcor                 | git checkout --recurse-submodules                                                                                                |
@@ -88,7 +88,7 @@ plugins=(... git)
 | ghh                  | git help                                                                                                                         |
 | gignore              | git update-index --assume-unchanged                                                                                              |
 | gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                           |
-| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk                                                                                 |
+| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk                                                                   |
 | gk                   | gitk --all --branches                                                                                                            |
 | gke                  | gitk --all $(git log -g --pretty=%h)                                                                                             |
 | gl                   | git pull                                                                                                                         |
@@ -107,10 +107,10 @@ plugins=(... git)
 | gloga                | git log --oneline --decorate --graph --all                                                                                       |
 | glp                  | git log --pretty=\<format\>                                                                                                      |
 | gm                   | git merge                                                                                                                        |
-| gmom                 | git merge origin/$(git_main_branch)                                                                                                            |
+| gmom                 | git merge origin/$(git_main_branch)                                                                                              |
 | gmt                  | git mergetool --no-prompt                                                                                                        |
 | gmtvim               | git mergetool --no-prompt --tool=vimdiff                                                                                         |
-| gmum                 | git merge upstream/$(git_main_branch)                                                                                                          |
+| gmum                 | git merge upstream/$(git_main_branch)                                                                                            |
 | gma                  | git merge --abort                                                                                                                |
 | gp                   | git push                                                                                                                         |
 | gpd                  | git push --dry-run                                                                                                               |
@@ -125,10 +125,10 @@ plugins=(... git)
 | grb                  | git rebase                                                                                                                       |
 | grba                 | git rebase --abort                                                                                                               |
 | grbc                 | git rebase --continue                                                                                                            |
-| grbd                 | git rebase develop                                                                                                               |
+| grbd                 | git rebase $(git_develop_branch)                                                                                                 |
 | grbi                 | git rebase -i                                                                                                                    |
-| grbm                 | git rebase $(git_main_branch)                                                                                                                  |
-| grbo                 | git rebase --onto                                                                                                             |
+| grbm                 | git rebase $(git_main_branch)                                                                                                    |
+| grbo                 | git rebase --onto                                                                                                                |
 | grbs                 | git rebase --skip                                                                                                                |
 | grev                 | git revert                                                                                                                       |
 | grh                  | git reset                                                                                                                        |
@@ -176,7 +176,7 @@ plugins=(... git)
 | gupv                 | git pull --rebase -v                                                                                                             |
 | gupa                 | git pull --rebase --autostash                                                                                                    |
 | gupav                | git pull --rebase --autostash -v                                                                                                 |
-| glum                 | git pull upstream $(git_main_branch)                                                                                                           |
+| glum                 | git pull upstream $(git_main_branch)                                                                                             |
 | gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                               |
 | gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"           |
 | gam                  | git am                                                                                                                           |
@@ -214,13 +214,14 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
 
 ### Current
 
-| Command                | Description                                                                  |
-|:-----------------------|:-----------------------------------------------------------------------------|
-| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                     |
-| current_branch         | Return the name of the current branch                                        |
-| git_current_user_name  | Returns the `user.name` config value                                         |
-| git_current_user_email | Returns the `user.email` config value                                        |
-| git_main_branch        | Returns the name of the main branch: `main` if it exists, `master` otherwise |
+| Command                | Description                                                                                              |
+|:-----------------------|:---------------------------------------------------------------------------------------------------------|
+| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                                                 |
+| current_branch         | Return the name of the current branch                                                                    |
+| git_current_user_name  | Returns the `user.name` config value                                                                     |
+| git_current_user_email | Returns the `user.email` config value                                                                    |
+| git_main_branch        | Returns the name of the main branch: `main` if it exists, `master` otherwise                             |
+| git_develop_branch     | Returns the name of the develop branch: `dev`, `devel`, `development` if they exist, `develop` otherwise |
 
 ### Work in Progress (WIP)
 
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2a7c7290d..3cd558692 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -42,6 +42,19 @@ function git_main_branch() {
   echo master
 }
 
+# Check for develop and similarly named branches
+function git_develop_branch() {
+  command git rev-parse --git-dir &>/dev/null || return
+  local branch
+  for branch in dev devel development; do
+    if command git show-ref -q --verify refs/heads/$branch; then
+      echo $branch
+      return
+    fi
+  done
+  echo develop
+}
+
 #
 # Aliases
 # (sorted alphabetically)
@@ -60,7 +73,7 @@ alias gapt='git apply --3way'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*($(git_main_branch)|development|develop|devel|dev)\s*$)" | command xargs -n 1 git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs -n 1 git branch -d'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
@@ -88,7 +101,7 @@ alias gcl='git clone --recurse-submodules'
 alias gclean='git clean -id'
 alias gpristine='git reset --hard && git clean -dffx'
 alias gcm='git checkout $(git_main_branch)'
-alias gcd='git checkout develop'
+alias gcd='git checkout $(git_develop_branch)'
 alias gcmsg='git commit -m'
 alias gco='git checkout'
 alias gcor='git checkout --recurse-submodules'
@@ -227,7 +240,7 @@ alias gra='git remote add'
 alias grb='git rebase'
 alias grba='git rebase --abort'
 alias grbc='git rebase --continue'
-alias grbd='git rebase develop'
+alias grbd='git rebase $(git_develop_branch)'
 alias grbi='git rebase -i'
 alias grbm='git rebase $(git_main_branch)'
 alias grbo='git rebase --onto'

From bca73e18584771fd6db770055dac25b5728764c3 Mon Sep 17 00:00:00 2001
From: Quentin Nerden <kenden@gmail.com>
Date: Tue, 10 Aug 2021 20:25:08 +0200
Subject: [PATCH 064/591] feat(plugins): add completion plugin for `invoke`
 (#7311)

Co-authored-by: Quentin Nerden <quentin.nerden@intel.com>
---
 plugins/invoke/README.md         | 10 ++++++++++
 plugins/invoke/invoke.plugin.zsh |  5 +++++
 2 files changed, 15 insertions(+)
 create mode 100644 plugins/invoke/README.md
 create mode 100644 plugins/invoke/invoke.plugin.zsh

diff --git a/plugins/invoke/README.md b/plugins/invoke/README.md
new file mode 100644
index 000000000..3f4b88078
--- /dev/null
+++ b/plugins/invoke/README.md
@@ -0,0 +1,10 @@
+# Invoke plugin
+
+This plugin adds completion for [invoke](https://github.com/pyinvoke/invoke).
+
+To use it, add `invoke` to the plugins array in your `~/.zshrc` file:
+
+```zsh
+plugins=(... invoke)
+```
+
diff --git a/plugins/invoke/invoke.plugin.zsh b/plugins/invoke/invoke.plugin.zsh
new file mode 100644
index 000000000..8c807de02
--- /dev/null
+++ b/plugins/invoke/invoke.plugin.zsh
@@ -0,0 +1,5 @@
+# Autocompletion for invoke.
+#
+if [ $commands[invoke] ]; then
+  source <(invoke --print-completion-script=zsh)
+fi

From b79fba7b0d38aa61afaeeaaa7fab6992dbfb6db3 Mon Sep 17 00:00:00 2001
From: Gregor Trefs <Gregor.Trefs@gmail.com>
Date: Tue, 10 Aug 2021 21:02:06 +0200
Subject: [PATCH 065/591] feat(plugins): `octozen` shows an Octocat zen quote
 on startup (#5959)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/octozen/README.md          | 12 ++++++++++++
 plugins/octozen/octozen.plugin.zsh | 11 +++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 plugins/octozen/README.md
 create mode 100644 plugins/octozen/octozen.plugin.zsh

diff --git a/plugins/octozen/README.md b/plugins/octozen/README.md
new file mode 100644
index 000000000..2051248ca
--- /dev/null
+++ b/plugins/octozen/README.md
@@ -0,0 +1,12 @@
+# Octozen plugin
+
+Displays a zen quote from GitHub's Octocat on start up.
+
+To use it, add `octozen` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... octozen)
+```
+
+It defines a `display_octozen` function that fetches a GitHub Octocat zen quote.
+NOTE: Internet connection is required (will time out if not fetched in 2 seconds).
diff --git a/plugins/octozen/octozen.plugin.zsh b/plugins/octozen/octozen.plugin.zsh
new file mode 100644
index 000000000..71ee550a5
--- /dev/null
+++ b/plugins/octozen/octozen.plugin.zsh
@@ -0,0 +1,11 @@
+# octozen plugin
+
+# Displays a zen quote from octocat
+function display_octozen() {
+  curl -m 2 -fsL "https://api.github.com/octocat"
+  add-zsh-hook -d precmd display_octozen
+}
+
+# Display the octocat on the first precmd, after the whole starting process has finished
+autoload -Uz add-zsh-hook
+add-zsh-hook precmd display_octozen

From c24928815179e1a8e1e3a0a4ab130e22ba2e0f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 10 Aug 2021 21:05:00 +0200
Subject: [PATCH 066/591] feat(lib): add `mkcd` as equivalent to `takedir`
 (#9749)

Fixes #9749
---
 lib/functions.zsh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 9cc735196..24b7254fb 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -13,10 +13,6 @@ function upgrade_oh_my_zsh() {
   omz update
 }
 
-function takedir() {
-  mkdir -p $@ && cd ${@:$#}
-}
-
 function open_command() {
   local open_cmd
 
@@ -37,6 +33,13 @@ function open_command() {
   ${=open_cmd} "$@" &>/dev/null
 }
 
+# take functions
+
+# mkcd is equivalent to takedir
+function mkcd takedir() {
+  mkdir -p $@ && cd ${@:$#}
+}
+
 function takeurl() {
   data=$(mktemp)
   curl -L $1 > $data

From 7eeb1e193d4a55ab706931fb80ef556a939be8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 10 Aug 2021 21:09:21 +0200
Subject: [PATCH 067/591] refactor(lib): refactor take functions

---
 lib/functions.zsh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 24b7254fb..73b491a59 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -41,26 +41,27 @@ function mkcd takedir() {
 }
 
 function takeurl() {
-  data=$(mktemp)
-  curl -L $1 > $data
-  tar xf $data
-  thedir=$(tar tf $data | head -1)
-  rm $data
-  cd $thedir
+  local data thedir
+  data="$(mktemp)"
+  curl -L "$1" > "$data"
+  tar xf "$data"
+  thedir="$(tar tf "$data" | head -1)"
+  rm "$data"
+  cd "$thedir"
 }
 
 function takegit() {
-  git clone $1
-  cd $(basename ${1%%.git})
+  git clone "$1"
+  cd "$(basename ${1%%.git})"
 }
 
 function take() {
   if [[ $1 =~ ^(https?|ftp).*\.tar\.(gz|bz2|xz)$ ]]; then
-    takeurl $1
+    takeurl "$1"
   elif [[ $1 =~ ^([A-Za-z0-9]\+@|https?|git|ssh|ftps?|rsync).*\.git/?$ ]]; then
-    takegit $1
+    takegit "$1"
   else
-    takedir $1
+    takedir "$@"
   fi
 }
 

From 6e4c9df4a433849a2c636980dc317db0fba3a0f5 Mon Sep 17 00:00:00 2001
From: James Eapen <jamespeapen@gmail.com>
Date: Fri, 13 Aug 2021 06:33:30 -0400
Subject: [PATCH 068/591] feat(cli): add `plugin load` subcommand (#9872)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #9672

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 lib/cli.zsh | 77 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 5 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 38e2f72f8..7e3e37be8 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -37,7 +37,7 @@ function _omz {
       changelog) local -a refs
         refs=("${(@f)$(command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
-      plugin) subcmds=('info:Get plugin information' 'list:List plugins')
+      plugin) subcmds=('info:Get plugin information' 'list:List plugins' 'load:Load plugin(s)')
         _describe 'command' subcmds ;;
       pr) subcmds=('test:Test a Pull Request' 'clean:Delete all Pull Request branches')
         _describe 'command' subcmds ;;
@@ -46,10 +46,26 @@ function _omz {
     esac
   elif (( CURRENT == 4 )); then
     case "$words[2]::$words[3]" in
-      plugin::info) compadd "$ZSH"/plugins/*/README.md(.N:h:t) \
-        "$ZSH_CUSTOM"/plugins/*/README.md(.N:h:t) ;;
-      theme::use) compadd "$ZSH"/themes/*.zsh-theme(.N:t:r) \
-        "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::) ;;
+      plugin::(info|load))
+        local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+        _describe 'plugin' plugins ;;
+      theme::use)
+        local -aU themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+        _describe 'theme' themes ;;
+    esac
+  elif (( CURRENT > 4 )); then
+    case "$words[2]::$words[3]" in
+      plugin::load)
+        local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+
+        # Remove plugins already passed as arguments
+        # NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which
+        # has a space after them. This is to avoid removing plugins partially passed, which makes
+        # the completion not add a space after the completed plugin.
+        local -a args=(${words[4,$(( CURRENT - 1))]})
+        plugins=(${plugins:|args})
+
+        _describe 'plugin' plugins ;;
     esac
   fi
 
@@ -147,6 +163,7 @@ Available commands:
 
   info <plugin>   Get information of a plugin
   list            List all available Oh My Zsh plugins
+  load <plugin>   Load plugin(s)
 
 EOF
     return 1
@@ -205,6 +222,56 @@ function _omz::plugin::list {
   fi
 }
 
+function _omz::plugin::load {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: omz plugin load <plugin> [...]"
+    return 1
+  fi
+
+  local plugins=("$@")
+  local plugin base has_completion=0
+
+  for plugin in $plugins; do
+    if [[ -d "$ZSH_CUSTOM/plugins/$plugin" ]]; then
+      base="$ZSH_CUSTOM/plugins/$plugin"
+    elif [[ -d "$ZSH/plugins/$plugin" ]]; then
+      base="$ZSH/plugins/$plugin"
+    else
+      _omz::log warn "plugin '$plugin' not found"
+      continue
+    fi
+
+    # Check if its a valid plugin
+    if [[ ! -f "$base/_$plugin" && ! -f "$base/$plugin.plugin.zsh" ]]; then
+      _omz::log warn "'$plugin' is not a valid plugin"
+      continue
+    # It it is a valid plugin, add its directory to $fpath unless it is already there
+    elif (( ! ${fpath[(Ie)$base]} )); then
+      fpath=("$base" $fpath)
+    fi
+
+    # Check if it has completion to reload compinit
+    if [[ -f "$base/_$plugin" ]]; then
+      has_completion=1
+    fi
+
+    # Load the plugin
+    if [[ -f "$base/$plugin.plugin.zsh" ]]; then
+      source "$base/$plugin.plugin.zsh"
+    fi
+  done
+
+  # If we have completion, we need to reload the completion
+  # We pass -D to avoid generating a new dump file, which would overwrite our
+  # current one for the next session (and we don't want that because we're not
+  # actually enabling the plugins for the next session).
+  # Note that we still have to pass -d "$_comp_dumpfile", so that compinit
+  # doesn't use the default zcompdump location (${ZDOTDIR:-$HOME}/.zcompdump).
+  if (( has_completion )); then
+    compinit -D -d "$_comp_dumpfile"
+  fi
+}
+
 function _omz::pr {
   (( $# > 0 && $+functions[_omz::pr::$1] )) || {
     cat <<EOF

From 502b07c9b2829733f43ca76b7cd077b310f0f77f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 13 Aug 2021 12:38:22 +0200
Subject: [PATCH 069/591] refactor(fedora)!: remove deprecated `fedora` plugin

BREAKING CHANGE: the `fedora` plugin has been removed. Use the `dnf` plugin instead.
---
 plugins/fedora/README.md         | 1 -
 plugins/fedora/fedora.plugin.zsh | 3 ---
 2 files changed, 4 deletions(-)
 delete mode 100644 plugins/fedora/README.md
 delete mode 100644 plugins/fedora/fedora.plugin.zsh

diff --git a/plugins/fedora/README.md b/plugins/fedora/README.md
deleted file mode 100644
index 85d8d7dea..000000000
--- a/plugins/fedora/README.md
+++ /dev/null
@@ -1 +0,0 @@
-The fedora plugin is deprecated. Use the [dnf plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/dnf) instead.
diff --git a/plugins/fedora/fedora.plugin.zsh b/plugins/fedora/fedora.plugin.zsh
deleted file mode 100644
index 226506c05..000000000
--- a/plugins/fedora/fedora.plugin.zsh
+++ /dev/null
@@ -1,3 +0,0 @@
-print -P "%F{yellow}The 'fedora' plugin is deprecated. Use the '%Udnf%u' plugin instead.%f"
-
-source "$ZSH/plugins/dnf/dnf.plugin.zsh"

From e1f0d826f1f0d362eb377ef4a8124062ec63c3e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 13 Aug 2021 12:40:20 +0200
Subject: [PATCH 070/591] refactor(go)!: remove deprecated `go` plugin

BREAKING CHANGE: the `go` plugin has been removed. Use the `golang` plugin instead.
---
 plugins/go/README.md     | 1 -
 plugins/go/go.plugin.zsh | 3 ---
 2 files changed, 4 deletions(-)
 delete mode 100644 plugins/go/README.md
 delete mode 100644 plugins/go/go.plugin.zsh

diff --git a/plugins/go/README.md b/plugins/go/README.md
deleted file mode 100644
index bf43b9feb..000000000
--- a/plugins/go/README.md
+++ /dev/null
@@ -1 +0,0 @@
-The go plugin is deprecated. Use the [golang plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/golang) instead.
diff --git a/plugins/go/go.plugin.zsh b/plugins/go/go.plugin.zsh
deleted file mode 100644
index da7c87cfd..000000000
--- a/plugins/go/go.plugin.zsh
+++ /dev/null
@@ -1,3 +0,0 @@
-print -P "%F{yellow}The 'go' plugin is deprecated. Use the '%Ugolang%u' plugin instead.%f"
-
-source "$ZSH/plugins/golang/golang.plugin.zsh"

From af6c7f3d6782cf0a34e4e68f661df526d35795be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 13 Aug 2021 12:42:56 +0200
Subject: [PATCH 071/591] refactor(cloudapp)!: remove deprecated `cloudapp`
 plugin

BREAKING CHANGE: the `cloudapp` plugin has been removed due to removed API.
---
 plugins/cloudapp/README.md           | 26 --------------------------
 plugins/cloudapp/cloudapp.plugin.zsh |  4 ----
 2 files changed, 30 deletions(-)
 delete mode 100644 plugins/cloudapp/README.md
 delete mode 100644 plugins/cloudapp/cloudapp.plugin.zsh

diff --git a/plugins/cloudapp/README.md b/plugins/cloudapp/README.md
deleted file mode 100644
index ef304edc2..000000000
--- a/plugins/cloudapp/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# CloudApp plugin
-
-## The CloudApp API is deprecated, so the plugin will be removed shortly
-
-[CloudApp](https://www.getcloudapp.com) brings screen recording, screenshots, and GIF creation to the cloud, in an easy-to-use enterprise-level app. The CloudApp plugin allows you to upload a file to your CloadApp account from the command line.
-
-To use it, add `cloudapp` to the plugins array of your `~/.zshrc` file:
-
-```zsh
-plugins=(... cloudapp)
-```
-
-## Requirements
-
-1. [Aaron Russell's `cloudapp_api` gem](https://github.com/aaronrussell/cloudapp_api#installation)
-
-2. That you set your CloudApp credentials in `~/.cloudapp` as a simple text file like below:
-   ```
-   email
-   password
-   ```
-
-## Usage
-
-- `cloudapp <filename>`: uploads `<filename>` to your CloudApp account, and if you're using
-  macOS, copies the URL to your clipboard.
diff --git a/plugins/cloudapp/cloudapp.plugin.zsh b/plugins/cloudapp/cloudapp.plugin.zsh
deleted file mode 100644
index a4d92a080..000000000
--- a/plugins/cloudapp/cloudapp.plugin.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-print -Pn "%F{yellow}"
-print "[oh-my-zsh] The CloudApp API no longer works, so the cloudapp plugin will"
-print "[oh-my-zsh] be removed shortly. Please remove it from your plugins list."
-print -Pn "%f"

From 6dc937ff685fcbc43056dbd7fb05ba01c56dfd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 4 Aug 2021 15:49:11 +0200
Subject: [PATCH 072/591] feat(extract): add suport for .cab files via
 `cabextract`

---
 plugins/extract/README.md          | 1 +
 plugins/extract/_extract           | 2 +-
 plugins/extract/extract.plugin.zsh | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/extract/README.md b/plugins/extract/README.md
index f2e6ad1d1..1dd8e19c0 100644
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@@ -21,6 +21,7 @@ plugins=(... extract)
 | `apk`             | Android app file                     |
 | `aar`             | Android library file                 |
 | `bz2`             | Bzip2 file                           |
+| `cab`             | Microsoft cabinet archive            |
 | `deb`             | Debian package                       |
 | `ear`             | Enterprise Application aRchive       |
 | `gz`              | Gzip file                            |
diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index 267c4d4e1..31a7facbe 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,5 +3,5 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|cab|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
     && return 0
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index e390e2dcc..601272cac 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -55,7 +55,7 @@ extract() {
 			(*.lz4) lz4 -d "$1" ;;
 			(*.lzma) unlzma "$1" ;;
 			(*.z) uncompress "$1" ;;
-			(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d $extract_dir ;;
+			(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d "$extract_dir" ;;
 			(*.rar) unrar x -ad "$1" ;;
 			(*.rpm) mkdir "$extract_dir" && cd "$extract_dir" && rpm2cpio "../$1" | cpio --quiet -id && cd .. ;;
 			(*.7z) 7za x "$1" ;;
@@ -69,6 +69,7 @@ extract() {
 				cd ..
 			;;
 			(*.zst) unzstd "$1" ;;
+			(*.cab) cabextract -d "$extract_dir" "$1" ;;
 			(*)
 				echo "extract: '$1' cannot be extracted" >&2
 				success=1

From 59a9b453d348baad4ff7b7cb2e1f205d615200e6 Mon Sep 17 00:00:00 2001
From: Alexander Kapshuna <kapsh@kap.sh>
Date: Mon, 24 Jun 2019 00:54:28 +0300
Subject: [PATCH 073/591] fix(extract): support unpacking deb file from
 different directory

---
 plugins/extract/extract.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 601272cac..e63b9494f 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -60,13 +60,13 @@ extract() {
 			(*.rpm) mkdir "$extract_dir" && cd "$extract_dir" && rpm2cpio "../$1" | cpio --quiet -id && cd .. ;;
 			(*.7z) 7za x "$1" ;;
 			(*.deb)
-				mkdir -p "$extract_dir/control"
-				mkdir -p "$extract_dir/data"
-				cd "$extract_dir"; ar vx "../${1}" > /dev/null
-				cd control; tar xzvf ../control.tar.gz
-				cd ../data; extract ../data.tar.*
-				cd ..; rm *.tar.* debian-binary
-				cd ..
+				local pwd="$PWD" file="${1:A}"
+				mkdir -p "$extract_dir/control" "$extract_dir/data"
+				builtin cd -q "$extract_dir"; ar vx "$file" > /dev/null
+				builtin cd -q control; extract ../control.tar.*
+				builtin cd -q ../data; extract ../data.tar.*
+				builtin cd -q ..; command rm *.tar.* debian-binary
+				builtin cd -q "$pwd"
 			;;
 			(*.zst) unzstd "$1" ;;
 			(*.cab) cabextract -d "$extract_dir" "$1" ;;

From 0b506fea0c9aeb450db6fdaba572041fd900c05b Mon Sep 17 00:00:00 2001
From: Xeonacid <h.dwwwwww@gmail.com>
Date: Wed, 9 Jun 2021 19:29:04 +0800
Subject: [PATCH 074/591] feat(extract): add cpio support

---
 plugins/extract/README.md          | 1 +
 plugins/extract/_extract           | 2 +-
 plugins/extract/extract.plugin.zsh | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/extract/README.md b/plugins/extract/README.md
index 1dd8e19c0..44f0b05a1 100644
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@@ -22,6 +22,7 @@ plugins=(... extract)
 | `aar`             | Android library file                 |
 | `bz2`             | Bzip2 file                           |
 | `cab`             | Microsoft cabinet archive            |
+| `cpio`            | Cpio archive                         |
 | `deb`             | Debian package                       |
 | `ear`             | Enterprise Application aRchive       |
 | `gz`              | Gzip file                            |
diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index 31a7facbe..27b099c9e 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,5 +3,5 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|cab|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|cab|cpio|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
     && return 0
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index e63b9494f..ac181fa78 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -70,6 +70,7 @@ extract() {
 			;;
 			(*.zst) unzstd "$1" ;;
 			(*.cab) cabextract -d "$extract_dir" "$1" ;;
+			(*.cpio) cpio -idmvF "$1" ;;
 			(*)
 				echo "extract: '$1' cannot be extracted" >&2
 				success=1

From a2f1ef69b570b43bbdd0fa29bddb860293b7278b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 21:57:56 +0200
Subject: [PATCH 075/591] fix(extract): correctly extract rpm files on other
 directories

---
 plugins/extract/extract.plugin.zsh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index ac181fa78..12a1ec948 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -20,6 +20,7 @@ extract() {
 		shift
 	fi
 
+	local pwd="$PWD"
 	while (( $# > 0 )); do
 		if [[ ! -f "$1" ]]; then
 			echo "extract: '$1' is not a valid file" >&2
@@ -29,6 +30,7 @@ extract() {
 
 		success=0
 		extract_dir="${1:t:r}"
+		local full_path="${1:A}"
 		case "${1:l}" in
 			(*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$1" | tar xv } || tar zxvf "$1" ;;
 			(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
@@ -57,17 +59,16 @@ extract() {
 			(*.z) uncompress "$1" ;;
 			(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d "$extract_dir" ;;
 			(*.rar) unrar x -ad "$1" ;;
-			(*.rpm) mkdir "$extract_dir" && cd "$extract_dir" && rpm2cpio "../$1" | cpio --quiet -id && cd .. ;;
+			(*.rpm)
+				command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \
+				&& rpm2cpio "$full_path" | cpio --quiet -id ;;
 			(*.7z) 7za x "$1" ;;
 			(*.deb)
-				local pwd="$PWD" file="${1:A}"
-				mkdir -p "$extract_dir/control" "$extract_dir/data"
-				builtin cd -q "$extract_dir"; ar vx "$file" > /dev/null
+				command mkdir -p "$extract_dir/control" "$extract_dir/data"
+				builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null
 				builtin cd -q control; extract ../control.tar.*
 				builtin cd -q ../data; extract ../data.tar.*
-				builtin cd -q ..; command rm *.tar.* debian-binary
-				builtin cd -q "$pwd"
-			;;
+				builtin cd -q ..; command rm *.tar.* debian-binary ;;
 			(*.zst) unzstd "$1" ;;
 			(*.cab) cabextract -d "$extract_dir" "$1" ;;
 			(*.cpio) cpio -idmvF "$1" ;;
@@ -77,8 +78,11 @@ extract() {
 			;;
 		esac
 
-		(( success = $success > 0 ? $success : $? ))
-		(( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
+		(( success = success > 0 ? success : $? ))
+		(( success == 0 && remove_archive == 0 )) && rm "$full_path"
 		shift
+
+		# Go back to original working directory in case we ran cd previously
+		builtin cd -q "$pwd"
 	done
 }

From 10a00085d027a969c7ef27e52085ca1fa7f5668c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 22:05:48 +0200
Subject: [PATCH 076/591] fix(extract): don't push entries to dirstack when
 extracting rpm and deb files

---
 plugins/extract/extract.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 12a1ec948..a257f6bc3 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -1,6 +1,8 @@
 alias x=extract
 
 extract() {
+	setopt localoptions noautopushd
+
 	local remove_archive
 	local success
 	local extract_dir

From 0b32e4b25fa7f3215964281a8af4e3ff2bf4cd68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 22:03:41 +0200
Subject: [PATCH 077/591] style(extract): adopt main code style guide and
 refactor variables

---
 plugins/extract/extract.plugin.zsh | 153 ++++++++++++++---------------
 1 file changed, 74 insertions(+), 79 deletions(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index a257f6bc3..1112dd52f 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -1,90 +1,85 @@
 alias x=extract
 
 extract() {
-	setopt localoptions noautopushd
+  setopt localoptions noautopushd
 
-	local remove_archive
-	local success
-	local extract_dir
+  if (( $# == 0 )); then
+    cat >&2 <<'EOF'
+Usage: extract [-option] [file ...]
 
-	if (( $# == 0 )); then
-		cat <<-'EOF' >&2
-			Usage: extract [-option] [file ...]
+Options:
+    -r, --remove    Remove archive after unpacking.
+EOF
+  fi
 
-			Options:
-			    -r, --remove    Remove archive after unpacking.
-		EOF
-	fi
+  local remove_archive=1
+  if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
+    remove_archive=0
+    shift
+  fi
 
-	remove_archive=1
-	if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
-		remove_archive=0
-		shift
-	fi
+  local pwd="$PWD"
+  while (( $# > 0 )); do
+    if [[ ! -f "$1" ]]; then
+      echo "extract: '$1' is not a valid file" >&2
+      shift
+      continue
+    fi
 
-	local pwd="$PWD"
-	while (( $# > 0 )); do
-		if [[ ! -f "$1" ]]; then
-			echo "extract: '$1' is not a valid file" >&2
-			shift
-			continue
-		fi
+    local success=0
+    local extract_dir="${1:t:r}"
+    local file="$1" full_path="${1:A}"
+    case "${file:l}" in
+      (*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$file" | tar xv } || tar zxvf "$file" ;;
+      (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$file" ;;
+      (*.tar.xz|*.txz)
+        tar --xz --help &> /dev/null \
+        && tar --xz -xvf "$file" \
+        || xzcat "$file" | tar xvf - ;;
+      (*.tar.zma|*.tlz)
+        tar --lzma --help &> /dev/null \
+        && tar --lzma -xvf "$file" \
+        || lzcat "$file" | tar xvf - ;;
+      (*.tar.zst|*.tzst)
+        tar --zstd --help &> /dev/null \
+        && tar --zstd -xvf "$file" \
+        || zstdcat "$file" | tar xvf - ;;
+      (*.tar) tar xvf "$file" ;;
+      (*.tar.lz) (( $+commands[lzip] )) && tar xvf "$file" ;;
+      (*.tar.lz4) lz4 -c -d "$file" | tar xvf - ;;
+      (*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$file" ;;
+      (*.gz) (( $+commands[pigz] )) && pigz -dk "$file" || gunzip -k "$file" ;;
+      (*.bz2) bunzip2 "$file" ;;
+      (*.xz) unxz "$file" ;;
+      (*.lrz) (( $+commands[lrunzip] )) && lrunzip "$file" ;;
+      (*.lz4) lz4 -d "$file" ;;
+      (*.lzma) unlzma "$file" ;;
+      (*.z) uncompress "$file" ;;
+      (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$file" -d "$extract_dir" ;;
+      (*.rar) unrar x -ad "$file" ;;
+      (*.rpm)
+        command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \
+        && rpm2cpio "$full_path" | cpio --quiet -id ;;
+      (*.7z) 7za x "$file" ;;
+      (*.deb)
+        command mkdir -p "$extract_dir/control" "$extract_dir/data"
+        builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null
+        builtin cd -q control; extract ../control.tar.*
+        builtin cd -q ../data; extract ../data.tar.*
+        builtin cd -q ..; command rm *.tar.* debian-binary ;;
+      (*.zst) unzstd "$file" ;;
+      (*.cab) cabextract -d "$extract_dir" "$file" ;;
+      (*.cpio) cpio -idmvF "$file" ;;
+      (*)
+        echo "extract: '$file' cannot be extracted" >&2
+        success=1 ;;
+    esac
 
-		success=0
-		extract_dir="${1:t:r}"
-		local full_path="${1:A}"
-		case "${1:l}" in
-			(*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$1" | tar xv } || tar zxvf "$1" ;;
-			(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
-			(*.tar.xz|*.txz)
-				tar --xz --help &> /dev/null \
-				&& tar --xz -xvf "$1" \
-				|| xzcat "$1" | tar xvf - ;;
-			(*.tar.zma|*.tlz)
-				tar --lzma --help &> /dev/null \
-				&& tar --lzma -xvf "$1" \
-				|| lzcat "$1" | tar xvf - ;;
-			(*.tar.zst|*.tzst)
-				tar --zstd --help &> /dev/null \
-				&& tar --zstd -xvf "$1" \
-				|| zstdcat "$1" | tar xvf - ;;
-			(*.tar) tar xvf "$1" ;;
-			(*.tar.lz) (( $+commands[lzip] )) && tar xvf "$1" ;;
-			(*.tar.lz4) lz4 -c -d "$1" | tar xvf - ;;
-			(*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$1" ;;
-			(*.gz) (( $+commands[pigz] )) && pigz -dk "$1" || gunzip -k "$1" ;;
-			(*.bz2) bunzip2 "$1" ;;
-			(*.xz) unxz "$1" ;;
-			(*.lrz) (( $+commands[lrunzip] )) && lrunzip "$1" ;;
-			(*.lz4) lz4 -d "$1" ;;
-			(*.lzma) unlzma "$1" ;;
-			(*.z) uncompress "$1" ;;
-			(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d "$extract_dir" ;;
-			(*.rar) unrar x -ad "$1" ;;
-			(*.rpm)
-				command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \
-				&& rpm2cpio "$full_path" | cpio --quiet -id ;;
-			(*.7z) 7za x "$1" ;;
-			(*.deb)
-				command mkdir -p "$extract_dir/control" "$extract_dir/data"
-				builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null
-				builtin cd -q control; extract ../control.tar.*
-				builtin cd -q ../data; extract ../data.tar.*
-				builtin cd -q ..; command rm *.tar.* debian-binary ;;
-			(*.zst) unzstd "$1" ;;
-			(*.cab) cabextract -d "$extract_dir" "$1" ;;
-			(*.cpio) cpio -idmvF "$1" ;;
-			(*)
-				echo "extract: '$1' cannot be extracted" >&2
-				success=1
-			;;
-		esac
+    (( success = success > 0 ? success : $? ))
+    (( success == 0 && remove_archive == 0 )) && rm "$full_path"
+    shift
 
-		(( success = success > 0 ? success : $? ))
-		(( success == 0 && remove_archive == 0 )) && rm "$full_path"
-		shift
-
-		# Go back to original working directory in case we ran cd previously
-		builtin cd -q "$pwd"
-	done
+    # Go back to original working directory in case we ran cd previously
+    builtin cd -q "$pwd"
+  done
 }

From 7c5ab01a5f7b07481182108117db070b8cabb2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 22:41:48 +0200
Subject: [PATCH 078/591] fix(changelog): also display commits from merged
 branches

---
 tools/changelog.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 56ea42cb1..6913ae49a 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -391,9 +391,7 @@ function main {
 
   # Get commit list from $until commit until $since commit, or until root
   # commit if $since is unset, in short hash form.
-  # --first-parent is used when dealing with merges: it only prints the
-  # merge commit, not the commits of the merged branch.
-  command git rev-list --first-parent --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
+  command git rev-list --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
     # Truncate list on versions with a lot of commits
     if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
       truncate=1

From 11e22ed0b5c1aebd6e990ea7a885bdf03ab6555a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 22:54:07 +0200
Subject: [PATCH 079/591] docs(dirhistory): document keyboard shortcut conflict
 with Windows Terminal

Related: https://github.com/ohmyzsh/ohmyzsh/issues/8505#issuecomment-886241162
---
 plugins/dirhistory/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/dirhistory/README.md b/plugins/dirhistory/README.md
index 223650727..602fc8284 100644
--- a/plugins/dirhistory/README.md
+++ b/plugins/dirhistory/README.md
@@ -17,6 +17,9 @@ plugins=(... dirhistory)
 | <kbd>alt</kbd> + <kbd>up</kbd>    | Move into the parent directory                            |
 | <kbd>alt</kbd> + <kbd>down</kbd>  | Move into the first child directory by alphabetical order |
 
+NOTE: some terminals might override the ALT+Arrows key bindings (Windows Terminal, for example).
+If these don't work check your terminal settings and change them to a different keyboard shortcut.
+
 ## Usage
 
 This plugin allows you to navigate the history of previous current-working-directories using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT. MAC users may alternately use OPT-LEFT and OPT-RIGHT.

From 33847956d9969866dd8b502ffc88af58d2b427fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 17 Aug 2021 09:37:01 +0200
Subject: [PATCH 080/591] fix(colemak): remove `lesskey` usage in less v582 and
 newer (#10102)

---
 plugins/colemak/.gitignore         |  1 +
 plugins/colemak/colemak.plugin.zsh | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 plugins/colemak/.gitignore

diff --git a/plugins/colemak/.gitignore b/plugins/colemak/.gitignore
new file mode 100644
index 000000000..8241f5ed6
--- /dev/null
+++ b/plugins/colemak/.gitignore
@@ -0,0 +1 @@
+.less
diff --git a/plugins/colemak/colemak.plugin.zsh b/plugins/colemak/colemak.plugin.zsh
index cb7cc5068..8d3393c44 100644
--- a/plugins/colemak/colemak.plugin.zsh
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -19,4 +19,15 @@ bindkey -a 'N' vi-join
 bindkey -a 'j' vi-forward-word-end
 bindkey -a 'J' vi-forward-blank-word-end
 
-lesskey $ZSH/plugins/colemak/colemak-less
+# New less versions will read this file directly
+export LESSKEYIN="${0:h:A}/colemak-less"
+
+# Only run lesskey if less version is older than v582
+less_ver=$(less --version | awk '{print $2;exit}')
+autoload -Uz is-at-least
+if ! is-at-least 582 $less_ver; then
+  # Old less versions will read this transformed file
+  export LESSKEY="${0:h:A}/.less"
+  lesskey -o "$LESSKEY" "$LESSKEYIN" 2>/dev/null
+fi
+unset less_ver

From 4455c13e063cf81ba427f98e1dce2024ecd50762 Mon Sep 17 00:00:00 2001
From: pollyduan <pollyduan@163.com>
Date: Tue, 17 Aug 2021 18:10:54 +0800
Subject: [PATCH 081/591] feat(cli): add subcommands for plugin `enable` and
 `disable` (#9869)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 lib/cli.zsh | 218 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 207 insertions(+), 11 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 7e3e37be8..1289df730 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -37,7 +37,13 @@ function _omz {
       changelog) local -a refs
         refs=("${(@f)$(command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
-      plugin) subcmds=('info:Get plugin information' 'list:List plugins' 'load:Load plugin(s)')
+      plugin) subcmds=(
+        'disable:Disable plugin(s)'
+        'enable:Enable plugin(s)'
+        'info:Get plugin information'
+        'list:List plugins'
+        'load:Load plugin(s)'
+      )
         _describe 'command' subcmds ;;
       pr) subcmds=('test:Test a Pull Request' 'clean:Delete all Pull Request branches')
         _describe 'command' subcmds ;;
@@ -45,8 +51,21 @@ function _omz {
         _describe 'command' subcmds ;;
     esac
   elif (( CURRENT == 4 )); then
-    case "$words[2]::$words[3]" in
-      plugin::(info|load))
+    case "${words[2]}::${words[3]}" in
+      plugin::(disable|enable|load))
+        local -aU valid_plugins
+
+        if [[ "${words[3]}" = disable ]]; then
+          # if command is "disable", only offer already enabled plugins
+          valid_plugins=($plugins)
+        else
+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+          # if command is "enable", remove already enabled plugins
+          [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
+        fi
+
+        _describe 'plugin' valid_plugins ;;
+      plugin::info)
         local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
         _describe 'plugin' plugins ;;
       theme::use)
@@ -54,18 +73,27 @@ function _omz {
         _describe 'theme' themes ;;
     esac
   elif (( CURRENT > 4 )); then
-    case "$words[2]::$words[3]" in
-      plugin::load)
-        local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+    case "${words[2]}::${words[3]}" in
+      plugin::(enable|disable|load))
+        local -aU valid_plugins
+
+        if [[ "${words[3]}" = disable ]]; then
+          # if command is "disable", only offer already enabled plugins
+          valid_plugins=($plugins)
+        else
+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+          # if command is "enable", remove already enabled plugins
+          [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
+        fi
 
         # Remove plugins already passed as arguments
         # NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which
         # has a space after them. This is to avoid removing plugins partially passed, which makes
         # the completion not add a space after the completed plugin.
         local -a args=(${words[4,$(( CURRENT - 1))]})
-        plugins=(${plugins:|args})
+        valid_plugins=(${valid_plugins:|args})
 
-        _describe 'plugin' plugins ;;
+        _describe 'plugin' valid_plugins ;;
     esac
   fi
 
@@ -161,9 +189,11 @@ Usage: omz plugin <command> [options]
 
 Available commands:
 
-  info <plugin>   Get information of a plugin
-  list            List all available Oh My Zsh plugins
-  load <plugin>   Load plugin(s)
+  disable <plugin> Disable plugin(s)
+  enable <plugin>  Enable plugin(s)
+  info <plugin>    Get information of a plugin
+  list             List all available Oh My Zsh plugins
+  load <plugin>    Load plugin(s)
 
 EOF
     return 1
@@ -175,6 +205,172 @@ EOF
   _omz::plugin::$command "$@"
 }
 
+function _omz::plugin::disable {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: omz plugin disable <plugin> [...]"
+    return 1
+  fi
+
+  # Check that plugin is in $plugins
+  local -a dis_plugins=()
+  for plugin in "$@"; do
+    if [[ ${plugins[(Ie)$plugin]} -eq 0 ]]; then
+      _omz::log warn "plugin '$plugin' is not enabled."
+      continue
+    fi
+    dis_plugins+=("$plugin")
+  done
+
+  # Exit if there are no enabled plugins to disable
+  if [[ ${#dis_plugins} -eq 0 ]]; then
+    return 1
+  fi
+
+  # Disable plugins awk script
+  local awk_script="
+# if plugins=() is in oneline form, substitute disabled plugins and go to next line
+/^\s*plugins=\([^#]+\).*\$/ {
+  sub(/\s+(${(j:|:)dis_plugins})/, \"\") # with spaces before
+  sub(/(${(j:|:)dis_plugins})\s+/, \"\") # with spaces after
+  sub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
+  print \$0
+  next
+}
+
+# if plugins=() is in multiline form, enable multi flag and disable plugins if they're there
+/^\s*plugins=\(/ {
+  multi=1
+  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  print \$0
+  next
+}
+
+# if multi flag is enabled and we find a valid closing parenthesis,
+# add new plugins and disable multi flag
+multi == 1 && /^[^#]*\)/ {
+  multi=0
+  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  print \$0
+  next
+}
+
+multi == 1 {
+  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  print \$0
+  next
+}
+
+{ print \$0 }
+"
+
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.disabled \
+  && mv ~/.zshrc ~/.zshrc.swp \
+  && mv ~/.zshrc.disabled ~/.zshrc
+
+  # Exit if the new .zshrc file wasn't created correctly
+  [[ $? -eq 0 ]] || {
+    local ret=$?
+    _omz::log error "error disabling plugins."
+    return $ret
+  }
+
+  # Exit if the new .zshrc file has syntax errors
+  if ! zsh -n ~/.zshrc; then
+    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
+    mv ~/.zshrc ~/.zshrc.disabled
+    mv ~/.zshrc.swp ~/.zshrc
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+  _omz::log info ""
+
+  # Old zsh versions don't have ZSH_ARGZERO
+  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
+  # Check whether to run a login shell
+  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+}
+
+function _omz::plugin::enable {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: omz plugin enable <plugin> [...]"
+    return 1
+  fi
+
+  # Check that plugin is not in $plugins
+  local -a add_plugins=()
+  for plugin in "$@"; do
+    if [[ ${plugins[(Ie)$plugin]} -ne 0 ]]; then
+      _omz::log warn "plugin '$plugin' is already enabled."
+      continue
+    fi
+    add_plugins+=("$plugin")
+  done
+
+  # Exit if there are no plugins to enable
+  if [[ ${#add_plugins} -eq 0 ]]; then
+    return 1
+  fi
+
+  # Enable plugins awk script
+  local awk_script="
+# if plugins=() is in oneline form, substitute ) with new plugins and go to the next line
+/^\s*plugins=\([^#]+\).*\$/ {
+  sub(/\)/, \" $add_plugins&\")
+  print \$0
+  next
+}
+
+# if plugins=() is in multiline form, enable multi flag
+/^\s*plugins=\(/ {
+  multi=1
+}
+
+# if multi flag is enabled and we find a valid closing parenthesis,
+# add new plugins and disable multi flag
+multi == 1 && /^[^#]*\)/ {
+  multi=0
+  sub(/\)/, \" $add_plugins&\")
+  print \$0
+  next
+}
+
+{ print \$0 }
+"
+
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.disabled \
+  && mv ~/.zshrc ~/.zshrc.swp \
+  && mv ~/.zshrc.disabled ~/.zshrc
+
+  # Exit if the new .zshrc file wasn't created correctly
+  [[ $? -eq 0 ]] || {
+    local ret=$?
+    _omz::log error "error disabling plugins."
+    return $ret
+  }
+
+  # Exit if the new .zshrc file has syntax errors
+  if ! zsh -n ~/.zshrc; then
+    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
+    mv ~/.zshrc ~/.zshrc.disabled
+    mv ~/.zshrc.swp ~/.zshrc
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+
+  # Old zsh versions don't have ZSH_ARGZERO
+  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
+  # Check whether to run a login shell
+  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+}
+
 function _omz::plugin::info {
   if [[ -z "$1" ]]; then
     echo >&2 "Usage: omz plugin info <plugin>"

From 708bbe12c5817e380c83d0c49bf684b0fc5d0024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 17 Aug 2021 12:31:37 +0200
Subject: [PATCH 082/591] fix(cli): fix multiple errors in `plugin
 disable/enable`

---
 lib/cli.zsh | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 1289df730..e490149e0 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -230,9 +230,9 @@ function _omz::plugin::disable {
   local awk_script="
 # if plugins=() is in oneline form, substitute disabled plugins and go to next line
 /^\s*plugins=\([^#]+\).*\$/ {
-  sub(/\s+(${(j:|:)dis_plugins})/, \"\") # with spaces before
-  sub(/(${(j:|:)dis_plugins})\s+/, \"\") # with spaces after
-  sub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
+  gsub(/\s+(${(j:|:)dis_plugins})/, \"\") # with spaces before
+  gsub(/(${(j:|:)dis_plugins})\s+/, \"\") # with spaces after
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
   print \$0
   next
 }
@@ -240,9 +240,9 @@ function _omz::plugin::disable {
 # if plugins=() is in multiline form, enable multi flag and disable plugins if they're there
 /^\s*plugins=\(/ {
   multi=1
-  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
   print \$0
   next
 }
@@ -251,17 +251,17 @@ function _omz::plugin::disable {
 # add new plugins and disable multi flag
 multi == 1 && /^[^#]*\)/ {
   multi=0
-  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
   print \$0
   next
 }
 
 multi == 1 {
-  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
   print \$0
   next
 }
@@ -283,13 +283,13 @@ multi == 1 {
   # Exit if the new .zshrc file has syntax errors
   if ! zsh -n ~/.zshrc; then
     _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    mv ~/.zshrc ~/.zshrc.disabled
-    mv ~/.zshrc.swp ~/.zshrc
+    command mv -f ~/.zshrc ~/.zshrc.disabled
+    command mv -f ~/.zshrc.swp ~/.zshrc
     return 1
   fi
 
   # Restart the zsh session if there were no errors
-  _omz::log info ""
+  _omz::log info "plugins disabled: ${(j:, :)dis_plugins}."
 
   # Old zsh versions don't have ZSH_ARGZERO
   local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
@@ -344,26 +344,27 @@ multi == 1 && /^[^#]*\)/ {
 { print \$0 }
 "
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.disabled \
-  && mv ~/.zshrc ~/.zshrc.swp \
-  && mv ~/.zshrc.disabled ~/.zshrc
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.enabled \
+  && command mv -f ~/.zshrc ~/.zshrc.swp \
+  && command mv -f ~/.zshrc.enabled ~/.zshrc
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
     local ret=$?
-    _omz::log error "error disabling plugins."
+    _omz::log error "error enabling plugins."
     return $ret
   }
 
   # Exit if the new .zshrc file has syntax errors
   if ! zsh -n ~/.zshrc; then
     _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    mv ~/.zshrc ~/.zshrc.disabled
-    mv ~/.zshrc.swp ~/.zshrc
+    command mv -f ~/.zshrc ~/.zshrc.enabled
+    command mv -f ~/.zshrc.swp ~/.zshrc
     return 1
   fi
 
   # Restart the zsh session if there were no errors
+  _omz::log info "plugins enabled: ${(j:, :)add_plugins}."
 
   # Old zsh versions don't have ZSH_ARGZERO
   local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"

From bf888680ea5b7161cf1d06011df33bfbeda8b255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 17 Aug 2021 12:38:48 +0200
Subject: [PATCH 083/591] refactor(cli): extract substitution awk script in
 `plugin disable`

---
 lib/cli.zsh | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index e490149e0..a10b0e147 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -226,13 +226,17 @@ function _omz::plugin::disable {
     return 1
   fi
 
+  # Remove plugins substitution awk script
+  local awk_subst_plugins="\
+  gsub(/\s+(${(j:|:)dis_plugins})/, \"\") # with spaces before
+  gsub(/(${(j:|:)dis_plugins})\s+/, \"\") # with spaces after
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
+"
   # Disable plugins awk script
   local awk_script="
 # if plugins=() is in oneline form, substitute disabled plugins and go to next line
 /^\s*plugins=\([^#]+\).*\$/ {
-  gsub(/\s+(${(j:|:)dis_plugins})/, \"\") # with spaces before
-  gsub(/(${(j:|:)dis_plugins})\s+/, \"\") # with spaces after
-  gsub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
+  $awk_subst_plugins
   print \$0
   next
 }
@@ -240,29 +244,22 @@ function _omz::plugin::disable {
 # if plugins=() is in multiline form, enable multi flag and disable plugins if they're there
 /^\s*plugins=\(/ {
   multi=1
-  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  $awk_subst_plugins
   print \$0
   next
 }
 
-# if multi flag is enabled and we find a valid closing parenthesis,
-# add new plugins and disable multi flag
+# if multi flag is enabled and we find a valid closing parenthesis, remove plugins and disable multi flag
 multi == 1 && /^[^#]*\)/ {
   multi=0
-  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  $awk_subst_plugins
   print \$0
   next
 }
 
-multi == 1 {
-  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
-  print \$0
+multi == 1 && length(\$0) > 0 {
+  $awk_subst_plugins
+  if (length(\$0) > 0) print \$0
   next
 }
 

From bc7ce982ddcabdb7a6d446207ef4a0b78920da8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 17 Aug 2021 12:53:09 +0200
Subject: [PATCH 084/591] style(cli): fill rows in column output in theme and
 plugin `list` commands

---
 lib/cli.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index a10b0e147..6bdac6cf1 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -405,14 +405,14 @@ function _omz::plugin::list {
 
   if (( ${#custom_plugins} )); then
     print -P "%U%BCustom plugins%b%u:"
-    print -l ${(q-)custom_plugins} | column
+    print -l ${(q-)custom_plugins} | column -x
   fi
 
   if (( ${#builtin_plugins} )); then
     (( ${#custom_plugins} )) && echo # add a line of separation
 
     print -P "%U%BBuilt-in plugins%b%u:"
-    print -l ${(q-)builtin_plugins} | column
+    print -l ${(q-)builtin_plugins} | column -x
   fi
 }
 
@@ -631,14 +631,14 @@ function _omz::theme::list {
 
   if (( ${#custom_themes} )); then
     print -P "%U%BCustom themes%b%u:"
-    print -l ${(q-)custom_themes} | column
+    print -l ${(q-)custom_themes} | column -x
   fi
 
   if (( ${#builtin_themes} )); then
     (( ${#custom_themes} )) && echo # add a line of separation
 
     print -P "%U%BBuilt-in themes%b%u:"
-    print -l ${(q-)builtin_themes} | column
+    print -l ${(q-)builtin_themes} | column -x
   fi
 }
 

From ad1837859bedc5283b69cfcabee6d2ba5e4ee71e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 17 Aug 2021 16:35:42 +0200
Subject: [PATCH 085/591] fix(updater): fix reset ANSI escape code for
 resetting underline format

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 38fac3ce0..e9f8bc0f9 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -30,7 +30,7 @@ if [ -t 1 ]; then
   BOLD=$(printf '\033[1m')
   DIM=$(printf '\033[2m')
   UNDER=$(printf '\033[4m')
-  RESET=$(printf '\033[m')
+  RESET=$(printf '\033[0m')
 fi
 
 # Update upstream remote to ohmyzsh org

From 7a4f4ad91e1f937b36a54703984b958abe9da4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 17 Aug 2021 17:38:31 +0200
Subject: [PATCH 086/591] fix(lib): fix clipboard copy on Termux

---
 lib/clipboard.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/clipboard.zsh b/lib/clipboard.zsh
index 122145f15..4e3ba0a45 100644
--- a/lib/clipboard.zsh
+++ b/lib/clipboard.zsh
@@ -76,7 +76,7 @@ function detect-clipboard() {
     function clipcopy() { win32yank -i < "${1:-/dev/stdin}"; }
     function clippaste() { win32yank -o; }
   elif [[ $OSTYPE == linux-android* ]] && (( $+commands[termux-clipboard-set] )); then
-    function clipcopy() { termux-clipboard-set "${1:-/dev/stdin}"; }
+    function clipcopy() { termux-clipboard-set < "${1:-/dev/stdin}"; }
     function clippaste() { termux-clipboard-get; }
   elif [ -n "${TMUX:-}" ] && (( ${+commands[tmux]} )); then
     function clipcopy() { tmux load-buffer "${1:--}"; }

From 10f3e0d4d498c68109bafd711d0bae7f6fa44071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 18 Aug 2021 11:43:29 +0200
Subject: [PATCH 087/591] docs(pyenv): document necessity to logout after PATH
 settings

---
 plugins/pyenv/pyenv.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 813f64b42..275c12c80 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -30,7 +30,7 @@ if [[ $FOUND_PYENV -ne 1 ]]; then
 
   # If we found pyenv, load it but show a caveat about non-interactive shells
   if [[ $FOUND_PYENV -eq 1 ]]; then
-    cat <<EOF
+    cat >&2 <<EOF
 Found pyenv, but it is badly configured. pyenv might not work for
 non-interactive shells (for example, when run from a script).
 ${bold_color}
@@ -40,7 +40,8 @@ in your home directory:
 export PYENV_ROOT="${dir/#$HOME/\$HOME}"
 export PATH="\$PYENV_ROOT/bin:\$PATH"
 eval "\$(pyenv init --path)"
-${reset_color}
+
+You'll need to restart your user session for the changes to take effect.${reset_color}
 For more info go to https://github.com/pyenv/pyenv/#installation.
 EOF
 

From b85e1dd5d6b0ee527b313ce8c902bbc4e34e36e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 18 Aug 2021 11:47:50 +0200
Subject: [PATCH 088/591] fix(pyenv): fix for checking if pyenv-virtualenv is
 installed

Fixes #8467
---
 plugins/pyenv/pyenv.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 275c12c80..bcf80a6a2 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -46,16 +46,20 @@ For more info go to https://github.com/pyenv/pyenv/#installation.
 EOF
 
     # Configuring in .zshrc only makes pyenv available for interactive shells
-    export PYENV_ROOT=$dir
+    export PYENV_ROOT="$dir"
     export PATH="$PYENV_ROOT/bin:$PATH"
     eval "$(pyenv init --path)"
   fi
 fi
 
 if [[ $FOUND_PYENV -eq 1 ]]; then
+  if [[ -z "$PYENV_ROOT" ]]; then
+    export PYENV_ROOT="$(pyenv root)"
+  fi
+
   eval "$(pyenv init - --no-rehash zsh)"
 
-  if (( ${+commands[pyenv-virtualenv-init]} )); then
+  if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
 

From 8dedf26294d4236ffe84260d30d686a705b0d2ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 18 Aug 2021 12:50:22 +0200
Subject: [PATCH 089/591] style(cli): print usage messages to stderr

---
 lib/cli.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 6bdac6cf1..b49643339 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -150,7 +150,7 @@ function _omz::log {
 ## User-facing commands
 
 function _omz::help {
-  cat <<EOF
+  cat >&2 <<EOF
 Usage: omz <command> [options]
 
 Available commands:
@@ -171,7 +171,7 @@ function _omz::changelog {
   if ! command git -C "$ZSH" show-ref --verify refs/heads/$version &>/dev/null && \
     ! command git -C "$ZSH" show-ref --verify refs/tags/$version &>/dev/null && \
     ! command git -C "$ZSH" rev-parse --verify "${version}^{commit}" &>/dev/null; then
-    cat <<EOF
+    cat >&2 <<EOF
 Usage: omz changelog [version]
 
 NOTE: <version> must be a valid branch, tag or commit.
@@ -184,7 +184,7 @@ EOF
 
 function _omz::plugin {
   (( $# > 0 && $+functions[_omz::plugin::$1] )) || {
-    cat <<EOF
+    cat >&2 <<EOF
 Usage: omz plugin <command> [options]
 
 Available commands:
@@ -468,7 +468,7 @@ function _omz::plugin::load {
 
 function _omz::pr {
   (( $# > 0 && $+functions[_omz::pr::$1] )) || {
-    cat <<EOF
+    cat >&2 <<EOF
 Usage: omz pr <command> [options]
 
 Available commands:
@@ -600,7 +600,7 @@ function _omz::pr::test {
 
 function _omz::theme {
   (( $# > 0 && $+functions[_omz::theme::$1] )) || {
-    cat <<EOF
+    cat >&2 <<EOF
 Usage: omz theme <command> [options]
 
 Available commands:

From cbb534267aca09fd123635fc39a7d00c0e21a5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 18 Aug 2021 16:57:56 +0200
Subject: [PATCH 090/591] feat(cli): add `theme set` subcommand to change theme
 in .zshrc

Fixes #9087
---
 lib/cli.zsh | 98 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 83 insertions(+), 15 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index b49643339..2189e24ca 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -45,9 +45,9 @@ function _omz {
         'load:Load plugin(s)'
       )
         _describe 'command' subcmds ;;
-      pr) subcmds=('test:Test a Pull Request' 'clean:Delete all Pull Request branches')
+      pr) subcmds=('clean:Delete all Pull Request branches' 'test:Test a Pull Request')
         _describe 'command' subcmds ;;
-      theme) subcmds=('use:Load a theme' 'list:List themes')
+      theme) subcmds=('list:List themes' 'set:Set a theme in your .zshrc file' 'use:Load a theme')
         _describe 'command' subcmds ;;
     esac
   elif (( CURRENT == 4 )); then
@@ -68,7 +68,7 @@ function _omz {
       plugin::info)
         local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
         _describe 'plugin' plugins ;;
-      theme::use)
+      theme::(set|use))
         local -aU themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
         _describe 'theme' themes ;;
     esac
@@ -266,9 +266,9 @@ multi == 1 && length(\$0) > 0 {
 { print \$0 }
 "
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.disabled \
-  && mv ~/.zshrc ~/.zshrc.swp \
-  && mv ~/.zshrc.disabled ~/.zshrc
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
+  && command mv -f ~/.zshrc ~/.zshrc.bck \
+  && command mv -f ~/.zshrc.new ~/.zshrc
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
@@ -280,8 +280,8 @@ multi == 1 && length(\$0) > 0 {
   # Exit if the new .zshrc file has syntax errors
   if ! zsh -n ~/.zshrc; then
     _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    command mv -f ~/.zshrc ~/.zshrc.disabled
-    command mv -f ~/.zshrc.swp ~/.zshrc
+    command mv -f ~/.zshrc ~/.zshrc.new
+    command mv -f ~/.zshrc.bck ~/.zshrc
     return 1
   fi
 
@@ -341,9 +341,9 @@ multi == 1 && /^[^#]*\)/ {
 { print \$0 }
 "
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.enabled \
-  && command mv -f ~/.zshrc ~/.zshrc.swp \
-  && command mv -f ~/.zshrc.enabled ~/.zshrc
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
+  && command mv -f ~/.zshrc ~/.zshrc.bck \
+  && command mv -f ~/.zshrc.new ~/.zshrc
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
@@ -355,8 +355,8 @@ multi == 1 && /^[^#]*\)/ {
   # Exit if the new .zshrc file has syntax errors
   if ! zsh -n ~/.zshrc; then
     _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    command mv -f ~/.zshrc ~/.zshrc.enabled
-    command mv -f ~/.zshrc.swp ~/.zshrc
+    command mv -f ~/.zshrc ~/.zshrc.new
+    command mv -f ~/.zshrc.bck ~/.zshrc
     return 1
   fi
 
@@ -606,7 +606,8 @@ Usage: omz theme <command> [options]
 Available commands:
 
   list            List all available Oh My Zsh themes
-  use <theme>     Load an Oh My Zsh theme
+  set <theme>     Set a theme in your .zshrc file
+  use <theme>     Load a theme
 
 EOF
     return 1
@@ -642,6 +643,73 @@ function _omz::theme::list {
   fi
 }
 
+function _omz::theme::set {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: omz theme set <theme>"
+    return 1
+  fi
+
+  # Check that theme exists
+  if [[ ! -f "$ZSH_CUSTOM/$1.zsh-theme" ]] \
+    && [[ ! -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]] \
+    && [[ ! -f "$ZSH/themes/$1.zsh-theme" ]]; then
+    _omz::log error "%B$1%b theme not found"
+    return 1
+  fi
+
+  # Enable theme in .zshrc
+  local awk_script='
+!set && /^\s*ZSH_THEME=[^#]+.*$/ {
+  set=1
+  sub(/^\s*ZSH_THEME=[^#]+.*$/, "ZSH_THEME=\"'$1'\" # set by `omz`")
+  print $0
+  next
+}
+
+{ print $0 }
+
+END {
+  # If no ZSH_THEME= line was found, return an error
+  if (!set) exit 1
+}
+'
+
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
+  || {
+    # Prepend ZSH_THEME= line to .zshrc if it doesn't exist
+    cat <<EOF
+ZSH_THEME="$1" # set by \`omz\`
+
+EOF
+    cat ~/.zshrc
+  } > ~/.zshrc.new \
+  && command mv -f ~/.zshrc ~/.zshrc.bck \
+  && command mv -f ~/.zshrc.new ~/.zshrc
+
+  # Exit if the new .zshrc file wasn't created correctly
+  [[ $? -eq 0 ]] || {
+    local ret=$?
+    _omz::log error "error setting theme."
+    return $ret
+  }
+
+  # Exit if the new .zshrc file has syntax errors
+  if ! zsh -n ~/.zshrc; then
+    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
+    command mv -f ~/.zshrc ~/.zshrc.new
+    command mv -f ~/.zshrc.bck ~/.zshrc
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+  _omz::log info "'$1' theme set correctly."
+
+  # Old zsh versions don't have ZSH_ARGZERO
+  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
+  # Check whether to run a login shell
+  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+}
+
 function _omz::theme::use {
   if [[ -z "$1" ]]; then
     echo >&2 "Usage: omz theme use <theme>"
@@ -656,7 +724,7 @@ function _omz::theme::use {
   elif [[ -f "$ZSH/themes/$1.zsh-theme" ]]; then
     source "$ZSH/themes/$1.zsh-theme"
   else
-    _omz::log error "theme '$1' not found"
+    _omz::log error "%B$1%b theme not found"
     return 1
   fi
 }

From 6d5b8484ce7198161d5f617c3db9fd7d3833d48c Mon Sep 17 00:00:00 2001
From: Ilya Bizyaev <bizyaev@zoho.com>
Date: Fri, 20 Aug 2021 13:25:58 +0300
Subject: [PATCH 091/591] fix(suse): avoid refresh attempts for Zypper queries
 (#9798)

---
 plugins/suse/README.md       | 10 ++++++++--
 plugins/suse/suse.plugin.zsh | 20 ++++++++++----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/plugins/suse/README.md b/plugins/suse/README.md
index b9b069574..06c6d9ef5 100644
--- a/plugins/suse/README.md
+++ b/plugins/suse/README.md
@@ -2,9 +2,9 @@
 
 **Maintainer**: [r-darwish](https://github.com/r-darwish)
 
- Alias for Zypper according to the official Zypper's alias
+Alias for Zypper according to the official Zypper's alias
 
- To use it add `suse` to the plugins array in you zshrc file.
+To use it add `suse` to the plugins array in you zshrc file.
 
 ```zsh
 plugins=(... suse)
@@ -60,6 +60,12 @@ plugins=(... suse)
 | zse           | `zypper se`                | search for packages                                  |
 | zwp           | `zypper wp`                | list all packages providing the specified capability |
 
+NOTE: `--no-refresh` is passed to zypper for speeding up the calls and avoid errors due to lack
+of root privileges. If you need to refresh the repositories, call `sudo zypper ref` (`zref` alias)
+before runing these aliases.
+
+Related: [#9798](https://github.com/ohmyzsh/ohmyzsh/pull/9798).
+
 ## Repositories commands
 
 | Alias | Commands            | Description                              |
diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
index dcfeccb03..56bc6f1c5 100644
--- a/plugins/suse/suse.plugin.zsh
+++ b/plugins/suse/suse.plugin.zsh
@@ -25,16 +25,16 @@ alias zup='sudo zypper up'
 alias zpatch='sudo zypper patch'
 
 #Request commands
-alias zif='zypper if'
-alias zpa='zypper pa'
-alias zpatch-info='zypper patch-info'
-alias zpattern-info='zypper pattern-info'
-alias zproduct-info='zypper product-info'
-alias zpch='zypper pch'
-alias zpd='zypper pd'
-alias zpt='zypper pt'
-alias zse='zypper se'
-alias zwp='zypper wp'
+alias zif='zypper --no-refresh if'
+alias zpa='zypper --no-refresh pa'
+alias zpatch-info='zypper --no-refresh patch-info'
+alias zpattern-info='zypper --no-refresh pattern-info'
+alias zproduct-info='zypper --no-refresh product-info'
+alias zpch='zypper --no-refresh pch'
+alias zpd='zypper --no-refresh pd'
+alias zpt='zypper --no-refresh pt'
+alias zse='zypper --no-refresh se'
+alias zwp='zypper --no-refresh wp'
 
 #Repositories commands
 alias zar='sudo zypper ar'

From e13ff75f38200b03b26f798991b3ecf30e547d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20=C3=96hrn?= <mattias.ohrn@gmail.com>
Date: Tue, 24 Aug 2021 19:19:29 +0200
Subject: [PATCH 092/591] fix(kubectx): show plain context if not mapped
 (#10134)

---
 plugins/kubectx/kubectx.plugin.zsh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
index 56b7217f1..abbdc254b 100644
--- a/plugins/kubectx/kubectx.plugin.zsh
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -3,12 +3,7 @@ typeset -A kubectx_mapping
 function kubectx_prompt_info() {
   if [ $commands[kubectl] ]; then
     local current_ctx=`kubectl config current-context`
-
-    #if associative array declared
-    if [[ -n $kubectx_mapping ]]; then
-      echo "${kubectx_mapping[$current_ctx]}"
-    else
-      echo $current_ctx
-    fi
+    # use value in associative array if it exists, otherwise fall back to the context name
+    echo "${kubectx_mapping[$current_ctx]:-$current_ctx}"
   fi
 }

From c47ac2d86d1aec3dcc3106c58d3ef0a91aa8cc3c Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Wed, 25 Aug 2021 10:25:26 +0200
Subject: [PATCH 093/591] feat(mlh): let users configure the official MLH theme
 (#9997)

---
 themes/mlh.zsh-theme | 51 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/themes/mlh.zsh-theme b/themes/mlh.zsh-theme
index 33f238ed9..baff3fb63 100644
--- a/themes/mlh.zsh-theme
+++ b/themes/mlh.zsh-theme
@@ -12,17 +12,40 @@
 # # # Feel free to customize! # # #
 # # # # # # # # # # # # # # # # # #
 
+# 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
 
-# enable or disable particular elements
-PRINT_EXIT_CODE=true
-PRINT_TIME=true
+# right prompt default settings
+if [ -z "$MLH_PRINT_EXIT_CODE" ]; then
+  MLH_PRINT_EXIT_CODE=true
+fi
 
-# symbols
-AT_SYMBOL=" @ "
-IN_SYMBOL=" in "
-ON_SYMBOL=" on "
-SHELL_SYMBOL="$"
+if [ -z "$MLH_PRINT_TIME" ]; then
+  MLH_PRINT_TIME=false
+fi
+
+# left prompt symbols default settings
+
+if [ -z "$MLH_AT_SYMBOL" ]; then
+  MLH_AT_SYMBOL="@"
+fi
+
+if [ -z "$MLH_IN_SYMBOL" ]; then
+  MLH_IN_SYMBOL=" in "
+fi
+
+if [ -z "$MLH_ON_SYMBOL" ]; then
+  MLH_ON_SYMBOL=" on "
+fi
+
+if [ -z "$MLH_SHELL_SYMBOL" ]; then
+  MLH_SHELL_SYMBOL="$ "
+fi
 
 # colors
 USER_COLOR="%F{001}"
@@ -47,24 +70,28 @@ directory() {
 
 # Prints current time
 current_time() {
-  if [ "$PRINT_TIME" = true ]; then
+  if [ "$MLH_PRINT_TIME" = true ]; then
     echo " $TIME_COLOR%*%f"
   fi
 }
 
 # Prints exit code of the last executed command
 exit_code() {
-  if [ "$PRINT_EXIT_CODE" = true ]; then
+  if [ "$MLH_PRINT_EXIT_CODE" = true ]; then
     echo "%(?..%F{001}exit %?)%f"
   fi
 }
 
+prompt_end() {
+  printf "\n$MLH_SHELL_SYMBOL"
+}
+
 # Set git_prompt_info text
-ZSH_THEME_GIT_PROMPT_PREFIX="${ON_SYMBOL}${BRANCH_COLOR}"
+ZSH_THEME_GIT_PROMPT_PREFIX="${MLH_ON_SYMBOL}${BRANCH_COLOR}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 # %B and %b make the text bold
-PROMPT='%b$(username)$AT_SYMBOL$(device)$IN_SYMBOL$(directory)$(git_prompt_info)%b $SHELL_SYMBOL '
+PROMPT='%b$(username)$MLH_AT_SYMBOL$(device)$MLH_IN_SYMBOL$(directory)$(git_prompt_info)%b$(prompt_end)'
 RPROMPT="$(exit_code)$(current_time)"

From 5a9d9553cd6861d80cc958132ab5af40fe661ac4 Mon Sep 17 00:00:00 2001
From: Simone Gaiarin <simgunz@gmail.com>
Date: Thu, 26 Aug 2021 11:42:17 +0200
Subject: [PATCH 094/591] feat(ssh-agent): allow using external helper to ask
 for passwords (#7631)

---
 plugins/ssh-agent/README.md            |   9 ++
 plugins/ssh-agent/ssh-agent.plugin.zsh | 128 ++++++++++++++-----------
 2 files changed, 83 insertions(+), 54 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index 8765a9c7e..f46e8bf6a 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -55,6 +55,15 @@ ssh-add -K -c -a /run/user/1000/ssh-auth <identities>
 
 For valid `ssh-add` arguments run `ssh-add --help` or `man ssh-add`.
 
+----
+
+To set an **external helper** to ask for the passwords and possibly store
+them in the system keychain use the `helper` style. For example:
+
+```zsh
+zstyle :omz:plugins:ssh-agent helper ksshaskpass
+```
+
 ## Credits
 
 Based on code from Joseph M. Reagle: https://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index d45406f63..9bc2e8a21 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,56 +1,76 @@
 typeset _agent_forwarding _ssh_env_cache
 
 function _start_agent() {
-	local lifetime
-	zstyle -s :omz:plugins:ssh-agent lifetime lifetime
+  local lifetime
+  zstyle -s :omz:plugins:ssh-agent lifetime lifetime
 
-	# start ssh-agent and setup environment
-	echo Starting ssh-agent...
-	ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
-	chmod 600 $_ssh_env_cache
-	. $_ssh_env_cache > /dev/null
+  # start ssh-agent and setup environment
+  echo Starting ssh-agent...
+  ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
+  chmod 600 $_ssh_env_cache
+  . $_ssh_env_cache > /dev/null
 }
 
 function _add_identities() {
-	local id line sig lines
-	local -a identities loaded_sigs loaded_ids not_loaded
-	zstyle -a :omz:plugins:ssh-agent identities identities
+  local id line sig lines
+  local -a identities loaded_sigs loaded_ids not_loaded
+  zstyle -a :omz:plugins:ssh-agent identities identities
 
-	# check for .ssh folder presence
-	if [[ ! -d $HOME/.ssh ]]; then
-		return
-	fi
+  # check for .ssh folder presence
+  if [[ ! -d $HOME/.ssh ]]; then
+    return
+  fi
 
-	# add default keys if no identities were set up via zstyle
-	# this is to mimic the call to ssh-add with no identities
-	if [[ ${#identities} -eq 0 ]]; then
-		# key list found on `ssh-add` man page's DESCRIPTION section
-		for id in id_rsa id_dsa id_ecdsa id_ed25519 identity; do
-			# check if file exists
-			[[ -f "$HOME/.ssh/$id" ]] && identities+=$id
-		done
-	fi
+  # add default keys if no identities were set up via zstyle
+  # this is to mimic the call to ssh-add with no identities
+  if [[ ${#identities} -eq 0 ]]; then
+    # key list found on `ssh-add` man page's DESCRIPTION section
+    for id in id_rsa id_dsa id_ecdsa id_ed25519 identity; do
+      # check if file exists
+      [[ -f "$HOME/.ssh/$id" ]] && identities+=($id)
+    done
+  fi
 
-	# get list of loaded identities' signatures and filenames
-	if lines=$(ssh-add -l); then
-		for line in ${(f)lines}; do
-			loaded_sigs+=${${(z)line}[2]}
-			loaded_ids+=${${(z)line}[3]}
-		done
-	fi
+  # get list of loaded identities' signatures and filenames
+  if lines=$(ssh-add -l); then
+    for line in ${(f)lines}; do
+      loaded_sigs+=${${(z)line}[2]}
+      loaded_ids+=${${(z)line}[3]}
+    done
+  fi
 
-	# add identities if not already loaded
-	for id in $identities; do
-		# check for filename match, otherwise try for signature match
-		if [[ ${loaded_ids[(I)$HOME/.ssh/$id]} -le 0 ]]; then
-			sig="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')"
-			[[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+="$HOME/.ssh/$id"
-		fi
-	done
+  # add identities if not already loaded
+  for id in $identities; do
+    # check for filename match, otherwise try for signature match
+    if [[ ${loaded_ids[(I)$HOME/.ssh/$id]} -le 0 ]]; then
+      sig="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')"
+      [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$HOME/.ssh/$id")
+    fi
+  done
 
-	local args
-	zstyle -a :omz:plugins:ssh-agent ssh-add-args args
-	[[ -n "$not_loaded" ]] && ssh-add "${args[@]}" ${^not_loaded}
+  # abort if no identities need to be loaded
+  if [[ ${#not_loaded} -eq 0 ]]; then
+    return
+  fi
+
+  # pass extra arguments to ssh-add
+  local args
+  zstyle -a :omz:plugins:ssh-agent ssh-add-args args
+
+  # use user specified helper to ask for password (ksshaskpass, etc)
+  local helper
+  zstyle -s :omz:plugins:ssh-agent helper helper
+
+  if [[ -n "$helper" ]]; then
+    if [[ -z "${commands[$helper]}" ]]; then
+      echo "ssh-agent: the helper '$helper' has not been found."
+    else
+      SSH_ASKPASS="$helper" ssh-add "${args[@]}" ${^not_loaded} < /dev/null
+      return $?
+    fi
+  fi
+
+  ssh-add "${args[@]}" ${^not_loaded}
 }
 
 # Get the filename to store/lookup the environment from
@@ -60,21 +80,21 @@ _ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
 zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding
 
 if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
-	# Add a nifty symlink for screen/tmux if agent forwarding
-	[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
+  # Add a nifty symlink for screen/tmux if agent forwarding
+  [[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 elif [[ -f "$_ssh_env_cache" ]]; then
-	# Source SSH settings, if applicable
-	. $_ssh_env_cache > /dev/null
-	if [[ $USERNAME == "root" ]]; then
-		FILTER="ax"
-	else
-		FILTER="x"
-	fi
-	ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
-		_start_agent
-	}
+  # Source SSH settings, if applicable
+  . $_ssh_env_cache > /dev/null
+  if [[ $USERNAME == "root" ]]; then
+    FILTER="ax"
+  else
+    FILTER="x"
+  fi
+  ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
+    _start_agent
+  }
 else
-	_start_agent
+  _start_agent
 fi
 
 _add_identities

From 7692881d2a61a4ba47eeef5d7827c0d2cb896def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 26 Aug 2021 12:14:53 +0200
Subject: [PATCH 095/591] feat(ssh-agent): only start ssh-agent once (#5359)

Close #5359
Close #7379

Co-authored-by: Will Andrews <will@firepipe.net>
Co-authored-by: zhangyc <zhangyc@fenbi.com>
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 9bc2e8a21..acad4e83e 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,5 +1,3 @@
-typeset _agent_forwarding _ssh_env_cache
-
 function _start_agent() {
   local lifetime
   zstyle -s :omz:plugins:ssh-agent lifetime lifetime
@@ -97,7 +95,23 @@ else
   _start_agent
 fi
 
-_add_identities
+() {
+  emulate -L zsh
+
+  command mkdir "$ZSH_CACHE_DIR/ssh-agent.lock" 2>/dev/null || return
+
+  trap "
+    ret=\$?
+
+    command rm -rf '$ZSH_CACHE_DIR/ssh-agent.lock'
+    unset _agent_forwarding _ssh_env_cache
+    unfunction _start_agent _add_identities 2>/dev/null
+
+    return \$ret
+  " EXIT INT QUIT
+
+  _add_identities
+}
 
 # tidy up after ourselves
 unset _agent_forwarding _ssh_env_cache

From 3f0672ff946a508329e382261e6eb8f837106e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 26 Aug 2021 12:40:16 +0200
Subject: [PATCH 096/591] refactor(ssh-agent): clean up and reorganize code

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 47 +++++++++++++-------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index acad4e83e..2049145fd 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,12 +1,25 @@
+# Get the filename to store/lookup the environment from
+ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
+
 function _start_agent() {
+  # Check if ssh-agent is already running
+  if [[ -f "$ssh_env_cache" ]]; then
+    . "$ssh_env_cache" > /dev/null
+
+    {
+      [[ "$USERNAME" = root ]] && command ps ax || command ps x
+    } | command grep ssh-agent | command grep -q $SSH_AGENT_PID && return 0
+  fi
+
+  # Set a maximum lifetime for identities added to ssh-agent
   local lifetime
   zstyle -s :omz:plugins:ssh-agent lifetime lifetime
 
   # start ssh-agent and setup environment
   echo Starting ssh-agent...
-  ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
-  chmod 600 $_ssh_env_cache
-  . $_ssh_env_cache > /dev/null
+  ssh-agent -s ${lifetime:+-t} ${lifetime} | sed '/^echo/d' >! "$ssh_env_cache"
+  chmod 600 "$ssh_env_cache"
+  . "$ssh_env_cache" > /dev/null
 }
 
 function _add_identities() {
@@ -71,26 +84,12 @@ function _add_identities() {
   ssh-add "${args[@]}" ${^not_loaded}
 }
 
-# Get the filename to store/lookup the environment from
-_ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
-
 # test if agent-forwarding is enabled
-zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding
+zstyle -b :omz:plugins:ssh-agent agent-forwarding agent_forwarding
 
-if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
-  # Add a nifty symlink for screen/tmux if agent forwarding
-  [[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
-elif [[ -f "$_ssh_env_cache" ]]; then
-  # Source SSH settings, if applicable
-  . $_ssh_env_cache > /dev/null
-  if [[ $USERNAME == "root" ]]; then
-    FILTER="ax"
-  else
-    FILTER="x"
-  fi
-  ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
-    _start_agent
-  }
+# Add a nifty symlink for screen/tmux if agent forwarding
+if [[ $agent_forwarding = "yes" && -n "$SSH_AUTH_SOCK" && ! -L "$SSH_AUTH_SOCK" ]]; then
+  ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 else
   _start_agent
 fi
@@ -104,15 +103,15 @@ fi
     ret=\$?
 
     command rm -rf '$ZSH_CACHE_DIR/ssh-agent.lock'
-    unset _agent_forwarding _ssh_env_cache
+    unset agent_forwarding ssh_env_cache
     unfunction _start_agent _add_identities 2>/dev/null
 
     return \$ret
   " EXIT INT QUIT
 
   _add_identities
+
 }
 
-# tidy up after ourselves
-unset _agent_forwarding _ssh_env_cache
+unset agent_forwarding ssh_env_cache
 unfunction _start_agent _add_identities

From 0c590aba74f28e94f03eb918c07a90cf1a51f525 Mon Sep 17 00:00:00 2001
From: wl2776 <wl2776@users.noreply.github.com>
Date: Fri, 27 Aug 2021 19:07:19 +0300
Subject: [PATCH 097/591] fix(git): fix `gbda` alias when there are no merged
 branches (#10005)

---
 plugins/git/README.md      | 2 +-
 plugins/git/git.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 522257d2d..48cf87204 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -23,7 +23,7 @@ plugins=(... git)
 | gb                   | git branch                                                                                                                       |
 | gba                  | git branch -a                                                                                                                    |
 | gbd                  | git branch -d                                                                                                                    |
-| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*($(git_main_branch)\|$(git_develop_branch))\s*$)" \| command xargs -n 1 git branch -d |
+| gbda                 | git branch --no-color --merged \| grep -vE "^([+*]\|\s*($(git_main_branch)\|$(git_develop_branch))\s*$)" \| xargs git branch -d 2>/dev/null |
 | gbD                  | git branch -D                                                                                                                    |
 | gbl                  | git blame -b -w                                                                                                                  |
 | gbnm                 | git branch --no-merged                                                                                                           |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 3cd558692..f0d9aaedc 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -73,7 +73,7 @@ alias gapt='git apply --3way'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs -n 1 git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch -d 2>/dev/null'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'

From 4a69ee575c9a8ec96fb6378fecae7777c7afba84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 26 Aug 2021 15:52:09 +0200
Subject: [PATCH 098/591] feat(ssh-agent): allow specifying absolute path to
 `identities`

Fixes #9650
---
 plugins/ssh-agent/README.md            |  9 +++++++++
 plugins/ssh-agent/ssh-agent.plugin.zsh | 12 +++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index f46e8bf6a..d1a504b1e 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -27,6 +27,15 @@ To **load multiple identities** use the `identities` style, For example:
 zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
 ```
 
+**NOTE:** the identities may be an absolute path if they are somewhere other than
+`~/.ssh`. For example:
+
+```zsh
+zstyle :omz:plugins:ssh-agent identities ~/.config/ssh/id_rsa ~/.config/ssh/id_rsa2 ~/.config/ssh/id_github
+# which can be simplified to
+zstyle :omz:plugins:ssh-agent identities ~/.config/ssh/{id_rsa,id_rsa2,id_github}
+```
+
 ----
 
 To **set the maximum lifetime of the identities**, use the `lifetime` style.
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 2049145fd..c2b9546a2 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -23,12 +23,12 @@ function _start_agent() {
 }
 
 function _add_identities() {
-  local id line sig lines
+  local id file line sig lines
   local -a identities loaded_sigs loaded_ids not_loaded
   zstyle -a :omz:plugins:ssh-agent identities identities
 
   # check for .ssh folder presence
-  if [[ ! -d $HOME/.ssh ]]; then
+  if [[ ! -d "$HOME/.ssh" ]]; then
     return
   fi
 
@@ -52,10 +52,12 @@ function _add_identities() {
 
   # add identities if not already loaded
   for id in $identities; do
+    # if id is an absolute path, make file equal to id
+    [[ "$id" = /* ]] && file="$id" || file="$HOME/.ssh/$id"
     # check for filename match, otherwise try for signature match
-    if [[ ${loaded_ids[(I)$HOME/.ssh/$id]} -le 0 ]]; then
-      sig="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')"
-      [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$HOME/.ssh/$id")
+    if [[ ${loaded_ids[(I)$file]} -le 0 ]]; then
+      sig="$(ssh-keygen -lf "$file" | awk '{print $2}')"
+      [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$file")
     fi
   done
 

From a1847dc860b85a0f0d97126ffe4b9b3a5276d1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 19 Aug 2021 17:20:52 +0200
Subject: [PATCH 099/591] style(sudo): apply main style guide indentation

---
 plugins/sudo/sudo.plugin.zsh | 70 ++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index f2445a762..f0a01bc1f 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -15,48 +15,48 @@
 # ------------------------------------------------------------------------------
 
 __sudo-replace-buffer() {
-    local old=$1 new=$2 space=${2:+ }
-    if [[ ${#LBUFFER} -le ${#old} ]]; then
-        RBUFFER="${space}${BUFFER#$old }"
-        LBUFFER="${new}"
-    else
-        LBUFFER="${new}${space}${LBUFFER#$old }"
-    fi
+  local old=$1 new=$2 space=${2:+ }
+  if [[ ${#LBUFFER} -le ${#old} ]]; then
+    RBUFFER="${space}${BUFFER#$old }"
+    LBUFFER="${new}"
+  else
+    LBUFFER="${new}${space}${LBUFFER#$old }"
+  fi
 }
 
 sudo-command-line() {
-    [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
+  [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
 
-    # Save beginning space
-    local WHITESPACE=""
-    if [[ ${LBUFFER:0:1} = " " ]]; then
-        WHITESPACE=" "
-        LBUFFER="${LBUFFER:1}"
+  # Save beginning space
+  local WHITESPACE=""
+  if [[ ${LBUFFER:0:1} = " " ]]; then
+    WHITESPACE=" "
+    LBUFFER="${LBUFFER:1}"
+  fi
+
+  # Get the first part of the typed command and check if it's an alias to $EDITOR
+  # If so, locally change $EDITOR to the alias so that it matches below
+  if [[ -n "$EDITOR" ]]; then
+    local cmd="${${(Az)BUFFER}[1]}"
+    if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then
+      local EDITOR="$cmd"
     fi
+  fi
 
-    # Get the first part of the typed command and check if it's an alias to $EDITOR
-    # If so, locally change $EDITOR to the alias so that it matches below
-    if [[ -n "$EDITOR" ]]; then
-        local cmd="${${(Az)BUFFER}[1]}"
-        if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then
-            local EDITOR="$cmd"
-        fi
-    fi
+  if [[ -n $EDITOR && $BUFFER = $EDITOR\ * ]]; then
+    __sudo-replace-buffer "$EDITOR" "sudoedit"
+  elif [[ -n $EDITOR && $BUFFER = \$EDITOR\ * ]]; then
+    __sudo-replace-buffer "\$EDITOR" "sudoedit"
+  elif [[ $BUFFER = sudoedit\ * ]]; then
+    __sudo-replace-buffer "sudoedit" "$EDITOR"
+  elif [[ $BUFFER = sudo\ * ]]; then
+    __sudo-replace-buffer "sudo" ""
+  else
+    LBUFFER="sudo $LBUFFER"
+  fi
 
-    if [[ -n $EDITOR && $BUFFER = $EDITOR\ * ]]; then
-        __sudo-replace-buffer "$EDITOR" "sudoedit"
-    elif [[ -n $EDITOR && $BUFFER = \$EDITOR\ * ]]; then
-        __sudo-replace-buffer "\$EDITOR" "sudoedit"
-    elif [[ $BUFFER = sudoedit\ * ]]; then
-        __sudo-replace-buffer "sudoedit" "$EDITOR"
-    elif [[ $BUFFER = sudo\ * ]]; then
-        __sudo-replace-buffer "sudo" ""
-    else
-        LBUFFER="sudo $LBUFFER"
-    fi
-
-    # Preserve beginning space
-    LBUFFER="${WHITESPACE}${LBUFFER}"
+  # Preserve beginning space
+  LBUFFER="${WHITESPACE}${LBUFFER}"
 }
 
 zle -N sudo-command-line

From 190325049ef93731ab28295dbedf36d44ab33d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 19 Aug 2021 18:20:57 +0200
Subject: [PATCH 100/591] fix(sudo): allow different $EDITOR settings and fix
 zsh-syntax-highlighting redraw

---
 plugins/sudo/sudo.plugin.zsh | 64 ++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index f0a01bc1f..e02f88a87 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -25,6 +25,7 @@ __sudo-replace-buffer() {
 }
 
 sudo-command-line() {
+  # If line is empty, get the last run command from history
   [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
 
   # Save beginning space
@@ -34,29 +35,56 @@ sudo-command-line() {
     LBUFFER="${LBUFFER:1}"
   fi
 
-  # Get the first part of the typed command and check if it's an alias to $EDITOR
-  # If so, locally change $EDITOR to the alias so that it matches below
-  if [[ -n "$EDITOR" ]]; then
-    local cmd="${${(Az)BUFFER}[1]}"
-    if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then
-      local EDITOR="$cmd"
-    fi
-  fi
-
-  if [[ -n $EDITOR && $BUFFER = $EDITOR\ * ]]; then
-    __sudo-replace-buffer "$EDITOR" "sudoedit"
-  elif [[ -n $EDITOR && $BUFFER = \$EDITOR\ * ]]; then
-    __sudo-replace-buffer "\$EDITOR" "sudoedit"
-  elif [[ $BUFFER = sudoedit\ * ]]; then
-    __sudo-replace-buffer "sudoedit" "$EDITOR"
-  elif [[ $BUFFER = sudo\ * ]]; then
-    __sudo-replace-buffer "sudo" ""
+  # If $EDITOR is not set, just toggle the sudo prefix on and off
+  if [[ -z "$EDITOR" ]]; then
+    case "$BUFFER" in
+      sudoedit\ *) __sudo-replace-buffer "sudoedit" "" ;;
+      sudo\ *) __sudo-replace-buffer "sudo" "" ;;
+      *) LBUFFER="sudo $LBUFFER" ;;
+    esac
   else
-    LBUFFER="sudo $LBUFFER"
+    # Check if the typed command is really an alias to $EDITOR
+
+    # Get the first part of the typed command
+    local cmd="${${(Az)BUFFER}[1]}"
+    # Get the first part of the alias of the same name as $cmd, or $cmd if no alias matches
+    local realcmd="${${(Az)aliases[$cmd]}[1]:-$cmd}"
+    # Get the first part of the $EDITOR command ($EDITOR may have arguments after it)
+    local editorcmd="${${(Az)EDITOR}[1]}"
+
+    # Note: ${var:c} makes a $PATH search and expands $var to the full path
+    # The if condition is met when:
+    # - $realcmd is '$EDITOR'
+    # - $realcmd is "cmd" and $EDITOR is "cmd"
+    # - $realcmd is "cmd" and $EDITOR is "cmd --with --arguments"
+    # - $realcmd is "/path/to/cmd" and $EDITOR is "cmd"
+    # - $realcmd is "/path/to/cmd" and $EDITOR is "/path/to/cmd"
+    # or
+    # - $realcmd is "cmd" and $EDITOR is "cmd"
+    # - $realcmd is "cmd" and $EDITOR is "/path/to/cmd"
+    # or
+    # - $realcmd is "cmd" and $EDITOR is /alternative/path/to/cmd that appears in $PATH
+    if [[ "$realcmd" = (\$EDITOR|$editorcmd|${editorcmd:c}) \
+      || "${realcmd:c}" = ($editorcmd|${editorcmd:c}) ]] \
+      || builtin which -a "$realcmd" | command grep -Fx -q "$editorcmd"; then
+      editorcmd="$cmd" # replace $editorcmd with the typed command so it matches below
+    fi
+
+    # Check for editor commands in the typed command and replace accordingly
+    case "$BUFFER" in
+      $editorcmd\ *) __sudo-replace-buffer "$editorcmd" "sudoedit" ;;
+      \$EDITOR\ *) __sudo-replace-buffer '$EDITOR' "sudoedit" ;;
+      sudoedit\ *) __sudo-replace-buffer "sudoedit" "$EDITOR" ;;
+      sudo\ *) __sudo-replace-buffer "sudo" "" ;;
+      *) LBUFFER="sudo $LBUFFER" ;;
+    esac
   fi
 
   # Preserve beginning space
   LBUFFER="${WHITESPACE}${LBUFFER}"
+
+  # Redisplay edit buffer (compatibility with zsh-syntax-highlighting)
+  zle redisplay
 }
 
 zle -N sudo-command-line

From 21b385e7bd522983642b52b51db5d4a210a77717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 2 Sep 2021 12:29:04 +0200
Subject: [PATCH 101/591] fix(frontend-search): fix codepen.io search (#10157)

Fixes #10157
---
 plugins/frontend-search/frontend-search.plugin.zsh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 4517e21a8..437e477b9 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -29,14 +29,10 @@ alias unheap='frontend unheap'
 alias vuejs='frontend vuejs'
 
 function _frontend_fallback() {
-  local url
-  if [[ "$FRONTEND_SEARCH_FALLBACK" == duckduckgo ]]; then
-    url="https://duckduckgo.com/?sites=$1&q="
-  else
-    url="https://google.com/search?as_sitesearch=$1&as_q="
-  fi
-
-  echo "$url"
+  case "$FRONTEND_SEARCH_FALLBACK" in
+    duckduckgo) echo "https://duckduckgo.com/?sites=$1&q=" ;;
+    *) echo "https://google.com/search?as_sitesearch=$1&as_q=" ;;
+  esac
 }
 
 function frontend() {
@@ -51,7 +47,7 @@ function frontend() {
     bootsnipp      'https://bootsnipp.com/search?q='
     bundlephobia   'https://bundlephobia.com/result?p='
     caniuse        'https://caniuse.com/#search='
-    codepen        'https://codepen.io/search?q='
+    codepen        'https://codepen.io/search/pens?q='
     compassdoc     'http://compass-style.org/search?q='
     cssflow        'http://www.cssflow.com/search?q='
     dartlang       'https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:'

From 53b54f5faa271ee90ec31fcffb559541c82b9703 Mon Sep 17 00:00:00 2001
From: Vitaly Polonetsky <m_vitaly@topixoft.com>
Date: Fri, 3 Sep 2021 02:43:53 -0700
Subject: [PATCH 102/591] feat(git): guess main branch name also from remotes
 (#10158)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/git/git.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index f0d9aaedc..2985ba024 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -32,10 +32,10 @@ function work_in_progress() {
 # Check if main exists and use instead of master
 function git_main_branch() {
   command git rev-parse --git-dir &>/dev/null || return
-  local branch
-  for branch in main trunk; do
-    if command git show-ref -q --verify refs/heads/$branch; then
-      echo $branch
+  local ref
+  for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk}; do
+    if command git show-ref -q --verify $ref; then
+      echo ${ref:t}
       return
     fi
   done

From c08fb77c2fc62ba8df6ad690df0e1d5c9f24c075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 3 Sep 2021 12:44:01 +0200
Subject: [PATCH 103/591] fix(pyenv): properly load pyenv shims and warn of
 broken configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #10133

Co-authored-by: Chloé “Matcha” <chloe.desoutter@gmail.com>
---
 plugins/pyenv/pyenv.plugin.zsh | 48 +++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index bcf80a6a2..f55701900 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -1,3 +1,22 @@
+pyenv_config_warning() {
+  local reason="$1"
+  local pyenv_root="${PYENV_ROOT/#$HOME/\$HOME}"
+  cat >&2 <<EOF
+Found pyenv, but it is badly configured ($reason). pyenv might not
+work correctly for non-interactive shells (for example, when run from a script).
+${(%):-"%B%F{yellow}"}
+To fix this message, add these lines to the '.profile' and '.zprofile' files
+in your home directory:
+${(%):-"%f"}
+export PYENV_ROOT="$pyenv_root"
+export PATH="\$PYENV_ROOT/bin:\$PATH"
+eval "\$(pyenv init --path)"
+${(%):-"%F{yellow}"}
+You'll need to restart your user session for the changes to take effect.${(%):-%b%f}
+For more information go to https://github.com/pyenv/pyenv/#installation.
+EOF
+}
+
 # This plugin loads pyenv into the current shell and provides prompt info via
 # the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available.
 
@@ -30,35 +49,33 @@ if [[ $FOUND_PYENV -ne 1 ]]; then
 
   # If we found pyenv, load it but show a caveat about non-interactive shells
   if [[ $FOUND_PYENV -eq 1 ]]; then
-    cat >&2 <<EOF
-Found pyenv, but it is badly configured. pyenv might not work for
-non-interactive shells (for example, when run from a script).
-${bold_color}
-To fix this message, add these lines to the '.profile' and '.zprofile' files
-in your home directory:
-
-export PYENV_ROOT="${dir/#$HOME/\$HOME}"
-export PATH="\$PYENV_ROOT/bin:\$PATH"
-eval "\$(pyenv init --path)"
-
-You'll need to restart your user session for the changes to take effect.${reset_color}
-For more info go to https://github.com/pyenv/pyenv/#installation.
-EOF
-
     # Configuring in .zshrc only makes pyenv available for interactive shells
     export PYENV_ROOT="$dir"
     export PATH="$PYENV_ROOT/bin:$PATH"
     eval "$(pyenv init --path)"
+
+    # Show warning due to bad pyenv configuration
+    pyenv_config_warning 'pyenv command not found in $PATH'
   fi
 fi
 
 if [[ $FOUND_PYENV -eq 1 ]]; then
+  # Setup $PYENV_ROOT if not already set
   if [[ -z "$PYENV_ROOT" ]]; then
     export PYENV_ROOT="$(pyenv root)"
+    pyenv_config_warning 'missing $PYENV_ROOT'
   fi
 
+  # Add pyenv shims to $PATH if not already added
+  if [[ -z "${path[(Re)$PYENV_ROOT/shims]}" ]]; then
+    eval "$(pyenv init --path)"
+    pyenv_config_warning 'missing pyenv shims in $PATH'
+  fi
+
+  # Load pyenv
   eval "$(pyenv init - --no-rehash zsh)"
 
+  # If pyenv-virtualenv exists, load it
   if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
@@ -74,3 +91,4 @@ else
 fi
 
 unset FOUND_PYENV pyenvdirs dir
+unfunction pyenv_config_warning

From 823be4ef5ff6753a9c5918218801709b98e5312f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 3 Sep 2021 12:53:33 +0200
Subject: [PATCH 104/591] feat(pyenv): silence bad config warning with
 `ZSH_PYENV_QUIET=true`

---
 plugins/pyenv/README.md        | 7 ++++++-
 plugins/pyenv/pyenv.plugin.zsh | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/pyenv/README.md b/plugins/pyenv/README.md
index d063b55b9..810c67998 100644
--- a/plugins/pyenv/README.md
+++ b/plugins/pyenv/README.md
@@ -1,4 +1,4 @@
-# pyenv 
+# pyenv
 
 This plugin looks for [pyenv](https://github.com/pyenv/pyenv), a Simple Python version
 management system, and loads it if it's found. It also loads pyenv-virtualenv, a pyenv
@@ -10,6 +10,11 @@ To use it, add `pyenv` to the plugins array in your zshrc file:
 plugins=(... pyenv)
 ```
 
+## Settings
+
+- `ZSH_PYENV_QUIET`: if set to `true`, the plugin will not print any messages if it
+  finds that `pyenv` is not properly configured.
+
 ## Functions
 
 - `pyenv_prompt_info`: displays the Python version in use by pyenv; or the global Python
diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index f55701900..679fc5e52 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -1,4 +1,6 @@
 pyenv_config_warning() {
+  [[ "$ZSH_PYENV_QUIET" != true ]] || return 0
+
   local reason="$1"
   local pyenv_root="${PYENV_ROOT/#$HOME/\$HOME}"
   cat >&2 <<EOF

From 1b03896a0e01ad263439449a0742d0f3339732e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 3 Sep 2021 12:56:00 +0200
Subject: [PATCH 105/591] feat(pyenv): don't load pyenv-virtualenv with
 `ZSH_PYENV_VIRTUALENV=false`

Closes #9443

Co-authored-by: Pandu POLUAN <pepoluan@gmail.com>
---
 plugins/pyenv/README.md        | 3 +++
 plugins/pyenv/pyenv.plugin.zsh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/pyenv/README.md b/plugins/pyenv/README.md
index 810c67998..b9ee937b7 100644
--- a/plugins/pyenv/README.md
+++ b/plugins/pyenv/README.md
@@ -15,6 +15,9 @@ plugins=(... pyenv)
 - `ZSH_PYENV_QUIET`: if set to `true`, the plugin will not print any messages if it
   finds that `pyenv` is not properly configured.
 
+- `ZSH_PYENV_VIRTUALENV`: if set to `false`, the plugin will not load pyenv-virtualenv
+  when it finds it.
+
 ## Functions
 
 - `pyenv_prompt_info`: displays the Python version in use by pyenv; or the global Python
diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 679fc5e52..922df8ead 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -78,7 +78,7 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
   eval "$(pyenv init - --no-rehash zsh)"
 
   # If pyenv-virtualenv exists, load it
-  if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" ]]; then
+  if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
 

From 19710a2d17d69dc0315465875c4becbf5e4ead38 Mon Sep 17 00:00:00 2001
From: Terry <tmoschou@gmail.com>
Date: Mon, 6 Sep 2021 18:02:19 +0930
Subject: [PATCH 106/591] fix(pyenv): do not warn if PYENV_ROOT is undefined
 (#10162)

Co-authored-by: Terry Moschou <terry.moschou@fivecast.com>
---
 plugins/pyenv/pyenv.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 922df8ead..d91b5daa7 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -62,14 +62,14 @@ if [[ $FOUND_PYENV -ne 1 ]]; then
 fi
 
 if [[ $FOUND_PYENV -eq 1 ]]; then
-  # Setup $PYENV_ROOT if not already set
   if [[ -z "$PYENV_ROOT" ]]; then
+    # This is only for backwards compatibility with users that previously relied
+    # on this plugin exporting it. pyenv itself does not require it to be exported
     export PYENV_ROOT="$(pyenv root)"
-    pyenv_config_warning 'missing $PYENV_ROOT'
   fi
 
   # Add pyenv shims to $PATH if not already added
-  if [[ -z "${path[(Re)$PYENV_ROOT/shims]}" ]]; then
+  if [[ -z "${path[(Re)$(pyenv root)/shims]}" ]]; then
     eval "$(pyenv init --path)"
     pyenv_config_warning 'missing pyenv shims in $PATH'
   fi
@@ -78,7 +78,7 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
   eval "$(pyenv init - --no-rehash zsh)"
 
   # If pyenv-virtualenv exists, load it
-  if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
+  if [[ -d "$(pyenv root)/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
 

From a5850d441b2168bbcc17ddcbe03c9b9cdb2720e0 Mon Sep 17 00:00:00 2001
From: Neil Girdhar <mistersheik@gmail.com>
Date: Mon, 6 Sep 2021 05:21:44 -0400
Subject: [PATCH 107/591] feat(git): change from commiter to author in `git
 log` aliases (#9670)

---
 plugins/git/README.md      | 6 +++---
 plugins/git/git.plugin.zsh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 48cf87204..13571c821 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -98,11 +98,11 @@ plugins=(... git)
 | glgga                | git log --graph --decorate --all                                                                                                 |
 | glgm                 | git log --graph --max-count=10                                                                                                   |
 | glo                  | git log --oneline --decorate                                                                                                     |
-| glol                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'                           |
-| glols                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat                    |
+| glol                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'                           |
+| glols                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat                    |
 | glod                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'                           |
 | glods                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short              |
-| glola                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all                     |
+| glola                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all                     |
 | glog                 | git log --oneline --decorate --graph                                                                                             |
 | gloga                | git log --oneline --decorate --graph --all                                                                                       |
 | glp                  | git log --pretty=\<format\>                                                                                                      |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2985ba024..03769ed0f 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -210,11 +210,11 @@ alias glgg='git log --graph'
 alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate'
-alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
-alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat"
+alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'"
+alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat"
 alias glod="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
 alias glods="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
-alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
+alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all"
 alias glog='git log --oneline --decorate --graph'
 alias gloga='git log --oneline --decorate --graph --all'
 alias glp="_git_log_prettily"

From a15ac80bba400cffd6a2e2e32be9c39cd7d13411 Mon Sep 17 00:00:00 2001
From: Gijs Key <gmkey@users.noreply.github.com>
Date: Mon, 6 Sep 2021 11:28:32 +0200
Subject: [PATCH 108/591] feat(gcloud): add Mac M1 Homebrew path (#10143)

Homebrew on Mac M1 is moved to the /opt/Homebrew location. This change updates the search
locations with this path.
---
 plugins/gcloud/gcloud.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/gcloud/gcloud.plugin.zsh b/plugins/gcloud/gcloud.plugin.zsh
index c7aebe697..7368eb3a6 100644
--- a/plugins/gcloud/gcloud.plugin.zsh
+++ b/plugins/gcloud/gcloud.plugin.zsh
@@ -7,6 +7,7 @@ if [[ -z "${CLOUDSDK_HOME}" ]]; then
   search_locations=(
     "$HOME/google-cloud-sdk"
     "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk"
+    "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk"
     "/usr/share/google-cloud-sdk"
     "/snap/google-cloud-sdk/current"
     "/usr/lib64/google-cloud-sdk/"

From 4d5bfe4c69360353cf7ed9d99b672cb840e9bbcf Mon Sep 17 00:00:00 2001
From: Julian Horsch <julian.horsch@gmail.com>
Date: Mon, 6 Sep 2021 11:30:28 +0200
Subject: [PATCH 109/591] feat(autojump): add new Homebrew default path on M1
 Macs (#9637)

On M1-Macs homebrew uses /opt/homebrew as default location for ARM
packages. This results in the autojump plugin not being able to find
autojump after a clean default installation.
This commit adds the new default location to the autojump plugin.
---
 plugins/autojump/autojump.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index f40b0e931..3117c6da4 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -10,6 +10,7 @@ autojump_paths=(
   /usr/local/share/autojump/autojump.zsh             # FreeBSD installation
   /opt/local/etc/profile.d/autojump.sh               # macOS with MacPorts
   /usr/local/etc/profile.d/autojump.sh               # macOS with Homebrew (default)
+  /opt/homebrew/etc/profile.d/autojump.sh            # macOS with Homebrew (default on M1 macs)
 )
 
 for file in $autojump_paths; do

From 97b4ab76b8c3743187495599a1ca87c520665299 Mon Sep 17 00:00:00 2001
From: "Michael J. Cohen" <mjc@kernel.org>
Date: Mon, 6 Sep 2021 05:31:56 -0400
Subject: [PATCH 110/591] fix(chruby): fix typo in test for Homebrew path
 (#9887)

---
 plugins/chruby/chruby.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index f7fedb5f2..32f0525aa 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -37,7 +37,7 @@ _homebrew-installed() {
 }
 
 _chruby-from-homebrew-installed() {
-  [ -r _brew_prefix ] &> /dev/null
+  [ -r $_brew_prefix ] &> /dev/null
 }
 
 _ruby-build_installed() {

From 7336ebcd8f095b0ead7e1e39bdc2fff57275acfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 6 Sep 2021 13:30:16 +0200
Subject: [PATCH 111/591] feat(changelog): change style of `BREAKING CHANGES`
 header

---
 tools/changelog.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 6913ae49a..b4b8d0c9e 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -285,8 +285,9 @@ function display-release {
     (( $#breaking != 0 )) || return 0
 
     case "$output" in
+    text) fmt:header "\e[31mBREAKING CHANGES" 3 ;;
     raw) fmt:header "BREAKING CHANGES" 3 ;;
-    text|md) fmt:header "⚠ BREAKING CHANGES" 3 ;;
+    md) fmt:header "BREAKING CHANGES ⚠" 3 ;;
     esac
 
     local hash subject

From 5a4159cd29ab9dfa31e7747dd676f3cf0e19bf81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 6 Sep 2021 13:25:35 +0200
Subject: [PATCH 112/591] fix(git)!: rename `git mergetool` aliases to `gmtl*`
 (#9154)

BREAKING CHANGE: the `gmt` alias conflicts with the Generic Mapping Tools command.
For that, the `gmt` alias has been renamed to `gmtl`, and `gmtvim` has been renamed to
`gmtlvim` for consistency.

Fixes #9154
---
 plugins/git/README.md      | 4 ++--
 plugins/git/git.plugin.zsh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 13571c821..64c507345 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -108,8 +108,8 @@ plugins=(... git)
 | glp                  | git log --pretty=\<format\>                                                                                                      |
 | gm                   | git merge                                                                                                                        |
 | gmom                 | git merge origin/$(git_main_branch)                                                                                              |
-| gmt                  | git mergetool --no-prompt                                                                                                        |
-| gmtvim               | git mergetool --no-prompt --tool=vimdiff                                                                                         |
+| gmtl                 | git mergetool --no-prompt                                                                                                        |
+| gmtlvim              | git mergetool --no-prompt --tool=vimdiff                                                                                         |
 | gmum                 | git merge upstream/$(git_main_branch)                                                                                            |
 | gma                  | git merge --abort                                                                                                                |
 | gp                   | git push                                                                                                                         |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 03769ed0f..d030d2801 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -221,8 +221,8 @@ alias glp="_git_log_prettily"
 
 alias gm='git merge'
 alias gmom='git merge origin/$(git_main_branch)'
-alias gmt='git mergetool --no-prompt'
-alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
+alias gmtl='git mergetool --no-prompt'
+alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
 alias gmum='git merge upstream/$(git_main_branch)'
 alias gma='git merge --abort'
 

From ab8b9913cb6cba35da3126887d4c0b67f033fffa Mon Sep 17 00:00:00 2001
From: Xuehai Pan <XuehaiPan@outlook.com>
Date: Mon, 6 Sep 2021 23:46:56 +0800
Subject: [PATCH 113/591] fix(git-auto-fetch): cancel fetch if we don't have
 permission over git folder (#10010)

---
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 0da84f2f5..dbc949621 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -11,8 +11,9 @@ function git-fetch-all {
       return 0
     fi
 
-    # Do nothing if auto-fetch disabled
-    if [[ -z "$gitdir" || -f "$gitdir/NO_AUTO_FETCH" ]]; then
+    # Do nothing if auto-fetch is disabled or don't have permissions
+    if [[ ! -w "$gitdir" || -f "$gitdir/NO_AUTO_FETCH" ]] ||
+       [[ -f "$gitdir/FETCH_LOG" && ! -w "$gitdir/FETCH_LOG" ]]; then
       return 0
     fi
 

From af271c9e387f9b536205a7f459802369cb26a7e0 Mon Sep 17 00:00:00 2001
From: Moshe Avni <moshe@avni.us>
Date: Mon, 6 Sep 2021 18:56:39 +0300
Subject: [PATCH 114/591] feat(git-auto-fetch): add date to git-auto-fetch log
 file (#10021)

---
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index dbc949621..efe8cbe66 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -25,8 +25,9 @@ function git-fetch-all {
     fi
 
     # Fetch all remotes (avoid ssh passphrase prompt)
+    date -R &>! "$gitdir/FETCH_LOG"
     GIT_SSH_COMMAND="command ssh -o BatchMode=yes" \
-      command git fetch --all 2>/dev/null &>! "$gitdir/FETCH_LOG"
+      command git fetch --all 2>/dev/null &>> "$gitdir/FETCH_LOG"
   ) &|
 }
 

From f341c8c20646bd82d5d84fae32f68b760e0f1be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 7 Sep 2021 17:08:46 +0200
Subject: [PATCH 115/591] feat(changelog): print BREAKING CHANGE messages in a
 prettier way

---
 tools/changelog.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index b4b8d0c9e..966e91c25 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -181,6 +181,12 @@ function display-release {
     return
   fi
 
+  # Get length of longest scope for padding
+  local max_scope=0
+  for hash in ${(k)scopes}; do
+    max_scope=$(( max_scope < ${#scopes[$hash]} ? ${#scopes[$hash]} : max_scope ))
+  done
+
   ##* Formatting functions
 
   # Format the hash according to output format
@@ -220,18 +226,13 @@ function display-release {
     #* Uses $scopes (A) and $hash from outer scope
     local scope="${1:-${scopes[$hash]}}"
 
-    # Get length of longest scope for padding
-    local max_scope=0 padding=0
-    for hash in ${(k)scopes}; do
-      max_scope=$(( max_scope < ${#scopes[$hash]} ? ${#scopes[$hash]} : max_scope ))
-    done
-
     # If no scopes, exit the function
     if [[ $max_scope -eq 0 ]]; then
       return
     fi
 
     # Get how much padding is required for this scope
+    local padding=0
     padding=$(( max_scope < ${#scope} ? 0 : max_scope - ${#scope} ))
     padding="${(r:$padding:: :):-}"
 
@@ -290,11 +291,15 @@ function display-release {
     md) fmt:header "BREAKING CHANGES ⚠" 3 ;;
     esac
 
-    local hash subject
+    local hash message
+    local wrap_width=$(( (COLUMNS < 100 ? COLUMNS : 100) - 3 ))
     for hash message in ${(kv)breaking}; do
-      echo " - $(fmt:hash) $(fmt:scope)$(fmt:subject "${message}")"
-    done | sort
-    echo
+      # Format the BREAKING CHANGE message by word-wrapping it at maximum 100 characters
+      # (use $COLUMNS if smaller than 100), and adding a 3-space left padding.
+      message="$(fmt -w $wrap_width <<< "$message" | sed 's/^/   /')"
+      # Display hash and scope first, and then the full message with newline separators
+      echo " - $(fmt:hash) $(fmt:scope)\n\n$(fmt:subject "$message")\n"
+    done
   }
 
   function display:type {

From 37a60eebc107c08047d4b5716c1c1760104aa25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 7 Sep 2021 17:13:46 +0200
Subject: [PATCH 116/591] chore(changelog): fix first-letter uppercase in
 breaking change messages

---
 tools/changelog.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 966e91c25..7329a9526 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -294,11 +294,12 @@ function display-release {
     local hash message
     local wrap_width=$(( (COLUMNS < 100 ? COLUMNS : 100) - 3 ))
     for hash message in ${(kv)breaking}; do
-      # Format the BREAKING CHANGE message by word-wrapping it at maximum 100 characters
-      # (use $COLUMNS if smaller than 100), and adding a 3-space left padding.
-      message="$(fmt -w $wrap_width <<< "$message" | sed 's/^/   /')"
-      # Display hash and scope first, and then the full message with newline separators
-      echo " - $(fmt:hash) $(fmt:scope)\n\n$(fmt:subject "$message")\n"
+      # Format the BREAKING CHANGE message by word-wrapping it at maximum 100
+      # characters (use $COLUMNS if smaller than 100)
+      message="$(fmt -w $wrap_width <<< "$message")"
+      # Display hash and scope in their own line, and then the full message with
+      # blank lines as separators and a 3-space left padding
+      echo " - $(fmt:hash) $(fmt:scope)\n\n$(fmt:subject "$message" | sed 's/^/   /')\n"
     done
   }
 

From 450acc0113b114352ce3b94870fe63fc461844bd Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 7 Sep 2021 20:02:20 +0200
Subject: [PATCH 117/591] fix: automatically create completion for `cargo` and
 `rustup` plugins (#10087)

---
 plugins/cargo/.gitignore         |    1 +
 plugins/cargo/_cargo             |  407 -----------
 plugins/cargo/cargo.plugin.zsh   |   11 +
 plugins/rustup/.gitignore        |    1 +
 plugins/rustup/_rustup           | 1143 ------------------------------
 plugins/rustup/rustup.plugin.zsh |   12 +
 6 files changed, 25 insertions(+), 1550 deletions(-)
 create mode 100644 plugins/cargo/.gitignore
 delete mode 100644 plugins/cargo/_cargo
 create mode 100644 plugins/cargo/cargo.plugin.zsh
 create mode 100644 plugins/rustup/.gitignore
 delete mode 100644 plugins/rustup/_rustup
 create mode 100644 plugins/rustup/rustup.plugin.zsh

diff --git a/plugins/cargo/.gitignore b/plugins/cargo/.gitignore
new file mode 100644
index 000000000..42d7ecdd6
--- /dev/null
+++ b/plugins/cargo/.gitignore
@@ -0,0 +1 @@
+_cargo
diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
deleted file mode 100644
index ebff99310..000000000
--- a/plugins/cargo/_cargo
+++ /dev/null
@@ -1,407 +0,0 @@
-#compdef cargo
-
-autoload -U regexp-replace
-
-_cargo() {
-    local curcontext="$curcontext" ret=1
-    local -a command_scope_spec common parallel features msgfmt triple target registry
-    local -a state line state_descr # These are set by _arguments
-    typeset -A opt_args
-
-    common=(
-        '(-q --quiet)*'{-v,--verbose}'[use verbose output]'
-        '(-q --quiet -v --verbose)'{-q,--quiet}'[no output printed to stdout]'
-        '-Z+[pass unstable (nightly-only) flags to cargo]: :_cargo_unstable_flags'
-        '--frozen[require that Cargo.lock and cache are up to date]'
-        '--locked[require that Cargo.lock is up to date]'
-        '--color=[specify colorization option]:coloring:(auto always never)'
-        '(- 1 *)'{-h,--help}'[show help message]'
-    )
-
-    # leading items in parentheses are an exclusion list for the arguments following that arg
-    # See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Functions
-    #   - => exclude all other options
-    #   1 => exclude positional arg 1
-    #   * => exclude all other args
-    #   +blah => exclude +blah
-    _arguments -s -S -C $common \
-        '(- 1 *)--list[list installed commands]' \
-        '(- 1 *)--explain=[provide a detailed explanation of an error message]:error code' \
-        '(- 1 *)'{-V,--version}'[show version information]' \
-        '(+beta +nightly)+stable[use the stable toolchain]' \
-        '(+stable +nightly)+beta[use the beta toolchain]' \
-        '(+stable +beta)+nightly[use the nightly toolchain]' \
-        '1: :_cargo_cmds' \
-        '*:: :->args'
-
-    # These flags are mutually exclusive specifiers for the scope of a command; as
-    # they are used in multiple places without change, they are expanded into the
-    # appropriate command's `_arguments` where appropriate.
-    command_scope_spec=(
-        '(--bin --example --test --lib)--bench=[specify benchmark name]: :_cargo_benchmark_names'
-        '(--bench --bin --test --lib)--example=[specify example name]:example name'
-        '(--bench --example --test --lib)--bin=[specify binary name]:binary name'
-        '(--bench --bin --example --test)--lib=[specify library name]:library name'
-        '(--bench --bin --example --lib)--test=[specify test name]:test name'
-    )
-
-    parallel=(
-        '(-j --jobs)'{-j+,--jobs=}'[specify number of parallel jobs]:jobs [# of CPUs]'
-    )
-
-    features=(
-        '(--all-features)--features=[specify features to activate]:feature'
-        '(--features)--all-features[activate all available features]'
-        "--no-default-features[don't build the default features]"
-    )
-
-    msgfmt='--message-format=[specify error format]:error format [human]:(human json short)'
-    triple='--target=[specify target triple]:target triple'
-    target='--target-dir=[specify directory for all generated artifacts]:directory:_directories'
-    manifest='--manifest-path=[specify path to manifest]:path:_directories'
-    registry='--registry=[specify registry to use]:registry'
-
-    case $state in
-        args)
-            curcontext="${curcontext%:*}-${words[1]}:"
-            case ${words[1]} in
-                bench)
-                    _arguments -s -A "^--" $common $parallel $features $msgfmt $triple $target $manifest \
-                        "${command_scope_spec[@]}" \
-                        '--all-targets[benchmark all targets]' \
-                        "--no-run[compile but don't run]" \
-                        '(-p --package)'{-p+,--package=}'[specify package to run benchmarks for]:package:_cargo_package_names' \
-                        '--exclude=[exclude packages from the benchmark]:spec' \
-                        '--no-fail-fast[run all benchmarks regardless of failure]' \
-                        '1: :_guard "^-*" "bench name"' \
-                        '*:args:_default'
-                        ;;
-
-                build|b)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
-                        "${command_scope_spec[@]}" \
-                        '(-p --package)'{-p+,--package=}'[specify package to build]:package:_cargo_package_names' \
-                        '--release[build in release mode]' \
-                        '--build-plan[output the build plan in JSON]' \
-                        ;;
-
-                check|c)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
-                        "${command_scope_spec[@]}" \
-                        '(-p --package)'{-p+,--package=}'[specify package to check]:package:_cargo_package_names' \
-                        '--release[check in release mode]' \
-                        ;;
-
-                clean)
-                    _arguments -s -S $common $triple $target $manifest \
-                        '(-p --package)'{-p+,--package=}'[specify package to clean]:package:_cargo_package_names' \
-                        '--release[clean release artifacts]' \
-                        '--doc[clean just the documentation directory]'
-                        ;;
-
-                doc)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--no-deps[do not build docs for dependencies]' \
-                        '--document-private-items[include non-public items in the documentation]' \
-                        '--open[open docs in browser after the build]' \
-                        '(-p --package)'{-p+,--package=}'[specify package to document]:package:_cargo_package_names' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        ;;
-
-                fetch)
-                    _arguments -s -S $common $triple $manifest
-                        ;;
-
-                fix)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        "${command_scope_spec[@]}" \
-                        '--broken-code[fix code even if it already has compiler errors]' \
-                        '--edition[fix in preparation for the next edition]' \
-                        '--edition-idioms[fix warnings to migrate to the idioms of an edition]' \
-                        '--allow-no-vcs[fix code even if a VCS was not detected]' \
-                        '--allow-dirty[fix code even if the working directory is dirty]' \
-                        '--allow-staged[fix code even if the working directory has staged changes]'
-                ;;
-
-                generate-lockfile)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                git-checkout)
-                    _arguments -s -S $common \
-                        '--reference=:reference' \
-                        '--url=:url:_urls'
-                        ;;
-
-                help)
-                    _cargo_cmds
-                        ;;
-
-                init)
-                    _arguments -s -S $common $registry \
-                        '--lib[use library template]' \
-                        '--edition=[specify edition to set for the crate generated]:edition:(2015 2018)' \
-                        '--vcs=[initialize a new repo with a given VCS]:vcs:(git hg pijul fossil none)' \
-                        '--name=[set the resulting package name]:name' \
-                        '1:path:_directories'
-                        ;;
-
-                install)
-                    _arguments -s -S $common $parallel $features $triple $registry \
-                        '(-f --force)'{-f,--force}'[force overwriting of existing crates or binaries]' \
-                        '--bin=[only install the specified binary]:binary' \
-                        '--branch=[branch to use when installing from git]:branch' \
-                        '--debug[build in debug mode instead of release mode]' \
-                        '--example=[install the specified example instead of binaries]:example' \
-                        '--git=[specify URL from which to install the crate]:url:_urls' \
-                        '--path=[local filesystem path to crate to install]: :_directories' \
-                        '--rev=[specific commit to use when installing from git]:commit' \
-                        '--root=[directory to install packages into]: :_directories' \
-                        '--tag=[tag to use when installing from git]:tag' \
-                        '--vers=[version to install from crates.io]:version' \
-                        '--list[list all installed packages and their versions]' \
-                        '*: :_guard "^-*" "crate"'
-                        ;;
-
-                locate-project)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                login)
-                    _arguments -s -S $common $registry \
-                        '*: :_guard "^-*" "token"'
-                        ;;
-
-                metadata)
-                    _arguments -s -S $common $features $manifest \
-                        "--no-deps[output information only about the root package and don't fetch dependencies]" \
-                        '--format-version=[specify format version]:version [1]:(1)'
-                        ;;
-
-                new)
-                    _arguments -s -S $common $registry \
-                        '--lib[use library template]' \
-                        '--vcs:initialize a new repo with a given VCS:(git hg none)' \
-                        '--name=[set the resulting package name]'
-                        ;;
-
-                owner)
-                    _arguments -s -S $common $registry \
-                        '(-a --add)'{-a,--add}'[specify name of a user or team to invite as an owner]:name' \
-                        '--index=[specify registry index]:index' \
-                        '(-l --list)'{-l,--list}'[list owners of a crate]' \
-                        '(-r --remove)'{-r,--remove}'[specify name of a user or team to remove as an owner]:name' \
-                        '--token=[specify API token to use when authenticating]:token' \
-                        '*: :_guard "^-*" "crate"'
-                        ;;
-
-                package)
-                    _arguments -s -S $common $parallel $features $triple $target $manifest \
-                        '(-l --list)'{-l,--list}'[print files included in a package without making one]' \
-                        '--no-metadata[ignore warnings about a lack of human-usable metadata]' \
-                        '--allow-dirty[allow dirty working directories to be packaged]' \
-                        "--no-verify[don't build to verify contents]"
-                        ;;
-
-                pkgid)
-                    _arguments -s -S $common $manifest \
-                        '(-p --package)'{-p+,--package=}'[specify package to get ID specifier for]:package:_cargo_package_names' \
-                        '*: :_guard "^-*" "spec"'
-                        ;;
-
-                publish)
-                    _arguments -s -S $common $parallel $features $triple $target $manifest $registry \
-                        '--index=[specify registry index]:index' \
-                        '--allow-dirty[allow dirty working directories to be packaged]' \
-                        "--no-verify[don't verify the contents by building them]" \
-                        '--token=[specify token to use when uploading]:token' \
-                        '--dry-run[perform all checks without uploading]'
-                        ;;
-
-                read-manifest)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                run|r)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--example=[name of the bin target]:name' \
-                        '--bin=[name of the bin target]:name' \
-                        '(-p --package)'{-p+,--package=}'[specify package with the target to run]:package:_cargo_package_names' \
-                        '--release[build in release mode]' \
-                        '*: :_default'
-                        ;;
-
-                rustc)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '(-p --package)'{-p+,--package=}'[specify package to build]:package:_cargo_package_names' \
-                        '--profile=[specify profile to build the selected target for]:profile' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        "${command_scope_spec[@]}" \
-                        '*: : _dispatch rustc rustc -default-'
-                        ;;
-
-                rustdoc)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--document-private-items[include non-public items in the documentation]' \
-                        '--open[open the docs in a browser after the operation]' \
-                        '(-p --package)'{-p+,--package=}'[specify package to document]:package:_cargo_package_names' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        "${command_scope_spec[@]}" \
-                        '*: : _dispatch rustdoc rustdoc -default-'
-                        ;;
-
-                search)
-                    _arguments -s -S $common $registry \
-                        '--index=[specify registry index]:index' \
-                        '--limit=[limit the number of results]:results [10]' \
-                        '*: :_guard "^-*" "query"'
-                        ;;
-
-                test|t)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--test=[test name]: :_cargo_test_names' \
-                        '--no-fail-fast[run all tests regardless of failure]' \
-                        '--no-run[compile but do not run]' \
-                        '(-p --package)'{-p+,--package=}'[package to run tests for]:package:_cargo_package_names' \
-                        '--all[test all packages in the workspace]' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        '1: :_cargo_test_names' \
-                        '(--doc --bin --example --test --bench)--lib[only test library]' \
-                        '(--lib --bin --example --test --bench)--doc[only test documentation]' \
-                        '(--lib --doc --example --test --bench)--bin=[binary name]' \
-                        '(--lib --doc --bin --test --bench)--example=[example name]' \
-                        '(--lib --doc --bin --example --bench)--test=[test name]' \
-                        '(--lib --doc --bin --example --test)--bench=[benchmark name]' \
-                        '*: :_default'
-                        ;;
-
-                uninstall)
-                    _arguments -s -S $common \
-                        '(-p --package)'{-p+,--package=}'[specify package to uninstall]:package:_cargo_package_names' \
-                        '--bin=[only uninstall the specified binary]:name' \
-                        '--root=[directory to uninstall packages from]: :_files -/' \
-                        '*:crate:_cargo_installed_crates -F line'
-                        ;;
-
-                update)
-                    _arguments -s -S $common $manifest \
-                        '--aggressive=[force dependency update]' \
-                        "--dry-run[don't actually write the lockfile]" \
-                        '(-p --package)'{-p+,--package=}'[specify package to update]:package:_cargo_package_names' \
-                        '--precise=[update single dependency to precise release]:release'
-                        ;;
-
-                verify-project)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                version)
-                    _arguments -s -S $common
-                        ;;
-
-                yank)
-                    _arguments -s -S $common $registry \
-                        '--vers=[specify yank version]:version' \
-                        '--undo[undo a yank, putting a version back into the index]' \
-                        '--index=[specify registry index to yank from]:registry index' \
-                        '--token=[specify API token to use when authenticating]:token' \
-                        '*: :_guard "^-*" "crate"'
-                        ;;
-                *)
-                    # allow plugins to define their own functions
-                    if ! _call_function ret _cargo-${words[1]}; then
-                        # fallback on default completion for unknown commands
-                        _default && ret=0
-                    fi
-                    (( ! ret ))
-                ;;
-            esac
-            ;;
-    esac
-}
-
-_cargo_unstable_flags() {
-    local flags
-    flags=( help ${${${(M)${(f)"$(_call_program flags cargo -Z help)"}:#*--*}/ #-- #/:}##*-Z } )
-    _describe -t flags 'unstable flag' flags
-}
-
-_cargo_installed_crates() {
-    local expl
-    _description crates expl 'crate'
-    compadd "$@" "$expl[@]" - ${${${(f)"$(cargo install --list)"}:# *}%% *}
-}
-
-_cargo_cmds() {
-    local -a commands
-    # This uses Parameter Expansion Flags, which are a built-in Zsh feature.
-    # See more: http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
-    # and       http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion
-    #
-    # # How this work?
-    #
-    # First it splits the result of `cargo --list` at newline, then it removes the first line.
-    # Then it removes indentation (4 whitespaces) before each items. (Note the x## pattern [1]).
-    # Then it replaces those spaces between item and description with a `:`
-    #
-    # [1]: https://github.com/zsh-users/zsh-completions/blob/master/zsh-completions-howto.org#patterns
-    commands=( ${${${(M)"${(f)$(_call_program commands cargo --list)}":#    *}/ ##/}/ ##/:} )
-    _describe -t commands 'command' commands
-}
-
-
-#FIXME: Disabled until fixed
-#gets package names from the manifest file
-_cargo_package_names() {
-    _message -e packages package
-}
-
-# Extracts the values of "name" from the array given in $1 and shows them as
-# command line options for completion
-_cargo_names_from_array() {
-    # strip json from the path
-    local manifest=${${${"$(cargo locate-project)"}%\"\}}##*\"}
-    if [[ -z $manifest ]]; then
-        return 0
-    fi
-
-    local last_line
-    local -a names;
-    local in_block=false
-    local block_name=$1
-    names=()
-    while read -r line; do
-        if [[ $last_line == "[[$block_name]]" ]]; then
-            in_block=true
-        else
-            if [[ $last_line =~ '\s*\[\[.*' ]]; then
-                in_block=false
-            fi
-        fi
-
-        if [[ $in_block == true ]]; then
-            if [[ $line =~ '\s*name\s*=' ]]; then
-                regexp-replace line '^\s*name\s*=\s*|"' ''
-                names+=( "$line" )
-            fi
-        fi
-
-        last_line=$line
-    done < "$manifest"
-    _describe "$block_name" names
-
-}
-
-#Gets the test names from the manifest file
-_cargo_test_names() {
-    _cargo_names_from_array "test"
-}
-
-#Gets the bench names from the manifest file
-_cargo_benchmark_names() {
-    _cargo_names_from_array "bench"
-}
-
-_cargo
diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
new file mode 100644
index 000000000..92eae5359
--- /dev/null
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -0,0 +1,11 @@
+# COMPLETION FUNCTION
+if (( $+commands[rustup] && $+commands[cargo] )); then
+  if [[ ! -f $ZSH_CACHE_DIR/cargo_version ]] \
+    || [[ "$(cargo --version)" != "$(< "$ZSH_CACHE_DIR/cargo_version")" ]] \
+    || [[ ! -f $ZSH/plugins/cargo/_cargo ]]; then
+    rustup completions zsh cargo > $ZSH/plugins/cargo/_cargo
+    cargo --version > $ZSH_CACHE_DIR/cargo_version
+  fi
+  autoload -Uz _cargo
+  _comps[cargo]=_cargo
+fi
diff --git a/plugins/rustup/.gitignore b/plugins/rustup/.gitignore
new file mode 100644
index 000000000..ad38ae3bf
--- /dev/null
+++ b/plugins/rustup/.gitignore
@@ -0,0 +1 @@
+_rustup
diff --git a/plugins/rustup/_rustup b/plugins/rustup/_rustup
deleted file mode 100644
index dab33533a..000000000
--- a/plugins/rustup/_rustup
+++ /dev/null
@@ -1,1143 +0,0 @@
-#compdef rustup
-
-autoload -U is-at-least
-
-_rustup() {
-    typeset -A opt_args
-    typeset -a _arguments_options
-    local ret=1
-
-    if is-at-least 5.2; then
-        _arguments_options=(-s -S -C)
-    else
-        _arguments_options=(-s -C)
-    fi
-
-    local context curcontext="$curcontext" state line
-    _arguments "${_arguments_options[@]}" \
-'-v[Enable verbose output]' \
-'--verbose[Enable verbose output]' \
-'(-v --verbose)-q[Disable progress output]' \
-'(-v --verbose)--quiet[Disable progress output]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::+toolchain -- release channel (e.g. +stable) or custom toolchain to set override:_files' \
-":: :_rustup_commands" \
-"*::: :->rustup" \
-&& ret=0
-    case $state in
-    (rustup)
-        words=($line[2] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-command-$line[2]:"
-        case $line[2] in
-            (dump-testament)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(show)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__show_commands" \
-"*::: :->show" \
-&& ret=0
-case $state in
-    (show)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-show-command-$line[1]:"
-        case $line[1] in
-            (active-toolchain)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(home)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(profile)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(keys)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(install)
-_arguments "${_arguments_options[@]}" \
-'--profile=[]: :(minimal default complete)' \
-'--no-self-update[Don'\''t perform self-update when running the `rustup install` command]' \
-'--force[Force an update, even if some components are missing]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(uninstall)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(update)
-_arguments "${_arguments_options[@]}" \
-'--no-self-update[Don'\''t perform self update when running the `rustup update` command]' \
-'--force[Force an update, even if some components are missing]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(check)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(default)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(toolchain)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__toolchain_commands" \
-"*::: :->toolchain" \
-&& ret=0
-case $state in
-    (toolchain)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-toolchain-command-$line[1]:"
-        case $line[1] in
-            (list)
-_arguments "${_arguments_options[@]}" \
-'-v[Enable verbose output with toolchain information]' \
-'--verbose[Enable verbose output with toolchain information]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(update)
-_arguments "${_arguments_options[@]}" \
-'--profile=[]: :(minimal default complete)' \
-'*-c+[Add specific components on installation]' \
-'*--component=[Add specific components on installation]' \
-'*-t+[Add specific targets on installation]' \
-'*--target=[Add specific targets on installation]' \
-'--no-self-update[Don'\''t perform self update when running the`rustup toolchain install` command]' \
-'--force[Force an update, even if some components are missing]' \
-'--allow-downgrade[Allow rustup to downgrade the toolchain to satisfy your component choice]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(add)
-_arguments "${_arguments_options[@]}" \
-'--profile=[]: :(minimal default complete)' \
-'*-c+[Add specific components on installation]' \
-'*--component=[Add specific components on installation]' \
-'*-t+[Add specific targets on installation]' \
-'*--target=[Add specific targets on installation]' \
-'--no-self-update[Don'\''t perform self update when running the`rustup toolchain install` command]' \
-'--force[Force an update, even if some components are missing]' \
-'--allow-downgrade[Allow rustup to downgrade the toolchain to satisfy your component choice]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(install)
-_arguments "${_arguments_options[@]}" \
-'--profile=[]: :(minimal default complete)' \
-'*-c+[Add specific components on installation]' \
-'*--component=[Add specific components on installation]' \
-'*-t+[Add specific targets on installation]' \
-'*--target=[Add specific targets on installation]' \
-'--no-self-update[Don'\''t perform self update when running the`rustup toolchain install` command]' \
-'--force[Force an update, even if some components are missing]' \
-'--allow-downgrade[Allow rustup to downgrade the toolchain to satisfy your component choice]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(remove)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(uninstall)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(link)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-':path:_files' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(target)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__target_commands" \
-"*::: :->target" \
-&& ret=0
-case $state in
-    (target)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-target-command-$line[1]:"
-        case $line[1] in
-            (list)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--installed[List only installed targets]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(install)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':target -- List of targets to install; "all" installs all available targets:_files' \
-&& ret=0
-;;
-(add)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':target -- List of targets to install; "all" installs all available targets:_files' \
-&& ret=0
-;;
-(uninstall)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':target:_files' \
-&& ret=0
-;;
-(remove)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':target:_files' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(component)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__component_commands" \
-"*::: :->component" \
-&& ret=0
-case $state in
-    (component)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-component-command-$line[1]:"
-        case $line[1] in
-            (list)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--installed[List only installed components]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(add)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--target=[]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':component:_files' \
-&& ret=0
-;;
-(remove)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--target=[]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':component:_files' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(override)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__override_commands" \
-"*::: :->override" \
-&& ret=0
-case $state in
-    (override)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-override-command-$line[1]:"
-        case $line[1] in
-            (list)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(add)
-_arguments "${_arguments_options[@]}" \
-'--path=[Path to the directory]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(set)
-_arguments "${_arguments_options[@]}" \
-'--path=[Path to the directory]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(remove)
-_arguments "${_arguments_options[@]}" \
-'--path=[Path to the directory]' \
-'--nonexistent[Remove override toolchain for all nonexistent directories]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(unset)
-_arguments "${_arguments_options[@]}" \
-'--path=[Path to the directory]' \
-'--nonexistent[Remove override toolchain for all nonexistent directories]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(run)
-_arguments "${_arguments_options[@]}" \
-'--install[Install the requested toolchain if needed]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-':command:_files' \
-&& ret=0
-;;
-(which)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':command:_files' \
-&& ret=0
-;;
-(docs)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--path[Only print the path to the documentation]' \
-'--alloc[The Rust core allocation and collections library]' \
-'--book[The Rust Programming Language book]' \
-'--cargo[The Cargo Book]' \
-'--core[The Rust Core Library]' \
-'--edition-guide[The Rust Edition Guide]' \
-'--nomicon[The Dark Arts of Advanced and Unsafe Rust Programming]' \
-'--proc_macro[A support library for macro authors when defining new macros]' \
-'--reference[The Rust Reference]' \
-'--rust-by-example[A collection of runnable examples that illustrate various Rust concepts and standard libraries]' \
-'--rustc[The compiler for the Rust programming language]' \
-'--rustdoc[Generate documentation for Rust projects]' \
-'--std[Standard library API documentation]' \
-'--test[Support code for rustc'\''s built in unit-test and micro-benchmarking framework]' \
-'--unstable-book[The Unstable Book]' \
-'--embedded-book[The Embedded Rust Book]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::topic -- Topic such as 'core', 'fn', 'usize', 'eprintln!', 'core::arch', 'alloc::format!', 'std::fs', 'std::fs::read_dir', 'std::io::Bytes', 'std::iter::Sum', 'std::io::error::Result' etc...:_files' \
-&& ret=0
-;;
-(doc)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--path[Only print the path to the documentation]' \
-'--alloc[The Rust core allocation and collections library]' \
-'--book[The Rust Programming Language book]' \
-'--cargo[The Cargo Book]' \
-'--core[The Rust Core Library]' \
-'--edition-guide[The Rust Edition Guide]' \
-'--nomicon[The Dark Arts of Advanced and Unsafe Rust Programming]' \
-'--proc_macro[A support library for macro authors when defining new macros]' \
-'--reference[The Rust Reference]' \
-'--rust-by-example[A collection of runnable examples that illustrate various Rust concepts and standard libraries]' \
-'--rustc[The compiler for the Rust programming language]' \
-'--rustdoc[Generate documentation for Rust projects]' \
-'--std[Standard library API documentation]' \
-'--test[Support code for rustc'\''s built in unit-test and micro-benchmarking framework]' \
-'--unstable-book[The Unstable Book]' \
-'--embedded-book[The Embedded Rust Book]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::topic -- Topic such as 'core', 'fn', 'usize', 'eprintln!', 'core::arch', 'alloc::format!', 'std::fs', 'std::fs::read_dir', 'std::io::Bytes', 'std::iter::Sum', 'std::io::error::Result' etc...:_files' \
-&& ret=0
-;;
-(man)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':command:_files' \
-&& ret=0
-;;
-(self)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__self_commands" \
-"*::: :->self" \
-&& ret=0
-case $state in
-    (self)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-self-command-$line[1]:"
-        case $line[1] in
-            (update)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(uninstall)
-_arguments "${_arguments_options[@]}" \
-'-y[]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(upgrade-data)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(set)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__set_commands" \
-"*::: :->set" \
-&& ret=0
-case $state in
-    (set)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-set-command-$line[1]:"
-        case $line[1] in
-            (default-host)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':host_triple:_files' \
-&& ret=0
-;;
-(profile)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':profile-name:(minimal default complete)' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(completions)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::shell:(zsh bash fish powershell elvish)' \
-'::command:(rustup cargo)' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-}
-
-(( $+functions[_rustup_commands] )) ||
-_rustup_commands() {
-    local commands; commands=(
-        "dump-testament:Dump information about the build" \
-"show:Show the active and installed toolchains or profiles" \
-"install:Update Rust toolchains" \
-"uninstall:Uninstall Rust toolchains" \
-"update:Update Rust toolchains and rustup" \
-"check:Check for updates to Rust toolchains" \
-"default:Set the default toolchain" \
-"toolchain:Modify or query the installed toolchains" \
-"target:Modify a toolchain's supported targets" \
-"component:Modify a toolchain's installed components" \
-"override:Modify directory toolchain overrides" \
-"run:Run a command with an environment configured for a given toolchain" \
-"which:Display which binary will be run for a given command" \
-"doc:Open the documentation for the current toolchain" \
-"man:View the man page for a given command" \
-"self:Modify the rustup installation" \
-"set:Alter rustup settings" \
-"completions:Generate tab-completion scripts for your shell" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup commands' commands "$@"
-}
-(( $+functions[_rustup__show__active-toolchain_commands] )) ||
-_rustup__show__active-toolchain_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup show active-toolchain commands' commands "$@"
-}
-(( $+functions[_rustup__add_commands] )) ||
-_rustup__add_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup add commands' commands "$@"
-}
-(( $+functions[_rustup__component__add_commands] )) ||
-_rustup__component__add_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup component add commands' commands "$@"
-}
-(( $+functions[_rustup__override__add_commands] )) ||
-_rustup__override__add_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override add commands' commands "$@"
-}
-(( $+functions[_rustup__target__add_commands] )) ||
-_rustup__target__add_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target add commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__add_commands] )) ||
-_rustup__toolchain__add_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain add commands' commands "$@"
-}
-(( $+functions[_rustup__check_commands] )) ||
-_rustup__check_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup check commands' commands "$@"
-}
-(( $+functions[_rustup__completions_commands] )) ||
-_rustup__completions_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup completions commands' commands "$@"
-}
-(( $+functions[_rustup__component_commands] )) ||
-_rustup__component_commands() {
-    local commands; commands=(
-        "list:List installed and available components" \
-"add:Add a component to a Rust toolchain" \
-"remove:Remove a component from a Rust toolchain" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup component commands' commands "$@"
-}
-(( $+functions[_rustup__default_commands] )) ||
-_rustup__default_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup default commands' commands "$@"
-}
-(( $+functions[_rustup__set__default-host_commands] )) ||
-_rustup__set__default-host_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup set default-host commands' commands "$@"
-}
-(( $+functions[_rustup__doc_commands] )) ||
-_rustup__doc_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup doc commands' commands "$@"
-}
-(( $+functions[_docs_commands] )) ||
-_docs_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'docs commands' commands "$@"
-}
-(( $+functions[_rustup__docs_commands] )) ||
-_rustup__docs_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup docs commands' commands "$@"
-}
-(( $+functions[_rustup__dump-testament_commands] )) ||
-_rustup__dump-testament_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup dump-testament commands' commands "$@"
-}
-(( $+functions[_rustup__component__help_commands] )) ||
-_rustup__component__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup component help commands' commands "$@"
-}
-(( $+functions[_rustup__help_commands] )) ||
-_rustup__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup help commands' commands "$@"
-}
-(( $+functions[_rustup__override__help_commands] )) ||
-_rustup__override__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override help commands' commands "$@"
-}
-(( $+functions[_rustup__self__help_commands] )) ||
-_rustup__self__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup self help commands' commands "$@"
-}
-(( $+functions[_rustup__set__help_commands] )) ||
-_rustup__set__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup set help commands' commands "$@"
-}
-(( $+functions[_rustup__show__help_commands] )) ||
-_rustup__show__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup show help commands' commands "$@"
-}
-(( $+functions[_rustup__target__help_commands] )) ||
-_rustup__target__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target help commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__help_commands] )) ||
-_rustup__toolchain__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain help commands' commands "$@"
-}
-(( $+functions[_rustup__show__home_commands] )) ||
-_rustup__show__home_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup show home commands' commands "$@"
-}
-(( $+functions[_rustup__install_commands] )) ||
-_rustup__install_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup install commands' commands "$@"
-}
-(( $+functions[_rustup__target__install_commands] )) ||
-_rustup__target__install_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target install commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__install_commands] )) ||
-_rustup__toolchain__install_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain install commands' commands "$@"
-}
-(( $+functions[_rustup__show__keys_commands] )) ||
-_rustup__show__keys_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup show keys commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__link_commands] )) ||
-_rustup__toolchain__link_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain link commands' commands "$@"
-}
-(( $+functions[_rustup__component__list_commands] )) ||
-_rustup__component__list_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup component list commands' commands "$@"
-}
-(( $+functions[_rustup__override__list_commands] )) ||
-_rustup__override__list_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override list commands' commands "$@"
-}
-(( $+functions[_rustup__target__list_commands] )) ||
-_rustup__target__list_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target list commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__list_commands] )) ||
-_rustup__toolchain__list_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain list commands' commands "$@"
-}
-(( $+functions[_rustup__man_commands] )) ||
-_rustup__man_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup man commands' commands "$@"
-}
-(( $+functions[_rustup__override_commands] )) ||
-_rustup__override_commands() {
-    local commands; commands=(
-        "list:List directory toolchain overrides" \
-"set:Set the override toolchain for a directory" \
-"unset:Remove the override toolchain for a directory" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup override commands' commands "$@"
-}
-(( $+functions[_rustup__set__profile_commands] )) ||
-_rustup__set__profile_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup set profile commands' commands "$@"
-}
-(( $+functions[_rustup__show__profile_commands] )) ||
-_rustup__show__profile_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup show profile commands' commands "$@"
-}
-(( $+functions[_rustup__component__remove_commands] )) ||
-_rustup__component__remove_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup component remove commands' commands "$@"
-}
-(( $+functions[_rustup__override__remove_commands] )) ||
-_rustup__override__remove_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override remove commands' commands "$@"
-}
-(( $+functions[_rustup__remove_commands] )) ||
-_rustup__remove_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup remove commands' commands "$@"
-}
-(( $+functions[_rustup__target__remove_commands] )) ||
-_rustup__target__remove_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target remove commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__remove_commands] )) ||
-_rustup__toolchain__remove_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain remove commands' commands "$@"
-}
-(( $+functions[_rustup__run_commands] )) ||
-_rustup__run_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup run commands' commands "$@"
-}
-(( $+functions[_rustup__self_commands] )) ||
-_rustup__self_commands() {
-    local commands; commands=(
-        "update:Download and install updates to rustup" \
-"uninstall:Uninstall rustup." \
-"upgrade-data:Upgrade the internal data format." \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup self commands' commands "$@"
-}
-(( $+functions[_rustup__override__set_commands] )) ||
-_rustup__override__set_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override set commands' commands "$@"
-}
-(( $+functions[_rustup__set_commands] )) ||
-_rustup__set_commands() {
-    local commands; commands=(
-        "default-host:The triple used to identify toolchains when not specified" \
-"profile:The default components installed" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup set commands' commands "$@"
-}
-(( $+functions[_rustup__show_commands] )) ||
-_rustup__show_commands() {
-    local commands; commands=(
-        "active-toolchain:Show the active toolchain" \
-"home:Display the computed value of RUSTUP_HOME" \
-"profile:Show the current profile" \
-"keys:Display the known PGP keys" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup show commands' commands "$@"
-}
-(( $+functions[_rustup__target_commands] )) ||
-_rustup__target_commands() {
-    local commands; commands=(
-        "list:List installed and available targets" \
-"add:Add a target to a Rust toolchain" \
-"remove:Remove a target from a Rust toolchain" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup target commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain_commands] )) ||
-_rustup__toolchain_commands() {
-    local commands; commands=(
-        "list:List installed toolchains" \
-"install:Install or update a given toolchain" \
-"uninstall:Uninstall a toolchain" \
-"link:Create a custom toolchain by symlinking to a directory" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup toolchain commands' commands "$@"
-}
-(( $+functions[_rustup__self__uninstall_commands] )) ||
-_rustup__self__uninstall_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup self uninstall commands' commands "$@"
-}
-(( $+functions[_rustup__target__uninstall_commands] )) ||
-_rustup__target__uninstall_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target uninstall commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__uninstall_commands] )) ||
-_rustup__toolchain__uninstall_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain uninstall commands' commands "$@"
-}
-(( $+functions[_rustup__uninstall_commands] )) ||
-_rustup__uninstall_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup uninstall commands' commands "$@"
-}
-(( $+functions[_rustup__override__unset_commands] )) ||
-_rustup__override__unset_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override unset commands' commands "$@"
-}
-(( $+functions[_rustup__self__update_commands] )) ||
-_rustup__self__update_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup self update commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__update_commands] )) ||
-_rustup__toolchain__update_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain update commands' commands "$@"
-}
-(( $+functions[_rustup__update_commands] )) ||
-_rustup__update_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup update commands' commands "$@"
-}
-(( $+functions[_rustup__self__upgrade-data_commands] )) ||
-_rustup__self__upgrade-data_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup self upgrade-data commands' commands "$@"
-}
-(( $+functions[_rustup__which_commands] )) ||
-_rustup__which_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup which commands' commands "$@"
-}
-
-_rustup "$@"
\ No newline at end of file
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
new file mode 100644
index 000000000..c7a9b3060
--- /dev/null
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -0,0 +1,12 @@
+# COMPLETION FUNCTION
+if (( $+commands[rustup] )); then
+  if [[ ! -f $ZSH_CACHE_DIR/rustup_version ]] \
+    || [[ "$(rustup --version 2> /dev/null)" \
+      != "$(< "$ZSH_CACHE_DIR/rustup_version")" ]] \
+    || [[ ! -f $ZSH/plugins/rustup/_rustup ]]; then
+    rustup completions zsh > $ZSH/plugins/rustup/_rustup
+    rustup --version 2> /dev/null > $ZSH_CACHE_DIR/rustup_version
+  fi
+  autoload -Uz _rustup
+  _comps[rustup]=_rustup
+fi

From 130f35fcb2e175e28178f834b16e00f121319bc4 Mon Sep 17 00:00:00 2001
From: Claas Augner <github@caugner.de>
Date: Thu, 9 Sep 2021 19:16:15 +0200
Subject: [PATCH 118/591] feat(git): add `gdu` alias to diff against upstream
 (#8721)

---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 64c507345..e53d93b0b 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -66,6 +66,7 @@ plugins=(... git)
 | gds                  | git diff --staged                                                                                                                |
 | gdt                  | git diff-tree --no-commit-id --name-only -r                                                                                      |
 | gdnolock             | git diff $@ ":(exclude)package-lock.json" ":(exclude)&ast;.lock"                                                                 |
+| gdu                  | git diff @{u}                                                                                                                    |
 | gdv                  | git diff -w $@ \| view -                                                                                                         |
 | gdw                  | git diff --word-diff                                                                                                             |
 | gf                   | git fetch                                                                                                                        |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d030d2801..76e0faed3 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -119,6 +119,7 @@ alias gdcw='git diff --cached --word-diff'
 alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
 alias gds='git diff --staged'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
+alias gdu='git diff @{u}'
 alias gdw='git diff --word-diff'
 
 function gdnolock() {

From aa6e932b06137a697296ea5be62c73905ff68848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20Fri=C3=B0riksson?=
 <johann.fridriksson@gmail.com>
Date: Thu, 9 Sep 2021 19:31:01 +0200
Subject: [PATCH 119/591] fix(vim-interaction): look up the newest GVim
 instance (#9095)

Instead of relying on a hardcoded instance-name existing for the default-value, let's
look up the latest instance. This also resolves my problem where MacVim
had a servername of "VIM" instead of "GVIM".

Co-authored-by: Johann Fridriksson <jofridri@silabs.com>
---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 010f998d3..53ec453e8 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -22,7 +22,8 @@ EOH
   local cmd=""
   local before="<esc>"
   local after=""
-  local name="GVIM"
+  # Look up the newest instance
+  local name="$(gvim --serverlist | tail -n 1)"
   while getopts ":b:a:n:" option
   do
     case $option in

From 358ac6a141010b19175d0eb5a6f28ff544aa75d3 Mon Sep 17 00:00:00 2001
From: Xuehai Pan <XuehaiPan@pku.edu.cn>
Date: Fri, 10 Sep 2021 04:18:09 +0800
Subject: [PATCH 120/591] fix(cp): add unique suffix to rsync backup directory
 for each user (#10170)

* fix(cp): add unique suffix to rsync backup directory for each user

* fix(cp): use `USERNAME` rather than `USER`
---
 plugins/cp/README.md     | 2 +-
 plugins/cp/cp.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/cp/README.md b/plugins/cp/README.md
index e8a9b6ccc..23734243c 100644
--- a/plugins/cp/README.md
+++ b/plugins/cp/README.md
@@ -25,7 +25,7 @@ The enabled options for rsync are:
 
 * `-hhh`: outputs numbers in human-readable format, in units of 1024 (K, M, G, T).
 
-* `--backup-dir=/tmp/rsync`: move backup copies to "/tmp/rsync".
+* `--backup-dir="/tmp/rsync-$USERNAME"`: move backup copies to "/tmp/rsync-$USERNAME".
 
 * `-e /dev/null`: only work on local files (disable remote shells).
 
diff --git a/plugins/cp/cp.plugin.zsh b/plugins/cp/cp.plugin.zsh
index fe6ea87a8..a56259106 100644
--- a/plugins/cp/cp.plugin.zsh
+++ b/plugins/cp/cp.plugin.zsh
@@ -1,4 +1,4 @@
 cpv() {
-    rsync -pogbr -hhh --backup-dir=/tmp/rsync -e /dev/null --progress "$@"
+    rsync -pogbr -hhh --backup-dir="/tmp/rsync-${USERNAME}" -e /dev/null --progress "$@"
 }
 compdef _files cpv

From 81edb03c5261658d40885abf4bcd54cf9dbbc6a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 10 Sep 2021 17:06:24 +0200
Subject: [PATCH 121/591] fix(copybuffer): define CTRL+O binding for all
 keymaps (#6442)

Fixes #6442
---
 plugins/copybuffer/copybuffer.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/copybuffer/copybuffer.plugin.zsh b/plugins/copybuffer/copybuffer.plugin.zsh
index 87a658d93..e67f920f0 100644
--- a/plugins/copybuffer/copybuffer.plugin.zsh
+++ b/plugins/copybuffer/copybuffer.plugin.zsh
@@ -11,4 +11,6 @@ copybuffer () {
 
 zle -N copybuffer
 
-bindkey "^O" copybuffer
+bindkey -M emacs "^O" copybuffer
+bindkey -M viins "^O" copybuffer
+bindkey -M vicmd "^O" copybuffer

From 735808f48d54aabce540f6c90294e21118104cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 10 Sep 2021 18:01:43 +0200
Subject: [PATCH 122/591] Revert "feat(ssh-agent): only start ssh-agent once
 (#5359)"

This reverts commit 7692881d2a61a4ba47eeef5d7827c0d2cb896def.
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index c2b9546a2..2d7d8a2a0 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -96,24 +96,7 @@ else
   _start_agent
 fi
 
-() {
-  emulate -L zsh
-
-  command mkdir "$ZSH_CACHE_DIR/ssh-agent.lock" 2>/dev/null || return
-
-  trap "
-    ret=\$?
-
-    command rm -rf '$ZSH_CACHE_DIR/ssh-agent.lock'
-    unset agent_forwarding ssh_env_cache
-    unfunction _start_agent _add_identities 2>/dev/null
-
-    return \$ret
-  " EXIT INT QUIT
-
-  _add_identities
-
-}
+_add_identities
 
 unset agent_forwarding ssh_env_cache
 unfunction _start_agent _add_identities

From c21ff38b8fda0584208ffd697dac0502e2327466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 17:44:36 +0200
Subject: [PATCH 123/591] fix(docker): remove unwanted asterisk in completed
 docker commands

Also update upstream completion to version fe2008d04e80fafd.

NOTE: this fix means the version bundled within Oh My Zsh has diverged
from the upstream version.
---
 plugins/docker/_docker | 100 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 97 insertions(+), 3 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 7fe204313..8ee35abcf 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -1343,7 +1343,7 @@ __docker_node_complete_ls_filters() {
                 ;;
         esac
     else
-        opts=('id' 'label' 'membership' 'name' 'role')
+        opts=('id' 'label' 'membership' 'name' 'node.label' 'role')
         _describe -t filter-opts "filter options" opts -qS "=" && ret=0
     fi
 
@@ -2544,6 +2544,82 @@ __docker_volume_subcommand() {
 
 # EO volume
 
+# BO context
+
+__docker_complete_contexts() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+    declare -a contexts
+
+    contexts=(${(f)${:-"$(_call_program commands docker $docker_options context ls -q)"$'\n'}})
+
+    _describe -t context-list "context" contexts && ret=0
+    return ret
+}
+
+__docker_context_commands() {
+    local -a _docker_context_subcommands
+    _docker_context_subcommands=(
+        "create:Create new context"
+        "inspect:Display detailed information on one or more contexts"
+        "list:List available contexts"
+        "rm:Remove one or more contexts"
+        "show:Print the current context"
+        "update:Update a context"
+        "use:Set the default context"
+    )
+    _describe -t docker-context-commands "docker context command" _docker_context_subcommands
+}
+
+__docker_context_subcommand() {
+    local -a _command_args opts_help
+    local expl help="--help"
+    integer ret=1
+
+    opts_help=("(: -)--help[Print usage]")
+
+    case "$words[1]" in
+        (create)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--default-stack-orchestrator=[Default orchestrator for stack operations to use with this context]:default-stack-orchestrator:(swarm kubernetes all)" \
+                "($help)--description=[Description of the context]:description:" \
+                "($help)--docker=[Set the docker endpoint]:docker:" \
+                "($help)--kubernetes=[Set the kubernetes endpoint]:kubernetes:" \
+                "($help)--from=[Create context from a named context]:from:__docker_complete_contexts" \
+                "($help -):name: " && ret=0
+            ;;
+        (use)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)1:context:__docker_complete_contexts" && ret=0
+            ;;
+        (inspect)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)1:context:__docker_complete_contexts" && ret=0
+            ;;
+        (rm)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)1:context:__docker_complete_contexts" && ret=0
+            ;;
+        (update)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--default-stack-orchestrator=[Default orchestrator for stack operations to use with this context]:default-stack-orchestrator:(swarm kubernetes all)" \
+                "($help)--description=[Description of the context]:description:" \
+                "($help)--docker=[Set the docker endpoint]:docker:" \
+                "($help)--kubernetes=[Set the kubernetes endpoint]:kubernetes:" \
+                "($help -):name:" && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+# EO context
+
 __docker_caching_policy() {
   oldp=( "$1"(Nmh+1) )     # 1 hour
   (( $#oldp ))
@@ -2576,7 +2652,7 @@ __docker_commands() {
     then
         local -a lines
         lines=(${(f)"$(_call_program commands docker 2>&1)"})
-        _docker_subcommands=(${${${(M)${lines[$((${lines[(i)*Commands:]} + 1)),-1]}:# *}## #}/ ##/:})
+        _docker_subcommands=(${${${(M)${lines[$((${lines[(i)*Commands:]} + 1)),-1]}:# *}## #}/\*# ##/:})
         _docker_subcommands=($_docker_subcommands 'daemon:Enable daemon mode' 'help:Show help for a command')
         (( $#_docker_subcommands > 2 )) && _store_cache docker_subcommands _docker_subcommands
     fi
@@ -2631,6 +2707,23 @@ __docker_subcommand() {
                     ;;
             esac
             ;;
+        (context)
+            local curcontext="$curcontext" state
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -): :->command" \
+                "($help -)*:: :->option-or-argument" && ret=0
+
+            case $state in
+                (command)
+                    __docker_context_commands && ret=0
+                    ;;
+                (option-or-argument)
+                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
+                    __docker_context_subcommand && ret=0
+                    ;;
+            esac
+            ;;
         (daemon)
             _arguments $(__docker_arguments) \
                 $opts_help \
@@ -2698,7 +2791,8 @@ __docker_subcommand() {
                 "($help)--tlsverify[Use TLS and verify the remote]" \
                 "($help)--userns-remap=[User/Group setting for user namespaces]:user\:group:->users-groups" \
                 "($help)--userland-proxy[Use userland proxy for loopback traffic]" \
-                "($help)--userland-proxy-path=[Path to the userland proxy binary]:binary:_files" && ret=0
+                "($help)--userland-proxy-path=[Path to the userland proxy binary]:binary:_files" \
+                "($help)--validate[Validate daemon configuration and exit]" && ret=0
 
             case $state in
                 (cluster-store)

From 4e6e49652b69557c01ef1ce81c96da7eb9b34e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 18:18:25 +0200
Subject: [PATCH 124/591] fix(plugins): fix `_comps` error in completion
 generation plugins (#10190)

Fixes #10190
---
 plugins/cargo/cargo.plugin.zsh   | 17 +++++++++++------
 plugins/deno/deno.plugin.zsh     | 16 +++++++++++-----
 plugins/fnm/fnm.plugin.zsh       | 17 +++++++++++------
 plugins/gh/gh.plugin.zsh         | 17 +++++++++++------
 plugins/rustup/rustup.plugin.zsh | 18 +++++++++++-------
 5 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 92eae5359..b636d492f 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,11 +1,16 @@
-# COMPLETION FUNCTION
 if (( $+commands[rustup] && $+commands[cargo] )); then
-  if [[ ! -f $ZSH_CACHE_DIR/cargo_version ]] \
-    || [[ "$(cargo --version)" != "$(< "$ZSH_CACHE_DIR/cargo_version")" ]] \
-    || [[ ! -f $ZSH/plugins/cargo/_cargo ]]; then
-    rustup completions zsh cargo > $ZSH/plugins/cargo/_cargo
-    cargo --version > $ZSH_CACHE_DIR/cargo_version
+  ver="$(cargo --version)"
+  ver_file="$ZSH_CACHE_DIR/cargo_version"
+  comp_file="$ZSH/plugins/cargo/_cargo"
+
+  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
+    rustup completions zsh cargo >| "$comp_file"
+    echo "$ver" >| "$ver_file"
   fi
+
+  declare -A _comps
   autoload -Uz _cargo
   _comps[cargo]=_cargo
+
+  unset ver ver_file comp_file
 fi
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index a37b3bec4..71749f4a0 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -12,12 +12,18 @@ alias dup='deno upgrade'
 
 # COMPLETION FUNCTION
 if (( $+commands[deno] )); then
-  if [[ ! -f $ZSH_CACHE_DIR/deno_version ]] \
-    || [[ "$(deno --version)" != "$(< "$ZSH_CACHE_DIR/deno_version")" ]] \
-    || [[ ! -f $ZSH/plugins/deno/_deno ]]; then
-    deno completions zsh > $ZSH/plugins/deno/_deno
-    deno --version > $ZSH_CACHE_DIR/deno_version
+  ver="$(deno --version)"
+  ver_file="$ZSH_CACHE_DIR/deno_version"
+  comp_file="$ZSH/plugins/deno/_deno"
+
+  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
+    deno completions zsh >| "$comp_file"
+    echo "$ver" >| "$ver_file"
   fi
+
+  declare -A _comps
   autoload -Uz _deno
   _comps[deno]=_deno
+
+  unset ver ver_file comp_file
 fi
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index 5ce558dcb..29b759abb 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,12 +1,17 @@
-# COMPLETION FUNCTION
 if (( $+commands[fnm] )); then
-  if [[ ! -f $ZSH_CACHE_DIR/fnm_version ]] \
-    || [[ "$(fnm --version)" != "$(< "$ZSH_CACHE_DIR/fnm_version")" ]] \
-    || [[ ! -f $ZSH/plugins/fnm/_fnm ]]; then
-      fnm completions --shell=zsh > $ZSH/plugins/fnm/_fnm
-      fnm --version > $ZSH_CACHE_DIR/fnm_version
+  ver="$(fnm --version)"
+  ver_file="$ZSH_CACHE_DIR/fnm_version"
+  comp_file="$ZSH/plugins/fnm/_fnm"
+
+  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
+    fnm completions --shell=zsh >| "$comp_file"
+    echo "$ver" >| "$ver_file"
   fi
+
+  declare -A _comps
   autoload -Uz _fnm
   _comps[fnm]=_fnm
+
+  unset ver ver_file comp_file
 fi
 
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index 8e055ec35..c3d87848d 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -1,13 +1,18 @@
 # Autocompletion for the GitHub CLI (gh).
-
 if (( $+commands[gh] )); then
-  if [[ ! -r "$ZSH_CACHE_DIR/gh_version" \
-    || "$(gh --version)" != "$(< "$ZSH_CACHE_DIR/gh_version")"
-    || ! -f "$ZSH/plugins/gh/_gh" ]]; then
-    gh completion --shell zsh > $ZSH/plugins/gh/_gh
-    gh --version > $ZSH_CACHE_DIR/gh_version
+  ver="$(gh --version)"
+  ver_file="$ZSH_CACHE_DIR/gh_version"
+  comp_file="$ZSH/plugins/gh/_gh"
+
+  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
+    gh completion --shell zsh >| "$comp_file"
+    echo "$ver" >| "$ver_file"
   fi
+
+  declare -A _comps
   autoload -Uz _gh
   _comps[gh]=_gh
+
+  unset ver ver_file comp_file
 fi
 
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index c7a9b3060..e709f41bd 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,12 +1,16 @@
-# COMPLETION FUNCTION
 if (( $+commands[rustup] )); then
-  if [[ ! -f $ZSH_CACHE_DIR/rustup_version ]] \
-    || [[ "$(rustup --version 2> /dev/null)" \
-      != "$(< "$ZSH_CACHE_DIR/rustup_version")" ]] \
-    || [[ ! -f $ZSH/plugins/rustup/_rustup ]]; then
-    rustup completions zsh > $ZSH/plugins/rustup/_rustup
-    rustup --version 2> /dev/null > $ZSH_CACHE_DIR/rustup_version
+  ver="$(rustup --version 2>/dev/null)"
+  ver_file="$ZSH_CACHE_DIR/rustup_version"
+  comp_file="$ZSH/plugins/rustup/_rustup"
+
+  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
+    rustup completions zsh >| "$comp_file"
+    echo "$ver" >| "$ver_file"
   fi
+
+  declare -A _comps
   autoload -Uz _rustup
   _comps[rustup]=_rustup
+
+  unset ver ver_file comp_file
 fi

From d2269180b074263f4a0d3df3f9de15a1abae8110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 18:41:44 +0200
Subject: [PATCH 125/591] fix(core): move plugin-generated completion files to
 `$ZSH_CACHE_DIR/completions`

Fixes #10183
---
 oh-my-zsh.sh                     | 4 ++++
 plugins/cargo/cargo.plugin.zsh   | 5 ++++-
 plugins/deno/deno.plugin.zsh     | 5 ++++-
 plugins/fnm/fnm.plugin.zsh       | 5 ++++-
 plugins/gh/gh.plugin.zsh         | 5 ++++-
 plugins/rustup/rustup.plugin.zsh | 5 ++++-
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 16e244be5..442972a9a 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -7,6 +7,10 @@ if [[ -z "$ZSH_CACHE_DIR" ]]; then
   ZSH_CACHE_DIR="$ZSH/cache"
 fi
 
+# Create completions cache dir and add to $fpath
+mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)$ZSH_CACHE_DIR/completions]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
   source $ZSH/tools/check_for_upgrade.sh
diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index b636d492f..95e63dd3c 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,7 +1,10 @@
 if (( $+commands[rustup] && $+commands[cargo] )); then
   ver="$(cargo --version)"
   ver_file="$ZSH_CACHE_DIR/cargo_version"
-  comp_file="$ZSH/plugins/cargo/_cargo"
+  comp_file="$ZSH_CACHE_DIR/completions/_cargo"
+
+  mkdir -p "${comp_file:h}"
+  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
 
   if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
     rustup completions zsh cargo >| "$comp_file"
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 71749f4a0..e22c4e4c8 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -14,7 +14,10 @@ alias dup='deno upgrade'
 if (( $+commands[deno] )); then
   ver="$(deno --version)"
   ver_file="$ZSH_CACHE_DIR/deno_version"
-  comp_file="$ZSH/plugins/deno/_deno"
+  comp_file="$ZSH_CACHE_DIR/completions/_deno"
+
+  mkdir -p "${comp_file:h}"
+  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
 
   if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
     deno completions zsh >| "$comp_file"
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index 29b759abb..efb81a6fa 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,7 +1,10 @@
 if (( $+commands[fnm] )); then
   ver="$(fnm --version)"
   ver_file="$ZSH_CACHE_DIR/fnm_version"
-  comp_file="$ZSH/plugins/fnm/_fnm"
+  comp_file="$ZSH_CACHE_DIR/completions/_fnm"
+
+  mkdir -p "${comp_file:h}"
+  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
 
   if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
     fnm completions --shell=zsh >| "$comp_file"
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index c3d87848d..a346ccf65 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -2,7 +2,10 @@
 if (( $+commands[gh] )); then
   ver="$(gh --version)"
   ver_file="$ZSH_CACHE_DIR/gh_version"
-  comp_file="$ZSH/plugins/gh/_gh"
+  comp_file="$ZSH_CACHE_DIR/completions/_gh"
+
+  mkdir -p "${comp_file:h}"
+  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
 
   if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
     gh completion --shell zsh >| "$comp_file"
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index e709f41bd..8740f255a 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,7 +1,10 @@
 if (( $+commands[rustup] )); then
   ver="$(rustup --version 2>/dev/null)"
   ver_file="$ZSH_CACHE_DIR/rustup_version"
-  comp_file="$ZSH/plugins/rustup/_rustup"
+  comp_file="$ZSH_CACHE_DIR/completions/_rustup"
+
+  mkdir -p "${comp_file:h}"
+  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
 
   if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
     rustup completions zsh >| "$comp_file"

From eb2eacaf0c46ace8e0eb3543199851a8249338fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 18:47:51 +0200
Subject: [PATCH 126/591] refactor(plugins): remove old generated completion
 files

This removes .gitignore plugin files and adds a force-rm of the old completion file,
which ignores any errors if the file doesn't exist.
---
 plugins/cargo/.gitignore         | 1 -
 plugins/cargo/cargo.plugin.zsh   | 4 ++++
 plugins/deno/.gitignore          | 1 -
 plugins/deno/deno.plugin.zsh     | 3 +++
 plugins/fnm/.gitignore           | 2 --
 plugins/fnm/fnm.plugin.zsh       | 3 +++
 plugins/gh/.gitignore            | 1 -
 plugins/gh/gh.plugin.zsh         | 3 +++
 plugins/rustup/.gitignore        | 1 -
 plugins/rustup/rustup.plugin.zsh | 3 +++
 10 files changed, 16 insertions(+), 6 deletions(-)
 delete mode 100644 plugins/cargo/.gitignore
 delete mode 100644 plugins/deno/.gitignore
 delete mode 100644 plugins/fnm/.gitignore
 delete mode 100644 plugins/gh/.gitignore
 delete mode 100644 plugins/rustup/.gitignore

diff --git a/plugins/cargo/.gitignore b/plugins/cargo/.gitignore
deleted file mode 100644
index 42d7ecdd6..000000000
--- a/plugins/cargo/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_cargo
diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 95e63dd3c..7082d2d55 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,4 +1,8 @@
 if (( $+commands[rustup] && $+commands[cargo] )); then
+  # remove old generated completion file
+  command rm -f "${0:A:h}/_cargo"
+
+  # generate new completion file
   ver="$(cargo --version)"
   ver_file="$ZSH_CACHE_DIR/cargo_version"
   comp_file="$ZSH_CACHE_DIR/completions/_cargo"
diff --git a/plugins/deno/.gitignore b/plugins/deno/.gitignore
deleted file mode 100644
index cba5b03e8..000000000
--- a/plugins/deno/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_deno
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index e22c4e4c8..34adddc37 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -12,6 +12,9 @@ alias dup='deno upgrade'
 
 # COMPLETION FUNCTION
 if (( $+commands[deno] )); then
+  # remove old generated completion file
+  command rm -f "${0:A:h}/_deno"
+
   ver="$(deno --version)"
   ver_file="$ZSH_CACHE_DIR/deno_version"
   comp_file="$ZSH_CACHE_DIR/completions/_deno"
diff --git a/plugins/fnm/.gitignore b/plugins/fnm/.gitignore
deleted file mode 100644
index 0b2bc9ab7..000000000
--- a/plugins/fnm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-_fnm
-
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index efb81a6fa..c161b27cd 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,4 +1,7 @@
 if (( $+commands[fnm] )); then
+  # remove old generated completion file
+  command rm -f "${0:A:h}/_fnm"
+
   ver="$(fnm --version)"
   ver_file="$ZSH_CACHE_DIR/fnm_version"
   comp_file="$ZSH_CACHE_DIR/completions/_fnm"
diff --git a/plugins/gh/.gitignore b/plugins/gh/.gitignore
deleted file mode 100644
index fa1244ab5..000000000
--- a/plugins/gh/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_gh
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index a346ccf65..3e4cdee5e 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -1,5 +1,8 @@
 # Autocompletion for the GitHub CLI (gh).
 if (( $+commands[gh] )); then
+  # remove old generated completion file
+  command rm -f "${0:A:h}/_gh"
+
   ver="$(gh --version)"
   ver_file="$ZSH_CACHE_DIR/gh_version"
   comp_file="$ZSH_CACHE_DIR/completions/_gh"
diff --git a/plugins/rustup/.gitignore b/plugins/rustup/.gitignore
deleted file mode 100644
index ad38ae3bf..000000000
--- a/plugins/rustup/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_rustup
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index 8740f255a..c6efc1b13 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,4 +1,7 @@
 if (( $+commands[rustup] )); then
+  # remove old generated completion file
+  command rm -f "${0:A:h}/_rustup"
+
   ver="$(rustup --version 2>/dev/null)"
   ver_file="$ZSH_CACHE_DIR/rustup_version"
   comp_file="$ZSH_CACHE_DIR/completions/_rustup"

From 8784e88552ad7f6f6a9c149a739474e0b168a840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 20:38:54 +0200
Subject: [PATCH 127/591] fix(core): use `$HOME/.cache` if default cache dir is
 non-writable (#10193)

Fixes #10193
---
 oh-my-zsh.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 442972a9a..cea466100 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -7,7 +7,12 @@ if [[ -z "$ZSH_CACHE_DIR" ]]; then
   ZSH_CACHE_DIR="$ZSH/cache"
 fi
 
-# Create completions cache dir and add to $fpath
+# Make sure $ZSH_CACHE_DIR is writable, otherwise use a directory in $HOME
+if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
+  ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/ohmyzsh"
+fi
+
+# Create cache and completions dir and add to $fpath
 mkdir -p "$ZSH_CACHE_DIR/completions"
 (( ${fpath[(Ie)$ZSH_CACHE_DIR/completions]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 

From 93b557e291ba60286bcd49f5d3e4ac61730b3f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 20:45:26 +0200
Subject: [PATCH 128/591] style(core): make alternative cache directory
 equivalent to Arch Linux package

The oh-my-zsh-git package sets the cache directory to `$HOME/.cache/oh-my-zsh`, so
Oh My Zsh will be compatible with it.
---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index cea466100..83c8f8057 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -9,7 +9,7 @@ fi
 
 # Make sure $ZSH_CACHE_DIR is writable, otherwise use a directory in $HOME
 if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
-  ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/ohmyzsh"
+  ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/oh-my-zsh"
 fi
 
 # Create cache and completions dir and add to $fpath

From 29ec52602ff947675ea9a1788d62c0c552bd01af Mon Sep 17 00:00:00 2001
From: Muhammad Zahalqa <m@tryfinally.com>
Date: Thu, 16 Sep 2021 17:44:35 +0300
Subject: [PATCH 129/591] feat(golang): add `gota` to test current directory
 recursively (#8974)

---
 plugins/golang/README.md         | 1 +
 plugins/golang/golang.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 0a1b43c30..0c90aa10b 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -27,4 +27,5 @@ plugins=(... golang)
 | gops    | `cd $GOPATH/src`        | Takes you to $GOPATH/src                                      |
 | gor     | `go run`                | Compiles and runs your code                                   |
 | got     | `go test`               | Runs tests                                                    |
+| gota    | `go test ./...`         | Runs tests in all subdirectories                              |
 | gov     | `go vet`                | Vet examines Go source code and reports suspicious constructs |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 398bd966f..eedde2573 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -271,4 +271,5 @@ alias gopb='cd $GOPATH/bin'
 alias gops='cd $GOPATH/src'
 alias gor='go run'
 alias got='go test'
+alias gota='go test ./...'
 alias gov='go vet'

From 4bd5d03e51ae289a986ab63e94bf4e1c96a75786 Mon Sep 17 00:00:00 2001
From: Tristan Messner <tristanmessner@gmail.com>
Date: Sun, 21 Apr 2019 20:20:23 -0400
Subject: [PATCH 130/591] feat(golang): add `goga` alias to install
 dependencies in current directory, recursively (#7786)

Closes #7786
---
 plugins/golang/README.md         | 1 +
 plugins/golang/golang.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 0c90aa10b..af2c4dff9 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -19,6 +19,7 @@ plugins=(... golang)
 | gof     | `go fmt`                | Gofmt formats (aligns and indents) Go programs.               |
 | gofa    | `go fmt ./...`          | Run go fmt for all packages in current directory, recursively |
 | gog     | `go get`                | Downloads packages and then installs them to $GOPATH          |
+| gog     | `go get ./...`          | Installs all dependencies in current directory, recursively   |
 | goi     | `go install`            | Compiles and installs packages to $GOPATH                     |
 | gol     | `go list`               | Lists Go packages                                             |
 | gom     | `go mod`                | Access to operations on modules                               |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index eedde2573..fce663fd6 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -263,6 +263,7 @@ alias god='go doc'
 alias gof='go fmt'
 alias gofa='go fmt ./...'
 alias gog='go get'
+alias goga='go get ./...'
 alias goi='go install'
 alias gol='go list'
 alias gom='go mod'

From b79726b1c33149a429bbade49e9567a08ffa98af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 19:06:51 +0200
Subject: [PATCH 131/591] fix(update): silence `typeset` calls in `upgrade.sh`
 script (#10048)

Co-authored-by: yyny <6576327+yyny@users.noreply.github.com>
---
 tools/upgrade.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index e9f8bc0f9..7dec398fd 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,16 +1,23 @@
 #!/usr/bin/env zsh
 
+# Protect against running with shells other than zsh
 if [ -z "$ZSH_VERSION" ]; then
   exec zsh "$0" "$@"
 fi
 
+# Protect against unwanted sourcing
+case "$ZSH_EVAL_CONTEXT" in
+  *:file) echo "error: this file should not be sourced" && return ;;
+esac
+
 cd "$ZSH"
 
 # Use colors, but only if connected to a terminal
 # and that terminal supports them.
 
-local -a RAINBOW
-local RED GREEN YELLOW BLUE BOLD DIM UNDER RESET
+setopt typeset_silent
+typeset -a RAINBOW
+typeset RED GREEN YELLOW BLUE BOLD DIM UNDER RESET
 
 if [ -t 1 ]; then
   RAINBOW=(

From eba3be243f634a80ae8d8134bf88657afda71fbb Mon Sep 17 00:00:00 2001
From: Al-Amin Ahamed <34349365+mralaminahamed@users.noreply.github.com>
Date: Sat, 18 Sep 2021 03:31:56 +0600
Subject: [PATCH 132/591] feat(archlinux): add cleanup aliases to `yaourt` and
 `yay` (#10184)

---
 plugins/archlinux/README.md            | 4 ++++
 plugins/archlinux/archlinux.plugin.zsh | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index d6b41ee40..d4706e220 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -143,6 +143,8 @@ upgrades were available. Use `pacman -Que` instead.
 | yaupd   | `yaourt -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | yaupg   | `yaourt -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | yasu    | `yaourt -Syua --no-confirm`       | Same as `yaupg`, but without confirmation                           |
+| yaclun  | `yaourt -Yc`                      | Remove unneeded installed packages                                  |
+| yaclf   | `yaourt -Scc`                     | Remove cache directories                                            |
 | upgrade[²](#f2) | `yaourt -Syu`             | Sync with repositories before upgrading packages                    |
 
 #### Yay[¹](#f1)
@@ -165,6 +167,8 @@ upgrades were available. Use `pacman -Que` instead.
 | yaupd   | `yay -Sy`                      | Update and refresh local package, ABS and AUR databases           |
 | yaupg   | `yay -Syu`                     | Sync with repositories before upgrading packages                  |
 | yasu    | `yay -Syu --no-confirm`        | Same as `yaupg`, but without confirmation                         |
+| yaclun  | `yay -Yc`                      | Remove unneeded installed packages                                |
+| yaclf   | `yay -Scc`                     | Remove cache directories                                          |
 | upgrade[²](#f2) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
 
 ---
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index c94fb8f6c..d34a4cd96 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -170,6 +170,8 @@ if (( $+commands[yaourt] )); then
   alias yainsd='yaourt -S --asdeps'
   alias yamir='yaourt -Syy'
   alias yaupd="yaourt -Sy"
+  alias yaclun='yaourt -Yc'
+  alias yaclf='yaourt -Scc'
   alias upgrade='yaourt -Syu'
 fi
 
@@ -190,6 +192,8 @@ if (( $+commands[yay] )); then
   alias yainsd='yay -S --asdeps'
   alias yamir='yay -Syy'
   alias yaupd="yay -Sy"
+  alias yaclun='yay -Yc'
+  alias yaclf='yay -Scc'
   alias upgrade='yay -Syu'
 fi
 

From 4d7f0cfb47b04f218a05f0f2b3deebdb7e3fdb99 Mon Sep 17 00:00:00 2001
From: Ken Crawford <kmcrawford@gmail.com>
Date: Fri, 17 Sep 2021 17:33:12 -0400
Subject: [PATCH 133/591] docs(kubectx): fix README sample code syntax (#10199)

---
 plugins/kubectx/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kubectx/README.md b/plugins/kubectx/README.md
index 9a1df2617..98f1cf032 100644
--- a/plugins/kubectx/README.md
+++ b/plugins/kubectx/README.md
@@ -17,7 +17,7 @@ One can rename default context name for better readability.
 
 _Example_. Add to **.zshrc**:
 ```
-kubectx_mapping[minikube] = "mini"
+kubectx_mapping[minikube]="mini"
 kubectx_mapping[context_name_from_kubeconfig]="$emoji[wolf_face]"
 kubectx_mapping[production_cluster]="%{$fg[yellow]%}prod!%{$reset_color%}"
 ```

From a4e68967a472132b4ffb05fbd1c86ac88d27fe42 Mon Sep 17 00:00:00 2001
From: Joshua Bedford <joshua@joshuabedford.com>
Date: Fri, 17 Sep 2021 16:36:27 -0500
Subject: [PATCH 134/591] feat(lando): add support for `php` command (#10146)

Co-authored-by: Joshua Bedford <joshua.bedford@hurstreview.com>
---
 plugins/lando/lando.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/lando/lando.plugin.zsh b/plugins/lando/lando.plugin.zsh
index aa74c9924..af53e7e5a 100644
--- a/plugins/lando/lando.plugin.zsh
+++ b/plugins/lando/lando.plugin.zsh
@@ -8,6 +8,7 @@ function artisan \
          drush \
          gulp \
          npm \
+         php \
          wp \
          yarn {
   if checkForLandoFile; then

From f9d9d33ba42d3038a45c98d95343030f7ec39efa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 20 Sep 2021 19:57:04 +0200
Subject: [PATCH 135/591] refactor(jsontools): restructure and simplify logic

---
 plugins/jsontools/jsontools.plugin.zsh | 61 +++++++++++++++++---------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 912c83509..f92d336da 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -1,42 +1,61 @@
 # JSON Tools
 # Adds command line aliases useful for dealing with JSON
 
-if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
-	JSONTOOLS_METHOD=""
+# Check that user-defined method is installed
+if [[ -n "$JSONTOOLS_METHOD" ]]; then
+  (( $+commands[$JSONTOOLS_METHOD] )) || unset JSONTOOLS_METHOD
 fi
 
-if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
-	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
-	alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
-	alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
-	alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
-elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
-	alias pp_json='python -c "import sys; del sys.path[0]; import runpy; runpy._run_module_as_main(\"json.tool\")"'
-	alias is_json='python -c "
+# If method undefined, find the first one that is installed
+if [[ ! -v JSONTOOLS_METHOD ]]; then
+  for JSONTOOLS_METHOD in node python ruby; do
+    # If method found, break out of loop
+    (( $+commands[$JSONTOOLS_METHOD] )) && break
+    # Otherwise unset the variable
+    unset JSONTOOLS_METHOD
+  done
+
+  # If no methods were found, exit the plugin
+  [[ -v JSONTOOLS_METHOD ]] || return 1
+fi
+
+# Define json tools for each method
+case "$JSONTOOLS_METHOD" in
+  node)
+    alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
+    alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
+    alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
+    alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
+  ;;
+  python)
+    alias pp_json='python -c "import sys; del sys.path[0]; import runpy; runpy._run_module_as_main(\"json.tool\")"'
+    alias is_json='python -c "
 import sys; del sys.path[0];
 import json;
 try: 
-	json.loads(sys.stdin.read())
+    json.loads(sys.stdin.read())
 except ValueError, e: 
-	print False
+    print False
 else:
-	print True
+    print True
 sys.exit(0)"'
-	alias urlencode_json='python -c "
+    alias urlencode_json='python -c "
 import sys; del sys.path[0];
 import urllib, json;
 print urllib.quote_plus(sys.stdin.read())
 sys.exit(0)"'
-	alias urldecode_json='python -c "
+    alias urldecode_json='python -c "
 import sys; del sys.path[0];
 import urllib, json;
 print urllib.unquote_plus(sys.stdin.read())
 sys.exit(0)"'
-elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
-	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
-	alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
-	alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
-	alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
-fi
+  ;;
+  ruby)
+    alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
+    alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
+    alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
+    alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
+  ;;
+esac
 
 unset JSONTOOLS_METHOD

From b5909396370db43ba1c6c2513b1745991e5f60d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 20 Sep 2021 19:58:34 +0200
Subject: [PATCH 136/591] refactor(jsontools): move to functions, align
 `is_json` tool to return exit code

Also:

- Fix Python code in accordance with Python 3
- Use CGI module in Ruby to encode/decode strings
---
 plugins/jsontools/jsontools.plugin.zsh | 96 +++++++++++++++++++-------
 1 file changed, 70 insertions(+), 26 deletions(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index f92d336da..b518288ad 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -22,39 +22,83 @@ fi
 # Define json tools for each method
 case "$JSONTOOLS_METHOD" in
   node)
-    alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
-    alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
-    alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
-    alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
+    # node doesn't make it easy to deal with stdin, so we pass it as an argument with xargs -0
+    function pp_json() {
+      xargs -0 node -e 'console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));'
+    }
+    function is_json() {
+      xargs -0 node -e '
+        try {
+          json = JSON.parse(process.argv[1]);
+          console.log("true");
+          process.exit(0);
+        } catch (e) {
+          console.log("false");
+          process.exit(1);
+        }
+      '
+    }
+    function urlencode_json() {
+      xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"
+    }
+    function urldecode_json() {
+      xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"
+    }
   ;;
   python)
-    alias pp_json='python -c "import sys; del sys.path[0]; import runpy; runpy._run_module_as_main(\"json.tool\")"'
-    alias is_json='python -c "
+    function pp_json() {
+      python -c 'import sys; del sys.path[0]; import runpy; runpy._run_module_as_main("json.tool")'
+    }
+    function is_json() {
+      python -c '
 import sys; del sys.path[0];
-import json;
-try: 
-    json.loads(sys.stdin.read())
-except ValueError, e: 
-    print False
-else:
-    print True
-sys.exit(0)"'
-    alias urlencode_json='python -c "
+import json
+try:
+  json.loads(sys.stdin.read())
+  print("true"); sys.exit(0)
+except ValueError:
+  print("false"); sys.exit(1)
+      '
+    }
+    function urlencode_json() {
+      python -c '
 import sys; del sys.path[0];
-import urllib, json;
-print urllib.quote_plus(sys.stdin.read())
-sys.exit(0)"'
-    alias urldecode_json='python -c "
+from urllib.parse import quote_plus
+print(quote_plus(sys.stdin.read()))
+      '
+    }
+    function urldecode_json() {
+      python -c '
 import sys; del sys.path[0];
-import urllib, json;
-print urllib.unquote_plus(sys.stdin.read())
-sys.exit(0)"'
+from urllib.parse import unquote_plus
+print(unquote_plus(sys.stdin.read()))
+      '
+    }
   ;;
   ruby)
-    alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
-    alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
-    alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
-    alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
+    function pp_json() {
+      ruby -e '
+        require "json"
+        require "yaml"
+        puts JSON.parse(STDIN.read).to_yaml
+      '
+    }
+    function is_json() {
+      ruby -e '
+        require "json"
+        begin
+          puts !!JSON.parse(STDIN.read); exit(0)
+        rescue JSON::ParserError
+          puts false; exit(1)
+        end
+      '
+    }
+    function urlencode_json() {
+      ruby -e 'require "cgi"; puts CGI.escape(STDIN.read)'
+    }
+    function urldecode_json() {
+      ruby -e 'require "cgi"; puts CGI.unescape(STDIN.read)'
+    }
   ;;
 esac
 

From 7ded6752fd34c513b0110b236c2ebd4fbbcd1a6f Mon Sep 17 00:00:00 2001
From: Eduardo Flores <eduardofv@gmail.com>
Date: Fri, 10 Sep 2021 17:52:00 -0500
Subject: [PATCH 137/591] feat(jsontools): add tools to pretty print json-lines
 (ndjson) (#10176)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/jsontools/README.md            | 47 +++++++++++++++++++++-----
 plugins/jsontools/jsontools.plugin.zsh | 10 +++++-
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index 1fa2b8eed..6a2740014 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -17,32 +17,63 @@ Usage is simple... just take your json data and pipe it into the appropriate jso
 - `urlencode_json`: returns a url encoded string for the given json.
 - `urldecode_json`: returns decoded json for the given url encoded string.
 
+### Supports NDJSON (Newline Delimited JSON)
+
+The plugin also supports [NDJSON](http://ndjson.org/) input, which means all functions
+have an alternative function that reads and processes the input line by line. These
+functions have the same name except using `ndjson` instead of `json`:
+
+> `pp_ndjson`, `is_ndjson`, `urlencode_ndjson`, `urldecode_ndjson`.
+
 ### Examples
 
 - **pp_json**:
 
-```sh
+```console
 # curl json data and pretty print the results
 curl https://coderwall.com/bobwilliams.json | pp_json
 ```
 
 - **is_json**:
 
-```sh
-# Validate if file's content conforms to a valid JSON schema
-less data.json | is_json
+```console
+# validate if file's content conforms to a valid JSON schema
+$ is_json < data.json
+true
+# shows true / false and returns the proper exit code
+$ echo $?
+0
 ```
 
 - **urlencode_json**:
 
-```sh
+```console
 # json data directly from the command line
-echo '{"b":2, "a":1}' | urlencode_json
+$ echo '{"b":2, "a":1}' | urlencode_json
+%7B%22b%22:2,%20%22a%22:1%7D
 ```
 
 - **urldecode_json**:
 
-```sh
+```console
 # url encoded string to decode
-echo '%7B%22b%22:2,%20%22a%22:1%7D%0A' | urldecode_json
+$ echo '%7B%22b%22:2,%20%22a%22:1%7D' | urldecode_json
+{"b":2, "a":1}
+```
+
+- **pp_ndjson**:
+
+```console
+# echo two separate json objects and pretty print both
+$ echo '{"a": "b"}\n{"c": [1,2,3]}' | pp_ndjson
+{
+    "a": "b"
+}
+{
+    "c": [
+        1,
+        2,
+        3
+    ]
+}
 ```
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index b518288ad..ed45cfa8e 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -101,5 +101,13 @@ print(unquote_plus(sys.stdin.read()))
     }
   ;;
 esac
-
 unset JSONTOOLS_METHOD
+
+## Add NDJSON support
+
+function {pp,is,urlencode,urldecode}_ndjson() {
+  local json jsonfunc="${0//ndjson/json}"
+  while read -r json; do
+    $jsonfunc <<< "$json"
+  done
+}

From 098bcda6910aa2f734fb0ad59ac089157a239c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 9 Sep 2021 12:57:59 +0200
Subject: [PATCH 138/591] feat(update): allow updating from branch set up on
 install

Closes #8788

Co-authored-by: Nikolas Garofil <nikolas@garofil.be>
---
 tools/install.sh | 42 ++++++++++++++++++++++--------------------
 tools/upgrade.sh | 17 +++++++++++++++--
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index cfc2808fe..510f83ce8 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -53,7 +53,7 @@ KEEP_ZSHRC=${KEEP_ZSHRC:-no}
 
 
 command_exists() {
-	command -v "$@" >/dev/null 2>&1
+  command -v "$@" >/dev/null 2>&1
 }
 
 fmt_error() {
@@ -65,27 +65,27 @@ fmt_underline() {
 }
 
 fmt_code() {
-  # shellcheck disable=SC2016 # backtic in single-quote
+  # shellcheck disable=SC2016 # backtick in single-quote
   printf '`\033[38;5;247m%s%s`\n' "$*" "$RESET"
 }
 
 setup_color() {
-	# Only use colors if connected to a terminal
-	if [ -t 1 ]; then
-		RED=$(printf '\033[31m')
-		GREEN=$(printf '\033[32m')
-		YELLOW=$(printf '\033[33m')
-		BLUE=$(printf '\033[34m')
-		BOLD=$(printf '\033[1m')
-		RESET=$(printf '\033[m')
-	else
-		RED=""
-		GREEN=""
-		YELLOW=""
-		BLUE=""
-		BOLD=""
-		RESET=""
-	fi
+  # Only use colors if connected to a terminal
+  if [ -t 1 ]; then
+    RED=$(printf '\033[31m')
+    GREEN=$(printf '\033[32m')
+    YELLOW=$(printf '\033[33m')
+    BLUE=$(printf '\033[34m')
+    BOLD=$(printf '\033[1m')
+    RESET=$(printf '\033[m')
+  else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    BOLD=""
+    RESET=""
+  fi
 }
 
 setup_ohmyzsh() {
@@ -114,6 +114,8 @@ setup_ohmyzsh() {
     -c fsck.zeroPaddedFilemode=ignore \
     -c fetch.fsck.zeroPaddedFilemode=ignore \
     -c receive.fsck.zeroPaddedFilemode=ignore \
+    -c oh-my-zsh.remote=origin \
+    -c oh-my-zsh.branch="$BRANCH" \
     --depth=1 --branch "$BRANCH" "$REMOTE" "$ZSH" || {
     fmt_error "git clone of oh-my-zsh repo failed"
     exit 1
@@ -157,9 +159,9 @@ setup_zshrc() {
   sed "/^export ZSH=/ c\\
 export ZSH=\"$ZSH\"
 " "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
-	mv -f ~/.zshrc-omztemp ~/.zshrc
+  mv -f ~/.zshrc-omztemp ~/.zshrc
 
-	echo
+  echo
 }
 
 setup_shell() {
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 7dec398fd..1424d1433 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -66,10 +66,20 @@ git config rebase.autoStash true
 
 local ret=0
 
+# repository settings
+remote=${"$(git config --local oh-my-zsh.remote)":-origin}
+branch=${"$(git config --local oh-my-zsh.branch)":-master}
+
+# repository state
+last_head=$(git symbolic-ref --quiet --short HEAD || git rev-parse HEAD)
+# checkout update branch
+git checkout -q "$branch" -- || exit 1
+# branch commit before update (used in changelog)
+last_commit=$(git rev-parse "$branch")
+
 # Update Oh My Zsh
 printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
-last_commit=$(git rev-parse HEAD)
-if git pull --rebase --stat origin master; then
+if git pull --rebase --stat $remote $branch; then
   # Check if it was really updated or not
   if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
     message="Oh My Zsh is already at the latest version."
@@ -103,6 +113,9 @@ else
   printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'
 fi
 
+# go back to HEAD previous to update
+git checkout -q "$last_head" --
+
 # Unset git-config values set just for the upgrade
 case "$resetAutoStash" in
   "") git config --unset rebase.autoStash ;;

From 3e4b520190f1e4aaced9267bd5dcde59b3d0211f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 22 Sep 2021 10:36:28 +0200
Subject: [PATCH 139/591] refactor(django)!: deprecate plugin in favor of Zsh's
 django completion

BREAKING CHANGE: Zsh already provides completion for the `django-admin` and `manage.py`
commands, which is substantially better than the one provided by this plugin. We're
therefore deprecating this plugin and we will remove it in the near future.
---
 plugins/django/README.md         | 38 ++++++--------------------------
 plugins/django/django.plugin.zsh |  3 +++
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/plugins/django/README.md b/plugins/django/README.md
index 1740e55e5..cfab43980 100644
--- a/plugins/django/README.md
+++ b/plugins/django/README.md
@@ -1,36 +1,12 @@
 # Django plugin
 
-This plugin adds completion and hints for the [Django Project](https://www.djangoproject.com/) `manage.py` commands
-and options.
+This plugin adds completion for the [Django Project](https://www.djangoproject.com/) commands
+(`manage.py`, `django-admin`, ...).
 
-To use it, add `django` to the plugins array in your zshrc file:
+## Deprecation (2021-09-22)
 
-```zsh
-plugins=(... django)
-```
+The plugin used to provide completion for `./manage.py` and `django-admin`, but Zsh already provides
+a better, more extensive completion for those, so this plugin is no longer needed.
 
-## Usage
-
-```zsh
-$> python manage.py (press <TAB> here)
-```
-
-Would result in:
-
-```zsh
-cleanup                    -- remove old data from the database
-compilemessages            -- compile .po files to .mo for use with gettext
-createcachetable           -- creates table for SQL cache backend
-createsuperuser            -- create a superuser
-dbshell                    -- run command-line client for the current database
-diffsettings               -- display differences between the current settings and Django defaults
-dumpdata                   -- output contents of database as a fixture
-flush                      -- execute 'sqlflush' on the current database
-inspectdb                  -- output Django model module for tables in database
-loaddata                   -- install the named fixture(s) in the database
-makemessages               -- pull out all strings marked for translation
-reset                      -- executes 'sqlreset' for the given app(s)
-runfcgi                    -- run this project as a fastcgi
-runserver                  -- start a lightweight web server for development
-...
-```
+Right now a warning message is shown, but in the near future the plugin will stop working altogether.
+So you can remove it from your plugins and you'll automatically start using Zsh's django completion.
diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index c2d00c171..a07a30889 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -402,3 +402,6 @@ compdef _managepy django
 compdef _managepy django-admin
 compdef _managepy django-admin.py
 compdef _managepy django-manage
+
+print -P "%F{yellow}The django plugin is deprecated in favor of Zsh's Django completion.
+%BPlease remove it from your plugins to stop using it.%b%f"

From 16de51404773a5e849c25a95e7612e212e7256a7 Mon Sep 17 00:00:00 2001
From: Simon Rogers <webdev@centralblue.co.uk>
Date: Thu, 5 Nov 2020 10:40:45 +0000
Subject: [PATCH 140/591] feat(lib): allow setting custom completion dots
 sequence (#9424)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #9424
Closes #9703

Co-authored-by: mortezadadgar <mortezadadgar97@gmail.com>
Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 lib/completion.zsh           | 7 +++++--
 templates/zshrc.zsh-template | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index ebaab0856..2c5695487 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -58,9 +58,12 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
-if [[ $COMPLETION_WAITING_DOTS = true ]]; then
+if [[ ${COMPLETION_WAITING_DOTS:-false} != false ]]; then
   expand-or-complete-with-dots() {
-    print -Pn "%F{red}…%f"
+    # use $COMPLETION_WAITING_DOTS either as toggle or as the sequence to show
+    [[ $COMPLETION_WAITING_DOTS = true ]] && COMPLETION_WAITING_DOTS="%F{red}…%f"
+    # turn off line wrapping and print prompt-expanded "dot" sequence
+    printf '\e[?7l%s\e[?7h' "${(%)COMPLETION_WAITING_DOTS}"
     zle expand-or-complete
     zle redisplay
   }
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 65d5ea65b..4a998c2fc 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -45,8 +45,9 @@ ZSH_THEME="robbyrussell"
 # ENABLE_CORRECTION="true"
 
 # Uncomment the following line to display red dots whilst waiting for completion.
-# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work)
-# See https://github.com/ohmyzsh/ohmyzsh/issues/5765
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
 # COMPLETION_WAITING_DOTS="true"
 
 # Uncomment the following line if you want to disable marking untracked files

From 5b3d2b2f0c02ef059fcbcbdb619b22318b8cc13a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 22 Sep 2021 11:58:23 +0200
Subject: [PATCH 141/591] Revert "feat(archlinux): add cleanup aliases to
 `yaourt` and `yay` (#10184)"

This reverts commit eba3be243f634a80ae8d8134bf88657afda71fbb.
---
 plugins/archlinux/README.md            | 4 ----
 plugins/archlinux/archlinux.plugin.zsh | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index d4706e220..d6b41ee40 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -143,8 +143,6 @@ upgrades were available. Use `pacman -Que` instead.
 | yaupd   | `yaourt -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | yaupg   | `yaourt -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | yasu    | `yaourt -Syua --no-confirm`       | Same as `yaupg`, but without confirmation                           |
-| yaclun  | `yaourt -Yc`                      | Remove unneeded installed packages                                  |
-| yaclf   | `yaourt -Scc`                     | Remove cache directories                                            |
 | upgrade[²](#f2) | `yaourt -Syu`             | Sync with repositories before upgrading packages                    |
 
 #### Yay[¹](#f1)
@@ -167,8 +165,6 @@ upgrades were available. Use `pacman -Que` instead.
 | yaupd   | `yay -Sy`                      | Update and refresh local package, ABS and AUR databases           |
 | yaupg   | `yay -Syu`                     | Sync with repositories before upgrading packages                  |
 | yasu    | `yay -Syu --no-confirm`        | Same as `yaupg`, but without confirmation                         |
-| yaclun  | `yay -Yc`                      | Remove unneeded installed packages                                |
-| yaclf   | `yay -Scc`                     | Remove cache directories                                          |
 | upgrade[²](#f2) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
 
 ---
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index d34a4cd96..c94fb8f6c 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -170,8 +170,6 @@ if (( $+commands[yaourt] )); then
   alias yainsd='yaourt -S --asdeps'
   alias yamir='yaourt -Syy'
   alias yaupd="yaourt -Sy"
-  alias yaclun='yaourt -Yc'
-  alias yaclf='yaourt -Scc'
   alias upgrade='yaourt -Syu'
 fi
 
@@ -192,8 +190,6 @@ if (( $+commands[yay] )); then
   alias yainsd='yay -S --asdeps'
   alias yamir='yay -Syy'
   alias yaupd="yay -Sy"
-  alias yaclun='yay -Yc'
-  alias yaclf='yay -Scc'
   alias upgrade='yay -Syu'
 fi
 

From d87f29f564286c4a233e454d8208b83b97b1366d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 23 Sep 2021 12:33:37 +0200
Subject: [PATCH 142/591] refactor(vim-interaction): clean up code and open
 gvim instance if none open (#10209)

Co-authored-by: Kevin Bader <keb@visotech.at>
---
 .../vim-interaction.plugin.zsh                | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 53ec453e8..b73f9b4da 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -4,8 +4,7 @@
 # Derek Wyatt (derek@{myfirstnamemylastname}.org
 # 
 
-function callvim
-{
+function callvim {
   if [[ $# == 0 ]]; then
     cat <<EOH
 usage: callvim [-b cmd] [-a cmd] [-n name] [file ... fileN]
@@ -19,11 +18,20 @@ EOH
     return 0
   fi
 
-  local cmd=""
-  local before="<esc>"
-  local after=""
-  # Look up the newest instance
+  # Look up the newest instance or start one
   local name="$(gvim --serverlist | tail -n 1)"
+  [[ -n "$name" ]] || {
+    # run gvim or exit if it fails
+    gvim || return $?
+
+    # wait for gvim instance to fully load
+    while name=$(gvim --serverlist) && [[ -z "$name" ]]; do
+      sleep 0.1
+    done
+  }
+
+  local before="<esc>" files after cmd
+
   while getopts ":b:a:n:" option
   do
     case $option in
@@ -36,22 +44,20 @@ EOH
     esac
   done
   shift $((OPTIND-1))
-  if [[ ${after#:} != $after && ${after%<cr>} == $after ]]; then
-    after="$after<cr>"
-  fi
-  if [[ ${before#:} != $before && ${before%<cr>} == $before ]]; then
-    before="$before<cr>"
-  fi
-  local files
-  if [[ $# -gt 0 ]]; then
-    # absolute path of files resolving symlinks (:A) and quoting special chars (:q)
-    files=':args! '"${@:A:q}<cr>"
-  fi
+
+  # If before or after commands begin with : and don't end with <cr>, append it
+  [[ ${after}  = :* && ${after}  != *\<cr\> ]] && after+="<cr>"
+  [[ ${before} = :* && ${before} != *\<cr\> ]] && before+="<cr>"
+  # Open files passed (:A means abs path resolving symlinks, :q means quoting special chars)
+  [[ $# -gt 0 ]] && files=':args! '"${@:A:q}<cr>"
+  # Pass the built vim command to gvim
   cmd="$before$files$after"
-  gvim --servername "$name" --remote-send "$cmd"
-  if typeset -f postCallVim > /dev/null; then
-    postCallVim
-  fi
+
+  # Run the gvim command
+  gvim --servername "$name" --remote-send "$cmd" || return $?
+
+  # Run postCallVim if defined (maybe to bring focus to gvim, see README)
+  (( ! $+functions[postCallVim] )) || postCallVim
 }
 
 alias v=callvim

From 57e8c959a02ca8c2aeda3980480a50a1f82f6953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 23 Sep 2021 18:28:34 +0200
Subject: [PATCH 143/591] style(installer): use rainbow logo and polish success
 message (#10211)

---
 tools/install.sh | 155 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 125 insertions(+), 30 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 510f83ce8..7704107c8 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -56,22 +56,115 @@ command_exists() {
   command -v "$@" >/dev/null 2>&1
 }
 
+# The [ -t 1 ] check only works when the function is not called from
+# a subshell (like in `$(...)` or `(...)`, so this hack redefines the
+# function at the top level to always return false when stdout is not
+# a tty.
+if [ -t 1 ]; then
+  is_tty() {
+    true
+  }
+else
+  is_tty() {
+    false
+  }
+fi
+
+# This function uses the logic from supports-hyperlinks[1][2], which is
+# made by Kat Marchán (@zkat) and licensed under the Apache License 2.0.
+# [1] https://github.com/zkat/supports-hyperlinks
+# [2] https://crates.io/crates/supports-hyperlinks
+#
+# Copyright (c) 2021 Kat Marchán
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+supports_hyperlinks() {
+  # $FORCE_HYPERLINK must be set and be non-zero (this acts as a logic bypass)
+  if [ -n "$FORCE_HYPERLINK" ]; then
+    [ "$FORCE_HYPERLINK" != 0 ]
+    return $?
+  fi
+
+  # If stdout is not a tty, it doesn't support hyperlinks
+  is_tty || return 1
+
+  # DomTerm terminal emulator (domterm.org)
+  if [ -n "$DOMTERM" ]; then
+    return 0
+  fi
+
+  # VTE-based terminals above v0.50 (Gnome Terminal, Guake, ROXTerm, etc)
+  if [ -n "$VTE_VERSION" ]; then
+    [ $VTE_VERSION -ge 5000 ]
+    return $?
+  fi
+
+  # If $TERM_PROGRAM is set, these terminals support hyperlinks
+  case "$TERM_PROGRAM" in
+  Hyper|iTerm.app|terminology|WezTerm) return 0 ;;
+  esac
+
+  # kitty supports hyperlinks
+  if [ "$TERM" = xterm-kitty ]; then
+    return 0
+  fi
+
+  # Windows Terminal or Konsole also support hyperlinks
+  if [ -n "$WT_SESSION" ] || [ -n "$KONSOLE_VERSION" ]; then
+    return 0
+  fi
+
+  return 1
+}
+
+fmt_link() {
+  # $1: text, $2: url, $3: fallback mode
+  if supports_hyperlinks; then
+    printf '\033]8;;%s\a%s\033]8;;\a\n' "$2" "$1"
+    return
+  fi
+
+  case "$3" in
+  --text) printf '%s\n' "$1" ;;
+  --url|*) fmt_underline "$2" ;;
+  esac
+}
+
+fmt_underline() {
+  is_tty && printf '\033[4m%s\033[24m\n' "$*" || printf '%s\n' "$*"
+}
+
+# shellcheck disable=SC2016 # backtick in single-quote
+fmt_code() {
+  is_tty && printf '`\033[2m%s\033[22m`\n' "$*" || printf '`%s`\n' "$*"
+}
+
 fmt_error() {
   printf '%sError: %s%s\n' "$BOLD$RED" "$*" "$RESET" >&2
 }
 
-fmt_underline() {
-  printf '\033[4m%s\033[24m\n' "$*"
-}
-
-fmt_code() {
-  # shellcheck disable=SC2016 # backtick in single-quote
-  printf '`\033[38;5;247m%s%s`\n' "$*" "$RESET"
-}
-
 setup_color() {
   # Only use colors if connected to a terminal
-  if [ -t 1 ]; then
+  if is_tty; then
+    RAINBOW="
+      $(printf '\033[38;5;196m')
+      $(printf '\033[38;5;202m')
+      $(printf '\033[38;5;226m')
+      $(printf '\033[38;5;082m')
+      $(printf '\033[38;5;021m')
+      $(printf '\033[38;5;093m')
+      $(printf '\033[38;5;163m')
+    "
     RED=$(printf '\033[31m')
     GREEN=$(printf '\033[32m')
     YELLOW=$(printf '\033[33m')
@@ -79,6 +172,7 @@ setup_color() {
     BOLD=$(printf '\033[1m')
     RESET=$(printf '\033[m')
   else
+    RAINBOW=""
     RED=""
     GREEN=""
     YELLOW=""
@@ -243,6 +337,26 @@ EOF
   echo
 }
 
+# shellcheck disable=SC2183  # printf string has more %s than arguments ($RAINBOW expands to multiple arguments)
+print_success() {
+  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET
+  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n' $RAINBOW $RESET
+  printf '%s / __ \%s/ __ \  %s / __ `__ \%s/ / / / %s /_  / %s/ ___/%s __ \ %s\n' $RAINBOW $RESET
+  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n' $RAINBOW $RESET
+  printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RAINBOW $RESET
+  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s....is now installed!%s\n' $RAINBOW $GREEN $RESET
+  printf '\n'
+  printf '\n'
+  printf "%s %s %s\n" "Before you scream ${BOLD}${YELLOW}Oh My Zsh!${RESET} look over the" \
+    "$(fmt_code "$(fmt_link ".zshrc" "file://$HOME/.zshrc" --text)")" \
+    "file to select plugins, themes, and options."
+  printf '\n'
+  printf '%s\n' "• Follow us on Twitter: $(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"
+  printf '%s\n' "• Join our Discord community: $(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
+  printf '%s\n' "• Get stickers, t-shirts, coffee mugs and more: $(fmt_link "Planet Argon Shop" https://shop.planetargon.com/collections/oh-my-zsh)"
+  printf '%s\n' $RESET
+}
+
 main() {
   # Run as unattended if stdin is not a tty
   if [ ! -t 0 ]; then
@@ -293,26 +407,7 @@ EOF
   setup_zshrc
   setup_shell
 
-  printf %s "$GREEN"
-  cat <<'EOF'
-         __                                     __
-  ____  / /_     ____ ___  __  __   ____  _____/ /_
- / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \
-/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / /
-\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/
-                        /____/                       ....is now installed!
-
-
-EOF
-  cat <<EOF
-Before you scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
-
-• Follow us on Twitter: $(fmt_underline https://twitter.com/ohmyzsh)
-• Join our Discord server: $(fmt_underline https://discord.gg/ohmyzsh)
-• Get stickers, shirts, coffee mugs and other swag: $(fmt_underline https://shop.planetargon.com/collections/oh-my-zsh)
-
-EOF
-  printf %s "$RESET"
+  print_success
 
   if [ $RUNZSH = no ]; then
     echo "${YELLOW}Run zsh to try it out.${RESET}"

From 2ea1fa6cbfc6340463906dfed589d5c976a10abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 24 Sep 2021 16:50:00 +0200
Subject: [PATCH 144/591] fix(init): fix `division by 0` error (#10213)

Fixes #10213
---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 83c8f8057..545d980f0 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -14,7 +14,7 @@ fi
 
 # Create cache and completions dir and add to $fpath
 mkdir -p "$ZSH_CACHE_DIR/completions"
-(( ${fpath[(Ie)$ZSH_CACHE_DIR/completions]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then

From 93ad3a88214b95f571e03c21f7d9bd76f9110938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Sep 2021 11:46:42 +0200
Subject: [PATCH 145/591] docs(vi-mode): document `$KEYTIMEOUT` issue (#9588)

Closes #9588
---
 plugins/vi-mode/README.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index b59d5f279..46bb6d070 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -64,7 +64,7 @@ NOTE: some of these key bindings are set by zsh by default when using a vi-mode
 
 - `vv`     : Edit current command line in Vim
 
-NOTE: this used to be bound to `v`. That is now the default (`visual-mode`)
+NOTE: this used to be bound to `v`. That is now the default (`visual-mode`).
 
 ### Movement
 
@@ -107,3 +107,21 @@ NOTE: this used to be bound to `v`. That is now the default (`visual-mode`)
 - `R`           : Enter replace mode: Each character replaces existing one
 - `x`           : Delete `count` characters under and after the cursor
 - `X`           : Delete `count` characters before the cursor
+
+## Known issues
+
+### Low `$KEYTIMEOUT`
+
+A low `$KEYTIMEOUT` value (< 15) means that key bindings that need multiple characters,
+like `vv`, will be very difficult to trigger. `$KEYTIMEOUT` controls the number of
+milliseconds that must pass before a key press is read and the appropriate key binding
+is triggered. For multi-character key bindings, the key presses need to happen before
+the timeout is reached, so on low timeouts the key press happens too slow, and therefore
+another key binding is triggered.
+
+We recommend either setting `$KEYTIMEOUT` to a higher value, or remapping the key bindings
+that you want to trigger to a keyboard sequence. For example:
+
+```zsh
+bindkey -M vicmd 'V' edit-command-line # this remaps `vv` to `V` (but overrides `visual-mode`)
+```

From 33c86fe80b5d838b3d3dd454c35aa94f4a38b3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Sep 2021 11:29:42 +0200
Subject: [PATCH 146/591] fix(init): detect and abort on non-zsh shell
 execution of Oh My Zsh

---
 oh-my-zsh.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 545d980f0..bf5902fc8 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,3 +1,11 @@
+# Protect against non-zsh execution of Oh My Zsh (use POSIX syntax here)
+[ -n "$ZSH_VERSION" ] || {
+  # ANSI (\033[<code>m): 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red
+  printf "\033[1;31mERROR:\033[22m Oh My Zsh can't be loaded from: \033[1m${0#-}\033[22m. " >&2
+  printf "You need to run \033[1;4mzsh\033[22;24m instead.\033[0m\n" >&2
+  return 1
+}
+
 # If ZSH is not defined, use the current script's directory.
 [[ -z "$ZSH" ]] && export ZSH="${${(%):-%x}:a:h}"
 

From 4ae5bdebc36068a53fbc38a4e0d6d97e49f5b56c Mon Sep 17 00:00:00 2001
From: April King <april@pokeinthe.io>
Date: Tue, 28 Sep 2021 04:40:31 -0500
Subject: [PATCH 147/591] fix(osx): only run Preview.app in `man-preview` if
 man page exists (#10222)

---
 plugins/osx/osx.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 7842e9f73..5455d7c5f 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -219,7 +219,8 @@ function quick-look() {
 }
 
 function man-preview() {
-  man -t "$@" | open -f -a Preview
+  # Don't let Preview.app steal focus if the man page doesn't exist
+  man -w "$@" &>/dev/null && man -t "$@" | open -f -a Preview || man "$@"
 }
 compdef _man man-preview
 

From a42db120856091257c7545473a20fbc3e295c633 Mon Sep 17 00:00:00 2001
From: nowshed-imran <now.im.627@gmail.com>
Date: Sat, 6 Mar 2021 16:50:12 +0600
Subject: [PATCH 148/591] refactor(archlinux)!: remove `yaourt` support (#9713)

BREAKING CHANGE: `yaourt` is no longer maintained nor available as a package.
Use `pacman` or one of the other maintained AUR helpers.

Closes #9713
---
 plugins/archlinux/README.md            | 46 ++++++--------------------
 plugins/archlinux/archlinux.plugin.zsh | 23 +------------
 2 files changed, 11 insertions(+), 58 deletions(-)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index d6b41ee40..c8ec1de1e 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -32,7 +32,7 @@ plugins=(... archlinux)
 | pacfiles     | `pacman -F`                            | Search package file names for matching strings                   |
 | pacls        | `pacman -Ql`                           | List files in a package                                          |
 | pacown       | `pacman -Qo`                           | Show which package owns a file                                   |
-| upgrade[²](#f2) | `sudo pacman -Syu`                  | Sync with repositories before upgrading packages                 |
+| upgrade[¹](#f1) | `sudo pacman -Syu`                  | Sync with repositories before upgrading packages                 |
 
 | Function       | Description                                               |
 |----------------|-----------------------------------------------------------|
@@ -73,7 +73,7 @@ upgrades were available. Use `pacman -Que` instead.
 | auupd   | `sudo aura -Sy`                                 | Update and refresh local package, ABS and AUR databases                 |
 | auupg   | `sudo sh -c "aura -Syu              && aura -Au"` | Sync with repositories before upgrading all packages (from AUR too)   |
 | ausu    | `sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"` | Same as `auupg`, but without confirmation                |
-| upgrade[²](#f2) | `sudo aura -Syu`                        | Sync with repositories before upgrading packages                        |
+| upgrade[¹](#f1) | `sudo aura -Syu`                        | Sync with repositories before upgrading packages                        |
 
 | Function        | Description                                                         |
 |-----------------|---------------------------------------------------------------------|
@@ -99,7 +99,7 @@ upgrades were available. Use `pacman -Que` instead.
 | paupd   | `pacaur -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | paupg   | `pacaur -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | pasu    | `pacaur -Syua --no-confirm`       | Same as `paupg`, but without confirmation                           |
-| upgrade[²](#f2) | `pacaur -Syu`             | Sync with repositories before upgrading packages                    |
+| upgrade[¹](#f1) | `pacaur -Syu`             | Sync with repositories before upgrading packages                    |
 
 #### Trizen
 
@@ -121,31 +121,9 @@ upgrades were available. Use `pacman -Que` instead.
 | trupd   | `trizen -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | trupg   | `trizen -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | trsu    | `trizen -Syua --no-confirm`       | Same as `trupg`, but without confirmation                           |
-| upgrade[²](#f2) | `trizen -Syu`             | Sync with repositories before upgrading packages                    |
+| upgrade[¹](#f1) | `trizen -Syu`             | Sync with repositories before upgrading packages                    |
 
-#### Yaourt[¹](#f1)
-
-| Alias   | Command                           | Description                                                         |
-|---------|-----------------------------------|---------------------------------------------------------------------|
-| yaconf  | `yaourt -C`                       | Fix all configuration files with vimdiff                            |
-| yain    | `yaourt -S`                       | Install packages from the repositories                              |
-| yains   | `yaourt -U`                       | Install a package from a local file                                 |
-| yainsd  | `yaourt -S --asdeps`              | Install packages as dependencies of another package                 |
-| yaloc   | `yaourt -Qi`                      | Display information about a package in the local database           |
-| yalocs  | `yaourt -Qs`                      | Search for packages in the local database                           |
-| yalst   | `yaourt -Qe`                      | List installed packages including from AUR (tagged as "local")      |
-| yamir   | `yaourt -Syy`                     | Force refresh of all package lists after updating mirrorlist        |
-| yaorph  | `yaourt -Qtd`                     | Remove orphans using yaourt                                         |
-| yare    | `yaourt -R`                       | Remove packages, keeping its settings and dependencies              |
-| yarem   | `yaourt -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
-| yarep   | `yaourt -Si`                      | Display information about a package in the repositories             |
-| yareps  | `yaourt -Ss`                      | Search for packages in the repositories                             |
-| yaupd   | `yaourt -Sy`                      | Update and refresh local package, ABS and AUR databases             |
-| yaupg   | `yaourt -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
-| yasu    | `yaourt -Syua --no-confirm`       | Same as `yaupg`, but without confirmation                           |
-| upgrade[²](#f2) | `yaourt -Syu`             | Sync with repositories before upgrading packages                    |
-
-#### Yay[¹](#f1)
+#### Yay
 
 | Alias   | Command                        | Description                                                       |
 |---------|--------------------------------|-------------------------------------------------------------------|
@@ -165,23 +143,19 @@ upgrades were available. Use `pacman -Que` instead.
 | yaupd   | `yay -Sy`                      | Update and refresh local package, ABS and AUR databases           |
 | yaupg   | `yay -Syu`                     | Sync with repositories before upgrading packages                  |
 | yasu    | `yay -Syu --no-confirm`        | Same as `yaupg`, but without confirmation                         |
-| upgrade[²](#f2) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
+| upgrade[¹](#f1) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
 
 ---
 
 <span id="f1">¹</span>
-Yay and Yaourt aliases overlap. If both are installed, yay will take precedence.
-
-<span id="f2">²</span>
 The `upgrade` alias is set for all package managers. Its value will depend on
 whether the package manager is installed, checked in the following order:
 
 1. `yay`
-2. `yaourt`
-3. `trizen`
-4. `pacaur`
-5. `aura`
-6. `pacman`
+2. `trizen`
+3. `pacaur`
+4. `aura`
+5. `pacman`
 
 ## Contributors
 
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index c94fb8f6c..0c5782d98 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -104,7 +104,7 @@ if (( $+commands[aura] )); then
   alias auras='aura -As --both'
   alias auupd="sudo aura -Sy"
   alias auupg='sudo sh -c "aura -Syu              && aura -Au"'
-  alias ausu='sudo  sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
+  alias ausu='sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
   alias upgrade='sudo aura -Syu'
 
   # extra bonus specially for aura
@@ -153,26 +153,6 @@ if (( $+commands[trizen] )); then
   alias upgrade='trizen -Syu'
 fi
 
-if (( $+commands[yaourt] )); then
-  alias yaconf='yaourt -C'
-  alias yaupg='yaourt -Syua'
-  alias yasu='yaourt -Syua --noconfirm'
-  alias yain='yaourt -S'
-  alias yains='yaourt -U'
-  alias yare='yaourt -R'
-  alias yarem='yaourt -Rns'
-  alias yarep='yaourt -Si'
-  alias yareps='yaourt -Ss'
-  alias yaloc='yaourt -Qi'
-  alias yalocs='yaourt -Qs'
-  alias yalst='yaourt -Qe'
-  alias yaorph='yaourt -Qtd'
-  alias yainsd='yaourt -S --asdeps'
-  alias yamir='yaourt -Syy'
-  alias yaupd="yaourt -Sy"
-  alias upgrade='yaourt -Syu'
-fi
-
 if (( $+commands[yay] )); then
   alias yaconf='yay -Pg'
   alias yaupg='yay -Syu'
@@ -192,4 +172,3 @@ if (( $+commands[yay] )); then
   alias yaupd="yay -Sy"
   alias upgrade='yay -Syu'
 fi
-

From b37114b4d5804f8125d3951efde6a1b9d39610d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Sep 2021 18:08:12 +0200
Subject: [PATCH 149/591] refactor(emacs): remove dependency on
 `require_tool.sh` and clean up code style

---
 plugins/emacs/emacs.plugin.zsh | 90 +++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 0b602d12a..027c7550f 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -9,57 +9,55 @@
 # - You can share opened buffered across opened frames.
 # - Configuration changes made at runtime are applied to all frames.
 
+# Require emacs version to be minimum 24
+autoload -Uz is-at-least
+is-at-least 24 "${${(Az)"$(emacsclient --version 2>/dev/null)"}[2]}" || return 0
 
-if "$ZSH/tools/require_tool.sh" emacsclient 24 2>/dev/null ; then
-    export EMACS_PLUGIN_LAUNCHER="$ZSH/plugins/emacs/emacsclient.sh"
+# Path to custom emacsclient launcher
+export EMACS_PLUGIN_LAUNCHER="${0:A:h}/emacsclient.sh"
 
-    # set EDITOR if not already defined.
-    export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
+# set EDITOR if not already defined.
+export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
 
-    alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait"
-    alias e=emacs
-    # open terminal emacsclient
-    alias te="$EMACS_PLUGIN_LAUNCHER -nw"
+alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait"
+alias e=emacs
+# open terminal emacsclient
+alias te="$EMACS_PLUGIN_LAUNCHER -nw"
 
-    # same than M-x eval but from outside Emacs.
-    alias eeval="$EMACS_PLUGIN_LAUNCHER --eval"
-    # create a new X frame
-    alias eframe='emacsclient --alternate-editor "" --create-frame'
+# same than M-x eval but from outside Emacs.
+alias eeval="$EMACS_PLUGIN_LAUNCHER --eval"
+# create a new X frame
+alias eframe='emacsclient --alternate-editor "" --create-frame'
 
-    # Emacs ANSI Term tracking
-    if [[ -n "$INSIDE_EMACS" ]]; then
-        chpwd_emacs() { print -P "\033AnSiTc %d"; }
-        print -P "\033AnSiTc %d"    # Track current working directory
-        print -P "\033AnSiTu %n"    # Track username        
+# Emacs ANSI Term tracking
+if [[ -n "$INSIDE_EMACS" ]]; then
+  chpwd_emacs() { print -P "\033AnSiTc %d"; }
+  print -P "\033AnSiTc %d"    # Track current working directory
+  print -P "\033AnSiTu %n"    # Track username
 
-        # add chpwd hook
-        autoload -Uz add-zsh-hook
-        add-zsh-hook chpwd chpwd_emacs
-    fi    
-
-    # Write to standard output the path to the file
-    # opened in the current buffer.
-    function efile {
-        local cmd="(buffer-file-name (window-buffer))"
-        "$EMACS_PLUGIN_LAUNCHER" --eval "$cmd" | tr -d \"
-    }
-
-    # Write to standard output the directory of the file
-    # opened in the the current buffer
-    function ecd {
-        local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
-                     (if buf-name (file-name-directory buf-name)))"
-
-        local dir="$($EMACS_PLUGIN_LAUNCHER --eval $cmd | tr -d \")"
-        if [ -n "$dir" ] ;then
-            echo "$dir"
-        else
-            echo "can not deduce current buffer filename." >/dev/stderr
-            return 1
-        fi
-    }
+  # add chpwd hook
+  autoload -Uz add-zsh-hook
+  add-zsh-hook chpwd chpwd_emacs
 fi
 
-## Local Variables:
-## mode: sh
-## End:
+# Write to standard output the path to the file
+# opened in the current buffer.
+function efile {
+  local cmd="(buffer-file-name (window-buffer))"
+  local file="$("$EMACS_PLUGIN_LAUNCHER" --eval "$cmd" | tr -d \")"
+
+  if [[ -z "$file" ]]; then
+    echo "Can't deduce current buffer filename." >&2
+    return 1
+  fi
+
+  echo "$file"
+}
+
+# Write to standard output the directory of the file
+# opened in the the current buffer
+function ecd {
+  local file
+  file="$(efile)" || return $?
+  echo "${file:h}"
+}

From 27dcca5967082474229d5efafb941e0d5229c760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Sep 2021 10:10:43 +0200
Subject: [PATCH 150/591] refactor(emacs): simplify emacsclient wrapper code

---
 plugins/emacs/emacsclient.sh | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 04a2c2afd..0702d7a33 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -1,29 +1,27 @@
 #!/bin/sh
 
-_emacsfun()
-{
-    # get list of emacs frames.
-    frameslist=`emacsclient --alternate-editor '' --eval '(frame-list)' 2>/dev/null | egrep -o '(frame)+'`
+emacsfun() {
+  local frames="$(emacsclient --alternate-editor "" -n -e "(length (frame-list))" 2>/dev/null)"
 
-    if [ "$(echo "$frameslist" | sed -n '$=')" -ge 2 ] ;then
-        # prevent creating another X frame if there is at least one present.
-        emacsclient --alternate-editor "" "$@"
-    else
-        # Create one if there is no X window yet.
-        emacsclient --alternate-editor "" --create-frame "$@"
-    fi
+  # Only create another X frame if there isn't one present
+  if [ -z "$frames" -o "$frames" -lt 2 ]; then
+    emacsclient --alternate-editor "" --create-frame "$@"
+    return $?
+  fi
+
+  emacsclient --alternate-editor "" "$@"
 }
 
 
 # adopted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
 # If the second argument is - then write stdin to a tempfile and open the
 # tempfile. (first argument will be `--no-wait` passed in by the plugin.zsh)
-if [ "$#" -ge "2" -a "$2" = "-" ]
-then
-    tempfile="$(mktemp --tmpdir emacs-stdin-$USERNAME.XXXXXXX 2>/dev/null \
-                || mktemp -t emacs-stdin-$USERNAME)" # support BSD mktemp
-    cat - > "$tempfile"
-    _emacsfun --no-wait $tempfile
-else
-    _emacsfun "$@"
+if [ $# -ge 2 -a "$2" = "-" ]; then
+  tempfile="$(mktemp --tmpdir emacs-stdin-$USERNAME.XXXXXXX 2>/dev/null \
+    || mktemp -t emacs-stdin-$USERNAME)" # support BSD mktemp
+  cat - > "$tempfile"
+  emacsfun --no-wait "$tempfile"
+  return $?
 fi
+
+emacsfun "$@"

From 2acae3797b713db2520bb27e76f25d3de6cee48e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Sep 2021 12:30:29 +0200
Subject: [PATCH 151/591] fix(emacs): assess if there are open frames of the
 expected type

This change looks at the frame type of the open frames ('framep) and
looks if they're of the type requested based on the arguments passed
to emacsclient (-nw/-t/--tty require tty frames, otherwise we need
graphical frames).

NOTE: this code considers anything different than t as graphical
terminals, including MS-DOS types (pc). I don't have such a setup
to test if this is correct.
---
 plugins/emacs/emacsclient.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 0702d7a33..53a3a428a 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -1,10 +1,20 @@
 #!/bin/sh
 
 emacsfun() {
-  local frames="$(emacsclient --alternate-editor "" -n -e "(length (frame-list))" 2>/dev/null)"
+  local cmd frames
+
+  # Build the Emacs Lisp command to check for suitable frames
+  # See https://www.gnu.org/software/emacs/manual/html_node/elisp/Frames.html#index-framep
+  case "$*" in
+  *-t*|*--tty*|*-nw*) cmd="(memq 't (mapcar 'framep (frame-list)))" ;; # if != nil, there are tty frames
+  *) cmd="(delete 't (mapcar 'framep (frame-list)))" ;; # if != nil, there are graphical terminals (x, w32, ns)
+  esac
+
+  # Check if there are suitable frames
+  frames="$(emacsclient -a '' -n -e "$cmd" 2>/dev/null)"
 
   # Only create another X frame if there isn't one present
-  if [ -z "$frames" -o "$frames" -lt 2 ]; then
+  if [ -z "$frames" -o "$frames" = nil ]; then
     emacsclient --alternate-editor "" --create-frame "$@"
     return $?
   fi

From de76f7cb491c7d566dd94f161b5dbc32e93af914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Sep 2021 12:34:44 +0200
Subject: [PATCH 152/591] fix(emacs): correctly pass arguments to emacsclient
 when $2 is stdin

---
 plugins/emacs/emacsclient.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 53a3a428a..25efe0d68 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -22,16 +22,17 @@ emacsfun() {
   emacsclient --alternate-editor "" "$@"
 }
 
-
-# adopted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
+# Adapted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
 # If the second argument is - then write stdin to a tempfile and open the
 # tempfile. (first argument will be `--no-wait` passed in by the plugin.zsh)
 if [ $# -ge 2 -a "$2" = "-" ]; then
+  # Create a tempfile to hold stdin
   tempfile="$(mktemp --tmpdir emacs-stdin-$USERNAME.XXXXXXX 2>/dev/null \
     || mktemp -t emacs-stdin-$USERNAME)" # support BSD mktemp
+  # Redirect stdin to the tempfile
   cat - > "$tempfile"
-  emacsfun --no-wait "$tempfile"
-  return $?
+  # Reset $2 to the tempfile so that "$@" works as expected
+  set -- "$1" "$tempfile" "${@:3}"
 fi
 
 emacsfun "$@"

From 54e3e8ef54765bb5d4548864ff2d6cff75a33976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Sep 2021 17:19:25 +0200
Subject: [PATCH 153/591] fix(lib): fix automatic title abort inside Emacs
 (#10124)

Closes #10124

Co-authored-by: Paul Schorfheide <pschorf2@gmail.com>
Co-authored-by: Alastair Rankine <alastair@girtby.net>
---
 lib/termsupport.zsh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 33451ef1f..ef0d78895 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -10,7 +10,8 @@ function title {
   emulate -L zsh
   setopt prompt_subst
 
-  [[ "$INSIDE_EMACS" == *term* ]] && return
+  # Don't set the title if inside emacs, unless using vterm
+  [[ -n "$INSIDE_EMACS" && "$INSIDE_EMACS" != vterm ]] && return
 
   # if $2 is unset use $1 as default
   # if it is set and empty, leave it as is
@@ -29,12 +30,9 @@ function title {
         print -Pn "\e]2;${2:q}\a" # set window name
         print -Pn "\e]1;${1:q}\a" # set tab name
       else
-        # Try to use terminfo to set the title
-        # If the feature is available set title
-        if [[ -n "$terminfo[fsl]" ]] && [[ -n "$terminfo[tsl]" ]]; then
-          echoti tsl
-          print -Pn "$1"
-          echoti fsl
+        # Try to use terminfo to set the title if the feature is available
+        if (( ${+terminfo[fsl]} && ${+terminfo[tsl]} )); then
+          print -Pn "${terminfo[tsl]}$1${terminfo[fsl]}"
         fi
       fi
       ;;
@@ -105,10 +103,12 @@ function omz_termsupport_preexec {
   title '$CMD' '%100>...>$LINE%<<'
 }
 
-autoload -U add-zsh-hook
-add-zsh-hook precmd omz_termsupport_precmd
-add-zsh-hook preexec omz_termsupport_preexec
+autoload -Uz add-zsh-hook
 
+if [[ -z "$INSIDE_EMACS" || "$INSIDE_EMACS" = vterm ]]; then
+  add-zsh-hook precmd omz_termsupport_precmd
+  add-zsh-hook preexec omz_termsupport_preexec
+fi
 
 # Keep Apple Terminal.app's current working directory updated
 # Based on this answer: https://superuser.com/a/315029

From c7a55086e16c8f1895498a859a1ef2806fa1f612 Mon Sep 17 00:00:00 2001
From: Celestino Gomes <tinorj@gmail.com>
Date: Wed, 29 Sep 2021 13:07:25 -0300
Subject: [PATCH 154/591] feat(lib): don't correct `su` command arguments
 (#10214)

---
 lib/correction.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index c635236b5..4259d3418 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -9,6 +9,7 @@ if [[ "$ENABLE_CORRECTION" == "true" ]]; then
   alias mv='nocorrect mv'
   alias mysql='nocorrect mysql'
   alias sudo='nocorrect sudo'
+  alias su='nocorrect su'
 
   setopt correct_all
 fi

From 54783f66b8188297448bc725c578fdc7647e9fa0 Mon Sep 17 00:00:00 2001
From: Leon <82407168+sed-i@users.noreply.github.com>
Date: Wed, 29 Sep 2021 12:09:02 -0400
Subject: [PATCH 155/591] feat(juju): add plugin for Juju (juju.is) (#10075)

Co-authored-by: Jon Seager <jon@sgrs.uk>
---
 plugins/juju/README.md       | 117 ++++++++++++++++++++++++++++++++
 plugins/juju/juju.plugin.zsh | 127 +++++++++++++++++++++++++++++++++++
 2 files changed, 244 insertions(+)
 create mode 100644 plugins/juju/README.md
 create mode 100644 plugins/juju/juju.plugin.zsh

diff --git a/plugins/juju/README.md b/plugins/juju/README.md
new file mode 100644
index 000000000..49f8b0d47
--- /dev/null
+++ b/plugins/juju/README.md
@@ -0,0 +1,117 @@
+# juju plugin
+
+This plugin provides useful aliases and functions for [juju](https://juju.is/) (for TAB completion,
+refer to the [official repo](https://github.com/juju/juju/blob/develop/etc/bash_completion.d/juju)).
+
+To use this plugin, add `juju` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... juju)
+```
+
+## Aliases
+
+Naming convention:
+
+- `!` suffix: `--force --no-wait -y`.
+- `ds` suffix: `--destroy-storage`.
+
+### General
+
+| Alias  | Command                                     | Description                                            |
+|--------|---------------------------------------------|--------------------------------------------------------|
+| `jdl`  | `juju debug-log --ms`                       | Display log, with millisecond resolution               |
+| `jdlr` | `juju debug-log --ms --replay`              | Replay entire log                                      |
+| `jh`   | `juju help`                                 | Show help on a command or other topic                  |
+| `jssl` | `juju juju show-status-log`                 | Output past statuses for the specified entity          |
+| `jstj` | `juju status --format=json`                 | Show status in json format (more detailed)             |
+| `jst`  | `juju status --relations --storage --color` | Show status, including relations and storage, in color |
+
+### Bootstrap
+
+| Alias | Command                   | Description                               |
+|-------|---------------------------|-------------------------------------------|
+| `jb`  | `juju bootstrap`          | Initializing a Juju cloud environment     |
+| `jbm` | `juju bootstrap microk8s` | Initializing a MicroK8s cloud environment |
+
+### Controller
+
+| Alias    | Command                                                                               | Description                                                       |
+|----------|---------------------------------------------------------------------------------------|-------------------------------------------------------------------|
+| `jdc`    | `juju destroy-controller --destroy-all-models`                                        | Destroy a controller                                              |
+| `jdc!`   | `juju destroy-controller --destroy-all-models --force --no-wait -y`                   | Destroy a controller                                              |
+| `jdcds`  | `juju destroy-controller --destroy-all-models --destroy-storage`                      | Destroy a controller and associated storage                       |
+| `jdcds!` | `juju destroy-controller --destroy-all-models --destroy-storage --force --no-wait -y` | Destroy a controller and associated storage                       |
+| `jkc`    | `juju kill-controller -y -t 0`                                                        | Forcibly terminate all associated resources for a Juju controller |
+| `jsw`    | `juju switch`                                                                         | Select or identify the current controller and model               |
+
+### Model
+
+| Alias    | Command                                                     | Description                                           |
+|----------|-------------------------------------------------------------|-------------------------------------------------------|
+| `jam`    | `juju add-model`                                            | Add a hosted model                                    |
+| `jdm`    | `juju destroy-model`                                        | Non-recoverable, complete removal of a model          |
+| `jdm!`   | `juju destroy-model --force --no-wait -y`                   | Non-recoverable, complete removal of a model          |
+| `jdmds`  | `juju destroy-model --destroy-storage`                      | Non-recoverable, complete removal of a model          |
+| `jdmds!` | `juju destroy-model --destroy-storage --force --no-wait -y` | Non-recoverable, complete removal of a model          |
+| `jmc`    | `juju model-config`                                         | Display or set configuration values on a model        |
+| `jm`     | `juju models`                                               | List models a user can access on a controller         |
+| `jshm`   | `juju show-model`                                           | Show information about the current or specified model |
+| `jsw`    | `juju switch`                                               | Select or identify the current controller and model   |
+
+### Application / unit
+
+| Alias    | Command                                                       | Description                                                               |
+|----------|---------------------------------------------------------------|---------------------------------------------------------------------------|
+| `jc`     | `juju config`                                                 | Get, set, or reset configuration for a deployed application               |
+| `jde`    | `juju deploy --channel=edge`                                  | Deploy a new application or bundle from the edge channel                  |
+| `jd`     | `juju deploy`                                                 | Deploy a new application or bundle                                        |
+| `jra`    | `juju run-action`                                             | Queue an action for execution                                             |
+| `jraw`   | `juju run-action --wait`                                      | Queue an action for execution and wait for results, with optional timeout |
+| `jrm`    | `juju remove-application`                                     | Remove application                                                        |
+| `jrm!`   | `juju remove-application --force --no-wait`                   | Remove application forcefully                                             |
+| `jrmds`  | `juju remove-application --destroy-storage`                   | Remove application and destroy attached storage                           |
+| `jrmds!` | `juju remove-application --destroy-storage --force --no-wait` | Remove application forcefully, destroying attached storage                |
+| `jrp`    | `juju refresh --path`                                         | Upgrade charm from local charm file                                       |
+| `jsa`    | `juju scale-application`                                      | Set the desired number of application units                               |
+| `jsh`    | `juju ssh`                                                    | Initiate an SSH session or execute a command on a Juju target             |
+| `jshc`   | `juju ssh --container`                                        | Initiate an SSH session or execute a command on a given container         |
+| `jsu`    | `juju show-unit`                                              | Displays information about a unit                                         |
+
+### Storage
+
+| Alias   | Command                       | Description                                     |
+|---------|-------------------------------|-------------------------------------------------|
+| `jrs`   | `juju remove-storage`         | Remove storage                                  |
+| `jrs!`  | `juju remove-storage --force` | Remove storage even if it is currently attached |
+
+### Relation
+
+| Alias     | Command                        | Description                                                       |
+|-----------|--------------------------------|-------------------------------------------------------------------|
+| `jrel`    | `juju relate`                  | Relate two applications                                           |
+| `jrmrel`  | `juju remove-relation`         | Remove an existing relation between two applications.             |
+| `jrmrel!` | `juju remove-relation --force` | Remove an existing relation between two applications, forcefully. |
+
+### Cross-model relation (CMR)
+
+| Alias    | Command            | Description                                                    |
+|----------|--------------------|----------------------------------------------------------------|
+| `jex`    | `juju expose`      | Make an application publicly available over the network        |
+| `jof`    | `juju offer`       | Offer application endpoints for use in other models            |
+| `jcon`   | `juju consume`     | Add a remote offer to the model                                |
+| `jrmsas` | `juju remove-saas` | Remove consumed applications (SAAS) from the model             |
+| `junex`  | `juju unexpose`    | Remove public availability over the network for an application |
+
+### Bundle
+
+| Alias | Command              | Description                                                 |
+|-------|----------------------|-------------------------------------------------------------|
+| `jeb` | `juju export-bundle` | Export the current model configuration as a reusable bundle |
+
+## Functions
+
+- `jaddr <app_name> [unit_num]`: display app or unit IP address.
+- `jreld <relation_name> <app_name> <unit_num>`: display app and unit relation data.
+- `wjst [interval_secs] [args_for_watch]`: watch juju status, with optional interval
+  (default: 5s); you may pass additional arguments to `watch`.
diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
new file mode 100644
index 000000000..07f15b392
--- /dev/null
+++ b/plugins/juju/juju.plugin.zsh
@@ -0,0 +1,127 @@
+# ---------------------------------------------------------- #
+# Aliases and functions for juju (https://juju.is)           #
+# ---------------------------------------------------------- #
+
+# Load TAB completions
+# You need juju's bash completion script installed. By default bash-completion's
+# location will be used (i.e. pkg-config --variable=completionsdir bash-completion).
+completion_file="$(pkg-config --variable=completionsdir bash-completion 2>/dev/null)/juju" || \
+  completion_file="/usr/share/bash-completion/completions/juju"
+[[ -f "$completion_file" ]] && source "$completion_file"
+unset completion_file
+
+# ---------------------------------------------------------- #
+# Aliases (in alphabetic order)                              #
+#                                                            #
+# Generally,                                                 #
+#   - `!` means --force --no-wait -y                         #
+#   - `ds` suffix means --destroy-storage                    #
+# ---------------------------------------------------------- #
+alias jam="juju add-model --config logging-config=\"<root>=WARNING; unit=DEBUG\"\
+ --config update-status-hook-interval=\"60m\""
+alias jb='juju bootstrap'
+alias jbm='juju bootstrap microk8s'
+alias jc='juju config'
+alias jdc='juju destroy-controller --destroy-all-models'
+alias 'jdc!'='juju destroy-controller --destroy-all-models --force --no-wait -y'
+alias jdcds='juju destroy-controller --destroy-all-models --destroy-storage'
+alias 'jdcds!'='juju destroy-controller --destroy-all-models --destroy-storage --force --no-wait -y'
+alias jdm='juju destroy-model'
+alias 'jdm!'='juju destroy-model --force --no-wait -y'
+alias jdmds='juju destroy-model --destroy-storage'
+alias 'jdmds!'='juju destroy-model --destroy-storage --force --no-wait -y'
+alias jde='juju deploy --channel=edge'
+alias jd='juju deploy'
+alias jdl='juju debug-log --ms'
+alias jdlr='juju debug-log --ms --replay'
+alias jcon='juju consume'
+alias jeb='juju export-bundle'
+alias jex='juju expose'
+alias jh='juju help'
+alias jkc='juju kill-controller -y -t 0'
+alias jm='juju models'
+alias jmc='juju model-config'
+alias jof='juju offer'
+alias jra='juju run-action'
+alias jraw='juju run-action --wait'
+alias jrel='juju relate'
+alias jrm='juju remove-application'
+alias 'jrm!'='juju remove-application --force --no-wait'
+alias jrmds='juju remove-application --destroy-storage'
+alias 'jrmds!'='juju remove-application --destroy-storage --force --no-wait'
+alias jrmrel='juju remove-relation'
+alias 'jrmrel!'='juju remove-relation --force'
+alias jrmsas='juju remove-saas'
+alias jrp='juju refresh --path'
+alias jrs='juju remove-storage'
+alias 'jrs!'='juju remove-storage --force'
+alias jsa='juju scale-application'
+alias jsh='juju ssh'
+alias jshc='juju ssh --container'
+alias jshm='juju show-model'
+alias jssl='juju show-status-log'
+alias jstj='juju status --format=json'
+alias jst='juju status --relations --storage --color'
+alias jsu='juju show-unit'
+alias jsw='juju switch'
+
+# ---------------------------------------------------------- #
+# Functions (in alphabetic order)                            #
+# ---------------------------------------------------------- #
+
+# Get app or unit address
+jaddr() {
+  # $1 = app name
+  # $2 = unit number (optional)
+  if (( ! ${+commands[jq]} )); then
+    echo "jq is required but could not be found." >&2
+    return 1
+  fi
+
+  if [[ $# -eq 1 ]]; then
+    # Get app address
+    juju status "$1" --format=json \
+      | jq -r ".applications.\"$1\".address"
+  elif [[ $# -eq 2 ]]; then
+    # Get unit address
+    juju status "$1/$2" --format=json \
+      | jq -r ".applications.\"$1\".units.\"$1/$2\".address"
+  else
+    echo "Invalid number of arguments."
+    echo "Usage:   jaddr <app-name> [<unit-number>]"
+    echo "Example: jaddr karma"
+    echo "Example: jaddr karma 0"
+    return 1
+  fi
+}
+
+# Display app and unit relation data
+jreld() {
+  # $1 = relation name
+  # $2 = app name
+  # $3 = unit number
+  if [[ $# -ne 3 ]]; then
+    echo "Invalid number of arguments."
+    echo "Usage:   jreld <relation-name> <app-name> <unit-number>"
+    echo "Example: jreld karma-dashboard alertmanager 0"
+    return 1
+  fi
+
+  local relid="$(juju run "relation-ids $1" --unit $2/$3)"
+  if [[ -z "$relid" ]]; then
+    return 1
+  fi
+
+  echo "App data:"
+  juju run "relation-get -r $relid --app - $2" --unit $2/$3
+  echo
+  echo "Unit data:"
+  juju run "relation-get -r $relid - $2" --unit $2/$3
+}
+
+# Watch juju status, with optional interval (default: 5 sec)
+wjst() {
+  local interval="${1:-5}"
+  shift $(( $# > 0 ))
+  watch -n "$interval" --color juju status --relations --storage --color "$@"
+}

From 5f99eb5afd3c19683f178ddb57bb9345391d3548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 10:18:53 +0200
Subject: [PATCH 156/591] fix(cli): get branch and tags from OMZ folder in `omz
 changelog` completion

---
 lib/cli.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 2189e24ca..f40a4226e 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -35,7 +35,7 @@ function _omz {
   elif (( CURRENT == 3 )); then
     case "$words[2]" in
       changelog) local -a refs
-        refs=("${(@f)$(command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
+        refs=("${(@f)$(command git -C "$ZSH" for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
       plugin) subcmds=(
         'disable:Disable plugin(s)'

From 72b8f0b73b56b4a5c01eada3cb93b94be39fd984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 15:23:11 +0200
Subject: [PATCH 157/591] fix(half-life): fix prompt color bleeding and code
 clean up (#10085)

Fixes #10085
Closes #10223

Co-authored-by: valdaarhun <icegambit91@gmail.com>
---
 themes/half-life.zsh-theme | 103 ++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 53 deletions(-)

diff --git a/themes/half-life.zsh-theme b/themes/half-life.zsh-theme
index c79027ed6..c4d785126 100644
--- a/themes/half-life.zsh-theme
+++ b/themes/half-life.zsh-theme
@@ -7,31 +7,22 @@
 # git untracked files modification from Brian Carper:
 # https://briancarper.net/blog/570/git-info-in-your-zsh-prompt
 
-function virtualenv_info {
-    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
-}
-PR_GIT_UPDATE=1
-
-setopt prompt_subst
-
-autoload -U add-zsh-hook
-autoload -Uz vcs_info
-
 #use extended color palette if available
-if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
-    turquoise="%F{81}"
-    orange="%F{166}"
-    purple="%F{135}"
-    hotpink="%F{161}"
-    limegreen="%F{118}"
+if [[ $TERM = (*256color|*rxvt*) ]]; then
+  turquoise="%{${(%):-"%F{81}"}%}"
+  orange="%{${(%):-"%F{166}"}%}"
+  purple="%{${(%):-"%F{135}"}%}"
+  hotpink="%{${(%):-"%F{161}"}%}"
+  limegreen="%{${(%):-"%F{118}"}%}"
 else
-    turquoise="$fg[cyan]"
-    orange="$fg[yellow]"
-    purple="$fg[magenta]"
-    hotpink="$fg[red]"
-    limegreen="$fg[green]"
+  turquoise="%{${(%):-"%F{cyan}"}%}"
+  orange="%{${(%):-"%F{yellow}"}%}"
+  purple="%{${(%):-"%F{magenta}"}%}"
+  hotpink="%{${(%):-"%F{red}"}%}"
+  limegreen="%{${(%):-"%F{green}"}%}"
 fi
 
+autoload -Uz vcs_info
 # enable VCS systems you use
 zstyle ':vcs_info:*' enable git svn
 
@@ -47,10 +38,10 @@ zstyle ':vcs_info:*:prompt:*' check-for-changes true
 # %R - repository path
 # %S - path in the repository
 PR_RST="%{${reset_color}%}"
-FMT_BRANCH=" on %{$turquoise%}%b%u%c${PR_RST}"
-FMT_ACTION=" performing a %{$limegreen%}%a${PR_RST}"
-FMT_UNSTAGED="%{$orange%} ●"
-FMT_STAGED="%{$limegreen%} ●"
+FMT_BRANCH=" on ${turquoise}%b%u%c${PR_RST}"
+FMT_ACTION=" performing a ${limegreen}%a${PR_RST}"
+FMT_UNSTAGED="${orange} ●"
+FMT_STAGED="${limegreen} ●"
 
 zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
 zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
@@ -59,38 +50,44 @@ zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
 zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
 
 
-function steeef_preexec {
-    case "$2" in
-        *git*)
-            PR_GIT_UPDATE=1
-            ;;
-        *svn*)
-            PR_GIT_UPDATE=1
-            ;;
-    esac
-}
-add-zsh-hook preexec steeef_preexec
-
 function steeef_chpwd {
-    PR_GIT_UPDATE=1
+  PR_GIT_UPDATE=1
+}
+
+function steeef_preexec {
+  case "$2" in
+  *git*|*svn*) PR_GIT_UPDATE=1 ;;
+  esac
 }
-add-zsh-hook chpwd steeef_chpwd
 
 function steeef_precmd {
-    if [[ -n "$PR_GIT_UPDATE" ]] ; then
-        # check for untracked files or updated submodules, since vcs_info doesn't
-        if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
-            PR_GIT_UPDATE=1
-            FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c%{$hotpink%} ●${PR_RST}"
-        else
-            FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c${PR_RST}"
-        fi
-        zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+  (( PR_GIT_UPDATE )) || return
 
-        vcs_info 'prompt'
-        PR_GIT_UPDATE=
-    fi
+  # check for untracked files or updated submodules, since vcs_info doesn't
+  if [[ -n "$(git ls-files --other --exclude-standard 2>/dev/null)" ]]; then
+    PR_GIT_UPDATE=1
+    FMT_BRANCH="${PM_RST} on ${turquoise}%b%u%c${hotpink} ●${PR_RST}"
+  else
+    FMT_BRANCH="${PM_RST} on ${turquoise}%b%u%c${PR_RST}"
+  fi
+  zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+
+  vcs_info 'prompt'
+  PR_GIT_UPDATE=
 }
-add-zsh-hook precmd steeef_precmd
 
-PROMPT=$'%{$purple%}%n%{$reset_color%} in %{$limegreen%}%~%{$reset_color%}$(ruby_prompt_info " with%{$fg[red]%} " v g "%{$reset_color%}")$vcs_info_msg_0_%{$orange%} λ%{$reset_color%} '
+# vcs_info running hooks
+PR_GIT_UPDATE=1
+
+autoload -U add-zsh-hook
+add-zsh-hook chpwd steeef_chpwd
+add-zsh-hook precmd steeef_precmd
+add-zsh-hook preexec steeef_preexec
+
+# ruby prompt settings
+ZSH_THEME_RUBY_PROMPT_PREFIX="with%F{red} "
+ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_RVM_PROMPT_OPTIONS="v g"
+
+setopt prompt_subst
+PROMPT="${purple}%n%{$reset_color%} in ${limegreen}%~%{$reset_color%}\$(ruby_prompt_info)\$vcs_info_msg_0_${orange} λ%{$reset_color%} "

From 3c209b00d69499db93fb6aac5c79a6179ff6b855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 15:41:25 +0200
Subject: [PATCH 158/591] feat(cli): show current theme in `omz theme list`

Fixes #9540
---
 lib/cli.zsh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index f40a4226e..cadc82e27 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -630,17 +630,23 @@ function _omz::theme::list {
     return
   fi
 
+  # Print theme in use
+  if [[ -n "$ZSH_THEME" ]]; then
+    print -Pn "%U%BCurrent theme%b%u: "
+    [[ $ZSH_THEME = random ]] && echo "$RANDOM_THEME (via random)" || echo "$ZSH_THEME"
+    echo
+  fi
+
+  # Print custom themes if there are any
   if (( ${#custom_themes} )); then
     print -P "%U%BCustom themes%b%u:"
     print -l ${(q-)custom_themes} | column -x
+    echo
   fi
 
-  if (( ${#builtin_themes} )); then
-    (( ${#custom_themes} )) && echo # add a line of separation
-
-    print -P "%U%BBuilt-in themes%b%u:"
-    print -l ${(q-)builtin_themes} | column -x
-  fi
+  # Print built-in themes
+  print -P "%U%BBuilt-in themes%b%u:"
+  print -l ${(q-)builtin_themes} | column -x
 }
 
 function _omz::theme::set {
@@ -727,6 +733,10 @@ function _omz::theme::use {
     _omz::log error "%B$1%b theme not found"
     return 1
   fi
+
+  # Update theme settings
+  ZSH_THEME="$1"
+  [[ $1 = random ]] || unset RANDOM_THEME
 }
 
 function _omz::update {

From c6c364317d1762aafc575951c08c2cccce76fffa Mon Sep 17 00:00:00 2001
From: Kaede Hoshikawa <futursolo@users.noreply.github.com>
Date: Sun, 3 Oct 2021 16:18:33 +0900
Subject: [PATCH 159/591] fix(pyenv): fix pyenv-virtualenv detection under
 macOS.

---
 plugins/pyenv/pyenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index d91b5daa7..39897ed16 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -78,7 +78,7 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
   eval "$(pyenv init - --no-rehash zsh)"
 
   # If pyenv-virtualenv exists, load it
-  if [[ -d "$(pyenv root)/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
+  if [[ "$(pyenv commands)" =~ "virtualenv-init" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
 

From 7152a942802b01cb74d7c0b99f3106f8af17439d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 10:34:13 +0200
Subject: [PATCH 160/591] feat(init): show error and process tree if OMZ is
 loaded from non-zsh shells (#10234)

---
 oh-my-zsh.sh | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index bf5902fc8..c389fc963 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,8 +1,40 @@
 # Protect against non-zsh execution of Oh My Zsh (use POSIX syntax here)
 [ -n "$ZSH_VERSION" ] || {
-  # ANSI (\033[<code>m): 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red
-  printf "\033[1;31mERROR:\033[22m Oh My Zsh can't be loaded from: \033[1m${0#-}\033[22m. " >&2
-  printf "You need to run \033[1;4mzsh\033[22;24m instead.\033[0m\n" >&2
+  # ANSI formatting function (\033[<code>m)
+  # 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red, 33: yellow
+  f() {
+    [ $# -gt 0 ] || return
+    IFS=";" printf "\033[%sm" $*
+  }
+  # If stdout is not a terminal ignore all formatting
+  [ -t 1 ] || f() { :; }
+
+  ptree() {
+    # Get process tree of the current process
+    pid=$$; pids="$pid"
+    while [ ${pid-0} -ne 1 ] && ppid=$(ps -e -o pid,ppid | awk "\$1 == $pid { print \$2 }"); do
+      pids="$pids $pid"; pid=$ppid
+    done
+
+    # Show process tree
+    case "$(uname)" in
+    Linux) ps -o ppid,pid,command -f -p $pids 2>/dev/null ;;
+    Darwin|*) ps -o ppid,pid,command -p $pids 2>/dev/null ;;
+    esac
+
+    # If ps command failed, try Busybox ps
+    [ $? -eq 0 ] || ps -o ppid,pid,comm | awk "NR == 1 || index(\"$pids\", \$2) != 0"
+  }
+
+  {
+    shell=$(ps -o pid,comm | awk "\$1 == $$ { print \$2 }")
+    printf "$(f 1 31)Error:$(f 22) Oh My Zsh can't be loaded from: $(f 1)${shell}$(f 22). "
+    printf "You need to run $(f 1)zsh$(f 22) instead.$(f 0)\n"
+    printf "$(f 33)Here's the process tree:$(f 22)\n\n"
+    ptree
+    printf "$(f 0)\n"
+  } >&2
+
   return 1
 }
 

From adef0e6081789498156fa11455f3ab4f4d36525c Mon Sep 17 00:00:00 2001
From: Nikolas Garofil <nikolas@garofil.be>
Date: Mon, 4 Oct 2021 10:43:13 +0200
Subject: [PATCH 161/591] feat(git): run `gitk` in the background in `gk` and
 `gke` aliases (#9657)

---
 plugins/git/README.md      | 4 ++--
 plugins/git/git.plugin.zsh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index e53d93b0b..05ef25099 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -90,8 +90,8 @@ plugins=(... git)
 | gignore              | git update-index --assume-unchanged                                                                                              |
 | gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                           |
 | git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk                                                                   |
-| gk                   | gitk --all --branches                                                                                                            |
-| gke                  | gitk --all $(git log -g --pretty=%h)                                                                                             |
+| gk                   | gitk --all --branches &!                                                                                                          |
+| gke                  | gitk --all $(git log -g --pretty=%h) &!                                                                                           |
 | gl                   | git pull                                                                                                                         |
 | glg                  | git log --stat                                                                                                                   |
 | glgp                 | git log --stat -p                                                                                                                |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 76e0faed3..11dff99d9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -201,8 +201,8 @@ alias gignore='git update-index --assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
 alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
 
-alias gk='\gitk --all --branches'
-alias gke='\gitk --all $(git log -g --pretty=%h)'
+alias gk='\gitk --all --branches &!'
+alias gke='\gitk --all $(git log -g --pretty=%h) &!'
 
 alias gl='git pull'
 alias glg='git log --stat'

From 3c9743313cc916a6cede71e333eecef4b07ce3ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 17:20:22 +0200
Subject: [PATCH 162/591] refactor(updater): change auto-update settings to use
 `zstyle`

---
 templates/zshrc.zsh-template | 10 ++++------
 tools/check_for_upgrade.sh   | 27 +++++++++++++++++++++------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 4a998c2fc..7cb87078c 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -23,14 +23,12 @@ ZSH_THEME="robbyrussell"
 # 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 lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
 
 # Uncomment the following line to change how often to auto-update (in days).
-# export UPDATE_ZSH_DAYS=13
+# zstyle ':omz:update' frequency 13
 
 # Uncomment the following line if pasting URLs and other text is messed up.
 # DISABLE_MAGIC_FUNCTIONS="true"
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index e87da3487..fa832ffac 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -3,17 +3,30 @@ if [[ -f ~/.zsh-update && ! -f "${ZSH_CACHE_DIR}/.zsh-update" ]]; then
   mv ~/.zsh-update "${ZSH_CACHE_DIR}/.zsh-update"
 fi
 
+# Get user's update preferences
+#
+# Supported update modes:
+# - prompt (default): the user is asked before updating when it's time to update
+# - auto: the update is performed automatically when it's time
+# - reminder: a reminder is shown to the user when it's time to update
+# - disabled: automatic update is turned off
+zstyle -s ':omz:update' mode update_mode || update_mode=prompt
+
+# Support old-style settings
+[[ "$DISABLE_UPDATE_PROMPT" != true ]] || update_mode=auto
+[[ "$DISABLE_AUTO_UPDATE" != true ]] || update_mode=disabled
+
 # Cancel update if:
 # - the automatic update is disabled.
 # - the current user doesn't have write permissions nor owns the $ZSH directory.
 # - git is unavailable on the system.
-if [[ "$DISABLE_AUTO_UPDATE" = true ]] \
+if [[ "$update_mode" = disabled ]] \
    || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
    || ! command -v git &>/dev/null; then
+  unset update_mode
   return
 fi
 
-
 function current_epoch() {
   zmodload zsh/datetime
   echo $(( EPOCHSECONDS / 60 / 60 / 24 ))
@@ -56,7 +69,6 @@ function update_ohmyzsh() {
   #  the shell actually exits what it's running.
   trap "
     ret=\$?
-    unset -f current_epoch update_last_updated_file update_ohmyzsh 2>/dev/null
     command rm -rf '$ZSH/log/update.lock'
     return \$ret
   " EXIT INT QUIT
@@ -68,14 +80,14 @@ function update_ohmyzsh() {
   fi
 
   # Number of days before trying to update again
-  epoch_target=${UPDATE_ZSH_DAYS:-13}
+  zstyle -s ':omz:update' frequency epoch_target || epoch_target=${UPDATE_ZSH_DAYS:-13}
   # Test if enough time has passed until the next update
   if (( ( $(current_epoch) - $LAST_EPOCH ) < $epoch_target )); then
     return
   fi
 
-  # Ask for confirmation before updating unless disabled
-  if [[ "$DISABLE_UPDATE_PROMPT" = true ]]; then
+  # Ask for confirmation before updating unless in auto mode
+  if [[ "$update_mode" = auto ]]; then
     update_ohmyzsh
   else
     # input sink to swallow all characters typed before the prompt
@@ -92,3 +104,6 @@ function update_ohmyzsh() {
     esac
   fi
 }
+
+unset update_mode
+unset -f current_epoch update_last_updated_file update_ohmyzsh

From 0120749a54d147405beebe6f8416da0e4443ebc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 17:22:04 +0200
Subject: [PATCH 163/591] feat(updater): add mode to only remind you to update
 when it's time (#10187)

Fixes #10187

Co-authored-by: NoPreserveRoot <NoPreserveRoot@pm.me>
---
 templates/zshrc.zsh-template | 1 +
 tools/check_for_upgrade.sh   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 7cb87078c..58642bc41 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -26,6 +26,7 @@ ZSH_THEME="robbyrussell"
 # Uncomment the following lines to change the auto-update behavior
 # zstyle ':omz:update' mode disabled  # disable automatic updates
 # zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
 
 # Uncomment the following line to change how often to auto-update (in days).
 # zstyle ':omz:update' frequency 13
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index fa832ffac..e6a4a3d69 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -89,6 +89,8 @@ function update_ohmyzsh() {
   # Ask for confirmation before updating unless in auto mode
   if [[ "$update_mode" = auto ]]; then
     update_ohmyzsh
+  elif [[ "$update_mode" = reminder ]]; then
+    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
   else
     # input sink to swallow all characters typed before the prompt
     # and add a newline if there wasn't one after characters typed

From 30d441713c47306fe63c1ce6833ff7a6120c9a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 17:56:02 +0200
Subject: [PATCH 164/591] feat(updater): check if there are updates before
 prompting (#8387)

Fixes #8387
---
 tools/check_for_upgrade.sh | 44 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index e6a4a3d69..157b0cce2 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -32,6 +32,41 @@ function current_epoch() {
   echo $(( EPOCHSECONDS / 60 / 60 / 24 ))
 }
 
+function is_update_available() {
+  local branch
+  branch=${"$(git -C "$ZSH" config --local oh-my-zsh.branch)":-master}
+
+  local remote remote_url remote_repo
+  remote=${"$(git -C "$ZSH" config --local oh-my-zsh.remote)":-origin}
+  remote_url=$(git -C "$ZSH" config remote.$remote.url)
+
+  local repo
+  case "$remote_url" in
+  https://github.com/*) repo=${${remote_url#https://github.com/}%.git} ;;
+  git@github.com:*) repo=${${remote_url#git@github.com:}%.git} ;;
+  *)
+    # If the remote is not using GitHub we can't check for updates
+    # Let's assume there are updates
+    return 0 ;;
+  esac
+
+  # If the remote repo is not the official one, let's assume there are updates available
+  [[ "$repo" = ohmyzsh/ohmyzsh ]] || return 0
+  local api_url="https://api.github.com/repos/${repo}/commits/${branch}"
+
+  # Get local and remote HEADs and compare them. If we can't get either assume there are updates
+  local local_head remote_head
+  local_head=$(git -C "$ZSH" rev-parse $branch 2>/dev/null) || return 0
+
+  remote_head=$(curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null) \
+  || remote_head=$(wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null) \
+  || remote_head=$(HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null) \
+  || return 0
+
+  # Compare local and remote HEADs
+  [[ "$local_head" != "$remote_head" ]]
+}
+
 function update_last_updated_file() {
   echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update"
 }
@@ -69,6 +104,8 @@ function update_ohmyzsh() {
   #  the shell actually exits what it's running.
   trap "
     ret=\$?
+    unset update_mode
+    unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh 2>/dev/null
     command rm -rf '$ZSH/log/update.lock'
     return \$ret
   " EXIT INT QUIT
@@ -86,6 +123,11 @@ function update_ohmyzsh() {
     return
   fi
 
+  # Check if there are updates available before proceeding
+  if ! is_update_available; then
+    return
+  fi
+
   # Ask for confirmation before updating unless in auto mode
   if [[ "$update_mode" = auto ]]; then
     update_ohmyzsh
@@ -108,4 +150,4 @@ function update_ohmyzsh() {
 }
 
 unset update_mode
-unset -f current_epoch update_last_updated_file update_ohmyzsh
+unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh

From c396efbee3217f1d5cc433cd788a67f747a579cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 11:26:39 +0200
Subject: [PATCH 165/591] fix(docker-compose): support Compose V2 `docker
 compose` command (#10248)

---
 .../docker-compose/docker-compose.plugin.zsh  | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 85e03d343..2eba20a09 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -1,28 +1,22 @@
-# Authors:
-# https://github.com/tristola
-#
-# Docker-compose related zsh aliases
+# support Compose v2 as docker CLI plugin
+command docker compose &>/dev/null && dccmd='docker compose' || dccmd='docker-compose'
 
-# Aliases ###################################################################
+alias dco="$dccmd"
+alias dcb="$dccmd build"
+alias dce="$dccmd exec"
+alias dcps="$dccmd ps"
+alias dcrestart="$dccmd restart"
+alias dcrm="$dccmd rm"
+alias dcr="$dccmd run"
+alias dcstop="$dccmd stop"
+alias dcup="$dccmd up"
+alias dcupb="$dccmd up --build"
+alias dcupd="$dccmd up -d"
+alias dcdn="$dccmd down"
+alias dcl="$dccmd logs"
+alias dclf="$dccmd logs -f"
+alias dcpull="$dccmd pull"
+alias dcstart="$dccmd start"
+alias dck="$dccmd kill"
 
-# Use dco as alias for docker-compose, since dc on *nix is 'dc - an arbitrary precision calculator'
-# https://www.gnu.org/software/bc/manual/dc-1.05/html_mono/dc.html
-
-alias dco='docker-compose'
-
-alias dcb='docker-compose build'
-alias dce='docker-compose exec'
-alias dcps='docker-compose ps'
-alias dcrestart='docker-compose restart'
-alias dcrm='docker-compose rm'
-alias dcr='docker-compose run'
-alias dcstop='docker-compose stop'
-alias dcup='docker-compose up'
-alias dcupb='docker-compose up --build'
-alias dcupd='docker-compose up -d'
-alias dcdn='docker-compose down'
-alias dcl='docker-compose logs'
-alias dclf='docker-compose logs -f'
-alias dcpull='docker-compose pull'
-alias dcstart='docker-compose start'
-alias dck='docker-compose kill'
+unset dccmd

From a3289c11f67ec84a6a56d3bde33c1ec191800470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 12:02:08 +0200
Subject: [PATCH 166/591] feat(docker-compose): update completion (4fa72a0,
 2021-01-19)

Source: https://github.com/docker/compose/blob/4fa72a0/contrib/completion/zsh/_docker-compose

Closes #9494

Co-authored-by: "Bakhir A.D" <Bakhir.A.D.st@gmail.com>
---
 plugins/docker-compose/_docker-compose | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/plugins/docker-compose/_docker-compose b/plugins/docker-compose/_docker-compose
index 808b068a3..c6b733500 100644
--- a/plugins/docker-compose/_docker-compose
+++ b/plugins/docker-compose/_docker-compose
@@ -121,12 +121,6 @@ __docker-compose_subcommand() {
                 '--parallel[Build images in parallel.]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
             ;;
-        (bundle)
-            _arguments \
-                $opts_help \
-                '--push-images[Automatically push images for any services which have a `build` option specified.]' \
-                '(--output -o)'{--output,-o}'[Path to write the bundle file to. Defaults to "<project name>.dab".]:file:_files' && ret=0
-            ;;
         (config)
             _arguments \
                 $opts_help \
@@ -290,7 +284,7 @@ __docker-compose_subcommand() {
         (up)
             _arguments \
                 $opts_help \
-                '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names. Incompatible with --abort-on-container-exit.]' \
+                '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names. Incompatible with --abort-on-container-exit and --attach-dependencies.]' \
                 $opts_no_color \
                 $opts_no_deps \
                 $opts_force_recreate \
@@ -298,6 +292,7 @@ __docker-compose_subcommand() {
                 $opts_no_build \
                 "(--no-build)--build[Build images before starting containers.]" \
                 "(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
+                "(-d)--attach-dependencies[Attach to dependent containers. Incompatible with -d.]" \
                 '(-t --timeout)'{-t,--timeout}"[Use this timeout in seconds for container shutdown when attached or when containers are already running. (default: 10)]:seconds: " \
                 '--scale[SERVICE=NUM Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present.]:service scale SERVICE=NUM: ' \
                 '--exit-code-from=[Return the exit code of the selected service container. Implies --abort-on-container-exit]:service:__docker-compose_services' \
@@ -341,11 +336,13 @@ _docker-compose() {
         '(- :)'{-h,--help}'[Get help]' \
         '*'{-f,--file}"[${file_description}]:file:_files -g '*.yml'" \
         '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
+        '--env-file[Specify an alternate environment file (default: .env)]:env-file:_files' \
         "--compatibility[If set, Compose will attempt to convert keys in v3 files to their non-Swarm equivalent]" \
         '(- :)'{-v,--version}'[Print version and exit]' \
         '--verbose[Show more output]' \
         '--log-level=[Set log level]:level:(DEBUG INFO WARNING ERROR CRITICAL)' \
         '--no-ansi[Do not print ANSI control characters]' \
+        '--ansi=[Control when to print ANSI control characters]:when:(never always auto)' \
         '(-H --host)'{-H,--host}'[Daemon socket to connect to]:host:' \
         '--tls[Use TLS; implied by --tlsverify]' \
         '--tlscacert=[Trust certs signed only by this CA]:ca path:' \
@@ -359,6 +356,7 @@ _docker-compose() {
     local -a relevant_compose_flags relevant_compose_repeatable_flags relevant_docker_flags compose_options docker_options
 
     relevant_compose_flags=(
+        "--env-file"
         "--file" "-f"
         "--host" "-H"
         "--project-name" "-p"

From 5dbb30342e1b7c4a04c3464bb16ffeb33abde139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 12:45:59 +0200
Subject: [PATCH 167/591] feat(yarn): update completion from zsh-completions
 (73505e4)

Fixes #10195
---
 plugins/yarn/_yarn | 184 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 140 insertions(+), 44 deletions(-)

diff --git a/plugins/yarn/_yarn b/plugins/yarn/_yarn
index 70e783b86..70ed55929 100644
--- a/plugins/yarn/_yarn
+++ b/plugins/yarn/_yarn
@@ -32,15 +32,21 @@
 # -------
 #
 #  * Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+#  * Shohei YOSHIDA <syohex@gmail.com>
 #
 # ------------------------------------------------------------------------------
 
+declare -g _yarn_run_cwd
+
 _commands=(
   'access'
+  'audit:Checks for known security issues with the installed packages'
   'autoclean:Clean and remove unnecessary files from package dependencies'
   'cache:List or clean every cached package'
-  "check:Verify package dependencies agains yarn's lock file"
+  "check:Verify package dependencies against yarn's lock file"
   'config:Manages the yarn configuration files'
+  'create:Creates new projects from any create-* starter kits'
+  'exec'
   'generate-lock-entry:Generates a lock file entry'
   'global:Install packages globally on your operating system'
   'help:Show information about a command'
@@ -50,25 +56,30 @@ _commands=(
   'install:Install all the dependencies listed within package.json'
   'licenses:List licenses for installed packages'
   'link:Symlink a package folder during development'
-  'list:List installed packages'
   'login:Store registry username and email'
   'logout:Clear registry username and email'
+  'node:Runs Node with the same version that the one used by Yarn itself'
   'outdated:Check for outdated package dependencies'
   'owner:Manage package owners'
   'pack:Create a compressed gzip archive of package dependencies'
+  'policies:Defines project-wide policies for your project'
   'publish:Publish a package to the npm registry'
   'run:Run a defined package script'
   'tag:Add, remove, or list tags on a package'
   'team:Maintain team memberships'
   'unlink:Unlink a previously created symlink for a package'
+  'unplug:Temporarily copies a package outside of the global cache for debugging purposes'
   'version:Update the package version'
   'versions:Display version information of currently installed Yarn, Node.js, and its dependencies'
   'why:Show information about why a package is installed'
+  'workspace'
+  'workspaces:Show information about your workspaces'
 )
 
 _global_commands=(
   'add:Installs a package and any packages that it depends on'
   'bin:Displays the location of the yarn bin folder'
+  'list:List installed packages'
   'remove:Remove installed package from dependencies updating package.json'
   'upgrade:Upgrades packages to their latest version based on the specified range'
   'upgrade-interactive:Interactively upgrade packages'
@@ -76,7 +87,12 @@ _global_commands=(
 
 _yarn_commands_scripts() {
   local -a scripts
-  scripts=($(yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+  if [[ -n $opt_args[--cwd] ]]; then
+    scripts=($(cd $opt_args[--cwd] && yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+  else
+    scripts=($(yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+  fi
+
   _describe 'command or script' _commands -- _global_commands -- scripts
 }
 
@@ -85,7 +101,11 @@ _yarn_scripts() {
   local -a scriptNames scriptCommands
   local i runJSON
 
-  runJSON=$(yarn run --json 2>/dev/null)
+  if [[ -n $_yarn_run_cwd ]]; then
+    runJSON=$(cd $_yarn_run_cwd && yarn run --json 2>/dev/null)
+  else
+    runJSON=$(yarn run --json 2>/dev/null)
+  fi
   # Some sed utilities (e.g. Mac OS / BSD) don't interpret `\n` in a replacement
   # pattern as a newline. See https://superuser.com/q/307165
   binaries=($(sed -E '/Commands available/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g;s/:/\\:/g;s/,/\'$'\n/g' <<< "$runJSON"))
@@ -96,7 +116,7 @@ _yarn_scripts() {
     scripts+=("${scriptNames[$i]}:${scriptCommands[$i]}")
   done
 
-  commands=($scripts $binaries)
+  commands=('env' $scripts $binaries)
   _describe 'command' commands
 }
 
@@ -110,6 +130,17 @@ _yarn_commands() {
   _describe 'command' _commands -- _global_commands
 }
 
+_yarn_add_files() {
+  if compset -P "(file|link):"; then
+    _files
+  fi
+}
+
+_yarn_workspaces() {
+  local -a workspaces=(${(@f)$(yarn workspaces info |sed -n -e 's/^  "\([^"]*\)": {/\1/p')})
+  _describe 'workspace' workspaces
+}
+
 _yarn() {
   local context state state_descr line
   typeset -A opt_args
@@ -118,37 +149,51 @@ _yarn() {
     '(-h --help)'{-h,--help}'[output usage information]' \
     '(-V --version)'{-V,--version}'[output the version number]' \
     '--verbose[output verbose messages on internal operations]' \
-    '--offline[trigger an error if any required dependencies are not available in local cache]' \
-    '--prefer-offline[use network only if dependencies are not available in local cache]' \
-    '--strict-semver' \
-    '--json' \
-    "--ignore-scripts[don't run lifecycle scripts]" \
-    '--har[save HAR output of network traffic]' \
-    '--ignore-platform[ignore platform checks]' \
-    '--ignore-engines[ignore engines check]' \
-    '--ignore-optional[ignore optional dependencies]' \
-    '--force[install and build packages even if they were built before, overwrite lockfile]' \
-    '--skip-integrity-check[run install without checking if node_modules is installed]' \
-    '--check-files[install will verify file tree of packages for consistency]' \
-    "--no-bin-links[don't generate bin links when setting up packages]" \
-    '--flat[only allow one version of a package]' \
-    '(--prod --production)'{--prod,--production} \
-    "--no-lockfile[don't read or generate a lockfile]" \
-    "--pure-lockfile[don't generate a lockfile]" \
-    "--frozen-lockfile[don't generate a lockfile and fail if an update is needed]" \
-    '--link-duplicates[create hardlinks to the repeated modules in node_modules]' \
-    '--global-folder=[modules folder]:folder:_files -/' \
-    '--modules-folder=[rather than installing modules into the node_modules folder relative to the cwd, output them here]:folder:_files -/' \
     '--cache-folder=[specify a custom folder to store the yarn cache]:folder:_files -/' \
+    '--check-files[install will verify file tree of packages for consistency]' \
+    '--cwd=[working directory to use]:path:_files -/' \
+    "(--enable-pnp --pnp)--disable-pnp[disable the Plug'n'Play installation]" \
+    '(--no-emoji)--emoji=[enable emoji in output(default: false)]:enabled:(true false)' \
+    '(--emoji)--no-emoji[disable emoji in output]' \
+    '(--disable-pnp)'{--enable-pnp,--pnp}"[enable the Plug'n'Play installation]" \
+    '--flat[only allow one version of a package]' \
+    '--focus[Focus on a single workspace by installing remote copies of its sibiling workspaces]' \
+    '--force[install and build packages even if they were built before, overwrite lockfile]' \
+    "--frozen-lockfile[don't generate a lockfile and fail if an update is needed]" \
+    '--global-folder=[modules folder]:folder:_files -/' \
+    '--har[save HAR output of network traffic]' \
+    '--https-proxy=[HTTPS proxy]:host:_hosts' \
+    '--ignore-engines[ignore engines check]' \
+    "--ignore-scripts[don't run lifecycle scripts]" \
+    '--ignore-optional[ignore optional dependencies]' \
+    '--ignore-platform[ignore platform checks]' \
+    '--json[format Yarn log messages as lines of JSON]' \
+    '--link-duplicates[create hardlinks to the repeated modules in node_modules]' \
+    '--link-folder=[specify a custom folder to store global links]' \
+    '--modules-folder=[rather than installing modules into the node_modules folder relative to the cwd, output them here]:folder:_files -/' \
     '--mutex=[use a mutex to ensure only one yarn instance is executing]:type[\:specifier]' \
-    '--no-emoji[disable emoji in output]' \
-    '(-s --silent)'{-s,--silent}'[skip Yarn console logs, other types of logs (script output) will be printed]' \
-    '--proxy=:host:_hosts' \
-    '--https-proxy=:host:_hosts' \
-    '--no-progress[disable progress bar]' \
     '--network-concurrency=[maximum number of concurrent network requests]:number' \
     '--network-timeout=[TCP timeout for network requests]:milliseconds' \
+    "--no-bin-links[don't generate bin links when setting up packages]" \
+    '--no-default-rc[prevent Yarn from automatically detecting yarnrc and npmrc files]' \
+    "--no-lockfile[don't read or generate a lockfile]" \
     '--non-interactive[do not show interactive prompts]' \
+    '--no-node-version-check[do not warn when using a potentially unsupported Node version]' \
+    '--no-progress[disable progress bar]' \
+    '--offline[trigger an error if any required dependencies are not available in local cache]' \
+    '--otp=[one-time password for two factor authentication]:otpcode' \
+    '--prefer-offline[use network only if dependencies are not available in local cache]' \
+    '--preferred-cache-folder=[specify a custom folder to store the yarn cache if possible]:folder:_files -/' \
+    '(--prod --production)'{--prod,--production}'[install only production dependencies]' \
+    '--proxy=[HTTP proxy]:host:_hosts' \
+    "--pure-lockfile[don't generate a lockfile]" \
+    '--registry=[override configuration registry]:url:_urls' \
+    '(-s --silent)'{-s,--silent}'[skip Yarn console logs, other types of logs (script output) will be printed]' \
+    '--scripts-prepend-node-path=[prepend the node executable dir to the PATH in scripts]:bool:(true false)' \
+    '--skip-integrity-check[run install without checking if node_modules is installed]' \
+    "--strict-semver[don't compare semver loosely]" \
+    '--update-checksum[update package checksums from current repository]' \
+    '--use-yarnrc=[specifies a yarnrc that Yarn should use]:yarnrc:_files' \
     '1: :_yarn_commands_scripts' \
     '*:: :->command_args'
 
@@ -173,18 +218,29 @@ _yarn() {
             '(-O --optional)'{-O,--optional}'[install packages in optionalDependencies]' \
             '(-E --exact)'{-E,--exact}'[install packages as exact versions]' \
             '(-T --tilde)'{-T,--tilde}'[install the most recent release of the packages that have the same minor version]' \
-            '*:package-name:'
+            '(--ignore-workspace-root-check -W)'{--ignore-workspace-root-check,-W}'[allows a package to be installed at the workspaces root]' \
+            '--audit[checks for known security issues with the installed packages]' \
+            '*:package-name:_yarn_add_files'
+        ;;
+
+        audit)
+          _arguments \
+            '--verbose[output verbose message]' \
+            '--json[format Yarn log messages as lines of JSON]' \
+            '--level=[only print advisories with severity greater than or equal to]:level:(info low moderate high critical)' \
+            '--groups=[only audit dependencies from listed groups]:groups:->groups_args'
         ;;
 
         cache)
           _arguments \
-            '1: :(ls dir clean)'
+            '1: :(list dir clean)' \
+            '*:: :->cache_args'
         ;;
 
         check)
           _arguments \
-            '--integrity' \
-            '--verify-tree'
+            '--integrity[Verifies that versions and hashed values of the package contents in package.json]' \
+            '--verify-tree[Recursively verifies that the dependencies in package.json are present in node_modules]'
         ;;
 
         config)
@@ -223,12 +279,13 @@ _yarn() {
 
         list)
           _arguments \
-            '--depth[Limit the depth of the shown dependencies]:depth'
+            '--depth=[Limit the depth of the shown dependencies]:depth' \
+            '--pattern=[filter the list of dependencies by the pattern]'
         ;;
 
         owner)
           _arguments \
-            '1: :(ls add rm)' \
+            '1: :(list add rm)' \
             '*:: :->owner_args'
         ;;
 
@@ -247,12 +304,22 @@ _yarn() {
             '1: :_files'
         ;;
 
+        policies)
+          _arguments \
+            '1: :(set-version)'
+        ;;
+
         remove|upgrade)
           _arguments \
             '*:package:'
         ;;
 
         run)
+          if [[ -n $opt_args[--cwd] ]]; then
+            _yarn_run_cwd=$opt_args[--cwd]
+          else
+            _yarn_run_cwd=''
+          fi
           _arguments \
             '1: :_yarn_scripts' \
             '*:: :_default'
@@ -260,26 +327,33 @@ _yarn() {
 
         tag)
           _arguments \
-            '1: :(ls add rm)' \
+            '1: :(lists add rm)' \
             '*:: :->tag_args'
         ;;
 
         team)
           _arguments \
-            '1: :(create destroy add rm ls)' \
+            '1: :(create destroy add rm list)' \
             '*:: :->team_args'
         ;;
 
         upgrade-interactive)
           _arguments \
-            '--latest:use the version tagged latest in the registry:'
+            '--latest[use the version tagged latest in the registry]'
         ;;
 
         version)
           _arguments \
-            '--new-version:version:' \
-            '--message:message:' \
-            '--no-git-tag-version'
+            '--new-version[create a new version using an interactive session to prompt you]:version:' \
+            '--major[creates a new version by incrementing the major version]' \
+            '--minor[creates a new version by incrementing the minor version]' \
+            '--patch[creates a new version by incrementing the patch version]' \
+            '--premajor[creates a new prerelease version by incrementing the major version]' \
+            '--preminor[creates a new prerelease version by incrementing the minor version]' \
+            '--prepatch[creates a new prerelease version by incrementing the patch version]' \
+            '--prerelease[increments the prerelease version number keeping the main version]' \
+            '--no-git-tag-version[creates a new version without creating a git tag]' \
+            '--no-commit-hooks[bypasses running commit hooks when committing the new version]'
         ;;
 
         why)
@@ -287,7 +361,19 @@ _yarn() {
             '1:query:_files'
         ;;
 
-        *) 
+        workspace)
+          _arguments \
+            '1:workspace:_yarn_workspaces' \
+            '*:: :_yarn_global_commands'
+        ;;
+
+        workspaces)
+          _arguments \
+            '--json[format Yarn log messages as lines of JSON]' \
+            '1:commands:(info run)'
+        ;;
+
+        *)
           _default
         ;;
       esac
@@ -295,6 +381,12 @@ _yarn() {
   esac
 
   case $state in
+    cache_args)
+      if [[ $words[1] == "list" ]]; then
+        _arguments \
+          '--pattern=[print out every cached package that matches the pattern]:pattern:'
+      fi
+    ;;
     config_args)
       case $words[1] in
         get|delete)
@@ -310,6 +402,10 @@ _yarn() {
         ;;
       esac
     ;;
+    groups_args)
+      local dependency_groups=(devDependencies dependencies optionalDependencies peerDependencies bundledDependencies)
+      _values -s ',' 'groups' $dependency_groups
+    ;;
 
     owner_args)
       case $words[1] in

From d304635b8c70c6d9400d1246f1446eb76c64406c Mon Sep 17 00:00:00 2001
From: Emilien Escalle <neilime@users.noreply.github.com>
Date: Mon, 4 Oct 2021 13:07:55 +0200
Subject: [PATCH 168/591] feat(yarn): add `ylnf` alias to fix linting problems
 (#9219)

---
 plugins/yarn/README.md       | 1 +
 plugins/yarn/yarn.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index fd748b742..9a0d1708d 100644
--- a/plugins/yarn/README.md
+++ b/plugins/yarn/README.md
@@ -28,6 +28,7 @@ plugins=(... yarn)
 | yi    | `yarn init`                               | Interactively creates or updates a package.json file                          |
 | yin   | `yarn install`                            | Install dependencies defined in `package.json`                                |
 | yln   | `yarn lint`                               | Run the lint script defined in `package.json`                                 |
+| ylnf  | `yarn lint --fix`                         | Run the lint script defined in `package.json`to automatically fix problems    |
 | yls   | `yarn list`                               | List installed packages                                                       |
 | yout  | `yarn outdated`                           | Check for outdated package dependencies                                       |
 | yp    | `yarn pack`                               | Create a compressed gzip archive of package dependencies                      |
diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 4a5192c61..a240cb88e 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -13,6 +13,7 @@ alias yh="yarn help"
 alias yi="yarn init"
 alias yin="yarn install"
 alias yln="yarn lint"
+alias ylnf="yarn lint --fix"
 alias yls="yarn list"
 alias yout="yarn outdated"
 alias yp="yarn pack"

From 717ece07efea5e74e6d18bd647387607a6f5fc49 Mon Sep 17 00:00:00 2001
From: TheTechRobo <52163910+TheTechRobo@users.noreply.github.com>
Date: Mon, 4 Oct 2021 09:55:18 -0400
Subject: [PATCH 169/591] feat(mercurial): add `hg log` aliases (#9979)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Kielan <kielanm@fb.com>
---
 plugins/mercurial/README.md            | 3 ++-
 plugins/mercurial/mercurial.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index 80ea2de31..756964896 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -30,7 +30,8 @@ plugins=(... mercurial)
 | `hgl`  | `hg pull -u`                                                                                                |
 | `hglr` | `hg pull --rebase`                                                                                          |
 | `hgo`  | `hg outgoing`                                                                                               |
-
+| `hglg` | `hg log --stat -v`                                                                                          |
+| `hglgp`| `hg log --stat -p -v`                                                                                       |
 ## Prompt usage
 
 - Switch to a theme which uses `hg_prompt_info`
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index f4efc2b4a..e098664c0 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -17,6 +17,8 @@ alias hgi='hg incoming'
 alias hgl='hg pull -u'
 alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
+alias hglg='hg log --stat -v'
+alias hglgp='hg log --stat  -p -v'
 
 function in_hg() {
   if $(hg branch > /dev/null 2>&1); then

From 56ab66b19429e5609e4331a987368ce2c844c7be Mon Sep 17 00:00:00 2001
From: Dani Torramilans <dani.torramilans@gmail.com>
Date: Mon, 4 Oct 2021 15:57:03 +0200
Subject: [PATCH 170/591] docs(python): update README to include new `py` alias
 (#9995)

---
 plugins/python/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/python/README.md b/plugins/python/README.md
index 0180218a2..b95ffe679 100644
--- a/plugins/python/README.md
+++ b/plugins/python/README.md
@@ -11,6 +11,7 @@ plugins=(... python)
 
 | Command          | Description                                                                     |
 |------------------|---------------------------------------------------------------------------------|
+| `py`             | Runs `python`                                                                   |
 | `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv    |
 | `pyfind`         | Finds .py files recursively in the current directory                            |
 | `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one |

From be4a952972de03d501fbff79435ae41594f06bac Mon Sep 17 00:00:00 2001
From: Monson Shao <holymonson@gmail.com>
Date: Fri, 3 Jul 2020 12:16:58 +0800
Subject: [PATCH 171/591] feat(cli)!: add `omz reload` command and deprecate
 `zsh_reload` plugin (#9078)

BREAKING CHANGE: the `zsh_reload` plugin is deprecated. Instead of using its `src`
function, use `omz reload` or `exec zsh` to reload zsh after making changes to
your `.zshrc` file.

Closes #9078
---
 lib/cli.zsh                              | 12 ++++++++++++
 plugins/zsh_reload/README.md             | 22 +--------------------
 plugins/zsh_reload/zsh_reload.plugin.zsh | 25 +++++-------------------
 3 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index cadc82e27..773891fce 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -26,6 +26,7 @@ function _omz {
     'help:Usage information'
     'plugin:Manage plugins'
     'pr:Manage Oh My Zsh Pull Requests'
+    'reload:Reload the current zsh session'
     'theme:Manage themes'
     'update:Update Oh My Zsh'
   )
@@ -159,6 +160,7 @@ Available commands:
   changelog           Print the changelog
   plugin <command>    Manage plugins
   pr     <command>    Manage Oh My Zsh Pull Requests
+  reload              Reload the current zsh session
   theme  <command>    Manage themes
   update              Update Oh My Zsh
 
@@ -598,6 +600,16 @@ function _omz::pr::test {
   )
 }
 
+function _omz::reload {
+  # Delete current completion cache
+  command rm -f $_comp_dumpfile $ZSH_COMPDUMP
+
+  # Old zsh versions don't have ZSH_ARGZERO
+  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
+  # Check whether to run a login shell
+  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+}
+
 function _omz::theme {
   (( $# > 0 && $+functions[_omz::theme::$1] )) || {
     cat >&2 <<EOF
diff --git a/plugins/zsh_reload/README.md b/plugins/zsh_reload/README.md
index d31a827fe..0b2e2a775 100644
--- a/plugins/zsh_reload/README.md
+++ b/plugins/zsh_reload/README.md
@@ -1,23 +1,3 @@
 # zsh_reload plugin
 
-The zsh_reload plugin defines a function to reload the zsh session with
-just a few keystrokes.
-
-To use it, add `zsh_reload` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... zsh_reload)
-```
-
-## Usage
-
-To reload the zsh session, just run `src`:
-
-```zsh
-$ vim ~/.zshrc  # enabled a plugin
-$ src
-re-compiling /home/user/.zshrc.zwc: succeeded
-re-compiling /home/user/.oh-my-zsh/cache/zcomp-host.zwc: succeeded
-
-# you now have a fresh zsh session. happy hacking!
-```
+**This plugin is deprecated.** Use `omz reload` or `exec zsh` instead.
diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
index 0d29a7ce3..6a058ec5e 100644
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -1,22 +1,7 @@
+print ${(%):-"%F{yellow}The \`zsh_reload\` plugin is deprecated and will be removed."}
+print ${(%):-"Use \`%Bomz reload%b\` or \`%Bexec zsh%b\` instead.%f"}
+
 src() {
-	local cache="$ZSH_CACHE_DIR"
-	autoload -U compinit zrecompile
-	compinit -i -d "$cache/zcomp-$HOST"
-
-	for f in ${ZDOTDIR:-~}/.zshrc "$cache/zcomp-$HOST"; do
-		zrecompile -p $f && command rm -f $f.zwc.old
-	done
-
-	# Use $SHELL if it's available and a zsh shell
-	local shell="$ZSH_ARGZERO"
-	if [[ "${${SHELL:t}#-}" = zsh ]]; then
-		shell="$SHELL"
-	fi
-
-	# Remove leading dash if login shell and run accordingly
-	if [[ "${shell:0:1}" = "-" ]]; then
-		exec -l "${shell#-}"
-	else
-		exec "$shell"
-	fi
+  print ${(%):-"%F{yellow}$0 is deprecated. Use \`%Bomz reload%b\` or \`%Bexec zsh%b\` instead.%f\n"}
+  omz reload
 }

From 568584a9f5f42d51a08de8b71347f6463b9211e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 17:14:34 +0200
Subject: [PATCH 172/591] fix(per-directory-history): fix use of global history
 on shell start (#9008)

Updated from upstream: https://github.com/jimhester/per-directory-history/blob/d2e291d/per-directory-history.zsh

Fixes #9007
Closese #9008

Co-authored-by: Sebastian Marsching <sebastian-git-2016@marsching.com>
---
 .../per-directory-history.zsh                 | 70 ++++++++++++-------
 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/plugins/per-directory-history/per-directory-history.zsh b/plugins/per-directory-history/per-directory-history.zsh
index 41de2f91d..7cd673cdb 100644
--- a/plugins/per-directory-history/per-directory-history.zsh
+++ b/plugins/per-directory-history/per-directory-history.zsh
@@ -32,7 +32,7 @@
 #
 # Copyright (c) 2014 Jim Hester
 #
-# This software is provided 'as-is', without any express or implied warranty. 
+# This software is provided 'as-is', without any express or implied warranty.
 # In no event will the authors be held liable for any damages arising from the
 # use of this software.
 #
@@ -57,6 +57,7 @@
 #-------------------------------------------------------------------------------
 
 [[ -z $HISTORY_BASE ]] && HISTORY_BASE="$HOME/.directory_history"
+[[ -z $HISTORY_START_WITH_GLOBAL ]] && HISTORY_START_WITH_GLOBAL=false
 [[ -z $PER_DIRECTORY_HISTORY_TOGGLE ]] && PER_DIRECTORY_HISTORY_TOGGLE='^G'
 
 #-------------------------------------------------------------------------------
@@ -66,9 +67,11 @@
 function per-directory-history-toggle-history() {
   if [[ $_per_directory_history_is_global == true ]]; then
     _per-directory-history-set-directory-history
+    _per_directory_history_is_global=false
     print -n "\nusing local history"
   else
     _per-directory-history-set-global-history
+    _per_directory_history_is_global=true
     print -n "\nusing global history"
   fi
   zle .push-line
@@ -114,43 +117,58 @@ function _per-directory-history-addhistory() {
       true
   else
       print -Sr -- "${1%%$'\n'}"
+      # instantly write history if set options require it.
+      if [[ -o share_history ]] || \
+         [[ -o inc_append_history ]] || \
+         [[ -o inc_append_history_time ]]; then
+          fc -AI $HISTFILE
+          fc -AI $_per_directory_history_directory
+      fi
       fc -p $_per_directory_history_directory
   fi
 }
 
+function _per-directory-history-precmd() {
+  if [[ $_per_directory_history_initialized == false ]]; then
+    _per_directory_history_initialized=true
+
+    if [[ $HISTORY_START_WITH_GLOBAL == true ]]; then
+      _per-directory-history-set-global-history
+      _per_directory_history_is_global=true
+    else
+      _per-directory-history-set-directory-history
+      _per_directory_history_is_global=false
+    fi
+  fi
+}
 
 function _per-directory-history-set-directory-history() {
-  if [[ $_per_directory_history_is_global == true ]]; then
-    fc -AI $HISTFILE
-    local original_histsize=$HISTSIZE
-    HISTSIZE=0
-    HISTSIZE=$original_histsize
-    if [[ -e "$_per_directory_history_directory" ]]; then
-      fc -R "$_per_directory_history_directory"
-    fi
+  fc -AI $HISTFILE
+  local original_histsize=$HISTSIZE
+  HISTSIZE=0
+  HISTSIZE=$original_histsize
+  if [[ -e "$_per_directory_history_directory" ]]; then
+    fc -R "$_per_directory_history_directory"
   fi
-  _per_directory_history_is_global=false
-}
-function _per-directory-history-set-global-history() {
-  if [[ $_per_directory_history_is_global == false ]]; then
-    fc -AI $_per_directory_history_directory
-    local original_histsize=$HISTSIZE
-    HISTSIZE=0
-    HISTSIZE=$original_histsize
-    if [[ -e "$HISTFILE" ]]; then
-      fc -R "$HISTFILE"
-    fi
-  fi
-  _per_directory_history_is_global=true
 }
 
+function _per-directory-history-set-global-history() {
+  fc -AI $_per_directory_history_directory
+  local original_histsize=$HISTSIZE
+  HISTSIZE=0
+  HISTSIZE=$original_histsize
+  if [[ -e "$HISTFILE" ]]; then
+    fc -R "$HISTFILE"
+  fi
+}
+
+mkdir -p ${_per_directory_history_directory:h}
 
 #add functions to the exec list for chpwd and zshaddhistory
 autoload -U add-zsh-hook
 add-zsh-hook chpwd _per-directory-history-change-directory
 add-zsh-hook zshaddhistory _per-directory-history-addhistory
+add-zsh-hook precmd _per-directory-history-precmd
 
-#start in directory mode
-mkdir -p ${_per_directory_history_directory:h}
-_per_directory_history_is_global=true
-_per-directory-history-set-directory-history
+# set initialized flag to false
+_per_directory_history_initialized=false

From 714399a7c33963384ef7f21ce21f6d134416f9aa Mon Sep 17 00:00:00 2001
From: fanuch <fanuch@gmail.com>
Date: Sun, 6 Oct 2019 13:19:14 +1100
Subject: [PATCH 173/591] feat(git): add `gccd` alias to clone and cd into git
 repository (#8220)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #8216
Closes #8220

Co-authored-by: Nelson Estevão <nelsonmestevao@gmail.com>
---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 05ef25099..b68dc552e 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -47,6 +47,7 @@ plugins=(... git)
 | gcb                  | git checkout -b                                                                                                                  |
 | gcf                  | git config --list                                                                                                                |
 | gcl                  | git clone --recurse-submodules                                                                                                   |
+| gccd                 | git clone --recurse-submodules "$@" && cd "$(basename $_ .git)"                                                                  |
 | gclean               | git clean -id                                                                                                                    |
 | gpristine            | git reset --hard && git clean -dffx                                                                                              |
 | gcm                  | git checkout $(git_main_branch)                                                                                                  |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 11dff99d9..f2431fde5 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -97,6 +97,13 @@ alias gcas='git commit -a -s'
 alias gcasm='git commit -a -s -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
+
+function gccd() {
+  command git clone --recurse-submodules "$@"
+  [[ -d "$_" ]] && cd "$_" || cd "${${_:h}%.git}"
+}
+compdef _git gccd=git-clone
+
 alias gcl='git clone --recurse-submodules'
 alias gclean='git clean -id'
 alias gpristine='git reset --hard && git clean -dffx'

From a54148a43e14f1ba8d4f602ce7d452111e70ad4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 17:51:22 +0200
Subject: [PATCH 174/591] fix(init): rename function `f` due to clash with `f`
 alias (#10260)

Fixes #10260
---
 oh-my-zsh.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c389fc963..b388b341d 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -2,14 +2,14 @@
 [ -n "$ZSH_VERSION" ] || {
   # ANSI formatting function (\033[<code>m)
   # 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red, 33: yellow
-  f() {
+  omz_f() {
     [ $# -gt 0 ] || return
     IFS=";" printf "\033[%sm" $*
   }
   # If stdout is not a terminal ignore all formatting
-  [ -t 1 ] || f() { :; }
+  [ -t 1 ] || omz_f() { :; }
 
-  ptree() {
+  omz_ptree() {
     # Get process tree of the current process
     pid=$$; pids="$pid"
     while [ ${pid-0} -ne 1 ] && ppid=$(ps -e -o pid,ppid | awk "\$1 == $pid { print \$2 }"); do
@@ -28,11 +28,11 @@
 
   {
     shell=$(ps -o pid,comm | awk "\$1 == $$ { print \$2 }")
-    printf "$(f 1 31)Error:$(f 22) Oh My Zsh can't be loaded from: $(f 1)${shell}$(f 22). "
-    printf "You need to run $(f 1)zsh$(f 22) instead.$(f 0)\n"
-    printf "$(f 33)Here's the process tree:$(f 22)\n\n"
-    ptree
-    printf "$(f 0)\n"
+    printf "$(omz_f 1 31)Error:$(omz_f 22) Oh My Zsh can't be loaded from: $(omz_f 1)${shell}$(omz_f 22). "
+    printf "You need to run $(omz_f 1)zsh$(omz_f 22) instead.$(omz_f 0)\n"
+    printf "$(omz_f 33)Here's the process tree:$(omz_f 22)\n\n"
+    omz_ptree
+    printf "$(omz_f 0)\n"
   } >&2
 
   return 1

From b621eee21f269498d072ca60823ecde9777821bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 5 Oct 2021 11:58:39 +0200
Subject: [PATCH 175/591] fix(cli): fix zsh array syntax for szh 5.0.2

---
 lib/cli.zsh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 773891fce..4b14360c1 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -91,7 +91,8 @@ function _omz {
         # NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which
         # has a space after them. This is to avoid removing plugins partially passed, which makes
         # the completion not add a space after the completed plugin.
-        local -a args=(${words[4,$(( CURRENT - 1))]})
+        local -a args
+        args=(${words[4,$(( CURRENT - 1))]})
         valid_plugins=(${valid_plugins:|args})
 
         _describe 'plugin' valid_plugins ;;
@@ -214,7 +215,7 @@ function _omz::plugin::disable {
   fi
 
   # Check that plugin is in $plugins
-  local -a dis_plugins=()
+  local -a dis_plugins
   for plugin in "$@"; do
     if [[ ${plugins[(Ie)$plugin]} -eq 0 ]]; then
       _omz::log warn "plugin '$plugin' is not enabled."
@@ -303,7 +304,7 @@ function _omz::plugin::enable {
   fi
 
   # Check that plugin is not in $plugins
-  local -a add_plugins=()
+  local -a add_plugins
   for plugin in "$@"; do
     if [[ ${plugins[(Ie)$plugin]} -ne 0 ]]; then
       _omz::log warn "plugin '$plugin' is already enabled."
@@ -424,10 +425,8 @@ function _omz::plugin::load {
     return 1
   fi
 
-  local plugins=("$@")
   local plugin base has_completion=0
-
-  for plugin in $plugins; do
+  for plugin in "$@"; do
     if [[ -d "$ZSH_CUSTOM/plugins/$plugin" ]]; then
       base="$ZSH_CUSTOM/plugins/$plugin"
     elif [[ -d "$ZSH/plugins/$plugin" ]]; then

From f793baf370bdfcbe3004f7746f3c945feefb56c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 5 Oct 2021 11:59:09 +0200
Subject: [PATCH 176/591] fix(jsontools): fix broken conditional in zsh 5.0.2
 (#10262)

Fixes #10262
---
 plugins/jsontools/jsontools.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index ed45cfa8e..857ca0ec9 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -7,7 +7,7 @@ if [[ -n "$JSONTOOLS_METHOD" ]]; then
 fi
 
 # If method undefined, find the first one that is installed
-if [[ ! -v JSONTOOLS_METHOD ]]; then
+if [[ -z "$JSONTOOLS_METHOD" ]]; then
   for JSONTOOLS_METHOD in node python ruby; do
     # If method found, break out of loop
     (( $+commands[$JSONTOOLS_METHOD] )) && break
@@ -16,7 +16,7 @@ if [[ ! -v JSONTOOLS_METHOD ]]; then
   done
 
   # If no methods were found, exit the plugin
-  [[ -v JSONTOOLS_METHOD ]] || return 1
+  [[ -n "$JSONTOOLS_METHOD" ]] || return 1
 fi
 
 # Define json tools for each method

From 49bc55f966d91b2a407c883cf1d0f21d0cdd9f4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 5 Oct 2021 13:23:05 +0200
Subject: [PATCH 177/591] fix(docker-compose): fix for slow `docker compose`
 call on remote Docker contexts (#10264)

Fixes #10264

Co-authored-by: Frederick Zhang <frederick888@tsundere.moe>
---
 plugins/docker-compose/docker-compose.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 2eba20a09..13985fc82 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -1,5 +1,7 @@
 # support Compose v2 as docker CLI plugin
-command docker compose &>/dev/null && dccmd='docker compose' || dccmd='docker-compose'
+DOCKER_CONTEXT=default command docker compose &>/dev/null \
+  && dccmd='docker compose' \
+  || dccmd='docker-compose'
 
 alias dco="$dccmd"
 alias dcb="$dccmd build"

From e5b9b80008a2fd71b441ef39fe620ed47dad82e5 Mon Sep 17 00:00:00 2001
From: Dapeng Gao <31944689+dpgao@users.noreply.github.com>
Date: Tue, 5 Oct 2021 19:54:53 +0800
Subject: [PATCH 178/591] fix(gpg-agent): correctly overwrite `$SSH_AUTH_SOCK`
 and other improvements (#7059)

---
 plugins/gpg-agent/README.md            |  2 +-
 plugins/gpg-agent/gpg-agent.plugin.zsh | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/gpg-agent/README.md b/plugins/gpg-agent/README.md
index 9c1e6d2cc..8eeb94f92 100644
--- a/plugins/gpg-agent/README.md
+++ b/plugins/gpg-agent/README.md
@@ -2,7 +2,7 @@
 
 Enables [GPG's gpg-agent](https://www.gnupg.org/documentation/manuals/gnupg/) if it is not running.
 
-To use it, add gpg-agent to the plugins array of your zshrc file:
+To use it, add `gpg-agent` to the plugins array of your zshrc file:
 
 ```zsh
 plugins=(... gpg-agent)
diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 3e24c2527..0adc8de5d 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -1,16 +1,17 @@
-# Enable gpg-agent if it is not running-
-# --use-standard-socket will work from version 2 upwards
-
-AGENT_SOCK=$(gpgconf --list-dirs | grep agent-socket | cut -d : -f 2)
-
-if [[ ! -S $AGENT_SOCK ]]; then
-  gpg-agent --daemon --use-standard-socket &>/dev/null
-fi
 export GPG_TTY=$TTY
 
-# Set SSH to use gpg-agent if it's enabled
-GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
-if [[ -r $GNUPGCONFIG ]] && command grep -q enable-ssh-support "$GNUPGCONFIG"; then
-  export SSH_AUTH_SOCK="$AGENT_SOCK.ssh"
+# Fix for passphrase prompt on the correct tty
+# See https://www.gnupg.org/documentation/manuals/gnupg/Agent-Options.html#option-_002d_002denable_002dssh_002dsupport
+function _gpg-agent_update-tty_preexec {
+  gpg-connect-agent updatestartuptty /bye &>/dev/null
+}
+autoload -U add-zsh-hook
+add-zsh-hook preexec _gpg-agent_update-tty_preexec
+
+# If enable-ssh-support is set, fix ssh agent integration
+if [[ $(gpgconf --list-options gpg-agent | awk -F: '$1=="enable-ssh-support" {print $10}') = 1 ]]; then
   unset SSH_AGENT_PID
+  if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]]; then
+    export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+  fi
 fi

From 53c9661b003b91e8af356c3ecbb95a025ffcd412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 5 Oct 2021 16:45:49 +0200
Subject: [PATCH 179/591] refactor(chucknorris): refresh plugin code

---
 plugins/chucknorris/README.md              |  4 +--
 plugins/chucknorris/chucknorris.plugin.zsh | 38 ++++++++++------------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/plugins/chucknorris/README.md b/plugins/chucknorris/README.md
index 35f989180..b51875de9 100644
--- a/plugins/chucknorris/README.md
+++ b/plugins/chucknorris/README.md
@@ -1,8 +1,6 @@
 # chucknorris
 
-Chuck Norris fortunes plugin for oh-my-zsh. Perfectly suitable as MOTD.
-
-**Maintainers**: [apjanke](https://github.com/apjanke) [maff](https://github.com/maff)
+Chuck Norris fortunes plugin for Oh My Zsh. Perfectly suitable as MOTD.
 
 To use it add `chucknorris` to the plugins array in you zshrc file.
 
diff --git a/plugins/chucknorris/chucknorris.plugin.zsh b/plugins/chucknorris/chucknorris.plugin.zsh
index 1dbb04ef0..b90abe320 100644
--- a/plugins/chucknorris/chucknorris.plugin.zsh
+++ b/plugins/chucknorris/chucknorris.plugin.zsh
@@ -1,28 +1,24 @@
-# chucknorris: Chuck Norris fortunes
-
-# Automatically generate or update Chuck's compiled fortune data file
-# $0 must be used outside a local function. This variable name is unlikly to collide.
-CHUCKNORRIS_PLUGIN_DIR=${0:h}
-
 () {
-local DIR=$CHUCKNORRIS_PLUGIN_DIR/fortunes
-if [[ ! -f $DIR/chucknorris.dat ]] || [[ $DIR/chucknorris.dat -ot $DIR/chucknorris ]]; then
-  # For some reason, Cygwin puts strfile in /usr/sbin, which is not on the path by default
-  local strfile=strfile
-  if ! which strfile &>/dev/null && [[ -f /usr/sbin/strfile ]]; then
-    strfile=/usr/sbin/strfile
+  # %x: name of file containing code being executed
+  local fortunes_dir="${${(%):-%x}:h}/fortunes"
+
+  # Aliases
+  alias chuck="fortune -a $fortunes_dir"
+  alias chuck_cow="chuck | cowthink"
+
+  # Automatically generate or update Chuck's compiled fortune data file
+  if [[ "$fortunes_dir/chucknorris" -ot "$fortunes_dir/chucknorris.dat" ]]; then
+    return
   fi
-  if which $strfile &> /dev/null; then
-    $strfile $DIR/chucknorris $DIR/chucknorris.dat >/dev/null
-  else
+
+  # For some reason, Cygwin puts strfile in /usr/sbin, which is not on the path by default
+  local strfile="${commands[strfile]:-/usr/sbin/strfile}"
+  if [[ ! -x "$strfile" ]]; then
     echo "[oh-my-zsh] chucknorris depends on strfile, which is not installed" >&2
     echo "[oh-my-zsh] strfile is often provided as part of the 'fortune' package" >&2
+    return
   fi
-fi
 
-# Aliases
-alias chuck="fortune -a $DIR"
-alias chuck_cow="chuck | cowthink"
+  # Generate the compiled fortune data file
+  $strfile "$fortunes_dir/chucknorris" "$fortunes_dir/chucknorris.dat" >/dev/null
 }
-
-unset CHUCKNORRIS_PLUGIN_DIR

From 9e41cffbf8515ba64ab2cf21b49dc78949707553 Mon Sep 17 00:00:00 2001
From: Ryan McAllen <rhyno@rhynodesigns.com>
Date: Tue, 5 Oct 2021 10:47:28 -0400
Subject: [PATCH 180/591] chore(chucknorris): add a few more Chuck Norris
 quotes (#10210)

---
 plugins/chucknorris/fortunes/chucknorris | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
index 0ddb6c03b..6ba5bb9b5 100644
--- a/plugins/chucknorris/fortunes/chucknorris
+++ b/plugins/chucknorris/fortunes/chucknorris
@@ -558,3 +558,11 @@ You know Chuck Norris' pet lizard, right? Last I heard, he was in the movie "God
 %
 http://chucknorrisfacts.com/ is built in Drupal because Chuck Norris knows a good CMS when he sees one.
 %
+Chuck Norris made the first Giraffe by uppercutting a horse.
+%
+Chuck Norris can hear sign language.
+%
+Chuck Norris make onions cry.
+%
+Chuck Norris doesn't shake hands, he makes them tremble.
+%

From 63b7e5767d551b1d839888a7216f2bed01e8eb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 5 Oct 2021 16:56:00 +0200
Subject: [PATCH 181/591] fix(changelog): don't parse commits of ignored types

---
 tools/changelog.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 7329a9526..71caa2b6c 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -120,7 +120,7 @@ function parse-commit {
   fi
 
   # Parse commit with hash $1
-  local hash="$1" subject body warning rhash
+  local hash="$1" subject body type warning rhash
   subject="$(command git show -s --format=%s $hash)"
   body="$(command git show -s --format=%b $hash)"
 
@@ -132,8 +132,12 @@ function parse-commit {
   #  commit body
   #  [BREAKING CHANGE: warning]
 
+  # if commit type is not going to be displayed, do nothing else
+  type="$(commit:type "$subject")"
+  (( ${MAIN_TYPES[(Ie)$type]} || ${OTHER_TYPES[(Ie)$type]} )) || return
+
   # commits holds the commit type
-  commits[$hash]="$(commit:type "$subject")"
+  commits[$hash]="$type"
   # scopes holds the commit scope
   scopes[$hash]="$(commit:scope "$subject")"
   # subjects holds the commit subject

From bf7c1b160d164f080a276e6ed6b21ef8008079ee Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Wed, 6 Oct 2021 10:13:38 +0200
Subject: [PATCH 182/591] fix(git)!: rename `gdu` alias to `gdup` (#10263)

BREAKING CHANGE: the `gdu` alias has been renamed to `gdup` to avoid a
conflict with `go disk usage` (https://github.com/dundee/gdu).
---
 plugins/git/README.md      | 2 +-
 plugins/git/git.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index b68dc552e..12e3676e8 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -67,7 +67,7 @@ plugins=(... git)
 | gds                  | git diff --staged                                                                                                                |
 | gdt                  | git diff-tree --no-commit-id --name-only -r                                                                                      |
 | gdnolock             | git diff $@ ":(exclude)package-lock.json" ":(exclude)&ast;.lock"                                                                 |
-| gdu                  | git diff @{u}                                                                                                                    |
+| gdup                 | git diff @{upstream}                                                                                                             |
 | gdv                  | git diff -w $@ \| view -                                                                                                         |
 | gdw                  | git diff --word-diff                                                                                                             |
 | gf                   | git fetch                                                                                                                        |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index f2431fde5..5c5db9972 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -126,7 +126,7 @@ alias gdcw='git diff --cached --word-diff'
 alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
 alias gds='git diff --staged'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
-alias gdu='git diff @{u}'
+alias gdup='git diff @{upstream}'
 alias gdw='git diff --word-diff'
 
 function gdnolock() {

From 7418814677a1b64d584d84be03fbfe38c7760e61 Mon Sep 17 00:00:00 2001
From: Ryan Zegray <ryan.zegray@gmail.com>
Date: Wed, 6 Oct 2021 04:14:22 -0400
Subject: [PATCH 183/591] feat(z): update z to latest version (#10267)

---
 plugins/z/z.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/z/z.sh b/plugins/z/z.sh
index 13008a60e..67f504e27 100644
--- a/plugins/z/z.sh
+++ b/plugins/z/z.sh
@@ -42,6 +42,8 @@ _z() {
     [ -z "$_Z_OWNER" -a -f "$datafile" -a ! -O "$datafile" ] && return
 
     _z_dirs () {
+        [ -f "$datafile" ] || return
+
         local line
         while read line; do
             # only count directories
@@ -54,14 +56,16 @@ _z() {
     if [ "$1" = "--add" ]; then
         shift
 
-        # $HOME isn't worth matching
-        [ "$*" = "$HOME" ] && return
+        # $HOME and / aren't worth matching
+        [ "$*" = "$HOME" -o "$*" = '/' ] && return
 
         # don't track excluded directory trees
-        local exclude
-        for exclude in "${_Z_EXCLUDE_DIRS[@]}"; do
-            case "$*" in "$exclude*") return;; esac
-        done
+        if [ ${#_Z_EXCLUDE_DIRS[@]} -gt 0 ]; then
+            local exclude
+            for exclude in "${_Z_EXCLUDE_DIRS[@]}"; do
+                case "$*" in "$exclude"*) return;; esac
+            done
+        fi
 
         # maintain the data file
         local tempfile="$datafile.$RANDOM"

From 69a45a9c98291dc485ee9c46c9bf79ec8533217b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 6 Oct 2021 10:04:30 +0200
Subject: [PATCH 184/591] chore: zshrc update settings rewording

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 58642bc41..7e1c7997c 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -23,7 +23,7 @@ ZSH_THEME="robbyrussell"
 # Case-sensitive completion must be off. _ and - will be interchangeable.
 # HYPHEN_INSENSITIVE="true"
 
-# Uncomment the following lines to change the auto-update behavior
+# Uncomment one of the following lines to change the auto-update behavior
 # zstyle ':omz:update' mode disabled  # disable automatic updates
 # zstyle ':omz:update' mode auto      # update automatically without asking
 # zstyle ':omz:update' mode reminder  # just remind me to update when it's time

From 29b5c182bec4cec7704fb8bac9ee0ab971dfb89a Mon Sep 17 00:00:00 2001
From: HoshinoArika <HoshinoArika@tuta.io>
Date: Wed, 6 Oct 2021 17:01:20 +0800
Subject: [PATCH 185/591] feat(sublime): add support for Sublime Text 4 on
 Windows (#10063)

---
 plugins/sublime/sublime.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 618dd8ee8..dadf37574 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -17,6 +17,7 @@ alias stn=create_project
   if [[ "$OSTYPE" == linux* ]]; then
     if [[ "$(uname -r)" = *icrosoft* ]]; then
       _sublime_paths=(
+        "$(wslpath -u 'C:\Program Files\Sublime Text\sublime_text.exe' 2>/dev/null)"
         "$(wslpath -u 'C:\Program Files\Sublime Text 3\subl.exe' 2>/dev/null)"
         "$(wslpath -u 'C:\Program Files\Sublime Text 2\subl.exe' 2>/dev/null)"
       )
@@ -52,6 +53,7 @@ alias stn=create_project
     )
   elif [[ "$OSTYPE" = msys ]]; then
     _sublime_paths=(
+      "/c/Program Files/Sublime Text/sublime_text.exe"
       "/c/Program Files/Sublime Text 2/subl.exe"
       "/c/Program Files/Sublime Text 3/subl.exe"
     )

From f0bbef1a070b7b00a36010c44af3c88807c73e6f Mon Sep 17 00:00:00 2001
From: Cxarli <10348289+Cxarli@users.noreply.github.com>
Date: Sat, 31 Oct 2020 16:01:18 +0100
Subject: [PATCH 186/591] feat(yarn): add global bin directory to `$PATH`
 (#9410)

Fixes #9177
Closes #9410
---
 plugins/yarn/yarn.plugin.zsh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index a240cb88e..a4f595c61 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -1,3 +1,10 @@
+# Add yarn bin directory to $PATH if it exists and not in $PATH already
+bindir=$(yarn global bin 2>/dev/null) \
+  && [[ -d "$bindir" ]] \
+  && (( ! ${path[(Ie)$bindir]} )) \
+  && path+=("$bindir")
+unset bindir
+
 alias y="yarn"
 alias ya="yarn add"
 alias yad="yarn add --dev"

From 607d2f1eda6f7a8a8036a6608e99c512db75c602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 7 Oct 2021 13:35:07 +0200
Subject: [PATCH 187/591] Revert "fix(changelog): don't parse commits of
 ignored types"

This reverts commit 63b7e5767d551b1d839888a7216f2bed01e8eb1f.
---
 tools/changelog.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 71caa2b6c..7329a9526 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -120,7 +120,7 @@ function parse-commit {
   fi
 
   # Parse commit with hash $1
-  local hash="$1" subject body type warning rhash
+  local hash="$1" subject body warning rhash
   subject="$(command git show -s --format=%s $hash)"
   body="$(command git show -s --format=%b $hash)"
 
@@ -132,12 +132,8 @@ function parse-commit {
   #  commit body
   #  [BREAKING CHANGE: warning]
 
-  # if commit type is not going to be displayed, do nothing else
-  type="$(commit:type "$subject")"
-  (( ${MAIN_TYPES[(Ie)$type]} || ${OTHER_TYPES[(Ie)$type]} )) || return
-
   # commits holds the commit type
-  commits[$hash]="$type"
+  commits[$hash]="$(commit:type "$subject")"
   # scopes holds the commit scope
   scopes[$hash]="$(commit:scope "$subject")"
   # subjects holds the commit subject

From dc83d0b7204cf66315471e980729490813b7d915 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 7 Oct 2021 15:16:30 -0400
Subject: [PATCH 188/591] fix(battery): support `acpitool` and multiple
 batteries under Linux (#9609)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/battery/battery.plugin.zsh | 54 ++++++++++++++++++------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index a525fd7da..24bff8ae6 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -12,15 +12,12 @@
 ###########################################
 
 if [[ "$OSTYPE" = darwin* ]]; then
-
   function battery_is_charging() {
     ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ Yes'
   }
-
   function battery_pct() {
     pmset -g batt | grep -Eo "\d+%" | cut -d% -f1
   }
-
   function battery_pct_remaining() {
     if battery_is_charging; then
       echo "External Power"
@@ -28,7 +25,6 @@ if [[ "$OSTYPE" = darwin* ]]; then
       battery_pct
     fi
   }
-
   function battery_time_remaining() {
     local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
     if [[ $(echo $smart_battery_status | command grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]]; then
@@ -42,7 +38,6 @@ if [[ "$OSTYPE" = darwin* ]]; then
       echo "∞"
     fi
   }
-
   function battery_pct_prompt () {
     local battery_pct color
     if ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ No'; then
@@ -61,17 +56,14 @@ if [[ "$OSTYPE" = darwin* ]]; then
   }
 
 elif [[ "$OSTYPE" = freebsd* ]]; then
-
   function battery_is_charging() {
     [[ $(sysctl -n hw.acpi.battery.state) -eq 2 ]]
   }
-
   function battery_pct() {
     if (( $+commands[sysctl] )); then
       sysctl -n hw.acpi.battery.life
     fi
   }
-
   function battery_pct_remaining() {
     if ! battery_is_charging; then
       battery_pct
@@ -79,7 +71,6 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       echo "External Power"
     fi
   }
-
   function battery_time_remaining() {
     local remaining_time
     remaining_time=$(sysctl -n hw.acpi.battery.time)
@@ -89,7 +80,6 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       printf %02d:%02d $hour $minute
     fi
   }
-
   function battery_pct_prompt() {
     local battery_pct color
     battery_pct=$(battery_pct_remaining)
@@ -106,19 +96,42 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
-
 elif [[ "$OSTYPE" = linux*  ]]; then
-
   function battery_is_charging() {
-    ! acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -q '^Battery.*Discharging'
-  }
-
-  function battery_pct() {
-    if (( $+commands[acpi] )); then
-      acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -E '^Battery.*(Full|(Disc|C)harging)' | cut -f2 -d ',' | tr -cd '[:digit:]'
+    if (( $+commands[acpitool] )); then
+      ! acpitool 2>/dev/null | command grep -qE '^\s+Battery.*Discharging'
+    elif (( $+commands[acpi] )); then
+      ! acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -q '^Battery.*Discharging'
+    fi
+  }
+  function battery_pct() {
+    if (( $+commands[acpitool] )); then
+      # Sample output:
+      #   Battery #1     : Unknown, 99.55%
+      #   Battery #2     : Discharging, 49.58%, 01:12:05
+      #   All batteries  : 62.60%, 02:03:03
+      acpitool 2>/dev/null | command awk -F, '
+        /^\s+All batteries/ {
+          gsub(/[^0-9.]/, "", $1)
+          pct=$1
+          exit
+        }
+        !pct && /^\s+Battery/ {
+          gsub(/[^0-9.]/, "", $2)
+          pct=$2
+        }
+        END { print pct }
+        '
+    elif (( $+commands[acpi] )); then
+      # Sample output:
+      # Battery 0: Discharging, 0%, rate information unavailable
+      # Battery 1: Full, 100%
+      acpi 2>/dev/null | command awk -F, '
+        /rate information unavailable/ { next }
+        /^Battery.*: /{ gsub(/[^0-9]/, "", $2); print $2; exit }
+      '
     fi
   }
-
   function battery_pct_remaining() {
     if ! battery_is_charging; then
       battery_pct
@@ -126,13 +139,11 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       echo "External Power"
     fi
   }
-
   function battery_time_remaining() {
     if ! battery_is_charging; then
       acpi 2>/dev/null | command grep -v "rate information unavailable" | cut -f3 -d ','
     fi
   }
-
   function battery_pct_prompt() {
     local battery_pct color
     battery_pct=$(battery_pct_remaining)
@@ -149,7 +160,6 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
-
 else
   # Empty functions so we don't cause errors in prompts
   function battery_is_charging { false }

From f26a1ecdf01185218004dd6d15ce02541e6a2b26 Mon Sep 17 00:00:00 2001
From: Avneet Singh <4151485+kalsi-avneet@users.noreply.github.com>
Date: Sun, 21 Mar 2021 00:06:33 +0530
Subject: [PATCH 189/591] feat(battery): add support for Android via Termux
 (#9752)

---
 plugins/battery/README.md          | 19 ++++++++-----
 plugins/battery/battery.plugin.zsh | 43 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/plugins/battery/README.md b/plugins/battery/README.md
index c2554a36d..18e5bd882 100644
--- a/plugins/battery/README.md
+++ b/plugins/battery/README.md
@@ -8,15 +8,22 @@ To use, add `battery` to the list of plugins in your `.zshrc` file:
 
 Then, add the `battery_pct_prompt` function to your custom theme. For example:
 
-```
+```zsh
 RPROMPT='$(battery_pct_prompt) ...'
 ```
 
 ## Requirements
 
-On Linux, you must have the `acpi` tool installed on your operating system.
+- On Linux, you must have the `acpi` or `acpitool` commands installed on your operating system.
+  On Debian/Ubuntu, you can do that with `sudo apt install acpi` or `sudo apt install acpitool`.
 
-Here's an example of how to install with apt:
-```
-sudo apt-get install acpi
-```
+- On Android (via [Termux](https://play.google.com/store/apps/details?id=com.termux)), you must have:
+
+  1. The `Termux:API` addon app installed:
+     [Google Play](https://play.google.com/store/apps/details?id=com.termux.api) | [F-Droid](https://f-droid.org/packages/com.termux.api/)
+
+  2. The `termux-api` package installed within termux:
+
+     ```sh
+     pkg install termux-api
+     ```
diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 24bff8ae6..8e6afe65e 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -10,6 +10,9 @@
 # Author: J (927589452)                   #
 # Modified to add support for FreeBSD     #
 ###########################################
+# Author: Avneet Singh (kalsi-avneet)     #
+# Modified to add support for Android     #
+###########################################
 
 if [[ "$OSTYPE" = darwin* ]]; then
   function battery_is_charging() {
@@ -160,6 +163,46 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
+elif [[ "$OSTYPE" = linux-android ]] && (( ${+commands[termux-battery-status]} )); then
+  function battery_is_charging() {
+    termux-battery-status 2>/dev/null | command awk '/status/ { exit ($0 ~ /DISCHARGING/) }'
+  }
+  function battery_pct() {
+    # Sample output:
+    # {
+    #   "health": "GOOD",
+    #   "percentage": 93,
+    #   "plugged": "UNPLUGGED",
+    #   "status": "DISCHARGING",
+    #   "temperature": 29.0,
+    #   "current": 361816
+    # }
+    termux-battery-status 2>/dev/null | command awk '/percentage/ { gsub(/[,]/,""); print $2}'
+  }
+  function battery_pct_remaining() {
+    if ! battery_is_charging; then
+      battery_pct
+    else
+      echo "External Power"
+    fi
+  }
+  function battery_time_remaining() { } # Not available on android
+  function battery_pct_prompt() {
+    local battery_pct color
+    battery_pct=$(battery_pct_remaining)
+    if battery_is_charging; then
+      echo "∞"
+    else
+      if [[ $battery_pct -gt 50 ]]; then
+        color='green'
+      elif [[ $battery_pct -gt 20 ]]; then
+        color='yellow'
+      else
+        color='red'
+      fi
+      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
+    fi
+  }
 else
   # Empty functions so we don't cause errors in prompts
   function battery_is_charging { false }

From 9aeb967581061ca12c1679d3fdce8a5b516a9796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 8 Oct 2021 12:34:04 +0200
Subject: [PATCH 190/591] fix(battery): fix system check so Termux uses the
 correct method

---
 plugins/battery/battery.plugin.zsh | 80 +++++++++++++++---------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 8e6afe65e..0e96b00aa 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -99,6 +99,46 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
+elif [[ "$OSTYPE" = linux-android ]] && (( ${+commands[termux-battery-status]} )); then
+  function battery_is_charging() {
+    termux-battery-status 2>/dev/null | command awk '/status/ { exit ($0 ~ /DISCHARGING/) }'
+  }
+  function battery_pct() {
+    # Sample output:
+    # {
+    #   "health": "GOOD",
+    #   "percentage": 93,
+    #   "plugged": "UNPLUGGED",
+    #   "status": "DISCHARGING",
+    #   "temperature": 29.0,
+    #   "current": 361816
+    # }
+    termux-battery-status 2>/dev/null | command awk '/percentage/ { gsub(/[,]/,""); print $2}'
+  }
+  function battery_pct_remaining() {
+    if ! battery_is_charging; then
+      battery_pct
+    else
+      echo "External Power"
+    fi
+  }
+  function battery_time_remaining() { } # Not available on android
+  function battery_pct_prompt() {
+    local battery_pct color
+    battery_pct=$(battery_pct_remaining)
+    if battery_is_charging; then
+      echo "∞"
+    else
+      if [[ $battery_pct -gt 50 ]]; then
+        color='green'
+      elif [[ $battery_pct -gt 20 ]]; then
+        color='yellow'
+      else
+        color='red'
+      fi
+      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
+    fi
+  }
 elif [[ "$OSTYPE" = linux*  ]]; then
   function battery_is_charging() {
     if (( $+commands[acpitool] )); then
@@ -163,46 +203,6 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
-elif [[ "$OSTYPE" = linux-android ]] && (( ${+commands[termux-battery-status]} )); then
-  function battery_is_charging() {
-    termux-battery-status 2>/dev/null | command awk '/status/ { exit ($0 ~ /DISCHARGING/) }'
-  }
-  function battery_pct() {
-    # Sample output:
-    # {
-    #   "health": "GOOD",
-    #   "percentage": 93,
-    #   "plugged": "UNPLUGGED",
-    #   "status": "DISCHARGING",
-    #   "temperature": 29.0,
-    #   "current": 361816
-    # }
-    termux-battery-status 2>/dev/null | command awk '/percentage/ { gsub(/[,]/,""); print $2}'
-  }
-  function battery_pct_remaining() {
-    if ! battery_is_charging; then
-      battery_pct
-    else
-      echo "External Power"
-    fi
-  }
-  function battery_time_remaining() { } # Not available on android
-  function battery_pct_prompt() {
-    local battery_pct color
-    battery_pct=$(battery_pct_remaining)
-    if battery_is_charging; then
-      echo "∞"
-    else
-      if [[ $battery_pct -gt 50 ]]; then
-        color='green'
-      elif [[ $battery_pct -gt 20 ]]; then
-        color='yellow'
-      else
-        color='red'
-      fi
-      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
-    fi
-  }
 else
   # Empty functions so we don't cause errors in prompts
   function battery_is_charging { false }

From 5fb204fa7469a89f31ffb8ee8a9b3c36bea926a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 8 Oct 2021 15:42:43 +0200
Subject: [PATCH 191/591] fix(battery): force battery percentage as integer

---
 plugins/battery/battery.plugin.zsh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 0e96b00aa..db5eeb93a 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -153,7 +153,7 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       #   Battery #1     : Unknown, 99.55%
       #   Battery #2     : Discharging, 49.58%, 01:12:05
       #   All batteries  : 62.60%, 02:03:03
-      acpitool 2>/dev/null | command awk -F, '
+      local -i pct=$(acpitool 2>/dev/null | command awk -F, '
         /^\s+All batteries/ {
           gsub(/[^0-9.]/, "", $1)
           pct=$1
@@ -164,7 +164,8 @@ elif [[ "$OSTYPE" = linux*  ]]; then
           pct=$2
         }
         END { print pct }
-        '
+        ')
+      echo $pct
     elif (( $+commands[acpi] )); then
       # Sample output:
       # Battery 0: Discharging, 0%, rate information unavailable
@@ -227,7 +228,7 @@ function battery_level_gauge() {
   local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow}
   local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'}
 
-  local battery_remaining_percentage=$(battery_pct)
+  local -i battery_remaining_percentage=$(battery_pct)
   local filled empty gauge_color
 
   if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then

From 1c9a64ece6dce901aac114deaa71b298a32fbfb4 Mon Sep 17 00:00:00 2001
From: Michael Fryar <michaelefryar@gmail.com>
Date: Fri, 8 Oct 2021 08:24:00 -0700
Subject: [PATCH 192/591] feat(git): add `gswm` and `gswd` aliases (#9897)

Co-authored-by: Nathaniel Young <nathanielyoung95070@gmail.com>
---
 plugins/git/README.md      | 2 ++
 plugins/git/git.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 12e3676e8..113080874 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -169,6 +169,8 @@ plugins=(... git)
 | gsu                  | git submodule update                                                                                                             |
 | gsw                  | git switch                                                                                                                       |
 | gswc                 | git switch -c                                                                                                                    |
+| gswm                 | git switch $(git_main_branch)                                                                                                    |
+| gswd                 | git switch $(git_develop_branch)                                                                                                 |
 | gts                  | git tag -s                                                                                                                       |
 | gtv                  | git tag \| sort -V                                                                                                               |
 | gtl                  | gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl                                                                       |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5c5db9972..dbcc7bddb 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -295,6 +295,8 @@ alias gstall='git stash --all'
 alias gsu='git submodule update'
 alias gsw='git switch'
 alias gswc='git switch -c'
+alias gswm='git switch $(git_main_branch)'
+alias gswd='git switch $(git_develop_branch)'
 
 alias gts='git tag -s'
 alias gtv='git tag | sort -V'

From 07cdd7a53931a17a2c24f834c5e1ea0f62609c42 Mon Sep 17 00:00:00 2001
From: Pooya Vahidi <56851682+pooyavahidi@users.noreply.github.com>
Date: Sat, 9 Oct 2021 21:02:49 +1100
Subject: [PATCH 193/591] fix(lib): fix status exit code check in
 `git_prompt_status` (#10275)

---
 lib/git.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index c9363274c..9a615e77b 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -206,7 +206,8 @@ function git_prompt_status() {
     STASHED UNMERGED AHEAD BEHIND DIVERGED
   )
 
-  local status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)"
+  local status_text
+  status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)"
 
   # Don't continue on a catastrophic failure
   if [[ $? -eq 128 ]]; then

From 6ac1ff69053525d94b8bc6c5243d2bb67fb61930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Marku=C5=A1i=C4=87?= <markusicluka@gmail.com>
Date: Sat, 9 Oct 2021 13:42:17 +0200
Subject: [PATCH 194/591] fix(git): fix directory parse from URL in `gccd`
 (#10276)

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index dbcc7bddb..5a3c98287 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -100,7 +100,7 @@ alias gcf='git config --list'
 
 function gccd() {
   command git clone --recurse-submodules "$@"
-  [[ -d "$_" ]] && cd "$_" || cd "${${_:h}%.git}"
+  [[ -d "$_" ]] && cd "$_" || cd "${${_:t}%.git}"
 }
 compdef _git gccd=git-clone
 

From f82aa819310752ad754c4ebfd1ae499285ee556e Mon Sep 17 00:00:00 2001
From: michael-yuji <michael-yuji@users.noreply.github.com>
Date: Mon, 11 Oct 2021 01:15:24 +0800
Subject: [PATCH 195/591] fix(lib): fix `diff --color` argument check for BSD
 systems (#10269)

---
 lib/theme-and-appearance.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 0b71de372..00947f72d 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -40,7 +40,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
 fi
 
 # enable diff color if possible.
-if command diff --color . . &>/dev/null; then
+if command diff --color /dev/null /dev/null &>/dev/null; then
   alias diff='diff --color'
 fi
 

From 9bd0ac9b005189edceb0ac53f361fcc020f8e6b6 Mon Sep 17 00:00:00 2001
From: Arthur Maltson <arthur@maltson.com>
Date: Mon, 11 Oct 2021 05:40:17 -0400
Subject: [PATCH 196/591] feat(mvn): support using `mvnw` in multi-module
 projects (#9413)

---
 plugins/mvn/mvn.plugin.zsh | 531 +++++++++++++++++++------------------
 1 file changed, 269 insertions(+), 262 deletions(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 27d63a6f9..e32729aa6 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -1,39 +1,46 @@
-# Calls ./mvnw if found, otherwise execute the original mvn
+# Calls mvnw if found in the current project, otherwise execute the original mvn
 mvn-or-mvnw() {
-	if [ -x ./mvnw ]; then
-		echo "executing mvnw instead of mvn"
-		./mvnw "$@"
-	else
-		command mvn "$@"
-	fi
+  local dir="$PWD"
+  while [[ ! -x "$dir/mvnw" && "$dir" != / ]]; do
+    dir="${dir:h}"
+  done
+
+  if [[ -x "$dir/mvnw" ]]; then
+    echo "Running \`$dir/mvnw\`..." >&2
+    "$dir/mvnw" "$@"
+    return $?
+  fi
+
+  command mvn "$@"
 }
 
 # Wrapper function for Maven's mvn command. Based on https://gist.github.com/1027800
 mvn-color() {
-	local BOLD=$(echoti bold)
-	local TEXT_RED=$(echoti setaf 1)
-	local TEXT_GREEN=$(echoti setaf 2)
-	local TEXT_YELLOW=$(echoti setaf 3)
-	local TEXT_BLUE=$(echoti setaf 4)
-	local TEXT_WHITE=$(echoti setaf 7)
-	local RESET_FORMATTING=$(echoti sgr0)
-	(
-	# Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
-	unset LANG
-	LC_CTYPE=C mvn "$@" | sed \
-		-e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
-		-e "s/\(\[DEBUG\]\)\(.*\)/${TEXT_WHITE}${BOLD}\1${RESET_FORMATTING}\2/g" \
-		-e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
-		-e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
-		-e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
-		-e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
+  local BOLD=$(echoti bold)
+  local TEXT_RED=$(echoti setaf 1)
+  local TEXT_GREEN=$(echoti setaf 2)
+  local TEXT_YELLOW=$(echoti setaf 3)
+  local TEXT_BLUE=$(echoti setaf 4)
+  local TEXT_WHITE=$(echoti setaf 7)
+  local RESET_FORMATTING=$(echoti sgr0)
 
-	# Make sure formatting is reset
-	echo -ne "${RESET_FORMATTING}"
-	)
+  (
+    # Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
+    unset LANG
+    LC_CTYPE=C mvn "$@" | sed \
+      -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
+      -e "s/\(\[DEBUG\]\)\(.*\)/${TEXT_WHITE}${BOLD}\1${RESET_FORMATTING}\2/g" \
+      -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
+      -e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
+      -e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
+      -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
+
+    # Make sure formatting is reset
+    echo -ne "${RESET_FORMATTING}"
+  )
 }
 
-# either use orignal mvn or the mvn wrapper
+# either use original mvn or the mvn wrapper
 alias mvn="mvn-or-mvnw"
 
 # Run mvn against the pom found in a project's root directory (assumes a git repo)
@@ -72,262 +79,262 @@ alias mvn-updates='mvn versions:display-dependency-updates'
 
 
 function listMavenCompletions {
-	local file new_file
-	local -a profiles POM_FILES modules
+  local file new_file
+  local -a profiles POM_FILES modules
 
-	# Root POM
-	POM_FILES=(~/.m2/settings.xml)
+  # Root POM
+  POM_FILES=(~/.m2/settings.xml)
 
-	# POM in the current directory
-	if [[ -f pom.xml ]]; then
-		local file=pom.xml
-		POM_FILES+=("${file:A}")
-	fi
+  # POM in the current directory
+  if [[ -f pom.xml ]]; then
+    local file=pom.xml
+    POM_FILES+=("${file:A}")
+  fi
 
-	# Look for POM files in parent directories
-	while [[ -n "$file" ]] && grep -q "<parent>" "$file"; do
-		# look for a new relativePath for parent pom.xml
-		new_file=$(grep -e "<relativePath>.*</relativePath>" "$file" | sed -e 's/.*<relativePath>\(.*\)<\/relativePath>.*/\1/')
+  # Look for POM files in parent directories
+  while [[ -n "$file" ]] && grep -q "<parent>" "$file"; do
+    # look for a new relativePath for parent pom.xml
+    new_file=$(grep -e "<relativePath>.*</relativePath>" "$file" | sed -e 's/.*<relativePath>\(.*\)<\/relativePath>.*/\1/')
 
-		# if <parent> is present but not defined, assume ../pom.xml
-		if [[ -z "$new_file" ]]; then
-			new_file="../pom.xml"
-		fi
+    # if <parent> is present but not defined, assume ../pom.xml
+    if [[ -z "$new_file" ]]; then
+      new_file="../pom.xml"
+    fi
 
-		# if file doesn't exist break
-		file="${file:h}/${new_file}"
-		if ! [[ -e "$file" ]]; then
-			break
-		fi
+    # if file doesn't exist break
+    file="${file:h}/${new_file}"
+    if ! [[ -e "$file" ]]; then
+      break
+    fi
 
-		POM_FILES+=("${file:A}")
-	done
+    POM_FILES+=("${file:A}")
+  done
 
-	# Get profiles from found files
-	for file in $POM_FILES; do
-		[[ -e $file ]] || continue
-		profiles+=($(sed 's/<!--.*-->//' "$file" | sed '/<!--/,/-->/d' | grep -e "<profile>" -A 1 | grep -e "<id>.*</id>" | sed 's?.*<id>\(.*\)<\/id>.*?-P\1?'))
-	done
+  # Get profiles from found files
+  for file in $POM_FILES; do
+    [[ -e $file ]] || continue
+    profiles+=($(sed 's/<!--.*-->//' "$file" | sed '/<!--/,/-->/d' | grep -e "<profile>" -A 1 | grep -e "<id>.*</id>" | sed 's?.*<id>\(.*\)<\/id>.*?-P\1?'))
+  done
 
-	# List modules
-	modules=($(find **/pom.xml -type f | grep -v '/target/classes/META-INF/' | grep '/pom.xml' |sed 's|\(.*\)/pom\.xml|\1|'))
+  # List modules
+  modules=($(find **/pom.xml -type f | grep -v '/target/classes/META-INF/' | grep '/pom.xml' |sed 's|\(.*\)/pom\.xml|\1|'))
 
-	reply=(
-		# common lifecycle
-		clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
+  reply=(
+    # common lifecycle
+    clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
 
-		# integration testing
-		pre-integration-test integration-test
+    # integration testing
+    pre-integration-test integration-test
 
-		# common plugins
-		deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
+    # common plugins
+    deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
 
-		# deploy
-		deploy:deploy-file
-		# failsafe
-		failsafe:integration-test failsafe:verify
-		# install
-		install:install-file install:help
-		# site
-		site:site site:deploy site:run site:stage site:stage-deploy site:attach-descriptor site:jar site:effective-site
-		# surefire
-		surefire:test
+    # deploy
+    deploy:deploy-file
+    # failsafe
+    failsafe:integration-test failsafe:verify
+    # install
+    install:install-file install:help
+    # site
+    site:site site:deploy site:run site:stage site:stage-deploy site:attach-descriptor site:jar site:effective-site
+    # surefire
+    surefire:test
 
-		# checkstyle
-		checkstyle:checkstyle checkstyle:check checkstyle:checkstyle-aggregate
-		# javadoc
-		javadoc:javadoc javadoc:test-javadoc javadoc:javadoc-no-fork javadoc:test-javadoc-no-fork javadoc:aggregate javadoc:test-aggregate javadoc:jar javadoc:test-jar javadoc:aggregate-jar javadoc:test-aggregate-jar javadoc:fix javadoc:test-fix javadoc:resource-bundle javadoc:test-resource-bundle
-		# jxr
-		jxr:jxr jxr:aggregate jxr:test-jxr jxr:test-aggregate
-		# pmd
-		pmd:pmd pmd:cpd pmd:check pmd:cpd-check
+    # checkstyle
+    checkstyle:checkstyle checkstyle:check checkstyle:checkstyle-aggregate
+    # javadoc
+    javadoc:javadoc javadoc:test-javadoc javadoc:javadoc-no-fork javadoc:test-javadoc-no-fork javadoc:aggregate javadoc:test-aggregate javadoc:jar javadoc:test-jar javadoc:aggregate-jar javadoc:test-aggregate-jar javadoc:fix javadoc:test-fix javadoc:resource-bundle javadoc:test-resource-bundle
+    # jxr
+    jxr:jxr jxr:aggregate jxr:test-jxr jxr:test-aggregate
+    # pmd
+    pmd:pmd pmd:cpd pmd:check pmd:cpd-check
 
-		# ant
-		ant:ant ant:clean
-		# antrun
-		antrun:run
-		# archetype
-		archetype:generate archetype:create-from-project archetype:crawl
-		# assembly
-		assembly:single assembly:assembly
-		# dependency
-		dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:analyze-duplicate dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:display-ancestors dependency:get dependency:go-offline dependency:list dependency:list-repositories dependency:properties dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies
-		# enforcer
-		enforcer:enforce enforcer:display-info
-		# gpg
-		gpg:sign gpg:sign-and-deploy-file
-		# help
-		help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
-		# release
-		release:clean release:prepare release:prepare-with-pom release:rollback release:perform release:stage release:branch release:update-versions
-		# jgitflow
-		jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
-		# repository
-		repository:bundle-create repository:bundle-pack
-		# source
-		source:aggregate source:jar source:jar-no-fork source:test-jar source:test-jar-no-fork
+    # ant
+    ant:ant ant:clean
+    # antrun
+    antrun:run
+    # archetype
+    archetype:generate archetype:create-from-project archetype:crawl
+    # assembly
+    assembly:single assembly:assembly
+    # dependency
+    dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:analyze-duplicate dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:display-ancestors dependency:get dependency:go-offline dependency:list dependency:list-repositories dependency:properties dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies
+    # enforcer
+    enforcer:enforce enforcer:display-info
+    # gpg
+    gpg:sign gpg:sign-and-deploy-file
+    # help
+    help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
+    # release
+    release:clean release:prepare release:prepare-with-pom release:rollback release:perform release:stage release:branch release:update-versions
+    # jgitflow
+    jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
+    # repository
+    repository:bundle-create repository:bundle-pack
+    # source
+    source:aggregate source:jar source:jar-no-fork source:test-jar source:test-jar-no-fork
 
-		# eclipse
-		eclipse:clean eclipse:eclipse
-		# idea
-		idea:clean idea:idea
+    # eclipse
+    eclipse:clean eclipse:eclipse
+    # idea
+    idea:clean idea:idea
 
-		# jetty
-		jetty:run jetty:run-exploded
-		# cargo
-		cargo:start cargo:run cargo:stop cargo:deploy cargo:undeploy cargo:help
-		# jboss
-		jboss:start jboss:stop jboss:deploy jboss:undeploy jboss:redeploy
-		# tomcat
-		tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:redeploy
-		# tomcat6
-		tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
-		# tomcat7
-		tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy
-		# tomee
-		tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy
-		# spring-boot
-		spring-boot:run spring-boot:repackage
-		# quarkus
-		quarkus:dev quarkus:list-extensions quarkus:add-extension quarkus:add-extensions quarkus:generate-config quarkus:help
-		# exec
-		exec:exec exec:java
-		# versions
-		versions:display-dependency-updates versions:display-plugin-updates versions:display-property-updates versions:update-parent versions:update-properties versions:update-child-modules versions:lock-snapshots versions:unlock-snapshots versions:resolve-ranges versions:set versions:use-releases versions:use-next-releases versions:use-latest-releases versions:use-next-snapshots versions:use-latest-snapshots versions:use-next-versions versions:use-latest-versions versions:commit versions:revert
-		# scm
-		scm:add scm:bootstrap scm:branch scm:changelog scm:check-local-modification scm:checkin scm:checkout scm:diff scm:edit scm:export scm:list scm:remove scm:status scm:tag scm:unedit scm:update scm:update-subprojects scm:validate
-		# buildnumber
-		buildnumber:create buildnumber:create-timestamp buildnumber:help buildnumber:hgchangeset
+    # jetty
+    jetty:run jetty:run-exploded
+    # cargo
+    cargo:start cargo:run cargo:stop cargo:deploy cargo:undeploy cargo:help
+    # jboss
+    jboss:start jboss:stop jboss:deploy jboss:undeploy jboss:redeploy
+    # tomcat
+    tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:redeploy
+    # tomcat6
+    tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
+    # tomcat7
+    tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy
+    # tomee
+    tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy
+    # spring-boot
+    spring-boot:run spring-boot:repackage
+    # quarkus
+    quarkus:dev quarkus:list-extensions quarkus:add-extension quarkus:add-extensions quarkus:generate-config quarkus:help
+    # exec
+    exec:exec exec:java
+    # versions
+    versions:display-dependency-updates versions:display-plugin-updates versions:display-property-updates versions:update-parent versions:update-properties versions:update-child-modules versions:lock-snapshots versions:unlock-snapshots versions:resolve-ranges versions:set versions:use-releases versions:use-next-releases versions:use-latest-releases versions:use-next-snapshots versions:use-latest-snapshots versions:use-next-versions versions:use-latest-versions versions:commit versions:revert
+    # scm
+    scm:add scm:bootstrap scm:branch scm:changelog scm:check-local-modification scm:checkin scm:checkout scm:diff scm:edit scm:export scm:list scm:remove scm:status scm:tag scm:unedit scm:update scm:update-subprojects scm:validate
+    # buildnumber
+    buildnumber:create buildnumber:create-timestamp buildnumber:help buildnumber:hgchangeset
 
-		# war
-		war:war war:exploded war:inplace war:manifest
-		# ear
-		ear:ear ear:generate-application-xml
-		# ejb
-		ejb:ejb
-		# android
-		android:apk android:apklib android:deploy android:deploy-dependencies android:dex android:emulator-start android:emulator-stop android:emulator-stop-all android:generate-sources android:help android:instrument android:manifest-update android:pull android:push android:redeploy android:run android:undeploy android:unpack android:version-update android:zipalign android:devices
-		# nexus
-		nexus:staging-list nexus:staging-close nexus:staging-drop nexus:staging-release nexus:staging-build-promotion nexus:staging-profiles-list nexus:settings-download
-		# repository
-		repository:bundle-create repository:bundle-pack repository:help
+    # war
+    war:war war:exploded war:inplace war:manifest
+    # ear
+    ear:ear ear:generate-application-xml
+    # ejb
+    ejb:ejb
+    # android
+    android:apk android:apklib android:deploy android:deploy-dependencies android:dex android:emulator-start android:emulator-stop android:emulator-stop-all android:generate-sources android:help android:instrument android:manifest-update android:pull android:push android:redeploy android:run android:undeploy android:unpack android:version-update android:zipalign android:devices
+    # nexus
+    nexus:staging-list nexus:staging-close nexus:staging-drop nexus:staging-release nexus:staging-build-promotion nexus:staging-profiles-list nexus:settings-download
+    # repository
+    repository:bundle-create repository:bundle-pack repository:help
 
-		# sonar
-		sonar:sonar
-		# license
-		license:format license:check
-		# hibernate3
-		hibernate3:hbm2ddl hibernate3:help
-		# liquibase
-		liquibase:changelogSync liquibase:changelogSyncSQL liquibase:clearCheckSums liquibase:dbDoc liquibase:diff liquibase:dropAll liquibase:help liquibase:migrate liquibase:listLocks liquibase:migrateSQL liquibase:releaseLocks liquibase:rollback liquibase:rollbackSQL liquibase:status liquibase:tag liquibase:update liquibase:updateSQL liquibase:updateTestingRollback
-		# flyway
-		flyway:clean flyway:history flyway:init flyway:migrate flyway:status flyway:validate
-		# gwt
-		gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test
-		# asciidoctor
-		asciidoctor:process-asciidoc asciidoctor:auto-refresh asciidoctor:http asciidoctor:zip
-		# compiler
-		compiler:compile compiler:testCompile
-		# resources
-		resources:resources resources:testResources resources:copy-resources
-		# verifier
-		verifier:verify
-		# jar
-		jar:jar jar:test-jar
-		# rar
-		rar:rar
-		# acr
-		acr:acr
-		# shade
-		shade:shade
-		# changelog
-		changelog:changelog changelog:dev-activity changelog:file-activity
-		# changes
-		changes:announcement-mail changes:announcement-generate changes:changes-check changes:changes-validate changes:changes-report changes:jira-report changes:trac-report changes:github-report
-		# doap
-		doap:generate
-		# docck
-		docck:check
-		# jdeps
-		jdeps:jdkinternals jdeps:test-jdkinternals
-		# linkcheck
-		linkcheck:linkcheck
-		# project-info-reports
-		project-info-reports:cim project-info-reports:dependencies project-info-reports:dependency-convergence project-info-reports:dependency-info project-info-reports:dependency-management project-info-reports:distribution-management project-info-reports:help project-info-reports:index project-info-reports:issue-tracking project-info-reports:license project-info-reports:mailing-list project-info-reports:modules project-info-reports:plugin-management project-info-reports:plugins project-info-reports:project-team project-info-reports:scm project-info-reports:summary
-		# surefire-report
-		surefire-report:failsafe-report-only surefire-report:report surefire-report:report-only
-		# invoker
-		invoker:install invoker:integration-test invoker:verify invoker:run
-		# jarsigner
-		jarsigner:sign jarsigner:verify
-		# patch
-		patch:apply
-		# pdf
-		pdf:pdf
-		# plugin
-		plugin:descriptor plugin:report plugin:updateRegistry plugin:addPluginArtifactMetadata plugin:helpmojo
-		# remote-resources
-		remote-resources:bundle remote-resources:process
-		# scm-publish
-		scm-publish:help scm-publish:publish-scm scm-publish:scmpublish
-		# stage
-		stage:copy
-		# toolchain
-		toolchain:toolchain
-		#liberty
-		liberty:clean-server liberty:compile-jsp liberty:configure-arquillian liberty:create-server liberty:debug liberty:debug-server liberty:deploy liberty:dev liberty:display-url liberty:dump-server liberty:install-apps liberty:install-feature liberty:install-server liberty:java-dump-server liberty:package-server liberty:run liberty:run-server liberty:server-status liberty:start liberty:start-server liberty:status liberty:stop liberty:stop-server liberty:test-start-server liberty:test-stop-server liberty:undeploy liberty:uninstall-feature
+    # sonar
+    sonar:sonar
+    # license
+    license:format license:check
+    # hibernate3
+    hibernate3:hbm2ddl hibernate3:help
+    # liquibase
+    liquibase:changelogSync liquibase:changelogSyncSQL liquibase:clearCheckSums liquibase:dbDoc liquibase:diff liquibase:dropAll liquibase:help liquibase:migrate liquibase:listLocks liquibase:migrateSQL liquibase:releaseLocks liquibase:rollback liquibase:rollbackSQL liquibase:status liquibase:tag liquibase:update liquibase:updateSQL liquibase:updateTestingRollback
+    # flyway
+    flyway:clean flyway:history flyway:init flyway:migrate flyway:status flyway:validate
+    # gwt
+    gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test
+    # asciidoctor
+    asciidoctor:process-asciidoc asciidoctor:auto-refresh asciidoctor:http asciidoctor:zip
+    # compiler
+    compiler:compile compiler:testCompile
+    # resources
+    resources:resources resources:testResources resources:copy-resources
+    # verifier
+    verifier:verify
+    # jar
+    jar:jar jar:test-jar
+    # rar
+    rar:rar
+    # acr
+    acr:acr
+    # shade
+    shade:shade
+    # changelog
+    changelog:changelog changelog:dev-activity changelog:file-activity
+    # changes
+    changes:announcement-mail changes:announcement-generate changes:changes-check changes:changes-validate changes:changes-report changes:jira-report changes:trac-report changes:github-report
+    # doap
+    doap:generate
+    # docck
+    docck:check
+    # jdeps
+    jdeps:jdkinternals jdeps:test-jdkinternals
+    # linkcheck
+    linkcheck:linkcheck
+    # project-info-reports
+    project-info-reports:cim project-info-reports:dependencies project-info-reports:dependency-convergence project-info-reports:dependency-info project-info-reports:dependency-management project-info-reports:distribution-management project-info-reports:help project-info-reports:index project-info-reports:issue-tracking project-info-reports:license project-info-reports:mailing-list project-info-reports:modules project-info-reports:plugin-management project-info-reports:plugins project-info-reports:project-team project-info-reports:scm project-info-reports:summary
+    # surefire-report
+    surefire-report:failsafe-report-only surefire-report:report surefire-report:report-only
+    # invoker
+    invoker:install invoker:integration-test invoker:verify invoker:run
+    # jarsigner
+    jarsigner:sign jarsigner:verify
+    # patch
+    patch:apply
+    # pdf
+    pdf:pdf
+    # plugin
+    plugin:descriptor plugin:report plugin:updateRegistry plugin:addPluginArtifactMetadata plugin:helpmojo
+    # remote-resources
+    remote-resources:bundle remote-resources:process
+    # scm-publish
+    scm-publish:help scm-publish:publish-scm scm-publish:scmpublish
+    # stage
+    stage:copy
+    # toolchain
+    toolchain:toolchain
+    #liberty
+    liberty:clean-server liberty:compile-jsp liberty:configure-arquillian liberty:create-server liberty:debug liberty:debug-server liberty:deploy liberty:dev liberty:display-url liberty:dump-server liberty:install-apps liberty:install-feature liberty:install-server liberty:java-dump-server liberty:package-server liberty:run liberty:run-server liberty:server-status liberty:start liberty:start-server liberty:status liberty:stop liberty:stop-server liberty:test-start-server liberty:test-stop-server liberty:undeploy liberty:uninstall-feature
 
-		# options
-		"-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile="
+    # options
+    "-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile="
 
-		# arguments
-		-am --also-make
-		-amd --also-make-dependents-am
-		-B --batch-mode
-		-b --builder
-		-C --strict-checksums
-		-c --lax-checksums
-		-cpu --check-plugin-updates
-		-D --define
-		-e --errors
-		-emp --encrypt-master-password
-		-ep --encrypt-password
-		-f --file
-		-fae --fail-at-end
-		-ff --fail-fast
-		-fn --fail-never
-		-gs --global-settings
-		-gt --global-toolchains
-		-h --help
-		-l --log-file
-		-llr --legacy-local-repository
-		-N --non-recursive
-		-npr --no-plugin-registry
-		-npu --no-plugin-updates
-		-nsu --no-snapshot-updates
-		-o --offline
-		-P --activate-profiles
-		-pl --projects
-		-q --quiet
-		-rf --resume-from
-		-s --settings
-		-t --toolchains
-		-T --threads
-		-U --update-snapshots
-		-up --update-plugins
-		-v --version
-		-V --show-version
-		-X --debug
+    # arguments
+    -am --also-make
+    -amd --also-make-dependents-am
+    -B --batch-mode
+    -b --builder
+    -C --strict-checksums
+    -c --lax-checksums
+    -cpu --check-plugin-updates
+    -D --define
+    -e --errors
+    -emp --encrypt-master-password
+    -ep --encrypt-password
+    -f --file
+    -fae --fail-at-end
+    -ff --fail-fast
+    -fn --fail-never
+    -gs --global-settings
+    -gt --global-toolchains
+    -h --help
+    -l --log-file
+    -llr --legacy-local-repository
+    -N --non-recursive
+    -npr --no-plugin-registry
+    -npu --no-plugin-updates
+    -nsu --no-snapshot-updates
+    -o --offline
+    -P --activate-profiles
+    -pl --projects
+    -q --quiet
+    -rf --resume-from
+    -s --settings
+    -t --toolchains
+    -T --threads
+    -U --update-snapshots
+    -up --update-plugins
+    -v --version
+    -V --show-version
+    -X --debug
 
-		cli:execute cli:execute-phase
-		archetype:generate generate-sources
-		cobertura:cobertura
-		-Dtest=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi)
-		-Dit.test=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi)
+    cli:execute cli:execute-phase
+    archetype:generate generate-sources
+    cobertura:cobertura
+    -Dtest=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi)
+    -Dit.test=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi)
 
-		$profiles
-		$modules
-	)
+    $profiles
+    $modules
+  )
 }
 
 compctl -K listMavenCompletions mvn mvnw

From a0ac789f2abf475346505cd372a3843b3b93d91e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 11 Oct 2021 12:15:47 +0200
Subject: [PATCH 197/591] feat(ssh-agent): allow lazy-loading SSH identities
 (#6309)

Fixes #7477
---
 plugins/ssh-agent/README.md            | 18 +++++++++++++++++-
 plugins/ssh-agent/ssh-agent.plugin.zsh |  5 ++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index d1a504b1e..1d6914ec6 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -21,7 +21,23 @@ zstyle :omz:plugins:ssh-agent agent-forwarding on
 
 ----
 
-To **load multiple identities** use the `identities` style, For example:
+To **NOT load any identities on start** use the `lazy` setting. This is particularly
+useful when combined with the `AddKeysToAgent` setting (available since OpenSSH 7.2),
+since it allows to enter the password only on first use. _NOTE: you can know your
+OpenSSH version with `ssh -V`._
+
+```zsh
+zstyle :omz:plugins:ssh-agent lazy yes
+```
+
+You can enable `AddKeysToAgent` by passing `-o AddKeysToAgent=yes` to the `ssh` command,
+or by adding `AddKeysToAgent yes` to your `~/.ssh/config` file [1].
+See the [OpenSSH 7.2 Release Notes](http://www.openssh.com/txt/release-7.2).
+
+----
+
+To **load multiple identities** use the `identities` style (**this has no effect
+if the `lazy` setting is enabled**). For example:
 
 ```zsh
 zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 2d7d8a2a0..4bd2dedcc 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -96,7 +96,10 @@ else
   _start_agent
 fi
 
-_add_identities
+# Don't add identities if lazy-loading is enabled
+if ! zstyle -b :omz:plugins:ssh-agent lazy; then
+  _add_identities
+fi
 
 unset agent_forwarding ssh_env_cache
 unfunction _start_agent _add_identities

From beeda72826f7288d3edf6cec4114bbda9bbae347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 11 Oct 2021 15:21:42 +0200
Subject: [PATCH 198/591] fix(ssh-agent): fix for bad `zstyle` command argument

Fixes #10282
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 4bd2dedcc..c006f1413 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -97,7 +97,7 @@ else
 fi
 
 # Don't add identities if lazy-loading is enabled
-if ! zstyle -b :omz:plugins:ssh-agent lazy; then
+if ! zstyle -t :omz:plugins:ssh-agent lazy; then
   _add_identities
 fi
 

From dbf555438e48fe447736200bd6f6d969a51a8086 Mon Sep 17 00:00:00 2001
From: Igor Gavelyuk <gavelyukworking@gmail.com>
Date: Wed, 13 Oct 2021 11:00:46 +0300
Subject: [PATCH 199/591] feat(obraun): display time with leading zeros
 (#10289)

---
 themes/obraun.zsh-theme | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/themes/obraun.zsh-theme b/themes/obraun.zsh-theme
index cc2769e4b..c64362b04 100644
--- a/themes/obraun.zsh-theme
+++ b/themes/obraun.zsh-theme
@@ -2,10 +2,9 @@ if [ "$USERNAME" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
 
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-PROMPT='%{$fg[green]%}[%*]%{$reset_color%} %{$fg_no_bold[cyan]%}%n %{${fg_bold[blue]}%}::%{$reset_color%} %{$fg[yellow]%}%m%{$reset_color%} %{$fg_no_bold[magenta]%} ➜ %{$reset_color%} %{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} '
+PROMPT='%{$fg[green]%}[%D{%H:%M:%S}]%{$reset_color%} %{$fg_no_bold[cyan]%}%n %{${fg_bold[blue]}%}::%{$reset_color%} %{$fg[yellow]%}%m%{$reset_color%} %{$fg_no_bold[magenta]%} ➜ %{$reset_color%} %{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} '
 
 RPS1="${return_code}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
-

From 19f9b6f1ade7788b07480be685cf3fcb117cad84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 13 Oct 2021 11:58:56 +0200
Subject: [PATCH 200/591] feat(updater): add support for terminal hyperlinks

---
 tools/upgrade.sh | 101 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 93 insertions(+), 8 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 1424d1433..7642858fe 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -15,11 +15,98 @@ cd "$ZSH"
 # Use colors, but only if connected to a terminal
 # and that terminal supports them.
 
+# The [ -t 1 ] check only works when the function is not called from
+# a subshell (like in `$(...)` or `(...)`, so this hack redefines the
+# function at the top level to always return false when stdout is not
+# a tty.
+if [ -t 1 ]; then
+  is_tty() {
+    true
+  }
+else
+  is_tty() {
+    false
+  }
+fi
+
+# This function uses the logic from supports-hyperlinks[1][2], which is
+# made by Kat Marchán (@zkat) and licensed under the Apache License 2.0.
+# [1] https://github.com/zkat/supports-hyperlinks
+# [2] https://crates.io/crates/supports-hyperlinks
+#
+# Copyright (c) 2021 Kat Marchán
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+supports_hyperlinks() {
+  # $FORCE_HYPERLINK must be set and be non-zero (this acts as a logic bypass)
+  if [ -n "$FORCE_HYPERLINK" ]; then
+    [ "$FORCE_HYPERLINK" != 0 ]
+    return $?
+  fi
+
+  # If stdout is not a tty, it doesn't support hyperlinks
+  is_tty || return 1
+
+  # DomTerm terminal emulator (domterm.org)
+  if [ -n "$DOMTERM" ]; then
+    return 0
+  fi
+
+  # VTE-based terminals above v0.50 (Gnome Terminal, Guake, ROXTerm, etc)
+  if [ -n "$VTE_VERSION" ]; then
+    [ $VTE_VERSION -ge 5000 ]
+    return $?
+  fi
+
+  # If $TERM_PROGRAM is set, these terminals support hyperlinks
+  case "$TERM_PROGRAM" in
+  Hyper|iTerm.app|terminology|WezTerm) return 0 ;;
+  esac
+
+  # kitty supports hyperlinks
+  if [ "$TERM" = xterm-kitty ]; then
+    return 0
+  fi
+
+  # Windows Terminal or Konsole also support hyperlinks
+  if [ -n "$WT_SESSION" ] || [ -n "$KONSOLE_VERSION" ]; then
+    return 0
+  fi
+
+  return 1
+}
+
+fmt_link() {
+  # $1: text, $2: url, $3: fallback mode
+  if supports_hyperlinks; then
+    printf '\033]8;;%s\a%s\033]8;;\a\n' "$2" "$1"
+    return
+  fi
+
+  case "$3" in
+  --text) printf '%s\n' "$1" ;;
+  --url|*) fmt_underline "$2" ;;
+  esac
+}
+
+fmt_underline() {
+  is_tty && printf '\033[4m%s\033[24m\n' "$*" || printf '%s\n' "$*"
+}
+
 setopt typeset_silent
 typeset -a RAINBOW
-typeset RED GREEN YELLOW BLUE BOLD DIM UNDER RESET
 
-if [ -t 1 ]; then
+if is_tty; then
   RAINBOW=(
     "$(printf '\033[38;5;196m')"
     "$(printf '\033[38;5;202m')"
@@ -35,8 +122,6 @@ if [ -t 1 ]; then
   YELLOW=$(printf '\033[33m')
   BLUE=$(printf '\033[34m')
   BOLD=$(printf '\033[1m')
-  DIM=$(printf '\033[2m')
-  UNDER=$(printf '\033[4m')
   RESET=$(printf '\033[0m')
 fi
 
@@ -104,10 +189,10 @@ if git pull --rebase --stat $remote $branch; then
   printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RAINBOW $RESET
   printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n' $RAINBOW $RESET
   printf '\n'
-  printf "${BLUE}%s${RESET}\n" "$message"
-  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "To keep up with the latest news and updates, follow us on Twitter:" "https://twitter.com/ohmyzsh"
-  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Want to get involved in the community? Join our Discord:" "https://discord.gg/ohmyzsh"
-  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Get your Oh My Zsh swag at:" "https://shop.planetargon.com/collections/oh-my-zsh"
+  printf "${BLUE}%s${RESET}\n\n" "$message"
+  printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on Twitter:" "$(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"
+  printf "${BLUE}${BOLD}%s %s${RESET}\n" "Want to get involved in the community? Join our Discord:" "$(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
+  printf "${BLUE}${BOLD}%s %s${RESET}\n" "Get your Oh My Zsh swag at:" "$(fmt_link "Planet Argon Shop" https://shop.planetargon.com/collections/oh-my-zsh)"
 else
   ret=$?
   printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'

From 75fe22b40552305ef7636b7604ba99534d4f7808 Mon Sep 17 00:00:00 2001
From: Eric <192110+scribe@users.noreply.github.com>
Date: Mon, 18 Oct 2021 11:58:25 -0600
Subject: [PATCH 201/591] docs(README): document new `zstyle` update settings
 (#10304)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 README.md | 65 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 3ebea91e0..907248beb 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ It's a good idea to inspect the install script from projects you don't yet know.
 that by downloading the install script first, looking through it so everything looks normal,
 then running it:
 
-```shell
+```sh
 wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
 sh install.sh
 ```
@@ -57,13 +57,13 @@ Oh My Zsh comes with a shitload of plugins for you to take advantage of. You can
 
 Once you spot a plugin (or several) that you'd like to use with Oh My Zsh, you'll need to enable them in the `.zshrc` file. You'll find the zshrc file in your `$HOME` directory. Open it with your favorite text editor and you'll see a spot to list all the plugins you want to load.
 
-```shell
+```sh
 vi ~/.zshrc
 ```
 
 For example, this might begin to look like this:
 
-```shell
+```sh
 plugins=(
   git
   bundler
@@ -91,13 +91,13 @@ _Robby's theme is the default one. It's not the fanciest one. It's not the simpl
 
 Once you find a theme that you'd like to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:
 
-```shell
+```sh
 ZSH_THEME="robbyrussell"
 ```
 
 To use a different theme, simply change the value to match the name of your desired theme. For example:
 
-```shell
+```sh
 ZSH_THEME="agnoster" # (this is one of the fancy ones)
 # see https://github.com/ohmyzsh/ohmyzsh/wiki/Themes#agnoster
 ```
@@ -112,13 +112,13 @@ In case you did not find a suitable theme for your needs, please have a look at
 
 If you're feeling feisty, you can let the computer select one randomly for you each time you open a new terminal window.
 
-```shell
+```sh
 ZSH_THEME="random" # (...please let it be pie... please be some pie..)
 ```
 
 And if you want to pick random theme from a list of your favorite themes:
 
-```shell
+```sh
 ZSH_THEME_RANDOM_CANDIDATES=(
   "robbyrussell"
   "agnoster"
@@ -127,7 +127,7 @@ ZSH_THEME_RANDOM_CANDIDATES=(
 
 If you only know which themes you don't like, you can add them similarly to an ignored list:
 
-```shell
+```sh
 ZSH_THEME_RANDOM_IGNORED=(pygmalion tjkirch_mod)
 ```
 
@@ -152,7 +152,7 @@ If you'd like to change the install directory with the `ZSH` environment variabl
 `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline
 like this:
 
-```shell
+```sh
 ZSH="$HOME/.dotfiles/oh-my-zsh" sh install.sh
 ```
 
@@ -162,7 +162,7 @@ If you're running the Oh My Zsh install script as part of an automated install,
 flag `--unattended` to the `install.sh` script. This will have the effect of not trying to change
 the default shell, and also won't run `zsh` when the installation has finished.
 
-```shell
+```sh
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 ```
 
@@ -185,7 +185,7 @@ The install script also accepts these variables to allow installation of a diffe
 
 For example:
 
-```shell
+```sh
 REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh
 ```
 
@@ -193,13 +193,13 @@ REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh
 
 ##### 1. Clone the repository
 
-```shell
+```sh
 git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh
 ```
 
 ##### 2. *Optionally*, backup your existing `~/.zshrc` file
 
-```shell
+```sh
 cp ~/.zshrc ~/.zshrc.orig
 ```
 
@@ -207,13 +207,13 @@ cp ~/.zshrc ~/.zshrc.orig
 
 You can create a new zsh config file by copying the template that we have included for you.
 
-```shell
+```sh
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 ```
 
 ##### 4. Change your default shell
 
-```shell
+```sh
 chsh -s $(which zsh)
 ```
 
@@ -242,23 +242,40 @@ If you would like to override the functionality of a plugin distributed with Oh
 
 ## Getting Updates
 
-By default, you will be prompted to check for upgrades every few weeks. If you would like `oh-my-zsh` to automatically upgrade itself without prompting you, set the following in your `~/.zshrc`:
+By default, you will be prompted to check for updates every 2 weeks. You can choose other update modes by adding a line to your `~/.zshrc` file, **before Oh My Zsh is loaded**:
 
-```shell
-DISABLE_UPDATE_PROMPT=true
-```
+1. Automatic update without confirmation prompt:
 
-To disable automatic upgrades, set the following in your `~/.zshrc`:
+   ```sh
+   zstyle ':omz:update' mode auto
+   ```
 
-```shell
-DISABLE_AUTO_UPDATE=true
+2. Just offer a reminder every few days, if there are updates available:
+
+   ```sh
+   zstyle ':omz:update' mode reminder
+   ```
+
+3. To disable automatic updates entirely:
+
+   ```sh
+   zstyle ':omz:update' mode disabled
+   ```
+
+NOTE: you can control how often Oh My Zsh checks for updates with the following setting:
+
+```sh
+# This will check for updates every 7 days
+zstyle ':omz:update' frequency 7
+# This will check for updates every time you open the terminal (not recommended)
+zstyle ':omz:update' frequency 0
 ```
 
 ### Manual Updates
 
-If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
+If you'd like to update at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
 
-```shell
+```sh
 omz update
 ```
 

From f83bb65d47e5c0a238f4950294eeaeaa12738ce4 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 19 Oct 2021 10:50:41 -0700
Subject: [PATCH 202/591] Swapping gh with ghlp as 'gh' is reserved for the
 Github CLI. #9005

---
 plugins/ruby/README.md       | 3 ++-
 plugins/ruby/ruby.plugin.zsh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index a2de11991..d2beeb4b3 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -25,7 +25,8 @@ plugins=(... ruby)
 | gcb   | `gem cert --build`                     | Build private key and self-signed certificate        |
 | gclup | `gem cleanup -n`                       | Do not uninstall gem                                 |
 | ggi   | `gem generate_index`                   | Generate index file for gem server                   |
-| gh    | `gem help`                             | Provide additional help                              |
+| ghlp  | `gem help`                             | Provide additional help                              |
 | gl    | `gem lock`                             | Generate a lockdown list of gems                     |
 | go    | `gem open`                             | Open gem source in default editor                    |
 | goe   | `gem open -e`                          | Open gem sources in preferred editor                 |
+
diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 88e769d39..a7583497c 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -19,7 +19,7 @@ alias gcr="gem cert --remove"
 alias gcb="gem cert --build"
 alias gclup="gem cleanup -n"
 alias ggi="gem generate_index"
-alias gh="gem help"
+alias ghlp="gem help"
 alias gl="gem lock"
 alias go="gem open"
 alias goe="gem open -e"

From 4b1f6d638f0783e05a9d2601ee0e1fd902416491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 19 Oct 2021 20:07:40 +0200
Subject: [PATCH 203/591] feat(ruby): add multiple `gem` aliases (#9005)

Mostly empty commit to fix the changelog for merge at 6f4c7f64
---
 plugins/ruby/README.md       | 1 -
 plugins/ruby/ruby.plugin.zsh | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index d2beeb4b3..76afc79f6 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -29,4 +29,3 @@ plugins=(... ruby)
 | gl    | `gem lock`                             | Generate a lockdown list of gems                     |
 | go    | `gem open`                             | Open gem source in default editor                    |
 | goe   | `gem open -e`                          | Open gem sources in preferred editor                 |
-
diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index a7583497c..c235b6b69 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -1,5 +1,4 @@
-# TODO: Make this compatible with rvm.
-#       Run sudo gem on the system ruby, not the active ruby.
+# Run sudo gem on the system ruby, not the active ruby
 alias sgem='sudo gem'
 
 # Find ruby file

From 8c1495a18e5ba496837bf3978300519edadffaff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 20 Oct 2021 17:09:38 +0200
Subject: [PATCH 204/591] fix(ruby)!: rename aliases that start with `g` to
 `ge`

BREAKING CHANGE: all `gem` aliases that started with `g` now start
with `ge` to fix conflicting names with the `git` plugin. Also, the
`ghlp` alias is now renamed `geh`. Have a look at the plugin README
for more information.

Fixes #10320
---
 plugins/ruby/README.md       | 38 ++++++++++++++++++------------------
 plugins/ruby/ruby.plugin.zsh | 28 +++++++++++++-------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index 76afc79f6..59594ade7 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -10,22 +10,22 @@ plugins=(... ruby)
 
 ## Aliases
 
-| Alias | Command                                | Description                                          |
-|-------|----------------------------------------|------------------------------------------------------|
-| rb    | `ruby`                                 | The Ruby command                                     |
-| sgem  | `sudo gem`                             | Run sudo gem on the system ruby, not the active ruby |
-| rfind | `find . -name "*.rb" \| xargs grep -n` | Find ruby file                                       |
-| gin   | `gem install`                          | Install a gem into the local repository              |
-| gun   | `gem uninstall`                        | Uninstall gems from the local repository             |
-| gli   | `gem list`                             | Display gems installed locally                       |
-| gi    | `gem info`                             | Show information for the given gem                   |
-| giall | `gem info --all`                       | Display all gem versions                             |
-| gca   | `gem cert --add`                       | Add a trusted certificate                            |
-| gcr   | `gem cert --remove`                    | Remove a trusted certificate                         |
-| gcb   | `gem cert --build`                     | Build private key and self-signed certificate        |
-| gclup | `gem cleanup -n`                       | Do not uninstall gem                                 |
-| ggi   | `gem generate_index`                   | Generate index file for gem server                   |
-| ghlp  | `gem help`                             | Provide additional help                              |
-| gl    | `gem lock`                             | Generate a lockdown list of gems                     |
-| go    | `gem open`                             | Open gem source in default editor                    |
-| goe   | `gem open -e`                          | Open gem sources in preferred editor                 |
+| Alias  | Command                                | Description                                          |
+|--------|----------------------------------------|------------------------------------------------------|
+| rb     | `ruby`                                 | The Ruby command                                     |
+| sgem   | `sudo gem`                             | Run sudo gem on the system ruby, not the active ruby |
+| rfind  | `find . -name "*.rb" \| xargs grep -n` | Find ruby file                                       |
+| gein   | `gem install`                          | Install a gem into the local repository              |
+| geun   | `gem uninstall`                        | Uninstall gems from the local repository             |
+| geli   | `gem list`                             | Display gems installed locally                       |
+| gei    | `gem info`                             | Show information for the given gem                   |
+| geiall | `gem info --all`                       | Display all gem versions                             |
+| geca   | `gem cert --add`                       | Add a trusted certificate                            |
+| gecr   | `gem cert --remove`                    | Remove a trusted certificate                         |
+| gecb   | `gem cert --build`                     | Build private key and self-signed certificate        |
+| geclup | `gem cleanup -n`                       | Do not uninstall gem                                 |
+| gegi   | `gem generate_index`                   | Generate index file for gem server                   |
+| geh    | `gem help`                             | Provide additional help                              |
+| gel    | `gem lock`                             | Generate a lockdown list of gems                     |
+| geo    | `gem open`                             | Open gem source in default editor                    |
+| geoe   | `gem open -e`                          | Open gem sources in preferred editor                 |
diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index c235b6b69..890fcb179 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -8,17 +8,17 @@ alias rfind='find . -name "*.rb" | xargs grep -n'
 alias rb="ruby"
 
 # Gem Command Shorthands
-alias gin="gem install"
-alias gun="gem uninstall"
-alias gli="gem list"
-alias gi="gem info"
-alias giall="gem info --all"
-alias gca="gem cert --add"
-alias gcr="gem cert --remove"
-alias gcb="gem cert --build"
-alias gclup="gem cleanup -n"
-alias ggi="gem generate_index"
-alias ghlp="gem help"
-alias gl="gem lock"
-alias go="gem open"
-alias goe="gem open -e"
+alias gein="gem install"
+alias geun="gem uninstall"
+alias geli="gem list"
+alias gei="gem info"
+alias geiall="gem info --all"
+alias geca="gem cert --add"
+alias gecr="gem cert --remove"
+alias gecb="gem cert --build"
+alias geclup="gem cleanup -n"
+alias gegi="gem generate_index"
+alias geh="gem help"
+alias gel="gem lock"
+alias geo="gem open"
+alias geoe="gem open -e"

From 46f8765f4c871ef9b4e7f8bc448e45f4be15ff58 Mon Sep 17 00:00:00 2001
From: Rob Vadai <rvadai@segence.com>
Date: Wed, 20 Oct 2021 21:58:28 +0100
Subject: [PATCH 205/591] feat(osx): add `freespace` command to clean purgeable
 disk space (#8762)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/osx/README.md      | 43 +++++++++++++++++++-------------------
 plugins/osx/osx.plugin.zsh | 23 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/plugins/osx/README.md b/plugins/osx/README.md
index ecc9327d0..50458f60e 100644
--- a/plugins/osx/README.md
+++ b/plugins/osx/README.md
@@ -12,27 +12,28 @@ Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 ## Commands
 
-| Command         | Description                                           |
-| :-------------- | :---------------------------------------------------- |
-| `tab`           | Open the current directory in a new tab               |
-| `split_tab`     | Split the current terminal tab horizontally           |
-| `vsplit_tab`    | Split the current terminal tab vertically             |
-| `ofd`           | Open the current directory in a Finder window         |
-| `pfd`           | Return the path of the frontmost Finder window        |
-| `pfs`           | Return the current Finder selection                   |
-| `cdf`           | `cd` to the current Finder directory                  |
-| `pushdf`        | `pushd` to the current Finder directory               |
-| `pxd`           | Return the current Xcode project directory            |
-| `cdx`           | `cd` to the current Xcode project directory           |
-| `quick-look`    | Quick-Look a specified file                           |
-| `man-preview`   | Open a specified man page in Preview app              |
-| `showfiles`     | Show hidden files in Finder                           |
-| `hidefiles`     | Hide the hidden files in Finder                       |
-| `itunes`        | _DEPRECATED_. Use `music` from macOS Catalina on      |
-| `music`         | Control Apple Music. Use `music -h` for usage details |
-| `spotify`       | Control Spotify and search by artist, album, track…   |
-| `rmdsstore`     | Remove .DS\_Store files recursively in a directory    |
-| `btrestart`     | Restart the Bluetooth daemon                          |
+| Command       | Description                                              |
+| :------------ | :------------------------------------------------------- |
+| `tab`         | Open the current directory in a new tab                  |
+| `split_tab`   | Split the current terminal tab horizontally              |
+| `vsplit_tab`  | Split the current terminal tab vertically                |
+| `ofd`         | Open the current directory in a Finder window            |
+| `pfd`         | Return the path of the frontmost Finder window           |
+| `pfs`         | Return the current Finder selection                      |
+| `cdf`         | `cd` to the current Finder directory                     |
+| `pushdf`      | `pushd` to the current Finder directory                  |
+| `pxd`         | Return the current Xcode project directory               |
+| `cdx`         | `cd` to the current Xcode project directory              |
+| `quick-look`  | Quick-Look a specified file                              |
+| `man-preview` | Open a specified man page in Preview app                 |
+| `showfiles`   | Show hidden files in Finder                              |
+| `hidefiles`   | Hide the hidden files in Finder                          |
+| `itunes`      | _DEPRECATED_. Use `music` from macOS Catalina on         |
+| `music`       | Control Apple Music. Use `music -h` for usage details    |
+| `spotify`     | Control Spotify and search by artist, album, track…      |
+| `rmdsstore`   | Remove .DS\_Store files recursively in a directory       |
+| `btrestart`   | Restart the Bluetooth daemon                             |
+| `freespace`   | Erases purgeable disk space with 0s on the selected disk |
 
 ## Acknowledgements
 
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 5455d7c5f..16f16ddb6 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -233,6 +233,29 @@ function rmdsstore() {
   find "${@:-.}" -type f -name .DS_Store -delete
 }
 
+# Erases purgeable disk space with 0s on the selected disk
+function freespace(){
+  if [[ -z "$1" ]]; then
+    echo "Usage: $0 <disk>"
+    echo "Example: $0 /dev/disk1s1"
+    echo
+    echo "Possible disks:"
+    df -h | awk 'NR == 1 || /^\/dev\/disk/'
+    return 1
+  fi
+
+  echo "Cleaning purgeable files from disk: $1 ...."
+  diskutil secureErase freespace 0 $1
+}
+
+_freespace() {
+  local -a disks
+  disks=("${(@f)"$(df | awk '/^\/dev\/disk/{ printf $1 ":"; for (i=9; i<=NF; i++) printf $i FS; print "" }')"}")
+  _describe disks disks
+}
+
+compdef _freespace freespace
+
 # Music / iTunes control function
 source "${0:h:A}/music"
 

From f1dd97bb2a9df55fae9b1ca26c829b9f8b290667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 23 Oct 2021 05:16:15 +0200
Subject: [PATCH 206/591] fix(ssh-agent): fix check for running `ssh-agent`
 process with hidepid /proc (#8492)

Fixes #8492
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index c006f1413..47dfef5b0 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -6,9 +6,11 @@ function _start_agent() {
   if [[ -f "$ssh_env_cache" ]]; then
     . "$ssh_env_cache" > /dev/null
 
-    {
-      [[ "$USERNAME" = root ]] && command ps ax || command ps x
-    } | command grep ssh-agent | command grep -q $SSH_AGENT_PID && return 0
+    # Test if $SSH_AUTH_SOCK is visible
+    zmodload zsh/net/socket
+    if [[ -S "$SSH_AUTH_SOCK" ]] && zsocket "$SSH_AUTH_SOCK" 2>/dev/null; then
+      return 0
+    fi
   fi
 
   # Set a maximum lifetime for identities added to ssh-agent

From 1e5e834e0f6486a569efd6b12ce4e33624fef0c9 Mon Sep 17 00:00:00 2001
From: Sina Tak Tehrani <ssttehrani@gmail.com>
Date: Mon, 25 Oct 2021 20:28:22 +0200
Subject: [PATCH 207/591] fix(cli): exit `omz update` with correct error code
 (#10342)

---
 lib/cli.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 4b14360c1..0b6bbc6cb 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -755,9 +755,9 @@ function _omz::update {
 
   # Run update script
   if [[ "$1" != --unattended ]]; then
-    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
+    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
   else
-    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
+    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" || return $?
   fi
 
   # Update last updated file

From c2b9ae29371f142fe7f2da694f893f1365170bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 26 Oct 2021 13:23:07 +0200
Subject: [PATCH 208/591] fix(changelog): don't show more than 40 commits
 (#10345)

Fixes #10345
---
 tools/changelog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 7329a9526..ebdffba0a 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -400,7 +400,7 @@ function main {
   # commit if $since is unset, in short hash form.
   command git rev-list --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
     # Truncate list on versions with a lot of commits
-    if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
+    if (( ++read_commits > 40 )); then
       truncate=1
       break
     fi

From 4f67b02a9f43b0996ad85ee600b468399e1477e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Camelo=20Freitas?= <josecfreittas@outlook.com>
Date: Tue, 26 Oct 2021 07:07:46 -0700
Subject: [PATCH 209/591] feat(mix): update `mix` commands and descriptions
 (#10273)

---
 plugins/mix/README.md | 16 ++++++++--------
 plugins/mix/_mix      | 43 +++++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/plugins/mix/README.md b/plugins/mix/README.md
index 878f370f2..f0258fe88 100644
--- a/plugins/mix/README.md
+++ b/plugins/mix/README.md
@@ -9,11 +9,11 @@ plugins=(... mix)
 ```
 ## Supported Task Types
 
-| Task Type               | Documentation                                            |
-|-------------------------|----------------------------------------------------------|
-| Elixir                  | [Elixir Lang](https://elixir-lang.org/)                  |
-| Phoenix v1.2.1 and below| [Phoenix](https://hexdocs.pm/phoenix/1.2.1/Phoenix.html) |
-| Phoenix v1.3.0 and above| [Phoenix](https://hexdocs.pm/phoenix/Phoenix.html)       |
-| Ecto                    | [Ecto](https://hexdocs.pm/ecto/Ecto.html)                |
-| Hex                     | [Hex](https://hex.pm/)                                   |
-| Nerves                  | [Nerves](https://nerves-project.org/)                    |
+| Task Type                | Documentation                                            |
+|--------------------------|----------------------------------------------------------|
+| Elixir                   | [Elixir Lang](https://elixir-lang.org/)                  |
+| Phoenix v1.2.1 and below | [Phoenix](https://hexdocs.pm/phoenix/1.2.1/Phoenix.html) |
+| Phoenix v1.3.0 and above | [Phoenix](https://hexdocs.pm/phoenix/Phoenix.html)       |
+| Ecto                     | [Ecto](https://hexdocs.pm/ecto/Ecto.html)                |
+| Hex                      | [Hex](https://hex.pm/)                                   |
+| Nerves                   | [Nerves](https://nerves-project.org/)                    |
diff --git a/plugins/mix/_mix b/plugins/mix/_mix
index c0fe68c91..7940ff1c9 100644
--- a/plugins/mix/_mix
+++ b/plugins/mix/_mix
@@ -5,8 +5,10 @@
 
 local -a _1st_arguments
 _1st_arguments=(
+    'app.config:Configures all registered apps'
     'app.start:Start all registered apps'
-    'archive:List all archives'
+    'app.tree:Prints the application tree'
+    'archive:Lists installed archives'
     'archive.build:Archive this project into a .ez file'
     'archive.install:Install an archive locally'
     'archive.uninstall:Uninstall archives'
@@ -18,6 +20,7 @@ _1st_arguments=(
     "deps.clean:Remove the given dependencies' files"
     'deps.compile:Compile dependencies'
     'deps.get:Get all out of date dependencies'
+    'deps.tree:Prints the dependency tree'
     'deps.unlock:Unlock the given dependencies'
     'deps.update:Update the given dependencies'
     'do:Executes the tasks separated by comma'
@@ -30,27 +33,39 @@ _1st_arguments=(
     'ecto.migrate:Runs Ecto migration'
     'ecto.migrations:Displays the up / down migration status'
     'ecto.rollback:Reverts applied migrations'
+    'escript:Lists installed escripts'
     'escript.build:Builds an escript for the project'
+    'escript.install:Installs an escript locally'
+    'escript.uninstall:Uninstalls escripts'
     'firmware:Nerves - Build a firmware image for the selected target platform'
     'firmware.burn:Nerves - Writes the generated firmware image to an attached SDCard or file'
     'firmware.image:Nerves - Create a firmware image file that can be copied byte-for-byte'
     'format:Formats the given files and patterns'
     'help:Print help information for tasks'
     'hex:Print hex help information'
-    'hex.config:Read or update hex config'
-    'hex.docs:Publish docs for package'
+    'hex.audit:Shows retired Hex deps for the current project'
+    'hex.build:Builds a new package version locally'
+    'hex.config:Reads, updates or deletes local Hex config'
+    'hex.docs:Fetches or opens documentation of a package'
     'hex.info:Print hex information'
+    'hex.organization:Manages Hex.pm organizations'
     'hex.key:Hex API key tasks'
-    'hex.outdated:Shows outdated hex deps for the current project'
-    'hex.owner:Hex package ownership tasks'
+    'hex.outdated:Shows outdated Hex deps for the current project'
+    'hex.owner:Manages Hex package ownership'
+    'hex.package:Fetches or diffs packages'
     'hex.publish:Publish a new package version'
+    'hex.registry:Manages local Hex registries'
+    'hex.repo:Manages Hex repositories'
+    'hex.retire:Retires a package version'
     'hex.search:Search for package names'
-    'hex.user:Hex user tasks'
+    'hex.sponsor:Show Hex packages accepting sponsorships'
+    'hex.user:Manages your Hex user account'
     'loadconfig:Loads and persists the given configuration'
     'local:List local tasks'
     'local.hex:Install hex locally'
     'local.phoenix:Updates Phoenix locally'
     'local.phx:Updates the Phoenix project generator locally'
+    'local.public_keys:Manages public keys'
     'local.rebar:Install rebar locally'
     'nerves.artifact:Create an artifact for a specified Nerves package'
     'nerves.artifact.get:Nerves get artifacts'
@@ -69,21 +84,33 @@ _1st_arguments=(
     'phoenix.server:Starts applications and their servers'
     'phx.digest:Digests and compresses static files'
     'phx.digest.clean:Removes old versions of static assets.'
+    'phx.gen.auth:Generates authentication logic for a resource'
+    'phx.gen.cert:Generates a self-signed certificate for HTTPS testing'
     'phx.gen.channel:Generates a Phoenix channel'
     'phx.gen.context:Generates a context with functions around an Ecto schema'
     'phx.gen.embedded:Generates an embedded Ecto schema file'
     'phx.gen.html:Generates controller, views, and context for an HTML resource'
     'phx.gen.json:Generates controller, views, and context for a JSON resource'
+    'phx.gen.live:Generates LiveView, templates, and context for a resource'
+    'phx.gen.notifier:Generates a notifier that delivers emails by default'
     'phx.gen.presence:Generates a Presence tracker'
     'phx.gen.schema:Generates an Ecto schema and migration file'
     'phx.gen.secret:Generates a secret'
-    'phx.new:Creates a new Phoenix v1.3.0 application'
+    'phx.gen.socket:Generates a Phoenix socket handler'
+    'phx.new:Creates a new Phoenix application'
     'phx.new.ecto:Creates a new Ecto project within an umbrella project'
     'phx.new.web:Creates a new Phoenix web project within an umbrella project'
     'phx.routes:Prints all routes'
     'phx.server:Starts applications and their servers'
+    'profile.cprof:Profiles the given file or expression with cprof'
+    'profile.eprof:Profiles the given file or expression with eprof'
+    'profile.fprof:Profiles the given file or expression with fprof'
+    'release:Assembles a self-contained release'
+    'release.init:Generates sample files for releases'
     'run:Run the given file or expression'
     "test:Run a project's tests"
+    'test.coverage:Build report from exported test coverage'
+    'xref:Prints cross reference information'
     '--help:Describe available tasks'
     '--version:Prints the Elixir version information'
 )
@@ -93,7 +120,7 @@ __task_list ()
     local expl
     declare -a tasks
 
-    tasks=(app.start archive archive.build archive.install archive.uninstall clean cmd compile compile.protocols deps deps.clean deps.compile deps.get deps.unlock deps.update do escript.build format help hex hex.config hex.docs hex.info hex.key hex.outdated hex.owner hex.publish hex.search hex.user loadconfig local local.hex local.rebar new phoenix.digest phoenix.gen.channel phoenix.gen.html phoenix.gen.json phoenix.gen.model phoenix.gen.secret phoenix.new phoenix.routes phoenix.server phx.digest phx.digest.clean phx.gen.channel phx.gen.context phx.gen.embedded phx.gen.html phx.gen.json phx.gen.presence phx.gen.schema phx.gen.secret phx.new phx.new.ecto phx.new.web phx.routes phx.server run test)
+    tasks=(app.config app.start app.tree archive archive.build archive.install archive.uninstall clean cmd compile compile.protocols deps deps.clean deps.compile deps.get deps.tree deps.unlock deps.update do ecto.create ecto.drop ecto.dump ecto.gen.migration ecto.gen.repo ecto.load ecto.migrate ecto.migrations ecto.rollback escript escript.build escript.install escript.uninstall firmware firmware.burn firmware.image format help hex hex.audit hex.build hex.config hex.docs hex.info hex.organization hex.key hex.outdated hex.owner hex.package hex.publish hex.registry hex.repo hex.retire hex.search hex.sponsor hex.user loadconfig local local.hex local.phoenix local.phx local.public_keys local.rebar nerves.artifact nerves.artifact.get nerves.info nerves.new nerves.release.init new phoenix.digest phoenix.gen.channel phoenix.gen.html phoenix.gen.json phoenix.gen.model phoenix.gen.secret phoenix.new phoenix.routes phoenix.server phx.digest phx.digest.clean phx.gen.auth phx.gen.cert phx.gen.channel phx.gen.context phx.gen.embedded phx.gen.html phx.gen.json phx.gen.live phx.gen.notifier phx.gen.presence phx.gen.schema phx.gen.secret phx.gen.socket phx.new phx.new.ecto phx.new.web phx.routes phx.server profile.cprof profile.eprof profile.fprof release release.init run test test.coverage xref)
 
     _wanted tasks expl 'help' compadd $tasks
 }

From 9c8131e417a15fccb15615e3b03ce44a53678fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 26 Oct 2021 18:24:29 +0200
Subject: [PATCH 210/591] perf(changelog): use a single `git log` command to
 get all commit messages

---
 tools/changelog.sh | 50 +++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index ebdffba0a..13cfb9530 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env zsh
 
+cd "$ZSH"
+setopt extendedglob
+
 ##############################
 # CHANGELOG SCRIPT CONSTANTS #
 ##############################
@@ -114,15 +117,8 @@ function parse-commit {
     fi
   }
 
-  # Ignore commit if it is a merge commit
-  if [[ $(command git show -s --format=%p $1 | wc -w) -gt 1 ]]; then
-    return
-  fi
-
   # Parse commit with hash $1
-  local hash="$1" subject body warning rhash
-  subject="$(command git show -s --format=%s $hash)"
-  body="$(command git show -s --format=%b $hash)"
+  local hash="$1" subject="$2" body="$3" warning rhash
 
   # Commits following Conventional Commits (https://www.conventionalcommits.org/)
   # have the following format, where parts between [] are optional:
@@ -384,7 +380,8 @@ function main {
   # Commit classification arrays
   local -A commits subjects scopes breaking reverts
   local truncate=0 read_commits=0
-  local hash version tag
+  local version tag
+  local hash refs subject body
 
   # Get the first version name:
   # 1) try tag-like version, or
@@ -396,17 +393,40 @@ function main {
     || version=$(command git symbolic-ref --quiet --short $until 2>/dev/null) \
     || version=$(command git rev-parse --short $until 2>/dev/null)
 
-  # Get commit list from $until commit until $since commit, or until root
-  # commit if $since is unset, in short hash form.
-  command git rev-list --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
+  # Get commit list from $until commit until $since commit, or until root commit if $since is unset
+  local range=${since:+$since..}$until
+
+  # Git log options
+  # -z:             commits are delimited by null bytes
+  # --format:       [7-char hash]<field sep>[ref names]<field sep>[subject]<field sep>[body]
+  # --abbrev=7:     force commit hashes to be 7 characters long
+  # --no-merges:    merge commits are omitted
+  local SEP="0mZmAgIcSeP"
+  local -a raw_commits
+  raw_commits=(${(0)"$(command git log -z \
+    --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \
+    --no-merges $range)"})
+
+  local raw_commit
+  local -a raw_fields
+  for raw_commit in $raw_commits; do
     # Truncate list on versions with a lot of commits
     if (( ++read_commits > 40 )); then
       truncate=1
       break
     fi
 
+    # Read the commit fields (@ is needed to keep empty values)
+    raw_fields=("${(@ps:$SEP:)raw_commit}")
+    hash="${raw_fields[1]}"
+    refs="${raw_fields[2]}"
+    subject="${raw_fields[3]}"
+    body="${raw_fields[4]}"
+
     # If we find a new release (exact tag)
-    if tag=$(command git describe --exact-match --tags $hash 2>/dev/null); then
+    if [[ "$refs" = *tag:\ * ]]; then
+      # Parse tag name (needs: setopt extendedglob)
+      tag="${${refs##*tag: }%%,# *}"
       # Output previous release
       display-release
       # Reinitialize commit storage
@@ -420,7 +440,7 @@ function main {
       read_commits=1
     fi
 
-    parse-commit "$hash"
+    parse-commit "$hash" "$subject" "$body"
   done
 
   display-release
@@ -431,8 +451,6 @@ function main {
   fi
 }
 
-cd "$ZSH"
-
 # Use raw output if stdout is not a tty
 if [[ ! -t 1 && -z "$3" ]]; then
   main "$1" "$2" --raw

From 140bfa84320d6f0a9c3b429c1c6be41878e60352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 26 Oct 2021 18:26:02 +0200
Subject: [PATCH 211/591] fix(changelog): go back to ignoring commits from
 merged branches

---
 tools/changelog.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 13cfb9530..5c3159732 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -401,17 +401,18 @@ function main {
   # --format:       [7-char hash]<field sep>[ref names]<field sep>[subject]<field sep>[body]
   # --abbrev=7:     force commit hashes to be 7 characters long
   # --no-merges:    merge commits are omitted
+  # --first-parent: commits from merged branches are omitted
   local SEP="0mZmAgIcSeP"
   local -a raw_commits
   raw_commits=(${(0)"$(command git log -z \
     --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \
-    --no-merges $range)"})
+    --no-merges --first-parent $range)"})
 
   local raw_commit
   local -a raw_fields
   for raw_commit in $raw_commits; do
     # Truncate list on versions with a lot of commits
-    if (( ++read_commits > 40 )); then
+    if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
       truncate=1
       break
     fi

From 0267cb89eba6dc9f2744bfba73ada391a6582249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 26 Oct 2021 18:59:39 +0200
Subject: [PATCH 212/591] perf(changelog): use regex-match instead of `sed` to
 parse commit subjects

---
 tools/changelog.sh | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 5c3159732..3641179e2 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -52,10 +52,15 @@ function parse-commit {
   #   make a breaking change
 
   function commit:type {
-    local type="$(sed -E 's/^([a-zA-Z_\-]+)(\(.+\))?!?: .+$/\1/' <<< "$1")"
+    local type
+
+    # Parse commit type from the subject
+    if [[ "$1" =~ '^([a-zA-Z_\-]+)(\(.+\))?!?: .+$' ]]; then
+      type="${match[1]}"
+    fi
 
     # If $type doesn't appear in $TYPES array mark it as 'other'
-    if [[ -n "${(k)TYPES[(i)$type]}" ]]; then
+    if [[ -n "$type" && -n "${(k)TYPES[(i)$type]}" ]]; then
       echo $type
     else
       echo other
@@ -66,17 +71,18 @@ function parse-commit {
     local scope
 
     # Try to find scope in "type(<scope>):" format
-    scope=$(sed -nE 's/^[a-zA-Z_\-]+\((.+)\)!?: .+$/\1/p' <<< "$1")
-    if [[ -n "$scope" ]]; then
-      echo "$scope"
+    if [[ "$1" =~ '^[a-zA-Z_\-]+\((.+)\)!?: .+$' ]]; then
+      echo "${match[1]}"
       return
     fi
 
     # If no scope found, try to find it in "<scope>:" format
-    # Make sure it's not a type before printing it
-    scope=$(sed -nE 's/^([a-zA-Z_\-]+): .+$/\1/p' <<< "$1")
-    if [[ -z "${(k)TYPES[(i)$scope]}" ]]; then
-      echo "$scope"
+    if [[ "$1" =~ '^([a-zA-Z_\-]+): .+$' ]]; then
+      scope="${match[1]}"
+      # Make sure it's not a type before printing it
+      if [[ -z "${(k)TYPES[(i)$scope]}" ]]; then
+        echo "$scope"
+      fi
     fi
   }
 
@@ -84,7 +90,11 @@ function parse-commit {
     # Only display the relevant part of the commit, i.e. if it has the format
     # type[(scope)!]: subject, where the part between [] is optional, only
     # displays subject. If it doesn't match the format, returns the whole string.
-    sed -E 's/^[a-zA-Z_\-]+(\(.+\))?!?: (.+)$/\2/' <<< "$1"
+    if [[ "$1" =~ '^[a-zA-Z_\-]+(\(.+\))?!?: (.+)$' ]]; then
+      echo "${match[2]}"
+    else
+      echo "$1"
+    fi
   }
 
   # Return subject if the body or subject match the breaking change format

From 4b3a5c54117fa8af12878d1b659c14214cb4bbec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 26 Oct 2021 20:54:39 +0200
Subject: [PATCH 213/591] fix(changelog): fix percent escapes in `printf` calls

---
 tools/changelog.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 3641179e2..e32d503b1 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -201,9 +201,9 @@ function display-release {
     #* Uses $hash from outer scope
     local hash="${1:-$hash}"
     case "$output" in
-    raw) printf "$hash" ;;
-    text) printf "\e[33m$hash\e[0m" ;; # red
-    md) printf "[\`$hash\`](https://github.com/ohmyzsh/ohmyzsh/commit/$hash)" ;;
+    raw) printf '%s' "$hash" ;;
+    text) printf '\e[33m%s\e[0m' "$hash" ;; # red
+    md) printf '[`%s`](https://github.com/ohmyzsh/ohmyzsh/commit/%s)' "$hash" ;;
     esac
   }
 
@@ -215,16 +215,16 @@ function display-release {
     case "$output" in
     raw)
       case "$level" in
-      1) printf "$header\n$(printf '%.0s=' {1..${#header}})\n\n" ;;
-      2) printf "$header\n$(printf '%.0s-' {1..${#header}})\n\n" ;;
-      *) printf "$header:\n\n" ;;
+      1) printf '%s\n%s\n\n' "$header" "$(printf '%.0s=' {1..${#header}})" ;;
+      2) printf '%s\n%s\n\n' "$header" "$(printf '%.0s-' {1..${#header}})" ;;
+      *) printf '%s:\n\n' "$header" ;;
       esac ;;
     text)
       case "$level" in
-      1|2) printf "\e[1;4m$header\e[0m\n\n" ;; # bold, underlined
-      *) printf "\e[1m$header:\e[0m\n\n" ;; # bold
+      1|2) printf '\e[1;4m%s\e[0m\n\n' "$header" ;; # bold, underlined
+      *) printf '\e[1m%s:\e[0m\n\n' "$header" ;; # bold
       esac ;;
-    md) printf "$(printf '%.0s#' {1..${level}}) $header\n\n" ;;
+    md) printf '%s %s\n\n' "$(printf '%.0s#' {1..${level}})" "$header" ;;
     esac
   }
 
@@ -250,8 +250,8 @@ function display-release {
 
     # Print [scope]
     case "$output" in
-    raw|md) printf "[$scope]${padding} " ;;
-    text) printf "[\e[38;5;9m$scope\e[0m]${padding} " ;; # red 9
+    raw|md) printf '[%s]%s ' "$scope" "$padding";;
+    text) printf '[\e[38;5;9m%s\e[0m]%s ' "$scope" "$padding";; # red 9
     esac
   }
 
@@ -264,7 +264,7 @@ function display-release {
     subject="${(U)subject:0:1}${subject:1}"
 
     case "$output" in
-    raw) printf "$subject" ;;
+    raw) printf '%s' "$subject" ;;
     # In text mode, highlight (#<issue>) and dim text between `backticks`
     text) sed -E $'s|#([0-9]+)|\e[32m#\\1\e[0m|g;s|`([^`]+)`|`\e[2m\\1\e[0m`|g' <<< "$subject" ;;
     # In markdown mode, link to (#<issue>) issues
@@ -277,8 +277,8 @@ function display-release {
     local type="${1:-${TYPES[$type]:-${(C)type}}}"
     [[ -z "$type" ]] && return 0
     case "$output" in
-    raw|md) printf "$type: " ;;
-    text) printf "\e[4m$type\e[24m: " ;; # underlined
+    raw|md) printf '%s: ' "$type" ;;
+    text) printf '\e[4m%s\e[24m: ' "$type" ;; # underlined
     esac
   }
 
@@ -292,7 +292,7 @@ function display-release {
     (( $#breaking != 0 )) || return 0
 
     case "$output" in
-    text) fmt:header "\e[31mBREAKING CHANGES" 3 ;;
+    text) printf '\e[31m'; fmt:header "BREAKING CHANGES" 3 ;;
     raw) fmt:header "BREAKING CHANGES" 3 ;;
     md) fmt:header "BREAKING CHANGES ⚠" 3 ;;
     esac

From 1dba1120410280699c6a97a5252bab24681b46b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 27 Oct 2021 10:12:23 +0200
Subject: [PATCH 214/591] fix(changelog): fix for `${(@ps:$sep:)var}` construct
 in zsh < 5.0.8

In recent zsh versions, `${(@ps:$sep:)var}` where $sep is a variable containing
a separator string and $var is a string with multiple values separated by $sep,
the `p` flag makes zsh correctly expand $sep before splitting $var. In versions
older than 5.0.8, this doesn't happen, so we use `eval` to get the same effect.
---
 tools/changelog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index e32d503b1..664f34608 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -428,7 +428,7 @@ function main {
     fi
 
     # Read the commit fields (@ is needed to keep empty values)
-    raw_fields=("${(@ps:$SEP:)raw_commit}")
+    eval "raw_fields=(\"\${(@ps:$SEP:)raw_commit}\")"
     hash="${raw_fields[1]}"
     refs="${raw_fields[2]}"
     subject="${raw_fields[3]}"

From 2e46b2a2dcb96cadd94283bdce95eca75bef1433 Mon Sep 17 00:00:00 2001
From: Christophe Bliard <christophe.bliard@trux.info>
Date: Wed, 27 Oct 2021 11:40:09 +0200
Subject: [PATCH 215/591] feat(fzf): support getting fzf from nix-darwin
 (#10355)

---
 plugins/fzf/fzf.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index a979fe222..aabd62cb1 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -20,7 +20,9 @@ function setup_using_base_dir() {
         done
 
         if [[ -z "${fzf_base}" ]]; then
-            if (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
+            if (( ${+commands[fzf-share]} )) && dir="$(fzf-share)" && [[ -d "${dir}" ]]; then
+                fzf_base="${dir}"
+            elif (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
                 if [[ -d "${dir}" ]]; then
                     fzf_base="${dir}"
                 fi

From 1861b5f175dc8f6d6408772b707c9d6deb28a53f Mon Sep 17 00:00:00 2001
From: YR Chen <stevapple@icloud.com>
Date: Fri, 29 Oct 2021 23:40:23 +0800
Subject: [PATCH 216/591] feat(xcode): support `Package.swift` as project file
 in `xc` (#10358)

---
 plugins/xcode/README.md        |  2 +-
 plugins/xcode/xcode.plugin.zsh | 28 +++++++++-------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/plugins/xcode/README.md b/plugins/xcode/README.md
index 37f882638..664a063a3 100644
--- a/plugins/xcode/README.md
+++ b/plugins/xcode/README.md
@@ -26,7 +26,7 @@ plugins=(... xcode)
 
 ###  `xc`
 
-Opens the current directory in Xcode as an Xcode project. This will open one of the `.xcworkspace` and `.xcodeproj` files that it can find in the current working directory. You can also specify a directory to look in for the Xcode files.
+Opens the current directory in Xcode as an Xcode project or a Swift package. This will open one of the `.xcworkspace`, `.xcodeproj` and `Package.swift` files that it can find in the current working directory. You can also specify a directory to look in for the Xcode files.
 Returns 1 if it didn't find any relevant files.
 
 ###  `xx`
diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 89703fe3c..41b9e37e4 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -6,28 +6,18 @@ alias xcsel='sudo xcode-select --switch'
 # original author: @subdigital
 # source: https://gist.github.com/subdigital/5420709
 function xc {
-  local xcode_proj
-  if [[ $# == 0 ]]; then
-    xcode_proj=(*.{xcworkspace,xcodeproj}(N))
-  else
-    xcode_proj=($1/*.{xcworkspace,xcodeproj}(N))
-  fi
+  local xcode_files
+  xcode_files=(${1:-.}/{*.{xcworkspace,xcodeproj},Package.swift}(N))
 
-
-  if [[ ${#xcode_proj} -eq 0 ]]; then
-    if [[ $# == 0 ]]; then
-      echo "No xcworkspace/xcodeproj file found in the current directory."
-    else
-      echo "No xcworkspace/xcodeproj file found in $1."
-    fi
+  if [[ ${#xcode_files} -eq 0 ]]; then
+    echo "No Xcode files found in ${1:-the current directory}." >&2
     return 1
-  else
-    local active_path
-    active_path=$(xcode-select -p)
-    active_path=${active_path%%/Contents/Developer*}
-    echo "Found ${xcode_proj[1]}. Opening with ${active_path}"
-    open -a "$active_path" "${xcode_proj[1]}"
   fi
+
+  local active_path
+  active_path=${"$(xcode-select -p)"%%/Contents/Developer*}
+  echo "Found ${xcode_files[1]}. Opening with ${active_path}"
+  open -a "$active_path" "${xcode_files[1]}"
 }
 
 # Opens a file or files in the Xcode IDE. Multiple files are opened in multi-file browser

From 04c96e235ff522704a6f1482e7fd06a05467cbb7 Mon Sep 17 00:00:00 2001
From: Afzal Sayed <14029371+afzalsayed96@users.noreply.github.com>
Date: Sat, 30 Oct 2021 16:50:30 +0530
Subject: [PATCH 217/591] chore: fix grammar mistake in `CONTRIBUTING.md`
 (#10362)

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4903584ee..605142845 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -202,7 +202,7 @@ type(scope)!: subject
     feat(archlinux): add support for aura AUR helper (#9467)
     ```
 
-  - Formatted inline code by using backticks: the text inbetween backticks will also be highlighted by
+  - Formatted inline code by using backticks: the text between backticks will also be highlighted by
     the changelog tool:
     ```
     feat(shell-proxy): enable unexported `DEFAULT_PROXY` setting (#9774)

From bf88ff3f904e7b6675ff142e44d8aae3132bad96 Mon Sep 17 00:00:00 2001
From: Richard Mitchell <rwmitchell@gmail.com>
Date: Tue, 2 Nov 2021 07:05:37 -0400
Subject: [PATCH 218/591] fix(lib): fix `1` alias to `cd` to directory 1 in
 stack (#10370)

---
 lib/directories.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index cf87bd7e4..6696854b0 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -9,7 +9,7 @@ alias -g .....='../../../..'
 alias -g ......='../../../../..'
 
 alias -- -='cd -'
-alias 1='cd -'
+alias 1='cd -1'
 alias 2='cd -2'
 alias 3='cd -3'
 alias 4='cd -4'

From 49458b872d1bab1aa8338e319f27c9b3705c9fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 29 Oct 2021 18:21:13 +0200
Subject: [PATCH 219/591] docs(dirhistory): document OPT key alternative for
 macOS and fix style

Fixes #10350
---
 plugins/dirhistory/README.md | 42 ++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/plugins/dirhistory/README.md b/plugins/dirhistory/README.md
index 602fc8284..ede9b5410 100644
--- a/plugins/dirhistory/README.md
+++ b/plugins/dirhistory/README.md
@@ -12,19 +12,27 @@ plugins=(... dirhistory)
 
 | Shortcut                          | Description                                               |
 |-----------------------------------|-----------------------------------------------------------|
-| <kbd>alt</kbd> + <kbd>left</kbd>  | Go to previous directory                                  |
-| <kbd>alt</kbd> + <kbd>right</kbd> | Undo <kbd>alt</kbd> + <kbd>left</kbd>                     |
-| <kbd>alt</kbd> + <kbd>up</kbd>    | Move into the parent directory                            |
-| <kbd>alt</kbd> + <kbd>down</kbd>  | Move into the first child directory by alphabetical order |
+| <kbd>Alt</kbd> + <kbd>Left</kbd>  | Go to previous directory                                  |
+| <kbd>Alt</kbd> + <kbd>Right</kbd> | Go to next directory                                      |
+| <kbd>Alt</kbd> + <kbd>Up</kbd>    | Move into the parent directory                            |
+| <kbd>Alt</kbd> + <kbd>Down</kbd>  | Move into the first child directory by alphabetical order |
 
-NOTE: some terminals might override the ALT+Arrows key bindings (Windows Terminal, for example).
-If these don't work check your terminal settings and change them to a different keyboard shortcut.
+**For macOS: use the Option key (<kbd>⌥</kbd>) instead of <kbd>Alt</kbd>**.
+
+> NOTE: some terminals might override the <kbd>Alt</kbd> + Arrows key bindings (e.g. Windows Terminal).
+> If these don't work check your terminal settings and change them to a different keyboard shortcut.
 
 ## Usage
 
-This plugin allows you to navigate the history of previous current-working-directories using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT. MAC users may alternately use OPT-LEFT and OPT-RIGHT.
+This plugin allows you to navigate the history of previous working directories using <kbd>Alt</kbd> + <kbd>Left</kbd>
+and <kbd>Alt</kbd> + <kbd>Right</kbd>. <kbd>Alt</kbd> + <kbd>Left</kbd> moves to past directories, and
+<kbd>Alt</kbd> + <kbd>Right</kbd> goes back to recent directories.
 
-Also, navigate directory **hierarchy** using ALT-UP and ALT-DOWN. (mac keybindings not yet implemented). ALT-UP moves to higher hierarchy (shortcut for 'cd ..'). ALT-DOWN moves into the first directory found in alphabetical order (useful to navigate long empty directories e.g. java packages)
+**NOTE: the maximum directory history size is 30.**
+
+You can also navigate **directory hierarchies** using <kbd>Alt</kbd> + <kbd>Up</kbd> and <kbd>Alt</kbd> + <kbd>Down</kbd>.
+<kbd>Alt</kbd> + <kbd>Up</kbd> moves to the parent directory, while <kbd>Alt</kbd> + <kbd>Down</kbd> moves into the first
+child directory found in alphabetical order (useful to navigate long empty directories, e.g. Java packages).
 
 For example, if the shell was started, and the following commands were entered:
 
@@ -35,8 +43,20 @@ cd share
 cd doc
 ```
 
-Then entering ALT-LEFT at the prompt would change directory from /usr/share/doc to /usr/share, then if pressed again to /usr/, then ~. If ALT-RIGHT were pressed the directory would be changed to /usr/ again.
+the directory stack (`dirs -v`) would look like this:
 
-After that, ALT-DOWN will probably go to /usr/bin (depends on your /usr structure), ALT-UP will return to /usr, then ALT-UP will get you to /
+```console
+$ dirs -v
+0       /usr/share/doc
+1       /usr/share
+2       /usr
+3       ~
+```
 
-**Currently the max history size is 30**. The navigation should work for xterm, PuTTY xterm mode, GNU screen, and on MAC with alternate keys as mentioned above.
+then entering <kbd>Alt</kbd> + <kbd>Left</kbd> at the prompt would change directory from `/usr/share/doc` to `/usr/share`,
+then if pressed again to `/usr`, then `~`. If <kbd>Alt</kbd> + <kbd>Right</kbd> were pressed the directory would be changed
+to `/usr` again.
+
+After that, <kbd>Alt</kbd> + <kbd>Down</kbd> will probably go to `/usr/bin` if `bin` is the first directory in alphabetical
+order (depends on your `/usr` folder structure). <kbd>Alt</kbd> + <kbd>Up</kbd> will return to `/usr`, and once more will get
+you to the root folder (`/`).

From 7f494944e6e8047b49fdbd42977b4eb4670381fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 29 Oct 2021 18:22:35 +0200
Subject: [PATCH 220/591] fix(dirhistory): fix ALT+Up/Down key bindings for
 Terminal.app

---
 plugins/dirhistory/dirhistory.plugin.zsh | 76 ++++++++++--------------
 1 file changed, 32 insertions(+), 44 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index cbac84600..d949064d8 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -121,35 +121,24 @@ function dirhistory_zle_dirhistory_future() {
 }
 
 zle -N dirhistory_zle_dirhistory_back
-# xterm in normal mode
-bindkey "\e[3D" dirhistory_zle_dirhistory_back
-bindkey "\e[1;3D" dirhistory_zle_dirhistory_back
-# Terminal.app
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
-  bindkey "^[b" dirhistory_zle_dirhistory_back
-fi
-# iTerm2
-if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
-  bindkey "^[^[[D" dirhistory_zle_dirhistory_back
-fi
-# Putty:
-bindkey "\e\e[D" dirhistory_zle_dirhistory_back
-# GNU screen:
-bindkey "\eO3D" dirhistory_zle_dirhistory_back
+bindkey "\e[3D" dirhistory_zle_dirhistory_back    # xterm in normal mode
+bindkey "\e[1;3D" dirhistory_zle_dirhistory_back  # xterm in normal mode
+bindkey "\e\e[D" dirhistory_zle_dirhistory_back   # Putty
+bindkey "\eO3D" dirhistory_zle_dirhistory_back    # GNU screen
+case "$TERM_PROGRAM" in
+iTerm.app) bindkey "^[^[[D" dirhistory_zle_dirhistory_back ;;   # iTerm2
+Apple_Terminal) bindkey "^[b" dirhistory_zle_dirhistory_back ;; # Terminal.app
+esac
 
 zle -N dirhistory_zle_dirhistory_future
-bindkey "\e[3C" dirhistory_zle_dirhistory_future
-bindkey "\e[1;3C" dirhistory_zle_dirhistory_future
-# Terminal.app
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
-  bindkey "^[f" dirhistory_zle_dirhistory_future
-fi
-# iTerm2
-if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
-  bindkey "^[^[[C" dirhistory_zle_dirhistory_future
-fi
-bindkey "\e\e[C" dirhistory_zle_dirhistory_future
-bindkey "\eO3C" dirhistory_zle_dirhistory_future
+bindkey "\e[3C" dirhistory_zle_dirhistory_future    # xterm in normal mode
+bindkey "\e[1;3C" dirhistory_zle_dirhistory_future  # xterm in normal mode
+bindkey "\e\e[C" dirhistory_zle_dirhistory_future   # Putty
+bindkey "\eO3C" dirhistory_zle_dirhistory_future    # GNU screen
+case "$TERM_PROGRAM" in
+iTerm.app) bindkey "^[^[[C" dirhistory_zle_dirhistory_future ;;   # iTerm2
+Apple_Terminal) bindkey "^[f" dirhistory_zle_dirhistory_future ;; # Terminal.app
+esac
 
 
 # 
@@ -181,22 +170,21 @@ function dirhistory_zle_dirhistory_down() {
 }
 
 zle -N dirhistory_zle_dirhistory_up
-# xterm in normal mode
-bindkey "\e[3A" dirhistory_zle_dirhistory_up
-bindkey "\e[1;3A" dirhistory_zle_dirhistory_up
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
-  bindkey "^[[A" dirhistory_zle_dirhistory_up
-fi
-# Putty:
-bindkey "\e\e[A" dirhistory_zle_dirhistory_up
-# GNU screen:
-bindkey "\eO3A" dirhistory_zle_dirhistory_up
+bindkey "\e[3A" dirhistory_zle_dirhistory_up    # xterm in normal mode
+bindkey "\e[1;3A" dirhistory_zle_dirhistory_up  # xterm in normal mode
+bindkey "\e\e[A" dirhistory_zle_dirhistory_up   # Putty
+bindkey "\eO3A" dirhistory_zle_dirhistory_up    # GNU screen
+case "$TERM_PROGRAM" in
+iTerm.app) bindkey "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
+Apple_Terminal) bindkey "^[OA" dirhistory_zle_dirhistory_up ;;  # Terminal.app
+esac
 
 zle -N dirhistory_zle_dirhistory_down
-bindkey "\e[3B" dirhistory_zle_dirhistory_down
-bindkey "\e[1;3B" dirhistory_zle_dirhistory_down
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
-  bindkey "^[[B" dirhistory_zle_dirhistory_down
-fi
-bindkey "\e\e[B" dirhistory_zle_dirhistory_down
-bindkey "\eO3B" dirhistory_zle_dirhistory_down
+bindkey "\e[3B" dirhistory_zle_dirhistory_down    # xterm in normal mode
+bindkey "\e[1;3B" dirhistory_zle_dirhistory_down  # xterm in normal mode
+bindkey "\e\e[B" dirhistory_zle_dirhistory_down   # Putty
+bindkey "\eO3B" dirhistory_zle_dirhistory_down    # GNU screen
+case "$TERM_PROGRAM" in
+iTerm.app) bindkey "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
+Apple_Terminal) bindkey "^[OB" dirhistory_zle_dirhistory_down ;;  # Terminal.app
+esac

From 79cf4b3ceb9bf981ce05adc1db3f01aa551efce8 Mon Sep 17 00:00:00 2001
From: Michael Peick <Michael.Peick@gmail.com>
Date: Sun, 10 Nov 2019 15:32:41 +0100
Subject: [PATCH 221/591] feat(dirhistory): support urxvt terminal key binding
 (#8370)

Closes #8370
---
 plugins/dirhistory/dirhistory.plugin.zsh | 30 +++++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index d949064d8..26ef07494 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -1,7 +1,7 @@
-## 
-#   Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories 
+##
+#   Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories
 #   that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT.
-# 
+#
 #   Navigate directory hierarchy using ALT-UP and ALT-DOWN.
 #   ALT-UP moves to higher hierarchy (cd ..)
 #   ALT-DOWN moves into the first directory found in alphabetical order
@@ -14,8 +14,8 @@ export dirhistory_future
 
 export DIRHISTORY_SIZE=30
 
-# Pop the last element of dirhistory_past. 
-# Pass the name of the variable to return the result in. 
+# Pop the last element of dirhistory_past.
+# Pass the name of the variable to return the result in.
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
@@ -32,7 +32,7 @@ function pop_future() {
   fi
 }
 
-# Push a new element onto the end of dirhistory_past. If the size of the array 
+# Push a new element onto the end of dirhistory_past. If the size of the array
 # is >= DIRHISTORY_SIZE, the array is shifted
 function push_past() {
   if [[ $#dirhistory_past -ge $DIRHISTORY_SIZE ]]; then
@@ -76,7 +76,7 @@ function dirhistory_back() {
   local d=""
   # Last element in dirhistory_past is the cwd.
 
-  pop_past cw 
+  pop_past cw
   if [[ "" == "$cw" ]]; then
     # Someone overwrote our variable. Recover it.
     dirhistory_past=($PWD)
@@ -129,6 +129,9 @@ case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[D" dirhistory_zle_dirhistory_back ;;   # iTerm2
 Apple_Terminal) bindkey "^[b" dirhistory_zle_dirhistory_back ;; # Terminal.app
 esac
+if (( ${+terminfo[kcub1]} )); then
+  bindkey "^[${terminfo[kcub1]}" dirhistory_zle_dirhistory_back  # urxvt
+fi
 
 zle -N dirhistory_zle_dirhistory_future
 bindkey "\e[3C" dirhistory_zle_dirhistory_future    # xterm in normal mode
@@ -139,11 +142,14 @@ case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[C" dirhistory_zle_dirhistory_future ;;   # iTerm2
 Apple_Terminal) bindkey "^[f" dirhistory_zle_dirhistory_future ;; # Terminal.app
 esac
+if (( ${+terminfo[kcuf1]} )); then
+  bindkey "^[${terminfo[kcuf1]}" dirhistory_zle_dirhistory_future # urxvt
+fi
 
 
-# 
+#
 # HIERARCHY Implemented in this section, in case someone wants to split it to another plugin if it clashes bindings
-# 
+#
 
 # Move up in hierarchy
 function dirhistory_up() {
@@ -178,6 +184,9 @@ case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
 Apple_Terminal) bindkey "^[OA" dirhistory_zle_dirhistory_up ;;  # Terminal.app
 esac
+if (( ${+terminfo[kcuu1]} )); then
+  bindkey "^[${terminfo[kcuu1]}" dirhistory_zle_dirhistory_up # urxvt
+fi
 
 zle -N dirhistory_zle_dirhistory_down
 bindkey "\e[3B" dirhistory_zle_dirhistory_down    # xterm in normal mode
@@ -188,3 +197,6 @@ case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
 Apple_Terminal) bindkey "^[OB" dirhistory_zle_dirhistory_down ;;  # Terminal.app
 esac
+if (( ${+terminfo[kcud1]} )); then
+  bindkey "^[${terminfo[kcud1]}" dirhistory_zle_dirhistory_down # urxvt
+fi

From 5e8905b4b22dfec9042590f3aa399935b8b83eed Mon Sep 17 00:00:00 2001
From: Aaron Hutchinson <xarnze@gmail.com>
Date: Tue, 2 Nov 2021 18:40:40 +0000
Subject: [PATCH 222/591] feat(ys): increase color contrast with light color
 schemes (#10295)

---
 themes/ys.zsh-theme | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 303c898b4..251b48827 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -5,8 +5,10 @@
 #
 # Mar 2013 Yad Smood
 
+typeset +H my_gray="$FG[247]"
+
 # VCS
-YS_VCS_PROMPT_PREFIX1=" %{$fg[white]%}on%{$reset_color%} "
+YS_VCS_PROMPT_PREFIX1=" %{$my_gray%}on%{$reset_color%} "
 YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}"
 YS_VCS_PROMPT_SUFFIX="%{$reset_color%}"
 YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x"
@@ -60,13 +62,13 @@ local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%})"
 PROMPT="
 %{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
 %(#,%{$bg[yellow]%}%{$fg[black]%}%n%{$reset_color%},%{$fg[cyan]%}%n) \
-%{$fg[white]%}@ \
+%{$my_gray%}@ \
 %{$fg[green]%}%m \
-%{$fg[white]%}in \
+%{$my_gray%}in \
 %{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\
 ${hg_info}\
 ${git_info}\
 ${venv_info}\
  \
-%{$fg[white]%}[%*] $exit_code
+%{$my_gray%}[%*] $exit_code
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"

From 9a02515c7c8eee90909fe72d59d2e3169cb5ed28 Mon Sep 17 00:00:00 2001
From: amnore <Mr.ChenWithCapsule@outlook.com>
Date: Wed, 3 Nov 2021 20:17:23 +0800
Subject: [PATCH 223/591] fix(command-not-found): pass arguments correctly in
 NixOS (#10381)

---
 plugins/command-not-found/command-not-found.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index 3ec13429c..cb96fe063 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -50,7 +50,7 @@ fi
 # NixOS: https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/programs/command-not-found
 if [[ -x /run/current-system/sw/bin/command-not-found ]]; then
   command_not_found_handler() {
-    /run/current-system/sw/bin/command-not-found -- "$@"
+    /run/current-system/sw/bin/command-not-found "$@"
   }
 fi
 

From 0520c2e30934a6e01b27988dca5bbbe3511d6868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 3 Nov 2021 18:21:04 +0100
Subject: [PATCH 224/591] docs: add Security Policy

---
 SECURITY.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..cda53379f
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,22 @@
+# Security Policy
+
+## Supported Versions
+
+At the moment Oh My Zsh only considers the very latest commit to be supported.
+We combine that with our fast response to incidents, so risk is minimized.
+
+| Version        | Supported          |
+|:-------------- |:------------------ |
+| master         | :white_check_mark: |
+| other commits  | :x:                |
+
+In the near future we will introduce versioning, so expect this section to change.
+
+## Reporting a Vulnerability
+
+If you find a vulnerability, email all the maintainers directly at:
+
+- Robby: robby [at] planetargon.com
+- Marc: hello [at] mcornella.com
+
+**Do not open an issue or Pull Request directly**, because it might reveal the vulnerability.

From 7a2cb106258aa7a18bcd53e45df96c4871a03d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 5 Nov 2021 19:47:29 +0100
Subject: [PATCH 225/591] fix(updater): stop update if connection unavailable

---
 tools/check_for_upgrade.sh | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 157b0cce2..8264762b6 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -54,14 +54,27 @@ function is_update_available() {
   [[ "$repo" = ohmyzsh/ohmyzsh ]] || return 0
   local api_url="https://api.github.com/repos/${repo}/commits/${branch}"
 
-  # Get local and remote HEADs and compare them. If we can't get either assume there are updates
-  local local_head remote_head
+  # Get local HEAD. If this fails assume there are updates
+  local local_head
   local_head=$(git -C "$ZSH" rev-parse $branch 2>/dev/null) || return 0
 
-  remote_head=$(curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null) \
-  || remote_head=$(wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null) \
-  || remote_head=$(HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null) \
-  || return 0
+  # Get remote HEAD. If we can't get it assume there are updates unless there is no connection:
+  # - curl: 6 (could not resolve) or 7 (could not connect)
+  # - wget: 4 (network unreachable)
+  # - fetch: 1 (no route to host)
+  local remote_head ret
+  remote_head=$(
+    curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null || {
+      [[ $? -eq 6 || $? -eq 7 ]] && exit 1
+    } || wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null || {
+      [[ $? -eq 4 ]] && exit 1
+    } || HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null || {
+      [[ $? -eq 1 ]] && exit 1
+    } || exit 0
+  )
+
+  # If can't fetch remote HEAD, return exit code
+  ret=$?; [[ -n "$remote_head" ]] || return $ret
 
   # Compare local and remote HEADs
   [[ "$local_head" != "$remote_head" ]]

From b2f35a7b98455b2bb8c7c3b11db6aa587e1d28bf Mon Sep 17 00:00:00 2001
From: Jonathan Batchelor <jmb@users.noreply.github.com>
Date: Fri, 5 Nov 2021 23:40:38 +0000
Subject: [PATCH 226/591] refactor(osx): Rename osx plugin to macos (#10341)

Apple changed the name of their operating system from OS X to macOS a number of years ago. This was overdue!

As per issue  #10311

* refactor(osx): rename `osx` plugin to `macos`
* refactor(macos): Add symbolic link from old `osx` plugin name.
---
 README.md                                          |  2 +-
 plugins/{osx => macos}/README.md                   |  8 ++++----
 plugins/{osx => macos}/_security                   |  0
 .../{osx/osx.plugin.zsh => macos/macos.plugin.zsh} | 14 ++++++++++----
 plugins/{osx => macos}/music                       |  0
 plugins/macos/osx.plugin.zsh                       |  1 +
 plugins/{osx => macos}/spotify                     |  0
 plugins/osx                                        |  1 +
 8 files changed, 17 insertions(+), 9 deletions(-)
 rename plugins/{osx => macos}/README.md (94%)
 rename plugins/{osx => macos}/_security (100%)
 rename plugins/{osx/osx.plugin.zsh => macos/macos.plugin.zsh} (93%)
 rename plugins/{osx => macos}/music (100%)
 create mode 120000 plugins/macos/osx.plugin.zsh
 rename plugins/{osx => macos}/spotify (100%)
 create mode 120000 plugins/osx

diff --git a/README.md b/README.md
index 907248beb..5712c1701 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ plugins=(
   git
   bundler
   dotenv
-  osx
+  macos
   rake
   rbenv
   ruby
diff --git a/plugins/osx/README.md b/plugins/macos/README.md
similarity index 94%
rename from plugins/osx/README.md
rename to plugins/macos/README.md
index 50458f60e..1bc4244a4 100644
--- a/plugins/osx/README.md
+++ b/plugins/macos/README.md
@@ -1,11 +1,11 @@
-# OSX plugin
+# MacOS plugin
 
 This plugin provides a few utilities to make it more enjoyable on macOS (previously named OSX).
 
-To start using it, add the `osx` plugin to your plugins array in `~/.zshrc`:
+To start using it, add the `macos` plugin to your plugins array in `~/.zshrc`:
 
 ```zsh
-plugins=(... osx)
+plugins=(... macos)
 ```
 
 Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
@@ -31,7 +31,7 @@ Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
 | `itunes`      | _DEPRECATED_. Use `music` from macOS Catalina on         |
 | `music`       | Control Apple Music. Use `music -h` for usage details    |
 | `spotify`     | Control Spotify and search by artist, album, track…      |
-| `rmdsstore`   | Remove .DS\_Store files recursively in a directory       |
+| `rmdsstore`   | Remove .DS_Store files recursively in a directory        |
 | `btrestart`   | Restart the Bluetooth daemon                             |
 | `freespace`   | Erases purgeable disk space with 0s on the selected disk |
 
diff --git a/plugins/osx/_security b/plugins/macos/_security
similarity index 100%
rename from plugins/osx/_security
rename to plugins/macos/_security
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/macos/macos.plugin.zsh
similarity index 93%
rename from plugins/osx/osx.plugin.zsh
rename to plugins/macos/macos.plugin.zsh
index 16f16ddb6..4bcbbaead 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/macos/macos.plugin.zsh
@@ -1,3 +1,9 @@
+# Check if 'osx' is still in the plugins list and prompt to change to 'macos'
+if [[ -n "${plugins[(r)osx]}" ]]; then
+  print ${(%):-"%F{yellow}The \`osx\` plugin is deprecated and has been renamed to \`macos\`."}
+  print ${(%):-"Please update your .zshrc to use the \`%Bmacos%b\` plugin instead.%f"}
+fi
+
 # Open the current directory in a Finder window
 alias ofd='open_command $PWD'
 
@@ -11,7 +17,7 @@ function btrestart() {
   sudo kextload -b com.apple.iokit.BroadcomBluetoothHostControllerUSBTransport
 }
 
-function _omz_osx_get_frontmost_app() {
+function _omz_macos_get_frontmost_app() {
   osascript 2>/dev/null <<EOF
     tell application "System Events"
       name of first item of (every process whose frontmost is true)
@@ -24,7 +30,7 @@ function tab() {
   local command="cd \\\"$PWD\\\"; clear"
   (( $# > 0 )) && command="${command}; $*"
 
-  local the_app=$(_omz_osx_get_frontmost_app)
+  local the_app=$(_omz_macos_get_frontmost_app)
 
   if [[ "$the_app" == 'Terminal' ]]; then
     # Discarding stdout to quash "tab N of window id XXX" output
@@ -77,7 +83,7 @@ function vsplit_tab() {
   local command="cd \\\"$PWD\\\"; clear"
   (( $# > 0 )) && command="${command}; $*"
 
-  local the_app=$(_omz_osx_get_frontmost_app)
+  local the_app=$(_omz_macos_get_frontmost_app)
 
   if [[ "$the_app" == 'iTerm' ]]; then
     osascript <<EOF
@@ -125,7 +131,7 @@ function split_tab() {
   local command="cd \\\"$PWD\\\"; clear"
   (( $# > 0 )) && command="${command}; $*"
 
-  local the_app=$(_omz_osx_get_frontmost_app)
+  local the_app=$(_omz_macos_get_frontmost_app)
 
   if [[ "$the_app" == 'iTerm' ]]; then
     osascript 2>/dev/null <<EOF
diff --git a/plugins/osx/music b/plugins/macos/music
similarity index 100%
rename from plugins/osx/music
rename to plugins/macos/music
diff --git a/plugins/macos/osx.plugin.zsh b/plugins/macos/osx.plugin.zsh
new file mode 120000
index 000000000..73d718d43
--- /dev/null
+++ b/plugins/macos/osx.plugin.zsh
@@ -0,0 +1 @@
+macos.plugin.zsh
\ No newline at end of file
diff --git a/plugins/osx/spotify b/plugins/macos/spotify
similarity index 100%
rename from plugins/osx/spotify
rename to plugins/macos/spotify
diff --git a/plugins/osx b/plugins/osx
new file mode 120000
index 000000000..a8d0f9c48
--- /dev/null
+++ b/plugins/osx
@@ -0,0 +1 @@
+macos
\ No newline at end of file

From 90903779b942a12d273e8d158ad97b252dc74360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 8 Nov 2021 14:01:34 +0100
Subject: [PATCH 227/591] refactor(percol): fix style, bind keys for vi-mode
 and remove dependencies

---
 plugins/percol/README.md         | 23 ++++++++++--------
 plugins/percol/percol.plugin.zsh | 41 +++++++++++++++++---------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/plugins/percol/README.md b/plugins/percol/README.md
index ec5de4f86..78c881f55 100644
--- a/plugins/percol/README.md
+++ b/plugins/percol/README.md
@@ -1,20 +1,23 @@
-## percol
+# percol
 
-Provides some useful function to make [percol](https://github.com/mooz/percol) work with zsh history and [jump plugin](https://github.com/ohmyzsh/ohmyzsh/blob/master/plugins/jump/jump.plugin.zsh)
+Provides some useful function to make [percol](https://github.com/mooz/percol) work with zsh history and
+the [jump plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/jump), optionally.
 
-### Requirements
+To use it, add `percol` to the plugins array in your zshrc:
 
-```shell
-pip install percol
+```zsh
+plugins=(... percol)
 ```
 
-And [jump](https://github.com/ohmyzsh/ohmyzsh/blob/master/plugins/jump/jump.plugin.zsh) for `oh-my-zsh` is a optional requirement.
+## Requirements
 
-### Usage
+- `percol`: install with `pip install percol`.
 
-For default
+- (_Optional_) [`jump`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/jump) plugin: needs to be
+  enabled before the `percol` plugin.
 
-- `^-r` bind to `percol_select_history`.You can use it to grep your history with percol.
+## Usage
 
-- `^-b` bind to `percol_select_marks`.You can use it to grep your bookmarks with percol.
+- <kbd>CTRL-R</kbd> (bound to `percol_select_history`): you can use it to grep your history with percol.
 
+- <kbd>CTRL-B</kbd> (bound to `percol_select_marks`): you can use it to grep your jump bookmarks with percol.
diff --git a/plugins/percol/percol.plugin.zsh b/plugins/percol/percol.plugin.zsh
index c6adf4e1e..b78383eee 100644
--- a/plugins/percol/percol.plugin.zsh
+++ b/plugins/percol/percol.plugin.zsh
@@ -1,22 +1,25 @@
-if which percol &> /dev/null; then
-    function percol_select_history() {
-        local tac
-        which gtac &> /dev/null && tac="gtac" || { which tac &> /dev/null && tac="tac" || { tac="tail -r" } }
-        BUFFER=$(fc -l -n 1 | eval $tac | percol --query "$LBUFFER")
-        CURSOR=$#BUFFER
-        zle -R -c
-    }
+(( ${+commands[percol]} )) || return
 
-    zle -N percol_select_history
-    bindkey '^R' percol_select_history
+function percol_select_history() {
+  # print history in reverse order (from -1 (latest) to 1 (oldest))
+  BUFFER=$(fc -l -n -1 1 | percol --query "$LBUFFER")
+  CURSOR=$#BUFFER
+  zle -R -c
+}
+zle -N percol_select_history
+bindkey -M emacs '^R' percol_select_history
+bindkey -M viins '^R' percol_select_history
+bindkey -M vicmd '^R' percol_select_history
 
-    if which marks &> /dev/null; then
-        function percol_select_marks() {
-            BUFFER=$(marks | percol --query "$LBUFFER" | awk '{print $3}')
-            CURSOR=$#BUFFER # move cursor
-            zle -R -c       # refresh
-        }
-        zle -N percol_select_marks
-        bindkey '^B' percol_select_marks
-    fi
+if (( ${+functions[marks]} )); then
+  function percol_select_marks() {
+    # parse directory from marks output (markname -> path) and quote if necessary
+    BUFFER=${(q)"$(marks | percol --query "$LBUFFER")"##*-> }
+    CURSOR=$#BUFFER
+    zle -R -c
+  }
+  zle -N percol_select_marks
+  bindkey -M emacs '^B' percol_select_marks
+  bindkey -M viins '^B' percol_select_marks
+  bindkey -M vicmd '^B' percol_select_marks
 fi

From 55682e36920e2ab7633fc6eee11466d3faed0bf8 Mon Sep 17 00:00:00 2001
From: Shahin Sorkh <sorkh.shahin@protonmail.com>
Date: Mon, 8 Nov 2021 18:02:09 +0330
Subject: [PATCH 228/591] feat(tmux): set session name with
 `ZSH_TMUX_DEFAULT_SESSION_NAME` (#9063)

---
 plugins/tmux/README.md       | 1 +
 plugins/tmux/tmux.plugin.zsh | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/tmux/README.md b/plugins/tmux/README.md
index 2ceaf1ad5..551814a39 100644
--- a/plugins/tmux/README.md
+++ b/plugins/tmux/README.md
@@ -39,3 +39,4 @@ The plugin also supports the following:
 | `ZSH_TMUX_FIXTERM_WITH_256COLOR`    | `$TERM` to use for 256-color terminals (default: `screen-256color`            |
 | `ZSH_TMUX_CONFIG`                   | Set the configuration path (default: `$HOME/.tmux.conf`)                      |
 | `ZSH_TMUX_UNICODE`                  | Set `tmux -u` option to support unicode                                       |
+| `ZSH_TMUX_DEFAULT_SESSION_NAME`     | Set tmux default session name when autostart is enabled                       |
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index e52443a71..0ea3aa02a 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -76,7 +76,11 @@ function _zsh_tmux_plugin_run() {
     elif [[ -e "$ZSH_TMUX_CONFIG" ]]; then
       tmux_cmd+=(-f "$ZSH_TMUX_CONFIG")
     fi
-    $tmux_cmd new-session
+    if [[ -n "$ZSH_TMUX_DEFAULT_SESSION_NAME" ]]; then
+        $tmux_cmd new-session -s $ZSH_TMUX_DEFAULT_SESSION_NAME
+    else
+        $tmux_cmd new-session
+    fi
   fi
 
   if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then

From e86c6f5e7fc9f024a427e2870ab70644b5454725 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kevin@burke.dev>
Date: Tue, 9 Nov 2021 00:04:10 -0800
Subject: [PATCH 229/591] style: use `-n` flag in `head` and `tail` commands
 (#10391)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 lib/diagnostics.zsh                        |  2 +-
 lib/directories.zsh                        |  2 +-
 lib/functions.zsh                          |  4 ++--
 lib/git.zsh                                |  2 +-
 plugins/scd/scd                            |  2 +-
 plugins/systemadmin/README.md              |  4 ++--
 plugins/systemadmin/systemadmin.plugin.zsh | 12 ++++++------
 tools/install.sh                           |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index 650520797..eaeba7d23 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -335,7 +335,7 @@ function _omz_diag_dump_os_specific_version() {
       builtin echo "OS Version: $osname $osver build $(sw_vers -buildVersion)"
       ;;
     cygwin)
-      command systeminfo | command head -4 | command tail -2
+      command systeminfo | command head -n 4 | command tail -n 2
       ;;
   esac
 
diff --git a/lib/directories.zsh b/lib/directories.zsh
index 6696854b0..c62f56468 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -26,7 +26,7 @@ function d () {
   if [[ -n $1 ]]; then
     dirs "$@"
   else
-    dirs -v | head -10
+    dirs -v | head -n 10
   fi
 }
 compdef _dirs d
diff --git a/lib/functions.zsh b/lib/functions.zsh
index 73b491a59..fc53611b8 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -1,7 +1,7 @@
 function zsh_stats() {
   fc -l 1 \
     | awk '{ CMD[$2]++; count++; } END { for (a in CMD) print CMD[a] " " CMD[a]*100/count "% " a }' \
-    | grep -v "./" | sort -nr | head -20 | column -c3 -s " " -t | nl
+    | grep -v "./" | sort -nr | head -n 20 | column -c3 -s " " -t | nl
 }
 
 function uninstall_oh_my_zsh() {
@@ -45,7 +45,7 @@ function takeurl() {
   data="$(mktemp)"
   curl -L "$1" > "$data"
   tar xf "$data"
-  thedir="$(tar tf "$data" | head -1)"
+  thedir="$(tar tf "$data" | head -n 1)"
   rm "$data"
   cd "$thedir"
 }
diff --git a/lib/git.zsh b/lib/git.zsh
index 9a615e77b..8623473b0 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -51,7 +51,7 @@ function parse_git_dirty() {
         FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
         ;;
     esac
-    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -1)
+    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n 1)
   fi
   if [[ -n $STATUS ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
diff --git a/plugins/scd/scd b/plugins/scd/scd
index a7db6c265..7e9654b44 100755
--- a/plugins/scd/scd
+++ b/plugins/scd/scd
@@ -270,7 +270,7 @@ fi
 
 # Determine the last recorded directory
 if [[ -s ${SCD_HISTFILE} ]]; then
-    last_directory=${"$(tail -1 ${SCD_HISTFILE})"#*;}
+    last_directory=${"$(tail -n 1 ${SCD_HISTFILE})"#*;}
 fi
 
 # The "record" function adds its arguments to the directory index.
diff --git a/plugins/systemadmin/README.md b/plugins/systemadmin/README.md
index 052fc6edc..146b58605 100644
--- a/plugins/systemadmin/README.md
+++ b/plugins/systemadmin/README.md
@@ -17,9 +17,9 @@ plugins=(... systemadmin)
 | path    | `print -l $path`                                                           | Displays PATH with each entry on a separate line                   |
 | mkdir   | `mkdir -pv`                                                                | Automatically create parent directories and display verbose output |
 | psmem   | `ps -e -orss=,args= \| sort -b -k1 -nr`                                    | Display the processes using the most memory                        |
-| psmem10 | `ps -e -orss=,args= \| sort -b -k1 -nr \| head -10`                        | Display the top 10 processes using the most memory                 |
+| psmem10 | `ps -e -orss=,args= \| sort -b -k1 -nr \| head -n 10`                      | Display the top 10 processes using the most memory                 |
 | pscpu   | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr`                 | Display the top processes using the most CPU                       |
-| pscpu10 | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr \| head -10`     | Display the top 10 processes using the most CPU                    |
+| pscpu10 | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr \| head -n 10`   | Display the top 10 processes using the most CPU                    |
 | hist10  | `print -l ${(o)history%% *} \| uniq -c \| sort -nr \| head -n 10`          | Display the top 10 most used commands in the history               |
 
 ## Functions
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index a77f0069b..2f9d1ef35 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -26,10 +26,10 @@ alias path='print -l $path'
 alias mkdir='mkdir -pv'
 # get top process eating memory
 alias psmem='ps -e -orss=,args= | sort -b -k1 -nr'
-alias psmem10='ps -e -orss=,args= | sort -b -k1 -nr | head -10'
+alias psmem10='ps -e -orss=,args= | sort -b -k1 -nr | head -n 10'
 # get top process eating cpu if not work try excute : export LC_ALL='C'
 alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr'
-alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -10'
+alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -n 10'
 # top10 of the history
 alias hist10='print -l ${(o)history%% *} | uniq -c | sort -nr | head -n 10'
 
@@ -74,7 +74,7 @@ req20() {
 
 # top20 of Using tcpdump port 80 access to view
 http20() {
-    sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -20
+    sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -n 20
 }
 
 # top20 of Find time_wait connection
@@ -99,14 +99,14 @@ accessip10() {
 
 # top20 of Most Visited file or page
 visitpage20() {
-    awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -20
+    awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -n 20
 }
 
 # top100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences
 consume100() {
-    awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+    awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
     # if django website or other webiste make by no suffix language
-    # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+    # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
 }
 
 # Website traffic statistics (G)
diff --git a/tools/install.sh b/tools/install.sh
index 7704107c8..ca996f8a7 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -311,7 +311,7 @@ EOF
     # 1. Use the most preceding one based on $PATH, then check that it's in the shells file
     # 2. If that fails, get a zsh path from the shells file, then check it actually exists
     if ! zsh=$(command -v zsh) || ! grep -qx "$zsh" "$shells_file"; then
-      if ! zsh=$(grep '^/.*/zsh$' "$shells_file" | tail -1) || [ ! -f "$zsh" ]; then
+      if ! zsh=$(grep '^/.*/zsh$' "$shells_file" | tail -n 1) || [ ! -f "$zsh" ]; then
         fmt_error "no zsh binary found or not present in '$shells_file'"
         fmt_error "change your default shell manually."
         return

From 4a74349635cf30d305766b459c7cc3246831676e Mon Sep 17 00:00:00 2001
From: Janusz Mordarski <janusz.m@gmail.com>
Date: Tue, 9 Nov 2021 09:50:25 +0100
Subject: [PATCH 230/591] feat(refined): allow selecting git branch by changing
 prefix to `:` (#10400)

---
 themes/refined.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/refined.zsh-theme b/themes/refined.zsh-theme
index 2a4188c9d..5d39bd757 100644
--- a/themes/refined.zsh-theme
+++ b/themes/refined.zsh-theme
@@ -33,8 +33,8 @@ autoload -Uz vcs_info
 zstyle ':vcs_info:*' enable hg bzr git
 zstyle ':vcs_info:*:*' unstagedstr '!'
 zstyle ':vcs_info:*:*' stagedstr '+'
-zstyle ':vcs_info:*:*' formats "$FX[bold]%r$FX[no-bold]/%S" "%s/%b" "%%u%c"
-zstyle ':vcs_info:*:*' actionformats "$FX[bold]%r$FX[no-bold]/%S" "%s/%b" "%u%c (%a)"
+zstyle ':vcs_info:*:*' formats "$FX[bold]%r$FX[no-bold]/%S" "%s:%b" "%%u%c"
+zstyle ':vcs_info:*:*' actionformats "$FX[bold]%r$FX[no-bold]/%S" "%s:%b" "%u%c (%a)"
 zstyle ':vcs_info:*:*' nvcsformats "%~" "" ""
 
 # Fastest possible way to check if repo is dirty

From 3dc66bd3676a564e3864fb5ccf5641c65fd42c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 10:25:23 +0100
Subject: [PATCH 231/591] fix(emotty): fix glyphs output width in emotty theme

---
 themes/emotty.zsh-theme | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/emotty.zsh-theme b/themes/emotty.zsh-theme
index 13adad78d..044b317e8 100644
--- a/themes/emotty.zsh-theme
+++ b/themes/emotty.zsh-theme
@@ -51,9 +51,9 @@ root_prompt="$emoji[skull]"
 warn_prompt="$emoji[collision_symbol]"
 
 vcs_unstaged_glyph="%{$emoji[circled_latin_capital_letter_m]$emoji2[emoji_style] %2G%}"
-vcs_staged_glyph="%{$emoji[high_voltage_sign] %2G%}"
-vcs_branch_glyph=$(print -P $'\Ue0a0') #  
-vcs_action_glyph=$(print -P $'\U276f') # ❯
+vcs_staged_glyph="%{$emoji[high_voltage_sign]%2G%}"
+vcs_branch_glyph=$'\Ue0a0' # 
+vcs_action_glyph=$'\U276f' # ❯
 
 red="$FG[001]"
 yellow="$FG[003]"

From 9a11b34101a218532f5133b78e55e48e3dbeb2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 12:03:59 +0100
Subject: [PATCH 232/591] fix(cli): fix check for completion files in `omz
 plugin load`

---
 lib/cli.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 0b6bbc6cb..2975acb91 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -446,9 +446,9 @@ function _omz::plugin::load {
     fi
 
     # Check if it has completion to reload compinit
-    if [[ -f "$base/_$plugin" ]]; then
-      has_completion=1
-    fi
+    local -a comp_files
+    comp_files=($base/_*(N))
+    has_completion=$(( $#comp_files > 0 ))
 
     # Load the plugin
     if [[ -f "$base/$plugin.plugin.zsh" ]]; then

From 5c2440cb0c2ee70afb33bda3954a93abe37c34f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 12:07:23 +0100
Subject: [PATCH 233/591] style(frontend-search): rename completion file to
 `_frontend`

---
 plugins/frontend-search/{_frontend-search.sh => _frontend} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/frontend-search/{_frontend-search.sh => _frontend} (100%)

diff --git a/plugins/frontend-search/_frontend-search.sh b/plugins/frontend-search/_frontend
similarity index 100%
rename from plugins/frontend-search/_frontend-search.sh
rename to plugins/frontend-search/_frontend

From db19589fcf03690a443f1a206361963b47809b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 19:27:43 +0100
Subject: [PATCH 234/591] refactor(updater): simplify check for available
 updates

---
 tools/check_for_upgrade.sh | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 8264762b6..70cd21f84 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -58,23 +58,20 @@ function is_update_available() {
   local local_head
   local_head=$(git -C "$ZSH" rev-parse $branch 2>/dev/null) || return 0
 
-  # Get remote HEAD. If we can't get it assume there are updates unless there is no connection:
-  # - curl: 6 (could not resolve) or 7 (could not connect)
-  # - wget: 4 (network unreachable)
-  # - fetch: 1 (no route to host)
-  local remote_head ret
+  # Get remote HEAD. If no suitable command is found assume there are updates
+  # On any other error, skip the update (connection may be down)
+  local remote_head
   remote_head=$(
-    curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null || {
-      [[ $? -eq 6 || $? -eq 7 ]] && exit 1
-    } || wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null || {
-      [[ $? -eq 4 ]] && exit 1
-    } || HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null || {
-      [[ $? -eq 1 ]] && exit 1
-    } || exit 0
-  )
-
-  # If can't fetch remote HEAD, return exit code
-  ret=$?; [[ -n "$remote_head" ]] || return $ret
+    if (( ${+commands[curl]} )); then
+      curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
+    elif (( ${+commands[wget]} )); then
+      wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
+    elif (( ${+commands[fetch]} )); then
+      HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null
+    else
+      exit 0
+    fi
+  ) || return 1
 
   # Compare local and remote HEADs
   [[ "$local_head" != "$remote_head" ]]

From e3f7b8aa570a09186a7e3d1877b36d7e43d39197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 10 Nov 2021 11:21:59 +0100
Subject: [PATCH 235/591] fix(updater): avoid `git -C` for compatibility with
 git < v1.8.5 (#10404)

Fixes #10404
---
 tools/check_for_upgrade.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 70cd21f84..a6fdf4659 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -34,11 +34,11 @@ function current_epoch() {
 
 function is_update_available() {
   local branch
-  branch=${"$(git -C "$ZSH" config --local oh-my-zsh.branch)":-master}
+  branch=${"$(cd "$ZSH"; git config --local oh-my-zsh.branch)":-master}
 
   local remote remote_url remote_repo
-  remote=${"$(git -C "$ZSH" config --local oh-my-zsh.remote)":-origin}
-  remote_url=$(git -C "$ZSH" config remote.$remote.url)
+  remote=${"$(cd "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
+  remote_url=$(cd "$ZSH"; git config remote.$remote.url)
 
   local repo
   case "$remote_url" in
@@ -56,7 +56,7 @@ function is_update_available() {
 
   # Get local HEAD. If this fails assume there are updates
   local local_head
-  local_head=$(git -C "$ZSH" rev-parse $branch 2>/dev/null) || return 0
+  local_head=$(cd "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
 
   # Get remote HEAD. If no suitable command is found assume there are updates
   # On any other error, skip the update (connection may be down)

From 1d166eaaa138d7413365205c61412ccb68286b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 10 Nov 2021 11:35:17 +0100
Subject: [PATCH 236/591] fix(cli): avoid `git -C` for compatibility with git <
 v1.8.5 (#10404)

---
 lib/cli.zsh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 2975acb91..d90cc6469 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -36,7 +36,7 @@ function _omz {
   elif (( CURRENT == 3 )); then
     case "$words[2]" in
       changelog) local -a refs
-        refs=("${(@f)$(command git -C "$ZSH" for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
+        refs=("${(@f)$(cd "$ZSH"; command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
       plugin) subcmds=(
         'disable:Disable plugin(s)'
@@ -171,9 +171,12 @@ EOF
 function _omz::changelog {
   local version=${1:-HEAD} format=${3:-"--text"}
 
-  if ! command git -C "$ZSH" show-ref --verify refs/heads/$version &>/dev/null && \
-    ! command git -C "$ZSH" show-ref --verify refs/tags/$version &>/dev/null && \
-    ! command git -C "$ZSH" rev-parse --verify "${version}^{commit}" &>/dev/null; then
+  if (
+    cd "$ZSH"
+    ! command git show-ref --verify refs/heads/$version && \
+    ! command git show-ref --verify refs/tags/$version && \
+    ! command git rev-parse --verify "${version}^{commit}"
+  ) &>/dev/null; then
     cat >&2 <<EOF
 Usage: omz changelog [version]
 

From 22de1d304c730c6e364a57a7b901978bd2fcd061 Mon Sep 17 00:00:00 2001
From: Kirill Molchanov <k03.mad@gmail.com>
Date: Wed, 10 Nov 2021 17:03:38 +0300
Subject: [PATCH 237/591] fix(command-not-found): pass arguments correctly in
 Termux (#10403)

---
 plugins/command-not-found/command-not-found.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index cb96fe063..e46350604 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -57,6 +57,6 @@ fi
 # Termux: https://github.com/termux/command-not-found
 if [[ -x /data/data/com.termux/files/usr/libexec/termux/command-not-found ]]; then
   command_not_found_handler() {
-    /data/data/com.termux/files/usr/libexec/termux/command-not-found -- "$1"
+    /data/data/com.termux/files/usr/libexec/termux/command-not-found "$1"
   }
 fi

From 1448d234d6d9c25f64a48b16379b34db28a36898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 11 Nov 2021 17:20:07 +0100
Subject: [PATCH 238/591] fix(dirhistory): fix Up/Down key bindings for
 Terminal.app

Reference: https://github.com/ohmyzsh/ohmyzsh/commit/7f49494#commitcomment-60117011
---
 plugins/dirhistory/dirhistory.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 26ef07494..971eb6540 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -182,7 +182,7 @@ bindkey "\e\e[A" dirhistory_zle_dirhistory_up   # Putty
 bindkey "\eO3A" dirhistory_zle_dirhistory_up    # GNU screen
 case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
-Apple_Terminal) bindkey "^[OA" dirhistory_zle_dirhistory_up ;;  # Terminal.app
+Apple_Terminal) bindkey "^[[A" dirhistory_zle_dirhistory_up ;;  # Terminal.app
 esac
 if (( ${+terminfo[kcuu1]} )); then
   bindkey "^[${terminfo[kcuu1]}" dirhistory_zle_dirhistory_up # urxvt
@@ -195,7 +195,7 @@ bindkey "\e\e[B" dirhistory_zle_dirhistory_down   # Putty
 bindkey "\eO3B" dirhistory_zle_dirhistory_down    # GNU screen
 case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
-Apple_Terminal) bindkey "^[OB" dirhistory_zle_dirhistory_down ;;  # Terminal.app
+Apple_Terminal) bindkey "^[[B" dirhistory_zle_dirhistory_down ;;  # Terminal.app
 esac
 if (( ${+terminfo[kcud1]} )); then
   bindkey "^[${terminfo[kcud1]}" dirhistory_zle_dirhistory_down # urxvt

From 6cb41b70a6d04301fd50cd5862ecd705ba226c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 8 Nov 2021 17:46:14 +0100
Subject: [PATCH 239/591] fix(lib): fix `omz_urldecode` unsafe eval bug

The `omz_urldecode` function uses an eval to decode the input which can be
exploited to inject commands. This is used only in the svn plugin and it
requires a complex process to exploit, so it is highly unlikely to have been
used by an attacker.
---
 lib/functions.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index fc53611b8..61f4dd49e 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -237,12 +237,11 @@ function omz_urldecode {
   tmp=${tmp:gs/\\/\\\\/}
   # Handle %-escapes by turning them into `\xXX` printf escapes
   tmp=${tmp:gs/%/\\x/}
-  local decoded
-  eval "decoded=\$'$tmp'"
+  local decoded="$(printf -- "$tmp")"
 
   # Now we have a UTF-8 encoded string in the variable. We need to re-encode
   # it if caller is in a non-UTF-8 locale.
-  local safe_encodings
+  local -a safe_encodings
   safe_encodings=(UTF-8 utf8 US-ASCII)
   if [[ -z ${safe_encodings[(r)$caller_encoding]} ]]; then
     decoded=$(echo -E "$decoded" | iconv -f UTF-8 -t $caller_encoding)

From 06fc5fb12900d7ee5821a5f20b47be2c4b894ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 15:05:53 +0100
Subject: [PATCH 240/591] fix(dirhistory): fix unsafe eval bug in back and
 forward widgets

The plugin unsafely processes directory paths in pop_past and pop_future.
This commit fixes that.
---
 plugins/dirhistory/dirhistory.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 971eb6540..e3f45ee99 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -19,14 +19,14 @@ export DIRHISTORY_SIZE=30
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
-  eval "$1='$dirhistory_past[$#dirhistory_past]'"
+  eval "$1=${(q)dirhistory_past[$#dirhistory_past]}"
   if [[ $#dirhistory_past -gt 0 ]]; then
     dirhistory_past[$#dirhistory_past]=()
   fi
 }
 
 function pop_future() {
-  eval "$1='$dirhistory_future[$#dirhistory_future]'"
+  eval "$1=${(q)dirhistory_future[$#dirhistory_future]}"
   if [[ $#dirhistory_future -gt 0 ]]; then
     dirhistory_future[$#dirhistory_future]=()
   fi

From a263cdac9c15de4003d3289a53cad1d19c8cfb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 09:08:18 +0100
Subject: [PATCH 241/591] fix(lib): fix potential command injection in `title`
 and `spectrum` functions

The `title` function unsafely prints its input without sanitization, which if used
with custom user code that calls it, it could trigger command injection.

The `spectrum_ls` and `spectrum_bls` could similarly be exploited if a variable is
changed in the user's shell environment with a carefully crafted value. This is
highly unlikely to occur (and if possible, other methods would be used instead),
but with this change the exploit of these two functions is now impossible.
---
 lib/spectrum.zsh    |  6 ++++--
 lib/termsupport.zsh | 13 ++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index d5c22a8c5..97f5c360a 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -20,16 +20,18 @@ done
 
 # Show all 256 colors with color number
 function spectrum_ls() {
+  setopt localoptions nopromptsubst
   local ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
   for code in {000..255}; do
-    print -P -- "$code: $FG[$code]$ZSH_SPECTRUM_TEXT%{$reset_color%}"
+    print -P -- "$code: ${FG[$code]}${ZSH_SPECTRUM_TEXT}%{$reset_color%}"
   done
 }
 
 # Show all 256 colors where the background is set to specific color
 function spectrum_bls() {
+  setopt localoptions nopromptsubst
   local ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
   for code in {000..255}; do
-    print -P -- "$code: $BG[$code]$ZSH_SPECTRUM_TEXT%{$reset_color%}"
+    print -P -- "$code: ${BG[$code]}${ZSH_SPECTRUM_TEXT}%{$reset_color%}"
   done
 }
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index ef0d78895..49f64400b 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -7,8 +7,7 @@
 # (In screen, only short_tab_title is used)
 # Limited support for Apple Terminal (Terminal can't set window and tab separately)
 function title {
-  emulate -L zsh
-  setopt prompt_subst
+  setopt localoptions nopromptsubst
 
   # Don't set the title if inside emacs, unless using vterm
   [[ -n "$INSIDE_EMACS" && "$INSIDE_EMACS" != vterm ]] && return
@@ -48,13 +47,13 @@ fi
 
 # Runs before showing the prompt
 function omz_termsupport_precmd {
-  [[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return
-  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return
+  title "$ZSH_THEME_TERM_TAB_TITLE_IDLE" "$ZSH_THEME_TERM_TITLE_IDLE"
 }
 
 # Runs before executing the command
 function omz_termsupport_preexec {
-  [[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return
+  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return
 
   emulate -L zsh
   setopt extended_glob
@@ -97,10 +96,10 @@ function omz_termsupport_preexec {
   fi
 
   # cmd name only, or if this is sudo or ssh, the next cmd
-  local CMD=${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}
+  local CMD="${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}"
   local LINE="${2:gs/%/%%}"
 
-  title '$CMD' '%100>...>$LINE%<<'
+  title "$CMD" "%100>...>${LINE}%<<"
 }
 
 autoload -Uz add-zsh-hook

From 72928432f1ddaa244e02067dd7fc14948a4a5ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 09:31:09 +0100
Subject: [PATCH 242/591] fix(plugins): fix potential command injection in
 `rand-quote` and `hitokoto`

The `rand-quote` plugin uses quotationspage.com and prints part of its content to the
shell without sanitization, which could trigger command injection. There is no evidence
that this has been exploited, but this commit removes all possibility for exploit.

Similarly, the `hitokoto` plugin uses the hitokoto.cn website to print quotes to the
shell, also without sanitization. Furthermore, there is also no evidence that this has
been exploited, but with this change it is now impossible.
---
 plugins/hitokoto/hitokoto.plugin.zsh     | 18 +++++++++++-------
 plugins/rand-quote/rand-quote.plugin.zsh | 23 ++++++++++++++++-------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/plugins/hitokoto/hitokoto.plugin.zsh b/plugins/hitokoto/hitokoto.plugin.zsh
index 8646ebf3b..e346d18c5 100644
--- a/plugins/hitokoto/hitokoto.plugin.zsh
+++ b/plugins/hitokoto/hitokoto.plugin.zsh
@@ -1,14 +1,18 @@
 if ! (( $+commands[curl] )); then
-    echo "hitokoto plugin needs curl to work" >&2
-    return
+  echo "hitokoto plugin needs curl to work" >&2
+  return
 fi
 
 function hitokoto {
-    emulate -L zsh
-    Q=$(curl -s --connect-timeout 2 "https://v1.hitokoto.cn" | jq -j '.hitokoto+"\t"+.from')
+  setopt localoptions nopromptsubst
 
-    TXT=$(echo "$Q" | awk -F '\t' '{print $1}')
-    WHO=$(echo "$Q" | awk -F '\t' '{print $2}')
+  # Get hitokoto data
+  local -a data
+  data=("${(ps:\n:)"$(command curl -s --connect-timeout 2 "https://v1.hitokoto.cn" | command jq -j '.hitokoto+"\n"+.from')"}")
 
-    [[ -n "$WHO" && -n "$TXT" ]] && print -P "%F{3}${WHO}%f: “%F{5}${TXT}%f”"
+  # Exit if could not fetch hitokoto
+  [[ -n "$data" ]] || return 0
+
+  local quote="${data[1]}" author="${data[2]}"
+  print -P "%F{3}${author}%f: “%F{5}${quote}%f”"
 }
diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh
index 371b997d3..23c21dc8f 100644
--- a/plugins/rand-quote/rand-quote.plugin.zsh
+++ b/plugins/rand-quote/rand-quote.plugin.zsh
@@ -1,14 +1,23 @@
 if ! (( $+commands[curl] )); then
-    echo "rand-quote plugin needs curl to work" >&2
-    return
+  echo "rand-quote plugin needs curl to work" >&2
+  return
 fi
 
 function quote {
-    emulate -L zsh
-    Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php" | iconv -c -f ISO-8859-1 -t UTF-8 | grep -m 1 "dt ")
+  setopt localoptions nopromptsubst
 
-    TXT=$(echo "$Q" | sed -e 's/<\/dt>.*//g' -e 's/.*html//g' -e 's/^[^a-zA-Z]*//' -e 's/<\/a..*$//g')
-    WHO=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g')
+  # Get random quote data
+  local data
+  data="$(command curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php" \
+    | iconv -c -f ISO-8859-1 -t UTF-8 \
+    | command grep -a -m 1 'dt class="quote"')"
 
-    [[ -n "$WHO" && -n "$TXT" ]] && print -P "%F{3}${WHO}%f: “%F{5}${TXT}%f”"
+  # Exit if could not fetch random quote
+  [[ -n "$data" ]] || return 0
+
+  local quote author
+  quote=$(sed -e 's|</dt>.*||g' -e 's|.*html||g' -e 's|^[^a-zA-Z]*||' -e 's|</a..*$||g' <<< "$data")
+  author=$(sed -e 's|.*/quotes/||g' -e 's|<.*||g' -e 's|.*">||g' <<< "$data")
+
+  print -P "%F{3}${author}%f: “%F{5}${quote}%f”"
 }

From b3ba9978cc42a5031c7b68e3cf917ec2e64643bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 09:54:21 +0100
Subject: [PATCH 243/591] fix(themes): fix potential command injection in
 `pygmalion`, `pygmalion-virtualenv` and `refined`

The pygmalion and pygmalion-virtualenv themes unsafely handle git prompt information
which results in a double evaluation of this information, so a malicious git repository
could trigger a command injection if the user cloned and entered the repository.

A similar method could be used in the refined theme. All themes have been patched against this
vulnerability.
---
 themes/pygmalion-virtualenv.zsh-theme | 11 ++++++-----
 themes/pygmalion.zsh-theme            |  6 +++---
 themes/refined.zsh-theme              |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/themes/pygmalion-virtualenv.zsh-theme b/themes/pygmalion-virtualenv.zsh-theme
index 47b0b4fb1..c2ab7f4e6 100644
--- a/themes/pygmalion-virtualenv.zsh-theme
+++ b/themes/pygmalion-virtualenv.zsh-theme
@@ -35,19 +35,20 @@ prompt_setup_pygmalion(){
 }
 
 prompt_pygmalion_precmd(){
-  setopt localoptions extendedglob
+  setopt localoptions nopromptsubst extendedglob
 
   local gitinfo=$(git_prompt_info)
   local gitinfo_nocolor=${gitinfo//\%\{[^\}]##\}}
-  local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
+  local exp_nocolor="$(print -P \"${base_prompt_nocolor}${gitinfo_nocolor}${post_prompt_nocolor}\")"
   local prompt_length=${#exp_nocolor}
 
+  # add new line on prompt longer than 40 characters
   local nl=""
-
   if [[ $prompt_length -gt 40 ]]; then
-    nl=$'\n%{\r%}';
+    nl=$'\n%{\r%}'
   fi
-  PROMPT="$base_prompt$gitinfo$nl$post_prompt"
+
+  PROMPT="${base_prompt}\$(git_prompt_info)${nl}${post_prompt}"
 }
 
 prompt_setup_pygmalion
diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
index b13adfd5f..be9ca3889 100644
--- a/themes/pygmalion.zsh-theme
+++ b/themes/pygmalion.zsh-theme
@@ -19,14 +19,14 @@ prompt_setup_pygmalion(){
 }
 
 prompt_pygmalion_precmd(){
-  setopt localoptions extendedglob
+  setopt localoptions nopromptsubst extendedglob
 
   local gitinfo=$(git_prompt_info)
   local gitinfo_nocolor=${gitinfo//\%\{[^\}]##\}}
-  local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
+  local exp_nocolor="$(print -P \"${base_prompt_nocolor}${gitinfo_nocolor}${post_prompt_nocolor}\")"
   local prompt_length=${#exp_nocolor}
 
-  PROMPT="${base_prompt}${gitinfo}${post_prompt}"
+  PROMPT="${base_prompt}\$(git_prompt_info)${post_prompt}"
 }
 
 prompt_setup_pygmalion
diff --git a/themes/refined.zsh-theme b/themes/refined.zsh-theme
index 5d39bd757..5e2de7a87 100644
--- a/themes/refined.zsh-theme
+++ b/themes/refined.zsh-theme
@@ -70,6 +70,7 @@ preexec() {
 # Output additional information about paths, repos and exec time
 #
 precmd() {
+    setopt localoptions nopromptsubst
     vcs_info # Get version control info before we start outputting stuff
     print -P "\n$(repo_information) %F{yellow}$(cmd_exec_time)%f"
     unset cmd_timestamp #Reset cmd exec time.

From 2c06852546f52330c389b53a1b81348e62f64423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 16 Nov 2021 17:18:07 +0100
Subject: [PATCH 244/591] style(dirhistory): remove use of `eval` completely

---
 plugins/dirhistory/dirhistory.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index e3f45ee99..9f39264cf 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -19,14 +19,14 @@ export DIRHISTORY_SIZE=30
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
-  eval "$1=${(q)dirhistory_past[$#dirhistory_past]}"
+  print -v $1 "${dirhistory_past[$#dirhistory_past]}"
   if [[ $#dirhistory_past -gt 0 ]]; then
     dirhistory_past[$#dirhistory_past]=()
   fi
 }
 
 function pop_future() {
-  eval "$1=${(q)dirhistory_future[$#dirhistory_future]}"
+  print -v $1 "${dirhistory_future[$#dirhistory_future]}"
   if [[ $#dirhistory_future -gt 0 ]]; then
     dirhistory_future[$#dirhistory_future]=()
   fi

From fb12e4135311b9c4189a7e4556be619922052f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 16 Nov 2021 18:38:59 +0100
Subject: [PATCH 245/591] fix(install): fix backslash in `printf` when showing
 logo (#10422)

Fixes #10422
---
 tools/install.sh | 10 +++++-----
 tools/upgrade.sh | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index ca996f8a7..47166059d 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -339,11 +339,11 @@ EOF
 
 # shellcheck disable=SC2183  # printf string has more %s than arguments ($RAINBOW expands to multiple arguments)
 print_success() {
-  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET
-  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n' $RAINBOW $RESET
-  printf '%s / __ \%s/ __ \  %s / __ `__ \%s/ / / / %s /_  / %s/ ___/%s __ \ %s\n' $RAINBOW $RESET
-  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n' $RAINBOW $RESET
-  printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RAINBOW $RESET
+  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $RAINBOW $RESET
+  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $RAINBOW $RESET
+  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $RAINBOW $RESET
+  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $RAINBOW $RESET
+  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $RAINBOW $RESET
   printf '%s    %s        %s           %s /____/ %s       %s     %s          %s....is now installed!%s\n' $RAINBOW $GREEN $RESET
   printf '\n'
   printf '\n'
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 7642858fe..994ffe9c9 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -182,12 +182,12 @@ if git pull --rebase --stat $remote $branch; then
     printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog with" "omz changelog"
   fi
 
-  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET
-  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n' $RAINBOW $RESET
-  printf '%s / __ \%s/ __ \  %s / __ `__ \%s/ / / / %s /_  / %s/ ___/%s __ \ %s\n' $RAINBOW $RESET
-  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n' $RAINBOW $RESET
-  printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RAINBOW $RESET
-  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n' $RAINBOW $RESET
+  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $RAINBOW $RESET
+  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $RAINBOW $RESET
+  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $RAINBOW $RESET
+  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $RAINBOW $RESET
+  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $RAINBOW $RESET
+  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n'      $RAINBOW $RESET
   printf '\n'
   printf "${BLUE}%s${RESET}\n\n" "$message"
   printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on Twitter:" "$(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"

From 60b89cd264a5d889573704f5116cefc8e690062c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 17 Nov 2021 09:55:39 +0100
Subject: [PATCH 246/591] feat(ssh-agent): add `quiet` option to silence plugin
 (#9659)

Closes #9659

Co-authored-by: Jeff Warner <jeff@develops.software>
---
 plugins/ssh-agent/README.md            | 56 +++++++++++++++-----------
 plugins/ssh-agent/ssh-agent.plugin.zsh | 12 +++---
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index 1d6914ec6..fa6a996d4 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -13,28 +13,24 @@ plugins=(... ssh-agent)
 
 **IMPORTANT: put these settings _before_ the line that sources oh-my-zsh**
 
+### `agent-forwarding`
+
 To enable **agent forwarding support** add the following to your zshrc file:
 
 ```zsh
-zstyle :omz:plugins:ssh-agent agent-forwarding on
+zstyle :omz:plugins:ssh-agent agent-forwarding yes
 ```
 
-----
+### `helper`
 
-To **NOT load any identities on start** use the `lazy` setting. This is particularly
-useful when combined with the `AddKeysToAgent` setting (available since OpenSSH 7.2),
-since it allows to enter the password only on first use. _NOTE: you can know your
-OpenSSH version with `ssh -V`._
+To set an **external helper** to ask for the passwords and possibly store
+them in the system keychain use the `helper` style. For example:
 
 ```zsh
-zstyle :omz:plugins:ssh-agent lazy yes
+zstyle :omz:plugins:ssh-agent helper ksshaskpass
 ```
 
-You can enable `AddKeysToAgent` by passing `-o AddKeysToAgent=yes` to the `ssh` command,
-or by adding `AddKeysToAgent yes` to your `~/.ssh/config` file [1].
-See the [OpenSSH 7.2 Release Notes](http://www.openssh.com/txt/release-7.2).
-
-----
+### `identities`
 
 To **load multiple identities** use the `identities` style (**this has no effect
 if the `lazy` setting is enabled**). For example:
@@ -52,7 +48,22 @@ zstyle :omz:plugins:ssh-agent identities ~/.config/ssh/id_rsa ~/.config/ssh/id_r
 zstyle :omz:plugins:ssh-agent identities ~/.config/ssh/{id_rsa,id_rsa2,id_github}
 ```
 
-----
+### `lazy`
+
+To **NOT load any identities on start** use the `lazy` setting. This is particularly
+useful when combined with the `AddKeysToAgent` setting (available since OpenSSH 7.2),
+since it allows to enter the password only on first use. _NOTE: you can know your
+OpenSSH version with `ssh -V`._
+
+```zsh
+zstyle :omz:plugins:ssh-agent lazy yes
+```
+
+You can enable `AddKeysToAgent` by passing `-o AddKeysToAgent=yes` to the `ssh` command,
+or by adding `AddKeysToAgent yes` to your `~/.ssh/config` file [1].
+See the [OpenSSH 7.2 Release Notes](http://www.openssh.com/txt/release-7.2).
+
+### `lifetime`
 
 To **set the maximum lifetime of the identities**, use the `lifetime` style.
 The lifetime may be specified in seconds or as described in sshd_config(5)
@@ -62,7 +73,15 @@ The lifetime may be specified in seconds or as described in sshd_config(5)
 zstyle :omz:plugins:ssh-agent lifetime 4h
 ```
 
-----
+### `quiet`
+
+To silence the plugin, use the following setting:
+
+```zsh
+zstyle :omz:plugins:ssh-agent quiet yes
+```
+
+### `ssh-add-args`
 
 To **pass arguments to the `ssh-add` command** that adds the identities on startup,
 use the `ssh-add-args` setting. You can pass multiple arguments separated by spaces:
@@ -80,15 +99,6 @@ ssh-add -K -c -a /run/user/1000/ssh-auth <identities>
 
 For valid `ssh-add` arguments run `ssh-add --help` or `man ssh-add`.
 
-----
-
-To set an **external helper** to ask for the passwords and possibly store
-them in the system keychain use the `helper` style. For example:
-
-```zsh
-zstyle :omz:plugins:ssh-agent helper ksshaskpass
-```
-
 ## Credits
 
 Based on code from Joseph M. Reagle: https://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 47dfef5b0..0d6a35b35 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -18,7 +18,7 @@ function _start_agent() {
   zstyle -s :omz:plugins:ssh-agent lifetime lifetime
 
   # start ssh-agent and setup environment
-  echo Starting ssh-agent...
+  zstyle -t :omz:plugins:ssh-agent quiet || echo >&2 "Starting ssh-agent ..."
   ssh-agent -s ${lifetime:+-t} ${lifetime} | sed '/^echo/d' >! "$ssh_env_cache"
   chmod 600 "$ssh_env_cache"
   . "$ssh_env_cache" > /dev/null
@@ -78,7 +78,7 @@ function _add_identities() {
 
   if [[ -n "$helper" ]]; then
     if [[ -z "${commands[$helper]}" ]]; then
-      echo "ssh-agent: the helper '$helper' has not been found."
+      echo >&2 "ssh-agent: the helper '$helper' has not been found."
     else
       SSH_ASKPASS="$helper" ssh-add "${args[@]}" ${^not_loaded} < /dev/null
       return $?
@@ -88,11 +88,9 @@ function _add_identities() {
   ssh-add "${args[@]}" ${^not_loaded}
 }
 
-# test if agent-forwarding is enabled
-zstyle -b :omz:plugins:ssh-agent agent-forwarding agent_forwarding
-
-# Add a nifty symlink for screen/tmux if agent forwarding
-if [[ $agent_forwarding = "yes" && -n "$SSH_AUTH_SOCK" && ! -L "$SSH_AUTH_SOCK" ]]; then
+# Add a nifty symlink for screen/tmux if agent forwarding is enabled
+if zstyle -t :omz:plugins:ssh-agent agent-forwarding \
+   && [[ -n "$SSH_AUTH_SOCK" && ! -L "$SSH_AUTH_SOCK" ]]; then
   ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 else
   _start_agent

From 2b379ec42c8675d6076737e1373767c160f5ae70 Mon Sep 17 00:00:00 2001
From: Brian Tannous <brian@briantannous.com>
Date: Wed, 17 Nov 2021 01:33:48 -0800
Subject: [PATCH 247/591] feat(kn): add plugin for `kn` completion (#8927)

---
 plugins/kn/README.md     | 17 +++++++++++++++++
 plugins/kn/kn.plugin.zsh |  8 ++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 plugins/kn/README.md
 create mode 100644 plugins/kn/kn.plugin.zsh

diff --git a/plugins/kn/README.md b/plugins/kn/README.md
new file mode 100644
index 000000000..d2eb9b31d
--- /dev/null
+++ b/plugins/kn/README.md
@@ -0,0 +1,17 @@
+# kn - Knative CLI
+
+This plugin provides autocompletion for [kn](https://knative.dev/docs/install/client/install-kn/) operations.
+
+To use it, add `kn` to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... kn)
+```
+
+## See Also
+
++ [kn/client](https://github.com/knative/client)
+
+## Contributors
+
++ [btannous](https://github.com/btannous) - Plugin Author
diff --git a/plugins/kn/kn.plugin.zsh b/plugins/kn/kn.plugin.zsh
new file mode 100644
index 000000000..f60177dd9
--- /dev/null
+++ b/plugins/kn/kn.plugin.zsh
@@ -0,0 +1,8 @@
+# Autocompletion for kn, the command line interface for knative
+#
+# Author: https://github.com/btannous
+
+if [ $commands[kn] ]; then
+  source <(kn completion zsh)
+  compdef _kn kn 
+fi

From b60b3f184275c39800dd7284d6904fcf295b3956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 17 Nov 2021 10:53:17 +0100
Subject: [PATCH 248/591] fix(osx): deprecate `osx` plugin without symlink
 (#10428)

Fixes #10428
---
 plugins/macos/macos.plugin.zsh | 6 ------
 plugins/macos/osx.plugin.zsh   | 1 -
 plugins/osx                    | 1 -
 plugins/osx/README.md          | 3 +++
 plugins/osx/osx.plugin.zsh     | 5 +++++
 5 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 120000 plugins/macos/osx.plugin.zsh
 delete mode 120000 plugins/osx
 create mode 100644 plugins/osx/README.md
 create mode 100644 plugins/osx/osx.plugin.zsh

diff --git a/plugins/macos/macos.plugin.zsh b/plugins/macos/macos.plugin.zsh
index 4bcbbaead..6a91be336 100644
--- a/plugins/macos/macos.plugin.zsh
+++ b/plugins/macos/macos.plugin.zsh
@@ -1,9 +1,3 @@
-# Check if 'osx' is still in the plugins list and prompt to change to 'macos'
-if [[ -n "${plugins[(r)osx]}" ]]; then
-  print ${(%):-"%F{yellow}The \`osx\` plugin is deprecated and has been renamed to \`macos\`."}
-  print ${(%):-"Please update your .zshrc to use the \`%Bmacos%b\` plugin instead.%f"}
-fi
-
 # Open the current directory in a Finder window
 alias ofd='open_command $PWD'
 
diff --git a/plugins/macos/osx.plugin.zsh b/plugins/macos/osx.plugin.zsh
deleted file mode 120000
index 73d718d43..000000000
--- a/plugins/macos/osx.plugin.zsh
+++ /dev/null
@@ -1 +0,0 @@
-macos.plugin.zsh
\ No newline at end of file
diff --git a/plugins/osx b/plugins/osx
deleted file mode 120000
index a8d0f9c48..000000000
--- a/plugins/osx
+++ /dev/null
@@ -1 +0,0 @@
-macos
\ No newline at end of file
diff --git a/plugins/osx/README.md b/plugins/osx/README.md
new file mode 100644
index 000000000..98d859545
--- /dev/null
+++ b/plugins/osx/README.md
@@ -0,0 +1,3 @@
+# osx plugin
+
+**Deprecated: use the [`macos`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/macos) plugin instead.**
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
new file mode 100644
index 000000000..9304e7f32
--- /dev/null
+++ b/plugins/osx/osx.plugin.zsh
@@ -0,0 +1,5 @@
+print ${(%):-'%F{yellow}The `osx` plugin is deprecated and has been renamed to `macos`.'}
+print ${(%):-'Please update your .zshrc to use the `%Bmacos%b` plugin instead.%f'}
+
+(( ${fpath[(Ie)$ZSH/plugins/macos]} )) || fpath=("$ZSH/plugins/macos" $fpath)
+source "$ZSH/plugins/macos/macos.plugin.zsh"

From 88e72e8a5482db677a1d07722293a3a4f8f71342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 17 Nov 2021 10:35:32 +0100
Subject: [PATCH 249/591] fix(docker-compose)!: check for old command instead
 of calling `docker` (#10409)

BREAKING CHANGE: the plugin now checks for the `docker-compose` command instead
of trying whether `docker compose` is a valid command. This means that if the
old command is still installed it will be used instead. To use `docker compose`,
uninstall any old copies of `docker-compose`.

Fixes #10409
---
 plugins/docker-compose/docker-compose.plugin.zsh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 13985fc82..b8a4b067d 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -1,7 +1,5 @@
 # support Compose v2 as docker CLI plugin
-DOCKER_CONTEXT=default command docker compose &>/dev/null \
-  && dccmd='docker compose' \
-  || dccmd='docker-compose'
+(( ${+commands[docker-compose]} )) && dccmd='docker-compose' || dccmd='docker compose'
 
 alias dco="$dccmd"
 alias dcb="$dccmd build"

From ff09151d6b82fef7af4ced774a416a36e7835b8a Mon Sep 17 00:00:00 2001
From: Aurora <AuroraWright@users.noreply.github.com>
Date: Wed, 17 Nov 2021 11:44:04 +0100
Subject: [PATCH 250/591] fix(bgnotify): avoid permission prompts by checking
 frontmost app ID (#10318)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/bgnotify/bgnotify.plugin.zsh | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index aecde20ea..479796dbe 100644
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -20,6 +20,12 @@ if ! (type bgnotify_formatted | grep -q 'function'); then ## allow custom functi
   }
 fi
 
+currentAppId () {
+  if (( $+commands[osascript] )); then
+    osascript -e 'tell application (path to frontmost application as text) to id' 2>/dev/null
+  fi
+}
+
 currentWindowId () {
   if hash osascript 2>/dev/null; then #osx
     osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null || echo "0"
@@ -32,11 +38,20 @@ currentWindowId () {
 
 bgnotify () { ## args: (title, subtitle)
   if hash terminal-notifier 2>/dev/null; then #osx
-    [[ "$TERM_PROGRAM" == 'iTerm.app' ]] && term_id='com.googlecode.iterm2';
-    [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]] && term_id='com.apple.terminal';
+    local term_id="$bgnotify_appid"
+    if [[ -z "$term_id" ]]; then
+      case "$TERM_PROGRAM" in
+      iTerm.app) term_id='com.googlecode.iterm2' ;;
+      Apple_Terminal) term_id='com.apple.terminal' ;;
+      esac
+    fi
+
     ## now call terminal-notifier, (hopefully with $term_id!)
-    [ -z "$term_id" ] && terminal-notifier -message "$2" -title "$1" >/dev/null ||
-    terminal-notifier -message "$2" -title "$1" -activate "$term_id" -sender "$term_id" >/dev/null
+    if [[ -z "$term_id" ]]; then
+      terminal-notifier -message "$2" -title "$1" >/dev/null
+    else
+      terminal-notifier -message "$2" -title "$1" -activate "$term_id" -sender "$term_id" >/dev/null
+    fi
   elif hash growlnotify 2>/dev/null; then #osx growl
     growlnotify -m "$1" "$2"
   elif hash notify-send 2>/dev/null; then #ubuntu gnome!
@@ -54,6 +69,7 @@ bgnotify () { ## args: (title, subtitle)
 bgnotify_begin() {
   bgnotify_timestamp=$EPOCHSECONDS
   bgnotify_lastcmd="${1:-$2}"
+  bgnotify_appid="$(currentAppId)"
   bgnotify_windowid=$(currentWindowId)
 }
 
@@ -62,7 +78,7 @@ bgnotify_end() {
   elapsed=$(( EPOCHSECONDS - bgnotify_timestamp ))
   past_threshold=$(( elapsed >= bgnotify_threshold ))
   if (( bgnotify_timestamp > 0 )) && (( past_threshold )); then
-    if [ $(currentWindowId) != "$bgnotify_windowid" ]; then
+    if [[ $(currentAppId) != "$bgnotify_appid" || $(currentWindowId) != "$bgnotify_windowid" ]]; then
       print -n "\a"
       bgnotify_formatted "$didexit" "$bgnotify_lastcmd" "$elapsed"
     fi

From 98b48015486bc638ba8f989af9285b73c413f9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 17 Nov 2021 12:35:23 +0100
Subject: [PATCH 251/591] fix(bundler): use BUNDLE_JOBS in `bi` to avoid config
 file change

When calling `bundle install` with `--jobs=<n>`, bundle persists this
argument in `.bundle/config`. If we run `BUNDLE_JOBS=<n> bundle install`
instead, this is not persisted.

Fixes #10425
---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 6293dc28a..c93d4869e 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -40,7 +40,7 @@ bundle_install() {
   else
     local cores_num="$(nproc)"
   fi
-  bundle install --jobs="$cores_num" "$@"
+  BUNDLE_JOBS="$cores_num" bundle install "$@"
 }
 
 ## Gem wrapper

From 15fd9c84deae400ba52451d75548fb8f6ec26bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 15:07:09 +0100
Subject: [PATCH 252/591] style(bundler): simplify `bundled_commands` array
 operations

---
 plugins/bundler/bundler.plugin.zsh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index c93d4869e..c1cbb13dd 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -81,14 +81,12 @@ bundled_commands=(
 )
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
-for cmd in $UNBUNDLED_COMMANDS; do
-  bundled_commands=(${bundled_commands#$cmd});
-done
+bundled_commands=(${bundled_commands:|UNBUNDLED_COMMANDS})
+unset UNBUNDLED_COMMANDS
 
 # Add $BUNDLED_COMMANDS to the bundled_commands list
-for cmd in $BUNDLED_COMMANDS; do
-  bundled_commands+=($cmd);
-done
+bundled_commands+=($BUNDLED_COMMANDS)
+unset BUNDLED_COMMANDS
 
 # Check if in the root or a subdirectory of a bundled project
 _within-bundled-project() {
@@ -126,5 +124,4 @@ for cmd in $bundled_commands; do
     compdef "_$cmd" "bundled_$cmd"="$cmd"
   fi
 done
-
 unset cmd bundled_commands

From 2b96b7c54bbc86743d5550196e31f14b1b3d4951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 25 Nov 2021 11:46:37 +0100
Subject: [PATCH 253/591] fix(updater): stop update if `$ZSH` is not a git
 repository (#10448)

Fixes #10448
---
 tools/check_for_upgrade.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index a6fdf4659..b6625a395 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -133,6 +133,12 @@ function update_ohmyzsh() {
     return
   fi
 
+  # Test if Oh My Zsh directory is a git repository
+  if ! (cd "$ZSH" && LANG= git rev-parse &>/dev/null); then
+    echo >&2 "[oh-my-zsh] Can't update: not a git repository."
+    return
+  fi
+
   # Check if there are updates available before proceeding
   if ! is_update_available; then
     return

From 0314604384529fb535825bf1d93c6fdb3c5ccbbe Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scotto@gmail.com>
Date: Thu, 25 Nov 2021 22:55:21 +0000
Subject: [PATCH 254/591] fix(lib): don't error if `INSIDE_EMACS` is not
 defined (#10443)

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 49f64400b..4035d10a1 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -10,7 +10,7 @@ function title {
   setopt localoptions nopromptsubst
 
   # Don't set the title if inside emacs, unless using vterm
-  [[ -n "$INSIDE_EMACS" && "$INSIDE_EMACS" != vterm ]] && return
+  [[ -n "${INSIDE_EMACS:-}" && "$INSIDE_EMACS" != vterm ]] && return
 
   # if $2 is unset use $1 as default
   # if it is set and empty, leave it as is

From 452ddff763ebbaba40a060006e8290d497e2993a Mon Sep 17 00:00:00 2001
From: Kyle <43724855+Kyle-Ye@users.noreply.github.com>
Date: Fri, 26 Nov 2021 06:57:08 +0800
Subject: [PATCH 255/591] feat(xcode): support `.swiftpm` as project file in
 `xc` (#10434)

---
 plugins/xcode/README.md        | 2 +-
 plugins/xcode/xcode.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/xcode/README.md b/plugins/xcode/README.md
index 664a063a3..27d6a228b 100644
--- a/plugins/xcode/README.md
+++ b/plugins/xcode/README.md
@@ -26,7 +26,7 @@ plugins=(... xcode)
 
 ###  `xc`
 
-Opens the current directory in Xcode as an Xcode project or a Swift package. This will open one of the `.xcworkspace`, `.xcodeproj` and `Package.swift` files that it can find in the current working directory. You can also specify a directory to look in for the Xcode files.
+Opens the current directory in Xcode as an Xcode project or a Swift package. This will open one of the `.xcworkspace`, `.xcodeproj`, `.swiftpm` and `Package.swift` files that it can find in the current working directory. You can also specify a directory to look in for the Xcode files.
 Returns 1 if it didn't find any relevant files.
 
 ###  `xx`
diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 41b9e37e4..3bd12cdec 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -7,7 +7,7 @@ alias xcsel='sudo xcode-select --switch'
 # source: https://gist.github.com/subdigital/5420709
 function xc {
   local xcode_files
-  xcode_files=(${1:-.}/{*.{xcworkspace,xcodeproj},Package.swift}(N))
+  xcode_files=(${1:-.}/{*.{xcworkspace,xcodeproj,swiftpm},Package.swift}(N))
 
   if [[ ${#xcode_files} -eq 0 ]]; then
     echo "No Xcode files found in ${1:-the current directory}." >&2

From 8e5f3db305bb1fc363d3fe98c2d1177f0027a5bc Mon Sep 17 00:00:00 2001
From: Adam Cwyk <8567636+acwyk@users.noreply.github.com>
Date: Sat, 27 Nov 2021 12:23:08 +1100
Subject: [PATCH 256/591] feat(dotnet): add alias for `dotnet build` command
 (#10435)

Co-authored-by: Adam Cwyk <git@adamcwyk.dev>
---
 plugins/dotnet/README.md         | 1 +
 plugins/dotnet/dotnet.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/dotnet/README.md b/plugins/dotnet/README.md
index 7554b4e3c..87dfd8f8d 100644
--- a/plugins/dotnet/README.md
+++ b/plugins/dotnet/README.md
@@ -21,3 +21,4 @@ plugins=(... dotnet)
 | da    | dotnet add       | Add a package or reference to a .NET project.                     |
 | dp    | dotnet pack      | Create a NuGet package.                                           |
 | dng   | dotnet nuget     | Provides additional NuGet commands.                               |
+| db    | dotnet build     | Build a .NET project                                              |
diff --git a/plugins/dotnet/dotnet.plugin.zsh b/plugins/dotnet/dotnet.plugin.zsh
index 6bd4b7af8..5bc1587c5 100644
--- a/plugins/dotnet/dotnet.plugin.zsh
+++ b/plugins/dotnet/dotnet.plugin.zsh
@@ -30,3 +30,4 @@ alias ds='dotnet sln'
 alias da='dotnet add'
 alias dp='dotnet pack'
 alias dng='dotnet nuget'
+alias db='dotnet build'

From 58478d0888aa842adc71aded80009cba5be190ec Mon Sep 17 00:00:00 2001
From: Markus Hofbauer <markus.hofbauer@tum.de>
Date: Sat, 27 Nov 2021 20:30:03 +0100
Subject: [PATCH 257/591] feat(git): Add alias for rebasing to
 origin/main-branch (#10445)

---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 113080874..b9af3488f 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -130,6 +130,7 @@ plugins=(... git)
 | grbd                 | git rebase $(git_develop_branch)                                                                                                 |
 | grbi                 | git rebase -i                                                                                                                    |
 | grbm                 | git rebase $(git_main_branch)                                                                                                    |
+| grbom                | git rebase origin/$(git_main_branch)                                                                                             |
 | grbo                 | git rebase --onto                                                                                                                |
 | grbs                 | git rebase --skip                                                                                                                |
 | grev                 | git revert                                                                                                                       |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5a3c98287..648fa0a33 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -251,6 +251,7 @@ alias grbc='git rebase --continue'
 alias grbd='git rebase $(git_develop_branch)'
 alias grbi='git rebase -i'
 alias grbm='git rebase $(git_main_branch)'
+alias grbom='git rebase origin/$(git_main_branch)'
 alias grbo='git rebase --onto'
 alias grbs='git rebase --skip'
 alias grev='git revert'

From bf303965e685489f2f1b764d5d22dc4766ca78c8 Mon Sep 17 00:00:00 2001
From: Nicholas Hawkes <nicholas.hawkes@prodigygame.com>
Date: Sat, 27 Nov 2021 15:34:47 -0500
Subject: [PATCH 258/591] feat(aws): Adds the login option for AWS SSO (#9921)

---
 plugins/aws/README.md      | 1 +
 plugins/aws/aws.plugin.zsh | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 011bbd8b4..24c6429dd 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -14,6 +14,7 @@ plugins=(... aws)
 * `asp [<profile>]`: sets `$AWS_PROFILE` and `$AWS_DEFAULT_PROFILE` (legacy) to `<profile>`.
   It also sets `$AWS_EB_PROFILE` to `<profile>` for the Elastic Beanstalk CLI.
   Run `asp` without arguments to clear the profile.
+* `asp [<profile>] login`: If AWS SSO has been configured in your aws profile, it will run the `aws sso login` command following profile selection. 
 
 * `acp [<profile>]`: in addition to `asp` functionality, it actually changes the profile by
    assuming the role specified in the `<profile>` configuration. It supports MFA and sets
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 2d095635b..3a3a111b4 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -21,6 +21,10 @@ function asp() {
   export AWS_DEFAULT_PROFILE=$1
   export AWS_PROFILE=$1
   export AWS_EB_PROFILE=$1
+
+  if [[ "$2" == "login" ]]; then
+    aws sso login
+  fi
 }
 
 # AWS profile switch

From f0f792fa6b207bc72453ae55011b6b44f678fb78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 30 Nov 2021 10:13:23 +0100
Subject: [PATCH 259/591] feat(cli): add `omz version` command

---
 lib/cli.zsh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index d90cc6469..aed84e08f 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -29,6 +29,7 @@ function _omz {
     'reload:Reload the current zsh session'
     'theme:Manage themes'
     'update:Update Oh My Zsh'
+    'version:Show the version'
   )
 
   if (( CURRENT == 2 )); then
@@ -164,6 +165,7 @@ Available commands:
   reload              Reload the current zsh session
   theme  <command>    Manage themes
   update              Update Oh My Zsh
+  version             Show the version
 
 EOF
 }
@@ -777,3 +779,24 @@ function _omz::update {
     [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
   fi
 }
+
+function _omz::version {
+  (
+    cd "$ZSH"
+
+    # Get the version name:
+    # 1) try tag-like version
+    # 2) try name-rev
+    # 3) try branch name
+    local version
+    version=$(command git describe --tags HEAD 2>/dev/null) \
+    || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" HEAD 2>/dev/null) \
+    || version=$(command git symbolic-ref --quiet --short HEAD 2>/dev/null)
+
+    # Get short hash for the current HEAD
+    local commit=$(command git rev-parse --short HEAD 2>/dev/null)
+
+    # Show version and commit hash
+    printf "%s (%s)\n" "$version" "$commit"
+  )
+}

From 1c1d74c5ec49e5ab7e2d664e557c61745d1995e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 30 Nov 2021 10:19:21 +0100
Subject: [PATCH 260/591] chore: update new issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.yml      | 15 ++---
 .github/ISSUE_TEMPLATE/bug_report_omz.yml  | 77 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.yml |  7 +-
 3 files changed, 90 insertions(+), 9 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report_omz.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index af2973fec..98f66b1d2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,12 +1,11 @@
-name: Bug report
-description: Create a report to help us improve Oh My Zsh
-labels: 'Bug'
+name: Report a bug
+description: Report a bug that isn't caused by Oh My Zsh. If unsure, use this form
 body:
   - type: markdown
     attributes:
       value: |
         ## Self Check
-        - Try searching existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed) for similar issues.
+        - Look for similar errors in existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed).
         - Try reaching out on the [Discord server](https://discord.gg/ohmyzsh) for help.
   - type: textarea
     validations:
@@ -41,21 +40,21 @@ body:
     validations:
       required: true
     attributes:
-      label: OS / Distro
-      placeholder: e.g. Windows 10, Ubuntu 20.04, Arch Linux, macOS 10.15...
+      label: OS / Linux distribution
+      placeholder: Windows 10, Ubuntu 20.04, Arch Linux, macOS 10.15...
   - type: input
     validations:
       required: true
     attributes:
       label: Zsh version
       description: Run `echo $ZSH_VERSION` to check.
-      placeholder: e.g. 5.6
+      placeholder: "5.6"
   - type: input
     validations:
       required: true
     attributes:
       label: Terminal emulator
-      placeholder: e.g. iTerm2, Gnome Terminal...
+      placeholder: iTerm2, GNOME Terminal, Terminal.app...
   - type: dropdown
     attributes:
       label: If using WSL on Windows, which version of WSL
diff --git a/.github/ISSUE_TEMPLATE/bug_report_omz.yml b/.github/ISSUE_TEMPLATE/bug_report_omz.yml
new file mode 100644
index 000000000..96f5ad934
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report_omz.yml
@@ -0,0 +1,77 @@
+name: Report a bug in Oh My Zsh
+description: Create a report to help us improve Oh My Zsh
+labels: ['Bug']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Self Check
+        - **Make sure this bug only happens with Oh My Zsh enabled**.
+        - Look for similar errors in existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed).
+        - Try reaching out on the [Discord server](https://discord.gg/ohmyzsh) for help.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the bug
+      description: A clear description of what the bug is.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Steps to reproduce the problem.
+      placeholder: |
+        For example:
+        1. Enable plugin '...'
+        2. Run command '...' or try to complete command '...'
+        3. See error
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Expected behavior
+      description: A brief description of what should happen.
+  - type: textarea
+    attributes:
+      label: Screenshots and recordings
+      description: |
+        If applicable, add screenshots to help explain your problem. You can also record an asciinema session: https://asciinema.org/
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: OS / Linux distribution
+      placeholder: Windows 10, Ubuntu 20.04, Arch Linux, macOS 10.15...
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Zsh version
+      description: Run `echo $ZSH_VERSION` to check.
+      placeholder: "5.6"
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Oh My Zsh version
+      description: Run `omz version` to check.
+      placeholder: master (bf303965)
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Terminal emulator
+      placeholder: iTerm2, GNOME Terminal, Terminal.app...
+  - type: dropdown
+    attributes:
+      label: If using WSL on Windows, which version of WSL
+      description: Run `wsl -l -v` to check.
+      options:
+        - WSL1
+        - WSL2
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here. This can be themes, plugins, custom settings...
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index dc4baf2b1..ac966dfd9 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,7 +1,12 @@
 name: Feature request
 description: Suggest a feature for Oh My Zsh
-labels: 'Feature'
+labels: ["Feature"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Self Check
+        - Look for similar features in existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed).
   - type: input
     attributes:
       label: If the feature request is for a plugin or theme, specify it here.

From 0e41181d547e2f89ffc503a7afc8b0f3991dd1a8 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Wed, 1 Dec 2021 06:20:31 -0500
Subject: [PATCH 261/591] chore: fix spelling errors across the project
 (#10459)

Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
---
 plugins/aliases/cheatsheet.py                        |  8 ++++----
 plugins/aliases/termcolor.py                         |  2 +-
 plugins/bower/bower.plugin.zsh                       |  8 ++++----
 plugins/catimg/catimg.plugin.zsh                     |  2 +-
 plugins/catimg/catimg.sh                             |  2 +-
 plugins/chucknorris/fortunes/chucknorris             | 10 +++++-----
 plugins/colorize/colorize.plugin.zsh                 |  2 +-
 plugins/cpanm/_cpanm                                 |  2 +-
 plugins/docker-machine/_docker-machine               |  6 +++---
 plugins/dotnet/dotnet.plugin.zsh                     |  2 +-
 plugins/emoji/emoji.plugin.zsh                       |  2 +-
 plugins/fastfile/fastfile.plugin.zsh                 | 12 ++++++------
 plugins/fd/README.md                                 |  2 +-
 plugins/flutter/README.md                            |  2 +-
 plugins/fzf/README.md                                |  2 +-
 plugins/gitfast/git-completion.bash                  |  2 +-
 plugins/grails/grails.plugin.zsh                     |  2 +-
 plugins/grunt/grunt.plugin.zsh                       |  4 ++--
 .../history-substring-search.zsh                     |  4 ++--
 plugins/ipfs/_ipfs                                   |  2 +-
 plugins/iterm2/iterm2.plugin.zsh                     |  2 +-
 plugins/jenv/README.md                               |  2 +-
 plugins/macos/spotify                                |  2 +-
 plugins/mercurial/README.md                          |  2 +-
 plugins/npm/README.md                                |  2 +-
 plugins/pep8/_pep8                                   |  2 +-
 plugins/please/README.md                             |  2 +-
 plugins/pm2/_pm2                                     |  4 ++--
 plugins/powify/_powify                               |  2 +-
 plugins/rake/rake.plugin.zsh                         |  2 +-
 plugins/rebar/_rebar                                 |  2 +-
 plugins/redis-cli/_redis-cli                         | 10 +++++-----
 plugins/salt/_salt                                   |  2 +-
 plugins/scala/_scala                                 |  2 +-
 plugins/sfdx/_sfdx                                   |  2 +-
 plugins/sprunge/README.md                            |  2 +-
 plugins/supervisor/_supervisorctl                    | 10 +++++-----
 plugins/supervisor/supervisor.plugin.zsh             |  2 +-
 plugins/suse/README.md                               |  2 +-
 plugins/symfony2/README.md                           |  2 +-
 plugins/systemadmin/systemadmin.plugin.zsh           |  4 ++--
 plugins/terminitor/_terminitor                       |  2 +-
 plugins/ubuntu/README.md                             |  2 +-
 plugins/vault/_vault                                 |  4 ++--
 plugins/yarn/_yarn                                   |  2 +-
 plugins/yum/yum.plugin.zsh                           |  2 +-
 themes/dallas.zsh-theme                              |  2 +-
 themes/essembeh.zsh-theme                            |  2 +-
 themes/nicoulaj.zsh-theme                            |  2 +-
 49 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/plugins/aliases/cheatsheet.py b/plugins/aliases/cheatsheet.py
index d6d507b92..694afd31c 100644
--- a/plugins/aliases/cheatsheet.py
+++ b/plugins/aliases/cheatsheet.py
@@ -26,16 +26,16 @@ def cheatsheet(lines):
         target_aliases.extend(group_list)
     return cheatsheet
 
-def pretty_print_group(key, aliases, hightlight=None):
+def pretty_print_group(key, aliases, highlight=None):
     if len(aliases) == 0:
         return
     group_hl_formatter = lambda g, hl: termcolor.colored(hl, 'yellow').join([termcolor.colored(part, 'red') for part in ('[%s]' % g).split(hl)])
     alias_hl_formatter = lambda alias, hl: termcolor.colored(hl, 'yellow').join([termcolor.colored(part, 'green') for part in ('\t%s = %s' % alias[0:2]).split(hl)])
     group_formatter = lambda g: termcolor.colored('[%s]' % g, 'red')
     alias_formatter = lambda alias: termcolor.colored('\t%s = %s' % alias[0:2], 'green')
-    if hightlight and len(hightlight)>0:
-        print (group_hl_formatter(key, hightlight))
-        print ('\n'.join([alias_hl_formatter(alias, hightlight) for alias in aliases]))
+    if highlight and len(highlight)>0:
+        print (group_hl_formatter(key, highlight))
+        print ('\n'.join([alias_hl_formatter(alias, highlight) for alias in aliases]))
     else:
         print (group_formatter(key))
         print ('\n'.join([alias_formatter(alias) for alias in aliases]))
diff --git a/plugins/aliases/termcolor.py b/plugins/aliases/termcolor.py
index f11b824b2..bb725e905 100644
--- a/plugins/aliases/termcolor.py
+++ b/plugins/aliases/termcolor.py
@@ -21,7 +21,7 @@
 #
 # Author: Konstantin Lepa <konstantin.lepa@gmail.com>
 
-"""ANSII Color formatting for output in terminal."""
+"""ANSI Color formatting for output in terminal."""
 
 from __future__ import print_function
 import os
diff --git a/plugins/bower/bower.plugin.zsh b/plugins/bower/bower.plugin.zsh
index 3a40b3af0..c4f71c2ae 100644
--- a/plugins/bower/bower.plugin.zsh
+++ b/plugins/bower/bower.plugin.zsh
@@ -9,7 +9,7 @@ _bower_installed_packages () {
 }
 _bower ()
 {
-    local -a _1st_arguments _no_color _dopts _save_dev _force_lastest _production
+    local -a _1st_arguments _no_color _dopts _save_dev _force_latest _production
     local expl
     typeset -A opt_args
 
@@ -22,7 +22,7 @@ _bower ()
 
     _save_dev=('(--save-dev)--save-dev[Save installed packages into the project"s bower.json devDependencies]')
 
-    _force_lastest=('(--force-latest)--force-latest[Force latest version on conflict]')
+    _force_latest=('(--force-latest)--force-latest[Force latest version on conflict]')
 
     _production=('(--production)--production[Do not install project devDependencies]')
 
@@ -54,7 +54,7 @@ _bower ()
         _arguments \
         $_dopts \
         $_save_dev \
-        $_force_lastest \
+        $_force_latest \
         $_no_color \
         $_production
         ;;
@@ -62,7 +62,7 @@ _bower ()
         _arguments \
         $_dopts \
         $_no_color \
-        $_force_lastest
+        $_force_latest
         _bower_installed_packages
         compadd "$@" $(echo $bower_package_list)
         ;;
diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index ca46444cc..f4ff6f856 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -2,7 +2,7 @@
 # catimg script by Eduardo San Martin Morote aka Posva                         #
 # https://posva.net                                                            #
 #                                                                              #
-# Ouput the content of an image to the stdout using the 256 colors of the      #
+# Output the content of an image to the stdout using the 256 colors of the     #
 # terminal.                                                                    #
 # GitHub: https://github.com/posva/catimg                                      #
 ################################################################################
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
index 713a03291..f58392428 100644
--- a/plugins/catimg/catimg.sh
+++ b/plugins/catimg/catimg.sh
@@ -2,7 +2,7 @@
 # catimg script by Eduardo San Martin Morote aka Posva                         #
 # https://posva.net                                                            #
 #                                                                              #
-# Ouput the content of an image to the stdout using the 256 colors of the      #
+# Output the content of an image to the stdout using the 256 colors of the     #
 # terminal.                                                                    #
 # GitHub: https://github.com/posva/catimg                                      #
 ################################################################################
diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
index 6ba5bb9b5..9e36ce89a 100644
--- a/plugins/chucknorris/fortunes/chucknorris
+++ b/plugins/chucknorris/fortunes/chucknorris
@@ -228,7 +228,7 @@ Chuck Norris once punched the ground to stop an earthquake. The resulting afters
 %
 Chuck Norris once round-house kicked a salesman. Over the phone.
 %
-Chuck Norris once rounhouse kicked a football. The astronomical society now considers it a planet.
+Chuck Norris once roundhouse kicked a football. The astronomical society now considers it a planet.
 %
 Chuck Norris once thought he was wrong. He was, however, mistaken.
 %
@@ -342,7 +342,7 @@ Every time there's an earthquake, you know Chuck Norris is hungry. The earthquak
 %
 Evolution's driving mechanism is nature's desperate attempt to escape Chuck Norris.
 %
-Fear of spiders is arachnaphobia. Fear of tight spaces is claustrophobia. Fear of Chuck Norris is called Logic.
+Fear of spiders is arachnophobia. Fear of tight spaces is claustrophobia. Fear of Chuck Norris is called Logic.
 %
 Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
@@ -426,7 +426,7 @@ Some people ask for a Kleenex when they sneeze, Chuck Norris asks for a body bag
 %
 Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
 %
-Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindess, and possibly foot sized brusies on the face.
+Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindness, and possibly foot sized bruises on the face.
 %
 Taking Karate Lessons = $100, Buying MMA DVD's = $150, Subscribing to a UFC event = $50, Getting a Roundhouse Kick from Chuck Norris = PRICELESS.
 %
@@ -452,7 +452,7 @@ The best part of waking up is not Folgers in your cup. it's knowing that Chuck N
 %
 The chief export of Chuck Norris is pain.
 %
-The dictionary references Chuck Norris several times, he is metioned under Fear, Law, Order and Chucktatorship.
+The dictionary references Chuck Norris several times, he is mentioned under Fear, Law, Order and Chucktatorship.
 %
 The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
@@ -468,7 +468,7 @@ The only way sharks will come near CN underwater is when CN is inside of a cage.
 %
 The only word that rhymes with orange is Chuck Norris.
 %
-The producers of the movie "The Last Airbender" are now in talks with Chuck Norris in Order to star him in their next sequal "The Last Skull Bender".
+The producers of the movie "The Last Airbender" are now in talks with Chuck Norris in Order to star him in their next sequel "The Last Skull Bender".
 %
 The quickest way to a man's heart is with Chuck Norris' fist.
 %
diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 8ea98f80a..a9da6cf83 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -82,7 +82,7 @@ colorize_less() {
         # This variable tells less to pipe every file through the specified command
         # (see the man page of less INPUT PREPROCESSOR).
         # 'zsh -ic "colorize_cat %s 2> /dev/null"' would not work for huge files like
-        # the ~/.zsh_history. For such files the tty of the preprocessor will be supended.
+        # the ~/.zsh_history. For such files the tty of the preprocessor will be suspended.
         # Therefore we must source this file to make colorize_cat available in the
         # preprocessor without the interactive mode.
         # `2>/dev/null` will suppress the error for large files 'broken pipe' of the python
diff --git a/plugins/cpanm/_cpanm b/plugins/cpanm/_cpanm
index ff9ae1c15..f328dd997 100644
--- a/plugins/cpanm/_cpanm
+++ b/plugins/cpanm/_cpanm
@@ -36,7 +36,7 @@ arguments=(
   '--reinstall[Reinstall the distribution even if you already have the latest version installed]'
   '--interactive[Turn on interactive configure]'
 
-  '--scandeps[Scan the depencencies of given modules and output the tree in a text format]'
+  '--scandeps[Scan the dependencies of given modules and output the tree in a text format]'
   '--format[Specify what format to display the scanned dependency tree]:scandeps format:(tree json yaml dists)'
 
   '--save-dists[Specify the optional directory path to copy downloaded tarballs]'
diff --git a/plugins/docker-machine/_docker-machine b/plugins/docker-machine/_docker-machine
index 7c19ba8e7..fbd36d7c6 100644
--- a/plugins/docker-machine/_docker-machine
+++ b/plugins/docker-machine/_docker-machine
@@ -90,7 +90,7 @@ __docker-machine_filters() {
 }
 
 __get_swarm_discovery() {
-    declare -a masters serivces
+    declare -a masters services
     local service
     services=()
     masters=($(docker-machine ls -f {{.Swarm}} |grep '(master)' |awk '{print $1}'))
@@ -169,7 +169,7 @@ __get_create_argument() {
 __docker-machine_subcommand() {
     local -a opts_help
     opts_help=("(- :)--help[Print usage]")
-    local -a opts_only_host opts_driver opts_storage_driver opts_stragery
+    local -a opts_only_host opts_driver opts_storage_driver opts_state
     opts_only_host=(
         "$opts_help"
         "*:host:__docker-machine_hosts_all"
@@ -330,7 +330,7 @@ _docker-machine() {
     _arguments -C \
         "(- :)"{-h,--help}"[Show help]" \
         "(-D --debug)"{-D,--debug}"[Enable debug mode]" \
-        '(-s --stroage-path)'{-s,--storage-path}'[Configures storage path]:file:_files' \
+        '(-s --storage-path)'{-s,--storage-path}'[Configures storage path]:file:_files' \
         '--tls-ca-cert[CA to verify remotes against]:file:_files' \
         '--tls-ca-key[Private key to generate certificates]:file:_files' \
         '--tls-client-cert[Client cert to use for TLS]:file:_files' \
diff --git a/plugins/dotnet/dotnet.plugin.zsh b/plugins/dotnet/dotnet.plugin.zsh
index 5bc1587c5..8ea31cdbd 100644
--- a/plugins/dotnet/dotnet.plugin.zsh
+++ b/plugins/dotnet/dotnet.plugin.zsh
@@ -12,7 +12,7 @@ _dotnet_zsh_complete()
     return
   fi
 
-  # This is not a variable assigment, don't remove spaces!
+  # This is not a variable assignment, don't remove spaces!
   _values = "${(ps:\n:)completions}"
 }
 
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index 7876f1c89..f70e09320 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -20,7 +20,7 @@ unset _omz_emoji_plugin_dir
 
 # These additional emoji are not in the definition file, but are useful in conjunction with it
 
-# This is a combinin character that can be placed after any other character to surround
+# 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. 
 # It's unclear whether this should be in the $emoji array, because those characters are all ones
diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh
index ccbbce3b2..6288bb275 100644
--- a/plugins/fastfile/fastfile.plugin.zsh
+++ b/plugins/fastfile/fastfile.plugin.zsh
@@ -18,7 +18,7 @@ default fastfile_var_prefix "§"
 #    1. name - The name of the shortcut (default: name of the file)
 #    2. file - The file or directory to make the shortcut for
 # STDOUT:
-#    => fastfle_print
+#    => fastfile_print
 #
 function fastfile() {
     test "$2" || 2="."
@@ -75,14 +75,14 @@ function fastfile_print() {
 # List all shortcuts
 #
 # STDOUT:
-#    (=> fastfle_print) for each shortcut
+#    (=> fastfile_print) for each shortcut
 #
 function fastfile_ls() {
     for f in "${fastfile_dir}"/*(NF); do
-        file=`basename "$f"` # To enable simpler handeling of spaces in file names
+        file=`basename "$f"` # To enable simpler handling of spaces in file names
         varkey=`echo "$file" | tr " " "_"`
 
-        # Special format for colums
+        # Special format for columns
         echo "${fastfile_var_prefix}${varkey}|->|$(fastfile_get "$file")"
     done | column -t -s "|"
 }
@@ -93,7 +93,7 @@ function fastfile_ls() {
 # Arguments:
 #    1. name - The name of the shortcut (default: name of the file)
 # STDOUT:
-#    => fastfle_print
+#    => fastfile_print
 #
 function fastfile_rm() {
     fastfile_print "$1"
@@ -105,7 +105,7 @@ function fastfile_rm() {
 #
 function fastfile_sync() {
     for f in "${fastfile_dir}"/*(NF); do
-        file=`basename "$f"` # To enable simpler handeling of spaces in file names
+        file=`basename "$f"` # To enable simpler handling of spaces in file names
         varkey=`echo "$file" | tr " " "_"`
 
         alias -g "${fastfile_var_prefix}${varkey}"="'$(fastfile_get "$file")'"
diff --git a/plugins/fd/README.md b/plugins/fd/README.md
index aabd624b8..4d9cf190f 100644
--- a/plugins/fd/README.md
+++ b/plugins/fd/README.md
@@ -10,4 +10,4 @@ plugins=(... fd)
 
 Completion is taken from the fd release [`7.3.0`](https://github.com/sharkdp/fd/releases/tag/v7.3.0).
 
-Updated on Febrary 13th, 2019.
+Updated on February 13th, 2019.
diff --git a/plugins/flutter/README.md b/plugins/flutter/README.md
index be419144f..9c8169afc 100644
--- a/plugins/flutter/README.md
+++ b/plugins/flutter/README.md
@@ -18,4 +18,4 @@ plugins=(... flutter)
 | `flb`      | `flutter build`        | Build flutter application                                                  |
 | `flattach` | `flutter attach`       | Attaches flutter to a running flutter application with enabled observatory |
 | `flget`    | `flutter packages get` | Installs dependencies                                                      |
-| `flc`      | `flutter clean`        | Cleans flutter porject                                                     |
+| `flc`      | `flutter clean`        | Cleans flutter project                                                     |
diff --git a/plugins/fzf/README.md b/plugins/fzf/README.md
index 791a3eb6f..15d4d31f3 100644
--- a/plugins/fzf/README.md
+++ b/plugins/fzf/README.md
@@ -26,7 +26,7 @@ export FZF_BASE=/path/to/fzf/install/dir
 Set default command to use when input is tty:
 
 ```zsh
-export FZF_DEFAULT_COMMAND='<your fzf default commmand>'
+export FZF_DEFAULT_COMMAND='<your fzf default command>'
 ```
 
 If not set, the plugin will try to set it to these, in the order in which they're found:
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index 4497a294f..f7b09b2c1 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -3383,7 +3383,7 @@ _git_worktree ()
 		# Here we are not completing an --option, it's either the
 		# path or a ref.
 		case "$prev" in
-		-b|-B)	# Complete refs for branch to be created/reseted.
+		-b|-B)	# Complete refs for branch to be created/reset.
 			__git_complete_refs
 			;;
 		-*)	# The previous word is an -o|--option without an
diff --git a/plugins/grails/grails.plugin.zsh b/plugins/grails/grails.plugin.zsh
index 11777738c..ddc257428 100644
--- a/plugins/grails/grails.plugin.zsh
+++ b/plugins/grails/grails.plugin.zsh
@@ -1,5 +1,5 @@
 _enumerateGrailsScripts() {
-    # Default directoryies
+    # Default directories
     directories=($GRAILS_HOME/scripts ~/.grails/scripts ./scripts)
 
     # Check all of the plugins directories, if they exist
diff --git a/plugins/grunt/grunt.plugin.zsh b/plugins/grunt/grunt.plugin.zsh
index 3f9695177..a89469a59 100644
--- a/plugins/grunt/grunt.plugin.zsh
+++ b/plugins/grunt/grunt.plugin.zsh
@@ -82,7 +82,7 @@ function __grunt() {
         update_msg=' (cache updated)'
     fi
 
-    # Make optioins completion.
+    # Make options completion.
     if [[ ${#__grunt_opts} -gt 0 ]]; then
         opts+=("${__grunt_opts[@]}")
     fi
@@ -161,7 +161,7 @@ function __grunt_update_cache() {
     fi
 
     if [[ $is_updating -ne 0 ]]; then
-        # Update caceh.
+        # Update cache.
         __grunt_version=$version
         __grunt_gruntfile=$gruntfile
         is_updating=1
diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index a791cc4da..c326778d4 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -243,8 +243,8 @@ _history-substring-search-begin() {
     fi
 
     #
-    # Escape and join query parts with wildcard character '*' as seperator
-    # `(j:CHAR:)` join array to string with CHAR as seperator
+    # Escape and join query parts with wildcard character '*' as separator
+    # `(j:CHAR:)` join array to string with CHAR as separator
     #
     local search_pattern="*${(j:*:)_history_substring_search_query_parts[@]//(#m)[\][()|\\*?#<>~^]/\\$MATCH}*"
 
diff --git a/plugins/ipfs/_ipfs b/plugins/ipfs/_ipfs
index 9ee8bd79c..90c0a61c8 100644
--- a/plugins/ipfs/_ipfs
+++ b/plugins/ipfs/_ipfs
@@ -596,7 +596,7 @@ case $MAIN_SUBCOMMAND in
       '(-v --headers)'{-v,--headers}'[Print table headers (Hash, Size, Name).]' \
       '--resolve-type[Resolve linked objects to find out their types. Default: true.]' \
       '--size[Resolve linked objects to find out their file size. Default: true.]' \
-      '(-s --stream)'{-s,--stream}'[Enable exprimental streaming of directory entries as they are traversed.]' \
+      '(-s --stream)'{-s,--stream}'[Enable experimental streaming of directory entries as they are traversed.]' \
   ;;
   (mount)
     _arguments \
diff --git a/plugins/iterm2/iterm2.plugin.zsh b/plugins/iterm2/iterm2.plugin.zsh
index e4ac72ee3..9d8e40bf6 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
 
   ###
-  # Executes an arbitrary iTerm2 command via an escape code sequce.
+  # Executes an arbitrary iTerm2 command via an escape code sequence.
   # See https://iterm2.com/documentation-escape-codes.html for all supported commands.
   # Example: $ _iterm2_command "1337;StealFocus"
   function _iterm2_command() {
diff --git a/plugins/jenv/README.md b/plugins/jenv/README.md
index c043c626e..148794197 100644
--- a/plugins/jenv/README.md
+++ b/plugins/jenv/README.md
@@ -1,6 +1,6 @@
 # jenv plugin
 
-[jenv](https://www.jenv.be/) is a Java version manager similiar to [rbenv](https://github.com/rbenv/rbenv)
+[jenv](https://www.jenv.be/) is a Java version manager similar to [rbenv](https://github.com/rbenv/rbenv)
 and [pyenv](https://github.com/yyuu/pyenv).
 
 This plugin initializes jenv and provides the `jenv_prompt_info` function to add Java
diff --git a/plugins/macos/spotify b/plugins/macos/spotify
index 663215a74..491a60686 100644
--- a/plugins/macos/spotify
+++ b/plugins/macos/spotify
@@ -191,7 +191,7 @@ while [ $# -gt 0 ]; do
                             -d "grant_type=client_credentials" \
                     )
                     if ! [[ "${SPOTIFY_TOKEN_RESPONSE_DATA}" =~ "access_token" ]]; then
-                        cecho "Autorization failed, please check ${USER_CONFG_FILE}"
+                        cecho "Authorization failed, please check ${USER_CONFG_FILE}"
                         cecho "${SPOTIFY_TOKEN_RESPONSE_DATA}"
                         showAPIHelp
                         return 1
diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index 756964896..4beee0a95 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -61,7 +61,7 @@ ZSH_THEME_HG_PROMPT_CLEAN="%{$fg[magenta]%})"
 This is the same as git plugin does. **Note**: additional changes to `.zshrc`, or using a theme designed
 to use `hg_prompt_info`, are required in order for this to work.
 
-## Mantainers
+## Maintainers
 
 - [ptrv](https://github.com/ptrv): original creator
 - [oshybystyi](https://github.com/oshybystyi)
diff --git a/plugins/npm/README.md b/plugins/npm/README.md
index 47d153619..e970c3c7a 100644
--- a/plugins/npm/README.md
+++ b/plugins/npm/README.md
@@ -10,7 +10,7 @@ plugins=(... npm)
 
 ## Aliases
 
-| Alias   | Command                      | Descripton                                                      |
+| Alias   | Command                      | Description                                                     |
 |:------  |:-----------------------------|:----------------------------------------------------------------|
 | `npmg`  | `npm i -g`                   | Install dependencies globally                                   |
 | `npmS`  | `npm i -S`                   | Install and save to dependencies in your package.json           |
diff --git a/plugins/pep8/_pep8 b/plugins/pep8/_pep8
index ce19951dc..27b7fc544 100644
--- a/plugins/pep8/_pep8
+++ b/plugins/pep8/_pep8
@@ -29,6 +29,6 @@ _arguments -s -S \
   "--max-line-length[set maximum allowed line length (default: 79)]::n:_files" \
   "--format[set the error format \[default|pylint|<custom>\]]::format:_files" \
   "--diff[report only lines changed according to the unified diff received on STDIN]" \
-  "--benchmark[measure processing speed   are read from the \[pep8\] section of the tox.ini fg file located in any parent folder of the path(s) llowed options are: exclude, filename, select, ngth, count, format, quiet, show-pep8, show-source, .]" \
+  "--benchmark[measure processing speed   are read from the \[pep8\] section of the tox.ini fg file located in any parent folder of the path(s) allowed options are: exclude, filename, select, ngth, count, format, quiet, show-pep8, show-source, .]" \
   "--config[user config file location (default: /home/gsemet/.config/pep8)]::path:_files" \
   "*::args:_files"
diff --git a/plugins/please/README.md b/plugins/please/README.md
index 89bfbf105..0a33f897b 100644
--- a/plugins/please/README.md
+++ b/plugins/please/README.md
@@ -1,7 +1,7 @@
 # please plugin
 
 [Please](https://please.build) is a cross-language build system with an emphasis on
-high performance, extensibility and reproduceability. It supports a number of popular
+high performance, extensibility and reproducibility. It supports a number of popular
 languages and can automate nearly any aspect of your build process.
 
 This plugin adds autocomplete and major aliases for `plz`, the command line tool for
diff --git a/plugins/pm2/_pm2 b/plugins/pm2/_pm2
index 6f1e89df5..86412aef1 100644
--- a/plugins/pm2/_pm2
+++ b/plugins/pm2/_pm2
@@ -124,7 +124,7 @@ logs_options=(
     '--out[only shows standard output]'
     '--lines[output the last N lines, instead of the last 15 by default]'
     '--timestamp[add timestamps (default format YYYY-MM-DD-HH:mm:ss)]'
-    '--nostream[print logs without lauching the log stream]'
+    '--nostream[print logs without launching the log stream]'
     '(-h --help)'{-h,--help}'[output usage information]'
     $id_all_comp
 )
@@ -139,7 +139,7 @@ case "$words[1]" in
     stop|restart|delete|reload|reset)
         _arguments $id_all_comp && return 0
         ;;
-    env|inspect|monitor|unmonitor|discribe)
+    env|inspect|monitor|unmonitor|describe)
         _arguments $id_comp && return 0
         ;;
     deploy|startOrRestart|startOrReload)
diff --git a/plugins/powify/_powify b/plugins/powify/_powify
index 9507f400e..57042aa63 100644
--- a/plugins/powify/_powify
+++ b/plugins/powify/_powify
@@ -15,7 +15,7 @@ _1st_arguments=(
   'restart:restarts the pow app linked to the current directory'
   'always_restart:reload the pow app after each request'
   'always_restart_off:do not reload the pow app after each request'
-  'rename:rename the current pow app to [NAME] or renmae [OLD] to [NEW]'
+  'rename:rename the current pow app to [NAME] or rename [OLD] to [NEW]'
   'environment:run the this pow app in a different environment (aliased `env`)'
   'browse:opens and navigates the default browser to this app'
   'logs:tail the application logs'
diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh
index 121150017..3ceb20fea 100644
--- a/plugins/rake/rake.plugin.zsh
+++ b/plugins/rake/rake.plugin.zsh
@@ -2,7 +2,7 @@
 # over the years. We will miss you dearly.
 alias jimweirich="rake"  
 
-alias rake="noglob rake" # allows square brackts for rake task invocation
+alias rake="noglob rake" # allows square brackets for rake task invocation
 alias brake='noglob bundle exec rake' # execute the bundled rake gem
 alias srake='noglob sudo rake' # noglob must come before sudo
 alias sbrake='noglob sudo bundle exec rake' # altogether now ... 
diff --git a/plugins/rebar/_rebar b/plugins/rebar/_rebar
index 7ac5a510c..ea0d8a674 100644
--- a/plugins/rebar/_rebar
+++ b/plugins/rebar/_rebar
@@ -32,7 +32,7 @@ _rebar () {
         'create[Create skel based on template and vars]' \
         'create-app[Create simple app skel]' \
         'create-node[Create simple node skel]' \
-        'list-template[List avaiavle templates]' \
+        'list-template[List available templates]' \
         'doc[Generate Erlang program documentation]' \
         'check-deps[Display to be fetched dependencies]' \
         'get-deps[Fetch dependencies]' \
diff --git a/plugins/redis-cli/_redis-cli b/plugins/redis-cli/_redis-cli
index 1569f2916..f93624565 100644
--- a/plugins/redis-cli/_redis-cli
+++ b/plugins/redis-cli/_redis-cli
@@ -8,7 +8,7 @@ _1st_arguments=(
   'append:append a value to a key'
   'auth:authenticate to the server'
   'bgrewriteeaof:asynchronously rewrite the append-only file'
-  'bgsave:asynchornously save the dataset to disk'
+  'bgsave:asynchronously save the dataset to disk'
   'blpop:remove and get the first element in a list, or block until one is available'
   'brpop:remove and get the last element in a list, or block until one is available'
   'brpoplpush:pop a value from a list, push it to another list and return it; or block until one is available'
@@ -17,9 +17,9 @@ _1st_arguments=(
   # 'config resetstat: reset the stats returned by INFO'
   'dbsize:return the number of keys in the selected database'
   # 'debug object:get debugging information about a key'
-  # 'debug setgfault:make the server crash'
+  # 'debug segfault:make the server crash'
   'decr:decrement the integer value of a key by one'
-  'decrby:decrement the integet value of a key by the given number'
+  'decrby:decrement the integer value of a key by the given number'
   'del:delete a key'
   'discard:discard all commands issued after MULTI'
   'echo:echo the given string'
@@ -63,7 +63,7 @@ _1st_arguments=(
   'mget:get the values of all the given keys'
   'monitor:listen for all requests received by the server in real time'
   'move:move a key to another database'
-  'mset:set multiple keys to muliple values'
+  'mset:set multiple keys to multiple values'
   'msetnx:set multiple keys tom ultiple values, only if none of the keys exist'
   'multi:mark the start of a transaction block'
   'object:inspect the internals of Redis objects'
@@ -122,7 +122,7 @@ _1st_arguments=(
   'zrem:remove a member from a sorted set'
   'zremrangebyrank:remove all members in a sorted set within the given indexes'
   'zremrangebyscore:remove all members in a sorted set within the given scores'
-  'zrevrange:return a range of membrs in a sorted set, by index, with scores ordered from high to low'
+  'zrevrange:return a range of members in a sorted set, by index, with scores ordered from high to low'
   'zrevrangebyscore:return a range of members in a sorted set, by score, with scores ordered from high to low'
   'zrevrank:determine the index of a member in a sorted set, with scores ordered from high to low'
   'zscore:get the score associated with the given member in a sorted set'
diff --git a/plugins/salt/_salt b/plugins/salt/_salt
index 78d8611d2..a1c55f350 100644
--- a/plugins/salt/_salt
+++ b/plugins/salt/_salt
@@ -145,7 +145,7 @@ _master_options=(
     '(-v --verbose)'{-v,--verbose}'[Turn on command verbosity, display jid and active job queries]'
     '--hide-timeout[Hide minions that timeout]'
     '(-b --batch --batch-size)'{-b,--batch,--batch-size}'[Execute the salt job in batch mode, pass number or percentage to batch.]:Batch Size:'
-    '(-a --auth --eauth --extrenal-auth)'{-a,--auth,--eauth,--external-auth}'[Specify an external authentication system to use.]:eauth:'
+    '(-a --auth --eauth --external-auth)'{-a,--auth,--eauth,--external-auth}'[Specify an external authentication system to use.]:eauth:'
     '(-T --make-token)'{-T,--make-token}'[Generate and save an authentication token for re-use.]'
     '--return[Set an alternative return method.]:Returners:_path_files -W "$salt_dir/returners" -g "[^_]*.py(\:r)"'
     '(-d --doc --documentation)'{-d,--doc,--documentation}'[Return the documentation for the specified module]'
diff --git a/plugins/scala/_scala b/plugins/scala/_scala
index f7511a647..ba7ac3874 100644
--- a/plugins/scala/_scala
+++ b/plugins/scala/_scala
@@ -190,7 +190,7 @@ Y_opts=(
   "-Yshow-symkinds[Print abbreviated symbol kinds next to symbol names]"
   "-Yshow-trees[Print detailed ASTs (requires -Xprint\:phase)]"
   "-Yshow-trees-compact[Print detailed ASTs in compact form (requires -Xprint\:)]"
-  "-Yshow-trees-stringified[Print stringifications along with detailed ASTs (requires -Xprint\:)]"
+  "-Yshow-trees-stringified[Print stringification along with detailed ASTs (requires -Xprint\:)]"
   "-Ystatistics[Print compiler statistics]"
   "-Ystruct-dispatch\:-[Structural method dispatch policy (default\: poly-cache)]:policy name:(no-cache mono-cache poly-cache invoke-dynamic)"
 
diff --git a/plugins/sfdx/_sfdx b/plugins/sfdx/_sfdx
index 42ee55970..3a441f257 100644
--- a/plugins/sfdx/_sfdx
+++ b/plugins/sfdx/_sfdx
@@ -900,7 +900,7 @@ case "$words[1]" in
  force:data:tree:export)
  _command_args=(
  '(-q|--query)'{-q,--query}'[soql query, or filepath of file containing a soql query, to retrieve records]' \
- '(-p|--plan)'{-p,--plan}'[generate mulitple sobject tree files and a plan definition file for aggregated import]' \
+ '(-p|--plan)'{-p,--plan}'[generate multiple sobject tree files and a plan definition file for aggregated import]' \
  '(-x|--prefix)'{-x,--prefix}'[prefix of generated files]' \
  '(-d|--outputdir)'{-d,--outputdir}'[directory to store files]:file:_files' \
  '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
diff --git a/plugins/sprunge/README.md b/plugins/sprunge/README.md
index 28ed1834a..fb70d42eb 100644
--- a/plugins/sprunge/README.md
+++ b/plugins/sprunge/README.md
@@ -28,5 +28,5 @@ http://sprunge.us/XxjnKz
 - Sprunge accepts piped data, stdin redirection, text strings as input or filenames.
   Only one of these can be used at a time.
 - Argument precedence goes as follows: stdin > piped input > text strings.
-- If a filename is mispelled or doesn't have the necessary path description, it will NOT
+- If a filename is misspelled or doesn't have the necessary path description, it will NOT
   generate an error, but instead treat it as a text string.
diff --git a/plugins/supervisor/_supervisorctl b/plugins/supervisor/_supervisorctl
index 9f576c0c0..87cffab86 100644
--- a/plugins/supervisor/_supervisorctl
+++ b/plugins/supervisor/_supervisorctl
@@ -109,27 +109,27 @@ _supervisorctl_maintail() {
 _supervisorctl_start() {
     # TODO: add 'all'
     _arguments -s \
-        '*::supvervisor process:_get_supervisor_procs'
+        '*::supervisor process:_get_supervisor_procs'
 }
 
 (( $+functions[_supervisorctl_restart] )) ||
 _supervisorctl_restart() {
     # TODO: add 'all'
     _arguments -s \
-        '*::supvervisor process:_get_supervisor_procs'
+        '*::supervisor process:_get_supervisor_procs'
 }
 
 (( $+functions[_supervisorctl_status] )) ||
 _supervisorctl_status() {
     _arguments \
-        '*::supvervisor process:_get_supervisor_procs'
+        '*::supervisor process:_get_supervisor_procs'
 }
 
 (( $+functions[_supervisorctl_stop] )) ||
 _supervisorctl_stop() {
     # TODO: add 'all'
     _arguments -s \
-        '*::supvervisor process:_get_supervisor_procs'
+        '*::supervisor process:_get_supervisor_procs'
 }
 
 (( $+functions[_supervisorctl_tail] )) ||
@@ -137,7 +137,7 @@ _supervisorctl_tail() {
     # TODO: add 'stderr'
     _arguments -s \
         '-f[Continuous tail of named process stdout Ctrl-C to exit.]' \
-        '*::supvervisor process:_get_supervisor_procs'
+        '*::supervisor process:_get_supervisor_procs'
 }
 
 _supervisorctl "$@"
diff --git a/plugins/supervisor/supervisor.plugin.zsh b/plugins/supervisor/supervisor.plugin.zsh
index f11f0ed3f..ad5430275 100644
--- a/plugins/supervisor/supervisor.plugin.zsh
+++ b/plugins/supervisor/supervisor.plugin.zsh
@@ -1,4 +1,4 @@
-# DECLARION: This plugin was created by hhatto. What I did is just making a portal from https://bitbucket.org/hhatto/zshcompfunc4supervisor.
+# DECLARATION: This plugin was created by hhatto. What I did is just making a portal from https://bitbucket.org/hhatto/zshcompfunc4supervisor.
 
 alias sup='sudo supervisorctl'
 alias supad='sudo supervisorctl add'
diff --git a/plugins/suse/README.md b/plugins/suse/README.md
index 06c6d9ef5..f37ec1695 100644
--- a/plugins/suse/README.md
+++ b/plugins/suse/README.md
@@ -62,7 +62,7 @@ plugins=(... suse)
 
 NOTE: `--no-refresh` is passed to zypper for speeding up the calls and avoid errors due to lack
 of root privileges. If you need to refresh the repositories, call `sudo zypper ref` (`zref` alias)
-before runing these aliases.
+before running these aliases.
 
 Related: [#9798](https://github.com/ohmyzsh/ohmyzsh/pull/9798).
 
diff --git a/plugins/symfony2/README.md b/plugins/symfony2/README.md
index 2946d0937..76233472f 100644
--- a/plugins/symfony2/README.md
+++ b/plugins/symfony2/README.md
@@ -17,7 +17,7 @@ plugins=(... symfony2)
 | `sfsr`        | sf server:run                | Run the dev server            |
 | `sfcw`        | sf cache:warmup              | Use the Bundles warmer        |
 | `sfroute`     | sf debug:router              | Show the different routes     |
-| `sfcontainer` | sf debug:contaner            | List the different services   |
+| `sfcontainer` | sf debug:container           | List the different services   |
 | `sfgb`        | sf generate:bundle           | Generate a bundle             |
 | `sfgc`        | sf generate:controller       | Generate a controller         |
 | `sfgcom`      | sf generate:command          | Generate a command            |
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index 2f9d1ef35..9a2129060 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -27,7 +27,7 @@ alias mkdir='mkdir -pv'
 # get top process eating memory
 alias psmem='ps -e -orss=,args= | sort -b -k1 -nr'
 alias psmem10='ps -e -orss=,args= | sort -b -k1 -nr | head -n 10'
-# get top process eating cpu if not work try excute : export LC_ALL='C'
+# get top process eating cpu if not work try execute : export LC_ALL='C'
 alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr'
 alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -n 10'
 # top10 of the history
@@ -105,7 +105,7 @@ visitpage20() {
 # top100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences
 consume100() {
     awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
-    # if django website or other webiste make by no suffix language
+    # if django website or other website make by no suffix language
     # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
 }
 
diff --git a/plugins/terminitor/_terminitor b/plugins/terminitor/_terminitor
index 1ce87c3ad..3615350e2 100644
--- a/plugins/terminitor/_terminitor
+++ b/plugins/terminitor/_terminitor
@@ -11,7 +11,7 @@ local -a _1st_arguments
 _1st_arguments=(
     'create:create a Termfile in directory'
     'delete:delete terminitor script'
-    'edit:open termitor script'
+    'edit:open terminitor script'
     'fetch:clone the designated repo and run setup'
     'help:Describe available tasks or one specific task'
     'init:create initial root terminitor folder'
diff --git a/plugins/ubuntu/README.md b/plugins/ubuntu/README.md
index f72182f5c..9efef0732 100644
--- a/plugins/ubuntu/README.md
+++ b/plugins/ubuntu/README.md
@@ -19,7 +19,7 @@ Commands that use `$APT` will use `apt` if installed or defer to `apt-get` other
 | acp     | `apt-cache policy`                                                       | Display the package source priorities                                                             |
 | afs     | `apt-file search --regexp`                                               | Perform a regular expression apt-file search                                                      |
 | afu     | `sudo apt-file update`                                                   | Generates or updates the apt-file package database                                                |
-| aga     | `sudo $APT autoclean`                                                    | Clears out the local reposityory of retrieved package files that can no longer be downloaded      |
+| aga     | `sudo $APT autoclean`                                                    | Clears out the local repository of retrieved package files that can no longer be downloaded       |
 | agb     | `sudo $APT build-dep <source_pkg>`                                       | Installs/Removes packages to satisfy the dependencies of a specified build pkg                    |
 | agc     | `sudo $APT clean`                                                        | Clears out the local repository of retrieved package files leaving everything from the lock files |
 | agd     | `sudo $APT dselect-upgrade`                                              | Follows dselect choices for package installation                                                  |
diff --git a/plugins/vault/_vault b/plugins/vault/_vault
index c5338dffa..f6bd3517e 100644
--- a/plugins/vault/_vault
+++ b/plugins/vault/_vault
@@ -53,7 +53,7 @@ mount_tune_args=(
 typeset -a mount_args
 mount_args=(
     $mount_tune_args
-    '(-path)-path=-[Mount point for the logical backend. This defauls to the type of the mount.]:path:'
+    '(-path)-path=-[Mount point for the logical backend. This defaults to the type of the mount.]:path:'
     '(-description)-description=-[Human-friendly description of the purpose for the mount. This shows up in the mounts command.]:description:'
 )
 
@@ -189,7 +189,7 @@ _vault_mounts() {
 }
 
 _vault_mount() {
-    # to find out how many types of backens are there
+    # to find out how many types of backends are there
     _arguments : \
         ${general_args[@]} \
         ${mount_args[@]} \
diff --git a/plugins/yarn/_yarn b/plugins/yarn/_yarn
index 70ed55929..9173eca20 100644
--- a/plugins/yarn/_yarn
+++ b/plugins/yarn/_yarn
@@ -157,7 +157,7 @@ _yarn() {
     '(--emoji)--no-emoji[disable emoji in output]' \
     '(--disable-pnp)'{--enable-pnp,--pnp}"[enable the Plug'n'Play installation]" \
     '--flat[only allow one version of a package]' \
-    '--focus[Focus on a single workspace by installing remote copies of its sibiling workspaces]' \
+    '--focus[Focus on a single workspace by installing remote copies of its sibling workspaces]' \
     '--force[install and build packages even if they were built before, overwrite lockfile]' \
     "--frozen-lockfile[don't generate a lockfile and fail if an update is needed]" \
     '--global-folder=[modules folder]:folder:_files -/' \
diff --git a/plugins/yum/yum.plugin.zsh b/plugins/yum/yum.plugin.zsh
index 69abfc4ce..d36571133 100644
--- a/plugins/yum/yum.plugin.zsh
+++ b/plugins/yum/yum.plugin.zsh
@@ -7,7 +7,7 @@ alias ygl="yum grouplist"                   # list package groups
 alias yli="yum list installed"              # print all installed packages
 alias ymc="yum makecache"                   # rebuilds the yum package list
 
-alias yu="sudo yum update"                  # upgrate packages
+alias yu="sudo yum update"                  # upgrade packages
 alias yi="sudo yum install"                 # install package
 alias ygi="sudo yum groupinstall"           # install package group
 alias yr="sudo yum remove"                  # remove package
diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme
index d6c417fc3..4f8be20d3 100644
--- a/themes/dallas.zsh-theme
+++ b/themes/dallas.zsh-theme
@@ -9,7 +9,7 @@ DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
 DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}\$(parse_git_dirty)"
 # Grab the current username: dallas
 DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}"
-# Use a % for normal users and a # for privelaged (root) users.
+# Use a % for normal users and a # for privileged (root) users.
 DALLAS_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}"
 # For the git prompt, use a white @ and blue text for the branch name
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg[blue]%}"
diff --git a/themes/essembeh.zsh-theme b/themes/essembeh.zsh-theme
index f34f36f8a..43d4093b1 100644
--- a/themes/essembeh.zsh-theme
+++ b/themes/essembeh.zsh-theme
@@ -39,7 +39,7 @@ 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
-	# also prefix prompt inside a docker contrainer
+	# also prefix prompt inside a docker container
 	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[docker]%{$reset_color%} "
 fi
 if [[ $UID = 0 ]]; then
diff --git a/themes/nicoulaj.zsh-theme b/themes/nicoulaj.zsh-theme
index 333aa5e70..685cd1ade 100644
--- a/themes/nicoulaj.zsh-theme
+++ b/themes/nicoulaj.zsh-theme
@@ -6,7 +6,7 @@
 #   * Only shows the path on the left prompt by default.
 #   * Crops the path to a defined length and only shows the path relative to
 #     the current VCS repository root.
-#   * Wears a different color wether the last command succeeded/failed.
+#   * Wears a different color whether the last command succeeded/failed.
 #   * Shows user@hostname if connected through SSH.
 #   * Shows if logged in as root or not.
 # ------------------------------------------------------------------------------

From aef393bdce523ed5e5754721965fab2da8080119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 1 Dec 2021 12:18:32 +0100
Subject: [PATCH 262/591] ci: add `check-spelling` GitHub Action

---
 .github/actions/spelling/README.md    | 15 +++++++++++++
 .github/actions/spelling/advice.md    | 27 +++++++++++++++++++++++
 .github/actions/spelling/allow.txt    |  0
 .github/actions/spelling/excludes.txt | 17 +++++++++++++++
 .github/actions/spelling/expect.txt   |  2 ++
 .github/actions/spelling/patterns.txt |  4 ++++
 .github/actions/spelling/reject.txt   |  6 ++++++
 .github/workflows/spelling.yml        | 31 +++++++++++++++++++++++++++
 8 files changed, 102 insertions(+)
 create mode 100644 .github/actions/spelling/README.md
 create mode 100644 .github/actions/spelling/advice.md
 create mode 100644 .github/actions/spelling/allow.txt
 create mode 100644 .github/actions/spelling/excludes.txt
 create mode 100644 .github/actions/spelling/expect.txt
 create mode 100644 .github/actions/spelling/patterns.txt
 create mode 100644 .github/actions/spelling/reject.txt
 create mode 100644 .github/workflows/spelling.yml

diff --git a/.github/actions/spelling/README.md b/.github/actions/spelling/README.md
new file mode 100644
index 000000000..1bd7d4412
--- /dev/null
+++ b/.github/actions/spelling/README.md
@@ -0,0 +1,15 @@
+# check-spelling/check-spelling configuration
+
+| File                             | Purpose                                                                          | Format                                                    | Info                                                                                                 |
+| -------------------------------- | -------------------------------------------------------------------------------- | --------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
+| [dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line                                         | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)         |
+| [allow.txt](allow.txt)           | Add words to the dictionary                                                      | one word per line (only letters and `'`s allowed)         | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)                   |
+| [reject.txt](reject.txt)         | Remove words from the dictionary (after allow)                                   | grep pattern matching whole dictionary words              | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)     |
+| [excludes.txt](excludes.txt)     | Files to ignore entirely                                                         | perl regular expression                                   | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes) |
+| [only.txt](only.txt)             | Only check matching files (applied after excludes)                               | perl regular expression                                   | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)         |
+| [patterns.txt](patterns.txt)     | Patterns to ignore from checked lines                                            | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns) |
+| [expect.txt](expect.txt)         | Expected words that aren't in the dictionary                                     | one word per line (sorted, alphabetically)                | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)                 |
+| [advice.md](advice.md)           | Supplement for GitHub comment when unrecognized words are found                  | GitHub Markdown                                           | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)     |
+
+Note: you can replace any of these files with a directory by the same name (minus the suffix)
+and then include multiple files inside that directory (with that suffix) to merge multiple files together.
diff --git a/.github/actions/spelling/advice.md b/.github/actions/spelling/advice.md
new file mode 100644
index 000000000..2a32b6520
--- /dev/null
+++ b/.github/actions/spelling/advice.md
@@ -0,0 +1,27 @@
+<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
+<details><summary>If you see a bunch of garbage</summary>
+
+If it relates to a ...
+<details><summary>well-formed pattern</summary>
+
+See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it.
+
+If not, try writing one and adding it to the `patterns.txt` file.
+
+Patterns are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
+
+Note that patterns can't match multiline strings.
+</details>
+<details><summary>binary-ish string</summary>
+
+Please add a file path to the `excludes.txt` file instead of just accepting the garbage.
+
+File paths are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
+
+`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
+../tree/HEAD/README.md) (on whichever branch you're using).
+</details>
+
+</details>
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
new file mode 100644
index 000000000..ce9f3b99a
--- /dev/null
+++ b/.github/actions/spelling/excludes.txt
@@ -0,0 +1,17 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
+(?:^|/)(?i)COPYRIGHT
+(?:^|/)(?i)LICEN[CS]E
+(?:^|/)package(?:-lock|)\.json$
+(?:^|/)vendor/
+ignore$
+\.avi$
+\.ico$
+\.jpe?g$
+\.lock$
+\.map$
+\.min\.
+\.mod$
+\.mp[34]$
+\.png$
+\.wav$
+^\.github/
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
new file mode 100644
index 000000000..d69fa3882
--- /dev/null
+++ b/.github/actions/spelling/expect.txt
@@ -0,0 +1,2 @@
+ohmyzsh
+oh-my-zsh
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
new file mode 100644
index 000000000..d39d09e97
--- /dev/null
+++ b/.github/actions/spelling/patterns.txt
@@ -0,0 +1,4 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b
diff --git a/.github/actions/spelling/reject.txt b/.github/actions/spelling/reject.txt
new file mode 100644
index 000000000..67e0ad79b
--- /dev/null
+++ b/.github/actions/spelling/reject.txt
@@ -0,0 +1,6 @@
+^attache$
+occurence
+Sorce
+^[Ss]pae
+^untill
+^wether
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
new file mode 100644
index 000000000..06a8b74c9
--- /dev/null
+++ b/.github/workflows/spelling.yml
@@ -0,0 +1,31 @@
+name: Spell checking
+on:
+  pull_request_target:
+  push:
+  issue_comment:
+    types: [created]
+
+jobs:
+  spelling:
+    name: Spell checking
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout-merge
+      if: "contains(github.event_name, 'pull_request')"
+      uses: actions/checkout@v2
+      with:
+        ref: refs/pull/${{github.event.pull_request.number}}/merge
+    - name: checkout
+      if: ${{ github.event_name == 'push' ||
+        (
+          contains(github.event.comment.body, '@check-spelling-bot apply')
+        ) }}
+      uses: actions/checkout@v2
+    - uses: check-spelling/check-spelling@main
+      id: spelling
+      if: ${{ github.event_name != 'issue_comment' ||
+        (
+          contains(github.event.comment.body, '@check-spelling-bot apply')
+        ) }}
+      with:
+        experimental_apply_changes_via_bot: 1

From e253661a9b3d8bba3acc90bc06c211f14ab8d587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 1 Dec 2021 12:25:58 +0100
Subject: [PATCH 263/591] Revert "ci: add `check-spelling` GitHub Action"

This reverts commit aef393bdce523ed5e5754721965fab2da8080119.
---
 .github/actions/spelling/README.md    | 15 -------------
 .github/actions/spelling/advice.md    | 27 -----------------------
 .github/actions/spelling/allow.txt    |  0
 .github/actions/spelling/excludes.txt | 17 ---------------
 .github/actions/spelling/expect.txt   |  2 --
 .github/actions/spelling/patterns.txt |  4 ----
 .github/actions/spelling/reject.txt   |  6 ------
 .github/workflows/spelling.yml        | 31 ---------------------------
 8 files changed, 102 deletions(-)
 delete mode 100644 .github/actions/spelling/README.md
 delete mode 100644 .github/actions/spelling/advice.md
 delete mode 100644 .github/actions/spelling/allow.txt
 delete mode 100644 .github/actions/spelling/excludes.txt
 delete mode 100644 .github/actions/spelling/expect.txt
 delete mode 100644 .github/actions/spelling/patterns.txt
 delete mode 100644 .github/actions/spelling/reject.txt
 delete mode 100644 .github/workflows/spelling.yml

diff --git a/.github/actions/spelling/README.md b/.github/actions/spelling/README.md
deleted file mode 100644
index 1bd7d4412..000000000
--- a/.github/actions/spelling/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# check-spelling/check-spelling configuration
-
-| File                             | Purpose                                                                          | Format                                                    | Info                                                                                                 |
-| -------------------------------- | -------------------------------------------------------------------------------- | --------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
-| [dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line                                         | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)         |
-| [allow.txt](allow.txt)           | Add words to the dictionary                                                      | one word per line (only letters and `'`s allowed)         | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)                   |
-| [reject.txt](reject.txt)         | Remove words from the dictionary (after allow)                                   | grep pattern matching whole dictionary words              | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)     |
-| [excludes.txt](excludes.txt)     | Files to ignore entirely                                                         | perl regular expression                                   | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes) |
-| [only.txt](only.txt)             | Only check matching files (applied after excludes)                               | perl regular expression                                   | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)         |
-| [patterns.txt](patterns.txt)     | Patterns to ignore from checked lines                                            | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns) |
-| [expect.txt](expect.txt)         | Expected words that aren't in the dictionary                                     | one word per line (sorted, alphabetically)                | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)                 |
-| [advice.md](advice.md)           | Supplement for GitHub comment when unrecognized words are found                  | GitHub Markdown                                           | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)     |
-
-Note: you can replace any of these files with a directory by the same name (minus the suffix)
-and then include multiple files inside that directory (with that suffix) to merge multiple files together.
diff --git a/.github/actions/spelling/advice.md b/.github/actions/spelling/advice.md
deleted file mode 100644
index 2a32b6520..000000000
--- a/.github/actions/spelling/advice.md
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
-<details><summary>If you see a bunch of garbage</summary>
-
-If it relates to a ...
-<details><summary>well-formed pattern</summary>
-
-See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it.
-
-If not, try writing one and adding it to the `patterns.txt` file.
-
-Patterns are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
-
-Note that patterns can't match multiline strings.
-</details>
-<details><summary>binary-ish string</summary>
-
-Please add a file path to the `excludes.txt` file instead of just accepting the garbage.
-
-File paths are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
-
-`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
-../tree/HEAD/README.md) (on whichever branch you're using).
-</details>
-
-</details>
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
deleted file mode 100644
index ce9f3b99a..000000000
--- a/.github/actions/spelling/excludes.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
-(?:^|/)(?i)COPYRIGHT
-(?:^|/)(?i)LICEN[CS]E
-(?:^|/)package(?:-lock|)\.json$
-(?:^|/)vendor/
-ignore$
-\.avi$
-\.ico$
-\.jpe?g$
-\.lock$
-\.map$
-\.min\.
-\.mod$
-\.mp[34]$
-\.png$
-\.wav$
-^\.github/
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
deleted file mode 100644
index d69fa3882..000000000
--- a/.github/actions/spelling/expect.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ohmyzsh
-oh-my-zsh
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
deleted file mode 100644
index d39d09e97..000000000
--- a/.github/actions/spelling/patterns.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
-
-# ignore long runs of a single character:
-\b([A-Za-z])\g{-1}{3,}\b
diff --git a/.github/actions/spelling/reject.txt b/.github/actions/spelling/reject.txt
deleted file mode 100644
index 67e0ad79b..000000000
--- a/.github/actions/spelling/reject.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-^attache$
-occurence
-Sorce
-^[Ss]pae
-^untill
-^wether
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
deleted file mode 100644
index 06a8b74c9..000000000
--- a/.github/workflows/spelling.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Spell checking
-on:
-  pull_request_target:
-  push:
-  issue_comment:
-    types: [created]
-
-jobs:
-  spelling:
-    name: Spell checking
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout-merge
-      if: "contains(github.event_name, 'pull_request')"
-      uses: actions/checkout@v2
-      with:
-        ref: refs/pull/${{github.event.pull_request.number}}/merge
-    - name: checkout
-      if: ${{ github.event_name == 'push' ||
-        (
-          contains(github.event.comment.body, '@check-spelling-bot apply')
-        ) }}
-      uses: actions/checkout@v2
-    - uses: check-spelling/check-spelling@main
-      id: spelling
-      if: ${{ github.event_name != 'issue_comment' ||
-        (
-          contains(github.event.comment.body, '@check-spelling-bot apply')
-        ) }}
-      with:
-        experimental_apply_changes_via_bot: 1

From c66fc00401a8d6a6bd6da39ec890dfdc0e6bd878 Mon Sep 17 00:00:00 2001
From: Nick Aldwin <Nick@Aldwin.us>
Date: Wed, 1 Dec 2021 06:44:15 -0500
Subject: [PATCH 264/591] feat(updater): show command to update when update
 skipped (#10465)

---
 tools/check_for_upgrade.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index b6625a395..293f48edf 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -160,7 +160,8 @@ function update_ohmyzsh() {
     [[ "$option" != $'\n' ]] && echo
     case "$option" in
       [yY$'\n']) update_ohmyzsh ;;
-      [nN]) update_last_updated_file ;;
+      [nN]) update_last_updated_file ;&
+      *) echo "[oh-my-zsh] You can update manually by running \`omz update\`" ;;
     esac
   fi
 }

From 46e63340eef243f25890e2178931919125c58aae Mon Sep 17 00:00:00 2001
From: whoami <atommixz@gmail.com>
Date: Wed, 1 Dec 2021 19:49:42 +0300
Subject: [PATCH 265/591] feat(branch): show mercurial bookmarks if used
 (#9948)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/branch/README.md         | 48 +++++++++++++++++++++-----------
 plugins/branch/branch.plugin.zsh | 44 ++++++++++++++++-------------
 2 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/plugins/branch/README.md b/plugins/branch/README.md
index 56ab8da4b..a15dd22df 100644
--- a/plugins/branch/README.md
+++ b/plugins/branch/README.md
@@ -1,31 +1,47 @@
-# Branch
+# Branch plugin
 
-Displays the current Git or Mercurial branch fast.
+This plugin displays the current Git or Mercurial branch, fast. If in a Mercurial repository,
+also display the current bookmark, if present.
+
+To use it, add `branch` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... branch)
+```
 
 ## Speed test
 
-### Mercurial
+- `hg branch`:
 
-```shell
-$ time hg branch
-0.11s user 0.14s system 70% cpu 0.355 total
-```
+  ```console
+  $ time hg branch
+  0.11s user 0.14s system 70% cpu 0.355 total
+  ```
 
-### Branch plugin
+- branch plugin:
 
-```shell
-$ time zsh /tmp/branch_prompt_info_test.zsh
-0.00s user 0.01s system 78% cpu 0.014 total
-```
+  ```console
+  $ time zsh /tmp/branch_prompt_info_test.zsh
+  0.00s user 0.01s system 78% cpu 0.014 total
+  ```
 
 ## Usage
 
-Edit your theme file (eg.: `~/.oh-my-zsh/theme/robbyrussell.zsh-theme`)
-adding `$(branch_prompt_info)` in your prompt like this:
+Copy your theme to `$ZSH_CUSTOM/themes/` and modify it to add `$(branch_prompt_info)` in your prompt.
+This example is for the `robbyrussell` theme:
 
 ```diff
-- PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
-+ PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)$(branch_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell.zsh-theme
+index 2fd5f2cd..9d89a464 100644
+--- a/themes/robbyrussell.zsh-theme
++++ b/themes/robbyrussell.zsh-theme
+@@ -1,5 +1,5 @@
+ 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%} "
 ```
 
 ## Maintainer
diff --git a/plugins/branch/branch.plugin.zsh b/plugins/branch/branch.plugin.zsh
index 2e5659bdf..dd5871fdc 100644
--- a/plugins/branch/branch.plugin.zsh
+++ b/plugins/branch/branch.plugin.zsh
@@ -3,29 +3,33 @@
 # Oct 2, 2015
 
 function branch_prompt_info() {
-  # Defines path as current directory
-  local current_dir=$PWD
-  # While current path is not root path
-  while [[ $current_dir != '/' ]]
-  do
-    # Git repository
-    if [[ -d "${current_dir}/.git" ]]
-    then
-      echo '±' ${"$(<"$current_dir/.git/HEAD")"##*/}
-      return;
+  # Start checking in current working directory
+  local branch="" dir="$PWD"
+  while [[ "$dir" != '/' ]]; do
+    # Found .git directory
+    if [[ -d "${dir}/.git" ]]; then
+      branch="${"$(<"${dir}/.git/HEAD")"##*/}"
+      echo '±' "${branch:gs/%/%%}"
+      return
     fi
-    # Mercurial repository
-    if [[ -d "${current_dir}/.hg" ]]
-    then
-      if [[ -f "$current_dir/.hg/branch" ]]
-      then
-        echo '☿' $(<"$current_dir/.hg/branch")
+
+    # Found .hg directory
+    if [[ -d "${dir}/.hg" ]]; then
+      if [[ -f "${dir}/.hg/branch" ]]; then
+        branch="$(<"${dir}/.hg/branch")"
       else
-        echo '☿ default'
+        branch="default"
       fi
-      return;
+
+      if [[ -f "${dir}/.hg/bookmarks.current" ]]; then
+        branch="${branch}/$(<"${dir}/.hg/bookmarks.current")"
+      fi
+
+      echo '☿' "${branch:gs/%/%%}"
+      return
     fi
-    # Defines path as parent directory and keeps looking for :)
-    current_dir="${current_dir:h}"
+
+    # Check parent directory
+    dir="${dir:h}"
   done
 }

From 841f3cb0bb7663fa1062ffc59acb7b4581dc1d0f Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 2 Dec 2021 06:17:00 -0500
Subject: [PATCH 266/591] ci: add `check-spelling` action (#10470)

Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
---
 .github/actions/spelling/README.md    |   15 +
 .github/actions/spelling/advice.md    |   25 +
 .github/actions/spelling/allow.txt    |    0
 .github/actions/spelling/excludes.txt |   41 +
 .github/actions/spelling/expect.txt   | 4489 +++++++++++++++++++++++++
 .github/actions/spelling/patterns.txt |   73 +
 .github/actions/spelling/reject.txt   |    7 +
 .github/workflows/spelling.yml        |   95 +
 8 files changed, 4745 insertions(+)
 create mode 100644 .github/actions/spelling/README.md
 create mode 100644 .github/actions/spelling/advice.md
 create mode 100644 .github/actions/spelling/allow.txt
 create mode 100644 .github/actions/spelling/excludes.txt
 create mode 100644 .github/actions/spelling/expect.txt
 create mode 100644 .github/actions/spelling/patterns.txt
 create mode 100644 .github/actions/spelling/reject.txt
 create mode 100644 .github/workflows/spelling.yml

diff --git a/.github/actions/spelling/README.md b/.github/actions/spelling/README.md
new file mode 100644
index 000000000..dcd237ba2
--- /dev/null
+++ b/.github/actions/spelling/README.md
@@ -0,0 +1,15 @@
+# check-spelling/check-spelling configuration
+
+File | Purpose | Format | Info
+-|-|-|-
+[dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)
+[allow.txt](allow.txt) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
+[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
+[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
+[only.txt](only.txt) | Only check matching files (applied after excludes) | perl regular expression | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)
+[patterns.txt](patterns.txt) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
+[expect.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
+[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
+
+Note: you can replace any of these files with a directory by the same name (minus the suffix)
+and then include multiple files inside that directory (with that suffix) to merge multiple files together.
diff --git a/.github/actions/spelling/advice.md b/.github/actions/spelling/advice.md
new file mode 100644
index 000000000..c83423a8e
--- /dev/null
+++ b/.github/actions/spelling/advice.md
@@ -0,0 +1,25 @@
+<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
+<details><summary>If the flagged items do not appear to be text</summary>
+
+If items relate to a ...
+* well-formed pattern.
+
+  If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it,
+  try adding it to the `patterns.txt` file.
+
+  Patterns are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
+
+  Note that patterns can't match multiline strings.
+
+* binary file.
+
+  Please add a file path to the `excludes.txt` file matching the containing file.
+
+  File paths are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
+
+  `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
+../tree/HEAD/README.md) (on whichever branch you're using).
+
+</details>
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
new file mode 100644
index 000000000..f1cfeefbb
--- /dev/null
+++ b/.github/actions/spelling/excludes.txt
@@ -0,0 +1,41 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
+(?:^|/)(?i)COPYRIGHT
+(?:^|/)(?i)LICEN[CS]E
+(?:^|/)package(?:-lock|)\.json$
+(?:^|/)vendor/
+ignore$
+\.avi$
+\.ico$
+\.jpe?g$
+\.lock$
+\.map$
+\.min\..
+\.mod$
+\.mp[34]$
+\.png$
+\.wav$
+^\.github/
+^\Qplugins/archlinux/archlinux.plugin.zsh\E$
+^\Qplugins/cp/cp.plugin.zsh\E$
+^\Qplugins/extract/_extract\E$
+^\Qplugins/genpass/genpass.plugin.zsh\E$
+^\Qplugins/gitignore/gitignore.plugin.zsh\E$
+^\Qplugins/gnu-utils/gnu-utils.plugin.zsh\E$
+^\Qplugins/hitchhiker/fortunes/hitchhiker\E$
+^\Qplugins/jhbuild/jhbuild.plugin.zsh\E$
+^\Qplugins/jhbuild/README.md\E$
+^\Qplugins/jruby/jruby.plugin.zsh\E$
+^\Qplugins/kubectl/kubectl.plugin.zsh\E$
+^\Qplugins/lol/lol.plugin.zsh\E$
+^\Qplugins/mosh/mosh.plugin.zsh\E$
+^\Qplugins/npx/npx.plugin.zsh\E$
+^\Qplugins/powder/_powder\E$
+^\Qplugins/suse/suse.plugin.zsh\E$
+^\Qplugins/thor/_thor\E$
+^\Qplugins/universalarchive/_universalarchive\E$
+^\Qplugins/vagrant/vagrant.plugin.zsh\E$
+^\Qplugins/wp-cli/README.md\E$
+^\Qplugins/wp-cli/wp-cli.plugin.zsh\E$
+^\Qthemes/clean.zsh-theme\E$
+^\Qthemes/philips.zsh-theme\E$
+^\Qthemes/tonotdo.zsh-theme\E$
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
new file mode 100644
index 000000000..fc764f57a
--- /dev/null
+++ b/.github/actions/spelling/expect.txt
@@ -0,0 +1,4489 @@
+AAAAC
+aac
+aar
+abcdefghjkmnpqrstvwxyz
+ABRT
+absorbgitdirs
+abspath
+abtvfr
+acceptorthreads
+accessip
+ACDIM
+acking
+ackmate
+ackup
+ACLs
+acon
+aconf
+acp
+acpi
+acpitool
+acr
+acroread
+acs
+acsc
+acsp
+actionformats
+Adamantium
+adb
+adbd
+adben
+addgroups
+addhistory
+addon
+addprincipals
+addrport
+addrs
+addusergroups
+addwin
+adelcampo
+adg
+ADK
+adminalias
+adminport
+Admins
+adoc
+adu
+aeiouy
+afh
+afind
+afmagic
+afs
+afu
+agb
+agc
+agd
+agentpath
+agi
+agignore
+agli
+aglu
+agnoster
+agp
+agrimaldi
+ags
+agu
+agud
+agug
+aguu
+AHg
+ainv
+aip
+Airbender
+ajp
+ajs
+Akinori
+akoenig
+alacritty
+albers
+alberto
+alertmanager
+alex
+alexandre
+aliasfiletype
+aliaspassword
+allexport
+alloc
+allocstatus
+allownoncomponentcallers
+allpkgs
+alnum
+ALRM
+altchar
+Altoid
+alwayz
+amanda
+amazonaws
+amazonec
+ambyj
+amd
+amqp
+AMRD
+anche
+andi
+andrewrdwyer
+angularjs
+anley
+anlp
+annots
+anonymize
+anotherfolder
+ansible
+antrun
+anycommand
+apexcodefile
+apextests
+api
+apidocs
+apiversion
+apjanke
+apk
+apklib
+aplaybook
+appid
+applica
+applist
+appname
+apps
+appup
+aps
+apull
+arachnophobia
+araxis
+ARCHFLAGS
+archimport
+archlinux
+arci
+arcizan
+ard
+ardc
+ardnu
+ardnupc
+ardp
+ardpc
+ARGC
+args
+argset
+argslist
+argu
+argv
+ARGZERO
+arh
+arinit
+arl
+arli
+arpa
+arquillian
+artifactory
+asadmin
+asc
+asciicast
+asciidoc
+asciidoctor
+asciinema
+asdeps
+asdf
+askpass
+asm
+asmo
+asrc
+assem
+associatewiththread
+ASTs
+asyncreplication
+atlassian
+attr
+ATTRIBUTENAME
+aufs
+auin
+auinsd
+auloc
+auls
+aulst
+aumir
+auown
+auownloc
+auownls
+aur
+aure
+aurem
+aurep
+aurinsd
+aurph
+aurrep
+authmethods
+authorizationdb
+authpriv
+authrealmname
+authz
+autoapplyenabled
+autoclean
+autocomplete
+autocompleted
+autocompletion
+AUTOCONNECT
+autocrlf
+autodetermine
+autodie
+autoenv
+autohadboverride
+autoipd
+autojump
+autoload
+autolock
+autolocking
+autopep
+AUTOQUIT
+autoreload
+autoreloading
+autoremove
+autorun
+autoscale
+autoscaling
+autoselect
+autoshortened
+autosquash
+autostart
+autostash
+autoupdate
+auupd
+auupg
+availabilityenabled
+avh
+avi
+AVIT
+avivrosenberg
+avneet
+avz
+avzu
+aws
+awscli
+awslogs
+babakks
+backend
+backendconfig
+backtick
+backupconfig
+backupdir
+backupfile
+backuptheme
+bactrian
+baidu
+bamshuf
+bamtobed
+bamtofastq
+Barsi
+Basecamp
+basedir
+basedn
+basefile
+baseurl
+basevmdk
+bashcompinit
+bashdefault
+bashrc
+batchid
+baz
+bazel
+bazelbuild
+bbd
+bbdiff
+bbedit
+BBM
+bbpb
+bcc
+bcdfghjklmnpqrstvwxz
+bck
+bcn
+bcubc
+bcubo
+beaglidx
+becc
+bedcov
+BEDGRAPH
+BEDPE
+bedpetobam
+bedtobam
+bedtools
+Belarus
+bem
+benchmarker
+benchmem
+benchtime
+bento
+benwilcock
+berks
+Bertinelli
+bgnotify
+bgrewriteeaof
+bgsave
+binarynights
+bindaddress
+binded
+bindir
+bindkey
+binpack
+binstub
+bintray
+bip
+bira
+bisd
+bitboxer
+bitbucket
+bitswap
+blkio
+blockprofile
+blockprofilerate
+blod
+blog
+blogger
+blogspot
+blpop
+bluebox
+Bluetooth
+bobwilliams
+bodycc
+Bonetti
+bookmarked
+booknames
+bootclasspath
+bootscript
+bootsnipp
+borland
+borrowck
+Boudreau
+Boushh
+Bouvet
+BPtmux
+bpython
+bqr
+brainstormr
+Brainville
+branchformat
+branchname
+branchrefs
+brewp
+brewsp
+briancarper
+bringz
+Broadcom
+Brodersen
+brpop
+brpoplpush
+btannous
+btih
+btn
+btrestart
+btrfs
+btw
+bubc
+bubu
+buf
+buffersizebytes
+buflines
+bugfix
+bugfixes
+bugreport
+bugsnag
+Buildfile
+buildinstance
+buildnumber
+buildpackage
+buildpacks
+buildscript
+builtins
+bundlephobia
+bunzip
+Burkina
+Busybox
+bwaht
+Bxegedabagacad
+bypjyp
+bytebuffertype
+bytecode
+bytewise
+byznis
+bzip
+bzr
+cabextract
+CACERT
+cacertfile
+cacheinfo
+cachename
+caiifr
+Cakefile
+cakephp
+callvim
+calmd
+calways
+caname
+caniuse
+cano
+capath
+Capfile
+capify
+capistrano
+capistranorb
+capit
+CARETCOLOR
+caserta
+Caskroom
+catimg
+catserver
+catspeak
+cbr
+ccat
+cccmd
+ccflags
+ccl
+ccomp
+ccp
+cdargs
+cdcmd
+cdo
+CDPATH
+cdu
+cdx
+cdylib
+cecho
+cehlrtx
+celerybeat
+celeryev
+celerymon
+celeryproject
+Celso
+celsomiranda
+certfile
+certname
+certs
+cfa
+cfap
+cfbpk
+cfbs
+cfc
+cfdel
+cfdm
+cfdor
+cfds
+cfe
+cfev
+cfg
+cfgfile
+cfhu
+cfl
+cflg
+cflr
+cfp
+cfpc
+cfpm
+cfr
+cfsc
+cfsh
+cfsp
+cfsrt
+cfsrtall
+cfstg
+cfstp
+cfstpall
+cft
+cfup
+cfus
+cget
+cgi
+cgit
+cgr
+cgrm
+cgroup
+cgroupns
+cgu
+changelog
+changepassword
+changeset
+charmap
+charset
+chaselinks
+chcid
+chdir
+cheatsheet
+checkin
+checkinit
+checkonly
+checkports
+checkstyle
+cheeseshops
+Chesal
+chiark
+childlogdir
+chlrtx
+chmod
+chown
+chpwd
+chroot
+chruby
+chrubydirs
+chsh
+chucknorris
+chucknorrisfacts
+Chucktatorship
+Chucktober
+chunker
+cidfile
+cidr
+CIDs
+cidv
+ciici
+cim
+cirw
+citool
+civis
+cjk
+clamav
+classfile
+classloaders
+classloading
+classmap
+classname
+classpath
+CLDR
+cleardump
+cless
+CLICOLOR
+clientauthenabled
+clientid
+clipcmd
+clipcopy
+clippaste
+Clipperton
+clj
+Clojure
+closelim
+cloudfoundry
+cloudproviders
+CLOUDSDK
+clrz
+clustertype
+cmdargs
+cmdline
+cmds
+Cmp
+CMR
+cms
+cmt
+cnorm
+cobertura
+cocoapods
+codebase
+codeclimate
+codecompare
+codecoverage
+codegen
+codepen
+coderwall
+CODESET
+codium
+coffeescript
+colemak
+Colindres
+collectstatic
+colorbool
+colorcoded
+colorcoding
+colorify
+colorized
+colorls
+colorpair
+colorset
+colorspec
+colourised
+Colouriser
+colsearch
+COMMANDLINE
+commandlinefu
+committerdate
+Comoros
+compadd
+comparguments
+compassdoc
+compaudit
+compbiome
+compcall
+compctl
+compdef
+compdescribe
+compdump
+compfiles
+compfix
+compgen
+compgroups
+compilemessages
+compinit
+compl
+completemarks
+completionsdir
+complist
+componentname
+compopt
+compquote
+COMPREPLY
+COMPRESSSPARSESTATE
+compset
+compstate
+comptags
+comptry
+compvalues
+CONDA
+CONFG
+config
+configfile
+confighelp
+configmap
+configstoretype
+connectiondefinition
+connectionpoolid
+conssec
+Consts
+contacto
+containerd
+contenttype
+contextinitialization
+contextroot
+contoroll
+contreras
+controlargs
+conventionalcommits
+COOKBOOKNAME
+cookbookversion
+coproc
+copybuffer
+copydir
+copyfile
+copypaste
+copypasteable
+cordova
+coreutil
+cors
+cowsay
+cowthink
+cpan
+cpanm
+cpanminus
+cpantesters
+cpio
+cpp
+cprint
+cprof
+cpuprofile
+cpuset
+cpv
+createcachetable
+createdlastdays
+createsuperuser
+createtables
+creationretryattempts
+creationretryinterval
+cription
+crlf
+crm
+crockford
+cron
+cronjob
+crt
+cseuckr
+cseucpkdfmtjapanese
+csh
+csibm
+csiso
+csisolatin
+cskoi
+csksc
+css
+cssflow
+cssh
+csshiftjis
+csu
+csv
+csvfile
+ctag
+ctl
+ctlseqs
+ctx
+ctype
+culater
+Cunha
+curcontext
+curdir
+curhistsize
+curkeyword
+curpath
+currentartist
+currentdir
+currenttrack
+cursored
+curtheme
+Customisation
+CUTBUFFER
+cvccvc
+cvf
+cvhs
+cvjf
+cvs
+cvsexportcommit
+cvsimport
+cvsserver
+cvvis
+cvzf
+cwd
+cword
+cxx
+cya
+cycledleft
+cycledright
+cygpath
+cygstart
+cygwin
+cygwyn
+czf
+daemonize
+daemonized
+daemonizing
+daemonset
+dalias
+dango
+danielcsgomes
+darcs
+dartdoc
+dartlang
+dashdoc
+DATABAGNAME
+datafieldenc
+datasift
+datasourceclassname
+datastore
+datestamp
+datetime
+daylerees
+dbbolton
+dbconsole
+dbfile
+dbhome
+dbhost
+dbport
+dbshell
+dbsize
+dburl
+dbus
+dbuser
+dbvendor
+dbvendorname
+dccmd
+dcdn
+dce
+dck
+dcl
+dclf
+dco
+dcom
+dcommit
+dcps
+dcpull
+dcr
+dcrestart
+dcrm
+dcstart
+dcstop
+dcup
+dcupb
+dcupd
+ddg
+ddl
+deadwyler
+debian
+debman
+debuginfo
+debuglevel
+decr
+decrby
+DECSCUSR
+defaultleasettl
+defaultpackagedir
+Defaultsfdx
+defaultvs
+defaultwebmodule
+definitionfile
+definitionjson
+deinit
+deinstall
+delwin
+denable
+deno
+dependencyfile
+deploydir
+deployers
+deploymentplan
+deps
+depthfrom
+dequote
+dequoted
+deref
+derek
+descr
+dest
+DESTDIR
+destroot
+desttype
+devcenter
+devdocs
+devfolder
+devicehost
+devicemapper
+deviceport
+devlog
+devops
+devpath
+dfa
+dffx
+dflt
+dfmt
+dfs
+dhcp
+dhcpd
+dhcpip
+dht
+dhtrc
+dhtt
+diagdump
+didexit
+diffcore
+diffmerge
+diffs
+diffsettings
+difftool
+digitalocean
+diiirrrty
+dijcaf
+dircolors
+dircycle
+direnv
+dirhistory
+dirname
+dirpath
+dirpersist
+dirs
+dirstack
+DIRSTACKSIZE
+dirstat
+dirver
+disablemasking
+disksize
+diskutil
+displayconfiguration
+displayname
+distcache
+distcheck
+distclean
+distro
+dists
+django
+djangojs
+djangoproject
+djangopypi
+djview
+djvu
+dli
+dlist
+dls
+dman
+dmatching
+dmesg
+dmg
+dna
+dnf
+dnfc
+dnfgi
+dnfgl
+dnfgr
+dnfi
+dnfl
+dnfli
+dnfmc
+dnfp
+dnfr
+dnfu
+dng
+dnote
+dns
+dnsmasq
+dnsrr
+doap
+docck
+dockerd
+dockerdaemon
+dockerenv
+Dockerfile
+dockerport
+dockersearch
+docopt
+docset
+docstring
+doctl
+doctorjellyface
+dogenpunk
+doitclient
+domaindir
+domainname
+domainproperties
+domterm
+Donenfeld
+dongweiming
+donotwant
+dopts
+dotall
+dotenv
+dotest
+dotfile
+dotnet
+doubledash
+doublequotes
+dowant
+dpkg
+drca
+drcb
+drcg
+drcj
+drcm
+drcml
+drcr
+drct
+drcv
+drdmp
+dren
+dreurmail
+drf
+drfi
+drfr
+drfra
+drfu
+Driessen
+drif
+dris
+driverclassname
+drn
+drnew
+droid
+dropandcreatetables
+dropindexes
+droplr
+dropreplace
+droptables
+drpm
+drpu
+drst
+drup
+drush
+drushrc
+drv
+drvd
+drvg
+drw
+dsa
+dselect
+dsl
+dssh
+dst
+dsupport
+Dtest
+dtrace
+dts
+duckduckgo
+duf
+dumpconfig
+dumpdata
+dumpfiles
+duplessis
+durationdays
+durrheimer
+dutchcoders
+dvd
+dvi
+dwim
+dwr
+dylib
+eal
+eastermonday
+eauth
+ebuild
+ecd
+ecdsa
+echotc
+echoti
+ecma
+ecmerge
+ecosia
+ecto
+editorcmd
+edu
+eecms
+eed
+eeval
+efforted
+efile
+eframe
+egrep
+ein
+Eisentraut
+ejb
+ekzsh
+Eley
+ELGNRCIS
+elidable
+elif
+elim
+elisp
+elllen
+elot
+emacs
+emacsclient
+emacsfun
+emacswiki
+emails
+emberjs
+Emelianenko
+emoji
+emotty
+enablesnoop
+enacs
+endswith
+ent
+entrypoint
+enum
+envsubst
+envvar
+enwom
+eocw
+EOH
+eol
+eoq
+eow
+eoww
+eoy
+EPOCHREALTIME
+epochseconds
+eprof
+eread
+erl
+errlog
+Errored
+esac
+escripts
+essembeh
+etcd
+ethanschoonover
+ets
+etwlogs
+euc
+EUID
+EULAs
+eunit
+evals
+evalstatus
+evan
+eventlet
+eventname
+Evernote
+Evt
+exe
+executables
+execv
+exfxcxdxbxbxbxbxbxbxbx
+exfxcxdxbxegedabagacad
+existentials
+exitcode
+exoscale
+expandvars
+expaning
+expireat
+expl
+explaintypes
+explicitouter
+expn
+expr
+exps
+exs
+extcmd
+extdirs
+extendedglob
+externalid
+extmethods
+fabfile
+facebook
+factoryclass
+faidx
+failconnection
+failfast
+failurefatal
+fakeroot
+faqs
+fargs
+Faroe
+fasd
+FASTA
+fastcgi
+fastfile
+fastprint
+FASTQ
+favlist
+fbterm
+fcap
+Fcart
+fcgi
+Fcrt
+fcss
+fdfind
+fdlimit
+feditor
+fedoraproject
+felipe
+felixr
+ffls
+ffp
+ffrm
+ffsync
+fghijk
+fgrep
+Fiala
+fieldlist
+Filemode
+filepath
+filesize
+filestore
+filesystem
+filetype
+filevaultmaster
+FILLBAR
+filtername
+findpeer
+findprovs
+finetune
+firefox
+firewalld
+firewalls
+firstline
+fishshell
+fitzpatrick
+fixmate
+fixme
+fixperms
+FIXTERM
+fizsh
+fjs
+flagstat
+flatlist
+flattach
+flc
+fldoc
+flget
+flickr
+flowgraph
+flowtype
+flr
+fluentd
+flup
+flushall
+flushdb
+flv
+fnd
+fnm
+fns
+Fnv
+Folgers
+fontello
+foodcritic
+foqtam
+forall
+forceoverwrite
+forceupgrade
+foreach
+forrest
+fortunecity
+forw
+fosmid
+fotqoh
+fpath
+fprof
+fqn
+framep
+frecency
+frecent
+freebsd
+freenode
+freqs
+fri
+Friesel
+fromaddress
+frontend
+frontmost
+fsc
+fscache
+fsck
+fsl
+fsmonitor
+FSsh
+fstgpy
+ftp
+fts
+fucnul
+func
+funcsourcetrace
+functrace
+funtoo
+Futuna
+futuret
+fwl
+fwp
+fwr
+fwrp
+fzf
+fzfdirs
+gaa
+gallifrey
+gamc
+Gamera
+gamscp
+gapt
+gasconfig
+Gatorade
+gatsbyjs
+gav
+gba
+gbd
+gbda
+gbk
+gbl
+gbnm
+gbr
+gbs
+gbsb
+gbsg
+gbsr
+gca
+gcam
+gcan
+gcasm
+gcb
+gcc
+gccd
+gccgo
+gccgoflags
+gcf
+gcflags
+gch
+gcl
+gclean
+gcloud
+gcm
+gcmsg
+gcn
+gco
+gcor
+gcount
+gcp
+gcpa
+gcpc
+gcplogs
+gcr
+gcs
+gcsm
+gcssm
+gdc
+gdca
+gdct
+gdcw
+gdd
+gdm
+gdnolock
+gdt
+gdup
+gdv
+gdw
+geca
+gecb
+gecho
+geclup
+gecr
+geeknote
+gegi
+geh
+gei
+geiall
+gelcyv
+gelf
+geli
+gemb
+gemfile
+gemoji
+gemp
+gemset
+gemspec
+gemy
+generatekey
+generatermistubs
+genomecov
+genpass
+genpaths
+genzshcomp
+geoe
+geoff
+geoffgarside
+getattr
+getbit
+getcomposer
+getdir
+geteip
+getenv
+getfasta
+getgb
+getip
+getline
+getln
+getopt
+getrange
+getset
+gettext
+geun
+gevent
+Geza
+gezalore
+gfa
+gfg
+gfl
+gflf
+gflff
+gflfp
+gflfpll
+gflh
+gflhf
+gflhp
+gfli
+gflr
+gflrf
+gflrp
+gfo
+gga
+ggf
+ggfl
+ggl
+ggp
+ggpnp
+ggpull
+ggpur
+ggpush
+ggsup
+ggu
+ghci
+ghf
+ghff
+ghfh
+ghfr
+ghfu
+ghh
+ghostrevery
+gignore
+gignored
+gimmeh
+giobi
+gistcomment
+gitbranch
+gitbranchsize
+gitcomp
+gitcompadd
+gitcompappend
+gitcompletion
+gitdir
+gitex
+gitfast
+gitflow
+github
+gitignore
+gitinfo
+gitk
+gitmodules
+gitpod
+GITSS
+gitstatus
+gitstring
+gitweb
+givero
+gke
+gkrellmd
+glfsi
+glfsls
+glfsmi
+glfst
+glg
+glgg
+glgga
+glgm
+glgp
+glidenote
+glo
+globalias
+globals
+globbing
+globsubst
+glods
+glog
+gloga
+glol
+glola
+glp
+gls
+gma
+gmail
+gmom
+gmtl
+gmtlvim
+gmum
+Gneat
+Gniazdowski
+gnore
+gnupg
+goc
+godoc
+Godzilla
+gof
+gofa
+gofmt
+goga
+Gohr
+golang
+gom
+GOMAXPROCS
+Gomes
+Gonz
+goodreads
+google
+googlecode
+gop
+gopath
+gopb
+GOROOT
+goroutine
+gota
+gpf
+gpg
+gpgconf
+gplfs
+GPLv
+gpoat
+gpr
+gpristine
+gpsup
+gpu
+gpv
+gradle
+gradlew
+graphviz
+grb
+grba
+grbc
+grbd
+grbi
+grbm
+grbo
+grbom
+grc
+greenend
+greer
+grename
+grep
+grepping
+grev
+grh
+grhh
+GRIMALDI
+grk
+Grlm
+grm
+grmc
+grml
+grmv
+groh
+grok
+Grosenbach
+groupby
+groupinstall
+grouplist
+groupremove
+groupsmap
+growlnotify
+grrm
+grset
+grss
+grst
+grt
+gru
+gruntfile
+grup
+grv
+gsb
+gsd
+gsemet
+gsh
+gsi
+gsps
+gsr
+gss
+gst
+gsta
+gstaa
+gstall
+gstc
+gstd
+gstl
+gstp
+gstu
+gsu
+gsub
+gsw
+gswc
+gswd
+gswm
+gtb
+gtfo
+gtl
+gts
+gtv
+gua
+Guake
+Guerci
+gui
+guidovansteen
+guitool
+gulpfile
+gulpjs
+gunignore
+gunwip
+gunzip
+gupa
+gupav
+gupv
+gvim
+gvimdiff
+gwc
+gwch
+gwip
+gwt
+Gxfxcxdxbxegedabagacad
+gxvx
+gyazo
+Gyver
+gzip
+Hackage
+Hacktoberfest
+hackzor
+hacluster
+hadouken
+hai
+haldaemon
+Halis
+Hamelink
+hammertest
+hanami
+hanamirb
+har
+hardcoded
+hardlinks
+hardstatus
+harishnarayanan
+hashh
+Hashicorp
+haskell
+haskellstack
+Hasklig
+hawaga
+hax
+HBAR
+hbm
+Hcode
+hda
+hdc
+hdd
+hdel
+hdp
+hdrs
+hdtp
+hdv
+hea
+healthcheck
+healthcheckerinterval
+healthcheckertimeout
+healthcheckerurl
+heduled
+heg
+Helens
+helpmojo
+heroku
+hexdocs
+hexdump
+hexists
+hga
+hgb
+hgba
+hgbk
+hgc
+hgca
+hgchangeset
+hgco
+hgd
+hged
+hget
+hgetall
+hgi
+hgic
+hgl
+hglg
+hglgp
+hglr
+hgm
+hgo
+hgoc
+hgp
+hgrc
+hgrep
+hgs
+hgsl
+hgun
+hhatto
+hhh
+hidefiles
+highlighter
+hincrby
+HISTCMD
+HISTFILE
+HISTNO
+historywords
+histsize
+histsubstrsrch
+hitokoto
+hkeys
+hkscs
+hlen
+hmget
+hmset
+Hocevar
+hocho
+hoeg
+Homeboy
+homepage
+hostip
+hostname
+hostpath
+hotfix
+hotfixes
+hotlist
+hotpink
+howto
+howtorun
+hpodder
+href
+hrg
+hscolour
+hscroll
+hset
+hsetnx
+hsi
+hsp
+hsqldb
+htm
+html
+htmlsingle
+htop
+htslib
+HTT
+http
+httpd
+httpie
+httplisteners
+httpparams
+httpsrouting
+httpstatus
+hubflow
+hukkan
+humza
+huyy
+hvals
+hyperlink
+hypermedia
+hyperv
+hypervisor
+iam
+ian
+ianchesal
+ibest
+icanhas
+icanhazip
+icba
+icbi
+icc
+icode
+icpaa
+icpai
+icpra
+icpri
+icra
+icri
+icrosoft
+icrsa
+icrsi
+idlekeytimeoutseconds
+idletimeout
+idmv
+idx
+idxstats
+ietf
+ifargs
+ifconfig
+iflist
+iglob
+ignoredescriptoritem
+ignoreerrors
+ignorenonexistent
+ignorewarnings
+igv
+ihasbucket
+iiop
+iiopport
+ilikenwf
+ilkka
+ima
+imageshack
+imap
+imatch
+imatches
+img
+imgur
+iminurbase
+imnp
+imonit
+impl
+implicits
+importpath
+inbox
+incrby
+indexopts
+inet
+infocmp
+ini
+initsql
+inkytonik
+inl
+inliner
+inlining
+inplace
+inprogress
+Inproper
+inputenc
+inr
+insecureskipverify
+insns
+inspectdb
+inspr
+instagram
+Installable
+installationkey
+installationkeybypass
+installdeps
+installdir
+installsuffix
+instancealias
+instanceport
+instanceurl
+instaweb
+instrs
+integ
+Intellij
+interactivecomments
+interdiff
+interfacename
+interoperability
+interp
+Intf
+inur
+invicem
+iojs
+iokit
+ionescu
+ionicframework
+iops
+ioreg
+ipa
+ipaddr
+ipam
+ipamdriver
+ipapp
+ipc
+ipcidr
+ipe
+ipfs
+ipld
+ipns
+IPREFIX
+ipsw
+iptables
+ipv
+ipython
+irb
+irc
+IRTY
+isconnectvalidatereq
+isdefaultprovider
+isdeleted
+isearch
+isfile
+isisolationguaranteed
+isodate
+isodatesec
+isolationlevel
+isredeploy
+istio
+ISUFFIX
+isundeploy
+iterm
+itertools
+itunes
+ivan
+Ivoire
+ixfuk
+izakaya
+ize
+jacc
+jaccard
+jaddr
+jaischeema
+jakefile
+jakejs
+Janke
+japvyz
+jarfile
+JARIN
+jarsigner
+javabootclasspath
+javac
+javadoc
+javaextdirs
+javamail
+javap
+javascript
+javax
+jbm
+jboss
+jcon
+jdbc
+jdc
+jdcds
+jde
+jdeps
+JDK
+jdkinternals
+jdl
+jdlr
+jdm
+jdmds
+jdwp
+jeb
+jecdyq
+ject
+Jedis
+jeffmhubbard
+jenv
+jenvdir
+jepgad
+jerryling
+jestjs
+jex
+jexec
+jfrog
+jgitflow
+jgpagent
+jid
+jimhester
+jimweirich
+jira
+jis
+jisse
+jkc
+jkenabled
+JLine
+jlist
+jmc
+jmsdbpassword
+jmsdest
+jmx
+jndi
+jndilookupname
+jnrowe
+jobid
+jobspec
+jobstates
+jobtexts
+jof
+johnhamelink
+joly
+jonas
+jonmosco
+jorge
+journald
+jpeg
+jpg
+jpo
+jprofile
+jql
+jquery
+jra
+jraw
+jrel
+jreld
+jrm
+jrmds
+jrmrel
+jrmsas
+jrp
+jrs
+jrspec
+jruby
+jsa
+jsh
+jshc
+jshm
+json
+jsonfunc
+jsonpath
+jsontool
+jsp
+jspa
+jssl
+jst
+jstj
+jsu
+jsw
+jukie
+junegunn
+junex
+junit
+junkbust
+JUNKFOOD
+Juraj
+jvenant
+jvm
+jvmargs
+jvmoptions
+jwt
+jwtkeyfile
+jxr
+kajrod
+kalsi
+kapeli
+kapow
+kate
+Kaving
+kbd
+kca
+kcbt
+kccc
+kcdc
+kcgc
+kclean
+kcn
+kcp
+kcsc
+kcub
+kcuc
+kcud
+kcuf
+kcuu
+kdch
+kdcj
+kdcm
+kdd
+kde
+kdel
+kdelcj
+kdelcm
+kdeld
+kdelf
+kdeli
+kdelno
+kdelns
+kdelp
+kdelpvc
+kdelsa
+kdelsec
+kdelss
+kdi
+kdialog
+kdiff
+kdm
+kdno
+kdns
+kdp
+kdpvc
+kds
+kdsa
+kdsec
+Keanu
+kecj
+kecm
+keds
+keepfailedstubs
+keepreposdir
+keepstate
+kei
+kepvc
+kerndeb
+kes
+keti
+kevinkirkup
+kexec
+kextload
+kextunload
+keybindings
+keycap
+keychain
+keyfile
+keygen
+keymap
+keymetrics
+keypair
+keyring
+keyshares
+keysize
+keyspace
+keythreshold
+KEYTIMEOUT
+keytooloptions
+keywordisfresh
+keywordmsg
+keywordquickly
+kga
+kgaa
+kgcj
+kgcm
+kgd
+kgdsw
+kgdw
+kgdwide
+kgi
+kgno
+kgns
+kgp
+kgpl
+kgpn
+kgpvc
+kgpvcw
+kgpw
+kgpwide
+kgrs
+kgs
+kgsec
+kgssw
+kgsswide
+kgsw
+kgswide
+Khas
+khome
+killall
+killit
+Kindergarteners
+Kitts
+kiwiirc
+kiwish
+kjx
+klf
+Klingberg
+knative
+kni
+knifecmd
+knifesubcmd
+knp
+knu
+koenig
+Kombat
+kompare
+konsole
+kotlin
+kotlintest
+kpf
+kphoen
+kpkg
+kpp
+kres
+krh
+Krivitsky
+krsd
+krsss
+kru
+ksc
+ksd
+ksh
+ksharrays
+kshautoload
+kshglob
+kshoptionprint
+ksshaskpass
+ksss
+kthxbai
+kts
+kube
+kubeconfig
+kubectl
+kubectx
+kubens
+kubeoff
+kubeon
+kubernetes
+kungfoo
+Kurapati
+kwargs
+kypkvcw
+Kyrgyzstan
+Lacheze
+lambdalift
+lando
+langinfo
+laravel
+lart
+lastcategory
+lastcmd
+lastfull
+lastrun
+lastsave
+launchctl
+lazyconnectionassociation
+lazyconnectionenlistment
+lazyvals
+lbenableallapplications
+lbenableallinstances
+lbenabled
+lblue
+lbname
+lbpolicy
+lbpolicymodule
+lbtargets
+lbuf
+LBUFFER
+lbweight
+lcmd
+ldap
+ldflags
+ldot
+leakreclaim
+leaktimeout
+leavebrowseropen
+lein
+leiningen
+lemy
+len
+Lengyel
+leonhartx
+LESSCLOSE
+lesskey
+LESSKEYIN
+LESSOPEN
+letcat
+leter
+lexduv
+lexer
+lfs
+lho
+lhs
+libc
+libedit
+libexec
+libnotify
+libp
+libreadline
+libsecret
+lifecycle
+lighthouseapp
+limegreen
+lindex
+linearizer
+linewords
+linkcheck
+linkname
+linsert
+linux
+linuxcommando
+linuxcontainers
+linuxmain
+liquibase
+listeneraddress
+listenerport
+livecheck
+liveserver
+llc
+LLCORNER
+llen
+llr
+llvm
+lmnop
+lname
+loadconfig
+loaddata
+loadorder
+localhost
+localonly
+localoptions
+localtime
+localtraps
+lockdown
+lockfile
+lodash
+logcat
+logdriver
+logentries
+logfile
+logid
+loginurl
+loglevel
+logname
+logreportederrors
+logrotate
+logtype
+lol
+lowerip
+lpop
+lpr
+lpush
+lpushx
+lrange
+lrbu
+LRCORNER
+lrem
+lrh
+lrp
+lrt
+lrunzip
+lrz
+lrzip
+lrzuntar
+lsa
+lsb
+lscolors
+lset
+lsof
+lstheme
+lstrip
+lto
+ltrim
+lubs
+lucentbeing
+lvi
+lways
+lwc
+lwd
+lxc
+lxd
+lzcat
+lzip
+lzma
+lzo
+lzop
+LZW
+Maarten
+macos
+macports
+macromates
+Maeda
+Magento
+magerun
+magicequalsubst
+magick
+mailhost
+mailinfo
+mailmap
+mailnull
+mailrc
+mailsplit
+mailuser
+mainporcelain
+maintail
+maintainership
+makecache
+MAKEFLAGS
+makemessages
+makemigrations
+makewindows
+managedreleased
+managepy
+manni
+manpage
+manpath
+mapcar
+mapfile
+mappedpassword
+mappedusername
+markname
+markpath
+maskfasta
+maskray
+masq
+massimiliano
+matchconnections
+mathfunc
+Mattern
+Matth
+matthewratzloff
+matthr
+maxbytes
+maxchildren
+maxconnectionscount
+maxconnectionusagecount
+maxdepth
+maxleasettl
+maxpoolsize
+maxqueuesize
+maxrank
+maxrate
+maxrequests
+maxspare
+maxtasksperchild
+maxthreadpoolsize
+maxwait
+Mayen
+Mayra
+mbean
+mbegin
+mbologna
+mbox
+mboxrd
+mbp
+mca
+mcl
+mcm
+mco
+mcornella
+mct
+mdapi
+mdb
+mde
+mdi
+mdn
+mds
+meanlife
+mediawiki
+megazord
+meh
+Mek
+mekanics
+memprofile
+memprofilerate
+memq
+menuselect
+MENUSIZE
+mergetool
+mergewebxml
+merkledag
+Mery
+messagebus
+messagestoretype
+metacpan
+metadata
+metricscollector
+mfa
+mfaerevaag
+mfs
+mget
+miam
+michelebologna
+microk
+microsoft
+middleware
+midsommar
+midsommarafton
+mikeh
+millis
+mindepth
+minfds
+minidisc
+minikube
+minlogprob
+minprocs
+minspare
+minthreadpoolsize
+mirko
+mirrorlist
+mixin
+mkcd
+mkdir
+mktag
+mktemp
+mktree
+mkv
+mkvirtualenv
+mla
+mldonkey
+Mleb
+MLH
+mli
+mlo
+mlog
+mlp
+mls
+mlterm
+MMA
+mmap
+mmin
+mng
+mnt
+moar
+modded
+modifiedlastdays
+modulename
+Moldova
+mongocli
+mongodb
+monit
+monitorable
+monokai
+Morote
+Mosco
+mosh
+mostfrequent
+MOTD
+mountpoint
+mov
+moyai
+mozilla
+mpa
+mpeg
+mpileup
+mpkg
+mplayer
+mplex
+mpr
+mputniorz
+mqhost
+mqpassword
+mqport
+mquser
+mre
+mrp
+mset
+msetnx
+msgnum
+msgs
+msh
+msil
+msp
+mst
+msvs
+msw
+msys
+msysgit
+mtime
+mtu
+Mudkipz
+multiaddresses
+multibase
+multicastaddress
+multicastport
+multicov
+multihashes
+multiinter
+multiline
+multios
+multiset
+mumpub
+munication
+MURI
+muscato
+mutex
+muxer
+mvim
+mvn
+mvnag
+mvnboot
+mvnc
+mvncd
+mvnce
+mvnci
+mvncie
+mvncini
+mvncist
+mvncisto
+mvncom
+mvncp
+mvnct
+mvncv
+mvncvst
+mvnd
+mvndocs
+mvndt
+mvne
+mvnfmt
+mvnjetty
+mvnp
+mvnqdev
+mvnsrc
+mvnt
+mvntc
+mvnw
+Mvt
+Myanmar
+myapp
+myargs
+myd
+mydeb
+myers
+myfile
+myfirstnamemylastname
+mygit
+myissues
+mymark
+myns
+myprop
+mypy
+myrole
+myserver
+mysql
+mysqladmin
+mysqlrestart
+mysqlstart
+mysqlstatus
+mysqlstop
+mytime
+myuser
+myvalue
+myvirtualenv
+myzsh
+nables
+nagios
+naliases
+nameddirs
+namespace
+namesys
+nanoant
+nanoc
+Narayanan
+Naruto
+nativelibrarypath
+ncd
+ncipe
+NCOLOR
+ncpu
+ncs
+ncv
+ndjson
+NDUw
+NEm
+nenv
+neovim
+netbsd
+netdump
+netloc
+netmask
+netstat
+networkdriver
+networklisteners
+neuralsandwich
+newcons
+newpl
+newvol
+nextgenthemes
+nfsnobody
+nfunctions
+nginx
+ngnix
+ngth
+nhelp
+nhistory
+nhughes
+nicoulaj
+Nicoulaud
+nixos
+nkeywords
+nkill
+nle
+nlinux
+nlist
+nmap
+nmatches
+Nmh
+Nms
+Nmw
+noacl
+noancestors
+noargs
+noautonamedirs
+noautopushd
+noblock
+nobootcp
+nobreak
+nocache
+nochunk
+nocleanup
+nocolor
+nocopy
+nocorrect
+nodaemon
+nodedir
+nodefaultpolicy
+nodegroup
+nodehost
+nodeid
+nodejs
+nodense
+nodestatus
+noexec
+noexpand
+noglob
+noheading
+nohelpers
+nohup
+noinput
+nojline
+noksh
+nomadproject
+nomnom
+nomz
+nonamespace
+nondistributable
+nongnu
+NONINFRINGEMENT
+nonomatch
+NONSELECTABLE
+nontransactionalconnections
+nopassword
+noposixbuiltins
+noprofile
+noprompt
+nopromptsubst
+noptions
+nopushdminus
+norc
+noreload
+NORMARG
+NORRIS
+noshortloops
+noshwordsplit
+nospace
+nosplash
+nostatic
+nostatus
+nostream
+notactive
+notailcalls
+notest
+nothreading
+notifu
+notnull
+nounit
+noverbose
+nowai
+nowarn
+noword
+noyes
+NPAGE
+npanelize
+npm
+npmd
+npmg
+npmi
+npmjs
+npmrc
+npmst
+npmt
+npr
+nproc
+npu
+npx
+nroff
+nscd
+nsu
+nthemes
+ntlp
+ntp
+ntu
+nubxa
+nuc
+nuget
+numstat
+nvcsformats
+nvie
+nvimdiff
+nvm
+nvmrc
+Oakv
+oanward
+oathtool
+OAuth
+objectname
+objectsize
+objecttype
+obsrun
+obtw
+octocat
+octozen
+oden
+ofd
+ogg
+ogm
+ohmyz
+ohmyzsh
+oid
+oldp
+oldpatmat
+OLDPWD
+OMITSPARSESTATE
+OMMIT
+omz
+omztemp
+onbehalfof
+oneline
+onlyrepos
+onoz
+ooanward
+oom
+openbsd
+opendiff
+openr
+openshift
+opensource
+openssh
+openstack
+opensuse
+openvpn
+openw
+OPTARG
+optimisations
+OPTIND
+orderby
+orgdir
+orgs
+oris
+ority
+orm
+ornicar
+orss
+osascript
+osname
+osscan
+ostype
+osver
+osx
+oth
+otp
+otpcode
+Ouellet
+oug
+outfh
+outfile
+outfilebase
+outfilename
+outlog
+outputdir
+outputtedto
+Outputters
+pacac
+pacaur
+pacdisowned
+pacfiles
+pacfileupg
+pacin
+pacinsd
+packagecreaterequestid
+packageid
+packagekitd
+packagename
+packageobjects
+packagephobia
+packagetype
+packageversionid
+paclist
+pacloc
+pacls
+paclsorphans
+pacman
+pacmanallkeys
+pacmansignkeys
+pacmir
+pacoc
+pacown
+pacre
+pacrem
+pacrep
+pacrmorphans
+pacupd
+pacupg
+pacweb
+pagage
+pagename
+painsd
+pairtobed
+pairtopair
+paloc
+palst
+pamc
+pame
+pamf
+pamfa
+pamir
+pamj
+paml
+pamm
+pamn
+pamp
+pampp
+pamr
+pamt
+panelize
+paorph
+paperclips
+paqf
+paqft
+paql
+paqr
+paqt
+paqw
+paralint
+params
+parem
+parep
+PARGON
+parhaat
+paroc
+parseable
+parseopt
+parwok
+passivepopup
+passphrase
+passthrough
+passthru
+passwd
+passwordstore
+pastebin
+pasu
+patchformat
+pathspec
+patmat
+patshead
+paupd
+paupg
+pausedservices
+pavic
+paypal
+paypalobjects
+pbcopy
+pbi
+pbl
+pbo
+pbpaste
+pbs
+pbu
+pcap
+pch
+pchk
+pcl
+pcmode
+pcpu
+PCR
+pcre
+pdf
+PDoc
+peb
+peepcode
+peerid
+pem
+percol
+perflog
+perl
+perlbrew
+perldoc
+permset
+permsetname
+petere
+peterhoeg
+Pfenniger
+pfs
+pgp
+pgpkeys
+pgr
+pgrep
+pgs
+phab
+phing
+phome
+php
+phx
+pid
+pidev
+pidfile
+pidof
+pigz
+pipenv
+pipestatus
+pipfile
+pipir
+piplist
+pipreq
+pipunall
+pipupall
+Pitcairn
+pjdb
+pjo
+PKGBUILD
+pkgfile
+plaetinck
+planetargon
+playlists
+playpause
+ple
+pleted
+plist
+Plug'n
+plugin
+pluginsdir
+plz
+pmat
+pmd
+pmin
+pmset
+png
+pnp
+podfile
+podspec
+policyconfigfactoryclass
+policyproviderclass
+polipo
+polkitd
+poo
+poolname
+poolresize
+Poorter
+popd
+Popen
+porcheron
+portbase
+portdir
+Portfile
+portlist
+portname
+posix
+possen
+posteo
+posterasure
+postgres
+postinstallurl
+posva
+powd
+powed
+Powerline
+poweroff
+powershell
+powify
+powit
+PPAGE
+ppap
+ppid
+ppy
+precache
+precaire
+precmd
+precompilejsp
+precompilewait
+predef
+preexec
+prefetching
+prefiltered
+prefork
+preload
+premajor
+preminor
+prepatch
+prepends
+prepopulate
+prettylist
+previewer
+prevword
+pri
+princ
+principalsmap
+printenv
+printf
+printflags
+printprompt
+privhist
+privoxy
+procfs
+procs
+prodlog
+progfile
+projectname
+PROMPTCOLOR
+PROMPTPREFIX
+promptsize
+promptsubst
+promptvars
+propget
+proplist
+protobuf
+providertype
+prun
+pscpu
+pseudoword
+psgrep
+psh
+psmem
+psprint
+pstadler
+pstree
+psu
+psubscribe
+psy
+psykorebase
+pthree
+ptot
+ptree
+pubgrub
+publishwait
+pubsub
+puni
+punsubscribe
+puo
+pushd
+pushdefault
+pushdf
+pushdignoredups
+pushdminus
+pushdsilent
+pushln
+pushremote
+pushurl
+Putniorz
+pvc
+pvenv
+pvm
+pwd
+PWDCASECORRECT
+PWDLEN
+pwdsize
+pwdx
+pwgen
+pwh
+pwned
+pxd
+pxy
+pybundles
+pyc
+pycache
+pyclean
+pyenv
+pyenvdirs
+pyfind
+pygmentize
+pygments
+pygrep
+pylint
+pypa
+pypi
+pytb
+pytest
+pythonhosted
+pythonpath
+pythonrc
+PYTHONSTARTUP
+PYTHONUSERBASE
+pyuserpaths
+Qdt
+qiqmiq
+qkey
+qlmanage
+qpwd
+Qql
+Qqo
+qqq
+qqwtzgejwgqve
+Qtdq
+quarkus
+quicklisp
+quickstart
+quiltimport
+qunit
+qunitjs
+quotationspage
+quotedir
+quu
+quux
+qwant
+qwerty
+qxtm
+qyjti
+rabin
+rackspace
+rackup
+radvd
+raek
+Rakefile
+raname
+randomkey
+rangepos
+rar
+ratijas
+rawurldecode
+rawurlencode
+rbenv
+rbenvdirs
+rbfu
+RBUFFER
+rcfile
+Rchive
+rcs
+rdargument
+rdb
+rdc
+rdd
+rdependents
+rdeps
+rdm
+rdmd
+rdmr
+rdmtc
+rdmu
+rdoc
+rdp
+rdr
+rds
+rdsl
+rdtc
+rdtp
+reactjs
+readline
+readlink
+readme
+readonly
+readthedocs
+readtimeoutmillis
+Reagle
+realcmd
+reauthor
+rebased
+rebases
+rebasing
+receivepack
+reddit
+redirectport
+redis
+rediscli
+redistrubute
+redzone
+reencode
+reexec
+refactor
+refchecks
+reflogs
+refmap
+refname
+refspec
+regex
+regexes
+regexn
+regexp
+reheader
+reintializes
+Reitsma
+rej
+reldates
+reldist
+releasenotesurl
+releaseversion
+relid
+reloadinterval
+reloadpost
+reltool
+remco
+remoteonly
+remotetestdir
+removegroups
+removeprincipals
+removeusergroups
+renamenx
+rephorm
+replacetokens
+repow
+reprovider
+requestauthrecipient
+requestauthsource
+requestid
+rerere
+resetstat
+resolv
+resolvemsg
+responseauthrecipient
+responseauthsource
+responsetimeout
+restartpost
+restype
+resultformat
+retcode
+retlog
+retrievefile
+retrievetargetdir
+returncode
+RETVAL
+revdeps
+revlist
+rfa
+rfakeroot
+rfap
+rfbu
+rfc
+RFh
+rfind
+rgm
+rhash
+rinass
+rinf
+ripgrep
+riseup
+RIXIUS
+rlc
+Rli
+rlib
+Rlvi
+rmacs
+rmcup
+rmd
+rmdir
+rmdsstore
+rmdup
+rmi
+rmkx
+rnand
+rnatv
+rnaw
+rnios
+rniosse
+rniosx
+rniosxr
+rniosxsm
+rnipad
+rnipada
+rnipadm
+rnipadp
+rnipadr
+rnland
+rnlink
+rnlios
+rns
+robby
+robbyrussell
+ROLENAME
+rollbackonerror
+rootdir
+rosrc
+roswell
+ROSWELLPATH
+roundhoused
+routecookie
+rpath
+rpc
+rpcuser
+rpmpackage
+rpms
+rpo
+rpop
+rpoplpush
+rprompt
+rpush
+rpushx
+rra
+rrg
+rsa
+rsb
+rsd
+rset
+rsh
+rsp
+rspec
+rsrra
+rst
+rsto
+rstrip
+rsync
+rtfm
+rtkit
+rtorrent
+rts
+rubocop
+rubygems
+rubyonrails
+rubyprompt
+rubypromptsize
+rubyversion
+Rudkin
+rulz
+runfcgi
+runningservers
+runningservices
+runpy
+runserver
+runtests
+runtfile
+runtimes
+RUNZSH
+Ruslan
+ruslanspivak
+rustc
+rustup
+Rvi
+rvm
+rvmprompt
+rvmpromptsize
+rxvt
+saas
+sadd
+salesforce
+samtools
+sandboxed
+SAVEHIST
+savelogin
+savemasterpassword
+sba
+sbc
+sbcc
+sbcln
+sbco
+sbcp
+sbcq
+sbd
+sbdc
+sbdi
+sbgi
+sbin
+sbp
+sbpl
+sbr
+sbrake
+sbrm
+sbt
+sbu
+sbx
+scalac
+scaladoc
+scalatest
+scaleway
+scandeps
+scard
+scd
+scdalias
+scdaliases
+scdhistory
+scdignore
+scgi
+sched
+scheduledrundatetime
+Schlatow
+scm
+scmpublish
+scorpius
+scottkidder
+scp
+screencast
+screenshot
+SCTP
+scu
+scutil
+scw
+scwsearch
+sdiff
+sdiffstore
+sdist
+sdk
+sdkman
+Sdl
+sdurrheimer
+Seagal
+searchterm
+seccomp
+securityenabled
+securitymap
+securitytype
+segfault
+selectables
+selectionkeyhandler
+selectiveanf
+selectivecps
+selectorpolltimeoutmillis
+selfupdate
+selinux
+semver
+sendemail
+sendperiod
+serialfile
+serialno
+serverlist
+servername
+serverurl
+serviceproperties
+serviceuser
+servlet
+setab
+setaf
+setalias
+setapp
+setbit
+setdefaultdevhubusername
+setdefaulttimeout
+setdefaultusername
+setenv
+setex
+setnx
+setopt
+setprompt
+setrange
+sfcl
+sfcontainer
+sfcw
+sfdc
+sfdev
+sfdx
+sfdxcli
+sfdxurl
+sfdxurlfile
+sfffe
+sfgb
+sfgc
+sfgcom
+sfge
+sfn
+sfprod
+sfroute
+SFSB
+sfsr
+sfsu
+sftp
+sfx
+sgem
+sgr
+sgrep
+sgtatham
+shasum
+sheerun
+shellcheck
+shellinit
+shellperson
+shitload
+SHLVL
+shm
+Shohei
+shopt
+shortlist
+shortlog
+shortname
+shortstat
+SHOWCOLORHINTS
+showcurrentpatch
+showdeprecated
+SHOWDIRTYSTATE
+showfiles
+showformat
+showmigrations
+showpkg
+SHOWSTASHSTATE
+showsubclasses
+SHOWUNTRACKEDFILES
+showupstream
+shpotify
+shuf
+shunit
+Shyamshankar
+sid
+sidekiq
+sideload
+SIGINT
+SIGKILL
+sigs
+SIMBL
+Sindre
+sindresorhus
+singlechar
+singlepackage
+Sint
+sinterstore
+sirech
+sismember
+sitecookbooks
+sitesearch
+sjis
+skintone
+skiptraceflag
+skitch
+slaveof
+slicehost
+sln
+slogin
+slp
+smacs
+smartlist
+smartsync
+smcup
+smembers
+smerge
+smkx
+Smood
+smove
+smt
+smtp
+Smurf
+snapshotname
+snowboarder
+sobject
+sobjectid
+sobjecttreefiles
+sobjecttype
+sobjecttypecategory
+socio
+socw
+softlayer
+solaris
+som
+soq
+soql
+Sorhus
+sorin
+sortconip
+sortcons
+sortnr
+sortr
+sourceapiversion
+sourced
+sourcedir
+sourcefile
+sourceforge
+sourceorg
+sourcepath
+sourcetype
+sourcing
+soww
+soyc
+spacewander
+spam
+spd
+spearce
+speartail
+spf
+spi
+Spivak
+splitbrain
+splitlines
+splunk
+spock
+spop
+spork
+spotify
+springframework
+sprintf
+sprunge
+spu
+spx
+sql
+sqlall
+sqlc
+sqlclear
+sqlcustom
+sqldropindexes
+sqlflush
+sqlindexes
+sqlinitialdata
+sqlq
+sqlsan
+sqlsequencereset
+sqltracelisteners
+squashmigrations
+srake
+srandmember
+src
+srem
+ssh
+sshd
+sshkey
+sshkeyfile
+sshkeypassphrase
+sshpassword
+sshport
+sshpublickeyfile
+sshuser
+ssl
+sslproxyhost
+sslproxyport
+ssm
+sso
+sst
+sstat
+stackoverflow
+stacktrace
+stagedstr
+standalone
+standaloneonly
+startapp
+startpage
+startpost
+startproject
+startswith
+startus
+statd
+statedb
+statefile
+statefulset
+statelist
+statementcachesize
+statementleakreclaim
+statementleaktimeout
+statementtimeout
+STATESEPARATOR
+staticlib
+statuspost
+stderr
+stdin
+stdio
+stdlayout
+stdlib
+stdout
+steadypoolsize
+stedolan
+steeef
+sterr
+stevelosh
+stgit
+stil
+STITLE
+stn
+stoppedservers
+stoppedservices
+stoppost
+stopwait
+storeprotocol
+storeprotocolclass
+stp
+strfile
+strftime
+stringification
+stringified
+stringify
+stripspace
+strlen
+strverscmp
+Strzelecki
+sts
+stt
+stty
+stu
+stylesheets
+subcmds
+subdigital
+subdir
+subdomain
+subfolder
+Subhaditya
+subl
+sublimemerge
+sublimetext
+subm
+subnut
+subpage
+subpath
+subscriberfile
+subscriberorg
+subservices
+subshells
+subspec
+substr
+subsubcmds
+Subsubcommands
+Subsubsubcommands
+sudo
+sudoedit
+SUFIX
+suitenames
+sunaku
+sunion
+sunionstore
+supad
+superaccessors
+supervisorctl
+supervisord
+suppresscc
+suprl
+suprm
+suprr
+suprs
+supso
+supsr
+supu
+Suraj
+surryhill
+suse
+svcat
+svg
+svm
+svn
+svnsync
+svntrunk
+swiftc
+swiftpm
+sxa
+sxc
+sxd
+sxf
+sxfn
+sxm
+sxn
+sxp
+sxu
+sxw
+sxy
+sykora
+symfony
+symkinds
+symlink
+Symlinking
+symref
+syms
+syncdb
+SYNOPSYS
+syns
+syohex
+sys
+sysadmins
+sysctl
+syslog
+sysread
+sysroot
+systemadmin
+systemctl
+systemd
+systeminfo
+systemproperties
+Syu
+Syua
+Syy
+Tabone
+tagname
+tailcalls
+Tajikistan
+takedir
+takegit
+takeurl
+tanabata
+tarball
+tarfile
+targetcut
+targetdevhubusername
+targetprotocol
+targetted
+targetusername
+Tasche
+Tascii
+taskwarrior
+Tassilo
+tatooine
+tavric
+tbz
+tcl
+tcp
+tcpdump
+tcpip
+tcpnodelay
+tcsh
+tdiff
+tdiffstr
+tempdir
+tempfile
+tempfilename
+TEMPLATENAME
+terday
+termcap
+termcolor
+Termfile
+terminalapp
+terminfo
+terminitor
+termsupport
+termux
+TERMWIDTH
+terraform
+terremark
+testflag
+testfunc
+testlevel
+testlog
+testname
+testng
+testrb
+testrunid
+testrunner
+testserver
+textastic
+textasticapp
+textconv
+textfile
+textmate
+tformat
+tfstate
+tftp
+tfvars
+tgz
+thedir
+thefuck
+themeisfresh
+thememsg
+there're
+thibault
+thisfcn
+Thoumie
+threadpool
+threadpoolid
+thu
+tif
+timeoutmsec
+timeremaining
+timetolive
+timewait
+timothybasanov
+tion
+titlebar
+tjkirch
+tkachenko
+tkdiff
+tkss
+tksv
+tldr
+Tlp
+tls
+tlscacert
+tlscert
+tlsciphers
+tlsenabled
+tlskey
+tlsrollbackenabled
+tlsverify
+tlz
+tmp
+tmpdir
+tmpfile
+tmpfs
+tmux
+tmuxinator
+tne
+tnn
+tobed
+todo
+Tokenise
+tokenized
+tolower
+tomee
+tonotdo
+toolchain
+toolcp
+toplevel
+Toponce
+torrez
+torromeo
+tortoisemerge
+totp
+totpkey
+Touron
+tput
+traceroute
+trackball
+transactionlogdir
+transactionsupport
+transferencoding
+transprotocol
+transprotocolclass
+trapd
+trconf
+triggerevents
+triggername
+trins
+trinsd
+trizen
+trloc
+trlst
+trmir
+Troiae
+Trojanowski
+trorph
+trre
+trrem
+trrep
+trsu
+trunc
+trupd
+trupg
+tsdh
+tsl
+ttl
+ttr
+ttyctl
+ttys
+tview
+twohead
+txl
+txn
+txo
+txs
+txz
+tycho
+typechecking
+typescriptlang
+typesetsilent
+typespec
+typoes
+tzst
+uapprox
+uberjar
+Ubfksu
+ubuntu
+udp
+uescape
+UFE
+ufw
+uid
+ukpog
+ULCORNER
+ulimit
+Ullrich
+ultiple
+umask
+umd
+umich
+unace
+unalias
+uname
+unarchive
+Uncomment
+uncommit
+uncompress
+uncurry
+undelete
+undeploy
+unedit
+unescape
+unexport
+unexpose
+unfunction
+unhash
+unheap
+unhost
+unicode
+unidiff
+unindex
+uninst
+uninstall
+uninstalling
+unionbedg
+uniq
+uniqid
+uniquetablenames
+unittest
+universalarchive
+unixfs
+unixstamp
+unlimit
+unlzma
+unmark
+unmatch
+unmonitor
+unmute
+unpause
+unrar
+unreachability
+unsetopt
+unshallow
+unshare
+unstagedstr
+unstartup
+unsubscribe
+untag
+unversioned
+unwatch
+unwip
+unxz
+unzstd
+updatedb
+updateonsave
+updatestartuptty
+upgr
+upgradable
+upgradetype
+uploadpack
+upperip
+upsert
+urandom
+URCORNER
+uri
+url
+urldecode
+urlencode
+urllib
+urlmatch
+urlonly
+urlparse
+urlstring
+urltools
+urxvt
+usb
+usbmux
+usejavacp
+uselimit
+usemasterpassword
+usergroups
+userguide
+userland
+username
+userns
+userpass
+userpassword
+usetoolingapi
+usetty
+usr
+utc
+utf
+utils
+utm
+uucp
+UUID
+Vagrantfile
+vagrantup
+valentinbud
+validateatmostonceperiod
+validateddeployrequestid
+validateschema
+validationclassname
+validationmethod
+validationtable
+Valodim
+vals
+varargs
+vared
+varkey
+varname
+vaultproject
+vba
+vbl
+vbm
+vbo
+vbox
+vbqs
+vbr
+vbu
+vcf
+vcmp
+vcs
+vcsa
+vdf
+vectorize
+Venant
+vendored
+venv
+Verhoef
+Verma
+VERSINFO
+versioncomp
+versiondescription
+versioned
+versioning
+versionname
+versionnumber
+versiontagprefix
+verstr
+vfs
+vgi
+vgrepping
+vgs
+vguerci
+vhost
+vhsp
+vicmd
+viewtopic
+viins
+vimdiff
+vimgrep
+vimrc
+violenz
+viopp
+virtenv
+virtualbox
+virtualenv
+virtualenvwrapper
+virtualizing
+virtualservers
+virumque
+visitpage
+visualforce
+visualstudio
+VMDK
+VMs
+vmwarefusion
+vmwarevcloudair
+vmwarevsphere
+vnc
+vncviewer
+vnd
+voggom
+Voldemort
+volumedriver
+vonnegut
+Vop
+vopts
+vpaivatorres
+vpc
+vpli
+vpll
+vplu
+vplun
+vpr
+vrdp
+vre
+vrp
+vsc
+vsca
+vscd
+vscde
+vscg
+vscie
+vscl
+vscn
+vscode
+vscodium
+vscr
+vscu
+vscue
+vscv
+vscw
+vsh
+vsix
+vsp
+vsplit
+vssh
+vsshc
+vssp
+vst
+VTE
+vterm
+Vue
+vuejs
+vulns
+vulscan
+vundle
+vup
+vvsp
+vvv
+vwxyz
+vydpig
+waittime
+wakeonlan
+walle
+wantlist
+warpdir
+warprc
+wav
+wclip
+wcomp
+Webchat
+weblog
+webm
+webrick
+webscr
+webserver
+website
+webtraffic
+Wegner
+Weiming
+Weirich
+Wez
+wfilter
+wget
+whatchanged
+whatisthor
+whatthecommit
+whatwg
+whitespacelist
+whl
+whoami
+wiki
+wikipedia
+wil
+willmendesneto
+wincmd
+windowid
+windowsdomain
+windowspassword
+windowsuser
+wip
+wjst
+wks
+wlne
+wolframalpha
+womens
+wordbits
+WORDBREAKS
+WORDCHARS
+wordlist
+wordpress
+workaround
+workdir
+workflow
+workon
+workpass
+workqueues
+workspaces
+worktree
+would've
+wrapjdbcobjects
+writetimeoutmillis
+WSL
+wslpath
+wtf
+wtfpl
+www
+wwwrun
+Wzf
+xargs
+xcb
+xcconfig
+xcdd
+xchm
+xclick
+xclip
+xcode
+xcodebuild
+xcodeproj
+xcp
+xcsel
+xcselv
+xcworkspace
+XDCHDSBDSDG
+xdg
+xdvi
+xfn
+xfree
+xfs
+xit
+XIVIEWER
+xjnmahqewy
+xkcd
+Xkten
+XLBUFFER
+xlbuflines
+xml
+xnode
+xontab
+xor
+Xout
+xperl
+xphp
+xpi
+xpm
+xpowered
+xprop
+xpython
+XRBUFFER
+xrbuflines
+xruby
+xsel
+xshell
+xstrat
+xterm
+XTRACE
+xudmec
+xunit
+xvf
+xvjf
+xxd
+xxdiff
+Xxjn
+xzcat
+yaconf
+yain
+yainsd
+yaloc
+yalst
+yamir
+yaml
+yandex
+yandsearch
+Yanovich
+yaorph
+yarem
+yarep
+yarnpkg
+yarnrc
+yasu
+yaupd
+yaupg
+ybalrid
+ycc
+yesorno
+yga
+ygi
+ygl
+ygr
+ygrm
+ygu
+yii
+yiic
+yiiframework
+yireo
+yleo
+ylep
+yli
+yln
+ylnf
+yls
+ymc
+yml
+yolo
+Yonchu
+YOSHIDA
+yout
+youtube
+yrl
+yrm
+yrun
+yst
+ytc
+yuc
+yui
+yuil
+yuyuchu
+yws
+yyy
+yzf
+zadd
+zake
+zal
+zall
+zas
+zbell
+ZCA
+zcard
+zcl
+zcompcache
+zcompdump
+zcompile
+Zconvey
+zcount
+zcu
+zcurses
+zdbc
+zdbcm
+zdbm
+zdbmigrate
+zdbr
+zdbreset
+ZDgw
+zdharma
+zdirs
+zdotdir
+zdup
+zenerate
+zenmap
+zerver
+zfs
+zgen
+zgrep
+zhimingwang
+zhse
+zic
+zif
+zin
+zincrby
+zinit
+zinr
+zinterstore
+zipalign
+zipfile
+zkat
+zle
+zleparameter
+zlicenses
+zll
+zlogin
+zlogout
+zlp
+zlr
+zls
+zlu
+zma
+zmodload
+zmr
+zms
+znr
+znt
+zocmez
+zonsole
+zoxide
+zpa
+zparseopts
+zpatch
+zpattern
+zpch
+zpchk
+zpd
+zplg
+zplug
+zplugin
+zproduct
+zprofile
+zps
+zpt
+zrake
+zrange
+zrangebyscore
+zrank
+zref
+zregexparse
+zrem
+zremrangebyrank
+zremrangebyscore
+zrevrange
+zrevrangebyscore
+zrevrank
+zrl
+zrm
+zrn
+zrr
+zrs
+zscore
+zse
+zsh'ed
+zsh
+zshaddhistory
+zshcmd
+zshcommands
+zshcompfunc
+zshconfig
+zshell
+zshenv
+zshexpn
+zshids
+zshrc
+zshtheme
+zshwiki
+zshzle
+zsi
+zsocket
+Zsolt
+zsource
+zspec
+zsr
+zsrc
+zst
+Zstandard
+zstat
+zstd
+zstdcat
+zstyle
+zsw
+ztart
+ztos
+zucumber
+zunctional
+zunionstore
+zunits
+zunner
+zup
+zutil
+zvcmp
+zve
+zweep
+zwip
+ZWJ
+zwp
+zxvf
+zyg
+zypper
+zzz
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
new file mode 100644
index 000000000..93dfa201c
--- /dev/null
+++ b/.github/actions/spelling/patterns.txt
@@ -0,0 +1,73 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+
+# YouTube
+https?://(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_]*
+<\s*youtube\s+id=['"][-a-zA-Z0-9?_]*['"]
+\bimg\.youtube\.com/vi/[-a-zA-Z0-9?&=_]*
+# Google Analytics
+\bgoogle-analytics\.com/collect.[-0-9a-zA-Z?%=&_.~]*
+# Google APIs
+\bgoogleapis\.com/[a-z]+/v\d+/[a-z]+/[@./?=\w]+
+\b[-a-zA-Z0-9.]*\bstorage\d*\.googleapis\.com(?:/\S*|)
+# Google Calendar
+\bcalendar\.google\.com/calendar(?:/u/\d+|)/embed\?src=[@./?=\w&%]+
+\w+\@group\.calendar\.google\.com\b
+# Google DataStudio
+\bdatastudio\.google\.com/(?:(?:c/|)u/\d+/|)(?:embed/|)(?:open|reporting|datasources|s)/[-0-9a-zA-Z]+(?:/page/[-0-9a-zA-Z]+|)
+# The leading `/` here is as opposed to the `\b` above
+# ... a short way to match `https://` or `http://` since most urls have one of those prefixes
+# Google Docs
+/docs\.google\.com/[a-z]+/d/(?:e/|)[0-9a-zA-Z_-]+/?
+# Google Drive
+\bdrive\.google\.com/file/d/[0-9a-zA-Z_?=]*
+# Google Groups
+\bgroups\.google\.com/(?:forum/#!|d/)(?:msg|topic)/[^/]+/[a-zA-Z0-9]+(?:/[a-zA-Z0-9]+|)
+# Google themes
+themes\.googleusercontent\.com/static/fonts/[^/]+/v\d+/[^.]+.
+# Google CDN
+\bclients2\.google(?:usercontent|)\.com[-0-9a-zA-Z/.]*
+# Goo.gl
+/goo\.gl/[a-zA-Z0-9]+
+# Google Chrome Store
+\bchrome\.google\.com/webstore/detail/\w*(?:/\w*|)
+# Google Books
+\bbooks\.google\.(?:\w{2,4})/books\?[-\w\d=&#.]*
+# Google Fonts
+\bfonts\.(?:googleapis|gstatic)\.com/[-/?=:;+&0-9a-zA-Z]*
+
+# GitHub SHAs
+\bapi.github\.com/repos/[^/]+/[^/]+/[^/]+/[0-9a-f]+\b
+(?:\[[0-9a-f]+\]\(https:/|)/(?:www\.|)github\.com/[^/]+/[^/]+(?:/[^/]+/[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b|)
+\bgithub\.com/[^/]+/[^/]+[@#][0-9a-f]+\b
+# githubusercontent
+/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
+# gist github
+/gist\.github\.com/[^/]+/[0-9a-f]+
+# git.io
+\bgit\.io/[0-9a-zA-Z]+
+# GitHub JSON
+"node_id": "[-a-zA-Z=;:/0-9+]*"
+# Contributor
+\[[^\]]+]\(https://github\.com/[^/]+\)
+# GHSA
+GHSA(?:-[0-9a-z]{4}){3}
+
+LS_COLORS=(["']).*?\g{-1}
+
+(\\?)%[a-zA-Z]+\g{-1}(?!%)
+
+# URL escaped characters
+\%[0-9A-F]{2}
+# hex digits including css/html color classes:
+(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9a-fA-FgGrR_]{2,}(?:[uU]?[lL]{0,2}|u\d+)\b
+
+# https://www.gnu.org/software/groff/manual/groff.html
+# man troff content
+\\f[BCIPR]
+
+# Compiler flags
+[\t "'`=]-[LPWXY]
+[\t "'`=]-D(?!ebian)
+
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b
diff --git a/.github/actions/spelling/reject.txt b/.github/actions/spelling/reject.txt
new file mode 100644
index 000000000..a5ba6f639
--- /dev/null
+++ b/.github/actions/spelling/reject.txt
@@ -0,0 +1,7 @@
+^attache$
+benefitting
+occurence
+Sorce
+^[Ss]pae
+^untill
+^wether
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
new file mode 100644
index 000000000..18a302e3c
--- /dev/null
+++ b/.github/workflows/spelling.yml
@@ -0,0 +1,95 @@
+name: Spell checking
+on:
+  push:
+    branches: ["**"]
+    tags-ignore: ["**"]
+  pull_request_target:
+  issue_comment:
+    types: [created]
+
+jobs:
+  spelling:
+    name: Spell checking
+    permissions:
+      contents: read
+      pull-requests: read
+    outputs:
+      internal_state_directory: ${{ steps.spelling.outputs.internal_state_directory }}
+    runs-on: ubuntu-latest
+    if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'"
+    concurrency:
+      group: spelling-${{ github.event.pull_request.number || github.ref }}
+      # note: If you use only_check_changed_files, you do not want cancel-in-progress
+      cancel-in-progress: true
+    steps:
+    - name: checkout-merge
+      if: "contains(github.event_name, 'pull_request')"
+      uses: actions/checkout@v2
+      with:
+        ref: refs/pull/${{github.event.pull_request.number}}/merge
+    - name: checkout
+      if: github.event_name == 'push'
+      uses: actions/checkout@v2
+    - name: check-spelling
+      id: spelling
+      uses: check-spelling/check-spelling@prerelease
+      with:
+        experimental_apply_changes_via_bot: 1
+        suppress_push_for_open_pull_request: 1
+        post_comment: 0
+    - name: store-comment
+      if: failure()
+      uses: actions/upload-artifact@v2
+      with:
+        retention-days: 1
+        name: "check-spelling-comment-${{ github.run_id }}"
+        path: |
+          ${{ steps.spelling.outputs.internal_state_directory }}
+
+  comment:
+    name: Comment
+    runs-on: ubuntu-latest
+    needs: spelling
+    permissions:
+      contents: write
+      pull-requests: write
+    if: always() && needs.spelling.result == 'failure' && needs.spelling.outputs.internal_state_directory
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: set up
+      run: |
+        mkdir /tmp/data
+    - name: retrieve-comment
+      uses: actions/download-artifact@v2
+      with:
+        name: "check-spelling-comment-${{ github.run_id }}"
+        path: /tmp/data
+    - name: comment
+      uses: check-spelling/check-spelling@prerelease
+      with:
+        experimental_apply_changes_via_bot: 1
+        custom_task: comment
+        internal_state_directory: /tmp/data
+
+  update:
+    name: Update PR
+    permissions:
+      contents: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    if: ${{
+        github.event_name == 'issue_comment' &&
+        github.event.issue.pull_request &&
+        contains(github.event.comment.body, '@check-spelling-bot apply')
+      }}
+    concurrency:
+      group: spelling-update-${{ github.event.issue.number }}
+      cancel-in-progress: false
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: check-spelling
+      uses: check-spelling/check-spelling@prerelease
+      with:
+        experimental_apply_changes_via_bot: 1

From 29b344a7102a2fe427d5ea6bcde4044898be1112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 7 Dec 2021 18:04:33 +0100
Subject: [PATCH 267/591] chore: update security docs and link to huntr.dev

---
 README.md   |  1 +
 SECURITY.md | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5712c1701..310283e92 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 [![Follow @ohmyzsh](https://img.shields.io/twitter/follow/ohmyzsh?label=Follow+@ohmyzsh&style=flat)](https://twitter.com/intent/follow?screen_name=ohmyzsh)
 [![Discord server](https://img.shields.io/discord/642496866407284746)](https://discord.gg/ohmyzsh)
 [![Gitpod ready](https://img.shields.io/badge/Gitpod-ready-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ohmyzsh/ohmyzsh)
+[![huntr.dev](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev/bounties/disclose/?utm_campaign=ohmyzsh%2Fohmyzsh&utm_medium=social&utm_source=github&target=https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh)
 
 ## Getting Started
 
diff --git a/SECURITY.md b/SECURITY.md
index cda53379f..7e5c8eed0 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -3,7 +3,8 @@
 ## Supported Versions
 
 At the moment Oh My Zsh only considers the very latest commit to be supported.
-We combine that with our fast response to incidents, so risk is minimized.
+We combine that with our fast response to incidents and the automated updates
+to minimize the time between vulnerability publication and patch release.
 
 | Version        | Supported          |
 |:-------------- |:------------------ |
@@ -14,9 +15,10 @@ In the near future we will introduce versioning, so expect this section to chang
 
 ## Reporting a Vulnerability
 
-If you find a vulnerability, email all the maintainers directly at:
+**Do not submit an issue or pull request**: this might reveal the vulnerability.
 
-- Robby: robby [at] planetargon.com
-- Marc: hello [at] mcornella.com
+Instead, you should email the maintainers directly at: [**security@ohmyz.sh**](mailto:security@ohmyz.sh).
 
-**Do not open an issue or Pull Request directly**, because it might reveal the vulnerability.
+We will deal with the vulnerability privately and submit a patch as soon as possible.
+
+You can also submit your vulnerability report to [huntr.dev](https://huntr.dev/bounties/disclose/?utm_campaign=ohmyzsh%2Fohmyzsh&utm_medium=social&utm_source=github&target=https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh) and see if you can get a bounty reward.

From 44d8edea05d940ceb593a025e27466e7c8727f03 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue, 7 Dec 2021 12:09:34 -0500
Subject: [PATCH 268/591] ci(spelling): automatically accept aliased commands
 (#10475)

Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
---
 .github/actions/spelling/expect.txt | 3 +++
 .github/workflows/spelling.yml      | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index fc764f57a..76e9fdf31 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -22,6 +22,7 @@ acr
 acroread
 acs
 acsc
+acss
 acsp
 actionformats
 Adamantium
@@ -1459,6 +1460,7 @@ gpr
 gpristine
 gpsup
 gpu
+gpus
 gpv
 gradle
 gradlew
@@ -2396,6 +2398,7 @@ mirrorlist
 mixin
 mkcd
 mkdir
+mkdirs
 mktag
 mktemp
 mktree
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
index 18a302e3c..946d411d1 100644
--- a/.github/workflows/spelling.yml
+++ b/.github/workflows/spelling.yml
@@ -30,6 +30,14 @@ jobs:
     - name: checkout
       if: github.event_name == 'push'
       uses: actions/checkout@v2
+    - name: find aliases
+      run: |
+        for a in $(git ls-files|grep '\.zsh$'); do
+          echo "-- $a"
+          if [ -s "$a" ]; then
+            perl -ne 'next unless s/^alias ([A-Za-z]{3,})=.*/$1/;print' "$a" | tee -a .github/actions/spelling/allow.txt
+          fi
+        done;
     - name: check-spelling
       id: spelling
       uses: check-spelling/check-spelling@prerelease

From 90e53bcc6aba67e9e27c4e6961cb4a0eec34d436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 7 Dec 2021 19:37:28 +0100
Subject: [PATCH 269/591] ci(spelling): turn off check-spelling action
 temporarily

---
 .github/workflows/spelling.yml | 103 ---------------------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 .github/workflows/spelling.yml

diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
deleted file mode 100644
index 946d411d1..000000000
--- a/.github/workflows/spelling.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-name: Spell checking
-on:
-  push:
-    branches: ["**"]
-    tags-ignore: ["**"]
-  pull_request_target:
-  issue_comment:
-    types: [created]
-
-jobs:
-  spelling:
-    name: Spell checking
-    permissions:
-      contents: read
-      pull-requests: read
-    outputs:
-      internal_state_directory: ${{ steps.spelling.outputs.internal_state_directory }}
-    runs-on: ubuntu-latest
-    if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'"
-    concurrency:
-      group: spelling-${{ github.event.pull_request.number || github.ref }}
-      # note: If you use only_check_changed_files, you do not want cancel-in-progress
-      cancel-in-progress: true
-    steps:
-    - name: checkout-merge
-      if: "contains(github.event_name, 'pull_request')"
-      uses: actions/checkout@v2
-      with:
-        ref: refs/pull/${{github.event.pull_request.number}}/merge
-    - name: checkout
-      if: github.event_name == 'push'
-      uses: actions/checkout@v2
-    - name: find aliases
-      run: |
-        for a in $(git ls-files|grep '\.zsh$'); do
-          echo "-- $a"
-          if [ -s "$a" ]; then
-            perl -ne 'next unless s/^alias ([A-Za-z]{3,})=.*/$1/;print' "$a" | tee -a .github/actions/spelling/allow.txt
-          fi
-        done;
-    - name: check-spelling
-      id: spelling
-      uses: check-spelling/check-spelling@prerelease
-      with:
-        experimental_apply_changes_via_bot: 1
-        suppress_push_for_open_pull_request: 1
-        post_comment: 0
-    - name: store-comment
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        retention-days: 1
-        name: "check-spelling-comment-${{ github.run_id }}"
-        path: |
-          ${{ steps.spelling.outputs.internal_state_directory }}
-
-  comment:
-    name: Comment
-    runs-on: ubuntu-latest
-    needs: spelling
-    permissions:
-      contents: write
-      pull-requests: write
-    if: always() && needs.spelling.result == 'failure' && needs.spelling.outputs.internal_state_directory
-    steps:
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: set up
-      run: |
-        mkdir /tmp/data
-    - name: retrieve-comment
-      uses: actions/download-artifact@v2
-      with:
-        name: "check-spelling-comment-${{ github.run_id }}"
-        path: /tmp/data
-    - name: comment
-      uses: check-spelling/check-spelling@prerelease
-      with:
-        experimental_apply_changes_via_bot: 1
-        custom_task: comment
-        internal_state_directory: /tmp/data
-
-  update:
-    name: Update PR
-    permissions:
-      contents: write
-      pull-requests: write
-    runs-on: ubuntu-latest
-    if: ${{
-        github.event_name == 'issue_comment' &&
-        github.event.issue.pull_request &&
-        contains(github.event.comment.body, '@check-spelling-bot apply')
-      }}
-    concurrency:
-      group: spelling-update-${{ github.event.issue.number }}
-      cancel-in-progress: false
-    steps:
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: check-spelling
-      uses: check-spelling/check-spelling@prerelease
-      with:
-        experimental_apply_changes_via_bot: 1

From 5b987e59d0fce1a74bcfd51750c6f52d7c29c647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 7 Dec 2021 20:15:38 +0100
Subject: [PATCH 270/591] chore: add ohmyzsh GitHub Sponsors to FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index c44bb2475..484a8cf53 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,2 @@
-github: [robbyrussell, mcornella, larson-carter]
+github: [ohmyzsh, robbyrussell, mcornella, larson-carter]
 open_collective: ohmyzsh

From dcf12ba8f3b31eead602c530a9fbfd5579c64630 Mon Sep 17 00:00:00 2001
From: Nicolas Cavigneaux <nico@bounga.org>
Date: Fri, 16 Jan 2015 15:59:52 +0100
Subject: [PATCH 271/591] fix(mercurial): show author name in `hgsl` alias log
 alias (#3500)

Closes #3500
---
 plugins/mercurial/README.md            | 43 +++++++++++++-------------
 plugins/mercurial/mercurial.plugin.zsh |  2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index 4beee0a95..a362de4ce 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -11,27 +11,28 @@ plugins=(... mercurial)
 
 ## Aliases
 
-| Alias  | Command                                                                                                     |
-|--------|-------------------------------------------------------------------------------------------------------------|
-| `hga`  | `hg add`                                                                                                    |
-| `hgc`  | `hg commit`                                                                                                 |
-| `hgca` | `hg commit --amend`                                                                                         |
-| `hgb`  | `hg branch`                                                                                                 |
-| `hgba` | `hg branches`                                                                                               |
-| `hgbk` | `hg bookmarks`                                                                                              |
-| `hgco` | `hg checkout`                                                                                               |
-| `hgd`  | `hg diff`                                                                                                   |
-| `hged` | `hg diffmerge`                                                                                              |
-| `hgp`  | `hg push`                                                                                                   |
-| `hgs`  | `hg status`                                                                                                 |
-| `hgsl` | `hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n"` |
-| `hgun` | `hg resolve --list`                                                                                         |
-| `hgi`  | `hg incoming`                                                                                               |
-| `hgl`  | `hg pull -u`                                                                                                |
-| `hglr` | `hg pull --rebase`                                                                                          |
-| `hgo`  | `hg outgoing`                                                                                               |
-| `hglg` | `hg log --stat -v`                                                                                          |
-| `hglgp`| `hg log --stat -p -v`                                                                                       |
+| Alias   | Command                                     |
+| ------- | ------------------------------------------- |
+| `hga`   | `hg add`                                    |
+| `hgc`   | `hg commit`                                 |
+| `hgca`  | `hg commit --amend`                         |
+| `hgb`   | `hg branch`                                 |
+| `hgba`  | `hg branches`                               |
+| `hgbk`  | `hg bookmarks`                              |
+| `hgco`  | `hg checkout`                               |
+| `hgd`   | `hg diff`                                   |
+| `hged`  | `hg diffmerge`                              |
+| `hgp`   | `hg push`                                   |
+| `hgs`   | `hg status`                                 |
+| `hgsl`  | `hg log --limit 20 --template "<template>"` |
+| `hgun`  | `hg resolve --list`                         |
+| `hgi`   | `hg incoming`                               |
+| `hgl`   | `hg pull -u`                                |
+| `hglr`  | `hg pull --rebase`                          |
+| `hgo`   | `hg outgoing`                               |
+| `hglg`  | `hg log --stat -v`                          |
+| `hglgp` | `hg log --stat -p -v`                       |
+
 ## Prompt usage
 
 - Switch to a theme which uses `hg_prompt_info`
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index e098664c0..68a3d9a5c 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -10,7 +10,7 @@ alias hgd='hg diff'
 alias hged='hg diffmerge'
 alias hgp='hg push'
 alias hgs='hg status'
-alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n"'
+alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|person}: {desc|strip|firstline}\n" '
 alias hgun='hg resolve --list'
 # pull and update
 alias hgi='hg incoming'

From e52584c90195d0cc0979efec88b94271a31fe494 Mon Sep 17 00:00:00 2001
From: anatolyrr <anatoly.rr@gmail.com>
Date: Sun, 16 Jun 2019 16:50:11 +0300
Subject: [PATCH 272/591] perf(mercurial): improve performance of
 `hg_prompt_info` (#7929)

Replaced two different calls of hg with one `hg --id --branch` for retrieving
information whether we're in a repo (will be empty if not), whether the repo is
dirty (revision id will contain "+" if there are uncommitted changed), and the
branch name.

Closes #6197
Closes #7929
---
 plugins/mercurial/mercurial.plugin.zsh | 27 +++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 68a3d9a5c..f110507fd 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -35,12 +35,29 @@ function hg_get_branch_name() {
 }
 
 function hg_prompt_info {
-  _DISPLAY=`hg branch 2>/dev/null`
-  if [ $? -eq 0 ]; then
-    echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR"
+  local info rev branch dirty
+
+  if ! info=$(hg id --id --branch 2>/dev/null); then
+    return
   fi
-  unset _DISPLAY
+
+  rev="${info[(w)1]}"
+  branch="${${info[(w)2]}:gs/%/%%}"
+
+  if [[ "$rev" = *+ ]]; then
+    dirty="$ZSH_THEME_HG_PROMPT_DIRTY"
+  else
+    dirty="$ZSH_THEME_HG_PROMPT_CLEAN"
+  fi
+
+  echo "${ZSH_PROMPT_BASE_COLOR}\
+${ZSH_THEME_HG_PROMPT_PREFIX}\
+${ZSH_THEME_REPO_NAME_COLOR}\
+${branch}\
+${ZSH_PROMPT_BASE_COLOR}\
+${dirty}\
+${ZSH_THEME_HG_PROMPT_SUFFIX}\
+${ZSH_PROMPT_BASE_COLOR}"
 }
 
 function hg_dirty_choose {

From 24974a135c0bdd4c2d824e4836177ae292f8f56a Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Sun, 18 Feb 2018 19:19:03 -0500
Subject: [PATCH 273/591] feat(mercurial)!: use `PREFIX` and `SUFFIX` settings
 in `hg_prompt_info` (#6631)

BREAKING CHANGE: the `hg_prompt_info` function now uses `ZSH_THEME_HG_PROMPT_PREFIX`
and `ZSH_THEME_HG_PROMPT_SUFFIX` variables when displaying branch information, similar
to the `git_prompt_info` function.

Closes #6631
---
 plugins/mercurial/mercurial.plugin.zsh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index f110507fd..111464af6 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -50,14 +50,7 @@ function hg_prompt_info {
     dirty="$ZSH_THEME_HG_PROMPT_CLEAN"
   fi
 
-  echo "${ZSH_PROMPT_BASE_COLOR}\
-${ZSH_THEME_HG_PROMPT_PREFIX}\
-${ZSH_THEME_REPO_NAME_COLOR}\
-${branch}\
-${ZSH_PROMPT_BASE_COLOR}\
-${dirty}\
-${ZSH_THEME_HG_PROMPT_SUFFIX}\
-${ZSH_PROMPT_BASE_COLOR}"
+  echo "${ZSH_THEME_HG_PROMPT_PREFIX}${branch}${dirty}${ZSH_THEME_HG_PROMPT_SUFFIX}"
 }
 
 function hg_dirty_choose {

From 137b45672dd182e798f7bd0c580aa9b634657990 Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Sun, 18 Feb 2018 19:27:50 -0500
Subject: [PATCH 274/591] feat(bira): improve theme and add support for
 mercurial (#6631)

Added the red dot (instead of the default `*`) if the branch is dirty.

The bira theme only supported git, now it supports mercurial as well. It
needed ito call `hg_prompt_info` and the `ZSH_THEME_HG_PROMPT_`
variables.

Closes #6631
---
 themes/bira.zsh-theme | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
index cdae68d6c..4a05bf3bb 100644
--- a/themes/bira.zsh-theme
+++ b/themes/bira.zsh-theme
@@ -1,32 +1,32 @@
-# ZSH Theme - Preview: https://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+local user_host="%B%(!.%F{red}.%F{green})%n@%m %{$reset_color%}"
+local user_symbol='%(!.#.$)'
+local current_dir="%B%{$fg[blue]%}%~ %{$reset_color%}"
 
-if [[ $UID -eq 0 ]]; then
-    local user_host='%{$terminfo[bold]$fg[red]%}%n@%m %{$reset_color%}'
-    local user_symbol='#'
-else
-    local user_host='%{$terminfo[bold]$fg[green]%}%n@%m %{$reset_color%}'
-    local user_symbol='$'
-fi
-
-local current_dir='%{$terminfo[bold]$fg[blue]%}%~ %{$reset_color%}'
-local git_branch='$(git_prompt_info)'
+local vcs_branch='$(git_prompt_info)$(hg_prompt_info)'
 local rvm_ruby='$(ruby_prompt_info)'
 local venv_prompt='$(virtualenv_prompt_info)'
 
 ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
 
-PROMPT="╭─${user_host}${current_dir}${rvm_ruby}${git_branch}${venv_prompt}
+PROMPT="╭─${user_host}${current_dir}${rvm_ruby}${vcs_branch}${venv_prompt}
 ╰─%B${user_symbol}%b "
 RPROMPT="%B${return_code}%b"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$fg[yellow]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[yellow]%}"
+
+ZSH_THEME_HG_PROMPT_PREFIX="$ZSH_THEME_GIT_PROMPT_PREFIX"
+ZSH_THEME_HG_PROMPT_SUFFIX="$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ZSH_THEME_HG_PROMPT_DIRTY="$ZSH_THEME_GIT_PROMPT_DIRTY"
+ZSH_THEME_HG_PROMPT_CLEAN="$ZSH_THEME_GIT_PROMPT_CLEAN"
 
 ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}‹"
 ZSH_THEME_RUBY_PROMPT_SUFFIX="› %{$reset_color%}"
 
 ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX="%{$fg[green]%}‹"
 ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="› %{$reset_color%}"
-ZSH_THEME_VIRTUALENV_PREFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX
-ZSH_THEME_VIRTUALENV_SUFFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX
+ZSH_THEME_VIRTUALENV_PREFIX="$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX"
+ZSH_THEME_VIRTUALENV_SUFFIX="$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX"

From d058801a18270800c906d92dd41e275f4da24397 Mon Sep 17 00:00:00 2001
From: Pandu POLUAN <pepoluan@gmail.com>
Date: Mon, 11 May 2020 14:55:20 +0700
Subject: [PATCH 275/591] feat(mercurial): add `hgci` alias for interactive
 commit (#8912)

Closes #8912
---
 plugins/mercurial/README.md            | 1 +
 plugins/mercurial/mercurial.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index a362de4ce..19d4a17b1 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -16,6 +16,7 @@ plugins=(... mercurial)
 | `hga`   | `hg add`                                    |
 | `hgc`   | `hg commit`                                 |
 | `hgca`  | `hg commit --amend`                         |
+| `hgci`  | `hg commit --interactive`                   |
 | `hgb`   | `hg branch`                                 |
 | `hgba`  | `hg branches`                               |
 | `hgbk`  | `hg bookmarks`                              |
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 111464af6..8b50da9d8 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -2,6 +2,7 @@
 alias hga='hg add'
 alias hgc='hg commit'
 alias hgca='hg commit --amend'
+alias hgci='hg commit --interactive'
 alias hgb='hg branch'
 alias hgba='hg branches'
 alias hgbk='hg bookmarks'

From 4119f53004de987215e4ae2ce49d0f818ad58c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 2 Dec 2021 11:12:18 +0100
Subject: [PATCH 276/591] perf(mercurial): optimize utility functions

---
 plugins/mercurial/mercurial.plugin.zsh | 127 ++++++++++++++-----------
 themes/minimal.zsh-theme               |  32 ++++---
 2 files changed, 91 insertions(+), 68 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 8b50da9d8..6e72f0b1e 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -21,55 +21,6 @@ alias hgo='hg outgoing'
 alias hglg='hg log --stat -v'
 alias hglgp='hg log --stat  -p -v'
 
-function in_hg() {
-  if $(hg branch > /dev/null 2>&1); then
-    echo 1
-  fi
-}
-
-function hg_get_branch_name() {
-  branch=`hg branch 2>/dev/null`
-  if [ $? -eq 0 ]; then
-    echo $branch
-  fi
-  unset branch
-}
-
-function hg_prompt_info {
-  local info rev branch dirty
-
-  if ! info=$(hg id --id --branch 2>/dev/null); then
-    return
-  fi
-
-  rev="${info[(w)1]}"
-  branch="${${info[(w)2]}:gs/%/%%}"
-
-  if [[ "$rev" = *+ ]]; then
-    dirty="$ZSH_THEME_HG_PROMPT_DIRTY"
-  else
-    dirty="$ZSH_THEME_HG_PROMPT_CLEAN"
-  fi
-
-  echo "${ZSH_THEME_HG_PROMPT_PREFIX}${branch}${dirty}${ZSH_THEME_HG_PROMPT_SUFFIX}"
-}
-
-function hg_dirty_choose {
-  hg status -mar 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'
-  if [ $? -eq 0 ]; then
-    if [ $pipestatus[-1] -eq 0 ]; then
-      # Grep exits with 0 when "One or more lines were selected", return "dirty".
-      echo $1
-      return
-    fi
-  fi
-  echo $2
-}
-
-function hg_dirty {
-  hg_dirty_choose $ZSH_THEME_HG_PROMPT_DIRTY $ZSH_THEME_HG_PROMPT_CLEAN
-}
-
 function hgic() {
   hg incoming "$@" | grep "changeset" | wc -l
 }
@@ -78,8 +29,78 @@ function hgoc() {
   hg outgoing "$@" | grep "changeset" | wc -l
 }
 
-function hg_get_bookmark_name() {
-  if [ $(in_hg) ]; then
-    echo $(hg id -B)
-  fi
+# functions
+function hg_root() {
+  local dir="$PWD"
+  while [[ "$dir" != "/" ]]; do
+    if [[ -d "$dir/.hg" ]]; then
+      echo "$dir"
+      return 0
+    fi
+    dir="${dir:h}"
+  done
+  return 1
+}
+
+function in_hg() {
+  hg_root >/dev/null
+}
+
+function hg_get_branch_name() {
+  local dir
+  if ! dir=$(hg_root); then
+    return
+  fi
+
+  if [[ ! -f "$dir/.hg/branch" ]]; then
+    echo default
+    return
+  fi
+
+  echo "$(<"$dir/.hg/branch")"
+}
+
+function hg_get_bookmark_name() {
+  local dir
+  if ! dir=$(hg_root); then
+    return
+  fi
+
+  if [[ ! -f "$dir/.hg/bookmarks.current" ]]; then
+    return
+  fi
+
+  echo "$(<"$dir/.hg/bookmarks.current")"
+}
+
+function hg_prompt_info {
+  local dir branch dirty
+  if ! dir=$(hg_root); then
+    return
+  fi
+
+  if [[ ! -f "$dir/.hg/branch" ]]; then
+    branch=default
+  else
+    branch="$(<"$dir/.hg/branch")"
+  fi
+
+  dirty="$(hg_dirty)"
+
+  echo "${ZSH_THEME_HG_PROMPT_PREFIX}${branch:gs/%/%%}${dirty}${ZSH_THEME_HG_PROMPT_SUFFIX}"
+}
+
+function hg_dirty {
+  local hg_status
+  if ! hg_status="$(hg status -mar 2>/dev/null)"; then
+    return
+  fi
+
+  # grep exits with 0 when dirty
+  if command grep -Eq '^\s*[ACDIM!?L]' <<< "$hg_status"; then
+    echo $ZSH_THEME_HG_PROMPT_DIRTY
+    return
+  fi
+
+  echo $ZSH_THEME_HG_PROMPT_CLEAN
 }
diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
index e05df9c9b..588ab6982 100644
--- a/themes/minimal.zsh-theme
+++ b/themes/minimal.zsh-theme
@@ -2,23 +2,25 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$fg[white]%}]%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_CLEAN="]%{$reset_color%} "
-ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
-ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
-ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
-ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
-ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
-ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
-ZSH_THEME_HG_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
-ZSH_THEME_HG_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
+
+ZSH_THEME_SVN_PROMPT_PREFIX="$ZSH_THEME_GIT_PROMPT_PREFIX"
+ZSH_THEME_SVN_PROMPT_SUFFIX="$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ZSH_THEME_SVN_PROMPT_DIRTY="$ZSH_THEME_GIT_PROMPT_DIRTY"
+ZSH_THEME_SVN_PROMPT_CLEAN="$ZSH_THEME_GIT_PROMPT_CLEAN"
+
+ZSH_THEME_HG_PROMPT_PREFIX="$ZSH_THEME_GIT_PROMPT_PREFIX"
+ZSH_THEME_HG_PROMPT_SUFFIX="$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ZSH_THEME_HG_PROMPT_DIRTY="$ZSH_THEME_GIT_PROMPT_DIRTY"
+ZSH_THEME_HG_PROMPT_CLEAN="$ZSH_THEME_GIT_PROMPT_CLEAN"
 
 vcs_status() {
-    if [[ $(whence in_svn) != "" ]] && in_svn; then
-        svn_prompt_info
-    elif [[ $(whence in_hg) != "" ]] && in_hg; then
-        hg_prompt_info
-    else
-        git_prompt_info
-    fi
+  if (( ${+functions[in_svn]} )) && in_svn; then
+    svn_prompt_info
+  elif (( ${+functions[in_hg]} )) && in_hg; then
+    hg_prompt_info
+  else
+    git_prompt_info
+  fi
 }
 
 PROMPT='%2~ $(vcs_status)»%b '

From 1c07001896de18cd0a742d7892b948ba7bab10c7 Mon Sep 17 00:00:00 2001
From: David Sutherland <djsutho@gmail.com>
Date: Thu, 17 Oct 2013 16:48:58 +1000
Subject: [PATCH 277/591] fix(mercurial): correctly check for untracked files
 in `hg_dirty` (#2177)

Closes #2177
Closes #6197

Co-authored-by: Henrik Ravn <hravnx@gmail.com>
---
 plugins/mercurial/mercurial.plugin.zsh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 6e72f0b1e..9b85d02f6 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -91,13 +91,25 @@ function hg_prompt_info {
 }
 
 function hg_dirty {
-  local hg_status
-  if ! hg_status="$(hg status -mar 2>/dev/null)"; then
+  # Do nothing if clean / dirty settings aren't defined
+  if [[ -z "$ZSH_THEME_HG_PROMPT_DIRTY" && -z "$ZSH_THEME_HG_PROMPT_CLEAN" ]]; then
     return
   fi
 
+  # Check if there are modifications
+  local hg_status
+  if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" = true ]]; then
+    if ! hg_status="$(hg status -q 2>/dev/null)"; then
+      return
+    fi
+  else
+    if ! hg_status="$(hg status 2>/dev/null)"; then
+      return
+    fi
+  fi
+
   # grep exits with 0 when dirty
-  if command grep -Eq '^\s*[ACDIM!?L]' <<< "$hg_status"; then
+  if command grep -Eq '^\s*[ACDIMR!?L].*$' <<< "$hg_status"; then
     echo $ZSH_THEME_HG_PROMPT_DIRTY
     return
   fi

From c172624398918577bcb212d07b0036f4058cb5c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 30 Nov 2021 18:07:42 +0100
Subject: [PATCH 278/591] style(af-magic): fix code style and remove
 unnecessary variables

---
 themes/af-magic.zsh-theme | 61 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 1d2af3458..d939d546f 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -1,47 +1,46 @@
 # af-magic.zsh-theme
-# Repo: https://github.com/andyfleming/oh-my-zsh
-# Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme
+#
+# Author: Andy Fleming
+# URL: http://andyfleming.com/
 
-
-# settings
-typeset +H return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
-typeset +H my_gray="$FG[237]"
-typeset +H my_orange="$FG[214]"
-
-# separator dashes size
+# dashed separator size
 function afmagic_dashes {
-	local PYTHON_ENV="$VIRTUAL_ENV"
-	[[ -z "$PYTHON_ENV" ]] && PYTHON_ENV="$CONDA_DEFAULT_ENV"
+  # check either virtualenv or condaenv variables
+  local python_env="${VIRTUAL_ENV:-$CONDA_DEFAULT_ENV}"
 
-	if [[ -n "$PYTHON_ENV" && "$PS1" = \(* ]]; then
-		echo $(( COLUMNS - ${#PYTHON_ENV} - 3 ))
-	else
-		echo $COLUMNS
-	fi
+  # if there is a python virtual environment and it is displayed in
+  # the prompt, account for it when returning the number of dashes
+  if [[ -n "$python_env" && "$PS1" = \(* ]]; then
+    echo $(( COLUMNS - ${#python_env} - 3 ))
+  else
+    echo $COLUMNS
+  fi
 }
 
-# primary prompt
-PS1='$FG[237]${(l.$(afmagic_dashes)..-.)}%{$reset_color%}
-$FG[032]%~$(git_prompt_info)$(hg_prompt_info) $FG[105]%(!.#.»)%{$reset_color%} '
-PS2='%{$fg[red]%}\ %{$reset_color%}'
-RPS1='${return_code}'
+# primary prompt: dashed separator, directory and vcs info
+PS1="${FG[237]}\${(l.\$(afmagic_dashes)..-.)}%{$reset_color%}
+${FG[032]}%~\$(git_prompt_info)\$(hg_prompt_info) ${FG[105]}%(!.#.»)%{$reset_color%} "
+PS2="%{$fg[red]%}\ %{$reset_color%}"
 
-# right prompt
-(( $+functions[virtualenv_prompt_info] )) && RPS1+='$(virtualenv_prompt_info)'
-RPS1+=' $my_gray%n@%m%{$reset_color%}%'
+# right prompt: return code, virtualenv and context (user@host)
+RPS1="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+if (( $+functions[virtualenv_prompt_info] )); then
+  RPS1+='$(virtualenv_prompt_info)'
+fi
+RPS1+=" ${FG[237]}%n@%m%{$reset_color%}"
 
 # git settings
-ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075]($FG[078]"
+ZSH_THEME_GIT_PROMPT_PREFIX="${FG[075]}(${FG[078]}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
-ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"
 
 # hg settings
-ZSH_THEME_HG_PROMPT_PREFIX="$FG[075]($FG[078]"
+ZSH_THEME_HG_PROMPT_PREFIX="${FG[075]}(${FG[078]}"
 ZSH_THEME_HG_PROMPT_CLEAN=""
-ZSH_THEME_HG_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
-ZSH_THEME_HG_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"
+ZSH_THEME_HG_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
+ZSH_THEME_HG_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"
 
 # virtualenv settings
-ZSH_THEME_VIRTUALENV_PREFIX=" $FG[075]["
+ZSH_THEME_VIRTUALENV_PREFIX=" ${FG[075]}["
 ZSH_THEME_VIRTUALENV_SUFFIX="]%{$reset_color%}"

From ee46d198ad94c3e4942f2557b6ecade5f9224b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 11:10:47 +0100
Subject: [PATCH 279/591] style(afowler): simplify code and remove unnecessary
 variables

---
 themes/afowler.zsh-theme | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/themes/afowler.zsh-theme b/themes/afowler.zsh-theme
index 3a4753fc1..783bdc269 100644
--- a/themes/afowler.zsh-theme
+++ b/themes/afowler.zsh-theme
@@ -1,10 +1,5 @@
-if [ $UID -eq 0 ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
-
-local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
-
-PROMPT='%m %{${fg_bold[blue]}%}:: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} '
-
-RPS1="${return_code}"
+PROMPT='%m %B%F{blue}:: %b%F{green}%3~ $(git_prompt_info)%B%(!.%F{red}.%F{blue})»%f%b '
+RPS1='%(?..%F{red}%? ↵%f)'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"

From a1a63f4c7d3e765ffc4af93793d6d45287e80291 Mon Sep 17 00:00:00 2001
From: Frank Van Damme <frank.van.damme@vub.ac.be>
Date: Tue, 10 Jan 2017 09:23:49 +0100
Subject: [PATCH 280/591] feat(afowler): add mercurial support

Closes #5992
---
 themes/afowler.zsh-theme | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/themes/afowler.zsh-theme b/themes/afowler.zsh-theme
index 783bdc269..f6d3ef82a 100644
--- a/themes/afowler.zsh-theme
+++ b/themes/afowler.zsh-theme
@@ -1,5 +1,10 @@
-PROMPT='%m %B%F{blue}:: %b%F{green}%3~ $(git_prompt_info)%B%(!.%F{red}.%F{blue})»%f%b '
+PROMPT='%m %B%F{blue}:: %b%F{green}%3~ $(hg_prompt_info)$(git_prompt_info)%B%(!.%F{red}.%F{blue})»%f%b '
 RPS1='%(?..%F{red}%? ↵%f)'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
+
+ZSH_THEME_HG_PROMPT_PREFIX="%{$fg[magenta]%}hg:‹%{$fg[yellow]%}"
+ZSH_THEME_HG_PROMPT_SUFFIX="%{$fg[magenta]%}› %{$reset_color%}"
+ZSH_THEME_HG_PROMPT_DIRTY=" %{$fg[red]%}✗"
+ZSH_THEME_HG_PROMPT_CLEAN=""

From e96b8bd52366b526d7ebb22d947b54d286d6da61 Mon Sep 17 00:00:00 2001
From: fengkx <liangkx8237@gmail.com>
Date: Mon, 13 Dec 2021 18:26:05 +0800
Subject: [PATCH 281/591] refactor(shell-proxy)!: rename env vars to
 `SHELLPROXY_*` and add usage message (#10456)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BREAKING CHANGE: the `DEFAULT_PROXY` setting has been renamed to `SHELLPROXY_URL`,
and `CONFIG_PROXY` has been renamed to `SHELLPROXY_CONFIG`. See the plugin README
for more information.

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 .github/actions/spelling/expect.txt        |  1 +
 plugins/shell-proxy/README.md              | 58 +++++++++++++---------
 plugins/shell-proxy/proxy.py               | 21 +++++---
 plugins/shell-proxy/shell-proxy.plugin.zsh | 37 +++++++++++---
 4 files changed, 77 insertions(+), 40 deletions(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 76e9fdf31..533ae49c0 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -3456,6 +3456,7 @@ sheerun
 shellcheck
 shellinit
 shellperson
+SHELLPROXY
 shitload
 SHLVL
 shm
diff --git a/plugins/shell-proxy/README.md b/plugins/shell-proxy/README.md
index 6f2cd13e0..b19888c56 100644
--- a/plugins/shell-proxy/README.md
+++ b/plugins/shell-proxy/README.md
@@ -1,42 +1,56 @@
-# Shell Proxy oh-my-zsh plugin
+# shell-proxy plugin
 
-This a pure user-space program, shell-proxy setter, written Python3 and Bash.
+This a pure user-space program, shell-proxy setter, written in Python3 and Zsh.
 
-100% only no side-effects, only effect **environment variables** and **aliases**
+To use it, add `shell-proxy` to the plugins array in your zshrc file:
 
-## Key feature
+```zsh
+plugins=(... shell-proxy)
+```
 
-- Support Ubuntu, Archlinux, etc (Linux)
-- Support macOS
-- Support git via based-`$GIT_SSH`
-- Support ssh, sftp, scp, slogin and ssh-copy-id via based-`alias`
-- Built-in Auto-complete
+## Key features
+
+- Supports macOS and Linux (Ubuntu, Archlinux, etc.)
+- Supports git via setting `$GIT_SSH`
+- Supports ssh, sftp, scp, slogin and ssh-copy-id via setting aliases
+- Built-in autocomplete
 
 ## Usage
 
-Method 1:
+### Method 1
 
-`$DEFAULT_PROXY` is the proxy URL you will set
+Set `SHELLPROXY_URL` environment variable to the URL of the proxy server:
 
-Method 2:
+```sh
+SHELLPROXY_URL="http://127.0.0.1:8123"
+proxy enable
+```
 
-Write a program to `$HOME/.config/proxy` in the file.
+### Method 2
 
-Example program:
+Write a program file in `$HOME/.config/proxy` so that the proxy URL is defined dynamically.
+Note that the program file must be executable.
 
-```bash
+Example:
+
+```sh
 #!/bin/bash
-# The file path: $HOME/.config/proxy
-if [[ "$OSTYPE" == "darwin"* ]]; then
+
+if [[ "$(uname)" = Darwin ]]; then
   echo "http://127.0.0.1:6152" # Surge Mac
 else
   echo "http://127.0.0.1:8123" # polipo
 fi
 ```
 
-Method 3:
+### Method 3
 
-The working path of **Method 2** can be changed via `$CONFIG_PROXY`
+Use [method 2](#method-2) but define the location of the program file by setting the
+`SHELLPROXY_CONFIG` environment variable:
+
+```sh
+SHELLPROXY_CONFIG="$HOME/.dotfiles/proxy-config"
+```
 
 ## Reference
 
@@ -45,8 +59,4 @@ The working path of **Method 2** can be changed via `$CONFIG_PROXY`
 
 ## Maintainer
 
-- <https://github.com/septs>
-
-## The oh-my-zsh plugin (shell-proxy)
-
-Public Domain
+- [@septs](https://github.com/septs)
diff --git a/plugins/shell-proxy/proxy.py b/plugins/shell-proxy/proxy.py
index 97f4cf873..14f2944cc 100755
--- a/plugins/shell-proxy/proxy.py
+++ b/plugins/shell-proxy/proxy.py
@@ -5,16 +5,22 @@ from subprocess import check_output, list2cmdline
 
 cwd = os.path.dirname(__file__)
 ssh_agent = os.path.join(cwd, "ssh-agent.py")
-user_proxy = os.environ.get("CONFIG_PROXY", os.path.expandvars("$HOME/.config/proxy"))
+proxy_env = "SHELLPROXY_URL"
+proxy_config = os.environ.get("SHELLPROXY_CONFIG") or os.path.expandvars("$HOME/.config/proxy")
 
+usage="""shell-proxy: no proxy configuration found.
+
+Set `{env}` or create a config file at `{config}`
+See the plugin README for more information.""".format(env=proxy_env, config=proxy_config)
 
 def get_http_proxy():
-    default_proxy = os.environ.get("DEFAULT_PROXY")
+    default_proxy = os.environ.get(proxy_env)
     if default_proxy:
         return default_proxy
-    if os.path.isfile(user_proxy):
-        return check_output(user_proxy).decode("utf-8").strip()
-    raise Exception("Not found, Proxy configuration")
+    if os.path.isfile(proxy_config):
+        return check_output(proxy_config).decode("utf-8").strip()
+    print(usage, file=sys.stderr)
+    sys.exit(1)
 
 
 def make_proxies(url: str):
@@ -53,8 +59,7 @@ class CommandSet:
             cmdline("echo", _)
 
     def usage(self):
-        cmdline("echo", "usage: proxy {enable,disable,status}")
-        self.status()
+        print("usage: proxy {enable,disable,status}", file=sys.stderr)
 
 
 def cmdline(*items):
@@ -65,7 +70,7 @@ def main():
     command = CommandSet()
     if len(sys.argv) == 1:
         command.usage()
-        sys.exit(-1)
+        sys.exit(1)
     getattr(command, sys.argv[1], command.usage)()
 
 
diff --git a/plugins/shell-proxy/shell-proxy.plugin.zsh b/plugins/shell-proxy/shell-proxy.plugin.zsh
index 315ade665..9d45b5269 100644
--- a/plugins/shell-proxy/shell-proxy.plugin.zsh
+++ b/plugins/shell-proxy/shell-proxy.plugin.zsh
@@ -1,16 +1,37 @@
 #!/usr/bin/bash
-# shellcheck disable=SC1090
-
-__PROXY__="${0:A:h}/proxy.py"
+# shellcheck disable=SC1090,SC2154
 
 proxy() {
-	source <(env "DEFAULT_PROXY=$DEFAULT_PROXY" "$__PROXY__" "$1")
+  # deprecate $DEFAULT_PROXY, use SHELLPROXY_URL instead
+  if [[ -n "$DEFAULT_PROXY" && -z "$SHELLPROXY_URL" ]]; then
+    echo >&2 "proxy: DEFAULT_PROXY is deprecated, use SHELLPROXY_URL instead"
+    SHELLPROXY_URL="$DEFAULT_PROXY"
+    unset DEFAULT_PROXY
+  fi
+
+  # deprecate CONFIG_PROXY, use SHELLPROXY_CONFIG instead
+  if [[ -n "$CONFIG_PROXY" && -z "$SHELLPROXY_CONFIG" ]]; then
+    echo >&2 "proxy: CONFIG_PROXY is deprecated, use SHELLPROXY_CONFIG instead"
+    SHELLPROXY_CONFIG="$CONFIG_PROXY"
+    unset CONFIG_PROXY
+  fi
+
+  # the proxy.py script is in the same directory as this function
+  local proxy="${functions_source[$0]:A:h}/proxy.py"
+
+  # capture the output of the proxy script and bail out if it fails
+  local output
+  output="$(SHELLPROXY_URL="$SHELLPROXY_URL" SHELLPROXY_CONFIG="$SHELLPROXY_CONFIG" "$proxy" "$1")" ||
+    return $?
+
+  # evaluate the output generated by the proxy script
+  source <(echo "$output")
 }
 
 _proxy() {
-	local -r commands=('enable' 'disable' 'status')
-	compset -P '*,'
-	compadd -S '' "${commands[@]}"
+  local -r commands=('enable' 'disable' 'status')
+  compset -P '*,'
+  compadd -S '' "${commands[@]}"
 }
 
-compdef '_proxy' 'proxy'
+compdef _proxy proxy

From 428f815169ea8ff4918cff41d8ab68fe9d9c0c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 30 Nov 2021 17:43:36 +0100
Subject: [PATCH 282/591] fix(lib): %-quote git prompt functions

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 8623473b0..62aac8f39 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -29,7 +29,7 @@ function git_prompt_info() {
     && upstream=" -> ${upstream}"
   fi
 
-  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref}${upstream}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 # Checks if working tree is dirty

From a94e263426bdf6e05cdfa9fae5e80cec5ee8d9ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 30 Nov 2021 17:37:29 +0100
Subject: [PATCH 283/591] refactor(adben): simplify used variables and %-quote
 prompt functions

Closes #10474

Co-authored-by: Tom Payne <twpayne@gmail.com>
---
 .github/actions/spelling/expect.txt |   1 -
 themes/adben.zsh-theme              | 106 +++++++++++++---------------
 2 files changed, 49 insertions(+), 58 deletions(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 533ae49c0..65215c6c3 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -3688,7 +3688,6 @@ Subsubcommands
 Subsubsubcommands
 sudo
 sudoedit
-SUFIX
 suitenames
 sunaku
 sunion
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index ebdec7c82..ddb34236b 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -32,42 +32,44 @@
 
 ########## COLOR ###########
 for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
-  eval PR_$COLOR='%{$fg[${(L)COLOR}]%}'
-  eval PR_BRIGHT_$COLOR='%{$fg_bold[${(L)COLOR}]%}'
+  print -v "PR_$COLOR" "%b%{$fg[${(L)COLOR}]%}"
+  print -v "PR_BRIGHT_$COLOR" "%B%{$fg[${(L)COLOR}]%}"
 done
-
 PR_RESET="%{$reset_color%}"
-RED_START="${PR_RESET}${PR_GREY}<${PR_RESET}${PR_RED}<${PR_BRIGHT_RED}<${PR_RESET} "
-RED_END="${PR_RESET}${PR_BRIGHT_RED}>${PR_RESET}${PR_RED}>${PR_GREY}>${PR_RESET} "
-GREEN_END="${PR_RESET}${PR_BRIGHT_GREEN}>${PR_RESET}${PR_GREEN}>${PR_GREY}>${PR_RESET} "
-GREEN_BASE_START="${PR_RESET}${PR_GREY}>${PR_RESET}${PR_GREEN}>${PR_BRIGHT_GREEN}>${PR_RESET}"
-GREEN_START_P1="${PR_RESET}${GREEN_BASE_START}${PR_RESET} "
-DIVISION="${PR_RESET}${PR_RED} < ${PR_RESET}"
-VCS_DIRTY_COLOR="${PR_RESET}${PR_YELLOW}"
-VCS_CLEAN_COLOR="${PR_RESET}${PR_GREEN}"
-VCS_SUFIX_COLOR="${PR_RESET}${PR_RED}› ${PR_RESET}"
+
+RED_START="${PR_GREY}<${PR_RED}<${PR_BRIGHT_RED}<${PR_RESET} "
+RED_END="${PR_BRIGHT_RED}>${PR_RED}>${PR_GREY}>${PR_RESET} "
+GREEN_START="${PR_GREY}>${PR_GREEN}>${PR_BRIGHT_GREEN}>${PR_RESET}"
+GREEN_END="${PR_BRIGHT_GREEN}>${PR_GREEN}>${PR_GREY}>${PR_RESET} "
+
+########## VCS ###########
+VCS_DIRTY_COLOR="${PR_YELLOW}"
+VCS_CLEAN_COLOR="${PR_GREEN}"
+VCS_SUFFIX_COLOR="${PR_RED}› ${PR_RESET}"
 
 ########## SVN ###########
-ZSH_THEME_SVN_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹svn:"
-ZSH_THEME_SVN_PROMPT_SUFFIX=""
-ZSH_THEME_SVN_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}"
-ZSH_THEME_SVN_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}"
+ZSH_THEME_SVN_PROMPT_PREFIX="${PR_RED}‹svn:"
+ZSH_THEME_SVN_PROMPT_SUFFIX="${VCS_SUFFIX_COLOR}"
+ZSH_THEME_SVN_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘"
+ZSH_THEME_SVN_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔"
 
 ########## GIT ###########
-ZSH_THEME_GIT_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹git:"
-ZSH_THEME_GIT_PROMPT_SUFFIX=""
-ZSH_THEME_GIT_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}"
-ZSH_THEME_GIT_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}"
-ZSH_THEME_GIT_PROMPT_ADDED="${PR_RESET}${PR_YELLOW} ✚${PR_RESET}"
-ZSH_THEME_GIT_PROMPT_MODIFIED="${PR_RESET}${PR_YELLOW} ✹${PR_RESET}"
-ZSH_THEME_GIT_PROMPT_DELETED="${PR_RESET}${PR_YELLOW} ✖${PR_RESET}"
-ZSH_THEME_GIT_PROMPT_RENAMED="${PR_RESET}${PR_YELLOW} ➜${PR_RESET}"
-ZSH_THEME_GIT_PROMPT_UNMERGED="${PR_RESET}${PR_YELLOW} ═${PR_RESET}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="${PR_RESET}${PR_YELLOW} ✭${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_PREFIX="${PR_RED}‹git:"
+ZSH_THEME_GIT_PROMPT_SUFFIX="${VCS_SUFFIX_COLOR}"
+ZSH_THEME_GIT_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘"
+ZSH_THEME_GIT_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔"
+ZSH_THEME_GIT_PROMPT_ADDED="${PR_YELLOW} ✚"
+ZSH_THEME_GIT_PROMPT_MODIFIED="${PR_YELLOW} ✹"
+ZSH_THEME_GIT_PROMPT_DELETED="${PR_YELLOW} ✖"
+ZSH_THEME_GIT_PROMPT_RENAMED="${PR_YELLOW} ➜"
+ZSH_THEME_GIT_PROMPT_UNMERGED="${PR_YELLOW} ═"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="${PR_YELLOW} ✭"
 
 # Get a fortune quote
 ps1_fortune() {
-  (( ${+commands[fortune]} )) && fortune
+  if (( ${+commands[fortune]} )); then
+    fortune
+  fi
 }
 
 # Obtain a command tip
@@ -77,33 +79,27 @@ 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
-  } | sed 1d | sed '/^$/d'
+    fi 
+  } | sed '1d;/^$/d'
 }
 
-function precmd_adben {
-  prompt_header() {
-    if [[ "$ENABLE_COMMAND_TIP" = true ]]; then
-      ps1_command_tip
-    else
-      ps1_fortune
-    fi
-  }
+# Show prompt header (fortune / command tip)
+prompt_header() {
+  local header=$(
+    case "${ENABLE_COMMAND_TIP:-}" in
+    true) ps1_command_tip ;;
+    *) ps1_fortune ;;
+    esac
+  )
 
-  PROMPT_HEAD="${RED_START}${PR_YELLOW}$(prompt_header)${PR_RESET}"
-
-  # set a simple variable to show when in screen
-  if [[ -n "${WINDOW}" ]]; then
-    SCREEN=""
-  fi
+  # Make sure to quote % so that they're not expanded by the prompt
+  echo -n "${header:gs/%/%%}"
 }
 
 # Context: user@directory or just directory
 prompt_context() {
   if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-    echo -n "${PR_RESET}${PR_RED}$USERNAME@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
-  else
-    echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+    echo -n "${PR_RESET}${PR_RED}%n@%m"
   fi
 }
 
@@ -111,16 +107,12 @@ prompt_context() {
 
 # Required for the prompt
 setopt prompt_subst
-autoload zsh/terminfo
 
-# Prompt
-PROMPT='${PROMPT_HEAD}
-${RED_START}$(prompt_context)
-${GREEN_START_P1}'
-RPROMPT='${PR_RESET}$(git_prompt_info)$(svn_prompt_info)${PR_YELLOW}%D{%R.%S %a %b %d %Y} ${GREEN_END}${PR_RESET}'
+# Prompt: header, context (user@host), directory
+PROMPT="${RED_START}${PR_YELLOW}\$(prompt_header)${PR_RESET}
+${RED_START}\$(prompt_context)${PR_BRIGHT_YELLOW}%~${PR_RESET}
+${GREEN_START} "
+# Right prompt: vcs status + time
+RPROMPT="\$(git_prompt_info)\$(svn_prompt_info)${PR_YELLOW}%D{%R.%S %a %b %d %Y} ${GREEN_END}"
 # Matching continuation prompt
-PROMPT2='${GREEN_BASE_START}${PR_RESET} %_ ${GREEN_BASE_START}${PR_RESET} '
-
-# Prompt head
-autoload -Uz add-zsh-hook
-add-zsh-hook precmd precmd_adben
+PROMPT2="${GREEN_START} %_ ${GREEN_START} "

From 1b01496c21e9ca7ef79d6a1dcb4728abd7a2803a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 14:42:57 +0100
Subject: [PATCH 284/591] fix(bira): fix color bleed in user_host prompt
 section (#10505)

Fixes #10505
---
 themes/bira.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
index 4a05bf3bb..42a70a018 100644
--- a/themes/bira.zsh-theme
+++ b/themes/bira.zsh-theme
@@ -1,5 +1,5 @@
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
-local user_host="%B%(!.%F{red}.%F{green})%n@%m %{$reset_color%}"
+local user_host="%B%(!.%{$fg[red]%}.%{$fg[green]%})%n@%m%{$reset_color%} "
 local user_symbol='%(!.#.$)'
 local current_dir="%B%{$fg[blue]%}%~ %{$reset_color%}"
 

From 065e8ebdd02ba2554d4509424f1cde0e84361357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 15:13:43 +0100
Subject: [PATCH 285/591] style(jonathan): fix code style in jonathan theme

---
 themes/jonathan.zsh-theme | 255 +++++++++++++++++---------------------
 themes/simonoff.zsh-theme | 134 ++++++++++----------
 2 files changed, 178 insertions(+), 211 deletions(-)

diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 2f0e77431..2c5f30060 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -1,153 +1,124 @@
-functions rbenv_prompt_info >& /dev/null || rbenv_prompt_info(){}
-
 function theme_precmd {
-    local TERMWIDTH
-    (( TERMWIDTH = ${COLUMNS} - 1 ))
+  local -i TERMWIDTH=$COLUMNS
 
+  PR_FILLBAR=""
+  PR_PWDLEN=""
 
-    ###
-    # Truncate the path if it's too long.
-
-    PR_FILLBAR=""
-    PR_PWDLEN=""
-
-    local promptsize=${#${(%):---(%n@%m:%l)---()--}}
-    local rubyprompt=`rvm_prompt_info || rbenv_prompt_info`
-    local rubypromptsize=${#${rubyprompt}}
-    local pwdsize=${#${(%):-%~}}
-
-    if [[ "$promptsize + $rubypromptsize + $pwdsize" -gt $TERMWIDTH ]]; then
-      ((PR_PWDLEN=$TERMWIDTH - $promptsize))
-    else
-      PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}"
-    fi
+  local promptsize=${#${(%):---(%n@%m:%l)---()--}}
+  local rubypromptsize=${#${(%)$(ruby_prompt_info)}}
+  local pwdsize=${#${(%):-%~}}
 
+  # Truncate the path if it's too long.
+  if (( promptsize + rubypromptsize + pwdsize > TERMWIDTH )); then
+    (( PR_PWDLEN = TERMWIDTH - promptsize ))
+  else
+    PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}"
+  fi
 }
 
-
-setopt extended_glob
-theme_preexec () {
-    if [[ "$TERM" == "screen" ]]; then
-	local CMD=${1[(wr)^(*=*|sudo|-*)]}
-	echo -n "\ek$CMD\e\\"
-    fi
+function theme_preexec {
+  setopt local_options extended_glob
+  if [[ "$TERM" = "screen" ]]; then
+    local CMD=${1[(wr)^(*=*|sudo|-*)]}
+    echo -n "\ek$CMD\e\\"
+  fi
 }
 
-
-setprompt () {
-    ###
-    # Need this so the prompt will work.
-
-    setopt prompt_subst
-
-
-    ###
-    # See if we can use colors.
-
-    autoload zsh/terminfo
-    for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
-	eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
-	eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
-	(( count = $count + 1 ))
-    done
-    PR_NO_COLOUR="%{$terminfo[sgr0]%}"
-
-    ###
-    # Modify Git prompt
-    ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
-    ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-    ZSH_THEME_GIT_PROMPT_DIRTY=""
-    ZSH_THEME_GIT_PROMPT_CLEAN=""
-
-    ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
-    ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
-    ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
-    ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
-    ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
-    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
-
-    ###
-    # See if we can use extended characters to look nicer.
-    # UTF-8 Fixed
-
-    if [[ $(locale charmap) == "UTF-8" ]]; then
-	PR_SET_CHARSET=""
-	PR_SHIFT_IN=""
-	PR_SHIFT_OUT=""
-	PR_HBAR="─"
-        PR_ULCORNER="┌"
-        PR_LLCORNER="└"
-        PR_LRCORNER="┘"
-        PR_URCORNER="┐"
-    else
-        typeset -A altchar
-        set -A altchar ${(s..)terminfo[acsc]}
-        # Some stuff to help us draw nice lines
-        PR_SET_CHARSET="%{$terminfo[enacs]%}"
-        PR_SHIFT_IN="%{$terminfo[smacs]%}"
-        PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
-        PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT'
-        PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT'
-        PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT'
-        PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT'
-        PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
-     fi
-
-
-    ###
-    # Decide if we need to set titlebar text.
-
-    case $TERM in
-	xterm*)
-	    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}'
-	    ;;
-	screen)
-	    PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
-	    ;;
-	*)
-	    PR_TITLEBAR=''
-	    ;;
-    esac
-
-
-    ###
-    # Decide whether to set a screen title
-    if [[ "$TERM" == "screen" ]]; then
-	PR_STITLE=$'%{\ekzsh\e\\%}'
-    else
-	PR_STITLE=''
-    fi
-
-
-    ###
-    # Finally, the prompt.
-
-    PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
-$PR_CYAN$PR_ULCORNER$PR_HBAR$PR_GREY(\
-$PR_GREEN%$PR_PWDLEN<...<%~%<<\
-$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_GREY(\
-$PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\
-$PR_GREY)$PR_CYAN$PR_HBAR$PR_URCORNER\
-
-$PR_CYAN$PR_LLCORNER$PR_BLUE$PR_HBAR(\
-$PR_YELLOW%D{%H:%M:%S}\
-$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_HBAR\
-$PR_HBAR\
->$PR_NO_COLOUR '
-
-    # display exitcode on the right when >0
-    return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
-    RPROMPT=' $return_code$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR\
-($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_NO_COLOUR'
-
-    PS2='$PR_CYAN$PR_HBAR\
-$PR_BLUE$PR_HBAR(\
-$PR_LIGHT_GREEN%_$PR_BLUE)$PR_HBAR\
-$PR_CYAN$PR_HBAR$PR_NO_COLOUR '
-}
-
-setprompt
-
 autoload -U add-zsh-hook
 add-zsh-hook precmd  theme_precmd
 add-zsh-hook preexec theme_preexec
+
+
+# Set the prompt
+
+# Need this so the prompt will work.
+setopt prompt_subst
+
+# See if we can use colors.
+autoload zsh/terminfo
+for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
+  print -v "PR_$color" "%{$terminfo[bold]$fg[${(L)color}]%}"
+  print -v "PR_LIGHT_$color" "%{$fg[${(L)color}]%}"
+done
+PR_NO_COLOUR="%{$terminfo[sgr0]%}"
+
+# Modify Git prompt
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+
+# Use extended characters to look nicer if supported.
+if [[ "${langinfo[CODESET]}" = "UTF-8" ]]; then
+  PR_SET_CHARSET=""
+  PR_SHIFT_IN=""
+  PR_SHIFT_OUT=""
+  PR_HBAR="─"
+  PR_ULCORNER="┌"
+  PR_LLCORNER="└"
+  PR_LRCORNER="┘"
+  PR_URCORNER="┐"
+else
+  typeset -A altchar
+  set -A altchar ${(s..)terminfo[acsc]}
+  # Some stuff to help us draw nice lines
+  PR_SET_CHARSET="%{$terminfo[enacs]%}"
+  PR_SHIFT_IN="%{$terminfo[smacs]%}"
+  PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
+  PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT'
+  PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT'
+  PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT'
+  PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT'
+  PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
+  fi
+
+# Decide if we need to set titlebar text.
+case $TERM in
+  xterm*)
+    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}'
+    ;;
+  screen)
+    PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
+    ;;
+  *)
+    PR_TITLEBAR=""
+    ;;
+esac
+
+# Decide whether to set a screen title
+if [[ "$TERM" = "screen" ]]; then
+  PR_STITLE=$'%{\ekzsh\e\\%}'
+else
+  PR_STITLE=""
+fi
+
+# Finally, the prompt.
+PROMPT='${PR_SET_CHARSET}${PR_STITLE}${(e)PR_TITLEBAR}\
+${PR_CYAN}${PR_ULCORNER}${PR_HBAR}${PR_GREY}(\
+${PR_GREEN}%${PR_PWDLEN}<...<%~%<<\
+${PR_GREY})$(ruby_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
+${PR_CYAN}%(!.%SROOT%s.%n)${PR_GREY}@${PR_GREEN}%m:%l\
+${PR_GREY})${PR_CYAN}${PR_HBAR}${PR_URCORNER}\
+
+${PR_CYAN}${PR_LLCORNER}${PR_BLUE}${PR_HBAR}(\
+${PR_YELLOW}%D{%H:%M:%S}\
+${PR_LIGHT_BLUE}%{$reset_color%}$(git_prompt_info)$(git_prompt_status)${PR_BLUE})${PR_CYAN}${PR_HBAR}\
+${PR_HBAR}\
+>${PR_NO_COLOUR} '
+
+# display exitcode on the right when > 0
+return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
+RPROMPT=' $return_code${PR_CYAN}${PR_HBAR}${PR_BLUE}${PR_HBAR}\
+(${PR_YELLOW}%D{%a,%b%d}${PR_BLUE})${PR_HBAR}${PR_CYAN}${PR_LRCORNER}${PR_NO_COLOUR}'
+
+PS2='${PR_CYAN}${PR_HBAR}\
+${PR_BLUE}${PR_HBAR}(\
+${PR_LIGHT_GREEN}%_${PR_BLUE})${PR_HBAR}\
+${PR_CYAN}${PR_HBAR}${PR_NO_COLOUR} '
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index ef91c5ee3..fea2eff42 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -10,46 +10,46 @@
 # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
 function precmd {
 
-    local TERMWIDTH
-    (( TERMWIDTH = ${COLUMNS} - 1 ))
+  local TERMWIDTH
+  (( TERMWIDTH = ${COLUMNS} - 1 ))
 
 
-    ###
-    # Truncate the path if it's too long.
+  ###
+  # Truncate the path if it's too long.
 
-    PR_FILLBAR=""
-    PR_PWDLEN=""
+  PR_FILLBAR=""
+  PR_PWDLEN=""
 
-    local promptsize=${#${(%):---(%n@%M:%l)---()}}
-    local pwdsize=${#${(%):-%~}}
-    local gitbranch="$(git_prompt_info)"
-    local rvmprompt="$(ruby_prompt_info)"
-    local gitbranchsize=${#${gitbranch:-''}}
-    local rvmpromptsize=${#${rvmprompt:-''}}
+  local promptsize=${#${(%):---(%n@%M:%l)---()}}
+  local pwdsize=${#${(%):-%~}}
+  local gitbranch="$(git_prompt_info)"
+  local rvmprompt="$(ruby_prompt_info)"
+  local gitbranchsize=${#${gitbranch:-''}}
+  local rvmpromptsize=${#${rvmprompt:-''}}
 
-    if [[ "$promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize" -gt $TERMWIDTH ]]; then
-        ((PR_PWDLEN=$TERMWIDTH - $promptsize))
-    else
-        PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize)))..${PR_SPACE}.)}"
-    fi
+  if [[ "$promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize" -gt $TERMWIDTH ]]; then
+    ((PR_PWDLEN=$TERMWIDTH - $promptsize))
+  else
+    PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize)))..${PR_SPACE}.)}"
+  fi
 }
 
 
 setopt extended_glob
 
 preexec () {
-    if [[ "$TERM" == "screen" ]]; then
-        local CMD=${1[(wr)^(*=*|sudo|-*)]}
-        echo -n "\ek$CMD\e\\"
-    fi
+  if [[ "$TERM" == "screen" ]]; then
+    local CMD=${1[(wr)^(*=*|sudo|-*)]}
+    echo -n "\ek$CMD\e\\"
+  fi
 
-    if [[ "$TERM" == "xterm" ]]; then
-        print -Pn "\e]0;$1\a"
-    fi
+  if [[ "$TERM" == "xterm" ]]; then
+    print -Pn "\e]0;$1\a"
+  fi
 
-    if [[ "$TERM" == "rxvt" ]]; then
-        print -Pn "\e]0;$1\a"
-    fi
+  if [[ "$TERM" == "rxvt" ]]; then
+    print -Pn "\e]0;$1\a"
+  fi
 
 }
 
@@ -57,71 +57,67 @@ setprompt () {
 ###
 # Need this so the prompt will work.
 
-    setopt prompt_subst
+  setopt prompt_subst
 
 
 ###
 # See if we can use colors.
 
-    autoload zsh/terminfo
-    for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
-    eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
-    eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
-    (( count = $count + 1 ))
-    done
-    PR_NO_COLOUR="%{$terminfo[sgr0]%}"
+  autoload zsh/terminfo
+  for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
+  eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
+  eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
+  (( count = $count + 1 ))
+  done
+  PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 
 
 ###
 # See if we can use extended characters to look nicer.
+  PR_HBAR=${altchar[q]:--}
+  PR_ULCORNER=${altchar[l]:--}
+  PR_LLCORNER=${altchar[m]:--}
+  PR_LRCORNER=${altchar[j]:--}
+  PR_URCORNER=${altchar[k]:--}
 
-    typeset -A altchar
-#    set -A altchar "${(s..)terminfo[acsc]}"
-    PR_SET_CHARSET="%{$terminfo[enacs]%}"
-    PR_HBAR=${altchar[q]:--}
-    PR_ULCORNER=${altchar[l]:--}
-    PR_LLCORNER=${altchar[m]:--}
-    PR_LRCORNER=${altchar[j]:--}
-    PR_URCORNER=${altchar[k]:--}
-
-    ###
-    # Modify Git prompt
-    ZSH_THEME_GIT_PROMPT_PREFIX=" ["
-    ZSH_THEME_GIT_PROMPT_SUFFIX="]"
-    ###
-    # Modify RVM prompt
-    ZSH_THEME_RUBY_PROMPT_PREFIX=" ["
-    ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
+  ###
+  # Modify Git prompt
+  ZSH_THEME_GIT_PROMPT_PREFIX=" ["
+  ZSH_THEME_GIT_PROMPT_SUFFIX="]"
+  ###
+  # Modify RVM prompt
+  ZSH_THEME_RUBY_PROMPT_PREFIX=" ["
+  ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
 
 
 ###
 # Decide if we need to set titlebar text.
 
-    case $TERM in
-    xterm*|*rxvt*)
-        PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(rvm_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
-        ;;
-    screen)
-        PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
-        ;;
-    *)
-        PR_TITLEBAR=''
-        ;;
-    esac
+  case $TERM in
+  xterm*|*rxvt*)
+    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(rvm_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
+    ;;
+  screen)
+    PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
+    ;;
+  *)
+    PR_TITLEBAR=''
+    ;;
+  esac
 
 
 ###
 # Decide whether to set a screen title
-    if [[ "$TERM" == "screen" ]]; then
-        PR_STITLE=$'%{\ekzsh\e\\%}'
-    else
-        PR_STITLE=''
-    fi
+  if [[ "$TERM" == "screen" ]]; then
+    PR_STITLE=$'%{\ekzsh\e\\%}'
+  else
+    PR_STITLE=''
+  fi
 
 ###
 # Finally, the prompt.
 #
-    PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
+  PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
 $PR_RED$PR_HBAR<\
 $PR_BLUE%(!.$PR_RED%SROOT%s.%n)$PR_GREEN@$PR_BLUE%M:$PR_GREEN%$PR_PWDLEN<...<%~$PR_CYAN$(git_prompt_info)$(rvm_prompt_info)\
 $PR_RED>$PR_HBAR$PR_SPACE${(e)PR_FILLBAR}\

From 134c1ada285f5c65fa9d0f2f0cc784201428462a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 16:42:54 +0100
Subject: [PATCH 286/591] fix(jonathan): fix theme for non-UTF8 locales

---
 themes/jonathan.zsh-theme | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 2c5f30060..ca58b94a3 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -1,6 +1,4 @@
 function theme_precmd {
-  local -i TERMWIDTH=$COLUMNS
-
   PR_FILLBAR=""
   PR_PWDLEN=""
 
@@ -9,10 +7,12 @@ function theme_precmd {
   local pwdsize=${#${(%):-%~}}
 
   # Truncate the path if it's too long.
-  if (( promptsize + rubypromptsize + pwdsize > TERMWIDTH )); then
-    (( PR_PWDLEN = TERMWIDTH - promptsize ))
+  if (( promptsize + rubypromptsize + pwdsize > COLUMNS )); then
+    (( PR_PWDLEN = COLUMNS - promptsize ))
+  elif [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
+    PR_FILLBAR="\${(l:$(( COLUMNS - (promptsize + rubypromptsize + pwdsize) ))::${PR_HBAR}:)}"
   else
-    PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}"
+    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( COLUMNS - (promptsize + rubypromptsize + pwdsize) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
   fi
 }
 
@@ -48,18 +48,16 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} %{%G✚%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} %{%G✹%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} %{%G✖%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} %{%G➜%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} %{%G═%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} %{%G✭%}"
 
 # Use extended characters to look nicer if supported.
-if [[ "${langinfo[CODESET]}" = "UTF-8" ]]; then
+if [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
   PR_SET_CHARSET=""
-  PR_SHIFT_IN=""
-  PR_SHIFT_OUT=""
   PR_HBAR="─"
   PR_ULCORNER="┌"
   PR_LLCORNER="└"
@@ -72,12 +70,12 @@ else
   PR_SET_CHARSET="%{$terminfo[enacs]%}"
   PR_SHIFT_IN="%{$terminfo[smacs]%}"
   PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
-  PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT'
-  PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT'
-  PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT'
-  PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT'
-  PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
-  fi
+  PR_HBAR="${PR_SHIFT_IN}${altchar[q]:--}${PR_SHIFT_OUT}"
+  PR_ULCORNER="${PR_SHIFT_IN}${altchar[l]:--}${PR_SHIFT_OUT}"
+  PR_LLCORNER="${PR_SHIFT_IN}${altchar[m]:--}${PR_SHIFT_OUT}"
+  PR_LRCORNER="${PR_SHIFT_IN}${altchar[j]:--}${PR_SHIFT_OUT}"
+  PR_URCORNER="${PR_SHIFT_IN}${altchar[k]:--}${PR_SHIFT_OUT}"
+fi
 
 # Decide if we need to set titlebar text.
 case $TERM in

From aa99472c8ac5bdd111ea306e800bb152fb8580ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 17:02:21 +0100
Subject: [PATCH 287/591] style(simonoff): fix code style and optimize use of
 variables

---
 themes/simonoff.zsh-theme | 127 ++++++++++++++------------------------
 1 file changed, 46 insertions(+), 81 deletions(-)

diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index fea2eff42..c906192a0 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -1,43 +1,22 @@
-# Prompt
-#
-# Below are the color init strings for the basic file types. A color init
-# string consists of one or more of the following numeric codes:
-# Attribute codes:
-# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
-# Text color codes:
-# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
-# Background color codes:
-# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
-function precmd {
-
-  local TERMWIDTH
-  (( TERMWIDTH = ${COLUMNS} - 1 ))
-
-
-  ###
-  # Truncate the path if it's too long.
-
+function theme_precmd {
   PR_FILLBAR=""
   PR_PWDLEN=""
 
-  local promptsize=${#${(%):---(%n@%M:%l)---()}}
+  local promptsize=${#${(%):--(%n@%M:)--(%l)-}}
   local pwdsize=${#${(%):-%~}}
-  local gitbranch="$(git_prompt_info)"
-  local rvmprompt="$(ruby_prompt_info)"
-  local gitbranchsize=${#${gitbranch:-''}}
-  local rvmpromptsize=${#${rvmprompt:-''}}
+  local gitbranchsize="${#${(%)$(git_prompt_info)}:-}"
+  local rvmpromptsize="${#${(%)$(ruby_prompt_info):-}}"
 
-  if [[ "$promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize" -gt $TERMWIDTH ]]; then
-    ((PR_PWDLEN=$TERMWIDTH - $promptsize))
+  # Truncate the path if it's too long.
+  if (( promptsize + pwdsize + rvmpromptsize + gitbranchsize > COLUMNS )); then
+    (( PR_PWDLEN = COLUMNS - promptsize ))
   else
-    PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize)))..${PR_SPACE}.)}"
+    PR_FILLBAR="\${(l.$(( COLUMNS - (promptsize + pwdsize + rvmpromptsize + gitbranchsize) ))..${PR_SPACE}.)}"
   fi
 }
 
-
-setopt extended_glob
-
-preexec () {
+function theme_preexec {
+  setopt local_options extended_glob
   if [[ "$TERM" == "screen" ]]; then
     local CMD=${1[(wr)^(*=*|sudo|-*)]}
     echo -n "\ek$CMD\e\\"
@@ -53,47 +32,41 @@ preexec () {
 
 }
 
-setprompt () {
-###
+autoload -U add-zsh-hook
+add-zsh-hook precmd  theme_precmd
+add-zsh-hook preexec theme_preexec
+
+
+# Set the prompt
+
 # Need this so the prompt will work.
+setopt prompt_subst
 
-  setopt prompt_subst
-
-
-###
 # See if we can use colors.
+autoload zsh/terminfo
+for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
+  print -v "PR_$color" "%{$terminfo[bold]$fg[${(L)color}]%}"
+  print -v "PR_LIGHT_$color" "%{$fg[${(L)color}]%}"
+done
+PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 
-  autoload zsh/terminfo
-  for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
-  eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
-  eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
-  (( count = $count + 1 ))
-  done
-  PR_NO_COLOUR="%{$terminfo[sgr0]%}"
+# Use extended characters to look nicer
+PR_HBAR="-"
+PR_ULCORNER="-"
+PR_LLCORNER="-"
+PR_LRCORNER="-"
+PR_URCORNER="-"
 
+# Modify Git prompt
+ZSH_THEME_GIT_PROMPT_PREFIX=" ["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]"
 
-###
-# See if we can use extended characters to look nicer.
-  PR_HBAR=${altchar[q]:--}
-  PR_ULCORNER=${altchar[l]:--}
-  PR_LLCORNER=${altchar[m]:--}
-  PR_LRCORNER=${altchar[j]:--}
-  PR_URCORNER=${altchar[k]:--}
+# Modify RVM prompt
+ZSH_THEME_RUBY_PROMPT_PREFIX=" ["
+ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
 
-  ###
-  # Modify Git prompt
-  ZSH_THEME_GIT_PROMPT_PREFIX=" ["
-  ZSH_THEME_GIT_PROMPT_SUFFIX="]"
-  ###
-  # Modify RVM prompt
-  ZSH_THEME_RUBY_PROMPT_PREFIX=" ["
-  ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
-
-
-###
 # Decide if we need to set titlebar text.
-
-  case $TERM in
+case $TERM in
   xterm*|*rxvt*)
     PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(rvm_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
     ;;
@@ -101,26 +74,22 @@ setprompt () {
     PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
     ;;
   *)
-    PR_TITLEBAR=''
+    PR_TITLEBAR=""
     ;;
-  esac
+esac
 
-
-###
 # Decide whether to set a screen title
-  if [[ "$TERM" == "screen" ]]; then
-    PR_STITLE=$'%{\ekzsh\e\\%}'
-  else
-    PR_STITLE=''
-  fi
+if [[ "$TERM" == "screen" ]]; then
+  PR_STITLE=$'%{\ekzsh\e\\%}'
+else
+  PR_STITLE=""
+fi
 
-###
 # Finally, the prompt.
-#
-  PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
+PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
 $PR_RED$PR_HBAR<\
 $PR_BLUE%(!.$PR_RED%SROOT%s.%n)$PR_GREEN@$PR_BLUE%M:$PR_GREEN%$PR_PWDLEN<...<%~$PR_CYAN$(git_prompt_info)$(rvm_prompt_info)\
-$PR_RED>$PR_HBAR$PR_SPACE${(e)PR_FILLBAR}\
+$PR_RED>$PR_HBAR${(e)PR_FILLBAR}\
 $PR_RED$PR_HBAR<\
 $PR_GREEN%l$PR_RED>$PR_HBAR\
 
@@ -128,7 +97,3 @@ $PR_RED$PR_HBAR<\
 %(?..$PR_LIGHT_RED%?$PR_BLUE:)\
 $PR_LIGHT_BLUE%(!.$PR_RED.$PR_WHITE)%#$PR_RED>$PR_HBAR\
 $PR_NO_COLOUR '
-
-}
-
-setprompt

From e3bb6e685dc0325f472a4cfadb9847add12ec699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 17:12:31 +0100
Subject: [PATCH 288/591] refactor(themes): use `ruby_prompt_info` everywhere

---
 themes/aussiegeek.zsh-theme | 2 +-
 themes/josh.zsh-theme       | 4 ++--
 themes/murilasso.zsh-theme  | 2 +-
 themes/simonoff.zsh-theme   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/themes/aussiegeek.zsh-theme b/themes/aussiegeek.zsh-theme
index c2c7f65b9..2ded5c157 100644
--- a/themes/aussiegeek.zsh-theme
+++ b/themes/aussiegeek.zsh-theme
@@ -1,5 +1,5 @@
 
-PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%~$(git_prompt_info)$fg[yellow]$(rvm_prompt_info)$fg_bold[blue] ]$reset_color
+PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%~$(git_prompt_info)$fg[yellow]$(ruby_prompt_info)$fg_bold[blue] ]$reset_color
  $ '
 # git theming
 ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[green]("
diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme
index c8f0f4dd7..ea051c58e 100644
--- a/themes/josh.zsh-theme
+++ b/themes/josh.zsh-theme
@@ -10,7 +10,7 @@ function josh_prompt {
   prompt=" "
 
   branch=$(git_current_branch)
-  ruby_version=$(rvm_prompt_info || rbenv_prompt_info)
+  ruby_version=$(ruby_prompt_info)
   path_size=${#PWD}
   branch_size=${#branch}
   ruby_size=${#ruby_version}
@@ -31,7 +31,7 @@ function josh_prompt {
     prompt=" $prompt"
   done
   
-  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_current_branch)"
+  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(ruby_prompt_info)%{$reset_color%} $(git_current_branch)"
   
   echo $prompt
 }
diff --git a/themes/murilasso.zsh-theme b/themes/murilasso.zsh-theme
index bc2b9b224..d46874c54 100644
--- a/themes/murilasso.zsh-theme
+++ b/themes/murilasso.zsh-theme
@@ -1,7 +1,7 @@
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
 local current_dir='%{$terminfo[bold]$fg[blue]%}%~%{$reset_color%}'
-local rvm_ruby='%{$fg[red]%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%}'
+local rvm_ruby='%{$fg[red]%}$(ruby_prompt_info)%{$reset_color%}'
 local git_branch='%{$fg[blue]%}$(git_prompt_info)%{$reset_color%}'
 
 PROMPT="${user_host}:${current_dir} ${rvm_ruby}
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index c906192a0..201d5d7e4 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -68,7 +68,7 @@ ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
 # Decide if we need to set titlebar text.
 case $TERM in
   xterm*|*rxvt*)
-    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(rvm_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
+    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(ruby_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
     ;;
   screen)
     PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
@@ -88,7 +88,7 @@ fi
 # Finally, the prompt.
 PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
 $PR_RED$PR_HBAR<\
-$PR_BLUE%(!.$PR_RED%SROOT%s.%n)$PR_GREEN@$PR_BLUE%M:$PR_GREEN%$PR_PWDLEN<...<%~$PR_CYAN$(git_prompt_info)$(rvm_prompt_info)\
+$PR_BLUE%(!.$PR_RED%SROOT%s.%n)$PR_GREEN@$PR_BLUE%M:$PR_GREEN%$PR_PWDLEN<...<%~$PR_CYAN$(git_prompt_info)$(ruby_prompt_info)\
 $PR_RED>$PR_HBAR${(e)PR_FILLBAR}\
 $PR_RED$PR_HBAR<\
 $PR_GREEN%l$PR_RED>$PR_HBAR\

From 7b12fa9799edf07547cf5a55cf6518a4cb4c4852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 12:14:45 +0100
Subject: [PATCH 289/591] style(rbfu): clean up code

---
 plugins/rbfu/README.md       |  1 +
 plugins/rbfu/rbfu.plugin.zsh | 68 ++++++++++++++++++++----------------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/plugins/rbfu/README.md b/plugins/rbfu/README.md
index f1f9fa2f7..fbcab64de 100644
--- a/plugins/rbfu/README.md
+++ b/plugins/rbfu/README.md
@@ -4,6 +4,7 @@ This plugin starts [rbfu](https://github.com/hmans/rbfu), a minimal Ruby version
 manager, and adds some useful functions.
 
 To use it, add `rbfu` to the plugins array in your zshrc file:
+
 ```zsh
 plugins=(... rbfu)
 ```
diff --git a/plugins/rbfu/rbfu.plugin.zsh b/plugins/rbfu/rbfu.plugin.zsh
index 008485205..c973fbf9f 100644
--- a/plugins/rbfu/rbfu.plugin.zsh
+++ b/plugins/rbfu/rbfu.plugin.zsh
@@ -5,38 +5,44 @@
 # rvm_prompt_info function to return the $RBFU_RUBY_VERSION
 # version.
 
-command -v rbfu &>/dev/null
+command -v rbfu &>/dev/null || return
 
-if [[ $? -eq 0 ]]; then
-  eval "$(rbfu --init --auto)"
+eval "$(rbfu --init --auto)"
 
-  # Internal: Print ruby version details, if it's currently
-  # active etc.
-  function _rbfu_rubies_print() {
-    local rb rb_out
-    rb=$(basename $1)
-    rb_out="$rb"
-    [[ -h $1 ]] && rb_out="$rb_out${fg[green]}@${reset_color}"
-    [[ "x$rb" == "x$2" ]] && rb_out="${fg[red]}$rb_out ${fg[red]}*${reset_color}"
-    echo $rb_out
-  }
+# Internal: Print ruby version details, if it's currently active, etc.
+function _rbfu_rubies_print() {
+  # 1: path to ruby file
+  # 2: active ruby
+  local rb rb_out
+  rb="${$1:t}"
+  rb_out="$rb"
 
-  # Public: Provide a list with all available rubies, this basically depends
-  # on `ls -1` and .rfbu/rubies. Highlights the currently active ruby version
-  # and aliases.
-  function rbfu-rubies() {
-    local rbfu_dir active_rb
-    rbfu_dir=$RBFU_RUBIES
-    active_rb=$RBFU_RUBY_VERSION
-    [[ -z "$rbfu_dir" ]] && rbfu_dir="${HOME}/.rbfu/rubies"
-    [[ -z "$active_rb" ]] && active_rb="system"
-    _rbfu_rubies_print "${rbfu_dir}/system" $active_rb
-    for rb in $(ls -1 $rbfu_dir); do
-      _rbfu_rubies_print "${rbfu_dir}/${rb}" $active_rb
-    done
-  }
+  # If the ruby is a symlink, add @ to the name.
+  if [[ -h "$1" ]]; then
+    rb_out="${rb_out}${fg[green]}@${reset_color}"
+  fi
 
-  # Public: Create rvm_prompt_info command for themes compatibility, unless
-  # it has already been defined.
-  [ ! -x rvm_prompt_info ] && function rvm_prompt_info() { echo "${RBFU_RUBY_VERSION:=system}" }
-fi
+  # If the ruby is active, add * to the name and show it in red.
+  if [[ "$rb" = "$2" ]]; then
+    rb_out="${fg[red]}${rb_out} ${fg[red]}*${reset_color}"
+  fi
+
+  echo $rb_out
+}
+
+# Public: Provide a list with all available rubies, this basically depends
+# on ~/.rfbu/rubies. Highlights the currently active ruby version and aliases.
+function rbfu-rubies() {
+  local rbfu_dir active_rb
+  rbfu_dir="${RBFU_RUBIES:-${HOME}/.rbfu/rubies}"
+  active_rb="${RBFU_RUBY_VERSION:-system}"
+
+  _rbfu_rubies_print "${rbfu_dir}/system" "$active_rb"
+  for rb in ${rbfu_dir}/*(N); do
+    _rbfu_rubies_print "$rb" "$active_rb"
+  done
+}
+
+# Public: Create rvm_prompt_info command for themes compatibility, unless
+# it has already been defined.
+[ ! -x rvm_prompt_info ] && function rvm_prompt_info() { echo "${RBFU_RUBY_VERSION:=system}" }

From 5c14474eb2a252ad61e55cf084c5bbe6c1c934b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 17:37:44 +0100
Subject: [PATCH 290/591] style(chruby): fix plugin code style and loading
 process

---
 plugins/chruby/README.md         |   3 +-
 plugins/chruby/chruby.plugin.zsh | 189 +++++++++++++------------------
 2 files changed, 83 insertions(+), 109 deletions(-)

diff --git a/plugins/chruby/README.md b/plugins/chruby/README.md
index d373006a5..19eb15a8d 100644
--- a/plugins/chruby/README.md
+++ b/plugins/chruby/README.md
@@ -5,6 +5,7 @@ current Ruby version, and completion and a prompt function to display the Ruby v
 Supports brew and manual installation of chruby.
 
 To use it, add `chruby` to the plugins array in your zshrc file:
+
 ```zsh
 plugins=(... chruby)
 ```
@@ -14,7 +15,7 @@ plugins=(... chruby)
 If you'd prefer to specify an explicit path to load chruby from
 you can set variables like so:
 
-```
+```zsh
 zstyle :omz:plugins:chruby path /local/path/to/chruby.sh
 zstyle :omz:plugins:chruby auto /local/path/to/auto.sh
 ```
diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index 32f0525aa..61ded3b73 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -1,121 +1,94 @@
-#
-# INSTRUCTIONS
-#
-#  With either a manual or brew installed chruby things should just work.
-#
-#  If you'd prefer to specify an explicit path to load chruby from
-#  you can set variables like so:
-#
-#    zstyle :omz:plugins:chruby path /local/path/to/chruby.sh
-#    zstyle :omz:plugins:chruby auto /local/path/to/auto.sh
-# 
-# TODO
-#  - autodetermine correct source path on non OS X systems
-#  - completion if ruby-install exists
+## load chruby from different locations
+
+_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
+
+  if [[ -r ${_chruby_path} ]]; then
+    source ${_chruby_path}
+  fi
+
+  if [[ -r ${_chruby_auto} ]]; then
+    source ${_chruby_auto}
+  fi
+}
+
+_source-from-homebrew() {
+  (( $+commands[brew] )) || return 1
+
+  local _brew_prefix
+  # check default brew prefix
+  if [[ -h /usr/local/opt/chruby ]];then
+    _brew_prefix="/usr/local/opt/chruby"
+  else
+    # 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
+
+  [[ -r "$_brew_prefix" ]] || return 1
+
+  source $_brew_prefix/share/chruby/chruby.sh
+  source $_brew_prefix/share/chruby/auto.sh
+}
+
+_load-chruby-dirs() {
+  local dir
+  for dir in "$HOME/.rubies" "$PREFIX/opt/rubies"; do
+    if [[ -d "$dir" ]]; then
+      RUBIES+=("$dir")
+    fi
+  done
+}
+
+# Load chruby
+if _source-from-omz-settings; then
+  _load-chruby-dirs
+elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
+  source /usr/local/share/chruby/chruby.sh
+  source /usr/local/share/chruby/auto.sh
+  _load-chruby-dirs
+elif _source-from-homebrew; then
+  _load-chruby-dirs
+fi
+
+unfunction _source-from-homebrew _source-from-omz-settings _load-chruby-dirs
+
+
+## chruby utility functions and aliases
 
 # rvm and rbenv plugins also provide this alias
 alias rubies='chruby'
 
-
-_homebrew-installed() {
-    whence brew &> /dev/null
-    _xit=$?
-    if [ $_xit -eq 0 ];then
-    	# ok , we have brew installed
-	# speculatively we check default brew prefix
-        if [ -h  /usr/local/opt/chruby ];then
-		_brew_prefix="/usr/local/opt/chruby"
-	else
-		# 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
-	return 0
-   else
-        return $_xit
-   fi
-}
-
-_chruby-from-homebrew-installed() {
-  [ -r $_brew_prefix ] &> /dev/null
-}
-
-_ruby-build_installed() {
-    whence ruby-build &> /dev/null
-}
-
-_ruby-install-installed() {
-    whence ruby-install &> /dev/null
-}
-
-# Simple definition completer for ruby-build
-if _ruby-build_installed; then
-    _ruby-build() { compadd $(ruby-build --definitions) }
-    compdef _ruby-build ruby-build
-fi
-
-_source_from_omz_settings() {
-    local _chruby_path
-    local _chruby_auto
-    
-    zstyle -s :omz:plugins:chruby path _chruby_path
-    zstyle -s :omz:plugins:chruby auto _chruby_auto
-
-    if [[ -r ${_chruby_path} ]]; then
-        source ${_chruby_path}
-    fi
-
-    if [[ -r ${_chruby_auto} ]]; then
-        source ${_chruby_auto}
-    fi
-}
-
-_chruby_dirs() {
-    chrubydirs=($HOME/.rubies/ $PREFIX/opt/rubies)
-    for dir in chrubydirs; do
-        if [[ -d $dir ]]; then
-            RUBIES+=$dir
-        fi
-    done
-}
-
-if _homebrew-installed && _chruby-from-homebrew-installed ; then
-    source $_brew_prefix/share/chruby/chruby.sh
-    source $_brew_prefix/share/chruby/auto.sh
-    _chruby_dirs
-elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
-    source /usr/local/share/chruby/chruby.sh
-    source /usr/local/share/chruby/auto.sh
-    _chruby_dirs
-else
-    _source_from_omz_settings
-    _chruby_dirs
-fi
-
-function ensure_chruby() {
-    $(whence chruby)
-}
-
 function current_ruby() {
-    local _ruby
-    _ruby="$(chruby |grep \* |tr -d '* ')"
-    if [[ $(chruby |grep -c \*) -eq 1 ]]; then
-        echo ${_ruby}
-    else
-        echo "system"
-    fi
+  local ruby
+  ruby="$(chruby | grep \* | tr -d '* ')"
+  if [[ $(chruby | grep -c \*) -eq 1 ]]; then
+    echo ${ruby}
+  else
+    echo "system"
+  fi
 }
 
 function chruby_prompt_info() {
-    echo "$(current_ruby)"
+  echo "$(current_ruby)"
 }
 
-# complete on installed rubies
+# Complete chruby command with installed rubies
 _chruby() {
-    compadd $(chruby | tr -d '* ')
-    local default_path='/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'
-    if PATH=${default_path} type ruby &> /dev/null; then
-        compadd system
-    fi
+  compadd $(chruby | tr -d '* ')
+  if PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" command ruby &>/dev/null; then
+    compadd system
+  fi
 }
+
 compdef _chruby chruby
+
+
+# Simple definition completer for ruby-build
+if command ruby-build &> /dev/null; then
+  _ruby-build() { compadd $(ruby-build --definitions) }
+  compdef _ruby-build ruby-build
+fi

From 59cb231692a171887e064fc4002da387718aaea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 17:42:17 +0100
Subject: [PATCH 291/591] style(rbenv): adapt to code style

---
 plugins/rbenv/rbenv.plugin.zsh | 92 +++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 0f2d366e2..d36d4922c 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -4,65 +4,65 @@
 FOUND_RBENV=$+commands[rbenv]
 
 if [[ $FOUND_RBENV -ne 1 ]]; then
-    rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
-    for dir in $rbenvdirs; do
-        if [[ -d $dir/bin ]]; then
-            export PATH="$dir/bin:$PATH"
-            FOUND_RBENV=1
-            break
-        fi
-    done
+  rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
+  for dir in $rbenvdirs; do
+    if [[ -d $dir/bin ]]; then
+      export PATH="$dir/bin:$PATH"
+      FOUND_RBENV=1
+      break
+    fi
+  done
 fi
 
 if [[ $FOUND_RBENV -ne 1 ]]; then
-    if (( $+commands[brew] )) && dir=$(brew --prefix rbenv 2>/dev/null); then
-        if [[ -d $dir/bin ]]; then
-            export PATH="$dir/bin:$PATH"
-            FOUND_RBENV=1
-        fi
+  if (( $+commands[brew] )) && dir=$(brew --prefix rbenv 2>/dev/null); then
+    if [[ -d $dir/bin ]]; then
+      export PATH="$dir/bin:$PATH"
+      FOUND_RBENV=1
     fi
+  fi
 fi
 
 if [[ $FOUND_RBENV -eq 1 ]]; then
-    eval "$(rbenv init --no-rehash - zsh)"
+  eval "$(rbenv init --no-rehash - zsh)"
 
-    alias rubies="rbenv versions"
-    alias gemsets="rbenv gemset list"
+  alias rubies="rbenv versions"
+  alias gemsets="rbenv gemset list"
 
-    function current_ruby() {
-        echo "$(rbenv version-name)"
-    }
+  function current_ruby() {
+    echo "$(rbenv version-name)"
+  }
 
-    function current_gemset() {
-        echo "$(rbenv gemset active 2>/dev/null)" | tr ' ' '+'
-    }
+  function current_gemset() {
+    echo "$(rbenv gemset active 2>/dev/null)" | tr ' ' '+'
+  }
 
-    function gems() {
-        local rbenv_path=$(rbenv prefix)
-        gem list $@ | sed -E \
-          -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
-          -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
-          -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
-          -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
-    }
+  function gems() {
+    local rbenv_path=$(rbenv prefix)
+    gem list $@ | sed -E \
+      -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+      -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
+      -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+      -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+  }
 
-    function rbenv_prompt_info() {
-        local ruby=$(current_ruby) gemset=$(current_gemset)
-        echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
-        [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
-        echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
-    }
+  function rbenv_prompt_info() {
+    local ruby=$(current_ruby) gemset=$(current_gemset)
+    echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
+    [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
+    echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
+  }
 else
-    alias rubies="ruby -v"
-    function gemsets() { echo "not supported" }
-    function current_ruby() { echo "not supported" }
-    function current_gemset() { echo "not supported" }
-    function gems() { echo "not supported" }
-    function rbenv_prompt_info() {
-        echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
-        echo -n "system: $(ruby -v | cut -f-2 -d ' ')"
-        echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
-    }
+  alias rubies="ruby -v"
+  function gemsets() { echo "not supported" }
+  function current_ruby() { echo "not supported" }
+  function current_gemset() { echo "not supported" }
+  function gems() { echo "not supported" }
+  function rbenv_prompt_info() {
+    echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
+    echo -n "system: $(ruby -v | cut -f-2 -d ' ')"
+    echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
+  }
 fi
 
 unset FOUND_RBENV rbenvdirs dir

From 9a3d853481645ae0f961e9cc8421fc5d84e2c3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 17:43:32 +0100
Subject: [PATCH 292/591] fix: quote % characters in ruby prompt info functions

---
 lib/prompt_info_functions.zsh    | 2 +-
 plugins/chruby/chruby.plugin.zsh | 2 +-
 plugins/rbenv/rbenv.plugin.zsh   | 4 ++--
 plugins/rbfu/rbfu.plugin.zsh     | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 48f033da6..e5535848b 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -30,7 +30,7 @@ function rvm_prompt_info() {
   local rvm_prompt
   rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${=ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
   [[ -z "${rvm_prompt}" ]] && return 1
-  echo "${ZSH_THEME_RUBY_PROMPT_PREFIX}${rvm_prompt}${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
+  echo "${ZSH_THEME_RUBY_PROMPT_PREFIX}${rvm_prompt:gs/%/%%}${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
 }
 
 ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index 61ded3b73..d7a28d4e2 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -73,7 +73,7 @@ function current_ruby() {
 }
 
 function chruby_prompt_info() {
-  echo "$(current_ruby)"
+  echo "${$(current_ruby):gs/%/%%}"
 }
 
 # Complete chruby command with installed rubies
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index d36d4922c..d758aebae 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -47,7 +47,7 @@ if [[ $FOUND_RBENV -eq 1 ]]; then
   }
 
   function rbenv_prompt_info() {
-    local ruby=$(current_ruby) gemset=$(current_gemset)
+    local ruby=${$(current_ruby):gs/%/%%} gemset=${$(current_gemset):gs/%/%%}
     echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
     [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
     echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
@@ -60,7 +60,7 @@ else
   function gems() { echo "not supported" }
   function rbenv_prompt_info() {
     echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
-    echo -n "system: $(ruby -v | cut -f-2 -d ' ')"
+    echo -n "system: $(ruby -v | cut -f-2 -d ' ' | sed 's/%/%%/g')"
     echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
   }
 fi
diff --git a/plugins/rbfu/rbfu.plugin.zsh b/plugins/rbfu/rbfu.plugin.zsh
index c973fbf9f..27dc3eec6 100644
--- a/plugins/rbfu/rbfu.plugin.zsh
+++ b/plugins/rbfu/rbfu.plugin.zsh
@@ -45,4 +45,5 @@ function rbfu-rubies() {
 
 # Public: Create rvm_prompt_info command for themes compatibility, unless
 # it has already been defined.
-[ ! -x rvm_prompt_info ] && function rvm_prompt_info() { echo "${RBFU_RUBY_VERSION:=system}" }
+(( ${+functions[rvm_prompt_info]} )) || \
+function rvm_prompt_info() { echo "${${RBFU_RUBY_VERSION:=system}:gs/%/%%}" }

From f42aa49cfdfc56b784744d3e421f297ab03efbdc Mon Sep 17 00:00:00 2001
From: deimosian <deimosian@gmail.com>
Date: Mon, 13 Dec 2021 16:52:32 -0500
Subject: [PATCH 293/591] fix(ys): use default color instead of gray for
 improved readability (#10506)

---
 themes/ys.zsh-theme | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 251b48827..45bbae2d1 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -5,10 +5,8 @@
 #
 # Mar 2013 Yad Smood
 
-typeset +H my_gray="$FG[247]"
-
 # VCS
-YS_VCS_PROMPT_PREFIX1=" %{$my_gray%}on%{$reset_color%} "
+YS_VCS_PROMPT_PREFIX1=" %{$reset_color%}on%{$fg[blue]%} "
 YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}"
 YS_VCS_PROMPT_SUFFIX="%{$reset_color%}"
 YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x"
@@ -62,13 +60,13 @@ local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%})"
 PROMPT="
 %{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
 %(#,%{$bg[yellow]%}%{$fg[black]%}%n%{$reset_color%},%{$fg[cyan]%}%n) \
-%{$my_gray%}@ \
+%{$reset_color%}@ \
 %{$fg[green]%}%m \
-%{$my_gray%}in \
+%{$reset_color%}in \
 %{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\
 ${hg_info}\
 ${git_info}\
 ${venv_info}\
  \
-%{$my_gray%}[%*] $exit_code
+[%*] $exit_code
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"

From 5403db85998ff0c087bc97d972e1e76551127b7e Mon Sep 17 00:00:00 2001
From: K Harishankar <48408097+harishnkr@users.noreply.github.com>
Date: Tue, 14 Dec 2021 03:24:19 +0530
Subject: [PATCH 294/591] feat(archlinux): add aliases for cleaning package
 cache (#10091)

Co-authored-by: K Harishankar <48408097+Haritronic909@users.noreply.github.com>
---
 plugins/archlinux/README.md            | 11 +++++++++++
 plugins/archlinux/archlinux.plugin.zsh | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index c8ec1de1e..fd772c61a 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -17,8 +17,10 @@ plugins=(... archlinux)
 | pacin        | `sudo pacman -S`                       | Install packages from the repositories                           |
 | pacins       | `sudo pacman -U`                       | Install a package from a local file                              |
 | pacinsd      | `sudo pacman -S --asdeps`              | Install packages as dependencies of another package              |
+| paclean      | `sudo pacman -Sc`                      | Clean out old and unused caches and packages                     |
 | pacloc       | `pacman -Qi`                           | Display information about a package in the local database        |
 | paclocs      | `pacman -Qs`                           | Search for packages in the local database                        |
+| paclr        | `sudo pacman -Scc`                     | Remove all files from the cache                                  |
 | paclsorphans | `sudo pacman -Qdt`                     | List all orphaned packages                                       |
 | pacmir       | `sudo pacman -Syy`                     | Force refresh of all package lists after updating mirrorlist     |
 | pacre        | `sudo pacman -R`                       | Remove packages, keeping its settings and dependencies           |
@@ -52,6 +54,8 @@ upgrades were available. Use `pacman -Que` instead.
 
 | Alias   | Command                                         | Description                                                             |
 |---------|-------------------------------------------------|-------------------------------------------------------------------------|
+| auclean | `sudo aura -Sc`                                 | Clean out old and unused caches and packages                            |
+| auclr   | `sudo aura -Scc`                                | Remove all files from the cache                                         |
 | auin    | `sudo aura -S`                                  | Install packages from the repositories                                  |
 | aurin   | `sudo aura -A`                                  | Install packages from the repositories                                  |
 | auins   | `sudo aura -U`                                  | Install a package from a local file                                     |
@@ -84,6 +88,8 @@ upgrades were available. Use `pacman -Que` instead.
 
 | Alias   | Command                           | Description                                                         |
 |---------|-----------------------------------|---------------------------------------------------------------------|
+| pacclean| `pacaur -Sc`                      | Clean out old and unused caches and packages                        |
+| pacclr  | `pacaur -Scc`                     | Remove all files from the cache                                     |
 | pain    | `pacaur -S`                       | Install packages from the repositories                              |
 | pains   | `pacaur -U`                       | Install a package from a local file                                 |
 | painsd  | `pacaur -S --asdeps`              | Install packages as dependencies of another package                 |
@@ -106,6 +112,8 @@ upgrades were available. Use `pacman -Que` instead.
 | Alias   | Command                           | Description                                                         |
 |---------|-----------------------------------|---------------------------------------------------------------------|
 | trconf  | `trizen -C`                       | Fix all configuration files with vimdiff                            |
+| trclean | `trizen -Sc`                      | Clean out old and unused caches and packages                        |
+| trclr   | `trizen -Scc`                     | Remove all files from the cache                                     |
 | trin    | `trizen -S`                       | Install packages from the repositories                              |
 | trins   | `trizen -U`                       | Install a package from a local file                                 |
 | trinsd  | `trizen -S --asdeps`              | Install packages as dependencies of another package                 |
@@ -128,6 +136,8 @@ upgrades were available. Use `pacman -Que` instead.
 | Alias   | Command                        | Description                                                       |
 |---------|--------------------------------|-------------------------------------------------------------------|
 | yaconf  | `yay -Pg`                      | Print current configuration                                       |
+| yaclean | `yay -Sc`                      | Clean out old and unused caches and packages                      |
+| yaclr   | `yay -Scc`                     | Remove all files from the cache                                   |
 | yain    | `yay -S`                       | Install packages from the repositories                            |
 | yains   | `yay -U`                       | Install a package from a local file                               |
 | yainsd  | `yay -S --asdeps`              | Install packages as dependencies of another package               |
@@ -170,3 +180,4 @@ whether the package manager is installed, checked in the following order:
 - ornicar - thibault.duplessis@gmail.com
 - Ybalrid (Arthur Brainville) - ybalrid@ybalrid.info
 - Jeff M. Hubbard - jeffmhubbard@gmail.com
+- K. Harishankar(harishnkr) - hari2menon1234@gmail.com
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 0c5782d98..4f1364779 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -5,7 +5,9 @@
 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
 alias pacupg='sudo pacman -Syu'
 alias pacin='sudo pacman -S'
+alias paclean='sudo pacman -Sc'
 alias pacins='sudo pacman -U'
+alias paclr='sudo pacman -Scc'
 alias pacre='sudo pacman -R'
 alias pacrem='sudo pacman -Rns'
 alias pacrep='pacman -Si'
@@ -88,6 +90,8 @@ fi
 if (( $+commands[aura] )); then
   alias auin='sudo aura -S'
   alias aurin='sudo aura -A'
+  alias auclean='sudo aura -Sc'
+  alias auclr='sudo aura -Scc'
   alias auins='sudo aura -U'
   alias auinsd='sudo aura -S --asdeps'
   alias aurinsd='sudo aura -A --asdeps'
@@ -115,6 +119,8 @@ if (( $+commands[aura] )); then
 fi
 
 if (( $+commands[pacaur] )); then
+  alias pacclean='pacaur -Sc'
+  alias pacclr='pacaur -Scc'
   alias paupg='pacaur -Syu'
   alias pasu='pacaur -Syu --noconfirm'
   alias pain='pacaur -S'
@@ -138,6 +144,8 @@ if (( $+commands[trizen] )); then
   alias trupg='trizen -Syua'
   alias trsu='trizen -Syua --noconfirm'
   alias trin='trizen -S'
+  alias trclean='trizen -Sc'
+  alias trclr='trizen -Scc'
   alias trins='trizen -U'
   alias trre='trizen -R'
   alias trrem='trizen -Rns'
@@ -155,6 +163,8 @@ fi
 
 if (( $+commands[yay] )); then
   alias yaconf='yay -Pg'
+  alias yaclean='yay -Sc'
+  alias yaclr='yay -Scc'
   alias yaupg='yay -Syu'
   alias yasu='yay -Syu --noconfirm'
   alias yain='yay -S'

From fb86ec7749644bba4792f95bd06076049d9c74a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 14 Dec 2021 13:09:02 +0100
Subject: [PATCH 295/591] style: use `typeset` for dynamic variable names

---
 plugins/dirhistory/dirhistory.plugin.zsh | 4 ++--
 themes/adben.zsh-theme                   | 4 ++--
 themes/jonathan.zsh-theme                | 4 ++--
 themes/simonoff.zsh-theme                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 9f39264cf..2f5a79735 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -19,14 +19,14 @@ export DIRHISTORY_SIZE=30
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
-  print -v $1 "${dirhistory_past[$#dirhistory_past]}"
+  typeset $1="${dirhistory_past[$#dirhistory_past]}"
   if [[ $#dirhistory_past -gt 0 ]]; then
     dirhistory_past[$#dirhistory_past]=()
   fi
 }
 
 function pop_future() {
-  print -v $1 "${dirhistory_future[$#dirhistory_future]}"
+  typeset $1="${dirhistory_future[$#dirhistory_future]}"
   if [[ $#dirhistory_future -gt 0 ]]; then
     dirhistory_future[$#dirhistory_future]=()
   fi
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index ddb34236b..a11f7b0a9 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -32,8 +32,8 @@
 
 ########## COLOR ###########
 for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
-  print -v "PR_$COLOR" "%b%{$fg[${(L)COLOR}]%}"
-  print -v "PR_BRIGHT_$COLOR" "%B%{$fg[${(L)COLOR}]%}"
+  typeset PR_$COLOR="%b%{$fg[${(L)COLOR}]%}"
+  typeset PR_BRIGHT_$COLOR="%B%{$fg[${(L)COLOR}]%}"
 done
 PR_RESET="%{$reset_color%}"
 
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index ca58b94a3..fc3cb2caa 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -37,8 +37,8 @@ setopt prompt_subst
 # See if we can use colors.
 autoload zsh/terminfo
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
-  print -v "PR_$color" "%{$terminfo[bold]$fg[${(L)color}]%}"
-  print -v "PR_LIGHT_$color" "%{$fg[${(L)color}]%}"
+  typeset PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
+  typeset PR_LIGHT_$color="%{$fg[${(L)color}]%}"
 done
 PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index 201d5d7e4..c7e35e160 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -45,8 +45,8 @@ setopt prompt_subst
 # See if we can use colors.
 autoload zsh/terminfo
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
-  print -v "PR_$color" "%{$terminfo[bold]$fg[${(L)color}]%}"
-  print -v "PR_LIGHT_$color" "%{$fg[${(L)color}]%}"
+  typeset PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
+  typeset PR_LIGHT_$color="%{$fg[${(L)color}]%}"
 done
 PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 

From 7d03ea18eda8d89316fdb035fb3840f48a065338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:15:55 +0100
Subject: [PATCH 296/591] fix: declare variables as global when using `typeset`

Fixes fb86ec77
---
 plugins/dirhistory/dirhistory.plugin.zsh | 4 ++--
 themes/adben.zsh-theme                   | 4 ++--
 themes/jonathan.zsh-theme                | 4 ++--
 themes/simonoff.zsh-theme                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 2f5a79735..8268147f6 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -19,14 +19,14 @@ export DIRHISTORY_SIZE=30
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
-  typeset $1="${dirhistory_past[$#dirhistory_past]}"
+  typeset -g $1="${dirhistory_past[$#dirhistory_past]}"
   if [[ $#dirhistory_past -gt 0 ]]; then
     dirhistory_past[$#dirhistory_past]=()
   fi
 }
 
 function pop_future() {
-  typeset $1="${dirhistory_future[$#dirhistory_future]}"
+  typeset -g $1="${dirhistory_future[$#dirhistory_future]}"
   if [[ $#dirhistory_future -gt 0 ]]; then
     dirhistory_future[$#dirhistory_future]=()
   fi
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index a11f7b0a9..c2fdbed23 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -32,8 +32,8 @@
 
 ########## COLOR ###########
 for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
-  typeset PR_$COLOR="%b%{$fg[${(L)COLOR}]%}"
-  typeset PR_BRIGHT_$COLOR="%B%{$fg[${(L)COLOR}]%}"
+  typeset -g PR_$COLOR="%b%{$fg[${(L)COLOR}]%}"
+  typeset -g PR_BRIGHT_$COLOR="%B%{$fg[${(L)COLOR}]%}"
 done
 PR_RESET="%{$reset_color%}"
 
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index fc3cb2caa..48927f1db 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -37,8 +37,8 @@ setopt prompt_subst
 # See if we can use colors.
 autoload zsh/terminfo
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
-  typeset PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
-  typeset PR_LIGHT_$color="%{$fg[${(L)color}]%}"
+  typeset -g PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
+  typeset -g PR_LIGHT_$color="%{$fg[${(L)color}]%}"
 done
 PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index c7e35e160..287781d9e 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -45,8 +45,8 @@ setopt prompt_subst
 # See if we can use colors.
 autoload zsh/terminfo
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
-  typeset PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
-  typeset PR_LIGHT_$color="%{$fg[${(L)color}]%}"
+  typeset -g PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
+  typeset -g PR_LIGHT_$color="%{$fg[${(L)color}]%}"
 done
 PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 

From 4b4cc9a4a57468218b25b10c21c1e6060f42544b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:50:34 +0100
Subject: [PATCH 297/591] fix(cli): fix plugin and theme suggestions in
 completion for older zsh versions

---
 lib/cli.zsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index aed84e08f..4917bc354 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -68,10 +68,12 @@ function _omz {
 
         _describe 'plugin' valid_plugins ;;
       plugin::info)
-        local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+        local -aU plugins
+        plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
         _describe 'plugin' plugins ;;
       theme::(set|use))
-        local -aU themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+        local -aU themes
+        themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
         _describe 'theme' themes ;;
     esac
   elif (( CURRENT > 4 )); then

From 41c15a21599f16a802046f741ac26f80c30c7c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:51:25 +0100
Subject: [PATCH 298/591] fix(jonathan): fix top bar alignment with RPROMPT

---
 themes/jonathan.zsh-theme | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 48927f1db..11d799a84 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -1,4 +1,6 @@
 function theme_precmd {
+  local TERMWIDTH=$(( COLUMNS - ${ZLE_RPROMPT_INDENT:-1} ))
+
   PR_FILLBAR=""
   PR_PWDLEN=""
 
@@ -7,12 +9,12 @@ function theme_precmd {
   local pwdsize=${#${(%):-%~}}
 
   # Truncate the path if it's too long.
-  if (( promptsize + rubypromptsize + pwdsize > COLUMNS )); then
-    (( PR_PWDLEN = COLUMNS - promptsize ))
+  if (( promptsize + rubypromptsize + pwdsize > TERMWIDTH )); then
+    (( PR_PWDLEN = TERMWIDTH - promptsize ))
   elif [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
-    PR_FILLBAR="\${(l:$(( COLUMNS - (promptsize + rubypromptsize + pwdsize) ))::${PR_HBAR}:)}"
+    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize) ))::${PR_HBAR}:)}"
   else
-    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( COLUMNS - (promptsize + rubypromptsize + pwdsize) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
+    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
   fi
 }
 

From 010c36d4ab0b6f9037a278c39ed6d41586f25843 Mon Sep 17 00:00:00 2001
From: Logan Linn <logan@loganlinn.com>
Date: Fri, 17 Dec 2021 04:18:28 -0800
Subject: [PATCH 299/591] refactor(fzf): adopt code style and simplify function
 naming (#10514)

---
 plugins/fzf/fzf.plugin.zsh | 274 ++++++++++++++++++-------------------
 1 file changed, 137 insertions(+), 137 deletions(-)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index aabd62cb1..50712cbee 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -1,176 +1,176 @@
-function setup_using_base_dir() {
-    local fzf_base fzf_shell fzfdirs dir
+function fzf_setup_using_base_dir() {
+  local fzf_base fzf_shell fzfdirs dir
 
-    test -d "${FZF_BASE}" && fzf_base="${FZF_BASE}"
+  test -d "${FZF_BASE}" && fzf_base="${FZF_BASE}"
+
+  if [[ -z "${fzf_base}" ]]; then
+    fzfdirs=(
+      "${HOME}/.fzf"
+      "${HOME}/.nix-profile/share/fzf"
+      "${XDG_DATA_HOME:-$HOME/.local/share}/fzf"
+      "/usr/local/opt/fzf"
+      "/usr/share/fzf"
+      "/usr/local/share/examples/fzf"
+    )
+    for dir in ${fzfdirs}; do
+      if [[ -d "${dir}" ]]; then
+        fzf_base="${dir}"
+        break
+      fi
+    done
 
     if [[ -z "${fzf_base}" ]]; then
-        fzfdirs=(
-          "${HOME}/.fzf"
-          "${HOME}/.nix-profile/share/fzf"
-          "${XDG_DATA_HOME:-$HOME/.local/share}/fzf"
-          "/usr/local/opt/fzf"
-          "/usr/share/fzf"
-          "/usr/local/share/examples/fzf"
-        )
-        for dir in ${fzfdirs}; do
-            if [[ -d "${dir}" ]]; then
-                fzf_base="${dir}"
-                break
-            fi
-        done
-
-        if [[ -z "${fzf_base}" ]]; then
-            if (( ${+commands[fzf-share]} )) && dir="$(fzf-share)" && [[ -d "${dir}" ]]; then
-                fzf_base="${dir}"
-            elif (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
-                if [[ -d "${dir}" ]]; then
-                    fzf_base="${dir}"
-                fi
-            fi
+      if (( ${+commands[fzf-share]} )) && dir="$(fzf-share)" && [[ -d "${dir}" ]]; then
+        fzf_base="${dir}"
+      elif (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
+        if [[ -d "${dir}" ]]; then
+          fzf_base="${dir}"
         fi
+      fi
     fi
+  fi
 
-    if [[ ! -d "${fzf_base}" ]]; then
-        return 1
-    fi
+  if [[ ! -d "${fzf_base}" ]]; then
+    return 1
+  fi
 
-    # Fix fzf shell directory for Arch Linux, NixOS or Void Linux packages
-    if [[ ! -d "${fzf_base}/shell" ]]; then
-        fzf_shell="${fzf_base}"
-    else
-        fzf_shell="${fzf_base}/shell"
-    fi
+  # Fix fzf shell directory for Arch Linux, NixOS or Void Linux packages
+  if [[ ! -d "${fzf_base}/shell" ]]; then
+    fzf_shell="${fzf_base}"
+  else
+    fzf_shell="${fzf_base}/shell"
+  fi
 
-    # Setup fzf binary path
-    if (( ! ${+commands[fzf]} )) && [[ "$PATH" != *$fzf_base/bin* ]]; then
-        export PATH="$PATH:$fzf_base/bin"
-    fi
+  # Setup fzf binary path
+  if (( ! ${+commands[fzf]} )) && [[ "$PATH" != *$fzf_base/bin* ]]; then
+    export PATH="$PATH:$fzf_base/bin"
+  fi
 
-    # Auto-completion
-    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
-        source "${fzf_shell}/completion.zsh" 2> /dev/null
-    fi
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "${fzf_shell}/completion.zsh" 2> /dev/null
+  fi
 
-    # Key bindings
-    if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
-        source "${fzf_shell}/key-bindings.zsh"
-    fi
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "${fzf_shell}/key-bindings.zsh"
+  fi
 }
 
 
-function setup_using_debian_package() {
-    if (( ! $+commands[dpkg] )) || ! dpkg -s fzf &>/dev/null; then
-        # Either not a debian based distro, or no fzf installed
-        return 1
-    fi
+function fzf_setup_using_debian() {
+  if (( ! $+commands[dpkg] )) || ! dpkg -s fzf &>/dev/null; then
+    # Either not a debian based distro, or no fzf installed
+    return 1
+  fi
 
-    # NOTE: There is no need to configure PATH for debian package, all binaries
-    # are installed to /usr/bin by default
+  # NOTE: There is no need to configure PATH for debian package, all binaries
+  # are installed to /usr/bin by default
 
-    local completions key_bindings
+  local completions key_bindings
 
-    case $PREFIX in
-        *com.termux*)
-            # Support Termux package
-            completions="${PREFIX}/share/fzf/completion.zsh"
-            key_bindings="${PREFIX}/share/fzf/key-bindings.zsh"
-            ;;
-        *)
-            # Determine completion file path: first bullseye/sid, then buster/stretch
-            completions="/usr/share/doc/fzf/examples/completion.zsh"
-            [[ -f "$completions" ]] || completions="/usr/share/zsh/vendor-completions/_fzf"
-            key_bindings="/usr/share/doc/fzf/examples/key-bindings.zsh"
-            ;;
-    esac
+  case $PREFIX in
+    *com.termux*)
+      # Support Termux package
+      completions="${PREFIX}/share/fzf/completion.zsh"
+      key_bindings="${PREFIX}/share/fzf/key-bindings.zsh"
+      ;;
+    *)
+      # Determine completion file path: first bullseye/sid, then buster/stretch
+      completions="/usr/share/doc/fzf/examples/completion.zsh"
+      [[ -f "$completions" ]] || completions="/usr/share/zsh/vendor-completions/_fzf"
+      key_bindings="/usr/share/doc/fzf/examples/key-bindings.zsh"
+      ;;
+  esac
 
-    # Auto-completion
-    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
-        source $completions 2> /dev/null
-    fi
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source $completions 2> /dev/null
+  fi
 
-    # Key bindings
-    if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
-        source $key_bindings
-    fi
+  # Key bindings
+  if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
+    source $key_bindings
+  fi
 
-    return 0
+  return 0
 }
 
-function setup_using_opensuse_package() {
-    # OpenSUSE installs fzf in /usr/bin/fzf
-    # If the command is not found, the package isn't installed
-    (( $+commands[fzf] )) || return 1
+function fzf_setup_using_opensuse() {
+  # OpenSUSE installs fzf in /usr/bin/fzf
+  # If the command is not found, the package isn't installed
+  (( $+commands[fzf] )) || return 1
 
-    # The fzf-zsh-completion package installs the auto-completion in
-    local completions="/usr/share/zsh/site-functions/_fzf"
-    # The fzf-zsh-completion package installs the key-bindings file in
-    local key_bindings="/etc/zsh_completion.d/fzf-key-bindings"
+  # The fzf-zsh-completion package installs the auto-completion in
+  local completions="/usr/share/zsh/site-functions/_fzf"
+  # The fzf-zsh-completion package installs the key-bindings file in
+  local key_bindings="/etc/zsh_completion.d/fzf-key-bindings"
 
-    # If these are not found: (1) maybe we're not on OpenSUSE, or
-    # (2) maybe the fzf-zsh-completion package isn't installed.
-    if [[ ! -f "$completions" || ! -f "$key_bindings" ]]; then
-        return 1
-    fi
+  # If these are not found: (1) maybe we're not on OpenSUSE, or
+  # (2) maybe the fzf-zsh-completion package isn't installed.
+  if [[ ! -f "$completions" || ! -f "$key_bindings" ]]; then
+    return 1
+  fi
 
-    # Auto-completion
-    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
-        source "$completions" 2>/dev/null
-    fi
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "$completions" 2>/dev/null
+  fi
 
-    # Key bindings
-    if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
-        source "$key_bindings" 2>/dev/null
-    fi
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "$key_bindings" 2>/dev/null
+  fi
 
-    return 0
+  return 0
 }
 
-function setup_using_openbsd_package() {
-    # openBSD installs fzf in /usr/local/bin/fzf
-    if [[ "$OSTYPE" != openbsd* ]] || (( ! $+commands[fzf] )); then
-        return 1
-    fi
+function fzf_setup_using_openbsd() {
+  # openBSD installs fzf in /usr/local/bin/fzf
+  if [[ "$OSTYPE" != openbsd* ]] || (( ! $+commands[fzf] )); then
+    return 1
+  fi
 
-    # The fzf package installs the auto-completion in
-    local completions="/usr/local/share/zsh/site-functions/_fzf_completion"
-    # The fzf package installs the key-bindings file in
-    local key_bindings="/usr/local/share/zsh/site-functions/_fzf_key_bindings"
+  # The fzf package installs the auto-completion in
+  local completions="/usr/local/share/zsh/site-functions/_fzf_completion"
+  # The fzf package installs the key-bindings file in
+  local key_bindings="/usr/local/share/zsh/site-functions/_fzf_key_bindings"
 
-    # Auto-completion
-    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
-        source "$completions" 2>/dev/null
-    fi
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "$completions" 2>/dev/null
+  fi
 
-    # Key bindings
-    if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
-        source "$key_bindings" 2>/dev/null
-    fi
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "$key_bindings" 2>/dev/null
+  fi
 
-    return 0
-}
-
-function indicate_error() {
-    cat >&2 <<EOF
-[oh-my-zsh] fzf plugin: Cannot find fzf installation directory.
-Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc
-EOF
+  return 0
 }
 
 # Indicate to user that fzf installation not found if nothing worked
-setup_using_openbsd_package \
-    || setup_using_debian_package \
-    || setup_using_opensuse_package \
-    || setup_using_base_dir \
-    || indicate_error
+function fzf_setup_error() {
+  cat >&2 <<'EOF'
+[oh-my-zsh] fzf plugin: Cannot find fzf installation directory.
+Please add `export FZF_BASE=/path/to/fzf/install/dir` to your .zshrc
+EOF
+}
 
-unset -f setup_using_opensuse_package setup_using_debian_package setup_using_base_dir indicate_error
+fzf_setup_using_openbsd \
+  || fzf_setup_using_debian \
+  || fzf_setup_using_opensuse \
+  || fzf_setup_using_base_dir \
+  || fzf_setup_error
+
+unset -f -m 'fzf_setup_*'
 
 if [[ -z "$FZF_DEFAULT_COMMAND" ]]; then
-    if (( $+commands[rg] )); then
-        export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git/*"'
-    elif (( $+commands[fd] )); then
-        export FZF_DEFAULT_COMMAND='fd --type f --hidden --exclude .git'
-    elif (( $+commands[ag] )); then
-        export FZF_DEFAULT_COMMAND='ag -l --hidden -g "" --ignore .git'
-    fi
+  if (( $+commands[rg] )); then
+    export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git/*"'
+  elif (( $+commands[fd] )); then
+    export FZF_DEFAULT_COMMAND='fd --type f --hidden --exclude .git'
+  elif (( $+commands[ag] )); then
+    export FZF_DEFAULT_COMMAND='ag -l --hidden -g "" --ignore .git'
+  fi
 fi

From 52a46ec362389429049cc36b0806627db02f099e Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sean@flanigan.org>
Date: Sat, 21 Nov 2020 20:52:11 +1000
Subject: [PATCH 300/591] feat(fzf): support fzf in Cygwin (#9463)

Closes #9463
---
 plugins/fzf/fzf.plugin.zsh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 50712cbee..102605958 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -149,6 +149,30 @@ function fzf_setup_using_openbsd() {
   return 0
 }
 
+function fzf_setup_using_cygwin() {
+  # Cygwin installs fzf in /usr/local/bin/fzf
+  if [[ "$OSTYPE" != cygwin* ]] || (( ! $+commands[fzf] )); then
+    return 1
+  fi
+
+  # The fzf-zsh-completion package installs the auto-completion in
+  local completions="/etc/profile.d/fzf-completion.zsh"
+  # The fzf-zsh package installs the key-bindings file in
+  local key_bindings="/etc/profile.d/fzf.zsh"
+
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "$completions" 2>/dev/null
+  fi
+
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "$key_bindings" 2>/dev/null
+  fi
+
+  return 0
+}
+
 # Indicate to user that fzf installation not found if nothing worked
 function fzf_setup_error() {
   cat >&2 <<'EOF'
@@ -160,6 +184,7 @@ EOF
 fzf_setup_using_openbsd \
   || fzf_setup_using_debian \
   || fzf_setup_using_opensuse \
+  || fzf_setup_using_cygwin \
   || fzf_setup_using_base_dir \
   || fzf_setup_error
 

From b7fb0a55c03429bd90cbae74fb538bb0dff4b0ea Mon Sep 17 00:00:00 2001
From: smac89 <8305511+smac89@users.noreply.github.com>
Date: Fri, 17 Dec 2021 06:45:06 -0600
Subject: [PATCH 301/591] fix(heroku): fix XDG cache directory name and code
 style (#10436)

---
 plugins/heroku/heroku.plugin.zsh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/heroku/heroku.plugin.zsh b/plugins/heroku/heroku.plugin.zsh
index 9a99b4211..d22c1bb2f 100644
--- a/plugins/heroku/heroku.plugin.zsh
+++ b/plugins/heroku/heroku.plugin.zsh
@@ -1,9 +1,9 @@
-HEROKU_AC_CACHE_DIR="$HOME/.cache"
-if [ "$(uname -s)" = "Darwin" ]; then
-  HEROKU_AC_CACHE_DIR="$HOME/Library/Caches"
+if [[ "$OSTYPE" = darwin* ]]; then
+  cache_dir="${HOME}/Library/Caches"
+else
+  cache_dir="${XDG_CACHE_HOME:-"${HOME}/.cache"}"
 fi
-if [ ! -z "$XDG_CACHE_HOME" ]; then
-  HEROKU_AC_CACHE_DIR="$XDG_CACHE_DIR"
-fi
-HEROKU_AC_ZSH_SETUP_PATH=$HEROKU_AC_CACHE_DIR/heroku/autocomplete/zsh_setup
-[ -f $HEROKU_AC_ZSH_SETUP_PATH ] && source $HEROKU_AC_ZSH_SETUP_PATH
+
+setup_path="${cache_dir}/heroku/autocomplete/zsh_setup"
+[[ -f "$setup_path" ]] && source $setup_path
+unset cache_dir setup_path

From 44c6a71243092e32ba4760743338f0bf130f6409 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Sat, 18 Dec 2021 00:40:57 +0100
Subject: [PATCH 302/591] feat(deno): adding drA alias for --allow-all (#10501)

---
 plugins/deno/README.md       | 1 +
 plugins/deno/deno.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/deno/README.md b/plugins/deno/README.md
index 828e6af39..691318397 100644
--- a/plugins/deno/README.md
+++ b/plugins/deno/README.md
@@ -13,6 +13,7 @@ This plugin sets up completion and aliases for [Deno](https://deno.land).
 | dh    | deno help        |
 | dli   | deno lint        |
 | drn   | deno run         |
+| drA   | deno run -A      |
 | drw   | deno run --watch |
 | dts   | deno test        |
 | dup   | deno upgrade     |
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 34adddc37..eb7191971 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -6,6 +6,7 @@ alias dfmt='deno fmt'
 alias dh='deno help'
 alias dli='deno lint'
 alias drn='deno run'
+alias drA='deno run -A'
 alias drw='deno run --watch'
 alias dts='deno test'
 alias dup='deno upgrade'

From 08d086a09c0181b733a9f5565fc242ca148fd80a Mon Sep 17 00:00:00 2001
From: Patrick Fitzgerald <auskast03@gmail.com>
Date: Fri, 17 Dec 2021 15:47:56 -0800
Subject: [PATCH 303/591] feat(volta): add volta plugin (#10441)

For Volta JavaScript toolchain
https://github.com/volta-cli/volta
---
 plugins/volta/README.md |  11 ++
 plugins/volta/_volta    | 298 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 309 insertions(+)
 create mode 100644 plugins/volta/README.md
 create mode 100644 plugins/volta/_volta

diff --git a/plugins/volta/README.md b/plugins/volta/README.md
new file mode 100644
index 000000000..d5972d56c
--- /dev/null
+++ b/plugins/volta/README.md
@@ -0,0 +1,11 @@
+# Volta
+
+This plugin provides completion for [Volta](https://volta.sh/).
+
+To use it add volta to the plugins array in your zshrc file.
+
+```bash
+plugins=(... volta)
+```
+
+This plugin installs no aliases.
diff --git a/plugins/volta/_volta b/plugins/volta/_volta
new file mode 100644
index 000000000..295b80362
--- /dev/null
+++ b/plugins/volta/_volta
@@ -0,0 +1,298 @@
+#compdef volta
+
+autoload -U is-at-least
+
+_volta() {
+    typeset -A opt_args
+    typeset -a _arguments_options
+    local ret=1
+
+    if is-at-least 5.2; then
+        _arguments_options=(-s -S -C)
+    else
+        _arguments_options=(-s -C)
+    fi
+
+    local context curcontext="$curcontext" state line
+    _arguments "${_arguments_options[@]}" \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+'-v[Prints the current version of Volta]' \
+'--version[Prints the current version of Volta]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+":: :_volta_commands" \
+"*::: :->Volta" \
+&& ret=0
+    case $state in
+    (Volta)
+        words=($line[1] "${words[@]}")
+        (( CURRENT += 1 ))
+        curcontext="${curcontext%:*:*}:volta-command-$line[1]:"
+        case $line[1] in
+            (fetch)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':tool[@version] -- Tools to fetch, like `node`, `yarn@latest` or `your-package@^14.4.3`.:_files' \
+&& ret=0
+;;
+(install)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':tool[@version] -- Tools to install, like `node`, `yarn@latest` or `your-package@^14.4.3`.:_files' \
+&& ret=0
+;;
+(uninstall)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':tool -- The tool to uninstall, e.g. `node`, `npm`, `yarn`, or <package>:_files' \
+&& ret=0
+;;
+(pin)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':tool[@version] -- Tools to pin, like `node@lts` or `yarn@^1.14`.:_files' \
+&& ret=0
+;;
+(ls)
+_arguments "${_arguments_options[@]}" \
+'--format=[Specify the output format]: :(human plain)' \
+'(-d --default)-c[Show the currently-active tool(s)]' \
+'(-d --default)--current[Show the currently-active tool(s)]' \
+'(-c --current)-d[Show your default tool(s).]' \
+'(-c --current)--default[Show your default tool(s).]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+'::tool -- The tool to lookup - `all`, `node`, `yarn`, or the name of a package or binary.:_files' \
+&& ret=0
+;;
+(list)
+_arguments "${_arguments_options[@]}" \
+'--format=[Specify the output format]: :(human plain)' \
+'(-d --default)-c[Show the currently-active tool(s)]' \
+'(-d --default)--current[Show the currently-active tool(s)]' \
+'(-c --current)-d[Show your default tool(s).]' \
+'(-c --current)--default[Show your default tool(s).]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+'::tool -- The tool to lookup - `all`, `node`, `yarn`, or the name of a package or binary.:_files' \
+&& ret=0
+;;
+(completions)
+_arguments "${_arguments_options[@]}" \
+'-o+[File to write generated completions to]' \
+'--output=[File to write generated completions to]' \
+'-f[Write over an existing file, if any.]' \
+'--force[Write over an existing file, if any.]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':shell -- Shell to generate completions for:(zsh bash fish powershell elvish)' \
+&& ret=0
+;;
+(which)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':binary -- The binary to find, e.g. `node` or `npm`:_files' \
+&& ret=0
+;;
+(use)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+'::anything:_files' \
+&& ret=0
+;;
+(setup)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+&& ret=0
+;;
+(run)
+_arguments "${_arguments_options[@]}" \
+'--node=[Set the custom Node version]' \
+'(--bundled-npm)--npm=[Set the custom npm version]' \
+'(--no-yarn)--yarn=[Set the custom Yarn version]' \
+'*--env=[Set an environment variable (can be used multiple times)]' \
+'(--npm)--bundled-npm[Forces npm to be the version bundled with Node]' \
+'(--yarn)--no-yarn[Disables Yarn]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':command -- The command to run:_files' \
+'::args -- Arguments to pass to the command:_files' \
+&& ret=0
+;;
+(help)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+&& ret=0
+;;
+        esac
+    ;;
+esac
+}
+
+(( $+functions[_volta_commands] )) ||
+_volta_commands() {
+    local commands; commands=(
+        "fetch:Fetches a tool to the local machine" \
+"install:Installs a tool in your toolchain" \
+"uninstall:Uninstalls a tool from your toolchain" \
+"pin:Pins your project's runtime or package manager" \
+"list:Displays the current toolchain" \
+"completions:Generates Volta completions" \
+"which:Locates the actual binary that will be called by Volta" \
+"use:" \
+"setup:Enables Volta for the current user / shell" \
+"run:Run a command with custom Node, npm, and/or Yarn versions" \
+"help:Prints this message or the help of the given subcommand(s)" \
+    )
+    _describe -t commands 'volta commands' commands "$@"
+}
+(( $+functions[_volta__completions_commands] )) ||
+_volta__completions_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta completions commands' commands "$@"
+}
+(( $+functions[_volta__fetch_commands] )) ||
+_volta__fetch_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta fetch commands' commands "$@"
+}
+(( $+functions[_volta__help_commands] )) ||
+_volta__help_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta help commands' commands "$@"
+}
+(( $+functions[_volta__install_commands] )) ||
+_volta__install_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta install commands' commands "$@"
+}
+(( $+functions[_volta__list_commands] )) ||
+_volta__list_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta list commands' commands "$@"
+}
+(( $+functions[_ls_commands] )) ||
+_ls_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'ls commands' commands "$@"
+}
+(( $+functions[_volta__ls_commands] )) ||
+_volta__ls_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta ls commands' commands "$@"
+}
+(( $+functions[_volta__pin_commands] )) ||
+_volta__pin_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta pin commands' commands "$@"
+}
+(( $+functions[_volta__run_commands] )) ||
+_volta__run_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta run commands' commands "$@"
+}
+(( $+functions[_volta__setup_commands] )) ||
+_volta__setup_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta setup commands' commands "$@"
+}
+(( $+functions[_volta__uninstall_commands] )) ||
+_volta__uninstall_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta uninstall commands' commands "$@"
+}
+(( $+functions[_volta__use_commands] )) ||
+_volta__use_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta use commands' commands "$@"
+}
+(( $+functions[_volta__which_commands] )) ||
+_volta__which_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta which commands' commands "$@"
+}
+
+_volta "$@"
\ No newline at end of file

From a150d8a7c0040de5a1b0246728dc3c2af3b4c423 Mon Sep 17 00:00:00 2001
From: jxlwqq <jxlwqq@gmail.com>
Date: Sat, 18 Dec 2021 07:54:19 +0800
Subject: [PATCH 304/591] feat(istioctl): add plugin for istioctl (#10410)

* Add plugin for istioctl completion. close #10405

* fix typo

* Update README.md
---
 plugins/istioctl/README.md           | 9 +++++++++
 plugins/istioctl/istioctl.plugin.zsh | 4 ++++
 2 files changed, 13 insertions(+)
 create mode 100644 plugins/istioctl/README.md
 create mode 100644 plugins/istioctl/istioctl.plugin.zsh

diff --git a/plugins/istioctl/README.md b/plugins/istioctl/README.md
new file mode 100644
index 000000000..afd4d293c
--- /dev/null
+++ b/plugins/istioctl/README.md
@@ -0,0 +1,9 @@
+# Istioctl - Istio Command-line Tool
+
+The [istioctl](https://istio.io/latest/docs/ops/diagnostic-tools/istioctl/) tool is a configuration command line utility that allows service operators to debug and diagnose their Istio service mesh deployments.
+
+To use it, add `istioctl` to the plugins array of your zshrc file:
+
+```sh
+plugins=(... istioctl)
+```
diff --git a/plugins/istioctl/istioctl.plugin.zsh b/plugins/istioctl/istioctl.plugin.zsh
new file mode 100644
index 000000000..13ead1b2b
--- /dev/null
+++ b/plugins/istioctl/istioctl.plugin.zsh
@@ -0,0 +1,4 @@
+if [ $commands[istioctl] ]; then
+  source <(istioctl completion zsh)
+  compdef _istioctl istioctl
+fi

From f8c76d55a7c26ba7061d95ed4ba7fb200f3e6cde Mon Sep 17 00:00:00 2001
From: theVerusDev <richard.p23@protonmail.com>
Date: Fri, 17 Dec 2021 19:02:06 -0500
Subject: [PATCH 305/591] feat(cnf): Added support for SUSE-derived operation
 systems (ZYpp) to CNF plugin (#10508)

* Added support for SUSE and derivatives for command-not-found plugin

* Updated command-not-found documentation to list support for SUSE and derivatives
---
 plugins/command-not-found/README.md                    | 1 +
 plugins/command-not-found/command-not-found.plugin.zsh | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/command-not-found/README.md b/plugins/command-not-found/README.md
index f267f0c89..5a373c537 100644
--- a/plugins/command-not-found/README.md
+++ b/plugins/command-not-found/README.md
@@ -29,5 +29,6 @@ It works out of the box with the command-not-found packages for:
 - [Fedora](https://fedoraproject.org/wiki/Features/PackageKitCommandNotFound)
 - [NixOS](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/programs/command-not-found)
 - [Termux](https://github.com/termux/command-not-found)
+- [SUSE](https://www.unix.com/man-page/suse/1/command-not-found/)
 
 You can add support for other platforms by submitting a Pull Request.
diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index e46350604..cb8a8989c 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -60,3 +60,10 @@ if [[ -x /data/data/com.termux/files/usr/libexec/termux/command-not-found ]]; th
     /data/data/com.termux/files/usr/libexec/termux/command-not-found "$1"
   }
 fi
+
+# SUSE and derivates: https://www.unix.com/man-page/suse/1/command-not-found/
+if [[ -x /usr/bin/command-not-found ]]; then
+  command_not_found_handler() {
+    /usr/bin/command-not-found "$1"
+  }
+fi

From 481b912fd794827de435f50f44fbd047fa9d6a0e Mon Sep 17 00:00:00 2001
From: Robi Nino <robin@jfrog.com>
Date: Sat, 18 Dec 2021 02:03:20 +0200
Subject: [PATCH 306/591] feat(jfrog): Support jf executable auto completion
 (#10503)

---
 plugins/jfrog/jfrog.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/jfrog/jfrog.plugin.zsh b/plugins/jfrog/jfrog.plugin.zsh
index 064ffa2db..1441bc107 100644
--- a/plugins/jfrog/jfrog.plugin.zsh
+++ b/plugins/jfrog/jfrog.plugin.zsh
@@ -7,4 +7,5 @@ _jfrog() {
 	fi
 }
 
-compdef _jfrog jfrog
\ No newline at end of file
+compdef _jfrog jfrog
+compdef _jfrog jf

From 1e263e245d2760bd3bc35d81c761ad00f0d0a83f Mon Sep 17 00:00:00 2001
From: jxlwqq <jxlwqq@gmail.com>
Date: Sat, 18 Dec 2021 08:04:31 +0800
Subject: [PATCH 307/591] feat(operator-sdk): add plugin for operator-sdk
 (#10423)

---
 plugins/operator-sdk/README.md               | 11 +++++++++++
 plugins/operator-sdk/operator-sdk.plugin.zsh |  4 ++++
 2 files changed, 15 insertions(+)
 create mode 100644 plugins/operator-sdk/README.md
 create mode 100644 plugins/operator-sdk/operator-sdk.plugin.zsh

diff --git a/plugins/operator-sdk/README.md b/plugins/operator-sdk/README.md
new file mode 100644
index 000000000..3336e36ef
--- /dev/null
+++ b/plugins/operator-sdk/README.md
@@ -0,0 +1,11 @@
+# Operator SDK
+
+[Operator SDK](https://sdk.operatorframework.io/) is a component of the Operator Framework, an open source toolkit to manage Kubernetes native applications, called Operators, in an effective, automated, and scalable way.
+
+To use it, add `operator-sdk` to the plugins array of your zshrc file:
+
+```sh
+plugins=(... operator-sdk)
+```
+
+
diff --git a/plugins/operator-sdk/operator-sdk.plugin.zsh b/plugins/operator-sdk/operator-sdk.plugin.zsh
new file mode 100644
index 000000000..baeb01a80
--- /dev/null
+++ b/plugins/operator-sdk/operator-sdk.plugin.zsh
@@ -0,0 +1,4 @@
+if [ $commands[operator-sdk] ]; then
+  source <(operator-sdk completion zsh)
+  compdef _operator-sdk operator-sdk
+fi

From 8d02dabbb616a149d23ab5668b6db5428d5182ac Mon Sep 17 00:00:00 2001
From: Eric <192110+scribe@users.noreply.github.com>
Date: Fri, 17 Dec 2021 17:12:31 -0700
Subject: [PATCH 308/591] docs(README): Document .pre-oh-my-zsh (#10315)

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 310283e92..94a200850 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,8 @@ Oh My Zsh is installed by running one of the following commands in your terminal
 | **wget**  | `sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`   |
 | **fetch** | `sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
 
+_Note that previous configuration in `.zshrc` will be placed in `.pre-oh-my-zsh`. After installation you can move configuration you want to preserve into `.zshrc`._
+
 #### Manual inspection
 
 It's a good idea to inspect the install script from projects you don't yet know. You can do

From 3a3a44c7b583d5518f28c8679298256bdbd0780b Mon Sep 17 00:00:00 2001
From: Celestino Gomes <tinorj@gmail.com>
Date: Fri, 17 Dec 2021 21:14:14 -0300
Subject: [PATCH 309/591] feat(rvm): add alias `rvms` (#10219)

* feat(rvm): add alias `rvms`

* docs(rvm): new alias `rvms`
---
 plugins/rvm/README.md      | 1 +
 plugins/rvm/rvm.plugin.zsh | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/rvm/README.md b/plugins/rvm/README.md
index 1ed8d46a2..b0977f53a 100644
--- a/plugins/rvm/README.md
+++ b/plugins/rvm/README.md
@@ -18,3 +18,4 @@ plugins=(... rvm)
 | `rb21`         | `rvm use ruby-2.1.2` |
 | `rvm-update`   | `rvm get head`       |
 | `gems`         | `gem list`           |
+| `rvms`         | `rvm gemset`         |
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 53e809aaf..c5918f289 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,7 +1,8 @@
 fpath=($rvm_path/scripts/zsh/Completion $fpath)
 
 alias rubies='rvm list rubies'
-alias gemsets='rvm gemset list'
+alias rvms='rvm gemset'
+alias gemsets='rvms list'
 
 local ruby18='ruby-1.8.7'
 local ruby19='ruby-1.9.3'

From 904f8685f75ff5dd3f544f8c6f2cabb8e5952e9a Mon Sep 17 00:00:00 2001
From: Ming Aldrich-Gan <mingaldrichgan@gmail.com>
Date: Fri, 17 Dec 2021 18:15:39 -0600
Subject: [PATCH 310/591] feat(brew): improve `brews` list layout (#10135)

This is an improvement (in my opinion) to the `brews` command that prints each leaf formula (in white), followed by its dependencies (in blue), on each line. Compared to the existing flat list of formulae, the new layout is both more compact and more informative, by differentiating leaves from dependencies at a glance.

Screenshot:
<img width="530" src="https://user-images.githubusercontent.com/1753319/130641713-b78535c9-e3f5-4dbb-80f8-22bc00e1129d.png">
---
 plugins/brew/brew.plugin.zsh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 532dd9be7..070a083d0 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,5 +1,4 @@
 alias brewp='brew pin'
-alias brews='brew list -1'
 alias brewsp='brew list --pinned'
 alias bubo='brew update && brew outdated'
 alias bubc='brew upgrade && brew cleanup'
@@ -7,3 +6,16 @@ alias bubu='bubo && bubc'
 alias buf='brew upgrade --formula'
 alias bcubo='brew update && brew outdated --cask'
 alias bcubc='brew upgrade --cask && brew cleanup'
+
+function brews() {
+  local formulae="$(brew leaves | xargs brew deps --installed --for-each)"
+  local casks="$(brew list --cask)"
+
+  local blue="$(tput setaf 4)"
+  local bold="$(tput bold)"
+  local off="$(tput sgr0)"
+
+  echo "${blue}==>${off} ${bold}Formulae${off}"
+  echo "${formulae}" | sed "s/^\(.*\):\(.*\)$/\1${blue}\2${off}/"
+  echo "\n${blue}==>${off} ${bold}Casks${off}\n${casks}"
+}

From a1ec96d125ad421bc291563378b96711689cb1b8 Mon Sep 17 00:00:00 2001
From: rutriff <mail@alextri.ru>
Date: Wed, 28 Oct 2020 20:31:26 +0300
Subject: [PATCH 311/591] fix(af-magic): add space before git and hg
 information (#9396)

Closes #9396
---
 themes/af-magic.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index d939d546f..2ef9b02d7 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -30,13 +30,13 @@ fi
 RPS1+=" ${FG[237]}%n@%m%{$reset_color%}"
 
 # git settings
-ZSH_THEME_GIT_PROMPT_PREFIX="${FG[075]}(${FG[078]}"
+ZSH_THEME_GIT_PROMPT_PREFIX=" ${FG[075]}(${FG[078]}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"
 
 # hg settings
-ZSH_THEME_HG_PROMPT_PREFIX="${FG[075]}(${FG[078]}"
+ZSH_THEME_HG_PROMPT_PREFIX=" ${FG[075]}(${FG[078]}"
 ZSH_THEME_HG_PROMPT_CLEAN=""
 ZSH_THEME_HG_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
 ZSH_THEME_HG_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"

From 8ae373130c8da1458323a196505355c710869e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 21 Dec 2021 17:01:56 +0100
Subject: [PATCH 312/591] fix(cli): respect `ZDOTDIR` in plugin/theme change
 commands (#10520)

Fixes #10520
---
 lib/cli.zsh | 49 ++++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 4917bc354..8cf8368e6 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -276,9 +276,10 @@ multi == 1 && length(\$0) > 0 {
 { print \$0 }
 "
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
-  && command mv -f ~/.zshrc ~/.zshrc.bck \
-  && command mv -f ~/.zshrc.new ~/.zshrc
+  local zdot="${ZDOTDIR:-$HOME}"
+  awk "$awk_script" "$zdot/.zshrc" > "$zdot/.zshrc.new" \
+  && command mv -f "$zdot/.zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$zdot/.zshrc"
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
@@ -288,10 +289,10 @@ multi == 1 && length(\$0) > 0 {
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n ~/.zshrc; then
-    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    command mv -f ~/.zshrc ~/.zshrc.new
-    command mv -f ~/.zshrc.bck ~/.zshrc
+  if ! zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
+    command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
     return 1
   fi
 
@@ -351,9 +352,10 @@ multi == 1 && /^[^#]*\)/ {
 { print \$0 }
 "
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
-  && command mv -f ~/.zshrc ~/.zshrc.bck \
-  && command mv -f ~/.zshrc.new ~/.zshrc
+  local zdot="${ZDOTDIR:-$HOME}"
+  awk "$awk_script" "$zdot/.zshrc" > "$zdot/.zshrc.new" \
+  && command mv -f "$zdot/.zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$zdot/.zshrc"
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
@@ -363,10 +365,10 @@ multi == 1 && /^[^#]*\)/ {
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n ~/.zshrc; then
-    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    command mv -f ~/.zshrc ~/.zshrc.new
-    command mv -f ~/.zshrc.bck ~/.zshrc
+  if ! zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
+    command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
     return 1
   fi
 
@@ -698,17 +700,18 @@ END {
 }
 '
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
+  local zdot="${ZDOTDIR:-$HOME}"
+  awk "$awk_script" "$zdot/.zshrc" > "$zdot/.zshrc.new" \
   || {
     # Prepend ZSH_THEME= line to .zshrc if it doesn't exist
     cat <<EOF
 ZSH_THEME="$1" # set by \`omz\`
 
 EOF
-    cat ~/.zshrc
-  } > ~/.zshrc.new \
-  && command mv -f ~/.zshrc ~/.zshrc.bck \
-  && command mv -f ~/.zshrc.new ~/.zshrc
+    cat "$zdot/.zshrc"
+  } > "$zdot/.zshrc.new" \
+  && command mv -f "$zdot/.zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$zdot/.zshrc"
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
@@ -718,10 +721,10 @@ EOF
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n ~/.zshrc; then
-    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    command mv -f ~/.zshrc ~/.zshrc.new
-    command mv -f ~/.zshrc.bck ~/.zshrc
+  if ! zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
+    command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
     return 1
   fi
 

From bd0b4b64c6ceaddbd01c6ec35a56f1d72bae4072 Mon Sep 17 00:00:00 2001
From: Sergei Shishov <sshishov@users.noreply.github.com>
Date: Sun, 5 Dec 2021 11:48:00 +0400
Subject: [PATCH 313/591] fix(asdf): fix path to Homebrew installation of
 `asdf` (#10481)

Fixes #10484
Closes #10481
---
 plugins/asdf/asdf.plugin.zsh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh
index c386d57ed..da53eef8e 100644
--- a/plugins/asdf/asdf.plugin.zsh
+++ b/plugins/asdf/asdf.plugin.zsh
@@ -4,16 +4,18 @@ ASDF_COMPLETIONS="$ASDF_DIR/completions"
 
 # If not found, check for Homebrew package
 if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && (( $+commands[brew] )); then
-   ASDF_DIR="$(brew --prefix asdf)"
-   ASDF_COMPLETIONS="$ASDF_DIR/etc/bash_completion.d"
+  brew_prefix="$(brew --prefix asdf)"
+  ASDF_DIR="${brew_prefix}/libexec"
+  ASDF_COMPLETIONS="${brew_prefix}/etc/bash_completion.d"
+  unset brew_prefix
 fi
 
 # Load command
 if [[ -f "$ASDF_DIR/asdf.sh" ]]; then
-    . "$ASDF_DIR/asdf.sh"
+  . "$ASDF_DIR/asdf.sh"
 
-    # Load completions
-    if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then
-        . "$ASDF_COMPLETIONS/asdf.bash"
-    fi
+  # Load completions
+  if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then
+    . "$ASDF_COMPLETIONS/asdf.bash"
+  fi
 fi

From 6babcbd8841335a3c25ec960ff57ab9a139c9073 Mon Sep 17 00:00:00 2001
From: alexandregv <contact@alexandregv.fr>
Date: Thu, 6 May 2021 19:02:37 +0200
Subject: [PATCH 314/591] feat(asdf): add support for archlinux/AUR package
 (#9893)

Closes #9893
---
 plugins/asdf/asdf.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh
index da53eef8e..3016282c6 100644
--- a/plugins/asdf/asdf.plugin.zsh
+++ b/plugins/asdf/asdf.plugin.zsh
@@ -2,6 +2,12 @@
 ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}"
 ASDF_COMPLETIONS="$ASDF_DIR/completions"
 
+# If not found, check for archlinux/AUR package (/opt/asdf-vm/)
+if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && [[ -f "/opt/asdf-vm/asdf.sh" ]]; then
+  ASDF_DIR="/opt/asdf-vm"
+  ASDF_COMPLETIONS="$ASDF_DIR"
+fi
+
 # If not found, check for Homebrew package
 if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && (( $+commands[brew] )); then
   brew_prefix="$(brew --prefix asdf)"

From 98a916b2cf67a47f97268dec9d68a15cb2c092ba Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 23 Dec 2021 19:45:28 +0100
Subject: [PATCH 315/591] feat(yarn): upgrade completion to latest version
 (#10516)

---
 plugins/yarn/_yarn | 73 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 55 insertions(+), 18 deletions(-)

diff --git a/plugins/yarn/_yarn b/plugins/yarn/_yarn
index 9173eca20..9db02602e 100644
--- a/plugins/yarn/_yarn
+++ b/plugins/yarn/_yarn
@@ -85,36 +85,67 @@ _global_commands=(
   'upgrade-interactive:Interactively upgrade packages'
 )
 
+_yarn_find_package_json() {
+  local dir=$(cd "$1" && pwd)
+
+  while true
+  do
+    if [[ -e "${dir}/package.json" ]]; then
+      echo "${dir}/package.json"
+      return
+    fi
+
+    if [[ $dir == '/' ]]; then
+      break
+    fi
+
+    dir=$(dirname $dir)
+  done
+}
+
 _yarn_commands_scripts() {
-  local -a scripts
+  local -a scripts binaries
+  local packageJson
+
   if [[ -n $opt_args[--cwd] ]]; then
-    scripts=($(cd $opt_args[--cwd] && yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+    packageJson=$(_yarn_find_package_json $opt_args[--cwd])
+    binaries=($(cd $opt_args[--cwd] && echo node_modules/.bin/*(x:t)))
   else
-    scripts=($(yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+    packageJson=$(_yarn_find_package_json $pwd)
+    binaries=($(echo node_modules/.bin/*(x:t)))
   fi
 
-  _describe 'command or script' _commands -- _global_commands -- scripts
+  if [[ -n $packageJson ]]; then
+    scripts=($(cat "$packageJson" | perl -0777 -MJSON::PP -n -E '%r=decode_json($_); say for sort keys %{$r->{scripts}}'))
+  fi
+
+  _describe 'command or script' _commands -- _global_commands -- scripts -- binaries
 }
 
 _yarn_scripts() {
-  local -a commands binaries scripts
-  local -a scriptNames scriptCommands
-  local i runJSON
+  local -a binaries scripts
+  local -a commands
+  local packageJson
 
   if [[ -n $_yarn_run_cwd ]]; then
-    runJSON=$(cd $_yarn_run_cwd && yarn run --json 2>/dev/null)
+    packageJson=$(_yarn_find_package_json $_yarn_run_cwd)
+    if [[ -d "${_yarn_run_cwd}/node_modules" ]]; then
+      binaries=($(cd $_yarn_run_cwd && echo node_modules/.bin/*(x:t)))
+    else
+      binaries=($(cd $_yarn_run_cwd && yarn bin | perl -wln -e 'm{^[^:]+: (\S+)$} and print $1'))
+    fi
   else
-    runJSON=$(yarn run --json 2>/dev/null)
+    packageJson=$(_yarn_find_package_json $pwd)
+    if [[ -d node_modules ]]; then
+      binaries=($(echo node_modules/.bin/*(x:t)))
+    else
+      binaries=($(yarn bin | perl -wln -e 'm{^[^:]+: (\S+)$} and print $1'))
+    fi
   fi
-  # Some sed utilities (e.g. Mac OS / BSD) don't interpret `\n` in a replacement
-  # pattern as a newline. See https://superuser.com/q/307165
-  binaries=($(sed -E '/Commands available/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g;s/:/\\:/g;s/,/\'$'\n/g' <<< "$runJSON"))
-  scriptNames=($(sed -E '/possibleCommands/!d;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g;s/:/\\:/g;s/,/\'$'\n/g' <<< "$runJSON"))
-  scriptCommands=("${(@f)$(sed -E '/possibleCommands/!d;s/.*"hints":\{(.+")\}.*/\1/;s/"[^"]+"://g;s/:/\\:/g;s/","/\'$'\n/g;s/(^"|"$)//g' <<< "$runJSON")}")
 
-  for (( i=1; i <= $#scriptNames; i++ )); do
-    scripts+=("${scriptNames[$i]}:${scriptCommands[$i]}")
-  done
+  if [[ -n $packageJson ]]; then
+    scripts=("${(@f)$(cat ${packageJson} | perl -0777 -MJSON::PP -n -E '%r=%{decode_json($_)->{scripts}}; printf "$_:$r{$_}\n" for sort keys %r')}")
+  fi
 
   commands=('env' $scripts $binaries)
   _describe 'command' commands
@@ -137,7 +168,13 @@ _yarn_add_files() {
 }
 
 _yarn_workspaces() {
-  local -a workspaces=(${(@f)$(yarn workspaces info |sed -n -e 's/^  "\([^"]*\)": {/\1/p')})
+  local version=$(yarn --version |sed -n 's|\([0-9]*\).*|\1|p')
+  local -a workspaces
+  if [[ $version == "1" ]]; then
+    workspaces=(${(@f)$(yarn workspaces info |sed -n -e 's/^  "\([^"]*\)": {/\1/p')})
+  else
+    workspaces=(${(@f)$(yarn workspaces list --json | sed -n 's|.*"name":"\([^"]*\)"}|\1|p')})
+  fi
   _describe 'workspace' workspaces
 }
 

From 7546ded93b31ffc3824b3cd63a72bba0a25f5e9b Mon Sep 17 00:00:00 2001
From: Benoit Foujols <benoit@foujols.com>
Date: Thu, 23 Dec 2021 19:47:50 +0100
Subject: [PATCH 316/591] fix(symfony2): silence debug lines in command
 completion (#10528)

---
 plugins/symfony2/symfony2.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 1498e8d02..e23809df4 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -5,7 +5,7 @@ _symfony_console () {
 }
 
 _symfony2_get_command_list () {
-   `_symfony_console` --no-ansi | sed "1,/Available commands/d" | awk '/^  ?[^ ]+ / { print $1 }'
+   `_symfony_console` --no-ansi --no-debug | sed "1,/Available commands/d" | awk '/^  ?[^ ]+ / { print $1 }'
 }
 
 _symfony2 () {

From 4f90849425b4f40778e2fdb5281a1bae4117a7c2 Mon Sep 17 00:00:00 2001
From: Mark Mercado <mamercad@gmail.com>
Date: Thu, 23 Dec 2021 13:50:13 -0500
Subject: [PATCH 317/591] feat(lpass): add plugin for LastPass CLI completion
 (#9323)

---
 plugins/lpass/README.md |  13 ++++
 plugins/lpass/_lpass    | 169 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 182 insertions(+)
 create mode 100644 plugins/lpass/README.md
 create mode 100644 plugins/lpass/_lpass

diff --git a/plugins/lpass/README.md b/plugins/lpass/README.md
new file mode 100644
index 000000000..d3923ea67
--- /dev/null
+++ b/plugins/lpass/README.md
@@ -0,0 +1,13 @@
+# lpass (LastPass CLI)
+
+This plugin adds completion for LastPass CLI [`lpass`](https://github.com/lastpass/lastpass-cli).
+
+To use it, add `lpass` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... lpass)
+```
+
+Completion is taken from the `lpass` release [`1.3.3`](https://github.com/lastpass/lastpass-cli/releases/tag/v1.3.3).
+
+Updated on October 9th, 2020.
diff --git a/plugins/lpass/_lpass b/plugins/lpass/_lpass
new file mode 100644
index 000000000..e6193a22d
--- /dev/null
+++ b/plugins/lpass/_lpass
@@ -0,0 +1,169 @@
+#compdef lpass
+
+_lpass() {
+    local cmd has_color has_sync has_interactive
+  	if (( CURRENT > 2)); then
+        cmd=${words[2]}
+        # Set the context for the subcommand.
+        curcontext="${curcontext%:*:*}:lpass-$cmd"
+        # Narrow the range of words we are looking at to exclude `lpass'
+        (( CURRENT-- ))
+        shift words
+        # Run the completion for the subcommand
+        case "${cmd}" in
+            login)
+                _arguments : \
+                  '--trust[Cause subsequent logins to not require multifactor authentication.]' \
+                  '--plaintext-key[Save plaintext decryption key to the hard disk]' \
+                  '--force[Do not ask on saving plaintext key]'
+                has_color=1
+            ;;
+
+            logout)
+                _arguments : '--force[Force confirmation]'
+                has_color=1
+            ;;
+            show)
+                _arguments : \
+                  '(-c --clip)'{-c,--clip}'[Copy output to clipboard]' \
+                  '(-x --expand-multi)'{-x,---expand-multi}'[Show the requested information from all of the matching sites]' \
+                  '(--all --username --password --url --notes --field= --id --name --attach=)'{--all,--username,--password,--url,--notes,--field=,--id,--name,--attach=}'[Output the specific field]' \
+                  '(--basic-regexp,--fixed-string)'{-G,--basic-regexp}'[Find a site by substring or regular expression]' \
+                  '--format=[Format output with printf-style placeholders]'
+                _lpass_complete_uniqenames
+                has_color=1
+                has_sync=1
+            ;;
+
+            ls)
+                _arguments : \
+                  '(-l --long)'{-l,--long}'[Also list the last modification time and username]' \
+                  '-u[List username]' \
+                  '-m[List modification time]' \
+                  '--format=[Format output with printf-style placeholders]'
+      				  _lpass_complete_groups
+                has_color=1
+                has_sync=1
+      			;;
+            mv)
+                _lpass_complete_uniqenames
+                _lpass_complete_groups
+                has_color=1
+            ;;
+            duplicate|rm)
+                _lpass_complete_uniqenames
+                has_color=1
+                has_sync=1
+            ;;
+            add)
+                _arguments : '(--username --password --url --notes --field=)'{--username,--password,--url,--notes,--field=}'[Add field]'
+                _lpass_complete_uniqenames
+                has_color=1
+                has_sync=1
+                has_interactive=1
+            ;;
+            edit)
+                _arguments : '(--name --username --password --url --notes --field=)'{--name,--username,--password,--url,--notes,--field=}'[Update field]'
+                _lpass_complete_uniqenames
+                has_color=1
+                has_sync=1
+                has_interactive=1
+            ;;
+            generate)
+                _arguments : \
+                  '(-c --clip)'{-c,--clip}'[Copy output to clipboard]' \
+                  '--username=[USERNAME]' \
+                  '--url=[URL]' \
+                  '--no-symbols[Do not use symbols]'
+                has_sync=1
+            ;;
+            status)
+               _arguments : '(-q --quiet)'{-q,--quiet}'[Supress output to stdout]'
+                has_color=1
+            ;;
+            sync)
+                _arguments : '(-b --background)'{-b,--background}'[Run sync in background]'
+                has_color=1
+            ;;
+            export)
+                _arguments : '--fields=[Field list]'
+                has_color=1
+                has_sync=1
+            ;;
+            import)
+              if ((CURRENT < 3)); then
+                _files
+              fi
+            ;;
+        esac
+
+        if [ -n "$has_sync" ] || [ -n "$has_color" ] || [ -n "$has_interactive" ]; then
+            local -a generic_options
+            if [ "$has_sync" -eq 1 ]; then
+                generic_options+=('--sync=[Synchronize local cache with server: auto | now | no]')
+            fi
+            if [ "$has_color" -eq 1 ]; then
+                generic_options+=('--color=[Color: auto | never | always]')
+            fi
+            if [ "$has_interactive" -eq 1 ]; then
+                generic_options+=("--non-interactive[Use stardard input instead of $EDITOR]")
+            fi
+            _arguments $generic_options
+        fi
+    else
+        local -a subcommands
+        subcommands=(
+          "login:Authenticate with the LastPass server and initialize a local cache"
+          "logout:Remove the local cache and stored encryption keys"
+          "passwd:Change your LastPass password"
+          "show:Display a password or selected field"
+          "ls:List names in groups in a tree structure"
+          "mv:Move the specified entry to a new group"
+          "add:Add a new entry"
+          "edit:Edit the selected field"
+          "generate:Create a randomly generated password"
+          "duplicate:Create a duplicate entry of the one specified"
+          "rm:Remove the specified entry"
+          "status:Show current login status"
+          "sync:Synchronize local cache with server"
+          "export:Dump all account information including passwords as unencrypted csv to stdout"
+          "import:Upload accounts from an unencrypted CSV file to the server"
+          "share:Manipulate shared folders (only enterprise or premium user)"
+        )
+        _describe -t commands 'lpass' subcommands
+        _arguments : \
+          '(-h --help)'{-h,--help}'[show help]' \
+          '(-v --version)'{-v,--version}'[show version]'
+
+    fi
+}
+
+_lpass_complete_uniqenames(){
+  local -a entries
+  while read i;  do
+    if [ -n "$i" ]; then
+      entries+=("$i")
+    fi
+  done < <(lpass ls --sync auto --format "%an" --color=never)
+  compadd -a entries
+}
+
+
+_lpass_complete_groups() {
+  local -a entries
+  while read i;  do
+    if [ -n "$i" ]; then
+      entries+=("$i")
+    fi
+  done < <(lpass ls --sync auto --format "%aN" --color=never | grep -E "\/$")
+  compadd -a entries
+}
+
+_lpass
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

From 068feca15d09dce6747d0fb6cab2027b938e82bd Mon Sep 17 00:00:00 2001
From: Philipp Schmitt <pschmitt@users.noreply.github.com>
Date: Fri, 24 Dec 2021 18:09:01 +0100
Subject: [PATCH 318/591] feat(zsh-navigation-tools)!: update to
 zdharma-continuum fork (#10402)

BREAKING CHANGE: the `zsh-navigation-tools` plugin now bundles the version from the
zdharma-continuum project, which republished the projects that psprint deleted (we
don't yet know yet why). In theory this change doesn't break anything, but be aware
of the change and that the upstream repository now lives somewhere else.

Source: https://github.com/zdharma-continuum/zsh-navigation-tools/commit/67b24e1
---
 .../.config/znt/README.txt                    |   1 -
 plugins/zsh-navigation-tools/README.md        |  37 ++-
 .../doc/generate_single_file                  |  35 +++
 .../doc/img/n-history2.png                    | Bin 0 -> 108316 bytes
 plugins/zsh-navigation-tools/doc/install.sh   |  70 ++++++
 plugins/zsh-navigation-tools/doc/n-preview    | 224 ++++++++++++++++++
 .../{ => doc}/znt-tmux.zsh                    |   2 +-
 .../zsh-navigation-tools.plugin.zsh           |   2 +-
 8 files changed, 346 insertions(+), 25 deletions(-)
 delete mode 100644 plugins/zsh-navigation-tools/.config/znt/README.txt
 create mode 100755 plugins/zsh-navigation-tools/doc/generate_single_file
 create mode 100644 plugins/zsh-navigation-tools/doc/img/n-history2.png
 create mode 100755 plugins/zsh-navigation-tools/doc/install.sh
 create mode 100644 plugins/zsh-navigation-tools/doc/n-preview
 rename plugins/zsh-navigation-tools/{ => doc}/znt-tmux.zsh (97%)

diff --git a/plugins/zsh-navigation-tools/.config/znt/README.txt b/plugins/zsh-navigation-tools/.config/znt/README.txt
deleted file mode 100644
index c3d6c821a..000000000
--- a/plugins/zsh-navigation-tools/.config/znt/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-These are skeletons, configuration is read from ~/.config/znt/*
diff --git a/plugins/zsh-navigation-tools/README.md b/plugins/zsh-navigation-tools/README.md
index 7d2ce99f4..9fd2d5414 100644
--- a/plugins/zsh-navigation-tools/README.md
+++ b/plugins/zsh-navigation-tools/README.md
@@ -1,15 +1,14 @@
 [![License (GPL version 3)](https://img.shields.io/badge/license-GNU%20GPL%20version%203-blue.svg?style=flat-square)](./LICENSE)
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](./LICENSE)
 ![ZSH 5.0.0](https://img.shields.io/badge/zsh-v5.0.0-orange.svg?style=flat-square)
+[![Gitter][gitter-image]][gitter-link]
 
 ![znt logo](http://imageshack.com/a/img905/2629/WK9qjN.png)
 
-[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D6XDCHDSBDSDG)
-
 # Zsh Navigation Tools
 
-Also check out [![ZCA](http://imageshack.com/a/img911/8084/qSpO8a.png) Zsh Command Architect](https://github.com/psprint/zsh-cmd-architect)
-and [Zconvey](https://github.com/psprint/zconvey)
+Also check out [![ZCA](http://imageshack.com/a/img911/8084/qSpO8a.png) Zsh Command Architect](https://github.com/zdharma-continuum/zsh-cmd-architect)
+and [Zconvey](https://github.com/zdharma-continuum/zconvey)
 
 
 
@@ -107,10 +106,10 @@ history management and various integrations with `Zsh`.
 
 * 30-04-2016
   - New feature: color themes. Use `Ctrl-T` and `Ctrl-G` to browse predefined
-    themes. They are listed in [~/.config/znt/n-list.conf](https://github.com/psprint/zsh-navigation-tools/blob/master/.config/znt/n-list.conf).
+    themes. They are listed in [~/.config/znt/n-list.conf](https://github.com/zdharma-continuum/zsh-navigation-tools/blob/master/.config/znt/n-list.conf).
     Use the file to permanently set a color scheme. Also, I sent a patch to Zsh developers
     and starting from Zsh > 5.2 (not yet released) supported will be 256 colors.
-    The file [~/.config/znt/n-list.conf](https://github.com/psprint/zsh-navigation-tools/blob/master/.config/znt/n-list.conf)
+    The file [~/.config/znt/n-list.conf](https://github.com/zdharma-continuum/zsh-navigation-tools/blob/master/.config/znt/n-list.conf)
     already has set of 256-color themes prepared :)
 
     ![themes](http://imageshack.com/a/img924/4310/EbRh30.gif)
@@ -130,7 +129,7 @@ history management and various integrations with `Zsh`.
 ## Installation
 
 ```
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/psprint/zsh-navigation-tools/master/doc/install.sh)"
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/zdharma-continuum/zsh-navigation-tools/master/doc/install.sh)"
 ```
 
 To update run the command again.
@@ -140,16 +139,16 @@ will be updated with only `8` lines of code, which will be added at the bottom.
 
 After installing and reloading shell give `ZNT` a quick try with `Ctrl-R` – this keyboard shortcut will open `n-history`.
 
-## Installation With [Zplugin](https://github.com/psprint/zplugin)
-Add `zplugin load psprint/zsh-navigation-tools` to `.zshrc`. The config files will be in `~/.config/znt`.
+## Installation With [Zinit](https://github.com/zdharma-continuum/zinit)
+Add `zinit load zdharma-continuum/zsh-navigation-tools` to `.zshrc`. The config files will be in `~/.config/znt`.
 
-## Installation With Zgen
+## Installation With Zgenom/Zgen
 
-Add `zgen load psprint/zsh-navigation-tools` to `.zshrc` and issue a `zgen reset` (this assumes that there is a proper `zgen save` construct in `.zshrc`).
+Add `zgen load zdharma-continuum/zsh-navigation-tools` to `.zshrc` and issue a `zgen reset` (this assumes that there is a proper `zgen save` construct in `.zshrc`).
 The config files will be available in `~/.config/znt`.
 
 ## Installation With Antigen
-Add `antigen bundle psprint/zsh-navigation-tools` to `.zshrc`. There also
+Add `antigen bundle zdharma-continuum/zsh-navigation-tools` to `.zshrc`. There also
 should be `antigen apply`. The config files will be in `~/.config/znt`.
 
 ## Single File Manual Installation
@@ -194,7 +193,7 @@ alias naliases=n-aliases ncd=n-cd nenv=n-env nfunctions=n-functions nhistory=n-h
 alias nkill=n-kill noptions=n-options npanelize=n-panelize nhelp=n-help
 ```
 
-Don't forget to copy [configuration files](https://github.com/psprint/zsh-navigation-tools/tree/master/.config/znt). They should go to `~/.config/znt`. Moreover, `n-cd` works together with option `AUTO_PUSHD` and you should have:
+Don't forget to copy [configuration files](https://github.com/zdharma-continuum/zsh-navigation-tools/tree/master/.config/znt). They should go to `~/.config/znt`. Moreover, `n-cd` works together with option `AUTO_PUSHD` and you should have:
 
 ```zsh
 setopt AUTO_PUSHD
@@ -397,15 +396,7 @@ The same with doing any non-typical Zsh Navigation Tools installation.
 
 ## More
 
-- be aware of [this](https://github.com/psprint/zsh-navigation-tools/blob/f49f910d239ae5bc6e1a5bb34930307b4f4e3ffe/zsh-navigation-tools.plugin.zsh#L35-L49)
-
-## IRC Channel
-
-Channel `#zplugin@freenode` is a support place for all author's projects. Connect to:
-[chat.freenode.net:6697](ircs://chat.freenode.net:6697/%23zplugin) (SSL) or [chat.freenode.net:6667](irc://chat.freenode.net:6667/%23zplugin)
- and join #zplugin.
-
-Following is a quick access via Webchat [![IRC](https://kiwiirc.com/buttons/chat.freenode.net/zplugin.png)](https://kiwiirc.com/client/chat.freenode.net:+6697/#zplugin)
+- be aware of [this](https://github.com/zdharma-continuum/zsh-navigation-tools/blob/f49f910d239ae5bc6e1a5bb34930307b4f4e3ffe/zsh-navigation-tools.plugin.zsh#L35-L49)
 
 # Fixing tmux, screen and linux vt
 
@@ -429,3 +420,5 @@ It will not display underline properly, but will instead highlight by a color,
 which is quite nice. The same will not work for FreeBSD's vt, `ZNT` will detect
 if that vt is used and will revert to highlighting elements via `reverse` mode.
 
+[gitter-image]: https://badges.gitter.im/zdharma-continuum/community.svg
+[gitter-link]: https://gitter.im/zdharma-continuum/community
diff --git a/plugins/zsh-navigation-tools/doc/generate_single_file b/plugins/zsh-navigation-tools/doc/generate_single_file
new file mode 100755
index 000000000..d3d393834
--- /dev/null
+++ b/plugins/zsh-navigation-tools/doc/generate_single_file
@@ -0,0 +1,35 @@
+#!/bin/zsh
+
+local PLUGIN_FILE="doc/zshnavigationtools.plugin.zsh"
+
+[ -d doc ] || cd ..
+
+rm -vf "$PLUGIN_FILE"
+echo "# The preamble comments apply when using ZNT as autoload functions" >>"$PLUGIN_FILE"
+echo "# https://github.com/psprint/zsh-navigation-tools" >>"$PLUGIN_FILE"
+echo "# License is GPLv3 and MIT" >>"$PLUGIN_FILE"
+echo -n "# " >>"$PLUGIN_FILE"
+git show-ref master | head -1 >>"$PLUGIN_FILE"
+echo >>"$PLUGIN_FILE"
+
+for i in n-*(on); do
+    echo "$i() {" >>"$PLUGIN_FILE"
+    cat "$i" >>"$PLUGIN_FILE"
+    echo "}" >>"$PLUGIN_FILE"
+    echo "alias n${i#n-}=$i" >>"$PLUGIN_FILE"
+    echo >>"$PLUGIN_FILE"
+done
+
+# Append znt-* files
+for i in znt-*(on); do
+    echo "$i() {" >>"$PLUGIN_FILE"
+    cat "$i" >>"$PLUGIN_FILE"
+    echo "}" >>"$PLUGIN_FILE"
+    echo >>"$PLUGIN_FILE"
+done
+
+# Append ^R bind
+echo "zle -N znt-history-widget" >>"$PLUGIN_FILE"
+echo "bindkey '^R' znt-history-widget" >>"$PLUGIN_FILE"
+echo "setopt AUTO_PUSHD HIST_IGNORE_DUPS PUSHD_IGNORE_DUPS" >>"$PLUGIN_FILE"
+
diff --git a/plugins/zsh-navigation-tools/doc/img/n-history2.png b/plugins/zsh-navigation-tools/doc/img/n-history2.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa23de00d5c6b4550c96fe783d34575d8fdecbfe
GIT binary patch
literal 108316
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
RAp-*ggQu&X%Q~loCIFj977_pe

literal 0
HcmV?d00001

diff --git a/plugins/zsh-navigation-tools/doc/install.sh b/plugins/zsh-navigation-tools/doc/install.sh
new file mode 100755
index 000000000..2b71aa3b4
--- /dev/null
+++ b/plugins/zsh-navigation-tools/doc/install.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+if ! type git 2>/dev/null 1>&2; then
+    echo "Please install GIT first"
+    echo "Exiting"
+    exit 1
+fi
+
+#
+# Clone or pull
+#
+
+if ! test -d "$HOME/.config"; then
+    mkdir "$HOME/.config"
+fi
+
+if ! test -d "$HOME/.config/znt"; then
+    mkdir "$HOME/.config/znt"
+fi
+
+echo ">>> Downloading zsh-navigation-tools to ~/.config/znt"
+if test -d ~/.config/znt/zsh-navigation-tools; then
+    cd ~/.config/znt/zsh-navigation-tools
+    git pull origin master
+else
+    cd ~/.config/znt
+    git clone https://github.com/psprint/zsh-navigation-tools.git zsh-navigation-tools
+fi
+echo ">>> Done"
+
+#
+# Copy configs
+#
+
+echo ">>> Copying config files"
+
+cd ~/.config/znt
+
+set n-aliases.conf n-env.conf n-history.conf n-list.conf n-panelize.conf n-cd.conf n-functions.conf n-kill.conf n-options.conf
+
+for i; do
+    if ! test -f "$i"; then
+        cp -v zsh-navigation-tools/.config/znt/$i .
+    fi
+done
+
+echo ">>> Done"
+
+#
+# Modify .zshrc
+#
+
+echo ">>> Updating .zshrc"
+if ! grep zsh-navigation-tools ~/.zshrc >/dev/null 2>&1; then
+    echo >> ~/.zshrc
+    echo "### ZNT's installer added snippet ###" >> ~/.zshrc
+    echo "fpath=( \"\$fpath[@]\" \"\$HOME/.config/znt/zsh-navigation-tools\" )" >> ~/.zshrc
+    echo "autoload n-aliases n-cd n-env n-functions n-history n-kill n-list n-list-draw n-list-input n-options n-panelize n-help" >> ~/.zshrc
+    echo "autoload znt-usetty-wrapper znt-history-widget znt-cd-widget znt-kill-widget" >> ~/.zshrc
+    echo "alias naliases=n-aliases ncd=n-cd nenv=n-env nfunctions=n-functions nhistory=n-history" >> ~/.zshrc
+    echo "alias nkill=n-kill noptions=n-options npanelize=n-panelize nhelp=n-help" >> ~/.zshrc
+    echo "zle -N znt-history-widget" >> ~/.zshrc
+    echo "bindkey '^R' znt-history-widget" >> ~/.zshrc
+    echo "setopt AUTO_PUSHD HIST_IGNORE_DUPS PUSHD_IGNORE_DUPS" >> ~/.zshrc
+    echo "zstyle ':completion::complete:n-kill::bits' matcher 'r:|=** l:|=*'" >> ~/.zshrc
+    echo "### END ###" >> ~/.zshrc
+    echo ">>> Done"
+else
+    echo ">>> .zshrc already updated, not making changes"
+fi
diff --git a/plugins/zsh-navigation-tools/doc/n-preview b/plugins/zsh-navigation-tools/doc/n-preview
new file mode 100644
index 000000000..2d8eea3fb
--- /dev/null
+++ b/plugins/zsh-navigation-tools/doc/n-preview
@@ -0,0 +1,224 @@
+# Copy this file into /usr/share/zsh/site-functions/
+# and add 'autoload n-preview` to .zshrc
+#
+# This is partially a test if n-list-draw and n-list-input can be
+# used multiple times to create multiple lists. It might become
+# more usable if someone adds more features like previewing of
+# archive contents.
+
+emulate -L zsh
+
+zmodload zsh/curses
+
+setopt typesetsilent extendedglob
+trap "return" TERM INT QUIT
+trap "_vpreview_exit" EXIT
+
+local IFS="
+"
+
+[ -f ~/.config/znt/n-list.conf ] && . ~/.config/znt/n-list.conf
+
+[[ "$colorpair" = "" ]] && colorpair="white/black"
+local background="${colorpair#*/}"
+
+# Drawing and input
+autoload n-list-draw n-list-input
+
+# Cleanup before any exit
+_vpreview_exit() {
+    zcurses 2>/dev/null delwin files
+    zcurses 2>/dev/null delwin body 
+    zcurses 2>/dev/null delwin status
+    zcurses 2>/dev/null refresh
+    zcurses end
+}
+
+# Outputs a message in the bottom of the screen
+_vpreview_status_msg() {
+    zcurses move status 1 2
+    zcurses clear status eol
+    zcurses string status "$1"
+}
+
+# Prefer tput, then module terminfo
+_nlist_cursor_visibility() {
+    if type tput 2>/dev/null 1>&2; then
+        [ "$1" = "1" ] && tput cvvis
+        [ "$1" = "0" ] && tput civis
+    elif [ "$has_termcap" = "1" ]; then
+        [ "$1" = "1" ] && [ -n $terminfo[cvvis] ] && echo -n $terminfo[cvvis]
+        [ "$1" = "0" ] && [ -n $terminfo[civis] ] && echo -n $terminfo[civis]
+    fi 
+}
+
+#
+# Main code
+#
+
+integer term_height="$LINES"
+integer term_width="$COLUMNS"
+if [[ "$term_height" -lt 1 || "$term_width" -lt 1 ]]; then
+    local stty_out=$( stty size )
+    term_height="${stty_out% *}"
+    term_width="${stty_out#* }"
+fi
+
+integer status_height=3
+integer status_width=term_width
+integer status_page_height=1
+integer status_page_width=term_width-2
+
+integer files_height=term_height-status_height
+integer files_width=term_width/5
+integer files_page_height=files_height-2
+integer files_page_width=files_width-2
+
+integer body_height=term_height-status_height
+integer body_width=term_width-files_width
+integer body_page_height=body_height-2
+integer body_page_width=body_width
+
+integer _from_what_idx_list_is_shown_1=1
+integer current_1=1
+
+integer _from_what_idx_list_is_shown_2=1
+integer current_2=1
+integer hscroll_2=0
+
+integer active_window=0
+
+local ansi_mode="ansi"
+[ -f ~/.config/znt/n-preview.conf ] && . ~/.config/znt/n-preview.conf
+typeset -a hcmd
+#if type pygmentize 2>/dev/null 1>&2; then
+#    hcmd=( pygmentize -g )
+if type highlight 2>/dev/null 1>&2; then
+    hcmd=( highlight -q --force -O ansi )
+elif type source-highlight 2>/dev/null 1>&2; then
+    # Warning: source-highlight can have problems
+    hcmd=( source-highlight --failsafe -fesc -o STDOUT -i )
+else
+    ansi_mode="noansi"
+fi
+
+zcurses init
+zcurses addwin status "$status_height" "$status_width" $(( term_height - status_height )) 0
+zcurses addwin files "$files_height" "$files_width" 0 0
+zcurses addwin body "$body_height" "$body_width" 0 "$files_width"
+zcurses bg status white/black
+zcurses bg files white/black
+zcurses bg body white/black
+
+#
+# Listening for input
+#
+
+local key keypad
+
+# Clear input buffer
+zcurses timeout status 0
+zcurses input status key keypad
+zcurses timeout status -1
+key=""
+keypad=""
+
+typeset -a filenames
+integer last_element_1
+
+typeset -a body
+integer last_element_2
+
+filenames=( *(N) )
+filenames=( "${(@M)filenames:#(#i)*$1*}" )
+
+local NLIST_GREP_STRING="$1"
+
+integer last_element_1="$#filenames"
+integer last_element_2=0
+
+local selection action final_key
+
+while (( 1 )); do
+    # Output the lists
+    integer end_idx=$(( _from_what_idx_list_is_shown_1 + files_page_height - 1 ))
+    [ "$end_idx" -gt "$last_element_1" ] && end_idx=last_element_1
+
+    n-list-draw "$(( (current_1 -1) % files_page_height + 1 ))" \
+                    "$files_page_height" "$files_page_width" 1 2 0 files \
+                    "${(@)filenames[_from_what_idx_list_is_shown_1, end_idx]}"
+
+    if [ "$#body" -ge 1 ]; then
+        end_idx=$(( _from_what_idx_list_is_shown_2 + body_page_height - 1 ))
+        [ "$end_idx" -gt "$last_element_2" ] && end_idx=last_element_2
+
+        n-list-draw "$(( (current_2 -1) % body_page_height + 1 ))" \
+                        "$body_page_height" "$body_page_width" 1 0 "$hscroll_2" body \
+                        "${(@)body[_from_what_idx_list_is_shown_2, end_idx]}"
+    fi
+
+    [[ "$active_window" -eq 0 ]] && zcurses border files
+    zcurses border status
+    zcurses refresh files body status 
+
+    # Wait for input
+    zcurses input status key keypad
+
+    # Get the special (i.e. "keypad") key or regular key
+    if [ -n "$key" ]; then
+        final_key="$key" 
+    elif [ -n "$keypad" ]; then
+        final_key="$keypad"
+    else
+        _vpreview_status_msg "Inproper input detected"
+        zcurses refresh status 
+    fi
+
+    if [ "$active_window" -eq 0 ]; then
+        zcurses clear files
+        n-list-input "$current_1" "$_from_what_idx_list_is_shown_1" "$files_page_height" \
+            "$files_page_width" "$last_element_1" 0 "$final_key"
+
+        selection="$reply[1]"
+        action="$reply[2]"
+        current_1="$reply[3]"
+        _from_what_idx_list_is_shown_1="$reply[4]"
+
+        if [ "$action" = "SELECT" ]; then
+            # Load new file and refresh the displaying window
+            local filename="$filenames[$selection]"
+            if [ "$ansi_mode" = "ansi" ]; then
+                body=( "${(@f)"$( "$hcmd[@]" "$filename" )"}" )
+            else
+                body=( "${(@f)"$(<$filename)"}" )
+            fi
+            last_element_2="$#body"
+            current_2=1
+            _from_what_idx_list_is_shown_2=1
+            zcurses clear body
+        fi
+    elif [ "$active_window" -eq 1 ]; then
+        zcurses clear body
+        n-list-input "$current_2" "$_from_what_idx_list_is_shown_2" "$body_page_height" \
+            "$body_page_width" "$last_element_2" "$hscroll_2" "$final_key"
+
+        selection="$reply[1]"
+        action="$reply[2]"
+        current_2="$reply[3]"
+        _from_what_idx_list_is_shown_2="$reply[4]"
+        hscroll_2="$reply[5]"
+
+    fi
+
+    if [ "$action" = "LEAVE" ]; then
+        active_window=1-active_window
+    elif [ "$action" = "QUIT" ]; then
+            break
+    elif [ "$action" = "REDRAW" ]; then
+        zcurses clear files redraw
+        zcurses clear body redraw
+        zcurses clear status redraw
+    fi
+done
+
+# vim: set filetype=zsh:
diff --git a/plugins/zsh-navigation-tools/znt-tmux.zsh b/plugins/zsh-navigation-tools/doc/znt-tmux.zsh
similarity index 97%
rename from plugins/zsh-navigation-tools/znt-tmux.zsh
rename to plugins/zsh-navigation-tools/doc/znt-tmux.zsh
index 6a96e97a1..309c11a0b 100755
--- a/plugins/zsh-navigation-tools/znt-tmux.zsh
+++ b/plugins/zsh-navigation-tools/doc/znt-tmux.zsh
@@ -12,7 +12,7 @@
 # To use, put this line to your ~/.tmux.conf. The tool is invoked with:
 # Ctrl+b h
 #
-# bind h run-shell -b "$ZNT_REPO_DIR/znt-tmux.zsh"
+# bind h run-shell -b "$ZNT_REPO_DIR/doc/znt-tmux.zsh"
 #
 
 # get and save the current active tmux pane id
diff --git a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
index f015620f5..85ce87ca4 100644
--- a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
+++ b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
@@ -8,7 +8,7 @@
 #
 
 # According to the standard:
-# http://zdharma.org/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 export ZNT_REPO_DIR="${0:h}"

From e9bc107ad502083d91c5bcca1415634563c8b5dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 18:29:55 +0100
Subject: [PATCH 319/591] fix(dirhistory): define key bindings for vi mode
 (#10450)

Fixes #10450
---
 plugins/dirhistory/dirhistory.plugin.zsh | 111 +++++++++++++----------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 8268147f6..7021fc03a 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -121,31 +121,39 @@ function dirhistory_zle_dirhistory_future() {
 }
 
 zle -N dirhistory_zle_dirhistory_back
-bindkey "\e[3D" dirhistory_zle_dirhistory_back    # xterm in normal mode
-bindkey "\e[1;3D" dirhistory_zle_dirhistory_back  # xterm in normal mode
-bindkey "\e\e[D" dirhistory_zle_dirhistory_back   # Putty
-bindkey "\eO3D" dirhistory_zle_dirhistory_back    # GNU screen
-case "$TERM_PROGRAM" in
-iTerm.app) bindkey "^[^[[D" dirhistory_zle_dirhistory_back ;;   # iTerm2
-Apple_Terminal) bindkey "^[b" dirhistory_zle_dirhistory_back ;; # Terminal.app
-esac
-if (( ${+terminfo[kcub1]} )); then
-  bindkey "^[${terminfo[kcub1]}" dirhistory_zle_dirhistory_back  # urxvt
-fi
-
 zle -N dirhistory_zle_dirhistory_future
-bindkey "\e[3C" dirhistory_zle_dirhistory_future    # xterm in normal mode
-bindkey "\e[1;3C" dirhistory_zle_dirhistory_future  # xterm in normal mode
-bindkey "\e\e[C" dirhistory_zle_dirhistory_future   # Putty
-bindkey "\eO3C" dirhistory_zle_dirhistory_future    # GNU screen
-case "$TERM_PROGRAM" in
-iTerm.app) bindkey "^[^[[C" dirhistory_zle_dirhistory_future ;;   # iTerm2
-Apple_Terminal) bindkey "^[f" dirhistory_zle_dirhistory_future ;; # Terminal.app
-esac
-if (( ${+terminfo[kcuf1]} )); then
-  bindkey "^[${terminfo[kcuf1]}" dirhistory_zle_dirhistory_future # urxvt
-fi
 
+for keymap in emacs vicmd viins; do
+  # dirhistory_back
+  bindkey -M $keymap "\e[3D" dirhistory_zle_dirhistory_back    # xterm in normal mode
+  bindkey -M $keymap "\e[1;3D" dirhistory_zle_dirhistory_back  # xterm in normal mode
+  bindkey -M $keymap "\e\e[D" dirhistory_zle_dirhistory_back   # Putty
+  bindkey -M $keymap "\eO3D" dirhistory_zle_dirhistory_back    # GNU screen
+
+  case "$TERM_PROGRAM" in
+  Apple_Terminal) bindkey -M $keymap "^[b" dirhistory_zle_dirhistory_back ;; # Terminal.app
+  iTerm.app) bindkey -M $keymap "^[^[[D" dirhistory_zle_dirhistory_back ;;   # iTerm2
+  esac
+
+  if (( ${+terminfo[kcub1]} )); then
+    bindkey -M $keymap "^[${terminfo[kcub1]}" dirhistory_zle_dirhistory_back  # urxvt
+  fi
+
+  # dirhistory_future
+  bindkey -M $keymap "\e[3C" dirhistory_zle_dirhistory_future    # xterm in normal mode
+  bindkey -M $keymap "\e[1;3C" dirhistory_zle_dirhistory_future  # xterm in normal mode
+  bindkey -M $keymap "\e\e[C" dirhistory_zle_dirhistory_future   # Putty
+  bindkey -M $keymap "\eO3C" dirhistory_zle_dirhistory_future    # GNU screen
+
+  case "$TERM_PROGRAM" in
+  Apple_Terminal) bindkey -M $keymap "^[f" dirhistory_zle_dirhistory_future ;; # Terminal.app
+  iTerm.app) bindkey -M $keymap "^[^[[C" dirhistory_zle_dirhistory_future ;;   # iTerm2
+  esac
+
+  if (( ${+terminfo[kcuf1]} )); then
+    bindkey -M $keymap "^[${terminfo[kcuf1]}" dirhistory_zle_dirhistory_future # urxvt
+  fi
+done
 
 #
 # HIERARCHY Implemented in this section, in case someone wants to split it to another plugin if it clashes bindings
@@ -176,27 +184,38 @@ function dirhistory_zle_dirhistory_down() {
 }
 
 zle -N dirhistory_zle_dirhistory_up
-bindkey "\e[3A" dirhistory_zle_dirhistory_up    # xterm in normal mode
-bindkey "\e[1;3A" dirhistory_zle_dirhistory_up  # xterm in normal mode
-bindkey "\e\e[A" dirhistory_zle_dirhistory_up   # Putty
-bindkey "\eO3A" dirhistory_zle_dirhistory_up    # GNU screen
-case "$TERM_PROGRAM" in
-iTerm.app) bindkey "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
-Apple_Terminal) bindkey "^[[A" dirhistory_zle_dirhistory_up ;;  # Terminal.app
-esac
-if (( ${+terminfo[kcuu1]} )); then
-  bindkey "^[${terminfo[kcuu1]}" dirhistory_zle_dirhistory_up # urxvt
-fi
-
 zle -N dirhistory_zle_dirhistory_down
-bindkey "\e[3B" dirhistory_zle_dirhistory_down    # xterm in normal mode
-bindkey "\e[1;3B" dirhistory_zle_dirhistory_down  # xterm in normal mode
-bindkey "\e\e[B" dirhistory_zle_dirhistory_down   # Putty
-bindkey "\eO3B" dirhistory_zle_dirhistory_down    # GNU screen
-case "$TERM_PROGRAM" in
-iTerm.app) bindkey "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
-Apple_Terminal) bindkey "^[[B" dirhistory_zle_dirhistory_down ;;  # Terminal.app
-esac
-if (( ${+terminfo[kcud1]} )); then
-  bindkey "^[${terminfo[kcud1]}" dirhistory_zle_dirhistory_down # urxvt
-fi
+
+for keymap in emacs vicmd viins; do
+  # dirhistory_up
+  bindkey -M $keymap "\e[3A" dirhistory_zle_dirhistory_up    # xterm in normal mode
+  bindkey -M $keymap "\e[1;3A" dirhistory_zle_dirhistory_up  # xterm in normal mode
+  bindkey -M $keymap "\e\e[A" dirhistory_zle_dirhistory_up   # Putty
+  bindkey -M $keymap "\eO3A" dirhistory_zle_dirhistory_up    # GNU screen
+
+  case "$TERM_PROGRAM" in
+  Apple_Terminal) bindkey -M $keymap "^[[A" dirhistory_zle_dirhistory_up ;;  # Terminal.app
+  iTerm.app) bindkey -M $keymap "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
+  esac
+
+  if (( ${+terminfo[kcuu1]} )); then
+    bindkey -M $keymap "^[${terminfo[kcuu1]}" dirhistory_zle_dirhistory_up # urxvt
+  fi
+
+  # dirhistory_down
+  bindkey -M $keymap "\e[3B" dirhistory_zle_dirhistory_down    # xterm in normal mode
+  bindkey -M $keymap "\e[1;3B" dirhistory_zle_dirhistory_down  # xterm in normal mode
+  bindkey -M $keymap "\e\e[B" dirhistory_zle_dirhistory_down   # Putty
+  bindkey -M $keymap "\eO3B" dirhistory_zle_dirhistory_down    # GNU screen
+
+  case "$TERM_PROGRAM" in
+  Apple_Terminal) bindkey -M $keymap "^[[B" dirhistory_zle_dirhistory_down ;;  # Terminal.app
+  iTerm.app) bindkey -M $keymap "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
+  esac
+
+  if (( ${+terminfo[kcud1]} )); then
+    bindkey -M $keymap "^[${terminfo[kcud1]}" dirhistory_zle_dirhistory_down # urxvt
+  fi
+done
+
+unset keymap

From 5f6b0ac7fbfbb0e25d0d691efa1bf676ac9f6962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 18:58:12 +0100
Subject: [PATCH 320/591] style(composer): fix code and README style

---
 plugins/composer/README.md           | 36 +++++++-------
 plugins/composer/composer.plugin.zsh | 74 ++++++++++++----------------
 2 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/plugins/composer/README.md b/plugins/composer/README.md
index 7a5f7256e..00ada1e13 100644
--- a/plugins/composer/README.md
+++ b/plugins/composer/README.md
@@ -10,22 +10,24 @@ To use it add `composer` to the plugins array in your zshrc file.
 plugins=(... composer)
 ```
 
+Original author: Daniel Gomes <me@danielcsgomes.com>
+
 ## Aliases
 
-| Alias  | Command                                     | Description                                                                             |
-| ------ | ------------------------------------------- | --------------------------------------------------------------------------------------- |
-| `c`    | `composer`                                  | Starts composer                                                                         |
-| `csu`  | `composer self-update`                      | Updates composer to the latest version                                                  |
-| `cu`   | `composer update`                           | Updates composer dependencies and `composer.lock` file                                  |
-| `cr`   | `composer require`                          | Adds new packages to `composer.json`                                                    |
-| `crm`  | `composer remove`                           | Removes packages from `composer.json`                                                   |
-| `ci`   | `composer install`                          | Resolves and installs dependencies from `composer.json`                                 |
-| `ccp`  | `composer create-project`                   | Create new project from an existing package                                             |
-| `cdu`  | `composer dump-autoload`                    | Updates the autoloader                                                                  |
-| `cdo`  | `composer dump-autoload -o`                 | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production)  |
-| `cgu`  | `composer global update`                    | Allows update command to run on COMPOSER_HOME directory                                 |
-| `cgr`  | `composer global require`                   | Allows require command to run on COMPOSER_HOME directory                                |
-| `cgrm` | `composer global remove`                    | Allows remove command to run on COMPOSER_HOME directory                                 |
-| `cget` | `curl -s https://getcomposer.org/installer` | Installs composer in the current directory                                              |
-| `co`   | `composer outdated`                         | Shows a list of installed packages with available updates                               |
-| `cod`  | `composer outdated --direct`                | Shows a list of installed packages with available updates which are direct dependencies |
+| Alias  | Command                      | Description                                                                             |
+| ------ | ---------------------------- | --------------------------------------------------------------------------------------- |
+| `c`    | `composer`                   | Starts composer                                                                         |
+| `ccp`  | `composer create-project`    | Create new project from an existing package                                             |
+| `cdo`  | `composer dump-autoload -o`  | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production)  |
+| `cdu`  | `composer dump-autoload`     | Updates the autoloader                                                                  |
+| `cget` | `curl -s <installer> \| php` | Installs composer in the current directory                                              |
+| `cgr`  | `composer global require`    | Allows require command to run on COMPOSER_HOME directory                                |
+| `cgrm` | `composer global remove`     | Allows remove command to run on COMPOSER_HOME directory                                 |
+| `cgu`  | `composer global update`     | Allows update command to run on COMPOSER_HOME directory                                 |
+| `ci`   | `composer install`           | Resolves and installs dependencies from `composer.json`                                 |
+| `co`   | `composer outdated`          | Shows a list of installed packages with available updates                               |
+| `cod`  | `composer outdated --direct` | Shows a list of installed packages with available updates which are direct dependencies |
+| `cr`   | `composer require`           | Adds new packages to `composer.json`                                                    |
+| `crm`  | `composer remove`            | Removes packages from `composer.json`                                                   |
+| `csu`  | `composer self-update`       | Updates composer to the latest version                                                  |
+| `cu`   | `composer update`            | Updates composer dependencies and `composer.lock` file                                  |
diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 218a13e5f..ba29503e4 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -1,19 +1,3 @@
-# ------------------------------------------------------------------------------
-#          FILE:  composer.plugin.zsh
-#   DESCRIPTION:  oh-my-zsh composer plugin file.
-#        AUTHOR:  Daniel Gomes (me@danielcsgomes.com)
-#       VERSION:  1.0.0
-# ------------------------------------------------------------------------------
-
-# Composer basic command completion
-_composer_get_command_list () {
-    $_comp_command1 --no-ansi 2>/dev/null | sed "1,/Available commands/d" | awk '/^[ \t]*[a-z]+/ { print $1 }'
-}
-
-_composer_get_required_list () {
-    $_comp_command1 show -s --no-ansi 2>/dev/null | sed '1,/requires/d' | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }'
-}
-
 _composer () {
     local curcontext="$curcontext" state line
     typeset -A opt_args
@@ -30,41 +14,45 @@ _composer () {
 compdef _composer composer
 compdef _composer composer.phar
 
-# Aliases
+
+## Aliases
 alias c='composer'
-alias csu='composer self-update'
-alias cu='composer update'
-alias cr='composer require'
-alias crm='composer remove'
-alias ci='composer install'
 alias ccp='composer create-project'
-alias cdu='composer dump-autoload'
 alias cdo='composer dump-autoload -o'
-alias cgu='composer global update'
+alias cdu='composer dump-autoload'
+alias cget='curl -s https://getcomposer.org/installer | php'
 alias cgr='composer global require'
 alias cgrm='composer global remove'
+alias cgu='composer global update'
+alias ci='composer install'
 alias co='composer outdated'
 alias cod='composer outdated --direct'
+alias cr='composer require'
+alias crm='composer remove'
+alias csu='composer self-update'
+alias cu='composer update'
 
-# install composer in the current directory
-alias cget='curl -s https://getcomposer.org/installer | php'
 
-# Add Composer's global binaries to PATH, using Composer if available.
-if (( $+commands[composer] )); then
-    autoload -Uz _store_cache _retrieve_cache _cache_invalid
+## If Composer not found, try to add known directories to $PATH
+if (( ! $+commands[composer] )); then
+  [[ -d "$HOME/.composer/vendor/bin" ]] && export PATH="$PATH:$HOME/.composer/vendor/bin"
+  [[ -d "$HOME/.config/composer/vendor/bin" ]] && export PATH="$PATH:$HOME/.config/composer/vendor/bin"
 
-    _retrieve_cache composer
-
-    if [[ -z $__composer_bin_dir ]]; then
-        __composer_bin_dir=$(composer global config bin-dir --absolute 2>/dev/null)
-        _store_cache composer __composer_bin_dir
-    fi
-
-    # Add Composer's global binaries to PATH
-    export PATH="$PATH:$__composer_bin_dir"
-
-    unset __composer_bin_dir
-else
-  [ -d $HOME/.composer/vendor/bin ] && export PATH=$PATH:$HOME/.composer/vendor/bin
-  [ -d $HOME/.config/composer/vendor/bin ] && export PATH=$PATH:$HOME/.config/composer/vendor/bin
+  # If still not found, don't do the rest of the script
+  (( $+commands[composer] )) || return 0
 fi
+
+
+## Add Composer's global binaries to PATH
+autoload -Uz _store_cache _retrieve_cache _cache_invalid
+_retrieve_cache composer
+
+if [[ -z $__composer_bin_dir ]]; then
+  __composer_bin_dir=$(composer global config bin-dir --absolute 2>/dev/null)
+  _store_cache composer __composer_bin_dir
+fi
+
+# Add Composer's global binaries to PATH
+export PATH="$PATH:$__composer_bin_dir"
+
+unset __composer_bin_dir

From 70dfb6ef92f3bedc460e300e94e3456942ff328c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 18:58:22 +0100
Subject: [PATCH 321/591] refactor(composer): improve completion and use
 official Zsh completion if available

---
 plugins/composer/composer.plugin.zsh | 34 ++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index ba29503e4..f2076c220 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -1,18 +1,34 @@
-_composer () {
+## Basic Composer command completion
+# Since Zsh 5.7, an improved composer command completion is provided
+if ! is-at-least 5.7; then
+  _composer () {
     local curcontext="$curcontext" state line
     typeset -A opt_args
-    _arguments \
-        '*:: :->subcmds'
+    _arguments '*:: :->subcmds'
 
-    if (( CURRENT == 1 )) || ( ((CURRENT == 2)) && [ "$words[1]" = "global" ] ) ; then
-        compadd $(_composer_get_command_list)
+    if (( CURRENT == 1 )) || ( (( CURRENT == 2 )) && [[ "$words[1]" = "global" ]] ); then
+      # Command list
+      local -a subcmds
+      subcmds=("${(@f)"$($_comp_command1 --no-ansi 2>/dev/null | awk '
+        /Available commands/{ r=1 }
+        r == 1 && /^[ \t]*[a-z]+/{
+          gsub(/^[ \t]+/, "")
+          gsub(/  +/, ":")
+          print $0
+        }
+      ')"}")
+      _describe -t commands 'composer command' subcmds
     else
-        compadd $(_composer_get_required_list)
+      # Required list
+      compadd $($_comp_command1 show -s --no-ansi 2>/dev/null \
+        | sed '1,/requires/d' \
+        | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }')
     fi
-}
+  }
 
-compdef _composer composer
-compdef _composer composer.phar
+  compdef _composer composer
+  compdef _composer composer.phar
+fi
 
 
 ## Aliases

From 96e473a1d65cf3a093be2c742eea427706f18c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 19:24:19 +0100
Subject: [PATCH 322/591] fix(random): fix `ZSH_THEME_RANDOM_QUIET` check
 (#10534)

BREAKING CHANGE: For consistency, `ZSH_THEME_RANDOM_QUIET` now needs to
be `true` if you want to silence the "Random theme loaded" message in the
`random` theme.

The wiki specified that 1 or true was valid, while the code just
checked whether it was set to any value. Being more strict makes
sure that we're consistent with the rest of the Settings.

Fixes #10534
---
 themes/random.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/random.zsh-theme b/themes/random.zsh-theme
index f0b8e5c18..173d5b33f 100644
--- a/themes/random.zsh-theme
+++ b/themes/random.zsh-theme
@@ -42,6 +42,6 @@ else
   return 1
 fi
 
-if [[ -z "$ZSH_THEME_RANDOM_QUIET" ]]; then
+if [[ "$ZSH_THEME_RANDOM_QUIET" = true ]]; then
   echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded"
 fi

From 8e7cbafb3249993ff152f456ceff60723917755b Mon Sep 17 00:00:00 2001
From: CleanMachine1 <78213164+CleanMachine1@users.noreply.github.com>
Date: Fri, 24 Sep 2021 23:08:38 +0100
Subject: [PATCH 323/591] feat(golang): add `gofx` alias for `go fix` (#10220)

Closes #10220

Co-authored-by: Chaithanya Naik <chaithanyampcrl@gmail.com>
---
 plugins/golang/README.md         | 1 +
 plugins/golang/golang.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index af2c4dff9..1dc9b080b 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -18,6 +18,7 @@ plugins=(... golang)
 | god     | `go doc`                | Prints documentation comments                                 |
 | gof     | `go fmt`                | Gofmt formats (aligns and indents) Go programs.               |
 | gofa    | `go fmt ./...`          | Run go fmt for all packages in current directory, recursively |
+| gofx    | `go fix`                | Update packages to use a new API                              |
 | gog     | `go get`                | Downloads packages and then installs them to $GOPATH          |
 | gog     | `go get ./...`          | Installs all dependencies in current directory, recursively   |
 | goi     | `go install`            | Compiles and installs packages to $GOPATH                     |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index fce663fd6..05196acc0 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -262,6 +262,7 @@ alias goc='go clean'
 alias god='go doc'
 alias gof='go fmt'
 alias gofa='go fmt ./...'
+alias gofx='go fix'
 alias gog='go get'
 alias goga='go get ./...'
 alias goi='go install'

From 89596597e99676329846efcf9e8512fc389d96cd Mon Sep 17 00:00:00 2001
From: Chaithanya Naik <chaithanyampcrl@gmail.com>
Date: Sat, 30 Oct 2021 11:14:51 +0530
Subject: [PATCH 324/591] feat(golang): add aliases for `go tool` utility
 (#10361)

Closes #10361
---
 plugins/golang/README.md         | 4 ++++
 plugins/golang/golang.plugin.zsh | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 1dc9b080b..8bfe3ae3d 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -30,4 +30,8 @@ plugins=(... golang)
 | gor     | `go run`                | Compiles and runs your code                                   |
 | got     | `go test`               | Runs tests                                                    |
 | gota    | `go test ./...`         | Runs tests in all subdirectories                              |
+| goto    | `go tool`               | Prints all the available tools                                |
+| gotoc   | `go tool compile`       | Generates object file                                         |
+| gotod   | `go tool dist`          | Utility to bootstrap, build and test go runtime               |
+| gotofx  | `go tool fix`           | Fixes an application to use newer features                    |
 | gov     | `go vet`                | Vet examines Go source code and reports suspicious constructs |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 05196acc0..3ef9da6aa 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -274,4 +274,8 @@ alias gops='cd $GOPATH/src'
 alias gor='go run'
 alias got='go test'
 alias gota='go test ./...'
+alias goto='go tool'
+alias gotoc='go tool compile'
+alias gotod='go tool dist'
+alias gotofx='go tool fix'
 alias gov='go vet'

From c9a1edeab8270a8fe32848bc31d46814bd2fca87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 20:12:14 +0100
Subject: [PATCH 325/591] fix(golang)!: rename `gop` alias to `gopa` to avoid
 conflict with Go+ (#10504)

BREAKING CHANGE: the `gop` alias has been renamed to `gopa` to avoid conflict with
Go+ `gop` command.

Fixes #10504
---
 plugins/golang/README.md         | 48 ++++++++++++++++----------------
 plugins/golang/golang.plugin.zsh | 12 ++++----
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 8bfe3ae3d..979c89010 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -11,27 +11,27 @@ plugins=(... golang)
 
 ## Aliases
 
-| Alias   | Command                 | Description                                                   |
-| ------- | ----------------------- | ------------------------------------------------------------- |
-| gob     | `go build`              | Build your code                                               |
-| goc     | `go clean`              | Removes object files from package source directories          |
-| god     | `go doc`                | Prints documentation comments                                 |
-| gof     | `go fmt`                | Gofmt formats (aligns and indents) Go programs.               |
-| gofa    | `go fmt ./...`          | Run go fmt for all packages in current directory, recursively |
-| gofx    | `go fix`                | Update packages to use a new API                              |
-| gog     | `go get`                | Downloads packages and then installs them to $GOPATH          |
-| gog     | `go get ./...`          | Installs all dependencies in current directory, recursively   |
-| goi     | `go install`            | Compiles and installs packages to $GOPATH                     |
-| gol     | `go list`               | Lists Go packages                                             |
-| gom     | `go mod`                | Access to operations on modules                               |
-| gop     | `cd $GOPATH`            | Takes you to $GOPATH                                          |
-| gopb    | `cd $GOPATH/bin`        | Takes you to $GOPATH/bin                                      |
-| gops    | `cd $GOPATH/src`        | Takes you to $GOPATH/src                                      |
-| gor     | `go run`                | Compiles and runs your code                                   |
-| got     | `go test`               | Runs tests                                                    |
-| gota    | `go test ./...`         | Runs tests in all subdirectories                              |
-| goto    | `go tool`               | Prints all the available tools                                |
-| gotoc   | `go tool compile`       | Generates object file                                         |
-| gotod   | `go tool dist`          | Utility to bootstrap, build and test go runtime               |
-| gotofx  | `go tool fix`           | Fixes an application to use newer features                    |
-| gov     | `go vet`                | Vet examines Go source code and reports suspicious constructs |
+| Alias  | Command           | Description                                                   |
+| ------ | ----------------- | ------------------------------------------------------------- |
+| gob    | `go build`        | Build your code                                               |
+| goc    | `go clean`        | Removes object files from package source directories          |
+| god    | `go doc`          | Prints documentation comments                                 |
+| gof    | `go fmt`          | Gofmt formats (aligns and indents) Go programs.               |
+| gofa   | `go fmt ./...`    | Run go fmt for all packages in current directory, recursively |
+| gofx   | `go fix`          | Update packages to use a new API                              |
+| gog    | `go get`          | Downloads packages and then installs them to $GOPATH          |
+| gog    | `go get ./...`    | Installs all dependencies in current directory, recursively   |
+| goi    | `go install`      | Compiles and installs packages to $GOPATH                     |
+| gol    | `go list`         | Lists Go packages                                             |
+| gom    | `go mod`          | Access to operations on modules                               |
+| gopa   | `cd $GOPATH`      | Takes you to `$GOPATH`                                        |
+| gopb   | `cd $GOPATH/bin`  | Takes you to `$GOPATH/bin`                                    |
+| gops   | `cd $GOPATH/src`  | Takes you to `$GOPATH/src`                                    |
+| gor    | `go run`          | Compiles and runs your code                                   |
+| got    | `go test`         | Runs tests                                                    |
+| gota   | `go test ./...`   | Runs tests in all subdirectories                              |
+| goto   | `go tool`         | Prints all the available tools                                |
+| gotoc  | `go tool compile` | Generates object file                                         |
+| gotod  | `go tool dist`    | Utility to bootstrap, build and test go runtime               |
+| gotofx | `go tool fix`     | Fixes an application to use newer features                    |
+| gov    | `go vet`          | Vet examines Go source code and reports suspicious constructs |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 3ef9da6aa..6d1eb40c2 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -1,11 +1,9 @@
-# install in /etc/zsh/zshrc or your personal .zshrc
-
 # gc
-prefixes=(5 6 8)
-for p in $prefixes; do
-	compctl -g "*.${p}" ${p}l
-	compctl -g "*.go" ${p}g
+for p in 5 6 8; do
+  compctl -g "*.${p}" ${p}l
+  compctl -g "*.go" ${p}g
 done
+unset p
 
 # standard go tools
 compctl -g "*.go" gofmt
@@ -268,7 +266,7 @@ alias goga='go get ./...'
 alias goi='go install'
 alias gol='go list'
 alias gom='go mod'
-alias gop='cd $GOPATH'
+alias gopa='cd $GOPATH'
 alias gopb='cd $GOPATH/bin'
 alias gops='cd $GOPATH/src'
 alias gor='go run'

From 2e0cf4a3b07c027312e0c419e083fe125b5883c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 20:37:08 +0100
Subject: [PATCH 326/591] refactor(golang): move completion out of the plugin

---
 plugins/golang/_golang           | 249 ++++++++++++++++++++++++++++++
 plugins/golang/golang.plugin.zsh | 255 +------------------------------
 2 files changed, 254 insertions(+), 250 deletions(-)
 create mode 100644 plugins/golang/_golang

diff --git a/plugins/golang/_golang b/plugins/golang/_golang
new file mode 100644
index 000000000..01b976b12
--- /dev/null
+++ b/plugins/golang/_golang
@@ -0,0 +1,249 @@
+#compdef go
+
+__go_packages() {
+  local gopaths
+  declare -a gopaths
+  gopaths=("${(s/:/)$(go env GOPATH)}")
+  gopaths+=("$(go env GOROOT)")
+  for p in $gopaths; do
+    _path_files -W "$p/src" -/
+  done
+}
+
+__go_identifiers() {
+  local tmpl_path="${functions_source[$0]:h}/templates"
+  compadd $(godoc -templates "$tmpl_path" ${words[-2]} 2> /dev/null)
+}
+
+_go() {
+  typeset -a commands build_flags
+  commands+=(
+    'build[compile packages and dependencies]'
+    'clean[remove object files]'
+    'doc[run godoc on package sources]'
+    'env[print Go environment information]'
+    'fix[run go tool fix on packages]'
+    'fmt[run gofmt on package sources]'
+    'generate[generate Go files by processing source]'
+    'get[download and install packages and dependencies]'
+    'help[display help]'
+    'install[compile and install packages and dependencies]'
+    'list[list packages]'
+    'mod[modules maintenance]'
+    'run[compile and run Go program]'
+    'test[test packages]'
+    'tool[run specified go tool]'
+    'version[print Go version]'
+    'vet[run go tool vet on packages]'
+  )
+  if (( CURRENT == 2 )); then
+    # explain go commands
+    _values 'go tool commands' ${commands[@]}
+    return
+  fi
+  build_flags=(
+    '-a[force reinstallation of packages that are already up to date]'
+    '-n[print the commands but do not run them]'
+    '-p[number of parallel builds]:number'
+    '-race[enable data race detection]'
+    '-x[print the commands]'
+    '-work[print temporary directory name and keep it]'
+    '-ccflags[flags for 5c/6c/8c]:flags'
+    '-gcflags[flags for 5g/6g/8g]:flags'
+    '-ldflags[flags for 5l/6l/8l]:flags'
+    '-gccgoflags[flags for gccgo]:flags'
+    '-compiler[name of compiler to use]:name'
+    '-installsuffix[suffix to add to package directory]:suffix'
+    '-tags[list of build tags to consider satisfied]:tags'
+  )
+
+  case ${words[2]} in
+  doc)
+    _arguments -s -w \
+      "-c[symbol matching honors case (paths not affected)]" \
+      "-cmd[show symbols with package docs even if package is a command]" \
+      "-u[show unexported symbols as well as exported]" \
+      "2:importpaths:__go_packages" \
+      ":next identifiers:__go_identifiers"
+    ;;
+  clean)
+    _arguments -s -w \
+      "-i[remove the corresponding installed archive or binary (what 'go install' would create)]" \
+      "-n[print the remove commands it would execute, but not run them]" \
+      "-r[apply recursively to all the dependencies of the packages named by the import paths]" \
+      "-x[print remove commands as it executes them]" \
+      "*:importpaths:__go_packages"
+    ;;
+  fix|fmt|vet)
+    _alternative ':importpaths:__go_packages' ':files:_path_files -g "*.go"'
+    ;;
+  install)
+    _arguments -s -w : ${build_flags[@]} \
+      "-v[show package names]" \
+      '*:importpaths:__go_packages'
+    ;;
+  get)
+    _arguments -s -w : \
+      ${build_flags[@]}
+    ;;
+  build)
+    _arguments -s -w : \
+      ${build_flags[@]} \
+      "-v[show package names]" \
+      "-o[output file]:file:_files" \
+      "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
+    ;;
+  test)
+    _arguments -s -w : \
+      ${build_flags[@]} \
+      "-c[do not run, compile the test binary]" \
+      "-i[do not run, install dependencies]" \
+      "-v[print test output]" \
+      "-x[print the commands]" \
+      "-short[use short mode]" \
+      "-parallel[number of parallel tests]:number" \
+      "-cpu[values of GOMAXPROCS to use]:number list" \
+      "-run[run tests and examples matching regexp]:regexp" \
+      "-bench[run benchmarks matching regexp]:regexp" \
+      "-benchmem[print memory allocation stats]" \
+      "-benchtime[run each benchmark until taking this long]:duration" \
+      "-blockprofile[write goroutine blocking profile to file]:file" \
+      "-blockprofilerate[set sampling rate of goroutine blocking profile]:number" \
+      "-timeout[kill test after that duration]:duration" \
+      "-cpuprofile[write CPU profile to file]:file:_files" \
+      "-memprofile[write heap profile to file]:file:_files" \
+      "-memprofilerate[set heap profiling rate]:number" \
+      "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
+    ;;
+  list)
+    _arguments -s -w : \
+      "-f[alternative format for the list]:format" \
+      "-json[print data in json format]" \
+      "-compiled[set CompiledGoFiles to the Go source files presented to the compiler]" \
+      "-deps[iterate over not just the named packages but also all their dependencies]" \
+      "-e[change the handling of erroneous packages]" \
+      "-export[set the Export field to the name of a file containing up-to-date export information for the given package]" \
+      "-find[identify the named packages but not resolve their dependencies]" \
+      "-test[report not only the named packages but also their test binaries]" \
+      "-m[list modules instead of packages]" \
+      "-u[adds information about available upgrades]" \
+      "-versions[set the Module's Versions field to a list of all known versions of that module]:number" \
+      "*:importpaths:__go_packages"
+    ;;
+  mod)
+    local -a mod_commands
+    mod_commands+=(
+      'download[download modules to local cache]'
+      'edit[edit go.mod from tools or scripts]'
+      'graph[print module requirement graph]'
+      'init[initialize new module in current directory]'
+      'tidy[add missing and remove unused modules]'
+      'vendor[make vendored copy of dependencies]'
+      'verify[verify dependencies have expected content]'
+      'why[explain why packages or modules are needed]'
+    )
+
+    if (( CURRENT == 3 )); then
+      _values 'go mod commands' ${mod_commands[@]} "help[display help]"
+      return
+    fi
+
+    case ${words[3]} in
+    help)
+      _values 'go mod commands' ${mod_commands[@]}
+      ;;
+    download)
+      _arguments -s -w : \
+        "-json[print a sequence of JSON objects standard output]" \
+        "*:flags"
+      ;;
+    edit)
+      _arguments -s -w : \
+        "-fmt[reformat the go.mod file]" \
+        "-module[change the module's path]" \
+        "-replace[=old{@v}=new{@v} add a replacement of the given module path and version pair]:name" \
+        "-dropreplace[=old{@v}=new{@v} drop a replacement of the given module path and version pair]:name" \
+        "-go[={version} set the expected Go language version]:number" \
+        "-print[print the final go.mod in its text format]" \
+        "-json[print the final go.mod file in JSON format]" \
+        "*:flags"
+      ;;
+    graph)
+      ;;
+    init)
+      ;;
+    tidy)
+      _arguments -s -w : \
+        "-v[print information about removed modules]" \
+        "*:flags"
+      ;;
+    vendor)
+      _arguments -s -w : \
+        "-v[print the names of vendored]" \
+        "*:flags"
+      ;;
+    verify)
+      ;;
+    why)
+      _arguments -s -w : \
+        "-m[treats the arguments as a list of modules and finds a path to any package in each of the modules]" \
+        "-vendor[exclude tests of dependencies]" \
+        "*:importpaths:__go_packages"
+      ;;
+    esac
+    ;;
+  help)
+    _values "${commands[@]}" \
+      'environment[show Go environment variables available]' \
+      'gopath[GOPATH environment variable]' \
+      'packages[description of package lists]' \
+      'remote[remote import path syntax]' \
+      'testflag[description of testing flags]' \
+      'testfunc[description of testing functions]'
+    ;;
+  run)
+    _arguments -s -w : \
+      ${build_flags[@]} \
+      '*:file:_files -g "*.go"'
+    ;;
+  tool)
+    if (( CURRENT == 3 )); then
+        _values "go tool" $(go tool)
+        return
+    fi
+    case ${words[3]} in
+    [568]g)
+        _arguments -s -w : \
+            '-I[search for packages in DIR]:includes:_path_files -/' \
+            '-L[show full path in file:line prints]' \
+            '-S[print the assembly language]' \
+            '-V[print the compiler version]' \
+            '-e[no limit on number of errors printed]' \
+            '-h[panic on an error]' \
+            '-l[disable inlining]' \
+            '-m[print optimization decisions]' \
+            '-o[file specify output file]:file' \
+            '-p[assumed import path for this code]:importpath' \
+            '-u[disable package unsafe]' \
+            "*:file:_files -g '*.go'"
+        ;;
+    [568]l)
+        local O=${words[3]%l}
+        _arguments -s -w : \
+            '-o[file specify output file]:file' \
+            '-L[search for packages in DIR]:includes:_path_files -/' \
+            "*:file:_files -g '*.[ao$O]'"
+        ;;
+    dist)
+        _values "dist tool" banner bootstrap clean env install version
+        ;;
+    *)
+        # use files by default
+        _files
+        ;;
+    esac
+    ;;
+  esac
+}
+
+_go "$@"
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 6d1eb40c2..4dafecd86 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -1,3 +1,7 @@
+## completion
+compctl -g "*.go" gofmt # standard go tools
+compctl -g "*.go" gccgo # gccgo
+
 # gc
 for p in 5 6 8; do
   compctl -g "*.${p}" ${p}l
@@ -5,256 +9,7 @@ for p in 5 6 8; do
 done
 unset p
 
-# standard go tools
-compctl -g "*.go" gofmt
-
-# gccgo
-compctl -g "*.go" gccgo
-
-# go tool
-__go_tool_complete() {
-  typeset -a commands build_flags
-  commands+=(
-    'build[compile packages and dependencies]'
-    'clean[remove object files]'
-    'doc[run godoc on package sources]'
-    'env[print Go environment information]'
-    'fix[run go tool fix on packages]'
-    'fmt[run gofmt on package sources]'
-    'generate[generate Go files by processing source]'
-    'get[download and install packages and dependencies]'
-    'help[display help]'
-    'install[compile and install packages and dependencies]'
-    'list[list packages]'
-    'mod[modules maintenance]'
-    'run[compile and run Go program]'
-    'test[test packages]'
-    'tool[run specified go tool]'
-    'version[print Go version]'
-    'vet[run go tool vet on packages]'
-  )
-  if (( CURRENT == 2 )); then
-    # explain go commands
-    _values 'go tool commands' ${commands[@]}
-    return
-  fi
-  build_flags=(
-    '-a[force reinstallation of packages that are already up to date]'
-    '-n[print the commands but do not run them]'
-    '-p[number of parallel builds]:number'
-    '-race[enable data race detection]'
-    '-x[print the commands]'
-    '-work[print temporary directory name and keep it]'
-    '-ccflags[flags for 5c/6c/8c]:flags'
-    '-gcflags[flags for 5g/6g/8g]:flags'
-    '-ldflags[flags for 5l/6l/8l]:flags'
-    '-gccgoflags[flags for gccgo]:flags'
-    '-compiler[name of compiler to use]:name'
-    '-installsuffix[suffix to add to package directory]:suffix'
-    '-tags[list of build tags to consider satisfied]:tags'
-  )
-  __go_packages() {
-      local gopaths
-      declare -a gopaths
-      gopaths=("${(s/:/)$(go env GOPATH)}")
-      gopaths+=("$(go env GOROOT)")
-      for p in $gopaths; do
-        _path_files -W "$p/src" -/
-      done
-  }
-  __go_identifiers() {
-      compadd $(godoc -templates $ZSH/plugins/golang/templates ${words[-2]} 2> /dev/null)
-  }
-  case ${words[2]} in
-  doc)
-    _arguments -s -w \
-      "-c[symbol matching honors case (paths not affected)]" \
-      "-cmd[show symbols with package docs even if package is a command]" \
-      "-u[show unexported symbols as well as exported]" \
-      "2:importpaths:__go_packages" \
-      ":next identifiers:__go_identifiers"
-      ;;
-  clean)
-    _arguments -s -w \
-      "-i[remove the corresponding installed archive or binary (what 'go install' would create)]" \
-      "-n[print the remove commands it would execute, but not run them]" \
-      "-r[apply recursively to all the dependencies of the packages named by the import paths]" \
-      "-x[print remove commands as it executes them]" \
-      "*:importpaths:__go_packages"
-      ;;
-  fix|fmt|vet)
-      _alternative ':importpaths:__go_packages' ':files:_path_files -g "*.go"'
-      ;;
-  install)
-      _arguments -s -w : ${build_flags[@]} \
-        "-v[show package names]" \
-        '*:importpaths:__go_packages'
-      ;;
-  get)
-      _arguments -s -w : \
-        ${build_flags[@]}
-      ;;
-  build)
-      _arguments -s -w : \
-        ${build_flags[@]} \
-        "-v[show package names]" \
-        "-o[output file]:file:_files" \
-        "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
-      ;;
-  test)
-      _arguments -s -w : \
-        ${build_flags[@]} \
-        "-c[do not run, compile the test binary]" \
-        "-i[do not run, install dependencies]" \
-        "-v[print test output]" \
-        "-x[print the commands]" \
-        "-short[use short mode]" \
-        "-parallel[number of parallel tests]:number" \
-        "-cpu[values of GOMAXPROCS to use]:number list" \
-        "-run[run tests and examples matching regexp]:regexp" \
-        "-bench[run benchmarks matching regexp]:regexp" \
-        "-benchmem[print memory allocation stats]" \
-        "-benchtime[run each benchmark until taking this long]:duration" \
-        "-blockprofile[write goroutine blocking profile to file]:file" \
-        "-blockprofilerate[set sampling rate of goroutine blocking profile]:number" \
-        "-timeout[kill test after that duration]:duration" \
-        "-cpuprofile[write CPU profile to file]:file:_files" \
-        "-memprofile[write heap profile to file]:file:_files" \
-        "-memprofilerate[set heap profiling rate]:number" \
-        "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
-      ;;
-  list)
-      _arguments -s -w : \
-        "-f[alternative format for the list]:format" \
-        "-json[print data in json format]" \
-        "-compiled[set CompiledGoFiles to the Go source files presented to the compiler]" \
-        "-deps[iterate over not just the named packages but also all their dependencies]" \
-        "-e[change the handling of erroneous packages]" \
-        "-export[set the Export field to the name of a file containing up-to-date export information for the given package]" \
-        "-find[identify the named packages but not resolve their dependencies]" \
-        "-test[report not only the named packages but also their test binaries]" \
-        "-m[list modules instead of packages]" \
-        "-u[adds information about available upgrades]" \
-        "-versions[set the Module's Versions field to a list of all known versions of that module]:number" \
-        "*:importpaths:__go_packages"
-      ;;
-  mod)
-      typeset -a mod_commands
-      mod_commands+=(
-        'download[download modules to local cache]'
-        'edit[edit go.mod from tools or scripts]'
-        'graph[print module requirement graph]'
-        'init[initialize new module in current directory]'
-        'tidy[add missing and remove unused modules]'
-        'vendor[make vendored copy of dependencies]'
-        'verify[verify dependencies have expected content]'
-        'why[explain why packages or modules are needed]'
-      )
-      if (( CURRENT == 3 )); then
-          _values 'go mod commands' ${mod_commands[@]} "help[display help]"
-          return
-      fi
-      case ${words[3]} in
-      help)
-        _values 'go mod commands' ${mod_commands[@]}
-        ;;
-      download)
-        _arguments -s -w : \
-          "-json[print a sequence of JSON objects standard output]" \
-          "*:flags"
-        ;;
-      edit)
-        _arguments -s -w : \
-          "-fmt[reformat the go.mod file]" \
-          "-module[change the module's path]" \
-          "-replace[=old{@v}=new{@v} add a replacement of the given module path and version pair]:name" \
-          "-dropreplace[=old{@v}=new{@v} drop a replacement of the given module path and version pair]:name" \
-          "-go[={version} set the expected Go language version]:number" \
-          "-print[print the final go.mod in its text format]" \
-          "-json[print the final go.mod file in JSON format]" \
-          "*:flags"
-        ;;
-      graph)
-        ;;
-      init)   
-        ;;
-      tidy)
-        _arguments -s -w : \
-          "-v[print information about removed modules]" \
-          "*:flags"
-        ;;
-      vendor)
-        _arguments -s -w : \
-          "-v[print the names of vendored]" \
-          "*:flags"
-        ;;
-      verify)
-        ;;
-      why)
-        _arguments -s -w : \
-          "-m[treats the arguments as a list of modules and finds a path to any package in each of the modules]" \
-          "-vendor[exclude tests of dependencies]" \
-          "*:importpaths:__go_packages"
-        ;;
-      esac
-      ;;
-  help)
-      _values "${commands[@]}" \
-        'environment[show Go environment variables available]' \
-        'gopath[GOPATH environment variable]' \
-        'packages[description of package lists]' \
-        'remote[remote import path syntax]' \
-        'testflag[description of testing flags]' \
-        'testfunc[description of testing functions]'
-      ;;
-  run)
-      _arguments -s -w : \
-          ${build_flags[@]} \
-          '*:file:_files -g "*.go"'
-      ;;
-  tool)
-      if (( CURRENT == 3 )); then
-          _values "go tool" $(go tool)
-          return
-      fi
-      case ${words[3]} in
-      [568]g)
-          _arguments -s -w : \
-              '-I[search for packages in DIR]:includes:_path_files -/' \
-              '-L[show full path in file:line prints]' \
-              '-S[print the assembly language]' \
-              '-V[print the compiler version]' \
-              '-e[no limit on number of errors printed]' \
-              '-h[panic on an error]' \
-              '-l[disable inlining]' \
-              '-m[print optimization decisions]' \
-              '-o[file specify output file]:file' \
-              '-p[assumed import path for this code]:importpath' \
-              '-u[disable package unsafe]' \
-              "*:file:_files -g '*.go'"
-          ;;
-      [568]l)
-          local O=${words[3]%l}
-          _arguments -s -w : \
-              '-o[file specify output file]:file' \
-              '-L[search for packages in DIR]:includes:_path_files -/' \
-              "*:file:_files -g '*.[ao$O]'"
-          ;;
-      dist)
-          _values "dist tool" banner bootstrap clean env install version
-          ;;
-      *)
-          # use files by default
-          _files
-          ;;
-      esac
-      ;;
-  esac
-}
-
-compdef __go_tool_complete go
-
-# aliases: go<~>
+## aliases
 alias gob='go build'
 alias goc='go clean'
 alias god='go doc'

From ba069e7731b3afe90a393fb6a36f8f9bda795f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 22:40:38 +0100
Subject: [PATCH 327/591] fix(installer): don't hard-code user `$HOME`
 directory on install

---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 47166059d..d210d8cc9 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -251,7 +251,7 @@ setup_zshrc() {
   echo "${GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${RESET}"
 
   sed "/^export ZSH=/ c\\
-export ZSH=\"$ZSH\"
+export ZSH=\"${ZSH/$HOME\//\$HOME\/}\"
 " "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
   mv -f ~/.zshrc-omztemp ~/.zshrc
 

From f85087005a966445e167bf7962f35032597663c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 23:27:49 +0100
Subject: [PATCH 328/591] fix(installer): fix POSIX shell syntax of previous
 commit

---
 tools/install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index d210d8cc9..731d89a29 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -250,9 +250,9 @@ setup_zshrc() {
 
   echo "${GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${RESET}"
 
-  sed "/^export ZSH=/ c\\
-export ZSH=\"${ZSH/$HOME\//\$HOME\/}\"
-" "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
+  # Replace $HOME path with '$HOME' in $ZSH variable in .zshrc file
+  omz=$(echo "$ZSH" | sed "s|^$HOME/|\$HOME/|")
+  sed "s|^export ZSH=.*$|export ZSH=\"${omz}\"|" "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
   mv -f ~/.zshrc-omztemp ~/.zshrc
 
   echo

From 0f1de0871327f29c437e3cb0e99c48123892e453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 23:29:58 +0100
Subject: [PATCH 329/591] fix(gnu-utils): always reapply GNU coreutils on
 `rehash`

---
 plugins/gnu-utils/gnu-utils.plugin.zsh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index 539e7fe4d..5b8f71c8a 100644
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -73,11 +73,6 @@ function hash() {
 }
 
 function rehash() {
-  if [[ "$*" =~ "-f" ]]; then
-    builtin rehash "$@"
-    __gnu_utils
-  else
-    builtin rehash "$@"
-  fi
+  builtin rehash "$@"
+  __gnu_utils
 }
-

From 8cb53ba692a3df24a9b3159ef221ec3cf8d058e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Dec 2021 17:34:06 +0100
Subject: [PATCH 330/591] fix(gnu-utils): reassign GNU utils on `preexec`
 (#10535)

The previous version rebound the `hash` and `rehash` builtins to
reassing GNU utils when they were called. This didn't take into
account that when `$PATH` changes, the commands are rehashed as
well.

This version adds a preexec hook to reassign the GNU utilities
before running any command, if and only if they aren't already
reassigned. This is checked by looking at the `whoami` command.

Fixes #10535
---
 plugins/gnu-utils/gnu-utils.plugin.zsh | 38 +++++++-------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index 5b8f71c8a..6ede9e3a7 100644
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -11,11 +11,8 @@ if [[ ! -x "${commands[gwhoami]}" ]]; then
 fi
 
 __gnu_utils() {
-  emulate -L zsh
-  local gcmds
+  local -a gcmds
   local gcmd
-  local cmd
-  local prefix
 
   # coreutils 
   gcmds=('g[' 'gbase64' 'gbasename' 'gcat' 'gchcon' 'gchgrp' 'gchmod'
@@ -43,36 +40,21 @@ __gnu_utils() {
     (( ${+commands[$gcmd]} )) || continue
     
     # This method allows for builtin commands to be primary but it's
-    # lost if hash -r or rehash -f is executed. Thus, those two 
-    # functions have to be wrapped.
+    # 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
+    # is not already rehashed.
     #
     hash ${gcmd[2,-1]}=${commands[$gcmd]}
-
-    # This method generates wrapper functions.
-    # It will override shell builtins.
-    #
-    # eval "function $gcmd[2,-1]() { \"${prefix}/${gcmd//"["/"\\["}\" \"\$@\"; }"
-
-    # This method is inflexible since the aliases are at risk of being
-    # overridden resulting in the BSD coreutils being called.
-    #
-    # alias "$gcmd[2,-1]"="${prefix}/${gcmd//"["/"\\["}"
   done
 
   return 0
 }
-__gnu_utils
 
-function hash() {
-  if [[ "$*" =~ "-(r|f)" ]]; then
-    builtin hash "$@"
-    __gnu_utils
-  else
-    builtin hash "$@"
-  fi
+__gnu_utils_preexec() {
+  # Run __gnu_utils when the whoami command is not already rehashed.
+  # This acts as a sign that we need to rehash all GNU utils.
+  [[ "${commands[whoami]}" = "${commands[gwhoami]}" ]] || __gnu_utils
 }
 
-function rehash() {
-  builtin rehash "$@"
-  __gnu_utils
-}
+autoload -Uz add-zsh-hook
+add-zsh-hook preexec __gnu_utils_preexec

From 634296be3c985ed475ffbc1c0ffabe7ebd698808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 11:04:13 +0100
Subject: [PATCH 331/591] fix(random): fix negated logic in
 `ZSH_THEME_RANDOM_QUIET`

---
 themes/random.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/random.zsh-theme b/themes/random.zsh-theme
index 173d5b33f..28af84e23 100644
--- a/themes/random.zsh-theme
+++ b/themes/random.zsh-theme
@@ -42,6 +42,6 @@ else
   return 1
 fi
 
-if [[ "$ZSH_THEME_RANDOM_QUIET" = true ]]; then
+if [[ "$ZSH_THEME_RANDOM_QUIET" != true ]]; then
   echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded"
 fi

From a33ae92f4d78d4e4089d4d04a1d9f18bb11f39e1 Mon Sep 17 00:00:00 2001
From: QuarticCat <QuarticCat@protonmail.com>
Date: Sun, 7 Nov 2021 00:45:51 +0800
Subject: [PATCH 332/591] refactor(rustup): generate completion file in the
 background (#10392)

Closes #10392
---
 plugins/rustup/rustup.plugin.zsh | 44 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index c6efc1b13..af8cf03a2 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,22 +1,24 @@
-if (( $+commands[rustup] )); then
-  # remove old generated completion file
-  command rm -f "${0:A:h}/_rustup"
-
-  ver="$(rustup --version 2>/dev/null)"
-  ver_file="$ZSH_CACHE_DIR/rustup_version"
-  comp_file="$ZSH_CACHE_DIR/completions/_rustup"
-
-  mkdir -p "${comp_file:h}"
-  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
-
-  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
-    rustup completions zsh >| "$comp_file"
-    echo "$ver" >| "$ver_file"
-  fi
-
-  declare -A _comps
-  autoload -Uz _rustup
-  _comps[rustup]=_rustup
-
-  unset ver ver_file comp_file
+if (( ! $+commands[rustup] )); then
+  return
 fi
+
+# Remove old generated completion file
+# TODO: 2021-09-15: remove this line
+command rm -f "${0:A:h}/_rustup"
+
+# Add completions/ folder in $ZSH_CACHE_DIR
+comp_file="$ZSH_CACHE_DIR/completions/_rustup"
+command mkdir -p "${comp_file:h}"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `rustup`. Otherwise, compinit will have already done that
+if [[ ! -f "$comp_file" ]]; then
+  autoload -Uz _rustup
+  declare -A _comps
+  _comps[rustup]=_rustup
+fi
+
+# Generate completion file in the background
+rustup completions zsh >| "$comp_file" &|
+unset comp_file

From 5fbd4c83f6e70a66c555fc7ace7dda2c056b8663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 11:42:17 +0100
Subject: [PATCH 333/591] refactor(cargo): generate completion file in the
 background

---
 plugins/cargo/cargo.plugin.zsh | 45 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 7082d2d55..9d1d23757 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,23 +1,24 @@
-if (( $+commands[rustup] && $+commands[cargo] )); then
-  # remove old generated completion file
-  command rm -f "${0:A:h}/_cargo"
-
-  # generate new completion file
-  ver="$(cargo --version)"
-  ver_file="$ZSH_CACHE_DIR/cargo_version"
-  comp_file="$ZSH_CACHE_DIR/completions/_cargo"
-
-  mkdir -p "${comp_file:h}"
-  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
-
-  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
-    rustup completions zsh cargo >| "$comp_file"
-    echo "$ver" >| "$ver_file"
-  fi
-
-  declare -A _comps
-  autoload -Uz _cargo
-  _comps[cargo]=_cargo
-
-  unset ver ver_file comp_file
+if ! (( $+commands[rustup] && $+commands[cargo] )); then
+  return
 fi
+
+# Remove old generated completion file
+# TODO: 2021-09-15: remove this line
+command rm -f "${0:A:h}/_cargo"
+
+# Add completions/ folder in $ZSH_CACHE_DIR
+comp_file="$ZSH_CACHE_DIR/completions/_cargo"
+command mkdir -p "${comp_file:h}"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `cargo`. Otherwise, compinit will have already done that
+if [[ ! -f "$comp_file" ]]; then
+  autoload -Uz _cargo
+  declare -A _comps
+  _comps[cargo]=_cargo
+fi
+
+# Generate completion file in the background
+rustup completions zsh cargo >| "$comp_file" &|
+unset comp_file

From 89a740be2d5487c96f01e4eaae7e280caf555019 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Wed, 6 Oct 2021 22:43:09 +0200
Subject: [PATCH 334/591] refactor(rust)!: merge `cargo` and `rustup` plugins
 into `rust` plugin (#10270)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BREAKING CHANGE: `cargo` and `rustup` plugins have been moved to the `rust` plugin
since they're part of the Rust toolchain. If you're using these, update your .zshrc
file to use `rust` instead.

Closes #10270

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/cargo/README.md          | 10 +---------
 plugins/cargo/cargo.plugin.zsh   | 27 +++++++--------------------
 plugins/rust/README.md           |  2 +-
 plugins/rust/{_rust => _rustc}   |  0
 plugins/rust/rust.plugin.zsh     | 28 ++++++++++++++++++++++++++++
 plugins/rustup/README.md         |  8 +-------
 plugins/rustup/rustup.plugin.zsh | 27 +++++++--------------------
 7 files changed, 45 insertions(+), 57 deletions(-)
 rename plugins/rust/{_rust => _rustc} (100%)
 create mode 100644 plugins/rust/rust.plugin.zsh

diff --git a/plugins/cargo/README.md b/plugins/cargo/README.md
index 31bae4efe..93e69ae7f 100644
--- a/plugins/cargo/README.md
+++ b/plugins/cargo/README.md
@@ -1,11 +1,3 @@
 # cargo
 
-This plugin adds completion for the Rust build tool [`Cargo`](https://github.com/rust-lang/cargo).
-
-To use it, add `cargo` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... cargo)
-```
-
-Updated on March 3rd, 2019, from [Cargo 0.34.0](https://github.com/rust-lang/cargo/releases/tag/0.34.0).
+**Deprecated: use the [`rust`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rust) plugin instead.**
diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 9d1d23757..51a80d4f1 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,24 +1,11 @@
-if ! (( $+commands[rustup] && $+commands[cargo] )); then
-  return
-fi
+print ${(%):-'%F{yellow}The `cargo` plugin is deprecated and has been moved to the `rust` plugin.'}
+print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 
 # Remove old generated completion file
-# TODO: 2021-09-15: remove this line
+# TODO: 2021-12-28: remove this line
 command rm -f "${0:A:h}/_cargo"
 
-# Add completions/ folder in $ZSH_CACHE_DIR
-comp_file="$ZSH_CACHE_DIR/completions/_cargo"
-command mkdir -p "${comp_file:h}"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `cargo`. Otherwise, compinit will have already done that
-if [[ ! -f "$comp_file" ]]; then
-  autoload -Uz _cargo
-  declare -A _comps
-  _comps[cargo]=_cargo
-fi
-
-# Generate completion file in the background
-rustup completions zsh cargo >| "$comp_file" &|
-unset comp_file
+(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
+  fpath=("$ZSH/plugins/rust" $fpath)
+  source "$ZSH/plugins/rust/rust.plugin.zsh"
+}
diff --git a/plugins/rust/README.md b/plugins/rust/README.md
index 83d7d91ba..e05364474 100644
--- a/plugins/rust/README.md
+++ b/plugins/rust/README.md
@@ -1,6 +1,6 @@
 # rust
 
-This plugin adds completion for [`rustc`](https://doc.rust-lang.org/rustc/index.html), the compiler for the Rust programming language.
+This plugin adds completion for [`rustc`](https://doc.rust-lang.org/rustc/index.html), the compiler for the Rust programming language, as well as for `rustup` and `cargo` if you have the Rust toolchain installed.
 
 To use it, add `rust` to the plugins array in your zshrc file:
 
diff --git a/plugins/rust/_rust b/plugins/rust/_rustc
similarity index 100%
rename from plugins/rust/_rust
rename to plugins/rust/_rustc
diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh
new file mode 100644
index 000000000..ced6eb4aa
--- /dev/null
+++ b/plugins/rust/rust.plugin.zsh
@@ -0,0 +1,28 @@
+if ! (( $+commands[rustup] && $+commands[cargo] )); then
+  return
+fi
+
+# Add completions folder in $ZSH_CACHE_DIR
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `cargo`. Otherwise, compinit will have already done that
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_cargo" ]]; then
+  autoload -Uz _cargo
+  declare -A _comps
+  _comps[cargo]=_cargo
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `rustup`. Otherwise, compinit will have already done that
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_rustup" ]]; then
+  autoload -Uz _rustup
+  declare -A _comps
+  _comps[rustup]=_rustup
+fi
+
+# Generate completion files in the background
+rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
+rustup completions zsh cargo >| "$ZSH_CACHE_DIR/completions/_cargo" &|
diff --git a/plugins/rustup/README.md b/plugins/rustup/README.md
index ba037f8f6..c620e72a8 100644
--- a/plugins/rustup/README.md
+++ b/plugins/rustup/README.md
@@ -1,9 +1,3 @@
 # rustup
 
-This plugin adds completion for [`rustup`](https://rustup.rs/), the toolchain installer for the Rust programming language.
-
-To use it, add `rustup` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... rustup)
-```
+**Deprecated: use the [`rust`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rust) plugin instead.**
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index af8cf03a2..0ca745b7e 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,24 +1,11 @@
-if (( ! $+commands[rustup] )); then
-  return
-fi
+print ${(%):-'%F{yellow}The `rustup` plugin is deprecated and has been moved to the `rust` plugin.'}
+print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 
 # Remove old generated completion file
-# TODO: 2021-09-15: remove this line
+# TODO: 2021-12-28: remove this line
 command rm -f "${0:A:h}/_rustup"
 
-# Add completions/ folder in $ZSH_CACHE_DIR
-comp_file="$ZSH_CACHE_DIR/completions/_rustup"
-command mkdir -p "${comp_file:h}"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `rustup`. Otherwise, compinit will have already done that
-if [[ ! -f "$comp_file" ]]; then
-  autoload -Uz _rustup
-  declare -A _comps
-  _comps[rustup]=_rustup
-fi
-
-# Generate completion file in the background
-rustup completions zsh >| "$comp_file" &|
-unset comp_file
+(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
+  fpath=("$ZSH/plugins/rust" $fpath)
+  source "$ZSH/plugins/rust/rust.plugin.zsh"
+}

From 2d32e9be668672c110405aa2952ab8adaf374856 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 18 Dec 2021 14:53:49 -0600
Subject: [PATCH 335/591] refactor: handle `$0` according to the Zsh plugin
 standard (#10518)

For details and rationale, see:
https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html

Closes #10518
---
 plugins/cargo/cargo.plugin.zsh                              | 6 +++++-
 plugins/colemak/colemak.plugin.zsh                          | 5 +++++
 plugins/colored-man-pages/colored-man-pages.plugin.zsh      | 5 +++++
 plugins/deno/deno.plugin.zsh                                | 5 +++++
 plugins/emacs/emacs.plugin.zsh                              | 5 +++++
 plugins/emoji/emoji.plugin.zsh                              | 5 +++++
 plugins/emotty/emotty.plugin.zsh                            | 5 +++++
 plugins/fnm/fnm.plugin.zsh                                  | 5 +++++
 plugins/gh/gh.plugin.zsh                                    | 5 +++++
 plugins/git-prompt/git-prompt.plugin.zsh                    | 5 +++++
 plugins/gitfast/gitfast.plugin.zsh                          | 5 +++++
 .../history-substring-search.plugin.zsh                     | 6 +++++-
 plugins/hitchhiker/hitchhiker.plugin.zsh                    | 5 +++++
 plugins/macos/macos.plugin.zsh                              | 5 +++++
 plugins/rustup/rustup.plugin.zsh                            | 6 +++++-
 plugins/tmux/tmux.plugin.zsh                                | 5 +++++
 plugins/wd/wd.plugin.zsh                                    | 5 +++++
 plugins/z/z.plugin.zsh                                      | 5 +++++
 .../zsh-navigation-tools/zsh-navigation-tools.plugin.zsh    | 1 +
 19 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 51a80d4f1..20aeb6652 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,8 +1,12 @@
 print ${(%):-'%F{yellow}The `cargo` plugin is deprecated and has been moved to the `rust` plugin.'}
 print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 
+# TODO: 2021-12-28: remove this block
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
-# TODO: 2021-12-28: remove this line
 command rm -f "${0:A:h}/_cargo"
 
 (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
diff --git a/plugins/colemak/colemak.plugin.zsh b/plugins/colemak/colemak.plugin.zsh
index 8d3393c44..de0b5b866 100644
--- a/plugins/colemak/colemak.plugin.zsh
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -19,6 +19,11 @@ bindkey -a 'N' vi-join
 bindkey -a 'j' vi-forward-word-end
 bindkey -a 'J' vi-forward-blank-word-end
 
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 # New less versions will read this file directly
 export LESSKEYIN="${0:h:A}/colemak-less"
 
diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index 37faed672..040e74fc9 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -16,6 +16,11 @@ less_termcap[se]="${reset_color}"
 less_termcap[us]="${fg_bold[green]}"
 less_termcap[ue]="${reset_color}"
 
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 # Absolute path to this file's directory.
 typeset __colored_man_pages_dir="${0:A:h}"
 
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index eb7191971..88df55af7 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -13,6 +13,11 @@ alias dup='deno upgrade'
 
 # COMPLETION FUNCTION
 if (( $+commands[deno] )); 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}}"
+  0="${${(M)0:#/*}:-$PWD/$0}"
+
   # remove old generated completion file
   command rm -f "${0:A:h}/_deno"
 
diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 027c7550f..258e57f24 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -13,6 +13,11 @@
 autoload -Uz is-at-least
 is-at-least 24 "${${(Az)"$(emacsclient --version 2>/dev/null)"}[2]}" || return 0
 
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 # Path to custom emacsclient launcher
 export EMACS_PLUGIN_LAUNCHER="${0:A:h}/emacsclient.sh"
 
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index f70e09320..60d00d976 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -4,6 +4,11 @@
 #
 # See the README for documentation.
 
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 _omz_emoji_plugin_dir="${0:h}"
 
 () {
diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index 4511275d6..959390a31 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -10,6 +10,11 @@
 # % export emotty_set=nature
 # ------------------------------------------------------------------------------
 
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 typeset -gAH _emotty_sets
 local _emotty_plugin_dir="${0:h}"
 source "$_emotty_plugin_dir/emotty_stellar_set.zsh"
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index c161b27cd..a5b0d0900 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,4 +1,9 @@
 if (( $+commands[fnm] )); 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}}"
+  0="${${(M)0:#/*}:-$PWD/$0}"
+
   # remove old generated completion file
   command rm -f "${0:A:h}/_fnm"
 
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index 3e4cdee5e..3092bfa4a 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -1,5 +1,10 @@
 # Autocompletion for the GitHub CLI (gh).
 if (( $+commands[gh] )); 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}}"
+  0="${${(M)0:#/*}:-$PWD/$0}"
+
   # remove old generated completion file
   command rm -f "${0:A:h}/_gh"
 
diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index a4c952471..122542e65 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -1,3 +1,8 @@
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 __GIT_PROMPT_DIR="${0:A:h}"
 
 ## Hook function definitions
diff --git a/plugins/gitfast/gitfast.plugin.zsh b/plugins/gitfast/gitfast.plugin.zsh
index 7b6b67e92..f28e3808c 100644
--- a/plugins/gitfast/gitfast.plugin.zsh
+++ b/plugins/gitfast/gitfast.plugin.zsh
@@ -1,3 +1,8 @@
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 source "${0:A:h}/git-prompt.sh"
 
 function git_prompt_info() {
diff --git a/plugins/history-substring-search/history-substring-search.plugin.zsh b/plugins/history-substring-search/history-substring-search.plugin.zsh
index d2c749bc3..bac2c3ab9 100644
--- a/plugins/history-substring-search/history-substring-search.plugin.zsh
+++ b/plugins/history-substring-search/history-substring-search.plugin.zsh
@@ -1,4 +1,8 @@
-0=${(%):-%N}
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 source ${0:A:h}/history-substring-search.zsh
 
 
diff --git a/plugins/hitchhiker/hitchhiker.plugin.zsh b/plugins/hitchhiker/hitchhiker.plugin.zsh
index aeafaf01e..6d0e40052 100644
--- a/plugins/hitchhiker/hitchhiker.plugin.zsh
+++ b/plugins/hitchhiker/hitchhiker.plugin.zsh
@@ -1,3 +1,8 @@
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 HITCHHIKER_DIR="${0:h}/fortunes"
 
 # Aliases
diff --git a/plugins/macos/macos.plugin.zsh b/plugins/macos/macos.plugin.zsh
index 6a91be336..144c17ab2 100644
--- a/plugins/macos/macos.plugin.zsh
+++ b/plugins/macos/macos.plugin.zsh
@@ -1,3 +1,8 @@
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 # Open the current directory in a Finder window
 alias ofd='open_command $PWD'
 
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index 0ca745b7e..698c081e5 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,8 +1,12 @@
 print ${(%):-'%F{yellow}The `rustup` plugin is deprecated and has been moved to the `rust` plugin.'}
 print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 
+# TODO: 2021-12-28: remove this block
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
-# TODO: 2021-12-28: remove this line
 command rm -f "${0:A:h}/_rustup"
 
 (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 0ea3aa02a..648d12bbf 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -46,6 +46,11 @@ else
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
 fi
 
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 # Set the correct local config file to use.
 if [[ "$ZSH_TMUX_ITERM2" == "false" && -e "$ZSH_TMUX_CONFIG" ]]; then
   export ZSH_TMUX_CONFIG
diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
index 87d1d0858..222a1483a 100644
--- a/plugins/wd/wd.plugin.zsh
+++ b/plugins/wd/wd.plugin.zsh
@@ -7,4 +7,9 @@
 #
 # @github.com/mfaerevaag/wd
 
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 eval "wd() { source '${0:A:h}/wd.sh' }"
diff --git a/plugins/z/z.plugin.zsh b/plugins/z/z.plugin.zsh
index 96abee890..7ce13afa7 100644
--- a/plugins/z/z.plugin.zsh
+++ b/plugins/z/z.plugin.zsh
@@ -1 +1,6 @@
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 source "${0:h}/z.sh"
diff --git a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
index 85ce87ca4..54c819810 100644
--- a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
+++ b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
@@ -11,6 +11,7 @@
 # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
+
 export ZNT_REPO_DIR="${0:h}"
 export ZNT_CONFIG_DIR="$HOME/.config/znt"
 

From c06197ad954baf3567d8711e43ad542aef86e6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 14:16:54 +0100
Subject: [PATCH 336/591] chore: fix comment bulk replace

---
 plugins/cargo/cargo.plugin.zsh                                  | 2 +-
 plugins/colemak/colemak.plugin.zsh                              | 2 +-
 plugins/colored-man-pages/colored-man-pages.plugin.zsh          | 2 +-
 plugins/deno/deno.plugin.zsh                                    | 2 +-
 plugins/emacs/emacs.plugin.zsh                                  | 2 +-
 plugins/emoji/emoji.plugin.zsh                                  | 2 +-
 plugins/emotty/emotty.plugin.zsh                                | 2 +-
 plugins/fnm/fnm.plugin.zsh                                      | 2 +-
 plugins/git-prompt/git-prompt.plugin.zsh                        | 2 +-
 plugins/gitfast/gitfast.plugin.zsh                              | 2 +-
 .../history-substring-search.plugin.zsh                         | 2 +-
 plugins/hitchhiker/hitchhiker.plugin.zsh                        | 2 +-
 plugins/macos/macos.plugin.zsh                                  | 2 +-
 plugins/rustup/rustup.plugin.zsh                                | 2 +-
 plugins/tmux/tmux.plugin.zsh                                    | 2 +-
 plugins/wd/wd.plugin.zsh                                        | 2 +-
 plugins/z/z.plugin.zsh                                          | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 20aeb6652..6651f6432 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -3,7 +3,7 @@ print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'
 
 # TODO: 2021-12-28: remove this block
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
diff --git a/plugins/colemak/colemak.plugin.zsh b/plugins/colemak/colemak.plugin.zsh
index de0b5b866..e6a46f296 100644
--- a/plugins/colemak/colemak.plugin.zsh
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -20,7 +20,7 @@ bindkey -a 'j' vi-forward-word-end
 bindkey -a 'J' vi-forward-blank-word-end
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index 040e74fc9..087ddce97 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -17,7 +17,7 @@ less_termcap[us]="${fg_bold[green]}"
 less_termcap[ue]="${reset_color}"
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 88df55af7..15fe15a7b 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -14,7 +14,7 @@ alias dup='deno upgrade'
 # COMPLETION FUNCTION
 if (( $+commands[deno] )); then
   # Handle $0 according to the standard:
-  # # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+  # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
   0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
   0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 258e57f24..fede5b0c4 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -14,7 +14,7 @@ autoload -Uz is-at-least
 is-at-least 24 "${${(Az)"$(emacsclient --version 2>/dev/null)"}[2]}" || return 0
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index 60d00d976..876011957 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -5,7 +5,7 @@
 # See the README for documentation.
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index 959390a31..661169a8b 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -11,7 +11,7 @@
 # ------------------------------------------------------------------------------
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index a5b0d0900..73e2b958a 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,6 +1,6 @@
 if (( $+commands[fnm] )); then
   # Handle $0 according to the standard:
-  # # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+  # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
   0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
   0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index 122542e65..c86c1f59b 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/gitfast/gitfast.plugin.zsh b/plugins/gitfast/gitfast.plugin.zsh
index f28e3808c..a6db0c6bd 100644
--- a/plugins/gitfast/gitfast.plugin.zsh
+++ b/plugins/gitfast/gitfast.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/history-substring-search/history-substring-search.plugin.zsh b/plugins/history-substring-search/history-substring-search.plugin.zsh
index bac2c3ab9..63f0bdd42 100644
--- a/plugins/history-substring-search/history-substring-search.plugin.zsh
+++ b/plugins/history-substring-search/history-substring-search.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/hitchhiker/hitchhiker.plugin.zsh b/plugins/hitchhiker/hitchhiker.plugin.zsh
index 6d0e40052..0b1a30119 100644
--- a/plugins/hitchhiker/hitchhiker.plugin.zsh
+++ b/plugins/hitchhiker/hitchhiker.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/macos/macos.plugin.zsh b/plugins/macos/macos.plugin.zsh
index 144c17ab2..b540eecb5 100644
--- a/plugins/macos/macos.plugin.zsh
+++ b/plugins/macos/macos.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index 698c081e5..d8225901b 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -3,7 +3,7 @@ print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'
 
 # TODO: 2021-12-28: remove this block
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 648d12bbf..5474c3522 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -47,7 +47,7 @@ else
 fi
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
index 222a1483a..ca2ca7c65 100644
--- a/plugins/wd/wd.plugin.zsh
+++ b/plugins/wd/wd.plugin.zsh
@@ -8,7 +8,7 @@
 # @github.com/mfaerevaag/wd
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/z/z.plugin.zsh b/plugins/z/z.plugin.zsh
index 7ce13afa7..7d3eacac0 100644
--- a/plugins/z/z.plugin.zsh
+++ b/plugins/z/z.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 

From 49bae43f6202e7e1171d8911d8b243714dfe888a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 14:30:13 +0100
Subject: [PATCH 337/591] refactor(plugins): generate completion functions in
 the background

---
 plugins/cargo/cargo.plugin.zsh   |  2 +-
 plugins/deno/deno.plugin.zsh     | 39 ++++++++++++++++----------------
 plugins/fnm/fnm.plugin.zsh       | 38 +++++++++++++++----------------
 plugins/gh/gh.plugin.zsh         | 38 +++++++++++++++----------------
 plugins/rustup/rustup.plugin.zsh |  2 +-
 5 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 6651f6432..e4b338207 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -7,7 +7,7 @@ print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
-command rm -f "${0:A:h}/_cargo"
+command rm -f "${0:A:h}/_cargo" "$ZSH_CACHE_DIR/cargo_version"
 
 (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
   fpath=("$ZSH/plugins/rust" $fpath)
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 15fe15a7b..77c2125d2 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -12,30 +12,29 @@ alias dts='deno test'
 alias dup='deno upgrade'
 
 # COMPLETION FUNCTION
-if (( $+commands[deno] )); 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}}"
-  0="${${(M)0:#/*}:-$PWD/$0}"
+if (( ! $+commands[deno] )); then
+  return
+fi
 
-  # remove old generated completion file
-  command rm -f "${0:A:h}/_deno"
+# TODO: 2021-12-28: remove this block
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+# Remove old generated files
+command rm -f "${0:A:h}/_deno" "$ZSH_CACHE_DIR/deno_version"
 
-  ver="$(deno --version)"
-  ver_file="$ZSH_CACHE_DIR/deno_version"
-  comp_file="$ZSH_CACHE_DIR/completions/_deno"
-
-  mkdir -p "${comp_file:h}"
-  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
-
-  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
-    deno completions zsh >| "$comp_file"
-    echo "$ver" >| "$ver_file"
-  fi
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `deno`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_deno" ]]; then
   declare -A _comps
   autoload -Uz _deno
   _comps[deno]=_deno
-
-  unset ver ver_file comp_file
 fi
+
+deno completions zsh >| "$ZSH_CACHE_DIR/completions/_deno" &|
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index 73e2b958a..e22588792 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,28 +1,26 @@
-if (( $+commands[fnm] )); 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}}"
-  0="${${(M)0:#/*}:-$PWD/$0}"
+if (( ! $+commands[fnm] )); then
+  return
+fi
 
-  # remove old generated completion file
-  command rm -f "${0:A:h}/_fnm"
+# TODO: 2021-12-28: remove this block
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+# remove old generated files
+command rm -f "${0:A:h}/_fnm" "$ZSH_CACHE_DIR/fnm_version"
 
-  ver="$(fnm --version)"
-  ver_file="$ZSH_CACHE_DIR/fnm_version"
-  comp_file="$ZSH_CACHE_DIR/completions/_fnm"
-
-  mkdir -p "${comp_file:h}"
-  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
-
-  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
-    fnm completions --shell=zsh >| "$comp_file"
-    echo "$ver" >| "$ver_file"
-  fi
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `fnm`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_fnm" ]]; then
   declare -A _comps
   autoload -Uz _fnm
   _comps[fnm]=_fnm
-
-  unset ver ver_file comp_file
 fi
 
+fnm completions --shell=zsh >| "$ZSH_CACHE_DIR/completions/_fnm" &|
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index 3092bfa4a..17995e1cf 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -1,29 +1,27 @@
 # Autocompletion for the GitHub CLI (gh).
-if (( $+commands[gh] )); 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}}"
-  0="${${(M)0:#/*}:-$PWD/$0}"
+if (( ! $+commands[gh] )); then
+  return
+fi
 
-  # remove old generated completion file
-  command rm -f "${0:A:h}/_gh"
+# TODO: 2021-12-28: remove this block
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+# Remove old generated files
+command rm -f "${0:A:h}/_gh" "$ZSH_CACHE_DIR/gh_version"
 
-  ver="$(gh --version)"
-  ver_file="$ZSH_CACHE_DIR/gh_version"
-  comp_file="$ZSH_CACHE_DIR/completions/_gh"
-
-  mkdir -p "${comp_file:h}"
-  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
-
-  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
-    gh completion --shell zsh >| "$comp_file"
-    echo "$ver" >| "$ver_file"
-  fi
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `gh`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_gh" ]]; then
   declare -A _comps
   autoload -Uz _gh
   _comps[gh]=_gh
-
-  unset ver ver_file comp_file
 fi
 
+gh completion --shell zsh >| "$ZSH_CACHE_DIR/completions/_gh" &|
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index d8225901b..3d59c1c54 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -7,7 +7,7 @@ print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
-command rm -f "${0:A:h}/_rustup"
+command rm -f "${0:A:h}/_rustup" "$ZSH_CACHE_DIR/rustup_version"
 
 (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
   fpath=("$ZSH/plugins/rust" $fpath)

From 79531f7013d9f9a54eaa7ac265c4788bd72a8ada Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 28 Dec 2021 14:36:32 +0100
Subject: [PATCH 338/591] feat(pip): alias `pip` to `pip3` if pip is missing
 (#10431)

---
 plugins/pip/pip.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index 629147bae..a58f5704a 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -82,7 +82,11 @@ zsh-pip-test-clean-packages() {
     fi
 }
 
-alias pip="noglob pip" # allows square brackets for pip command invocation
+if (( $+commands[pip3] && !$+commands[pip] )); then
+  alias pip="noglob pip3"
+else
+  alias pip="noglob pip"
+fi
 
 # Create requirements file
 alias pipreq="pip freeze > requirements.txt"

From 543d6c0db197b624f8cf8be296fa2e5d37d3e6c2 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 28 Dec 2021 15:54:59 +0100
Subject: [PATCH 339/591] feat(rbw): add completion for `rbw` Bitwarden client
 (#10346)

---
 .github/actions/spelling/expect.txt |  6 ++++--
 plugins/rbw/README.md               | 12 ++++++++++++
 plugins/rbw/rbw.plugin.zsh          | 19 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 plugins/rbw/README.md
 create mode 100644 plugins/rbw/rbw.plugin.zsh

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 65215c6c3..5c5a04ff1 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -22,8 +22,8 @@ acr
 acroread
 acs
 acsc
-acss
 acsp
+acss
 actionformats
 Adamantium
 adb
@@ -312,6 +312,7 @@ bisd
 bitboxer
 bitbucket
 bitswap
+bitwarden
 blkio
 blockprofile
 blockprofilerate
@@ -3119,6 +3120,7 @@ rbenv
 rbenvdirs
 rbfu
 RBUFFER
+rbw
 rcfile
 Rchive
 rcs
@@ -4442,8 +4444,8 @@ zrr
 zrs
 zscore
 zse
-zsh'ed
 zsh
+zsh'ed
 zshaddhistory
 zshcmd
 zshcommands
diff --git a/plugins/rbw/README.md b/plugins/rbw/README.md
new file mode 100644
index 000000000..87d073d24
--- /dev/null
+++ b/plugins/rbw/README.md
@@ -0,0 +1,12 @@
+# Bitwarden (unofficial) CLI plugin
+
+This plugin adds completion for [rbw](https://github.com/doy/rbw), an unofficial
+CLI for [Bitwarden](https://bitwarden.com).
+
+To use it, add `rbw` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... rbw)
+```
+
+This plugin does not add any aliases.
diff --git a/plugins/rbw/rbw.plugin.zsh b/plugins/rbw/rbw.plugin.zsh
new file mode 100644
index 000000000..3825be7a6
--- /dev/null
+++ b/plugins/rbw/rbw.plugin.zsh
@@ -0,0 +1,19 @@
+if (( ! $+commands[rbw] )); then
+  return
+fi
+
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `rbw`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_rbw" ]]; then
+  declare -A _comps
+  autoload -Uz _rbw
+  _comps[rbw]=_rbw
+fi
+
+rbw gen-completions zsh >| "$ZSH_CACHE_DIR/completions/_rbw" &|

From df4508ad543236f754b3cd373d474b4af3638115 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 28 Dec 2021 15:55:47 +0100
Subject: [PATCH 340/591] feat(volta): add dynamic completion generation
 (#10515)

---
 plugins/volta/_volta           | 298 ---------------------------------
 plugins/volta/volta.plugin.zsh |  19 +++
 2 files changed, 19 insertions(+), 298 deletions(-)
 delete mode 100644 plugins/volta/_volta
 create mode 100644 plugins/volta/volta.plugin.zsh

diff --git a/plugins/volta/_volta b/plugins/volta/_volta
deleted file mode 100644
index 295b80362..000000000
--- a/plugins/volta/_volta
+++ /dev/null
@@ -1,298 +0,0 @@
-#compdef volta
-
-autoload -U is-at-least
-
-_volta() {
-    typeset -A opt_args
-    typeset -a _arguments_options
-    local ret=1
-
-    if is-at-least 5.2; then
-        _arguments_options=(-s -S -C)
-    else
-        _arguments_options=(-s -C)
-    fi
-
-    local context curcontext="$curcontext" state line
-    _arguments "${_arguments_options[@]}" \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-'-v[Prints the current version of Volta]' \
-'--version[Prints the current version of Volta]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-":: :_volta_commands" \
-"*::: :->Volta" \
-&& ret=0
-    case $state in
-    (Volta)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:volta-command-$line[1]:"
-        case $line[1] in
-            (fetch)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':tool[@version] -- Tools to fetch, like `node`, `yarn@latest` or `your-package@^14.4.3`.:_files' \
-&& ret=0
-;;
-(install)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':tool[@version] -- Tools to install, like `node`, `yarn@latest` or `your-package@^14.4.3`.:_files' \
-&& ret=0
-;;
-(uninstall)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':tool -- The tool to uninstall, e.g. `node`, `npm`, `yarn`, or <package>:_files' \
-&& ret=0
-;;
-(pin)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':tool[@version] -- Tools to pin, like `node@lts` or `yarn@^1.14`.:_files' \
-&& ret=0
-;;
-(ls)
-_arguments "${_arguments_options[@]}" \
-'--format=[Specify the output format]: :(human plain)' \
-'(-d --default)-c[Show the currently-active tool(s)]' \
-'(-d --default)--current[Show the currently-active tool(s)]' \
-'(-c --current)-d[Show your default tool(s).]' \
-'(-c --current)--default[Show your default tool(s).]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-'::tool -- The tool to lookup - `all`, `node`, `yarn`, or the name of a package or binary.:_files' \
-&& ret=0
-;;
-(list)
-_arguments "${_arguments_options[@]}" \
-'--format=[Specify the output format]: :(human plain)' \
-'(-d --default)-c[Show the currently-active tool(s)]' \
-'(-d --default)--current[Show the currently-active tool(s)]' \
-'(-c --current)-d[Show your default tool(s).]' \
-'(-c --current)--default[Show your default tool(s).]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-'::tool -- The tool to lookup - `all`, `node`, `yarn`, or the name of a package or binary.:_files' \
-&& ret=0
-;;
-(completions)
-_arguments "${_arguments_options[@]}" \
-'-o+[File to write generated completions to]' \
-'--output=[File to write generated completions to]' \
-'-f[Write over an existing file, if any.]' \
-'--force[Write over an existing file, if any.]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':shell -- Shell to generate completions for:(zsh bash fish powershell elvish)' \
-&& ret=0
-;;
-(which)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':binary -- The binary to find, e.g. `node` or `npm`:_files' \
-&& ret=0
-;;
-(use)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-'::anything:_files' \
-&& ret=0
-;;
-(setup)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-&& ret=0
-;;
-(run)
-_arguments "${_arguments_options[@]}" \
-'--node=[Set the custom Node version]' \
-'(--bundled-npm)--npm=[Set the custom npm version]' \
-'(--no-yarn)--yarn=[Set the custom Yarn version]' \
-'*--env=[Set an environment variable (can be used multiple times)]' \
-'(--npm)--bundled-npm[Forces npm to be the version bundled with Node]' \
-'(--yarn)--no-yarn[Disables Yarn]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':command -- The command to run:_files' \
-'::args -- Arguments to pass to the command:_files' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-}
-
-(( $+functions[_volta_commands] )) ||
-_volta_commands() {
-    local commands; commands=(
-        "fetch:Fetches a tool to the local machine" \
-"install:Installs a tool in your toolchain" \
-"uninstall:Uninstalls a tool from your toolchain" \
-"pin:Pins your project's runtime or package manager" \
-"list:Displays the current toolchain" \
-"completions:Generates Volta completions" \
-"which:Locates the actual binary that will be called by Volta" \
-"use:" \
-"setup:Enables Volta for the current user / shell" \
-"run:Run a command with custom Node, npm, and/or Yarn versions" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'volta commands' commands "$@"
-}
-(( $+functions[_volta__completions_commands] )) ||
-_volta__completions_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta completions commands' commands "$@"
-}
-(( $+functions[_volta__fetch_commands] )) ||
-_volta__fetch_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta fetch commands' commands "$@"
-}
-(( $+functions[_volta__help_commands] )) ||
-_volta__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta help commands' commands "$@"
-}
-(( $+functions[_volta__install_commands] )) ||
-_volta__install_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta install commands' commands "$@"
-}
-(( $+functions[_volta__list_commands] )) ||
-_volta__list_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta list commands' commands "$@"
-}
-(( $+functions[_ls_commands] )) ||
-_ls_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'ls commands' commands "$@"
-}
-(( $+functions[_volta__ls_commands] )) ||
-_volta__ls_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta ls commands' commands "$@"
-}
-(( $+functions[_volta__pin_commands] )) ||
-_volta__pin_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta pin commands' commands "$@"
-}
-(( $+functions[_volta__run_commands] )) ||
-_volta__run_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta run commands' commands "$@"
-}
-(( $+functions[_volta__setup_commands] )) ||
-_volta__setup_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta setup commands' commands "$@"
-}
-(( $+functions[_volta__uninstall_commands] )) ||
-_volta__uninstall_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta uninstall commands' commands "$@"
-}
-(( $+functions[_volta__use_commands] )) ||
-_volta__use_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta use commands' commands "$@"
-}
-(( $+functions[_volta__which_commands] )) ||
-_volta__which_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta which commands' commands "$@"
-}
-
-_volta "$@"
\ No newline at end of file
diff --git a/plugins/volta/volta.plugin.zsh b/plugins/volta/volta.plugin.zsh
new file mode 100644
index 000000000..756dc84b3
--- /dev/null
+++ b/plugins/volta/volta.plugin.zsh
@@ -0,0 +1,19 @@
+# COMPLETION FUNCTION
+if (( ! $+commands[volta] )); then
+  return
+fi
+
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `deno`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_volta" ]]; then
+  declare -A _comps
+  autoload -Uz _volta
+  _comps[volta]=_volta
+fi
+
+volta completions zsh >| "$ZSH_CACHE_DIR/completions/_volta" &|

From d5cb1d339f3fb8b181d5ab5527718657587021ea Mon Sep 17 00:00:00 2001
From: Alwyn Kik <alwyn@kik.pw>
Date: Tue, 28 Dec 2021 16:59:48 +0100
Subject: [PATCH 341/591] docs(oc): update link to openshift CLI reference
 (#9667)

---
 plugins/oc/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/oc/README.md b/plugins/oc/README.md
index deae9b2d0..b7903eafe 100644
--- a/plugins/oc/README.md
+++ b/plugins/oc/README.md
@@ -1,6 +1,6 @@
 # OC - OpenShift CLI
 
-This plugin provides autocompletion for [OC](https://docs.openshift.com/container-platform/3.7/cli_reference/index.html) commands, building, managing and updating operations.
+This plugin provides autocompletion for [OC](https://docs.openshift.com/container-platform/latest/cli_reference/openshift_cli/getting-started-cli.html) commands, building, managing and updating operations.
 
 To use it, add `oc` to the plugins array of your zshrc file:
 

From 56de7c85f34a15a4490f4984e128dba78fcebfd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Malard?= <c.malard-git@valdun.net>
Date: Tue, 28 Dec 2021 17:06:50 +0100
Subject: [PATCH 342/591] docs(aliases): clarify usage (#9990)

---
 plugins/aliases/README.md | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/aliases/README.md b/plugins/aliases/README.md
index 481c1bd4e..bfb6ab8c4 100644
--- a/plugins/aliases/README.md
+++ b/plugins/aliases/README.md
@@ -1,21 +1,22 @@
-## Aliases Cheatsheet
+# Aliases cheatsheet
 
 **Maintainer:** [@hqingyi](https://github.com/hqingyi)
 
 With lots of 3rd-party amazing aliases installed, this plugin helps list the shortcuts
 that are currently available based on the plugins you have enabled.
 
-Enable this plugin by adding it to your `plugins` definition in `~/.zshrc`.
+To use it, add `aliases` to the plugins array in your zshrc file:
 
-  ```
-  plugins=(aliases)
-  ```
+```zsh
+plugins=(aliases)
+```
 
 Requirements: Python needs to be installed.
 
-### Usage
+## Usage
 
-```
-  acs: group all alias
-  acs $keywordquickly filter alias & highlight
-```
+- `acs`: show all aliases by group.
+
+- `acs <keyword>`: filter aliases by `<keyword>` and highlight.
+
+  ![screenshot](https://cloud.githubusercontent.com/assets/3602957/11581913/cb54fb8a-9a82-11e5-846b-5a67f67ad9ad.png)

From 364e62155de53c3d977b54953a262d7a256d2cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 17:15:16 +0100
Subject: [PATCH 343/591] refactor(ant): extract completion function

---
 plugins/ant/README.md      |  4 ++--
 plugins/ant/_ant           | 22 ++++++++++++++++++++++
 plugins/ant/ant.plugin.zsh | 16 ----------------
 3 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 plugins/ant/_ant
 delete mode 100644 plugins/ant/ant.plugin.zsh

diff --git a/plugins/ant/README.md b/plugins/ant/README.md
index 5f88984ac..571237223 100644
--- a/plugins/ant/README.md
+++ b/plugins/ant/README.md
@@ -2,9 +2,9 @@
 
 This plugin provides completion for [Ant](https://ant.apache.org/).
 
-To use it add ant to the plugins array in your zshrc file.
+To use it, add `ant` to the plugins array in your zshrc file:
 
-```bash
+```zsh
 plugins=(... ant)
 ```
 
diff --git a/plugins/ant/_ant b/plugins/ant/_ant
new file mode 100644
index 000000000..24a8e3667
--- /dev/null
+++ b/plugins/ant/_ant
@@ -0,0 +1,22 @@
+#compdef ant
+
+_ant_does_target_list_need_generating () {
+  [[ ! -f .ant_targets ]] && return 0
+  [[ build.xml -nt .ant_targets ]] && return 0
+  return 1
+}
+
+_ant () {
+  if [[ ! -f build.xml ]]; then
+    return
+  fi
+
+  if ! _ant_does_target_list_need_generating; then
+    return
+  fi
+
+  ant -p | awk -F " " 'NR > 5 { print lastTarget } { lastTarget = $1 }' >| .ant_targets
+  compadd -- "$(cat .ant_targets)"
+}
+
+_ant "$@"
diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
deleted file mode 100644
index 0b738c94f..000000000
--- a/plugins/ant/ant.plugin.zsh
+++ /dev/null
@@ -1,16 +0,0 @@
-_ant_does_target_list_need_generating () {
-  [ ! -f .ant_targets ] && return 0;
-  [ build.xml -nt .ant_targets ] && return 0;
-  return 1;
-}
-
-_ant () {
-  if [ -f build.xml ]; then
-    if _ant_does_target_list_need_generating; then
-    	ant -p | awk -F " " 'NR > 5 { print lastTarget }{lastTarget = $1}' > .ant_targets
-    fi
-    compadd -- `cat .ant_targets`
-  fi
-}
-
-compdef _ant ant

From 1316b31764826e348d2f4753c2b7a8e6ffe4441c Mon Sep 17 00:00:00 2001
From: Brahim Djoudi <jolkdarr@netscape.net>
Date: Thu, 22 Mar 2018 08:58:11 +0100
Subject: [PATCH 344/591] feat(ant): enable colored output by default (#6688)

Closes #6688
---
 plugins/ant/ant.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 plugins/ant/ant.plugin.zsh

diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
new file mode 100644
index 000000000..5f6382521
--- /dev/null
+++ b/plugins/ant/ant.plugin.zsh
@@ -0,0 +1,2 @@
+# Default to colored output
+export ANT_ARGS='-logger org.apache.tools.ant.listener.AnsiColorLogger'

From 292f11e97a2c82e5138ef11624d2ccebb945681b Mon Sep 17 00:00:00 2001
From: "Jason A. Crome" <jason@crome-plated.com>
Date: Tue, 28 Dec 2021 11:20:13 -0500
Subject: [PATCH 345/591] feat(autojump): add support for NetBSD (#9746)

---
 plugins/autojump/autojump.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 3117c6da4..8593353b2 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -8,6 +8,7 @@ autojump_paths=(
   /etc/profile.d/autojump.zsh                        # manual installation
   /etc/profile.d/autojump.sh                         # Gentoo installation
   /usr/local/share/autojump/autojump.zsh             # FreeBSD installation
+  /usr/pkg/share/autojump/autojump.zsh               # NetBSD installation
   /opt/local/etc/profile.d/autojump.sh               # macOS with MacPorts
   /usr/local/etc/profile.d/autojump.sh               # macOS with Homebrew (default)
   /opt/homebrew/etc/profile.d/autojump.sh            # macOS with Homebrew (default on M1 macs)

From c26e9e807f80f9c219e0ef2c71834fe0af703d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnas=20Udovi=C4=8Dius?= <zordsdavini@gmail.com>
Date: Fri, 9 Jun 2017 14:14:55 +0300
Subject: [PATCH 346/591] feat(arcanist): add `arbl` and `arho` aliases (#6132)

Closes #6132
---
 plugins/arcanist/README.md           | 2 ++
 plugins/arcanist/arcanist.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugins/arcanist/README.md b/plugins/arcanist/README.md
index f49e4344b..07e766977 100644
--- a/plugins/arcanist/README.md
+++ b/plugins/arcanist/README.md
@@ -14,6 +14,7 @@ plugins=(... arcanist)
 | ------- | ---------------------------------- |
 | ara     | `arc amend`                        |
 | arb     | `arc branch`                       |
+| arbl    | `arc bland`                        |
 | arco    | `arc cover`                        |
 | arci    | `arc commit`                       |
 | ard     | `arc diff`                         |
@@ -24,6 +25,7 @@ plugins=(... arcanist)
 | ardpc   | `arc diff --plan-changes`          |
 | are     | `arc export`                       |
 | arh     | `arc help`                         |
+| arho    | `arc hotfix`                       |
 | arl     | `arc land`                         |
 | arli    | `arc lint`                         |
 | arls    | `arc list`                         |
diff --git a/plugins/arcanist/arcanist.plugin.zsh b/plugins/arcanist/arcanist.plugin.zsh
index 88e6713e4..380eede75 100644
--- a/plugins/arcanist/arcanist.plugin.zsh
+++ b/plugins/arcanist/arcanist.plugin.zsh
@@ -5,6 +5,7 @@
 
 alias ara='arc amend'
 alias arb='arc branch'
+alias arbl='arc bland'
 alias arco='arc cover'
 alias arci='arc commit'
 
@@ -17,6 +18,7 @@ alias ardp='arc diff --preview' # creates a new diff in the phab interface
 
 alias are='arc export'
 alias arh='arc help'
+alias arho='arc hotfix'
 alias arl='arc land'
 alias arli='arc lint'
 alias arls='arc list'

From d806649028f60ee2efc4aac187faf252e32ba1ef Mon Sep 17 00:00:00 2001
From: michal panoch <mp@maya.cz>
Date: Tue, 28 Dec 2021 17:30:32 +0100
Subject: [PATCH 347/591] feat(bundler): add completion for `info` argument
 (#9594)

---
 plugins/bundler/_bundler | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/bundler/_bundler b/plugins/bundler/_bundler
index ba647ab80..51678dd7c 100644
--- a/plugins/bundler/_bundler
+++ b/plugins/bundler/_bundler
@@ -18,6 +18,7 @@ case $state in
 			"check[Determine whether the requirements for your application are installed]" \
 			"list[Show all of the gems in the current bundle]" \
 			"show[Show the source location of a particular gem in the bundle]" \
+			"info[Show details of a particular gem in the bundle]" \
 			"outdated[Show all of the outdated gems in the current bundle]" \
 			"console[Start an IRB session in the context of the current bundle]" \
 			"open[Open an installed gem in the editor]" \
@@ -84,7 +85,7 @@ case $state in
 					'(--verbose)--verbose[Enable verbose output mode]'
 				ret=0
 				;;
-			(open|show)
+			(open|show|info)
 				_gems=( $(bundle show 2> /dev/null | sed -e '/^  \*/!d; s/^  \* \([^ ]*\) .*/\1/') )
 				if [[ $_gems != "" ]]; then
 					_values 'gems' $_gems && ret=0

From c4be9294f26a3cf58fc7f1b4e6cd43931c68b639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 17:46:35 +0100
Subject: [PATCH 348/591] style(acs): fix style and gitignore __pycache__
 folder

---
 plugins/aliases/.gitignore         | 1 +
 plugins/aliases/aliases.plugin.zsh | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 plugins/aliases/.gitignore

diff --git a/plugins/aliases/.gitignore b/plugins/aliases/.gitignore
new file mode 100644
index 000000000..bee8a64b7
--- /dev/null
+++ b/plugins/aliases/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/plugins/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh
index 28d8fba24..b3d9340f0 100644
--- a/plugins/aliases/aliases.plugin.zsh
+++ b/plugins/aliases/aliases.plugin.zsh
@@ -2,9 +2,10 @@
 #
 # - acs: alias cheatsheet
 #   group alias by command, pass addition argv to grep.
-ALIASES_PLUGIN_ROOT=$(cd `dirname $0` && pwd)
 function acs(){
-    which python >>/dev/null
-    [[ $? -eq 1 ]] && echo "[error]no python executable detected!" && return
-    alias | python $ALIASES_PLUGIN_ROOT/cheatsheet.py $@
+  (( $+commands[python] )) || {
+    echo "[error] No python executable detected"
+    return
+  }
+  alias | python ${functions_source[$0]:h}/cheatsheet.py $@
 }

From 01230fa6e29c54294800c06ac8a4249d5bddf2dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 17:49:41 +0100
Subject: [PATCH 349/591] style(drush): fix code and README style

---
 plugins/drush/README.md        | 111 +++++++++++++--------------------
 plugins/drush/drush.plugin.zsh |  87 +++++++++++++-------------
 2 files changed, 86 insertions(+), 112 deletions(-)

diff --git a/plugins/drush/README.md b/plugins/drush/README.md
index df7b82bdd..dfd1eaf82 100644
--- a/plugins/drush/README.md
+++ b/plugins/drush/README.md
@@ -1,83 +1,60 @@
 # Drush
 
-## Description
-This plugin offers aliases and functions to make the work with drush easier and more productive.
+This plugin adds aliases and functions for [Drush](https://www.drush.org), a command-line shell
+and Unix scripting interface for Drupal. It also adds completion for the `drush` command.
 
-To enable it, add the `drush` to your `plugins` array in `~/.zshrc`:
+To enable it, add `drush` to the plugins array in zshrc file:
 
-```
+```zsh
 plugins=(... drush)
 ```
 
 ## Aliases
-| Alias | Description                                                           | Command                     |
-|-------|-----------------------------------------------------------------------|-----------------------------|
-| dr    | Display drush help                                                    | drush                       |
-| drca  | Clear all drupal caches.                                              | drush cc all                |
-| drcb  | Clear block cache.                                                    | drush cc block              |
-| drcg  | Clear registry cache.                                                 | drush cc registry           |
-| drcj  | Clear css-js cache.                                                   | drush cc css-js             |
-| drcm  | Clear menu cache.                                                     | drush cc menu               |
-| drcml | Clear module-list cache.                                              | drush cc module-list        |
-| drcr  | Run all cron hooks in all active modules for specified site.          | drush core-cron             |
-| drct  | Clear theme-registry cache.                                           | drush cc theme-registry     |
-| drcv  | Clear views cache. (Make sure that the views module is enabled)       | drush cc views              |
-| drdmp | Backup database in a new dump.sql file                                | drush drush sql-dump --ordered-dump --result-file=dump.sql|
-| drf   | Display features status                                               | drush features              |
-| drfr  | Revert a feature module on your site.                                 | drush features-revert -y    |
-| drfu  | Update a feature module on your site.                                 | drush features-update -y    |
-| drfra | Revert all enabled feature module on your site.                       | drush features-revert-all   |
-| drif  | Flush all derived images.                                             | drush image-flush --all     |
-| drpm  | Show a list of available modules.                                     | drush pm-list --type=module |
-| drst  | Provides a birds-eye view of the current Drupal installation, if any. | drush core-status           |
-| drup  | Apply any database updates required (as with running update.php).     | drush updatedb              |
-| drups | List any pending database updates.                                    | drush updatedb-status       |
-| drv   | Show drush version.                                                   | drush version               |
-| drvd	| Delete a variable.																										| drush variable-del					|
-| drvg	| Get a list of some or all site variables and values.									| drush variable-get					|
-| drvs	| Set a variable.																												| drush variable-set					|
+
+| Alias   | Command                                                      | Description                                                           |
+| ------- | ------------------------------------------------------------ | --------------------------------------------------------------------- |
+| `dr`    | `drush`                                                      | Display drush help                                                    |
+| `drca`  | `drush cc all`                                               | _(Deprecated in Drush 8)_ Clear all drupal caches.                    |
+| `drcb`  | `drush cc block`                                             | _(Deprecated in Drush 8)_ Clear block cache.                          |
+| `drcg`  | `drush cc registry`                                          | _(Deprecated in Drush 8)_ Clear registry cache.                       |
+| `drcj`  | `drush cc css-js`                                            | Clear css-js cache.                                                   |
+| `drcm`  | `drush cc menu`                                              | Clear menu cache.                                                     |
+| `drcml` | `drush cc module-list`                                       | Clear module-list cache.                                              |
+| `drcr`  | `drush core-cron`                                            | Run all cron hooks in all active modules for specified site.          |
+| `drct`  | `drush cc theme-registry`                                    | Clear theme-registry cache.                                           |
+| `drcv`  | `drush cc views`                                             | Clear views cache. (Make sure that the views module is enabled)       |
+| `drdmp` | `drush drush sql-dump --ordered-dump --result-file=dump.sql` | Backup database in a new dump.sql file                                |
+| `drf`   | `drush features`                                             | Display features status                                               |
+| `drfr`  | `drush features-revert -y`                                   | Revert a feature module on your site.                                 |
+| `drfra` | `drush features-revert-all`                                  | Revert all enabled feature module on your site.                       |
+| `drfu`  | `drush features-update -y`                                   | Update a feature module on your site.                                 |
+| `drif`  | `drush image-flush --all`                                    | Flush all derived images.                                             |
+| `drpm`  | `drush pm-list --type=module`                                | Show a list of available modules.                                     |
+| `drst`  | `drush core-status`                                          | Provides a birds-eye view of the current Drupal installation, if any. |
+| `drup`  | `drush updatedb`                                             | Apply any database updates required (as with running update.php).     |
+| `drups` | `drush updatedb-status`                                      | List any pending database updates.                                    |
+| `drv`   | `drush version`                                              | Show drush version.                                                   |
+| `drvd`  | `drush variable-del`                                         | Delete a variable.                                                    |
+| `drvg`  | `drush variable-get`                                         | Get a list of some or all site variables and values.                  |
+| `drvs`  | `drush variable-set`                                         | Set a variable.                                                       |
 
 ## Functions
 
-### dren
-Download and enable one or more extensions (modules or themes).
-Must be invoked with one or more parameters. e.g.:
-`dren devel` or `dren devel module_filter views`
+- `dren`: download and enable one or more extensions (modules or themes). Must be
+  invoked with one or more parameters, e.g.: `dren devel` or `dren devel module_filter views`.
 
-### drf
-Edit drushrc, site alias, and Drupal settings.php files.
-Can be invoked with one or without parameters. e.g.:
-`drf 1`
+- `drf`: edit drushrc, site alias, and Drupal settings.php files.
+  Can be invoked with one or without parameters, e.g.: `drf 1`.
 
-### dris
-Disable one or more extensions (modules or themes)
-Must be invoked with one or more parameters. e.g.:
-`dris devel` or `dris devel module_filter views`
+- `dris`: disable one or more extensions (modules or themes). Must be invoked with
+  one or more parameters, e.g.: `dris devel` or `dris devel module_filter views`.
 
-### drpu
-Uninstall one or more modules.
-Must be invoked with one or more parameters. e.g.:
-`drpu devel` or `drpu devel module_filter views`
+- `drpu`: uninstall one or more modules. Must be invoked with one or more
+  parameters, e.g.: `drpu devel` or `drpu devel module_filter views`.
 
-### drnew
-Creates a brand new drupal website.
-Note: As soon as the installation is complete, drush will print a username and a random password into the terminal:
-```
-Installation complete.  User name: admin  User password: cf7t8yqNEm
-```
+- `drnew`: creates a brand new drupal website. Note: as soon as the installation
+  is complete, `drush` will print a username and a random password into the terminal:
 
-## Additional features
-
-### Autocomplete
-The [completion script for drush](https://github.com/drush-ops/drush/blob/8.0.1/drush.complete.sh) comes enabled with this plugin.
-So, it is possible to type a command:
-```
-drush sql
-```
-
-And as soon as the tab key is pressed, the script will display the available commands:
-```
-drush sql
-sqlc           sql-conf       sql-create     sql-dump       sql-query      sql-sanitize                
-sql-cli        sql-connect    sql-drop       sqlq           sqlsan         sql-sync
-```
+  ```text
+  Installation complete.  User name: admin  User password: cf7t8yqNEm
+  ```
diff --git a/plugins/drush/drush.plugin.zsh b/plugins/drush/drush.plugin.zsh
index 8a20d79f2..fbf9656e6 100644
--- a/plugins/drush/drush.plugin.zsh
+++ b/plugins/drush/drush.plugin.zsh
@@ -1,19 +1,18 @@
-# Drush support.
-
+# Functions
 function dren() {
-  drush en $@ -y
+  drush en "$@" -y
 }
 
 function dris() {
-  drush pm-disable $@ -y
+  drush pm-disable "$@" -y
 }
 
 function drpu() {
-  drush pm-uninstall $@ -y
+  drush pm-uninstall "$@" -y
 }
 
 function drf() {
-  if [[ $1 == "" ]] then
+  if [[ -z "$1" ]] then
     drush core-config
   else
     drush core-config --choice=$1
@@ -21,58 +20,56 @@ function drf() {
 }
 
 function drfi() {
-  if [[ $1 == "fields" ]]; then
-    drush field-info fields
-  elif [[ $1 == "types" ]]; then
-    drush field-info types
-  else
-    drush field-info
-  fi
+  case "$1" in
+  fields) drush field-info fields ;;
+  types) drush field-info types ;;
+  *) drush field-info ;;
+  esac
 }
 
 function drnew() {
+  (
+    cd
+    echo "Website's name: "
+    read WEBSITE_NAME
 
-  cd ~
-  echo "Website's name: "
-  read WEBSITE_NAME
+    HOST=http://$(hostname -i)/
 
-  HOST=http://$(hostname -i)/
+    if [[ $WEBSITE_NAME == "" ]] then
+      MINUTES=$(date +%M:%S)
+      WEBSITE_NAME="Drupal-$MINUTES"
+      echo "Your website will be named: $WEBSITE_NAME"
+    fi
 
-  if [[ $WEBSITE_NAME == "" ]] then
-    MINUTES=$(date +%M:%S)
-    WEBSITE_NAME="Drupal-$MINUTES"
-    echo "Your website will be named: $WEBSITE_NAME"
-  fi
+    drush dl drupal --drupal-project-rename=$WEBSITE_NAME
 
-  drush dl drupal --drupal-project-rename=$WEBSITE_NAME
+    echo "Type your localhost directory: (Leave empty for /var/www/html/)"
+    read DIRECTORY
 
-  echo "Type your localhost directory: (Leave empty for /var/www/html/)"
-  read DIRECTORY
+    if [[ $DIRECTORY == "" ]] then
+      DIRECTORY="/var/www/html/"
+    fi
 
-  if [[ $DIRECTORY == "" ]] then
-    DIRECTORY="/var/www/html/"
-  fi
+    echo "Moving to $DIRECTORY$WEBSITE_NAME"
+    sudo mv $WEBSITE_NAME $DIRECTORY
+    cd $DIRECTORY$WEBSITE_NAME
 
-  echo "Moving to $DIRECTORY$WEBSITE_NAME"
-  sudo mv $WEBSITE_NAME $DIRECTORY
-  cd $DIRECTORY$WEBSITE_NAME
+    echo "Database's user: "
+    read DATABASE_USR
+    echo "Database's password: "
+    read -s DATABASE_PWD
+    echo "Database's name for your project: "
+    read DATABASE
 
-  echo "Database's user: "
-  read DATABASE_USR
-  echo "Database's password: "
-  read -s DATABASE_PWD
-  echo "Database's name for your project: "
-  read DATABASE
-
-  DB_URL="mysql://$DATABASE_USR:$DATABASE_PWD@localhost/$DATABASE"
-  drush site-install standard --db-url=$DB_URL --site-name=$WEBSITE_NAME
-
-  open_command $HOST$WEBSITE_NAME
-  echo "Done"
+    DB_URL="mysql://$DATABASE_USR:$DATABASE_PWD@localhost/$DATABASE"
+    drush site-install standard --db-url=$DB_URL --site-name=$WEBSITE_NAME
 
+    open_command $HOST$WEBSITE_NAME
+    echo "Done"
+  )
 }
 
-# Aliases, sorted alphabetically.
+# Aliases
 alias dr="drush"
 alias drca="drush cc all" # Deprecated for Drush 8
 alias drcb="drush cc block" # Deprecated for Drush 8
@@ -86,8 +83,8 @@ alias drcv="drush cc views"
 alias drdmp="drush sql-dump --ordered-dump --result-file=dump.sql"
 alias drf="drush features"
 alias drfr="drush features-revert -y"
-alias drfu="drush features-update -y"
 alias drfra="drush features-revert-all"
+alias drfu="drush features-update -y"
 alias drif="drush image-flush --all"
 alias drpm="drush pm-list --type=module"
 alias drst="drush core-status"

From d3bc4b41523b18dd75a7f3ba1a153afc8e8dcedd Mon Sep 17 00:00:00 2001
From: Sean MacCath-Moran <sean@Seans-MacBook-Pro.local>
Date: Wed, 9 Dec 2020 18:17:30 -0400
Subject: [PATCH 350/591] feat(drush): add Drupal 8 aliases to `drush` plugin
 (#9498)

Closes #9498
---
 plugins/drush/README.md        | 58 +++++++++++++++++++---------------
 plugins/drush/drush.plugin.zsh |  6 ++++
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/plugins/drush/README.md b/plugins/drush/README.md
index dfd1eaf82..29b429e3b 100644
--- a/plugins/drush/README.md
+++ b/plugins/drush/README.md
@@ -11,32 +11,38 @@ plugins=(... drush)
 
 ## Aliases
 
-| Alias   | Command                                                      | Description                                                           |
-| ------- | ------------------------------------------------------------ | --------------------------------------------------------------------- |
-| `dr`    | `drush`                                                      | Display drush help                                                    |
-| `drca`  | `drush cc all`                                               | _(Deprecated in Drush 8)_ Clear all drupal caches.                    |
-| `drcb`  | `drush cc block`                                             | _(Deprecated in Drush 8)_ Clear block cache.                          |
-| `drcg`  | `drush cc registry`                                          | _(Deprecated in Drush 8)_ Clear registry cache.                       |
-| `drcj`  | `drush cc css-js`                                            | Clear css-js cache.                                                   |
-| `drcm`  | `drush cc menu`                                              | Clear menu cache.                                                     |
-| `drcml` | `drush cc module-list`                                       | Clear module-list cache.                                              |
-| `drcr`  | `drush core-cron`                                            | Run all cron hooks in all active modules for specified site.          |
-| `drct`  | `drush cc theme-registry`                                    | Clear theme-registry cache.                                           |
-| `drcv`  | `drush cc views`                                             | Clear views cache. (Make sure that the views module is enabled)       |
-| `drdmp` | `drush drush sql-dump --ordered-dump --result-file=dump.sql` | Backup database in a new dump.sql file                                |
-| `drf`   | `drush features`                                             | Display features status                                               |
-| `drfr`  | `drush features-revert -y`                                   | Revert a feature module on your site.                                 |
-| `drfra` | `drush features-revert-all`                                  | Revert all enabled feature module on your site.                       |
-| `drfu`  | `drush features-update -y`                                   | Update a feature module on your site.                                 |
-| `drif`  | `drush image-flush --all`                                    | Flush all derived images.                                             |
-| `drpm`  | `drush pm-list --type=module`                                | Show a list of available modules.                                     |
-| `drst`  | `drush core-status`                                          | Provides a birds-eye view of the current Drupal installation, if any. |
-| `drup`  | `drush updatedb`                                             | Apply any database updates required (as with running update.php).     |
-| `drups` | `drush updatedb-status`                                      | List any pending database updates.                                    |
-| `drv`   | `drush version`                                              | Show drush version.                                                   |
-| `drvd`  | `drush variable-del`                                         | Delete a variable.                                                    |
-| `drvg`  | `drush variable-get`                                         | Get a list of some or all site variables and values.                  |
-| `drvs`  | `drush variable-set`                                         | Set a variable.                                                       |
+| Alias   | Command                                                     | Description                                                          |
+| ------- | ----------------------------------------------------------- | -------------------------------------------------------------------- |
+| `dr`    | `drush`                                                     | Display drush help                                                   |
+| `drca`  | `drush cc all`                                              | _(Deprecated in Drush 8)_ Clear all drupal caches                    |
+| `drcb`  | `drush cc block`                                            | _(Deprecated in Drush 8)_ Clear block cache                          |
+| `drcex` | `drush config:export -y`                                    | Export Drupal configuration to a directory                           |
+| `drcg`  | `drush cc registry`                                         | _(Deprecated in Drush 8)_ Clear registry cache                       |
+| `drcim` | `drush config:import -y`                                    | Import config from a config directory                                |
+| `drcj`  | `drush cc css-js`                                           | Clear css-js cache                                                   |
+| `drcm`  | `drush cc menu`                                             | Clear menu cache                                                     |
+| `drcml` | `drush cc module-list`                                      | Clear module-list cache                                              |
+| `drcr`  | `drush core-cron`                                           | Run all cron hooks in all active modules for specified site          |
+| `drct`  | `drush cc theme-registry`                                   | Clear theme-registry cache                                           |
+| `drcv`  | `drush cc views`                                            | Clear views cache _(make sure that the views module is enabled)_     |
+| `drdmp` | `drush drush sql-dump --ordered-dump --result-file=dumpsql` | Backup database in a new dump.sql file                               |
+| `drf`   | `drush features`                                            | Display features status                                              |
+| `drfr`  | `drush features-revert -y`                                  | Revert a feature module on your site                                 |
+| `drfra` | `drush features-revert-all`                                 | Revert all enabled feature module on your site                       |
+| `drfu`  | `drush features-update -y`                                  | Update a feature module on your site                                 |
+| `drif`  | `drush image-flush --all`                                   | Flush all derived images                                             |
+| `drpm`  | `drush pm-list --type=module`                               | Show a list of available modules                                     |
+| `drst`  | `drush core-status`                                         | Provides a birds-eye view of the current Drupal installation, if any |
+| `druli` | `drush user:login`                                          | Display a one time login link for user ID 1, or another user         |
+| `drup`  | `drush updatedb`                                            | Apply any database updates required (as with running update.php)     |
+| `drups` | `drush updatedb-status`                                     | List any pending database updates                                    |
+| `drv`   | `drush version`                                             | Show drush version                                                   |
+| `drvd`  | `drush variable-del`                                        | Delete a variable                                                    |
+| `drvg`  | `drush variable-get`                                        | Get a list of some or all site variables and values                  |
+| `drvs`  | `drush variable-set`                                        | Set a variable                                                       |
+| `drws`  | `drush watchdog:show`                                       | Show watchdog messages                                               |
+| `drwse` | `drush watchdog:show --extended`                            | Show watchdog messages with extended information                     |
+| `drwst` | `drush watchdog:tail`                                       | Tail watchdog messages                                              |
 
 ## Functions
 
diff --git a/plugins/drush/drush.plugin.zsh b/plugins/drush/drush.plugin.zsh
index fbf9656e6..48e8ddb1e 100644
--- a/plugins/drush/drush.plugin.zsh
+++ b/plugins/drush/drush.plugin.zsh
@@ -73,7 +73,9 @@ function drnew() {
 alias dr="drush"
 alias drca="drush cc all" # Deprecated for Drush 8
 alias drcb="drush cc block" # Deprecated for Drush 8
+alias drcex="drush config:export -y"
 alias drcg="drush cc registry" # Deprecated for Drush 8
+alias drcim="drush config:import -y"
 alias drcj="drush cc css-js"
 alias drcm="drush cc menu"
 alias drcml="drush cc module-list"
@@ -88,12 +90,16 @@ alias drfu="drush features-update -y"
 alias drif="drush image-flush --all"
 alias drpm="drush pm-list --type=module"
 alias drst="drush core-status"
+alias druli="drush user:login"
 alias drup="drush updatedb"
 alias drups="drush updatedb-status"
 alias drv="drush version"
 alias drvd="drush variable-del"
 alias drvg="drush variable-get"
 alias drvs="drush variable-set"
+alias drws="drush watchdog:show"
+alias drwse="drush watchdog:show --extended"
+alias drwst="drush watchdog:tail"
 
 # Enable drush autocomplete support
 autoload bashcompinit

From 02d8cf6e9a1123b9c0b47c6d051a8c70c392f635 Mon Sep 17 00:00:00 2001
From: t-sauer <t-sauer@outlook.de>
Date: Sun, 26 Feb 2017 16:58:57 +0100
Subject: [PATCH 351/591] feat(ember-cli): add completions for ember-cli
 (#5916)

Closes #5916
---
 plugins/ember-cli/README.md            |  45 +++---
 plugins/ember-cli/_ember-cli           | 189 +++++++++++++++++++++++++
 plugins/ember-cli/ember-cli.plugin.zsh |   9 +-
 3 files changed, 219 insertions(+), 24 deletions(-)
 create mode 100644 plugins/ember-cli/_ember-cli

diff --git a/plugins/ember-cli/README.md b/plugins/ember-cli/README.md
index b46373619..419704ade 100644
--- a/plugins/ember-cli/README.md
+++ b/plugins/ember-cli/README.md
@@ -1,22 +1,33 @@
 # Ember CLI
 
-**Maintainers:** [BilalBudhani](https://github.com/BilalBudhani), [eubenesa](https://github.com/eubenesa), [scottkidder](https://github.com/scottkidder]
+This plugin adds completion and aliases for using [`ember-cli`](https://cli.emberjs.com/).
 
-Ember CLI (https://www.ember-cli.com/)
+To use it, add `ember-cli` to the plugins array in your zshrc file:
 
-### List of Aliases
+```zsh
+plugins=(... ember-cli)
+```
 
-Alias | Ember-CLI command
------ | -----------------
-**es** | *ember serve*
-**ea** | *ember addon*
-**eb** | *ember build*
-**ed** | *ember destroy*
-**eg** | *ember generate*
-**eh** | *ember help*
-**ein** | *ember init*
-**ei** | *ember install*
-**et** | *ember test*
-**ets** | *ember test --serve*
-**eu** | *ember update*
-**ev** | *ember version*
+## Aliases
+
+| Alias | Command              |
+| ----- | -------------------- |
+| `ea`  | `ember addon`        |
+| `eb`  | `ember build`        |
+| `ed`  | `ember destroy`      |
+| `eg`  | `ember generate`     |
+| `eh`  | `ember help`         |
+| `ei`  | `ember install`      |
+| `ein` | `ember init`         |
+| `es`  | `ember serve`        |
+| `et`  | `ember test`         |
+| `ets` | `ember test --serve` |
+| `eu`  | `ember update`       |
+| `ev`  | `ember version`      |
+
+## Maintainers
+
+- [BilalBudhani](https://github.com/BilalBudhani)
+- [eubenesa](https://github.com/eubenesa)
+- [scottkidder](https://github.com/scottkidder]
+- [t-sauer](https://www.github.com/t-sauer)
diff --git a/plugins/ember-cli/_ember-cli b/plugins/ember-cli/_ember-cli
new file mode 100644
index 000000000..41c3c1fd4
--- /dev/null
+++ b/plugins/ember-cli/_ember-cli
@@ -0,0 +1,189 @@
+#compdef ember
+
+local curcontext="$curcontext" state line ret=1
+
+_arguments -C -A "--version" -A "--help" \
+  '(- 1 *)--help' \
+  '(- 1 *)--version' \
+  '1: :->cmds' \
+  '*:: :->args' && ret=0
+
+case $state in
+  cmds)
+    _values "ember command" \
+      "addon[Generates a new folder structure for building an addon, complete with test harness]" \
+      "asset-sizes[Shows the sizes of your asset files]" \
+      "build[Builds your app and places it into the output path (dist/ by default)]" \
+      "destroy[Destroys code generated by generate command]" \
+      "generate[Generates new code from blueprints]" \
+      "help[Outputs the usage instructions for all commands or the provided command]" \
+      "init[Creates a new ember-cli project in the current folder]" \
+      "install[Installs an ember-cli addon from npm]" \
+      "new[Creates a new directory and runs ember init in it]" \
+      "serve[Builds and serves your app, rebuilding on file changes]" \
+      "test[Runs your app's test suite]" \
+      "version[outputs ember-cli version]"
+    ret=0
+    ;;
+  args)
+    case $line[1] in
+      help)
+        _values 'commands' \
+          'addon' \
+          'asset-sizes' \
+          'build' \
+          'destroy' \
+          'generate' \
+          'help' \
+          'init' \
+          'install' \
+          'new' \
+          'serve' \
+          'test' \
+          'vesion' && ret=0
+        ;;
+      addon)
+        _arguments \
+          '(--blueprint)--blueprint=-' \
+          '(--directory)--directory=-' \
+          '(--dry-run)--dry-run' \
+          '(--skip-bower)--skip-bower' \
+          '(--skip-git)--skip-git' \
+          '(--skip-npm)--skip-npm' \
+          '(--verbose)--verbose'
+        ;;
+      asset-sizes)
+        _arguments \
+          '(--output-path)--output-path=-'
+        ;;
+      build)
+        _arguments \
+          '(--environment)--environment=-' \
+          '(--output-path)--output-path=-' \
+          '(--output-path)--suppress-sizes' \
+          '(--watch)--watch' \
+          '(--watcher)--watcher=-' \
+          '(-dev)-dev' \
+          '(-prod)-prod'
+        ;;
+      destroy|generate)
+        _values 'arguments' \
+          '(--classic)--classic' \
+          '(--dry-run)--dry-run' \
+          '(--dummy)--dummy' \
+          '(--in-repo-addon)--in-repo-addon-=' \
+          '(--pod)--pod' \
+          '(--verbose)--verbose' && ret=0
+        _values 'blueprints' \
+          'acceptance-test' \
+          'adapter' \
+          'adapter-test' \
+          'component' \
+          'component-addon' \
+          'component-test' \
+          'controller' \
+          'controller-test' \
+          'helper' \
+          'helper-addon' \
+          'helper-test' \
+          'initializer' \
+          'initializer-addon' \
+          'initializer-test' \
+          'instance-initializer' \
+          'instance-initializer-addon' \
+          'instance-initializer-test' \
+          'mixin' \
+          'mixin-test' \
+          'model' \
+          'model-test' \
+          'resource' \
+          'route' \
+          'route-addon' \
+          'route-test' \
+          'serializer' \
+          'serializer-test' \
+          'service' \
+          'service-test' \
+          'template' \
+          'test-helper' \
+          'transform' \
+          'transform-test' \
+          'util' \
+          'util-test' \
+          'view' \
+          'view-test' \
+          'addon' \
+          'addon-import' \
+          'app' \
+          'blueprint' \
+          'http-mock' \
+          'http-proxy' \
+          'in-repo-addon' \
+          'lib' \
+          'server' \
+          'vendor-shim' && ret=0
+        ;;
+      init)
+        _arguments \
+          '(--blueprint)--blueprint=-' \
+          '(--name)--name=-' \
+          '(--dry-run)--dry-run' \
+          '(--skip-bower)--skip-bower' \
+          '(--skip-npm)--skip-npm' \
+          '(--verbose)--verbose'
+        ;;
+      install)
+        _arguments \
+          '(--save-dev)--save-dev' \
+          '(--save)--save'
+        ;;
+      new)
+        _arguments \
+          '(--blueprint)--blueprint=-' \
+          '(--directory)--directory=-' \
+          '(--dry-run)--dry-run' \
+          '(--skip-bower)--skip-bower' \
+          '(--skip-git)--skip-git' \
+          '(--skip-npm)--skip-npm' \
+          '(--verbose)--verbose'
+        ;;
+      serve)
+        _arguments \
+          '(--port)--port=-[To use a port different than 4200. Pass 0 to automatically pick an available port.]' \
+          '(--host)--host=-[Listens on all interfaces by default]' \
+          '(--proxy)--proxy=-' \
+          '(--secure-proxy)--secure-proxy[Set to false to proxy self-signed SSL certificates]' \
+          '(--transparent-proxy)--transparent-proxy[Set to false to omit x-forwarded-* headers when proxying]' \
+          '(--watcher)--watcher=-' \
+          '(--live-reload)--live-reload' \
+          '(--live-reload-host)--live-reload-host=-[Defaults to host]' \
+          '(--live-reload-base-url)--live-reload-base-url=-[Defaults to baseURL]' \
+          '(--live-reload-port)--live-reload-port=-[Defaults to port number within \[49152...65535\]]' \
+          '(--environment)--environment=-' \
+          '(--output-path)--output-path=-' \
+          '(--ssl)--ssl' \
+          '(--ssl-key)--ssl-key=-' \
+          '(--ssl-cert)--ssl-cert=-'
+        ;;
+      test)
+        _arguments \
+          '(--environment)--environment=-' \
+          '(--config-file)--config-file=-' \
+          '(--server)--server' \
+          '(--host)--host=-' \
+          '(--test-port)--test-port=-[The test port to use when running with --server.]' \
+          '(--filter)--filter=-[A string to filter tests to run]' \
+          '(--module)--module=-[The name of a test module to run]' \
+          '(--watcher)--watcher=-' \
+          '(--launch)--launch=-[A comma separated list of browsers to launch for tests.]' \
+          '(--reporter)--reporter=-[Test reporter to use \[tap|dot|xunit\] (default: tap)]' \
+          '(--silent)--silent[Suppress any output except for the test report]' \
+          '(--test-page)--test-page=-[Test page to invoke]' \
+          '(--path)--path=-[Reuse an existing build at given path.]' \
+          '(--query)--query=-[A query string to append to the test page URL.]'
+        ;;
+    esac
+    ;;
+esac
+
+return ret
diff --git a/plugins/ember-cli/ember-cli.plugin.zsh b/plugins/ember-cli/ember-cli.plugin.zsh
index 67842c120..de46b9827 100644
--- a/plugins/ember-cli/ember-cli.plugin.zsh
+++ b/plugins/ember-cli/ember-cli.plugin.zsh
@@ -1,17 +1,12 @@
-# Ember CLI
-# Visit https://www.ember-cli.com/ to view user guide
-
-alias es='ember serve'
 alias ea='ember addon'
 alias eb='ember build'
 alias ed='ember destroy'
 alias eg='ember generate'
 alias eh='ember help'
-alias ein='ember init'
 alias ei='ember install'
+alias ein='ember init'
+alias es='ember serve'
 alias et='ember test'
 alias ets='ember test --serve'
 alias eu='ember update'
-
-# version
 alias ev='ember version'

From 0613232202b92349cee79804fc46e0495152ef12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9opold=20Mebazaa?= <lemeb@users.noreply.github.com>
Date: Fri, 9 Aug 2019 21:56:57 -0400
Subject: [PATCH 352/591] refactor(emoji): rewrite script w/ Python and update
 emojis (#8069)

Closes #8069
---
 plugins/emoji/README.md                  |    42 +-
 plugins/emoji/emoji-char-definitions.zsh |  7893 +++++++-
 plugins/emoji/emoji-data.txt             |  5424 ++++--
 plugins/emoji/emoji.plugin.zsh           |   225 +-
 plugins/emoji/gemoji_db.json             | 21538 +++++++++++++++++++++
 plugins/emoji/update_emoji.pl            |   113 -
 plugins/emoji/update_emoji.py            |   213 +
 7 files changed, 32840 insertions(+), 2608 deletions(-)
 create mode 100644 plugins/emoji/gemoji_db.json
 delete mode 100644 plugins/emoji/update_emoji.pl
 create mode 100644 plugins/emoji/update_emoji.py

diff --git a/plugins/emoji/README.md b/plugins/emoji/README.md
index 8b8860a86..4154ea0dc 100644
--- a/plugins/emoji/README.md
+++ b/plugins/emoji/README.md
@@ -10,7 +10,7 @@ This plugin provides support for working with Unicode emoji characters in `zsh`
 
 Variable          | Description
 ----------------- | --------------------------------
-  $emoji          | Maps emoji names to characters
+  $emoji          | Maps emoji names to characters (except flags)
   $emoji_flags    | Maps country names to flag characters (using region indicators)
   $emoji_groups   | Named groups of emoji. Keys are group names; values are whitespace-separated lists of character names
 
@@ -55,10 +55,8 @@ The defined group names can be found with `echo ${(k)emoji_groups}`.
 To list all available emoji with their names, use:
 ```
 $> display_emoji
-$> display_emoji fruits
-$> display_emoji animals
-$> display_emoji vehicles
 $> display_emoji faces
+$> display_emoji people
 ```
 
 To use emoji in a prompt:
@@ -73,13 +71,13 @@ PROMPT="$surfer  > "
 
 The emoji names and codes are sourced from Unicode Technical Report \#51, which provides information on emoji support in Unicode. It can be found at https://www.unicode.org/reports/tr51/index.html.
 
-The group definitions are added by this OMZ plugin. They are not based on external definitions. (As far as I can tell. -apjanke)
+The group definitions are added by this OMZ plugin. They are not based on external definitions.
 
 The values in the `$emoji*` maps are the emoji characters themselves, not escape sequences or other forms that require interpretation. They can be used in any context and do not require escape sequence support from commands like `echo` or `print`.
 
 The emoji in the main `$emoji` map are standalone character sequences which can all be output on their own, without worrying about combining characters. The values may actually be multi-code-point sequences, instead of a single code point, and may include combining characters in those sequences. But they're arranged so their effects do not extend beyond that sequence.
 
-The exception to this is the skin tone variation selectors. These are included in the main `$emoji` map because they can be displayed on their own, as well as used as combining characters. (If they follow a character that is not one of the emoji characters they combine with, they are displayed as color swatches.)
+The exception to this is the skin tone / hair style variation selectors. These are included in the main `$emoji` map because they can be displayed on their own, as well as used as combining characters. (If they follow a character that is not one of the emoji characters they combine with, they are displayed as color swatches.)
 
 
 ##  Experimental Features
@@ -90,7 +88,6 @@ Variables:
 
 Variable          | Description
 ----------------- | --------------------------------
-  $emoji2         | Auxiliary and combining characters
   $emoji_skintone | Skin tone modifiers (from Unicode 8.0)
 
 
@@ -105,31 +102,26 @@ The "variation selectors" are combining characters which change the appearance o
 The `$emoji_skintone` associative array maps skin tone IDs to the variation selector characters. To use one, output it immediately following a smiley or other human emoji.
 
 ```
-echo "$emoji[smiling_face_with_open_mouth]$emoji_skintone[4]"
+echo $emoji[waving_hand]$emoji_skintone[5]
 ```
 
 Note that `$emoji_skintone` is an associative array, and its keys are the *names* of "Fitzpatrick Skin Type" groups, not linear indexes into a normal array. The names are `1_2`, `3`, `4`, `5`, and `6`. (Types 1 and 2 are combined into a single color.) See the [Diversity section in Unicode TR 51](https://www.unicode.org/reports/tr51/index.html#Diversity) for details.
 
+####  Gemoji support
+
+The [gemoji project](https://github.com/github/gemoji) seems to be the de facto main source for short names and other emoji-related metadata that isn't included in the official Unicode reports. So, our list of emojis incorporates some of their aliases to make your life more convenient:
+
+```
+echo $emoji[grinning_face_with_smiling_eyes]
+echo $emoji[smile]
+```
+
+These two commands yield the same emoji (😄). The first name is the official one, in the Unicode reference, and the second one is the alias that was in Gemoji's database.
+
 ##  TODO
 
 These are things that could be enhanced in future revisions of the plugin.
 
 * Incorporate CLDR data for ordering and groupings
 * Short :bracket: style names (from gemoji)
-* Incorporate `gemoji` data
-* Country codes for flags
-* ZWJ combining function?
-
-####  Gemoji support
-
-The [gemoji project](https://github.com/github/gemoji) seems to be the de facto main source for short names and other emoji-related metadata that isn't included in the official Unicode reports. (I'm saying this just from looking at the google results for "emoji short names" and related searches. -apjanke)
-
-If this plugin is updated to provide short names, CLDR sorting data, and similar stuff, it should probably be changed to use the Gemoji project, and the `update_emoji.pl` script be rewritten in Ruby so it can use the Gemoji library directly instead of parsing its data files.
-
-This does *not* mean that it should use Gemoji at run time. None of the `zsh` plugin stuff should call Gemoji or Ruby code. Rather, the "build time" `update_emoji.pl` script should be rewritten to use Gemoji to generate a pure-native-`zsh` character definition file which would be checked in to the repo and can be called by OMZ users without having Gemoji installed.
-
-####  ZWJ combining function
-
-One of the newer features of Unicode emoji is the ability to use the "Zero-Width Joiner" character to compose multiple emoji characters in to a single "emoji ligature" glyph. For example, this is [how Apple supports "family" emoji with various genders and skin tones](https://www.unicode.org/reports/tr51/index.html#ZWJ_Sequences).
-
-These are a pain to write out (and probably worse to read), and it might be convenient to have a couple functions for concisely composing them, if wider support for them appears.
+* ZWJ combining function?
\ No newline at end of file
diff --git a/plugins/emoji/emoji-char-definitions.zsh b/plugins/emoji/emoji-char-definitions.zsh
index 04693da05..b37c142a1 100644
--- a/plugins/emoji/emoji-char-definitions.zsh
+++ b/plugins/emoji/emoji-char-definitions.zsh
@@ -1,11 +1,18 @@
 
-# emoji-char-definitions.zsh - Emoji character definitions for oh-my-zsh emoji plugin
+# emoji-char-definitions.zsh - Emoji definitions for oh-my-zsh emoji plugin
 #
-# This file is auto-generated by update_emoji.pl. Do not edit it manually.
+# This file is auto-generated by update_emoji.py. Do not edit it manually.
 #
 # This contains the definition for:
 #   $emoji         - which maps character names to Unicode characters
-#   $emoji_flags   - maps country names to Unicode flag characters using region indicators 
+#   $emoji_flags   - maps country names to Unicode flag characters using region
+#                    indicators
+#   $emoji_mod     - maps modifier components to Unicode characters
+#   $emoji_groups  - a single associative array to avoid cluttering up the
+#                    global namespace, and to allow adding additional group
+#                    definitions at run time. The keys are the group names, and
+#                    the values are whitespace-separated lists of emoji
+#                    character names.
 
 # Main emoji
 typeset -gAH emoji
@@ -13,938 +20,3102 @@ typeset -gAH emoji
 typeset -gAH emoji_flags
 # Combining modifiers
 typeset -gAH emoji_mod
-
-emoji[copyright_sign]=$'\U00A9'
-emoji[registered_sign]=$'\U00AE'
-emoji[double_exclamation_mark]=$'\U203C'
-emoji[exclamation_question_mark]=$'\U2049'
-emoji[trade_mark_sign]=$'\U2122'
-emoji[information_source]=$'\U2139'
-emoji[left_right_arrow]=$'\U2194'
-emoji[up_down_arrow]=$'\U2195'
-emoji[north_west_arrow]=$'\U2196'
-emoji[north_east_arrow]=$'\U2197'
-emoji[south_east_arrow]=$'\U2198'
-emoji[south_west_arrow]=$'\U2199'
-emoji[leftwards_arrow_with_hook]=$'\U21A9'
-emoji[rightwards_arrow_with_hook]=$'\U21AA'
-emoji[watch]=$'\U231A'
-emoji[hourglass]=$'\U231B'
-emoji[keyboard]=$'\U2328'
-emoji[eject_symbol]=$'\U23CF'
-emoji[black_right_pointing_double_triangle]=$'\U23E9'
-emoji[black_left_pointing_double_triangle]=$'\U23EA'
-emoji[black_up_pointing_double_triangle]=$'\U23EB'
-emoji[black_down_pointing_double_triangle]=$'\U23EC'
-emoji[black_right_pointing_double_triangle_with_vertical_bar]=$'\U23ED'
-emoji[black_left_pointing_double_triangle_with_vertical_bar]=$'\U23EE'
-emoji[black_right_pointing_triangle_with_double_vertical_bar]=$'\U23EF'
-emoji[alarm_clock]=$'\U23F0'
-emoji[stopwatch]=$'\U23F1'
-emoji[timer_clock]=$'\U23F2'
-emoji[hourglass_with_flowing_sand]=$'\U23F3'
-emoji[double_vertical_bar]=$'\U23F8'
-emoji[black_square_for_stop]=$'\U23F9'
-emoji[black_circle_for_record]=$'\U23FA'
-emoji[circled_latin_capital_letter_m]=$'\U24C2'
-emoji[black_small_square]=$'\U25AA'
-emoji[white_small_square]=$'\U25AB'
-emoji[black_right_pointing_triangle]=$'\U25B6'
-emoji[black_left_pointing_triangle]=$'\U25C0'
-emoji[white_medium_square]=$'\U25FB'
-emoji[black_medium_square]=$'\U25FC'
-emoji[white_medium_small_square]=$'\U25FD'
-emoji[black_medium_small_square]=$'\U25FE'
-emoji[black_sun_with_rays]=$'\U2600'
-emoji[cloud]=$'\U2601'
-emoji[umbrella]=$'\U2602'
-emoji[snowman]=$'\U2603'
-emoji[comet]=$'\U2604'
-emoji[black_telephone]=$'\U260E'
-emoji[ballot_box_with_check]=$'\U2611'
-emoji[umbrella_with_rain_drops]=$'\U2614'
-emoji[hot_beverage]=$'\U2615'
-emoji[shamrock]=$'\U2618'
-emoji[white_up_pointing_index]=$'\U261D'
-emoji[skull_and_crossbones]=$'\U2620'
-emoji[radioactive_sign]=$'\U2622'
-emoji[biohazard_sign]=$'\U2623'
-emoji[orthodox_cross]=$'\U2626'
-emoji[star_and_crescent]=$'\U262A'
-emoji[peace_symbol]=$'\U262E'
-emoji[yin_yang]=$'\U262F'
-emoji[wheel_of_dharma]=$'\U2638'
-emoji[white_frowning_face]=$'\U2639'
-emoji[white_smiling_face]=$'\U263A'
-emoji[aries]=$'\U2648'
-emoji[taurus]=$'\U2649'
-emoji[gemini]=$'\U264A'
-emoji[cancer]=$'\U264B'
-emoji[leo]=$'\U264C'
-emoji[virgo]=$'\U264D'
-emoji[libra]=$'\U264E'
-emoji[scorpius]=$'\U264F'
-emoji[sagittarius]=$'\U2650'
-emoji[capricorn]=$'\U2651'
-emoji[aquarius]=$'\U2652'
-emoji[pisces]=$'\U2653'
-emoji[black_spade_suit]=$'\U2660'
-emoji[black_club_suit]=$'\U2663'
-emoji[black_heart_suit]=$'\U2665'
-emoji[black_diamond_suit]=$'\U2666'
-emoji[hot_springs]=$'\U2668'
-emoji[black_universal_recycling_symbol]=$'\U267B'
-emoji[wheelchair_symbol]=$'\U267F'
-emoji[hammer_and_pick]=$'\U2692'
-emoji[anchor]=$'\U2693'
-emoji[crossed_swords]=$'\U2694'
-emoji[scales]=$'\U2696'
-emoji[alembic]=$'\U2697'
-emoji[gear]=$'\U2699'
-emoji[atom_symbol]=$'\U269B'
-emoji[fleur_de_lis]=$'\U269C'
-emoji[warning_sign]=$'\U26A0'
-emoji[high_voltage_sign]=$'\U26A1'
-emoji[medium_white_circle]=$'\U26AA'
-emoji[medium_black_circle]=$'\U26AB'
-emoji[coffin]=$'\U26B0'
-emoji[funeral_urn]=$'\U26B1'
-emoji[soccer_ball]=$'\U26BD'
-emoji[baseball]=$'\U26BE'
-emoji[snowman_without_snow]=$'\U26C4'
-emoji[sun_behind_cloud]=$'\U26C5'
-emoji[thunder_cloud_and_rain]=$'\U26C8'
-emoji[ophiuchus]=$'\U26CE'
-emoji[pick]=$'\U26CF'
-emoji[helmet_with_white_cross]=$'\U26D1'
-emoji[chains]=$'\U26D3'
-emoji[no_entry]=$'\U26D4'
-emoji[shinto_shrine]=$'\U26E9'
-emoji[church]=$'\U26EA'
-emoji[mountain]=$'\U26F0'
-emoji[umbrella_on_ground]=$'\U26F1'
-emoji[fountain]=$'\U26F2'
-emoji[flag_in_hole]=$'\U26F3'
-emoji[ferry]=$'\U26F4'
-emoji[sailboat]=$'\U26F5'
-emoji[skier]=$'\U26F7'
-emoji[ice_skate]=$'\U26F8'
-emoji[person_with_ball]=$'\U26F9'
-emoji[tent]=$'\U26FA'
-emoji[fuel_pump]=$'\U26FD'
-emoji[black_scissors]=$'\U2702'
-emoji[white_heavy_check_mark]=$'\U2705'
-emoji[airplane]=$'\U2708'
-emoji[envelope]=$'\U2709'
-emoji[raised_fist]=$'\U270A'
+# Emoji groups
+typeset -gAH emoji_groups
+emoji[grinning_face]=$'\U1F600'
+emoji[grinning]=$'\U1F600'
+emoji[grinning_face_with_big_eyes]=$'\U1F603'
+emoji[smiley]=$'\U1F603'
+emoji[grinning_face_with_smiling_eyes]=$'\U1F604'
+emoji[smile]=$'\U1F604'
+emoji[beaming_face_with_smiling_eyes]=$'\U1F601'
+emoji[grin]=$'\U1F601'
+emoji[grinning_squinting_face]=$'\U1F606'
+emoji[laughing]=$'\U1F606'
+emoji[satisfied]=$'\U1F606'
+emoji[grinning_face_with_sweat]=$'\U1F605'
+emoji[sweat_smile]=$'\U1F605'
+emoji[rolling_on_the_floor_laughing]=$'\U1F923'
+emoji[rofl]=$'\U1F923'
+emoji[face_with_tears_of_joy]=$'\U1F602'
+emoji[joy]=$'\U1F602'
+emoji[slightly_smiling_face]=$'\U1F642'
+emoji[upside_down_face]=$'\U1F643'
+emoji[winking_face]=$'\U1F609'
+emoji[wink]=$'\U1F609'
+emoji[smiling_face_with_smiling_eyes]=$'\U1F60A'
+emoji[blush]=$'\U1F60A'
+emoji[smiling_face_with_halo]=$'\U1F607'
+emoji[innocent]=$'\U1F607'
+emoji[smiling_face_with_hearts]=$'\U1F970'
+emoji[smiling_face_with_three_hearts]=$'\U1F970'
+emoji[smiling_face_with_heart_eyes]=$'\U1F60D'
+emoji[heart_eyes]=$'\U1F60D'
+emoji[star_struck]=$'\U1F929'
+emoji[face_blowing_a_kiss]=$'\U1F618'
+emoji[kissing_heart]=$'\U1F618'
+emoji[kissing_face]=$'\U1F617'
+emoji[kissing]=$'\U1F617'
+emoji[smiling_face]=$'\U263A\UFE0F'
+emoji[relaxed]=$'\U263A\UFE0F'
+emoji[smiling_face_unqualified]=$'\U263A'
+emoji[kissing_face_with_closed_eyes]=$'\U1F61A'
+emoji[kissing_closed_eyes]=$'\U1F61A'
+emoji[kissing_face_with_smiling_eyes]=$'\U1F619'
+emoji[kissing_smiling_eyes]=$'\U1F619'
+emoji[face_savoring_food]=$'\U1F60B'
+emoji[yum]=$'\U1F60B'
+emoji[face_with_tongue]=$'\U1F61B'
+emoji[stuck_out_tongue]=$'\U1F61B'
+emoji[winking_face_with_tongue]=$'\U1F61C'
+emoji[stuck_out_tongue_winking_eye]=$'\U1F61C'
+emoji[zany_face]=$'\U1F92A'
+emoji[squinting_face_with_tongue]=$'\U1F61D'
+emoji[stuck_out_tongue_closed_eyes]=$'\U1F61D'
+emoji[money_mouth_face]=$'\U1F911'
+emoji[hugging_face]=$'\U1F917'
+emoji[hugs]=$'\U1F917'
+emoji[face_with_hand_over_mouth]=$'\U1F92D'
+emoji[hand_over_mouth]=$'\U1F92D'
+emoji[shushing_face]=$'\U1F92B'
+emoji[thinking_face]=$'\U1F914'
+emoji[thinking]=$'\U1F914'
+emoji[zipper_mouth_face]=$'\U1F910'
+emoji[face_with_raised_eyebrow]=$'\U1F928'
+emoji[raised_eyebrow]=$'\U1F928'
+emoji[neutral_face]=$'\U1F610'
+emoji[expressionless_face]=$'\U1F611'
+emoji[expressionless]=$'\U1F611'
+emoji[face_without_mouth]=$'\U1F636'
+emoji[no_mouth]=$'\U1F636'
+emoji[smirking_face]=$'\U1F60F'
+emoji[smirk]=$'\U1F60F'
+emoji[unamused_face]=$'\U1F612'
+emoji[unamused]=$'\U1F612'
+emoji[face_with_rolling_eyes]=$'\U1F644'
+emoji[roll_eyes]=$'\U1F644'
+emoji[grimacing_face]=$'\U1F62C'
+emoji[grimacing]=$'\U1F62C'
+emoji[lying_face]=$'\U1F925'
+emoji[relieved_face]=$'\U1F60C'
+emoji[relieved]=$'\U1F60C'
+emoji[pensive_face]=$'\U1F614'
+emoji[pensive]=$'\U1F614'
+emoji[sleepy_face]=$'\U1F62A'
+emoji[sleepy]=$'\U1F62A'
+emoji[drooling_face]=$'\U1F924'
+emoji[sleeping_face]=$'\U1F634'
+emoji[sleeping]=$'\U1F634'
+emoji[face_with_medical_mask]=$'\U1F637'
+emoji[mask]=$'\U1F637'
+emoji[face_with_thermometer]=$'\U1F912'
+emoji[face_with_head_bandage]=$'\U1F915'
+emoji[nauseated_face]=$'\U1F922'
+emoji[face_vomiting]=$'\U1F92E'
+emoji[vomiting_face]=$'\U1F92E'
+emoji[sneezing_face]=$'\U1F927'
+emoji[hot_face]=$'\U1F975'
+emoji[cold_face]=$'\U1F976'
+emoji[woozy_face]=$'\U1F974'
+emoji[dizzy_face]=$'\U1F635'
+emoji[exploding_head]=$'\U1F92F'
+emoji[cowboy_hat_face]=$'\U1F920'
+emoji[partying_face]=$'\U1F973'
+emoji[smiling_face_with_sunglasses]=$'\U1F60E'
+emoji[nerd_face]=$'\U1F913'
+emoji[face_with_monocle]=$'\U1F9D0'
+emoji[monocle_face]=$'\U1F9D0'
+emoji[confused_face]=$'\U1F615'
+emoji[confused]=$'\U1F615'
+emoji[worried_face]=$'\U1F61F'
+emoji[worried]=$'\U1F61F'
+emoji[slightly_frowning_face]=$'\U1F641'
+emoji[slightly_frowning_face_1]=$'\U2639\UFE0F'
+emoji[frowning_face_unqualified]=$'\U2639'
+emoji[frowning_face]=$'\U2639'
+emoji[face_with_open_mouth]=$'\U1F62E'
+emoji[open_mouth]=$'\U1F62E'
+emoji[hushed_face]=$'\U1F62F'
+emoji[hushed]=$'\U1F62F'
+emoji[astonished_face]=$'\U1F632'
+emoji[astonished]=$'\U1F632'
+emoji[flushed_face]=$'\U1F633'
+emoji[flushed]=$'\U1F633'
+emoji[pleading_face]=$'\U1F97A'
+emoji[frowning_face_with_open_mouth]=$'\U1F626'
+emoji[frowning]=$'\U1F626'
+emoji[anguished_face]=$'\U1F627'
+emoji[anguished]=$'\U1F627'
+emoji[fearful_face]=$'\U1F628'
+emoji[fearful]=$'\U1F628'
+emoji[anxious_face_with_sweat]=$'\U1F630'
+emoji[cold_sweat]=$'\U1F630'
+emoji[sad_but_relieved_face]=$'\U1F625'
+emoji[disappointed_relieved]=$'\U1F625'
+emoji[crying_face]=$'\U1F622'
+emoji[cry]=$'\U1F622'
+emoji[loudly_crying_face]=$'\U1F62D'
+emoji[sob]=$'\U1F62D'
+emoji[face_screaming_in_fear]=$'\U1F631'
+emoji[scream]=$'\U1F631'
+emoji[confounded_face]=$'\U1F616'
+emoji[confounded]=$'\U1F616'
+emoji[persevering_face]=$'\U1F623'
+emoji[persevere]=$'\U1F623'
+emoji[disappointed_face]=$'\U1F61E'
+emoji[disappointed]=$'\U1F61E'
+emoji[downcast_face_with_sweat]=$'\U1F613'
+emoji[sweat]=$'\U1F613'
+emoji[weary_face]=$'\U1F629'
+emoji[weary]=$'\U1F629'
+emoji[tired_face]=$'\U1F62B'
+emoji[yawning_face]=$'\U1F971'
+emoji[face_with_steam_from_nose]=$'\U1F624'
+emoji[triumph]=$'\U1F624'
+emoji[pouting_face]=$'\U1F621'
+emoji[rage]=$'\U1F621'
+emoji[pout]=$'\U1F621'
+emoji[angry_face]=$'\U1F620'
+emoji[angry]=$'\U1F620'
+emoji[face_with_symbols_on_mouth]=$'\U1F92C'
+emoji[cursing_face]=$'\U1F92C'
+emoji[smiling_face_with_horns]=$'\U1F608'
+emoji[smiling_imp]=$'\U1F608'
+emoji[angry_face_with_horns]=$'\U1F47F'
+emoji[imp]=$'\U1F47F'
+emoji[skull]=$'\U1F480'
+emoji[skull_and_crossbones]=$'\U2620\UFE0F'
+emoji[skull_and_crossbones_unqualified]=$'\U2620'
+emoji[pile_of_poo]=$'\U1F4A9'
+emoji[hankey]=$'\U1F4A9'
+emoji[poop]=$'\U1F4A9'
+emoji[shit]=$'\U1F4A9'
+emoji[clown_face]=$'\U1F921'
+emoji[ogre]=$'\U1F479'
+emoji[japanese_ogre]=$'\U1F479'
+emoji[goblin]=$'\U1F47A'
+emoji[japanese_goblin]=$'\U1F47A'
+emoji[ghost]=$'\U1F47B'
+emoji[alien]=$'\U1F47D'
+emoji[alien_monster]=$'\U1F47E'
+emoji[space_invader]=$'\U1F47E'
+emoji[robot]=$'\U1F916'
+emoji[grinning_cat]=$'\U1F63A'
+emoji[smiley_cat]=$'\U1F63A'
+emoji[grinning_cat_with_smiling_eyes]=$'\U1F638'
+emoji[smile_cat]=$'\U1F638'
+emoji[cat_with_tears_of_joy]=$'\U1F639'
+emoji[joy_cat]=$'\U1F639'
+emoji[smiling_cat_with_heart_eyes]=$'\U1F63B'
+emoji[heart_eyes_cat]=$'\U1F63B'
+emoji[cat_with_wry_smile]=$'\U1F63C'
+emoji[smirk_cat]=$'\U1F63C'
+emoji[kissing_cat]=$'\U1F63D'
+emoji[weary_cat]=$'\U1F640'
+emoji[scream_cat]=$'\U1F640'
+emoji[crying_cat]=$'\U1F63F'
+emoji[crying_cat_face]=$'\U1F63F'
+emoji[pouting_cat]=$'\U1F63E'
+emoji[see_no_evil_monkey]=$'\U1F648'
+emoji[see_no_evil]=$'\U1F648'
+emoji[hear_no_evil_monkey]=$'\U1F649'
+emoji[hear_no_evil]=$'\U1F649'
+emoji[speak_no_evil_monkey]=$'\U1F64A'
+emoji[speak_no_evil]=$'\U1F64A'
+emoji[kiss_mark]=$'\U1F48B'
+emoji[love_letter]=$'\U1F48C'
+emoji[heart_with_arrow]=$'\U1F498'
+emoji[cupid]=$'\U1F498'
+emoji[heart_with_ribbon]=$'\U1F49D'
+emoji[gift_heart]=$'\U1F49D'
+emoji[sparkling_heart]=$'\U1F496'
+emoji[growing_heart]=$'\U1F497'
+emoji[heartpulse]=$'\U1F497'
+emoji[beating_heart]=$'\U1F493'
+emoji[heartbeat]=$'\U1F493'
+emoji[revolving_hearts]=$'\U1F49E'
+emoji[two_hearts]=$'\U1F495'
+emoji[heart_decoration]=$'\U1F49F'
+emoji[heart_exclamation]=$'\U2763\UFE0F'
+emoji[heavy_heart_exclamation]=$'\U2763\UFE0F'
+emoji[heart_exclamation_unqualified]=$'\U2763'
+emoji[broken_heart]=$'\U1F494'
+emoji[red_heart]=$'\U2764\UFE0F'
+emoji[heart]=$'\U2764\UFE0F'
+emoji[red_heart_unqualified]=$'\U2764'
+emoji[orange_heart]=$'\U1F9E1'
+emoji[yellow_heart]=$'\U1F49B'
+emoji[green_heart]=$'\U1F49A'
+emoji[blue_heart]=$'\U1F499'
+emoji[purple_heart]=$'\U1F49C'
+emoji[brown_heart]=$'\U1F90E'
+emoji[black_heart]=$'\U1F5A4'
+emoji[white_heart]=$'\U1F90D'
+emoji[hundred_points]=$'\U1F4AF'
+emoji[100]=$'\U1F4AF'
+emoji[anger_symbol]=$'\U1F4A2'
+emoji[anger]=$'\U1F4A2'
+emoji[collision]=$'\U1F4A5'
+emoji[boom]=$'\U1F4A5'
+emoji[dizzy]=$'\U1F4AB'
+emoji[sweat_droplets]=$'\U1F4A6'
+emoji[sweat_drops]=$'\U1F4A6'
+emoji[dashing_away]=$'\U1F4A8'
+emoji[dash]=$'\U1F4A8'
+emoji[hole]=$'\U1F573\UFE0F'
+emoji[hole_unqualified]=$'\U1F573'
+emoji[bomb]=$'\U1F4A3'
+emoji[speech_balloon]=$'\U1F4AC'
+emoji[eye_in_speech_bubble]=$'\U1F441\UFE0F\U200D\U1F5E8\UFE0F'
+emoji[eye_speech_bubble]=$'\U1F441\UFE0F\U200D\U1F5E8\UFE0F'
+emoji[eye_in_speech_bubble_unqualified]=$'\U1F441\U200D\U1F5E8\UFE0F'
+emoji[eye_in_speech_bubble_unqualified_1]=$'\U1F441\UFE0F\U200D\U1F5E8'
+emoji[eye_in_speech_bubble_unqualified_2]=$'\U1F441\U200D\U1F5E8'
+emoji[left_speech_bubble]=$'\U1F5E8\UFE0F'
+emoji[left_speech_bubble_unqualified]=$'\U1F5E8'
+emoji[right_anger_bubble]=$'\U1F5EF\UFE0F'
+emoji[right_anger_bubble_unqualified]=$'\U1F5EF'
+emoji[thought_balloon]=$'\U1F4AD'
+emoji[zzz]=$'\U1F4A4'
+emoji[waving_hand]=$'\U1F44B'
+emoji[wave]=$'\U1F44B'
+emoji[waving_hand_light_skin_tone]=$'\U1F44B\U1F3FB'
+emoji[waving_hand_medium_light_skin_tone]=$'\U1F44B\U1F3FC'
+emoji[waving_hand_medium_skin_tone]=$'\U1F44B\U1F3FD'
+emoji[waving_hand_medium_dark_skin_tone]=$'\U1F44B\U1F3FE'
+emoji[waving_hand_dark_skin_tone]=$'\U1F44B\U1F3FF'
+emoji[raised_back_of_hand]=$'\U1F91A'
+emoji[raised_back_of_hand_light_skin_tone]=$'\U1F91A\U1F3FB'
+emoji[raised_back_of_hand_medium_light_skin_tone]=$'\U1F91A\U1F3FC'
+emoji[raised_back_of_hand_medium_skin_tone]=$'\U1F91A\U1F3FD'
+emoji[raised_back_of_hand_medium_dark_skin_tone]=$'\U1F91A\U1F3FE'
+emoji[raised_back_of_hand_dark_skin_tone]=$'\U1F91A\U1F3FF'
+emoji[hand_with_fingers_splayed]=$'\U1F590\UFE0F'
+emoji[hand_with_fingers_splayed_unqualified]=$'\U1F590'
+emoji[raised_hand_with_fingers_splayed]=$'\U1F590'
+emoji[hand_with_fingers_splayed_light_skin_tone]=$'\U1F590\U1F3FB'
+emoji[hand_with_fingers_splayed_medium_light_skin_tone]=$'\U1F590\U1F3FC'
+emoji[hand_with_fingers_splayed_medium_skin_tone]=$'\U1F590\U1F3FD'
+emoji[hand_with_fingers_splayed_medium_dark_skin_tone]=$'\U1F590\U1F3FE'
+emoji[hand_with_fingers_splayed_dark_skin_tone]=$'\U1F590\U1F3FF'
 emoji[raised_hand]=$'\U270B'
-emoji[victory_hand]=$'\U270C'
-emoji[writing_hand]=$'\U270D'
-emoji[pencil]=$'\U270F'
-emoji[black_nib]=$'\U2712'
-emoji[heavy_check_mark]=$'\U2714'
-emoji[heavy_multiplication_x]=$'\U2716'
-emoji[latin_cross]=$'\U271D'
-emoji[star_of_david]=$'\U2721'
-emoji[sparkles]=$'\U2728'
-emoji[eight_spoked_asterisk]=$'\U2733'
-emoji[eight_pointed_black_star]=$'\U2734'
-emoji[snowflake]=$'\U2744'
-emoji[sparkle]=$'\U2747'
-emoji[cross_mark]=$'\U274C'
-emoji[negative_squared_cross_mark]=$'\U274E'
-emoji[black_question_mark_ornament]=$'\U2753'
-emoji[white_question_mark_ornament]=$'\U2754'
-emoji[white_exclamation_mark_ornament]=$'\U2755'
-emoji[heavy_exclamation_mark_symbol]=$'\U2757'
-emoji[heavy_heart_exclamation_mark_ornament]=$'\U2763'
-emoji[heavy_black_heart]=$'\U2764'
-emoji[heavy_plus_sign]=$'\U2795'
-emoji[heavy_minus_sign]=$'\U2796'
-emoji[heavy_division_sign]=$'\U2797'
-emoji[black_rightwards_arrow]=$'\U27A1'
-emoji[curly_loop]=$'\U27B0'
-emoji[double_curly_loop]=$'\U27BF'
-emoji[arrow_pointing_rightwards_then_curving_upwards]=$'\U2934'
-emoji[arrow_pointing_rightwards_then_curving_downwards]=$'\U2935'
-emoji[leftwards_black_arrow]=$'\U2B05'
-emoji[upwards_black_arrow]=$'\U2B06'
-emoji[downwards_black_arrow]=$'\U2B07'
-emoji[black_large_square]=$'\U2B1B'
-emoji[white_large_square]=$'\U2B1C'
-emoji[white_medium_star]=$'\U2B50'
-emoji[heavy_large_circle]=$'\U2B55'
-emoji[wavy_dash]=$'\U3030'
-emoji[part_alternation_mark]=$'\U303D'
-emoji[circled_ideograph_congratulation]=$'\U3297'
-emoji[circled_ideograph_secret]=$'\U3299'
-emoji[mahjong_tile_red_dragon]=$'\U1F004'
-emoji[playing_card_black_joker]=$'\U1F0CF'
-emoji[negative_squared_latin_capital_letter_a]=$'\U1F170'
-emoji[negative_squared_latin_capital_letter_b]=$'\U1F171'
-emoji[negative_squared_latin_capital_letter_o]=$'\U1F17E'
-emoji[negative_squared_latin_capital_letter_p]=$'\U1F17F'
-emoji[negative_squared_ab]=$'\U1F18E'
-emoji[squared_cl]=$'\U1F191'
-emoji[squared_cool]=$'\U1F192'
-emoji[squared_free]=$'\U1F193'
-emoji[squared_id]=$'\U1F194'
-emoji[squared_new]=$'\U1F195'
-emoji[squared_ng]=$'\U1F196'
-emoji[squared_ok]=$'\U1F197'
-emoji[squared_sos]=$'\U1F198'
-emoji[squared_up_with_exclamation_mark]=$'\U1F199'
-emoji[squared_vs]=$'\U1F19A'
-emoji[squared_katakana_koko]=$'\U1F201'
-emoji[squared_katakana_sa]=$'\U1F202'
-emoji[squared_cjk_unified_ideograph_7121]=$'\U1F21A'
-emoji[squared_cjk_unified_ideograph_6307]=$'\U1F22F'
-emoji[squared_cjk_unified_ideograph_7981]=$'\U1F232'
-emoji[squared_cjk_unified_ideograph_7a7a]=$'\U1F233'
-emoji[squared_cjk_unified_ideograph_5408]=$'\U1F234'
-emoji[squared_cjk_unified_ideograph_6e80]=$'\U1F235'
-emoji[squared_cjk_unified_ideograph_6709]=$'\U1F236'
-emoji[squared_cjk_unified_ideograph_6708]=$'\U1F237'
-emoji[squared_cjk_unified_ideograph_7533]=$'\U1F238'
-emoji[squared_cjk_unified_ideograph_5272]=$'\U1F239'
-emoji[squared_cjk_unified_ideograph_55b6]=$'\U1F23A'
-emoji[circled_ideograph_advantage]=$'\U1F250'
-emoji[circled_ideograph_accept]=$'\U1F251'
-emoji[cyclone]=$'\U1F300'
-emoji[foggy]=$'\U1F301'
-emoji[closed_umbrella]=$'\U1F302'
-emoji[night_with_stars]=$'\U1F303'
-emoji[sunrise_over_mountains]=$'\U1F304'
-emoji[sunrise]=$'\U1F305'
-emoji[cityscape_at_dusk]=$'\U1F306'
-emoji[sunset_over_buildings]=$'\U1F307'
-emoji[rainbow]=$'\U1F308'
-emoji[bridge_at_night]=$'\U1F309'
-emoji[water_wave]=$'\U1F30A'
-emoji[volcano]=$'\U1F30B'
-emoji[milky_way]=$'\U1F30C'
-emoji[earth_globe_europe_africa]=$'\U1F30D'
-emoji[earth_globe_americas]=$'\U1F30E'
-emoji[earth_globe_asia_australia]=$'\U1F30F'
-emoji[globe_with_meridians]=$'\U1F310'
-emoji[new_moon_symbol]=$'\U1F311'
-emoji[waxing_crescent_moon_symbol]=$'\U1F312'
-emoji[first_quarter_moon_symbol]=$'\U1F313'
-emoji[waxing_gibbous_moon_symbol]=$'\U1F314'
-emoji[full_moon_symbol]=$'\U1F315'
-emoji[waning_gibbous_moon_symbol]=$'\U1F316'
-emoji[last_quarter_moon_symbol]=$'\U1F317'
-emoji[waning_crescent_moon_symbol]=$'\U1F318'
-emoji[crescent_moon]=$'\U1F319'
-emoji[new_moon_with_face]=$'\U1F31A'
-emoji[first_quarter_moon_with_face]=$'\U1F31B'
-emoji[last_quarter_moon_with_face]=$'\U1F31C'
-emoji[full_moon_with_face]=$'\U1F31D'
-emoji[sun_with_face]=$'\U1F31E'
-emoji[glowing_star]=$'\U1F31F'
-emoji[shooting_star]=$'\U1F320'
-emoji[thermometer]=$'\U1F321'
-emoji[white_sun_with_small_cloud]=$'\U1F324'
-emoji[white_sun_behind_cloud]=$'\U1F325'
-emoji[white_sun_behind_cloud_with_rain]=$'\U1F326'
-emoji[cloud_with_rain]=$'\U1F327'
-emoji[cloud_with_snow]=$'\U1F328'
-emoji[cloud_with_lightning]=$'\U1F329'
-emoji[cloud_with_tornado]=$'\U1F32A'
-emoji[fog]=$'\U1F32B'
-emoji[wind_blowing_face]=$'\U1F32C'
-emoji[hot_dog]=$'\U1F32D'
-emoji[taco]=$'\U1F32E'
-emoji[burrito]=$'\U1F32F'
-emoji[chestnut]=$'\U1F330'
+emoji[hand]=$'\U270B'
+emoji[raised_hand_light_skin_tone]=$'\U270B\U1F3FB'
+emoji[raised_hand_medium_light_skin_tone]=$'\U270B\U1F3FC'
+emoji[raised_hand_medium_skin_tone]=$'\U270B\U1F3FD'
+emoji[raised_hand_medium_dark_skin_tone]=$'\U270B\U1F3FE'
+emoji[raised_hand_dark_skin_tone]=$'\U270B\U1F3FF'
+emoji[vulcan_salute]=$'\U1F596'
+emoji[vulcan_salute_light_skin_tone]=$'\U1F596\U1F3FB'
+emoji[vulcan_salute_medium_light_skin_tone]=$'\U1F596\U1F3FC'
+emoji[vulcan_salute_medium_skin_tone]=$'\U1F596\U1F3FD'
+emoji[vulcan_salute_medium_dark_skin_tone]=$'\U1F596\U1F3FE'
+emoji[vulcan_salute_dark_skin_tone]=$'\U1F596\U1F3FF'
+emoji[OK_hand]=$'\U1F44C'
+emoji[ok_hand]=$'\U1F44C'
+emoji[OK_hand_light_skin_tone]=$'\U1F44C\U1F3FB'
+emoji[OK_hand_medium_light_skin_tone]=$'\U1F44C\U1F3FC'
+emoji[OK_hand_medium_skin_tone]=$'\U1F44C\U1F3FD'
+emoji[OK_hand_medium_dark_skin_tone]=$'\U1F44C\U1F3FE'
+emoji[OK_hand_dark_skin_tone]=$'\U1F44C\U1F3FF'
+emoji[pinching_hand]=$'\U1F90F'
+emoji[pinching_hand_light_skin_tone]=$'\U1F90F\U1F3FB'
+emoji[pinching_hand_medium_light_skin_tone]=$'\U1F90F\U1F3FC'
+emoji[pinching_hand_medium_skin_tone]=$'\U1F90F\U1F3FD'
+emoji[pinching_hand_medium_dark_skin_tone]=$'\U1F90F\U1F3FE'
+emoji[pinching_hand_dark_skin_tone]=$'\U1F90F\U1F3FF'
+emoji[victory_hand]=$'\U270C\UFE0F'
+emoji[v]=$'\U270C\UFE0F'
+emoji[victory_hand_unqualified]=$'\U270C'
+emoji[victory_hand_light_skin_tone]=$'\U270C\U1F3FB'
+emoji[victory_hand_medium_light_skin_tone]=$'\U270C\U1F3FC'
+emoji[victory_hand_medium_skin_tone]=$'\U270C\U1F3FD'
+emoji[victory_hand_medium_dark_skin_tone]=$'\U270C\U1F3FE'
+emoji[victory_hand_dark_skin_tone]=$'\U270C\U1F3FF'
+emoji[crossed_fingers]=$'\U1F91E'
+emoji[crossed_fingers_light_skin_tone]=$'\U1F91E\U1F3FB'
+emoji[crossed_fingers_medium_light_skin_tone]=$'\U1F91E\U1F3FC'
+emoji[crossed_fingers_medium_skin_tone]=$'\U1F91E\U1F3FD'
+emoji[crossed_fingers_medium_dark_skin_tone]=$'\U1F91E\U1F3FE'
+emoji[crossed_fingers_dark_skin_tone]=$'\U1F91E\U1F3FF'
+emoji[love_you_gesture]=$'\U1F91F'
+emoji[love_you_gesture_light_skin_tone]=$'\U1F91F\U1F3FB'
+emoji[love_you_gesture_medium_light_skin_tone]=$'\U1F91F\U1F3FC'
+emoji[love_you_gesture_medium_skin_tone]=$'\U1F91F\U1F3FD'
+emoji[love_you_gesture_medium_dark_skin_tone]=$'\U1F91F\U1F3FE'
+emoji[love_you_gesture_dark_skin_tone]=$'\U1F91F\U1F3FF'
+emoji[sign_of_the_horns]=$'\U1F918'
+emoji[metal]=$'\U1F918'
+emoji[sign_of_the_horns_light_skin_tone]=$'\U1F918\U1F3FB'
+emoji[sign_of_the_horns_medium_light_skin_tone]=$'\U1F918\U1F3FC'
+emoji[sign_of_the_horns_medium_skin_tone]=$'\U1F918\U1F3FD'
+emoji[sign_of_the_horns_medium_dark_skin_tone]=$'\U1F918\U1F3FE'
+emoji[sign_of_the_horns_dark_skin_tone]=$'\U1F918\U1F3FF'
+emoji[call_me_hand]=$'\U1F919'
+emoji[call_me_hand_light_skin_tone]=$'\U1F919\U1F3FB'
+emoji[call_me_hand_medium_light_skin_tone]=$'\U1F919\U1F3FC'
+emoji[call_me_hand_medium_skin_tone]=$'\U1F919\U1F3FD'
+emoji[call_me_hand_medium_dark_skin_tone]=$'\U1F919\U1F3FE'
+emoji[call_me_hand_dark_skin_tone]=$'\U1F919\U1F3FF'
+emoji[backhand_index_pointing_left]=$'\U1F448'
+emoji[point_left]=$'\U1F448'
+emoji[backhand_index_pointing_left_light_skin_tone]=$'\U1F448\U1F3FB'
+emoji[backhand_index_pointing_left_medium_light_skin_tone]=$'\U1F448\U1F3FC'
+emoji[backhand_index_pointing_left_medium_skin_tone]=$'\U1F448\U1F3FD'
+emoji[backhand_index_pointing_left_medium_dark_skin_tone]=$'\U1F448\U1F3FE'
+emoji[backhand_index_pointing_left_dark_skin_tone]=$'\U1F448\U1F3FF'
+emoji[backhand_index_pointing_right]=$'\U1F449'
+emoji[point_right]=$'\U1F449'
+emoji[backhand_index_pointing_right_light_skin_tone]=$'\U1F449\U1F3FB'
+emoji[backhand_index_pointing_right_medium_light_skin_tone]=$'\U1F449\U1F3FC'
+emoji[backhand_index_pointing_right_medium_skin_tone]=$'\U1F449\U1F3FD'
+emoji[backhand_index_pointing_right_medium_dark_skin_tone]=$'\U1F449\U1F3FE'
+emoji[backhand_index_pointing_right_dark_skin_tone]=$'\U1F449\U1F3FF'
+emoji[backhand_index_pointing_up]=$'\U1F446'
+emoji[point_up_2]=$'\U1F446'
+emoji[backhand_index_pointing_up_light_skin_tone]=$'\U1F446\U1F3FB'
+emoji[backhand_index_pointing_up_medium_light_skin_tone]=$'\U1F446\U1F3FC'
+emoji[backhand_index_pointing_up_medium_skin_tone]=$'\U1F446\U1F3FD'
+emoji[backhand_index_pointing_up_medium_dark_skin_tone]=$'\U1F446\U1F3FE'
+emoji[backhand_index_pointing_up_dark_skin_tone]=$'\U1F446\U1F3FF'
+emoji[middle_finger]=$'\U1F595'
+emoji[fu]=$'\U1F595'
+emoji[middle_finger_light_skin_tone]=$'\U1F595\U1F3FB'
+emoji[middle_finger_medium_light_skin_tone]=$'\U1F595\U1F3FC'
+emoji[middle_finger_medium_skin_tone]=$'\U1F595\U1F3FD'
+emoji[middle_finger_medium_dark_skin_tone]=$'\U1F595\U1F3FE'
+emoji[middle_finger_dark_skin_tone]=$'\U1F595\U1F3FF'
+emoji[backhand_index_pointing_down]=$'\U1F447'
+emoji[point_down]=$'\U1F447'
+emoji[backhand_index_pointing_down_light_skin_tone]=$'\U1F447\U1F3FB'
+emoji[backhand_index_pointing_down_medium_light_skin_tone]=$'\U1F447\U1F3FC'
+emoji[backhand_index_pointing_down_medium_skin_tone]=$'\U1F447\U1F3FD'
+emoji[backhand_index_pointing_down_medium_dark_skin_tone]=$'\U1F447\U1F3FE'
+emoji[backhand_index_pointing_down_dark_skin_tone]=$'\U1F447\U1F3FF'
+emoji[index_pointing_up]=$'\U261D\UFE0F'
+emoji[point_up]=$'\U261D\UFE0F'
+emoji[index_pointing_up_unqualified]=$'\U261D'
+emoji[index_pointing_up_light_skin_tone]=$'\U261D\U1F3FB'
+emoji[index_pointing_up_medium_light_skin_tone]=$'\U261D\U1F3FC'
+emoji[index_pointing_up_medium_skin_tone]=$'\U261D\U1F3FD'
+emoji[index_pointing_up_medium_dark_skin_tone]=$'\U261D\U1F3FE'
+emoji[index_pointing_up_dark_skin_tone]=$'\U261D\U1F3FF'
+emoji[thumbs_up]=$'\U1F44D'
+emoji[+1]=$'\U1F44D'
+emoji[thumbsup]=$'\U1F44D'
+emoji[thumbs_up_light_skin_tone]=$'\U1F44D\U1F3FB'
+emoji[thumbs_up_medium_light_skin_tone]=$'\U1F44D\U1F3FC'
+emoji[thumbs_up_medium_skin_tone]=$'\U1F44D\U1F3FD'
+emoji[thumbs_up_medium_dark_skin_tone]=$'\U1F44D\U1F3FE'
+emoji[thumbs_up_dark_skin_tone]=$'\U1F44D\U1F3FF'
+emoji[thumbs_down]=$'\U1F44E'
+emoji[-1]=$'\U1F44E'
+emoji[thumbsdown]=$'\U1F44E'
+emoji[thumbs_down_light_skin_tone]=$'\U1F44E\U1F3FB'
+emoji[thumbs_down_medium_light_skin_tone]=$'\U1F44E\U1F3FC'
+emoji[thumbs_down_medium_skin_tone]=$'\U1F44E\U1F3FD'
+emoji[thumbs_down_medium_dark_skin_tone]=$'\U1F44E\U1F3FE'
+emoji[thumbs_down_dark_skin_tone]=$'\U1F44E\U1F3FF'
+emoji[raised_fist]=$'\U270A'
+emoji[fist_raised]=$'\U270A'
+emoji[fist]=$'\U270A'
+emoji[raised_fist_light_skin_tone]=$'\U270A\U1F3FB'
+emoji[raised_fist_medium_light_skin_tone]=$'\U270A\U1F3FC'
+emoji[raised_fist_medium_skin_tone]=$'\U270A\U1F3FD'
+emoji[raised_fist_medium_dark_skin_tone]=$'\U270A\U1F3FE'
+emoji[raised_fist_dark_skin_tone]=$'\U270A\U1F3FF'
+emoji[oncoming_fist]=$'\U1F44A'
+emoji[fist_oncoming]=$'\U1F44A'
+emoji[facepunch]=$'\U1F44A'
+emoji[punch]=$'\U1F44A'
+emoji[oncoming_fist_light_skin_tone]=$'\U1F44A\U1F3FB'
+emoji[oncoming_fist_medium_light_skin_tone]=$'\U1F44A\U1F3FC'
+emoji[oncoming_fist_medium_skin_tone]=$'\U1F44A\U1F3FD'
+emoji[oncoming_fist_medium_dark_skin_tone]=$'\U1F44A\U1F3FE'
+emoji[oncoming_fist_dark_skin_tone]=$'\U1F44A\U1F3FF'
+emoji[left_facing_fist]=$'\U1F91B'
+emoji[fist_left]=$'\U1F91B'
+emoji[left_facing_fist_light_skin_tone]=$'\U1F91B\U1F3FB'
+emoji[left_facing_fist_medium_light_skin_tone]=$'\U1F91B\U1F3FC'
+emoji[left_facing_fist_medium_skin_tone]=$'\U1F91B\U1F3FD'
+emoji[left_facing_fist_medium_dark_skin_tone]=$'\U1F91B\U1F3FE'
+emoji[left_facing_fist_dark_skin_tone]=$'\U1F91B\U1F3FF'
+emoji[right_facing_fist]=$'\U1F91C'
+emoji[fist_right]=$'\U1F91C'
+emoji[right_facing_fist_light_skin_tone]=$'\U1F91C\U1F3FB'
+emoji[right_facing_fist_medium_light_skin_tone]=$'\U1F91C\U1F3FC'
+emoji[right_facing_fist_medium_skin_tone]=$'\U1F91C\U1F3FD'
+emoji[right_facing_fist_medium_dark_skin_tone]=$'\U1F91C\U1F3FE'
+emoji[right_facing_fist_dark_skin_tone]=$'\U1F91C\U1F3FF'
+emoji[clapping_hands]=$'\U1F44F'
+emoji[clap]=$'\U1F44F'
+emoji[clapping_hands_light_skin_tone]=$'\U1F44F\U1F3FB'
+emoji[clapping_hands_medium_light_skin_tone]=$'\U1F44F\U1F3FC'
+emoji[clapping_hands_medium_skin_tone]=$'\U1F44F\U1F3FD'
+emoji[clapping_hands_medium_dark_skin_tone]=$'\U1F44F\U1F3FE'
+emoji[clapping_hands_dark_skin_tone]=$'\U1F44F\U1F3FF'
+emoji[raising_hands]=$'\U1F64C'
+emoji[raised_hands]=$'\U1F64C'
+emoji[raising_hands_light_skin_tone]=$'\U1F64C\U1F3FB'
+emoji[raising_hands_medium_light_skin_tone]=$'\U1F64C\U1F3FC'
+emoji[raising_hands_medium_skin_tone]=$'\U1F64C\U1F3FD'
+emoji[raising_hands_medium_dark_skin_tone]=$'\U1F64C\U1F3FE'
+emoji[raising_hands_dark_skin_tone]=$'\U1F64C\U1F3FF'
+emoji[open_hands]=$'\U1F450'
+emoji[open_hands_light_skin_tone]=$'\U1F450\U1F3FB'
+emoji[open_hands_medium_light_skin_tone]=$'\U1F450\U1F3FC'
+emoji[open_hands_medium_skin_tone]=$'\U1F450\U1F3FD'
+emoji[open_hands_medium_dark_skin_tone]=$'\U1F450\U1F3FE'
+emoji[open_hands_dark_skin_tone]=$'\U1F450\U1F3FF'
+emoji[palms_up_together]=$'\U1F932'
+emoji[palms_up_together_light_skin_tone]=$'\U1F932\U1F3FB'
+emoji[palms_up_together_medium_light_skin_tone]=$'\U1F932\U1F3FC'
+emoji[palms_up_together_medium_skin_tone]=$'\U1F932\U1F3FD'
+emoji[palms_up_together_medium_dark_skin_tone]=$'\U1F932\U1F3FE'
+emoji[palms_up_together_dark_skin_tone]=$'\U1F932\U1F3FF'
+emoji[handshake]=$'\U1F91D'
+emoji[folded_hands]=$'\U1F64F'
+emoji[pray]=$'\U1F64F'
+emoji[folded_hands_light_skin_tone]=$'\U1F64F\U1F3FB'
+emoji[folded_hands_medium_light_skin_tone]=$'\U1F64F\U1F3FC'
+emoji[folded_hands_medium_skin_tone]=$'\U1F64F\U1F3FD'
+emoji[folded_hands_medium_dark_skin_tone]=$'\U1F64F\U1F3FE'
+emoji[folded_hands_dark_skin_tone]=$'\U1F64F\U1F3FF'
+emoji[writing_hand]=$'\U270D\UFE0F'
+emoji[writing_hand_unqualified]=$'\U270D'
+emoji[writing_hand_light_skin_tone]=$'\U270D\U1F3FB'
+emoji[writing_hand_medium_light_skin_tone]=$'\U270D\U1F3FC'
+emoji[writing_hand_medium_skin_tone]=$'\U270D\U1F3FD'
+emoji[writing_hand_medium_dark_skin_tone]=$'\U270D\U1F3FE'
+emoji[writing_hand_dark_skin_tone]=$'\U270D\U1F3FF'
+emoji[nail_polish]=$'\U1F485'
+emoji[nail_care]=$'\U1F485'
+emoji[nail_polish_light_skin_tone]=$'\U1F485\U1F3FB'
+emoji[nail_polish_medium_light_skin_tone]=$'\U1F485\U1F3FC'
+emoji[nail_polish_medium_skin_tone]=$'\U1F485\U1F3FD'
+emoji[nail_polish_medium_dark_skin_tone]=$'\U1F485\U1F3FE'
+emoji[nail_polish_dark_skin_tone]=$'\U1F485\U1F3FF'
+emoji[selfie]=$'\U1F933'
+emoji[selfie_light_skin_tone]=$'\U1F933\U1F3FB'
+emoji[selfie_medium_light_skin_tone]=$'\U1F933\U1F3FC'
+emoji[selfie_medium_skin_tone]=$'\U1F933\U1F3FD'
+emoji[selfie_medium_dark_skin_tone]=$'\U1F933\U1F3FE'
+emoji[selfie_dark_skin_tone]=$'\U1F933\U1F3FF'
+emoji[flexed_biceps]=$'\U1F4AA'
+emoji[muscle]=$'\U1F4AA'
+emoji[flexed_biceps_light_skin_tone]=$'\U1F4AA\U1F3FB'
+emoji[flexed_biceps_medium_light_skin_tone]=$'\U1F4AA\U1F3FC'
+emoji[flexed_biceps_medium_skin_tone]=$'\U1F4AA\U1F3FD'
+emoji[flexed_biceps_medium_dark_skin_tone]=$'\U1F4AA\U1F3FE'
+emoji[flexed_biceps_dark_skin_tone]=$'\U1F4AA\U1F3FF'
+emoji[mechanical_arm]=$'\U1F9BE'
+emoji[mechanical_leg]=$'\U1F9BF'
+emoji[mechanical_leg_1]=$'\U1F9B5'
+emoji[leg]=$'\U1F9B5'
+emoji[leg_light_skin_tone]=$'\U1F9B5\U1F3FB'
+emoji[leg_medium_light_skin_tone]=$'\U1F9B5\U1F3FC'
+emoji[leg_medium_skin_tone]=$'\U1F9B5\U1F3FD'
+emoji[leg_medium_dark_skin_tone]=$'\U1F9B5\U1F3FE'
+emoji[leg_dark_skin_tone]=$'\U1F9B5\U1F3FF'
+emoji[foot]=$'\U1F9B6'
+emoji[foot_light_skin_tone]=$'\U1F9B6\U1F3FB'
+emoji[foot_medium_light_skin_tone]=$'\U1F9B6\U1F3FC'
+emoji[foot_medium_skin_tone]=$'\U1F9B6\U1F3FD'
+emoji[foot_medium_dark_skin_tone]=$'\U1F9B6\U1F3FE'
+emoji[foot_dark_skin_tone]=$'\U1F9B6\U1F3FF'
+emoji[ear]=$'\U1F442'
+emoji[ear_light_skin_tone]=$'\U1F442\U1F3FB'
+emoji[ear_medium_light_skin_tone]=$'\U1F442\U1F3FC'
+emoji[ear_medium_skin_tone]=$'\U1F442\U1F3FD'
+emoji[ear_medium_dark_skin_tone]=$'\U1F442\U1F3FE'
+emoji[ear_dark_skin_tone]=$'\U1F442\U1F3FF'
+emoji[ear_with_hearing_aid]=$'\U1F9BB'
+emoji[ear_with_hearing_aid_light_skin_tone]=$'\U1F9BB\U1F3FB'
+emoji[ear_with_hearing_aid_medium_light_skin_tone]=$'\U1F9BB\U1F3FC'
+emoji[ear_with_hearing_aid_medium_skin_tone]=$'\U1F9BB\U1F3FD'
+emoji[ear_with_hearing_aid_medium_dark_skin_tone]=$'\U1F9BB\U1F3FE'
+emoji[ear_with_hearing_aid_dark_skin_tone]=$'\U1F9BB\U1F3FF'
+emoji[nose]=$'\U1F443'
+emoji[nose_light_skin_tone]=$'\U1F443\U1F3FB'
+emoji[nose_medium_light_skin_tone]=$'\U1F443\U1F3FC'
+emoji[nose_medium_skin_tone]=$'\U1F443\U1F3FD'
+emoji[nose_medium_dark_skin_tone]=$'\U1F443\U1F3FE'
+emoji[nose_dark_skin_tone]=$'\U1F443\U1F3FF'
+emoji[brain]=$'\U1F9E0'
+emoji[tooth]=$'\U1F9B7'
+emoji[bone]=$'\U1F9B4'
+emoji[eyes]=$'\U1F440'
+emoji[eyes_1]=$'\U1F441\UFE0F'
+emoji[eye_unqualified]=$'\U1F441'
+emoji[eye]=$'\U1F441'
+emoji[tongue]=$'\U1F445'
+emoji[mouth]=$'\U1F444'
+emoji[lips]=$'\U1F444'
+emoji[baby]=$'\U1F476'
+emoji[baby_light_skin_tone]=$'\U1F476\U1F3FB'
+emoji[baby_medium_light_skin_tone]=$'\U1F476\U1F3FC'
+emoji[baby_medium_skin_tone]=$'\U1F476\U1F3FD'
+emoji[baby_medium_dark_skin_tone]=$'\U1F476\U1F3FE'
+emoji[baby_dark_skin_tone]=$'\U1F476\U1F3FF'
+emoji[child]=$'\U1F9D2'
+emoji[child_light_skin_tone]=$'\U1F9D2\U1F3FB'
+emoji[child_medium_light_skin_tone]=$'\U1F9D2\U1F3FC'
+emoji[child_medium_skin_tone]=$'\U1F9D2\U1F3FD'
+emoji[child_medium_dark_skin_tone]=$'\U1F9D2\U1F3FE'
+emoji[child_dark_skin_tone]=$'\U1F9D2\U1F3FF'
+emoji[boy]=$'\U1F466'
+emoji[boy_light_skin_tone]=$'\U1F466\U1F3FB'
+emoji[boy_medium_light_skin_tone]=$'\U1F466\U1F3FC'
+emoji[boy_medium_skin_tone]=$'\U1F466\U1F3FD'
+emoji[boy_medium_dark_skin_tone]=$'\U1F466\U1F3FE'
+emoji[boy_dark_skin_tone]=$'\U1F466\U1F3FF'
+emoji[girl]=$'\U1F467'
+emoji[girl_light_skin_tone]=$'\U1F467\U1F3FB'
+emoji[girl_medium_light_skin_tone]=$'\U1F467\U1F3FC'
+emoji[girl_medium_skin_tone]=$'\U1F467\U1F3FD'
+emoji[girl_medium_dark_skin_tone]=$'\U1F467\U1F3FE'
+emoji[girl_dark_skin_tone]=$'\U1F467\U1F3FF'
+emoji[person]=$'\U1F9D1'
+emoji[adult]=$'\U1F9D1'
+emoji[person_light_skin_tone]=$'\U1F9D1\U1F3FB'
+emoji[person_medium_light_skin_tone]=$'\U1F9D1\U1F3FC'
+emoji[person_medium_skin_tone]=$'\U1F9D1\U1F3FD'
+emoji[person_medium_dark_skin_tone]=$'\U1F9D1\U1F3FE'
+emoji[person_dark_skin_tone]=$'\U1F9D1\U1F3FF'
+emoji[person_blond_hair]=$'\U1F471'
+emoji[blond_haired_person]=$'\U1F471'
+emoji[person_light_skin_tone_blond_hair]=$'\U1F471\U1F3FB'
+emoji[person_medium_light_skin_tone_blond_hair]=$'\U1F471\U1F3FC'
+emoji[person_medium_skin_tone_blond_hair]=$'\U1F471\U1F3FD'
+emoji[person_medium_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FE'
+emoji[person_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FF'
+emoji[man]=$'\U1F468'
+emoji[man_light_skin_tone]=$'\U1F468\U1F3FB'
+emoji[man_medium_light_skin_tone]=$'\U1F468\U1F3FC'
+emoji[man_medium_skin_tone]=$'\U1F468\U1F3FD'
+emoji[man_medium_dark_skin_tone]=$'\U1F468\U1F3FE'
+emoji[man_dark_skin_tone]=$'\U1F468\U1F3FF'
+emoji[man_beard]=$'\U1F9D4'
+emoji[bearded_person]=$'\U1F9D4'
+emoji[man_light_skin_tone_beard]=$'\U1F9D4\U1F3FB'
+emoji[man_medium_light_skin_tone_beard]=$'\U1F9D4\U1F3FC'
+emoji[man_medium_skin_tone_beard]=$'\U1F9D4\U1F3FD'
+emoji[man_medium_dark_skin_tone_beard]=$'\U1F9D4\U1F3FE'
+emoji[man_dark_skin_tone_beard]=$'\U1F9D4\U1F3FF'
+emoji[man_blond_hair]=$'\U1F471\U200D\U2642\UFE0F'
+emoji[man_blond_hair_minimally]=$'\U1F471\U200D\U2642'
+emoji[blond_haired_man]=$'\U1F471\U200D\U2642'
+emoji[man_light_skin_tone_blond_hair]=$'\U1F471\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_light_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FB\U200D\U2642'
+emoji[man_medium_light_skin_tone_blond_hair]=$'\U1F471\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_medium_light_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FC\U200D\U2642'
+emoji[man_medium_skin_tone_blond_hair]=$'\U1F471\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_medium_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FD\U200D\U2642'
+emoji[man_medium_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_medium_dark_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FE\U200D\U2642'
+emoji[man_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_dark_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FF\U200D\U2642'
+emoji[man_red_hair]=$'\U1F468\U200D\U1F9B0'
+emoji[red_haired_man]=$'\U1F468\U200D\U1F9B0'
+emoji[man_light_skin_tone_red_hair]=$'\U1F468\U1F3FB\U200D\U1F9B0'
+emoji[man_medium_light_skin_tone_red_hair]=$'\U1F468\U1F3FC\U200D\U1F9B0'
+emoji[man_medium_skin_tone_red_hair]=$'\U1F468\U1F3FD\U200D\U1F9B0'
+emoji[man_medium_dark_skin_tone_red_hair]=$'\U1F468\U1F3FE\U200D\U1F9B0'
+emoji[man_dark_skin_tone_red_hair]=$'\U1F468\U1F3FF\U200D\U1F9B0'
+emoji[man_curly_hair]=$'\U1F468\U200D\U1F9B1'
+emoji[curly_haired_man]=$'\U1F468\U200D\U1F9B1'
+emoji[man_light_skin_tone_curly_hair]=$'\U1F468\U1F3FB\U200D\U1F9B1'
+emoji[man_medium_light_skin_tone_curly_hair]=$'\U1F468\U1F3FC\U200D\U1F9B1'
+emoji[man_medium_skin_tone_curly_hair]=$'\U1F468\U1F3FD\U200D\U1F9B1'
+emoji[man_medium_dark_skin_tone_curly_hair]=$'\U1F468\U1F3FE\U200D\U1F9B1'
+emoji[man_dark_skin_tone_curly_hair]=$'\U1F468\U1F3FF\U200D\U1F9B1'
+emoji[man_white_hair]=$'\U1F468\U200D\U1F9B3'
+emoji[white_haired_man]=$'\U1F468\U200D\U1F9B3'
+emoji[man_light_skin_tone_white_hair]=$'\U1F468\U1F3FB\U200D\U1F9B3'
+emoji[man_medium_light_skin_tone_white_hair]=$'\U1F468\U1F3FC\U200D\U1F9B3'
+emoji[man_medium_skin_tone_white_hair]=$'\U1F468\U1F3FD\U200D\U1F9B3'
+emoji[man_medium_dark_skin_tone_white_hair]=$'\U1F468\U1F3FE\U200D\U1F9B3'
+emoji[man_dark_skin_tone_white_hair]=$'\U1F468\U1F3FF\U200D\U1F9B3'
+emoji[man_bald]=$'\U1F468\U200D\U1F9B2'
+emoji[bald_man]=$'\U1F468\U200D\U1F9B2'
+emoji[man_light_skin_tone_bald]=$'\U1F468\U1F3FB\U200D\U1F9B2'
+emoji[man_medium_light_skin_tone_bald]=$'\U1F468\U1F3FC\U200D\U1F9B2'
+emoji[man_medium_skin_tone_bald]=$'\U1F468\U1F3FD\U200D\U1F9B2'
+emoji[man_medium_dark_skin_tone_bald]=$'\U1F468\U1F3FE\U200D\U1F9B2'
+emoji[man_dark_skin_tone_bald]=$'\U1F468\U1F3FF\U200D\U1F9B2'
+emoji[woman]=$'\U1F469'
+emoji[woman_light_skin_tone]=$'\U1F469\U1F3FB'
+emoji[woman_medium_light_skin_tone]=$'\U1F469\U1F3FC'
+emoji[woman_medium_skin_tone]=$'\U1F469\U1F3FD'
+emoji[woman_medium_dark_skin_tone]=$'\U1F469\U1F3FE'
+emoji[woman_dark_skin_tone]=$'\U1F469\U1F3FF'
+emoji[woman_blond_hair]=$'\U1F471\U200D\U2640\UFE0F'
+emoji[woman_blond_hair_minimally]=$'\U1F471\U200D\U2640'
+emoji[blond_haired_woman]=$'\U1F471\U200D\U2640'
+emoji[blonde_woman]=$'\U1F471\U200D\U2640'
+emoji[woman_light_skin_tone_blond_hair]=$'\U1F471\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_light_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FB\U200D\U2640'
+emoji[woman_medium_light_skin_tone_blond_hair]=$'\U1F471\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_medium_light_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FC\U200D\U2640'
+emoji[woman_medium_skin_tone_blond_hair]=$'\U1F471\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_medium_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FD\U200D\U2640'
+emoji[woman_medium_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_medium_dark_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FE\U200D\U2640'
+emoji[woman_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_dark_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FF\U200D\U2640'
+emoji[woman_red_hair]=$'\U1F469\U200D\U1F9B0'
+emoji[red_haired_woman]=$'\U1F469\U200D\U1F9B0'
+emoji[woman_light_skin_tone_red_hair]=$'\U1F469\U1F3FB\U200D\U1F9B0'
+emoji[woman_medium_light_skin_tone_red_hair]=$'\U1F469\U1F3FC\U200D\U1F9B0'
+emoji[woman_medium_skin_tone_red_hair]=$'\U1F469\U1F3FD\U200D\U1F9B0'
+emoji[woman_medium_dark_skin_tone_red_hair]=$'\U1F469\U1F3FE\U200D\U1F9B0'
+emoji[woman_dark_skin_tone_red_hair]=$'\U1F469\U1F3FF\U200D\U1F9B0'
+emoji[woman_curly_hair]=$'\U1F469\U200D\U1F9B1'
+emoji[curly_haired_woman]=$'\U1F469\U200D\U1F9B1'
+emoji[woman_light_skin_tone_curly_hair]=$'\U1F469\U1F3FB\U200D\U1F9B1'
+emoji[woman_medium_light_skin_tone_curly_hair]=$'\U1F469\U1F3FC\U200D\U1F9B1'
+emoji[woman_medium_skin_tone_curly_hair]=$'\U1F469\U1F3FD\U200D\U1F9B1'
+emoji[woman_medium_dark_skin_tone_curly_hair]=$'\U1F469\U1F3FE\U200D\U1F9B1'
+emoji[woman_dark_skin_tone_curly_hair]=$'\U1F469\U1F3FF\U200D\U1F9B1'
+emoji[woman_white_hair]=$'\U1F469\U200D\U1F9B3'
+emoji[white_haired_woman]=$'\U1F469\U200D\U1F9B3'
+emoji[woman_light_skin_tone_white_hair]=$'\U1F469\U1F3FB\U200D\U1F9B3'
+emoji[woman_medium_light_skin_tone_white_hair]=$'\U1F469\U1F3FC\U200D\U1F9B3'
+emoji[woman_medium_skin_tone_white_hair]=$'\U1F469\U1F3FD\U200D\U1F9B3'
+emoji[woman_medium_dark_skin_tone_white_hair]=$'\U1F469\U1F3FE\U200D\U1F9B3'
+emoji[woman_dark_skin_tone_white_hair]=$'\U1F469\U1F3FF\U200D\U1F9B3'
+emoji[woman_bald]=$'\U1F469\U200D\U1F9B2'
+emoji[bald_woman]=$'\U1F469\U200D\U1F9B2'
+emoji[woman_light_skin_tone_bald]=$'\U1F469\U1F3FB\U200D\U1F9B2'
+emoji[woman_medium_light_skin_tone_bald]=$'\U1F469\U1F3FC\U200D\U1F9B2'
+emoji[woman_medium_skin_tone_bald]=$'\U1F469\U1F3FD\U200D\U1F9B2'
+emoji[woman_medium_dark_skin_tone_bald]=$'\U1F469\U1F3FE\U200D\U1F9B2'
+emoji[woman_dark_skin_tone_bald]=$'\U1F469\U1F3FF\U200D\U1F9B2'
+emoji[older_person]=$'\U1F9D3'
+emoji[older_adult]=$'\U1F9D3'
+emoji[older_person_light_skin_tone]=$'\U1F9D3\U1F3FB'
+emoji[older_person_medium_light_skin_tone]=$'\U1F9D3\U1F3FC'
+emoji[older_person_medium_skin_tone]=$'\U1F9D3\U1F3FD'
+emoji[older_person_medium_dark_skin_tone]=$'\U1F9D3\U1F3FE'
+emoji[older_person_dark_skin_tone]=$'\U1F9D3\U1F3FF'
+emoji[old_man]=$'\U1F474'
+emoji[older_man]=$'\U1F474'
+emoji[old_man_light_skin_tone]=$'\U1F474\U1F3FB'
+emoji[old_man_medium_light_skin_tone]=$'\U1F474\U1F3FC'
+emoji[old_man_medium_skin_tone]=$'\U1F474\U1F3FD'
+emoji[old_man_medium_dark_skin_tone]=$'\U1F474\U1F3FE'
+emoji[old_man_dark_skin_tone]=$'\U1F474\U1F3FF'
+emoji[old_woman]=$'\U1F475'
+emoji[older_woman]=$'\U1F475'
+emoji[old_woman_light_skin_tone]=$'\U1F475\U1F3FB'
+emoji[old_woman_medium_light_skin_tone]=$'\U1F475\U1F3FC'
+emoji[old_woman_medium_skin_tone]=$'\U1F475\U1F3FD'
+emoji[old_woman_medium_dark_skin_tone]=$'\U1F475\U1F3FE'
+emoji[old_woman_dark_skin_tone]=$'\U1F475\U1F3FF'
+emoji[person_frowning]=$'\U1F64D'
+emoji[frowning_person]=$'\U1F64D'
+emoji[person_frowning_light_skin_tone]=$'\U1F64D\U1F3FB'
+emoji[person_frowning_medium_light_skin_tone]=$'\U1F64D\U1F3FC'
+emoji[person_frowning_medium_skin_tone]=$'\U1F64D\U1F3FD'
+emoji[person_frowning_medium_dark_skin_tone]=$'\U1F64D\U1F3FE'
+emoji[person_frowning_dark_skin_tone]=$'\U1F64D\U1F3FF'
+emoji[man_frowning]=$'\U1F64D\U200D\U2642\UFE0F'
+emoji[man_frowning_minimally]=$'\U1F64D\U200D\U2642'
+emoji[frowning_man]=$'\U1F64D\U200D\U2642'
+emoji[man_frowning_light_skin_tone]=$'\U1F64D\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_frowning_light_skin_tone_minimally]=$'\U1F64D\U1F3FB\U200D\U2642'
+emoji[man_frowning_medium_light_skin_tone]=$'\U1F64D\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_frowning_medium_light_skin_tone_minimally]=$'\U1F64D\U1F3FC\U200D\U2642'
+emoji[man_frowning_medium_skin_tone]=$'\U1F64D\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_frowning_medium_skin_tone_minimally]=$'\U1F64D\U1F3FD\U200D\U2642'
+emoji[man_frowning_medium_dark_skin_tone]=$'\U1F64D\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_frowning_medium_dark_skin_tone_minimally]=$'\U1F64D\U1F3FE\U200D\U2642'
+emoji[man_frowning_dark_skin_tone]=$'\U1F64D\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_frowning_dark_skin_tone_minimally]=$'\U1F64D\U1F3FF\U200D\U2642'
+emoji[woman_frowning]=$'\U1F64D\U200D\U2640\UFE0F'
+emoji[woman_frowning_minimally]=$'\U1F64D\U200D\U2640'
+emoji[frowning_woman]=$'\U1F64D\U200D\U2640'
+emoji[woman_frowning_light_skin_tone]=$'\U1F64D\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_frowning_light_skin_tone_minimally]=$'\U1F64D\U1F3FB\U200D\U2640'
+emoji[woman_frowning_medium_light_skin_tone]=$'\U1F64D\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_frowning_medium_light_skin_tone_minimally]=$'\U1F64D\U1F3FC\U200D\U2640'
+emoji[woman_frowning_medium_skin_tone]=$'\U1F64D\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_frowning_medium_skin_tone_minimally]=$'\U1F64D\U1F3FD\U200D\U2640'
+emoji[woman_frowning_medium_dark_skin_tone]=$'\U1F64D\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_frowning_medium_dark_skin_tone_minimally]=$'\U1F64D\U1F3FE\U200D\U2640'
+emoji[woman_frowning_dark_skin_tone]=$'\U1F64D\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_frowning_dark_skin_tone_minimally]=$'\U1F64D\U1F3FF\U200D\U2640'
+emoji[person_pouting]=$'\U1F64E'
+emoji[person_pouting_light_skin_tone]=$'\U1F64E\U1F3FB'
+emoji[person_pouting_medium_light_skin_tone]=$'\U1F64E\U1F3FC'
+emoji[person_pouting_medium_skin_tone]=$'\U1F64E\U1F3FD'
+emoji[person_pouting_medium_dark_skin_tone]=$'\U1F64E\U1F3FE'
+emoji[person_pouting_dark_skin_tone]=$'\U1F64E\U1F3FF'
+emoji[man_pouting]=$'\U1F64E\U200D\U2642\UFE0F'
+emoji[man_pouting_minimally]=$'\U1F64E\U200D\U2642'
+emoji[pouting_man]=$'\U1F64E\U200D\U2642'
+emoji[man_pouting_light_skin_tone]=$'\U1F64E\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_pouting_light_skin_tone_minimally]=$'\U1F64E\U1F3FB\U200D\U2642'
+emoji[man_pouting_medium_light_skin_tone]=$'\U1F64E\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_pouting_medium_light_skin_tone_minimally]=$'\U1F64E\U1F3FC\U200D\U2642'
+emoji[man_pouting_medium_skin_tone]=$'\U1F64E\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_pouting_medium_skin_tone_minimally]=$'\U1F64E\U1F3FD\U200D\U2642'
+emoji[man_pouting_medium_dark_skin_tone]=$'\U1F64E\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_pouting_medium_dark_skin_tone_minimally]=$'\U1F64E\U1F3FE\U200D\U2642'
+emoji[man_pouting_dark_skin_tone]=$'\U1F64E\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_pouting_dark_skin_tone_minimally]=$'\U1F64E\U1F3FF\U200D\U2642'
+emoji[woman_pouting]=$'\U1F64E\U200D\U2640\UFE0F'
+emoji[woman_pouting_minimally]=$'\U1F64E\U200D\U2640'
+emoji[pouting_woman]=$'\U1F64E\U200D\U2640'
+emoji[woman_pouting_light_skin_tone]=$'\U1F64E\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_pouting_light_skin_tone_minimally]=$'\U1F64E\U1F3FB\U200D\U2640'
+emoji[woman_pouting_medium_light_skin_tone]=$'\U1F64E\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_pouting_medium_light_skin_tone_minimally]=$'\U1F64E\U1F3FC\U200D\U2640'
+emoji[woman_pouting_medium_skin_tone]=$'\U1F64E\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_pouting_medium_skin_tone_minimally]=$'\U1F64E\U1F3FD\U200D\U2640'
+emoji[woman_pouting_medium_dark_skin_tone]=$'\U1F64E\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_pouting_medium_dark_skin_tone_minimally]=$'\U1F64E\U1F3FE\U200D\U2640'
+emoji[woman_pouting_dark_skin_tone]=$'\U1F64E\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_pouting_dark_skin_tone_minimally]=$'\U1F64E\U1F3FF\U200D\U2640'
+emoji[person_gesturing_NO]=$'\U1F645'
+emoji[no_good]=$'\U1F645'
+emoji[person_gesturing_NO_light_skin_tone]=$'\U1F645\U1F3FB'
+emoji[person_gesturing_NO_medium_light_skin_tone]=$'\U1F645\U1F3FC'
+emoji[person_gesturing_NO_medium_skin_tone]=$'\U1F645\U1F3FD'
+emoji[person_gesturing_NO_medium_dark_skin_tone]=$'\U1F645\U1F3FE'
+emoji[person_gesturing_NO_dark_skin_tone]=$'\U1F645\U1F3FF'
+emoji[man_gesturing_NO]=$'\U1F645\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_minimally]=$'\U1F645\U200D\U2642'
+emoji[no_good_man]=$'\U1F645\U200D\U2642'
+emoji[ng_man]=$'\U1F645\U200D\U2642'
+emoji[man_gesturing_NO_light_skin_tone]=$'\U1F645\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_light_skin_tone_minimally]=$'\U1F645\U1F3FB\U200D\U2642'
+emoji[man_gesturing_NO_medium_light_skin_tone]=$'\U1F645\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_medium_light_skin_tone_minimally]=$'\U1F645\U1F3FC\U200D\U2642'
+emoji[man_gesturing_NO_medium_skin_tone]=$'\U1F645\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_medium_skin_tone_minimally]=$'\U1F645\U1F3FD\U200D\U2642'
+emoji[man_gesturing_NO_medium_dark_skin_tone]=$'\U1F645\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_medium_dark_skin_tone_minimally]=$'\U1F645\U1F3FE\U200D\U2642'
+emoji[man_gesturing_NO_dark_skin_tone]=$'\U1F645\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_dark_skin_tone_minimally]=$'\U1F645\U1F3FF\U200D\U2642'
+emoji[woman_gesturing_NO]=$'\U1F645\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_minimally]=$'\U1F645\U200D\U2640'
+emoji[no_good_woman]=$'\U1F645\U200D\U2640'
+emoji[ng_woman]=$'\U1F645\U200D\U2640'
+emoji[woman_gesturing_NO_light_skin_tone]=$'\U1F645\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_light_skin_tone_minimally]=$'\U1F645\U1F3FB\U200D\U2640'
+emoji[woman_gesturing_NO_medium_light_skin_tone]=$'\U1F645\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_medium_light_skin_tone_minimally]=$'\U1F645\U1F3FC\U200D\U2640'
+emoji[woman_gesturing_NO_medium_skin_tone]=$'\U1F645\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_medium_skin_tone_minimally]=$'\U1F645\U1F3FD\U200D\U2640'
+emoji[woman_gesturing_NO_medium_dark_skin_tone]=$'\U1F645\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_medium_dark_skin_tone_minimally]=$'\U1F645\U1F3FE\U200D\U2640'
+emoji[woman_gesturing_NO_dark_skin_tone]=$'\U1F645\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_dark_skin_tone_minimally]=$'\U1F645\U1F3FF\U200D\U2640'
+emoji[person_gesturing_OK]=$'\U1F646'
+emoji[ok_person]=$'\U1F646'
+emoji[person_gesturing_OK_light_skin_tone]=$'\U1F646\U1F3FB'
+emoji[person_gesturing_OK_medium_light_skin_tone]=$'\U1F646\U1F3FC'
+emoji[person_gesturing_OK_medium_skin_tone]=$'\U1F646\U1F3FD'
+emoji[person_gesturing_OK_medium_dark_skin_tone]=$'\U1F646\U1F3FE'
+emoji[person_gesturing_OK_dark_skin_tone]=$'\U1F646\U1F3FF'
+emoji[man_gesturing_OK]=$'\U1F646\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_minimally]=$'\U1F646\U200D\U2642'
+emoji[ok_man]=$'\U1F646\U200D\U2642'
+emoji[man_gesturing_OK_light_skin_tone]=$'\U1F646\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_light_skin_tone_minimally]=$'\U1F646\U1F3FB\U200D\U2642'
+emoji[man_gesturing_OK_medium_light_skin_tone]=$'\U1F646\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_medium_light_skin_tone_minimally]=$'\U1F646\U1F3FC\U200D\U2642'
+emoji[man_gesturing_OK_medium_skin_tone]=$'\U1F646\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_medium_skin_tone_minimally]=$'\U1F646\U1F3FD\U200D\U2642'
+emoji[man_gesturing_OK_medium_dark_skin_tone]=$'\U1F646\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_medium_dark_skin_tone_minimally]=$'\U1F646\U1F3FE\U200D\U2642'
+emoji[man_gesturing_OK_dark_skin_tone]=$'\U1F646\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_dark_skin_tone_minimally]=$'\U1F646\U1F3FF\U200D\U2642'
+emoji[woman_gesturing_OK]=$'\U1F646\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_minimally]=$'\U1F646\U200D\U2640'
+emoji[ok_woman]=$'\U1F646\U200D\U2640'
+emoji[woman_gesturing_OK_light_skin_tone]=$'\U1F646\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_light_skin_tone_minimally]=$'\U1F646\U1F3FB\U200D\U2640'
+emoji[woman_gesturing_OK_medium_light_skin_tone]=$'\U1F646\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_medium_light_skin_tone_minimally]=$'\U1F646\U1F3FC\U200D\U2640'
+emoji[woman_gesturing_OK_medium_skin_tone]=$'\U1F646\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_medium_skin_tone_minimally]=$'\U1F646\U1F3FD\U200D\U2640'
+emoji[woman_gesturing_OK_medium_dark_skin_tone]=$'\U1F646\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_medium_dark_skin_tone_minimally]=$'\U1F646\U1F3FE\U200D\U2640'
+emoji[woman_gesturing_OK_dark_skin_tone]=$'\U1F646\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_dark_skin_tone_minimally]=$'\U1F646\U1F3FF\U200D\U2640'
+emoji[person_tipping_hand]=$'\U1F481'
+emoji[tipping_hand_person]=$'\U1F481'
+emoji[information_desk_person]=$'\U1F481'
+emoji[person_tipping_hand_light_skin_tone]=$'\U1F481\U1F3FB'
+emoji[person_tipping_hand_medium_light_skin_tone]=$'\U1F481\U1F3FC'
+emoji[person_tipping_hand_medium_skin_tone]=$'\U1F481\U1F3FD'
+emoji[person_tipping_hand_medium_dark_skin_tone]=$'\U1F481\U1F3FE'
+emoji[person_tipping_hand_dark_skin_tone]=$'\U1F481\U1F3FF'
+emoji[man_tipping_hand]=$'\U1F481\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_minimally]=$'\U1F481\U200D\U2642'
+emoji[tipping_hand_man]=$'\U1F481\U200D\U2642'
+emoji[sassy_man]=$'\U1F481\U200D\U2642'
+emoji[man_tipping_hand_light_skin_tone]=$'\U1F481\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_light_skin_tone_minimally]=$'\U1F481\U1F3FB\U200D\U2642'
+emoji[man_tipping_hand_medium_light_skin_tone]=$'\U1F481\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_medium_light_skin_tone_minimally]=$'\U1F481\U1F3FC\U200D\U2642'
+emoji[man_tipping_hand_medium_skin_tone]=$'\U1F481\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_medium_skin_tone_minimally]=$'\U1F481\U1F3FD\U200D\U2642'
+emoji[man_tipping_hand_medium_dark_skin_tone]=$'\U1F481\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_medium_dark_skin_tone_minimally]=$'\U1F481\U1F3FE\U200D\U2642'
+emoji[man_tipping_hand_dark_skin_tone]=$'\U1F481\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_dark_skin_tone_minimally]=$'\U1F481\U1F3FF\U200D\U2642'
+emoji[woman_tipping_hand]=$'\U1F481\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_minimally]=$'\U1F481\U200D\U2640'
+emoji[tipping_hand_woman]=$'\U1F481\U200D\U2640'
+emoji[sassy_woman]=$'\U1F481\U200D\U2640'
+emoji[woman_tipping_hand_light_skin_tone]=$'\U1F481\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_light_skin_tone_minimally]=$'\U1F481\U1F3FB\U200D\U2640'
+emoji[woman_tipping_hand_medium_light_skin_tone]=$'\U1F481\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_medium_light_skin_tone_minimally]=$'\U1F481\U1F3FC\U200D\U2640'
+emoji[woman_tipping_hand_medium_skin_tone]=$'\U1F481\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_medium_skin_tone_minimally]=$'\U1F481\U1F3FD\U200D\U2640'
+emoji[woman_tipping_hand_medium_dark_skin_tone]=$'\U1F481\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_medium_dark_skin_tone_minimally]=$'\U1F481\U1F3FE\U200D\U2640'
+emoji[woman_tipping_hand_dark_skin_tone]=$'\U1F481\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_dark_skin_tone_minimally]=$'\U1F481\U1F3FF\U200D\U2640'
+emoji[person_raising_hand]=$'\U1F64B'
+emoji[raising_hand]=$'\U1F64B'
+emoji[person_raising_hand_light_skin_tone]=$'\U1F64B\U1F3FB'
+emoji[person_raising_hand_medium_light_skin_tone]=$'\U1F64B\U1F3FC'
+emoji[person_raising_hand_medium_skin_tone]=$'\U1F64B\U1F3FD'
+emoji[person_raising_hand_medium_dark_skin_tone]=$'\U1F64B\U1F3FE'
+emoji[person_raising_hand_dark_skin_tone]=$'\U1F64B\U1F3FF'
+emoji[man_raising_hand]=$'\U1F64B\U200D\U2642\UFE0F'
+emoji[man_raising_hand_minimally]=$'\U1F64B\U200D\U2642'
+emoji[raising_hand_man]=$'\U1F64B\U200D\U2642'
+emoji[man_raising_hand_light_skin_tone]=$'\U1F64B\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_raising_hand_light_skin_tone_minimally]=$'\U1F64B\U1F3FB\U200D\U2642'
+emoji[man_raising_hand_medium_light_skin_tone]=$'\U1F64B\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_raising_hand_medium_light_skin_tone_minimally]=$'\U1F64B\U1F3FC\U200D\U2642'
+emoji[man_raising_hand_medium_skin_tone]=$'\U1F64B\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_raising_hand_medium_skin_tone_minimally]=$'\U1F64B\U1F3FD\U200D\U2642'
+emoji[man_raising_hand_medium_dark_skin_tone]=$'\U1F64B\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_raising_hand_medium_dark_skin_tone_minimally]=$'\U1F64B\U1F3FE\U200D\U2642'
+emoji[man_raising_hand_dark_skin_tone]=$'\U1F64B\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_raising_hand_dark_skin_tone_minimally]=$'\U1F64B\U1F3FF\U200D\U2642'
+emoji[woman_raising_hand]=$'\U1F64B\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_minimally]=$'\U1F64B\U200D\U2640'
+emoji[raising_hand_woman]=$'\U1F64B\U200D\U2640'
+emoji[woman_raising_hand_light_skin_tone]=$'\U1F64B\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_light_skin_tone_minimally]=$'\U1F64B\U1F3FB\U200D\U2640'
+emoji[woman_raising_hand_medium_light_skin_tone]=$'\U1F64B\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_medium_light_skin_tone_minimally]=$'\U1F64B\U1F3FC\U200D\U2640'
+emoji[woman_raising_hand_medium_skin_tone]=$'\U1F64B\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_medium_skin_tone_minimally]=$'\U1F64B\U1F3FD\U200D\U2640'
+emoji[woman_raising_hand_medium_dark_skin_tone]=$'\U1F64B\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_medium_dark_skin_tone_minimally]=$'\U1F64B\U1F3FE\U200D\U2640'
+emoji[woman_raising_hand_dark_skin_tone]=$'\U1F64B\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_dark_skin_tone_minimally]=$'\U1F64B\U1F3FF\U200D\U2640'
+emoji[deaf_person]=$'\U1F9CF'
+emoji[deaf_person_light_skin_tone]=$'\U1F9CF\U1F3FB'
+emoji[deaf_person_medium_light_skin_tone]=$'\U1F9CF\U1F3FC'
+emoji[deaf_person_medium_skin_tone]=$'\U1F9CF\U1F3FD'
+emoji[deaf_person_medium_dark_skin_tone]=$'\U1F9CF\U1F3FE'
+emoji[deaf_person_dark_skin_tone]=$'\U1F9CF\U1F3FF'
+emoji[deaf_man]=$'\U1F9CF\U200D\U2642\UFE0F'
+emoji[deaf_man_minimally]=$'\U1F9CF\U200D\U2642'
+emoji[deaf_man_light_skin_tone]=$'\U1F9CF\U1F3FB\U200D\U2642\UFE0F'
+emoji[deaf_man_light_skin_tone_minimally]=$'\U1F9CF\U1F3FB\U200D\U2642'
+emoji[deaf_man_medium_light_skin_tone]=$'\U1F9CF\U1F3FC\U200D\U2642\UFE0F'
+emoji[deaf_man_medium_light_skin_tone_minimally]=$'\U1F9CF\U1F3FC\U200D\U2642'
+emoji[deaf_man_medium_skin_tone]=$'\U1F9CF\U1F3FD\U200D\U2642\UFE0F'
+emoji[deaf_man_medium_skin_tone_minimally]=$'\U1F9CF\U1F3FD\U200D\U2642'
+emoji[deaf_man_medium_dark_skin_tone]=$'\U1F9CF\U1F3FE\U200D\U2642\UFE0F'
+emoji[deaf_man_medium_dark_skin_tone_minimally]=$'\U1F9CF\U1F3FE\U200D\U2642'
+emoji[deaf_man_dark_skin_tone]=$'\U1F9CF\U1F3FF\U200D\U2642\UFE0F'
+emoji[deaf_man_dark_skin_tone_minimally]=$'\U1F9CF\U1F3FF\U200D\U2642'
+emoji[deaf_woman]=$'\U1F9CF\U200D\U2640\UFE0F'
+emoji[deaf_woman_minimally]=$'\U1F9CF\U200D\U2640'
+emoji[deaf_woman_light_skin_tone]=$'\U1F9CF\U1F3FB\U200D\U2640\UFE0F'
+emoji[deaf_woman_light_skin_tone_minimally]=$'\U1F9CF\U1F3FB\U200D\U2640'
+emoji[deaf_woman_medium_light_skin_tone]=$'\U1F9CF\U1F3FC\U200D\U2640\UFE0F'
+emoji[deaf_woman_medium_light_skin_tone_minimally]=$'\U1F9CF\U1F3FC\U200D\U2640'
+emoji[deaf_woman_medium_skin_tone]=$'\U1F9CF\U1F3FD\U200D\U2640\UFE0F'
+emoji[deaf_woman_medium_skin_tone_minimally]=$'\U1F9CF\U1F3FD\U200D\U2640'
+emoji[deaf_woman_medium_dark_skin_tone]=$'\U1F9CF\U1F3FE\U200D\U2640\UFE0F'
+emoji[deaf_woman_medium_dark_skin_tone_minimally]=$'\U1F9CF\U1F3FE\U200D\U2640'
+emoji[deaf_woman_dark_skin_tone]=$'\U1F9CF\U1F3FF\U200D\U2640\UFE0F'
+emoji[deaf_woman_dark_skin_tone_minimally]=$'\U1F9CF\U1F3FF\U200D\U2640'
+emoji[person_bowing]=$'\U1F647'
+emoji[bow]=$'\U1F647'
+emoji[person_bowing_light_skin_tone]=$'\U1F647\U1F3FB'
+emoji[person_bowing_medium_light_skin_tone]=$'\U1F647\U1F3FC'
+emoji[person_bowing_medium_skin_tone]=$'\U1F647\U1F3FD'
+emoji[person_bowing_medium_dark_skin_tone]=$'\U1F647\U1F3FE'
+emoji[person_bowing_dark_skin_tone]=$'\U1F647\U1F3FF'
+emoji[man_bowing]=$'\U1F647\U200D\U2642\UFE0F'
+emoji[man_bowing_minimally]=$'\U1F647\U200D\U2642'
+emoji[bowing_man]=$'\U1F647\U200D\U2642'
+emoji[man_bowing_light_skin_tone]=$'\U1F647\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_bowing_light_skin_tone_minimally]=$'\U1F647\U1F3FB\U200D\U2642'
+emoji[man_bowing_medium_light_skin_tone]=$'\U1F647\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_bowing_medium_light_skin_tone_minimally]=$'\U1F647\U1F3FC\U200D\U2642'
+emoji[man_bowing_medium_skin_tone]=$'\U1F647\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_bowing_medium_skin_tone_minimally]=$'\U1F647\U1F3FD\U200D\U2642'
+emoji[man_bowing_medium_dark_skin_tone]=$'\U1F647\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_bowing_medium_dark_skin_tone_minimally]=$'\U1F647\U1F3FE\U200D\U2642'
+emoji[man_bowing_dark_skin_tone]=$'\U1F647\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_bowing_dark_skin_tone_minimally]=$'\U1F647\U1F3FF\U200D\U2642'
+emoji[woman_bowing]=$'\U1F647\U200D\U2640\UFE0F'
+emoji[woman_bowing_minimally]=$'\U1F647\U200D\U2640'
+emoji[bowing_woman]=$'\U1F647\U200D\U2640'
+emoji[woman_bowing_light_skin_tone]=$'\U1F647\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_bowing_light_skin_tone_minimally]=$'\U1F647\U1F3FB\U200D\U2640'
+emoji[woman_bowing_medium_light_skin_tone]=$'\U1F647\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_bowing_medium_light_skin_tone_minimally]=$'\U1F647\U1F3FC\U200D\U2640'
+emoji[woman_bowing_medium_skin_tone]=$'\U1F647\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_bowing_medium_skin_tone_minimally]=$'\U1F647\U1F3FD\U200D\U2640'
+emoji[woman_bowing_medium_dark_skin_tone]=$'\U1F647\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_bowing_medium_dark_skin_tone_minimally]=$'\U1F647\U1F3FE\U200D\U2640'
+emoji[woman_bowing_dark_skin_tone]=$'\U1F647\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_bowing_dark_skin_tone_minimally]=$'\U1F647\U1F3FF\U200D\U2640'
+emoji[person_facepalming]=$'\U1F926'
+emoji[facepalm]=$'\U1F926'
+emoji[person_facepalming_light_skin_tone]=$'\U1F926\U1F3FB'
+emoji[person_facepalming_medium_light_skin_tone]=$'\U1F926\U1F3FC'
+emoji[person_facepalming_medium_skin_tone]=$'\U1F926\U1F3FD'
+emoji[person_facepalming_medium_dark_skin_tone]=$'\U1F926\U1F3FE'
+emoji[person_facepalming_dark_skin_tone]=$'\U1F926\U1F3FF'
+emoji[man_facepalming]=$'\U1F926\U200D\U2642\UFE0F'
+emoji[man_facepalming_minimally]=$'\U1F926\U200D\U2642'
+emoji[man_facepalming_light_skin_tone]=$'\U1F926\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_facepalming_light_skin_tone_minimally]=$'\U1F926\U1F3FB\U200D\U2642'
+emoji[man_facepalming_medium_light_skin_tone]=$'\U1F926\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_facepalming_medium_light_skin_tone_minimally]=$'\U1F926\U1F3FC\U200D\U2642'
+emoji[man_facepalming_medium_skin_tone]=$'\U1F926\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_facepalming_medium_skin_tone_minimally]=$'\U1F926\U1F3FD\U200D\U2642'
+emoji[man_facepalming_medium_dark_skin_tone]=$'\U1F926\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_facepalming_medium_dark_skin_tone_minimally]=$'\U1F926\U1F3FE\U200D\U2642'
+emoji[man_facepalming_dark_skin_tone]=$'\U1F926\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_facepalming_dark_skin_tone_minimally]=$'\U1F926\U1F3FF\U200D\U2642'
+emoji[woman_facepalming]=$'\U1F926\U200D\U2640\UFE0F'
+emoji[woman_facepalming_minimally]=$'\U1F926\U200D\U2640'
+emoji[woman_facepalming_light_skin_tone]=$'\U1F926\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_facepalming_light_skin_tone_minimally]=$'\U1F926\U1F3FB\U200D\U2640'
+emoji[woman_facepalming_medium_light_skin_tone]=$'\U1F926\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_facepalming_medium_light_skin_tone_minimally]=$'\U1F926\U1F3FC\U200D\U2640'
+emoji[woman_facepalming_medium_skin_tone]=$'\U1F926\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_facepalming_medium_skin_tone_minimally]=$'\U1F926\U1F3FD\U200D\U2640'
+emoji[woman_facepalming_medium_dark_skin_tone]=$'\U1F926\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_facepalming_medium_dark_skin_tone_minimally]=$'\U1F926\U1F3FE\U200D\U2640'
+emoji[woman_facepalming_dark_skin_tone]=$'\U1F926\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_facepalming_dark_skin_tone_minimally]=$'\U1F926\U1F3FF\U200D\U2640'
+emoji[person_shrugging]=$'\U1F937'
+emoji[shrug]=$'\U1F937'
+emoji[person_shrugging_light_skin_tone]=$'\U1F937\U1F3FB'
+emoji[person_shrugging_medium_light_skin_tone]=$'\U1F937\U1F3FC'
+emoji[person_shrugging_medium_skin_tone]=$'\U1F937\U1F3FD'
+emoji[person_shrugging_medium_dark_skin_tone]=$'\U1F937\U1F3FE'
+emoji[person_shrugging_dark_skin_tone]=$'\U1F937\U1F3FF'
+emoji[man_shrugging]=$'\U1F937\U200D\U2642\UFE0F'
+emoji[man_shrugging_minimally]=$'\U1F937\U200D\U2642'
+emoji[man_shrugging_light_skin_tone]=$'\U1F937\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_shrugging_light_skin_tone_minimally]=$'\U1F937\U1F3FB\U200D\U2642'
+emoji[man_shrugging_medium_light_skin_tone]=$'\U1F937\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_shrugging_medium_light_skin_tone_minimally]=$'\U1F937\U1F3FC\U200D\U2642'
+emoji[man_shrugging_medium_skin_tone]=$'\U1F937\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_shrugging_medium_skin_tone_minimally]=$'\U1F937\U1F3FD\U200D\U2642'
+emoji[man_shrugging_medium_dark_skin_tone]=$'\U1F937\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_shrugging_medium_dark_skin_tone_minimally]=$'\U1F937\U1F3FE\U200D\U2642'
+emoji[man_shrugging_dark_skin_tone]=$'\U1F937\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_shrugging_dark_skin_tone_minimally]=$'\U1F937\U1F3FF\U200D\U2642'
+emoji[woman_shrugging]=$'\U1F937\U200D\U2640\UFE0F'
+emoji[woman_shrugging_minimally]=$'\U1F937\U200D\U2640'
+emoji[woman_shrugging_light_skin_tone]=$'\U1F937\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_shrugging_light_skin_tone_minimally]=$'\U1F937\U1F3FB\U200D\U2640'
+emoji[woman_shrugging_medium_light_skin_tone]=$'\U1F937\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_shrugging_medium_light_skin_tone_minimally]=$'\U1F937\U1F3FC\U200D\U2640'
+emoji[woman_shrugging_medium_skin_tone]=$'\U1F937\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_shrugging_medium_skin_tone_minimally]=$'\U1F937\U1F3FD\U200D\U2640'
+emoji[woman_shrugging_medium_dark_skin_tone]=$'\U1F937\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_shrugging_medium_dark_skin_tone_minimally]=$'\U1F937\U1F3FE\U200D\U2640'
+emoji[woman_shrugging_dark_skin_tone]=$'\U1F937\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_shrugging_dark_skin_tone_minimally]=$'\U1F937\U1F3FF\U200D\U2640'
+emoji[man_health_worker]=$'\U1F468\U200D\U2695\UFE0F'
+emoji[man_health_worker_minimally]=$'\U1F468\U200D\U2695'
+emoji[man_health_worker_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U2695\UFE0F'
+emoji[man_health_worker_light_skin_tone_minimally]=$'\U1F468\U1F3FB\U200D\U2695'
+emoji[man_health_worker_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U2695\UFE0F'
+emoji[man_health_worker_medium_light_skin_tone_minimally]=$'\U1F468\U1F3FC\U200D\U2695'
+emoji[man_health_worker_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U2695\UFE0F'
+emoji[man_health_worker_medium_skin_tone_minimally]=$'\U1F468\U1F3FD\U200D\U2695'
+emoji[man_health_worker_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U2695\UFE0F'
+emoji[man_health_worker_medium_dark_skin_tone_minimally]=$'\U1F468\U1F3FE\U200D\U2695'
+emoji[man_health_worker_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U2695\UFE0F'
+emoji[man_health_worker_dark_skin_tone_minimally]=$'\U1F468\U1F3FF\U200D\U2695'
+emoji[woman_health_worker]=$'\U1F469\U200D\U2695\UFE0F'
+emoji[woman_health_worker_minimally]=$'\U1F469\U200D\U2695'
+emoji[woman_health_worker_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U2695\UFE0F'
+emoji[woman_health_worker_light_skin_tone_minimally]=$'\U1F469\U1F3FB\U200D\U2695'
+emoji[woman_health_worker_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U2695\UFE0F'
+emoji[woman_health_worker_medium_light_skin_tone_minimally]=$'\U1F469\U1F3FC\U200D\U2695'
+emoji[woman_health_worker_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U2695\UFE0F'
+emoji[woman_health_worker_medium_skin_tone_minimally]=$'\U1F469\U1F3FD\U200D\U2695'
+emoji[woman_health_worker_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U2695\UFE0F'
+emoji[woman_health_worker_medium_dark_skin_tone_minimally]=$'\U1F469\U1F3FE\U200D\U2695'
+emoji[woman_health_worker_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U2695\UFE0F'
+emoji[woman_health_worker_dark_skin_tone_minimally]=$'\U1F469\U1F3FF\U200D\U2695'
+emoji[man_student]=$'\U1F468\U200D\U1F393'
+emoji[man_student_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F393'
+emoji[man_student_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F393'
+emoji[man_student_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F393'
+emoji[man_student_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F393'
+emoji[man_student_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F393'
+emoji[woman_student]=$'\U1F469\U200D\U1F393'
+emoji[woman_student_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F393'
+emoji[woman_student_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F393'
+emoji[woman_student_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F393'
+emoji[woman_student_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F393'
+emoji[woman_student_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F393'
+emoji[man_teacher]=$'\U1F468\U200D\U1F3EB'
+emoji[man_teacher_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F3EB'
+emoji[man_teacher_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F3EB'
+emoji[man_teacher_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F3EB'
+emoji[man_teacher_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F3EB'
+emoji[man_teacher_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F3EB'
+emoji[woman_teacher]=$'\U1F469\U200D\U1F3EB'
+emoji[woman_teacher_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F3EB'
+emoji[woman_teacher_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F3EB'
+emoji[woman_teacher_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F3EB'
+emoji[woman_teacher_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F3EB'
+emoji[woman_teacher_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F3EB'
+emoji[man_judge]=$'\U1F468\U200D\U2696\UFE0F'
+emoji[man_judge_minimally]=$'\U1F468\U200D\U2696'
+emoji[man_judge_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U2696\UFE0F'
+emoji[man_judge_light_skin_tone_minimally]=$'\U1F468\U1F3FB\U200D\U2696'
+emoji[man_judge_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U2696\UFE0F'
+emoji[man_judge_medium_light_skin_tone_minimally]=$'\U1F468\U1F3FC\U200D\U2696'
+emoji[man_judge_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U2696\UFE0F'
+emoji[man_judge_medium_skin_tone_minimally]=$'\U1F468\U1F3FD\U200D\U2696'
+emoji[man_judge_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U2696\UFE0F'
+emoji[man_judge_medium_dark_skin_tone_minimally]=$'\U1F468\U1F3FE\U200D\U2696'
+emoji[man_judge_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U2696\UFE0F'
+emoji[man_judge_dark_skin_tone_minimally]=$'\U1F468\U1F3FF\U200D\U2696'
+emoji[woman_judge]=$'\U1F469\U200D\U2696\UFE0F'
+emoji[woman_judge_minimally]=$'\U1F469\U200D\U2696'
+emoji[woman_judge_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U2696\UFE0F'
+emoji[woman_judge_light_skin_tone_minimally]=$'\U1F469\U1F3FB\U200D\U2696'
+emoji[woman_judge_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U2696\UFE0F'
+emoji[woman_judge_medium_light_skin_tone_minimally]=$'\U1F469\U1F3FC\U200D\U2696'
+emoji[woman_judge_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U2696\UFE0F'
+emoji[woman_judge_medium_skin_tone_minimally]=$'\U1F469\U1F3FD\U200D\U2696'
+emoji[woman_judge_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U2696\UFE0F'
+emoji[woman_judge_medium_dark_skin_tone_minimally]=$'\U1F469\U1F3FE\U200D\U2696'
+emoji[woman_judge_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U2696\UFE0F'
+emoji[woman_judge_dark_skin_tone_minimally]=$'\U1F469\U1F3FF\U200D\U2696'
+emoji[man_farmer]=$'\U1F468\U200D\U1F33E'
+emoji[man_farmer_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F33E'
+emoji[man_farmer_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F33E'
+emoji[man_farmer_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F33E'
+emoji[man_farmer_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F33E'
+emoji[man_farmer_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F33E'
+emoji[woman_farmer]=$'\U1F469\U200D\U1F33E'
+emoji[woman_farmer_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F33E'
+emoji[woman_farmer_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F33E'
+emoji[woman_farmer_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F33E'
+emoji[woman_farmer_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F33E'
+emoji[woman_farmer_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F33E'
+emoji[man_cook]=$'\U1F468\U200D\U1F373'
+emoji[man_cook_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F373'
+emoji[man_cook_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F373'
+emoji[man_cook_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F373'
+emoji[man_cook_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F373'
+emoji[man_cook_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F373'
+emoji[woman_cook]=$'\U1F469\U200D\U1F373'
+emoji[woman_cook_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F373'
+emoji[woman_cook_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F373'
+emoji[woman_cook_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F373'
+emoji[woman_cook_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F373'
+emoji[woman_cook_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F373'
+emoji[man_mechanic]=$'\U1F468\U200D\U1F527'
+emoji[man_mechanic_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F527'
+emoji[man_mechanic_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F527'
+emoji[man_mechanic_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F527'
+emoji[man_mechanic_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F527'
+emoji[man_mechanic_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F527'
+emoji[woman_mechanic]=$'\U1F469\U200D\U1F527'
+emoji[woman_mechanic_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F527'
+emoji[woman_mechanic_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F527'
+emoji[woman_mechanic_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F527'
+emoji[woman_mechanic_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F527'
+emoji[woman_mechanic_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F527'
+emoji[man_factory_worker]=$'\U1F468\U200D\U1F3ED'
+emoji[man_factory_worker_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F3ED'
+emoji[man_factory_worker_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F3ED'
+emoji[man_factory_worker_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F3ED'
+emoji[man_factory_worker_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F3ED'
+emoji[man_factory_worker_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F3ED'
+emoji[woman_factory_worker]=$'\U1F469\U200D\U1F3ED'
+emoji[woman_factory_worker_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F3ED'
+emoji[woman_factory_worker_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F3ED'
+emoji[woman_factory_worker_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F3ED'
+emoji[woman_factory_worker_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F3ED'
+emoji[woman_factory_worker_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F3ED'
+emoji[man_office_worker]=$'\U1F468\U200D\U1F4BC'
+emoji[man_office_worker_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F4BC'
+emoji[man_office_worker_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F4BC'
+emoji[man_office_worker_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F4BC'
+emoji[man_office_worker_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F4BC'
+emoji[man_office_worker_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F4BC'
+emoji[woman_office_worker]=$'\U1F469\U200D\U1F4BC'
+emoji[woman_office_worker_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F4BC'
+emoji[woman_office_worker_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F4BC'
+emoji[woman_office_worker_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F4BC'
+emoji[woman_office_worker_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F4BC'
+emoji[woman_office_worker_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F4BC'
+emoji[man_scientist]=$'\U1F468\U200D\U1F52C'
+emoji[man_scientist_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F52C'
+emoji[man_scientist_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F52C'
+emoji[man_scientist_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F52C'
+emoji[man_scientist_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F52C'
+emoji[man_scientist_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F52C'
+emoji[woman_scientist]=$'\U1F469\U200D\U1F52C'
+emoji[woman_scientist_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F52C'
+emoji[woman_scientist_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F52C'
+emoji[woman_scientist_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F52C'
+emoji[woman_scientist_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F52C'
+emoji[woman_scientist_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F52C'
+emoji[man_technologist]=$'\U1F468\U200D\U1F4BB'
+emoji[man_technologist_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F4BB'
+emoji[man_technologist_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F4BB'
+emoji[man_technologist_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F4BB'
+emoji[man_technologist_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F4BB'
+emoji[man_technologist_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F4BB'
+emoji[woman_technologist]=$'\U1F469\U200D\U1F4BB'
+emoji[woman_technologist_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F4BB'
+emoji[woman_technologist_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F4BB'
+emoji[woman_technologist_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F4BB'
+emoji[woman_technologist_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F4BB'
+emoji[woman_technologist_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F4BB'
+emoji[man_singer]=$'\U1F468\U200D\U1F3A4'
+emoji[man_singer_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F3A4'
+emoji[man_singer_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F3A4'
+emoji[man_singer_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F3A4'
+emoji[man_singer_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F3A4'
+emoji[man_singer_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F3A4'
+emoji[woman_singer]=$'\U1F469\U200D\U1F3A4'
+emoji[woman_singer_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F3A4'
+emoji[woman_singer_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F3A4'
+emoji[woman_singer_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F3A4'
+emoji[woman_singer_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F3A4'
+emoji[woman_singer_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F3A4'
+emoji[man_artist]=$'\U1F468\U200D\U1F3A8'
+emoji[man_artist_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F3A8'
+emoji[man_artist_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F3A8'
+emoji[man_artist_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F3A8'
+emoji[man_artist_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F3A8'
+emoji[man_artist_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F3A8'
+emoji[woman_artist]=$'\U1F469\U200D\U1F3A8'
+emoji[woman_artist_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F3A8'
+emoji[woman_artist_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F3A8'
+emoji[woman_artist_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F3A8'
+emoji[woman_artist_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F3A8'
+emoji[woman_artist_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F3A8'
+emoji[man_pilot]=$'\U1F468\U200D\U2708\UFE0F'
+emoji[man_pilot_minimally]=$'\U1F468\U200D\U2708'
+emoji[man_pilot_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U2708\UFE0F'
+emoji[man_pilot_light_skin_tone_minimally]=$'\U1F468\U1F3FB\U200D\U2708'
+emoji[man_pilot_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U2708\UFE0F'
+emoji[man_pilot_medium_light_skin_tone_minimally]=$'\U1F468\U1F3FC\U200D\U2708'
+emoji[man_pilot_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U2708\UFE0F'
+emoji[man_pilot_medium_skin_tone_minimally]=$'\U1F468\U1F3FD\U200D\U2708'
+emoji[man_pilot_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U2708\UFE0F'
+emoji[man_pilot_medium_dark_skin_tone_minimally]=$'\U1F468\U1F3FE\U200D\U2708'
+emoji[man_pilot_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U2708\UFE0F'
+emoji[man_pilot_dark_skin_tone_minimally]=$'\U1F468\U1F3FF\U200D\U2708'
+emoji[woman_pilot]=$'\U1F469\U200D\U2708\UFE0F'
+emoji[woman_pilot_minimally]=$'\U1F469\U200D\U2708'
+emoji[woman_pilot_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U2708\UFE0F'
+emoji[woman_pilot_light_skin_tone_minimally]=$'\U1F469\U1F3FB\U200D\U2708'
+emoji[woman_pilot_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U2708\UFE0F'
+emoji[woman_pilot_medium_light_skin_tone_minimally]=$'\U1F469\U1F3FC\U200D\U2708'
+emoji[woman_pilot_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U2708\UFE0F'
+emoji[woman_pilot_medium_skin_tone_minimally]=$'\U1F469\U1F3FD\U200D\U2708'
+emoji[woman_pilot_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U2708\UFE0F'
+emoji[woman_pilot_medium_dark_skin_tone_minimally]=$'\U1F469\U1F3FE\U200D\U2708'
+emoji[woman_pilot_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U2708\UFE0F'
+emoji[woman_pilot_dark_skin_tone_minimally]=$'\U1F469\U1F3FF\U200D\U2708'
+emoji[man_astronaut]=$'\U1F468\U200D\U1F680'
+emoji[man_astronaut_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F680'
+emoji[man_astronaut_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F680'
+emoji[man_astronaut_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F680'
+emoji[man_astronaut_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F680'
+emoji[man_astronaut_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F680'
+emoji[woman_astronaut]=$'\U1F469\U200D\U1F680'
+emoji[woman_astronaut_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F680'
+emoji[woman_astronaut_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F680'
+emoji[woman_astronaut_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F680'
+emoji[woman_astronaut_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F680'
+emoji[woman_astronaut_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F680'
+emoji[man_firefighter]=$'\U1F468\U200D\U1F692'
+emoji[man_firefighter_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F692'
+emoji[man_firefighter_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F692'
+emoji[man_firefighter_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F692'
+emoji[man_firefighter_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F692'
+emoji[man_firefighter_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F692'
+emoji[woman_firefighter]=$'\U1F469\U200D\U1F692'
+emoji[woman_firefighter_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F692'
+emoji[woman_firefighter_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F692'
+emoji[woman_firefighter_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F692'
+emoji[woman_firefighter_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F692'
+emoji[woman_firefighter_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F692'
+emoji[police_officer]=$'\U1F46E'
+emoji[cop]=$'\U1F46E'
+emoji[police_officer_light_skin_tone]=$'\U1F46E\U1F3FB'
+emoji[police_officer_medium_light_skin_tone]=$'\U1F46E\U1F3FC'
+emoji[police_officer_medium_skin_tone]=$'\U1F46E\U1F3FD'
+emoji[police_officer_medium_dark_skin_tone]=$'\U1F46E\U1F3FE'
+emoji[police_officer_dark_skin_tone]=$'\U1F46E\U1F3FF'
+emoji[man_police_officer]=$'\U1F46E\U200D\U2642\UFE0F'
+emoji[man_police_officer_minimally]=$'\U1F46E\U200D\U2642'
+emoji[policeman]=$'\U1F46E\U200D\U2642'
+emoji[man_police_officer_light_skin_tone]=$'\U1F46E\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_police_officer_light_skin_tone_minimally]=$'\U1F46E\U1F3FB\U200D\U2642'
+emoji[man_police_officer_medium_light_skin_tone]=$'\U1F46E\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_police_officer_medium_light_skin_tone_minimally]=$'\U1F46E\U1F3FC\U200D\U2642'
+emoji[man_police_officer_medium_skin_tone]=$'\U1F46E\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_police_officer_medium_skin_tone_minimally]=$'\U1F46E\U1F3FD\U200D\U2642'
+emoji[man_police_officer_medium_dark_skin_tone]=$'\U1F46E\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_police_officer_medium_dark_skin_tone_minimally]=$'\U1F46E\U1F3FE\U200D\U2642'
+emoji[man_police_officer_dark_skin_tone]=$'\U1F46E\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_police_officer_dark_skin_tone_minimally]=$'\U1F46E\U1F3FF\U200D\U2642'
+emoji[woman_police_officer]=$'\U1F46E\U200D\U2640\UFE0F'
+emoji[woman_police_officer_minimally]=$'\U1F46E\U200D\U2640'
+emoji[policewoman]=$'\U1F46E\U200D\U2640'
+emoji[woman_police_officer_light_skin_tone]=$'\U1F46E\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_police_officer_light_skin_tone_minimally]=$'\U1F46E\U1F3FB\U200D\U2640'
+emoji[woman_police_officer_medium_light_skin_tone]=$'\U1F46E\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_police_officer_medium_light_skin_tone_minimally]=$'\U1F46E\U1F3FC\U200D\U2640'
+emoji[woman_police_officer_medium_skin_tone]=$'\U1F46E\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_police_officer_medium_skin_tone_minimally]=$'\U1F46E\U1F3FD\U200D\U2640'
+emoji[woman_police_officer_medium_dark_skin_tone]=$'\U1F46E\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_police_officer_medium_dark_skin_tone_minimally]=$'\U1F46E\U1F3FE\U200D\U2640'
+emoji[woman_police_officer_dark_skin_tone]=$'\U1F46E\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_police_officer_dark_skin_tone_minimally]=$'\U1F46E\U1F3FF\U200D\U2640'
+emoji[detective]=$'\U1F575\UFE0F'
+emoji[detective_unqualified]=$'\U1F575'
+emoji[detective_light_skin_tone]=$'\U1F575\U1F3FB'
+emoji[detective_medium_light_skin_tone]=$'\U1F575\U1F3FC'
+emoji[detective_medium_skin_tone]=$'\U1F575\U1F3FD'
+emoji[detective_medium_dark_skin_tone]=$'\U1F575\U1F3FE'
+emoji[detective_dark_skin_tone]=$'\U1F575\U1F3FF'
+emoji[man_detective]=$'\U1F575\UFE0F\U200D\U2642\UFE0F'
+emoji[male_detective]=$'\U1F575\UFE0F\U200D\U2642\UFE0F'
+emoji[man_detective_unqualified]=$'\U1F575\U200D\U2642\UFE0F'
+emoji[man_detective_unqualified_1]=$'\U1F575\UFE0F\U200D\U2642'
+emoji[man_detective_unqualified_2]=$'\U1F575\U200D\U2642'
+emoji[man_detective_light_skin_tone]=$'\U1F575\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_detective_light_skin_tone_minimally]=$'\U1F575\U1F3FB\U200D\U2642'
+emoji[man_detective_medium_light_skin_tone]=$'\U1F575\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_detective_medium_light_skin_tone_minimally]=$'\U1F575\U1F3FC\U200D\U2642'
+emoji[man_detective_medium_skin_tone]=$'\U1F575\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_detective_medium_skin_tone_minimally]=$'\U1F575\U1F3FD\U200D\U2642'
+emoji[man_detective_medium_dark_skin_tone]=$'\U1F575\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_detective_medium_dark_skin_tone_minimally]=$'\U1F575\U1F3FE\U200D\U2642'
+emoji[man_detective_dark_skin_tone]=$'\U1F575\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_detective_dark_skin_tone_minimally]=$'\U1F575\U1F3FF\U200D\U2642'
+emoji[woman_detective]=$'\U1F575\UFE0F\U200D\U2640\UFE0F'
+emoji[female_detective]=$'\U1F575\UFE0F\U200D\U2640\UFE0F'
+emoji[woman_detective_unqualified]=$'\U1F575\U200D\U2640\UFE0F'
+emoji[woman_detective_unqualified_1]=$'\U1F575\UFE0F\U200D\U2640'
+emoji[woman_detective_unqualified_2]=$'\U1F575\U200D\U2640'
+emoji[woman_detective_light_skin_tone]=$'\U1F575\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_detective_light_skin_tone_minimally]=$'\U1F575\U1F3FB\U200D\U2640'
+emoji[woman_detective_medium_light_skin_tone]=$'\U1F575\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_detective_medium_light_skin_tone_minimally]=$'\U1F575\U1F3FC\U200D\U2640'
+emoji[woman_detective_medium_skin_tone]=$'\U1F575\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_detective_medium_skin_tone_minimally]=$'\U1F575\U1F3FD\U200D\U2640'
+emoji[woman_detective_medium_dark_skin_tone]=$'\U1F575\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_detective_medium_dark_skin_tone_minimally]=$'\U1F575\U1F3FE\U200D\U2640'
+emoji[woman_detective_dark_skin_tone]=$'\U1F575\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_detective_dark_skin_tone_minimally]=$'\U1F575\U1F3FF\U200D\U2640'
+emoji[guard]=$'\U1F482'
+emoji[guard_light_skin_tone]=$'\U1F482\U1F3FB'
+emoji[guard_medium_light_skin_tone]=$'\U1F482\U1F3FC'
+emoji[guard_medium_skin_tone]=$'\U1F482\U1F3FD'
+emoji[guard_medium_dark_skin_tone]=$'\U1F482\U1F3FE'
+emoji[guard_dark_skin_tone]=$'\U1F482\U1F3FF'
+emoji[man_guard]=$'\U1F482\U200D\U2642\UFE0F'
+emoji[man_guard_minimally]=$'\U1F482\U200D\U2642'
+emoji[guardsman]=$'\U1F482\U200D\U2642'
+emoji[man_guard_light_skin_tone]=$'\U1F482\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_guard_light_skin_tone_minimally]=$'\U1F482\U1F3FB\U200D\U2642'
+emoji[man_guard_medium_light_skin_tone]=$'\U1F482\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_guard_medium_light_skin_tone_minimally]=$'\U1F482\U1F3FC\U200D\U2642'
+emoji[man_guard_medium_skin_tone]=$'\U1F482\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_guard_medium_skin_tone_minimally]=$'\U1F482\U1F3FD\U200D\U2642'
+emoji[man_guard_medium_dark_skin_tone]=$'\U1F482\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_guard_medium_dark_skin_tone_minimally]=$'\U1F482\U1F3FE\U200D\U2642'
+emoji[man_guard_dark_skin_tone]=$'\U1F482\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_guard_dark_skin_tone_minimally]=$'\U1F482\U1F3FF\U200D\U2642'
+emoji[woman_guard]=$'\U1F482\U200D\U2640\UFE0F'
+emoji[woman_guard_minimally]=$'\U1F482\U200D\U2640'
+emoji[guardswoman]=$'\U1F482\U200D\U2640'
+emoji[woman_guard_light_skin_tone]=$'\U1F482\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_guard_light_skin_tone_minimally]=$'\U1F482\U1F3FB\U200D\U2640'
+emoji[woman_guard_medium_light_skin_tone]=$'\U1F482\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_guard_medium_light_skin_tone_minimally]=$'\U1F482\U1F3FC\U200D\U2640'
+emoji[woman_guard_medium_skin_tone]=$'\U1F482\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_guard_medium_skin_tone_minimally]=$'\U1F482\U1F3FD\U200D\U2640'
+emoji[woman_guard_medium_dark_skin_tone]=$'\U1F482\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_guard_medium_dark_skin_tone_minimally]=$'\U1F482\U1F3FE\U200D\U2640'
+emoji[woman_guard_dark_skin_tone]=$'\U1F482\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_guard_dark_skin_tone_minimally]=$'\U1F482\U1F3FF\U200D\U2640'
+emoji[construction_worker]=$'\U1F477'
+emoji[construction_worker_light_skin_tone]=$'\U1F477\U1F3FB'
+emoji[construction_worker_medium_light_skin_tone]=$'\U1F477\U1F3FC'
+emoji[construction_worker_medium_skin_tone]=$'\U1F477\U1F3FD'
+emoji[construction_worker_medium_dark_skin_tone]=$'\U1F477\U1F3FE'
+emoji[construction_worker_dark_skin_tone]=$'\U1F477\U1F3FF'
+emoji[man_construction_worker]=$'\U1F477\U200D\U2642\UFE0F'
+emoji[man_construction_worker_minimally]=$'\U1F477\U200D\U2642'
+emoji[construction_worker_man]=$'\U1F477\U200D\U2642'
+emoji[man_construction_worker_light_skin_tone]=$'\U1F477\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_construction_worker_light_skin_tone_minimally]=$'\U1F477\U1F3FB\U200D\U2642'
+emoji[man_construction_worker_medium_light_skin_tone]=$'\U1F477\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_construction_worker_medium_light_skin_tone_minimally]=$'\U1F477\U1F3FC\U200D\U2642'
+emoji[man_construction_worker_medium_skin_tone]=$'\U1F477\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_construction_worker_medium_skin_tone_minimally]=$'\U1F477\U1F3FD\U200D\U2642'
+emoji[man_construction_worker_medium_dark_skin_tone]=$'\U1F477\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_construction_worker_medium_dark_skin_tone_minimally]=$'\U1F477\U1F3FE\U200D\U2642'
+emoji[man_construction_worker_dark_skin_tone]=$'\U1F477\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_construction_worker_dark_skin_tone_minimally]=$'\U1F477\U1F3FF\U200D\U2642'
+emoji[woman_construction_worker]=$'\U1F477\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_minimally]=$'\U1F477\U200D\U2640'
+emoji[construction_worker_woman]=$'\U1F477\U200D\U2640'
+emoji[woman_construction_worker_light_skin_tone]=$'\U1F477\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_light_skin_tone_minimally]=$'\U1F477\U1F3FB\U200D\U2640'
+emoji[woman_construction_worker_medium_light_skin_tone]=$'\U1F477\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_medium_light_skin_tone_minimally]=$'\U1F477\U1F3FC\U200D\U2640'
+emoji[woman_construction_worker_medium_skin_tone]=$'\U1F477\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_medium_skin_tone_minimally]=$'\U1F477\U1F3FD\U200D\U2640'
+emoji[woman_construction_worker_medium_dark_skin_tone]=$'\U1F477\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_medium_dark_skin_tone_minimally]=$'\U1F477\U1F3FE\U200D\U2640'
+emoji[woman_construction_worker_dark_skin_tone]=$'\U1F477\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_dark_skin_tone_minimally]=$'\U1F477\U1F3FF\U200D\U2640'
+emoji[prince]=$'\U1F934'
+emoji[prince_light_skin_tone]=$'\U1F934\U1F3FB'
+emoji[prince_medium_light_skin_tone]=$'\U1F934\U1F3FC'
+emoji[prince_medium_skin_tone]=$'\U1F934\U1F3FD'
+emoji[prince_medium_dark_skin_tone]=$'\U1F934\U1F3FE'
+emoji[prince_dark_skin_tone]=$'\U1F934\U1F3FF'
+emoji[princess]=$'\U1F478'
+emoji[princess_light_skin_tone]=$'\U1F478\U1F3FB'
+emoji[princess_medium_light_skin_tone]=$'\U1F478\U1F3FC'
+emoji[princess_medium_skin_tone]=$'\U1F478\U1F3FD'
+emoji[princess_medium_dark_skin_tone]=$'\U1F478\U1F3FE'
+emoji[princess_dark_skin_tone]=$'\U1F478\U1F3FF'
+emoji[person_wearing_turban]=$'\U1F473'
+emoji[person_with_turban]=$'\U1F473'
+emoji[person_wearing_turban_light_skin_tone]=$'\U1F473\U1F3FB'
+emoji[person_wearing_turban_medium_light_skin_tone]=$'\U1F473\U1F3FC'
+emoji[person_wearing_turban_medium_skin_tone]=$'\U1F473\U1F3FD'
+emoji[person_wearing_turban_medium_dark_skin_tone]=$'\U1F473\U1F3FE'
+emoji[person_wearing_turban_dark_skin_tone]=$'\U1F473\U1F3FF'
+emoji[man_wearing_turban]=$'\U1F473\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_minimally]=$'\U1F473\U200D\U2642'
+emoji[man_with_turban]=$'\U1F473\U200D\U2642'
+emoji[man_wearing_turban_light_skin_tone]=$'\U1F473\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_light_skin_tone_minimally]=$'\U1F473\U1F3FB\U200D\U2642'
+emoji[man_wearing_turban_medium_light_skin_tone]=$'\U1F473\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_medium_light_skin_tone_minimally]=$'\U1F473\U1F3FC\U200D\U2642'
+emoji[man_wearing_turban_medium_skin_tone]=$'\U1F473\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_medium_skin_tone_minimally]=$'\U1F473\U1F3FD\U200D\U2642'
+emoji[man_wearing_turban_medium_dark_skin_tone]=$'\U1F473\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_medium_dark_skin_tone_minimally]=$'\U1F473\U1F3FE\U200D\U2642'
+emoji[man_wearing_turban_dark_skin_tone]=$'\U1F473\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_dark_skin_tone_minimally]=$'\U1F473\U1F3FF\U200D\U2642'
+emoji[woman_wearing_turban]=$'\U1F473\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_minimally]=$'\U1F473\U200D\U2640'
+emoji[woman_with_turban]=$'\U1F473\U200D\U2640'
+emoji[woman_wearing_turban_light_skin_tone]=$'\U1F473\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_light_skin_tone_minimally]=$'\U1F473\U1F3FB\U200D\U2640'
+emoji[woman_wearing_turban_medium_light_skin_tone]=$'\U1F473\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_medium_light_skin_tone_minimally]=$'\U1F473\U1F3FC\U200D\U2640'
+emoji[woman_wearing_turban_medium_skin_tone]=$'\U1F473\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_medium_skin_tone_minimally]=$'\U1F473\U1F3FD\U200D\U2640'
+emoji[woman_wearing_turban_medium_dark_skin_tone]=$'\U1F473\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_medium_dark_skin_tone_minimally]=$'\U1F473\U1F3FE\U200D\U2640'
+emoji[woman_wearing_turban_dark_skin_tone]=$'\U1F473\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_dark_skin_tone_minimally]=$'\U1F473\U1F3FF\U200D\U2640'
+emoji[man_with_Chinese_cap]=$'\U1F472'
+emoji[man_with_gua_pi_mao]=$'\U1F472'
+emoji[man_with_Chinese_cap_light_skin_tone]=$'\U1F472\U1F3FB'
+emoji[man_with_Chinese_cap_medium_light_skin_tone]=$'\U1F472\U1F3FC'
+emoji[man_with_Chinese_cap_medium_skin_tone]=$'\U1F472\U1F3FD'
+emoji[man_with_Chinese_cap_medium_dark_skin_tone]=$'\U1F472\U1F3FE'
+emoji[man_with_Chinese_cap_dark_skin_tone]=$'\U1F472\U1F3FF'
+emoji[woman_with_headscarf]=$'\U1F9D5'
+emoji[woman_with_headscarf_light_skin_tone]=$'\U1F9D5\U1F3FB'
+emoji[woman_with_headscarf_medium_light_skin_tone]=$'\U1F9D5\U1F3FC'
+emoji[woman_with_headscarf_medium_skin_tone]=$'\U1F9D5\U1F3FD'
+emoji[woman_with_headscarf_medium_dark_skin_tone]=$'\U1F9D5\U1F3FE'
+emoji[woman_with_headscarf_dark_skin_tone]=$'\U1F9D5\U1F3FF'
+emoji[man_in_tuxedo]=$'\U1F935'
+emoji[man_in_tuxedo_light_skin_tone]=$'\U1F935\U1F3FB'
+emoji[man_in_tuxedo_medium_light_skin_tone]=$'\U1F935\U1F3FC'
+emoji[man_in_tuxedo_medium_skin_tone]=$'\U1F935\U1F3FD'
+emoji[man_in_tuxedo_medium_dark_skin_tone]=$'\U1F935\U1F3FE'
+emoji[man_in_tuxedo_dark_skin_tone]=$'\U1F935\U1F3FF'
+emoji[bride_with_veil]=$'\U1F470'
+emoji[bride_with_veil_light_skin_tone]=$'\U1F470\U1F3FB'
+emoji[bride_with_veil_medium_light_skin_tone]=$'\U1F470\U1F3FC'
+emoji[bride_with_veil_medium_skin_tone]=$'\U1F470\U1F3FD'
+emoji[bride_with_veil_medium_dark_skin_tone]=$'\U1F470\U1F3FE'
+emoji[bride_with_veil_dark_skin_tone]=$'\U1F470\U1F3FF'
+emoji[pregnant_woman]=$'\U1F930'
+emoji[pregnant_woman_light_skin_tone]=$'\U1F930\U1F3FB'
+emoji[pregnant_woman_medium_light_skin_tone]=$'\U1F930\U1F3FC'
+emoji[pregnant_woman_medium_skin_tone]=$'\U1F930\U1F3FD'
+emoji[pregnant_woman_medium_dark_skin_tone]=$'\U1F930\U1F3FE'
+emoji[pregnant_woman_dark_skin_tone]=$'\U1F930\U1F3FF'
+emoji[breast_feeding]=$'\U1F931'
+emoji[breast_feeding_light_skin_tone]=$'\U1F931\U1F3FB'
+emoji[breast_feeding_medium_light_skin_tone]=$'\U1F931\U1F3FC'
+emoji[breast_feeding_medium_skin_tone]=$'\U1F931\U1F3FD'
+emoji[breast_feeding_medium_dark_skin_tone]=$'\U1F931\U1F3FE'
+emoji[breast_feeding_dark_skin_tone]=$'\U1F931\U1F3FF'
+emoji[baby_angel]=$'\U1F47C'
+emoji[angel]=$'\U1F47C'
+emoji[baby_angel_light_skin_tone]=$'\U1F47C\U1F3FB'
+emoji[baby_angel_medium_light_skin_tone]=$'\U1F47C\U1F3FC'
+emoji[baby_angel_medium_skin_tone]=$'\U1F47C\U1F3FD'
+emoji[baby_angel_medium_dark_skin_tone]=$'\U1F47C\U1F3FE'
+emoji[baby_angel_dark_skin_tone]=$'\U1F47C\U1F3FF'
+emoji[Santa_Claus]=$'\U1F385'
+emoji[santa]=$'\U1F385'
+emoji[Santa_Claus_light_skin_tone]=$'\U1F385\U1F3FB'
+emoji[Santa_Claus_medium_light_skin_tone]=$'\U1F385\U1F3FC'
+emoji[Santa_Claus_medium_skin_tone]=$'\U1F385\U1F3FD'
+emoji[Santa_Claus_medium_dark_skin_tone]=$'\U1F385\U1F3FE'
+emoji[Santa_Claus_dark_skin_tone]=$'\U1F385\U1F3FF'
+emoji[Mrs_Claus]=$'\U1F936'
+emoji[mrs_claus]=$'\U1F936'
+emoji[Mrs_Claus_light_skin_tone]=$'\U1F936\U1F3FB'
+emoji[Mrs_Claus_medium_light_skin_tone]=$'\U1F936\U1F3FC'
+emoji[Mrs_Claus_medium_skin_tone]=$'\U1F936\U1F3FD'
+emoji[Mrs_Claus_medium_dark_skin_tone]=$'\U1F936\U1F3FE'
+emoji[Mrs_Claus_dark_skin_tone]=$'\U1F936\U1F3FF'
+emoji[superhero]=$'\U1F9B8'
+emoji[superhero_light_skin_tone]=$'\U1F9B8\U1F3FB'
+emoji[superhero_medium_light_skin_tone]=$'\U1F9B8\U1F3FC'
+emoji[superhero_medium_skin_tone]=$'\U1F9B8\U1F3FD'
+emoji[superhero_medium_dark_skin_tone]=$'\U1F9B8\U1F3FE'
+emoji[superhero_dark_skin_tone]=$'\U1F9B8\U1F3FF'
+emoji[man_superhero]=$'\U1F9B8\U200D\U2642\UFE0F'
+emoji[man_superhero_minimally]=$'\U1F9B8\U200D\U2642'
+emoji[superhero_man]=$'\U1F9B8\U200D\U2642'
+emoji[man_superhero_light_skin_tone]=$'\U1F9B8\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_superhero_light_skin_tone_minimally]=$'\U1F9B8\U1F3FB\U200D\U2642'
+emoji[man_superhero_medium_light_skin_tone]=$'\U1F9B8\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_superhero_medium_light_skin_tone_minimally]=$'\U1F9B8\U1F3FC\U200D\U2642'
+emoji[man_superhero_medium_skin_tone]=$'\U1F9B8\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_superhero_medium_skin_tone_minimally]=$'\U1F9B8\U1F3FD\U200D\U2642'
+emoji[man_superhero_medium_dark_skin_tone]=$'\U1F9B8\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_superhero_medium_dark_skin_tone_minimally]=$'\U1F9B8\U1F3FE\U200D\U2642'
+emoji[man_superhero_dark_skin_tone]=$'\U1F9B8\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_superhero_dark_skin_tone_minimally]=$'\U1F9B8\U1F3FF\U200D\U2642'
+emoji[woman_superhero]=$'\U1F9B8\U200D\U2640\UFE0F'
+emoji[woman_superhero_minimally]=$'\U1F9B8\U200D\U2640'
+emoji[superhero_woman]=$'\U1F9B8\U200D\U2640'
+emoji[woman_superhero_light_skin_tone]=$'\U1F9B8\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_superhero_light_skin_tone_minimally]=$'\U1F9B8\U1F3FB\U200D\U2640'
+emoji[woman_superhero_medium_light_skin_tone]=$'\U1F9B8\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_superhero_medium_light_skin_tone_minimally]=$'\U1F9B8\U1F3FC\U200D\U2640'
+emoji[woman_superhero_medium_skin_tone]=$'\U1F9B8\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_superhero_medium_skin_tone_minimally]=$'\U1F9B8\U1F3FD\U200D\U2640'
+emoji[woman_superhero_medium_dark_skin_tone]=$'\U1F9B8\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_superhero_medium_dark_skin_tone_minimally]=$'\U1F9B8\U1F3FE\U200D\U2640'
+emoji[woman_superhero_dark_skin_tone]=$'\U1F9B8\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_superhero_dark_skin_tone_minimally]=$'\U1F9B8\U1F3FF\U200D\U2640'
+emoji[supervillain]=$'\U1F9B9'
+emoji[supervillain_light_skin_tone]=$'\U1F9B9\U1F3FB'
+emoji[supervillain_medium_light_skin_tone]=$'\U1F9B9\U1F3FC'
+emoji[supervillain_medium_skin_tone]=$'\U1F9B9\U1F3FD'
+emoji[supervillain_medium_dark_skin_tone]=$'\U1F9B9\U1F3FE'
+emoji[supervillain_dark_skin_tone]=$'\U1F9B9\U1F3FF'
+emoji[man_supervillain]=$'\U1F9B9\U200D\U2642\UFE0F'
+emoji[man_supervillain_minimally]=$'\U1F9B9\U200D\U2642'
+emoji[supervillain_man]=$'\U1F9B9\U200D\U2642'
+emoji[man_supervillain_light_skin_tone]=$'\U1F9B9\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_supervillain_light_skin_tone_minimally]=$'\U1F9B9\U1F3FB\U200D\U2642'
+emoji[man_supervillain_medium_light_skin_tone]=$'\U1F9B9\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_supervillain_medium_light_skin_tone_minimally]=$'\U1F9B9\U1F3FC\U200D\U2642'
+emoji[man_supervillain_medium_skin_tone]=$'\U1F9B9\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_supervillain_medium_skin_tone_minimally]=$'\U1F9B9\U1F3FD\U200D\U2642'
+emoji[man_supervillain_medium_dark_skin_tone]=$'\U1F9B9\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_supervillain_medium_dark_skin_tone_minimally]=$'\U1F9B9\U1F3FE\U200D\U2642'
+emoji[man_supervillain_dark_skin_tone]=$'\U1F9B9\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_supervillain_dark_skin_tone_minimally]=$'\U1F9B9\U1F3FF\U200D\U2642'
+emoji[woman_supervillain]=$'\U1F9B9\U200D\U2640\UFE0F'
+emoji[woman_supervillain_minimally]=$'\U1F9B9\U200D\U2640'
+emoji[supervillain_woman]=$'\U1F9B9\U200D\U2640'
+emoji[woman_supervillain_light_skin_tone]=$'\U1F9B9\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_supervillain_light_skin_tone_minimally]=$'\U1F9B9\U1F3FB\U200D\U2640'
+emoji[woman_supervillain_medium_light_skin_tone]=$'\U1F9B9\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_supervillain_medium_light_skin_tone_minimally]=$'\U1F9B9\U1F3FC\U200D\U2640'
+emoji[woman_supervillain_medium_skin_tone]=$'\U1F9B9\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_supervillain_medium_skin_tone_minimally]=$'\U1F9B9\U1F3FD\U200D\U2640'
+emoji[woman_supervillain_medium_dark_skin_tone]=$'\U1F9B9\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_supervillain_medium_dark_skin_tone_minimally]=$'\U1F9B9\U1F3FE\U200D\U2640'
+emoji[woman_supervillain_dark_skin_tone]=$'\U1F9B9\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_supervillain_dark_skin_tone_minimally]=$'\U1F9B9\U1F3FF\U200D\U2640'
+emoji[mage]=$'\U1F9D9'
+emoji[mage_light_skin_tone]=$'\U1F9D9\U1F3FB'
+emoji[mage_medium_light_skin_tone]=$'\U1F9D9\U1F3FC'
+emoji[mage_medium_skin_tone]=$'\U1F9D9\U1F3FD'
+emoji[mage_medium_dark_skin_tone]=$'\U1F9D9\U1F3FE'
+emoji[mage_dark_skin_tone]=$'\U1F9D9\U1F3FF'
+emoji[man_mage]=$'\U1F9D9\U200D\U2642\UFE0F'
+emoji[man_mage_minimally]=$'\U1F9D9\U200D\U2642'
+emoji[mage_man]=$'\U1F9D9\U200D\U2642'
+emoji[man_mage_light_skin_tone]=$'\U1F9D9\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_mage_light_skin_tone_minimally]=$'\U1F9D9\U1F3FB\U200D\U2642'
+emoji[man_mage_medium_light_skin_tone]=$'\U1F9D9\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_mage_medium_light_skin_tone_minimally]=$'\U1F9D9\U1F3FC\U200D\U2642'
+emoji[man_mage_medium_skin_tone]=$'\U1F9D9\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_mage_medium_skin_tone_minimally]=$'\U1F9D9\U1F3FD\U200D\U2642'
+emoji[man_mage_medium_dark_skin_tone]=$'\U1F9D9\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_mage_medium_dark_skin_tone_minimally]=$'\U1F9D9\U1F3FE\U200D\U2642'
+emoji[man_mage_dark_skin_tone]=$'\U1F9D9\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_mage_dark_skin_tone_minimally]=$'\U1F9D9\U1F3FF\U200D\U2642'
+emoji[woman_mage]=$'\U1F9D9\U200D\U2640\UFE0F'
+emoji[woman_mage_minimally]=$'\U1F9D9\U200D\U2640'
+emoji[mage_woman]=$'\U1F9D9\U200D\U2640'
+emoji[woman_mage_light_skin_tone]=$'\U1F9D9\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_mage_light_skin_tone_minimally]=$'\U1F9D9\U1F3FB\U200D\U2640'
+emoji[woman_mage_medium_light_skin_tone]=$'\U1F9D9\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_mage_medium_light_skin_tone_minimally]=$'\U1F9D9\U1F3FC\U200D\U2640'
+emoji[woman_mage_medium_skin_tone]=$'\U1F9D9\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_mage_medium_skin_tone_minimally]=$'\U1F9D9\U1F3FD\U200D\U2640'
+emoji[woman_mage_medium_dark_skin_tone]=$'\U1F9D9\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_mage_medium_dark_skin_tone_minimally]=$'\U1F9D9\U1F3FE\U200D\U2640'
+emoji[woman_mage_dark_skin_tone]=$'\U1F9D9\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_mage_dark_skin_tone_minimally]=$'\U1F9D9\U1F3FF\U200D\U2640'
+emoji[fairy]=$'\U1F9DA'
+emoji[fairy_light_skin_tone]=$'\U1F9DA\U1F3FB'
+emoji[fairy_medium_light_skin_tone]=$'\U1F9DA\U1F3FC'
+emoji[fairy_medium_skin_tone]=$'\U1F9DA\U1F3FD'
+emoji[fairy_medium_dark_skin_tone]=$'\U1F9DA\U1F3FE'
+emoji[fairy_dark_skin_tone]=$'\U1F9DA\U1F3FF'
+emoji[man_fairy]=$'\U1F9DA\U200D\U2642\UFE0F'
+emoji[man_fairy_minimally]=$'\U1F9DA\U200D\U2642'
+emoji[fairy_man]=$'\U1F9DA\U200D\U2642'
+emoji[man_fairy_light_skin_tone]=$'\U1F9DA\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_fairy_light_skin_tone_minimally]=$'\U1F9DA\U1F3FB\U200D\U2642'
+emoji[man_fairy_medium_light_skin_tone]=$'\U1F9DA\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_fairy_medium_light_skin_tone_minimally]=$'\U1F9DA\U1F3FC\U200D\U2642'
+emoji[man_fairy_medium_skin_tone]=$'\U1F9DA\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_fairy_medium_skin_tone_minimally]=$'\U1F9DA\U1F3FD\U200D\U2642'
+emoji[man_fairy_medium_dark_skin_tone]=$'\U1F9DA\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_fairy_medium_dark_skin_tone_minimally]=$'\U1F9DA\U1F3FE\U200D\U2642'
+emoji[man_fairy_dark_skin_tone]=$'\U1F9DA\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_fairy_dark_skin_tone_minimally]=$'\U1F9DA\U1F3FF\U200D\U2642'
+emoji[woman_fairy]=$'\U1F9DA\U200D\U2640\UFE0F'
+emoji[woman_fairy_minimally]=$'\U1F9DA\U200D\U2640'
+emoji[fairy_woman]=$'\U1F9DA\U200D\U2640'
+emoji[woman_fairy_light_skin_tone]=$'\U1F9DA\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_fairy_light_skin_tone_minimally]=$'\U1F9DA\U1F3FB\U200D\U2640'
+emoji[woman_fairy_medium_light_skin_tone]=$'\U1F9DA\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_fairy_medium_light_skin_tone_minimally]=$'\U1F9DA\U1F3FC\U200D\U2640'
+emoji[woman_fairy_medium_skin_tone]=$'\U1F9DA\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_fairy_medium_skin_tone_minimally]=$'\U1F9DA\U1F3FD\U200D\U2640'
+emoji[woman_fairy_medium_dark_skin_tone]=$'\U1F9DA\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_fairy_medium_dark_skin_tone_minimally]=$'\U1F9DA\U1F3FE\U200D\U2640'
+emoji[woman_fairy_dark_skin_tone]=$'\U1F9DA\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_fairy_dark_skin_tone_minimally]=$'\U1F9DA\U1F3FF\U200D\U2640'
+emoji[vampire]=$'\U1F9DB'
+emoji[vampire_light_skin_tone]=$'\U1F9DB\U1F3FB'
+emoji[vampire_medium_light_skin_tone]=$'\U1F9DB\U1F3FC'
+emoji[vampire_medium_skin_tone]=$'\U1F9DB\U1F3FD'
+emoji[vampire_medium_dark_skin_tone]=$'\U1F9DB\U1F3FE'
+emoji[vampire_dark_skin_tone]=$'\U1F9DB\U1F3FF'
+emoji[man_vampire]=$'\U1F9DB\U200D\U2642\UFE0F'
+emoji[man_vampire_minimally]=$'\U1F9DB\U200D\U2642'
+emoji[vampire_man]=$'\U1F9DB\U200D\U2642'
+emoji[man_vampire_light_skin_tone]=$'\U1F9DB\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_vampire_light_skin_tone_minimally]=$'\U1F9DB\U1F3FB\U200D\U2642'
+emoji[man_vampire_medium_light_skin_tone]=$'\U1F9DB\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_vampire_medium_light_skin_tone_minimally]=$'\U1F9DB\U1F3FC\U200D\U2642'
+emoji[man_vampire_medium_skin_tone]=$'\U1F9DB\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_vampire_medium_skin_tone_minimally]=$'\U1F9DB\U1F3FD\U200D\U2642'
+emoji[man_vampire_medium_dark_skin_tone]=$'\U1F9DB\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_vampire_medium_dark_skin_tone_minimally]=$'\U1F9DB\U1F3FE\U200D\U2642'
+emoji[man_vampire_dark_skin_tone]=$'\U1F9DB\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_vampire_dark_skin_tone_minimally]=$'\U1F9DB\U1F3FF\U200D\U2642'
+emoji[woman_vampire]=$'\U1F9DB\U200D\U2640\UFE0F'
+emoji[woman_vampire_minimally]=$'\U1F9DB\U200D\U2640'
+emoji[vampire_woman]=$'\U1F9DB\U200D\U2640'
+emoji[woman_vampire_light_skin_tone]=$'\U1F9DB\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_vampire_light_skin_tone_minimally]=$'\U1F9DB\U1F3FB\U200D\U2640'
+emoji[woman_vampire_medium_light_skin_tone]=$'\U1F9DB\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_vampire_medium_light_skin_tone_minimally]=$'\U1F9DB\U1F3FC\U200D\U2640'
+emoji[woman_vampire_medium_skin_tone]=$'\U1F9DB\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_vampire_medium_skin_tone_minimally]=$'\U1F9DB\U1F3FD\U200D\U2640'
+emoji[woman_vampire_medium_dark_skin_tone]=$'\U1F9DB\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_vampire_medium_dark_skin_tone_minimally]=$'\U1F9DB\U1F3FE\U200D\U2640'
+emoji[woman_vampire_dark_skin_tone]=$'\U1F9DB\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_vampire_dark_skin_tone_minimally]=$'\U1F9DB\U1F3FF\U200D\U2640'
+emoji[merperson]=$'\U1F9DC'
+emoji[merperson_light_skin_tone]=$'\U1F9DC\U1F3FB'
+emoji[merperson_medium_light_skin_tone]=$'\U1F9DC\U1F3FC'
+emoji[merperson_medium_skin_tone]=$'\U1F9DC\U1F3FD'
+emoji[merperson_medium_dark_skin_tone]=$'\U1F9DC\U1F3FE'
+emoji[merperson_dark_skin_tone]=$'\U1F9DC\U1F3FF'
+emoji[merman]=$'\U1F9DC\U200D\U2642\UFE0F'
+emoji[merman_minimally]=$'\U1F9DC\U200D\U2642'
+emoji[merman_light_skin_tone]=$'\U1F9DC\U1F3FB\U200D\U2642\UFE0F'
+emoji[merman_light_skin_tone_minimally]=$'\U1F9DC\U1F3FB\U200D\U2642'
+emoji[merman_medium_light_skin_tone]=$'\U1F9DC\U1F3FC\U200D\U2642\UFE0F'
+emoji[merman_medium_light_skin_tone_minimally]=$'\U1F9DC\U1F3FC\U200D\U2642'
+emoji[merman_medium_skin_tone]=$'\U1F9DC\U1F3FD\U200D\U2642\UFE0F'
+emoji[merman_medium_skin_tone_minimally]=$'\U1F9DC\U1F3FD\U200D\U2642'
+emoji[merman_medium_dark_skin_tone]=$'\U1F9DC\U1F3FE\U200D\U2642\UFE0F'
+emoji[merman_medium_dark_skin_tone_minimally]=$'\U1F9DC\U1F3FE\U200D\U2642'
+emoji[merman_dark_skin_tone]=$'\U1F9DC\U1F3FF\U200D\U2642\UFE0F'
+emoji[merman_dark_skin_tone_minimally]=$'\U1F9DC\U1F3FF\U200D\U2642'
+emoji[mermaid]=$'\U1F9DC\U200D\U2640\UFE0F'
+emoji[mermaid_minimally]=$'\U1F9DC\U200D\U2640'
+emoji[mermaid_light_skin_tone]=$'\U1F9DC\U1F3FB\U200D\U2640\UFE0F'
+emoji[mermaid_light_skin_tone_minimally]=$'\U1F9DC\U1F3FB\U200D\U2640'
+emoji[mermaid_medium_light_skin_tone]=$'\U1F9DC\U1F3FC\U200D\U2640\UFE0F'
+emoji[mermaid_medium_light_skin_tone_minimally]=$'\U1F9DC\U1F3FC\U200D\U2640'
+emoji[mermaid_medium_skin_tone]=$'\U1F9DC\U1F3FD\U200D\U2640\UFE0F'
+emoji[mermaid_medium_skin_tone_minimally]=$'\U1F9DC\U1F3FD\U200D\U2640'
+emoji[mermaid_medium_dark_skin_tone]=$'\U1F9DC\U1F3FE\U200D\U2640\UFE0F'
+emoji[mermaid_medium_dark_skin_tone_minimally]=$'\U1F9DC\U1F3FE\U200D\U2640'
+emoji[mermaid_dark_skin_tone]=$'\U1F9DC\U1F3FF\U200D\U2640\UFE0F'
+emoji[mermaid_dark_skin_tone_minimally]=$'\U1F9DC\U1F3FF\U200D\U2640'
+emoji[elf]=$'\U1F9DD'
+emoji[elf_light_skin_tone]=$'\U1F9DD\U1F3FB'
+emoji[elf_medium_light_skin_tone]=$'\U1F9DD\U1F3FC'
+emoji[elf_medium_skin_tone]=$'\U1F9DD\U1F3FD'
+emoji[elf_medium_dark_skin_tone]=$'\U1F9DD\U1F3FE'
+emoji[elf_dark_skin_tone]=$'\U1F9DD\U1F3FF'
+emoji[man_elf]=$'\U1F9DD\U200D\U2642\UFE0F'
+emoji[man_elf_minimally]=$'\U1F9DD\U200D\U2642'
+emoji[elf_man]=$'\U1F9DD\U200D\U2642'
+emoji[man_elf_light_skin_tone]=$'\U1F9DD\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_elf_light_skin_tone_minimally]=$'\U1F9DD\U1F3FB\U200D\U2642'
+emoji[man_elf_medium_light_skin_tone]=$'\U1F9DD\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_elf_medium_light_skin_tone_minimally]=$'\U1F9DD\U1F3FC\U200D\U2642'
+emoji[man_elf_medium_skin_tone]=$'\U1F9DD\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_elf_medium_skin_tone_minimally]=$'\U1F9DD\U1F3FD\U200D\U2642'
+emoji[man_elf_medium_dark_skin_tone]=$'\U1F9DD\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_elf_medium_dark_skin_tone_minimally]=$'\U1F9DD\U1F3FE\U200D\U2642'
+emoji[man_elf_dark_skin_tone]=$'\U1F9DD\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_elf_dark_skin_tone_minimally]=$'\U1F9DD\U1F3FF\U200D\U2642'
+emoji[woman_elf]=$'\U1F9DD\U200D\U2640\UFE0F'
+emoji[woman_elf_minimally]=$'\U1F9DD\U200D\U2640'
+emoji[elf_woman]=$'\U1F9DD\U200D\U2640'
+emoji[woman_elf_light_skin_tone]=$'\U1F9DD\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_elf_light_skin_tone_minimally]=$'\U1F9DD\U1F3FB\U200D\U2640'
+emoji[woman_elf_medium_light_skin_tone]=$'\U1F9DD\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_elf_medium_light_skin_tone_minimally]=$'\U1F9DD\U1F3FC\U200D\U2640'
+emoji[woman_elf_medium_skin_tone]=$'\U1F9DD\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_elf_medium_skin_tone_minimally]=$'\U1F9DD\U1F3FD\U200D\U2640'
+emoji[woman_elf_medium_dark_skin_tone]=$'\U1F9DD\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_elf_medium_dark_skin_tone_minimally]=$'\U1F9DD\U1F3FE\U200D\U2640'
+emoji[woman_elf_dark_skin_tone]=$'\U1F9DD\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_elf_dark_skin_tone_minimally]=$'\U1F9DD\U1F3FF\U200D\U2640'
+emoji[genie]=$'\U1F9DE'
+emoji[man_genie]=$'\U1F9DE\U200D\U2642\UFE0F'
+emoji[man_genie_minimally]=$'\U1F9DE\U200D\U2642'
+emoji[genie_man]=$'\U1F9DE\U200D\U2642'
+emoji[woman_genie]=$'\U1F9DE\U200D\U2640\UFE0F'
+emoji[woman_genie_minimally]=$'\U1F9DE\U200D\U2640'
+emoji[genie_woman]=$'\U1F9DE\U200D\U2640'
+emoji[zombie]=$'\U1F9DF'
+emoji[man_zombie]=$'\U1F9DF\U200D\U2642\UFE0F'
+emoji[man_zombie_minimally]=$'\U1F9DF\U200D\U2642'
+emoji[zombie_man]=$'\U1F9DF\U200D\U2642'
+emoji[woman_zombie]=$'\U1F9DF\U200D\U2640\UFE0F'
+emoji[woman_zombie_minimally]=$'\U1F9DF\U200D\U2640'
+emoji[zombie_woman]=$'\U1F9DF\U200D\U2640'
+emoji[person_getting_massage]=$'\U1F486'
+emoji[massage]=$'\U1F486'
+emoji[person_getting_massage_light_skin_tone]=$'\U1F486\U1F3FB'
+emoji[person_getting_massage_medium_light_skin_tone]=$'\U1F486\U1F3FC'
+emoji[person_getting_massage_medium_skin_tone]=$'\U1F486\U1F3FD'
+emoji[person_getting_massage_medium_dark_skin_tone]=$'\U1F486\U1F3FE'
+emoji[person_getting_massage_dark_skin_tone]=$'\U1F486\U1F3FF'
+emoji[man_getting_massage]=$'\U1F486\U200D\U2642\UFE0F'
+emoji[man_getting_massage_minimally]=$'\U1F486\U200D\U2642'
+emoji[massage_man]=$'\U1F486\U200D\U2642'
+emoji[man_getting_massage_light_skin_tone]=$'\U1F486\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_getting_massage_light_skin_tone_minimally]=$'\U1F486\U1F3FB\U200D\U2642'
+emoji[man_getting_massage_medium_light_skin_tone]=$'\U1F486\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_getting_massage_medium_light_skin_tone_minimally]=$'\U1F486\U1F3FC\U200D\U2642'
+emoji[man_getting_massage_medium_skin_tone]=$'\U1F486\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_getting_massage_medium_skin_tone_minimally]=$'\U1F486\U1F3FD\U200D\U2642'
+emoji[man_getting_massage_medium_dark_skin_tone]=$'\U1F486\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_getting_massage_medium_dark_skin_tone_minimally]=$'\U1F486\U1F3FE\U200D\U2642'
+emoji[man_getting_massage_dark_skin_tone]=$'\U1F486\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_getting_massage_dark_skin_tone_minimally]=$'\U1F486\U1F3FF\U200D\U2642'
+emoji[woman_getting_massage]=$'\U1F486\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_minimally]=$'\U1F486\U200D\U2640'
+emoji[massage_woman]=$'\U1F486\U200D\U2640'
+emoji[woman_getting_massage_light_skin_tone]=$'\U1F486\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_light_skin_tone_minimally]=$'\U1F486\U1F3FB\U200D\U2640'
+emoji[woman_getting_massage_medium_light_skin_tone]=$'\U1F486\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_medium_light_skin_tone_minimally]=$'\U1F486\U1F3FC\U200D\U2640'
+emoji[woman_getting_massage_medium_skin_tone]=$'\U1F486\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_medium_skin_tone_minimally]=$'\U1F486\U1F3FD\U200D\U2640'
+emoji[woman_getting_massage_medium_dark_skin_tone]=$'\U1F486\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_medium_dark_skin_tone_minimally]=$'\U1F486\U1F3FE\U200D\U2640'
+emoji[woman_getting_massage_dark_skin_tone]=$'\U1F486\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_dark_skin_tone_minimally]=$'\U1F486\U1F3FF\U200D\U2640'
+emoji[person_getting_haircut]=$'\U1F487'
+emoji[haircut]=$'\U1F487'
+emoji[person_getting_haircut_light_skin_tone]=$'\U1F487\U1F3FB'
+emoji[person_getting_haircut_medium_light_skin_tone]=$'\U1F487\U1F3FC'
+emoji[person_getting_haircut_medium_skin_tone]=$'\U1F487\U1F3FD'
+emoji[person_getting_haircut_medium_dark_skin_tone]=$'\U1F487\U1F3FE'
+emoji[person_getting_haircut_dark_skin_tone]=$'\U1F487\U1F3FF'
+emoji[man_getting_haircut]=$'\U1F487\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_minimally]=$'\U1F487\U200D\U2642'
+emoji[haircut_man]=$'\U1F487\U200D\U2642'
+emoji[man_getting_haircut_light_skin_tone]=$'\U1F487\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_light_skin_tone_minimally]=$'\U1F487\U1F3FB\U200D\U2642'
+emoji[man_getting_haircut_medium_light_skin_tone]=$'\U1F487\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_medium_light_skin_tone_minimally]=$'\U1F487\U1F3FC\U200D\U2642'
+emoji[man_getting_haircut_medium_skin_tone]=$'\U1F487\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_medium_skin_tone_minimally]=$'\U1F487\U1F3FD\U200D\U2642'
+emoji[man_getting_haircut_medium_dark_skin_tone]=$'\U1F487\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_medium_dark_skin_tone_minimally]=$'\U1F487\U1F3FE\U200D\U2642'
+emoji[man_getting_haircut_dark_skin_tone]=$'\U1F487\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_dark_skin_tone_minimally]=$'\U1F487\U1F3FF\U200D\U2642'
+emoji[woman_getting_haircut]=$'\U1F487\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_minimally]=$'\U1F487\U200D\U2640'
+emoji[haircut_woman]=$'\U1F487\U200D\U2640'
+emoji[woman_getting_haircut_light_skin_tone]=$'\U1F487\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_light_skin_tone_minimally]=$'\U1F487\U1F3FB\U200D\U2640'
+emoji[woman_getting_haircut_medium_light_skin_tone]=$'\U1F487\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_medium_light_skin_tone_minimally]=$'\U1F487\U1F3FC\U200D\U2640'
+emoji[woman_getting_haircut_medium_skin_tone]=$'\U1F487\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_medium_skin_tone_minimally]=$'\U1F487\U1F3FD\U200D\U2640'
+emoji[woman_getting_haircut_medium_dark_skin_tone]=$'\U1F487\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_medium_dark_skin_tone_minimally]=$'\U1F487\U1F3FE\U200D\U2640'
+emoji[woman_getting_haircut_dark_skin_tone]=$'\U1F487\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_dark_skin_tone_minimally]=$'\U1F487\U1F3FF\U200D\U2640'
+emoji[person_walking]=$'\U1F6B6'
+emoji[walking]=$'\U1F6B6'
+emoji[person_walking_light_skin_tone]=$'\U1F6B6\U1F3FB'
+emoji[person_walking_medium_light_skin_tone]=$'\U1F6B6\U1F3FC'
+emoji[person_walking_medium_skin_tone]=$'\U1F6B6\U1F3FD'
+emoji[person_walking_medium_dark_skin_tone]=$'\U1F6B6\U1F3FE'
+emoji[person_walking_dark_skin_tone]=$'\U1F6B6\U1F3FF'
+emoji[man_walking]=$'\U1F6B6\U200D\U2642\UFE0F'
+emoji[man_walking_minimally]=$'\U1F6B6\U200D\U2642'
+emoji[walking_man]=$'\U1F6B6\U200D\U2642'
+emoji[man_walking_light_skin_tone]=$'\U1F6B6\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_walking_light_skin_tone_minimally]=$'\U1F6B6\U1F3FB\U200D\U2642'
+emoji[man_walking_medium_light_skin_tone]=$'\U1F6B6\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_walking_medium_light_skin_tone_minimally]=$'\U1F6B6\U1F3FC\U200D\U2642'
+emoji[man_walking_medium_skin_tone]=$'\U1F6B6\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_walking_medium_skin_tone_minimally]=$'\U1F6B6\U1F3FD\U200D\U2642'
+emoji[man_walking_medium_dark_skin_tone]=$'\U1F6B6\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_walking_medium_dark_skin_tone_minimally]=$'\U1F6B6\U1F3FE\U200D\U2642'
+emoji[man_walking_dark_skin_tone]=$'\U1F6B6\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_walking_dark_skin_tone_minimally]=$'\U1F6B6\U1F3FF\U200D\U2642'
+emoji[woman_walking]=$'\U1F6B6\U200D\U2640\UFE0F'
+emoji[woman_walking_minimally]=$'\U1F6B6\U200D\U2640'
+emoji[walking_woman]=$'\U1F6B6\U200D\U2640'
+emoji[woman_walking_light_skin_tone]=$'\U1F6B6\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_walking_light_skin_tone_minimally]=$'\U1F6B6\U1F3FB\U200D\U2640'
+emoji[woman_walking_medium_light_skin_tone]=$'\U1F6B6\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_walking_medium_light_skin_tone_minimally]=$'\U1F6B6\U1F3FC\U200D\U2640'
+emoji[woman_walking_medium_skin_tone]=$'\U1F6B6\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_walking_medium_skin_tone_minimally]=$'\U1F6B6\U1F3FD\U200D\U2640'
+emoji[woman_walking_medium_dark_skin_tone]=$'\U1F6B6\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_walking_medium_dark_skin_tone_minimally]=$'\U1F6B6\U1F3FE\U200D\U2640'
+emoji[woman_walking_dark_skin_tone]=$'\U1F6B6\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_walking_dark_skin_tone_minimally]=$'\U1F6B6\U1F3FF\U200D\U2640'
+emoji[person_standing]=$'\U1F9CD'
+emoji[standing_person]=$'\U1F9CD'
+emoji[person_standing_light_skin_tone]=$'\U1F9CD\U1F3FB'
+emoji[person_standing_medium_light_skin_tone]=$'\U1F9CD\U1F3FC'
+emoji[person_standing_medium_skin_tone]=$'\U1F9CD\U1F3FD'
+emoji[person_standing_medium_dark_skin_tone]=$'\U1F9CD\U1F3FE'
+emoji[person_standing_dark_skin_tone]=$'\U1F9CD\U1F3FF'
+emoji[man_standing]=$'\U1F9CD\U200D\U2642\UFE0F'
+emoji[man_standing_minimally]=$'\U1F9CD\U200D\U2642'
+emoji[standing_man]=$'\U1F9CD\U200D\U2642'
+emoji[man_standing_light_skin_tone]=$'\U1F9CD\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_standing_light_skin_tone_minimally]=$'\U1F9CD\U1F3FB\U200D\U2642'
+emoji[man_standing_medium_light_skin_tone]=$'\U1F9CD\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_standing_medium_light_skin_tone_minimally]=$'\U1F9CD\U1F3FC\U200D\U2642'
+emoji[man_standing_medium_skin_tone]=$'\U1F9CD\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_standing_medium_skin_tone_minimally]=$'\U1F9CD\U1F3FD\U200D\U2642'
+emoji[man_standing_medium_dark_skin_tone]=$'\U1F9CD\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_standing_medium_dark_skin_tone_minimally]=$'\U1F9CD\U1F3FE\U200D\U2642'
+emoji[man_standing_dark_skin_tone]=$'\U1F9CD\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_standing_dark_skin_tone_minimally]=$'\U1F9CD\U1F3FF\U200D\U2642'
+emoji[woman_standing]=$'\U1F9CD\U200D\U2640\UFE0F'
+emoji[woman_standing_minimally]=$'\U1F9CD\U200D\U2640'
+emoji[standing_woman]=$'\U1F9CD\U200D\U2640'
+emoji[woman_standing_light_skin_tone]=$'\U1F9CD\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_standing_light_skin_tone_minimally]=$'\U1F9CD\U1F3FB\U200D\U2640'
+emoji[woman_standing_medium_light_skin_tone]=$'\U1F9CD\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_standing_medium_light_skin_tone_minimally]=$'\U1F9CD\U1F3FC\U200D\U2640'
+emoji[woman_standing_medium_skin_tone]=$'\U1F9CD\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_standing_medium_skin_tone_minimally]=$'\U1F9CD\U1F3FD\U200D\U2640'
+emoji[woman_standing_medium_dark_skin_tone]=$'\U1F9CD\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_standing_medium_dark_skin_tone_minimally]=$'\U1F9CD\U1F3FE\U200D\U2640'
+emoji[woman_standing_dark_skin_tone]=$'\U1F9CD\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_standing_dark_skin_tone_minimally]=$'\U1F9CD\U1F3FF\U200D\U2640'
+emoji[person_kneeling]=$'\U1F9CE'
+emoji[kneeling_person]=$'\U1F9CE'
+emoji[person_kneeling_light_skin_tone]=$'\U1F9CE\U1F3FB'
+emoji[person_kneeling_medium_light_skin_tone]=$'\U1F9CE\U1F3FC'
+emoji[person_kneeling_medium_skin_tone]=$'\U1F9CE\U1F3FD'
+emoji[person_kneeling_medium_dark_skin_tone]=$'\U1F9CE\U1F3FE'
+emoji[person_kneeling_dark_skin_tone]=$'\U1F9CE\U1F3FF'
+emoji[man_kneeling]=$'\U1F9CE\U200D\U2642\UFE0F'
+emoji[man_kneeling_minimally]=$'\U1F9CE\U200D\U2642'
+emoji[kneeling_man]=$'\U1F9CE\U200D\U2642'
+emoji[man_kneeling_light_skin_tone]=$'\U1F9CE\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_kneeling_light_skin_tone_minimally]=$'\U1F9CE\U1F3FB\U200D\U2642'
+emoji[man_kneeling_medium_light_skin_tone]=$'\U1F9CE\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_kneeling_medium_light_skin_tone_minimally]=$'\U1F9CE\U1F3FC\U200D\U2642'
+emoji[man_kneeling_medium_skin_tone]=$'\U1F9CE\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_kneeling_medium_skin_tone_minimally]=$'\U1F9CE\U1F3FD\U200D\U2642'
+emoji[man_kneeling_medium_dark_skin_tone]=$'\U1F9CE\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_kneeling_medium_dark_skin_tone_minimally]=$'\U1F9CE\U1F3FE\U200D\U2642'
+emoji[man_kneeling_dark_skin_tone]=$'\U1F9CE\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_kneeling_dark_skin_tone_minimally]=$'\U1F9CE\U1F3FF\U200D\U2642'
+emoji[woman_kneeling]=$'\U1F9CE\U200D\U2640\UFE0F'
+emoji[woman_kneeling_minimally]=$'\U1F9CE\U200D\U2640'
+emoji[kneeling_woman]=$'\U1F9CE\U200D\U2640'
+emoji[woman_kneeling_light_skin_tone]=$'\U1F9CE\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_kneeling_light_skin_tone_minimally]=$'\U1F9CE\U1F3FB\U200D\U2640'
+emoji[woman_kneeling_medium_light_skin_tone]=$'\U1F9CE\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_kneeling_medium_light_skin_tone_minimally]=$'\U1F9CE\U1F3FC\U200D\U2640'
+emoji[woman_kneeling_medium_skin_tone]=$'\U1F9CE\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_kneeling_medium_skin_tone_minimally]=$'\U1F9CE\U1F3FD\U200D\U2640'
+emoji[woman_kneeling_medium_dark_skin_tone]=$'\U1F9CE\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_kneeling_medium_dark_skin_tone_minimally]=$'\U1F9CE\U1F3FE\U200D\U2640'
+emoji[woman_kneeling_dark_skin_tone]=$'\U1F9CE\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_kneeling_dark_skin_tone_minimally]=$'\U1F9CE\U1F3FF\U200D\U2640'
+emoji[man_with_probing_cane]=$'\U1F468\U200D\U1F9AF'
+emoji[man_with_probing_cane_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F9AF'
+emoji[man_with_probing_cane_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F9AF'
+emoji[man_with_probing_cane_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F9AF'
+emoji[man_with_probing_cane_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F9AF'
+emoji[man_with_probing_cane_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F9AF'
+emoji[woman_with_probing_cane]=$'\U1F469\U200D\U1F9AF'
+emoji[woman_with_probing_cane_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F9AF'
+emoji[woman_with_probing_cane_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F9AF'
+emoji[woman_with_probing_cane_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F9AF'
+emoji[woman_with_probing_cane_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F9AF'
+emoji[woman_with_probing_cane_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F9AF'
+emoji[man_in_motorized_wheelchair]=$'\U1F468\U200D\U1F9BC'
+emoji[man_in_motorized_wheelchair_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F9BC'
+emoji[man_in_motorized_wheelchair_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F9BC'
+emoji[man_in_motorized_wheelchair_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F9BC'
+emoji[man_in_motorized_wheelchair_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F9BC'
+emoji[man_in_motorized_wheelchair_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair]=$'\U1F469\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F9BC'
+emoji[man_in_manual_wheelchair]=$'\U1F468\U200D\U1F9BD'
+emoji[man_in_manual_wheelchair_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F9BD'
+emoji[man_in_manual_wheelchair_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F9BD'
+emoji[man_in_manual_wheelchair_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F9BD'
+emoji[man_in_manual_wheelchair_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F9BD'
+emoji[man_in_manual_wheelchair_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair]=$'\U1F469\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F9BD'
+emoji[person_running]=$'\U1F3C3'
+emoji[runner]=$'\U1F3C3'
+emoji[running]=$'\U1F3C3'
+emoji[person_running_light_skin_tone]=$'\U1F3C3\U1F3FB'
+emoji[person_running_medium_light_skin_tone]=$'\U1F3C3\U1F3FC'
+emoji[person_running_medium_skin_tone]=$'\U1F3C3\U1F3FD'
+emoji[person_running_medium_dark_skin_tone]=$'\U1F3C3\U1F3FE'
+emoji[person_running_dark_skin_tone]=$'\U1F3C3\U1F3FF'
+emoji[man_running]=$'\U1F3C3\U200D\U2642\UFE0F'
+emoji[man_running_minimally]=$'\U1F3C3\U200D\U2642'
+emoji[running_man]=$'\U1F3C3\U200D\U2642'
+emoji[man_running_light_skin_tone]=$'\U1F3C3\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_running_light_skin_tone_minimally]=$'\U1F3C3\U1F3FB\U200D\U2642'
+emoji[man_running_medium_light_skin_tone]=$'\U1F3C3\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_running_medium_light_skin_tone_minimally]=$'\U1F3C3\U1F3FC\U200D\U2642'
+emoji[man_running_medium_skin_tone]=$'\U1F3C3\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_running_medium_skin_tone_minimally]=$'\U1F3C3\U1F3FD\U200D\U2642'
+emoji[man_running_medium_dark_skin_tone]=$'\U1F3C3\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_running_medium_dark_skin_tone_minimally]=$'\U1F3C3\U1F3FE\U200D\U2642'
+emoji[man_running_dark_skin_tone]=$'\U1F3C3\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_running_dark_skin_tone_minimally]=$'\U1F3C3\U1F3FF\U200D\U2642'
+emoji[woman_running]=$'\U1F3C3\U200D\U2640\UFE0F'
+emoji[woman_running_minimally]=$'\U1F3C3\U200D\U2640'
+emoji[running_woman]=$'\U1F3C3\U200D\U2640'
+emoji[woman_running_light_skin_tone]=$'\U1F3C3\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_running_light_skin_tone_minimally]=$'\U1F3C3\U1F3FB\U200D\U2640'
+emoji[woman_running_medium_light_skin_tone]=$'\U1F3C3\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_running_medium_light_skin_tone_minimally]=$'\U1F3C3\U1F3FC\U200D\U2640'
+emoji[woman_running_medium_skin_tone]=$'\U1F3C3\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_running_medium_skin_tone_minimally]=$'\U1F3C3\U1F3FD\U200D\U2640'
+emoji[woman_running_medium_dark_skin_tone]=$'\U1F3C3\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_running_medium_dark_skin_tone_minimally]=$'\U1F3C3\U1F3FE\U200D\U2640'
+emoji[woman_running_dark_skin_tone]=$'\U1F3C3\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_running_dark_skin_tone_minimally]=$'\U1F3C3\U1F3FF\U200D\U2640'
+emoji[woman_dancing]=$'\U1F483'
+emoji[dancer]=$'\U1F483'
+emoji[woman_dancing_light_skin_tone]=$'\U1F483\U1F3FB'
+emoji[woman_dancing_medium_light_skin_tone]=$'\U1F483\U1F3FC'
+emoji[woman_dancing_medium_skin_tone]=$'\U1F483\U1F3FD'
+emoji[woman_dancing_medium_dark_skin_tone]=$'\U1F483\U1F3FE'
+emoji[woman_dancing_dark_skin_tone]=$'\U1F483\U1F3FF'
+emoji[woman_dancing_dark_skin_tone_1]=$'\U1F57A'
+emoji[man_dancing]=$'\U1F57A'
+emoji[man_dancing_light_skin_tone]=$'\U1F57A\U1F3FB'
+emoji[man_dancing_medium_light_skin_tone]=$'\U1F57A\U1F3FC'
+emoji[man_dancing_medium_skin_tone]=$'\U1F57A\U1F3FD'
+emoji[man_dancing_medium_dark_skin_tone]=$'\U1F57A\U1F3FE'
+emoji[man_dancing_dark_skin_tone]=$'\U1F57A\U1F3FF'
+emoji[man_in_suit_levitating]=$'\U1F574\UFE0F'
+emoji[man_in_suit_levitating_unqualified]=$'\U1F574'
+emoji[business_suit_levitating]=$'\U1F574'
+emoji[man_in_suit_levitating_light_skin_tone]=$'\U1F574\U1F3FB'
+emoji[man_in_suit_levitating_medium_light_skin_tone]=$'\U1F574\U1F3FC'
+emoji[man_in_suit_levitating_medium_skin_tone]=$'\U1F574\U1F3FD'
+emoji[man_in_suit_levitating_medium_dark_skin_tone]=$'\U1F574\U1F3FE'
+emoji[man_in_suit_levitating_dark_skin_tone]=$'\U1F574\U1F3FF'
+emoji[people_with_bunny_ears]=$'\U1F46F'
+emoji[dancers]=$'\U1F46F'
+emoji[men_with_bunny_ears]=$'\U1F46F\U200D\U2642\UFE0F'
+emoji[men_with_bunny_ears_minimally]=$'\U1F46F\U200D\U2642'
+emoji[dancing_men]=$'\U1F46F\U200D\U2642'
+emoji[women_with_bunny_ears]=$'\U1F46F\U200D\U2640\UFE0F'
+emoji[women_with_bunny_ears_minimally]=$'\U1F46F\U200D\U2640'
+emoji[dancing_women]=$'\U1F46F\U200D\U2640'
+emoji[person_in_steamy_room]=$'\U1F9D6'
+emoji[sauna_person]=$'\U1F9D6'
+emoji[person_in_steamy_room_light_skin_tone]=$'\U1F9D6\U1F3FB'
+emoji[person_in_steamy_room_medium_light_skin_tone]=$'\U1F9D6\U1F3FC'
+emoji[person_in_steamy_room_medium_skin_tone]=$'\U1F9D6\U1F3FD'
+emoji[person_in_steamy_room_medium_dark_skin_tone]=$'\U1F9D6\U1F3FE'
+emoji[person_in_steamy_room_dark_skin_tone]=$'\U1F9D6\U1F3FF'
+emoji[man_in_steamy_room]=$'\U1F9D6\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_minimally]=$'\U1F9D6\U200D\U2642'
+emoji[sauna_man]=$'\U1F9D6\U200D\U2642'
+emoji[man_in_steamy_room_light_skin_tone]=$'\U1F9D6\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_light_skin_tone_minimally]=$'\U1F9D6\U1F3FB\U200D\U2642'
+emoji[man_in_steamy_room_medium_light_skin_tone]=$'\U1F9D6\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_medium_light_skin_tone_minimally]=$'\U1F9D6\U1F3FC\U200D\U2642'
+emoji[man_in_steamy_room_medium_skin_tone]=$'\U1F9D6\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_medium_skin_tone_minimally]=$'\U1F9D6\U1F3FD\U200D\U2642'
+emoji[man_in_steamy_room_medium_dark_skin_tone]=$'\U1F9D6\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_medium_dark_skin_tone_minimally]=$'\U1F9D6\U1F3FE\U200D\U2642'
+emoji[man_in_steamy_room_dark_skin_tone]=$'\U1F9D6\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_dark_skin_tone_minimally]=$'\U1F9D6\U1F3FF\U200D\U2642'
+emoji[woman_in_steamy_room]=$'\U1F9D6\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_minimally]=$'\U1F9D6\U200D\U2640'
+emoji[sauna_woman]=$'\U1F9D6\U200D\U2640'
+emoji[woman_in_steamy_room_light_skin_tone]=$'\U1F9D6\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_light_skin_tone_minimally]=$'\U1F9D6\U1F3FB\U200D\U2640'
+emoji[woman_in_steamy_room_medium_light_skin_tone]=$'\U1F9D6\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_medium_light_skin_tone_minimally]=$'\U1F9D6\U1F3FC\U200D\U2640'
+emoji[woman_in_steamy_room_medium_skin_tone]=$'\U1F9D6\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_medium_skin_tone_minimally]=$'\U1F9D6\U1F3FD\U200D\U2640'
+emoji[woman_in_steamy_room_medium_dark_skin_tone]=$'\U1F9D6\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_medium_dark_skin_tone_minimally]=$'\U1F9D6\U1F3FE\U200D\U2640'
+emoji[woman_in_steamy_room_dark_skin_tone]=$'\U1F9D6\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_dark_skin_tone_minimally]=$'\U1F9D6\U1F3FF\U200D\U2640'
+emoji[person_climbing]=$'\U1F9D7'
+emoji[climbing]=$'\U1F9D7'
+emoji[person_climbing_light_skin_tone]=$'\U1F9D7\U1F3FB'
+emoji[person_climbing_medium_light_skin_tone]=$'\U1F9D7\U1F3FC'
+emoji[person_climbing_medium_skin_tone]=$'\U1F9D7\U1F3FD'
+emoji[person_climbing_medium_dark_skin_tone]=$'\U1F9D7\U1F3FE'
+emoji[person_climbing_dark_skin_tone]=$'\U1F9D7\U1F3FF'
+emoji[man_climbing]=$'\U1F9D7\U200D\U2642\UFE0F'
+emoji[man_climbing_minimally]=$'\U1F9D7\U200D\U2642'
+emoji[climbing_man]=$'\U1F9D7\U200D\U2642'
+emoji[man_climbing_light_skin_tone]=$'\U1F9D7\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_climbing_light_skin_tone_minimally]=$'\U1F9D7\U1F3FB\U200D\U2642'
+emoji[man_climbing_medium_light_skin_tone]=$'\U1F9D7\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_climbing_medium_light_skin_tone_minimally]=$'\U1F9D7\U1F3FC\U200D\U2642'
+emoji[man_climbing_medium_skin_tone]=$'\U1F9D7\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_climbing_medium_skin_tone_minimally]=$'\U1F9D7\U1F3FD\U200D\U2642'
+emoji[man_climbing_medium_dark_skin_tone]=$'\U1F9D7\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_climbing_medium_dark_skin_tone_minimally]=$'\U1F9D7\U1F3FE\U200D\U2642'
+emoji[man_climbing_dark_skin_tone]=$'\U1F9D7\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_climbing_dark_skin_tone_minimally]=$'\U1F9D7\U1F3FF\U200D\U2642'
+emoji[woman_climbing]=$'\U1F9D7\U200D\U2640\UFE0F'
+emoji[woman_climbing_minimally]=$'\U1F9D7\U200D\U2640'
+emoji[climbing_woman]=$'\U1F9D7\U200D\U2640'
+emoji[woman_climbing_light_skin_tone]=$'\U1F9D7\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_climbing_light_skin_tone_minimally]=$'\U1F9D7\U1F3FB\U200D\U2640'
+emoji[woman_climbing_medium_light_skin_tone]=$'\U1F9D7\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_climbing_medium_light_skin_tone_minimally]=$'\U1F9D7\U1F3FC\U200D\U2640'
+emoji[woman_climbing_medium_skin_tone]=$'\U1F9D7\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_climbing_medium_skin_tone_minimally]=$'\U1F9D7\U1F3FD\U200D\U2640'
+emoji[woman_climbing_medium_dark_skin_tone]=$'\U1F9D7\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_climbing_medium_dark_skin_tone_minimally]=$'\U1F9D7\U1F3FE\U200D\U2640'
+emoji[woman_climbing_dark_skin_tone]=$'\U1F9D7\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_climbing_dark_skin_tone_minimally]=$'\U1F9D7\U1F3FF\U200D\U2640'
+emoji[person_fencing]=$'\U1F93A'
+emoji[horse_racing]=$'\U1F3C7'
+emoji[horse_racing_light_skin_tone]=$'\U1F3C7\U1F3FB'
+emoji[horse_racing_medium_light_skin_tone]=$'\U1F3C7\U1F3FC'
+emoji[horse_racing_medium_skin_tone]=$'\U1F3C7\U1F3FD'
+emoji[horse_racing_medium_dark_skin_tone]=$'\U1F3C7\U1F3FE'
+emoji[horse_racing_dark_skin_tone]=$'\U1F3C7\U1F3FF'
+emoji[skier]=$'\U26F7\UFE0F'
+emoji[skier_unqualified]=$'\U26F7'
+emoji[snowboarder]=$'\U1F3C2'
+emoji[snowboarder_light_skin_tone]=$'\U1F3C2\U1F3FB'
+emoji[snowboarder_medium_light_skin_tone]=$'\U1F3C2\U1F3FC'
+emoji[snowboarder_medium_skin_tone]=$'\U1F3C2\U1F3FD'
+emoji[snowboarder_medium_dark_skin_tone]=$'\U1F3C2\U1F3FE'
+emoji[snowboarder_dark_skin_tone]=$'\U1F3C2\U1F3FF'
+emoji[person_golfing]=$'\U1F3CC\UFE0F'
+emoji[person_golfing_unqualified]=$'\U1F3CC'
+emoji[golfing]=$'\U1F3CC'
+emoji[person_golfing_light_skin_tone]=$'\U1F3CC\U1F3FB'
+emoji[person_golfing_medium_light_skin_tone]=$'\U1F3CC\U1F3FC'
+emoji[person_golfing_medium_skin_tone]=$'\U1F3CC\U1F3FD'
+emoji[person_golfing_medium_dark_skin_tone]=$'\U1F3CC\U1F3FE'
+emoji[person_golfing_dark_skin_tone]=$'\U1F3CC\U1F3FF'
+emoji[man_golfing]=$'\U1F3CC\UFE0F\U200D\U2642\UFE0F'
+emoji[golfing_man]=$'\U1F3CC\UFE0F\U200D\U2642\UFE0F'
+emoji[man_golfing_unqualified]=$'\U1F3CC\U200D\U2642\UFE0F'
+emoji[man_golfing_unqualified_1]=$'\U1F3CC\UFE0F\U200D\U2642'
+emoji[man_golfing_unqualified_2]=$'\U1F3CC\U200D\U2642'
+emoji[man_golfing_light_skin_tone]=$'\U1F3CC\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_golfing_light_skin_tone_minimally]=$'\U1F3CC\U1F3FB\U200D\U2642'
+emoji[man_golfing_medium_light_skin_tone]=$'\U1F3CC\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_golfing_medium_light_skin_tone_minimally]=$'\U1F3CC\U1F3FC\U200D\U2642'
+emoji[man_golfing_medium_skin_tone]=$'\U1F3CC\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_golfing_medium_skin_tone_minimally]=$'\U1F3CC\U1F3FD\U200D\U2642'
+emoji[man_golfing_medium_dark_skin_tone]=$'\U1F3CC\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_golfing_medium_dark_skin_tone_minimally]=$'\U1F3CC\U1F3FE\U200D\U2642'
+emoji[man_golfing_dark_skin_tone]=$'\U1F3CC\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_golfing_dark_skin_tone_minimally]=$'\U1F3CC\U1F3FF\U200D\U2642'
+emoji[woman_golfing]=$'\U1F3CC\UFE0F\U200D\U2640\UFE0F'
+emoji[golfing_woman]=$'\U1F3CC\UFE0F\U200D\U2640\UFE0F'
+emoji[woman_golfing_unqualified]=$'\U1F3CC\U200D\U2640\UFE0F'
+emoji[woman_golfing_unqualified_1]=$'\U1F3CC\UFE0F\U200D\U2640'
+emoji[woman_golfing_unqualified_2]=$'\U1F3CC\U200D\U2640'
+emoji[woman_golfing_light_skin_tone]=$'\U1F3CC\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_golfing_light_skin_tone_minimally]=$'\U1F3CC\U1F3FB\U200D\U2640'
+emoji[woman_golfing_medium_light_skin_tone]=$'\U1F3CC\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_golfing_medium_light_skin_tone_minimally]=$'\U1F3CC\U1F3FC\U200D\U2640'
+emoji[woman_golfing_medium_skin_tone]=$'\U1F3CC\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_golfing_medium_skin_tone_minimally]=$'\U1F3CC\U1F3FD\U200D\U2640'
+emoji[woman_golfing_medium_dark_skin_tone]=$'\U1F3CC\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_golfing_medium_dark_skin_tone_minimally]=$'\U1F3CC\U1F3FE\U200D\U2640'
+emoji[woman_golfing_dark_skin_tone]=$'\U1F3CC\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_golfing_dark_skin_tone_minimally]=$'\U1F3CC\U1F3FF\U200D\U2640'
+emoji[person_surfing]=$'\U1F3C4'
+emoji[surfer]=$'\U1F3C4'
+emoji[person_surfing_light_skin_tone]=$'\U1F3C4\U1F3FB'
+emoji[person_surfing_medium_light_skin_tone]=$'\U1F3C4\U1F3FC'
+emoji[person_surfing_medium_skin_tone]=$'\U1F3C4\U1F3FD'
+emoji[person_surfing_medium_dark_skin_tone]=$'\U1F3C4\U1F3FE'
+emoji[person_surfing_dark_skin_tone]=$'\U1F3C4\U1F3FF'
+emoji[man_surfing]=$'\U1F3C4\U200D\U2642\UFE0F'
+emoji[man_surfing_minimally]=$'\U1F3C4\U200D\U2642'
+emoji[surfing_man]=$'\U1F3C4\U200D\U2642'
+emoji[man_surfing_light_skin_tone]=$'\U1F3C4\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_surfing_light_skin_tone_minimally]=$'\U1F3C4\U1F3FB\U200D\U2642'
+emoji[man_surfing_medium_light_skin_tone]=$'\U1F3C4\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_surfing_medium_light_skin_tone_minimally]=$'\U1F3C4\U1F3FC\U200D\U2642'
+emoji[man_surfing_medium_skin_tone]=$'\U1F3C4\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_surfing_medium_skin_tone_minimally]=$'\U1F3C4\U1F3FD\U200D\U2642'
+emoji[man_surfing_medium_dark_skin_tone]=$'\U1F3C4\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_surfing_medium_dark_skin_tone_minimally]=$'\U1F3C4\U1F3FE\U200D\U2642'
+emoji[man_surfing_dark_skin_tone]=$'\U1F3C4\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_surfing_dark_skin_tone_minimally]=$'\U1F3C4\U1F3FF\U200D\U2642'
+emoji[woman_surfing]=$'\U1F3C4\U200D\U2640\UFE0F'
+emoji[woman_surfing_minimally]=$'\U1F3C4\U200D\U2640'
+emoji[surfing_woman]=$'\U1F3C4\U200D\U2640'
+emoji[woman_surfing_light_skin_tone]=$'\U1F3C4\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_surfing_light_skin_tone_minimally]=$'\U1F3C4\U1F3FB\U200D\U2640'
+emoji[woman_surfing_medium_light_skin_tone]=$'\U1F3C4\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_surfing_medium_light_skin_tone_minimally]=$'\U1F3C4\U1F3FC\U200D\U2640'
+emoji[woman_surfing_medium_skin_tone]=$'\U1F3C4\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_surfing_medium_skin_tone_minimally]=$'\U1F3C4\U1F3FD\U200D\U2640'
+emoji[woman_surfing_medium_dark_skin_tone]=$'\U1F3C4\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_surfing_medium_dark_skin_tone_minimally]=$'\U1F3C4\U1F3FE\U200D\U2640'
+emoji[woman_surfing_dark_skin_tone]=$'\U1F3C4\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_surfing_dark_skin_tone_minimally]=$'\U1F3C4\U1F3FF\U200D\U2640'
+emoji[person_rowing_boat]=$'\U1F6A3'
+emoji[rowboat]=$'\U1F6A3'
+emoji[person_rowing_boat_light_skin_tone]=$'\U1F6A3\U1F3FB'
+emoji[person_rowing_boat_medium_light_skin_tone]=$'\U1F6A3\U1F3FC'
+emoji[person_rowing_boat_medium_skin_tone]=$'\U1F6A3\U1F3FD'
+emoji[person_rowing_boat_medium_dark_skin_tone]=$'\U1F6A3\U1F3FE'
+emoji[person_rowing_boat_dark_skin_tone]=$'\U1F6A3\U1F3FF'
+emoji[man_rowing_boat]=$'\U1F6A3\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_minimally]=$'\U1F6A3\U200D\U2642'
+emoji[rowing_man]=$'\U1F6A3\U200D\U2642'
+emoji[man_rowing_boat_light_skin_tone]=$'\U1F6A3\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_light_skin_tone_minimally]=$'\U1F6A3\U1F3FB\U200D\U2642'
+emoji[man_rowing_boat_medium_light_skin_tone]=$'\U1F6A3\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_medium_light_skin_tone_minimally]=$'\U1F6A3\U1F3FC\U200D\U2642'
+emoji[man_rowing_boat_medium_skin_tone]=$'\U1F6A3\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_medium_skin_tone_minimally]=$'\U1F6A3\U1F3FD\U200D\U2642'
+emoji[man_rowing_boat_medium_dark_skin_tone]=$'\U1F6A3\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_medium_dark_skin_tone_minimally]=$'\U1F6A3\U1F3FE\U200D\U2642'
+emoji[man_rowing_boat_dark_skin_tone]=$'\U1F6A3\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_dark_skin_tone_minimally]=$'\U1F6A3\U1F3FF\U200D\U2642'
+emoji[woman_rowing_boat]=$'\U1F6A3\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_minimally]=$'\U1F6A3\U200D\U2640'
+emoji[rowing_woman]=$'\U1F6A3\U200D\U2640'
+emoji[woman_rowing_boat_light_skin_tone]=$'\U1F6A3\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_light_skin_tone_minimally]=$'\U1F6A3\U1F3FB\U200D\U2640'
+emoji[woman_rowing_boat_medium_light_skin_tone]=$'\U1F6A3\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_medium_light_skin_tone_minimally]=$'\U1F6A3\U1F3FC\U200D\U2640'
+emoji[woman_rowing_boat_medium_skin_tone]=$'\U1F6A3\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_medium_skin_tone_minimally]=$'\U1F6A3\U1F3FD\U200D\U2640'
+emoji[woman_rowing_boat_medium_dark_skin_tone]=$'\U1F6A3\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_medium_dark_skin_tone_minimally]=$'\U1F6A3\U1F3FE\U200D\U2640'
+emoji[woman_rowing_boat_dark_skin_tone]=$'\U1F6A3\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_dark_skin_tone_minimally]=$'\U1F6A3\U1F3FF\U200D\U2640'
+emoji[person_swimming]=$'\U1F3CA'
+emoji[swimmer]=$'\U1F3CA'
+emoji[person_swimming_light_skin_tone]=$'\U1F3CA\U1F3FB'
+emoji[person_swimming_medium_light_skin_tone]=$'\U1F3CA\U1F3FC'
+emoji[person_swimming_medium_skin_tone]=$'\U1F3CA\U1F3FD'
+emoji[person_swimming_medium_dark_skin_tone]=$'\U1F3CA\U1F3FE'
+emoji[person_swimming_dark_skin_tone]=$'\U1F3CA\U1F3FF'
+emoji[man_swimming]=$'\U1F3CA\U200D\U2642\UFE0F'
+emoji[man_swimming_minimally]=$'\U1F3CA\U200D\U2642'
+emoji[swimming_man]=$'\U1F3CA\U200D\U2642'
+emoji[man_swimming_light_skin_tone]=$'\U1F3CA\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_swimming_light_skin_tone_minimally]=$'\U1F3CA\U1F3FB\U200D\U2642'
+emoji[man_swimming_medium_light_skin_tone]=$'\U1F3CA\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_swimming_medium_light_skin_tone_minimally]=$'\U1F3CA\U1F3FC\U200D\U2642'
+emoji[man_swimming_medium_skin_tone]=$'\U1F3CA\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_swimming_medium_skin_tone_minimally]=$'\U1F3CA\U1F3FD\U200D\U2642'
+emoji[man_swimming_medium_dark_skin_tone]=$'\U1F3CA\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_swimming_medium_dark_skin_tone_minimally]=$'\U1F3CA\U1F3FE\U200D\U2642'
+emoji[man_swimming_dark_skin_tone]=$'\U1F3CA\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_swimming_dark_skin_tone_minimally]=$'\U1F3CA\U1F3FF\U200D\U2642'
+emoji[woman_swimming]=$'\U1F3CA\U200D\U2640\UFE0F'
+emoji[woman_swimming_minimally]=$'\U1F3CA\U200D\U2640'
+emoji[swimming_woman]=$'\U1F3CA\U200D\U2640'
+emoji[woman_swimming_light_skin_tone]=$'\U1F3CA\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_swimming_light_skin_tone_minimally]=$'\U1F3CA\U1F3FB\U200D\U2640'
+emoji[woman_swimming_medium_light_skin_tone]=$'\U1F3CA\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_swimming_medium_light_skin_tone_minimally]=$'\U1F3CA\U1F3FC\U200D\U2640'
+emoji[woman_swimming_medium_skin_tone]=$'\U1F3CA\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_swimming_medium_skin_tone_minimally]=$'\U1F3CA\U1F3FD\U200D\U2640'
+emoji[woman_swimming_medium_dark_skin_tone]=$'\U1F3CA\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_swimming_medium_dark_skin_tone_minimally]=$'\U1F3CA\U1F3FE\U200D\U2640'
+emoji[woman_swimming_dark_skin_tone]=$'\U1F3CA\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_swimming_dark_skin_tone_minimally]=$'\U1F3CA\U1F3FF\U200D\U2640'
+emoji[person_bouncing_ball]=$'\U26F9\UFE0F'
+emoji[person_bouncing_ball_unqualified]=$'\U26F9'
+emoji[bouncing_ball_person]=$'\U26F9'
+emoji[person_bouncing_ball_light_skin_tone]=$'\U26F9\U1F3FB'
+emoji[person_bouncing_ball_medium_light_skin_tone]=$'\U26F9\U1F3FC'
+emoji[person_bouncing_ball_medium_skin_tone]=$'\U26F9\U1F3FD'
+emoji[person_bouncing_ball_medium_dark_skin_tone]=$'\U26F9\U1F3FE'
+emoji[person_bouncing_ball_dark_skin_tone]=$'\U26F9\U1F3FF'
+emoji[man_bouncing_ball]=$'\U26F9\UFE0F\U200D\U2642\UFE0F'
+emoji[bouncing_ball_man]=$'\U26F9\UFE0F\U200D\U2642\UFE0F'
+emoji[basketball_man]=$'\U26F9\UFE0F\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_unqualified]=$'\U26F9\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_unqualified_1]=$'\U26F9\UFE0F\U200D\U2642'
+emoji[man_bouncing_ball_unqualified_2]=$'\U26F9\U200D\U2642'
+emoji[man_bouncing_ball_light_skin_tone]=$'\U26F9\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_light_skin_tone_minimally]=$'\U26F9\U1F3FB\U200D\U2642'
+emoji[man_bouncing_ball_medium_light_skin_tone]=$'\U26F9\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_medium_light_skin_tone_minimally]=$'\U26F9\U1F3FC\U200D\U2642'
+emoji[man_bouncing_ball_medium_skin_tone]=$'\U26F9\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_medium_skin_tone_minimally]=$'\U26F9\U1F3FD\U200D\U2642'
+emoji[man_bouncing_ball_medium_dark_skin_tone]=$'\U26F9\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_medium_dark_skin_tone_minimally]=$'\U26F9\U1F3FE\U200D\U2642'
+emoji[man_bouncing_ball_dark_skin_tone]=$'\U26F9\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_dark_skin_tone_minimally]=$'\U26F9\U1F3FF\U200D\U2642'
+emoji[woman_bouncing_ball]=$'\U26F9\UFE0F\U200D\U2640\UFE0F'
+emoji[bouncing_ball_woman]=$'\U26F9\UFE0F\U200D\U2640\UFE0F'
+emoji[basketball_woman]=$'\U26F9\UFE0F\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_unqualified]=$'\U26F9\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_unqualified_1]=$'\U26F9\UFE0F\U200D\U2640'
+emoji[woman_bouncing_ball_unqualified_2]=$'\U26F9\U200D\U2640'
+emoji[woman_bouncing_ball_light_skin_tone]=$'\U26F9\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_light_skin_tone_minimally]=$'\U26F9\U1F3FB\U200D\U2640'
+emoji[woman_bouncing_ball_medium_light_skin_tone]=$'\U26F9\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_medium_light_skin_tone_minimally]=$'\U26F9\U1F3FC\U200D\U2640'
+emoji[woman_bouncing_ball_medium_skin_tone]=$'\U26F9\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_medium_skin_tone_minimally]=$'\U26F9\U1F3FD\U200D\U2640'
+emoji[woman_bouncing_ball_medium_dark_skin_tone]=$'\U26F9\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_medium_dark_skin_tone_minimally]=$'\U26F9\U1F3FE\U200D\U2640'
+emoji[woman_bouncing_ball_dark_skin_tone]=$'\U26F9\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_dark_skin_tone_minimally]=$'\U26F9\U1F3FF\U200D\U2640'
+emoji[person_lifting_weights]=$'\U1F3CB\UFE0F'
+emoji[person_lifting_weights_unqualified]=$'\U1F3CB'
+emoji[weight_lifting]=$'\U1F3CB'
+emoji[person_lifting_weights_light_skin_tone]=$'\U1F3CB\U1F3FB'
+emoji[person_lifting_weights_medium_light_skin_tone]=$'\U1F3CB\U1F3FC'
+emoji[person_lifting_weights_medium_skin_tone]=$'\U1F3CB\U1F3FD'
+emoji[person_lifting_weights_medium_dark_skin_tone]=$'\U1F3CB\U1F3FE'
+emoji[person_lifting_weights_dark_skin_tone]=$'\U1F3CB\U1F3FF'
+emoji[man_lifting_weights]=$'\U1F3CB\UFE0F\U200D\U2642\UFE0F'
+emoji[weight_lifting_man]=$'\U1F3CB\UFE0F\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_unqualified]=$'\U1F3CB\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_unqualified_1]=$'\U1F3CB\UFE0F\U200D\U2642'
+emoji[man_lifting_weights_unqualified_2]=$'\U1F3CB\U200D\U2642'
+emoji[man_lifting_weights_light_skin_tone]=$'\U1F3CB\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_light_skin_tone_minimally]=$'\U1F3CB\U1F3FB\U200D\U2642'
+emoji[man_lifting_weights_medium_light_skin_tone]=$'\U1F3CB\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_medium_light_skin_tone_minimally]=$'\U1F3CB\U1F3FC\U200D\U2642'
+emoji[man_lifting_weights_medium_skin_tone]=$'\U1F3CB\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_medium_skin_tone_minimally]=$'\U1F3CB\U1F3FD\U200D\U2642'
+emoji[man_lifting_weights_medium_dark_skin_tone]=$'\U1F3CB\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_medium_dark_skin_tone_minimally]=$'\U1F3CB\U1F3FE\U200D\U2642'
+emoji[man_lifting_weights_dark_skin_tone]=$'\U1F3CB\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_dark_skin_tone_minimally]=$'\U1F3CB\U1F3FF\U200D\U2642'
+emoji[woman_lifting_weights]=$'\U1F3CB\UFE0F\U200D\U2640\UFE0F'
+emoji[weight_lifting_woman]=$'\U1F3CB\UFE0F\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_unqualified]=$'\U1F3CB\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_unqualified_1]=$'\U1F3CB\UFE0F\U200D\U2640'
+emoji[woman_lifting_weights_unqualified_2]=$'\U1F3CB\U200D\U2640'
+emoji[woman_lifting_weights_light_skin_tone]=$'\U1F3CB\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_light_skin_tone_minimally]=$'\U1F3CB\U1F3FB\U200D\U2640'
+emoji[woman_lifting_weights_medium_light_skin_tone]=$'\U1F3CB\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_medium_light_skin_tone_minimally]=$'\U1F3CB\U1F3FC\U200D\U2640'
+emoji[woman_lifting_weights_medium_skin_tone]=$'\U1F3CB\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_medium_skin_tone_minimally]=$'\U1F3CB\U1F3FD\U200D\U2640'
+emoji[woman_lifting_weights_medium_dark_skin_tone]=$'\U1F3CB\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_medium_dark_skin_tone_minimally]=$'\U1F3CB\U1F3FE\U200D\U2640'
+emoji[woman_lifting_weights_dark_skin_tone]=$'\U1F3CB\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_dark_skin_tone_minimally]=$'\U1F3CB\U1F3FF\U200D\U2640'
+emoji[person_biking]=$'\U1F6B4'
+emoji[bicyclist]=$'\U1F6B4'
+emoji[person_biking_light_skin_tone]=$'\U1F6B4\U1F3FB'
+emoji[person_biking_medium_light_skin_tone]=$'\U1F6B4\U1F3FC'
+emoji[person_biking_medium_skin_tone]=$'\U1F6B4\U1F3FD'
+emoji[person_biking_medium_dark_skin_tone]=$'\U1F6B4\U1F3FE'
+emoji[person_biking_dark_skin_tone]=$'\U1F6B4\U1F3FF'
+emoji[man_biking]=$'\U1F6B4\U200D\U2642\UFE0F'
+emoji[man_biking_minimally]=$'\U1F6B4\U200D\U2642'
+emoji[biking_man]=$'\U1F6B4\U200D\U2642'
+emoji[man_biking_light_skin_tone]=$'\U1F6B4\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_biking_light_skin_tone_minimally]=$'\U1F6B4\U1F3FB\U200D\U2642'
+emoji[man_biking_medium_light_skin_tone]=$'\U1F6B4\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_biking_medium_light_skin_tone_minimally]=$'\U1F6B4\U1F3FC\U200D\U2642'
+emoji[man_biking_medium_skin_tone]=$'\U1F6B4\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_biking_medium_skin_tone_minimally]=$'\U1F6B4\U1F3FD\U200D\U2642'
+emoji[man_biking_medium_dark_skin_tone]=$'\U1F6B4\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_biking_medium_dark_skin_tone_minimally]=$'\U1F6B4\U1F3FE\U200D\U2642'
+emoji[man_biking_dark_skin_tone]=$'\U1F6B4\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_biking_dark_skin_tone_minimally]=$'\U1F6B4\U1F3FF\U200D\U2642'
+emoji[woman_biking]=$'\U1F6B4\U200D\U2640\UFE0F'
+emoji[woman_biking_minimally]=$'\U1F6B4\U200D\U2640'
+emoji[biking_woman]=$'\U1F6B4\U200D\U2640'
+emoji[woman_biking_light_skin_tone]=$'\U1F6B4\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_biking_light_skin_tone_minimally]=$'\U1F6B4\U1F3FB\U200D\U2640'
+emoji[woman_biking_medium_light_skin_tone]=$'\U1F6B4\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_biking_medium_light_skin_tone_minimally]=$'\U1F6B4\U1F3FC\U200D\U2640'
+emoji[woman_biking_medium_skin_tone]=$'\U1F6B4\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_biking_medium_skin_tone_minimally]=$'\U1F6B4\U1F3FD\U200D\U2640'
+emoji[woman_biking_medium_dark_skin_tone]=$'\U1F6B4\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_biking_medium_dark_skin_tone_minimally]=$'\U1F6B4\U1F3FE\U200D\U2640'
+emoji[woman_biking_dark_skin_tone]=$'\U1F6B4\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_biking_dark_skin_tone_minimally]=$'\U1F6B4\U1F3FF\U200D\U2640'
+emoji[person_mountain_biking]=$'\U1F6B5'
+emoji[mountain_bicyclist]=$'\U1F6B5'
+emoji[person_mountain_biking_light_skin_tone]=$'\U1F6B5\U1F3FB'
+emoji[person_mountain_biking_medium_light_skin_tone]=$'\U1F6B5\U1F3FC'
+emoji[person_mountain_biking_medium_skin_tone]=$'\U1F6B5\U1F3FD'
+emoji[person_mountain_biking_medium_dark_skin_tone]=$'\U1F6B5\U1F3FE'
+emoji[person_mountain_biking_dark_skin_tone]=$'\U1F6B5\U1F3FF'
+emoji[man_mountain_biking]=$'\U1F6B5\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_minimally]=$'\U1F6B5\U200D\U2642'
+emoji[mountain_biking_man]=$'\U1F6B5\U200D\U2642'
+emoji[man_mountain_biking_light_skin_tone]=$'\U1F6B5\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_light_skin_tone_minimally]=$'\U1F6B5\U1F3FB\U200D\U2642'
+emoji[man_mountain_biking_medium_light_skin_tone]=$'\U1F6B5\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_medium_light_skin_tone_minimally]=$'\U1F6B5\U1F3FC\U200D\U2642'
+emoji[man_mountain_biking_medium_skin_tone]=$'\U1F6B5\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_medium_skin_tone_minimally]=$'\U1F6B5\U1F3FD\U200D\U2642'
+emoji[man_mountain_biking_medium_dark_skin_tone]=$'\U1F6B5\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_medium_dark_skin_tone_minimally]=$'\U1F6B5\U1F3FE\U200D\U2642'
+emoji[man_mountain_biking_dark_skin_tone]=$'\U1F6B5\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_dark_skin_tone_minimally]=$'\U1F6B5\U1F3FF\U200D\U2642'
+emoji[woman_mountain_biking]=$'\U1F6B5\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_minimally]=$'\U1F6B5\U200D\U2640'
+emoji[mountain_biking_woman]=$'\U1F6B5\U200D\U2640'
+emoji[woman_mountain_biking_light_skin_tone]=$'\U1F6B5\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_light_skin_tone_minimally]=$'\U1F6B5\U1F3FB\U200D\U2640'
+emoji[woman_mountain_biking_medium_light_skin_tone]=$'\U1F6B5\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_medium_light_skin_tone_minimally]=$'\U1F6B5\U1F3FC\U200D\U2640'
+emoji[woman_mountain_biking_medium_skin_tone]=$'\U1F6B5\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_medium_skin_tone_minimally]=$'\U1F6B5\U1F3FD\U200D\U2640'
+emoji[woman_mountain_biking_medium_dark_skin_tone]=$'\U1F6B5\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_medium_dark_skin_tone_minimally]=$'\U1F6B5\U1F3FE\U200D\U2640'
+emoji[woman_mountain_biking_dark_skin_tone]=$'\U1F6B5\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_dark_skin_tone_minimally]=$'\U1F6B5\U1F3FF\U200D\U2640'
+emoji[person_cartwheeling]=$'\U1F938'
+emoji[cartwheeling]=$'\U1F938'
+emoji[person_cartwheeling_light_skin_tone]=$'\U1F938\U1F3FB'
+emoji[person_cartwheeling_medium_light_skin_tone]=$'\U1F938\U1F3FC'
+emoji[person_cartwheeling_medium_skin_tone]=$'\U1F938\U1F3FD'
+emoji[person_cartwheeling_medium_dark_skin_tone]=$'\U1F938\U1F3FE'
+emoji[person_cartwheeling_dark_skin_tone]=$'\U1F938\U1F3FF'
+emoji[man_cartwheeling]=$'\U1F938\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_minimally]=$'\U1F938\U200D\U2642'
+emoji[man_cartwheeling_light_skin_tone]=$'\U1F938\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_light_skin_tone_minimally]=$'\U1F938\U1F3FB\U200D\U2642'
+emoji[man_cartwheeling_medium_light_skin_tone]=$'\U1F938\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_medium_light_skin_tone_minimally]=$'\U1F938\U1F3FC\U200D\U2642'
+emoji[man_cartwheeling_medium_skin_tone]=$'\U1F938\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_medium_skin_tone_minimally]=$'\U1F938\U1F3FD\U200D\U2642'
+emoji[man_cartwheeling_medium_dark_skin_tone]=$'\U1F938\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_medium_dark_skin_tone_minimally]=$'\U1F938\U1F3FE\U200D\U2642'
+emoji[man_cartwheeling_dark_skin_tone]=$'\U1F938\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_dark_skin_tone_minimally]=$'\U1F938\U1F3FF\U200D\U2642'
+emoji[woman_cartwheeling]=$'\U1F938\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_minimally]=$'\U1F938\U200D\U2640'
+emoji[woman_cartwheeling_light_skin_tone]=$'\U1F938\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_light_skin_tone_minimally]=$'\U1F938\U1F3FB\U200D\U2640'
+emoji[woman_cartwheeling_medium_light_skin_tone]=$'\U1F938\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_medium_light_skin_tone_minimally]=$'\U1F938\U1F3FC\U200D\U2640'
+emoji[woman_cartwheeling_medium_skin_tone]=$'\U1F938\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_medium_skin_tone_minimally]=$'\U1F938\U1F3FD\U200D\U2640'
+emoji[woman_cartwheeling_medium_dark_skin_tone]=$'\U1F938\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_medium_dark_skin_tone_minimally]=$'\U1F938\U1F3FE\U200D\U2640'
+emoji[woman_cartwheeling_dark_skin_tone]=$'\U1F938\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_dark_skin_tone_minimally]=$'\U1F938\U1F3FF\U200D\U2640'
+emoji[people_wrestling]=$'\U1F93C'
+emoji[wrestling]=$'\U1F93C'
+emoji[men_wrestling]=$'\U1F93C\U200D\U2642\UFE0F'
+emoji[men_wrestling_minimally]=$'\U1F93C\U200D\U2642'
+emoji[women_wrestling]=$'\U1F93C\U200D\U2640\UFE0F'
+emoji[women_wrestling_minimally]=$'\U1F93C\U200D\U2640'
+emoji[person_playing_water_polo]=$'\U1F93D'
+emoji[water_polo]=$'\U1F93D'
+emoji[person_playing_water_polo_light_skin_tone]=$'\U1F93D\U1F3FB'
+emoji[person_playing_water_polo_medium_light_skin_tone]=$'\U1F93D\U1F3FC'
+emoji[person_playing_water_polo_medium_skin_tone]=$'\U1F93D\U1F3FD'
+emoji[person_playing_water_polo_medium_dark_skin_tone]=$'\U1F93D\U1F3FE'
+emoji[person_playing_water_polo_dark_skin_tone]=$'\U1F93D\U1F3FF'
+emoji[man_playing_water_polo]=$'\U1F93D\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_minimally]=$'\U1F93D\U200D\U2642'
+emoji[man_playing_water_polo_light_skin_tone]=$'\U1F93D\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_light_skin_tone_minimally]=$'\U1F93D\U1F3FB\U200D\U2642'
+emoji[man_playing_water_polo_medium_light_skin_tone]=$'\U1F93D\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_medium_light_skin_tone_minimally]=$'\U1F93D\U1F3FC\U200D\U2642'
+emoji[man_playing_water_polo_medium_skin_tone]=$'\U1F93D\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_medium_skin_tone_minimally]=$'\U1F93D\U1F3FD\U200D\U2642'
+emoji[man_playing_water_polo_medium_dark_skin_tone]=$'\U1F93D\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_medium_dark_skin_tone_minimally]=$'\U1F93D\U1F3FE\U200D\U2642'
+emoji[man_playing_water_polo_dark_skin_tone]=$'\U1F93D\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_dark_skin_tone_minimally]=$'\U1F93D\U1F3FF\U200D\U2642'
+emoji[woman_playing_water_polo]=$'\U1F93D\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_minimally]=$'\U1F93D\U200D\U2640'
+emoji[woman_playing_water_polo_light_skin_tone]=$'\U1F93D\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_light_skin_tone_minimally]=$'\U1F93D\U1F3FB\U200D\U2640'
+emoji[woman_playing_water_polo_medium_light_skin_tone]=$'\U1F93D\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_medium_light_skin_tone_minimally]=$'\U1F93D\U1F3FC\U200D\U2640'
+emoji[woman_playing_water_polo_medium_skin_tone]=$'\U1F93D\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_medium_skin_tone_minimally]=$'\U1F93D\U1F3FD\U200D\U2640'
+emoji[woman_playing_water_polo_medium_dark_skin_tone]=$'\U1F93D\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_medium_dark_skin_tone_minimally]=$'\U1F93D\U1F3FE\U200D\U2640'
+emoji[woman_playing_water_polo_dark_skin_tone]=$'\U1F93D\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_dark_skin_tone_minimally]=$'\U1F93D\U1F3FF\U200D\U2640'
+emoji[person_playing_handball]=$'\U1F93E'
+emoji[handball_person]=$'\U1F93E'
+emoji[person_playing_handball_light_skin_tone]=$'\U1F93E\U1F3FB'
+emoji[person_playing_handball_medium_light_skin_tone]=$'\U1F93E\U1F3FC'
+emoji[person_playing_handball_medium_skin_tone]=$'\U1F93E\U1F3FD'
+emoji[person_playing_handball_medium_dark_skin_tone]=$'\U1F93E\U1F3FE'
+emoji[person_playing_handball_dark_skin_tone]=$'\U1F93E\U1F3FF'
+emoji[man_playing_handball]=$'\U1F93E\U200D\U2642\UFE0F'
+emoji[man_playing_handball_minimally]=$'\U1F93E\U200D\U2642'
+emoji[man_playing_handball_light_skin_tone]=$'\U1F93E\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_playing_handball_light_skin_tone_minimally]=$'\U1F93E\U1F3FB\U200D\U2642'
+emoji[man_playing_handball_medium_light_skin_tone]=$'\U1F93E\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_playing_handball_medium_light_skin_tone_minimally]=$'\U1F93E\U1F3FC\U200D\U2642'
+emoji[man_playing_handball_medium_skin_tone]=$'\U1F93E\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_playing_handball_medium_skin_tone_minimally]=$'\U1F93E\U1F3FD\U200D\U2642'
+emoji[man_playing_handball_medium_dark_skin_tone]=$'\U1F93E\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_playing_handball_medium_dark_skin_tone_minimally]=$'\U1F93E\U1F3FE\U200D\U2642'
+emoji[man_playing_handball_dark_skin_tone]=$'\U1F93E\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_playing_handball_dark_skin_tone_minimally]=$'\U1F93E\U1F3FF\U200D\U2642'
+emoji[woman_playing_handball]=$'\U1F93E\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_minimally]=$'\U1F93E\U200D\U2640'
+emoji[woman_playing_handball_light_skin_tone]=$'\U1F93E\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_light_skin_tone_minimally]=$'\U1F93E\U1F3FB\U200D\U2640'
+emoji[woman_playing_handball_medium_light_skin_tone]=$'\U1F93E\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_medium_light_skin_tone_minimally]=$'\U1F93E\U1F3FC\U200D\U2640'
+emoji[woman_playing_handball_medium_skin_tone]=$'\U1F93E\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_medium_skin_tone_minimally]=$'\U1F93E\U1F3FD\U200D\U2640'
+emoji[woman_playing_handball_medium_dark_skin_tone]=$'\U1F93E\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_medium_dark_skin_tone_minimally]=$'\U1F93E\U1F3FE\U200D\U2640'
+emoji[woman_playing_handball_dark_skin_tone]=$'\U1F93E\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_dark_skin_tone_minimally]=$'\U1F93E\U1F3FF\U200D\U2640'
+emoji[person_juggling]=$'\U1F939'
+emoji[juggling_person]=$'\U1F939'
+emoji[person_juggling_light_skin_tone]=$'\U1F939\U1F3FB'
+emoji[person_juggling_medium_light_skin_tone]=$'\U1F939\U1F3FC'
+emoji[person_juggling_medium_skin_tone]=$'\U1F939\U1F3FD'
+emoji[person_juggling_medium_dark_skin_tone]=$'\U1F939\U1F3FE'
+emoji[person_juggling_dark_skin_tone]=$'\U1F939\U1F3FF'
+emoji[man_juggling]=$'\U1F939\U200D\U2642\UFE0F'
+emoji[man_juggling_minimally]=$'\U1F939\U200D\U2642'
+emoji[man_juggling_light_skin_tone]=$'\U1F939\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_juggling_light_skin_tone_minimally]=$'\U1F939\U1F3FB\U200D\U2642'
+emoji[man_juggling_medium_light_skin_tone]=$'\U1F939\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_juggling_medium_light_skin_tone_minimally]=$'\U1F939\U1F3FC\U200D\U2642'
+emoji[man_juggling_medium_skin_tone]=$'\U1F939\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_juggling_medium_skin_tone_minimally]=$'\U1F939\U1F3FD\U200D\U2642'
+emoji[man_juggling_medium_dark_skin_tone]=$'\U1F939\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_juggling_medium_dark_skin_tone_minimally]=$'\U1F939\U1F3FE\U200D\U2642'
+emoji[man_juggling_dark_skin_tone]=$'\U1F939\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_juggling_dark_skin_tone_minimally]=$'\U1F939\U1F3FF\U200D\U2642'
+emoji[woman_juggling]=$'\U1F939\U200D\U2640\UFE0F'
+emoji[woman_juggling_minimally]=$'\U1F939\U200D\U2640'
+emoji[woman_juggling_light_skin_tone]=$'\U1F939\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_juggling_light_skin_tone_minimally]=$'\U1F939\U1F3FB\U200D\U2640'
+emoji[woman_juggling_medium_light_skin_tone]=$'\U1F939\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_juggling_medium_light_skin_tone_minimally]=$'\U1F939\U1F3FC\U200D\U2640'
+emoji[woman_juggling_medium_skin_tone]=$'\U1F939\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_juggling_medium_skin_tone_minimally]=$'\U1F939\U1F3FD\U200D\U2640'
+emoji[woman_juggling_medium_dark_skin_tone]=$'\U1F939\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_juggling_medium_dark_skin_tone_minimally]=$'\U1F939\U1F3FE\U200D\U2640'
+emoji[woman_juggling_dark_skin_tone]=$'\U1F939\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_juggling_dark_skin_tone_minimally]=$'\U1F939\U1F3FF\U200D\U2640'
+emoji[person_in_lotus_position]=$'\U1F9D8'
+emoji[lotus_position]=$'\U1F9D8'
+emoji[person_in_lotus_position_light_skin_tone]=$'\U1F9D8\U1F3FB'
+emoji[person_in_lotus_position_medium_light_skin_tone]=$'\U1F9D8\U1F3FC'
+emoji[person_in_lotus_position_medium_skin_tone]=$'\U1F9D8\U1F3FD'
+emoji[person_in_lotus_position_medium_dark_skin_tone]=$'\U1F9D8\U1F3FE'
+emoji[person_in_lotus_position_dark_skin_tone]=$'\U1F9D8\U1F3FF'
+emoji[man_in_lotus_position]=$'\U1F9D8\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_minimally]=$'\U1F9D8\U200D\U2642'
+emoji[lotus_position_man]=$'\U1F9D8\U200D\U2642'
+emoji[man_in_lotus_position_light_skin_tone]=$'\U1F9D8\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_light_skin_tone_minimally]=$'\U1F9D8\U1F3FB\U200D\U2642'
+emoji[man_in_lotus_position_medium_light_skin_tone]=$'\U1F9D8\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_medium_light_skin_tone_minimally]=$'\U1F9D8\U1F3FC\U200D\U2642'
+emoji[man_in_lotus_position_medium_skin_tone]=$'\U1F9D8\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_medium_skin_tone_minimally]=$'\U1F9D8\U1F3FD\U200D\U2642'
+emoji[man_in_lotus_position_medium_dark_skin_tone]=$'\U1F9D8\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_medium_dark_skin_tone_minimally]=$'\U1F9D8\U1F3FE\U200D\U2642'
+emoji[man_in_lotus_position_dark_skin_tone]=$'\U1F9D8\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_dark_skin_tone_minimally]=$'\U1F9D8\U1F3FF\U200D\U2642'
+emoji[woman_in_lotus_position]=$'\U1F9D8\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_minimally]=$'\U1F9D8\U200D\U2640'
+emoji[lotus_position_woman]=$'\U1F9D8\U200D\U2640'
+emoji[woman_in_lotus_position_light_skin_tone]=$'\U1F9D8\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_light_skin_tone_minimally]=$'\U1F9D8\U1F3FB\U200D\U2640'
+emoji[woman_in_lotus_position_medium_light_skin_tone]=$'\U1F9D8\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_medium_light_skin_tone_minimally]=$'\U1F9D8\U1F3FC\U200D\U2640'
+emoji[woman_in_lotus_position_medium_skin_tone]=$'\U1F9D8\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_medium_skin_tone_minimally]=$'\U1F9D8\U1F3FD\U200D\U2640'
+emoji[woman_in_lotus_position_medium_dark_skin_tone]=$'\U1F9D8\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_medium_dark_skin_tone_minimally]=$'\U1F9D8\U1F3FE\U200D\U2640'
+emoji[woman_in_lotus_position_dark_skin_tone]=$'\U1F9D8\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_dark_skin_tone_minimally]=$'\U1F9D8\U1F3FF\U200D\U2640'
+emoji[person_taking_bath]=$'\U1F6C0'
+emoji[bath]=$'\U1F6C0'
+emoji[person_taking_bath_light_skin_tone]=$'\U1F6C0\U1F3FB'
+emoji[person_taking_bath_medium_light_skin_tone]=$'\U1F6C0\U1F3FC'
+emoji[person_taking_bath_medium_skin_tone]=$'\U1F6C0\U1F3FD'
+emoji[person_taking_bath_medium_dark_skin_tone]=$'\U1F6C0\U1F3FE'
+emoji[person_taking_bath_dark_skin_tone]=$'\U1F6C0\U1F3FF'
+emoji[person_in_bed]=$'\U1F6CC'
+emoji[sleeping_bed]=$'\U1F6CC'
+emoji[person_in_bed_light_skin_tone]=$'\U1F6CC\U1F3FB'
+emoji[person_in_bed_medium_light_skin_tone]=$'\U1F6CC\U1F3FC'
+emoji[person_in_bed_medium_skin_tone]=$'\U1F6CC\U1F3FD'
+emoji[person_in_bed_medium_dark_skin_tone]=$'\U1F6CC\U1F3FE'
+emoji[person_in_bed_dark_skin_tone]=$'\U1F6CC\U1F3FF'
+emoji[people_holding_hands]=$'\U1F9D1\U200D\U1F91D\U200D\U1F9D1'
+emoji[people_holding_hands_light_skin_tone]=$'\U1F9D1\U1F3FB\U200D\U1F91D\U200D\U1F9D1\U1F3FB'
+emoji[people_holding_hands_medium_light_skin_tone_light_skin_tone]=$'\U1F9D1\U1F3FC\U200D\U1F91D\U200D\U1F9D1\U1F3FB'
+emoji[people_holding_hands_medium_light_skin_tone_light_skin_tone_1]=$'\U1F9D1\U1F3FC\U200D\U1F91D\U200D\U1F9D1\U1F3FC'
+emoji[people_holding_hands_medium_skin_tone_light_skin_tone]=$'\U1F9D1\U1F3FD\U200D\U1F91D\U200D\U1F9D1\U1F3FB'
+emoji[people_holding_hands_medium_skin_tone_medium_light_skin_tone]=$'\U1F9D1\U1F3FD\U200D\U1F91D\U200D\U1F9D1\U1F3FC'
+emoji[people_holding_hands_medium_skin_tone_medium_light_skin_tone_1]=$'\U1F9D1\U1F3FD\U200D\U1F91D\U200D\U1F9D1\U1F3FD'
+emoji[people_holding_hands_medium_dark_skin_tone_light_skin_tone]=$'\U1F9D1\U1F3FE\U200D\U1F91D\U200D\U1F9D1\U1F3FB'
+emoji[people_holding_hands_medium_dark_skin_tone_medium_light_skin_tone]=$'\U1F9D1\U1F3FE\U200D\U1F91D\U200D\U1F9D1\U1F3FC'
+emoji[people_holding_hands_medium_dark_skin_tone_medium_skin_tone]=$'\U1F9D1\U1F3FE\U200D\U1F91D\U200D\U1F9D1\U1F3FD'
+emoji[people_holding_hands_medium_dark_skin_tone_medium_skin_tone_1]=$'\U1F9D1\U1F3FE\U200D\U1F91D\U200D\U1F9D1\U1F3FE'
+emoji[people_holding_hands_dark_skin_tone_light_skin_tone]=$'\U1F9D1\U1F3FF\U200D\U1F91D\U200D\U1F9D1\U1F3FB'
+emoji[people_holding_hands_dark_skin_tone_medium_light_skin_tone]=$'\U1F9D1\U1F3FF\U200D\U1F91D\U200D\U1F9D1\U1F3FC'
+emoji[people_holding_hands_dark_skin_tone_medium_skin_tone]=$'\U1F9D1\U1F3FF\U200D\U1F91D\U200D\U1F9D1\U1F3FD'
+emoji[people_holding_hands_dark_skin_tone_medium_dark_skin_tone]=$'\U1F9D1\U1F3FF\U200D\U1F91D\U200D\U1F9D1\U1F3FE'
+emoji[people_holding_hands_dark_skin_tone_medium_dark_skin_tone_1]=$'\U1F9D1\U1F3FF\U200D\U1F91D\U200D\U1F9D1\U1F3FF'
+emoji[women_holding_hands]=$'\U1F46D'
+emoji[two_women_holding_hands]=$'\U1F46D'
+emoji[women_holding_hands_light_skin_tone]=$'\U1F46D\U1F3FB'
+emoji[women_holding_hands_medium_light_skin_tone_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F91D\U200D\U1F469\U1F3FB'
+emoji[women_holding_hands_medium_light_skin_tone_light_skin_tone_1]=$'\U1F46D\U1F3FC'
+emoji[women_holding_hands_medium_skin_tone_light_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F469\U1F3FB'
+emoji[women_holding_hands_medium_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F469\U1F3FC'
+emoji[women_holding_hands_medium_skin_tone_medium_light_skin_tone_1]=$'\U1F46D\U1F3FD'
+emoji[women_holding_hands_medium_dark_skin_tone_light_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F469\U1F3FB'
+emoji[women_holding_hands_medium_dark_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F469\U1F3FC'
+emoji[women_holding_hands_medium_dark_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F469\U1F3FD'
+emoji[women_holding_hands_medium_dark_skin_tone_medium_skin_tone_1]=$'\U1F46D\U1F3FE'
+emoji[women_holding_hands_dark_skin_tone_light_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F469\U1F3FB'
+emoji[women_holding_hands_dark_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F469\U1F3FC'
+emoji[women_holding_hands_dark_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F469\U1F3FD'
+emoji[women_holding_hands_dark_skin_tone_medium_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F469\U1F3FE'
+emoji[women_holding_hands_dark_skin_tone_medium_dark_skin_tone_1]=$'\U1F46D\U1F3FF'
+emoji[woman_and_man_holding_hands]=$'\U1F46B'
+emoji[couple]=$'\U1F46B'
+emoji[woman_and_man_holding_hands_light_skin_tone]=$'\U1F46B\U1F3FB'
+emoji[woman_and_man_holding_hands_light_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[woman_and_man_holding_hands_light_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[woman_and_man_holding_hands_light_skin_tone_medium_dark_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F91D\U200D\U1F468\U1F3FE'
+emoji[woman_and_man_holding_hands_light_skin_tone_dark_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F91D\U200D\U1F468\U1F3FF'
+emoji[woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone_1]=$'\U1F46B\U1F3FC'
+emoji[woman_and_man_holding_hands_medium_light_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[woman_and_man_holding_hands_medium_light_skin_tone_medium_dark_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F91D\U200D\U1F468\U1F3FE'
+emoji[woman_and_man_holding_hands_medium_light_skin_tone_dark_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F91D\U200D\U1F468\U1F3FF'
+emoji[woman_and_man_holding_hands_medium_skin_tone_light_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone_1]=$'\U1F46B\U1F3FD'
+emoji[woman_and_man_holding_hands_medium_skin_tone_medium_dark_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FE'
+emoji[woman_and_man_holding_hands_medium_skin_tone_dark_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FF'
+emoji[woman_and_man_holding_hands_medium_dark_skin_tone_light_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[woman_and_man_holding_hands_medium_dark_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone_1]=$'\U1F46B\U1F3FE'
+emoji[woman_and_man_holding_hands_medium_dark_skin_tone_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FF'
+emoji[woman_and_man_holding_hands_dark_skin_tone_light_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[woman_and_man_holding_hands_dark_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[woman_and_man_holding_hands_dark_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FE'
+emoji[woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone_1]=$'\U1F46B\U1F3FF'
+emoji[men_holding_hands]=$'\U1F46C'
+emoji[two_men_holding_hands]=$'\U1F46C'
+emoji[men_holding_hands_light_skin_tone]=$'\U1F46C\U1F3FB'
+emoji[men_holding_hands_medium_light_skin_tone_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[men_holding_hands_medium_light_skin_tone_light_skin_tone_1]=$'\U1F46C\U1F3FC'
+emoji[men_holding_hands_medium_skin_tone_light_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[men_holding_hands_medium_skin_tone_medium_light_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[men_holding_hands_medium_skin_tone_medium_light_skin_tone_1]=$'\U1F46C\U1F3FD'
+emoji[men_holding_hands_medium_dark_skin_tone_light_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[men_holding_hands_medium_dark_skin_tone_medium_light_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[men_holding_hands_medium_dark_skin_tone_medium_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[men_holding_hands_medium_dark_skin_tone_medium_skin_tone_1]=$'\U1F46C\U1F3FE'
+emoji[men_holding_hands_dark_skin_tone_light_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[men_holding_hands_dark_skin_tone_medium_light_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[men_holding_hands_dark_skin_tone_medium_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[men_holding_hands_dark_skin_tone_medium_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FE'
+emoji[men_holding_hands_dark_skin_tone_medium_dark_skin_tone_1]=$'\U1F46C\U1F3FF'
+emoji[kiss]=$'\U1F48F'
+emoji[couplekiss]=$'\U1F48F'
+emoji[kiss_woman_man]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F468'
+emoji[couplekiss_man_woman]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F468'
+emoji[kiss_woman_man_minimally]=$'\U1F469\U200D\U2764\U200D\U1F48B\U200D\U1F468'
+emoji[kiss_man_man]=$'\U1F468\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F468'
+emoji[couplekiss_man_man]=$'\U1F468\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F468'
+emoji[kiss_man_man_minimally]=$'\U1F468\U200D\U2764\U200D\U1F48B\U200D\U1F468'
+emoji[kiss_woman_woman]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F469'
+emoji[couplekiss_woman_woman]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F469'
+emoji[kiss_woman_woman_minimally]=$'\U1F469\U200D\U2764\U200D\U1F48B\U200D\U1F469'
+emoji[couple_with_heart]=$'\U1F491'
+emoji[couple_with_heart_woman_man]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F468'
+emoji[couple_with_heart_woman_man_minimally]=$'\U1F469\U200D\U2764\U200D\U1F468'
+emoji[couple_with_heart_man_man]=$'\U1F468\U200D\U2764\UFE0F\U200D\U1F468'
+emoji[couple_with_heart_man_man_minimally]=$'\U1F468\U200D\U2764\U200D\U1F468'
+emoji[couple_with_heart_woman_woman]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F469'
+emoji[couple_with_heart_woman_woman_minimally]=$'\U1F469\U200D\U2764\U200D\U1F469'
+emoji[family]=$'\U1F46A'
+emoji[family_man_woman_boy]=$'\U1F468\U200D\U1F469\U200D\U1F466'
+emoji[family_man_woman_girl]=$'\U1F468\U200D\U1F469\U200D\U1F467'
+emoji[family_man_woman_girl_boy]=$'\U1F468\U200D\U1F469\U200D\U1F467\U200D\U1F466'
+emoji[family_man_woman_boy_boy]=$'\U1F468\U200D\U1F469\U200D\U1F466\U200D\U1F466'
+emoji[family_man_woman_girl_girl]=$'\U1F468\U200D\U1F469\U200D\U1F467\U200D\U1F467'
+emoji[family_man_man_boy]=$'\U1F468\U200D\U1F468\U200D\U1F466'
+emoji[family_man_man_girl]=$'\U1F468\U200D\U1F468\U200D\U1F467'
+emoji[family_man_man_girl_boy]=$'\U1F468\U200D\U1F468\U200D\U1F467\U200D\U1F466'
+emoji[family_man_man_boy_boy]=$'\U1F468\U200D\U1F468\U200D\U1F466\U200D\U1F466'
+emoji[family_man_man_girl_girl]=$'\U1F468\U200D\U1F468\U200D\U1F467\U200D\U1F467'
+emoji[family_woman_woman_boy]=$'\U1F469\U200D\U1F469\U200D\U1F466'
+emoji[family_woman_woman_girl]=$'\U1F469\U200D\U1F469\U200D\U1F467'
+emoji[family_woman_woman_girl_boy]=$'\U1F469\U200D\U1F469\U200D\U1F467\U200D\U1F466'
+emoji[family_woman_woman_boy_boy]=$'\U1F469\U200D\U1F469\U200D\U1F466\U200D\U1F466'
+emoji[family_woman_woman_girl_girl]=$'\U1F469\U200D\U1F469\U200D\U1F467\U200D\U1F467'
+emoji[family_man_boy]=$'\U1F468\U200D\U1F466'
+emoji[family_man_boy_boy]=$'\U1F468\U200D\U1F466\U200D\U1F466'
+emoji[family_man_girl]=$'\U1F468\U200D\U1F467'
+emoji[family_man_girl_boy]=$'\U1F468\U200D\U1F467\U200D\U1F466'
+emoji[family_man_girl_girl]=$'\U1F468\U200D\U1F467\U200D\U1F467'
+emoji[family_woman_boy]=$'\U1F469\U200D\U1F466'
+emoji[family_woman_boy_boy]=$'\U1F469\U200D\U1F466\U200D\U1F466'
+emoji[family_woman_girl]=$'\U1F469\U200D\U1F467'
+emoji[family_woman_girl_boy]=$'\U1F469\U200D\U1F467\U200D\U1F466'
+emoji[family_woman_girl_girl]=$'\U1F469\U200D\U1F467\U200D\U1F467'
+emoji[speaking_head]=$'\U1F5E3\UFE0F'
+emoji[speaking_head_unqualified]=$'\U1F5E3'
+emoji[bust_in_silhouette]=$'\U1F464'
+emoji[busts_in_silhouette]=$'\U1F465'
+emoji[footprints]=$'\U1F463'
+emoji_mod[light_skin_tone]=$'\U1F3FB'
+emoji_mod[medium_light_skin_tone]=$'\U1F3FC'
+emoji_mod[medium_skin_tone]=$'\U1F3FD'
+emoji_mod[medium_dark_skin_tone]=$'\U1F3FE'
+emoji_mod[medium_dark_skin_tone_1]=$'\U1F3FF'
+emoji_mod[red_hair]=$'\U1F9B0'
+emoji_mod[curly_hair]=$'\U1F9B1'
+emoji_mod[white_hair]=$'\U1F9B3'
+emoji_mod[bald]=$'\U1F9B2'
+emoji[monkey_face]=$'\U1F435'
+emoji[monkey_face_1]=$'\U1F412'
+emoji[monkey]=$'\U1F412'
+emoji[gorilla]=$'\U1F98D'
+emoji[orangutan]=$'\U1F9A7'
+emoji[dog_face]=$'\U1F436'
+emoji[dog]=$'\U1F436'
+emoji[dog_face_1]=$'\U1F415'
+emoji[dog2]=$'\U1F415'
+emoji[guide_dog]=$'\U1F9AE'
+emoji[service_dog]=$'\U1F415\U200D\U1F9BA'
+emoji[poodle]=$'\U1F429'
+emoji[wolf]=$'\U1F43A'
+emoji[fox]=$'\U1F98A'
+emoji[fox_face]=$'\U1F98A'
+emoji[raccoon]=$'\U1F99D'
+emoji[cat_face]=$'\U1F431'
+emoji[cat]=$'\U1F431'
+emoji[cat_face_1]=$'\U1F408'
+emoji[cat2]=$'\U1F408'
+emoji[lion]=$'\U1F981'
+emoji[tiger_face]=$'\U1F42F'
+emoji[tiger]=$'\U1F42F'
+emoji[tiger_face_1]=$'\U1F405'
+emoji[tiger2]=$'\U1F405'
+emoji[leopard]=$'\U1F406'
+emoji[horse_face]=$'\U1F434'
+emoji[horse]=$'\U1F434'
+emoji[horse_face_1]=$'\U1F40E'
+emoji[racehorse]=$'\U1F40E'
+emoji[unicorn]=$'\U1F984'
+emoji[zebra]=$'\U1F993'
+emoji[deer]=$'\U1F98C'
+emoji[cow_face]=$'\U1F42E'
+emoji[ox]=$'\U1F402'
+emoji[water_buffalo]=$'\U1F403'
+emoji[cow]=$'\U1F404'
+emoji[cow2]=$'\U1F404'
+emoji[pig_face]=$'\U1F437'
+emoji[pig]=$'\U1F437'
+emoji[pig_face_1]=$'\U1F416'
+emoji[pig2]=$'\U1F416'
+emoji[boar]=$'\U1F417'
+emoji[pig_nose]=$'\U1F43D'
+emoji[ram]=$'\U1F40F'
+emoji[ewe]=$'\U1F411'
+emoji[sheep]=$'\U1F411'
+emoji[goat]=$'\U1F410'
+emoji[camel]=$'\U1F42A'
+emoji[dromedary_camel]=$'\U1F42A'
+emoji[two_hump_camel]=$'\U1F42B'
+emoji[llama]=$'\U1F999'
+emoji[giraffe]=$'\U1F992'
+emoji[elephant]=$'\U1F418'
+emoji[rhinoceros]=$'\U1F98F'
+emoji[hippopotamus]=$'\U1F99B'
+emoji[mouse_face]=$'\U1F42D'
+emoji[mouse]=$'\U1F42D'
+emoji[mouse_face_1]=$'\U1F401'
+emoji[mouse2]=$'\U1F401'
+emoji[rat]=$'\U1F400'
+emoji[hamster]=$'\U1F439'
+emoji[rabbit_face]=$'\U1F430'
+emoji[rabbit]=$'\U1F430'
+emoji[rabbit_face_1]=$'\U1F407'
+emoji[rabbit2]=$'\U1F407'
+emoji[chipmunk]=$'\U1F43F\UFE0F'
+emoji[chipmunk_unqualified]=$'\U1F43F'
+emoji[hedgehog]=$'\U1F994'
+emoji[bat]=$'\U1F987'
+emoji[bear]=$'\U1F43B'
+emoji[koala]=$'\U1F428'
+emoji[panda]=$'\U1F43C'
+emoji[panda_face]=$'\U1F43C'
+emoji[sloth]=$'\U1F9A5'
+emoji[otter]=$'\U1F9A6'
+emoji[skunk]=$'\U1F9A8'
+emoji[kangaroo]=$'\U1F998'
+emoji[badger]=$'\U1F9A1'
+emoji[paw_prints]=$'\U1F43E'
+emoji[feet]=$'\U1F43E'
+emoji[turkey]=$'\U1F983'
+emoji[chicken]=$'\U1F414'
+emoji[rooster]=$'\U1F413'
+emoji[hatching_chick]=$'\U1F423'
+emoji[baby_chick]=$'\U1F424'
+emoji[front_facing_baby_chick]=$'\U1F425'
+emoji[hatched_chick]=$'\U1F425'
+emoji[bird]=$'\U1F426'
+emoji[penguin]=$'\U1F427'
+emoji[dove]=$'\U1F54A\UFE0F'
+emoji[dove_unqualified]=$'\U1F54A'
+emoji[eagle]=$'\U1F985'
+emoji[duck]=$'\U1F986'
+emoji[swan]=$'\U1F9A2'
+emoji[owl]=$'\U1F989'
+emoji[flamingo]=$'\U1F9A9'
+emoji[peacock]=$'\U1F99A'
+emoji[parrot]=$'\U1F99C'
+emoji[frog]=$'\U1F438'
+emoji[crocodile]=$'\U1F40A'
+emoji[turtle]=$'\U1F422'
+emoji[lizard]=$'\U1F98E'
+emoji[snake]=$'\U1F40D'
+emoji[dragon_face]=$'\U1F432'
+emoji[dragon_face_1]=$'\U1F409'
+emoji[dragon]=$'\U1F409'
+emoji[sauropod]=$'\U1F995'
+emoji[T_Rex]=$'\U1F996'
+emoji[t-rex]=$'\U1F996'
+emoji[spouting_whale]=$'\U1F433'
+emoji[whale]=$'\U1F433'
+emoji[spouting_whale_1]=$'\U1F40B'
+emoji[whale2]=$'\U1F40B'
+emoji[dolphin]=$'\U1F42C'
+emoji[flipper]=$'\U1F42C'
+emoji[fish]=$'\U1F41F'
+emoji[tropical_fish]=$'\U1F420'
+emoji[blowfish]=$'\U1F421'
+emoji[shark]=$'\U1F988'
+emoji[octopus]=$'\U1F419'
+emoji[spiral_shell]=$'\U1F41A'
+emoji[shell]=$'\U1F41A'
+emoji[snail]=$'\U1F40C'
+emoji[butterfly]=$'\U1F98B'
+emoji[bug]=$'\U1F41B'
+emoji[ant]=$'\U1F41C'
+emoji[honeybee]=$'\U1F41D'
+emoji[bee]=$'\U1F41D'
+emoji[lady_beetle]=$'\U1F41E'
+emoji[beetle]=$'\U1F41E'
+emoji[cricket]=$'\U1F997'
+emoji[spider]=$'\U1F577\UFE0F'
+emoji[spider_unqualified]=$'\U1F577'
+emoji[spider_web]=$'\U1F578\UFE0F'
+emoji[spider_web_unqualified]=$'\U1F578'
+emoji[scorpion]=$'\U1F982'
+emoji[mosquito]=$'\U1F99F'
+emoji[microbe]=$'\U1F9A0'
+emoji[bouquet]=$'\U1F490'
+emoji[cherry_blossom]=$'\U1F338'
+emoji[white_flower]=$'\U1F4AE'
+emoji[rosette]=$'\U1F3F5\UFE0F'
+emoji[rosette_unqualified]=$'\U1F3F5'
+emoji[rosette_unqualified_1]=$'\U1F339'
+emoji[rose]=$'\U1F339'
+emoji[wilted_flower]=$'\U1F940'
+emoji[hibiscus]=$'\U1F33A'
+emoji[sunflower]=$'\U1F33B'
+emoji[blossom]=$'\U1F33C'
+emoji[tulip]=$'\U1F337'
 emoji[seedling]=$'\U1F331'
 emoji[evergreen_tree]=$'\U1F332'
 emoji[deciduous_tree]=$'\U1F333'
 emoji[palm_tree]=$'\U1F334'
 emoji[cactus]=$'\U1F335'
-emoji[hot_pepper]=$'\U1F336'
-emoji[tulip]=$'\U1F337'
-emoji[cherry_blossom]=$'\U1F338'
-emoji[rose]=$'\U1F339'
-emoji[hibiscus]=$'\U1F33A'
-emoji[sunflower]=$'\U1F33B'
-emoji[blossom]=$'\U1F33C'
-emoji[ear_of_maize]=$'\U1F33D'
+emoji[sheaf_of_rice]=$'\U1F33E'
 emoji[ear_of_rice]=$'\U1F33E'
 emoji[herb]=$'\U1F33F'
+emoji[shamrock]=$'\U2618\UFE0F'
+emoji[shamrock_unqualified]=$'\U2618'
 emoji[four_leaf_clover]=$'\U1F340'
 emoji[maple_leaf]=$'\U1F341'
 emoji[fallen_leaf]=$'\U1F342'
 emoji[leaf_fluttering_in_wind]=$'\U1F343'
-emoji[mushroom]=$'\U1F344'
-emoji[tomato]=$'\U1F345'
-emoji[aubergine]=$'\U1F346'
+emoji[leaves]=$'\U1F343'
 emoji[grapes]=$'\U1F347'
 emoji[melon]=$'\U1F348'
 emoji[watermelon]=$'\U1F349'
 emoji[tangerine]=$'\U1F34A'
+emoji[orange]=$'\U1F34A'
+emoji[mandarin]=$'\U1F34A'
 emoji[lemon]=$'\U1F34B'
 emoji[banana]=$'\U1F34C'
 emoji[pineapple]=$'\U1F34D'
+emoji[mango]=$'\U1F96D'
 emoji[red_apple]=$'\U1F34E'
+emoji[apple]=$'\U1F34E'
 emoji[green_apple]=$'\U1F34F'
 emoji[pear]=$'\U1F350'
 emoji[peach]=$'\U1F351'
 emoji[cherries]=$'\U1F352'
 emoji[strawberry]=$'\U1F353'
-emoji[hamburger]=$'\U1F354'
-emoji[slice_of_pizza]=$'\U1F355'
+emoji[kiwi_fruit]=$'\U1F95D'
+emoji[tomato]=$'\U1F345'
+emoji[coconut]=$'\U1F965'
+emoji[avocado]=$'\U1F951'
+emoji[eggplant]=$'\U1F346'
+emoji[potato]=$'\U1F954'
+emoji[carrot]=$'\U1F955'
+emoji[ear_of_corn]=$'\U1F33D'
+emoji[corn]=$'\U1F33D'
+emoji[hot_pepper]=$'\U1F336\UFE0F'
+emoji[hot_pepper_unqualified]=$'\U1F336'
+emoji[cucumber]=$'\U1F952'
+emoji[leafy_green]=$'\U1F96C'
+emoji[broccoli]=$'\U1F966'
+emoji[garlic]=$'\U1F9C4'
+emoji[onion]=$'\U1F9C5'
+emoji[mushroom]=$'\U1F344'
+emoji[peanuts]=$'\U1F95C'
+emoji[chestnut]=$'\U1F330'
+emoji[bread]=$'\U1F35E'
+emoji[croissant]=$'\U1F950'
+emoji[baguette_bread]=$'\U1F956'
+emoji[pretzel]=$'\U1F968'
+emoji[bagel]=$'\U1F96F'
+emoji[pancakes]=$'\U1F95E'
+emoji[waffle]=$'\U1F9C7'
+emoji[cheese_wedge]=$'\U1F9C0'
+emoji[cheese]=$'\U1F9C0'
 emoji[meat_on_bone]=$'\U1F356'
 emoji[poultry_leg]=$'\U1F357'
+emoji[cut_of_meat]=$'\U1F969'
+emoji[bacon]=$'\U1F953'
+emoji[hamburger]=$'\U1F354'
+emoji[french_fries]=$'\U1F35F'
+emoji[fries]=$'\U1F35F'
+emoji[pizza]=$'\U1F355'
+emoji[hot_dog]=$'\U1F32D'
+emoji[hotdog]=$'\U1F32D'
+emoji[sandwich]=$'\U1F96A'
+emoji[taco]=$'\U1F32E'
+emoji[burrito]=$'\U1F32F'
+emoji[stuffed_flatbread]=$'\U1F959'
+emoji[falafel]=$'\U1F9C6'
+emoji[egg]=$'\U1F95A'
+emoji[cooking]=$'\U1F373'
+emoji[fried_egg]=$'\U1F373'
+emoji[shallow_pan_of_food]=$'\U1F958'
+emoji[pot_of_food]=$'\U1F372'
+emoji[stew]=$'\U1F372'
+emoji[bowl_with_spoon]=$'\U1F963'
+emoji[green_salad]=$'\U1F957'
+emoji[popcorn]=$'\U1F37F'
+emoji[butter]=$'\U1F9C8'
+emoji[salt]=$'\U1F9C2'
+emoji[canned_food]=$'\U1F96B'
+emoji[bento_box]=$'\U1F371'
+emoji[bento]=$'\U1F371'
 emoji[rice_cracker]=$'\U1F358'
 emoji[rice_ball]=$'\U1F359'
 emoji[cooked_rice]=$'\U1F35A'
-emoji[curry_and_rice]=$'\U1F35B'
+emoji[rice]=$'\U1F35A'
+emoji[curry_rice]=$'\U1F35B'
+emoji[curry]=$'\U1F35B'
 emoji[steaming_bowl]=$'\U1F35C'
+emoji[ramen]=$'\U1F35C'
 emoji[spaghetti]=$'\U1F35D'
-emoji[bread]=$'\U1F35E'
-emoji[french_fries]=$'\U1F35F'
 emoji[roasted_sweet_potato]=$'\U1F360'
-emoji[dango]=$'\U1F361'
+emoji[sweet_potato]=$'\U1F360'
 emoji[oden]=$'\U1F362'
 emoji[sushi]=$'\U1F363'
 emoji[fried_shrimp]=$'\U1F364'
-emoji[fish_cake_with_swirl_design]=$'\U1F365'
+emoji[fish_cake_with_swirl]=$'\U1F365'
+emoji[fish_cake]=$'\U1F365'
+emoji[moon_cake]=$'\U1F96E'
+emoji[dango]=$'\U1F361'
+emoji[dumpling]=$'\U1F95F'
+emoji[fortune_cookie]=$'\U1F960'
+emoji[takeout_box]=$'\U1F961'
+emoji[crab]=$'\U1F980'
+emoji[lobster]=$'\U1F99E'
+emoji[shrimp]=$'\U1F990'
+emoji[squid]=$'\U1F991'
+emoji[oyster]=$'\U1F9AA'
 emoji[soft_ice_cream]=$'\U1F366'
+emoji[icecream]=$'\U1F366'
 emoji[shaved_ice]=$'\U1F367'
 emoji[ice_cream]=$'\U1F368'
 emoji[doughnut]=$'\U1F369'
 emoji[cookie]=$'\U1F36A'
+emoji[birthday_cake]=$'\U1F382'
+emoji[birthday]=$'\U1F382'
+emoji[shortcake]=$'\U1F370'
+emoji[cake]=$'\U1F370'
+emoji[cupcake]=$'\U1F9C1'
+emoji[pie]=$'\U1F967'
 emoji[chocolate_bar]=$'\U1F36B'
 emoji[candy]=$'\U1F36C'
 emoji[lollipop]=$'\U1F36D'
 emoji[custard]=$'\U1F36E'
 emoji[honey_pot]=$'\U1F36F'
-emoji[shortcake]=$'\U1F370'
-emoji[bento_box]=$'\U1F371'
-emoji[pot_of_food]=$'\U1F372'
-emoji[cooking]=$'\U1F373'
-emoji[fork_and_knife]=$'\U1F374'
+emoji[baby_bottle]=$'\U1F37C'
+emoji[glass_of_milk]=$'\U1F95B'
+emoji[milk_glass]=$'\U1F95B'
+emoji[hot_beverage]=$'\U2615'
+emoji[coffee]=$'\U2615'
 emoji[teacup_without_handle]=$'\U1F375'
-emoji[sake_bottle_and_cup]=$'\U1F376'
+emoji[tea]=$'\U1F375'
+emoji[sake]=$'\U1F376'
+emoji[bottle_with_popping_cork]=$'\U1F37E'
+emoji[champagne]=$'\U1F37E'
 emoji[wine_glass]=$'\U1F377'
 emoji[cocktail_glass]=$'\U1F378'
+emoji[cocktail]=$'\U1F378'
 emoji[tropical_drink]=$'\U1F379'
 emoji[beer_mug]=$'\U1F37A'
+emoji[beer]=$'\U1F37A'
 emoji[clinking_beer_mugs]=$'\U1F37B'
-emoji[baby_bottle]=$'\U1F37C'
-emoji[fork_and_knife_with_plate]=$'\U1F37D'
-emoji[bottle_with_popping_cork]=$'\U1F37E'
-emoji[popcorn]=$'\U1F37F'
-emoji[ribbon]=$'\U1F380'
-emoji[wrapped_present]=$'\U1F381'
-emoji[birthday_cake]=$'\U1F382'
-emoji[jack_o_lantern]=$'\U1F383'
-emoji[christmas_tree]=$'\U1F384'
-emoji[father_christmas]=$'\U1F385'
-emoji[fireworks]=$'\U1F386'
-emoji[firework_sparkler]=$'\U1F387'
-emoji[balloon]=$'\U1F388'
-emoji[party_popper]=$'\U1F389'
-emoji[confetti_ball]=$'\U1F38A'
-emoji[tanabata_tree]=$'\U1F38B'
-emoji[crossed_flags]=$'\U1F38C'
-emoji[pine_decoration]=$'\U1F38D'
-emoji[japanese_dolls]=$'\U1F38E'
-emoji[carp_streamer]=$'\U1F38F'
-emoji[wind_chime]=$'\U1F390'
-emoji[moon_viewing_ceremony]=$'\U1F391'
-emoji[school_satchel]=$'\U1F392'
-emoji[graduation_cap]=$'\U1F393'
-emoji[military_medal]=$'\U1F396'
-emoji[reminder_ribbon]=$'\U1F397'
-emoji[studio_microphone]=$'\U1F399'
-emoji[level_slider]=$'\U1F39A'
-emoji[control_knobs]=$'\U1F39B'
-emoji[film_frames]=$'\U1F39E'
-emoji[admission_tickets]=$'\U1F39F'
-emoji[carousel_horse]=$'\U1F3A0'
-emoji[ferris_wheel]=$'\U1F3A1'
-emoji[roller_coaster]=$'\U1F3A2'
-emoji[fishing_pole_and_fish]=$'\U1F3A3'
-emoji[microphone]=$'\U1F3A4'
-emoji[movie_camera]=$'\U1F3A5'
-emoji[cinema]=$'\U1F3A6'
-emoji[headphone]=$'\U1F3A7'
-emoji[artist_palette]=$'\U1F3A8'
-emoji[top_hat]=$'\U1F3A9'
-emoji[circus_tent]=$'\U1F3AA'
-emoji[ticket]=$'\U1F3AB'
-emoji[clapper_board]=$'\U1F3AC'
-emoji[performing_arts]=$'\U1F3AD'
-emoji[video_game]=$'\U1F3AE'
-emoji[direct_hit]=$'\U1F3AF'
-emoji[slot_machine]=$'\U1F3B0'
-emoji[billiards]=$'\U1F3B1'
-emoji[game_die]=$'\U1F3B2'
-emoji[bowling]=$'\U1F3B3'
-emoji[flower_playing_cards]=$'\U1F3B4'
-emoji[musical_note]=$'\U1F3B5'
-emoji[multiple_musical_notes]=$'\U1F3B6'
-emoji[saxophone]=$'\U1F3B7'
-emoji[guitar]=$'\U1F3B8'
-emoji[musical_keyboard]=$'\U1F3B9'
-emoji[trumpet]=$'\U1F3BA'
-emoji[violin]=$'\U1F3BB'
-emoji[musical_score]=$'\U1F3BC'
-emoji[running_shirt_with_sash]=$'\U1F3BD'
-emoji[tennis_racquet_and_ball]=$'\U1F3BE'
-emoji[ski_and_ski_boot]=$'\U1F3BF'
-emoji[basketball_and_hoop]=$'\U1F3C0'
-emoji[chequered_flag]=$'\U1F3C1'
-emoji[snowboarder]=$'\U1F3C2'
-emoji[runner]=$'\U1F3C3'
-emoji[surfer]=$'\U1F3C4'
-emoji[sports_medal]=$'\U1F3C5'
-emoji[trophy]=$'\U1F3C6'
-emoji[horse_racing]=$'\U1F3C7'
-emoji[american_football]=$'\U1F3C8'
-emoji[rugby_football]=$'\U1F3C9'
-emoji[swimmer]=$'\U1F3CA'
-emoji[weight_lifter]=$'\U1F3CB'
-emoji[golfer]=$'\U1F3CC'
-emoji[racing_motorcycle]=$'\U1F3CD'
-emoji[racing_car]=$'\U1F3CE'
-emoji[cricket_bat_and_ball]=$'\U1F3CF'
-emoji[volleyball]=$'\U1F3D0'
-emoji[field_hockey_stick_and_ball]=$'\U1F3D1'
-emoji[ice_hockey_stick_and_puck]=$'\U1F3D2'
-emoji[table_tennis_paddle_and_ball]=$'\U1F3D3'
-emoji[snow_capped_mountain]=$'\U1F3D4'
-emoji[camping]=$'\U1F3D5'
-emoji[beach_with_umbrella]=$'\U1F3D6'
-emoji[building_construction]=$'\U1F3D7'
-emoji[house_buildings]=$'\U1F3D8'
-emoji[cityscape]=$'\U1F3D9'
-emoji[derelict_house_building]=$'\U1F3DA'
-emoji[classical_building]=$'\U1F3DB'
-emoji[desert]=$'\U1F3DC'
-emoji[desert_island]=$'\U1F3DD'
-emoji[national_park]=$'\U1F3DE'
-emoji[stadium]=$'\U1F3DF'
-emoji[house_building]=$'\U1F3E0'
+emoji[beers]=$'\U1F37B'
+emoji[clinking_glasses]=$'\U1F942'
+emoji[tumbler_glass]=$'\U1F943'
+emoji[cup_with_straw]=$'\U1F964'
+emoji[beverage_box]=$'\U1F9C3'
+emoji[mate]=$'\U1F9C9'
+emoji[ice_cube]=$'\U1F9CA'
+emoji[chopsticks]=$'\U1F962'
+emoji[fork_and_knife_with_plate]=$'\U1F37D\UFE0F'
+emoji[fork_and_knife_with_plate_unqualified]=$'\U1F37D'
+emoji[plate_with_cutlery]=$'\U1F37D'
+emoji[fork_and_knife_with_plate_unqualified_1]=$'\U1F374'
+emoji[fork_and_knife]=$'\U1F374'
+emoji[spoon]=$'\U1F944'
+emoji[kitchen_knife]=$'\U1F52A'
+emoji[hocho]=$'\U1F52A'
+emoji[knife]=$'\U1F52A'
+emoji[amphora]=$'\U1F3FA'
+emoji[globe_showing_Europe_Africa]=$'\U1F30D'
+emoji[earth_africa]=$'\U1F30D'
+emoji[globe_showing_Americas]=$'\U1F30E'
+emoji[earth_americas]=$'\U1F30E'
+emoji[globe_showing_Asia_Australia]=$'\U1F30F'
+emoji[earth_asia]=$'\U1F30F'
+emoji[globe_with_meridians]=$'\U1F310'
+emoji[world_map]=$'\U1F5FA\UFE0F'
+emoji[world_map_unqualified]=$'\U1F5FA'
+emoji[map_of_Japan]=$'\U1F5FE'
+emoji[japan]=$'\U1F5FE'
+emoji[compass]=$'\U1F9ED'
+emoji[snow_capped_mountain]=$'\U1F3D4\UFE0F'
+emoji[snow_capped_mountain_unqualified]=$'\U1F3D4'
+emoji[mountain_snow]=$'\U1F3D4'
+emoji[snow_capped_mountain_unqualified_1]=$'\U26F0\UFE0F'
+emoji[snow_capped_mountain_unqualified_2]=$'\U26F0'
+emoji[mountain]=$'\U26F0'
+emoji[volcano]=$'\U1F30B'
+emoji[mount_fuji]=$'\U1F5FB'
+emoji[camping]=$'\U1F3D5\UFE0F'
+emoji[camping_unqualified]=$'\U1F3D5'
+emoji[beach_with_umbrella]=$'\U1F3D6\UFE0F'
+emoji[beach_with_umbrella_unqualified]=$'\U1F3D6'
+emoji[beach_umbrella]=$'\U1F3D6'
+emoji[desert]=$'\U1F3DC\UFE0F'
+emoji[desert_unqualified]=$'\U1F3DC'
+emoji[desert_island]=$'\U1F3DD\UFE0F'
+emoji[desert_island_unqualified]=$'\U1F3DD'
+emoji[national_park]=$'\U1F3DE\UFE0F'
+emoji[national_park_unqualified]=$'\U1F3DE'
+emoji[stadium]=$'\U1F3DF\UFE0F'
+emoji[stadium_unqualified]=$'\U1F3DF'
+emoji[classical_building]=$'\U1F3DB\UFE0F'
+emoji[classical_building_unqualified]=$'\U1F3DB'
+emoji[building_construction]=$'\U1F3D7\UFE0F'
+emoji[building_construction_unqualified]=$'\U1F3D7'
+emoji[brick]=$'\U1F9F1'
+emoji[bricks]=$'\U1F9F1'
+emoji[houses]=$'\U1F3D8\UFE0F'
+emoji[houses_unqualified]=$'\U1F3D8'
+emoji[derelict_house]=$'\U1F3DA\UFE0F'
+emoji[derelict_house_unqualified]=$'\U1F3DA'
+emoji[derelict_house_unqualified_1]=$'\U1F3E0'
+emoji[house]=$'\U1F3E0'
 emoji[house_with_garden]=$'\U1F3E1'
 emoji[office_building]=$'\U1F3E2'
-emoji[japanese_post_office]=$'\U1F3E3'
+emoji[office]=$'\U1F3E2'
+emoji[Japanese_post_office]=$'\U1F3E3'
+emoji[post_office]=$'\U1F3E3'
+emoji[Japanese_post_office_1]=$'\U1F3E4'
 emoji[european_post_office]=$'\U1F3E4'
 emoji[hospital]=$'\U1F3E5'
 emoji[bank]=$'\U1F3E6'
-emoji[automated_teller_machine]=$'\U1F3E7'
 emoji[hotel]=$'\U1F3E8'
 emoji[love_hotel]=$'\U1F3E9'
 emoji[convenience_store]=$'\U1F3EA'
 emoji[school]=$'\U1F3EB'
 emoji[department_store]=$'\U1F3EC'
 emoji[factory]=$'\U1F3ED'
-emoji[izakaya_lantern]=$'\U1F3EE'
+emoji[Japanese_castle]=$'\U1F3EF'
 emoji[japanese_castle]=$'\U1F3EF'
+emoji[Japanese_castle_1]=$'\U1F3F0'
 emoji[european_castle]=$'\U1F3F0'
-emoji[waving_white_flag]=$'\U1F3F3'
-emoji[waving_black_flag]=$'\U1F3F4'
-emoji[rosette]=$'\U1F3F5'
-emoji[label]=$'\U1F3F7'
-emoji[badminton_racquet_and_shuttlecock]=$'\U1F3F8'
-emoji[bow_and_arrow]=$'\U1F3F9'
-emoji[amphora]=$'\U1F3FA'
-emoji[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB'
-emoji_mod[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB'
-emoji[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC'
-emoji_mod[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC'
-emoji[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD'
-emoji_mod[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD'
-emoji[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE'
-emoji_mod[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE'
-emoji[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF'
-emoji_mod[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF'
-emoji[rat]=$'\U1F400'
-emoji[mouse]=$'\U1F401'
-emoji[ox]=$'\U1F402'
-emoji[water_buffalo]=$'\U1F403'
-emoji[cow]=$'\U1F404'
-emoji[tiger]=$'\U1F405'
-emoji[leopard]=$'\U1F406'
-emoji[rabbit]=$'\U1F407'
-emoji[cat]=$'\U1F408'
-emoji[dragon]=$'\U1F409'
-emoji[crocodile]=$'\U1F40A'
-emoji[whale]=$'\U1F40B'
-emoji[snail]=$'\U1F40C'
-emoji[snake]=$'\U1F40D'
-emoji[horse]=$'\U1F40E'
-emoji[ram]=$'\U1F40F'
-emoji[goat]=$'\U1F410'
-emoji[sheep]=$'\U1F411'
-emoji[monkey]=$'\U1F412'
-emoji[rooster]=$'\U1F413'
-emoji[chicken]=$'\U1F414'
-emoji[dog]=$'\U1F415'
-emoji[pig]=$'\U1F416'
-emoji[boar]=$'\U1F417'
-emoji[elephant]=$'\U1F418'
-emoji[octopus]=$'\U1F419'
-emoji[spiral_shell]=$'\U1F41A'
-emoji[bug]=$'\U1F41B'
-emoji[ant]=$'\U1F41C'
-emoji[honeybee]=$'\U1F41D'
-emoji[lady_beetle]=$'\U1F41E'
-emoji[fish]=$'\U1F41F'
-emoji[tropical_fish]=$'\U1F420'
-emoji[blowfish]=$'\U1F421'
-emoji[turtle]=$'\U1F422'
-emoji[hatching_chick]=$'\U1F423'
-emoji[baby_chick]=$'\U1F424'
-emoji[front_facing_baby_chick]=$'\U1F425'
-emoji[bird]=$'\U1F426'
-emoji[penguin]=$'\U1F427'
-emoji[koala]=$'\U1F428'
-emoji[poodle]=$'\U1F429'
-emoji[dromedary_camel]=$'\U1F42A'
-emoji[bactrian_camel]=$'\U1F42B'
-emoji[dolphin]=$'\U1F42C'
-emoji[mouse_face]=$'\U1F42D'
-emoji[cow_face]=$'\U1F42E'
-emoji[tiger_face]=$'\U1F42F'
-emoji[rabbit_face]=$'\U1F430'
-emoji[cat_face]=$'\U1F431'
-emoji[dragon_face]=$'\U1F432'
-emoji[spouting_whale]=$'\U1F433'
-emoji[horse_face]=$'\U1F434'
-emoji[monkey_face]=$'\U1F435'
-emoji[dog_face]=$'\U1F436'
-emoji[pig_face]=$'\U1F437'
-emoji[frog_face]=$'\U1F438'
-emoji[hamster_face]=$'\U1F439'
-emoji[wolf_face]=$'\U1F43A'
-emoji[bear_face]=$'\U1F43B'
-emoji[panda_face]=$'\U1F43C'
-emoji[pig_nose]=$'\U1F43D'
-emoji[paw_prints]=$'\U1F43E'
-emoji[chipmunk]=$'\U1F43F'
-emoji[eyes]=$'\U1F440'
-emoji[eye]=$'\U1F441'
-emoji[ear]=$'\U1F442'
-emoji[nose]=$'\U1F443'
-emoji[mouth]=$'\U1F444'
-emoji[tongue]=$'\U1F445'
-emoji[white_up_pointing_backhand_index]=$'\U1F446'
-emoji[white_down_pointing_backhand_index]=$'\U1F447'
-emoji[white_left_pointing_backhand_index]=$'\U1F448'
-emoji[white_right_pointing_backhand_index]=$'\U1F449'
-emoji[fisted_hand_sign]=$'\U1F44A'
-emoji[waving_hand_sign]=$'\U1F44B'
-emoji[ok_hand_sign]=$'\U1F44C'
-emoji[thumbs_up_sign]=$'\U1F44D'
-emoji[thumbs_down_sign]=$'\U1F44E'
-emoji[clapping_hands_sign]=$'\U1F44F'
-emoji[open_hands_sign]=$'\U1F450'
-emoji[crown]=$'\U1F451'
-emoji[womans_hat]=$'\U1F452'
-emoji[eyeglasses]=$'\U1F453'
-emoji[necktie]=$'\U1F454'
-emoji[t_shirt]=$'\U1F455'
-emoji[jeans]=$'\U1F456'
-emoji[dress]=$'\U1F457'
-emoji[kimono]=$'\U1F458'
-emoji[bikini]=$'\U1F459'
-emoji[womans_clothes]=$'\U1F45A'
-emoji[purse]=$'\U1F45B'
-emoji[handbag]=$'\U1F45C'
-emoji[pouch]=$'\U1F45D'
-emoji[mans_shoe]=$'\U1F45E'
-emoji[athletic_shoe]=$'\U1F45F'
-emoji[high_heeled_shoe]=$'\U1F460'
-emoji[womans_sandal]=$'\U1F461'
-emoji[womans_boots]=$'\U1F462'
-emoji[footprints]=$'\U1F463'
-emoji[bust_in_silhouette]=$'\U1F464'
-emoji[busts_in_silhouette]=$'\U1F465'
-emoji[boy]=$'\U1F466'
-emoji[girl]=$'\U1F467'
-emoji[man]=$'\U1F468'
-emoji[woman]=$'\U1F469'
-emoji[family]=$'\U1F46A'
-emoji[man_and_woman_holding_hands]=$'\U1F46B'
-emoji[two_men_holding_hands]=$'\U1F46C'
-emoji[two_women_holding_hands]=$'\U1F46D'
-emoji[police_officer]=$'\U1F46E'
-emoji[woman_with_bunny_ears]=$'\U1F46F'
-emoji[bride_with_veil]=$'\U1F470'
-emoji[person_with_blond_hair]=$'\U1F471'
-emoji[man_with_gua_pi_mao]=$'\U1F472'
-emoji[man_with_turban]=$'\U1F473'
-emoji[older_man]=$'\U1F474'
-emoji[older_woman]=$'\U1F475'
-emoji[baby]=$'\U1F476'
-emoji[construction_worker]=$'\U1F477'
-emoji[princess]=$'\U1F478'
-emoji[japanese_ogre]=$'\U1F479'
-emoji[japanese_goblin]=$'\U1F47A'
-emoji[ghost]=$'\U1F47B'
-emoji[baby_angel]=$'\U1F47C'
-emoji[extraterrestrial_alien]=$'\U1F47D'
-emoji[alien_monster]=$'\U1F47E'
-emoji[imp]=$'\U1F47F'
-emoji[skull]=$'\U1F480'
-emoji[information_desk_person]=$'\U1F481'
-emoji[guardsman]=$'\U1F482'
-emoji[dancer]=$'\U1F483'
-emoji[lipstick]=$'\U1F484'
-emoji[nail_polish]=$'\U1F485'
-emoji[face_massage]=$'\U1F486'
-emoji[haircut]=$'\U1F487'
-emoji[barber_pole]=$'\U1F488'
-emoji[syringe]=$'\U1F489'
-emoji[pill]=$'\U1F48A'
-emoji[kiss_mark]=$'\U1F48B'
-emoji[love_letter]=$'\U1F48C'
-emoji[ring]=$'\U1F48D'
-emoji[gem_stone]=$'\U1F48E'
-emoji[kiss]=$'\U1F48F'
-emoji[bouquet]=$'\U1F490'
-emoji[couple_with_heart]=$'\U1F491'
 emoji[wedding]=$'\U1F492'
-emoji[beating_heart]=$'\U1F493'
-emoji[broken_heart]=$'\U1F494'
-emoji[two_hearts]=$'\U1F495'
-emoji[sparkling_heart]=$'\U1F496'
-emoji[growing_heart]=$'\U1F497'
-emoji[heart_with_arrow]=$'\U1F498'
-emoji[blue_heart]=$'\U1F499'
-emoji[green_heart]=$'\U1F49A'
-emoji[yellow_heart]=$'\U1F49B'
-emoji[purple_heart]=$'\U1F49C'
-emoji[heart_with_ribbon]=$'\U1F49D'
-emoji[revolving_hearts]=$'\U1F49E'
-emoji[heart_decoration]=$'\U1F49F'
-emoji[diamond_shape_with_a_dot_inside]=$'\U1F4A0'
-emoji[electric_light_bulb]=$'\U1F4A1'
-emoji[anger_symbol]=$'\U1F4A2'
-emoji[bomb]=$'\U1F4A3'
-emoji[sleeping_symbol]=$'\U1F4A4'
-emoji[collision_symbol]=$'\U1F4A5'
-emoji[splashing_sweat_symbol]=$'\U1F4A6'
-emoji[droplet]=$'\U1F4A7'
-emoji[dash_symbol]=$'\U1F4A8'
-emoji[pile_of_poo]=$'\U1F4A9'
-emoji[flexed_biceps]=$'\U1F4AA'
-emoji[dizzy_symbol]=$'\U1F4AB'
-emoji[speech_balloon]=$'\U1F4AC'
-emoji[thought_balloon]=$'\U1F4AD'
-emoji[white_flower]=$'\U1F4AE'
-emoji[hundred_points_symbol]=$'\U1F4AF'
-emoji[money_bag]=$'\U1F4B0'
-emoji[currency_exchange]=$'\U1F4B1'
-emoji[heavy_dollar_sign]=$'\U1F4B2'
-emoji[credit_card]=$'\U1F4B3'
-emoji[banknote_with_yen_sign]=$'\U1F4B4'
-emoji[banknote_with_dollar_sign]=$'\U1F4B5'
-emoji[banknote_with_euro_sign]=$'\U1F4B6'
-emoji[banknote_with_pound_sign]=$'\U1F4B7'
-emoji[money_with_wings]=$'\U1F4B8'
-emoji[chart_with_upwards_trend_and_yen_sign]=$'\U1F4B9'
-emoji[seat]=$'\U1F4BA'
-emoji[personal_computer]=$'\U1F4BB'
-emoji[briefcase]=$'\U1F4BC'
-emoji[minidisc]=$'\U1F4BD'
-emoji[floppy_disk]=$'\U1F4BE'
-emoji[optical_disc]=$'\U1F4BF'
-emoji[dvd]=$'\U1F4C0'
-emoji[file_folder]=$'\U1F4C1'
-emoji[open_file_folder]=$'\U1F4C2'
-emoji[page_with_curl]=$'\U1F4C3'
-emoji[page_facing_up]=$'\U1F4C4'
-emoji[calendar]=$'\U1F4C5'
-emoji[tear_off_calendar]=$'\U1F4C6'
-emoji[card_index]=$'\U1F4C7'
-emoji[chart_with_upwards_trend]=$'\U1F4C8'
-emoji[chart_with_downwards_trend]=$'\U1F4C9'
-emoji[bar_chart]=$'\U1F4CA'
-emoji[clipboard]=$'\U1F4CB'
-emoji[pushpin]=$'\U1F4CC'
-emoji[round_pushpin]=$'\U1F4CD'
-emoji[paperclip]=$'\U1F4CE'
-emoji[straight_ruler]=$'\U1F4CF'
-emoji[triangular_ruler]=$'\U1F4D0'
-emoji[bookmark_tabs]=$'\U1F4D1'
-emoji[ledger]=$'\U1F4D2'
-emoji[notebook]=$'\U1F4D3'
-emoji[notebook_with_decorative_cover]=$'\U1F4D4'
-emoji[closed_book]=$'\U1F4D5'
-emoji[open_book]=$'\U1F4D6'
-emoji[green_book]=$'\U1F4D7'
-emoji[blue_book]=$'\U1F4D8'
-emoji[orange_book]=$'\U1F4D9'
-emoji[books]=$'\U1F4DA'
-emoji[name_badge]=$'\U1F4DB'
-emoji[scroll]=$'\U1F4DC'
-emoji[memo]=$'\U1F4DD'
-emoji[telephone_receiver]=$'\U1F4DE'
-emoji[pager]=$'\U1F4DF'
-emoji[fax_machine]=$'\U1F4E0'
-emoji[satellite_antenna]=$'\U1F4E1'
-emoji[public_address_loudspeaker]=$'\U1F4E2'
-emoji[cheering_megaphone]=$'\U1F4E3'
-emoji[outbox_tray]=$'\U1F4E4'
-emoji[inbox_tray]=$'\U1F4E5'
-emoji[package]=$'\U1F4E6'
-emoji[e_mail_symbol]=$'\U1F4E7'
-emoji[incoming_envelope]=$'\U1F4E8'
-emoji[envelope_with_downwards_arrow_above]=$'\U1F4E9'
-emoji[closed_mailbox_with_lowered_flag]=$'\U1F4EA'
-emoji[closed_mailbox_with_raised_flag]=$'\U1F4EB'
-emoji[open_mailbox_with_raised_flag]=$'\U1F4EC'
-emoji[open_mailbox_with_lowered_flag]=$'\U1F4ED'
-emoji[postbox]=$'\U1F4EE'
-emoji[postal_horn]=$'\U1F4EF'
-emoji[newspaper]=$'\U1F4F0'
-emoji[mobile_phone]=$'\U1F4F1'
-emoji[mobile_phone_with_rightwards_arrow_at_left]=$'\U1F4F2'
-emoji[vibration_mode]=$'\U1F4F3'
-emoji[mobile_phone_off]=$'\U1F4F4'
-emoji[no_mobile_phones]=$'\U1F4F5'
-emoji[antenna_with_bars]=$'\U1F4F6'
-emoji[camera]=$'\U1F4F7'
-emoji[camera_with_flash]=$'\U1F4F8'
-emoji[video_camera]=$'\U1F4F9'
-emoji[television]=$'\U1F4FA'
-emoji[radio]=$'\U1F4FB'
-emoji[videocassette]=$'\U1F4FC'
-emoji[film_projector]=$'\U1F4FD'
-emoji[prayer_beads]=$'\U1F4FF'
-emoji[twisted_rightwards_arrows]=$'\U1F500'
-emoji[clockwise_rightwards_and_leftwards_open_circle_arrows]=$'\U1F501'
-emoji[clockwise_rightwards_and_leftwards_open_circle_arrows_with_circled_one_overlay]=$'\U1F502'
-emoji[clockwise_downwards_and_upwards_open_circle_arrows]=$'\U1F503'
-emoji[anticlockwise_downwards_and_upwards_open_circle_arrows]=$'\U1F504'
-emoji[low_brightness_symbol]=$'\U1F505'
-emoji[high_brightness_symbol]=$'\U1F506'
-emoji[speaker_with_cancellation_stroke]=$'\U1F507'
-emoji[speaker]=$'\U1F508'
-emoji[speaker_with_one_sound_wave]=$'\U1F509'
-emoji[speaker_with_three_sound_waves]=$'\U1F50A'
-emoji[battery]=$'\U1F50B'
-emoji[electric_plug]=$'\U1F50C'
-emoji[left_pointing_magnifying_glass]=$'\U1F50D'
-emoji[right_pointing_magnifying_glass]=$'\U1F50E'
-emoji[lock_with_ink_pen]=$'\U1F50F'
-emoji[closed_lock_with_key]=$'\U1F510'
-emoji[key]=$'\U1F511'
-emoji[lock]=$'\U1F512'
-emoji[open_lock]=$'\U1F513'
-emoji[bell]=$'\U1F514'
-emoji[bell_with_cancellation_stroke]=$'\U1F515'
-emoji[bookmark]=$'\U1F516'
-emoji[link_symbol]=$'\U1F517'
-emoji[radio_button]=$'\U1F518'
-emoji[back_with_leftwards_arrow_above]=$'\U1F519'
-emoji[end_with_leftwards_arrow_above]=$'\U1F51A'
-emoji[on_with_exclamation_mark_with_left_right_arrow_above]=$'\U1F51B'
-emoji[soon_with_rightwards_arrow_above]=$'\U1F51C'
-emoji[top_with_upwards_arrow_above]=$'\U1F51D'
-emoji[no_one_under_eighteen_symbol]=$'\U1F51E'
-emoji[keycap_ten]=$'\U1F51F'
-emoji[input_symbol_for_latin_capital_letters]=$'\U1F520'
-emoji[input_symbol_for_latin_small_letters]=$'\U1F521'
-emoji[input_symbol_for_numbers]=$'\U1F522'
-emoji[input_symbol_for_symbols]=$'\U1F523'
-emoji[input_symbol_for_latin_letters]=$'\U1F524'
-emoji[fire]=$'\U1F525'
-emoji[electric_torch]=$'\U1F526'
-emoji[wrench]=$'\U1F527'
-emoji[hammer]=$'\U1F528'
-emoji[nut_and_bolt]=$'\U1F529'
-emoji[hocho]=$'\U1F52A'
-emoji[pistol]=$'\U1F52B'
-emoji[microscope]=$'\U1F52C'
-emoji[telescope]=$'\U1F52D'
-emoji[crystal_ball]=$'\U1F52E'
-emoji[six_pointed_star_with_middle_dot]=$'\U1F52F'
-emoji[japanese_symbol_for_beginner]=$'\U1F530'
-emoji[trident_emblem]=$'\U1F531'
-emoji[black_square_button]=$'\U1F532'
-emoji[white_square_button]=$'\U1F533'
-emoji[large_red_circle]=$'\U1F534'
-emoji[large_blue_circle]=$'\U1F535'
-emoji[large_orange_diamond]=$'\U1F536'
-emoji[large_blue_diamond]=$'\U1F537'
-emoji[small_orange_diamond]=$'\U1F538'
-emoji[small_blue_diamond]=$'\U1F539'
-emoji[up_pointing_red_triangle]=$'\U1F53A'
-emoji[down_pointing_red_triangle]=$'\U1F53B'
-emoji[up_pointing_small_red_triangle]=$'\U1F53C'
-emoji[down_pointing_small_red_triangle]=$'\U1F53D'
-emoji[om_symbol]=$'\U1F549'
-emoji[dove_of_peace]=$'\U1F54A'
-emoji[kaaba]=$'\U1F54B'
-emoji[mosque]=$'\U1F54C'
-emoji[synagogue]=$'\U1F54D'
-emoji[menorah_with_nine_branches]=$'\U1F54E'
-emoji[clock_face_one_oclock]=$'\U1F550'
-emoji[clock_face_two_oclock]=$'\U1F551'
-emoji[clock_face_three_oclock]=$'\U1F552'
-emoji[clock_face_four_oclock]=$'\U1F553'
-emoji[clock_face_five_oclock]=$'\U1F554'
-emoji[clock_face_six_oclock]=$'\U1F555'
-emoji[clock_face_seven_oclock]=$'\U1F556'
-emoji[clock_face_eight_oclock]=$'\U1F557'
-emoji[clock_face_nine_oclock]=$'\U1F558'
-emoji[clock_face_ten_oclock]=$'\U1F559'
-emoji[clock_face_eleven_oclock]=$'\U1F55A'
-emoji[clock_face_twelve_oclock]=$'\U1F55B'
-emoji[clock_face_one_thirty]=$'\U1F55C'
-emoji[clock_face_two_thirty]=$'\U1F55D'
-emoji[clock_face_three_thirty]=$'\U1F55E'
-emoji[clock_face_four_thirty]=$'\U1F55F'
-emoji[clock_face_five_thirty]=$'\U1F560'
-emoji[clock_face_six_thirty]=$'\U1F561'
-emoji[clock_face_seven_thirty]=$'\U1F562'
-emoji[clock_face_eight_thirty]=$'\U1F563'
-emoji[clock_face_nine_thirty]=$'\U1F564'
-emoji[clock_face_ten_thirty]=$'\U1F565'
-emoji[clock_face_eleven_thirty]=$'\U1F566'
-emoji[clock_face_twelve_thirty]=$'\U1F567'
-emoji[candle]=$'\U1F56F'
-emoji[mantelpiece_clock]=$'\U1F570'
-emoji[hole]=$'\U1F573'
-emoji[man_in_business_suit_levitating]=$'\U1F574'
-emoji[sleuth_or_spy]=$'\U1F575'
-emoji[dark_sunglasses]=$'\U1F576'
-emoji[spider]=$'\U1F577'
-emoji[spider_web]=$'\U1F578'
-emoji[joystick]=$'\U1F579'
-emoji[linked_paperclips]=$'\U1F587'
-emoji[lower_left_ballpoint_pen]=$'\U1F58A'
-emoji[lower_left_fountain_pen]=$'\U1F58B'
-emoji[lower_left_paintbrush]=$'\U1F58C'
-emoji[lower_left_crayon]=$'\U1F58D'
-emoji[raised_hand_with_fingers_splayed]=$'\U1F590'
-emoji[reversed_hand_with_middle_finger_extended]=$'\U1F595'
-emoji[raised_hand_with_part_between_middle_and_ring_fingers]=$'\U1F596'
-emoji[desktop_computer]=$'\U1F5A5'
-emoji[printer]=$'\U1F5A8'
-emoji[three_button_mouse]=$'\U1F5B1'
-emoji[trackball]=$'\U1F5B2'
-emoji[frame_with_picture]=$'\U1F5BC'
-emoji[card_index_dividers]=$'\U1F5C2'
-emoji[card_file_box]=$'\U1F5C3'
-emoji[file_cabinet]=$'\U1F5C4'
-emoji[wastebasket]=$'\U1F5D1'
-emoji[spiral_note_pad]=$'\U1F5D2'
-emoji[spiral_calendar_pad]=$'\U1F5D3'
-emoji[compression]=$'\U1F5DC'
-emoji[old_key]=$'\U1F5DD'
-emoji[rolled_up_newspaper]=$'\U1F5DE'
-emoji[dagger_knife]=$'\U1F5E1'
-emoji[speaking_head_in_silhouette]=$'\U1F5E3'
-emoji[right_anger_bubble]=$'\U1F5EF'
-emoji[ballot_box_with_ballot]=$'\U1F5F3'
-emoji[world_map]=$'\U1F5FA'
-emoji[mount_fuji]=$'\U1F5FB'
+emoji[Tokyo_tower]=$'\U1F5FC'
 emoji[tokyo_tower]=$'\U1F5FC'
+emoji[Statue_of_Liberty]=$'\U1F5FD'
 emoji[statue_of_liberty]=$'\U1F5FD'
-emoji[silhouette_of_japan]=$'\U1F5FE'
-emoji[moyai]=$'\U1F5FF'
-emoji[grinning_face]=$'\U1F600'
-emoji[grinning_face_with_smiling_eyes]=$'\U1F601'
-emoji[face_with_tears_of_joy]=$'\U1F602'
-emoji[smiling_face_with_open_mouth]=$'\U1F603'
-emoji[smiling_face_with_open_mouth_and_smiling_eyes]=$'\U1F604'
-emoji[smiling_face_with_open_mouth_and_cold_sweat]=$'\U1F605'
-emoji[smiling_face_with_open_mouth_and_tightly_closed_eyes]=$'\U1F606'
-emoji[smiling_face_with_halo]=$'\U1F607'
-emoji[smiling_face_with_horns]=$'\U1F608'
-emoji[winking_face]=$'\U1F609'
-emoji[smiling_face_with_smiling_eyes]=$'\U1F60A'
-emoji[face_savouring_delicious_food]=$'\U1F60B'
-emoji[relieved_face]=$'\U1F60C'
-emoji[smiling_face_with_heart_shaped_eyes]=$'\U1F60D'
-emoji[smiling_face_with_sunglasses]=$'\U1F60E'
-emoji[smirking_face]=$'\U1F60F'
-emoji[neutral_face]=$'\U1F610'
-emoji[expressionless_face]=$'\U1F611'
-emoji[unamused_face]=$'\U1F612'
-emoji[face_with_cold_sweat]=$'\U1F613'
-emoji[pensive_face]=$'\U1F614'
-emoji[confused_face]=$'\U1F615'
-emoji[confounded_face]=$'\U1F616'
-emoji[kissing_face]=$'\U1F617'
-emoji[face_throwing_a_kiss]=$'\U1F618'
-emoji[kissing_face_with_smiling_eyes]=$'\U1F619'
-emoji[kissing_face_with_closed_eyes]=$'\U1F61A'
-emoji[face_with_stuck_out_tongue]=$'\U1F61B'
-emoji[face_with_stuck_out_tongue_and_winking_eye]=$'\U1F61C'
-emoji[face_with_stuck_out_tongue_and_tightly_closed_eyes]=$'\U1F61D'
-emoji[disappointed_face]=$'\U1F61E'
-emoji[worried_face]=$'\U1F61F'
-emoji[angry_face]=$'\U1F620'
-emoji[pouting_face]=$'\U1F621'
-emoji[crying_face]=$'\U1F622'
-emoji[persevering_face]=$'\U1F623'
-emoji[face_with_look_of_triumph]=$'\U1F624'
-emoji[disappointed_but_relieved_face]=$'\U1F625'
-emoji[frowning_face_with_open_mouth]=$'\U1F626'
-emoji[anguished_face]=$'\U1F627'
-emoji[fearful_face]=$'\U1F628'
-emoji[weary_face]=$'\U1F629'
-emoji[sleepy_face]=$'\U1F62A'
-emoji[tired_face]=$'\U1F62B'
-emoji[grimacing_face]=$'\U1F62C'
-emoji[loudly_crying_face]=$'\U1F62D'
-emoji[face_with_open_mouth]=$'\U1F62E'
-emoji[hushed_face]=$'\U1F62F'
-emoji[face_with_open_mouth_and_cold_sweat]=$'\U1F630'
-emoji[face_screaming_in_fear]=$'\U1F631'
-emoji[astonished_face]=$'\U1F632'
-emoji[flushed_face]=$'\U1F633'
-emoji[sleeping_face]=$'\U1F634'
-emoji[dizzy_face]=$'\U1F635'
-emoji[face_without_mouth]=$'\U1F636'
-emoji[face_with_medical_mask]=$'\U1F637'
-emoji[grinning_cat_face_with_smiling_eyes]=$'\U1F638'
-emoji[cat_face_with_tears_of_joy]=$'\U1F639'
-emoji[smiling_cat_face_with_open_mouth]=$'\U1F63A'
-emoji[smiling_cat_face_with_heart_shaped_eyes]=$'\U1F63B'
-emoji[cat_face_with_wry_smile]=$'\U1F63C'
-emoji[kissing_cat_face_with_closed_eyes]=$'\U1F63D'
-emoji[pouting_cat_face]=$'\U1F63E'
-emoji[crying_cat_face]=$'\U1F63F'
-emoji[weary_cat_face]=$'\U1F640'
-emoji[slightly_frowning_face]=$'\U1F641'
-emoji[slightly_smiling_face]=$'\U1F642'
-emoji[upside_down_face]=$'\U1F643'
-emoji[face_with_rolling_eyes]=$'\U1F644'
-emoji[face_with_no_good_gesture]=$'\U1F645'
-emoji[face_with_ok_gesture]=$'\U1F646'
-emoji[person_bowing_deeply]=$'\U1F647'
-emoji[see_no_evil_monkey]=$'\U1F648'
-emoji[hear_no_evil_monkey]=$'\U1F649'
-emoji[speak_no_evil_monkey]=$'\U1F64A'
-emoji[happy_person_raising_one_hand]=$'\U1F64B'
-emoji[person_raising_both_hands_in_celebration]=$'\U1F64C'
-emoji[person_frowning]=$'\U1F64D'
-emoji[person_with_pouting_face]=$'\U1F64E'
-emoji[person_with_folded_hands]=$'\U1F64F'
-emoji[rocket]=$'\U1F680'
-emoji[helicopter]=$'\U1F681'
+emoji[church]=$'\U26EA'
+emoji[mosque]=$'\U1F54C'
+emoji[hindu_temple]=$'\U1F6D5'
+emoji[synagogue]=$'\U1F54D'
+emoji[shinto_shrine]=$'\U26E9\UFE0F'
+emoji[shinto_shrine_unqualified]=$'\U26E9'
+emoji[kaaba]=$'\U1F54B'
+emoji[fountain]=$'\U26F2'
+emoji[tent]=$'\U26FA'
+emoji[foggy]=$'\U1F301'
+emoji[night_with_stars]=$'\U1F303'
+emoji[cityscape]=$'\U1F3D9\UFE0F'
+emoji[cityscape_unqualified]=$'\U1F3D9'
+emoji[sunrise_over_mountains]=$'\U1F304'
+emoji[sunrise_over_mountains_1]=$'\U1F305'
+emoji[sunrise]=$'\U1F305'
+emoji[cityscape_at_dusk]=$'\U1F306'
+emoji[city_sunset]=$'\U1F306'
+emoji[sunset]=$'\U1F307'
+emoji[city_sunrise]=$'\U1F307'
+emoji[bridge_at_night]=$'\U1F309'
+emoji[hot_springs]=$'\U2668\UFE0F'
+emoji[hotsprings]=$'\U2668\UFE0F'
+emoji[hot_springs_unqualified]=$'\U2668'
+emoji[carousel_horse]=$'\U1F3A0'
+emoji[ferris_wheel]=$'\U1F3A1'
+emoji[roller_coaster]=$'\U1F3A2'
+emoji[barber_pole]=$'\U1F488'
+emoji[barber]=$'\U1F488'
+emoji[circus_tent]=$'\U1F3AA'
+emoji[locomotive]=$'\U1F682'
 emoji[steam_locomotive]=$'\U1F682'
 emoji[railway_car]=$'\U1F683'
 emoji[high_speed_train]=$'\U1F684'
-emoji[high_speed_train_with_bullet_nose]=$'\U1F685'
-emoji[train]=$'\U1F686'
+emoji[bullettrain_side]=$'\U1F684'
+emoji[bullet_train]=$'\U1F685'
+emoji[bullettrain_front]=$'\U1F685'
+emoji[bullet_train_1]=$'\U1F686'
+emoji[train2]=$'\U1F686'
 emoji[metro]=$'\U1F687'
 emoji[light_rail]=$'\U1F688'
 emoji[station]=$'\U1F689'
 emoji[tram]=$'\U1F68A'
+emoji[monorail]=$'\U1F69D'
+emoji[mountain_railway]=$'\U1F69E'
 emoji[tram_car]=$'\U1F68B'
+emoji[train]=$'\U1F68B'
 emoji[bus]=$'\U1F68C'
 emoji[oncoming_bus]=$'\U1F68D'
 emoji[trolleybus]=$'\U1F68E'
-emoji[bus_stop]=$'\U1F68F'
 emoji[minibus]=$'\U1F690'
 emoji[ambulance]=$'\U1F691'
 emoji[fire_engine]=$'\U1F692'
@@ -953,351 +3124,4151 @@ emoji[oncoming_police_car]=$'\U1F694'
 emoji[taxi]=$'\U1F695'
 emoji[oncoming_taxi]=$'\U1F696'
 emoji[automobile]=$'\U1F697'
+emoji[car]=$'\U1F697'
+emoji[red_car]=$'\U1F697'
 emoji[oncoming_automobile]=$'\U1F698'
-emoji[recreational_vehicle]=$'\U1F699'
+emoji[sport_utility_vehicle]=$'\U1F699'
+emoji[blue_car]=$'\U1F699'
 emoji[delivery_truck]=$'\U1F69A'
+emoji[truck]=$'\U1F69A'
 emoji[articulated_lorry]=$'\U1F69B'
 emoji[tractor]=$'\U1F69C'
-emoji[monorail]=$'\U1F69D'
-emoji[mountain_railway]=$'\U1F69E'
+emoji[racing_car]=$'\U1F3CE\UFE0F'
+emoji[racing_car_unqualified]=$'\U1F3CE'
+emoji[motorcycle]=$'\U1F3CD\UFE0F'
+emoji[motorcycle_unqualified]=$'\U1F3CD'
+emoji[motor_scooter]=$'\U1F6F5'
+emoji[manual_wheelchair]=$'\U1F9BD'
+emoji[motorized_wheelchair]=$'\U1F9BC'
+emoji[auto_rickshaw]=$'\U1F6FA'
+emoji[bicycle]=$'\U1F6B2'
+emoji[bike]=$'\U1F6B2'
+emoji[kick_scooter]=$'\U1F6F4'
+emoji[skateboard]=$'\U1F6F9'
+emoji[bus_stop]=$'\U1F68F'
+emoji[busstop]=$'\U1F68F'
+emoji[motorway]=$'\U1F6E3\UFE0F'
+emoji[motorway_unqualified]=$'\U1F6E3'
+emoji[railway_track]=$'\U1F6E4\UFE0F'
+emoji[railway_track_unqualified]=$'\U1F6E4'
+emoji[oil_drum]=$'\U1F6E2\UFE0F'
+emoji[oil_drum_unqualified]=$'\U1F6E2'
+emoji[fuel_pump]=$'\U26FD'
+emoji[fuelpump]=$'\U26FD'
+emoji[police_car_light]=$'\U1F6A8'
+emoji[rotating_light]=$'\U1F6A8'
+emoji[horizontal_traffic_light]=$'\U1F6A5'
+emoji[traffic_light]=$'\U1F6A5'
+emoji[vertical_traffic_light]=$'\U1F6A6'
+emoji[stop_sign]=$'\U1F6D1'
+emoji[construction]=$'\U1F6A7'
+emoji[anchor]=$'\U2693'
+emoji[sailboat]=$'\U26F5'
+emoji[boat]=$'\U26F5'
+emoji[canoe]=$'\U1F6F6'
+emoji[speedboat]=$'\U1F6A4'
+emoji[passenger_ship]=$'\U1F6F3\UFE0F'
+emoji[passenger_ship_unqualified]=$'\U1F6F3'
+emoji[ferry]=$'\U26F4\UFE0F'
+emoji[ferry_unqualified]=$'\U26F4'
+emoji[motor_boat]=$'\U1F6E5\UFE0F'
+emoji[motor_boat_unqualified]=$'\U1F6E5'
+emoji[ship]=$'\U1F6A2'
+emoji[airplane]=$'\U2708\UFE0F'
+emoji[airplane_unqualified]=$'\U2708'
+emoji[small_airplane]=$'\U1F6E9\UFE0F'
+emoji[small_airplane_unqualified]=$'\U1F6E9'
+emoji[airplane_departure]=$'\U1F6EB'
+emoji[flight_departure]=$'\U1F6EB'
+emoji[airplane_arrival]=$'\U1F6EC'
+emoji[flight_arrival]=$'\U1F6EC'
+emoji[parachute]=$'\U1FA82'
+emoji[seat]=$'\U1F4BA'
+emoji[helicopter]=$'\U1F681'
 emoji[suspension_railway]=$'\U1F69F'
 emoji[mountain_cableway]=$'\U1F6A0'
 emoji[aerial_tramway]=$'\U1F6A1'
-emoji[ship]=$'\U1F6A2'
-emoji[rowboat]=$'\U1F6A3'
-emoji[speedboat]=$'\U1F6A4'
-emoji[horizontal_traffic_light]=$'\U1F6A5'
-emoji[vertical_traffic_light]=$'\U1F6A6'
-emoji[construction_sign]=$'\U1F6A7'
-emoji[police_cars_revolving_light]=$'\U1F6A8'
-emoji[triangular_flag_on_post]=$'\U1F6A9'
+emoji[satellite]=$'\U1F6F0\UFE0F'
+emoji[satellite_unqualified]=$'\U1F6F0'
+emoji[artificial_satellite]=$'\U1F6F0'
+emoji[rocket]=$'\U1F680'
+emoji[flying_saucer]=$'\U1F6F8'
+emoji[bellhop_bell]=$'\U1F6CE\UFE0F'
+emoji[bellhop_bell_unqualified]=$'\U1F6CE'
+emoji[luggage]=$'\U1F9F3'
+emoji[hourglass_done]=$'\U231B'
+emoji[hourglass]=$'\U231B'
+emoji[hourglass_not_done]=$'\U23F3'
+emoji[hourglass_flowing_sand]=$'\U23F3'
+emoji[watch]=$'\U231A'
+emoji[alarm_clock]=$'\U23F0'
+emoji[stopwatch]=$'\U23F1\UFE0F'
+emoji[stopwatch_unqualified]=$'\U23F1'
+emoji[timer_clock]=$'\U23F2\UFE0F'
+emoji[timer_clock_unqualified]=$'\U23F2'
+emoji[mantelpiece_clock]=$'\U1F570\UFE0F'
+emoji[mantelpiece_clock_unqualified]=$'\U1F570'
+emoji[twelve_o_clock]=$'\U1F55B'
+emoji[clock12]=$'\U1F55B'
+emoji[twelve_thirty]=$'\U1F567'
+emoji[clock1230]=$'\U1F567'
+emoji[one_o_clock]=$'\U1F550'
+emoji[clock1]=$'\U1F550'
+emoji[one_thirty]=$'\U1F55C'
+emoji[clock130]=$'\U1F55C'
+emoji[two_o_clock]=$'\U1F551'
+emoji[clock2]=$'\U1F551'
+emoji[two_thirty]=$'\U1F55D'
+emoji[clock230]=$'\U1F55D'
+emoji[three_o_clock]=$'\U1F552'
+emoji[clock3]=$'\U1F552'
+emoji[three_thirty]=$'\U1F55E'
+emoji[clock330]=$'\U1F55E'
+emoji[four_o_clock]=$'\U1F553'
+emoji[clock4]=$'\U1F553'
+emoji[four_thirty]=$'\U1F55F'
+emoji[clock430]=$'\U1F55F'
+emoji[five_o_clock]=$'\U1F554'
+emoji[clock5]=$'\U1F554'
+emoji[five_thirty]=$'\U1F560'
+emoji[clock530]=$'\U1F560'
+emoji[six_o_clock]=$'\U1F555'
+emoji[clock6]=$'\U1F555'
+emoji[six_thirty]=$'\U1F561'
+emoji[clock630]=$'\U1F561'
+emoji[seven_o_clock]=$'\U1F556'
+emoji[clock7]=$'\U1F556'
+emoji[seven_thirty]=$'\U1F562'
+emoji[clock730]=$'\U1F562'
+emoji[eight_o_clock]=$'\U1F557'
+emoji[clock8]=$'\U1F557'
+emoji[eight_thirty]=$'\U1F563'
+emoji[clock830]=$'\U1F563'
+emoji[nine_o_clock]=$'\U1F558'
+emoji[clock9]=$'\U1F558'
+emoji[nine_thirty]=$'\U1F564'
+emoji[clock930]=$'\U1F564'
+emoji[ten_o_clock]=$'\U1F559'
+emoji[clock10]=$'\U1F559'
+emoji[ten_thirty]=$'\U1F565'
+emoji[clock1030]=$'\U1F565'
+emoji[eleven_o_clock]=$'\U1F55A'
+emoji[clock11]=$'\U1F55A'
+emoji[eleven_thirty]=$'\U1F566'
+emoji[clock1130]=$'\U1F566'
+emoji[new_moon]=$'\U1F311'
+emoji[waxing_crescent_moon]=$'\U1F312'
+emoji[first_quarter_moon]=$'\U1F313'
+emoji[waxing_gibbous_moon]=$'\U1F314'
+emoji[moon]=$'\U1F314'
+emoji[full_moon]=$'\U1F315'
+emoji[waning_gibbous_moon]=$'\U1F316'
+emoji[last_quarter_moon]=$'\U1F317'
+emoji[waning_crescent_moon]=$'\U1F318'
+emoji[waning_crescent_moon_1]=$'\U1F319'
+emoji[crescent_moon]=$'\U1F319'
+emoji[new_moon_face]=$'\U1F31A'
+emoji[new_moon_with_face]=$'\U1F31A'
+emoji[first_quarter_moon_face]=$'\U1F31B'
+emoji[first_quarter_moon_with_face]=$'\U1F31B'
+emoji[last_quarter_moon_face]=$'\U1F31C'
+emoji[last_quarter_moon_with_face]=$'\U1F31C'
+emoji[thermometer]=$'\U1F321\UFE0F'
+emoji[thermometer_unqualified]=$'\U1F321'
+emoji[sun]=$'\U2600\UFE0F'
+emoji[sunny]=$'\U2600\UFE0F'
+emoji[sun_unqualified]=$'\U2600'
+emoji[full_moon_face]=$'\U1F31D'
+emoji[full_moon_with_face]=$'\U1F31D'
+emoji[sun_with_face]=$'\U1F31E'
+emoji[ringed_planet]=$'\U1FA90'
+emoji[star]=$'\U2B50'
+emoji[glowing_star]=$'\U1F31F'
+emoji[star2]=$'\U1F31F'
+emoji[shooting_star]=$'\U1F320'
+emoji[stars]=$'\U1F320'
+emoji[milky_way]=$'\U1F30C'
+emoji[cloud]=$'\U2601\UFE0F'
+emoji[cloud_unqualified]=$'\U2601'
+emoji[sun_behind_cloud]=$'\U26C5'
+emoji[partly_sunny]=$'\U26C5'
+emoji[cloud_with_lightning_and_rain]=$'\U26C8\UFE0F'
+emoji[cloud_with_lightning_and_rain_unqualified]=$'\U26C8'
+emoji[sun_behind_small_cloud]=$'\U1F324\UFE0F'
+emoji[sun_behind_small_cloud_unqualified]=$'\U1F324'
+emoji[sun_behind_large_cloud]=$'\U1F325\UFE0F'
+emoji[sun_behind_large_cloud_unqualified]=$'\U1F325'
+emoji[sun_behind_rain_cloud]=$'\U1F326\UFE0F'
+emoji[sun_behind_rain_cloud_unqualified]=$'\U1F326'
+emoji[cloud_with_rain]=$'\U1F327\UFE0F'
+emoji[cloud_with_rain_unqualified]=$'\U1F327'
+emoji[cloud_with_snow]=$'\U1F328\UFE0F'
+emoji[cloud_with_snow_unqualified]=$'\U1F328'
+emoji[cloud_with_lightning]=$'\U1F329\UFE0F'
+emoji[cloud_with_lightning_unqualified]=$'\U1F329'
+emoji[tornado]=$'\U1F32A\UFE0F'
+emoji[tornado_unqualified]=$'\U1F32A'
+emoji[fog]=$'\U1F32B\UFE0F'
+emoji[fog_unqualified]=$'\U1F32B'
+emoji[wind_face]=$'\U1F32C\UFE0F'
+emoji[wind_face_unqualified]=$'\U1F32C'
+emoji[cyclone]=$'\U1F300'
+emoji[rainbow]=$'\U1F308'
+emoji[closed_umbrella]=$'\U1F302'
+emoji[closed_umbrella_1]=$'\U2602\UFE0F'
+emoji[open_umbrella]=$'\U2602\UFE0F'
+emoji[umbrella_unqualified]=$'\U2602'
+emoji[umbrella_with_rain_drops]=$'\U2614'
+emoji[umbrella]=$'\U2614'
+emoji[umbrella_on_ground]=$'\U26F1\UFE0F'
+emoji[umbrella_on_ground_unqualified]=$'\U26F1'
+emoji[parasol_on_ground]=$'\U26F1'
+emoji[high_voltage]=$'\U26A1'
+emoji[zap]=$'\U26A1'
+emoji[snowflake]=$'\U2744\UFE0F'
+emoji[snowflake_unqualified]=$'\U2744'
+emoji[snowman]=$'\U2603\UFE0F'
+emoji[snowman_with_snow]=$'\U2603\UFE0F'
+emoji[snowman_unqualified]=$'\U2603'
+emoji[snowman_without_snow]=$'\U26C4'
+emoji[comet]=$'\U2604\UFE0F'
+emoji[comet_unqualified]=$'\U2604'
+emoji[fire]=$'\U1F525'
+emoji[droplet]=$'\U1F4A7'
+emoji[water_wave]=$'\U1F30A'
+emoji[ocean]=$'\U1F30A'
+emoji[jack_o_lantern]=$'\U1F383'
+emoji[Christmas_tree]=$'\U1F384'
+emoji[christmas_tree]=$'\U1F384'
+emoji[fireworks]=$'\U1F386'
+emoji[sparkler]=$'\U1F387'
+emoji[firecracker]=$'\U1F9E8'
+emoji[sparkles]=$'\U2728'
+emoji[balloon]=$'\U1F388'
+emoji[party_popper]=$'\U1F389'
+emoji[tada]=$'\U1F389'
+emoji[confetti_ball]=$'\U1F38A'
+emoji[tanabata_tree]=$'\U1F38B'
+emoji[pine_decoration]=$'\U1F38D'
+emoji[bamboo]=$'\U1F38D'
+emoji[Japanese_dolls]=$'\U1F38E'
+emoji[dolls]=$'\U1F38E'
+emoji[carp_streamer]=$'\U1F38F'
+emoji[flags]=$'\U1F38F'
+emoji[wind_chime]=$'\U1F390'
+emoji[moon_viewing_ceremony]=$'\U1F391'
+emoji[rice_scene]=$'\U1F391'
+emoji[red_envelope]=$'\U1F9E7'
+emoji[ribbon]=$'\U1F380'
+emoji[wrapped_gift]=$'\U1F381'
+emoji[gift]=$'\U1F381'
+emoji[reminder_ribbon]=$'\U1F397\UFE0F'
+emoji[reminder_ribbon_unqualified]=$'\U1F397'
+emoji[admission_tickets]=$'\U1F39F\UFE0F'
+emoji[admission_tickets_unqualified]=$'\U1F39F'
+emoji[tickets]=$'\U1F39F'
+emoji[admission_tickets_unqualified_1]=$'\U1F3AB'
+emoji[ticket]=$'\U1F3AB'
+emoji[military_medal]=$'\U1F396\UFE0F'
+emoji[military_medal_unqualified]=$'\U1F396'
+emoji[medal_military]=$'\U1F396'
+emoji[trophy]=$'\U1F3C6'
+emoji[sports_medal]=$'\U1F3C5'
+emoji[medal_sports]=$'\U1F3C5'
+emoji[1st_place_medal]=$'\U1F947'
+emoji[2nd_place_medal]=$'\U1F948'
+emoji[3rd_place_medal]=$'\U1F949'
+emoji[soccer_ball]=$'\U26BD'
+emoji[soccer]=$'\U26BD'
+emoji[baseball]=$'\U26BE'
+emoji[softball]=$'\U1F94E'
+emoji[basketball]=$'\U1F3C0'
+emoji[volleyball]=$'\U1F3D0'
+emoji[american_football]=$'\U1F3C8'
+emoji[football]=$'\U1F3C8'
+emoji[rugby_football]=$'\U1F3C9'
+emoji[tennis]=$'\U1F3BE'
+emoji[flying_disc]=$'\U1F94F'
+emoji[bowling]=$'\U1F3B3'
+emoji[cricket_game]=$'\U1F3CF'
+emoji[field_hockey]=$'\U1F3D1'
+emoji[ice_hockey]=$'\U1F3D2'
+emoji[lacrosse]=$'\U1F94D'
+emoji[ping_pong]=$'\U1F3D3'
+emoji[badminton]=$'\U1F3F8'
+emoji[boxing_glove]=$'\U1F94A'
+emoji[martial_arts_uniform]=$'\U1F94B'
+emoji[goal_net]=$'\U1F945'
+emoji[flag_in_hole]=$'\U26F3'
+emoji[golf]=$'\U26F3'
+emoji[ice_skate]=$'\U26F8\UFE0F'
+emoji[ice_skate_unqualified]=$'\U26F8'
+emoji[fishing_pole]=$'\U1F3A3'
+emoji[fishing_pole_and_fish]=$'\U1F3A3'
+emoji[diving_mask]=$'\U1F93F'
+emoji[running_shirt]=$'\U1F3BD'
+emoji[running_shirt_with_sash]=$'\U1F3BD'
+emoji[skis]=$'\U1F3BF'
+emoji[ski]=$'\U1F3BF'
+emoji[sled]=$'\U1F6F7'
+emoji[curling_stone]=$'\U1F94C'
+emoji[direct_hit]=$'\U1F3AF'
+emoji[dart]=$'\U1F3AF'
+emoji[yo_yo]=$'\U1FA80'
+emoji[kite]=$'\U1FA81'
+emoji[pool_8_ball]=$'\U1F3B1'
+emoji[8ball]=$'\U1F3B1'
+emoji[crystal_ball]=$'\U1F52E'
+emoji[nazar_amulet]=$'\U1F9FF'
+emoji[video_game]=$'\U1F3AE'
+emoji[joystick]=$'\U1F579\UFE0F'
+emoji[joystick_unqualified]=$'\U1F579'
+emoji[slot_machine]=$'\U1F3B0'
+emoji[game_die]=$'\U1F3B2'
+emoji[puzzle_piece]=$'\U1F9E9'
+emoji[jigsaw]=$'\U1F9E9'
+emoji[teddy_bear]=$'\U1F9F8'
+emoji[spade_suit]=$'\U2660\UFE0F'
+emoji[spades]=$'\U2660\UFE0F'
+emoji[spade_suit_unqualified]=$'\U2660'
+emoji[heart_suit]=$'\U2665\UFE0F'
+emoji[hearts]=$'\U2665\UFE0F'
+emoji[heart_suit_unqualified]=$'\U2665'
+emoji[diamond_suit]=$'\U2666\UFE0F'
+emoji[diamonds]=$'\U2666\UFE0F'
+emoji[diamond_suit_unqualified]=$'\U2666'
+emoji[club_suit]=$'\U2663\UFE0F'
+emoji[clubs]=$'\U2663\UFE0F'
+emoji[club_suit_unqualified]=$'\U2663'
+emoji[chess_pawn]=$'\U265F\UFE0F'
+emoji[chess_pawn_unqualified]=$'\U265F'
+emoji[joker]=$'\U1F0CF'
+emoji[black_joker]=$'\U1F0CF'
+emoji[mahjong_red_dragon]=$'\U1F004'
+emoji[mahjong]=$'\U1F004'
+emoji[flower_playing_cards]=$'\U1F3B4'
+emoji[performing_arts]=$'\U1F3AD'
+emoji[framed_picture]=$'\U1F5BC\UFE0F'
+emoji[framed_picture_unqualified]=$'\U1F5BC'
+emoji[artist_palette]=$'\U1F3A8'
+emoji[art]=$'\U1F3A8'
+emoji[thread]=$'\U1F9F5'
+emoji[yarn]=$'\U1F9F6'
+emoji[glasses]=$'\U1F453'
+emoji[eyeglasses]=$'\U1F453'
+emoji[sunglasses]=$'\U1F576\UFE0F'
+emoji[sunglasses_unqualified]=$'\U1F576'
+emoji[dark_sunglasses]=$'\U1F576'
+emoji[goggles]=$'\U1F97D'
+emoji[lab_coat]=$'\U1F97C'
+emoji[safety_vest]=$'\U1F9BA'
+emoji[necktie]=$'\U1F454'
+emoji[t_shirt]=$'\U1F455'
+emoji[shirt]=$'\U1F455'
+emoji[tshirt]=$'\U1F455'
+emoji[jeans]=$'\U1F456'
+emoji[scarf]=$'\U1F9E3'
+emoji[gloves]=$'\U1F9E4'
+emoji[coat]=$'\U1F9E5'
+emoji[socks]=$'\U1F9E6'
+emoji[dress]=$'\U1F457'
+emoji[kimono]=$'\U1F458'
+emoji[sari]=$'\U1F97B'
+emoji[one_piece_swimsuit]=$'\U1FA71'
+emoji[swim_brief]=$'\U1FA72'
+emoji[shorts]=$'\U1FA73'
+emoji[bikini]=$'\U1F459'
+emoji[woman_s_clothes]=$'\U1F45A'
+emoji[womans_clothes]=$'\U1F45A'
+emoji[purse]=$'\U1F45B'
+emoji[handbag]=$'\U1F45C'
+emoji[clutch_bag]=$'\U1F45D'
+emoji[pouch]=$'\U1F45D'
+emoji[shopping_bags]=$'\U1F6CD\UFE0F'
+emoji[shopping_bags_unqualified]=$'\U1F6CD'
+emoji[shopping]=$'\U1F6CD'
+emoji[backpack]=$'\U1F392'
+emoji[school_satchel]=$'\U1F392'
+emoji[man_s_shoe]=$'\U1F45E'
+emoji[mans_shoe]=$'\U1F45E'
+emoji[shoe]=$'\U1F45E'
+emoji[running_shoe]=$'\U1F45F'
+emoji[athletic_shoe]=$'\U1F45F'
+emoji[hiking_boot]=$'\U1F97E'
+emoji[flat_shoe]=$'\U1F97F'
+emoji[high_heeled_shoe]=$'\U1F460'
+emoji[high_heel]=$'\U1F460'
+emoji[woman_s_sandal]=$'\U1F461'
+emoji[sandal]=$'\U1F461'
+emoji[ballet_shoes]=$'\U1FA70'
+emoji[woman_s_boot]=$'\U1F462'
+emoji[boot]=$'\U1F462'
+emoji[crown]=$'\U1F451'
+emoji[woman_s_hat]=$'\U1F452'
+emoji[womans_hat]=$'\U1F452'
+emoji[top_hat]=$'\U1F3A9'
+emoji[tophat]=$'\U1F3A9'
+emoji[graduation_cap]=$'\U1F393'
+emoji[mortar_board]=$'\U1F393'
+emoji[billed_cap]=$'\U1F9E2'
+emoji[rescue_worker_s_helmet]=$'\U26D1\UFE0F'
+emoji[rescue_worker_s_helmet_unqualified]=$'\U26D1'
+emoji[rescue_worker_helmet]=$'\U26D1'
+emoji[prayer_beads]=$'\U1F4FF'
+emoji[lipstick]=$'\U1F484'
+emoji[ring]=$'\U1F48D'
+emoji[gem_stone]=$'\U1F48E'
+emoji[gem]=$'\U1F48E'
+emoji[muted_speaker]=$'\U1F507'
+emoji[mute]=$'\U1F507'
+emoji[speaker_low_volume]=$'\U1F508'
+emoji[speaker]=$'\U1F508'
+emoji[speaker_medium_volume]=$'\U1F509'
+emoji[sound]=$'\U1F509'
+emoji[speaker_high_volume]=$'\U1F50A'
+emoji[loud_sound]=$'\U1F50A'
+emoji[loudspeaker]=$'\U1F4E2'
+emoji[megaphone]=$'\U1F4E3'
+emoji[mega]=$'\U1F4E3'
+emoji[postal_horn]=$'\U1F4EF'
+emoji[bell]=$'\U1F514'
+emoji[bell_with_slash]=$'\U1F515'
+emoji[no_bell]=$'\U1F515'
+emoji[musical_score]=$'\U1F3BC'
+emoji[musical_note]=$'\U1F3B5'
+emoji[musical_notes]=$'\U1F3B6'
+emoji[notes]=$'\U1F3B6'
+emoji[studio_microphone]=$'\U1F399\UFE0F'
+emoji[studio_microphone_unqualified]=$'\U1F399'
+emoji[level_slider]=$'\U1F39A\UFE0F'
+emoji[level_slider_unqualified]=$'\U1F39A'
+emoji[control_knobs]=$'\U1F39B\UFE0F'
+emoji[control_knobs_unqualified]=$'\U1F39B'
+emoji[microphone]=$'\U1F3A4'
+emoji[headphone]=$'\U1F3A7'
+emoji[headphones]=$'\U1F3A7'
+emoji[radio]=$'\U1F4FB'
+emoji[saxophone]=$'\U1F3B7'
+emoji[guitar]=$'\U1F3B8'
+emoji[musical_keyboard]=$'\U1F3B9'
+emoji[trumpet]=$'\U1F3BA'
+emoji[violin]=$'\U1F3BB'
+emoji[banjo]=$'\U1FA95'
+emoji[drum]=$'\U1F941'
+emoji[mobile_phone]=$'\U1F4F1'
+emoji[iphone]=$'\U1F4F1'
+emoji[mobile_phone_with_arrow]=$'\U1F4F2'
+emoji[calling]=$'\U1F4F2'
+emoji[telephone]=$'\U260E\UFE0F'
+emoji[phone]=$'\U260E\UFE0F'
+emoji[telephone_unqualified]=$'\U260E'
+emoji[telephone_receiver]=$'\U1F4DE'
+emoji[pager]=$'\U1F4DF'
+emoji[fax_machine]=$'\U1F4E0'
+emoji[fax]=$'\U1F4E0'
+emoji[battery]=$'\U1F50B'
+emoji[electric_plug]=$'\U1F50C'
+emoji[laptop_computer]=$'\U1F4BB'
+emoji[computer]=$'\U1F4BB'
+emoji[desktop_computer]=$'\U1F5A5\UFE0F'
+emoji[desktop_computer_unqualified]=$'\U1F5A5'
+emoji[printer]=$'\U1F5A8\UFE0F'
+emoji[printer_unqualified]=$'\U1F5A8'
+emoji[keyboard]=$'\U2328\UFE0F'
+emoji[keyboard_unqualified]=$'\U2328'
+emoji[computer_mouse]=$'\U1F5B1\UFE0F'
+emoji[computer_mouse_unqualified]=$'\U1F5B1'
+emoji[trackball]=$'\U1F5B2\UFE0F'
+emoji[trackball_unqualified]=$'\U1F5B2'
+emoji[computer_disk]=$'\U1F4BD'
+emoji[minidisc]=$'\U1F4BD'
+emoji[floppy_disk]=$'\U1F4BE'
+emoji[optical_disk]=$'\U1F4BF'
+emoji[cd]=$'\U1F4BF'
+emoji[dvd]=$'\U1F4C0'
+emoji[abacus]=$'\U1F9EE'
+emoji[movie_camera]=$'\U1F3A5'
+emoji[film_frames]=$'\U1F39E\UFE0F'
+emoji[film_frames_unqualified]=$'\U1F39E'
+emoji[film_strip]=$'\U1F39E'
+emoji[film_projector]=$'\U1F4FD\UFE0F'
+emoji[film_projector_unqualified]=$'\U1F4FD'
+emoji[clapper_board]=$'\U1F3AC'
+emoji[clapper]=$'\U1F3AC'
+emoji[television]=$'\U1F4FA'
+emoji[tv]=$'\U1F4FA'
+emoji[camera]=$'\U1F4F7'
+emoji[camera_with_flash]=$'\U1F4F8'
+emoji[camera_flash]=$'\U1F4F8'
+emoji[video_camera]=$'\U1F4F9'
+emoji[videocassette]=$'\U1F4FC'
+emoji[vhs]=$'\U1F4FC'
+emoji[magnifying_glass_tilted_left]=$'\U1F50D'
+emoji[mag]=$'\U1F50D'
+emoji[magnifying_glass_tilted_right]=$'\U1F50E'
+emoji[mag_right]=$'\U1F50E'
+emoji[candle]=$'\U1F56F\UFE0F'
+emoji[candle_unqualified]=$'\U1F56F'
+emoji[light_bulb]=$'\U1F4A1'
+emoji[bulb]=$'\U1F4A1'
+emoji[flashlight]=$'\U1F526'
+emoji[red_paper_lantern]=$'\U1F3EE'
+emoji[izakaya_lantern]=$'\U1F3EE'
+emoji[lantern]=$'\U1F3EE'
+emoji[diya_lamp]=$'\U1FA94'
+emoji[notebook_with_decorative_cover]=$'\U1F4D4'
+emoji[closed_book]=$'\U1F4D5'
+emoji[open_book]=$'\U1F4D6'
+emoji[book]=$'\U1F4D6'
+emoji[green_book]=$'\U1F4D7'
+emoji[blue_book]=$'\U1F4D8'
+emoji[orange_book]=$'\U1F4D9'
+emoji[books]=$'\U1F4DA'
+emoji[notebook]=$'\U1F4D3'
+emoji[ledger]=$'\U1F4D2'
+emoji[page_with_curl]=$'\U1F4C3'
+emoji[scroll]=$'\U1F4DC'
+emoji[page_facing_up]=$'\U1F4C4'
+emoji[newspaper]=$'\U1F4F0'
+emoji[rolled_up_newspaper]=$'\U1F5DE\UFE0F'
+emoji[rolled_up_newspaper_unqualified]=$'\U1F5DE'
+emoji[newspaper_roll]=$'\U1F5DE'
+emoji[bookmark_tabs]=$'\U1F4D1'
+emoji[bookmark_tabs_1]=$'\U1F516'
+emoji[bookmark]=$'\U1F516'
+emoji[label]=$'\U1F3F7\UFE0F'
+emoji[label_unqualified]=$'\U1F3F7'
+emoji[money_bag]=$'\U1F4B0'
+emoji[moneybag]=$'\U1F4B0'
+emoji[yen_banknote]=$'\U1F4B4'
+emoji[yen]=$'\U1F4B4'
+emoji[dollar_banknote]=$'\U1F4B5'
+emoji[dollar]=$'\U1F4B5'
+emoji[euro_banknote]=$'\U1F4B6'
+emoji[euro]=$'\U1F4B6'
+emoji[pound_banknote]=$'\U1F4B7'
+emoji[pound]=$'\U1F4B7'
+emoji[money_with_wings]=$'\U1F4B8'
+emoji[credit_card]=$'\U1F4B3'
+emoji[receipt]=$'\U1F9FE'
+emoji[chart_increasing_with_yen]=$'\U1F4B9'
+emoji[chart]=$'\U1F4B9'
+emoji[currency_exchange]=$'\U1F4B1'
+emoji[heavy_dollar_sign]=$'\U1F4B2'
+emoji[envelope]=$'\U2709\UFE0F'
+emoji[email]=$'\U2709\UFE0F'
+emoji[envelope_unqualified]=$'\U2709'
+emoji[e_mail]=$'\U1F4E7'
+emoji[e-mail]=$'\U1F4E7'
+emoji[incoming_envelope]=$'\U1F4E8'
+emoji[envelope_with_arrow]=$'\U1F4E9'
+emoji[outbox_tray]=$'\U1F4E4'
+emoji[inbox_tray]=$'\U1F4E5'
+emoji[package]=$'\U1F4E6'
+emoji[closed_mailbox_with_raised_flag]=$'\U1F4EB'
+emoji[mailbox]=$'\U1F4EB'
+emoji[closed_mailbox_with_lowered_flag]=$'\U1F4EA'
+emoji[mailbox_closed]=$'\U1F4EA'
+emoji[open_mailbox_with_raised_flag]=$'\U1F4EC'
+emoji[mailbox_with_mail]=$'\U1F4EC'
+emoji[open_mailbox_with_lowered_flag]=$'\U1F4ED'
+emoji[mailbox_with_no_mail]=$'\U1F4ED'
+emoji[postbox]=$'\U1F4EE'
+emoji[ballot_box_with_ballot]=$'\U1F5F3\UFE0F'
+emoji[ballot_box_with_ballot_unqualified]=$'\U1F5F3'
+emoji[ballot_box]=$'\U1F5F3'
+emoji[pencil]=$'\U270F\UFE0F'
+emoji[pencil2]=$'\U270F\UFE0F'
+emoji[pencil_unqualified]=$'\U270F'
+emoji[black_nib]=$'\U2712\UFE0F'
+emoji[black_nib_unqualified]=$'\U2712'
+emoji[fountain_pen]=$'\U1F58B\UFE0F'
+emoji[fountain_pen_unqualified]=$'\U1F58B'
+emoji[fountain_pen_unqualified_1]=$'\U1F58A\UFE0F'
+emoji[fountain_pen_unqualified_2]=$'\U1F58A'
+emoji[pen]=$'\U1F58A'
+emoji[paintbrush]=$'\U1F58C\UFE0F'
+emoji[paintbrush_unqualified]=$'\U1F58C'
+emoji[crayon]=$'\U1F58D\UFE0F'
+emoji[crayon_unqualified]=$'\U1F58D'
+emoji[memo]=$'\U1F4DD'
+emoji[briefcase]=$'\U1F4BC'
+emoji[file_folder]=$'\U1F4C1'
+emoji[open_file_folder]=$'\U1F4C2'
+emoji[card_index_dividers]=$'\U1F5C2\UFE0F'
+emoji[card_index_dividers_unqualified]=$'\U1F5C2'
+emoji[calendar]=$'\U1F4C5'
+emoji[date]=$'\U1F4C5'
+emoji[tear_off_calendar]=$'\U1F4C6'
+emoji[spiral_notepad]=$'\U1F5D2\UFE0F'
+emoji[spiral_notepad_unqualified]=$'\U1F5D2'
+emoji[spiral_calendar]=$'\U1F5D3\UFE0F'
+emoji[spiral_calendar_unqualified]=$'\U1F5D3'
+emoji[card_index]=$'\U1F4C7'
+emoji[chart_increasing]=$'\U1F4C8'
+emoji[chart_with_upwards_trend]=$'\U1F4C8'
+emoji[chart_decreasing]=$'\U1F4C9'
+emoji[chart_with_downwards_trend]=$'\U1F4C9'
+emoji[bar_chart]=$'\U1F4CA'
+emoji[clipboard]=$'\U1F4CB'
+emoji[pushpin]=$'\U1F4CC'
+emoji[round_pushpin]=$'\U1F4CD'
+emoji[paperclip]=$'\U1F4CE'
+emoji[linked_paperclips]=$'\U1F587\UFE0F'
+emoji[linked_paperclips_unqualified]=$'\U1F587'
+emoji[paperclips]=$'\U1F587'
+emoji[straight_ruler]=$'\U1F4CF'
+emoji[triangular_ruler]=$'\U1F4D0'
+emoji[scissors]=$'\U2702\UFE0F'
+emoji[scissors_unqualified]=$'\U2702'
+emoji[card_file_box]=$'\U1F5C3\UFE0F'
+emoji[card_file_box_unqualified]=$'\U1F5C3'
+emoji[file_cabinet]=$'\U1F5C4\UFE0F'
+emoji[file_cabinet_unqualified]=$'\U1F5C4'
+emoji[wastebasket]=$'\U1F5D1\UFE0F'
+emoji[wastebasket_unqualified]=$'\U1F5D1'
+emoji[locked]=$'\U1F512'
+emoji[lock]=$'\U1F512'
+emoji[unlocked]=$'\U1F513'
+emoji[unlock]=$'\U1F513'
+emoji[locked_with_pen]=$'\U1F50F'
+emoji[lock_with_ink_pen]=$'\U1F50F'
+emoji[locked_with_key]=$'\U1F510'
+emoji[closed_lock_with_key]=$'\U1F510'
+emoji[locked_with_key_1]=$'\U1F511'
+emoji[key]=$'\U1F511'
+emoji[old_key]=$'\U1F5DD\UFE0F'
+emoji[old_key_unqualified]=$'\U1F5DD'
+emoji[hammer]=$'\U1F528'
+emoji[axe]=$'\U1FA93'
+emoji[pick]=$'\U26CF\UFE0F'
+emoji[pick_unqualified]=$'\U26CF'
+emoji[hammer_and_pick]=$'\U2692\UFE0F'
+emoji[hammer_and_pick_unqualified]=$'\U2692'
+emoji[hammer_and_wrench]=$'\U1F6E0\UFE0F'
+emoji[hammer_and_wrench_unqualified]=$'\U1F6E0'
+emoji[dagger]=$'\U1F5E1\UFE0F'
+emoji[dagger_unqualified]=$'\U1F5E1'
+emoji[crossed_swords]=$'\U2694\UFE0F'
+emoji[crossed_swords_unqualified]=$'\U2694'
+emoji[pistol]=$'\U1F52B'
+emoji[gun]=$'\U1F52B'
+emoji[bow_and_arrow]=$'\U1F3F9'
+emoji[shield]=$'\U1F6E1\UFE0F'
+emoji[shield_unqualified]=$'\U1F6E1'
+emoji[wrench]=$'\U1F527'
+emoji[nut_and_bolt]=$'\U1F529'
+emoji[gear]=$'\U2699\UFE0F'
+emoji[gear_unqualified]=$'\U2699'
+emoji[clamp]=$'\U1F5DC\UFE0F'
+emoji[clamp_unqualified]=$'\U1F5DC'
+emoji[balance_scale]=$'\U2696\UFE0F'
+emoji[balance_scale_unqualified]=$'\U2696'
+emoji[probing_cane]=$'\U1F9AF'
+emoji[link]=$'\U1F517'
+emoji[chains]=$'\U26D3\UFE0F'
+emoji[chains_unqualified]=$'\U26D3'
+emoji[toolbox]=$'\U1F9F0'
+emoji[magnet]=$'\U1F9F2'
+emoji[alembic]=$'\U2697\UFE0F'
+emoji[alembic_unqualified]=$'\U2697'
+emoji[test_tube]=$'\U1F9EA'
+emoji[petri_dish]=$'\U1F9EB'
+emoji[dna]=$'\U1F9EC'
+emoji[microscope]=$'\U1F52C'
+emoji[telescope]=$'\U1F52D'
+emoji[satellite_antenna]=$'\U1F4E1'
+emoji[syringe]=$'\U1F489'
+emoji[drop_of_blood]=$'\U1FA78'
+emoji[pill]=$'\U1F48A'
+emoji[adhesive_bandage]=$'\U1FA79'
+emoji[stethoscope]=$'\U1FA7A'
 emoji[door]=$'\U1F6AA'
-emoji[no_entry_sign]=$'\U1F6AB'
-emoji[smoking_symbol]=$'\U1F6AC'
-emoji[no_smoking_symbol]=$'\U1F6AD'
-emoji[put_litter_in_its_place_symbol]=$'\U1F6AE'
-emoji[do_not_litter_symbol]=$'\U1F6AF'
-emoji[potable_water_symbol]=$'\U1F6B0'
-emoji[non_potable_water_symbol]=$'\U1F6B1'
-emoji[bicycle]=$'\U1F6B2'
-emoji[no_bicycles]=$'\U1F6B3'
-emoji[bicyclist]=$'\U1F6B4'
-emoji[mountain_bicyclist]=$'\U1F6B5'
-emoji[pedestrian]=$'\U1F6B6'
-emoji[no_pedestrians]=$'\U1F6B7'
-emoji[children_crossing]=$'\U1F6B8'
-emoji[mens_symbol]=$'\U1F6B9'
-emoji[womens_symbol]=$'\U1F6BA'
+emoji[bed]=$'\U1F6CF\UFE0F'
+emoji[bed_unqualified]=$'\U1F6CF'
+emoji[couch_and_lamp]=$'\U1F6CB\UFE0F'
+emoji[couch_and_lamp_unqualified]=$'\U1F6CB'
+emoji[chair]=$'\U1FA91'
+emoji[toilet]=$'\U1F6BD'
+emoji[shower]=$'\U1F6BF'
+emoji[bathtub]=$'\U1F6C1'
+emoji[razor]=$'\U1FA92'
+emoji[lotion_bottle]=$'\U1F9F4'
+emoji[safety_pin]=$'\U1F9F7'
+emoji[broom]=$'\U1F9F9'
+emoji[basket]=$'\U1F9FA'
+emoji[roll_of_paper]=$'\U1F9FB'
+emoji[soap]=$'\U1F9FC'
+emoji[sponge]=$'\U1F9FD'
+emoji[fire_extinguisher]=$'\U1F9EF'
+emoji[shopping_cart]=$'\U1F6D2'
+emoji[cigarette]=$'\U1F6AC'
+emoji[smoking]=$'\U1F6AC'
+emoji[coffin]=$'\U26B0\UFE0F'
+emoji[coffin_unqualified]=$'\U26B0'
+emoji[funeral_urn]=$'\U26B1\UFE0F'
+emoji[funeral_urn_unqualified]=$'\U26B1'
+emoji[moai]=$'\U1F5FF'
+emoji[moyai]=$'\U1F5FF'
+emoji[ATM_sign]=$'\U1F3E7'
+emoji[atm]=$'\U1F3E7'
+emoji[litter_in_bin_sign]=$'\U1F6AE'
+emoji[put_litter_in_its_place]=$'\U1F6AE'
+emoji[potable_water]=$'\U1F6B0'
+emoji[wheelchair_symbol]=$'\U267F'
+emoji[wheelchair]=$'\U267F'
+emoji[men_s_room]=$'\U1F6B9'
+emoji[mens]=$'\U1F6B9'
+emoji[women_s_room]=$'\U1F6BA'
+emoji[womens]=$'\U1F6BA'
 emoji[restroom]=$'\U1F6BB'
 emoji[baby_symbol]=$'\U1F6BC'
-emoji[toilet]=$'\U1F6BD'
 emoji[water_closet]=$'\U1F6BE'
-emoji[shower]=$'\U1F6BF'
-emoji[bath]=$'\U1F6C0'
-emoji[bathtub]=$'\U1F6C1'
+emoji[wc]=$'\U1F6BE'
 emoji[passport_control]=$'\U1F6C2'
 emoji[customs]=$'\U1F6C3'
 emoji[baggage_claim]=$'\U1F6C4'
 emoji[left_luggage]=$'\U1F6C5'
-emoji[couch_and_lamp]=$'\U1F6CB'
-emoji[sleeping_accommodation]=$'\U1F6CC'
-emoji[shopping_bags]=$'\U1F6CD'
-emoji[bellhop_bell]=$'\U1F6CE'
-emoji[bed]=$'\U1F6CF'
+emoji[warning]=$'\U26A0\UFE0F'
+emoji[warning_unqualified]=$'\U26A0'
+emoji[children_crossing]=$'\U1F6B8'
+emoji[no_entry]=$'\U26D4'
+emoji[prohibited]=$'\U1F6AB'
+emoji[no_entry_sign]=$'\U1F6AB'
+emoji[no_bicycles]=$'\U1F6B3'
+emoji[no_smoking]=$'\U1F6AD'
+emoji[no_littering]=$'\U1F6AF'
+emoji[do_not_litter]=$'\U1F6AF'
+emoji[non_potable_water]=$'\U1F6B1'
+emoji[non-potable_water]=$'\U1F6B1'
+emoji[no_pedestrians]=$'\U1F6B7'
+emoji[no_mobile_phones]=$'\U1F4F5'
+emoji[no_one_under_eighteen]=$'\U1F51E'
+emoji[underage]=$'\U1F51E'
+emoji[radioactive]=$'\U2622\UFE0F'
+emoji[radioactive_unqualified]=$'\U2622'
+emoji[biohazard]=$'\U2623\UFE0F'
+emoji[biohazard_unqualified]=$'\U2623'
+emoji[up_arrow]=$'\U2B06\UFE0F'
+emoji[arrow_up]=$'\U2B06\UFE0F'
+emoji[up_arrow_unqualified]=$'\U2B06'
+emoji[up_right_arrow]=$'\U2197\UFE0F'
+emoji[arrow_upper_right]=$'\U2197\UFE0F'
+emoji[up_right_arrow_unqualified]=$'\U2197'
+emoji[up_right_arrow_unqualified_1]=$'\U27A1\UFE0F'
+emoji[arrow_right]=$'\U27A1\UFE0F'
+emoji[up_right_arrow_unqualified_2]=$'\U27A1'
+emoji[down_right_arrow]=$'\U2198\UFE0F'
+emoji[arrow_lower_right]=$'\U2198\UFE0F'
+emoji[down_right_arrow_unqualified]=$'\U2198'
+emoji[down_arrow]=$'\U2B07\UFE0F'
+emoji[arrow_down]=$'\U2B07\UFE0F'
+emoji[down_arrow_unqualified]=$'\U2B07'
+emoji[down_left_arrow]=$'\U2199\UFE0F'
+emoji[arrow_lower_left]=$'\U2199\UFE0F'
+emoji[down_left_arrow_unqualified]=$'\U2199'
+emoji[down_left_arrow_unqualified_1]=$'\U2B05\UFE0F'
+emoji[arrow_left]=$'\U2B05\UFE0F'
+emoji[down_left_arrow_unqualified_2]=$'\U2B05'
+emoji[up_left_arrow]=$'\U2196\UFE0F'
+emoji[arrow_upper_left]=$'\U2196\UFE0F'
+emoji[up_left_arrow_unqualified]=$'\U2196'
+emoji[up_down_arrow]=$'\U2195\UFE0F'
+emoji[arrow_up_down]=$'\U2195\UFE0F'
+emoji[up_down_arrow_unqualified]=$'\U2195'
+emoji[left_right_arrow]=$'\U2194\UFE0F'
+emoji[left_right_arrow_unqualified]=$'\U2194'
+emoji[right_arrow_curving_left]=$'\U21A9\UFE0F'
+emoji[leftwards_arrow_with_hook]=$'\U21A9\UFE0F'
+emoji[right_arrow_curving_left_unqualified]=$'\U21A9'
+emoji[left_arrow_curving_right]=$'\U21AA\UFE0F'
+emoji[arrow_right_hook]=$'\U21AA\UFE0F'
+emoji[left_arrow_curving_right_unqualified]=$'\U21AA'
+emoji[right_arrow_curving_up]=$'\U2934\UFE0F'
+emoji[arrow_heading_up]=$'\U2934\UFE0F'
+emoji[right_arrow_curving_up_unqualified]=$'\U2934'
+emoji[right_arrow_curving_down]=$'\U2935\UFE0F'
+emoji[arrow_heading_down]=$'\U2935\UFE0F'
+emoji[right_arrow_curving_down_unqualified]=$'\U2935'
+emoji[clockwise_vertical_arrows]=$'\U1F503'
+emoji[arrows_clockwise]=$'\U1F503'
+emoji[counterclockwise_arrows_button]=$'\U1F504'
+emoji[arrows_counterclockwise]=$'\U1F504'
+emoji[BACK_arrow]=$'\U1F519'
+emoji[back]=$'\U1F519'
+emoji[END_arrow]=$'\U1F51A'
+emoji[end]=$'\U1F51A'
+emoji[ON_arrow]=$'\U1F51B'
+emoji[on]=$'\U1F51B'
+emoji[SOON_arrow]=$'\U1F51C'
+emoji[soon]=$'\U1F51C'
+emoji[TOP_arrow]=$'\U1F51D'
+emoji[top]=$'\U1F51D'
 emoji[place_of_worship]=$'\U1F6D0'
-emoji[hammer_and_wrench]=$'\U1F6E0'
-emoji[shield]=$'\U1F6E1'
-emoji[oil_drum]=$'\U1F6E2'
-emoji[motorway]=$'\U1F6E3'
-emoji[railway_track]=$'\U1F6E4'
-emoji[motor_boat]=$'\U1F6E5'
-emoji[small_airplane]=$'\U1F6E9'
-emoji[airplane_departure]=$'\U1F6EB'
-emoji[airplane_arriving]=$'\U1F6EC'
-emoji[satellite]=$'\U1F6F0'
-emoji[passenger_ship]=$'\U1F6F3'
-emoji[zipper_mouth_face]=$'\U1F910'
-emoji[money_mouth_face]=$'\U1F911'
-emoji[face_with_thermometer]=$'\U1F912'
-emoji[nerd_face]=$'\U1F913'
-emoji[thinking_face]=$'\U1F914'
-emoji[face_with_head_bandage]=$'\U1F915'
-emoji[robot_face]=$'\U1F916'
-emoji[hugging_face]=$'\U1F917'
-emoji[sign_of_the_horns]=$'\U1F918'
-emoji[crab]=$'\U1F980'
-emoji[lion_face]=$'\U1F981'
-emoji[scorpion]=$'\U1F982'
-emoji[turkey]=$'\U1F983'
-emoji[unicorn_face]=$'\U1F984'
-emoji[cheese_wedge]=$'\U1F9C0'
-emoji[keycap_number_sign]=$'\U0023\U20E3'
-emoji[keycap_asterisk]=$'\U002A\U20E3'
-emoji[keycap_digit_zero]=$'\U0030\U20E3'
-emoji[keycap_digit_one]=$'\U0031\U20E3'
-emoji[keycap_digit_two]=$'\U0032\U20E3'
-emoji[keycap_digit_three]=$'\U0033\U20E3'
-emoji[keycap_digit_four]=$'\U0034\U20E3'
-emoji[keycap_digit_five]=$'\U0035\U20E3'
-emoji[keycap_digit_six]=$'\U0036\U20E3'
-emoji[keycap_digit_seven]=$'\U0037\U20E3'
-emoji[keycap_digit_eight]=$'\U0038\U20E3'
-emoji[keycap_digit_nine]=$'\U0039\U20E3'
+emoji[atom_symbol]=$'\U269B\UFE0F'
+emoji[atom_symbol_unqualified]=$'\U269B'
+emoji[atom_symbol_unqualified_1]=$'\U1F549\UFE0F'
+emoji[om_unqualified]=$'\U1F549'
+emoji[om]=$'\U1F549'
+emoji[star_of_David]=$'\U2721\UFE0F'
+emoji[star_of_david]=$'\U2721\UFE0F'
+emoji[star_of_David_unqualified]=$'\U2721'
+emoji[wheel_of_dharma]=$'\U2638\UFE0F'
+emoji[wheel_of_dharma_unqualified]=$'\U2638'
+emoji[yin_yang]=$'\U262F\UFE0F'
+emoji[yin_yang_unqualified]=$'\U262F'
+emoji[latin_cross]=$'\U271D\UFE0F'
+emoji[latin_cross_unqualified]=$'\U271D'
+emoji[orthodox_cross]=$'\U2626\UFE0F'
+emoji[orthodox_cross_unqualified]=$'\U2626'
+emoji[star_and_crescent]=$'\U262A\UFE0F'
+emoji[star_and_crescent_unqualified]=$'\U262A'
+emoji[peace_symbol]=$'\U262E\UFE0F'
+emoji[peace_symbol_unqualified]=$'\U262E'
+emoji[menorah]=$'\U1F54E'
+emoji[dotted_six_pointed_star]=$'\U1F52F'
+emoji[six_pointed_star]=$'\U1F52F'
+emoji[Aries]=$'\U2648'
+emoji[aries]=$'\U2648'
+emoji[Taurus]=$'\U2649'
+emoji[taurus]=$'\U2649'
+emoji[Gemini]=$'\U264A'
+emoji[gemini]=$'\U264A'
+emoji[Cancer]=$'\U264B'
+emoji[cancer]=$'\U264B'
+emoji[Leo]=$'\U264C'
+emoji[leo]=$'\U264C'
+emoji[Virgo]=$'\U264D'
+emoji[virgo]=$'\U264D'
+emoji[Libra]=$'\U264E'
+emoji[libra]=$'\U264E'
+emoji[Scorpio]=$'\U264F'
+emoji[scorpius]=$'\U264F'
+emoji[Sagittarius]=$'\U2650'
+emoji[sagittarius]=$'\U2650'
+emoji[Capricorn]=$'\U2651'
+emoji[capricorn]=$'\U2651'
+emoji[Aquarius]=$'\U2652'
+emoji[aquarius]=$'\U2652'
+emoji[Pisces]=$'\U2653'
+emoji[pisces]=$'\U2653'
+emoji[Ophiuchus]=$'\U26CE'
+emoji[ophiuchus]=$'\U26CE'
+emoji[shuffle_tracks_button]=$'\U1F500'
+emoji[twisted_rightwards_arrows]=$'\U1F500'
+emoji[repeat_button]=$'\U1F501'
+emoji[repeat]=$'\U1F501'
+emoji[repeat_single_button]=$'\U1F502'
+emoji[repeat_one]=$'\U1F502'
+emoji[play_button]=$'\U25B6\UFE0F'
+emoji[arrow_forward]=$'\U25B6\UFE0F'
+emoji[play_button_unqualified]=$'\U25B6'
+emoji[fast_forward_button]=$'\U23E9'
+emoji[fast_forward]=$'\U23E9'
+emoji[next_track_button]=$'\U23ED\UFE0F'
+emoji[next_track_button_unqualified]=$'\U23ED'
+emoji[play_or_pause_button]=$'\U23EF\UFE0F'
+emoji[play_or_pause_button_unqualified]=$'\U23EF'
+emoji[reverse_button]=$'\U25C0\UFE0F'
+emoji[arrow_backward]=$'\U25C0\UFE0F'
+emoji[reverse_button_unqualified]=$'\U25C0'
+emoji[fast_reverse_button]=$'\U23EA'
+emoji[rewind]=$'\U23EA'
+emoji[last_track_button]=$'\U23EE\UFE0F'
+emoji[last_track_button_unqualified]=$'\U23EE'
+emoji[previous_track_button]=$'\U23EE'
+emoji[upwards_button]=$'\U1F53C'
+emoji[arrow_up_small]=$'\U1F53C'
+emoji[fast_up_button]=$'\U23EB'
+emoji[arrow_double_up]=$'\U23EB'
+emoji[downwards_button]=$'\U1F53D'
+emoji[arrow_down_small]=$'\U1F53D'
+emoji[fast_down_button]=$'\U23EC'
+emoji[arrow_double_down]=$'\U23EC'
+emoji[pause_button]=$'\U23F8\UFE0F'
+emoji[pause_button_unqualified]=$'\U23F8'
+emoji[stop_button]=$'\U23F9\UFE0F'
+emoji[stop_button_unqualified]=$'\U23F9'
+emoji[record_button]=$'\U23FA\UFE0F'
+emoji[record_button_unqualified]=$'\U23FA'
+emoji[eject_button]=$'\U23CF\UFE0F'
+emoji[eject_button_unqualified]=$'\U23CF'
+emoji[cinema]=$'\U1F3A6'
+emoji[dim_button]=$'\U1F505'
+emoji[low_brightness]=$'\U1F505'
+emoji[bright_button]=$'\U1F506'
+emoji[high_brightness]=$'\U1F506'
+emoji[antenna_bars]=$'\U1F4F6'
+emoji[signal_strength]=$'\U1F4F6'
+emoji[vibration_mode]=$'\U1F4F3'
+emoji[mobile_phone_off]=$'\U1F4F4'
+emoji[female_sign]=$'\U2640\UFE0F'
+emoji[female_sign_unqualified]=$'\U2640'
+emoji[female_sign_unqualified_1]=$'\U2642\UFE0F'
+emoji[male_sign]=$'\U2642\UFE0F'
+emoji[female_sign_unqualified_2]=$'\U2642'
+emoji[medical_symbol]=$'\U2695\UFE0F'
+emoji[medical_symbol_unqualified]=$'\U2695'
+emoji[infinity]=$'\U267E\UFE0F'
+emoji[infinity_unqualified]=$'\U267E'
+emoji[recycling_symbol]=$'\U267B\UFE0F'
+emoji[recycle]=$'\U267B\UFE0F'
+emoji[recycling_symbol_unqualified]=$'\U267B'
+emoji[fleur_de_lis]=$'\U269C\UFE0F'
+emoji[fleur_de_lis_unqualified]=$'\U269C'
+emoji[trident_emblem]=$'\U1F531'
+emoji[trident]=$'\U1F531'
+emoji[name_badge]=$'\U1F4DB'
+emoji[Japanese_symbol_for_beginner]=$'\U1F530'
+emoji[beginner]=$'\U1F530'
+emoji[hollow_red_circle]=$'\U2B55'
+emoji[o]=$'\U2B55'
+emoji[check_mark_button]=$'\U2705'
+emoji[white_check_mark]=$'\U2705'
+emoji[check_box_with_check]=$'\U2611\UFE0F'
+emoji[ballot_box_with_check]=$'\U2611\UFE0F'
+emoji[check_box_with_check_unqualified]=$'\U2611'
+emoji[check_mark]=$'\U2714\UFE0F'
+emoji[heavy_check_mark]=$'\U2714\UFE0F'
+emoji[check_mark_unqualified]=$'\U2714'
+emoji[multiplication_sign]=$'\U2716\UFE0F'
+emoji[heavy_multiplication_x]=$'\U2716\UFE0F'
+emoji[multiplication_sign_unqualified]=$'\U2716'
+emoji[cross_mark]=$'\U274C'
+emoji[x]=$'\U274C'
+emoji[cross_mark_button]=$'\U274E'
+emoji[negative_squared_cross_mark]=$'\U274E'
+emoji[plus_sign]=$'\U2795'
+emoji[heavy_plus_sign]=$'\U2795'
+emoji[minus_sign]=$'\U2796'
+emoji[heavy_minus_sign]=$'\U2796'
+emoji[division_sign]=$'\U2797'
+emoji[heavy_division_sign]=$'\U2797'
+emoji[curly_loop]=$'\U27B0'
+emoji[double_curly_loop]=$'\U27BF'
+emoji[loop]=$'\U27BF'
+emoji[part_alternation_mark]=$'\U303D\UFE0F'
+emoji[part_alternation_mark_unqualified]=$'\U303D'
+emoji[eight_spoked_asterisk]=$'\U2733\UFE0F'
+emoji[eight_spoked_asterisk_unqualified]=$'\U2733'
+emoji[eight_pointed_star]=$'\U2734\UFE0F'
+emoji[eight_pointed_black_star]=$'\U2734\UFE0F'
+emoji[eight_pointed_star_unqualified]=$'\U2734'
+emoji[sparkle]=$'\U2747\UFE0F'
+emoji[sparkle_unqualified]=$'\U2747'
+emoji[double_exclamation_mark]=$'\U203C\UFE0F'
+emoji[bangbang]=$'\U203C\UFE0F'
+emoji[double_exclamation_mark_unqualified]=$'\U203C'
+emoji[exclamation_question_mark]=$'\U2049\UFE0F'
+emoji[interrobang]=$'\U2049\UFE0F'
+emoji[exclamation_question_mark_unqualified]=$'\U2049'
+emoji[exclamation_question_mark_unqualified_1]=$'\U2753'
+emoji[question]=$'\U2753'
+emoji[white_question_mark]=$'\U2754'
+emoji[grey_question]=$'\U2754'
+emoji[white_exclamation_mark]=$'\U2755'
+emoji[grey_exclamation]=$'\U2755'
+emoji[white_exclamation_mark_1]=$'\U2757'
+emoji[exclamation]=$'\U2757'
+emoji[heavy_exclamation_mark]=$'\U2757'
+emoji[wavy_dash]=$'\U3030\UFE0F'
+emoji[wavy_dash_unqualified]=$'\U3030'
+emoji[copyright]=$'\U00A9\UFE0F'
+emoji[copyright_unqualified]=$'\U00A9'
+emoji[registered]=$'\U00AE\UFE0F'
+emoji[registered_unqualified]=$'\U00AE'
+emoji[trade_mark]=$'\U2122\UFE0F'
+emoji[tm]=$'\U2122\UFE0F'
+emoji[trade_mark_unqualified]=$'\U2122'
+emoji[keycap_#]=$'\U0023\UFE0F\U20E3'
+emoji[hash]=$'\U0023\UFE0F\U20E3'
+emoji[keycap_#_unqualified]=$'\U0023\U20E3'
+emoji[keycap_*]=$'\U002A\UFE0F\U20E3'
+emoji[asterisk]=$'\U002A\UFE0F\U20E3'
+emoji[keycap_*_unqualified]=$'\U002A\U20E3'
+emoji[keycap_0]=$'\U0030\UFE0F\U20E3'
+emoji[zero]=$'\U0030\UFE0F\U20E3'
+emoji[keycap_0_unqualified]=$'\U0030\U20E3'
+emoji[keycap_1]=$'\U0031\UFE0F\U20E3'
+emoji[one]=$'\U0031\UFE0F\U20E3'
+emoji[keycap_1_unqualified]=$'\U0031\U20E3'
+emoji[keycap_2]=$'\U0032\UFE0F\U20E3'
+emoji[two]=$'\U0032\UFE0F\U20E3'
+emoji[keycap_2_unqualified]=$'\U0032\U20E3'
+emoji[keycap_3]=$'\U0033\UFE0F\U20E3'
+emoji[three]=$'\U0033\UFE0F\U20E3'
+emoji[keycap_3_unqualified]=$'\U0033\U20E3'
+emoji[keycap_4]=$'\U0034\UFE0F\U20E3'
+emoji[four]=$'\U0034\UFE0F\U20E3'
+emoji[keycap_4_unqualified]=$'\U0034\U20E3'
+emoji[keycap_5]=$'\U0035\UFE0F\U20E3'
+emoji[five]=$'\U0035\UFE0F\U20E3'
+emoji[keycap_5_unqualified]=$'\U0035\U20E3'
+emoji[keycap_6]=$'\U0036\UFE0F\U20E3'
+emoji[six]=$'\U0036\UFE0F\U20E3'
+emoji[keycap_6_unqualified]=$'\U0036\U20E3'
+emoji[keycap_7]=$'\U0037\UFE0F\U20E3'
+emoji[seven]=$'\U0037\UFE0F\U20E3'
+emoji[keycap_7_unqualified]=$'\U0037\U20E3'
+emoji[keycap_8]=$'\U0038\UFE0F\U20E3'
+emoji[eight]=$'\U0038\UFE0F\U20E3'
+emoji[keycap_8_unqualified]=$'\U0038\U20E3'
+emoji[keycap_9]=$'\U0039\UFE0F\U20E3'
+emoji[nine]=$'\U0039\UFE0F\U20E3'
+emoji[keycap_9_unqualified]=$'\U0039\U20E3'
+emoji[keycap_10]=$'\U1F51F'
+emoji[keycap_ten]=$'\U1F51F'
+emoji[input_latin_uppercase]=$'\U1F520'
+emoji[capital_abcd]=$'\U1F520'
+emoji[input_latin_lowercase]=$'\U1F521'
+emoji[abcd]=$'\U1F521'
+emoji[input_numbers]=$'\U1F522'
+emoji[1234]=$'\U1F522'
+emoji[input_symbols]=$'\U1F523'
+emoji[symbols]=$'\U1F523'
+emoji[input_latin_letters]=$'\U1F524'
+emoji[abc]=$'\U1F524'
+emoji[A_button_blood_type_]=$'\U1F170\UFE0F'
+emoji[a]=$'\U1F170\UFE0F'
+emoji[A_button_blood_type__unqualified]=$'\U1F170'
+emoji[AB_button_blood_type_]=$'\U1F18E'
+emoji[ab]=$'\U1F18E'
+emoji[AB_button_blood_type__1]=$'\U1F171\UFE0F'
+emoji[b]=$'\U1F171\UFE0F'
+emoji[B_button_blood_type__unqualified]=$'\U1F171'
+emoji[CL_button]=$'\U1F191'
+emoji[cl]=$'\U1F191'
+emoji[COOL_button]=$'\U1F192'
+emoji[cool]=$'\U1F192'
+emoji[FREE_button]=$'\U1F193'
+emoji[free]=$'\U1F193'
+emoji[information]=$'\U2139\UFE0F'
+emoji[information_source]=$'\U2139\UFE0F'
+emoji[information_unqualified]=$'\U2139'
+emoji[ID_button]=$'\U1F194'
+emoji[id]=$'\U1F194'
+emoji[circled_M]=$'\U24C2\UFE0F'
+emoji[m]=$'\U24C2\UFE0F'
+emoji[circled_M_unqualified]=$'\U24C2'
+emoji[NEW_button]=$'\U1F195'
+emoji[new]=$'\U1F195'
+emoji[NG_button]=$'\U1F196'
+emoji[ng]=$'\U1F196'
+emoji[O_button_blood_type_]=$'\U1F17E\UFE0F'
+emoji[o2]=$'\U1F17E\UFE0F'
+emoji[O_button_blood_type__unqualified]=$'\U1F17E'
+emoji[OK_button]=$'\U1F197'
+emoji[ok]=$'\U1F197'
+emoji[P_button]=$'\U1F17F\UFE0F'
+emoji[parking]=$'\U1F17F\UFE0F'
+emoji[P_button_unqualified]=$'\U1F17F'
+emoji[SOS_button]=$'\U1F198'
+emoji[sos]=$'\U1F198'
+emoji[UP_button]=$'\U1F199'
+emoji[up]=$'\U1F199'
+emoji[VS_button]=$'\U1F19A'
+emoji[vs]=$'\U1F19A'
+emoji[Japanese_here_button]=$'\U1F201'
+emoji[koko]=$'\U1F201'
+emoji[Japanese_service_charge_button]=$'\U1F202\UFE0F'
+emoji[sa]=$'\U1F202\UFE0F'
+emoji[Japanese_service_charge_button_unqualified]=$'\U1F202'
+emoji[Japanese_monthly_amount_button]=$'\U1F237\UFE0F'
+emoji[u6708]=$'\U1F237\UFE0F'
+emoji[Japanese_monthly_amount_button_unqualified]=$'\U1F237'
+emoji[Japanese_not_free_of_charge_button]=$'\U1F236'
+emoji[u6709]=$'\U1F236'
+emoji[Japanese_reserved_button]=$'\U1F22F'
+emoji[u6307]=$'\U1F22F'
+emoji[Japanese_bargain_button]=$'\U1F250'
+emoji[ideograph_advantage]=$'\U1F250'
+emoji[Japanese_discount_button]=$'\U1F239'
+emoji[u5272]=$'\U1F239'
+emoji[Japanese_free_of_charge_button]=$'\U1F21A'
+emoji[u7121]=$'\U1F21A'
+emoji[Japanese_prohibited_button]=$'\U1F232'
+emoji[u7981]=$'\U1F232'
+emoji[Japanese_acceptable_button]=$'\U1F251'
+emoji[accept]=$'\U1F251'
+emoji[Japanese_application_button]=$'\U1F238'
+emoji[u7533]=$'\U1F238'
+emoji[Japanese_passing_grade_button]=$'\U1F234'
+emoji[u5408]=$'\U1F234'
+emoji[Japanese_vacancy_button]=$'\U1F233'
+emoji[u7a7a]=$'\U1F233'
+emoji[Japanese_congratulations_button]=$'\U3297\UFE0F'
+emoji[congratulations]=$'\U3297\UFE0F'
+emoji[Japanese_congratulations_button_unqualified]=$'\U3297'
+emoji[Japanese_secret_button]=$'\U3299\UFE0F'
+emoji[secret]=$'\U3299\UFE0F'
+emoji[Japanese_secret_button_unqualified]=$'\U3299'
+emoji[Japanese_open_for_business_button]=$'\U1F23A'
+emoji[u55b6]=$'\U1F23A'
+emoji[Japanese_no_vacancy_button]=$'\U1F235'
+emoji[u6e80]=$'\U1F235'
+emoji[red_circle]=$'\U1F534'
+emoji[orange_circle]=$'\U1F7E0'
+emoji[yellow_circle]=$'\U1F7E1'
+emoji[green_circle]=$'\U1F7E2'
+emoji[blue_circle]=$'\U1F535'
+emoji[large_blue_circle]=$'\U1F535'
+emoji[purple_circle]=$'\U1F7E3'
+emoji[brown_circle]=$'\U1F7E4'
+emoji[black_circle]=$'\U26AB'
+emoji[white_circle]=$'\U26AA'
+emoji[red_square]=$'\U1F7E5'
+emoji[orange_square]=$'\U1F7E7'
+emoji[yellow_square]=$'\U1F7E8'
+emoji[green_square]=$'\U1F7E9'
+emoji[blue_square]=$'\U1F7E6'
+emoji[purple_square]=$'\U1F7EA'
+emoji[brown_square]=$'\U1F7EB'
+emoji[black_large_square]=$'\U2B1B'
+emoji[white_large_square]=$'\U2B1C'
+emoji[black_medium_square]=$'\U25FC\UFE0F'
+emoji[black_medium_square_unqualified]=$'\U25FC'
+emoji[white_medium_square]=$'\U25FB\UFE0F'
+emoji[white_medium_square_unqualified]=$'\U25FB'
+emoji[black_medium_small_square]=$'\U25FE'
+emoji[white_medium_small_square]=$'\U25FD'
+emoji[black_small_square]=$'\U25AA\UFE0F'
+emoji[black_small_square_unqualified]=$'\U25AA'
+emoji[white_small_square]=$'\U25AB\UFE0F'
+emoji[white_small_square_unqualified]=$'\U25AB'
+emoji[large_orange_diamond]=$'\U1F536'
+emoji[large_blue_diamond]=$'\U1F537'
+emoji[small_orange_diamond]=$'\U1F538'
+emoji[small_blue_diamond]=$'\U1F539'
+emoji[red_triangle_pointed_up]=$'\U1F53A'
+emoji[small_red_triangle]=$'\U1F53A'
+emoji[red_triangle_pointed_down]=$'\U1F53B'
+emoji[small_red_triangle_down]=$'\U1F53B'
+emoji[diamond_with_a_dot]=$'\U1F4A0'
+emoji[diamond_shape_with_a_dot_inside]=$'\U1F4A0'
+emoji[radio_button]=$'\U1F518'
+emoji[white_square_button]=$'\U1F533'
+emoji[black_square_button]=$'\U1F532'
+emoji_flags[chequered_flag]=$'\U1F3C1'
+emoji_flags[checkered_flag]=$'\U1F3C1'
+emoji_flags[triangular_flag]=$'\U1F6A9'
+emoji_flags[triangular_flag_on_post]=$'\U1F6A9'
+emoji_flags[crossed_flags]=$'\U1F38C'
+emoji_flags[black_flag]=$'\U1F3F4'
+emoji_flags[white_flag]=$'\U1F3F3\UFE0F'
+emoji_flags[white_flag_unqualified]=$'\U1F3F3'
+emoji_flags[rainbow_flag]=$'\U1F3F3\UFE0F\U200D\U1F308'
+emoji_flags[rainbow_flag_unqualified]=$'\U1F3F3\U200D\U1F308'
+emoji_flags[pirate_flag]=$'\U1F3F4\U200D\U2620\UFE0F'
+emoji_flags[pirate_flag_minimally]=$'\U1F3F4\U200D\U2620'
 emoji_flags[Ascension_Island]=$'\U1F1E6\U1F1E8'
+emoji_flags[ascension_island]=$'\U1F1E6\U1F1E8'
 emoji_flags[Andorra]=$'\U1F1E6\U1F1E9'
+emoji_flags[AD]=$'\U1F1E6\U1F1E9'
+emoji_flags[AND]=$'\U1F1E6\U1F1E9'
+emoji_flags[andorra]=$'\U1F1E6\U1F1E9'
 emoji_flags[United_Arab_Emirates]=$'\U1F1E6\U1F1EA'
+emoji_flags[AE]=$'\U1F1E6\U1F1EA'
+emoji_flags[ARE]=$'\U1F1E6\U1F1EA'
+emoji_flags[united_arab_emirates]=$'\U1F1E6\U1F1EA'
 emoji_flags[Afghanistan]=$'\U1F1E6\U1F1EB'
-emoji_flags[Antigua___Barbuda]=$'\U1F1E6\U1F1EC'
+emoji_flags[AF]=$'\U1F1E6\U1F1EB'
+emoji_flags[AFG]=$'\U1F1E6\U1F1EB'
+emoji_flags[afghanistan]=$'\U1F1E6\U1F1EB'
+emoji_flags[Antigua_and_Barbuda]=$'\U1F1E6\U1F1EC'
+emoji_flags[AG]=$'\U1F1E6\U1F1EC'
+emoji_flags[ATG]=$'\U1F1E6\U1F1EC'
+emoji_flags[antigua_barbuda]=$'\U1F1E6\U1F1EC'
 emoji_flags[Anguilla]=$'\U1F1E6\U1F1EE'
+emoji_flags[AI]=$'\U1F1E6\U1F1EE'
+emoji_flags[AIA]=$'\U1F1E6\U1F1EE'
+emoji_flags[anguilla]=$'\U1F1E6\U1F1EE'
 emoji_flags[Albania]=$'\U1F1E6\U1F1F1'
+emoji_flags[AL]=$'\U1F1E6\U1F1F1'
+emoji_flags[ALB]=$'\U1F1E6\U1F1F1'
+emoji_flags[albania]=$'\U1F1E6\U1F1F1'
 emoji_flags[Armenia]=$'\U1F1E6\U1F1F2'
+emoji_flags[AM]=$'\U1F1E6\U1F1F2'
+emoji_flags[ARM]=$'\U1F1E6\U1F1F2'
+emoji_flags[armenia]=$'\U1F1E6\U1F1F2'
 emoji_flags[Angola]=$'\U1F1E6\U1F1F4'
+emoji_flags[AO]=$'\U1F1E6\U1F1F4'
+emoji_flags[AGO]=$'\U1F1E6\U1F1F4'
+emoji_flags[angola]=$'\U1F1E6\U1F1F4'
 emoji_flags[Antarctica]=$'\U1F1E6\U1F1F6'
+emoji_flags[AQ]=$'\U1F1E6\U1F1F6'
+emoji_flags[ATA]=$'\U1F1E6\U1F1F6'
+emoji_flags[antarctica]=$'\U1F1E6\U1F1F6'
 emoji_flags[Argentina]=$'\U1F1E6\U1F1F7'
+emoji_flags[AR]=$'\U1F1E6\U1F1F7'
+emoji_flags[ARG]=$'\U1F1E6\U1F1F7'
+emoji_flags[argentina]=$'\U1F1E6\U1F1F7'
 emoji_flags[American_Samoa]=$'\U1F1E6\U1F1F8'
+emoji_flags[AS]=$'\U1F1E6\U1F1F8'
+emoji_flags[ASM]=$'\U1F1E6\U1F1F8'
+emoji_flags[american_samoa]=$'\U1F1E6\U1F1F8'
 emoji_flags[Austria]=$'\U1F1E6\U1F1F9'
+emoji_flags[AT]=$'\U1F1E6\U1F1F9'
+emoji_flags[AUT]=$'\U1F1E6\U1F1F9'
+emoji_flags[austria]=$'\U1F1E6\U1F1F9'
 emoji_flags[Australia]=$'\U1F1E6\U1F1FA'
+emoji_flags[AU]=$'\U1F1E6\U1F1FA'
+emoji_flags[AUS]=$'\U1F1E6\U1F1FA'
+emoji_flags[australia]=$'\U1F1E6\U1F1FA'
 emoji_flags[Aruba]=$'\U1F1E6\U1F1FC'
-emoji_flags[�_land_Islands]=$'\U1F1E6\U1F1FD'
+emoji_flags[AW]=$'\U1F1E6\U1F1FC'
+emoji_flags[ABW]=$'\U1F1E6\U1F1FC'
+emoji_flags[aruba]=$'\U1F1E6\U1F1FC'
+emoji_flags[Åland_Islands]=$'\U1F1E6\U1F1FD'
+emoji_flags[AX]=$'\U1F1E6\U1F1FD'
+emoji_flags[ALA]=$'\U1F1E6\U1F1FD'
+emoji_flags[aland_islands]=$'\U1F1E6\U1F1FD'
 emoji_flags[Azerbaijan]=$'\U1F1E6\U1F1FF'
-emoji_flags[Bosnia___Herzegovina]=$'\U1F1E7\U1F1E6'
+emoji_flags[AZ]=$'\U1F1E6\U1F1FF'
+emoji_flags[AZE]=$'\U1F1E6\U1F1FF'
+emoji_flags[azerbaijan]=$'\U1F1E6\U1F1FF'
+emoji_flags[Bosnia_and_Herzegovina]=$'\U1F1E7\U1F1E6'
+emoji_flags[BA]=$'\U1F1E7\U1F1E6'
+emoji_flags[BIH]=$'\U1F1E7\U1F1E6'
+emoji_flags[bosnia_herzegovina]=$'\U1F1E7\U1F1E6'
 emoji_flags[Barbados]=$'\U1F1E7\U1F1E7'
+emoji_flags[BB]=$'\U1F1E7\U1F1E7'
+emoji_flags[BRB]=$'\U1F1E7\U1F1E7'
+emoji_flags[barbados]=$'\U1F1E7\U1F1E7'
 emoji_flags[Bangladesh]=$'\U1F1E7\U1F1E9'
+emoji_flags[BD]=$'\U1F1E7\U1F1E9'
+emoji_flags[BGD]=$'\U1F1E7\U1F1E9'
+emoji_flags[bangladesh]=$'\U1F1E7\U1F1E9'
 emoji_flags[Belgium]=$'\U1F1E7\U1F1EA'
+emoji_flags[BE]=$'\U1F1E7\U1F1EA'
+emoji_flags[BEL]=$'\U1F1E7\U1F1EA'
+emoji_flags[belgium]=$'\U1F1E7\U1F1EA'
 emoji_flags[Burkina_Faso]=$'\U1F1E7\U1F1EB'
+emoji_flags[BF]=$'\U1F1E7\U1F1EB'
+emoji_flags[BFA]=$'\U1F1E7\U1F1EB'
+emoji_flags[burkina_faso]=$'\U1F1E7\U1F1EB'
 emoji_flags[Bulgaria]=$'\U1F1E7\U1F1EC'
+emoji_flags[BG]=$'\U1F1E7\U1F1EC'
+emoji_flags[BGR]=$'\U1F1E7\U1F1EC'
+emoji_flags[bulgaria]=$'\U1F1E7\U1F1EC'
 emoji_flags[Bahrain]=$'\U1F1E7\U1F1ED'
+emoji_flags[BH]=$'\U1F1E7\U1F1ED'
+emoji_flags[BHR]=$'\U1F1E7\U1F1ED'
+emoji_flags[bahrain]=$'\U1F1E7\U1F1ED'
 emoji_flags[Burundi]=$'\U1F1E7\U1F1EE'
+emoji_flags[BI]=$'\U1F1E7\U1F1EE'
+emoji_flags[BDI]=$'\U1F1E7\U1F1EE'
+emoji_flags[burundi]=$'\U1F1E7\U1F1EE'
 emoji_flags[Benin]=$'\U1F1E7\U1F1EF'
-emoji_flags[St__Barth�_lemy]=$'\U1F1E7\U1F1F1'
+emoji_flags[BJ]=$'\U1F1E7\U1F1EF'
+emoji_flags[BEN]=$'\U1F1E7\U1F1EF'
+emoji_flags[benin]=$'\U1F1E7\U1F1EF'
+emoji_flags[St_Barthélemy]=$'\U1F1E7\U1F1F1'
+emoji_flags[BL]=$'\U1F1E7\U1F1F1'
+emoji_flags[BLM]=$'\U1F1E7\U1F1F1'
+emoji_flags[st_barthelemy]=$'\U1F1E7\U1F1F1'
 emoji_flags[Bermuda]=$'\U1F1E7\U1F1F2'
+emoji_flags[BM]=$'\U1F1E7\U1F1F2'
+emoji_flags[BMU]=$'\U1F1E7\U1F1F2'
+emoji_flags[bermuda]=$'\U1F1E7\U1F1F2'
 emoji_flags[Brunei]=$'\U1F1E7\U1F1F3'
+emoji_flags[BN]=$'\U1F1E7\U1F1F3'
+emoji_flags[BRN]=$'\U1F1E7\U1F1F3'
+emoji_flags[brunei]=$'\U1F1E7\U1F1F3'
 emoji_flags[Bolivia]=$'\U1F1E7\U1F1F4'
+emoji_flags[BO]=$'\U1F1E7\U1F1F4'
+emoji_flags[BOL]=$'\U1F1E7\U1F1F4'
+emoji_flags[bolivia]=$'\U1F1E7\U1F1F4'
 emoji_flags[Caribbean_Netherlands]=$'\U1F1E7\U1F1F6'
+emoji_flags[BQ]=$'\U1F1E7\U1F1F6'
+emoji_flags[BES]=$'\U1F1E7\U1F1F6'
+emoji_flags[caribbean_netherlands]=$'\U1F1E7\U1F1F6'
 emoji_flags[Brazil]=$'\U1F1E7\U1F1F7'
+emoji_flags[BR]=$'\U1F1E7\U1F1F7'
+emoji_flags[BRA]=$'\U1F1E7\U1F1F7'
+emoji_flags[brazil]=$'\U1F1E7\U1F1F7'
 emoji_flags[Bahamas]=$'\U1F1E7\U1F1F8'
+emoji_flags[BS]=$'\U1F1E7\U1F1F8'
+emoji_flags[BHS]=$'\U1F1E7\U1F1F8'
+emoji_flags[bahamas]=$'\U1F1E7\U1F1F8'
 emoji_flags[Bhutan]=$'\U1F1E7\U1F1F9'
+emoji_flags[BT]=$'\U1F1E7\U1F1F9'
+emoji_flags[BTN]=$'\U1F1E7\U1F1F9'
+emoji_flags[bhutan]=$'\U1F1E7\U1F1F9'
 emoji_flags[Bouvet_Island]=$'\U1F1E7\U1F1FB'
+emoji_flags[BV]=$'\U1F1E7\U1F1FB'
+emoji_flags[BVT]=$'\U1F1E7\U1F1FB'
+emoji_flags[bouvet_island]=$'\U1F1E7\U1F1FB'
 emoji_flags[Botswana]=$'\U1F1E7\U1F1FC'
+emoji_flags[BW]=$'\U1F1E7\U1F1FC'
+emoji_flags[BWA]=$'\U1F1E7\U1F1FC'
+emoji_flags[botswana]=$'\U1F1E7\U1F1FC'
 emoji_flags[Belarus]=$'\U1F1E7\U1F1FE'
+emoji_flags[BY]=$'\U1F1E7\U1F1FE'
+emoji_flags[BLR]=$'\U1F1E7\U1F1FE'
+emoji_flags[belarus]=$'\U1F1E7\U1F1FE'
 emoji_flags[Belize]=$'\U1F1E7\U1F1FF'
+emoji_flags[BZ]=$'\U1F1E7\U1F1FF'
+emoji_flags[BLZ]=$'\U1F1E7\U1F1FF'
+emoji_flags[belize]=$'\U1F1E7\U1F1FF'
 emoji_flags[Canada]=$'\U1F1E8\U1F1E6'
-emoji_flags[Cocos__Islands]=$'\U1F1E8\U1F1E8'
-emoji_flags[Congo___Kinshasa]=$'\U1F1E8\U1F1E9'
+emoji_flags[CA]=$'\U1F1E8\U1F1E6'
+emoji_flags[CAN]=$'\U1F1E8\U1F1E6'
+emoji_flags[canada]=$'\U1F1E8\U1F1E6'
+emoji_flags[Cocos_Keeling_Islands]=$'\U1F1E8\U1F1E8'
+emoji_flags[CC]=$'\U1F1E8\U1F1E8'
+emoji_flags[CCK]=$'\U1F1E8\U1F1E8'
+emoji_flags[cocos_islands]=$'\U1F1E8\U1F1E8'
+emoji_flags[Congo__Kinshasa]=$'\U1F1E8\U1F1E9'
+emoji_flags[CD]=$'\U1F1E8\U1F1E9'
+emoji_flags[COD]=$'\U1F1E8\U1F1E9'
+emoji_flags[congo_kinshasa]=$'\U1F1E8\U1F1E9'
 emoji_flags[Central_African_Republic]=$'\U1F1E8\U1F1EB'
-emoji_flags[Congo___Brazzaville]=$'\U1F1E8\U1F1EC'
+emoji_flags[CF]=$'\U1F1E8\U1F1EB'
+emoji_flags[CAF]=$'\U1F1E8\U1F1EB'
+emoji_flags[central_african_republic]=$'\U1F1E8\U1F1EB'
+emoji_flags[Congo__Brazzaville]=$'\U1F1E8\U1F1EC'
+emoji_flags[CG]=$'\U1F1E8\U1F1EC'
+emoji_flags[COG]=$'\U1F1E8\U1F1EC'
+emoji_flags[congo_brazzaville]=$'\U1F1E8\U1F1EC'
 emoji_flags[Switzerland]=$'\U1F1E8\U1F1ED'
-emoji_flags[C�_te_d�__Ivoire]=$'\U1F1E8\U1F1EE'
+emoji_flags[CH]=$'\U1F1E8\U1F1ED'
+emoji_flags[CHE]=$'\U1F1E8\U1F1ED'
+emoji_flags[switzerland]=$'\U1F1E8\U1F1ED'
+emoji_flags[Côte_d_Ivoire]=$'\U1F1E8\U1F1EE'
+emoji_flags[CI]=$'\U1F1E8\U1F1EE'
+emoji_flags[CIV]=$'\U1F1E8\U1F1EE'
+emoji_flags[cote_divoire]=$'\U1F1E8\U1F1EE'
 emoji_flags[Cook_Islands]=$'\U1F1E8\U1F1F0'
+emoji_flags[CK]=$'\U1F1E8\U1F1F0'
+emoji_flags[COK]=$'\U1F1E8\U1F1F0'
+emoji_flags[cook_islands]=$'\U1F1E8\U1F1F0'
 emoji_flags[Chile]=$'\U1F1E8\U1F1F1'
+emoji_flags[CL]=$'\U1F1E8\U1F1F1'
+emoji_flags[CHL]=$'\U1F1E8\U1F1F1'
+emoji_flags[chile]=$'\U1F1E8\U1F1F1'
 emoji_flags[Cameroon]=$'\U1F1E8\U1F1F2'
+emoji_flags[CM]=$'\U1F1E8\U1F1F2'
+emoji_flags[CMR]=$'\U1F1E8\U1F1F2'
+emoji_flags[cameroon]=$'\U1F1E8\U1F1F2'
 emoji_flags[China]=$'\U1F1E8\U1F1F3'
+emoji_flags[CN]=$'\U1F1E8\U1F1F3'
+emoji_flags[CHN]=$'\U1F1E8\U1F1F3'
+emoji_flags[cn]=$'\U1F1E8\U1F1F3'
 emoji_flags[Colombia]=$'\U1F1E8\U1F1F4'
+emoji_flags[CO]=$'\U1F1E8\U1F1F4'
+emoji_flags[COL]=$'\U1F1E8\U1F1F4'
+emoji_flags[colombia]=$'\U1F1E8\U1F1F4'
 emoji_flags[Clipperton_Island]=$'\U1F1E8\U1F1F5'
+emoji_flags[clipperton_island]=$'\U1F1E8\U1F1F5'
 emoji_flags[Costa_Rica]=$'\U1F1E8\U1F1F7'
+emoji_flags[CR]=$'\U1F1E8\U1F1F7'
+emoji_flags[CRI]=$'\U1F1E8\U1F1F7'
+emoji_flags[costa_rica]=$'\U1F1E8\U1F1F7'
 emoji_flags[Cuba]=$'\U1F1E8\U1F1FA'
+emoji_flags[CU]=$'\U1F1E8\U1F1FA'
+emoji_flags[CUB]=$'\U1F1E8\U1F1FA'
+emoji_flags[cuba]=$'\U1F1E8\U1F1FA'
 emoji_flags[Cape_Verde]=$'\U1F1E8\U1F1FB'
-emoji_flags[Cura�_ao]=$'\U1F1E8\U1F1FC'
+emoji_flags[CV]=$'\U1F1E8\U1F1FB'
+emoji_flags[CPV]=$'\U1F1E8\U1F1FB'
+emoji_flags[cape_verde]=$'\U1F1E8\U1F1FB'
+emoji_flags[Curaçao]=$'\U1F1E8\U1F1FC'
+emoji_flags[CW]=$'\U1F1E8\U1F1FC'
+emoji_flags[CUW]=$'\U1F1E8\U1F1FC'
+emoji_flags[curacao]=$'\U1F1E8\U1F1FC'
 emoji_flags[Christmas_Island]=$'\U1F1E8\U1F1FD'
+emoji_flags[CX]=$'\U1F1E8\U1F1FD'
+emoji_flags[CXR]=$'\U1F1E8\U1F1FD'
+emoji_flags[christmas_island]=$'\U1F1E8\U1F1FD'
 emoji_flags[Cyprus]=$'\U1F1E8\U1F1FE'
-emoji_flags[Czech_Republic]=$'\U1F1E8\U1F1FF'
+emoji_flags[CY]=$'\U1F1E8\U1F1FE'
+emoji_flags[CYP]=$'\U1F1E8\U1F1FE'
+emoji_flags[cyprus]=$'\U1F1E8\U1F1FE'
+emoji_flags[Czechia]=$'\U1F1E8\U1F1FF'
+emoji_flags[CZ]=$'\U1F1E8\U1F1FF'
+emoji_flags[CZE]=$'\U1F1E8\U1F1FF'
+emoji_flags[czech_republic]=$'\U1F1E8\U1F1FF'
 emoji_flags[Germany]=$'\U1F1E9\U1F1EA'
+emoji_flags[DE]=$'\U1F1E9\U1F1EA'
+emoji_flags[DEU]=$'\U1F1E9\U1F1EA'
+emoji_flags[de]=$'\U1F1E9\U1F1EA'
 emoji_flags[Diego_Garcia]=$'\U1F1E9\U1F1EC'
+emoji_flags[diego_garcia]=$'\U1F1E9\U1F1EC'
 emoji_flags[Djibouti]=$'\U1F1E9\U1F1EF'
+emoji_flags[DJ]=$'\U1F1E9\U1F1EF'
+emoji_flags[DJI]=$'\U1F1E9\U1F1EF'
+emoji_flags[djibouti]=$'\U1F1E9\U1F1EF'
 emoji_flags[Denmark]=$'\U1F1E9\U1F1F0'
+emoji_flags[DK]=$'\U1F1E9\U1F1F0'
+emoji_flags[DNK]=$'\U1F1E9\U1F1F0'
+emoji_flags[denmark]=$'\U1F1E9\U1F1F0'
 emoji_flags[Dominica]=$'\U1F1E9\U1F1F2'
+emoji_flags[DM]=$'\U1F1E9\U1F1F2'
+emoji_flags[DMA]=$'\U1F1E9\U1F1F2'
+emoji_flags[dominica]=$'\U1F1E9\U1F1F2'
 emoji_flags[Dominican_Republic]=$'\U1F1E9\U1F1F4'
+emoji_flags[DO]=$'\U1F1E9\U1F1F4'
+emoji_flags[DOM]=$'\U1F1E9\U1F1F4'
+emoji_flags[dominican_republic]=$'\U1F1E9\U1F1F4'
 emoji_flags[Algeria]=$'\U1F1E9\U1F1FF'
-emoji_flags[Ceuta___Melilla]=$'\U1F1EA\U1F1E6'
+emoji_flags[DZ]=$'\U1F1E9\U1F1FF'
+emoji_flags[DZA]=$'\U1F1E9\U1F1FF'
+emoji_flags[algeria]=$'\U1F1E9\U1F1FF'
+emoji_flags[Ceuta_and_Melilla]=$'\U1F1EA\U1F1E6'
+emoji_flags[ceuta_melilla]=$'\U1F1EA\U1F1E6'
 emoji_flags[Ecuador]=$'\U1F1EA\U1F1E8'
+emoji_flags[EC]=$'\U1F1EA\U1F1E8'
+emoji_flags[ECU]=$'\U1F1EA\U1F1E8'
+emoji_flags[ecuador]=$'\U1F1EA\U1F1E8'
 emoji_flags[Estonia]=$'\U1F1EA\U1F1EA'
+emoji_flags[EE]=$'\U1F1EA\U1F1EA'
+emoji_flags[EST]=$'\U1F1EA\U1F1EA'
+emoji_flags[estonia]=$'\U1F1EA\U1F1EA'
 emoji_flags[Egypt]=$'\U1F1EA\U1F1EC'
+emoji_flags[EG]=$'\U1F1EA\U1F1EC'
+emoji_flags[EGY]=$'\U1F1EA\U1F1EC'
+emoji_flags[egypt]=$'\U1F1EA\U1F1EC'
 emoji_flags[Western_Sahara]=$'\U1F1EA\U1F1ED'
+emoji_flags[EH]=$'\U1F1EA\U1F1ED'
+emoji_flags[ESH]=$'\U1F1EA\U1F1ED'
+emoji_flags[western_sahara]=$'\U1F1EA\U1F1ED'
 emoji_flags[Eritrea]=$'\U1F1EA\U1F1F7'
+emoji_flags[ER]=$'\U1F1EA\U1F1F7'
+emoji_flags[ERI]=$'\U1F1EA\U1F1F7'
+emoji_flags[eritrea]=$'\U1F1EA\U1F1F7'
 emoji_flags[Spain]=$'\U1F1EA\U1F1F8'
+emoji_flags[ES]=$'\U1F1EA\U1F1F8'
+emoji_flags[ESP]=$'\U1F1EA\U1F1F8'
+emoji_flags[es]=$'\U1F1EA\U1F1F8'
 emoji_flags[Ethiopia]=$'\U1F1EA\U1F1F9'
+emoji_flags[ET]=$'\U1F1EA\U1F1F9'
+emoji_flags[ETH]=$'\U1F1EA\U1F1F9'
+emoji_flags[ethiopia]=$'\U1F1EA\U1F1F9'
 emoji_flags[European_Union]=$'\U1F1EA\U1F1FA'
+emoji_flags[eu]=$'\U1F1EA\U1F1FA'
+emoji_flags[european_union]=$'\U1F1EA\U1F1FA'
 emoji_flags[Finland]=$'\U1F1EB\U1F1EE'
+emoji_flags[FI]=$'\U1F1EB\U1F1EE'
+emoji_flags[FIN]=$'\U1F1EB\U1F1EE'
+emoji_flags[finland]=$'\U1F1EB\U1F1EE'
 emoji_flags[Fiji]=$'\U1F1EB\U1F1EF'
+emoji_flags[FJ]=$'\U1F1EB\U1F1EF'
+emoji_flags[FJI]=$'\U1F1EB\U1F1EF'
+emoji_flags[fiji]=$'\U1F1EB\U1F1EF'
 emoji_flags[Falkland_Islands]=$'\U1F1EB\U1F1F0'
+emoji_flags[FK]=$'\U1F1EB\U1F1F0'
+emoji_flags[FLK]=$'\U1F1EB\U1F1F0'
+emoji_flags[falkland_islands]=$'\U1F1EB\U1F1F0'
 emoji_flags[Micronesia]=$'\U1F1EB\U1F1F2'
+emoji_flags[FM]=$'\U1F1EB\U1F1F2'
+emoji_flags[FSM]=$'\U1F1EB\U1F1F2'
+emoji_flags[micronesia]=$'\U1F1EB\U1F1F2'
 emoji_flags[Faroe_Islands]=$'\U1F1EB\U1F1F4'
+emoji_flags[FO]=$'\U1F1EB\U1F1F4'
+emoji_flags[FRO]=$'\U1F1EB\U1F1F4'
+emoji_flags[faroe_islands]=$'\U1F1EB\U1F1F4'
 emoji_flags[France]=$'\U1F1EB\U1F1F7'
+emoji_flags[FR]=$'\U1F1EB\U1F1F7'
+emoji_flags[FRA]=$'\U1F1EB\U1F1F7'
+emoji_flags[fr]=$'\U1F1EB\U1F1F7'
 emoji_flags[Gabon]=$'\U1F1EC\U1F1E6'
+emoji_flags[GA]=$'\U1F1EC\U1F1E6'
+emoji_flags[GAB]=$'\U1F1EC\U1F1E6'
+emoji_flags[gabon]=$'\U1F1EC\U1F1E6'
 emoji_flags[United_Kingdom]=$'\U1F1EC\U1F1E7'
+emoji_flags[GB]=$'\U1F1EC\U1F1E7'
+emoji_flags[GBR]=$'\U1F1EC\U1F1E7'
+emoji_flags[gb]=$'\U1F1EC\U1F1E7'
+emoji_flags[uk]=$'\U1F1EC\U1F1E7'
 emoji_flags[Grenada]=$'\U1F1EC\U1F1E9'
+emoji_flags[GD]=$'\U1F1EC\U1F1E9'
+emoji_flags[GRD]=$'\U1F1EC\U1F1E9'
+emoji_flags[grenada]=$'\U1F1EC\U1F1E9'
 emoji_flags[Georgia]=$'\U1F1EC\U1F1EA'
+emoji_flags[GE]=$'\U1F1EC\U1F1EA'
+emoji_flags[GEO]=$'\U1F1EC\U1F1EA'
+emoji_flags[georgia]=$'\U1F1EC\U1F1EA'
 emoji_flags[French_Guiana]=$'\U1F1EC\U1F1EB'
+emoji_flags[GF]=$'\U1F1EC\U1F1EB'
+emoji_flags[GUF]=$'\U1F1EC\U1F1EB'
+emoji_flags[french_guiana]=$'\U1F1EC\U1F1EB'
 emoji_flags[Guernsey]=$'\U1F1EC\U1F1EC'
+emoji_flags[GG]=$'\U1F1EC\U1F1EC'
+emoji_flags[GGY]=$'\U1F1EC\U1F1EC'
+emoji_flags[guernsey]=$'\U1F1EC\U1F1EC'
 emoji_flags[Ghana]=$'\U1F1EC\U1F1ED'
+emoji_flags[GH]=$'\U1F1EC\U1F1ED'
+emoji_flags[GHA]=$'\U1F1EC\U1F1ED'
+emoji_flags[ghana]=$'\U1F1EC\U1F1ED'
 emoji_flags[Gibraltar]=$'\U1F1EC\U1F1EE'
+emoji_flags[GI]=$'\U1F1EC\U1F1EE'
+emoji_flags[GIB]=$'\U1F1EC\U1F1EE'
+emoji_flags[gibraltar]=$'\U1F1EC\U1F1EE'
 emoji_flags[Greenland]=$'\U1F1EC\U1F1F1'
+emoji_flags[GL]=$'\U1F1EC\U1F1F1'
+emoji_flags[GRL]=$'\U1F1EC\U1F1F1'
+emoji_flags[greenland]=$'\U1F1EC\U1F1F1'
 emoji_flags[Gambia]=$'\U1F1EC\U1F1F2'
+emoji_flags[GM]=$'\U1F1EC\U1F1F2'
+emoji_flags[GMB]=$'\U1F1EC\U1F1F2'
+emoji_flags[gambia]=$'\U1F1EC\U1F1F2'
 emoji_flags[Guinea]=$'\U1F1EC\U1F1F3'
+emoji_flags[GN]=$'\U1F1EC\U1F1F3'
+emoji_flags[GIN]=$'\U1F1EC\U1F1F3'
+emoji_flags[guinea]=$'\U1F1EC\U1F1F3'
 emoji_flags[Guadeloupe]=$'\U1F1EC\U1F1F5'
+emoji_flags[GP]=$'\U1F1EC\U1F1F5'
+emoji_flags[GLP]=$'\U1F1EC\U1F1F5'
+emoji_flags[guadeloupe]=$'\U1F1EC\U1F1F5'
 emoji_flags[Equatorial_Guinea]=$'\U1F1EC\U1F1F6'
+emoji_flags[GQ]=$'\U1F1EC\U1F1F6'
+emoji_flags[GNQ]=$'\U1F1EC\U1F1F6'
+emoji_flags[equatorial_guinea]=$'\U1F1EC\U1F1F6'
 emoji_flags[Greece]=$'\U1F1EC\U1F1F7'
-emoji_flags[South_Georgia___South_Sandwich_Islands]=$'\U1F1EC\U1F1F8'
+emoji_flags[GR]=$'\U1F1EC\U1F1F7'
+emoji_flags[GRC]=$'\U1F1EC\U1F1F7'
+emoji_flags[greece]=$'\U1F1EC\U1F1F7'
+emoji_flags[South_Georgia_and_South_Sandwich_Islands]=$'\U1F1EC\U1F1F8'
+emoji_flags[GS]=$'\U1F1EC\U1F1F8'
+emoji_flags[SGS]=$'\U1F1EC\U1F1F8'
+emoji_flags[south_georgia_south_sandwich_islands]=$'\U1F1EC\U1F1F8'
 emoji_flags[Guatemala]=$'\U1F1EC\U1F1F9'
+emoji_flags[GT]=$'\U1F1EC\U1F1F9'
+emoji_flags[GTM]=$'\U1F1EC\U1F1F9'
+emoji_flags[guatemala]=$'\U1F1EC\U1F1F9'
 emoji_flags[Guam]=$'\U1F1EC\U1F1FA'
+emoji_flags[GU]=$'\U1F1EC\U1F1FA'
+emoji_flags[GUM]=$'\U1F1EC\U1F1FA'
+emoji_flags[guam]=$'\U1F1EC\U1F1FA'
 emoji_flags[Guinea_Bissau]=$'\U1F1EC\U1F1FC'
+emoji_flags[GW]=$'\U1F1EC\U1F1FC'
+emoji_flags[GNB]=$'\U1F1EC\U1F1FC'
+emoji_flags[guinea_bissau]=$'\U1F1EC\U1F1FC'
 emoji_flags[Guyana]=$'\U1F1EC\U1F1FE'
-emoji_flags[Hong_Kong]=$'\U1F1ED\U1F1F0'
-emoji_flags[Heard___McDonald_Islands]=$'\U1F1ED\U1F1F2'
+emoji_flags[GY]=$'\U1F1EC\U1F1FE'
+emoji_flags[GUY]=$'\U1F1EC\U1F1FE'
+emoji_flags[guyana]=$'\U1F1EC\U1F1FE'
+emoji_flags[Hong_Kong_SAR_China]=$'\U1F1ED\U1F1F0'
+emoji_flags[HK]=$'\U1F1ED\U1F1F0'
+emoji_flags[HKG]=$'\U1F1ED\U1F1F0'
+emoji_flags[hong_kong]=$'\U1F1ED\U1F1F0'
+emoji_flags[Heard_and_McDonald_Islands]=$'\U1F1ED\U1F1F2'
+emoji_flags[HM]=$'\U1F1ED\U1F1F2'
+emoji_flags[HMD]=$'\U1F1ED\U1F1F2'
+emoji_flags[heard_mcdonald_islands]=$'\U1F1ED\U1F1F2'
 emoji_flags[Honduras]=$'\U1F1ED\U1F1F3'
+emoji_flags[HN]=$'\U1F1ED\U1F1F3'
+emoji_flags[HND]=$'\U1F1ED\U1F1F3'
+emoji_flags[honduras]=$'\U1F1ED\U1F1F3'
 emoji_flags[Croatia]=$'\U1F1ED\U1F1F7'
+emoji_flags[HR]=$'\U1F1ED\U1F1F7'
+emoji_flags[HRV]=$'\U1F1ED\U1F1F7'
+emoji_flags[croatia]=$'\U1F1ED\U1F1F7'
 emoji_flags[Haiti]=$'\U1F1ED\U1F1F9'
+emoji_flags[HT]=$'\U1F1ED\U1F1F9'
+emoji_flags[HTI]=$'\U1F1ED\U1F1F9'
+emoji_flags[haiti]=$'\U1F1ED\U1F1F9'
 emoji_flags[Hungary]=$'\U1F1ED\U1F1FA'
+emoji_flags[HU]=$'\U1F1ED\U1F1FA'
+emoji_flags[HUN]=$'\U1F1ED\U1F1FA'
+emoji_flags[hungary]=$'\U1F1ED\U1F1FA'
 emoji_flags[Canary_Islands]=$'\U1F1EE\U1F1E8'
+emoji_flags[canary_islands]=$'\U1F1EE\U1F1E8'
 emoji_flags[Indonesia]=$'\U1F1EE\U1F1E9'
+emoji_flags[ID]=$'\U1F1EE\U1F1E9'
+emoji_flags[IDN]=$'\U1F1EE\U1F1E9'
+emoji_flags[indonesia]=$'\U1F1EE\U1F1E9'
 emoji_flags[Ireland]=$'\U1F1EE\U1F1EA'
+emoji_flags[IE]=$'\U1F1EE\U1F1EA'
+emoji_flags[IRL]=$'\U1F1EE\U1F1EA'
+emoji_flags[ireland]=$'\U1F1EE\U1F1EA'
 emoji_flags[Israel]=$'\U1F1EE\U1F1F1'
+emoji_flags[IL]=$'\U1F1EE\U1F1F1'
+emoji_flags[ISR]=$'\U1F1EE\U1F1F1'
+emoji_flags[israel]=$'\U1F1EE\U1F1F1'
 emoji_flags[Isle_of_Man]=$'\U1F1EE\U1F1F2'
+emoji_flags[IM]=$'\U1F1EE\U1F1F2'
+emoji_flags[IMN]=$'\U1F1EE\U1F1F2'
+emoji_flags[isle_of_man]=$'\U1F1EE\U1F1F2'
 emoji_flags[India]=$'\U1F1EE\U1F1F3'
+emoji_flags[IN]=$'\U1F1EE\U1F1F3'
+emoji_flags[IND]=$'\U1F1EE\U1F1F3'
+emoji_flags[india]=$'\U1F1EE\U1F1F3'
 emoji_flags[British_Indian_Ocean_Territory]=$'\U1F1EE\U1F1F4'
+emoji_flags[IO]=$'\U1F1EE\U1F1F4'
+emoji_flags[IOT]=$'\U1F1EE\U1F1F4'
+emoji_flags[british_indian_ocean_territory]=$'\U1F1EE\U1F1F4'
 emoji_flags[Iraq]=$'\U1F1EE\U1F1F6'
+emoji_flags[IQ]=$'\U1F1EE\U1F1F6'
+emoji_flags[IRQ]=$'\U1F1EE\U1F1F6'
+emoji_flags[iraq]=$'\U1F1EE\U1F1F6'
 emoji_flags[Iran]=$'\U1F1EE\U1F1F7'
+emoji_flags[IR]=$'\U1F1EE\U1F1F7'
+emoji_flags[IRN]=$'\U1F1EE\U1F1F7'
+emoji_flags[iran]=$'\U1F1EE\U1F1F7'
 emoji_flags[Iceland]=$'\U1F1EE\U1F1F8'
+emoji_flags[IS]=$'\U1F1EE\U1F1F8'
+emoji_flags[ISL]=$'\U1F1EE\U1F1F8'
+emoji_flags[iceland]=$'\U1F1EE\U1F1F8'
 emoji_flags[Italy]=$'\U1F1EE\U1F1F9'
+emoji_flags[IT]=$'\U1F1EE\U1F1F9'
+emoji_flags[ITA]=$'\U1F1EE\U1F1F9'
+emoji_flags[it]=$'\U1F1EE\U1F1F9'
 emoji_flags[Jersey]=$'\U1F1EF\U1F1EA'
+emoji_flags[JE]=$'\U1F1EF\U1F1EA'
+emoji_flags[JEY]=$'\U1F1EF\U1F1EA'
+emoji_flags[jersey]=$'\U1F1EF\U1F1EA'
 emoji_flags[Jamaica]=$'\U1F1EF\U1F1F2'
+emoji_flags[JM]=$'\U1F1EF\U1F1F2'
+emoji_flags[JAM]=$'\U1F1EF\U1F1F2'
+emoji_flags[jamaica]=$'\U1F1EF\U1F1F2'
 emoji_flags[Jordan]=$'\U1F1EF\U1F1F4'
+emoji_flags[JO]=$'\U1F1EF\U1F1F4'
+emoji_flags[JOR]=$'\U1F1EF\U1F1F4'
+emoji_flags[jordan]=$'\U1F1EF\U1F1F4'
 emoji_flags[Japan]=$'\U1F1EF\U1F1F5'
+emoji_flags[JP]=$'\U1F1EF\U1F1F5'
+emoji_flags[JPN]=$'\U1F1EF\U1F1F5'
+emoji_flags[jp]=$'\U1F1EF\U1F1F5'
 emoji_flags[Kenya]=$'\U1F1F0\U1F1EA'
+emoji_flags[KE]=$'\U1F1F0\U1F1EA'
+emoji_flags[KEN]=$'\U1F1F0\U1F1EA'
+emoji_flags[kenya]=$'\U1F1F0\U1F1EA'
 emoji_flags[Kyrgyzstan]=$'\U1F1F0\U1F1EC'
+emoji_flags[KG]=$'\U1F1F0\U1F1EC'
+emoji_flags[KGZ]=$'\U1F1F0\U1F1EC'
+emoji_flags[kyrgyzstan]=$'\U1F1F0\U1F1EC'
 emoji_flags[Cambodia]=$'\U1F1F0\U1F1ED'
+emoji_flags[KH]=$'\U1F1F0\U1F1ED'
+emoji_flags[KHM]=$'\U1F1F0\U1F1ED'
+emoji_flags[cambodia]=$'\U1F1F0\U1F1ED'
 emoji_flags[Kiribati]=$'\U1F1F0\U1F1EE'
+emoji_flags[KI]=$'\U1F1F0\U1F1EE'
+emoji_flags[KIR]=$'\U1F1F0\U1F1EE'
+emoji_flags[kiribati]=$'\U1F1F0\U1F1EE'
 emoji_flags[Comoros]=$'\U1F1F0\U1F1F2'
-emoji_flags[St__Kitts___Nevis]=$'\U1F1F0\U1F1F3'
+emoji_flags[KM]=$'\U1F1F0\U1F1F2'
+emoji_flags[COM]=$'\U1F1F0\U1F1F2'
+emoji_flags[comoros]=$'\U1F1F0\U1F1F2'
+emoji_flags[St_Kitts_and_Nevis]=$'\U1F1F0\U1F1F3'
+emoji_flags[KN]=$'\U1F1F0\U1F1F3'
+emoji_flags[KNA]=$'\U1F1F0\U1F1F3'
+emoji_flags[st_kitts_nevis]=$'\U1F1F0\U1F1F3'
 emoji_flags[North_Korea]=$'\U1F1F0\U1F1F5'
+emoji_flags[KP]=$'\U1F1F0\U1F1F5'
+emoji_flags[PRK]=$'\U1F1F0\U1F1F5'
+emoji_flags[north_korea]=$'\U1F1F0\U1F1F5'
 emoji_flags[South_Korea]=$'\U1F1F0\U1F1F7'
+emoji_flags[KR]=$'\U1F1F0\U1F1F7'
+emoji_flags[KOR]=$'\U1F1F0\U1F1F7'
+emoji_flags[kr]=$'\U1F1F0\U1F1F7'
 emoji_flags[Kuwait]=$'\U1F1F0\U1F1FC'
+emoji_flags[KW]=$'\U1F1F0\U1F1FC'
+emoji_flags[KWT]=$'\U1F1F0\U1F1FC'
+emoji_flags[kuwait]=$'\U1F1F0\U1F1FC'
 emoji_flags[Cayman_Islands]=$'\U1F1F0\U1F1FE'
+emoji_flags[KY]=$'\U1F1F0\U1F1FE'
+emoji_flags[CYM]=$'\U1F1F0\U1F1FE'
+emoji_flags[cayman_islands]=$'\U1F1F0\U1F1FE'
 emoji_flags[Kazakhstan]=$'\U1F1F0\U1F1FF'
+emoji_flags[KZ]=$'\U1F1F0\U1F1FF'
+emoji_flags[KAZ]=$'\U1F1F0\U1F1FF'
+emoji_flags[kazakhstan]=$'\U1F1F0\U1F1FF'
 emoji_flags[Laos]=$'\U1F1F1\U1F1E6'
+emoji_flags[LA]=$'\U1F1F1\U1F1E6'
+emoji_flags[LAO]=$'\U1F1F1\U1F1E6'
+emoji_flags[laos]=$'\U1F1F1\U1F1E6'
 emoji_flags[Lebanon]=$'\U1F1F1\U1F1E7'
-emoji_flags[St__Lucia]=$'\U1F1F1\U1F1E8'
+emoji_flags[LB]=$'\U1F1F1\U1F1E7'
+emoji_flags[LBN]=$'\U1F1F1\U1F1E7'
+emoji_flags[lebanon]=$'\U1F1F1\U1F1E7'
+emoji_flags[St_Lucia]=$'\U1F1F1\U1F1E8'
+emoji_flags[LC]=$'\U1F1F1\U1F1E8'
+emoji_flags[LCA]=$'\U1F1F1\U1F1E8'
+emoji_flags[st_lucia]=$'\U1F1F1\U1F1E8'
 emoji_flags[Liechtenstein]=$'\U1F1F1\U1F1EE'
+emoji_flags[LI]=$'\U1F1F1\U1F1EE'
+emoji_flags[LIE]=$'\U1F1F1\U1F1EE'
+emoji_flags[liechtenstein]=$'\U1F1F1\U1F1EE'
 emoji_flags[Sri_Lanka]=$'\U1F1F1\U1F1F0'
+emoji_flags[LK]=$'\U1F1F1\U1F1F0'
+emoji_flags[LKA]=$'\U1F1F1\U1F1F0'
+emoji_flags[sri_lanka]=$'\U1F1F1\U1F1F0'
 emoji_flags[Liberia]=$'\U1F1F1\U1F1F7'
+emoji_flags[LR]=$'\U1F1F1\U1F1F7'
+emoji_flags[LBR]=$'\U1F1F1\U1F1F7'
+emoji_flags[liberia]=$'\U1F1F1\U1F1F7'
 emoji_flags[Lesotho]=$'\U1F1F1\U1F1F8'
+emoji_flags[LS]=$'\U1F1F1\U1F1F8'
+emoji_flags[LSO]=$'\U1F1F1\U1F1F8'
+emoji_flags[lesotho]=$'\U1F1F1\U1F1F8'
 emoji_flags[Lithuania]=$'\U1F1F1\U1F1F9'
+emoji_flags[LT]=$'\U1F1F1\U1F1F9'
+emoji_flags[LTU]=$'\U1F1F1\U1F1F9'
+emoji_flags[lithuania]=$'\U1F1F1\U1F1F9'
 emoji_flags[Luxembourg]=$'\U1F1F1\U1F1FA'
+emoji_flags[LU]=$'\U1F1F1\U1F1FA'
+emoji_flags[LUX]=$'\U1F1F1\U1F1FA'
+emoji_flags[luxembourg]=$'\U1F1F1\U1F1FA'
 emoji_flags[Latvia]=$'\U1F1F1\U1F1FB'
+emoji_flags[LV]=$'\U1F1F1\U1F1FB'
+emoji_flags[LVA]=$'\U1F1F1\U1F1FB'
+emoji_flags[latvia]=$'\U1F1F1\U1F1FB'
 emoji_flags[Libya]=$'\U1F1F1\U1F1FE'
+emoji_flags[LY]=$'\U1F1F1\U1F1FE'
+emoji_flags[LBY]=$'\U1F1F1\U1F1FE'
+emoji_flags[libya]=$'\U1F1F1\U1F1FE'
 emoji_flags[Morocco]=$'\U1F1F2\U1F1E6'
+emoji_flags[MA]=$'\U1F1F2\U1F1E6'
+emoji_flags[MAR]=$'\U1F1F2\U1F1E6'
+emoji_flags[morocco]=$'\U1F1F2\U1F1E6'
 emoji_flags[Monaco]=$'\U1F1F2\U1F1E8'
+emoji_flags[MC]=$'\U1F1F2\U1F1E8'
+emoji_flags[MCO]=$'\U1F1F2\U1F1E8'
+emoji_flags[monaco]=$'\U1F1F2\U1F1E8'
 emoji_flags[Moldova]=$'\U1F1F2\U1F1E9'
+emoji_flags[MD]=$'\U1F1F2\U1F1E9'
+emoji_flags[MDA]=$'\U1F1F2\U1F1E9'
+emoji_flags[moldova]=$'\U1F1F2\U1F1E9'
 emoji_flags[Montenegro]=$'\U1F1F2\U1F1EA'
-emoji_flags[St__Martin]=$'\U1F1F2\U1F1EB'
+emoji_flags[ME]=$'\U1F1F2\U1F1EA'
+emoji_flags[MNE]=$'\U1F1F2\U1F1EA'
+emoji_flags[montenegro]=$'\U1F1F2\U1F1EA'
+emoji_flags[St_Martin]=$'\U1F1F2\U1F1EB'
+emoji_flags[MF]=$'\U1F1F2\U1F1EB'
+emoji_flags[MAF]=$'\U1F1F2\U1F1EB'
+emoji_flags[st_martin]=$'\U1F1F2\U1F1EB'
 emoji_flags[Madagascar]=$'\U1F1F2\U1F1EC'
+emoji_flags[MG]=$'\U1F1F2\U1F1EC'
+emoji_flags[MDG]=$'\U1F1F2\U1F1EC'
+emoji_flags[madagascar]=$'\U1F1F2\U1F1EC'
 emoji_flags[Marshall_Islands]=$'\U1F1F2\U1F1ED'
+emoji_flags[MH]=$'\U1F1F2\U1F1ED'
+emoji_flags[MHL]=$'\U1F1F2\U1F1ED'
+emoji_flags[marshall_islands]=$'\U1F1F2\U1F1ED'
 emoji_flags[Macedonia]=$'\U1F1F2\U1F1F0'
+emoji_flags[MK]=$'\U1F1F2\U1F1F0'
+emoji_flags[MKD]=$'\U1F1F2\U1F1F0'
+emoji_flags[macedonia]=$'\U1F1F2\U1F1F0'
 emoji_flags[Mali]=$'\U1F1F2\U1F1F1'
-emoji_flags[Myanmar]=$'\U1F1F2\U1F1F2'
+emoji_flags[ML]=$'\U1F1F2\U1F1F1'
+emoji_flags[MLI]=$'\U1F1F2\U1F1F1'
+emoji_flags[mali]=$'\U1F1F2\U1F1F1'
+emoji_flags[Myanmar_Burma_]=$'\U1F1F2\U1F1F2'
+emoji_flags[MM]=$'\U1F1F2\U1F1F2'
+emoji_flags[MMR]=$'\U1F1F2\U1F1F2'
+emoji_flags[myanmar]=$'\U1F1F2\U1F1F2'
 emoji_flags[Mongolia]=$'\U1F1F2\U1F1F3'
-emoji_flags[Macau]=$'\U1F1F2\U1F1F4'
+emoji_flags[MN]=$'\U1F1F2\U1F1F3'
+emoji_flags[MNG]=$'\U1F1F2\U1F1F3'
+emoji_flags[mongolia]=$'\U1F1F2\U1F1F3'
+emoji_flags[Macao_SAR_China]=$'\U1F1F2\U1F1F4'
+emoji_flags[MO]=$'\U1F1F2\U1F1F4'
+emoji_flags[MAC]=$'\U1F1F2\U1F1F4'
+emoji_flags[macau]=$'\U1F1F2\U1F1F4'
 emoji_flags[Northern_Mariana_Islands]=$'\U1F1F2\U1F1F5'
+emoji_flags[MP]=$'\U1F1F2\U1F1F5'
+emoji_flags[MNP]=$'\U1F1F2\U1F1F5'
+emoji_flags[northern_mariana_islands]=$'\U1F1F2\U1F1F5'
 emoji_flags[Martinique]=$'\U1F1F2\U1F1F6'
+emoji_flags[MQ]=$'\U1F1F2\U1F1F6'
+emoji_flags[MTQ]=$'\U1F1F2\U1F1F6'
+emoji_flags[martinique]=$'\U1F1F2\U1F1F6'
 emoji_flags[Mauritania]=$'\U1F1F2\U1F1F7'
+emoji_flags[MR]=$'\U1F1F2\U1F1F7'
+emoji_flags[MRT]=$'\U1F1F2\U1F1F7'
+emoji_flags[mauritania]=$'\U1F1F2\U1F1F7'
 emoji_flags[Montserrat]=$'\U1F1F2\U1F1F8'
+emoji_flags[MS]=$'\U1F1F2\U1F1F8'
+emoji_flags[MSR]=$'\U1F1F2\U1F1F8'
+emoji_flags[montserrat]=$'\U1F1F2\U1F1F8'
 emoji_flags[Malta]=$'\U1F1F2\U1F1F9'
+emoji_flags[MT]=$'\U1F1F2\U1F1F9'
+emoji_flags[MLT]=$'\U1F1F2\U1F1F9'
+emoji_flags[malta]=$'\U1F1F2\U1F1F9'
 emoji_flags[Mauritius]=$'\U1F1F2\U1F1FA'
+emoji_flags[MU]=$'\U1F1F2\U1F1FA'
+emoji_flags[MUS]=$'\U1F1F2\U1F1FA'
+emoji_flags[mauritius]=$'\U1F1F2\U1F1FA'
 emoji_flags[Maldives]=$'\U1F1F2\U1F1FB'
+emoji_flags[MV]=$'\U1F1F2\U1F1FB'
+emoji_flags[MDV]=$'\U1F1F2\U1F1FB'
+emoji_flags[maldives]=$'\U1F1F2\U1F1FB'
 emoji_flags[Malawi]=$'\U1F1F2\U1F1FC'
+emoji_flags[MW]=$'\U1F1F2\U1F1FC'
+emoji_flags[MWI]=$'\U1F1F2\U1F1FC'
+emoji_flags[malawi]=$'\U1F1F2\U1F1FC'
 emoji_flags[Mexico]=$'\U1F1F2\U1F1FD'
+emoji_flags[MX]=$'\U1F1F2\U1F1FD'
+emoji_flags[MEX]=$'\U1F1F2\U1F1FD'
+emoji_flags[mexico]=$'\U1F1F2\U1F1FD'
 emoji_flags[Malaysia]=$'\U1F1F2\U1F1FE'
+emoji_flags[MY]=$'\U1F1F2\U1F1FE'
+emoji_flags[MYS]=$'\U1F1F2\U1F1FE'
+emoji_flags[malaysia]=$'\U1F1F2\U1F1FE'
 emoji_flags[Mozambique]=$'\U1F1F2\U1F1FF'
+emoji_flags[MZ]=$'\U1F1F2\U1F1FF'
+emoji_flags[MOZ]=$'\U1F1F2\U1F1FF'
+emoji_flags[mozambique]=$'\U1F1F2\U1F1FF'
 emoji_flags[Namibia]=$'\U1F1F3\U1F1E6'
+emoji_flags[NA]=$'\U1F1F3\U1F1E6'
+emoji_flags[NAM]=$'\U1F1F3\U1F1E6'
+emoji_flags[namibia]=$'\U1F1F3\U1F1E6'
 emoji_flags[New_Caledonia]=$'\U1F1F3\U1F1E8'
+emoji_flags[NC]=$'\U1F1F3\U1F1E8'
+emoji_flags[NCL]=$'\U1F1F3\U1F1E8'
+emoji_flags[new_caledonia]=$'\U1F1F3\U1F1E8'
 emoji_flags[Niger]=$'\U1F1F3\U1F1EA'
+emoji_flags[NE]=$'\U1F1F3\U1F1EA'
+emoji_flags[NER]=$'\U1F1F3\U1F1EA'
+emoji_flags[niger]=$'\U1F1F3\U1F1EA'
 emoji_flags[Norfolk_Island]=$'\U1F1F3\U1F1EB'
+emoji_flags[NF]=$'\U1F1F3\U1F1EB'
+emoji_flags[NFK]=$'\U1F1F3\U1F1EB'
+emoji_flags[norfolk_island]=$'\U1F1F3\U1F1EB'
 emoji_flags[Nigeria]=$'\U1F1F3\U1F1EC'
+emoji_flags[NG]=$'\U1F1F3\U1F1EC'
+emoji_flags[NGA]=$'\U1F1F3\U1F1EC'
+emoji_flags[nigeria]=$'\U1F1F3\U1F1EC'
 emoji_flags[Nicaragua]=$'\U1F1F3\U1F1EE'
+emoji_flags[NI]=$'\U1F1F3\U1F1EE'
+emoji_flags[NIC]=$'\U1F1F3\U1F1EE'
+emoji_flags[nicaragua]=$'\U1F1F3\U1F1EE'
 emoji_flags[Netherlands]=$'\U1F1F3\U1F1F1'
+emoji_flags[NL]=$'\U1F1F3\U1F1F1'
+emoji_flags[NLD]=$'\U1F1F3\U1F1F1'
+emoji_flags[netherlands]=$'\U1F1F3\U1F1F1'
 emoji_flags[Norway]=$'\U1F1F3\U1F1F4'
+emoji_flags[NO]=$'\U1F1F3\U1F1F4'
+emoji_flags[NOR]=$'\U1F1F3\U1F1F4'
+emoji_flags[norway]=$'\U1F1F3\U1F1F4'
 emoji_flags[Nepal]=$'\U1F1F3\U1F1F5'
+emoji_flags[NP]=$'\U1F1F3\U1F1F5'
+emoji_flags[NPL]=$'\U1F1F3\U1F1F5'
+emoji_flags[nepal]=$'\U1F1F3\U1F1F5'
 emoji_flags[Nauru]=$'\U1F1F3\U1F1F7'
+emoji_flags[NR]=$'\U1F1F3\U1F1F7'
+emoji_flags[NRU]=$'\U1F1F3\U1F1F7'
+emoji_flags[nauru]=$'\U1F1F3\U1F1F7'
 emoji_flags[Niue]=$'\U1F1F3\U1F1FA'
+emoji_flags[NU]=$'\U1F1F3\U1F1FA'
+emoji_flags[NIU]=$'\U1F1F3\U1F1FA'
+emoji_flags[niue]=$'\U1F1F3\U1F1FA'
 emoji_flags[New_Zealand]=$'\U1F1F3\U1F1FF'
+emoji_flags[NZ]=$'\U1F1F3\U1F1FF'
+emoji_flags[NZL]=$'\U1F1F3\U1F1FF'
+emoji_flags[new_zealand]=$'\U1F1F3\U1F1FF'
 emoji_flags[Oman]=$'\U1F1F4\U1F1F2'
+emoji_flags[OM]=$'\U1F1F4\U1F1F2'
+emoji_flags[OMN]=$'\U1F1F4\U1F1F2'
+emoji_flags[oman]=$'\U1F1F4\U1F1F2'
 emoji_flags[Panama]=$'\U1F1F5\U1F1E6'
+emoji_flags[PA]=$'\U1F1F5\U1F1E6'
+emoji_flags[PAN]=$'\U1F1F5\U1F1E6'
+emoji_flags[panama]=$'\U1F1F5\U1F1E6'
 emoji_flags[Peru]=$'\U1F1F5\U1F1EA'
+emoji_flags[PE]=$'\U1F1F5\U1F1EA'
+emoji_flags[PER]=$'\U1F1F5\U1F1EA'
+emoji_flags[peru]=$'\U1F1F5\U1F1EA'
 emoji_flags[French_Polynesia]=$'\U1F1F5\U1F1EB'
+emoji_flags[PF]=$'\U1F1F5\U1F1EB'
+emoji_flags[PYF]=$'\U1F1F5\U1F1EB'
+emoji_flags[french_polynesia]=$'\U1F1F5\U1F1EB'
 emoji_flags[Papua_New_Guinea]=$'\U1F1F5\U1F1EC'
+emoji_flags[PG]=$'\U1F1F5\U1F1EC'
+emoji_flags[PNG]=$'\U1F1F5\U1F1EC'
+emoji_flags[papua_new_guinea]=$'\U1F1F5\U1F1EC'
 emoji_flags[Philippines]=$'\U1F1F5\U1F1ED'
+emoji_flags[PH]=$'\U1F1F5\U1F1ED'
+emoji_flags[PHL]=$'\U1F1F5\U1F1ED'
+emoji_flags[philippines]=$'\U1F1F5\U1F1ED'
 emoji_flags[Pakistan]=$'\U1F1F5\U1F1F0'
+emoji_flags[PK]=$'\U1F1F5\U1F1F0'
+emoji_flags[PAK]=$'\U1F1F5\U1F1F0'
+emoji_flags[pakistan]=$'\U1F1F5\U1F1F0'
 emoji_flags[Poland]=$'\U1F1F5\U1F1F1'
-emoji_flags[St__Pierre___Miquelon]=$'\U1F1F5\U1F1F2'
+emoji_flags[PL]=$'\U1F1F5\U1F1F1'
+emoji_flags[POL]=$'\U1F1F5\U1F1F1'
+emoji_flags[poland]=$'\U1F1F5\U1F1F1'
+emoji_flags[St_Pierre_and_Miquelon]=$'\U1F1F5\U1F1F2'
+emoji_flags[PM]=$'\U1F1F5\U1F1F2'
+emoji_flags[SPM]=$'\U1F1F5\U1F1F2'
+emoji_flags[st_pierre_miquelon]=$'\U1F1F5\U1F1F2'
 emoji_flags[Pitcairn_Islands]=$'\U1F1F5\U1F1F3'
+emoji_flags[PN]=$'\U1F1F5\U1F1F3'
+emoji_flags[PCN]=$'\U1F1F5\U1F1F3'
+emoji_flags[pitcairn_islands]=$'\U1F1F5\U1F1F3'
 emoji_flags[Puerto_Rico]=$'\U1F1F5\U1F1F7'
+emoji_flags[PR]=$'\U1F1F5\U1F1F7'
+emoji_flags[PRI]=$'\U1F1F5\U1F1F7'
+emoji_flags[puerto_rico]=$'\U1F1F5\U1F1F7'
 emoji_flags[Palestinian_Territories]=$'\U1F1F5\U1F1F8'
+emoji_flags[PS]=$'\U1F1F5\U1F1F8'
+emoji_flags[PSE]=$'\U1F1F5\U1F1F8'
+emoji_flags[palestinian_territories]=$'\U1F1F5\U1F1F8'
 emoji_flags[Portugal]=$'\U1F1F5\U1F1F9'
+emoji_flags[PT]=$'\U1F1F5\U1F1F9'
+emoji_flags[PRT]=$'\U1F1F5\U1F1F9'
+emoji_flags[portugal]=$'\U1F1F5\U1F1F9'
 emoji_flags[Palau]=$'\U1F1F5\U1F1FC'
+emoji_flags[PW]=$'\U1F1F5\U1F1FC'
+emoji_flags[PLW]=$'\U1F1F5\U1F1FC'
+emoji_flags[palau]=$'\U1F1F5\U1F1FC'
 emoji_flags[Paraguay]=$'\U1F1F5\U1F1FE'
+emoji_flags[PY]=$'\U1F1F5\U1F1FE'
+emoji_flags[PRY]=$'\U1F1F5\U1F1FE'
+emoji_flags[paraguay]=$'\U1F1F5\U1F1FE'
 emoji_flags[Qatar]=$'\U1F1F6\U1F1E6'
-emoji_flags[R�_union]=$'\U1F1F7\U1F1EA'
+emoji_flags[QA]=$'\U1F1F6\U1F1E6'
+emoji_flags[QAT]=$'\U1F1F6\U1F1E6'
+emoji_flags[qatar]=$'\U1F1F6\U1F1E6'
+emoji_flags[Réunion]=$'\U1F1F7\U1F1EA'
+emoji_flags[RE]=$'\U1F1F7\U1F1EA'
+emoji_flags[REU]=$'\U1F1F7\U1F1EA'
+emoji_flags[reunion]=$'\U1F1F7\U1F1EA'
 emoji_flags[Romania]=$'\U1F1F7\U1F1F4'
+emoji_flags[RO]=$'\U1F1F7\U1F1F4'
+emoji_flags[ROU]=$'\U1F1F7\U1F1F4'
+emoji_flags[romania]=$'\U1F1F7\U1F1F4'
 emoji_flags[Serbia]=$'\U1F1F7\U1F1F8'
+emoji_flags[RS]=$'\U1F1F7\U1F1F8'
+emoji_flags[SRB]=$'\U1F1F7\U1F1F8'
+emoji_flags[serbia]=$'\U1F1F7\U1F1F8'
 emoji_flags[Russia]=$'\U1F1F7\U1F1FA'
+emoji_flags[RU]=$'\U1F1F7\U1F1FA'
+emoji_flags[RUS]=$'\U1F1F7\U1F1FA'
+emoji_flags[ru]=$'\U1F1F7\U1F1FA'
 emoji_flags[Rwanda]=$'\U1F1F7\U1F1FC'
+emoji_flags[RW]=$'\U1F1F7\U1F1FC'
+emoji_flags[RWA]=$'\U1F1F7\U1F1FC'
+emoji_flags[rwanda]=$'\U1F1F7\U1F1FC'
 emoji_flags[Saudi_Arabia]=$'\U1F1F8\U1F1E6'
+emoji_flags[SA]=$'\U1F1F8\U1F1E6'
+emoji_flags[SAU]=$'\U1F1F8\U1F1E6'
+emoji_flags[saudi_arabia]=$'\U1F1F8\U1F1E6'
 emoji_flags[Solomon_Islands]=$'\U1F1F8\U1F1E7'
+emoji_flags[SB]=$'\U1F1F8\U1F1E7'
+emoji_flags[SLB]=$'\U1F1F8\U1F1E7'
+emoji_flags[solomon_islands]=$'\U1F1F8\U1F1E7'
 emoji_flags[Seychelles]=$'\U1F1F8\U1F1E8'
+emoji_flags[SC]=$'\U1F1F8\U1F1E8'
+emoji_flags[SYC]=$'\U1F1F8\U1F1E8'
+emoji_flags[seychelles]=$'\U1F1F8\U1F1E8'
 emoji_flags[Sudan]=$'\U1F1F8\U1F1E9'
+emoji_flags[SD]=$'\U1F1F8\U1F1E9'
+emoji_flags[SDN]=$'\U1F1F8\U1F1E9'
+emoji_flags[sudan]=$'\U1F1F8\U1F1E9'
 emoji_flags[Sweden]=$'\U1F1F8\U1F1EA'
+emoji_flags[SE]=$'\U1F1F8\U1F1EA'
+emoji_flags[SWE]=$'\U1F1F8\U1F1EA'
+emoji_flags[sweden]=$'\U1F1F8\U1F1EA'
 emoji_flags[Singapore]=$'\U1F1F8\U1F1EC'
-emoji_flags[St__Helena]=$'\U1F1F8\U1F1ED'
+emoji_flags[SG]=$'\U1F1F8\U1F1EC'
+emoji_flags[SGP]=$'\U1F1F8\U1F1EC'
+emoji_flags[singapore]=$'\U1F1F8\U1F1EC'
+emoji_flags[St_Helena]=$'\U1F1F8\U1F1ED'
+emoji_flags[SH]=$'\U1F1F8\U1F1ED'
+emoji_flags[SHN]=$'\U1F1F8\U1F1ED'
+emoji_flags[st_helena]=$'\U1F1F8\U1F1ED'
 emoji_flags[Slovenia]=$'\U1F1F8\U1F1EE'
-emoji_flags[Svalbard___Jan_Mayen]=$'\U1F1F8\U1F1EF'
+emoji_flags[SI]=$'\U1F1F8\U1F1EE'
+emoji_flags[SVN]=$'\U1F1F8\U1F1EE'
+emoji_flags[slovenia]=$'\U1F1F8\U1F1EE'
+emoji_flags[Svalbard_and_Jan_Mayen]=$'\U1F1F8\U1F1EF'
+emoji_flags[SJ]=$'\U1F1F8\U1F1EF'
+emoji_flags[SJM]=$'\U1F1F8\U1F1EF'
+emoji_flags[svalbard_jan_mayen]=$'\U1F1F8\U1F1EF'
 emoji_flags[Slovakia]=$'\U1F1F8\U1F1F0'
+emoji_flags[SK]=$'\U1F1F8\U1F1F0'
+emoji_flags[SVK]=$'\U1F1F8\U1F1F0'
+emoji_flags[slovakia]=$'\U1F1F8\U1F1F0'
 emoji_flags[Sierra_Leone]=$'\U1F1F8\U1F1F1'
+emoji_flags[SL]=$'\U1F1F8\U1F1F1'
+emoji_flags[SLE]=$'\U1F1F8\U1F1F1'
+emoji_flags[sierra_leone]=$'\U1F1F8\U1F1F1'
 emoji_flags[San_Marino]=$'\U1F1F8\U1F1F2'
+emoji_flags[SM]=$'\U1F1F8\U1F1F2'
+emoji_flags[SMR]=$'\U1F1F8\U1F1F2'
+emoji_flags[san_marino]=$'\U1F1F8\U1F1F2'
 emoji_flags[Senegal]=$'\U1F1F8\U1F1F3'
+emoji_flags[SN]=$'\U1F1F8\U1F1F3'
+emoji_flags[SEN]=$'\U1F1F8\U1F1F3'
+emoji_flags[senegal]=$'\U1F1F8\U1F1F3'
 emoji_flags[Somalia]=$'\U1F1F8\U1F1F4'
+emoji_flags[SO]=$'\U1F1F8\U1F1F4'
+emoji_flags[SOM]=$'\U1F1F8\U1F1F4'
+emoji_flags[somalia]=$'\U1F1F8\U1F1F4'
 emoji_flags[Suriname]=$'\U1F1F8\U1F1F7'
+emoji_flags[SR]=$'\U1F1F8\U1F1F7'
+emoji_flags[SUR]=$'\U1F1F8\U1F1F7'
+emoji_flags[suriname]=$'\U1F1F8\U1F1F7'
 emoji_flags[South_Sudan]=$'\U1F1F8\U1F1F8'
-emoji_flags[S�_o_Tom�____Pr�_ncipe]=$'\U1F1F8\U1F1F9'
+emoji_flags[SS]=$'\U1F1F8\U1F1F8'
+emoji_flags[SSD]=$'\U1F1F8\U1F1F8'
+emoji_flags[south_sudan]=$'\U1F1F8\U1F1F8'
+emoji_flags[São_Tomé_and_Príncipe]=$'\U1F1F8\U1F1F9'
+emoji_flags[sao_tome_principe]=$'\U1F1F8\U1F1F9'
 emoji_flags[El_Salvador]=$'\U1F1F8\U1F1FB'
+emoji_flags[SV]=$'\U1F1F8\U1F1FB'
+emoji_flags[SLV]=$'\U1F1F8\U1F1FB'
+emoji_flags[el_salvador]=$'\U1F1F8\U1F1FB'
 emoji_flags[Sint_Maarten]=$'\U1F1F8\U1F1FD'
+emoji_flags[SX]=$'\U1F1F8\U1F1FD'
+emoji_flags[SXM]=$'\U1F1F8\U1F1FD'
+emoji_flags[sint_maarten]=$'\U1F1F8\U1F1FD'
 emoji_flags[Syria]=$'\U1F1F8\U1F1FE'
-emoji_flags[Swaziland]=$'\U1F1F8\U1F1FF'
+emoji_flags[SY]=$'\U1F1F8\U1F1FE'
+emoji_flags[SYR]=$'\U1F1F8\U1F1FE'
+emoji_flags[syria]=$'\U1F1F8\U1F1FE'
+emoji_flags[Eswatini]=$'\U1F1F8\U1F1FF'
+emoji_flags[SZ]=$'\U1F1F8\U1F1FF'
+emoji_flags[SWZ]=$'\U1F1F8\U1F1FF'
+emoji_flags[swaziland]=$'\U1F1F8\U1F1FF'
 emoji_flags[Tristan_da_Cunha]=$'\U1F1F9\U1F1E6'
-emoji_flags[Turks___Caicos_Islands]=$'\U1F1F9\U1F1E8'
+emoji_flags[tristan_da_cunha]=$'\U1F1F9\U1F1E6'
+emoji_flags[Turks_and_Caicos_Islands]=$'\U1F1F9\U1F1E8'
+emoji_flags[TC]=$'\U1F1F9\U1F1E8'
+emoji_flags[TCA]=$'\U1F1F9\U1F1E8'
+emoji_flags[turks_caicos_islands]=$'\U1F1F9\U1F1E8'
 emoji_flags[Chad]=$'\U1F1F9\U1F1E9'
+emoji_flags[TD]=$'\U1F1F9\U1F1E9'
+emoji_flags[TCD]=$'\U1F1F9\U1F1E9'
+emoji_flags[chad]=$'\U1F1F9\U1F1E9'
 emoji_flags[French_Southern_Territories]=$'\U1F1F9\U1F1EB'
+emoji_flags[TF]=$'\U1F1F9\U1F1EB'
+emoji_flags[ATF]=$'\U1F1F9\U1F1EB'
+emoji_flags[french_southern_territories]=$'\U1F1F9\U1F1EB'
 emoji_flags[Togo]=$'\U1F1F9\U1F1EC'
+emoji_flags[TG]=$'\U1F1F9\U1F1EC'
+emoji_flags[TGO]=$'\U1F1F9\U1F1EC'
+emoji_flags[togo]=$'\U1F1F9\U1F1EC'
 emoji_flags[Thailand]=$'\U1F1F9\U1F1ED'
+emoji_flags[TH]=$'\U1F1F9\U1F1ED'
+emoji_flags[THA]=$'\U1F1F9\U1F1ED'
+emoji_flags[thailand]=$'\U1F1F9\U1F1ED'
 emoji_flags[Tajikistan]=$'\U1F1F9\U1F1EF'
+emoji_flags[TJ]=$'\U1F1F9\U1F1EF'
+emoji_flags[TJK]=$'\U1F1F9\U1F1EF'
+emoji_flags[tajikistan]=$'\U1F1F9\U1F1EF'
 emoji_flags[Tokelau]=$'\U1F1F9\U1F1F0'
+emoji_flags[TK]=$'\U1F1F9\U1F1F0'
+emoji_flags[TKL]=$'\U1F1F9\U1F1F0'
+emoji_flags[tokelau]=$'\U1F1F9\U1F1F0'
 emoji_flags[Timor_Leste]=$'\U1F1F9\U1F1F1'
+emoji_flags[TL]=$'\U1F1F9\U1F1F1'
+emoji_flags[TLS]=$'\U1F1F9\U1F1F1'
+emoji_flags[timor_leste]=$'\U1F1F9\U1F1F1'
 emoji_flags[Turkmenistan]=$'\U1F1F9\U1F1F2'
+emoji_flags[TM]=$'\U1F1F9\U1F1F2'
+emoji_flags[TKM]=$'\U1F1F9\U1F1F2'
+emoji_flags[turkmenistan]=$'\U1F1F9\U1F1F2'
 emoji_flags[Tunisia]=$'\U1F1F9\U1F1F3'
+emoji_flags[TN]=$'\U1F1F9\U1F1F3'
+emoji_flags[TUN]=$'\U1F1F9\U1F1F3'
+emoji_flags[tunisia]=$'\U1F1F9\U1F1F3'
 emoji_flags[Tonga]=$'\U1F1F9\U1F1F4'
+emoji_flags[TO]=$'\U1F1F9\U1F1F4'
+emoji_flags[TON]=$'\U1F1F9\U1F1F4'
+emoji_flags[tonga]=$'\U1F1F9\U1F1F4'
 emoji_flags[Turkey]=$'\U1F1F9\U1F1F7'
-emoji_flags[Trinidad___Tobago]=$'\U1F1F9\U1F1F9'
+emoji_flags[TR]=$'\U1F1F9\U1F1F7'
+emoji_flags[TUR]=$'\U1F1F9\U1F1F7'
+emoji_flags[tr]=$'\U1F1F9\U1F1F7'
+emoji_flags[Trinidad_and_Tobago]=$'\U1F1F9\U1F1F9'
+emoji_flags[TT]=$'\U1F1F9\U1F1F9'
+emoji_flags[TTO]=$'\U1F1F9\U1F1F9'
+emoji_flags[trinidad_tobago]=$'\U1F1F9\U1F1F9'
 emoji_flags[Tuvalu]=$'\U1F1F9\U1F1FB'
+emoji_flags[TV]=$'\U1F1F9\U1F1FB'
+emoji_flags[TUV]=$'\U1F1F9\U1F1FB'
+emoji_flags[tuvalu]=$'\U1F1F9\U1F1FB'
 emoji_flags[Taiwan]=$'\U1F1F9\U1F1FC'
+emoji_flags[TW]=$'\U1F1F9\U1F1FC'
+emoji_flags[TWN]=$'\U1F1F9\U1F1FC'
+emoji_flags[taiwan]=$'\U1F1F9\U1F1FC'
 emoji_flags[Tanzania]=$'\U1F1F9\U1F1FF'
+emoji_flags[TZ]=$'\U1F1F9\U1F1FF'
+emoji_flags[TZA]=$'\U1F1F9\U1F1FF'
+emoji_flags[tanzania]=$'\U1F1F9\U1F1FF'
 emoji_flags[Ukraine]=$'\U1F1FA\U1F1E6'
+emoji_flags[UA]=$'\U1F1FA\U1F1E6'
+emoji_flags[UKR]=$'\U1F1FA\U1F1E6'
+emoji_flags[ukraine]=$'\U1F1FA\U1F1E6'
 emoji_flags[Uganda]=$'\U1F1FA\U1F1EC'
-emoji_flags[U_S__Outlying_Islands]=$'\U1F1FA\U1F1F2'
+emoji_flags[UG]=$'\U1F1FA\U1F1EC'
+emoji_flags[UGA]=$'\U1F1FA\U1F1EC'
+emoji_flags[uganda]=$'\U1F1FA\U1F1EC'
+emoji_flags[U_S_Outlying_Islands]=$'\U1F1FA\U1F1F2'
+emoji_flags[us_outlying_islands]=$'\U1F1FA\U1F1F2'
+emoji_flags[United_Nations]=$'\U1F1FA\U1F1F3'
+emoji_flags[united_nations]=$'\U1F1FA\U1F1F3'
 emoji_flags[United_States]=$'\U1F1FA\U1F1F8'
+emoji_flags[US]=$'\U1F1FA\U1F1F8'
+emoji_flags[USA]=$'\U1F1FA\U1F1F8'
+emoji_flags[us]=$'\U1F1FA\U1F1F8'
 emoji_flags[Uruguay]=$'\U1F1FA\U1F1FE'
+emoji_flags[UY]=$'\U1F1FA\U1F1FE'
+emoji_flags[URY]=$'\U1F1FA\U1F1FE'
+emoji_flags[uruguay]=$'\U1F1FA\U1F1FE'
 emoji_flags[Uzbekistan]=$'\U1F1FA\U1F1FF'
+emoji_flags[UZ]=$'\U1F1FA\U1F1FF'
+emoji_flags[UZB]=$'\U1F1FA\U1F1FF'
+emoji_flags[uzbekistan]=$'\U1F1FA\U1F1FF'
 emoji_flags[Vatican_City]=$'\U1F1FB\U1F1E6'
-emoji_flags[St__Vincent___Grenadines]=$'\U1F1FB\U1F1E8'
+emoji_flags[VA]=$'\U1F1FB\U1F1E6'
+emoji_flags[VAT]=$'\U1F1FB\U1F1E6'
+emoji_flags[vatican_city]=$'\U1F1FB\U1F1E6'
+emoji_flags[St_Vincent_and_Grenadines]=$'\U1F1FB\U1F1E8'
+emoji_flags[VC]=$'\U1F1FB\U1F1E8'
+emoji_flags[VCT]=$'\U1F1FB\U1F1E8'
+emoji_flags[st_vincent_grenadines]=$'\U1F1FB\U1F1E8'
 emoji_flags[Venezuela]=$'\U1F1FB\U1F1EA'
+emoji_flags[VE]=$'\U1F1FB\U1F1EA'
+emoji_flags[VEN]=$'\U1F1FB\U1F1EA'
+emoji_flags[venezuela]=$'\U1F1FB\U1F1EA'
 emoji_flags[British_Virgin_Islands]=$'\U1F1FB\U1F1EC'
-emoji_flags[U_S__Virgin_Islands]=$'\U1F1FB\U1F1EE'
+emoji_flags[VG]=$'\U1F1FB\U1F1EC'
+emoji_flags[VGB]=$'\U1F1FB\U1F1EC'
+emoji_flags[british_virgin_islands]=$'\U1F1FB\U1F1EC'
+emoji_flags[U_S_Virgin_Islands]=$'\U1F1FB\U1F1EE'
+emoji_flags[VI]=$'\U1F1FB\U1F1EE'
+emoji_flags[VIR]=$'\U1F1FB\U1F1EE'
+emoji_flags[us_virgin_islands]=$'\U1F1FB\U1F1EE'
 emoji_flags[Vietnam]=$'\U1F1FB\U1F1F3'
+emoji_flags[VN]=$'\U1F1FB\U1F1F3'
+emoji_flags[VNM]=$'\U1F1FB\U1F1F3'
+emoji_flags[vietnam]=$'\U1F1FB\U1F1F3'
 emoji_flags[Vanuatu]=$'\U1F1FB\U1F1FA'
-emoji_flags[Wallis___Futuna]=$'\U1F1FC\U1F1EB'
+emoji_flags[VU]=$'\U1F1FB\U1F1FA'
+emoji_flags[VUT]=$'\U1F1FB\U1F1FA'
+emoji_flags[vanuatu]=$'\U1F1FB\U1F1FA'
+emoji_flags[Wallis_and_Futuna]=$'\U1F1FC\U1F1EB'
+emoji_flags[WF]=$'\U1F1FC\U1F1EB'
+emoji_flags[WLF]=$'\U1F1FC\U1F1EB'
+emoji_flags[wallis_futuna]=$'\U1F1FC\U1F1EB'
 emoji_flags[Samoa]=$'\U1F1FC\U1F1F8'
+emoji_flags[WS]=$'\U1F1FC\U1F1F8'
+emoji_flags[WSM]=$'\U1F1FC\U1F1F8'
+emoji_flags[samoa]=$'\U1F1FC\U1F1F8'
 emoji_flags[Kosovo]=$'\U1F1FD\U1F1F0'
+emoji_flags[XK]=$'\U1F1FD\U1F1F0'
+emoji_flags[XKX]=$'\U1F1FD\U1F1F0'
+emoji_flags[kosovo]=$'\U1F1FD\U1F1F0'
 emoji_flags[Yemen]=$'\U1F1FE\U1F1EA'
+emoji_flags[YE]=$'\U1F1FE\U1F1EA'
+emoji_flags[YEM]=$'\U1F1FE\U1F1EA'
+emoji_flags[yemen]=$'\U1F1FE\U1F1EA'
 emoji_flags[Mayotte]=$'\U1F1FE\U1F1F9'
+emoji_flags[YT]=$'\U1F1FE\U1F1F9'
+emoji_flags[MYT]=$'\U1F1FE\U1F1F9'
+emoji_flags[mayotte]=$'\U1F1FE\U1F1F9'
 emoji_flags[South_Africa]=$'\U1F1FF\U1F1E6'
+emoji_flags[ZA]=$'\U1F1FF\U1F1E6'
+emoji_flags[ZAF]=$'\U1F1FF\U1F1E6'
+emoji_flags[south_africa]=$'\U1F1FF\U1F1E6'
 emoji_flags[Zambia]=$'\U1F1FF\U1F1F2'
+emoji_flags[ZM]=$'\U1F1FF\U1F1F2'
+emoji_flags[ZMB]=$'\U1F1FF\U1F1F2'
+emoji_flags[zambia]=$'\U1F1FF\U1F1F2'
 emoji_flags[Zimbabwe]=$'\U1F1FF\U1F1FC'
+emoji_flags[ZW]=$'\U1F1FF\U1F1FC'
+emoji_flags[ZWE]=$'\U1F1FF\U1F1FC'
+emoji_flags[zimbabwe]=$'\U1F1FF\U1F1FC'
+emoji_flags[England]=$'\U1F3F4\UE0067\UE0062\UE0065\UE006E\UE0067\UE007F'
+emoji_flags[england]=$'\U1F3F4\UE0067\UE0062\UE0065\UE006E\UE0067\UE007F'
+emoji_flags[Scotland]=$'\U1F3F4\UE0067\UE0062\UE0073\UE0063\UE0074\UE007F'
+emoji_flags[scotland]=$'\U1F3F4\UE0067\UE0062\UE0073\UE0063\UE0074\UE007F'
+emoji_flags[Wales]=$'\U1F3F4\UE0067\UE0062\UE0077\UE006C\UE0073\UE007F'
+emoji_flags[wales]=$'\U1F3F4\UE0067\UE0062\UE0077\UE006C\UE0073\UE007F'
 
+emoji_groups[fruits]="
+  grapes
+  melon
+  watermelon
+  tangerine
+  lemon
+  banana
+  pineapple
+  mango
+  red_apple
+  green_apple
+  pear
+  peach
+  cherries
+  strawberry
+  kiwi_fruit
+  tomato
+  coconut
+"
+
+emoji_groups[vehicles]="
+  locomotive
+  railway_car
+  high_speed_train
+  bullet_train
+  bullet_train_1
+  metro
+  light_rail
+  station
+  tram
+  monorail
+  mountain_railway
+  tram_car
+  bus
+  oncoming_bus
+  trolleybus
+  minibus
+  ambulance
+  fire_engine
+  police_car
+  oncoming_police_car
+  taxi
+  oncoming_taxi
+  automobile
+  oncoming_automobile
+  sport_utility_vehicle
+  delivery_truck
+  articulated_lorry
+  tractor
+  racing_car
+  motorcycle
+  motor_scooter
+  manual_wheelchair
+  motorized_wheelchair
+  auto_rickshaw
+  bicycle
+  kick_scooter
+  skateboard
+  bus_stop
+  motorway
+  railway_track
+  oil_drum
+  fuel_pump
+  police_car_light
+  horizontal_traffic_light
+  vertical_traffic_light
+  stop_sign
+  construction
+  anchor
+  sailboat
+  canoe
+  speedboat
+  passenger_ship
+  ferry
+  motor_boat
+  ship
+  airplane
+  small_airplane
+  airplane_departure
+  airplane_arrival
+  parachute
+  seat
+  helicopter
+  suspension_railway
+  mountain_cableway
+  aerial_tramway
+  satellite
+  rocket
+  flying_saucer
+  ATM_sign
+  litter_in_bin_sign
+  potable_water
+  wheelchair_symbol
+  men_s_room
+  women_s_room
+  restroom
+  baby_symbol
+  water_closet
+  passport_control
+  customs
+  baggage_claim
+  left_luggage
+"
+
+emoji_groups[hands]="
+  waving_hand
+  waving_hand_light_skin_tone
+  waving_hand_medium_light_skin_tone
+  waving_hand_medium_skin_tone
+  waving_hand_medium_dark_skin_tone
+  waving_hand_dark_skin_tone
+  raised_back_of_hand
+  raised_back_of_hand_light_skin_tone
+  raised_back_of_hand_medium_light_skin_tone
+  raised_back_of_hand_medium_skin_tone
+  raised_back_of_hand_medium_dark_skin_tone
+  raised_back_of_hand_dark_skin_tone
+  hand_with_fingers_splayed
+  hand_with_fingers_splayed_light_skin_tone
+  hand_with_fingers_splayed_medium_light_skin_tone
+  hand_with_fingers_splayed_medium_skin_tone
+  hand_with_fingers_splayed_medium_dark_skin_tone
+  hand_with_fingers_splayed_dark_skin_tone
+  raised_hand
+  raised_hand_light_skin_tone
+  raised_hand_medium_light_skin_tone
+  raised_hand_medium_skin_tone
+  raised_hand_medium_dark_skin_tone
+  raised_hand_dark_skin_tone
+  vulcan_salute
+  vulcan_salute_light_skin_tone
+  vulcan_salute_medium_light_skin_tone
+  vulcan_salute_medium_skin_tone
+  vulcan_salute_medium_dark_skin_tone
+  vulcan_salute_dark_skin_tone
+  OK_hand
+  OK_hand_light_skin_tone
+  OK_hand_medium_light_skin_tone
+  OK_hand_medium_skin_tone
+  OK_hand_medium_dark_skin_tone
+  OK_hand_dark_skin_tone
+  pinching_hand
+  pinching_hand_light_skin_tone
+  pinching_hand_medium_light_skin_tone
+  pinching_hand_medium_skin_tone
+  pinching_hand_medium_dark_skin_tone
+  pinching_hand_dark_skin_tone
+  victory_hand
+  victory_hand_light_skin_tone
+  victory_hand_medium_light_skin_tone
+  victory_hand_medium_skin_tone
+  victory_hand_medium_dark_skin_tone
+  victory_hand_dark_skin_tone
+  crossed_fingers
+  crossed_fingers_light_skin_tone
+  crossed_fingers_medium_light_skin_tone
+  crossed_fingers_medium_skin_tone
+  crossed_fingers_medium_dark_skin_tone
+  crossed_fingers_dark_skin_tone
+  love_you_gesture
+  love_you_gesture_light_skin_tone
+  love_you_gesture_medium_light_skin_tone
+  love_you_gesture_medium_skin_tone
+  love_you_gesture_medium_dark_skin_tone
+  love_you_gesture_dark_skin_tone
+  sign_of_the_horns
+  sign_of_the_horns_light_skin_tone
+  sign_of_the_horns_medium_light_skin_tone
+  sign_of_the_horns_medium_skin_tone
+  sign_of_the_horns_medium_dark_skin_tone
+  sign_of_the_horns_dark_skin_tone
+  call_me_hand
+  call_me_hand_light_skin_tone
+  call_me_hand_medium_light_skin_tone
+  call_me_hand_medium_skin_tone
+  call_me_hand_medium_dark_skin_tone
+  call_me_hand_dark_skin_tone
+  backhand_index_pointing_left
+  backhand_index_pointing_left_light_skin_tone
+  backhand_index_pointing_left_medium_light_skin_tone
+  backhand_index_pointing_left_medium_skin_tone
+  backhand_index_pointing_left_medium_dark_skin_tone
+  backhand_index_pointing_left_dark_skin_tone
+  backhand_index_pointing_right
+  backhand_index_pointing_right_light_skin_tone
+  backhand_index_pointing_right_medium_light_skin_tone
+  backhand_index_pointing_right_medium_skin_tone
+  backhand_index_pointing_right_medium_dark_skin_tone
+  backhand_index_pointing_right_dark_skin_tone
+  backhand_index_pointing_up
+  backhand_index_pointing_up_light_skin_tone
+  backhand_index_pointing_up_medium_light_skin_tone
+  backhand_index_pointing_up_medium_skin_tone
+  backhand_index_pointing_up_medium_dark_skin_tone
+  backhand_index_pointing_up_dark_skin_tone
+  middle_finger
+  middle_finger_light_skin_tone
+  middle_finger_medium_light_skin_tone
+  middle_finger_medium_skin_tone
+  middle_finger_medium_dark_skin_tone
+  middle_finger_dark_skin_tone
+  backhand_index_pointing_down
+  backhand_index_pointing_down_light_skin_tone
+  backhand_index_pointing_down_medium_light_skin_tone
+  backhand_index_pointing_down_medium_skin_tone
+  backhand_index_pointing_down_medium_dark_skin_tone
+  backhand_index_pointing_down_dark_skin_tone
+  index_pointing_up
+  index_pointing_up_light_skin_tone
+  index_pointing_up_medium_light_skin_tone
+  index_pointing_up_medium_skin_tone
+  index_pointing_up_medium_dark_skin_tone
+  index_pointing_up_dark_skin_tone
+  thumbs_up
+  thumbs_up_light_skin_tone
+  thumbs_up_medium_light_skin_tone
+  thumbs_up_medium_skin_tone
+  thumbs_up_medium_dark_skin_tone
+  thumbs_up_dark_skin_tone
+  thumbs_down
+  thumbs_down_light_skin_tone
+  thumbs_down_medium_light_skin_tone
+  thumbs_down_medium_skin_tone
+  thumbs_down_medium_dark_skin_tone
+  thumbs_down_dark_skin_tone
+  raised_fist
+  raised_fist_light_skin_tone
+  raised_fist_medium_light_skin_tone
+  raised_fist_medium_skin_tone
+  raised_fist_medium_dark_skin_tone
+  raised_fist_dark_skin_tone
+  oncoming_fist
+  oncoming_fist_light_skin_tone
+  oncoming_fist_medium_light_skin_tone
+  oncoming_fist_medium_skin_tone
+  oncoming_fist_medium_dark_skin_tone
+  oncoming_fist_dark_skin_tone
+  left_facing_fist
+  left_facing_fist_light_skin_tone
+  left_facing_fist_medium_light_skin_tone
+  left_facing_fist_medium_skin_tone
+  left_facing_fist_medium_dark_skin_tone
+  left_facing_fist_dark_skin_tone
+  right_facing_fist
+  right_facing_fist_light_skin_tone
+  right_facing_fist_medium_light_skin_tone
+  right_facing_fist_medium_skin_tone
+  right_facing_fist_medium_dark_skin_tone
+  right_facing_fist_dark_skin_tone
+  writing_hand
+  writing_hand_light_skin_tone
+  writing_hand_medium_light_skin_tone
+  writing_hand_medium_skin_tone
+  writing_hand_medium_dark_skin_tone
+  writing_hand_dark_skin_tone
+  nail_polish
+  nail_polish_light_skin_tone
+  nail_polish_medium_light_skin_tone
+  nail_polish_medium_skin_tone
+  nail_polish_medium_dark_skin_tone
+  nail_polish_dark_skin_tone
+  selfie
+  selfie_light_skin_tone
+  selfie_medium_light_skin_tone
+  selfie_medium_skin_tone
+  selfie_medium_dark_skin_tone
+  selfie_dark_skin_tone
+"
+
+emoji_groups[people]="
+  person_frowning
+  person_frowning_light_skin_tone
+  person_frowning_medium_light_skin_tone
+  person_frowning_medium_skin_tone
+  person_frowning_medium_dark_skin_tone
+  person_frowning_dark_skin_tone
+  man_frowning
+  man_frowning_light_skin_tone
+  man_frowning_medium_light_skin_tone
+  man_frowning_medium_skin_tone
+  man_frowning_medium_dark_skin_tone
+  man_frowning_dark_skin_tone
+  woman_frowning
+  woman_frowning_light_skin_tone
+  woman_frowning_medium_light_skin_tone
+  woman_frowning_medium_skin_tone
+  woman_frowning_medium_dark_skin_tone
+  woman_frowning_dark_skin_tone
+  person_pouting
+  person_pouting_light_skin_tone
+  person_pouting_medium_light_skin_tone
+  person_pouting_medium_skin_tone
+  person_pouting_medium_dark_skin_tone
+  person_pouting_dark_skin_tone
+  man_pouting
+  man_pouting_light_skin_tone
+  man_pouting_medium_light_skin_tone
+  man_pouting_medium_skin_tone
+  man_pouting_medium_dark_skin_tone
+  man_pouting_dark_skin_tone
+  woman_pouting
+  woman_pouting_light_skin_tone
+  woman_pouting_medium_light_skin_tone
+  woman_pouting_medium_skin_tone
+  woman_pouting_medium_dark_skin_tone
+  woman_pouting_dark_skin_tone
+  person_gesturing_NO
+  person_gesturing_NO_light_skin_tone
+  person_gesturing_NO_medium_light_skin_tone
+  person_gesturing_NO_medium_skin_tone
+  person_gesturing_NO_medium_dark_skin_tone
+  person_gesturing_NO_dark_skin_tone
+  man_gesturing_NO
+  man_gesturing_NO_light_skin_tone
+  man_gesturing_NO_medium_light_skin_tone
+  man_gesturing_NO_medium_skin_tone
+  man_gesturing_NO_medium_dark_skin_tone
+  man_gesturing_NO_dark_skin_tone
+  woman_gesturing_NO
+  woman_gesturing_NO_light_skin_tone
+  woman_gesturing_NO_medium_light_skin_tone
+  woman_gesturing_NO_medium_skin_tone
+  woman_gesturing_NO_medium_dark_skin_tone
+  woman_gesturing_NO_dark_skin_tone
+  person_gesturing_OK
+  person_gesturing_OK_light_skin_tone
+  person_gesturing_OK_medium_light_skin_tone
+  person_gesturing_OK_medium_skin_tone
+  person_gesturing_OK_medium_dark_skin_tone
+  person_gesturing_OK_dark_skin_tone
+  man_gesturing_OK
+  man_gesturing_OK_light_skin_tone
+  man_gesturing_OK_medium_light_skin_tone
+  man_gesturing_OK_medium_skin_tone
+  man_gesturing_OK_medium_dark_skin_tone
+  man_gesturing_OK_dark_skin_tone
+  woman_gesturing_OK
+  woman_gesturing_OK_light_skin_tone
+  woman_gesturing_OK_medium_light_skin_tone
+  woman_gesturing_OK_medium_skin_tone
+  woman_gesturing_OK_medium_dark_skin_tone
+  woman_gesturing_OK_dark_skin_tone
+  person_tipping_hand
+  person_tipping_hand_light_skin_tone
+  person_tipping_hand_medium_light_skin_tone
+  person_tipping_hand_medium_skin_tone
+  person_tipping_hand_medium_dark_skin_tone
+  person_tipping_hand_dark_skin_tone
+  man_tipping_hand
+  man_tipping_hand_light_skin_tone
+  man_tipping_hand_medium_light_skin_tone
+  man_tipping_hand_medium_skin_tone
+  man_tipping_hand_medium_dark_skin_tone
+  man_tipping_hand_dark_skin_tone
+  woman_tipping_hand
+  woman_tipping_hand_light_skin_tone
+  woman_tipping_hand_medium_light_skin_tone
+  woman_tipping_hand_medium_skin_tone
+  woman_tipping_hand_medium_dark_skin_tone
+  woman_tipping_hand_dark_skin_tone
+  person_raising_hand
+  person_raising_hand_light_skin_tone
+  person_raising_hand_medium_light_skin_tone
+  person_raising_hand_medium_skin_tone
+  person_raising_hand_medium_dark_skin_tone
+  person_raising_hand_dark_skin_tone
+  man_raising_hand
+  man_raising_hand_light_skin_tone
+  man_raising_hand_medium_light_skin_tone
+  man_raising_hand_medium_skin_tone
+  man_raising_hand_medium_dark_skin_tone
+  man_raising_hand_dark_skin_tone
+  woman_raising_hand
+  woman_raising_hand_light_skin_tone
+  woman_raising_hand_medium_light_skin_tone
+  woman_raising_hand_medium_skin_tone
+  woman_raising_hand_medium_dark_skin_tone
+  woman_raising_hand_dark_skin_tone
+  deaf_person
+  deaf_person_light_skin_tone
+  deaf_person_medium_light_skin_tone
+  deaf_person_medium_skin_tone
+  deaf_person_medium_dark_skin_tone
+  deaf_person_dark_skin_tone
+  deaf_man
+  deaf_man_light_skin_tone
+  deaf_man_medium_light_skin_tone
+  deaf_man_medium_skin_tone
+  deaf_man_medium_dark_skin_tone
+  deaf_man_dark_skin_tone
+  deaf_woman
+  deaf_woman_light_skin_tone
+  deaf_woman_medium_light_skin_tone
+  deaf_woman_medium_skin_tone
+  deaf_woman_medium_dark_skin_tone
+  deaf_woman_dark_skin_tone
+  person_bowing
+  person_bowing_light_skin_tone
+  person_bowing_medium_light_skin_tone
+  person_bowing_medium_skin_tone
+  person_bowing_medium_dark_skin_tone
+  person_bowing_dark_skin_tone
+  man_bowing
+  man_bowing_light_skin_tone
+  man_bowing_medium_light_skin_tone
+  man_bowing_medium_skin_tone
+  man_bowing_medium_dark_skin_tone
+  man_bowing_dark_skin_tone
+  woman_bowing
+  woman_bowing_light_skin_tone
+  woman_bowing_medium_light_skin_tone
+  woman_bowing_medium_skin_tone
+  woman_bowing_medium_dark_skin_tone
+  woman_bowing_dark_skin_tone
+  person_facepalming
+  person_facepalming_light_skin_tone
+  person_facepalming_medium_light_skin_tone
+  person_facepalming_medium_skin_tone
+  person_facepalming_medium_dark_skin_tone
+  person_facepalming_dark_skin_tone
+  man_facepalming
+  man_facepalming_light_skin_tone
+  man_facepalming_medium_light_skin_tone
+  man_facepalming_medium_skin_tone
+  man_facepalming_medium_dark_skin_tone
+  man_facepalming_dark_skin_tone
+  woman_facepalming
+  woman_facepalming_light_skin_tone
+  woman_facepalming_medium_light_skin_tone
+  woman_facepalming_medium_skin_tone
+  woman_facepalming_medium_dark_skin_tone
+  woman_facepalming_dark_skin_tone
+  person_shrugging
+  person_shrugging_light_skin_tone
+  person_shrugging_medium_light_skin_tone
+  person_shrugging_medium_skin_tone
+  person_shrugging_medium_dark_skin_tone
+  person_shrugging_dark_skin_tone
+  man_shrugging
+  man_shrugging_light_skin_tone
+  man_shrugging_medium_light_skin_tone
+  man_shrugging_medium_skin_tone
+  man_shrugging_medium_dark_skin_tone
+  man_shrugging_dark_skin_tone
+  woman_shrugging
+  woman_shrugging_light_skin_tone
+  woman_shrugging_medium_light_skin_tone
+  woman_shrugging_medium_skin_tone
+  woman_shrugging_medium_dark_skin_tone
+  woman_shrugging_dark_skin_tone
+  man_health_worker
+  man_health_worker_light_skin_tone
+  man_health_worker_medium_light_skin_tone
+  man_health_worker_medium_skin_tone
+  man_health_worker_medium_dark_skin_tone
+  man_health_worker_dark_skin_tone
+  woman_health_worker
+  woman_health_worker_light_skin_tone
+  woman_health_worker_medium_light_skin_tone
+  woman_health_worker_medium_skin_tone
+  woman_health_worker_medium_dark_skin_tone
+  woman_health_worker_dark_skin_tone
+  man_student
+  man_student_light_skin_tone
+  man_student_medium_light_skin_tone
+  man_student_medium_skin_tone
+  man_student_medium_dark_skin_tone
+  man_student_dark_skin_tone
+  woman_student
+  woman_student_light_skin_tone
+  woman_student_medium_light_skin_tone
+  woman_student_medium_skin_tone
+  woman_student_medium_dark_skin_tone
+  woman_student_dark_skin_tone
+  man_teacher
+  man_teacher_light_skin_tone
+  man_teacher_medium_light_skin_tone
+  man_teacher_medium_skin_tone
+  man_teacher_medium_dark_skin_tone
+  man_teacher_dark_skin_tone
+  woman_teacher
+  woman_teacher_light_skin_tone
+  woman_teacher_medium_light_skin_tone
+  woman_teacher_medium_skin_tone
+  woman_teacher_medium_dark_skin_tone
+  woman_teacher_dark_skin_tone
+  man_judge
+  man_judge_light_skin_tone
+  man_judge_medium_light_skin_tone
+  man_judge_medium_skin_tone
+  man_judge_medium_dark_skin_tone
+  man_judge_dark_skin_tone
+  woman_judge
+  woman_judge_light_skin_tone
+  woman_judge_medium_light_skin_tone
+  woman_judge_medium_skin_tone
+  woman_judge_medium_dark_skin_tone
+  woman_judge_dark_skin_tone
+  man_farmer
+  man_farmer_light_skin_tone
+  man_farmer_medium_light_skin_tone
+  man_farmer_medium_skin_tone
+  man_farmer_medium_dark_skin_tone
+  man_farmer_dark_skin_tone
+  woman_farmer
+  woman_farmer_light_skin_tone
+  woman_farmer_medium_light_skin_tone
+  woman_farmer_medium_skin_tone
+  woman_farmer_medium_dark_skin_tone
+  woman_farmer_dark_skin_tone
+  man_cook
+  man_cook_light_skin_tone
+  man_cook_medium_light_skin_tone
+  man_cook_medium_skin_tone
+  man_cook_medium_dark_skin_tone
+  man_cook_dark_skin_tone
+  woman_cook
+  woman_cook_light_skin_tone
+  woman_cook_medium_light_skin_tone
+  woman_cook_medium_skin_tone
+  woman_cook_medium_dark_skin_tone
+  woman_cook_dark_skin_tone
+  man_mechanic
+  man_mechanic_light_skin_tone
+  man_mechanic_medium_light_skin_tone
+  man_mechanic_medium_skin_tone
+  man_mechanic_medium_dark_skin_tone
+  man_mechanic_dark_skin_tone
+  woman_mechanic
+  woman_mechanic_light_skin_tone
+  woman_mechanic_medium_light_skin_tone
+  woman_mechanic_medium_skin_tone
+  woman_mechanic_medium_dark_skin_tone
+  woman_mechanic_dark_skin_tone
+  man_factory_worker
+  man_factory_worker_light_skin_tone
+  man_factory_worker_medium_light_skin_tone
+  man_factory_worker_medium_skin_tone
+  man_factory_worker_medium_dark_skin_tone
+  man_factory_worker_dark_skin_tone
+  woman_factory_worker
+  woman_factory_worker_light_skin_tone
+  woman_factory_worker_medium_light_skin_tone
+  woman_factory_worker_medium_skin_tone
+  woman_factory_worker_medium_dark_skin_tone
+  woman_factory_worker_dark_skin_tone
+  man_office_worker
+  man_office_worker_light_skin_tone
+  man_office_worker_medium_light_skin_tone
+  man_office_worker_medium_skin_tone
+  man_office_worker_medium_dark_skin_tone
+  man_office_worker_dark_skin_tone
+  woman_office_worker
+  woman_office_worker_light_skin_tone
+  woman_office_worker_medium_light_skin_tone
+  woman_office_worker_medium_skin_tone
+  woman_office_worker_medium_dark_skin_tone
+  woman_office_worker_dark_skin_tone
+  man_scientist
+  man_scientist_light_skin_tone
+  man_scientist_medium_light_skin_tone
+  man_scientist_medium_skin_tone
+  man_scientist_medium_dark_skin_tone
+  man_scientist_dark_skin_tone
+  woman_scientist
+  woman_scientist_light_skin_tone
+  woman_scientist_medium_light_skin_tone
+  woman_scientist_medium_skin_tone
+  woman_scientist_medium_dark_skin_tone
+  woman_scientist_dark_skin_tone
+  man_technologist
+  man_technologist_light_skin_tone
+  man_technologist_medium_light_skin_tone
+  man_technologist_medium_skin_tone
+  man_technologist_medium_dark_skin_tone
+  man_technologist_dark_skin_tone
+  woman_technologist
+  woman_technologist_light_skin_tone
+  woman_technologist_medium_light_skin_tone
+  woman_technologist_medium_skin_tone
+  woman_technologist_medium_dark_skin_tone
+  woman_technologist_dark_skin_tone
+  man_singer
+  man_singer_light_skin_tone
+  man_singer_medium_light_skin_tone
+  man_singer_medium_skin_tone
+  man_singer_medium_dark_skin_tone
+  man_singer_dark_skin_tone
+  woman_singer
+  woman_singer_light_skin_tone
+  woman_singer_medium_light_skin_tone
+  woman_singer_medium_skin_tone
+  woman_singer_medium_dark_skin_tone
+  woman_singer_dark_skin_tone
+  man_artist
+  man_artist_light_skin_tone
+  man_artist_medium_light_skin_tone
+  man_artist_medium_skin_tone
+  man_artist_medium_dark_skin_tone
+  man_artist_dark_skin_tone
+  woman_artist
+  woman_artist_light_skin_tone
+  woman_artist_medium_light_skin_tone
+  woman_artist_medium_skin_tone
+  woman_artist_medium_dark_skin_tone
+  woman_artist_dark_skin_tone
+  man_pilot
+  man_pilot_light_skin_tone
+  man_pilot_medium_light_skin_tone
+  man_pilot_medium_skin_tone
+  man_pilot_medium_dark_skin_tone
+  man_pilot_dark_skin_tone
+  woman_pilot
+  woman_pilot_light_skin_tone
+  woman_pilot_medium_light_skin_tone
+  woman_pilot_medium_skin_tone
+  woman_pilot_medium_dark_skin_tone
+  woman_pilot_dark_skin_tone
+  man_astronaut
+  man_astronaut_light_skin_tone
+  man_astronaut_medium_light_skin_tone
+  man_astronaut_medium_skin_tone
+  man_astronaut_medium_dark_skin_tone
+  man_astronaut_dark_skin_tone
+  woman_astronaut
+  woman_astronaut_light_skin_tone
+  woman_astronaut_medium_light_skin_tone
+  woman_astronaut_medium_skin_tone
+  woman_astronaut_medium_dark_skin_tone
+  woman_astronaut_dark_skin_tone
+  man_firefighter
+  man_firefighter_light_skin_tone
+  man_firefighter_medium_light_skin_tone
+  man_firefighter_medium_skin_tone
+  man_firefighter_medium_dark_skin_tone
+  man_firefighter_dark_skin_tone
+  woman_firefighter
+  woman_firefighter_light_skin_tone
+  woman_firefighter_medium_light_skin_tone
+  woman_firefighter_medium_skin_tone
+  woman_firefighter_medium_dark_skin_tone
+  woman_firefighter_dark_skin_tone
+  police_officer
+  police_officer_light_skin_tone
+  police_officer_medium_light_skin_tone
+  police_officer_medium_skin_tone
+  police_officer_medium_dark_skin_tone
+  police_officer_dark_skin_tone
+  man_police_officer
+  man_police_officer_light_skin_tone
+  man_police_officer_medium_light_skin_tone
+  man_police_officer_medium_skin_tone
+  man_police_officer_medium_dark_skin_tone
+  man_police_officer_dark_skin_tone
+  woman_police_officer
+  woman_police_officer_light_skin_tone
+  woman_police_officer_medium_light_skin_tone
+  woman_police_officer_medium_skin_tone
+  woman_police_officer_medium_dark_skin_tone
+  woman_police_officer_dark_skin_tone
+  detective
+  detective_light_skin_tone
+  detective_medium_light_skin_tone
+  detective_medium_skin_tone
+  detective_medium_dark_skin_tone
+  detective_dark_skin_tone
+  man_detective
+  man_detective_light_skin_tone
+  man_detective_medium_light_skin_tone
+  man_detective_medium_skin_tone
+  man_detective_medium_dark_skin_tone
+  man_detective_dark_skin_tone
+  woman_detective
+  woman_detective_light_skin_tone
+  woman_detective_medium_light_skin_tone
+  woman_detective_medium_skin_tone
+  woman_detective_medium_dark_skin_tone
+  woman_detective_dark_skin_tone
+  guard
+  guard_light_skin_tone
+  guard_medium_light_skin_tone
+  guard_medium_skin_tone
+  guard_medium_dark_skin_tone
+  guard_dark_skin_tone
+  man_guard
+  man_guard_light_skin_tone
+  man_guard_medium_light_skin_tone
+  man_guard_medium_skin_tone
+  man_guard_medium_dark_skin_tone
+  man_guard_dark_skin_tone
+  woman_guard
+  woman_guard_light_skin_tone
+  woman_guard_medium_light_skin_tone
+  woman_guard_medium_skin_tone
+  woman_guard_medium_dark_skin_tone
+  woman_guard_dark_skin_tone
+  construction_worker
+  construction_worker_light_skin_tone
+  construction_worker_medium_light_skin_tone
+  construction_worker_medium_skin_tone
+  construction_worker_medium_dark_skin_tone
+  construction_worker_dark_skin_tone
+  man_construction_worker
+  man_construction_worker_light_skin_tone
+  man_construction_worker_medium_light_skin_tone
+  man_construction_worker_medium_skin_tone
+  man_construction_worker_medium_dark_skin_tone
+  man_construction_worker_dark_skin_tone
+  woman_construction_worker
+  woman_construction_worker_light_skin_tone
+  woman_construction_worker_medium_light_skin_tone
+  woman_construction_worker_medium_skin_tone
+  woman_construction_worker_medium_dark_skin_tone
+  woman_construction_worker_dark_skin_tone
+  prince
+  prince_light_skin_tone
+  prince_medium_light_skin_tone
+  prince_medium_skin_tone
+  prince_medium_dark_skin_tone
+  prince_dark_skin_tone
+  princess
+  princess_light_skin_tone
+  princess_medium_light_skin_tone
+  princess_medium_skin_tone
+  princess_medium_dark_skin_tone
+  princess_dark_skin_tone
+  person_wearing_turban
+  person_wearing_turban_light_skin_tone
+  person_wearing_turban_medium_light_skin_tone
+  person_wearing_turban_medium_skin_tone
+  person_wearing_turban_medium_dark_skin_tone
+  person_wearing_turban_dark_skin_tone
+  man_wearing_turban
+  man_wearing_turban_light_skin_tone
+  man_wearing_turban_medium_light_skin_tone
+  man_wearing_turban_medium_skin_tone
+  man_wearing_turban_medium_dark_skin_tone
+  man_wearing_turban_dark_skin_tone
+  woman_wearing_turban
+  woman_wearing_turban_light_skin_tone
+  woman_wearing_turban_medium_light_skin_tone
+  woman_wearing_turban_medium_skin_tone
+  woman_wearing_turban_medium_dark_skin_tone
+  woman_wearing_turban_dark_skin_tone
+  man_with_Chinese_cap
+  man_with_Chinese_cap_light_skin_tone
+  man_with_Chinese_cap_medium_light_skin_tone
+  man_with_Chinese_cap_medium_skin_tone
+  man_with_Chinese_cap_medium_dark_skin_tone
+  man_with_Chinese_cap_dark_skin_tone
+  woman_with_headscarf
+  woman_with_headscarf_light_skin_tone
+  woman_with_headscarf_medium_light_skin_tone
+  woman_with_headscarf_medium_skin_tone
+  woman_with_headscarf_medium_dark_skin_tone
+  woman_with_headscarf_dark_skin_tone
+  man_in_tuxedo
+  man_in_tuxedo_light_skin_tone
+  man_in_tuxedo_medium_light_skin_tone
+  man_in_tuxedo_medium_skin_tone
+  man_in_tuxedo_medium_dark_skin_tone
+  man_in_tuxedo_dark_skin_tone
+  bride_with_veil
+  bride_with_veil_light_skin_tone
+  bride_with_veil_medium_light_skin_tone
+  bride_with_veil_medium_skin_tone
+  bride_with_veil_medium_dark_skin_tone
+  bride_with_veil_dark_skin_tone
+  pregnant_woman
+  pregnant_woman_light_skin_tone
+  pregnant_woman_medium_light_skin_tone
+  pregnant_woman_medium_skin_tone
+  pregnant_woman_medium_dark_skin_tone
+  pregnant_woman_dark_skin_tone
+  breast_feeding
+  breast_feeding_light_skin_tone
+  breast_feeding_medium_light_skin_tone
+  breast_feeding_medium_skin_tone
+  breast_feeding_medium_dark_skin_tone
+  breast_feeding_dark_skin_tone
+  baby_angel
+  baby_angel_light_skin_tone
+  baby_angel_medium_light_skin_tone
+  baby_angel_medium_skin_tone
+  baby_angel_medium_dark_skin_tone
+  baby_angel_dark_skin_tone
+  Santa_Claus
+  Santa_Claus_light_skin_tone
+  Santa_Claus_medium_light_skin_tone
+  Santa_Claus_medium_skin_tone
+  Santa_Claus_medium_dark_skin_tone
+  Santa_Claus_dark_skin_tone
+  Mrs_Claus
+  Mrs_Claus_light_skin_tone
+  Mrs_Claus_medium_light_skin_tone
+  Mrs_Claus_medium_skin_tone
+  Mrs_Claus_medium_dark_skin_tone
+  Mrs_Claus_dark_skin_tone
+  superhero
+  superhero_light_skin_tone
+  superhero_medium_light_skin_tone
+  superhero_medium_skin_tone
+  superhero_medium_dark_skin_tone
+  superhero_dark_skin_tone
+  man_superhero
+  man_superhero_light_skin_tone
+  man_superhero_medium_light_skin_tone
+  man_superhero_medium_skin_tone
+  man_superhero_medium_dark_skin_tone
+  man_superhero_dark_skin_tone
+  woman_superhero
+  woman_superhero_light_skin_tone
+  woman_superhero_medium_light_skin_tone
+  woman_superhero_medium_skin_tone
+  woman_superhero_medium_dark_skin_tone
+  woman_superhero_dark_skin_tone
+  supervillain
+  supervillain_light_skin_tone
+  supervillain_medium_light_skin_tone
+  supervillain_medium_skin_tone
+  supervillain_medium_dark_skin_tone
+  supervillain_dark_skin_tone
+  man_supervillain
+  man_supervillain_light_skin_tone
+  man_supervillain_medium_light_skin_tone
+  man_supervillain_medium_skin_tone
+  man_supervillain_medium_dark_skin_tone
+  man_supervillain_dark_skin_tone
+  woman_supervillain
+  woman_supervillain_light_skin_tone
+  woman_supervillain_medium_light_skin_tone
+  woman_supervillain_medium_skin_tone
+  woman_supervillain_medium_dark_skin_tone
+  woman_supervillain_dark_skin_tone
+  mage
+  mage_light_skin_tone
+  mage_medium_light_skin_tone
+  mage_medium_skin_tone
+  mage_medium_dark_skin_tone
+  mage_dark_skin_tone
+  man_mage
+  man_mage_light_skin_tone
+  man_mage_medium_light_skin_tone
+  man_mage_medium_skin_tone
+  man_mage_medium_dark_skin_tone
+  man_mage_dark_skin_tone
+  woman_mage
+  woman_mage_light_skin_tone
+  woman_mage_medium_light_skin_tone
+  woman_mage_medium_skin_tone
+  woman_mage_medium_dark_skin_tone
+  woman_mage_dark_skin_tone
+  fairy
+  fairy_light_skin_tone
+  fairy_medium_light_skin_tone
+  fairy_medium_skin_tone
+  fairy_medium_dark_skin_tone
+  fairy_dark_skin_tone
+  man_fairy
+  man_fairy_light_skin_tone
+  man_fairy_medium_light_skin_tone
+  man_fairy_medium_skin_tone
+  man_fairy_medium_dark_skin_tone
+  man_fairy_dark_skin_tone
+  woman_fairy
+  woman_fairy_light_skin_tone
+  woman_fairy_medium_light_skin_tone
+  woman_fairy_medium_skin_tone
+  woman_fairy_medium_dark_skin_tone
+  woman_fairy_dark_skin_tone
+  vampire
+  vampire_light_skin_tone
+  vampire_medium_light_skin_tone
+  vampire_medium_skin_tone
+  vampire_medium_dark_skin_tone
+  vampire_dark_skin_tone
+  man_vampire
+  man_vampire_light_skin_tone
+  man_vampire_medium_light_skin_tone
+  man_vampire_medium_skin_tone
+  man_vampire_medium_dark_skin_tone
+  man_vampire_dark_skin_tone
+  woman_vampire
+  woman_vampire_light_skin_tone
+  woman_vampire_medium_light_skin_tone
+  woman_vampire_medium_skin_tone
+  woman_vampire_medium_dark_skin_tone
+  woman_vampire_dark_skin_tone
+  merperson
+  merperson_light_skin_tone
+  merperson_medium_light_skin_tone
+  merperson_medium_skin_tone
+  merperson_medium_dark_skin_tone
+  merperson_dark_skin_tone
+  merman
+  merman_light_skin_tone
+  merman_medium_light_skin_tone
+  merman_medium_skin_tone
+  merman_medium_dark_skin_tone
+  merman_dark_skin_tone
+  mermaid
+  mermaid_light_skin_tone
+  mermaid_medium_light_skin_tone
+  mermaid_medium_skin_tone
+  mermaid_medium_dark_skin_tone
+  mermaid_dark_skin_tone
+  elf
+  elf_light_skin_tone
+  elf_medium_light_skin_tone
+  elf_medium_skin_tone
+  elf_medium_dark_skin_tone
+  elf_dark_skin_tone
+  man_elf
+  man_elf_light_skin_tone
+  man_elf_medium_light_skin_tone
+  man_elf_medium_skin_tone
+  man_elf_medium_dark_skin_tone
+  man_elf_dark_skin_tone
+  woman_elf
+  woman_elf_light_skin_tone
+  woman_elf_medium_light_skin_tone
+  woman_elf_medium_skin_tone
+  woman_elf_medium_dark_skin_tone
+  woman_elf_dark_skin_tone
+  genie
+  man_genie
+  woman_genie
+  zombie
+  man_zombie
+  woman_zombie
+  person_getting_massage
+  person_getting_massage_light_skin_tone
+  person_getting_massage_medium_light_skin_tone
+  person_getting_massage_medium_skin_tone
+  person_getting_massage_medium_dark_skin_tone
+  person_getting_massage_dark_skin_tone
+  man_getting_massage
+  man_getting_massage_light_skin_tone
+  man_getting_massage_medium_light_skin_tone
+  man_getting_massage_medium_skin_tone
+  man_getting_massage_medium_dark_skin_tone
+  man_getting_massage_dark_skin_tone
+  woman_getting_massage
+  woman_getting_massage_light_skin_tone
+  woman_getting_massage_medium_light_skin_tone
+  woman_getting_massage_medium_skin_tone
+  woman_getting_massage_medium_dark_skin_tone
+  woman_getting_massage_dark_skin_tone
+  person_getting_haircut
+  person_getting_haircut_light_skin_tone
+  person_getting_haircut_medium_light_skin_tone
+  person_getting_haircut_medium_skin_tone
+  person_getting_haircut_medium_dark_skin_tone
+  person_getting_haircut_dark_skin_tone
+  man_getting_haircut
+  man_getting_haircut_light_skin_tone
+  man_getting_haircut_medium_light_skin_tone
+  man_getting_haircut_medium_skin_tone
+  man_getting_haircut_medium_dark_skin_tone
+  man_getting_haircut_dark_skin_tone
+  woman_getting_haircut
+  woman_getting_haircut_light_skin_tone
+  woman_getting_haircut_medium_light_skin_tone
+  woman_getting_haircut_medium_skin_tone
+  woman_getting_haircut_medium_dark_skin_tone
+  woman_getting_haircut_dark_skin_tone
+  person_walking
+  person_walking_light_skin_tone
+  person_walking_medium_light_skin_tone
+  person_walking_medium_skin_tone
+  person_walking_medium_dark_skin_tone
+  person_walking_dark_skin_tone
+  man_walking
+  man_walking_light_skin_tone
+  man_walking_medium_light_skin_tone
+  man_walking_medium_skin_tone
+  man_walking_medium_dark_skin_tone
+  man_walking_dark_skin_tone
+  woman_walking
+  woman_walking_light_skin_tone
+  woman_walking_medium_light_skin_tone
+  woman_walking_medium_skin_tone
+  woman_walking_medium_dark_skin_tone
+  woman_walking_dark_skin_tone
+  person_standing
+  person_standing_light_skin_tone
+  person_standing_medium_light_skin_tone
+  person_standing_medium_skin_tone
+  person_standing_medium_dark_skin_tone
+  person_standing_dark_skin_tone
+  man_standing
+  man_standing_light_skin_tone
+  man_standing_medium_light_skin_tone
+  man_standing_medium_skin_tone
+  man_standing_medium_dark_skin_tone
+  man_standing_dark_skin_tone
+  woman_standing
+  woman_standing_light_skin_tone
+  woman_standing_medium_light_skin_tone
+  woman_standing_medium_skin_tone
+  woman_standing_medium_dark_skin_tone
+  woman_standing_dark_skin_tone
+  person_kneeling
+  person_kneeling_light_skin_tone
+  person_kneeling_medium_light_skin_tone
+  person_kneeling_medium_skin_tone
+  person_kneeling_medium_dark_skin_tone
+  person_kneeling_dark_skin_tone
+  man_kneeling
+  man_kneeling_light_skin_tone
+  man_kneeling_medium_light_skin_tone
+  man_kneeling_medium_skin_tone
+  man_kneeling_medium_dark_skin_tone
+  man_kneeling_dark_skin_tone
+  woman_kneeling
+  woman_kneeling_light_skin_tone
+  woman_kneeling_medium_light_skin_tone
+  woman_kneeling_medium_skin_tone
+  woman_kneeling_medium_dark_skin_tone
+  woman_kneeling_dark_skin_tone
+  man_with_probing_cane
+  man_with_probing_cane_light_skin_tone
+  man_with_probing_cane_medium_light_skin_tone
+  man_with_probing_cane_medium_skin_tone
+  man_with_probing_cane_medium_dark_skin_tone
+  man_with_probing_cane_dark_skin_tone
+  woman_with_probing_cane
+  woman_with_probing_cane_light_skin_tone
+  woman_with_probing_cane_medium_light_skin_tone
+  woman_with_probing_cane_medium_skin_tone
+  woman_with_probing_cane_medium_dark_skin_tone
+  woman_with_probing_cane_dark_skin_tone
+  man_in_motorized_wheelchair
+  man_in_motorized_wheelchair_light_skin_tone
+  man_in_motorized_wheelchair_medium_light_skin_tone
+  man_in_motorized_wheelchair_medium_skin_tone
+  man_in_motorized_wheelchair_medium_dark_skin_tone
+  man_in_motorized_wheelchair_dark_skin_tone
+  woman_in_motorized_wheelchair
+  woman_in_motorized_wheelchair_light_skin_tone
+  woman_in_motorized_wheelchair_medium_light_skin_tone
+  woman_in_motorized_wheelchair_medium_skin_tone
+  woman_in_motorized_wheelchair_medium_dark_skin_tone
+  woman_in_motorized_wheelchair_dark_skin_tone
+  man_in_manual_wheelchair
+  man_in_manual_wheelchair_light_skin_tone
+  man_in_manual_wheelchair_medium_light_skin_tone
+  man_in_manual_wheelchair_medium_skin_tone
+  man_in_manual_wheelchair_medium_dark_skin_tone
+  man_in_manual_wheelchair_dark_skin_tone
+  woman_in_manual_wheelchair
+  woman_in_manual_wheelchair_light_skin_tone
+  woman_in_manual_wheelchair_medium_light_skin_tone
+  woman_in_manual_wheelchair_medium_skin_tone
+  woman_in_manual_wheelchair_medium_dark_skin_tone
+  woman_in_manual_wheelchair_dark_skin_tone
+  person_running
+  person_running_light_skin_tone
+  person_running_medium_light_skin_tone
+  person_running_medium_skin_tone
+  person_running_medium_dark_skin_tone
+  person_running_dark_skin_tone
+  man_running
+  man_running_light_skin_tone
+  man_running_medium_light_skin_tone
+  man_running_medium_skin_tone
+  man_running_medium_dark_skin_tone
+  man_running_dark_skin_tone
+  woman_running
+  woman_running_light_skin_tone
+  woman_running_medium_light_skin_tone
+  woman_running_medium_skin_tone
+  woman_running_medium_dark_skin_tone
+  woman_running_dark_skin_tone
+  woman_dancing
+  woman_dancing_light_skin_tone
+  woman_dancing_medium_light_skin_tone
+  woman_dancing_medium_skin_tone
+  woman_dancing_medium_dark_skin_tone
+  woman_dancing_dark_skin_tone
+  woman_dancing_dark_skin_tone_1
+  man_dancing_light_skin_tone
+  man_dancing_medium_light_skin_tone
+  man_dancing_medium_skin_tone
+  man_dancing_medium_dark_skin_tone
+  man_dancing_dark_skin_tone
+  man_in_suit_levitating
+  man_in_suit_levitating_light_skin_tone
+  man_in_suit_levitating_medium_light_skin_tone
+  man_in_suit_levitating_medium_skin_tone
+  man_in_suit_levitating_medium_dark_skin_tone
+  man_in_suit_levitating_dark_skin_tone
+  people_with_bunny_ears
+  men_with_bunny_ears
+  women_with_bunny_ears
+  person_in_steamy_room
+  person_in_steamy_room_light_skin_tone
+  person_in_steamy_room_medium_light_skin_tone
+  person_in_steamy_room_medium_skin_tone
+  person_in_steamy_room_medium_dark_skin_tone
+  person_in_steamy_room_dark_skin_tone
+  man_in_steamy_room
+  man_in_steamy_room_light_skin_tone
+  man_in_steamy_room_medium_light_skin_tone
+  man_in_steamy_room_medium_skin_tone
+  man_in_steamy_room_medium_dark_skin_tone
+  man_in_steamy_room_dark_skin_tone
+  woman_in_steamy_room
+  woman_in_steamy_room_light_skin_tone
+  woman_in_steamy_room_medium_light_skin_tone
+  woman_in_steamy_room_medium_skin_tone
+  woman_in_steamy_room_medium_dark_skin_tone
+  woman_in_steamy_room_dark_skin_tone
+  person_climbing
+  person_climbing_light_skin_tone
+  person_climbing_medium_light_skin_tone
+  person_climbing_medium_skin_tone
+  person_climbing_medium_dark_skin_tone
+  person_climbing_dark_skin_tone
+  man_climbing
+  man_climbing_light_skin_tone
+  man_climbing_medium_light_skin_tone
+  man_climbing_medium_skin_tone
+  man_climbing_medium_dark_skin_tone
+  man_climbing_dark_skin_tone
+  woman_climbing
+  woman_climbing_light_skin_tone
+  woman_climbing_medium_light_skin_tone
+  woman_climbing_medium_skin_tone
+  woman_climbing_medium_dark_skin_tone
+  woman_climbing_dark_skin_tone
+  person_fencing
+  horse_racing
+  horse_racing_light_skin_tone
+  horse_racing_medium_light_skin_tone
+  horse_racing_medium_skin_tone
+  horse_racing_medium_dark_skin_tone
+  horse_racing_dark_skin_tone
+  skier
+  snowboarder
+  snowboarder_light_skin_tone
+  snowboarder_medium_light_skin_tone
+  snowboarder_medium_skin_tone
+  snowboarder_medium_dark_skin_tone
+  snowboarder_dark_skin_tone
+  person_golfing
+  person_golfing_light_skin_tone
+  person_golfing_medium_light_skin_tone
+  person_golfing_medium_skin_tone
+  person_golfing_medium_dark_skin_tone
+  person_golfing_dark_skin_tone
+  man_golfing
+  man_golfing_light_skin_tone
+  man_golfing_medium_light_skin_tone
+  man_golfing_medium_skin_tone
+  man_golfing_medium_dark_skin_tone
+  man_golfing_dark_skin_tone
+  woman_golfing
+  woman_golfing_light_skin_tone
+  woman_golfing_medium_light_skin_tone
+  woman_golfing_medium_skin_tone
+  woman_golfing_medium_dark_skin_tone
+  woman_golfing_dark_skin_tone
+  person_surfing
+  person_surfing_light_skin_tone
+  person_surfing_medium_light_skin_tone
+  person_surfing_medium_skin_tone
+  person_surfing_medium_dark_skin_tone
+  person_surfing_dark_skin_tone
+  man_surfing
+  man_surfing_light_skin_tone
+  man_surfing_medium_light_skin_tone
+  man_surfing_medium_skin_tone
+  man_surfing_medium_dark_skin_tone
+  man_surfing_dark_skin_tone
+  woman_surfing
+  woman_surfing_light_skin_tone
+  woman_surfing_medium_light_skin_tone
+  woman_surfing_medium_skin_tone
+  woman_surfing_medium_dark_skin_tone
+  woman_surfing_dark_skin_tone
+  person_rowing_boat
+  person_rowing_boat_light_skin_tone
+  person_rowing_boat_medium_light_skin_tone
+  person_rowing_boat_medium_skin_tone
+  person_rowing_boat_medium_dark_skin_tone
+  person_rowing_boat_dark_skin_tone
+  man_rowing_boat
+  man_rowing_boat_light_skin_tone
+  man_rowing_boat_medium_light_skin_tone
+  man_rowing_boat_medium_skin_tone
+  man_rowing_boat_medium_dark_skin_tone
+  man_rowing_boat_dark_skin_tone
+  woman_rowing_boat
+  woman_rowing_boat_light_skin_tone
+  woman_rowing_boat_medium_light_skin_tone
+  woman_rowing_boat_medium_skin_tone
+  woman_rowing_boat_medium_dark_skin_tone
+  woman_rowing_boat_dark_skin_tone
+  person_swimming
+  person_swimming_light_skin_tone
+  person_swimming_medium_light_skin_tone
+  person_swimming_medium_skin_tone
+  person_swimming_medium_dark_skin_tone
+  person_swimming_dark_skin_tone
+  man_swimming
+  man_swimming_light_skin_tone
+  man_swimming_medium_light_skin_tone
+  man_swimming_medium_skin_tone
+  man_swimming_medium_dark_skin_tone
+  man_swimming_dark_skin_tone
+  woman_swimming
+  woman_swimming_light_skin_tone
+  woman_swimming_medium_light_skin_tone
+  woman_swimming_medium_skin_tone
+  woman_swimming_medium_dark_skin_tone
+  woman_swimming_dark_skin_tone
+  person_bouncing_ball
+  person_bouncing_ball_light_skin_tone
+  person_bouncing_ball_medium_light_skin_tone
+  person_bouncing_ball_medium_skin_tone
+  person_bouncing_ball_medium_dark_skin_tone
+  person_bouncing_ball_dark_skin_tone
+  man_bouncing_ball
+  man_bouncing_ball_light_skin_tone
+  man_bouncing_ball_medium_light_skin_tone
+  man_bouncing_ball_medium_skin_tone
+  man_bouncing_ball_medium_dark_skin_tone
+  man_bouncing_ball_dark_skin_tone
+  woman_bouncing_ball
+  woman_bouncing_ball_light_skin_tone
+  woman_bouncing_ball_medium_light_skin_tone
+  woman_bouncing_ball_medium_skin_tone
+  woman_bouncing_ball_medium_dark_skin_tone
+  woman_bouncing_ball_dark_skin_tone
+  person_lifting_weights
+  person_lifting_weights_light_skin_tone
+  person_lifting_weights_medium_light_skin_tone
+  person_lifting_weights_medium_skin_tone
+  person_lifting_weights_medium_dark_skin_tone
+  person_lifting_weights_dark_skin_tone
+  man_lifting_weights
+  man_lifting_weights_light_skin_tone
+  man_lifting_weights_medium_light_skin_tone
+  man_lifting_weights_medium_skin_tone
+  man_lifting_weights_medium_dark_skin_tone
+  man_lifting_weights_dark_skin_tone
+  woman_lifting_weights
+  woman_lifting_weights_light_skin_tone
+  woman_lifting_weights_medium_light_skin_tone
+  woman_lifting_weights_medium_skin_tone
+  woman_lifting_weights_medium_dark_skin_tone
+  woman_lifting_weights_dark_skin_tone
+  person_biking
+  person_biking_light_skin_tone
+  person_biking_medium_light_skin_tone
+  person_biking_medium_skin_tone
+  person_biking_medium_dark_skin_tone
+  person_biking_dark_skin_tone
+  man_biking
+  man_biking_light_skin_tone
+  man_biking_medium_light_skin_tone
+  man_biking_medium_skin_tone
+  man_biking_medium_dark_skin_tone
+  man_biking_dark_skin_tone
+  woman_biking
+  woman_biking_light_skin_tone
+  woman_biking_medium_light_skin_tone
+  woman_biking_medium_skin_tone
+  woman_biking_medium_dark_skin_tone
+  woman_biking_dark_skin_tone
+  person_mountain_biking
+  person_mountain_biking_light_skin_tone
+  person_mountain_biking_medium_light_skin_tone
+  person_mountain_biking_medium_skin_tone
+  person_mountain_biking_medium_dark_skin_tone
+  person_mountain_biking_dark_skin_tone
+  man_mountain_biking
+  man_mountain_biking_light_skin_tone
+  man_mountain_biking_medium_light_skin_tone
+  man_mountain_biking_medium_skin_tone
+  man_mountain_biking_medium_dark_skin_tone
+  man_mountain_biking_dark_skin_tone
+  woman_mountain_biking
+  woman_mountain_biking_light_skin_tone
+  woman_mountain_biking_medium_light_skin_tone
+  woman_mountain_biking_medium_skin_tone
+  woman_mountain_biking_medium_dark_skin_tone
+  woman_mountain_biking_dark_skin_tone
+  person_cartwheeling
+  person_cartwheeling_light_skin_tone
+  person_cartwheeling_medium_light_skin_tone
+  person_cartwheeling_medium_skin_tone
+  person_cartwheeling_medium_dark_skin_tone
+  person_cartwheeling_dark_skin_tone
+  man_cartwheeling
+  man_cartwheeling_light_skin_tone
+  man_cartwheeling_medium_light_skin_tone
+  man_cartwheeling_medium_skin_tone
+  man_cartwheeling_medium_dark_skin_tone
+  man_cartwheeling_dark_skin_tone
+  woman_cartwheeling
+  woman_cartwheeling_light_skin_tone
+  woman_cartwheeling_medium_light_skin_tone
+  woman_cartwheeling_medium_skin_tone
+  woman_cartwheeling_medium_dark_skin_tone
+  woman_cartwheeling_dark_skin_tone
+  people_wrestling
+  men_wrestling
+  women_wrestling
+  person_playing_water_polo
+  person_playing_water_polo_light_skin_tone
+  person_playing_water_polo_medium_light_skin_tone
+  person_playing_water_polo_medium_skin_tone
+  person_playing_water_polo_medium_dark_skin_tone
+  person_playing_water_polo_dark_skin_tone
+  man_playing_water_polo
+  man_playing_water_polo_light_skin_tone
+  man_playing_water_polo_medium_light_skin_tone
+  man_playing_water_polo_medium_skin_tone
+  man_playing_water_polo_medium_dark_skin_tone
+  man_playing_water_polo_dark_skin_tone
+  woman_playing_water_polo
+  woman_playing_water_polo_light_skin_tone
+  woman_playing_water_polo_medium_light_skin_tone
+  woman_playing_water_polo_medium_skin_tone
+  woman_playing_water_polo_medium_dark_skin_tone
+  woman_playing_water_polo_dark_skin_tone
+  person_playing_handball
+  person_playing_handball_light_skin_tone
+  person_playing_handball_medium_light_skin_tone
+  person_playing_handball_medium_skin_tone
+  person_playing_handball_medium_dark_skin_tone
+  person_playing_handball_dark_skin_tone
+  man_playing_handball
+  man_playing_handball_light_skin_tone
+  man_playing_handball_medium_light_skin_tone
+  man_playing_handball_medium_skin_tone
+  man_playing_handball_medium_dark_skin_tone
+  man_playing_handball_dark_skin_tone
+  woman_playing_handball
+  woman_playing_handball_light_skin_tone
+  woman_playing_handball_medium_light_skin_tone
+  woman_playing_handball_medium_skin_tone
+  woman_playing_handball_medium_dark_skin_tone
+  woman_playing_handball_dark_skin_tone
+  person_juggling
+  person_juggling_light_skin_tone
+  person_juggling_medium_light_skin_tone
+  person_juggling_medium_skin_tone
+  person_juggling_medium_dark_skin_tone
+  person_juggling_dark_skin_tone
+  man_juggling
+  man_juggling_light_skin_tone
+  man_juggling_medium_light_skin_tone
+  man_juggling_medium_skin_tone
+  man_juggling_medium_dark_skin_tone
+  man_juggling_dark_skin_tone
+  woman_juggling
+  woman_juggling_light_skin_tone
+  woman_juggling_medium_light_skin_tone
+  woman_juggling_medium_skin_tone
+  woman_juggling_medium_dark_skin_tone
+  woman_juggling_dark_skin_tone
+  person_in_lotus_position
+  person_in_lotus_position_light_skin_tone
+  person_in_lotus_position_medium_light_skin_tone
+  person_in_lotus_position_medium_skin_tone
+  person_in_lotus_position_medium_dark_skin_tone
+  person_in_lotus_position_dark_skin_tone
+  man_in_lotus_position
+  man_in_lotus_position_light_skin_tone
+  man_in_lotus_position_medium_light_skin_tone
+  man_in_lotus_position_medium_skin_tone
+  man_in_lotus_position_medium_dark_skin_tone
+  man_in_lotus_position_dark_skin_tone
+  woman_in_lotus_position
+  woman_in_lotus_position_light_skin_tone
+  woman_in_lotus_position_medium_light_skin_tone
+  woman_in_lotus_position_medium_skin_tone
+  woman_in_lotus_position_medium_dark_skin_tone
+  woman_in_lotus_position_dark_skin_tone
+  person_taking_bath
+  person_taking_bath_light_skin_tone
+  person_taking_bath_medium_light_skin_tone
+  person_taking_bath_medium_skin_tone
+  person_taking_bath_medium_dark_skin_tone
+  person_taking_bath_dark_skin_tone
+  person_in_bed
+  person_in_bed_light_skin_tone
+  person_in_bed_medium_light_skin_tone
+  person_in_bed_medium_skin_tone
+  person_in_bed_medium_dark_skin_tone
+  person_in_bed_dark_skin_tone
+  people_holding_hands
+  people_holding_hands_light_skin_tone
+  people_holding_hands_medium_light_skin_tone_light_skin_tone
+  people_holding_hands_medium_light_skin_tone_light_skin_tone_1
+  people_holding_hands_medium_skin_tone_light_skin_tone
+  people_holding_hands_medium_skin_tone_medium_light_skin_tone
+  people_holding_hands_medium_skin_tone_medium_light_skin_tone_1
+  people_holding_hands_medium_dark_skin_tone_light_skin_tone
+  people_holding_hands_medium_dark_skin_tone_medium_light_skin_tone
+  people_holding_hands_medium_dark_skin_tone_medium_skin_tone
+  people_holding_hands_medium_dark_skin_tone_medium_skin_tone_1
+  people_holding_hands_dark_skin_tone_light_skin_tone
+  people_holding_hands_dark_skin_tone_medium_light_skin_tone
+  people_holding_hands_dark_skin_tone_medium_skin_tone
+  people_holding_hands_dark_skin_tone_medium_dark_skin_tone
+  people_holding_hands_dark_skin_tone_medium_dark_skin_tone_1
+  women_holding_hands
+  women_holding_hands_light_skin_tone
+  women_holding_hands_medium_light_skin_tone_light_skin_tone
+  women_holding_hands_medium_light_skin_tone_light_skin_tone_1
+  women_holding_hands_medium_skin_tone_light_skin_tone
+  women_holding_hands_medium_skin_tone_medium_light_skin_tone
+  women_holding_hands_medium_skin_tone_medium_light_skin_tone_1
+  women_holding_hands_medium_dark_skin_tone_light_skin_tone
+  women_holding_hands_medium_dark_skin_tone_medium_light_skin_tone
+  women_holding_hands_medium_dark_skin_tone_medium_skin_tone
+  women_holding_hands_medium_dark_skin_tone_medium_skin_tone_1
+  women_holding_hands_dark_skin_tone_light_skin_tone
+  women_holding_hands_dark_skin_tone_medium_light_skin_tone
+  women_holding_hands_dark_skin_tone_medium_skin_tone
+  women_holding_hands_dark_skin_tone_medium_dark_skin_tone
+  women_holding_hands_dark_skin_tone_medium_dark_skin_tone_1
+  woman_and_man_holding_hands
+  woman_and_man_holding_hands_light_skin_tone
+  woman_and_man_holding_hands_light_skin_tone_medium_light_skin_tone
+  woman_and_man_holding_hands_light_skin_tone_medium_skin_tone
+  woman_and_man_holding_hands_light_skin_tone_medium_dark_skin_tone
+  woman_and_man_holding_hands_light_skin_tone_dark_skin_tone
+  woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone
+  woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone_1
+  woman_and_man_holding_hands_medium_light_skin_tone_medium_skin_tone
+  woman_and_man_holding_hands_medium_light_skin_tone_medium_dark_skin_tone
+  woman_and_man_holding_hands_medium_light_skin_tone_dark_skin_tone
+  woman_and_man_holding_hands_medium_skin_tone_light_skin_tone
+  woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone
+  woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone_1
+  woman_and_man_holding_hands_medium_skin_tone_medium_dark_skin_tone
+  woman_and_man_holding_hands_medium_skin_tone_dark_skin_tone
+  woman_and_man_holding_hands_medium_dark_skin_tone_light_skin_tone
+  woman_and_man_holding_hands_medium_dark_skin_tone_medium_light_skin_tone
+  woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone
+  woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone_1
+  woman_and_man_holding_hands_medium_dark_skin_tone_dark_skin_tone
+  woman_and_man_holding_hands_dark_skin_tone_light_skin_tone
+  woman_and_man_holding_hands_dark_skin_tone_medium_light_skin_tone
+  woman_and_man_holding_hands_dark_skin_tone_medium_skin_tone
+  woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone
+  woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone_1
+  men_holding_hands
+  men_holding_hands_light_skin_tone
+  men_holding_hands_medium_light_skin_tone_light_skin_tone
+  men_holding_hands_medium_light_skin_tone_light_skin_tone_1
+  men_holding_hands_medium_skin_tone_light_skin_tone
+  men_holding_hands_medium_skin_tone_medium_light_skin_tone
+  men_holding_hands_medium_skin_tone_medium_light_skin_tone_1
+  men_holding_hands_medium_dark_skin_tone_light_skin_tone
+  men_holding_hands_medium_dark_skin_tone_medium_light_skin_tone
+  men_holding_hands_medium_dark_skin_tone_medium_skin_tone
+  men_holding_hands_medium_dark_skin_tone_medium_skin_tone_1
+  men_holding_hands_dark_skin_tone_light_skin_tone
+  men_holding_hands_dark_skin_tone_medium_light_skin_tone
+  men_holding_hands_dark_skin_tone_medium_skin_tone
+  men_holding_hands_dark_skin_tone_medium_dark_skin_tone
+  men_holding_hands_dark_skin_tone_medium_dark_skin_tone_1
+  kiss
+  kiss_woman_man
+  kiss_man_man
+  kiss_woman_woman
+  couple_with_heart
+  couple_with_heart_woman_man
+  couple_with_heart_man_man
+  couple_with_heart_woman_woman
+  family
+  family_man_woman_boy
+  family_man_woman_girl
+  family_man_woman_girl_boy
+  family_man_woman_boy_boy
+  family_man_woman_girl_girl
+  family_man_man_boy
+  family_man_man_girl
+  family_man_man_girl_boy
+  family_man_man_boy_boy
+  family_man_man_girl_girl
+  family_woman_woman_boy
+  family_woman_woman_girl
+  family_woman_woman_girl_boy
+  family_woman_woman_boy_boy
+  family_woman_woman_girl_girl
+  family_man_boy
+  family_man_boy_boy
+  family_man_girl
+  family_man_girl_boy
+  family_man_girl_girl
+  family_woman_boy
+  family_woman_boy_boy
+  family_woman_girl
+  family_woman_girl_boy
+  family_woman_girl_girl
+  speaking_head
+  bust_in_silhouette
+  busts_in_silhouette
+  footprints
+"
+
+emoji_groups[animals]="
+  monkey_face
+  monkey_face_1
+  gorilla
+  orangutan
+  dog_face
+  dog_face_1
+  guide_dog
+  service_dog
+  poodle
+  wolf
+  fox
+  raccoon
+  cat_face
+  cat_face_1
+  lion
+  tiger_face
+  tiger_face_1
+  leopard
+  horse_face
+  horse_face_1
+  unicorn
+  zebra
+  deer
+  cow_face
+  ox
+  water_buffalo
+  cow
+  pig_face
+  pig_face_1
+  boar
+  pig_nose
+  ram
+  ewe
+  goat
+  camel
+  two_hump_camel
+  llama
+  giraffe
+  elephant
+  rhinoceros
+  hippopotamus
+  mouse_face
+  mouse_face_1
+  rat
+  hamster
+  rabbit_face
+  rabbit_face_1
+  chipmunk
+  hedgehog
+  bat
+  bear
+  koala
+  panda
+  sloth
+  otter
+  skunk
+  kangaroo
+  badger
+  paw_prints
+  turkey
+  chicken
+  rooster
+  hatching_chick
+  baby_chick
+  front_facing_baby_chick
+  bird
+  penguin
+  dove
+  eagle
+  duck
+  swan
+  owl
+  flamingo
+  peacock
+  parrot
+  frog
+  crocodile
+  turtle
+  lizard
+  snake
+  dragon_face
+  dragon_face_1
+  sauropod
+  T_Rex
+  spouting_whale
+  spouting_whale_1
+  dolphin
+  fish
+  tropical_fish
+  blowfish
+  shark
+  octopus
+  spiral_shell
+  snail
+  butterfly
+  bug
+  ant
+  honeybee
+  lady_beetle
+  cricket
+  spider
+  spider_web
+  scorpion
+  mosquito
+  microbe
+"
+
+emoji_groups[faces]="
+  grinning_face
+  grinning_face_with_big_eyes
+  grinning_face_with_smiling_eyes
+  beaming_face_with_smiling_eyes
+  grinning_squinting_face
+  grinning_face_with_sweat
+  rolling_on_the_floor_laughing
+  face_with_tears_of_joy
+  slightly_smiling_face
+  upside_down_face
+  winking_face
+  smiling_face_with_smiling_eyes
+  smiling_face_with_halo
+  smiling_face_with_hearts
+  smiling_face_with_heart_eyes
+  star_struck
+  face_blowing_a_kiss
+  kissing_face
+  smiling_face
+  kissing_face_with_closed_eyes
+  kissing_face_with_smiling_eyes
+  face_savoring_food
+  face_with_tongue
+  winking_face_with_tongue
+  zany_face
+  squinting_face_with_tongue
+  money_mouth_face
+  hugging_face
+  face_with_hand_over_mouth
+  shushing_face
+  thinking_face
+  zipper_mouth_face
+  face_with_raised_eyebrow
+  neutral_face
+  expressionless_face
+  face_without_mouth
+  smirking_face
+  unamused_face
+  face_with_rolling_eyes
+  grimacing_face
+  lying_face
+  relieved_face
+  pensive_face
+  sleepy_face
+  drooling_face
+  sleeping_face
+  face_with_medical_mask
+  face_with_thermometer
+  face_with_head_bandage
+  nauseated_face
+  face_vomiting
+  sneezing_face
+  hot_face
+  cold_face
+  woozy_face
+  dizzy_face
+  exploding_head
+  cowboy_hat_face
+  partying_face
+  smiling_face_with_sunglasses
+  nerd_face
+  face_with_monocle
+  confused_face
+  worried_face
+  slightly_frowning_face
+  slightly_frowning_face_1
+  face_with_open_mouth
+  hushed_face
+  astonished_face
+  flushed_face
+  pleading_face
+  frowning_face_with_open_mouth
+  anguished_face
+  fearful_face
+  anxious_face_with_sweat
+  sad_but_relieved_face
+  crying_face
+  loudly_crying_face
+  face_screaming_in_fear
+  confounded_face
+  persevering_face
+  disappointed_face
+  downcast_face_with_sweat
+  weary_face
+  tired_face
+  yawning_face
+  face_with_steam_from_nose
+  pouting_face
+  angry_face
+  face_with_symbols_on_mouth
+  smiling_face_with_horns
+  angry_face_with_horns
+  skull
+  skull_and_crossbones
+  pile_of_poo
+  clown_face
+  ogre
+  goblin
+  ghost
+  alien
+  alien_monster
+  robot
+"
+
+emoji_groups[flags]="
+  chequered_flag
+  triangular_flag
+  crossed_flags
+  black_flag
+  white_flag
+  rainbow_flag
+  pirate_flag
+  Ascension_Island
+  Andorra
+  United_Arab_Emirates
+  Afghanistan
+  Antigua_and_Barbuda
+  Anguilla
+  Albania
+  Armenia
+  Angola
+  Antarctica
+  Argentina
+  American_Samoa
+  Austria
+  Australia
+  Aruba
+  Åland_Islands
+  Azerbaijan
+  Bosnia_and_Herzegovina
+  Barbados
+  Bangladesh
+  Belgium
+  Burkina_Faso
+  Bulgaria
+  Bahrain
+  Burundi
+  Benin
+  St_Barthélemy
+  Bermuda
+  Brunei
+  Bolivia
+  Caribbean_Netherlands
+  Brazil
+  Bahamas
+  Bhutan
+  Bouvet_Island
+  Botswana
+  Belarus
+  Belize
+  Canada
+  Cocos_Keeling_Islands
+  Congo__Kinshasa
+  Central_African_Republic
+  Congo__Brazzaville
+  Switzerland
+  Côte_d_Ivoire
+  Cook_Islands
+  Chile
+  Cameroon
+  China
+  Colombia
+  Clipperton_Island
+  Costa_Rica
+  Cuba
+  Cape_Verde
+  Curaçao
+  Christmas_Island
+  Cyprus
+  Czechia
+  Germany
+  Diego_Garcia
+  Djibouti
+  Denmark
+  Dominica
+  Dominican_Republic
+  Algeria
+  Ceuta_and_Melilla
+  Ecuador
+  Estonia
+  Egypt
+  Western_Sahara
+  Eritrea
+  Spain
+  Ethiopia
+  European_Union
+  Finland
+  Fiji
+  Falkland_Islands
+  Micronesia
+  Faroe_Islands
+  France
+  Gabon
+  United_Kingdom
+  Grenada
+  Georgia
+  French_Guiana
+  Guernsey
+  Ghana
+  Gibraltar
+  Greenland
+  Gambia
+  Guinea
+  Guadeloupe
+  Equatorial_Guinea
+  Greece
+  South_Georgia_and_South_Sandwich_Islands
+  Guatemala
+  Guam
+  Guinea_Bissau
+  Guyana
+  Hong_Kong_SAR_China
+  Heard_and_McDonald_Islands
+  Honduras
+  Croatia
+  Haiti
+  Hungary
+  Canary_Islands
+  Indonesia
+  Ireland
+  Israel
+  Isle_of_Man
+  India
+  British_Indian_Ocean_Territory
+  Iraq
+  Iran
+  Iceland
+  Italy
+  Jersey
+  Jamaica
+  Jordan
+  Japan
+  Kenya
+  Kyrgyzstan
+  Cambodia
+  Kiribati
+  Comoros
+  St_Kitts_and_Nevis
+  North_Korea
+  South_Korea
+  Kuwait
+  Cayman_Islands
+  Kazakhstan
+  Laos
+  Lebanon
+  St_Lucia
+  Liechtenstein
+  Sri_Lanka
+  Liberia
+  Lesotho
+  Lithuania
+  Luxembourg
+  Latvia
+  Libya
+  Morocco
+  Monaco
+  Moldova
+  Montenegro
+  St_Martin
+  Madagascar
+  Marshall_Islands
+  Macedonia
+  Mali
+  Myanmar_Burma_
+  Mongolia
+  Macao_SAR_China
+  Northern_Mariana_Islands
+  Martinique
+  Mauritania
+  Montserrat
+  Malta
+  Mauritius
+  Maldives
+  Malawi
+  Mexico
+  Malaysia
+  Mozambique
+  Namibia
+  New_Caledonia
+  Niger
+  Norfolk_Island
+  Nigeria
+  Nicaragua
+  Netherlands
+  Norway
+  Nepal
+  Nauru
+  Niue
+  New_Zealand
+  Oman
+  Panama
+  Peru
+  French_Polynesia
+  Papua_New_Guinea
+  Philippines
+  Pakistan
+  Poland
+  St_Pierre_and_Miquelon
+  Pitcairn_Islands
+  Puerto_Rico
+  Palestinian_Territories
+  Portugal
+  Palau
+  Paraguay
+  Qatar
+  Réunion
+  Romania
+  Serbia
+  Russia
+  Rwanda
+  Saudi_Arabia
+  Solomon_Islands
+  Seychelles
+  Sudan
+  Sweden
+  Singapore
+  St_Helena
+  Slovenia
+  Svalbard_and_Jan_Mayen
+  Slovakia
+  Sierra_Leone
+  San_Marino
+  Senegal
+  Somalia
+  Suriname
+  South_Sudan
+  São_Tomé_and_Príncipe
+  El_Salvador
+  Sint_Maarten
+  Syria
+  Eswatini
+  Tristan_da_Cunha
+  Turks_and_Caicos_Islands
+  Chad
+  French_Southern_Territories
+  Togo
+  Thailand
+  Tajikistan
+  Tokelau
+  Timor_Leste
+  Turkmenistan
+  Tunisia
+  Tonga
+  Turkey
+  Trinidad_and_Tobago
+  Tuvalu
+  Taiwan
+  Tanzania
+  Ukraine
+  Uganda
+  U_S_Outlying_Islands
+  United_Nations
+  United_States
+  Uruguay
+  Uzbekistan
+  Vatican_City
+  St_Vincent_and_Grenadines
+  Venezuela
+  British_Virgin_Islands
+  U_S_Virgin_Islands
+  Vietnam
+  Vanuatu
+  Wallis_and_Futuna
+  Samoa
+  Kosovo
+  Yemen
+  Mayotte
+  South_Africa
+  Zambia
+  Zimbabwe
+  England
+  Scotland
+  Wales
+"
diff --git a/plugins/emoji/emoji-data.txt b/plugins/emoji/emoji-data.txt
index 2d6d64e2b..59b7e92d7 100644
--- a/plugins/emoji/emoji-data.txt
+++ b/plugins/emoji/emoji-data.txt
@@ -1,1308 +1,4122 @@
-# DRAFT emoji-data.txt
-# For details about the format and other information, see /../../../reports/tr51/index.html#Data_Files.
+# emoji-data.txt
+# (Originally emoji-test.txt)
+# (Retrieved from https://unicode.org/Public/emoji/12.0/emoji-test.txt)
+
+# Date: 2019-01-27, 15:43:01 GMT
+# © 2019 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
-# Format: Code ; Default_Emoji_Style ; Emoji_Level ; Emoji_Modifier_Status ; Emoji_Sources # Comment
+# Emoji Keyboard/Display Test Data for UTS #51
+# Version: 12.0
 #
-#   Field 1 — Default_Emoji_Style:
-#             text:      default text presentation
-#             emoji:     default emoji presentation
-#   Field 2 — Emoji_Level:
-#             L1:        level 1 emoji
-#             L2:        level 2 emoji
-#             NA:        not applicable
-#   Field 3 — Emoji_Modifier_Status:
-#             modifier:  an emoji modifier
-#             primary:   a primary emoji modifier base
-#             secondary: a secondary emoji modifier base
-#             none:      not applicable
-#   Field 4 — Emoji_Sources:
-#             one or more values from {z, a, j, w, x}
-#             see the key in https://www.unicode.org/draft/reports/tr51/tr51.html#Major_Sources
-#             NA:        not applicable
-#   Comment — currently contains the version where the character was first encoded,
-#             followed by:
-#             - a character name in uppercase (for a single character),
-#             - a keycap name,
-#             - an associated flag, where is associated with value unicode region code
+# For documentation and usage, see http://www.unicode.org/reports/tr51
 #
-00A9 ;	text ;	L1 ;	none ;	j	# V1.1 (©) COPYRIGHT SIGN
-00AE ;	text ;	L1 ;	none ;	j	# V1.1 (®) REGISTERED SIGN
-203C ;	text ;	L1 ;	none ;	a j	# V1.1 (‼) DOUBLE EXCLAMATION MARK
-2049 ;	text ;	L1 ;	none ;	a j	# V3.0 (⁉) EXCLAMATION QUESTION MARK
-2122 ;	text ;	L1 ;	none ;	j	# V1.1 (™) TRADE MARK SIGN
-2139 ;	text ;	L1 ;	none ;	j	# V3.0 (ℹ) INFORMATION SOURCE
-2194 ;	text ;	L1 ;	none ;	z j	# V1.1 (↔) LEFT RIGHT ARROW
-2195 ;	text ;	L1 ;	none ;	z j	# V1.1 (↕) UP DOWN ARROW
-2196 ;	text ;	L1 ;	none ;	j	# V1.1 (↖) NORTH WEST ARROW
-2197 ;	text ;	L1 ;	none ;	j	# V1.1 (↗) NORTH EAST ARROW
-2198 ;	text ;	L1 ;	none ;	j	# V1.1 (↘) SOUTH EAST ARROW
-2199 ;	text ;	L1 ;	none ;	j	# V1.1 (↙) SOUTH WEST ARROW
-21A9 ;	text ;	L1 ;	none ;	j	# V1.1 (↩) LEFTWARDS ARROW WITH HOOK
-21AA ;	text ;	L1 ;	none ;	j	# V1.1 (↪) RIGHTWARDS ARROW WITH HOOK
-231A ;	emoji ;	L1 ;	none ;	j	# V1.1 (⌚) WATCH
-231B ;	emoji ;	L1 ;	none ;	j	# V1.1 (⌛) HOURGLASS
-2328 ;	text ;	L2 ;	none ;	x	# V1.1 (⌨) KEYBOARD
-23CF ;	text ;	L2 ;	none ;	x	# V4.0 (⏏) EJECT SYMBOL
-23E9 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (⏩) BLACK RIGHT-POINTING DOUBLE TRIANGLE
-23EA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (⏪) BLACK LEFT-POINTING DOUBLE TRIANGLE
-23EB ;	emoji ;	L1 ;	none ;	j	# V6.0 (⏫) BLACK UP-POINTING DOUBLE TRIANGLE
-23EC ;	emoji ;	L1 ;	none ;	j	# V6.0 (⏬) BLACK DOWN-POINTING DOUBLE TRIANGLE
-23ED ;	text ;	L2 ;	none ;	w	# V6.0 (⏭) BLACK RIGHT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR
-23EE ;	text ;	L2 ;	none ;	w	# V6.0 (⏮) BLACK LEFT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR
-23EF ;	text ;	L2 ;	none ;	x	# V6.0 (⏯) BLACK RIGHT-POINTING TRIANGLE WITH DOUBLE VERTICAL BAR
-23F0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (⏰) ALARM CLOCK
-23F1 ;	text ;	L2 ;	none ;	x	# V6.0 (⏱) STOPWATCH
-23F2 ;	text ;	L2 ;	none ;	x	# V6.0 (⏲) TIMER CLOCK
-23F3 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (⏳) HOURGLASS WITH FLOWING SAND
-23F8 ;	text ;	L2 ;	none ;	w	# V7.0 (⏸) DOUBLE VERTICAL BAR
-23F9 ;	text ;	L2 ;	none ;	w	# V7.0 (⏹) BLACK SQUARE FOR STOP
-23FA ;	text ;	L2 ;	none ;	w	# V7.0 (⏺) BLACK CIRCLE FOR RECORD
-24C2 ;	text ;	L1 ;	none ;	j	# V1.1 (Ⓜ) CIRCLED LATIN CAPITAL LETTER M
-25AA ;	text ;	L1 ;	none ;	j w	# V1.1 (▪) BLACK SMALL SQUARE
-25AB ;	text ;	L1 ;	none ;	j	# V1.1 (▫) WHITE SMALL SQUARE
-25B6 ;	text ;	L1 ;	none ;	a j w	# V1.1 (▶) BLACK RIGHT-POINTING TRIANGLE
-25C0 ;	text ;	L1 ;	none ;	a j w	# V1.1 (◀) BLACK LEFT-POINTING TRIANGLE
-25FB ;	text ;	L1 ;	none ;	j	# V3.2 (◻) WHITE MEDIUM SQUARE
-25FC ;	text ;	L1 ;	none ;	j w	# V3.2 (◼) BLACK MEDIUM SQUARE
-25FD ;	emoji ;	L1 ;	none ;	j	# V3.2 (◽) WHITE MEDIUM SMALL SQUARE
-25FE ;	emoji ;	L1 ;	none ;	j w	# V3.2 (◾) BLACK MEDIUM SMALL SQUARE
-2600 ;	text ;	L1 ;	none ;	a j	# V1.1 (☀) BLACK SUN WITH RAYS
-2601 ;	text ;	L1 ;	none ;	a j w	# V1.1 (☁) CLOUD
-2602 ;	text ;	L2 ;	none ;	a	# V1.1 (☂) UMBRELLA
-2603 ;	text ;	L2 ;	none ;	a	# V1.1 (☃) SNOWMAN
-2604 ;	text ;	L2 ;	none ;	x	# V1.1 (☄) COMET
-260E ;	text ;	L1 ;	none ;	z a j	# V1.1 (☎) BLACK TELEPHONE
-2611 ;	text ;	L1 ;	none ;	j w	# V1.1 (☑) BALLOT BOX WITH CHECK
-2614 ;	emoji ;	L1 ;	none ;	a j	# V4.0 (☔) UMBRELLA WITH RAIN DROPS
-2615 ;	emoji ;	L1 ;	none ;	j	# V4.0 (☕) HOT BEVERAGE
-2618 ;	text ;	L2 ;	none ;	x	# V4.1 (☘) SHAMROCK
-261D ;	text ;	L1 ;	secondary ;	j w	# V1.1 (☝) WHITE UP POINTING INDEX
-2620 ;	text ;	L2 ;	none ;	x	# V1.1 (☠) SKULL AND CROSSBONES
-2622 ;	text ;	L2 ;	none ;	x	# V1.1 (☢) RADIOACTIVE SIGN
-2623 ;	text ;	L2 ;	none ;	x	# V1.1 (☣) BIOHAZARD SIGN
-2626 ;	text ;	L2 ;	none ;	x	# V1.1 (☦) ORTHODOX CROSS
-262A ;	text ;	L2 ;	none ;	w	# V1.1 (☪) STAR AND CRESCENT
-262E ;	text ;	L2 ;	none ;	x	# V1.1 (☮) PEACE SYMBOL
-262F ;	text ;	L2 ;	none ;	w	# V1.1 (☯) YIN YANG
-2638 ;	text ;	L2 ;	none ;	w	# V1.1 (☸) WHEEL OF DHARMA
-2639 ;	text ;	L2 ;	secondary ;	w	# V1.1 (☹) WHITE FROWNING FACE
-263A ;	text ;	L1 ;	secondary ;	j w	# V1.1 (☺) WHITE SMILING FACE
-2648 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♈) ARIES
-2649 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♉) TAURUS
-264A ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♊) GEMINI
-264B ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♋) CANCER
-264C ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♌) LEO
-264D ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♍) VIRGO
-264E ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♎) LIBRA
-264F ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♏) SCORPIUS
-2650 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♐) SAGITTARIUS
-2651 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♑) CAPRICORN
-2652 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♒) AQUARIUS
-2653 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♓) PISCES
-2660 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♠) BLACK SPADE SUIT
-2663 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♣) BLACK CLUB SUIT
-2665 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♥) BLACK HEART SUIT
-2666 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♦) BLACK DIAMOND SUIT
-2668 ;	text ;	L1 ;	none ;	a j	# V1.1 (♨) HOT SPRINGS
-267B ;	text ;	L1 ;	none ;	j	# V3.2 (♻) BLACK UNIVERSAL RECYCLING SYMBOL
-267F ;	emoji ;	L1 ;	none ;	j w	# V4.1 (♿) WHEELCHAIR SYMBOL
-2692 ;	text ;	L2 ;	none ;	x	# V4.1 (⚒) HAMMER AND PICK
-2693 ;	emoji ;	L1 ;	none ;	a j	# V4.1 (⚓) ANCHOR
-2694 ;	text ;	L2 ;	none ;	x	# V4.1 (⚔) CROSSED SWORDS
-2696 ;	text ;	L2 ;	none ;	x	# V4.1 (⚖) SCALES
-2697 ;	text ;	L2 ;	none ;	x	# V4.1 (⚗) ALEMBIC
-2699 ;	text ;	L2 ;	none ;	x	# V4.1 (⚙) GEAR
-269B ;	text ;	L2 ;	none ;	x	# V4.1 (⚛) ATOM SYMBOL
-269C ;	text ;	L2 ;	none ;	x	# V4.1 (⚜) FLEUR-DE-LIS
-26A0 ;	text ;	L1 ;	none ;	j	# V4.0 (⚠) WARNING SIGN
-26A1 ;	emoji ;	L1 ;	none ;	a j	# V4.0 (⚡) HIGH VOLTAGE SIGN
-26AA ;	emoji ;	L1 ;	none ;	j	# V4.1 (⚪) MEDIUM WHITE CIRCLE
-26AB ;	emoji ;	L1 ;	none ;	j w	# V4.1 (⚫) MEDIUM BLACK CIRCLE
-26B0 ;	text ;	L2 ;	none ;	x	# V4.1 (⚰) COFFIN
-26B1 ;	text ;	L2 ;	none ;	x	# V4.1 (⚱) FUNERAL URN
-26BD ;	emoji ;	L1 ;	none ;	j	# V5.2 (⚽) SOCCER BALL
-26BE ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⚾) BASEBALL
-26C4 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛄) SNOWMAN WITHOUT SNOW
-26C5 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛅) SUN BEHIND CLOUD
-26C8 ;	text ;	L2 ;	none ;	a	# V5.2 (⛈) THUNDER CLOUD AND RAIN
-26CE ;	emoji ;	L1 ;	none ;	a j	# V6.0 (⛎) OPHIUCHUS
-26CF ;	text ;	L2 ;	none ;	a	# V5.2 (⛏) PICK
-26D1 ;	text ;	L2 ;	none ;	a	# V5.2 (⛑) HELMET WITH WHITE CROSS
-26D3 ;	text ;	L2 ;	none ;	a	# V5.2 (⛓) CHAINS
-26D4 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛔) NO ENTRY
-26E9 ;	text ;	L2 ;	none ;	a	# V5.2 (⛩) SHINTO SHRINE
-26EA ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛪) CHURCH
-26F0 ;	text ;	L2 ;	none ;	a	# V5.2 (⛰) MOUNTAIN
-26F1 ;	text ;	L2 ;	none ;	a	# V5.2 (⛱) UMBRELLA ON GROUND
-26F2 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛲) FOUNTAIN
-26F3 ;	emoji ;	L1 ;	none ;	a j w	# V5.2 (⛳) FLAG IN HOLE
-26F4 ;	text ;	L2 ;	none ;	a	# V5.2 (⛴) FERRY
-26F5 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛵) SAILBOAT
-26F7 ;	text ;	L2 ;	none ;	a w	# V5.2 (⛷) SKIER
-26F8 ;	text ;	L2 ;	none ;	a	# V5.2 (⛸) ICE SKATE
-26F9 ;	text ;	L2 ;	none ;	a	# V5.2 (⛹) PERSON WITH BALL
-26FA ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛺) TENT
-26FD ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛽) FUEL PUMP
-2702 ;	text ;	L1 ;	none ;	z j w	# V1.1 (✂) BLACK SCISSORS
-2705 ;	emoji ;	L1 ;	none ;	j	# V6.0 (✅) WHITE HEAVY CHECK MARK
-2708 ;	text ;	L1 ;	none ;	z a j w	# V1.1 (✈) AIRPLANE
-2709 ;	text ;	L1 ;	none ;	z j	# V1.1 (✉) ENVELOPE
-270A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (✊) RAISED FIST
-270B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (✋) RAISED HAND
-270C ;	text ;	L1 ;	secondary ;	z j w	# V1.1 (✌) VICTORY HAND
-270D ;	text ;	L2 ;	secondary ;	z w	# V1.1 (✍) WRITING HAND
-270F ;	text ;	L1 ;	none ;	z j	# V1.1 (✏) PENCIL
-2712 ;	text ;	L1 ;	none ;	z j	# V1.1 (✒) BLACK NIB
-2714 ;	text ;	L1 ;	none ;	z j w	# V1.1 (✔) HEAVY CHECK MARK
-2716 ;	text ;	L1 ;	none ;	z j	# V1.1 (✖) HEAVY MULTIPLICATION X
-271D ;	text ;	L2 ;	none ;	w	# V1.1 (✝) LATIN CROSS
-2721 ;	text ;	L2 ;	none ;	w	# V1.1 (✡) STAR OF DAVID
-2728 ;	emoji ;	L1 ;	none ;	j	# V6.0 (✨) SPARKLES
-2733 ;	text ;	L1 ;	none ;	z j	# V1.1 (✳) EIGHT SPOKED ASTERISK
-2734 ;	text ;	L1 ;	none ;	z j	# V1.1 (✴) EIGHT POINTED BLACK STAR
-2744 ;	text ;	L1 ;	none ;	z j w	# V1.1 (❄) SNOWFLAKE
-2747 ;	text ;	L1 ;	none ;	z j	# V1.1 (❇) SPARKLE
-274C ;	emoji ;	L1 ;	none ;	j	# V6.0 (❌) CROSS MARK
-274E ;	emoji ;	L1 ;	none ;	j	# V6.0 (❎) NEGATIVE SQUARED CROSS MARK
-2753 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (❓) BLACK QUESTION MARK ORNAMENT
-2754 ;	emoji ;	L1 ;	none ;	j	# V6.0 (❔) WHITE QUESTION MARK ORNAMENT
-2755 ;	emoji ;	L1 ;	none ;	j	# V6.0 (❕) WHITE EXCLAMATION MARK ORNAMENT
-2757 ;	emoji ;	L1 ;	none ;	j	# V5.2 (❗) HEAVY EXCLAMATION MARK SYMBOL
-2763 ;	text ;	L2 ;	none ;	z	# V1.1 (❣) HEAVY HEART EXCLAMATION MARK ORNAMENT
-2764 ;	text ;	L1 ;	none ;	z j	# V1.1 (❤) HEAVY BLACK HEART
-2795 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➕) HEAVY PLUS SIGN
-2796 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➖) HEAVY MINUS SIGN
-2797 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➗) HEAVY DIVISION SIGN
-27A1 ;	text ;	L1 ;	none ;	z a j	# V1.1 (➡) BLACK RIGHTWARDS ARROW
-27B0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➰) CURLY LOOP
-27BF ;	emoji ;	L1 ;	none ;	x	# V6.0 (➿) DOUBLE CURLY LOOP
-2934 ;	text ;	L1 ;	none ;	j	# V3.2 (⤴) ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS
-2935 ;	text ;	L1 ;	none ;	j	# V3.2 (⤵) ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS
-2B05 ;	text ;	L1 ;	none ;	a j	# V4.0 (⬅) LEFTWARDS BLACK ARROW
-2B06 ;	text ;	L1 ;	none ;	a j	# V4.0 (⬆) UPWARDS BLACK ARROW
-2B07 ;	text ;	L1 ;	none ;	a j	# V4.0 (⬇) DOWNWARDS BLACK ARROW
-2B1B ;	emoji ;	L1 ;	none ;	a j w	# V5.1 (⬛) BLACK LARGE SQUARE
-2B1C ;	emoji ;	L1 ;	none ;	j w	# V5.1 (⬜) WHITE LARGE SQUARE
-2B50 ;	emoji ;	L1 ;	none ;	j	# V5.1 (⭐) WHITE MEDIUM STAR
-2B55 ;	emoji ;	L1 ;	none ;	j	# V5.2 (⭕) HEAVY LARGE CIRCLE
-3030 ;	text ;	L1 ;	none ;	j	# V1.1 (〰) WAVY DASH
-303D ;	text ;	L1 ;	none ;	j	# V3.2 (〽) PART ALTERNATION MARK
-3297 ;	text ;	L1 ;	none ;	j	# V1.1 (㊗) CIRCLED IDEOGRAPH CONGRATULATION
-3299 ;	text ;	L1 ;	none ;	a j	# V1.1 (㊙) CIRCLED IDEOGRAPH SECRET
-1F004 ;	emoji ;	L1 ;	none ;	j	# V5.1 (🀄) MAHJONG TILE RED DRAGON
-1F0CF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🃏) PLAYING CARD BLACK JOKER
-1F170 ;	text ;	L1 ;	none ;	j	# V6.0 (🅰) NEGATIVE SQUARED LATIN CAPITAL LETTER A
-1F171 ;	text ;	L1 ;	none ;	j	# V6.0 (🅱) NEGATIVE SQUARED LATIN CAPITAL LETTER B
-1F17E ;	text ;	L1 ;	none ;	j	# V6.0 (🅾) NEGATIVE SQUARED LATIN CAPITAL LETTER O
-1F17F ;	text ;	L1 ;	none ;	a j	# V5.2 (🅿) NEGATIVE SQUARED LATIN CAPITAL LETTER P
-1F18E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆎) NEGATIVE SQUARED AB
-1F191 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆑) SQUARED CL
-1F192 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆒) SQUARED COOL
-1F193 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆓) SQUARED FREE
-1F194 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆔) SQUARED ID
-1F195 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆕) SQUARED NEW
-1F196 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆖) SQUARED NG
-1F197 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆗) SQUARED OK
-1F198 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆘) SQUARED SOS
-1F199 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆙) SQUARED UP WITH EXCLAMATION MARK
-1F19A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆚) SQUARED VS
-1F201 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈁) SQUARED KATAKANA KOKO
-1F202 ;	text ;	L1 ;	none ;	j	# V6.0 (🈂) SQUARED KATAKANA SA
-1F21A ;	emoji ;	L1 ;	none ;	a j	# V5.2 (🈚) SQUARED CJK UNIFIED IDEOGRAPH-7121
-1F22F ;	emoji ;	L1 ;	none ;	a j	# V5.2 (🈯) SQUARED CJK UNIFIED IDEOGRAPH-6307
-1F232 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈲) SQUARED CJK UNIFIED IDEOGRAPH-7981
-1F233 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈳) SQUARED CJK UNIFIED IDEOGRAPH-7A7A
-1F234 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈴) SQUARED CJK UNIFIED IDEOGRAPH-5408
-1F235 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈵) SQUARED CJK UNIFIED IDEOGRAPH-6E80
-1F236 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈶) SQUARED CJK UNIFIED IDEOGRAPH-6709
-1F237 ;	text ;	L1 ;	none ;	j	# V6.0 (🈷) SQUARED CJK UNIFIED IDEOGRAPH-6708
-1F238 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈸) SQUARED CJK UNIFIED IDEOGRAPH-7533
-1F239 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈹) SQUARED CJK UNIFIED IDEOGRAPH-5272
-1F23A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈺) SQUARED CJK UNIFIED IDEOGRAPH-55B6
-1F250 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🉐) CIRCLED IDEOGRAPH ADVANTAGE
-1F251 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🉑) CIRCLED IDEOGRAPH ACCEPT
-1F300 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌀) CYCLONE
-1F301 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌁) FOGGY
-1F302 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌂) CLOSED UMBRELLA
-1F303 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌃) NIGHT WITH STARS
-1F304 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌄) SUNRISE OVER MOUNTAINS
-1F305 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌅) SUNRISE
-1F306 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌆) CITYSCAPE AT DUSK
-1F307 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌇) SUNSET OVER BUILDINGS
-1F308 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌈) RAINBOW
-1F309 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌉) BRIDGE AT NIGHT
-1F30A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌊) WATER WAVE
-1F30B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌋) VOLCANO
-1F30C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌌) MILKY WAY
-1F30D ;	emoji ;	L1 ;	none ;	w	# V6.0 (🌍) EARTH GLOBE EUROPE-AFRICA
-1F30E ;	emoji ;	L1 ;	none ;	w	# V6.0 (🌎) EARTH GLOBE AMERICAS
-1F30F ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🌏) EARTH GLOBE ASIA-AUSTRALIA
-1F310 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌐) GLOBE WITH MERIDIANS
-1F311 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌑) NEW MOON SYMBOL
-1F312 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌒) WAXING CRESCENT MOON SYMBOL
-1F313 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌓) FIRST QUARTER MOON SYMBOL
-1F314 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌔) WAXING GIBBOUS MOON SYMBOL
-1F315 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🌕) FULL MOON SYMBOL
-1F316 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌖) WANING GIBBOUS MOON SYMBOL
-1F317 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌗) LAST QUARTER MOON SYMBOL
-1F318 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌘) WANING CRESCENT MOON SYMBOL
-1F319 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌙) CRESCENT MOON
-1F31A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌚) NEW MOON WITH FACE
-1F31B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌛) FIRST QUARTER MOON WITH FACE
-1F31C ;	emoji ;	L1 ;	none ;	w	# V6.0 (🌜) LAST QUARTER MOON WITH FACE
-1F31D ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌝) FULL MOON WITH FACE
-1F31E ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌞) SUN WITH FACE
-1F31F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌟) GLOWING STAR
-1F320 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌠) SHOOTING STAR
-1F321 ;	text ;	L2 ;	none ;	w	# V7.0 (🌡) THERMOMETER
-1F324 ;	text ;	L2 ;	none ;	w	# V7.0 (🌤) WHITE SUN WITH SMALL CLOUD
-1F325 ;	text ;	L2 ;	none ;	w	# V7.0 (🌥) WHITE SUN BEHIND CLOUD
-1F326 ;	text ;	L2 ;	none ;	w	# V7.0 (🌦) WHITE SUN BEHIND CLOUD WITH RAIN
-1F327 ;	text ;	L2 ;	none ;	w	# V7.0 (🌧) CLOUD WITH RAIN
-1F328 ;	text ;	L2 ;	none ;	w	# V7.0 (🌨) CLOUD WITH SNOW
-1F329 ;	text ;	L2 ;	none ;	w	# V7.0 (🌩) CLOUD WITH LIGHTNING
-1F32A ;	text ;	L2 ;	none ;	w	# V7.0 (🌪) CLOUD WITH TORNADO
-1F32B ;	text ;	L2 ;	none ;	w	# V7.0 (🌫) FOG
-1F32C ;	text ;	L2 ;	none ;	w	# V7.0 (🌬) WIND BLOWING FACE
-1F32D ;	emoji ;	L2 ;	none ;	x	# V8.0 (🌭) HOT DOG
-1F32E ;	emoji ;	L2 ;	none ;	x	# V8.0 (🌮) TACO
-1F32F ;	emoji ;	L2 ;	none ;	x	# V8.0 (🌯) BURRITO
-1F330 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌰) CHESTNUT
-1F331 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌱) SEEDLING
-1F332 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌲) EVERGREEN TREE
-1F333 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌳) DECIDUOUS TREE
-1F334 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌴) PALM TREE
-1F335 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌵) CACTUS
-1F336 ;	text ;	L2 ;	none ;	w	# V7.0 (🌶) HOT PEPPER
-1F337 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌷) TULIP
-1F338 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌸) CHERRY BLOSSOM
-1F339 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌹) ROSE
-1F33A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌺) HIBISCUS
-1F33B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌻) SUNFLOWER
-1F33C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌼) BLOSSOM
-1F33D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌽) EAR OF MAIZE
-1F33E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌾) EAR OF RICE
-1F33F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌿) HERB
-1F340 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍀) FOUR LEAF CLOVER
-1F341 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍁) MAPLE LEAF
-1F342 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍂) FALLEN LEAF
-1F343 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍃) LEAF FLUTTERING IN WIND
-1F344 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍄) MUSHROOM
-1F345 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍅) TOMATO
-1F346 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍆) AUBERGINE
-1F347 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍇) GRAPES
-1F348 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍈) MELON
-1F349 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍉) WATERMELON
-1F34A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍊) TANGERINE
-1F34B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🍋) LEMON
-1F34C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍌) BANANA
-1F34D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍍) PINEAPPLE
-1F34E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍎) RED APPLE
-1F34F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍏) GREEN APPLE
-1F350 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🍐) PEAR
-1F351 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍑) PEACH
-1F352 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍒) CHERRIES
-1F353 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍓) STRAWBERRY
-1F354 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍔) HAMBURGER
-1F355 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍕) SLICE OF PIZZA
-1F356 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍖) MEAT ON BONE
-1F357 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍗) POULTRY LEG
-1F358 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍘) RICE CRACKER
-1F359 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍙) RICE BALL
-1F35A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍚) COOKED RICE
-1F35B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍛) CURRY AND RICE
-1F35C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍜) STEAMING BOWL
-1F35D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍝) SPAGHETTI
-1F35E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍞) BREAD
-1F35F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍟) FRENCH FRIES
-1F360 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍠) ROASTED SWEET POTATO
-1F361 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍡) DANGO
-1F362 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍢) ODEN
-1F363 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍣) SUSHI
-1F364 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍤) FRIED SHRIMP
-1F365 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍥) FISH CAKE WITH SWIRL DESIGN
-1F366 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍦) SOFT ICE CREAM
-1F367 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍧) SHAVED ICE
-1F368 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍨) ICE CREAM
-1F369 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍩) DOUGHNUT
-1F36A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍪) COOKIE
-1F36B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍫) CHOCOLATE BAR
-1F36C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍬) CANDY
-1F36D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍭) LOLLIPOP
-1F36E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍮) CUSTARD
-1F36F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍯) HONEY POT
-1F370 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍰) SHORTCAKE
-1F371 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍱) BENTO BOX
-1F372 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍲) POT OF FOOD
-1F373 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍳) COOKING
-1F374 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍴) FORK AND KNIFE
-1F375 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍵) TEACUP WITHOUT HANDLE
-1F376 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍶) SAKE BOTTLE AND CUP
-1F377 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍷) WINE GLASS
-1F378 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🍸) COCKTAIL GLASS
-1F379 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍹) TROPICAL DRINK
-1F37A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍺) BEER MUG
-1F37B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍻) CLINKING BEER MUGS
-1F37C ;	emoji ;	L1 ;	none ;	x	# V6.0 (🍼) BABY BOTTLE
-1F37D ;	text ;	L2 ;	none ;	w	# V7.0 (🍽) FORK AND KNIFE WITH PLATE
-1F37E ;	emoji ;	L2 ;	none ;	x	# V8.0 (🍾) BOTTLE WITH POPPING CORK
-1F37F ;	emoji ;	L2 ;	none ;	x	# V8.0 (🍿) POPCORN
-1F380 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎀) RIBBON
-1F381 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎁) WRAPPED PRESENT
-1F382 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎂) BIRTHDAY CAKE
-1F383 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎃) JACK-O-LANTERN
-1F384 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎄) CHRISTMAS TREE
-1F385 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🎅) FATHER CHRISTMAS
-1F386 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎆) FIREWORKS
-1F387 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎇) FIREWORK SPARKLER
-1F388 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎈) BALLOON
-1F389 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎉) PARTY POPPER
-1F38A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎊) CONFETTI BALL
-1F38B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎋) TANABATA TREE
-1F38C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎌) CROSSED FLAGS
-1F38D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎍) PINE DECORATION
-1F38E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎎) JAPANESE DOLLS
-1F38F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎏) CARP STREAMER
-1F390 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎐) WIND CHIME
-1F391 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎑) MOON VIEWING CEREMONY
-1F392 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎒) SCHOOL SATCHEL
-1F393 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎓) GRADUATION CAP
-1F396 ;	text ;	L2 ;	none ;	w	# V7.0 (🎖) MILITARY MEDAL
-1F397 ;	text ;	L2 ;	none ;	w	# V7.0 (🎗) REMINDER RIBBON
-1F399 ;	text ;	L2 ;	none ;	w	# V7.0 (🎙) STUDIO MICROPHONE
-1F39A ;	text ;	L2 ;	none ;	w	# V7.0 (🎚) LEVEL SLIDER
-1F39B ;	text ;	L2 ;	none ;	w	# V7.0 (🎛) CONTROL KNOBS
-1F39E ;	text ;	L2 ;	none ;	w	# V7.0 (🎞) FILM FRAMES
-1F39F ;	text ;	L2 ;	none ;	w	# V7.0 (🎟) ADMISSION TICKETS
-1F3A0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎠) CAROUSEL HORSE
-1F3A1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎡) FERRIS WHEEL
-1F3A2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎢) ROLLER COASTER
-1F3A3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎣) FISHING POLE AND FISH
-1F3A4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎤) MICROPHONE
-1F3A5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎥) MOVIE CAMERA
-1F3A6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎦) CINEMA
-1F3A7 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎧) HEADPHONE
-1F3A8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎨) ARTIST PALETTE
-1F3A9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎩) TOP HAT
-1F3AA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎪) CIRCUS TENT
-1F3AB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎫) TICKET
-1F3AC ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎬) CLAPPER BOARD
-1F3AD ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎭) PERFORMING ARTS
-1F3AE ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎮) VIDEO GAME
-1F3AF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎯) DIRECT HIT
-1F3B0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎰) SLOT MACHINE
-1F3B1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎱) BILLIARDS
-1F3B2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎲) GAME DIE
-1F3B3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎳) BOWLING
-1F3B4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎴) FLOWER PLAYING CARDS
-1F3B5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎵) MUSICAL NOTE
-1F3B6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎶) MULTIPLE MUSICAL NOTES
-1F3B7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎷) SAXOPHONE
-1F3B8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎸) GUITAR
-1F3B9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎹) MUSICAL KEYBOARD
-1F3BA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎺) TRUMPET
-1F3BB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎻) VIOLIN
-1F3BC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎼) MUSICAL SCORE
-1F3BD ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎽) RUNNING SHIRT WITH SASH
-1F3BE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎾) TENNIS RACQUET AND BALL
-1F3BF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎿) SKI AND SKI BOOT
-1F3C0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏀) BASKETBALL AND HOOP
-1F3C1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏁) CHEQUERED FLAG
-1F3C2 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (🏂) SNOWBOARDER
-1F3C3 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🏃) RUNNER
-1F3C4 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (🏄) SURFER
-1F3C5 ;	emoji ;	L2 ;	none ;	x	# V7.0 (🏅) SPORTS MEDAL
-1F3C6 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🏆) TROPHY
-1F3C7 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🏇) HORSE RACING
-1F3C8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏈) AMERICAN FOOTBALL
-1F3C9 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🏉) RUGBY FOOTBALL
-1F3CA ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (🏊) SWIMMER
-1F3CB ;	text ;	L2 ;	none ;	w	# V7.0 (🏋) WEIGHT LIFTER
-1F3CC ;	text ;	L2 ;	none ;	w	# V7.0 (🏌) GOLFER
-1F3CD ;	text ;	L2 ;	none ;	w	# V7.0 (🏍) RACING MOTORCYCLE
-1F3CE ;	text ;	L2 ;	none ;	w	# V7.0 (🏎) RACING CAR
-1F3CF ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏏) CRICKET BAT AND BALL
-1F3D0 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏐) VOLLEYBALL
-1F3D1 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏑) FIELD HOCKEY STICK AND BALL
-1F3D2 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏒) ICE HOCKEY STICK AND PUCK
-1F3D3 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏓) TABLE TENNIS PADDLE AND BALL
-1F3D4 ;	text ;	L2 ;	none ;	w	# V7.0 (🏔) SNOW CAPPED MOUNTAIN
-1F3D5 ;	text ;	L2 ;	none ;	w	# V7.0 (🏕) CAMPING
-1F3D6 ;	text ;	L2 ;	none ;	w	# V7.0 (🏖) BEACH WITH UMBRELLA
-1F3D7 ;	text ;	L2 ;	none ;	w	# V7.0 (🏗) BUILDING CONSTRUCTION
-1F3D8 ;	text ;	L2 ;	none ;	w	# V7.0 (🏘) HOUSE BUILDINGS
-1F3D9 ;	text ;	L2 ;	none ;	w	# V7.0 (🏙) CITYSCAPE
-1F3DA ;	text ;	L2 ;	none ;	w	# V7.0 (🏚) DERELICT HOUSE BUILDING
-1F3DB ;	text ;	L2 ;	none ;	w	# V7.0 (🏛) CLASSICAL BUILDING
-1F3DC ;	text ;	L2 ;	none ;	w	# V7.0 (🏜) DESERT
-1F3DD ;	text ;	L2 ;	none ;	w	# V7.0 (🏝) DESERT ISLAND
-1F3DE ;	text ;	L2 ;	none ;	w	# V7.0 (🏞) NATIONAL PARK
-1F3DF ;	text ;	L2 ;	none ;	w	# V7.0 (🏟) STADIUM
-1F3E0 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🏠) HOUSE BUILDING
-1F3E1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏡) HOUSE WITH GARDEN
-1F3E2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏢) OFFICE BUILDING
-1F3E3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏣) JAPANESE POST OFFICE
-1F3E4 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🏤) EUROPEAN POST OFFICE
-1F3E5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏥) HOSPITAL
-1F3E6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏦) BANK
-1F3E7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏧) AUTOMATED TELLER MACHINE
-1F3E8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏨) HOTEL
-1F3E9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏩) LOVE HOTEL
-1F3EA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏪) CONVENIENCE STORE
-1F3EB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏫) SCHOOL
-1F3EC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏬) DEPARTMENT STORE
-1F3ED ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🏭) FACTORY
-1F3EE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏮) IZAKAYA LANTERN
-1F3EF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏯) JAPANESE CASTLE
-1F3F0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏰) EUROPEAN CASTLE
-1F3F3 ;	text ;	L2 ;	none ;	w	# V7.0 (🏳) WAVING WHITE FLAG
-1F3F4 ;	emoji ;	L2 ;	none ;	x	# V7.0 (🏴) WAVING BLACK FLAG
-1F3F5 ;	text ;	L2 ;	none ;	w	# V7.0 (🏵) ROSETTE
-1F3F7 ;	text ;	L2 ;	none ;	w	# V7.0 (🏷) LABEL
-1F3F8 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏸) BADMINTON RACQUET AND SHUTTLECOCK
-1F3F9 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏹) BOW AND ARROW
-1F3FA ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏺) AMPHORA
-1F3FB ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏻) EMOJI MODIFIER FITZPATRICK TYPE-1-2
-1F3FC ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏼) EMOJI MODIFIER FITZPATRICK TYPE-3
-1F3FD ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏽) EMOJI MODIFIER FITZPATRICK TYPE-4
-1F3FE ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏾) EMOJI MODIFIER FITZPATRICK TYPE-5
-1F3FF ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏿) EMOJI MODIFIER FITZPATRICK TYPE-6
-1F400 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐀) RAT
-1F401 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐁) MOUSE
-1F402 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐂) OX
-1F403 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐃) WATER BUFFALO
-1F404 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐄) COW
-1F405 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐅) TIGER
-1F406 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐆) LEOPARD
-1F407 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐇) RABBIT
-1F408 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🐈) CAT
-1F409 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐉) DRAGON
-1F40A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐊) CROCODILE
-1F40B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐋) WHALE
-1F40C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐌) SNAIL
-1F40D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐍) SNAKE
-1F40E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐎) HORSE
-1F40F ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐏) RAM
-1F410 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐐) GOAT
-1F411 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐑) SHEEP
-1F412 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐒) MONKEY
-1F413 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐓) ROOSTER
-1F414 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐔) CHICKEN
-1F415 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🐕) DOG
-1F416 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐖) PIG
-1F417 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐗) BOAR
-1F418 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐘) ELEPHANT
-1F419 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐙) OCTOPUS
-1F41A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐚) SPIRAL SHELL
-1F41B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐛) BUG
-1F41C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐜) ANT
-1F41D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐝) HONEYBEE
-1F41E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐞) LADY BEETLE
-1F41F ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🐟) FISH
-1F420 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐠) TROPICAL FISH
-1F421 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐡) BLOWFISH
-1F422 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐢) TURTLE
-1F423 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐣) HATCHING CHICK
-1F424 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐤) BABY CHICK
-1F425 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐥) FRONT-FACING BABY CHICK
-1F426 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🐦) BIRD
-1F427 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐧) PENGUIN
-1F428 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐨) KOALA
-1F429 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐩) POODLE
-1F42A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐪) DROMEDARY CAMEL
-1F42B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐫) BACTRIAN CAMEL
-1F42C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐬) DOLPHIN
-1F42D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐭) MOUSE FACE
-1F42E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐮) COW FACE
-1F42F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐯) TIGER FACE
-1F430 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐰) RABBIT FACE
-1F431 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐱) CAT FACE
-1F432 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐲) DRAGON FACE
-1F433 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐳) SPOUTING WHALE
-1F434 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐴) HORSE FACE
-1F435 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐵) MONKEY FACE
-1F436 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐶) DOG FACE
-1F437 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐷) PIG FACE
-1F438 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐸) FROG FACE
-1F439 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐹) HAMSTER FACE
-1F43A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐺) WOLF FACE
-1F43B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐻) BEAR FACE
-1F43C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐼) PANDA FACE
-1F43D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐽) PIG NOSE
-1F43E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐾) PAW PRINTS
-1F43F ;	text ;	L2 ;	none ;	w	# V7.0 (🐿) CHIPMUNK
-1F440 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👀) EYES
-1F441 ;	text ;	L2 ;	none ;	w	# V7.0 (👁) EYE
-1F442 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👂) EAR
-1F443 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👃) NOSE
-1F444 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👄) MOUTH
-1F445 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👅) TONGUE
-1F446 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👆) WHITE UP POINTING BACKHAND INDEX
-1F447 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👇) WHITE DOWN POINTING BACKHAND INDEX
-1F448 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👈) WHITE LEFT POINTING BACKHAND INDEX
-1F449 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👉) WHITE RIGHT POINTING BACKHAND INDEX
-1F44A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👊) FISTED HAND SIGN
-1F44B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👋) WAVING HAND SIGN
-1F44C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👌) OK HAND SIGN
-1F44D ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👍) THUMBS UP SIGN
-1F44E ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👎) THUMBS DOWN SIGN
-1F44F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👏) CLAPPING HANDS SIGN
-1F450 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👐) OPEN HANDS SIGN
-1F451 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👑) CROWN
-1F452 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👒) WOMANS HAT
-1F453 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (👓) EYEGLASSES
-1F454 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👔) NECKTIE
-1F455 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👕) T-SHIRT
-1F456 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👖) JEANS
-1F457 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👗) DRESS
-1F458 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👘) KIMONO
-1F459 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👙) BIKINI
-1F45A ;	emoji ;	L1 ;	none ;	j	# V6.0 (👚) WOMANS CLOTHES
-1F45B ;	emoji ;	L1 ;	none ;	j	# V6.0 (👛) PURSE
-1F45C ;	emoji ;	L1 ;	none ;	j	# V6.0 (👜) HANDBAG
-1F45D ;	emoji ;	L1 ;	none ;	j	# V6.0 (👝) POUCH
-1F45E ;	emoji ;	L1 ;	none ;	j	# V6.0 (👞) MANS SHOE
-1F45F ;	emoji ;	L1 ;	none ;	j	# V6.0 (👟) ATHLETIC SHOE
-1F460 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👠) HIGH-HEELED SHOE
-1F461 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👡) WOMANS SANDAL
-1F462 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👢) WOMANS BOOTS
-1F463 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👣) FOOTPRINTS
-1F464 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👤) BUST IN SILHOUETTE
-1F465 ;	emoji ;	L1 ;	none ;	x	# V6.0 (👥) BUSTS IN SILHOUETTE
-1F466 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👦) BOY
-1F467 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👧) GIRL
-1F468 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👨) MAN
-1F469 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👩) WOMAN
-1F46A ;	emoji ;	L1 ;	none ;	j w	# V6.0 (👪) FAMILY
-1F46B ;	emoji ;	L1 ;	none ;	j	# V6.0 (👫) MAN AND WOMAN HOLDING HANDS
-1F46C ;	emoji ;	L1 ;	none ;	x	# V6.0 (👬) TWO MEN HOLDING HANDS
-1F46D ;	emoji ;	L1 ;	none ;	x	# V6.0 (👭) TWO WOMEN HOLDING HANDS
-1F46E ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👮) POLICE OFFICER
-1F46F ;	emoji ;	L1 ;	none ;	j	# V6.0 (👯) WOMAN WITH BUNNY EARS
-1F470 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👰) BRIDE WITH VEIL
-1F471 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👱) PERSON WITH BLOND HAIR
-1F472 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👲) MAN WITH GUA PI MAO
-1F473 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👳) MAN WITH TURBAN
-1F474 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👴) OLDER MAN
-1F475 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👵) OLDER WOMAN
-1F476 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👶) BABY
-1F477 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👷) CONSTRUCTION WORKER
-1F478 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👸) PRINCESS
-1F479 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👹) JAPANESE OGRE
-1F47A ;	emoji ;	L1 ;	none ;	j	# V6.0 (👺) JAPANESE GOBLIN
-1F47B ;	emoji ;	L1 ;	none ;	j	# V6.0 (👻) GHOST
-1F47C ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👼) BABY ANGEL
-1F47D ;	emoji ;	L1 ;	none ;	j w	# V6.0 (👽) EXTRATERRESTRIAL ALIEN
-1F47E ;	emoji ;	L1 ;	none ;	j	# V6.0 (👾) ALIEN MONSTER
-1F47F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👿) IMP
-1F480 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💀) SKULL
-1F481 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💁) INFORMATION DESK PERSON
-1F482 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💂) GUARDSMAN
-1F483 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (💃) DANCER
-1F484 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💄) LIPSTICK
-1F485 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (💅) NAIL POLISH
-1F486 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💆) FACE MASSAGE
-1F487 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💇) HAIRCUT
-1F488 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💈) BARBER POLE
-1F489 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💉) SYRINGE
-1F48A ;	emoji ;	L1 ;	none ;	j	# V6.0 (💊) PILL
-1F48B ;	emoji ;	L1 ;	none ;	j	# V6.0 (💋) KISS MARK
-1F48C ;	emoji ;	L1 ;	none ;	j	# V6.0 (💌) LOVE LETTER
-1F48D ;	emoji ;	L1 ;	none ;	j	# V6.0 (💍) RING
-1F48E ;	emoji ;	L1 ;	none ;	j	# V6.0 (💎) GEM STONE
-1F48F ;	emoji ;	L1 ;	none ;	j	# V6.0 (💏) KISS
-1F490 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💐) BOUQUET
-1F491 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💑) COUPLE WITH HEART
-1F492 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💒) WEDDING
-1F493 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💓) BEATING HEART
-1F494 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💔) BROKEN HEART
-1F495 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💕) TWO HEARTS
-1F496 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💖) SPARKLING HEART
-1F497 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💗) GROWING HEART
-1F498 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💘) HEART WITH ARROW
-1F499 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💙) BLUE HEART
-1F49A ;	emoji ;	L1 ;	none ;	j	# V6.0 (💚) GREEN HEART
-1F49B ;	emoji ;	L1 ;	none ;	j	# V6.0 (💛) YELLOW HEART
-1F49C ;	emoji ;	L1 ;	none ;	j	# V6.0 (💜) PURPLE HEART
-1F49D ;	emoji ;	L1 ;	none ;	j	# V6.0 (💝) HEART WITH RIBBON
-1F49E ;	emoji ;	L1 ;	none ;	j	# V6.0 (💞) REVOLVING HEARTS
-1F49F ;	emoji ;	L1 ;	none ;	j	# V6.0 (💟) HEART DECORATION
-1F4A0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💠) DIAMOND SHAPE WITH A DOT INSIDE
-1F4A1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💡) ELECTRIC LIGHT BULB
-1F4A2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💢) ANGER SYMBOL
-1F4A3 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💣) BOMB
-1F4A4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💤) SLEEPING SYMBOL
-1F4A5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💥) COLLISION SYMBOL
-1F4A6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💦) SPLASHING SWEAT SYMBOL
-1F4A7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💧) DROPLET
-1F4A8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💨) DASH SYMBOL
-1F4A9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💩) PILE OF POO
-1F4AA ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (💪) FLEXED BICEPS
-1F4AB ;	emoji ;	L1 ;	none ;	j	# V6.0 (💫) DIZZY SYMBOL
-1F4AC ;	emoji ;	L1 ;	none ;	j	# V6.0 (💬) SPEECH BALLOON
-1F4AD ;	emoji ;	L1 ;	none ;	x	# V6.0 (💭) THOUGHT BALLOON
-1F4AE ;	emoji ;	L1 ;	none ;	j	# V6.0 (💮) WHITE FLOWER
-1F4AF ;	emoji ;	L1 ;	none ;	j	# V6.0 (💯) HUNDRED POINTS SYMBOL
-1F4B0 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💰) MONEY BAG
-1F4B1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💱) CURRENCY EXCHANGE
-1F4B2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💲) HEAVY DOLLAR SIGN
-1F4B3 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💳) CREDIT CARD
-1F4B4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💴) BANKNOTE WITH YEN SIGN
-1F4B5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💵) BANKNOTE WITH DOLLAR SIGN
-1F4B6 ;	emoji ;	L1 ;	none ;	x	# V6.0 (💶) BANKNOTE WITH EURO SIGN
-1F4B7 ;	emoji ;	L1 ;	none ;	x	# V6.0 (💷) BANKNOTE WITH POUND SIGN
-1F4B8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💸) MONEY WITH WINGS
-1F4B9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💹) CHART WITH UPWARDS TREND AND YEN SIGN
-1F4BA ;	emoji ;	L1 ;	none ;	j	# V6.0 (💺) SEAT
-1F4BB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💻) PERSONAL COMPUTER
-1F4BC ;	emoji ;	L1 ;	none ;	j	# V6.0 (💼) BRIEFCASE
-1F4BD ;	emoji ;	L1 ;	none ;	j	# V6.0 (💽) MINIDISC
-1F4BE ;	emoji ;	L1 ;	none ;	j	# V6.0 (💾) FLOPPY DISK
-1F4BF ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💿) OPTICAL DISC
-1F4C0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📀) DVD
-1F4C1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📁) FILE FOLDER
-1F4C2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📂) OPEN FILE FOLDER
-1F4C3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📃) PAGE WITH CURL
-1F4C4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📄) PAGE FACING UP
-1F4C5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📅) CALENDAR
-1F4C6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📆) TEAR-OFF CALENDAR
-1F4C7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📇) CARD INDEX
-1F4C8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📈) CHART WITH UPWARDS TREND
-1F4C9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📉) CHART WITH DOWNWARDS TREND
-1F4CA ;	emoji ;	L1 ;	none ;	j	# V6.0 (📊) BAR CHART
-1F4CB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📋) CLIPBOARD
-1F4CC ;	emoji ;	L1 ;	none ;	j	# V6.0 (📌) PUSHPIN
-1F4CD ;	emoji ;	L1 ;	none ;	j	# V6.0 (📍) ROUND PUSHPIN
-1F4CE ;	emoji ;	L1 ;	none ;	j	# V6.0 (📎) PAPERCLIP
-1F4CF ;	emoji ;	L1 ;	none ;	j	# V6.0 (📏) STRAIGHT RULER
-1F4D0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📐) TRIANGULAR RULER
-1F4D1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📑) BOOKMARK TABS
-1F4D2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📒) LEDGER
-1F4D3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📓) NOTEBOOK
-1F4D4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📔) NOTEBOOK WITH DECORATIVE COVER
-1F4D5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📕) CLOSED BOOK
-1F4D6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📖) OPEN BOOK
-1F4D7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📗) GREEN BOOK
-1F4D8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📘) BLUE BOOK
-1F4D9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📙) ORANGE BOOK
-1F4DA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📚) BOOKS
-1F4DB ;	emoji ;	L1 ;	none ;	j	# V6.0 (📛) NAME BADGE
-1F4DC ;	emoji ;	L1 ;	none ;	j	# V6.0 (📜) SCROLL
-1F4DD ;	emoji ;	L1 ;	none ;	j	# V6.0 (📝) MEMO
-1F4DE ;	emoji ;	L1 ;	none ;	j	# V6.0 (📞) TELEPHONE RECEIVER
-1F4DF ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📟) PAGER
-1F4E0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📠) FAX MACHINE
-1F4E1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📡) SATELLITE ANTENNA
-1F4E2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📢) PUBLIC ADDRESS LOUDSPEAKER
-1F4E3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📣) CHEERING MEGAPHONE
-1F4E4 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📤) OUTBOX TRAY
-1F4E5 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📥) INBOX TRAY
-1F4E6 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📦) PACKAGE
-1F4E7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📧) E-MAIL SYMBOL
-1F4E8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📨) INCOMING ENVELOPE
-1F4E9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📩) ENVELOPE WITH DOWNWARDS ARROW ABOVE
-1F4EA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📪) CLOSED MAILBOX WITH LOWERED FLAG
-1F4EB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📫) CLOSED MAILBOX WITH RAISED FLAG
-1F4EC ;	emoji ;	L1 ;	none ;	w	# V6.0 (📬) OPEN MAILBOX WITH RAISED FLAG
-1F4ED ;	emoji ;	L1 ;	none ;	w	# V6.0 (📭) OPEN MAILBOX WITH LOWERED FLAG
-1F4EE ;	emoji ;	L1 ;	none ;	j	# V6.0 (📮) POSTBOX
-1F4EF ;	emoji ;	L1 ;	none ;	x	# V6.0 (📯) POSTAL HORN
-1F4F0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📰) NEWSPAPER
-1F4F1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📱) MOBILE PHONE
-1F4F2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📲) MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT
-1F4F3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📳) VIBRATION MODE
-1F4F4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📴) MOBILE PHONE OFF
-1F4F5 ;	emoji ;	L1 ;	none ;	x	# V6.0 (📵) NO MOBILE PHONES
-1F4F6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📶) ANTENNA WITH BARS
-1F4F7 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📷) CAMERA
-1F4F8 ;	emoji ;	L2 ;	none ;	x	# V7.0 (📸) CAMERA WITH FLASH
-1F4F9 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📹) VIDEO CAMERA
-1F4FA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📺) TELEVISION
-1F4FB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📻) RADIO
-1F4FC ;	emoji ;	L1 ;	none ;	j	# V6.0 (📼) VIDEOCASSETTE
-1F4FD ;	text ;	L2 ;	none ;	w	# V7.0 (📽) FILM PROJECTOR
-1F4FF ;	emoji ;	L2 ;	none ;	x	# V8.0 (📿) PRAYER BEADS
-1F500 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔀) TWISTED RIGHTWARDS ARROWS
-1F501 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔁) CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS
-1F502 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔂) CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY
-1F503 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔃) CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS
-1F504 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔄) ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS
-1F505 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔅) LOW BRIGHTNESS SYMBOL
-1F506 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔆) HIGH BRIGHTNESS SYMBOL
-1F507 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔇) SPEAKER WITH CANCELLATION STROKE
-1F508 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🔈) SPEAKER
-1F509 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔉) SPEAKER WITH ONE SOUND WAVE
-1F50A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔊) SPEAKER WITH THREE SOUND WAVES
-1F50B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔋) BATTERY
-1F50C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔌) ELECTRIC PLUG
-1F50D ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🔍) LEFT-POINTING MAGNIFYING GLASS
-1F50E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔎) RIGHT-POINTING MAGNIFYING GLASS
-1F50F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔏) LOCK WITH INK PEN
-1F510 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔐) CLOSED LOCK WITH KEY
-1F511 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔑) KEY
-1F512 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🔒) LOCK
-1F513 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🔓) OPEN LOCK
-1F514 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔔) BELL
-1F515 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔕) BELL WITH CANCELLATION STROKE
-1F516 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔖) BOOKMARK
-1F517 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔗) LINK SYMBOL
-1F518 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔘) RADIO BUTTON
-1F519 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔙) BACK WITH LEFTWARDS ARROW ABOVE
-1F51A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔚) END WITH LEFTWARDS ARROW ABOVE
-1F51B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔛) ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE
-1F51C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔜) SOON WITH RIGHTWARDS ARROW ABOVE
-1F51D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔝) TOP WITH UPWARDS ARROW ABOVE
-1F51E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔞) NO ONE UNDER EIGHTEEN SYMBOL
-1F51F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔟) KEYCAP TEN
-1F520 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔠) INPUT SYMBOL FOR LATIN CAPITAL LETTERS
-1F521 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔡) INPUT SYMBOL FOR LATIN SMALL LETTERS
-1F522 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔢) INPUT SYMBOL FOR NUMBERS
-1F523 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔣) INPUT SYMBOL FOR SYMBOLS
-1F524 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔤) INPUT SYMBOL FOR LATIN LETTERS
-1F525 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔥) FIRE
-1F526 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔦) ELECTRIC TORCH
-1F527 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔧) WRENCH
-1F528 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔨) HAMMER
-1F529 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔩) NUT AND BOLT
-1F52A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔪) HOCHO
-1F52B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔫) PISTOL
-1F52C ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔬) MICROSCOPE
-1F52D ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔭) TELESCOPE
-1F52E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔮) CRYSTAL BALL
-1F52F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔯) SIX POINTED STAR WITH MIDDLE DOT
-1F530 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔰) JAPANESE SYMBOL FOR BEGINNER
-1F531 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔱) TRIDENT EMBLEM
-1F532 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔲) BLACK SQUARE BUTTON
-1F533 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔳) WHITE SQUARE BUTTON
-1F534 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔴) LARGE RED CIRCLE
-1F535 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔵) LARGE BLUE CIRCLE
-1F536 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔶) LARGE ORANGE DIAMOND
-1F537 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔷) LARGE BLUE DIAMOND
-1F538 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔸) SMALL ORANGE DIAMOND
-1F539 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔹) SMALL BLUE DIAMOND
-1F53A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔺) UP-POINTING RED TRIANGLE
-1F53B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔻) DOWN-POINTING RED TRIANGLE
-1F53C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔼) UP-POINTING SMALL RED TRIANGLE
-1F53D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔽) DOWN-POINTING SMALL RED TRIANGLE
-1F549 ;	text ;	L2 ;	none ;	w	# V7.0 (🕉) OM SYMBOL
-1F54A ;	text ;	L2 ;	none ;	w	# V7.0 (🕊) DOVE OF PEACE
-1F54B ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕋) KAABA
-1F54C ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕌) MOSQUE
-1F54D ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕍) SYNAGOGUE
-1F54E ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕎) MENORAH WITH NINE BRANCHES
-1F550 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕐) CLOCK FACE ONE OCLOCK
-1F551 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕑) CLOCK FACE TWO OCLOCK
-1F552 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕒) CLOCK FACE THREE OCLOCK
-1F553 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕓) CLOCK FACE FOUR OCLOCK
-1F554 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕔) CLOCK FACE FIVE OCLOCK
-1F555 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕕) CLOCK FACE SIX OCLOCK
-1F556 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕖) CLOCK FACE SEVEN OCLOCK
-1F557 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕗) CLOCK FACE EIGHT OCLOCK
-1F558 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕘) CLOCK FACE NINE OCLOCK
-1F559 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕙) CLOCK FACE TEN OCLOCK
-1F55A ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕚) CLOCK FACE ELEVEN OCLOCK
-1F55B ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕛) CLOCK FACE TWELVE OCLOCK
-1F55C ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕜) CLOCK FACE ONE-THIRTY
-1F55D ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕝) CLOCK FACE TWO-THIRTY
-1F55E ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕞) CLOCK FACE THREE-THIRTY
-1F55F ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕟) CLOCK FACE FOUR-THIRTY
-1F560 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕠) CLOCK FACE FIVE-THIRTY
-1F561 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕡) CLOCK FACE SIX-THIRTY
-1F562 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕢) CLOCK FACE SEVEN-THIRTY
-1F563 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕣) CLOCK FACE EIGHT-THIRTY
-1F564 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕤) CLOCK FACE NINE-THIRTY
-1F565 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕥) CLOCK FACE TEN-THIRTY
-1F566 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕦) CLOCK FACE ELEVEN-THIRTY
-1F567 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕧) CLOCK FACE TWELVE-THIRTY
-1F56F ;	text ;	L2 ;	none ;	w	# V7.0 (🕯) CANDLE
-1F570 ;	text ;	L2 ;	none ;	w	# V7.0 (🕰) MANTELPIECE CLOCK
-1F573 ;	text ;	L2 ;	none ;	w	# V7.0 (🕳) HOLE
-1F574 ;	text ;	L2 ;	none ;	w	# V7.0 (🕴) MAN IN BUSINESS SUIT LEVITATING
-1F575 ;	text ;	L2 ;	none ;	w	# V7.0 (🕵) SLEUTH OR SPY
-1F576 ;	text ;	L2 ;	none ;	w	# V7.0 (🕶) DARK SUNGLASSES
-1F577 ;	text ;	L2 ;	none ;	w	# V7.0 (🕷) SPIDER
-1F578 ;	text ;	L2 ;	none ;	w	# V7.0 (🕸) SPIDER WEB
-1F579 ;	text ;	L2 ;	none ;	w	# V7.0 (🕹) JOYSTICK
-1F587 ;	text ;	L2 ;	none ;	w	# V7.0 (🖇) LINKED PAPERCLIPS
-1F58A ;	text ;	L2 ;	none ;	w	# V7.0 (🖊) LOWER LEFT BALLPOINT PEN
-1F58B ;	text ;	L2 ;	none ;	w	# V7.0 (🖋) LOWER LEFT FOUNTAIN PEN
-1F58C ;	text ;	L2 ;	none ;	w	# V7.0 (🖌) LOWER LEFT PAINTBRUSH
-1F58D ;	text ;	L2 ;	none ;	w	# V7.0 (🖍) LOWER LEFT CRAYON
-1F590 ;	text ;	L2 ;	secondary ;	w	# V7.0 (🖐) RAISED HAND WITH FINGERS SPLAYED
-1F595 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🖕) REVERSED HAND WITH MIDDLE FINGER EXTENDED
-1F596 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🖖) RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
-1F5A5 ;	text ;	L2 ;	none ;	w	# V7.0 (🖥) DESKTOP COMPUTER
-1F5A8 ;	text ;	L2 ;	none ;	w	# V7.0 (🖨) PRINTER
-1F5B1 ;	text ;	L2 ;	none ;	w	# V7.0 (🖱) THREE BUTTON MOUSE
-1F5B2 ;	text ;	L2 ;	none ;	w	# V7.0 (🖲) TRACKBALL
-1F5BC ;	text ;	L2 ;	none ;	w	# V7.0 (🖼) FRAME WITH PICTURE
-1F5C2 ;	text ;	L2 ;	none ;	w	# V7.0 (🗂) CARD INDEX DIVIDERS
-1F5C3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗃) CARD FILE BOX
-1F5C4 ;	text ;	L2 ;	none ;	w	# V7.0 (🗄) FILE CABINET
-1F5D1 ;	text ;	L2 ;	none ;	w	# V7.0 (🗑) WASTEBASKET
-1F5D2 ;	text ;	L2 ;	none ;	w	# V7.0 (🗒) SPIRAL NOTE PAD
-1F5D3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗓) SPIRAL CALENDAR PAD
-1F5DC ;	text ;	L2 ;	none ;	w	# V7.0 (🗜) COMPRESSION
-1F5DD ;	text ;	L2 ;	none ;	w	# V7.0 (🗝) OLD KEY
-1F5DE ;	text ;	L2 ;	none ;	w	# V7.0 (🗞) ROLLED-UP NEWSPAPER
-1F5E1 ;	text ;	L2 ;	none ;	w	# V7.0 (🗡) DAGGER KNIFE
-1F5E3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗣) SPEAKING HEAD IN SILHOUETTE
-1F5EF ;	text ;	L2 ;	none ;	w	# V7.0 (🗯) RIGHT ANGER BUBBLE
-1F5F3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗳) BALLOT BOX WITH BALLOT
-1F5FA ;	text ;	L2 ;	none ;	w	# V7.0 (🗺) WORLD MAP
-1F5FB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗻) MOUNT FUJI
-1F5FC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗼) TOKYO TOWER
-1F5FD ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗽) STATUE OF LIBERTY
-1F5FE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗾) SILHOUETTE OF JAPAN
-1F5FF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗿) MOYAI
-1F600 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😀) GRINNING FACE
-1F601 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😁) GRINNING FACE WITH SMILING EYES
-1F602 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😂) FACE WITH TEARS OF JOY
-1F603 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😃) SMILING FACE WITH OPEN MOUTH
-1F604 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😄) SMILING FACE WITH OPEN MOUTH AND SMILING EYES
-1F605 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😅) SMILING FACE WITH OPEN MOUTH AND COLD SWEAT
-1F606 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😆) SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES
-1F607 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😇) SMILING FACE WITH HALO
-1F608 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😈) SMILING FACE WITH HORNS
-1F609 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😉) WINKING FACE
-1F60A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😊) SMILING FACE WITH SMILING EYES
-1F60B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😋) FACE SAVOURING DELICIOUS FOOD
-1F60C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😌) RELIEVED FACE
-1F60D ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😍) SMILING FACE WITH HEART-SHAPED EYES
-1F60E ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😎) SMILING FACE WITH SUNGLASSES
-1F60F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😏) SMIRKING FACE
-1F610 ;	emoji ;	L1 ;	secondary ;	w	# V6.0 (😐) NEUTRAL FACE
-1F611 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😑) EXPRESSIONLESS FACE
-1F612 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😒) UNAMUSED FACE
-1F613 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😓) FACE WITH COLD SWEAT
-1F614 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😔) PENSIVE FACE
-1F615 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😕) CONFUSED FACE
-1F616 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😖) CONFOUNDED FACE
-1F617 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😗) KISSING FACE
-1F618 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😘) FACE THROWING A KISS
-1F619 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😙) KISSING FACE WITH SMILING EYES
-1F61A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😚) KISSING FACE WITH CLOSED EYES
-1F61B ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😛) FACE WITH STUCK-OUT TONGUE
-1F61C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😜) FACE WITH STUCK-OUT TONGUE AND WINKING EYE
-1F61D ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😝) FACE WITH STUCK-OUT TONGUE AND TIGHTLY-CLOSED EYES
-1F61E ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😞) DISAPPOINTED FACE
-1F61F ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😟) WORRIED FACE
-1F620 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😠) ANGRY FACE
-1F621 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😡) POUTING FACE
-1F622 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😢) CRYING FACE
-1F623 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😣) PERSEVERING FACE
-1F624 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😤) FACE WITH LOOK OF TRIUMPH
-1F625 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😥) DISAPPOINTED BUT RELIEVED FACE
-1F626 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😦) FROWNING FACE WITH OPEN MOUTH
-1F627 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😧) ANGUISHED FACE
-1F628 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😨) FEARFUL FACE
-1F629 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😩) WEARY FACE
-1F62A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😪) SLEEPY FACE
-1F62B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😫) TIRED FACE
-1F62C ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😬) GRIMACING FACE
-1F62D ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😭) LOUDLY CRYING FACE
-1F62E ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😮) FACE WITH OPEN MOUTH
-1F62F ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😯) HUSHED FACE
-1F630 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😰) FACE WITH OPEN MOUTH AND COLD SWEAT
-1F631 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😱) FACE SCREAMING IN FEAR
-1F632 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😲) ASTONISHED FACE
-1F633 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😳) FLUSHED FACE
-1F634 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😴) SLEEPING FACE
-1F635 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😵) DIZZY FACE
-1F636 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😶) FACE WITHOUT MOUTH
-1F637 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😷) FACE WITH MEDICAL MASK
-1F638 ;	emoji ;	L1 ;	none ;	j	# V6.0 (😸) GRINNING CAT FACE WITH SMILING EYES
-1F639 ;	emoji ;	L1 ;	none ;	j	# V6.0 (😹) CAT FACE WITH TEARS OF JOY
-1F63A ;	emoji ;	L1 ;	none ;	j	# V6.0 (😺) SMILING CAT FACE WITH OPEN MOUTH
-1F63B ;	emoji ;	L1 ;	none ;	j	# V6.0 (😻) SMILING CAT FACE WITH HEART-SHAPED EYES
-1F63C ;	emoji ;	L1 ;	none ;	j	# V6.0 (😼) CAT FACE WITH WRY SMILE
-1F63D ;	emoji ;	L1 ;	none ;	j	# V6.0 (😽) KISSING CAT FACE WITH CLOSED EYES
-1F63E ;	emoji ;	L1 ;	none ;	j	# V6.0 (😾) POUTING CAT FACE
-1F63F ;	emoji ;	L1 ;	none ;	j	# V6.0 (😿) CRYING CAT FACE
-1F640 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙀) WEARY CAT FACE
-1F641 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🙁) SLIGHTLY FROWNING FACE
-1F642 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🙂) SLIGHTLY SMILING FACE
-1F643 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🙃) UPSIDE-DOWN FACE
-1F644 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🙄) FACE WITH ROLLING EYES
-1F645 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙅) FACE WITH NO GOOD GESTURE
-1F646 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙆) FACE WITH OK GESTURE
-1F647 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙇) PERSON BOWING DEEPLY
-1F648 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙈) SEE-NO-EVIL MONKEY
-1F649 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙉) HEAR-NO-EVIL MONKEY
-1F64A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙊) SPEAK-NO-EVIL MONKEY
-1F64B ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙋) HAPPY PERSON RAISING ONE HAND
-1F64C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🙌) PERSON RAISING BOTH HANDS IN CELEBRATION
-1F64D ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙍) PERSON FROWNING
-1F64E ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙎) PERSON WITH POUTING FACE
-1F64F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🙏) PERSON WITH FOLDED HANDS
-1F680 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚀) ROCKET
-1F681 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚁) HELICOPTER
-1F682 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚂) STEAM LOCOMOTIVE
-1F683 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚃) RAILWAY CAR
-1F684 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚄) HIGH-SPEED TRAIN
-1F685 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚅) HIGH-SPEED TRAIN WITH BULLET NOSE
-1F686 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚆) TRAIN
-1F687 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚇) METRO
-1F688 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚈) LIGHT RAIL
-1F689 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚉) STATION
-1F68A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚊) TRAM
-1F68B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚋) TRAM CAR
-1F68C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚌) BUS
-1F68D ;	emoji ;	L1 ;	none ;	w	# V6.0 (🚍) ONCOMING BUS
-1F68E ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚎) TROLLEYBUS
-1F68F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚏) BUS STOP
-1F690 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚐) MINIBUS
-1F691 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚑) AMBULANCE
-1F692 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚒) FIRE ENGINE
-1F693 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚓) POLICE CAR
-1F694 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🚔) ONCOMING POLICE CAR
-1F695 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚕) TAXI
-1F696 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚖) ONCOMING TAXI
-1F697 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚗) AUTOMOBILE
-1F698 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🚘) ONCOMING AUTOMOBILE
-1F699 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚙) RECREATIONAL VEHICLE
-1F69A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚚) DELIVERY TRUCK
-1F69B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚛) ARTICULATED LORRY
-1F69C ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚜) TRACTOR
-1F69D ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚝) MONORAIL
-1F69E ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚞) MOUNTAIN RAILWAY
-1F69F ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚟) SUSPENSION RAILWAY
-1F6A0 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚠) MOUNTAIN CABLEWAY
-1F6A1 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚡) AERIAL TRAMWAY
-1F6A2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚢) SHIP
-1F6A3 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🚣) ROWBOAT
-1F6A4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚤) SPEEDBOAT
-1F6A5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚥) HORIZONTAL TRAFFIC LIGHT
-1F6A6 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚦) VERTICAL TRAFFIC LIGHT
-1F6A7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚧) CONSTRUCTION SIGN
-1F6A8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚨) POLICE CARS REVOLVING LIGHT
-1F6A9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚩) TRIANGULAR FLAG ON POST
-1F6AA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚪) DOOR
-1F6AB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚫) NO ENTRY SIGN
-1F6AC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚬) SMOKING SYMBOL
-1F6AD ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚭) NO SMOKING SYMBOL
-1F6AE ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚮) PUT LITTER IN ITS PLACE SYMBOL
-1F6AF ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚯) DO NOT LITTER SYMBOL
-1F6B0 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚰) POTABLE WATER SYMBOL
-1F6B1 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚱) NON-POTABLE WATER SYMBOL
-1F6B2 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚲) BICYCLE
-1F6B3 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚳) NO BICYCLES
-1F6B4 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🚴) BICYCLIST
-1F6B5 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🚵) MOUNTAIN BICYCLIST
-1F6B6 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🚶) PEDESTRIAN
-1F6B7 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚷) NO PEDESTRIANS
-1F6B8 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚸) CHILDREN CROSSING
-1F6B9 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚹) MENS SYMBOL
-1F6BA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚺) WOMENS SYMBOL
-1F6BB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚻) RESTROOM
-1F6BC ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚼) BABY SYMBOL
-1F6BD ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚽) TOILET
-1F6BE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚾) WATER CLOSET
-1F6BF ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚿) SHOWER
-1F6C0 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🛀) BATH
-1F6C1 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛁) BATHTUB
-1F6C2 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛂) PASSPORT CONTROL
-1F6C3 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛃) CUSTOMS
-1F6C4 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛄) BAGGAGE CLAIM
-1F6C5 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛅) LEFT LUGGAGE
-1F6CB ;	text ;	L2 ;	none ;	w	# V7.0 (🛋) COUCH AND LAMP
-1F6CC ;	emoji ;	L2 ;	none ;	x	# V7.0 (🛌) SLEEPING ACCOMMODATION
-1F6CD ;	text ;	L2 ;	none ;	w	# V7.0 (🛍) SHOPPING BAGS
-1F6CE ;	text ;	L2 ;	none ;	w	# V7.0 (🛎) BELLHOP BELL
-1F6CF ;	text ;	L2 ;	none ;	w	# V7.0 (🛏) BED
-1F6D0 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🛐) PLACE OF WORSHIP
-1F6E0 ;	text ;	L2 ;	none ;	w	# V7.0 (🛠) HAMMER AND WRENCH
-1F6E1 ;	text ;	L2 ;	none ;	w	# V7.0 (🛡) SHIELD
-1F6E2 ;	text ;	L2 ;	none ;	w	# V7.0 (🛢) OIL DRUM
-1F6E3 ;	text ;	L2 ;	none ;	w	# V7.0 (🛣) MOTORWAY
-1F6E4 ;	text ;	L2 ;	none ;	w	# V7.0 (🛤) RAILWAY TRACK
-1F6E5 ;	text ;	L2 ;	none ;	w	# V7.0 (🛥) MOTOR BOAT
-1F6E9 ;	text ;	L2 ;	none ;	w	# V7.0 (🛩) SMALL AIRPLANE
-1F6EB ;	emoji ;	L2 ;	none ;	x	# V7.0 (🛫) AIRPLANE DEPARTURE
-1F6EC ;	emoji ;	L2 ;	none ;	x	# V7.0 (🛬) AIRPLANE ARRIVING
-1F6F0 ;	text ;	L2 ;	none ;	w	# V7.0 (🛰) SATELLITE
-1F6F3 ;	text ;	L2 ;	none ;	w	# V7.0 (🛳) PASSENGER SHIP
-1F910 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤐) ZIPPER-MOUTH FACE
-1F911 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤑) MONEY-MOUTH FACE
-1F912 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤒) FACE WITH THERMOMETER
-1F913 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤓) NERD FACE
-1F914 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤔) THINKING FACE
-1F915 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤕) FACE WITH HEAD-BANDAGE
-1F916 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🤖) ROBOT FACE
-1F917 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤗) HUGGING FACE
-1F918 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤘) SIGN OF THE HORNS
-1F980 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦀) CRAB
-1F981 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦁) LION FACE
-1F982 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦂) SCORPION
-1F983 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦃) TURKEY
-1F984 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦄) UNICORN FACE
-1F9C0 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🧀) CHEESE WEDGE
-0023 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (#⃣) keycap NUMBER SIGN
-002A 20E3 ;	text ;	L2 ;	none ;	x	# V3.0 (*⃣) keycap ASTERISK
-0030 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (0⃣) keycap DIGIT ZERO
-0031 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (1⃣) keycap DIGIT ONE
-0032 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (2⃣) keycap DIGIT TWO
-0033 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (3⃣) keycap DIGIT THREE
-0034 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (4⃣) keycap DIGIT FOUR
-0035 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (5⃣) keycap DIGIT FIVE
-0036 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (6⃣) keycap DIGIT SIX
-0037 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (7⃣) keycap DIGIT SEVEN
-0038 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (8⃣) keycap DIGIT EIGHT
-0039 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (9⃣) keycap DIGIT NINE
-1F1E6 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇨) flag for Ascension Island
-1F1E6 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇩) flag for Andorra
-1F1E6 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇪) flag for United Arab Emirates
-1F1E6 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇫) flag for Afghanistan
-1F1E6 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇬) flag for Antigua & Barbuda
-1F1E6 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇮) flag for Anguilla
-1F1E6 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇱) flag for Albania
-1F1E6 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇲) flag for Armenia
-1F1E6 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇴) flag for Angola
-1F1E6 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇶) flag for Antarctica
-1F1E6 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇷) flag for Argentina
-1F1E6 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇸) flag for American Samoa
-1F1E6 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇹) flag for Austria
-1F1E6 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇺) flag for Australia
-1F1E6 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇼) flag for Aruba
-1F1E6 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇽) flag for Åland Islands
-1F1E6 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇿) flag for Azerbaijan
-1F1E7 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇦) flag for Bosnia & Herzegovina
-1F1E7 1F1E7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇧) flag for Barbados
-1F1E7 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇩) flag for Bangladesh
-1F1E7 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇪) flag for Belgium
-1F1E7 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇫) flag for Burkina Faso
-1F1E7 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇬) flag for Bulgaria
-1F1E7 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇭) flag for Bahrain
-1F1E7 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇮) flag for Burundi
-1F1E7 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇯) flag for Benin
-1F1E7 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇱) flag for St. Barthélemy
-1F1E7 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇲) flag for Bermuda
-1F1E7 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇳) flag for Brunei
-1F1E7 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇴) flag for Bolivia
-1F1E7 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇶) flag for Caribbean Netherlands
-1F1E7 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇷) flag for Brazil
-1F1E7 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇸) flag for Bahamas
-1F1E7 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇹) flag for Bhutan
-1F1E7 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇻) flag for Bouvet Island
-1F1E7 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇼) flag for Botswana
-1F1E7 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇾) flag for Belarus
-1F1E7 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇿) flag for Belize
-1F1E8 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇦) flag for Canada
-1F1E8 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇨) flag for Cocos  Islands
-1F1E8 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇩) flag for Congo - Kinshasa
-1F1E8 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇫) flag for Central African Republic
-1F1E8 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇬) flag for Congo - Brazzaville
-1F1E8 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇭) flag for Switzerland
-1F1E8 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇮) flag for Côte d’Ivoire
-1F1E8 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇰) flag for Cook Islands
-1F1E8 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇱) flag for Chile
-1F1E8 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇲) flag for Cameroon
-1F1E8 1F1F3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇨🇳) flag for China
-1F1E8 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇴) flag for Colombia
-1F1E8 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇵) flag for Clipperton Island
-1F1E8 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇷) flag for Costa Rica
-1F1E8 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇺) flag for Cuba
-1F1E8 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇻) flag for Cape Verde
-1F1E8 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇼) flag for Curaçao
-1F1E8 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇽) flag for Christmas Island
-1F1E8 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇾) flag for Cyprus
-1F1E8 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇿) flag for Czech Republic
-1F1E9 1F1EA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇩🇪) flag for Germany
-1F1E9 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇬) flag for Diego Garcia
-1F1E9 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇯) flag for Djibouti
-1F1E9 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇰) flag for Denmark
-1F1E9 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇲) flag for Dominica
-1F1E9 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇴) flag for Dominican Republic
-1F1E9 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇿) flag for Algeria
-1F1EA 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇦) flag for Ceuta & Melilla
-1F1EA 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇨) flag for Ecuador
-1F1EA 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇪) flag for Estonia
-1F1EA 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇬) flag for Egypt
-1F1EA 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇭) flag for Western Sahara
-1F1EA 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇷) flag for Eritrea
-1F1EA 1F1F8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇪🇸) flag for Spain
-1F1EA 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇹) flag for Ethiopia
-1F1EA 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇺) flag for European Union
-1F1EB 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇮) flag for Finland
-1F1EB 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇯) flag for Fiji
-1F1EB 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇰) flag for Falkland Islands
-1F1EB 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇲) flag for Micronesia
-1F1EB 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇴) flag for Faroe Islands
-1F1EB 1F1F7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇫🇷) flag for France
-1F1EC 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇦) flag for Gabon
-1F1EC 1F1E7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇬🇧) flag for United Kingdom
-1F1EC 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇩) flag for Grenada
-1F1EC 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇪) flag for Georgia
-1F1EC 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇫) flag for French Guiana
-1F1EC 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇬) flag for Guernsey
-1F1EC 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇭) flag for Ghana
-1F1EC 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇮) flag for Gibraltar
-1F1EC 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇱) flag for Greenland
-1F1EC 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇲) flag for Gambia
-1F1EC 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇳) flag for Guinea
-1F1EC 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇵) flag for Guadeloupe
-1F1EC 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇶) flag for Equatorial Guinea
-1F1EC 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇷) flag for Greece
-1F1EC 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇸) flag for South Georgia & South Sandwich Islands
-1F1EC 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇹) flag for Guatemala
-1F1EC 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇺) flag for Guam
-1F1EC 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇼) flag for Guinea-Bissau
-1F1EC 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇾) flag for Guyana
-1F1ED 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇰) flag for Hong Kong
-1F1ED 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇲) flag for Heard & McDonald Islands
-1F1ED 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇳) flag for Honduras
-1F1ED 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇷) flag for Croatia
-1F1ED 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇹) flag for Haiti
-1F1ED 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇺) flag for Hungary
-1F1EE 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇨) flag for Canary Islands
-1F1EE 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇩) flag for Indonesia
-1F1EE 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇪) flag for Ireland
-1F1EE 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇱) flag for Israel
-1F1EE 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇲) flag for Isle of Man
-1F1EE 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇳) flag for India
-1F1EE 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇴) flag for British Indian Ocean Territory
-1F1EE 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇶) flag for Iraq
-1F1EE 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇷) flag for Iran
-1F1EE 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇸) flag for Iceland
-1F1EE 1F1F9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇮🇹) flag for Italy
-1F1EF 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇯🇪) flag for Jersey
-1F1EF 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇯🇲) flag for Jamaica
-1F1EF 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇯🇴) flag for Jordan
-1F1EF 1F1F5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇯🇵) flag for Japan
-1F1F0 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇪) flag for Kenya
-1F1F0 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇬) flag for Kyrgyzstan
-1F1F0 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇭) flag for Cambodia
-1F1F0 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇮) flag for Kiribati
-1F1F0 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇲) flag for Comoros
-1F1F0 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇳) flag for St. Kitts & Nevis
-1F1F0 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇵) flag for North Korea
-1F1F0 1F1F7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇰🇷) flag for South Korea
-1F1F0 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇼) flag for Kuwait
-1F1F0 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇾) flag for Cayman Islands
-1F1F0 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇿) flag for Kazakhstan
-1F1F1 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇦) flag for Laos
-1F1F1 1F1E7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇧) flag for Lebanon
-1F1F1 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇨) flag for St. Lucia
-1F1F1 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇮) flag for Liechtenstein
-1F1F1 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇰) flag for Sri Lanka
-1F1F1 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇷) flag for Liberia
-1F1F1 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇸) flag for Lesotho
-1F1F1 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇹) flag for Lithuania
-1F1F1 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇺) flag for Luxembourg
-1F1F1 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇻) flag for Latvia
-1F1F1 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇾) flag for Libya
-1F1F2 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇦) flag for Morocco
-1F1F2 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇨) flag for Monaco
-1F1F2 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇩) flag for Moldova
-1F1F2 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇪) flag for Montenegro
-1F1F2 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇫) flag for St. Martin
-1F1F2 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇬) flag for Madagascar
-1F1F2 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇭) flag for Marshall Islands
-1F1F2 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇰) flag for Macedonia
-1F1F2 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇱) flag for Mali
-1F1F2 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇲) flag for Myanmar
-1F1F2 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇳) flag for Mongolia
-1F1F2 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇴) flag for Macau
-1F1F2 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇵) flag for Northern Mariana Islands
-1F1F2 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇶) flag for Martinique
-1F1F2 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇷) flag for Mauritania
-1F1F2 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇸) flag for Montserrat
-1F1F2 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇹) flag for Malta
-1F1F2 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇺) flag for Mauritius
-1F1F2 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇻) flag for Maldives
-1F1F2 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇼) flag for Malawi
-1F1F2 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇽) flag for Mexico
-1F1F2 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇾) flag for Malaysia
-1F1F2 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇿) flag for Mozambique
-1F1F3 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇦) flag for Namibia
-1F1F3 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇨) flag for New Caledonia
-1F1F3 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇪) flag for Niger
-1F1F3 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇫) flag for Norfolk Island
-1F1F3 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇬) flag for Nigeria
-1F1F3 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇮) flag for Nicaragua
-1F1F3 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇱) flag for Netherlands
-1F1F3 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇴) flag for Norway
-1F1F3 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇵) flag for Nepal
-1F1F3 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇷) flag for Nauru
-1F1F3 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇺) flag for Niue
-1F1F3 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇿) flag for New Zealand
-1F1F4 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇴🇲) flag for Oman
-1F1F5 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇦) flag for Panama
-1F1F5 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇪) flag for Peru
-1F1F5 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇫) flag for French Polynesia
-1F1F5 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇬) flag for Papua New Guinea
-1F1F5 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇭) flag for Philippines
-1F1F5 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇰) flag for Pakistan
-1F1F5 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇱) flag for Poland
-1F1F5 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇲) flag for St. Pierre & Miquelon
-1F1F5 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇳) flag for Pitcairn Islands
-1F1F5 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇷) flag for Puerto Rico
-1F1F5 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇸) flag for Palestinian Territories
-1F1F5 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇹) flag for Portugal
-1F1F5 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇼) flag for Palau
-1F1F5 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇾) flag for Paraguay
-1F1F6 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇶🇦) flag for Qatar
-1F1F7 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇪) flag for Réunion
-1F1F7 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇴) flag for Romania
-1F1F7 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇸) flag for Serbia
-1F1F7 1F1FA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇷🇺) flag for Russia
-1F1F7 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇼) flag for Rwanda
-1F1F8 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇦) flag for Saudi Arabia
-1F1F8 1F1E7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇧) flag for Solomon Islands
-1F1F8 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇨) flag for Seychelles
-1F1F8 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇩) flag for Sudan
-1F1F8 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇪) flag for Sweden
-1F1F8 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇬) flag for Singapore
-1F1F8 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇭) flag for St. Helena
-1F1F8 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇮) flag for Slovenia
-1F1F8 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇯) flag for Svalbard & Jan Mayen
-1F1F8 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇰) flag for Slovakia
-1F1F8 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇱) flag for Sierra Leone
-1F1F8 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇲) flag for San Marino
-1F1F8 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇳) flag for Senegal
-1F1F8 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇴) flag for Somalia
-1F1F8 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇷) flag for Suriname
-1F1F8 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇸) flag for South Sudan
-1F1F8 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇹) flag for São Tomé & Príncipe
-1F1F8 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇻) flag for El Salvador
-1F1F8 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇽) flag for Sint Maarten
-1F1F8 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇾) flag for Syria
-1F1F8 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇿) flag for Swaziland
-1F1F9 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇦) flag for Tristan da Cunha
-1F1F9 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇨) flag for Turks & Caicos Islands
-1F1F9 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇩) flag for Chad
-1F1F9 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇫) flag for French Southern Territories
-1F1F9 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇬) flag for Togo
-1F1F9 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇭) flag for Thailand
-1F1F9 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇯) flag for Tajikistan
-1F1F9 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇰) flag for Tokelau
-1F1F9 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇱) flag for Timor-Leste
-1F1F9 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇲) flag for Turkmenistan
-1F1F9 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇳) flag for Tunisia
-1F1F9 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇴) flag for Tonga
-1F1F9 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇷) flag for Turkey
-1F1F9 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇹) flag for Trinidad & Tobago
-1F1F9 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇻) flag for Tuvalu
-1F1F9 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇼) flag for Taiwan
-1F1F9 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇿) flag for Tanzania
-1F1FA 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇦) flag for Ukraine
-1F1FA 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇬) flag for Uganda
-1F1FA 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇲) flag for U.S. Outlying Islands
-1F1FA 1F1F8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇺🇸) flag for United States
-1F1FA 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇾) flag for Uruguay
-1F1FA 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇿) flag for Uzbekistan
-1F1FB 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇦) flag for Vatican City
-1F1FB 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇨) flag for St. Vincent & Grenadines
-1F1FB 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇪) flag for Venezuela
-1F1FB 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇬) flag for British Virgin Islands
-1F1FB 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇮) flag for U.S. Virgin Islands
-1F1FB 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇳) flag for Vietnam
-1F1FB 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇺) flag for Vanuatu
-1F1FC 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇼🇫) flag for Wallis & Futuna
-1F1FC 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇼🇸) flag for Samoa
-1F1FD 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇽🇰) flag for Kosovo
-1F1FE 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇾🇪) flag for Yemen
-1F1FE 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇾🇹) flag for Mayotte
-1F1FF 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇿🇦) flag for South Africa
-1F1FF 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇿🇲) flag for Zambia
-1F1FF 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇿🇼) flag for Zimbabwe
+# This file provides data for testing which emoji forms should be in keyboards and which should also be displayed/processed.
+# Format: code points; status # emoji name
+#     Code points — list of one or more hex code points, separated by spaces
+#     Status
+#       component           — an Emoji_Component,
+#                             excluding Regional_Indicators, ASCII, and non-Emoji.
+#       fully-qualified     — a fully-qualified emoji (see ED-18 in UTS #51),
+#                             excluding Emoji_Component
+#       minimally-qualified — a minimally-qualified emoji (see ED-18a in UTS #51)
+#       unqualified         — a unqualified emoji (See ED-19 in UTS #51)
+# Notes:
+#   • This includes the emoji components that need emoji presentation (skin tone and hair)
+#     when isolated, but omits the components that need not have an emoji
+#     presentation when isolated.
+#   • The RGI set is covered by the listed fully-qualified emoji. 
+#   • The listed minimally-qualified and unqualified cover all cases where an
+#     element of the RGI set is missing one or more emoji presentation selectors.
+#   • The file is in CLDR order, not codepoint order. This is recommended (but not required!) for keyboard palettes.
+#   • The groups and subgroups are illustrative. See the Emoji Order chart for more information.
+
+
+# group: Smileys & Emotion
+
+# subgroup: face-smiling
+1F600                                      ; fully-qualified     # 😀 grinning face
+1F603                                      ; fully-qualified     # 😃 grinning face with big eyes
+1F604                                      ; fully-qualified     # 😄 grinning face with smiling eyes
+1F601                                      ; fully-qualified     # 😁 beaming face with smiling eyes
+1F606                                      ; fully-qualified     # 😆 grinning squinting face
+1F605                                      ; fully-qualified     # 😅 grinning face with sweat
+1F923                                      ; fully-qualified     # 🤣 rolling on the floor laughing
+1F602                                      ; fully-qualified     # 😂 face with tears of joy
+1F642                                      ; fully-qualified     # 🙂 slightly smiling face
+1F643                                      ; fully-qualified     # 🙃 upside-down face
+1F609                                      ; fully-qualified     # 😉 winking face
+1F60A                                      ; fully-qualified     # 😊 smiling face with smiling eyes
+1F607                                      ; fully-qualified     # 😇 smiling face with halo
+
+# subgroup: face-affection
+1F970                                      ; fully-qualified     # 🥰 smiling face with hearts
+1F60D                                      ; fully-qualified     # 😍 smiling face with heart-eyes
+1F929                                      ; fully-qualified     # 🤩 star-struck
+1F618                                      ; fully-qualified     # 😘 face blowing a kiss
+1F617                                      ; fully-qualified     # 😗 kissing face
+263A FE0F                                  ; fully-qualified     # ☺️ smiling face
+263A                                       ; unqualified         # ☺ smiling face
+1F61A                                      ; fully-qualified     # 😚 kissing face with closed eyes
+1F619                                      ; fully-qualified     # 😙 kissing face with smiling eyes
+
+# subgroup: face-tongue
+1F60B                                      ; fully-qualified     # 😋 face savoring food
+1F61B                                      ; fully-qualified     # 😛 face with tongue
+1F61C                                      ; fully-qualified     # 😜 winking face with tongue
+1F92A                                      ; fully-qualified     # 🤪 zany face
+1F61D                                      ; fully-qualified     # 😝 squinting face with tongue
+1F911                                      ; fully-qualified     # 🤑 money-mouth face
+
+# subgroup: face-hand
+1F917                                      ; fully-qualified     # 🤗 hugging face
+1F92D                                      ; fully-qualified     # 🤭 face with hand over mouth
+1F92B                                      ; fully-qualified     # 🤫 shushing face
+1F914                                      ; fully-qualified     # 🤔 thinking face
+
+# subgroup: face-neutral-skeptical
+1F910                                      ; fully-qualified     # 🤐 zipper-mouth face
+1F928                                      ; fully-qualified     # 🤨 face with raised eyebrow
+1F610                                      ; fully-qualified     # 😐 neutral face
+1F611                                      ; fully-qualified     # 😑 expressionless face
+1F636                                      ; fully-qualified     # 😶 face without mouth
+1F60F                                      ; fully-qualified     # 😏 smirking face
+1F612                                      ; fully-qualified     # 😒 unamused face
+1F644                                      ; fully-qualified     # 🙄 face with rolling eyes
+1F62C                                      ; fully-qualified     # 😬 grimacing face
+1F925                                      ; fully-qualified     # 🤥 lying face
+
+# subgroup: face-sleepy
+1F60C                                      ; fully-qualified     # 😌 relieved face
+1F614                                      ; fully-qualified     # 😔 pensive face
+1F62A                                      ; fully-qualified     # 😪 sleepy face
+1F924                                      ; fully-qualified     # 🤤 drooling face
+1F634                                      ; fully-qualified     # 😴 sleeping face
+
+# subgroup: face-unwell
+1F637                                      ; fully-qualified     # 😷 face with medical mask
+1F912                                      ; fully-qualified     # 🤒 face with thermometer
+1F915                                      ; fully-qualified     # 🤕 face with head-bandage
+1F922                                      ; fully-qualified     # 🤢 nauseated face
+1F92E                                      ; fully-qualified     # 🤮 face vomiting
+1F927                                      ; fully-qualified     # 🤧 sneezing face
+1F975                                      ; fully-qualified     # 🥵 hot face
+1F976                                      ; fully-qualified     # 🥶 cold face
+1F974                                      ; fully-qualified     # 🥴 woozy face
+1F635                                      ; fully-qualified     # 😵 dizzy face
+1F92F                                      ; fully-qualified     # 🤯 exploding head
+
+# subgroup: face-hat
+1F920                                      ; fully-qualified     # 🤠 cowboy hat face
+1F973                                      ; fully-qualified     # 🥳 partying face
+
+# subgroup: face-glasses
+1F60E                                      ; fully-qualified     # 😎 smiling face with sunglasses
+1F913                                      ; fully-qualified     # 🤓 nerd face
+1F9D0                                      ; fully-qualified     # 🧐 face with monocle
+
+# subgroup: face-concerned
+1F615                                      ; fully-qualified     # 😕 confused face
+1F61F                                      ; fully-qualified     # 😟 worried face
+1F641                                      ; fully-qualified     # 🙁 slightly frowning face
+2639 FE0F                                  ; fully-qualified     # ☹️ frowning face
+2639                                       ; unqualified         # ☹ frowning face
+1F62E                                      ; fully-qualified     # 😮 face with open mouth
+1F62F                                      ; fully-qualified     # 😯 hushed face
+1F632                                      ; fully-qualified     # 😲 astonished face
+1F633                                      ; fully-qualified     # 😳 flushed face
+1F97A                                      ; fully-qualified     # 🥺 pleading face
+1F626                                      ; fully-qualified     # 😦 frowning face with open mouth
+1F627                                      ; fully-qualified     # 😧 anguished face
+1F628                                      ; fully-qualified     # 😨 fearful face
+1F630                                      ; fully-qualified     # 😰 anxious face with sweat
+1F625                                      ; fully-qualified     # 😥 sad but relieved face
+1F622                                      ; fully-qualified     # 😢 crying face
+1F62D                                      ; fully-qualified     # 😭 loudly crying face
+1F631                                      ; fully-qualified     # 😱 face screaming in fear
+1F616                                      ; fully-qualified     # 😖 confounded face
+1F623                                      ; fully-qualified     # 😣 persevering face
+1F61E                                      ; fully-qualified     # 😞 disappointed face
+1F613                                      ; fully-qualified     # 😓 downcast face with sweat
+1F629                                      ; fully-qualified     # 😩 weary face
+1F62B                                      ; fully-qualified     # 😫 tired face
+1F971                                      ; fully-qualified     # 🥱 yawning face
+
+# subgroup: face-negative
+1F624                                      ; fully-qualified     # 😤 face with steam from nose
+1F621                                      ; fully-qualified     # 😡 pouting face
+1F620                                      ; fully-qualified     # 😠 angry face
+1F92C                                      ; fully-qualified     # 🤬 face with symbols on mouth
+1F608                                      ; fully-qualified     # 😈 smiling face with horns
+1F47F                                      ; fully-qualified     # 👿 angry face with horns
+1F480                                      ; fully-qualified     # 💀 skull
+2620 FE0F                                  ; fully-qualified     # ☠️ skull and crossbones
+2620                                       ; unqualified         # ☠ skull and crossbones
+
+# subgroup: face-costume
+1F4A9                                      ; fully-qualified     # 💩 pile of poo
+1F921                                      ; fully-qualified     # 🤡 clown face
+1F479                                      ; fully-qualified     # 👹 ogre
+1F47A                                      ; fully-qualified     # 👺 goblin
+1F47B                                      ; fully-qualified     # 👻 ghost
+1F47D                                      ; fully-qualified     # 👽 alien
+1F47E                                      ; fully-qualified     # 👾 alien monster
+1F916                                      ; fully-qualified     # 🤖 robot
+
+# subgroup: cat-face
+1F63A                                      ; fully-qualified     # 😺 grinning cat
+1F638                                      ; fully-qualified     # 😸 grinning cat with smiling eyes
+1F639                                      ; fully-qualified     # 😹 cat with tears of joy
+1F63B                                      ; fully-qualified     # 😻 smiling cat with heart-eyes
+1F63C                                      ; fully-qualified     # 😼 cat with wry smile
+1F63D                                      ; fully-qualified     # 😽 kissing cat
+1F640                                      ; fully-qualified     # 🙀 weary cat
+1F63F                                      ; fully-qualified     # 😿 crying cat
+1F63E                                      ; fully-qualified     # 😾 pouting cat
+
+# subgroup: monkey-face
+1F648                                      ; fully-qualified     # 🙈 see-no-evil monkey
+1F649                                      ; fully-qualified     # 🙉 hear-no-evil monkey
+1F64A                                      ; fully-qualified     # 🙊 speak-no-evil monkey
+
+# subgroup: emotion
+1F48B                                      ; fully-qualified     # 💋 kiss mark
+1F48C                                      ; fully-qualified     # 💌 love letter
+1F498                                      ; fully-qualified     # 💘 heart with arrow
+1F49D                                      ; fully-qualified     # 💝 heart with ribbon
+1F496                                      ; fully-qualified     # 💖 sparkling heart
+1F497                                      ; fully-qualified     # 💗 growing heart
+1F493                                      ; fully-qualified     # 💓 beating heart
+1F49E                                      ; fully-qualified     # 💞 revolving hearts
+1F495                                      ; fully-qualified     # 💕 two hearts
+1F49F                                      ; fully-qualified     # 💟 heart decoration
+2763 FE0F                                  ; fully-qualified     # ❣️ heart exclamation
+2763                                       ; unqualified         # ❣ heart exclamation
+1F494                                      ; fully-qualified     # 💔 broken heart
+2764 FE0F                                  ; fully-qualified     # ❤️ red heart
+2764                                       ; unqualified         # ❤ red heart
+1F9E1                                      ; fully-qualified     # 🧡 orange heart
+1F49B                                      ; fully-qualified     # 💛 yellow heart
+1F49A                                      ; fully-qualified     # 💚 green heart
+1F499                                      ; fully-qualified     # 💙 blue heart
+1F49C                                      ; fully-qualified     # 💜 purple heart
+1F90E                                      ; fully-qualified     # 🤎 brown heart
+1F5A4                                      ; fully-qualified     # 🖤 black heart
+1F90D                                      ; fully-qualified     # 🤍 white heart
+1F4AF                                      ; fully-qualified     # 💯 hundred points
+1F4A2                                      ; fully-qualified     # 💢 anger symbol
+1F4A5                                      ; fully-qualified     # 💥 collision
+1F4AB                                      ; fully-qualified     # 💫 dizzy
+1F4A6                                      ; fully-qualified     # 💦 sweat droplets
+1F4A8                                      ; fully-qualified     # 💨 dashing away
+1F573 FE0F                                 ; fully-qualified     # 🕳️ hole
+1F573                                      ; unqualified         # 🕳 hole
+1F4A3                                      ; fully-qualified     # 💣 bomb
+1F4AC                                      ; fully-qualified     # 💬 speech balloon
+1F441 FE0F 200D 1F5E8 FE0F                 ; fully-qualified     # 👁️‍🗨️ eye in speech bubble
+1F441 200D 1F5E8 FE0F                      ; unqualified         # 👁‍🗨️ eye in speech bubble
+1F441 FE0F 200D 1F5E8                      ; unqualified         # 👁️‍🗨 eye in speech bubble
+1F441 200D 1F5E8                           ; unqualified         # 👁‍🗨 eye in speech bubble
+1F5E8 FE0F                                 ; fully-qualified     # 🗨️ left speech bubble
+1F5E8                                      ; unqualified         # 🗨 left speech bubble
+1F5EF FE0F                                 ; fully-qualified     # 🗯️ right anger bubble
+1F5EF                                      ; unqualified         # 🗯 right anger bubble
+1F4AD                                      ; fully-qualified     # 💭 thought balloon
+1F4A4                                      ; fully-qualified     # 💤 zzz
+
+# Smileys & Emotion subtotal:		160
+# Smileys & Emotion subtotal:		160	w/o modifiers
+
+# group: People & Body
+
+# subgroup: hand-fingers-open
+1F44B                                      ; fully-qualified     # 👋 waving hand
+1F44B 1F3FB                                ; fully-qualified     # 👋🏻 waving hand: light skin tone
+1F44B 1F3FC                                ; fully-qualified     # 👋🏼 waving hand: medium-light skin tone
+1F44B 1F3FD                                ; fully-qualified     # 👋🏽 waving hand: medium skin tone
+1F44B 1F3FE                                ; fully-qualified     # 👋🏾 waving hand: medium-dark skin tone
+1F44B 1F3FF                                ; fully-qualified     # 👋🏿 waving hand: dark skin tone
+1F91A                                      ; fully-qualified     # 🤚 raised back of hand
+1F91A 1F3FB                                ; fully-qualified     # 🤚🏻 raised back of hand: light skin tone
+1F91A 1F3FC                                ; fully-qualified     # 🤚🏼 raised back of hand: medium-light skin tone
+1F91A 1F3FD                                ; fully-qualified     # 🤚🏽 raised back of hand: medium skin tone
+1F91A 1F3FE                                ; fully-qualified     # 🤚🏾 raised back of hand: medium-dark skin tone
+1F91A 1F3FF                                ; fully-qualified     # 🤚🏿 raised back of hand: dark skin tone
+1F590 FE0F                                 ; fully-qualified     # 🖐️ hand with fingers splayed
+1F590                                      ; unqualified         # 🖐 hand with fingers splayed
+1F590 1F3FB                                ; fully-qualified     # 🖐🏻 hand with fingers splayed: light skin tone
+1F590 1F3FC                                ; fully-qualified     # 🖐🏼 hand with fingers splayed: medium-light skin tone
+1F590 1F3FD                                ; fully-qualified     # 🖐🏽 hand with fingers splayed: medium skin tone
+1F590 1F3FE                                ; fully-qualified     # 🖐🏾 hand with fingers splayed: medium-dark skin tone
+1F590 1F3FF                                ; fully-qualified     # 🖐🏿 hand with fingers splayed: dark skin tone
+270B                                       ; fully-qualified     # ✋ raised hand
+270B 1F3FB                                 ; fully-qualified     # ✋🏻 raised hand: light skin tone
+270B 1F3FC                                 ; fully-qualified     # ✋🏼 raised hand: medium-light skin tone
+270B 1F3FD                                 ; fully-qualified     # ✋🏽 raised hand: medium skin tone
+270B 1F3FE                                 ; fully-qualified     # ✋🏾 raised hand: medium-dark skin tone
+270B 1F3FF                                 ; fully-qualified     # ✋🏿 raised hand: dark skin tone
+1F596                                      ; fully-qualified     # 🖖 vulcan salute
+1F596 1F3FB                                ; fully-qualified     # 🖖🏻 vulcan salute: light skin tone
+1F596 1F3FC                                ; fully-qualified     # 🖖🏼 vulcan salute: medium-light skin tone
+1F596 1F3FD                                ; fully-qualified     # 🖖🏽 vulcan salute: medium skin tone
+1F596 1F3FE                                ; fully-qualified     # 🖖🏾 vulcan salute: medium-dark skin tone
+1F596 1F3FF                                ; fully-qualified     # 🖖🏿 vulcan salute: dark skin tone
+
+# subgroup: hand-fingers-partial
+1F44C                                      ; fully-qualified     # 👌 OK hand
+1F44C 1F3FB                                ; fully-qualified     # 👌🏻 OK hand: light skin tone
+1F44C 1F3FC                                ; fully-qualified     # 👌🏼 OK hand: medium-light skin tone
+1F44C 1F3FD                                ; fully-qualified     # 👌🏽 OK hand: medium skin tone
+1F44C 1F3FE                                ; fully-qualified     # 👌🏾 OK hand: medium-dark skin tone
+1F44C 1F3FF                                ; fully-qualified     # 👌🏿 OK hand: dark skin tone
+1F90F                                      ; fully-qualified     # 🤏 pinching hand
+1F90F 1F3FB                                ; fully-qualified     # 🤏🏻 pinching hand: light skin tone
+1F90F 1F3FC                                ; fully-qualified     # 🤏🏼 pinching hand: medium-light skin tone
+1F90F 1F3FD                                ; fully-qualified     # 🤏🏽 pinching hand: medium skin tone
+1F90F 1F3FE                                ; fully-qualified     # 🤏🏾 pinching hand: medium-dark skin tone
+1F90F 1F3FF                                ; fully-qualified     # 🤏🏿 pinching hand: dark skin tone
+270C FE0F                                  ; fully-qualified     # ✌️ victory hand
+270C                                       ; unqualified         # ✌ victory hand
+270C 1F3FB                                 ; fully-qualified     # ✌🏻 victory hand: light skin tone
+270C 1F3FC                                 ; fully-qualified     # ✌🏼 victory hand: medium-light skin tone
+270C 1F3FD                                 ; fully-qualified     # ✌🏽 victory hand: medium skin tone
+270C 1F3FE                                 ; fully-qualified     # ✌🏾 victory hand: medium-dark skin tone
+270C 1F3FF                                 ; fully-qualified     # ✌🏿 victory hand: dark skin tone
+1F91E                                      ; fully-qualified     # 🤞 crossed fingers
+1F91E 1F3FB                                ; fully-qualified     # 🤞🏻 crossed fingers: light skin tone
+1F91E 1F3FC                                ; fully-qualified     # 🤞🏼 crossed fingers: medium-light skin tone
+1F91E 1F3FD                                ; fully-qualified     # 🤞🏽 crossed fingers: medium skin tone
+1F91E 1F3FE                                ; fully-qualified     # 🤞🏾 crossed fingers: medium-dark skin tone
+1F91E 1F3FF                                ; fully-qualified     # 🤞🏿 crossed fingers: dark skin tone
+1F91F                                      ; fully-qualified     # 🤟 love-you gesture
+1F91F 1F3FB                                ; fully-qualified     # 🤟🏻 love-you gesture: light skin tone
+1F91F 1F3FC                                ; fully-qualified     # 🤟🏼 love-you gesture: medium-light skin tone
+1F91F 1F3FD                                ; fully-qualified     # 🤟🏽 love-you gesture: medium skin tone
+1F91F 1F3FE                                ; fully-qualified     # 🤟🏾 love-you gesture: medium-dark skin tone
+1F91F 1F3FF                                ; fully-qualified     # 🤟🏿 love-you gesture: dark skin tone
+1F918                                      ; fully-qualified     # 🤘 sign of the horns
+1F918 1F3FB                                ; fully-qualified     # 🤘🏻 sign of the horns: light skin tone
+1F918 1F3FC                                ; fully-qualified     # 🤘🏼 sign of the horns: medium-light skin tone
+1F918 1F3FD                                ; fully-qualified     # 🤘🏽 sign of the horns: medium skin tone
+1F918 1F3FE                                ; fully-qualified     # 🤘🏾 sign of the horns: medium-dark skin tone
+1F918 1F3FF                                ; fully-qualified     # 🤘🏿 sign of the horns: dark skin tone
+1F919                                      ; fully-qualified     # 🤙 call me hand
+1F919 1F3FB                                ; fully-qualified     # 🤙🏻 call me hand: light skin tone
+1F919 1F3FC                                ; fully-qualified     # 🤙🏼 call me hand: medium-light skin tone
+1F919 1F3FD                                ; fully-qualified     # 🤙🏽 call me hand: medium skin tone
+1F919 1F3FE                                ; fully-qualified     # 🤙🏾 call me hand: medium-dark skin tone
+1F919 1F3FF                                ; fully-qualified     # 🤙🏿 call me hand: dark skin tone
+
+# subgroup: hand-single-finger
+1F448                                      ; fully-qualified     # 👈 backhand index pointing left
+1F448 1F3FB                                ; fully-qualified     # 👈🏻 backhand index pointing left: light skin tone
+1F448 1F3FC                                ; fully-qualified     # 👈🏼 backhand index pointing left: medium-light skin tone
+1F448 1F3FD                                ; fully-qualified     # 👈🏽 backhand index pointing left: medium skin tone
+1F448 1F3FE                                ; fully-qualified     # 👈🏾 backhand index pointing left: medium-dark skin tone
+1F448 1F3FF                                ; fully-qualified     # 👈🏿 backhand index pointing left: dark skin tone
+1F449                                      ; fully-qualified     # 👉 backhand index pointing right
+1F449 1F3FB                                ; fully-qualified     # 👉🏻 backhand index pointing right: light skin tone
+1F449 1F3FC                                ; fully-qualified     # 👉🏼 backhand index pointing right: medium-light skin tone
+1F449 1F3FD                                ; fully-qualified     # 👉🏽 backhand index pointing right: medium skin tone
+1F449 1F3FE                                ; fully-qualified     # 👉🏾 backhand index pointing right: medium-dark skin tone
+1F449 1F3FF                                ; fully-qualified     # 👉🏿 backhand index pointing right: dark skin tone
+1F446                                      ; fully-qualified     # 👆 backhand index pointing up
+1F446 1F3FB                                ; fully-qualified     # 👆🏻 backhand index pointing up: light skin tone
+1F446 1F3FC                                ; fully-qualified     # 👆🏼 backhand index pointing up: medium-light skin tone
+1F446 1F3FD                                ; fully-qualified     # 👆🏽 backhand index pointing up: medium skin tone
+1F446 1F3FE                                ; fully-qualified     # 👆🏾 backhand index pointing up: medium-dark skin tone
+1F446 1F3FF                                ; fully-qualified     # 👆🏿 backhand index pointing up: dark skin tone
+1F595                                      ; fully-qualified     # 🖕 middle finger
+1F595 1F3FB                                ; fully-qualified     # 🖕🏻 middle finger: light skin tone
+1F595 1F3FC                                ; fully-qualified     # 🖕🏼 middle finger: medium-light skin tone
+1F595 1F3FD                                ; fully-qualified     # 🖕🏽 middle finger: medium skin tone
+1F595 1F3FE                                ; fully-qualified     # 🖕🏾 middle finger: medium-dark skin tone
+1F595 1F3FF                                ; fully-qualified     # 🖕🏿 middle finger: dark skin tone
+1F447                                      ; fully-qualified     # 👇 backhand index pointing down
+1F447 1F3FB                                ; fully-qualified     # 👇🏻 backhand index pointing down: light skin tone
+1F447 1F3FC                                ; fully-qualified     # 👇🏼 backhand index pointing down: medium-light skin tone
+1F447 1F3FD                                ; fully-qualified     # 👇🏽 backhand index pointing down: medium skin tone
+1F447 1F3FE                                ; fully-qualified     # 👇🏾 backhand index pointing down: medium-dark skin tone
+1F447 1F3FF                                ; fully-qualified     # 👇🏿 backhand index pointing down: dark skin tone
+261D FE0F                                  ; fully-qualified     # ☝️ index pointing up
+261D                                       ; unqualified         # ☝ index pointing up
+261D 1F3FB                                 ; fully-qualified     # ☝🏻 index pointing up: light skin tone
+261D 1F3FC                                 ; fully-qualified     # ☝🏼 index pointing up: medium-light skin tone
+261D 1F3FD                                 ; fully-qualified     # ☝🏽 index pointing up: medium skin tone
+261D 1F3FE                                 ; fully-qualified     # ☝🏾 index pointing up: medium-dark skin tone
+261D 1F3FF                                 ; fully-qualified     # ☝🏿 index pointing up: dark skin tone
+
+# subgroup: hand-fingers-closed
+1F44D                                      ; fully-qualified     # 👍 thumbs up
+1F44D 1F3FB                                ; fully-qualified     # 👍🏻 thumbs up: light skin tone
+1F44D 1F3FC                                ; fully-qualified     # 👍🏼 thumbs up: medium-light skin tone
+1F44D 1F3FD                                ; fully-qualified     # 👍🏽 thumbs up: medium skin tone
+1F44D 1F3FE                                ; fully-qualified     # 👍🏾 thumbs up: medium-dark skin tone
+1F44D 1F3FF                                ; fully-qualified     # 👍🏿 thumbs up: dark skin tone
+1F44E                                      ; fully-qualified     # 👎 thumbs down
+1F44E 1F3FB                                ; fully-qualified     # 👎🏻 thumbs down: light skin tone
+1F44E 1F3FC                                ; fully-qualified     # 👎🏼 thumbs down: medium-light skin tone
+1F44E 1F3FD                                ; fully-qualified     # 👎🏽 thumbs down: medium skin tone
+1F44E 1F3FE                                ; fully-qualified     # 👎🏾 thumbs down: medium-dark skin tone
+1F44E 1F3FF                                ; fully-qualified     # 👎🏿 thumbs down: dark skin tone
+270A                                       ; fully-qualified     # ✊ raised fist
+270A 1F3FB                                 ; fully-qualified     # ✊🏻 raised fist: light skin tone
+270A 1F3FC                                 ; fully-qualified     # ✊🏼 raised fist: medium-light skin tone
+270A 1F3FD                                 ; fully-qualified     # ✊🏽 raised fist: medium skin tone
+270A 1F3FE                                 ; fully-qualified     # ✊🏾 raised fist: medium-dark skin tone
+270A 1F3FF                                 ; fully-qualified     # ✊🏿 raised fist: dark skin tone
+1F44A                                      ; fully-qualified     # 👊 oncoming fist
+1F44A 1F3FB                                ; fully-qualified     # 👊🏻 oncoming fist: light skin tone
+1F44A 1F3FC                                ; fully-qualified     # 👊🏼 oncoming fist: medium-light skin tone
+1F44A 1F3FD                                ; fully-qualified     # 👊🏽 oncoming fist: medium skin tone
+1F44A 1F3FE                                ; fully-qualified     # 👊🏾 oncoming fist: medium-dark skin tone
+1F44A 1F3FF                                ; fully-qualified     # 👊🏿 oncoming fist: dark skin tone
+1F91B                                      ; fully-qualified     # 🤛 left-facing fist
+1F91B 1F3FB                                ; fully-qualified     # 🤛🏻 left-facing fist: light skin tone
+1F91B 1F3FC                                ; fully-qualified     # 🤛🏼 left-facing fist: medium-light skin tone
+1F91B 1F3FD                                ; fully-qualified     # 🤛🏽 left-facing fist: medium skin tone
+1F91B 1F3FE                                ; fully-qualified     # 🤛🏾 left-facing fist: medium-dark skin tone
+1F91B 1F3FF                                ; fully-qualified     # 🤛🏿 left-facing fist: dark skin tone
+1F91C                                      ; fully-qualified     # 🤜 right-facing fist
+1F91C 1F3FB                                ; fully-qualified     # 🤜🏻 right-facing fist: light skin tone
+1F91C 1F3FC                                ; fully-qualified     # 🤜🏼 right-facing fist: medium-light skin tone
+1F91C 1F3FD                                ; fully-qualified     # 🤜🏽 right-facing fist: medium skin tone
+1F91C 1F3FE                                ; fully-qualified     # 🤜🏾 right-facing fist: medium-dark skin tone
+1F91C 1F3FF                                ; fully-qualified     # 🤜🏿 right-facing fist: dark skin tone
+
+# subgroup: hands
+1F44F                                      ; fully-qualified     # 👏 clapping hands
+1F44F 1F3FB                                ; fully-qualified     # 👏🏻 clapping hands: light skin tone
+1F44F 1F3FC                                ; fully-qualified     # 👏🏼 clapping hands: medium-light skin tone
+1F44F 1F3FD                                ; fully-qualified     # 👏🏽 clapping hands: medium skin tone
+1F44F 1F3FE                                ; fully-qualified     # 👏🏾 clapping hands: medium-dark skin tone
+1F44F 1F3FF                                ; fully-qualified     # 👏🏿 clapping hands: dark skin tone
+1F64C                                      ; fully-qualified     # 🙌 raising hands
+1F64C 1F3FB                                ; fully-qualified     # 🙌🏻 raising hands: light skin tone
+1F64C 1F3FC                                ; fully-qualified     # 🙌🏼 raising hands: medium-light skin tone
+1F64C 1F3FD                                ; fully-qualified     # 🙌🏽 raising hands: medium skin tone
+1F64C 1F3FE                                ; fully-qualified     # 🙌🏾 raising hands: medium-dark skin tone
+1F64C 1F3FF                                ; fully-qualified     # 🙌🏿 raising hands: dark skin tone
+1F450                                      ; fully-qualified     # 👐 open hands
+1F450 1F3FB                                ; fully-qualified     # 👐🏻 open hands: light skin tone
+1F450 1F3FC                                ; fully-qualified     # 👐🏼 open hands: medium-light skin tone
+1F450 1F3FD                                ; fully-qualified     # 👐🏽 open hands: medium skin tone
+1F450 1F3FE                                ; fully-qualified     # 👐🏾 open hands: medium-dark skin tone
+1F450 1F3FF                                ; fully-qualified     # 👐🏿 open hands: dark skin tone
+1F932                                      ; fully-qualified     # 🤲 palms up together
+1F932 1F3FB                                ; fully-qualified     # 🤲🏻 palms up together: light skin tone
+1F932 1F3FC                                ; fully-qualified     # 🤲🏼 palms up together: medium-light skin tone
+1F932 1F3FD                                ; fully-qualified     # 🤲🏽 palms up together: medium skin tone
+1F932 1F3FE                                ; fully-qualified     # 🤲🏾 palms up together: medium-dark skin tone
+1F932 1F3FF                                ; fully-qualified     # 🤲🏿 palms up together: dark skin tone
+1F91D                                      ; fully-qualified     # 🤝 handshake
+1F64F                                      ; fully-qualified     # 🙏 folded hands
+1F64F 1F3FB                                ; fully-qualified     # 🙏🏻 folded hands: light skin tone
+1F64F 1F3FC                                ; fully-qualified     # 🙏🏼 folded hands: medium-light skin tone
+1F64F 1F3FD                                ; fully-qualified     # 🙏🏽 folded hands: medium skin tone
+1F64F 1F3FE                                ; fully-qualified     # 🙏🏾 folded hands: medium-dark skin tone
+1F64F 1F3FF                                ; fully-qualified     # 🙏🏿 folded hands: dark skin tone
+
+# subgroup: hand-prop
+270D FE0F                                  ; fully-qualified     # ✍️ writing hand
+270D                                       ; unqualified         # ✍ writing hand
+270D 1F3FB                                 ; fully-qualified     # ✍🏻 writing hand: light skin tone
+270D 1F3FC                                 ; fully-qualified     # ✍🏼 writing hand: medium-light skin tone
+270D 1F3FD                                 ; fully-qualified     # ✍🏽 writing hand: medium skin tone
+270D 1F3FE                                 ; fully-qualified     # ✍🏾 writing hand: medium-dark skin tone
+270D 1F3FF                                 ; fully-qualified     # ✍🏿 writing hand: dark skin tone
+1F485                                      ; fully-qualified     # 💅 nail polish
+1F485 1F3FB                                ; fully-qualified     # 💅🏻 nail polish: light skin tone
+1F485 1F3FC                                ; fully-qualified     # 💅🏼 nail polish: medium-light skin tone
+1F485 1F3FD                                ; fully-qualified     # 💅🏽 nail polish: medium skin tone
+1F485 1F3FE                                ; fully-qualified     # 💅🏾 nail polish: medium-dark skin tone
+1F485 1F3FF                                ; fully-qualified     # 💅🏿 nail polish: dark skin tone
+1F933                                      ; fully-qualified     # 🤳 selfie
+1F933 1F3FB                                ; fully-qualified     # 🤳🏻 selfie: light skin tone
+1F933 1F3FC                                ; fully-qualified     # 🤳🏼 selfie: medium-light skin tone
+1F933 1F3FD                                ; fully-qualified     # 🤳🏽 selfie: medium skin tone
+1F933 1F3FE                                ; fully-qualified     # 🤳🏾 selfie: medium-dark skin tone
+1F933 1F3FF                                ; fully-qualified     # 🤳🏿 selfie: dark skin tone
+
+# subgroup: body-parts
+1F4AA                                      ; fully-qualified     # 💪 flexed biceps
+1F4AA 1F3FB                                ; fully-qualified     # 💪🏻 flexed biceps: light skin tone
+1F4AA 1F3FC                                ; fully-qualified     # 💪🏼 flexed biceps: medium-light skin tone
+1F4AA 1F3FD                                ; fully-qualified     # 💪🏽 flexed biceps: medium skin tone
+1F4AA 1F3FE                                ; fully-qualified     # 💪🏾 flexed biceps: medium-dark skin tone
+1F4AA 1F3FF                                ; fully-qualified     # 💪🏿 flexed biceps: dark skin tone
+1F9BE                                      ; fully-qualified     # 🦾 mechanical arm
+1F9BF                                      ; fully-qualified     # 🦿 mechanical leg
+1F9B5                                      ; fully-qualified     # 🦵 leg
+1F9B5 1F3FB                                ; fully-qualified     # 🦵🏻 leg: light skin tone
+1F9B5 1F3FC                                ; fully-qualified     # 🦵🏼 leg: medium-light skin tone
+1F9B5 1F3FD                                ; fully-qualified     # 🦵🏽 leg: medium skin tone
+1F9B5 1F3FE                                ; fully-qualified     # 🦵🏾 leg: medium-dark skin tone
+1F9B5 1F3FF                                ; fully-qualified     # 🦵🏿 leg: dark skin tone
+1F9B6                                      ; fully-qualified     # 🦶 foot
+1F9B6 1F3FB                                ; fully-qualified     # 🦶🏻 foot: light skin tone
+1F9B6 1F3FC                                ; fully-qualified     # 🦶🏼 foot: medium-light skin tone
+1F9B6 1F3FD                                ; fully-qualified     # 🦶🏽 foot: medium skin tone
+1F9B6 1F3FE                                ; fully-qualified     # 🦶🏾 foot: medium-dark skin tone
+1F9B6 1F3FF                                ; fully-qualified     # 🦶🏿 foot: dark skin tone
+1F442                                      ; fully-qualified     # 👂 ear
+1F442 1F3FB                                ; fully-qualified     # 👂🏻 ear: light skin tone
+1F442 1F3FC                                ; fully-qualified     # 👂🏼 ear: medium-light skin tone
+1F442 1F3FD                                ; fully-qualified     # 👂🏽 ear: medium skin tone
+1F442 1F3FE                                ; fully-qualified     # 👂🏾 ear: medium-dark skin tone
+1F442 1F3FF                                ; fully-qualified     # 👂🏿 ear: dark skin tone
+1F9BB                                      ; fully-qualified     # 🦻 ear with hearing aid
+1F9BB 1F3FB                                ; fully-qualified     # 🦻🏻 ear with hearing aid: light skin tone
+1F9BB 1F3FC                                ; fully-qualified     # 🦻🏼 ear with hearing aid: medium-light skin tone
+1F9BB 1F3FD                                ; fully-qualified     # 🦻🏽 ear with hearing aid: medium skin tone
+1F9BB 1F3FE                                ; fully-qualified     # 🦻🏾 ear with hearing aid: medium-dark skin tone
+1F9BB 1F3FF                                ; fully-qualified     # 🦻🏿 ear with hearing aid: dark skin tone
+1F443                                      ; fully-qualified     # 👃 nose
+1F443 1F3FB                                ; fully-qualified     # 👃🏻 nose: light skin tone
+1F443 1F3FC                                ; fully-qualified     # 👃🏼 nose: medium-light skin tone
+1F443 1F3FD                                ; fully-qualified     # 👃🏽 nose: medium skin tone
+1F443 1F3FE                                ; fully-qualified     # 👃🏾 nose: medium-dark skin tone
+1F443 1F3FF                                ; fully-qualified     # 👃🏿 nose: dark skin tone
+1F9E0                                      ; fully-qualified     # 🧠 brain
+1F9B7                                      ; fully-qualified     # 🦷 tooth
+1F9B4                                      ; fully-qualified     # 🦴 bone
+1F440                                      ; fully-qualified     # 👀 eyes
+1F441 FE0F                                 ; fully-qualified     # 👁️ eye
+1F441                                      ; unqualified         # 👁 eye
+1F445                                      ; fully-qualified     # 👅 tongue
+1F444                                      ; fully-qualified     # 👄 mouth
+
+# subgroup: person
+1F476                                      ; fully-qualified     # 👶 baby
+1F476 1F3FB                                ; fully-qualified     # 👶🏻 baby: light skin tone
+1F476 1F3FC                                ; fully-qualified     # 👶🏼 baby: medium-light skin tone
+1F476 1F3FD                                ; fully-qualified     # 👶🏽 baby: medium skin tone
+1F476 1F3FE                                ; fully-qualified     # 👶🏾 baby: medium-dark skin tone
+1F476 1F3FF                                ; fully-qualified     # 👶🏿 baby: dark skin tone
+1F9D2                                      ; fully-qualified     # 🧒 child
+1F9D2 1F3FB                                ; fully-qualified     # 🧒🏻 child: light skin tone
+1F9D2 1F3FC                                ; fully-qualified     # 🧒🏼 child: medium-light skin tone
+1F9D2 1F3FD                                ; fully-qualified     # 🧒🏽 child: medium skin tone
+1F9D2 1F3FE                                ; fully-qualified     # 🧒🏾 child: medium-dark skin tone
+1F9D2 1F3FF                                ; fully-qualified     # 🧒🏿 child: dark skin tone
+1F466                                      ; fully-qualified     # 👦 boy
+1F466 1F3FB                                ; fully-qualified     # 👦🏻 boy: light skin tone
+1F466 1F3FC                                ; fully-qualified     # 👦🏼 boy: medium-light skin tone
+1F466 1F3FD                                ; fully-qualified     # 👦🏽 boy: medium skin tone
+1F466 1F3FE                                ; fully-qualified     # 👦🏾 boy: medium-dark skin tone
+1F466 1F3FF                                ; fully-qualified     # 👦🏿 boy: dark skin tone
+1F467                                      ; fully-qualified     # 👧 girl
+1F467 1F3FB                                ; fully-qualified     # 👧🏻 girl: light skin tone
+1F467 1F3FC                                ; fully-qualified     # 👧🏼 girl: medium-light skin tone
+1F467 1F3FD                                ; fully-qualified     # 👧🏽 girl: medium skin tone
+1F467 1F3FE                                ; fully-qualified     # 👧🏾 girl: medium-dark skin tone
+1F467 1F3FF                                ; fully-qualified     # 👧🏿 girl: dark skin tone
+1F9D1                                      ; fully-qualified     # 🧑 person
+1F9D1 1F3FB                                ; fully-qualified     # 🧑🏻 person: light skin tone
+1F9D1 1F3FC                                ; fully-qualified     # 🧑🏼 person: medium-light skin tone
+1F9D1 1F3FD                                ; fully-qualified     # 🧑🏽 person: medium skin tone
+1F9D1 1F3FE                                ; fully-qualified     # 🧑🏾 person: medium-dark skin tone
+1F9D1 1F3FF                                ; fully-qualified     # 🧑🏿 person: dark skin tone
+1F471                                      ; fully-qualified     # 👱 person: blond hair
+1F471 1F3FB                                ; fully-qualified     # 👱🏻 person: light skin tone, blond hair
+1F471 1F3FC                                ; fully-qualified     # 👱🏼 person: medium-light skin tone, blond hair
+1F471 1F3FD                                ; fully-qualified     # 👱🏽 person: medium skin tone, blond hair
+1F471 1F3FE                                ; fully-qualified     # 👱🏾 person: medium-dark skin tone, blond hair
+1F471 1F3FF                                ; fully-qualified     # 👱🏿 person: dark skin tone, blond hair
+1F468                                      ; fully-qualified     # 👨 man
+1F468 1F3FB                                ; fully-qualified     # 👨🏻 man: light skin tone
+1F468 1F3FC                                ; fully-qualified     # 👨🏼 man: medium-light skin tone
+1F468 1F3FD                                ; fully-qualified     # 👨🏽 man: medium skin tone
+1F468 1F3FE                                ; fully-qualified     # 👨🏾 man: medium-dark skin tone
+1F468 1F3FF                                ; fully-qualified     # 👨🏿 man: dark skin tone
+1F9D4                                      ; fully-qualified     # 🧔 man: beard
+1F9D4 1F3FB                                ; fully-qualified     # 🧔🏻 man: light skin tone, beard
+1F9D4 1F3FC                                ; fully-qualified     # 🧔🏼 man: medium-light skin tone, beard
+1F9D4 1F3FD                                ; fully-qualified     # 🧔🏽 man: medium skin tone, beard
+1F9D4 1F3FE                                ; fully-qualified     # 🧔🏾 man: medium-dark skin tone, beard
+1F9D4 1F3FF                                ; fully-qualified     # 🧔🏿 man: dark skin tone, beard
+1F471 200D 2642 FE0F                       ; fully-qualified     # 👱‍♂️ man: blond hair
+1F471 200D 2642                            ; minimally-qualified # 👱‍♂ man: blond hair
+1F471 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 👱🏻‍♂️ man: light skin tone, blond hair
+1F471 1F3FB 200D 2642                      ; minimally-qualified # 👱🏻‍♂ man: light skin tone, blond hair
+1F471 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 👱🏼‍♂️ man: medium-light skin tone, blond hair
+1F471 1F3FC 200D 2642                      ; minimally-qualified # 👱🏼‍♂ man: medium-light skin tone, blond hair
+1F471 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 👱🏽‍♂️ man: medium skin tone, blond hair
+1F471 1F3FD 200D 2642                      ; minimally-qualified # 👱🏽‍♂ man: medium skin tone, blond hair
+1F471 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 👱🏾‍♂️ man: medium-dark skin tone, blond hair
+1F471 1F3FE 200D 2642                      ; minimally-qualified # 👱🏾‍♂ man: medium-dark skin tone, blond hair
+1F471 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 👱🏿‍♂️ man: dark skin tone, blond hair
+1F471 1F3FF 200D 2642                      ; minimally-qualified # 👱🏿‍♂ man: dark skin tone, blond hair
+1F468 200D 1F9B0                           ; fully-qualified     # 👨‍🦰 man: red hair
+1F468 1F3FB 200D 1F9B0                     ; fully-qualified     # 👨🏻‍🦰 man: light skin tone, red hair
+1F468 1F3FC 200D 1F9B0                     ; fully-qualified     # 👨🏼‍🦰 man: medium-light skin tone, red hair
+1F468 1F3FD 200D 1F9B0                     ; fully-qualified     # 👨🏽‍🦰 man: medium skin tone, red hair
+1F468 1F3FE 200D 1F9B0                     ; fully-qualified     # 👨🏾‍🦰 man: medium-dark skin tone, red hair
+1F468 1F3FF 200D 1F9B0                     ; fully-qualified     # 👨🏿‍🦰 man: dark skin tone, red hair
+1F468 200D 1F9B1                           ; fully-qualified     # 👨‍🦱 man: curly hair
+1F468 1F3FB 200D 1F9B1                     ; fully-qualified     # 👨🏻‍🦱 man: light skin tone, curly hair
+1F468 1F3FC 200D 1F9B1                     ; fully-qualified     # 👨🏼‍🦱 man: medium-light skin tone, curly hair
+1F468 1F3FD 200D 1F9B1                     ; fully-qualified     # 👨🏽‍🦱 man: medium skin tone, curly hair
+1F468 1F3FE 200D 1F9B1                     ; fully-qualified     # 👨🏾‍🦱 man: medium-dark skin tone, curly hair
+1F468 1F3FF 200D 1F9B1                     ; fully-qualified     # 👨🏿‍🦱 man: dark skin tone, curly hair
+1F468 200D 1F9B3                           ; fully-qualified     # 👨‍🦳 man: white hair
+1F468 1F3FB 200D 1F9B3                     ; fully-qualified     # 👨🏻‍🦳 man: light skin tone, white hair
+1F468 1F3FC 200D 1F9B3                     ; fully-qualified     # 👨🏼‍🦳 man: medium-light skin tone, white hair
+1F468 1F3FD 200D 1F9B3                     ; fully-qualified     # 👨🏽‍🦳 man: medium skin tone, white hair
+1F468 1F3FE 200D 1F9B3                     ; fully-qualified     # 👨🏾‍🦳 man: medium-dark skin tone, white hair
+1F468 1F3FF 200D 1F9B3                     ; fully-qualified     # 👨🏿‍🦳 man: dark skin tone, white hair
+1F468 200D 1F9B2                           ; fully-qualified     # 👨‍🦲 man: bald
+1F468 1F3FB 200D 1F9B2                     ; fully-qualified     # 👨🏻‍🦲 man: light skin tone, bald
+1F468 1F3FC 200D 1F9B2                     ; fully-qualified     # 👨🏼‍🦲 man: medium-light skin tone, bald
+1F468 1F3FD 200D 1F9B2                     ; fully-qualified     # 👨🏽‍🦲 man: medium skin tone, bald
+1F468 1F3FE 200D 1F9B2                     ; fully-qualified     # 👨🏾‍🦲 man: medium-dark skin tone, bald
+1F468 1F3FF 200D 1F9B2                     ; fully-qualified     # 👨🏿‍🦲 man: dark skin tone, bald
+1F469                                      ; fully-qualified     # 👩 woman
+1F469 1F3FB                                ; fully-qualified     # 👩🏻 woman: light skin tone
+1F469 1F3FC                                ; fully-qualified     # 👩🏼 woman: medium-light skin tone
+1F469 1F3FD                                ; fully-qualified     # 👩🏽 woman: medium skin tone
+1F469 1F3FE                                ; fully-qualified     # 👩🏾 woman: medium-dark skin tone
+1F469 1F3FF                                ; fully-qualified     # 👩🏿 woman: dark skin tone
+1F471 200D 2640 FE0F                       ; fully-qualified     # 👱‍♀️ woman: blond hair
+1F471 200D 2640                            ; minimally-qualified # 👱‍♀ woman: blond hair
+1F471 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 👱🏻‍♀️ woman: light skin tone, blond hair
+1F471 1F3FB 200D 2640                      ; minimally-qualified # 👱🏻‍♀ woman: light skin tone, blond hair
+1F471 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 👱🏼‍♀️ woman: medium-light skin tone, blond hair
+1F471 1F3FC 200D 2640                      ; minimally-qualified # 👱🏼‍♀ woman: medium-light skin tone, blond hair
+1F471 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 👱🏽‍♀️ woman: medium skin tone, blond hair
+1F471 1F3FD 200D 2640                      ; minimally-qualified # 👱🏽‍♀ woman: medium skin tone, blond hair
+1F471 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 👱🏾‍♀️ woman: medium-dark skin tone, blond hair
+1F471 1F3FE 200D 2640                      ; minimally-qualified # 👱🏾‍♀ woman: medium-dark skin tone, blond hair
+1F471 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 👱🏿‍♀️ woman: dark skin tone, blond hair
+1F471 1F3FF 200D 2640                      ; minimally-qualified # 👱🏿‍♀ woman: dark skin tone, blond hair
+1F469 200D 1F9B0                           ; fully-qualified     # 👩‍🦰 woman: red hair
+1F469 1F3FB 200D 1F9B0                     ; fully-qualified     # 👩🏻‍🦰 woman: light skin tone, red hair
+1F469 1F3FC 200D 1F9B0                     ; fully-qualified     # 👩🏼‍🦰 woman: medium-light skin tone, red hair
+1F469 1F3FD 200D 1F9B0                     ; fully-qualified     # 👩🏽‍🦰 woman: medium skin tone, red hair
+1F469 1F3FE 200D 1F9B0                     ; fully-qualified     # 👩🏾‍🦰 woman: medium-dark skin tone, red hair
+1F469 1F3FF 200D 1F9B0                     ; fully-qualified     # 👩🏿‍🦰 woman: dark skin tone, red hair
+1F469 200D 1F9B1                           ; fully-qualified     # 👩‍🦱 woman: curly hair
+1F469 1F3FB 200D 1F9B1                     ; fully-qualified     # 👩🏻‍🦱 woman: light skin tone, curly hair
+1F469 1F3FC 200D 1F9B1                     ; fully-qualified     # 👩🏼‍🦱 woman: medium-light skin tone, curly hair
+1F469 1F3FD 200D 1F9B1                     ; fully-qualified     # 👩🏽‍🦱 woman: medium skin tone, curly hair
+1F469 1F3FE 200D 1F9B1                     ; fully-qualified     # 👩🏾‍🦱 woman: medium-dark skin tone, curly hair
+1F469 1F3FF 200D 1F9B1                     ; fully-qualified     # 👩🏿‍🦱 woman: dark skin tone, curly hair
+1F469 200D 1F9B3                           ; fully-qualified     # 👩‍🦳 woman: white hair
+1F469 1F3FB 200D 1F9B3                     ; fully-qualified     # 👩🏻‍🦳 woman: light skin tone, white hair
+1F469 1F3FC 200D 1F9B3                     ; fully-qualified     # 👩🏼‍🦳 woman: medium-light skin tone, white hair
+1F469 1F3FD 200D 1F9B3                     ; fully-qualified     # 👩🏽‍🦳 woman: medium skin tone, white hair
+1F469 1F3FE 200D 1F9B3                     ; fully-qualified     # 👩🏾‍🦳 woman: medium-dark skin tone, white hair
+1F469 1F3FF 200D 1F9B3                     ; fully-qualified     # 👩🏿‍🦳 woman: dark skin tone, white hair
+1F469 200D 1F9B2                           ; fully-qualified     # 👩‍🦲 woman: bald
+1F469 1F3FB 200D 1F9B2                     ; fully-qualified     # 👩🏻‍🦲 woman: light skin tone, bald
+1F469 1F3FC 200D 1F9B2                     ; fully-qualified     # 👩🏼‍🦲 woman: medium-light skin tone, bald
+1F469 1F3FD 200D 1F9B2                     ; fully-qualified     # 👩🏽‍🦲 woman: medium skin tone, bald
+1F469 1F3FE 200D 1F9B2                     ; fully-qualified     # 👩🏾‍🦲 woman: medium-dark skin tone, bald
+1F469 1F3FF 200D 1F9B2                     ; fully-qualified     # 👩🏿‍🦲 woman: dark skin tone, bald
+1F9D3                                      ; fully-qualified     # 🧓 older person
+1F9D3 1F3FB                                ; fully-qualified     # 🧓🏻 older person: light skin tone
+1F9D3 1F3FC                                ; fully-qualified     # 🧓🏼 older person: medium-light skin tone
+1F9D3 1F3FD                                ; fully-qualified     # 🧓🏽 older person: medium skin tone
+1F9D3 1F3FE                                ; fully-qualified     # 🧓🏾 older person: medium-dark skin tone
+1F9D3 1F3FF                                ; fully-qualified     # 🧓🏿 older person: dark skin tone
+1F474                                      ; fully-qualified     # 👴 old man
+1F474 1F3FB                                ; fully-qualified     # 👴🏻 old man: light skin tone
+1F474 1F3FC                                ; fully-qualified     # 👴🏼 old man: medium-light skin tone
+1F474 1F3FD                                ; fully-qualified     # 👴🏽 old man: medium skin tone
+1F474 1F3FE                                ; fully-qualified     # 👴🏾 old man: medium-dark skin tone
+1F474 1F3FF                                ; fully-qualified     # 👴🏿 old man: dark skin tone
+1F475                                      ; fully-qualified     # 👵 old woman
+1F475 1F3FB                                ; fully-qualified     # 👵🏻 old woman: light skin tone
+1F475 1F3FC                                ; fully-qualified     # 👵🏼 old woman: medium-light skin tone
+1F475 1F3FD                                ; fully-qualified     # 👵🏽 old woman: medium skin tone
+1F475 1F3FE                                ; fully-qualified     # 👵🏾 old woman: medium-dark skin tone
+1F475 1F3FF                                ; fully-qualified     # 👵🏿 old woman: dark skin tone
+
+# subgroup: person-gesture
+1F64D                                      ; fully-qualified     # 🙍 person frowning
+1F64D 1F3FB                                ; fully-qualified     # 🙍🏻 person frowning: light skin tone
+1F64D 1F3FC                                ; fully-qualified     # 🙍🏼 person frowning: medium-light skin tone
+1F64D 1F3FD                                ; fully-qualified     # 🙍🏽 person frowning: medium skin tone
+1F64D 1F3FE                                ; fully-qualified     # 🙍🏾 person frowning: medium-dark skin tone
+1F64D 1F3FF                                ; fully-qualified     # 🙍🏿 person frowning: dark skin tone
+1F64D 200D 2642 FE0F                       ; fully-qualified     # 🙍‍♂️ man frowning
+1F64D 200D 2642                            ; minimally-qualified # 🙍‍♂ man frowning
+1F64D 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙍🏻‍♂️ man frowning: light skin tone
+1F64D 1F3FB 200D 2642                      ; minimally-qualified # 🙍🏻‍♂ man frowning: light skin tone
+1F64D 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙍🏼‍♂️ man frowning: medium-light skin tone
+1F64D 1F3FC 200D 2642                      ; minimally-qualified # 🙍🏼‍♂ man frowning: medium-light skin tone
+1F64D 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙍🏽‍♂️ man frowning: medium skin tone
+1F64D 1F3FD 200D 2642                      ; minimally-qualified # 🙍🏽‍♂ man frowning: medium skin tone
+1F64D 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙍🏾‍♂️ man frowning: medium-dark skin tone
+1F64D 1F3FE 200D 2642                      ; minimally-qualified # 🙍🏾‍♂ man frowning: medium-dark skin tone
+1F64D 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙍🏿‍♂️ man frowning: dark skin tone
+1F64D 1F3FF 200D 2642                      ; minimally-qualified # 🙍🏿‍♂ man frowning: dark skin tone
+1F64D 200D 2640 FE0F                       ; fully-qualified     # 🙍‍♀️ woman frowning
+1F64D 200D 2640                            ; minimally-qualified # 🙍‍♀ woman frowning
+1F64D 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙍🏻‍♀️ woman frowning: light skin tone
+1F64D 1F3FB 200D 2640                      ; minimally-qualified # 🙍🏻‍♀ woman frowning: light skin tone
+1F64D 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙍🏼‍♀️ woman frowning: medium-light skin tone
+1F64D 1F3FC 200D 2640                      ; minimally-qualified # 🙍🏼‍♀ woman frowning: medium-light skin tone
+1F64D 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙍🏽‍♀️ woman frowning: medium skin tone
+1F64D 1F3FD 200D 2640                      ; minimally-qualified # 🙍🏽‍♀ woman frowning: medium skin tone
+1F64D 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙍🏾‍♀️ woman frowning: medium-dark skin tone
+1F64D 1F3FE 200D 2640                      ; minimally-qualified # 🙍🏾‍♀ woman frowning: medium-dark skin tone
+1F64D 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙍🏿‍♀️ woman frowning: dark skin tone
+1F64D 1F3FF 200D 2640                      ; minimally-qualified # 🙍🏿‍♀ woman frowning: dark skin tone
+1F64E                                      ; fully-qualified     # 🙎 person pouting
+1F64E 1F3FB                                ; fully-qualified     # 🙎🏻 person pouting: light skin tone
+1F64E 1F3FC                                ; fully-qualified     # 🙎🏼 person pouting: medium-light skin tone
+1F64E 1F3FD                                ; fully-qualified     # 🙎🏽 person pouting: medium skin tone
+1F64E 1F3FE                                ; fully-qualified     # 🙎🏾 person pouting: medium-dark skin tone
+1F64E 1F3FF                                ; fully-qualified     # 🙎🏿 person pouting: dark skin tone
+1F64E 200D 2642 FE0F                       ; fully-qualified     # 🙎‍♂️ man pouting
+1F64E 200D 2642                            ; minimally-qualified # 🙎‍♂ man pouting
+1F64E 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙎🏻‍♂️ man pouting: light skin tone
+1F64E 1F3FB 200D 2642                      ; minimally-qualified # 🙎🏻‍♂ man pouting: light skin tone
+1F64E 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙎🏼‍♂️ man pouting: medium-light skin tone
+1F64E 1F3FC 200D 2642                      ; minimally-qualified # 🙎🏼‍♂ man pouting: medium-light skin tone
+1F64E 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙎🏽‍♂️ man pouting: medium skin tone
+1F64E 1F3FD 200D 2642                      ; minimally-qualified # 🙎🏽‍♂ man pouting: medium skin tone
+1F64E 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙎🏾‍♂️ man pouting: medium-dark skin tone
+1F64E 1F3FE 200D 2642                      ; minimally-qualified # 🙎🏾‍♂ man pouting: medium-dark skin tone
+1F64E 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙎🏿‍♂️ man pouting: dark skin tone
+1F64E 1F3FF 200D 2642                      ; minimally-qualified # 🙎🏿‍♂ man pouting: dark skin tone
+1F64E 200D 2640 FE0F                       ; fully-qualified     # 🙎‍♀️ woman pouting
+1F64E 200D 2640                            ; minimally-qualified # 🙎‍♀ woman pouting
+1F64E 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙎🏻‍♀️ woman pouting: light skin tone
+1F64E 1F3FB 200D 2640                      ; minimally-qualified # 🙎🏻‍♀ woman pouting: light skin tone
+1F64E 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙎🏼‍♀️ woman pouting: medium-light skin tone
+1F64E 1F3FC 200D 2640                      ; minimally-qualified # 🙎🏼‍♀ woman pouting: medium-light skin tone
+1F64E 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙎🏽‍♀️ woman pouting: medium skin tone
+1F64E 1F3FD 200D 2640                      ; minimally-qualified # 🙎🏽‍♀ woman pouting: medium skin tone
+1F64E 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙎🏾‍♀️ woman pouting: medium-dark skin tone
+1F64E 1F3FE 200D 2640                      ; minimally-qualified # 🙎🏾‍♀ woman pouting: medium-dark skin tone
+1F64E 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙎🏿‍♀️ woman pouting: dark skin tone
+1F64E 1F3FF 200D 2640                      ; minimally-qualified # 🙎🏿‍♀ woman pouting: dark skin tone
+1F645                                      ; fully-qualified     # 🙅 person gesturing NO
+1F645 1F3FB                                ; fully-qualified     # 🙅🏻 person gesturing NO: light skin tone
+1F645 1F3FC                                ; fully-qualified     # 🙅🏼 person gesturing NO: medium-light skin tone
+1F645 1F3FD                                ; fully-qualified     # 🙅🏽 person gesturing NO: medium skin tone
+1F645 1F3FE                                ; fully-qualified     # 🙅🏾 person gesturing NO: medium-dark skin tone
+1F645 1F3FF                                ; fully-qualified     # 🙅🏿 person gesturing NO: dark skin tone
+1F645 200D 2642 FE0F                       ; fully-qualified     # 🙅‍♂️ man gesturing NO
+1F645 200D 2642                            ; minimally-qualified # 🙅‍♂ man gesturing NO
+1F645 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙅🏻‍♂️ man gesturing NO: light skin tone
+1F645 1F3FB 200D 2642                      ; minimally-qualified # 🙅🏻‍♂ man gesturing NO: light skin tone
+1F645 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙅🏼‍♂️ man gesturing NO: medium-light skin tone
+1F645 1F3FC 200D 2642                      ; minimally-qualified # 🙅🏼‍♂ man gesturing NO: medium-light skin tone
+1F645 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙅🏽‍♂️ man gesturing NO: medium skin tone
+1F645 1F3FD 200D 2642                      ; minimally-qualified # 🙅🏽‍♂ man gesturing NO: medium skin tone
+1F645 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙅🏾‍♂️ man gesturing NO: medium-dark skin tone
+1F645 1F3FE 200D 2642                      ; minimally-qualified # 🙅🏾‍♂ man gesturing NO: medium-dark skin tone
+1F645 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙅🏿‍♂️ man gesturing NO: dark skin tone
+1F645 1F3FF 200D 2642                      ; minimally-qualified # 🙅🏿‍♂ man gesturing NO: dark skin tone
+1F645 200D 2640 FE0F                       ; fully-qualified     # 🙅‍♀️ woman gesturing NO
+1F645 200D 2640                            ; minimally-qualified # 🙅‍♀ woman gesturing NO
+1F645 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙅🏻‍♀️ woman gesturing NO: light skin tone
+1F645 1F3FB 200D 2640                      ; minimally-qualified # 🙅🏻‍♀ woman gesturing NO: light skin tone
+1F645 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙅🏼‍♀️ woman gesturing NO: medium-light skin tone
+1F645 1F3FC 200D 2640                      ; minimally-qualified # 🙅🏼‍♀ woman gesturing NO: medium-light skin tone
+1F645 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙅🏽‍♀️ woman gesturing NO: medium skin tone
+1F645 1F3FD 200D 2640                      ; minimally-qualified # 🙅🏽‍♀ woman gesturing NO: medium skin tone
+1F645 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙅🏾‍♀️ woman gesturing NO: medium-dark skin tone
+1F645 1F3FE 200D 2640                      ; minimally-qualified # 🙅🏾‍♀ woman gesturing NO: medium-dark skin tone
+1F645 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙅🏿‍♀️ woman gesturing NO: dark skin tone
+1F645 1F3FF 200D 2640                      ; minimally-qualified # 🙅🏿‍♀ woman gesturing NO: dark skin tone
+1F646                                      ; fully-qualified     # 🙆 person gesturing OK
+1F646 1F3FB                                ; fully-qualified     # 🙆🏻 person gesturing OK: light skin tone
+1F646 1F3FC                                ; fully-qualified     # 🙆🏼 person gesturing OK: medium-light skin tone
+1F646 1F3FD                                ; fully-qualified     # 🙆🏽 person gesturing OK: medium skin tone
+1F646 1F3FE                                ; fully-qualified     # 🙆🏾 person gesturing OK: medium-dark skin tone
+1F646 1F3FF                                ; fully-qualified     # 🙆🏿 person gesturing OK: dark skin tone
+1F646 200D 2642 FE0F                       ; fully-qualified     # 🙆‍♂️ man gesturing OK
+1F646 200D 2642                            ; minimally-qualified # 🙆‍♂ man gesturing OK
+1F646 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙆🏻‍♂️ man gesturing OK: light skin tone
+1F646 1F3FB 200D 2642                      ; minimally-qualified # 🙆🏻‍♂ man gesturing OK: light skin tone
+1F646 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙆🏼‍♂️ man gesturing OK: medium-light skin tone
+1F646 1F3FC 200D 2642                      ; minimally-qualified # 🙆🏼‍♂ man gesturing OK: medium-light skin tone
+1F646 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙆🏽‍♂️ man gesturing OK: medium skin tone
+1F646 1F3FD 200D 2642                      ; minimally-qualified # 🙆🏽‍♂ man gesturing OK: medium skin tone
+1F646 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙆🏾‍♂️ man gesturing OK: medium-dark skin tone
+1F646 1F3FE 200D 2642                      ; minimally-qualified # 🙆🏾‍♂ man gesturing OK: medium-dark skin tone
+1F646 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙆🏿‍♂️ man gesturing OK: dark skin tone
+1F646 1F3FF 200D 2642                      ; minimally-qualified # 🙆🏿‍♂ man gesturing OK: dark skin tone
+1F646 200D 2640 FE0F                       ; fully-qualified     # 🙆‍♀️ woman gesturing OK
+1F646 200D 2640                            ; minimally-qualified # 🙆‍♀ woman gesturing OK
+1F646 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙆🏻‍♀️ woman gesturing OK: light skin tone
+1F646 1F3FB 200D 2640                      ; minimally-qualified # 🙆🏻‍♀ woman gesturing OK: light skin tone
+1F646 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙆🏼‍♀️ woman gesturing OK: medium-light skin tone
+1F646 1F3FC 200D 2640                      ; minimally-qualified # 🙆🏼‍♀ woman gesturing OK: medium-light skin tone
+1F646 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙆🏽‍♀️ woman gesturing OK: medium skin tone
+1F646 1F3FD 200D 2640                      ; minimally-qualified # 🙆🏽‍♀ woman gesturing OK: medium skin tone
+1F646 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙆🏾‍♀️ woman gesturing OK: medium-dark skin tone
+1F646 1F3FE 200D 2640                      ; minimally-qualified # 🙆🏾‍♀ woman gesturing OK: medium-dark skin tone
+1F646 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙆🏿‍♀️ woman gesturing OK: dark skin tone
+1F646 1F3FF 200D 2640                      ; minimally-qualified # 🙆🏿‍♀ woman gesturing OK: dark skin tone
+1F481                                      ; fully-qualified     # 💁 person tipping hand
+1F481 1F3FB                                ; fully-qualified     # 💁🏻 person tipping hand: light skin tone
+1F481 1F3FC                                ; fully-qualified     # 💁🏼 person tipping hand: medium-light skin tone
+1F481 1F3FD                                ; fully-qualified     # 💁🏽 person tipping hand: medium skin tone
+1F481 1F3FE                                ; fully-qualified     # 💁🏾 person tipping hand: medium-dark skin tone
+1F481 1F3FF                                ; fully-qualified     # 💁🏿 person tipping hand: dark skin tone
+1F481 200D 2642 FE0F                       ; fully-qualified     # 💁‍♂️ man tipping hand
+1F481 200D 2642                            ; minimally-qualified # 💁‍♂ man tipping hand
+1F481 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 💁🏻‍♂️ man tipping hand: light skin tone
+1F481 1F3FB 200D 2642                      ; minimally-qualified # 💁🏻‍♂ man tipping hand: light skin tone
+1F481 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 💁🏼‍♂️ man tipping hand: medium-light skin tone
+1F481 1F3FC 200D 2642                      ; minimally-qualified # 💁🏼‍♂ man tipping hand: medium-light skin tone
+1F481 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 💁🏽‍♂️ man tipping hand: medium skin tone
+1F481 1F3FD 200D 2642                      ; minimally-qualified # 💁🏽‍♂ man tipping hand: medium skin tone
+1F481 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 💁🏾‍♂️ man tipping hand: medium-dark skin tone
+1F481 1F3FE 200D 2642                      ; minimally-qualified # 💁🏾‍♂ man tipping hand: medium-dark skin tone
+1F481 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 💁🏿‍♂️ man tipping hand: dark skin tone
+1F481 1F3FF 200D 2642                      ; minimally-qualified # 💁🏿‍♂ man tipping hand: dark skin tone
+1F481 200D 2640 FE0F                       ; fully-qualified     # 💁‍♀️ woman tipping hand
+1F481 200D 2640                            ; minimally-qualified # 💁‍♀ woman tipping hand
+1F481 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 💁🏻‍♀️ woman tipping hand: light skin tone
+1F481 1F3FB 200D 2640                      ; minimally-qualified # 💁🏻‍♀ woman tipping hand: light skin tone
+1F481 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 💁🏼‍♀️ woman tipping hand: medium-light skin tone
+1F481 1F3FC 200D 2640                      ; minimally-qualified # 💁🏼‍♀ woman tipping hand: medium-light skin tone
+1F481 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 💁🏽‍♀️ woman tipping hand: medium skin tone
+1F481 1F3FD 200D 2640                      ; minimally-qualified # 💁🏽‍♀ woman tipping hand: medium skin tone
+1F481 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 💁🏾‍♀️ woman tipping hand: medium-dark skin tone
+1F481 1F3FE 200D 2640                      ; minimally-qualified # 💁🏾‍♀ woman tipping hand: medium-dark skin tone
+1F481 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 💁🏿‍♀️ woman tipping hand: dark skin tone
+1F481 1F3FF 200D 2640                      ; minimally-qualified # 💁🏿‍♀ woman tipping hand: dark skin tone
+1F64B                                      ; fully-qualified     # 🙋 person raising hand
+1F64B 1F3FB                                ; fully-qualified     # 🙋🏻 person raising hand: light skin tone
+1F64B 1F3FC                                ; fully-qualified     # 🙋🏼 person raising hand: medium-light skin tone
+1F64B 1F3FD                                ; fully-qualified     # 🙋🏽 person raising hand: medium skin tone
+1F64B 1F3FE                                ; fully-qualified     # 🙋🏾 person raising hand: medium-dark skin tone
+1F64B 1F3FF                                ; fully-qualified     # 🙋🏿 person raising hand: dark skin tone
+1F64B 200D 2642 FE0F                       ; fully-qualified     # 🙋‍♂️ man raising hand
+1F64B 200D 2642                            ; minimally-qualified # 🙋‍♂ man raising hand
+1F64B 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙋🏻‍♂️ man raising hand: light skin tone
+1F64B 1F3FB 200D 2642                      ; minimally-qualified # 🙋🏻‍♂ man raising hand: light skin tone
+1F64B 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙋🏼‍♂️ man raising hand: medium-light skin tone
+1F64B 1F3FC 200D 2642                      ; minimally-qualified # 🙋🏼‍♂ man raising hand: medium-light skin tone
+1F64B 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙋🏽‍♂️ man raising hand: medium skin tone
+1F64B 1F3FD 200D 2642                      ; minimally-qualified # 🙋🏽‍♂ man raising hand: medium skin tone
+1F64B 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙋🏾‍♂️ man raising hand: medium-dark skin tone
+1F64B 1F3FE 200D 2642                      ; minimally-qualified # 🙋🏾‍♂ man raising hand: medium-dark skin tone
+1F64B 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙋🏿‍♂️ man raising hand: dark skin tone
+1F64B 1F3FF 200D 2642                      ; minimally-qualified # 🙋🏿‍♂ man raising hand: dark skin tone
+1F64B 200D 2640 FE0F                       ; fully-qualified     # 🙋‍♀️ woman raising hand
+1F64B 200D 2640                            ; minimally-qualified # 🙋‍♀ woman raising hand
+1F64B 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙋🏻‍♀️ woman raising hand: light skin tone
+1F64B 1F3FB 200D 2640                      ; minimally-qualified # 🙋🏻‍♀ woman raising hand: light skin tone
+1F64B 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙋🏼‍♀️ woman raising hand: medium-light skin tone
+1F64B 1F3FC 200D 2640                      ; minimally-qualified # 🙋🏼‍♀ woman raising hand: medium-light skin tone
+1F64B 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙋🏽‍♀️ woman raising hand: medium skin tone
+1F64B 1F3FD 200D 2640                      ; minimally-qualified # 🙋🏽‍♀ woman raising hand: medium skin tone
+1F64B 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙋🏾‍♀️ woman raising hand: medium-dark skin tone
+1F64B 1F3FE 200D 2640                      ; minimally-qualified # 🙋🏾‍♀ woman raising hand: medium-dark skin tone
+1F64B 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙋🏿‍♀️ woman raising hand: dark skin tone
+1F64B 1F3FF 200D 2640                      ; minimally-qualified # 🙋🏿‍♀ woman raising hand: dark skin tone
+1F9CF                                      ; fully-qualified     # 🧏 deaf person
+1F9CF 1F3FB                                ; fully-qualified     # 🧏🏻 deaf person: light skin tone
+1F9CF 1F3FC                                ; fully-qualified     # 🧏🏼 deaf person: medium-light skin tone
+1F9CF 1F3FD                                ; fully-qualified     # 🧏🏽 deaf person: medium skin tone
+1F9CF 1F3FE                                ; fully-qualified     # 🧏🏾 deaf person: medium-dark skin tone
+1F9CF 1F3FF                                ; fully-qualified     # 🧏🏿 deaf person: dark skin tone
+1F9CF 200D 2642 FE0F                       ; fully-qualified     # 🧏‍♂️ deaf man
+1F9CF 200D 2642                            ; minimally-qualified # 🧏‍♂ deaf man
+1F9CF 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧏🏻‍♂️ deaf man: light skin tone
+1F9CF 1F3FB 200D 2642                      ; minimally-qualified # 🧏🏻‍♂ deaf man: light skin tone
+1F9CF 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧏🏼‍♂️ deaf man: medium-light skin tone
+1F9CF 1F3FC 200D 2642                      ; minimally-qualified # 🧏🏼‍♂ deaf man: medium-light skin tone
+1F9CF 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧏🏽‍♂️ deaf man: medium skin tone
+1F9CF 1F3FD 200D 2642                      ; minimally-qualified # 🧏🏽‍♂ deaf man: medium skin tone
+1F9CF 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧏🏾‍♂️ deaf man: medium-dark skin tone
+1F9CF 1F3FE 200D 2642                      ; minimally-qualified # 🧏🏾‍♂ deaf man: medium-dark skin tone
+1F9CF 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧏🏿‍♂️ deaf man: dark skin tone
+1F9CF 1F3FF 200D 2642                      ; minimally-qualified # 🧏🏿‍♂ deaf man: dark skin tone
+1F9CF 200D 2640 FE0F                       ; fully-qualified     # 🧏‍♀️ deaf woman
+1F9CF 200D 2640                            ; minimally-qualified # 🧏‍♀ deaf woman
+1F9CF 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧏🏻‍♀️ deaf woman: light skin tone
+1F9CF 1F3FB 200D 2640                      ; minimally-qualified # 🧏🏻‍♀ deaf woman: light skin tone
+1F9CF 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧏🏼‍♀️ deaf woman: medium-light skin tone
+1F9CF 1F3FC 200D 2640                      ; minimally-qualified # 🧏🏼‍♀ deaf woman: medium-light skin tone
+1F9CF 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧏🏽‍♀️ deaf woman: medium skin tone
+1F9CF 1F3FD 200D 2640                      ; minimally-qualified # 🧏🏽‍♀ deaf woman: medium skin tone
+1F9CF 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧏🏾‍♀️ deaf woman: medium-dark skin tone
+1F9CF 1F3FE 200D 2640                      ; minimally-qualified # 🧏🏾‍♀ deaf woman: medium-dark skin tone
+1F9CF 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧏🏿‍♀️ deaf woman: dark skin tone
+1F9CF 1F3FF 200D 2640                      ; minimally-qualified # 🧏🏿‍♀ deaf woman: dark skin tone
+1F647                                      ; fully-qualified     # 🙇 person bowing
+1F647 1F3FB                                ; fully-qualified     # 🙇🏻 person bowing: light skin tone
+1F647 1F3FC                                ; fully-qualified     # 🙇🏼 person bowing: medium-light skin tone
+1F647 1F3FD                                ; fully-qualified     # 🙇🏽 person bowing: medium skin tone
+1F647 1F3FE                                ; fully-qualified     # 🙇🏾 person bowing: medium-dark skin tone
+1F647 1F3FF                                ; fully-qualified     # 🙇🏿 person bowing: dark skin tone
+1F647 200D 2642 FE0F                       ; fully-qualified     # 🙇‍♂️ man bowing
+1F647 200D 2642                            ; minimally-qualified # 🙇‍♂ man bowing
+1F647 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙇🏻‍♂️ man bowing: light skin tone
+1F647 1F3FB 200D 2642                      ; minimally-qualified # 🙇🏻‍♂ man bowing: light skin tone
+1F647 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙇🏼‍♂️ man bowing: medium-light skin tone
+1F647 1F3FC 200D 2642                      ; minimally-qualified # 🙇🏼‍♂ man bowing: medium-light skin tone
+1F647 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙇🏽‍♂️ man bowing: medium skin tone
+1F647 1F3FD 200D 2642                      ; minimally-qualified # 🙇🏽‍♂ man bowing: medium skin tone
+1F647 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙇🏾‍♂️ man bowing: medium-dark skin tone
+1F647 1F3FE 200D 2642                      ; minimally-qualified # 🙇🏾‍♂ man bowing: medium-dark skin tone
+1F647 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙇🏿‍♂️ man bowing: dark skin tone
+1F647 1F3FF 200D 2642                      ; minimally-qualified # 🙇🏿‍♂ man bowing: dark skin tone
+1F647 200D 2640 FE0F                       ; fully-qualified     # 🙇‍♀️ woman bowing
+1F647 200D 2640                            ; minimally-qualified # 🙇‍♀ woman bowing
+1F647 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙇🏻‍♀️ woman bowing: light skin tone
+1F647 1F3FB 200D 2640                      ; minimally-qualified # 🙇🏻‍♀ woman bowing: light skin tone
+1F647 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙇🏼‍♀️ woman bowing: medium-light skin tone
+1F647 1F3FC 200D 2640                      ; minimally-qualified # 🙇🏼‍♀ woman bowing: medium-light skin tone
+1F647 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙇🏽‍♀️ woman bowing: medium skin tone
+1F647 1F3FD 200D 2640                      ; minimally-qualified # 🙇🏽‍♀ woman bowing: medium skin tone
+1F647 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙇🏾‍♀️ woman bowing: medium-dark skin tone
+1F647 1F3FE 200D 2640                      ; minimally-qualified # 🙇🏾‍♀ woman bowing: medium-dark skin tone
+1F647 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙇🏿‍♀️ woman bowing: dark skin tone
+1F647 1F3FF 200D 2640                      ; minimally-qualified # 🙇🏿‍♀ woman bowing: dark skin tone
+1F926                                      ; fully-qualified     # 🤦 person facepalming
+1F926 1F3FB                                ; fully-qualified     # 🤦🏻 person facepalming: light skin tone
+1F926 1F3FC                                ; fully-qualified     # 🤦🏼 person facepalming: medium-light skin tone
+1F926 1F3FD                                ; fully-qualified     # 🤦🏽 person facepalming: medium skin tone
+1F926 1F3FE                                ; fully-qualified     # 🤦🏾 person facepalming: medium-dark skin tone
+1F926 1F3FF                                ; fully-qualified     # 🤦🏿 person facepalming: dark skin tone
+1F926 200D 2642 FE0F                       ; fully-qualified     # 🤦‍♂️ man facepalming
+1F926 200D 2642                            ; minimally-qualified # 🤦‍♂ man facepalming
+1F926 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤦🏻‍♂️ man facepalming: light skin tone
+1F926 1F3FB 200D 2642                      ; minimally-qualified # 🤦🏻‍♂ man facepalming: light skin tone
+1F926 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤦🏼‍♂️ man facepalming: medium-light skin tone
+1F926 1F3FC 200D 2642                      ; minimally-qualified # 🤦🏼‍♂ man facepalming: medium-light skin tone
+1F926 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤦🏽‍♂️ man facepalming: medium skin tone
+1F926 1F3FD 200D 2642                      ; minimally-qualified # 🤦🏽‍♂ man facepalming: medium skin tone
+1F926 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤦🏾‍♂️ man facepalming: medium-dark skin tone
+1F926 1F3FE 200D 2642                      ; minimally-qualified # 🤦🏾‍♂ man facepalming: medium-dark skin tone
+1F926 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤦🏿‍♂️ man facepalming: dark skin tone
+1F926 1F3FF 200D 2642                      ; minimally-qualified # 🤦🏿‍♂ man facepalming: dark skin tone
+1F926 200D 2640 FE0F                       ; fully-qualified     # 🤦‍♀️ woman facepalming
+1F926 200D 2640                            ; minimally-qualified # 🤦‍♀ woman facepalming
+1F926 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤦🏻‍♀️ woman facepalming: light skin tone
+1F926 1F3FB 200D 2640                      ; minimally-qualified # 🤦🏻‍♀ woman facepalming: light skin tone
+1F926 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤦🏼‍♀️ woman facepalming: medium-light skin tone
+1F926 1F3FC 200D 2640                      ; minimally-qualified # 🤦🏼‍♀ woman facepalming: medium-light skin tone
+1F926 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤦🏽‍♀️ woman facepalming: medium skin tone
+1F926 1F3FD 200D 2640                      ; minimally-qualified # 🤦🏽‍♀ woman facepalming: medium skin tone
+1F926 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤦🏾‍♀️ woman facepalming: medium-dark skin tone
+1F926 1F3FE 200D 2640                      ; minimally-qualified # 🤦🏾‍♀ woman facepalming: medium-dark skin tone
+1F926 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤦🏿‍♀️ woman facepalming: dark skin tone
+1F926 1F3FF 200D 2640                      ; minimally-qualified # 🤦🏿‍♀ woman facepalming: dark skin tone
+1F937                                      ; fully-qualified     # 🤷 person shrugging
+1F937 1F3FB                                ; fully-qualified     # 🤷🏻 person shrugging: light skin tone
+1F937 1F3FC                                ; fully-qualified     # 🤷🏼 person shrugging: medium-light skin tone
+1F937 1F3FD                                ; fully-qualified     # 🤷🏽 person shrugging: medium skin tone
+1F937 1F3FE                                ; fully-qualified     # 🤷🏾 person shrugging: medium-dark skin tone
+1F937 1F3FF                                ; fully-qualified     # 🤷🏿 person shrugging: dark skin tone
+1F937 200D 2642 FE0F                       ; fully-qualified     # 🤷‍♂️ man shrugging
+1F937 200D 2642                            ; minimally-qualified # 🤷‍♂ man shrugging
+1F937 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤷🏻‍♂️ man shrugging: light skin tone
+1F937 1F3FB 200D 2642                      ; minimally-qualified # 🤷🏻‍♂ man shrugging: light skin tone
+1F937 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤷🏼‍♂️ man shrugging: medium-light skin tone
+1F937 1F3FC 200D 2642                      ; minimally-qualified # 🤷🏼‍♂ man shrugging: medium-light skin tone
+1F937 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤷🏽‍♂️ man shrugging: medium skin tone
+1F937 1F3FD 200D 2642                      ; minimally-qualified # 🤷🏽‍♂ man shrugging: medium skin tone
+1F937 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤷🏾‍♂️ man shrugging: medium-dark skin tone
+1F937 1F3FE 200D 2642                      ; minimally-qualified # 🤷🏾‍♂ man shrugging: medium-dark skin tone
+1F937 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤷🏿‍♂️ man shrugging: dark skin tone
+1F937 1F3FF 200D 2642                      ; minimally-qualified # 🤷🏿‍♂ man shrugging: dark skin tone
+1F937 200D 2640 FE0F                       ; fully-qualified     # 🤷‍♀️ woman shrugging
+1F937 200D 2640                            ; minimally-qualified # 🤷‍♀ woman shrugging
+1F937 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤷🏻‍♀️ woman shrugging: light skin tone
+1F937 1F3FB 200D 2640                      ; minimally-qualified # 🤷🏻‍♀ woman shrugging: light skin tone
+1F937 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤷🏼‍♀️ woman shrugging: medium-light skin tone
+1F937 1F3FC 200D 2640                      ; minimally-qualified # 🤷🏼‍♀ woman shrugging: medium-light skin tone
+1F937 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤷🏽‍♀️ woman shrugging: medium skin tone
+1F937 1F3FD 200D 2640                      ; minimally-qualified # 🤷🏽‍♀ woman shrugging: medium skin tone
+1F937 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤷🏾‍♀️ woman shrugging: medium-dark skin tone
+1F937 1F3FE 200D 2640                      ; minimally-qualified # 🤷🏾‍♀ woman shrugging: medium-dark skin tone
+1F937 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤷🏿‍♀️ woman shrugging: dark skin tone
+1F937 1F3FF 200D 2640                      ; minimally-qualified # 🤷🏿‍♀ woman shrugging: dark skin tone
+
+# subgroup: person-role
+1F468 200D 2695 FE0F                       ; fully-qualified     # 👨‍⚕️ man health worker
+1F468 200D 2695                            ; minimally-qualified # 👨‍⚕ man health worker
+1F468 1F3FB 200D 2695 FE0F                 ; fully-qualified     # 👨🏻‍⚕️ man health worker: light skin tone
+1F468 1F3FB 200D 2695                      ; minimally-qualified # 👨🏻‍⚕ man health worker: light skin tone
+1F468 1F3FC 200D 2695 FE0F                 ; fully-qualified     # 👨🏼‍⚕️ man health worker: medium-light skin tone
+1F468 1F3FC 200D 2695                      ; minimally-qualified # 👨🏼‍⚕ man health worker: medium-light skin tone
+1F468 1F3FD 200D 2695 FE0F                 ; fully-qualified     # 👨🏽‍⚕️ man health worker: medium skin tone
+1F468 1F3FD 200D 2695                      ; minimally-qualified # 👨🏽‍⚕ man health worker: medium skin tone
+1F468 1F3FE 200D 2695 FE0F                 ; fully-qualified     # 👨🏾‍⚕️ man health worker: medium-dark skin tone
+1F468 1F3FE 200D 2695                      ; minimally-qualified # 👨🏾‍⚕ man health worker: medium-dark skin tone
+1F468 1F3FF 200D 2695 FE0F                 ; fully-qualified     # 👨🏿‍⚕️ man health worker: dark skin tone
+1F468 1F3FF 200D 2695                      ; minimally-qualified # 👨🏿‍⚕ man health worker: dark skin tone
+1F469 200D 2695 FE0F                       ; fully-qualified     # 👩‍⚕️ woman health worker
+1F469 200D 2695                            ; minimally-qualified # 👩‍⚕ woman health worker
+1F469 1F3FB 200D 2695 FE0F                 ; fully-qualified     # 👩🏻‍⚕️ woman health worker: light skin tone
+1F469 1F3FB 200D 2695                      ; minimally-qualified # 👩🏻‍⚕ woman health worker: light skin tone
+1F469 1F3FC 200D 2695 FE0F                 ; fully-qualified     # 👩🏼‍⚕️ woman health worker: medium-light skin tone
+1F469 1F3FC 200D 2695                      ; minimally-qualified # 👩🏼‍⚕ woman health worker: medium-light skin tone
+1F469 1F3FD 200D 2695 FE0F                 ; fully-qualified     # 👩🏽‍⚕️ woman health worker: medium skin tone
+1F469 1F3FD 200D 2695                      ; minimally-qualified # 👩🏽‍⚕ woman health worker: medium skin tone
+1F469 1F3FE 200D 2695 FE0F                 ; fully-qualified     # 👩🏾‍⚕️ woman health worker: medium-dark skin tone
+1F469 1F3FE 200D 2695                      ; minimally-qualified # 👩🏾‍⚕ woman health worker: medium-dark skin tone
+1F469 1F3FF 200D 2695 FE0F                 ; fully-qualified     # 👩🏿‍⚕️ woman health worker: dark skin tone
+1F469 1F3FF 200D 2695                      ; minimally-qualified # 👩🏿‍⚕ woman health worker: dark skin tone
+1F468 200D 1F393                           ; fully-qualified     # 👨‍🎓 man student
+1F468 1F3FB 200D 1F393                     ; fully-qualified     # 👨🏻‍🎓 man student: light skin tone
+1F468 1F3FC 200D 1F393                     ; fully-qualified     # 👨🏼‍🎓 man student: medium-light skin tone
+1F468 1F3FD 200D 1F393                     ; fully-qualified     # 👨🏽‍🎓 man student: medium skin tone
+1F468 1F3FE 200D 1F393                     ; fully-qualified     # 👨🏾‍🎓 man student: medium-dark skin tone
+1F468 1F3FF 200D 1F393                     ; fully-qualified     # 👨🏿‍🎓 man student: dark skin tone
+1F469 200D 1F393                           ; fully-qualified     # 👩‍🎓 woman student
+1F469 1F3FB 200D 1F393                     ; fully-qualified     # 👩🏻‍🎓 woman student: light skin tone
+1F469 1F3FC 200D 1F393                     ; fully-qualified     # 👩🏼‍🎓 woman student: medium-light skin tone
+1F469 1F3FD 200D 1F393                     ; fully-qualified     # 👩🏽‍🎓 woman student: medium skin tone
+1F469 1F3FE 200D 1F393                     ; fully-qualified     # 👩🏾‍🎓 woman student: medium-dark skin tone
+1F469 1F3FF 200D 1F393                     ; fully-qualified     # 👩🏿‍🎓 woman student: dark skin tone
+1F468 200D 1F3EB                           ; fully-qualified     # 👨‍🏫 man teacher
+1F468 1F3FB 200D 1F3EB                     ; fully-qualified     # 👨🏻‍🏫 man teacher: light skin tone
+1F468 1F3FC 200D 1F3EB                     ; fully-qualified     # 👨🏼‍🏫 man teacher: medium-light skin tone
+1F468 1F3FD 200D 1F3EB                     ; fully-qualified     # 👨🏽‍🏫 man teacher: medium skin tone
+1F468 1F3FE 200D 1F3EB                     ; fully-qualified     # 👨🏾‍🏫 man teacher: medium-dark skin tone
+1F468 1F3FF 200D 1F3EB                     ; fully-qualified     # 👨🏿‍🏫 man teacher: dark skin tone
+1F469 200D 1F3EB                           ; fully-qualified     # 👩‍🏫 woman teacher
+1F469 1F3FB 200D 1F3EB                     ; fully-qualified     # 👩🏻‍🏫 woman teacher: light skin tone
+1F469 1F3FC 200D 1F3EB                     ; fully-qualified     # 👩🏼‍🏫 woman teacher: medium-light skin tone
+1F469 1F3FD 200D 1F3EB                     ; fully-qualified     # 👩🏽‍🏫 woman teacher: medium skin tone
+1F469 1F3FE 200D 1F3EB                     ; fully-qualified     # 👩🏾‍🏫 woman teacher: medium-dark skin tone
+1F469 1F3FF 200D 1F3EB                     ; fully-qualified     # 👩🏿‍🏫 woman teacher: dark skin tone
+1F468 200D 2696 FE0F                       ; fully-qualified     # 👨‍⚖️ man judge
+1F468 200D 2696                            ; minimally-qualified # 👨‍⚖ man judge
+1F468 1F3FB 200D 2696 FE0F                 ; fully-qualified     # 👨🏻‍⚖️ man judge: light skin tone
+1F468 1F3FB 200D 2696                      ; minimally-qualified # 👨🏻‍⚖ man judge: light skin tone
+1F468 1F3FC 200D 2696 FE0F                 ; fully-qualified     # 👨🏼‍⚖️ man judge: medium-light skin tone
+1F468 1F3FC 200D 2696                      ; minimally-qualified # 👨🏼‍⚖ man judge: medium-light skin tone
+1F468 1F3FD 200D 2696 FE0F                 ; fully-qualified     # 👨🏽‍⚖️ man judge: medium skin tone
+1F468 1F3FD 200D 2696                      ; minimally-qualified # 👨🏽‍⚖ man judge: medium skin tone
+1F468 1F3FE 200D 2696 FE0F                 ; fully-qualified     # 👨🏾‍⚖️ man judge: medium-dark skin tone
+1F468 1F3FE 200D 2696                      ; minimally-qualified # 👨🏾‍⚖ man judge: medium-dark skin tone
+1F468 1F3FF 200D 2696 FE0F                 ; fully-qualified     # 👨🏿‍⚖️ man judge: dark skin tone
+1F468 1F3FF 200D 2696                      ; minimally-qualified # 👨🏿‍⚖ man judge: dark skin tone
+1F469 200D 2696 FE0F                       ; fully-qualified     # 👩‍⚖️ woman judge
+1F469 200D 2696                            ; minimally-qualified # 👩‍⚖ woman judge
+1F469 1F3FB 200D 2696 FE0F                 ; fully-qualified     # 👩🏻‍⚖️ woman judge: light skin tone
+1F469 1F3FB 200D 2696                      ; minimally-qualified # 👩🏻‍⚖ woman judge: light skin tone
+1F469 1F3FC 200D 2696 FE0F                 ; fully-qualified     # 👩🏼‍⚖️ woman judge: medium-light skin tone
+1F469 1F3FC 200D 2696                      ; minimally-qualified # 👩🏼‍⚖ woman judge: medium-light skin tone
+1F469 1F3FD 200D 2696 FE0F                 ; fully-qualified     # 👩🏽‍⚖️ woman judge: medium skin tone
+1F469 1F3FD 200D 2696                      ; minimally-qualified # 👩🏽‍⚖ woman judge: medium skin tone
+1F469 1F3FE 200D 2696 FE0F                 ; fully-qualified     # 👩🏾‍⚖️ woman judge: medium-dark skin tone
+1F469 1F3FE 200D 2696                      ; minimally-qualified # 👩🏾‍⚖ woman judge: medium-dark skin tone
+1F469 1F3FF 200D 2696 FE0F                 ; fully-qualified     # 👩🏿‍⚖️ woman judge: dark skin tone
+1F469 1F3FF 200D 2696                      ; minimally-qualified # 👩🏿‍⚖ woman judge: dark skin tone
+1F468 200D 1F33E                           ; fully-qualified     # 👨‍🌾 man farmer
+1F468 1F3FB 200D 1F33E                     ; fully-qualified     # 👨🏻‍🌾 man farmer: light skin tone
+1F468 1F3FC 200D 1F33E                     ; fully-qualified     # 👨🏼‍🌾 man farmer: medium-light skin tone
+1F468 1F3FD 200D 1F33E                     ; fully-qualified     # 👨🏽‍🌾 man farmer: medium skin tone
+1F468 1F3FE 200D 1F33E                     ; fully-qualified     # 👨🏾‍🌾 man farmer: medium-dark skin tone
+1F468 1F3FF 200D 1F33E                     ; fully-qualified     # 👨🏿‍🌾 man farmer: dark skin tone
+1F469 200D 1F33E                           ; fully-qualified     # 👩‍🌾 woman farmer
+1F469 1F3FB 200D 1F33E                     ; fully-qualified     # 👩🏻‍🌾 woman farmer: light skin tone
+1F469 1F3FC 200D 1F33E                     ; fully-qualified     # 👩🏼‍🌾 woman farmer: medium-light skin tone
+1F469 1F3FD 200D 1F33E                     ; fully-qualified     # 👩🏽‍🌾 woman farmer: medium skin tone
+1F469 1F3FE 200D 1F33E                     ; fully-qualified     # 👩🏾‍🌾 woman farmer: medium-dark skin tone
+1F469 1F3FF 200D 1F33E                     ; fully-qualified     # 👩🏿‍🌾 woman farmer: dark skin tone
+1F468 200D 1F373                           ; fully-qualified     # 👨‍🍳 man cook
+1F468 1F3FB 200D 1F373                     ; fully-qualified     # 👨🏻‍🍳 man cook: light skin tone
+1F468 1F3FC 200D 1F373                     ; fully-qualified     # 👨🏼‍🍳 man cook: medium-light skin tone
+1F468 1F3FD 200D 1F373                     ; fully-qualified     # 👨🏽‍🍳 man cook: medium skin tone
+1F468 1F3FE 200D 1F373                     ; fully-qualified     # 👨🏾‍🍳 man cook: medium-dark skin tone
+1F468 1F3FF 200D 1F373                     ; fully-qualified     # 👨🏿‍🍳 man cook: dark skin tone
+1F469 200D 1F373                           ; fully-qualified     # 👩‍🍳 woman cook
+1F469 1F3FB 200D 1F373                     ; fully-qualified     # 👩🏻‍🍳 woman cook: light skin tone
+1F469 1F3FC 200D 1F373                     ; fully-qualified     # 👩🏼‍🍳 woman cook: medium-light skin tone
+1F469 1F3FD 200D 1F373                     ; fully-qualified     # 👩🏽‍🍳 woman cook: medium skin tone
+1F469 1F3FE 200D 1F373                     ; fully-qualified     # 👩🏾‍🍳 woman cook: medium-dark skin tone
+1F469 1F3FF 200D 1F373                     ; fully-qualified     # 👩🏿‍🍳 woman cook: dark skin tone
+1F468 200D 1F527                           ; fully-qualified     # 👨‍🔧 man mechanic
+1F468 1F3FB 200D 1F527                     ; fully-qualified     # 👨🏻‍🔧 man mechanic: light skin tone
+1F468 1F3FC 200D 1F527                     ; fully-qualified     # 👨🏼‍🔧 man mechanic: medium-light skin tone
+1F468 1F3FD 200D 1F527                     ; fully-qualified     # 👨🏽‍🔧 man mechanic: medium skin tone
+1F468 1F3FE 200D 1F527                     ; fully-qualified     # 👨🏾‍🔧 man mechanic: medium-dark skin tone
+1F468 1F3FF 200D 1F527                     ; fully-qualified     # 👨🏿‍🔧 man mechanic: dark skin tone
+1F469 200D 1F527                           ; fully-qualified     # 👩‍🔧 woman mechanic
+1F469 1F3FB 200D 1F527                     ; fully-qualified     # 👩🏻‍🔧 woman mechanic: light skin tone
+1F469 1F3FC 200D 1F527                     ; fully-qualified     # 👩🏼‍🔧 woman mechanic: medium-light skin tone
+1F469 1F3FD 200D 1F527                     ; fully-qualified     # 👩🏽‍🔧 woman mechanic: medium skin tone
+1F469 1F3FE 200D 1F527                     ; fully-qualified     # 👩🏾‍🔧 woman mechanic: medium-dark skin tone
+1F469 1F3FF 200D 1F527                     ; fully-qualified     # 👩🏿‍🔧 woman mechanic: dark skin tone
+1F468 200D 1F3ED                           ; fully-qualified     # 👨‍🏭 man factory worker
+1F468 1F3FB 200D 1F3ED                     ; fully-qualified     # 👨🏻‍🏭 man factory worker: light skin tone
+1F468 1F3FC 200D 1F3ED                     ; fully-qualified     # 👨🏼‍🏭 man factory worker: medium-light skin tone
+1F468 1F3FD 200D 1F3ED                     ; fully-qualified     # 👨🏽‍🏭 man factory worker: medium skin tone
+1F468 1F3FE 200D 1F3ED                     ; fully-qualified     # 👨🏾‍🏭 man factory worker: medium-dark skin tone
+1F468 1F3FF 200D 1F3ED                     ; fully-qualified     # 👨🏿‍🏭 man factory worker: dark skin tone
+1F469 200D 1F3ED                           ; fully-qualified     # 👩‍🏭 woman factory worker
+1F469 1F3FB 200D 1F3ED                     ; fully-qualified     # 👩🏻‍🏭 woman factory worker: light skin tone
+1F469 1F3FC 200D 1F3ED                     ; fully-qualified     # 👩🏼‍🏭 woman factory worker: medium-light skin tone
+1F469 1F3FD 200D 1F3ED                     ; fully-qualified     # 👩🏽‍🏭 woman factory worker: medium skin tone
+1F469 1F3FE 200D 1F3ED                     ; fully-qualified     # 👩🏾‍🏭 woman factory worker: medium-dark skin tone
+1F469 1F3FF 200D 1F3ED                     ; fully-qualified     # 👩🏿‍🏭 woman factory worker: dark skin tone
+1F468 200D 1F4BC                           ; fully-qualified     # 👨‍💼 man office worker
+1F468 1F3FB 200D 1F4BC                     ; fully-qualified     # 👨🏻‍💼 man office worker: light skin tone
+1F468 1F3FC 200D 1F4BC                     ; fully-qualified     # 👨🏼‍💼 man office worker: medium-light skin tone
+1F468 1F3FD 200D 1F4BC                     ; fully-qualified     # 👨🏽‍💼 man office worker: medium skin tone
+1F468 1F3FE 200D 1F4BC                     ; fully-qualified     # 👨🏾‍💼 man office worker: medium-dark skin tone
+1F468 1F3FF 200D 1F4BC                     ; fully-qualified     # 👨🏿‍💼 man office worker: dark skin tone
+1F469 200D 1F4BC                           ; fully-qualified     # 👩‍💼 woman office worker
+1F469 1F3FB 200D 1F4BC                     ; fully-qualified     # 👩🏻‍💼 woman office worker: light skin tone
+1F469 1F3FC 200D 1F4BC                     ; fully-qualified     # 👩🏼‍💼 woman office worker: medium-light skin tone
+1F469 1F3FD 200D 1F4BC                     ; fully-qualified     # 👩🏽‍💼 woman office worker: medium skin tone
+1F469 1F3FE 200D 1F4BC                     ; fully-qualified     # 👩🏾‍💼 woman office worker: medium-dark skin tone
+1F469 1F3FF 200D 1F4BC                     ; fully-qualified     # 👩🏿‍💼 woman office worker: dark skin tone
+1F468 200D 1F52C                           ; fully-qualified     # 👨‍🔬 man scientist
+1F468 1F3FB 200D 1F52C                     ; fully-qualified     # 👨🏻‍🔬 man scientist: light skin tone
+1F468 1F3FC 200D 1F52C                     ; fully-qualified     # 👨🏼‍🔬 man scientist: medium-light skin tone
+1F468 1F3FD 200D 1F52C                     ; fully-qualified     # 👨🏽‍🔬 man scientist: medium skin tone
+1F468 1F3FE 200D 1F52C                     ; fully-qualified     # 👨🏾‍🔬 man scientist: medium-dark skin tone
+1F468 1F3FF 200D 1F52C                     ; fully-qualified     # 👨🏿‍🔬 man scientist: dark skin tone
+1F469 200D 1F52C                           ; fully-qualified     # 👩‍🔬 woman scientist
+1F469 1F3FB 200D 1F52C                     ; fully-qualified     # 👩🏻‍🔬 woman scientist: light skin tone
+1F469 1F3FC 200D 1F52C                     ; fully-qualified     # 👩🏼‍🔬 woman scientist: medium-light skin tone
+1F469 1F3FD 200D 1F52C                     ; fully-qualified     # 👩🏽‍🔬 woman scientist: medium skin tone
+1F469 1F3FE 200D 1F52C                     ; fully-qualified     # 👩🏾‍🔬 woman scientist: medium-dark skin tone
+1F469 1F3FF 200D 1F52C                     ; fully-qualified     # 👩🏿‍🔬 woman scientist: dark skin tone
+1F468 200D 1F4BB                           ; fully-qualified     # 👨‍💻 man technologist
+1F468 1F3FB 200D 1F4BB                     ; fully-qualified     # 👨🏻‍💻 man technologist: light skin tone
+1F468 1F3FC 200D 1F4BB                     ; fully-qualified     # 👨🏼‍💻 man technologist: medium-light skin tone
+1F468 1F3FD 200D 1F4BB                     ; fully-qualified     # 👨🏽‍💻 man technologist: medium skin tone
+1F468 1F3FE 200D 1F4BB                     ; fully-qualified     # 👨🏾‍💻 man technologist: medium-dark skin tone
+1F468 1F3FF 200D 1F4BB                     ; fully-qualified     # 👨🏿‍💻 man technologist: dark skin tone
+1F469 200D 1F4BB                           ; fully-qualified     # 👩‍💻 woman technologist
+1F469 1F3FB 200D 1F4BB                     ; fully-qualified     # 👩🏻‍💻 woman technologist: light skin tone
+1F469 1F3FC 200D 1F4BB                     ; fully-qualified     # 👩🏼‍💻 woman technologist: medium-light skin tone
+1F469 1F3FD 200D 1F4BB                     ; fully-qualified     # 👩🏽‍💻 woman technologist: medium skin tone
+1F469 1F3FE 200D 1F4BB                     ; fully-qualified     # 👩🏾‍💻 woman technologist: medium-dark skin tone
+1F469 1F3FF 200D 1F4BB                     ; fully-qualified     # 👩🏿‍💻 woman technologist: dark skin tone
+1F468 200D 1F3A4                           ; fully-qualified     # 👨‍🎤 man singer
+1F468 1F3FB 200D 1F3A4                     ; fully-qualified     # 👨🏻‍🎤 man singer: light skin tone
+1F468 1F3FC 200D 1F3A4                     ; fully-qualified     # 👨🏼‍🎤 man singer: medium-light skin tone
+1F468 1F3FD 200D 1F3A4                     ; fully-qualified     # 👨🏽‍🎤 man singer: medium skin tone
+1F468 1F3FE 200D 1F3A4                     ; fully-qualified     # 👨🏾‍🎤 man singer: medium-dark skin tone
+1F468 1F3FF 200D 1F3A4                     ; fully-qualified     # 👨🏿‍🎤 man singer: dark skin tone
+1F469 200D 1F3A4                           ; fully-qualified     # 👩‍🎤 woman singer
+1F469 1F3FB 200D 1F3A4                     ; fully-qualified     # 👩🏻‍🎤 woman singer: light skin tone
+1F469 1F3FC 200D 1F3A4                     ; fully-qualified     # 👩🏼‍🎤 woman singer: medium-light skin tone
+1F469 1F3FD 200D 1F3A4                     ; fully-qualified     # 👩🏽‍🎤 woman singer: medium skin tone
+1F469 1F3FE 200D 1F3A4                     ; fully-qualified     # 👩🏾‍🎤 woman singer: medium-dark skin tone
+1F469 1F3FF 200D 1F3A4                     ; fully-qualified     # 👩🏿‍🎤 woman singer: dark skin tone
+1F468 200D 1F3A8                           ; fully-qualified     # 👨‍🎨 man artist
+1F468 1F3FB 200D 1F3A8                     ; fully-qualified     # 👨🏻‍🎨 man artist: light skin tone
+1F468 1F3FC 200D 1F3A8                     ; fully-qualified     # 👨🏼‍🎨 man artist: medium-light skin tone
+1F468 1F3FD 200D 1F3A8                     ; fully-qualified     # 👨🏽‍🎨 man artist: medium skin tone
+1F468 1F3FE 200D 1F3A8                     ; fully-qualified     # 👨🏾‍🎨 man artist: medium-dark skin tone
+1F468 1F3FF 200D 1F3A8                     ; fully-qualified     # 👨🏿‍🎨 man artist: dark skin tone
+1F469 200D 1F3A8                           ; fully-qualified     # 👩‍🎨 woman artist
+1F469 1F3FB 200D 1F3A8                     ; fully-qualified     # 👩🏻‍🎨 woman artist: light skin tone
+1F469 1F3FC 200D 1F3A8                     ; fully-qualified     # 👩🏼‍🎨 woman artist: medium-light skin tone
+1F469 1F3FD 200D 1F3A8                     ; fully-qualified     # 👩🏽‍🎨 woman artist: medium skin tone
+1F469 1F3FE 200D 1F3A8                     ; fully-qualified     # 👩🏾‍🎨 woman artist: medium-dark skin tone
+1F469 1F3FF 200D 1F3A8                     ; fully-qualified     # 👩🏿‍🎨 woman artist: dark skin tone
+1F468 200D 2708 FE0F                       ; fully-qualified     # 👨‍✈️ man pilot
+1F468 200D 2708                            ; minimally-qualified # 👨‍✈ man pilot
+1F468 1F3FB 200D 2708 FE0F                 ; fully-qualified     # 👨🏻‍✈️ man pilot: light skin tone
+1F468 1F3FB 200D 2708                      ; minimally-qualified # 👨🏻‍✈ man pilot: light skin tone
+1F468 1F3FC 200D 2708 FE0F                 ; fully-qualified     # 👨🏼‍✈️ man pilot: medium-light skin tone
+1F468 1F3FC 200D 2708                      ; minimally-qualified # 👨🏼‍✈ man pilot: medium-light skin tone
+1F468 1F3FD 200D 2708 FE0F                 ; fully-qualified     # 👨🏽‍✈️ man pilot: medium skin tone
+1F468 1F3FD 200D 2708                      ; minimally-qualified # 👨🏽‍✈ man pilot: medium skin tone
+1F468 1F3FE 200D 2708 FE0F                 ; fully-qualified     # 👨🏾‍✈️ man pilot: medium-dark skin tone
+1F468 1F3FE 200D 2708                      ; minimally-qualified # 👨🏾‍✈ man pilot: medium-dark skin tone
+1F468 1F3FF 200D 2708 FE0F                 ; fully-qualified     # 👨🏿‍✈️ man pilot: dark skin tone
+1F468 1F3FF 200D 2708                      ; minimally-qualified # 👨🏿‍✈ man pilot: dark skin tone
+1F469 200D 2708 FE0F                       ; fully-qualified     # 👩‍✈️ woman pilot
+1F469 200D 2708                            ; minimally-qualified # 👩‍✈ woman pilot
+1F469 1F3FB 200D 2708 FE0F                 ; fully-qualified     # 👩🏻‍✈️ woman pilot: light skin tone
+1F469 1F3FB 200D 2708                      ; minimally-qualified # 👩🏻‍✈ woman pilot: light skin tone
+1F469 1F3FC 200D 2708 FE0F                 ; fully-qualified     # 👩🏼‍✈️ woman pilot: medium-light skin tone
+1F469 1F3FC 200D 2708                      ; minimally-qualified # 👩🏼‍✈ woman pilot: medium-light skin tone
+1F469 1F3FD 200D 2708 FE0F                 ; fully-qualified     # 👩🏽‍✈️ woman pilot: medium skin tone
+1F469 1F3FD 200D 2708                      ; minimally-qualified # 👩🏽‍✈ woman pilot: medium skin tone
+1F469 1F3FE 200D 2708 FE0F                 ; fully-qualified     # 👩🏾‍✈️ woman pilot: medium-dark skin tone
+1F469 1F3FE 200D 2708                      ; minimally-qualified # 👩🏾‍✈ woman pilot: medium-dark skin tone
+1F469 1F3FF 200D 2708 FE0F                 ; fully-qualified     # 👩🏿‍✈️ woman pilot: dark skin tone
+1F469 1F3FF 200D 2708                      ; minimally-qualified # 👩🏿‍✈ woman pilot: dark skin tone
+1F468 200D 1F680                           ; fully-qualified     # 👨‍🚀 man astronaut
+1F468 1F3FB 200D 1F680                     ; fully-qualified     # 👨🏻‍🚀 man astronaut: light skin tone
+1F468 1F3FC 200D 1F680                     ; fully-qualified     # 👨🏼‍🚀 man astronaut: medium-light skin tone
+1F468 1F3FD 200D 1F680                     ; fully-qualified     # 👨🏽‍🚀 man astronaut: medium skin tone
+1F468 1F3FE 200D 1F680                     ; fully-qualified     # 👨🏾‍🚀 man astronaut: medium-dark skin tone
+1F468 1F3FF 200D 1F680                     ; fully-qualified     # 👨🏿‍🚀 man astronaut: dark skin tone
+1F469 200D 1F680                           ; fully-qualified     # 👩‍🚀 woman astronaut
+1F469 1F3FB 200D 1F680                     ; fully-qualified     # 👩🏻‍🚀 woman astronaut: light skin tone
+1F469 1F3FC 200D 1F680                     ; fully-qualified     # 👩🏼‍🚀 woman astronaut: medium-light skin tone
+1F469 1F3FD 200D 1F680                     ; fully-qualified     # 👩🏽‍🚀 woman astronaut: medium skin tone
+1F469 1F3FE 200D 1F680                     ; fully-qualified     # 👩🏾‍🚀 woman astronaut: medium-dark skin tone
+1F469 1F3FF 200D 1F680                     ; fully-qualified     # 👩🏿‍🚀 woman astronaut: dark skin tone
+1F468 200D 1F692                           ; fully-qualified     # 👨‍🚒 man firefighter
+1F468 1F3FB 200D 1F692                     ; fully-qualified     # 👨🏻‍🚒 man firefighter: light skin tone
+1F468 1F3FC 200D 1F692                     ; fully-qualified     # 👨🏼‍🚒 man firefighter: medium-light skin tone
+1F468 1F3FD 200D 1F692                     ; fully-qualified     # 👨🏽‍🚒 man firefighter: medium skin tone
+1F468 1F3FE 200D 1F692                     ; fully-qualified     # 👨🏾‍🚒 man firefighter: medium-dark skin tone
+1F468 1F3FF 200D 1F692                     ; fully-qualified     # 👨🏿‍🚒 man firefighter: dark skin tone
+1F469 200D 1F692                           ; fully-qualified     # 👩‍🚒 woman firefighter
+1F469 1F3FB 200D 1F692                     ; fully-qualified     # 👩🏻‍🚒 woman firefighter: light skin tone
+1F469 1F3FC 200D 1F692                     ; fully-qualified     # 👩🏼‍🚒 woman firefighter: medium-light skin tone
+1F469 1F3FD 200D 1F692                     ; fully-qualified     # 👩🏽‍🚒 woman firefighter: medium skin tone
+1F469 1F3FE 200D 1F692                     ; fully-qualified     # 👩🏾‍🚒 woman firefighter: medium-dark skin tone
+1F469 1F3FF 200D 1F692                     ; fully-qualified     # 👩🏿‍🚒 woman firefighter: dark skin tone
+1F46E                                      ; fully-qualified     # 👮 police officer
+1F46E 1F3FB                                ; fully-qualified     # 👮🏻 police officer: light skin tone
+1F46E 1F3FC                                ; fully-qualified     # 👮🏼 police officer: medium-light skin tone
+1F46E 1F3FD                                ; fully-qualified     # 👮🏽 police officer: medium skin tone
+1F46E 1F3FE                                ; fully-qualified     # 👮🏾 police officer: medium-dark skin tone
+1F46E 1F3FF                                ; fully-qualified     # 👮🏿 police officer: dark skin tone
+1F46E 200D 2642 FE0F                       ; fully-qualified     # 👮‍♂️ man police officer
+1F46E 200D 2642                            ; minimally-qualified # 👮‍♂ man police officer
+1F46E 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 👮🏻‍♂️ man police officer: light skin tone
+1F46E 1F3FB 200D 2642                      ; minimally-qualified # 👮🏻‍♂ man police officer: light skin tone
+1F46E 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 👮🏼‍♂️ man police officer: medium-light skin tone
+1F46E 1F3FC 200D 2642                      ; minimally-qualified # 👮🏼‍♂ man police officer: medium-light skin tone
+1F46E 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 👮🏽‍♂️ man police officer: medium skin tone
+1F46E 1F3FD 200D 2642                      ; minimally-qualified # 👮🏽‍♂ man police officer: medium skin tone
+1F46E 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 👮🏾‍♂️ man police officer: medium-dark skin tone
+1F46E 1F3FE 200D 2642                      ; minimally-qualified # 👮🏾‍♂ man police officer: medium-dark skin tone
+1F46E 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 👮🏿‍♂️ man police officer: dark skin tone
+1F46E 1F3FF 200D 2642                      ; minimally-qualified # 👮🏿‍♂ man police officer: dark skin tone
+1F46E 200D 2640 FE0F                       ; fully-qualified     # 👮‍♀️ woman police officer
+1F46E 200D 2640                            ; minimally-qualified # 👮‍♀ woman police officer
+1F46E 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 👮🏻‍♀️ woman police officer: light skin tone
+1F46E 1F3FB 200D 2640                      ; minimally-qualified # 👮🏻‍♀ woman police officer: light skin tone
+1F46E 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 👮🏼‍♀️ woman police officer: medium-light skin tone
+1F46E 1F3FC 200D 2640                      ; minimally-qualified # 👮🏼‍♀ woman police officer: medium-light skin tone
+1F46E 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 👮🏽‍♀️ woman police officer: medium skin tone
+1F46E 1F3FD 200D 2640                      ; minimally-qualified # 👮🏽‍♀ woman police officer: medium skin tone
+1F46E 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 👮🏾‍♀️ woman police officer: medium-dark skin tone
+1F46E 1F3FE 200D 2640                      ; minimally-qualified # 👮🏾‍♀ woman police officer: medium-dark skin tone
+1F46E 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 👮🏿‍♀️ woman police officer: dark skin tone
+1F46E 1F3FF 200D 2640                      ; minimally-qualified # 👮🏿‍♀ woman police officer: dark skin tone
+1F575 FE0F                                 ; fully-qualified     # 🕵️ detective
+1F575                                      ; unqualified         # 🕵 detective
+1F575 1F3FB                                ; fully-qualified     # 🕵🏻 detective: light skin tone
+1F575 1F3FC                                ; fully-qualified     # 🕵🏼 detective: medium-light skin tone
+1F575 1F3FD                                ; fully-qualified     # 🕵🏽 detective: medium skin tone
+1F575 1F3FE                                ; fully-qualified     # 🕵🏾 detective: medium-dark skin tone
+1F575 1F3FF                                ; fully-qualified     # 🕵🏿 detective: dark skin tone
+1F575 FE0F 200D 2642 FE0F                  ; fully-qualified     # 🕵️‍♂️ man detective
+1F575 200D 2642 FE0F                       ; unqualified         # 🕵‍♂️ man detective
+1F575 FE0F 200D 2642                       ; unqualified         # 🕵️‍♂ man detective
+1F575 200D 2642                            ; unqualified         # 🕵‍♂ man detective
+1F575 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🕵🏻‍♂️ man detective: light skin tone
+1F575 1F3FB 200D 2642                      ; minimally-qualified # 🕵🏻‍♂ man detective: light skin tone
+1F575 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🕵🏼‍♂️ man detective: medium-light skin tone
+1F575 1F3FC 200D 2642                      ; minimally-qualified # 🕵🏼‍♂ man detective: medium-light skin tone
+1F575 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🕵🏽‍♂️ man detective: medium skin tone
+1F575 1F3FD 200D 2642                      ; minimally-qualified # 🕵🏽‍♂ man detective: medium skin tone
+1F575 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🕵🏾‍♂️ man detective: medium-dark skin tone
+1F575 1F3FE 200D 2642                      ; minimally-qualified # 🕵🏾‍♂ man detective: medium-dark skin tone
+1F575 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🕵🏿‍♂️ man detective: dark skin tone
+1F575 1F3FF 200D 2642                      ; minimally-qualified # 🕵🏿‍♂ man detective: dark skin tone
+1F575 FE0F 200D 2640 FE0F                  ; fully-qualified     # 🕵️‍♀️ woman detective
+1F575 200D 2640 FE0F                       ; unqualified         # 🕵‍♀️ woman detective
+1F575 FE0F 200D 2640                       ; unqualified         # 🕵️‍♀ woman detective
+1F575 200D 2640                            ; unqualified         # 🕵‍♀ woman detective
+1F575 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🕵🏻‍♀️ woman detective: light skin tone
+1F575 1F3FB 200D 2640                      ; minimally-qualified # 🕵🏻‍♀ woman detective: light skin tone
+1F575 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🕵🏼‍♀️ woman detective: medium-light skin tone
+1F575 1F3FC 200D 2640                      ; minimally-qualified # 🕵🏼‍♀ woman detective: medium-light skin tone
+1F575 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🕵🏽‍♀️ woman detective: medium skin tone
+1F575 1F3FD 200D 2640                      ; minimally-qualified # 🕵🏽‍♀ woman detective: medium skin tone
+1F575 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🕵🏾‍♀️ woman detective: medium-dark skin tone
+1F575 1F3FE 200D 2640                      ; minimally-qualified # 🕵🏾‍♀ woman detective: medium-dark skin tone
+1F575 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🕵🏿‍♀️ woman detective: dark skin tone
+1F575 1F3FF 200D 2640                      ; minimally-qualified # 🕵🏿‍♀ woman detective: dark skin tone
+1F482                                      ; fully-qualified     # 💂 guard
+1F482 1F3FB                                ; fully-qualified     # 💂🏻 guard: light skin tone
+1F482 1F3FC                                ; fully-qualified     # 💂🏼 guard: medium-light skin tone
+1F482 1F3FD                                ; fully-qualified     # 💂🏽 guard: medium skin tone
+1F482 1F3FE                                ; fully-qualified     # 💂🏾 guard: medium-dark skin tone
+1F482 1F3FF                                ; fully-qualified     # 💂🏿 guard: dark skin tone
+1F482 200D 2642 FE0F                       ; fully-qualified     # 💂‍♂️ man guard
+1F482 200D 2642                            ; minimally-qualified # 💂‍♂ man guard
+1F482 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 💂🏻‍♂️ man guard: light skin tone
+1F482 1F3FB 200D 2642                      ; minimally-qualified # 💂🏻‍♂ man guard: light skin tone
+1F482 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 💂🏼‍♂️ man guard: medium-light skin tone
+1F482 1F3FC 200D 2642                      ; minimally-qualified # 💂🏼‍♂ man guard: medium-light skin tone
+1F482 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 💂🏽‍♂️ man guard: medium skin tone
+1F482 1F3FD 200D 2642                      ; minimally-qualified # 💂🏽‍♂ man guard: medium skin tone
+1F482 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 💂🏾‍♂️ man guard: medium-dark skin tone
+1F482 1F3FE 200D 2642                      ; minimally-qualified # 💂🏾‍♂ man guard: medium-dark skin tone
+1F482 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 💂🏿‍♂️ man guard: dark skin tone
+1F482 1F3FF 200D 2642                      ; minimally-qualified # 💂🏿‍♂ man guard: dark skin tone
+1F482 200D 2640 FE0F                       ; fully-qualified     # 💂‍♀️ woman guard
+1F482 200D 2640                            ; minimally-qualified # 💂‍♀ woman guard
+1F482 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 💂🏻‍♀️ woman guard: light skin tone
+1F482 1F3FB 200D 2640                      ; minimally-qualified # 💂🏻‍♀ woman guard: light skin tone
+1F482 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 💂🏼‍♀️ woman guard: medium-light skin tone
+1F482 1F3FC 200D 2640                      ; minimally-qualified # 💂🏼‍♀ woman guard: medium-light skin tone
+1F482 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 💂🏽‍♀️ woman guard: medium skin tone
+1F482 1F3FD 200D 2640                      ; minimally-qualified # 💂🏽‍♀ woman guard: medium skin tone
+1F482 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 💂🏾‍♀️ woman guard: medium-dark skin tone
+1F482 1F3FE 200D 2640                      ; minimally-qualified # 💂🏾‍♀ woman guard: medium-dark skin tone
+1F482 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 💂🏿‍♀️ woman guard: dark skin tone
+1F482 1F3FF 200D 2640                      ; minimally-qualified # 💂🏿‍♀ woman guard: dark skin tone
+1F477                                      ; fully-qualified     # 👷 construction worker
+1F477 1F3FB                                ; fully-qualified     # 👷🏻 construction worker: light skin tone
+1F477 1F3FC                                ; fully-qualified     # 👷🏼 construction worker: medium-light skin tone
+1F477 1F3FD                                ; fully-qualified     # 👷🏽 construction worker: medium skin tone
+1F477 1F3FE                                ; fully-qualified     # 👷🏾 construction worker: medium-dark skin tone
+1F477 1F3FF                                ; fully-qualified     # 👷🏿 construction worker: dark skin tone
+1F477 200D 2642 FE0F                       ; fully-qualified     # 👷‍♂️ man construction worker
+1F477 200D 2642                            ; minimally-qualified # 👷‍♂ man construction worker
+1F477 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 👷🏻‍♂️ man construction worker: light skin tone
+1F477 1F3FB 200D 2642                      ; minimally-qualified # 👷🏻‍♂ man construction worker: light skin tone
+1F477 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 👷🏼‍♂️ man construction worker: medium-light skin tone
+1F477 1F3FC 200D 2642                      ; minimally-qualified # 👷🏼‍♂ man construction worker: medium-light skin tone
+1F477 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 👷🏽‍♂️ man construction worker: medium skin tone
+1F477 1F3FD 200D 2642                      ; minimally-qualified # 👷🏽‍♂ man construction worker: medium skin tone
+1F477 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 👷🏾‍♂️ man construction worker: medium-dark skin tone
+1F477 1F3FE 200D 2642                      ; minimally-qualified # 👷🏾‍♂ man construction worker: medium-dark skin tone
+1F477 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 👷🏿‍♂️ man construction worker: dark skin tone
+1F477 1F3FF 200D 2642                      ; minimally-qualified # 👷🏿‍♂ man construction worker: dark skin tone
+1F477 200D 2640 FE0F                       ; fully-qualified     # 👷‍♀️ woman construction worker
+1F477 200D 2640                            ; minimally-qualified # 👷‍♀ woman construction worker
+1F477 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 👷🏻‍♀️ woman construction worker: light skin tone
+1F477 1F3FB 200D 2640                      ; minimally-qualified # 👷🏻‍♀ woman construction worker: light skin tone
+1F477 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 👷🏼‍♀️ woman construction worker: medium-light skin tone
+1F477 1F3FC 200D 2640                      ; minimally-qualified # 👷🏼‍♀ woman construction worker: medium-light skin tone
+1F477 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 👷🏽‍♀️ woman construction worker: medium skin tone
+1F477 1F3FD 200D 2640                      ; minimally-qualified # 👷🏽‍♀ woman construction worker: medium skin tone
+1F477 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 👷🏾‍♀️ woman construction worker: medium-dark skin tone
+1F477 1F3FE 200D 2640                      ; minimally-qualified # 👷🏾‍♀ woman construction worker: medium-dark skin tone
+1F477 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 👷🏿‍♀️ woman construction worker: dark skin tone
+1F477 1F3FF 200D 2640                      ; minimally-qualified # 👷🏿‍♀ woman construction worker: dark skin tone
+1F934                                      ; fully-qualified     # 🤴 prince
+1F934 1F3FB                                ; fully-qualified     # 🤴🏻 prince: light skin tone
+1F934 1F3FC                                ; fully-qualified     # 🤴🏼 prince: medium-light skin tone
+1F934 1F3FD                                ; fully-qualified     # 🤴🏽 prince: medium skin tone
+1F934 1F3FE                                ; fully-qualified     # 🤴🏾 prince: medium-dark skin tone
+1F934 1F3FF                                ; fully-qualified     # 🤴🏿 prince: dark skin tone
+1F478                                      ; fully-qualified     # 👸 princess
+1F478 1F3FB                                ; fully-qualified     # 👸🏻 princess: light skin tone
+1F478 1F3FC                                ; fully-qualified     # 👸🏼 princess: medium-light skin tone
+1F478 1F3FD                                ; fully-qualified     # 👸🏽 princess: medium skin tone
+1F478 1F3FE                                ; fully-qualified     # 👸🏾 princess: medium-dark skin tone
+1F478 1F3FF                                ; fully-qualified     # 👸🏿 princess: dark skin tone
+1F473                                      ; fully-qualified     # 👳 person wearing turban
+1F473 1F3FB                                ; fully-qualified     # 👳🏻 person wearing turban: light skin tone
+1F473 1F3FC                                ; fully-qualified     # 👳🏼 person wearing turban: medium-light skin tone
+1F473 1F3FD                                ; fully-qualified     # 👳🏽 person wearing turban: medium skin tone
+1F473 1F3FE                                ; fully-qualified     # 👳🏾 person wearing turban: medium-dark skin tone
+1F473 1F3FF                                ; fully-qualified     # 👳🏿 person wearing turban: dark skin tone
+1F473 200D 2642 FE0F                       ; fully-qualified     # 👳‍♂️ man wearing turban
+1F473 200D 2642                            ; minimally-qualified # 👳‍♂ man wearing turban
+1F473 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 👳🏻‍♂️ man wearing turban: light skin tone
+1F473 1F3FB 200D 2642                      ; minimally-qualified # 👳🏻‍♂ man wearing turban: light skin tone
+1F473 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 👳🏼‍♂️ man wearing turban: medium-light skin tone
+1F473 1F3FC 200D 2642                      ; minimally-qualified # 👳🏼‍♂ man wearing turban: medium-light skin tone
+1F473 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 👳🏽‍♂️ man wearing turban: medium skin tone
+1F473 1F3FD 200D 2642                      ; minimally-qualified # 👳🏽‍♂ man wearing turban: medium skin tone
+1F473 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 👳🏾‍♂️ man wearing turban: medium-dark skin tone
+1F473 1F3FE 200D 2642                      ; minimally-qualified # 👳🏾‍♂ man wearing turban: medium-dark skin tone
+1F473 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 👳🏿‍♂️ man wearing turban: dark skin tone
+1F473 1F3FF 200D 2642                      ; minimally-qualified # 👳🏿‍♂ man wearing turban: dark skin tone
+1F473 200D 2640 FE0F                       ; fully-qualified     # 👳‍♀️ woman wearing turban
+1F473 200D 2640                            ; minimally-qualified # 👳‍♀ woman wearing turban
+1F473 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 👳🏻‍♀️ woman wearing turban: light skin tone
+1F473 1F3FB 200D 2640                      ; minimally-qualified # 👳🏻‍♀ woman wearing turban: light skin tone
+1F473 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 👳🏼‍♀️ woman wearing turban: medium-light skin tone
+1F473 1F3FC 200D 2640                      ; minimally-qualified # 👳🏼‍♀ woman wearing turban: medium-light skin tone
+1F473 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 👳🏽‍♀️ woman wearing turban: medium skin tone
+1F473 1F3FD 200D 2640                      ; minimally-qualified # 👳🏽‍♀ woman wearing turban: medium skin tone
+1F473 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 👳🏾‍♀️ woman wearing turban: medium-dark skin tone
+1F473 1F3FE 200D 2640                      ; minimally-qualified # 👳🏾‍♀ woman wearing turban: medium-dark skin tone
+1F473 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 👳🏿‍♀️ woman wearing turban: dark skin tone
+1F473 1F3FF 200D 2640                      ; minimally-qualified # 👳🏿‍♀ woman wearing turban: dark skin tone
+1F472                                      ; fully-qualified     # 👲 man with Chinese cap
+1F472 1F3FB                                ; fully-qualified     # 👲🏻 man with Chinese cap: light skin tone
+1F472 1F3FC                                ; fully-qualified     # 👲🏼 man with Chinese cap: medium-light skin tone
+1F472 1F3FD                                ; fully-qualified     # 👲🏽 man with Chinese cap: medium skin tone
+1F472 1F3FE                                ; fully-qualified     # 👲🏾 man with Chinese cap: medium-dark skin tone
+1F472 1F3FF                                ; fully-qualified     # 👲🏿 man with Chinese cap: dark skin tone
+1F9D5                                      ; fully-qualified     # 🧕 woman with headscarf
+1F9D5 1F3FB                                ; fully-qualified     # 🧕🏻 woman with headscarf: light skin tone
+1F9D5 1F3FC                                ; fully-qualified     # 🧕🏼 woman with headscarf: medium-light skin tone
+1F9D5 1F3FD                                ; fully-qualified     # 🧕🏽 woman with headscarf: medium skin tone
+1F9D5 1F3FE                                ; fully-qualified     # 🧕🏾 woman with headscarf: medium-dark skin tone
+1F9D5 1F3FF                                ; fully-qualified     # 🧕🏿 woman with headscarf: dark skin tone
+1F935                                      ; fully-qualified     # 🤵 man in tuxedo
+1F935 1F3FB                                ; fully-qualified     # 🤵🏻 man in tuxedo: light skin tone
+1F935 1F3FC                                ; fully-qualified     # 🤵🏼 man in tuxedo: medium-light skin tone
+1F935 1F3FD                                ; fully-qualified     # 🤵🏽 man in tuxedo: medium skin tone
+1F935 1F3FE                                ; fully-qualified     # 🤵🏾 man in tuxedo: medium-dark skin tone
+1F935 1F3FF                                ; fully-qualified     # 🤵🏿 man in tuxedo: dark skin tone
+1F470                                      ; fully-qualified     # 👰 bride with veil
+1F470 1F3FB                                ; fully-qualified     # 👰🏻 bride with veil: light skin tone
+1F470 1F3FC                                ; fully-qualified     # 👰🏼 bride with veil: medium-light skin tone
+1F470 1F3FD                                ; fully-qualified     # 👰🏽 bride with veil: medium skin tone
+1F470 1F3FE                                ; fully-qualified     # 👰🏾 bride with veil: medium-dark skin tone
+1F470 1F3FF                                ; fully-qualified     # 👰🏿 bride with veil: dark skin tone
+1F930                                      ; fully-qualified     # 🤰 pregnant woman
+1F930 1F3FB                                ; fully-qualified     # 🤰🏻 pregnant woman: light skin tone
+1F930 1F3FC                                ; fully-qualified     # 🤰🏼 pregnant woman: medium-light skin tone
+1F930 1F3FD                                ; fully-qualified     # 🤰🏽 pregnant woman: medium skin tone
+1F930 1F3FE                                ; fully-qualified     # 🤰🏾 pregnant woman: medium-dark skin tone
+1F930 1F3FF                                ; fully-qualified     # 🤰🏿 pregnant woman: dark skin tone
+1F931                                      ; fully-qualified     # 🤱 breast-feeding
+1F931 1F3FB                                ; fully-qualified     # 🤱🏻 breast-feeding: light skin tone
+1F931 1F3FC                                ; fully-qualified     # 🤱🏼 breast-feeding: medium-light skin tone
+1F931 1F3FD                                ; fully-qualified     # 🤱🏽 breast-feeding: medium skin tone
+1F931 1F3FE                                ; fully-qualified     # 🤱🏾 breast-feeding: medium-dark skin tone
+1F931 1F3FF                                ; fully-qualified     # 🤱🏿 breast-feeding: dark skin tone
+
+# subgroup: person-fantasy
+1F47C                                      ; fully-qualified     # 👼 baby angel
+1F47C 1F3FB                                ; fully-qualified     # 👼🏻 baby angel: light skin tone
+1F47C 1F3FC                                ; fully-qualified     # 👼🏼 baby angel: medium-light skin tone
+1F47C 1F3FD                                ; fully-qualified     # 👼🏽 baby angel: medium skin tone
+1F47C 1F3FE                                ; fully-qualified     # 👼🏾 baby angel: medium-dark skin tone
+1F47C 1F3FF                                ; fully-qualified     # 👼🏿 baby angel: dark skin tone
+1F385                                      ; fully-qualified     # 🎅 Santa Claus
+1F385 1F3FB                                ; fully-qualified     # 🎅🏻 Santa Claus: light skin tone
+1F385 1F3FC                                ; fully-qualified     # 🎅🏼 Santa Claus: medium-light skin tone
+1F385 1F3FD                                ; fully-qualified     # 🎅🏽 Santa Claus: medium skin tone
+1F385 1F3FE                                ; fully-qualified     # 🎅🏾 Santa Claus: medium-dark skin tone
+1F385 1F3FF                                ; fully-qualified     # 🎅🏿 Santa Claus: dark skin tone
+1F936                                      ; fully-qualified     # 🤶 Mrs. Claus
+1F936 1F3FB                                ; fully-qualified     # 🤶🏻 Mrs. Claus: light skin tone
+1F936 1F3FC                                ; fully-qualified     # 🤶🏼 Mrs. Claus: medium-light skin tone
+1F936 1F3FD                                ; fully-qualified     # 🤶🏽 Mrs. Claus: medium skin tone
+1F936 1F3FE                                ; fully-qualified     # 🤶🏾 Mrs. Claus: medium-dark skin tone
+1F936 1F3FF                                ; fully-qualified     # 🤶🏿 Mrs. Claus: dark skin tone
+1F9B8                                      ; fully-qualified     # 🦸 superhero
+1F9B8 1F3FB                                ; fully-qualified     # 🦸🏻 superhero: light skin tone
+1F9B8 1F3FC                                ; fully-qualified     # 🦸🏼 superhero: medium-light skin tone
+1F9B8 1F3FD                                ; fully-qualified     # 🦸🏽 superhero: medium skin tone
+1F9B8 1F3FE                                ; fully-qualified     # 🦸🏾 superhero: medium-dark skin tone
+1F9B8 1F3FF                                ; fully-qualified     # 🦸🏿 superhero: dark skin tone
+1F9B8 200D 2642 FE0F                       ; fully-qualified     # 🦸‍♂️ man superhero
+1F9B8 200D 2642                            ; minimally-qualified # 🦸‍♂ man superhero
+1F9B8 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🦸🏻‍♂️ man superhero: light skin tone
+1F9B8 1F3FB 200D 2642                      ; minimally-qualified # 🦸🏻‍♂ man superhero: light skin tone
+1F9B8 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🦸🏼‍♂️ man superhero: medium-light skin tone
+1F9B8 1F3FC 200D 2642                      ; minimally-qualified # 🦸🏼‍♂ man superhero: medium-light skin tone
+1F9B8 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🦸🏽‍♂️ man superhero: medium skin tone
+1F9B8 1F3FD 200D 2642                      ; minimally-qualified # 🦸🏽‍♂ man superhero: medium skin tone
+1F9B8 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🦸🏾‍♂️ man superhero: medium-dark skin tone
+1F9B8 1F3FE 200D 2642                      ; minimally-qualified # 🦸🏾‍♂ man superhero: medium-dark skin tone
+1F9B8 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🦸🏿‍♂️ man superhero: dark skin tone
+1F9B8 1F3FF 200D 2642                      ; minimally-qualified # 🦸🏿‍♂ man superhero: dark skin tone
+1F9B8 200D 2640 FE0F                       ; fully-qualified     # 🦸‍♀️ woman superhero
+1F9B8 200D 2640                            ; minimally-qualified # 🦸‍♀ woman superhero
+1F9B8 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🦸🏻‍♀️ woman superhero: light skin tone
+1F9B8 1F3FB 200D 2640                      ; minimally-qualified # 🦸🏻‍♀ woman superhero: light skin tone
+1F9B8 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🦸🏼‍♀️ woman superhero: medium-light skin tone
+1F9B8 1F3FC 200D 2640                      ; minimally-qualified # 🦸🏼‍♀ woman superhero: medium-light skin tone
+1F9B8 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🦸🏽‍♀️ woman superhero: medium skin tone
+1F9B8 1F3FD 200D 2640                      ; minimally-qualified # 🦸🏽‍♀ woman superhero: medium skin tone
+1F9B8 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🦸🏾‍♀️ woman superhero: medium-dark skin tone
+1F9B8 1F3FE 200D 2640                      ; minimally-qualified # 🦸🏾‍♀ woman superhero: medium-dark skin tone
+1F9B8 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🦸🏿‍♀️ woman superhero: dark skin tone
+1F9B8 1F3FF 200D 2640                      ; minimally-qualified # 🦸🏿‍♀ woman superhero: dark skin tone
+1F9B9                                      ; fully-qualified     # 🦹 supervillain
+1F9B9 1F3FB                                ; fully-qualified     # 🦹🏻 supervillain: light skin tone
+1F9B9 1F3FC                                ; fully-qualified     # 🦹🏼 supervillain: medium-light skin tone
+1F9B9 1F3FD                                ; fully-qualified     # 🦹🏽 supervillain: medium skin tone
+1F9B9 1F3FE                                ; fully-qualified     # 🦹🏾 supervillain: medium-dark skin tone
+1F9B9 1F3FF                                ; fully-qualified     # 🦹🏿 supervillain: dark skin tone
+1F9B9 200D 2642 FE0F                       ; fully-qualified     # 🦹‍♂️ man supervillain
+1F9B9 200D 2642                            ; minimally-qualified # 🦹‍♂ man supervillain
+1F9B9 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🦹🏻‍♂️ man supervillain: light skin tone
+1F9B9 1F3FB 200D 2642                      ; minimally-qualified # 🦹🏻‍♂ man supervillain: light skin tone
+1F9B9 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🦹🏼‍♂️ man supervillain: medium-light skin tone
+1F9B9 1F3FC 200D 2642                      ; minimally-qualified # 🦹🏼‍♂ man supervillain: medium-light skin tone
+1F9B9 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🦹🏽‍♂️ man supervillain: medium skin tone
+1F9B9 1F3FD 200D 2642                      ; minimally-qualified # 🦹🏽‍♂ man supervillain: medium skin tone
+1F9B9 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🦹🏾‍♂️ man supervillain: medium-dark skin tone
+1F9B9 1F3FE 200D 2642                      ; minimally-qualified # 🦹🏾‍♂ man supervillain: medium-dark skin tone
+1F9B9 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🦹🏿‍♂️ man supervillain: dark skin tone
+1F9B9 1F3FF 200D 2642                      ; minimally-qualified # 🦹🏿‍♂ man supervillain: dark skin tone
+1F9B9 200D 2640 FE0F                       ; fully-qualified     # 🦹‍♀️ woman supervillain
+1F9B9 200D 2640                            ; minimally-qualified # 🦹‍♀ woman supervillain
+1F9B9 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🦹🏻‍♀️ woman supervillain: light skin tone
+1F9B9 1F3FB 200D 2640                      ; minimally-qualified # 🦹🏻‍♀ woman supervillain: light skin tone
+1F9B9 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🦹🏼‍♀️ woman supervillain: medium-light skin tone
+1F9B9 1F3FC 200D 2640                      ; minimally-qualified # 🦹🏼‍♀ woman supervillain: medium-light skin tone
+1F9B9 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🦹🏽‍♀️ woman supervillain: medium skin tone
+1F9B9 1F3FD 200D 2640                      ; minimally-qualified # 🦹🏽‍♀ woman supervillain: medium skin tone
+1F9B9 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🦹🏾‍♀️ woman supervillain: medium-dark skin tone
+1F9B9 1F3FE 200D 2640                      ; minimally-qualified # 🦹🏾‍♀ woman supervillain: medium-dark skin tone
+1F9B9 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🦹🏿‍♀️ woman supervillain: dark skin tone
+1F9B9 1F3FF 200D 2640                      ; minimally-qualified # 🦹🏿‍♀ woman supervillain: dark skin tone
+1F9D9                                      ; fully-qualified     # 🧙 mage
+1F9D9 1F3FB                                ; fully-qualified     # 🧙🏻 mage: light skin tone
+1F9D9 1F3FC                                ; fully-qualified     # 🧙🏼 mage: medium-light skin tone
+1F9D9 1F3FD                                ; fully-qualified     # 🧙🏽 mage: medium skin tone
+1F9D9 1F3FE                                ; fully-qualified     # 🧙🏾 mage: medium-dark skin tone
+1F9D9 1F3FF                                ; fully-qualified     # 🧙🏿 mage: dark skin tone
+1F9D9 200D 2642 FE0F                       ; fully-qualified     # 🧙‍♂️ man mage
+1F9D9 200D 2642                            ; minimally-qualified # 🧙‍♂ man mage
+1F9D9 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧙🏻‍♂️ man mage: light skin tone
+1F9D9 1F3FB 200D 2642                      ; minimally-qualified # 🧙🏻‍♂ man mage: light skin tone
+1F9D9 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧙🏼‍♂️ man mage: medium-light skin tone
+1F9D9 1F3FC 200D 2642                      ; minimally-qualified # 🧙🏼‍♂ man mage: medium-light skin tone
+1F9D9 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧙🏽‍♂️ man mage: medium skin tone
+1F9D9 1F3FD 200D 2642                      ; minimally-qualified # 🧙🏽‍♂ man mage: medium skin tone
+1F9D9 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧙🏾‍♂️ man mage: medium-dark skin tone
+1F9D9 1F3FE 200D 2642                      ; minimally-qualified # 🧙🏾‍♂ man mage: medium-dark skin tone
+1F9D9 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧙🏿‍♂️ man mage: dark skin tone
+1F9D9 1F3FF 200D 2642                      ; minimally-qualified # 🧙🏿‍♂ man mage: dark skin tone
+1F9D9 200D 2640 FE0F                       ; fully-qualified     # 🧙‍♀️ woman mage
+1F9D9 200D 2640                            ; minimally-qualified # 🧙‍♀ woman mage
+1F9D9 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧙🏻‍♀️ woman mage: light skin tone
+1F9D9 1F3FB 200D 2640                      ; minimally-qualified # 🧙🏻‍♀ woman mage: light skin tone
+1F9D9 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧙🏼‍♀️ woman mage: medium-light skin tone
+1F9D9 1F3FC 200D 2640                      ; minimally-qualified # 🧙🏼‍♀ woman mage: medium-light skin tone
+1F9D9 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧙🏽‍♀️ woman mage: medium skin tone
+1F9D9 1F3FD 200D 2640                      ; minimally-qualified # 🧙🏽‍♀ woman mage: medium skin tone
+1F9D9 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧙🏾‍♀️ woman mage: medium-dark skin tone
+1F9D9 1F3FE 200D 2640                      ; minimally-qualified # 🧙🏾‍♀ woman mage: medium-dark skin tone
+1F9D9 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧙🏿‍♀️ woman mage: dark skin tone
+1F9D9 1F3FF 200D 2640                      ; minimally-qualified # 🧙🏿‍♀ woman mage: dark skin tone
+1F9DA                                      ; fully-qualified     # 🧚 fairy
+1F9DA 1F3FB                                ; fully-qualified     # 🧚🏻 fairy: light skin tone
+1F9DA 1F3FC                                ; fully-qualified     # 🧚🏼 fairy: medium-light skin tone
+1F9DA 1F3FD                                ; fully-qualified     # 🧚🏽 fairy: medium skin tone
+1F9DA 1F3FE                                ; fully-qualified     # 🧚🏾 fairy: medium-dark skin tone
+1F9DA 1F3FF                                ; fully-qualified     # 🧚🏿 fairy: dark skin tone
+1F9DA 200D 2642 FE0F                       ; fully-qualified     # 🧚‍♂️ man fairy
+1F9DA 200D 2642                            ; minimally-qualified # 🧚‍♂ man fairy
+1F9DA 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧚🏻‍♂️ man fairy: light skin tone
+1F9DA 1F3FB 200D 2642                      ; minimally-qualified # 🧚🏻‍♂ man fairy: light skin tone
+1F9DA 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧚🏼‍♂️ man fairy: medium-light skin tone
+1F9DA 1F3FC 200D 2642                      ; minimally-qualified # 🧚🏼‍♂ man fairy: medium-light skin tone
+1F9DA 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧚🏽‍♂️ man fairy: medium skin tone
+1F9DA 1F3FD 200D 2642                      ; minimally-qualified # 🧚🏽‍♂ man fairy: medium skin tone
+1F9DA 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧚🏾‍♂️ man fairy: medium-dark skin tone
+1F9DA 1F3FE 200D 2642                      ; minimally-qualified # 🧚🏾‍♂ man fairy: medium-dark skin tone
+1F9DA 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧚🏿‍♂️ man fairy: dark skin tone
+1F9DA 1F3FF 200D 2642                      ; minimally-qualified # 🧚🏿‍♂ man fairy: dark skin tone
+1F9DA 200D 2640 FE0F                       ; fully-qualified     # 🧚‍♀️ woman fairy
+1F9DA 200D 2640                            ; minimally-qualified # 🧚‍♀ woman fairy
+1F9DA 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧚🏻‍♀️ woman fairy: light skin tone
+1F9DA 1F3FB 200D 2640                      ; minimally-qualified # 🧚🏻‍♀ woman fairy: light skin tone
+1F9DA 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧚🏼‍♀️ woman fairy: medium-light skin tone
+1F9DA 1F3FC 200D 2640                      ; minimally-qualified # 🧚🏼‍♀ woman fairy: medium-light skin tone
+1F9DA 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧚🏽‍♀️ woman fairy: medium skin tone
+1F9DA 1F3FD 200D 2640                      ; minimally-qualified # 🧚🏽‍♀ woman fairy: medium skin tone
+1F9DA 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧚🏾‍♀️ woman fairy: medium-dark skin tone
+1F9DA 1F3FE 200D 2640                      ; minimally-qualified # 🧚🏾‍♀ woman fairy: medium-dark skin tone
+1F9DA 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧚🏿‍♀️ woman fairy: dark skin tone
+1F9DA 1F3FF 200D 2640                      ; minimally-qualified # 🧚🏿‍♀ woman fairy: dark skin tone
+1F9DB                                      ; fully-qualified     # 🧛 vampire
+1F9DB 1F3FB                                ; fully-qualified     # 🧛🏻 vampire: light skin tone
+1F9DB 1F3FC                                ; fully-qualified     # 🧛🏼 vampire: medium-light skin tone
+1F9DB 1F3FD                                ; fully-qualified     # 🧛🏽 vampire: medium skin tone
+1F9DB 1F3FE                                ; fully-qualified     # 🧛🏾 vampire: medium-dark skin tone
+1F9DB 1F3FF                                ; fully-qualified     # 🧛🏿 vampire: dark skin tone
+1F9DB 200D 2642 FE0F                       ; fully-qualified     # 🧛‍♂️ man vampire
+1F9DB 200D 2642                            ; minimally-qualified # 🧛‍♂ man vampire
+1F9DB 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧛🏻‍♂️ man vampire: light skin tone
+1F9DB 1F3FB 200D 2642                      ; minimally-qualified # 🧛🏻‍♂ man vampire: light skin tone
+1F9DB 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧛🏼‍♂️ man vampire: medium-light skin tone
+1F9DB 1F3FC 200D 2642                      ; minimally-qualified # 🧛🏼‍♂ man vampire: medium-light skin tone
+1F9DB 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧛🏽‍♂️ man vampire: medium skin tone
+1F9DB 1F3FD 200D 2642                      ; minimally-qualified # 🧛🏽‍♂ man vampire: medium skin tone
+1F9DB 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧛🏾‍♂️ man vampire: medium-dark skin tone
+1F9DB 1F3FE 200D 2642                      ; minimally-qualified # 🧛🏾‍♂ man vampire: medium-dark skin tone
+1F9DB 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧛🏿‍♂️ man vampire: dark skin tone
+1F9DB 1F3FF 200D 2642                      ; minimally-qualified # 🧛🏿‍♂ man vampire: dark skin tone
+1F9DB 200D 2640 FE0F                       ; fully-qualified     # 🧛‍♀️ woman vampire
+1F9DB 200D 2640                            ; minimally-qualified # 🧛‍♀ woman vampire
+1F9DB 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧛🏻‍♀️ woman vampire: light skin tone
+1F9DB 1F3FB 200D 2640                      ; minimally-qualified # 🧛🏻‍♀ woman vampire: light skin tone
+1F9DB 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧛🏼‍♀️ woman vampire: medium-light skin tone
+1F9DB 1F3FC 200D 2640                      ; minimally-qualified # 🧛🏼‍♀ woman vampire: medium-light skin tone
+1F9DB 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧛🏽‍♀️ woman vampire: medium skin tone
+1F9DB 1F3FD 200D 2640                      ; minimally-qualified # 🧛🏽‍♀ woman vampire: medium skin tone
+1F9DB 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧛🏾‍♀️ woman vampire: medium-dark skin tone
+1F9DB 1F3FE 200D 2640                      ; minimally-qualified # 🧛🏾‍♀ woman vampire: medium-dark skin tone
+1F9DB 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧛🏿‍♀️ woman vampire: dark skin tone
+1F9DB 1F3FF 200D 2640                      ; minimally-qualified # 🧛🏿‍♀ woman vampire: dark skin tone
+1F9DC                                      ; fully-qualified     # 🧜 merperson
+1F9DC 1F3FB                                ; fully-qualified     # 🧜🏻 merperson: light skin tone
+1F9DC 1F3FC                                ; fully-qualified     # 🧜🏼 merperson: medium-light skin tone
+1F9DC 1F3FD                                ; fully-qualified     # 🧜🏽 merperson: medium skin tone
+1F9DC 1F3FE                                ; fully-qualified     # 🧜🏾 merperson: medium-dark skin tone
+1F9DC 1F3FF                                ; fully-qualified     # 🧜🏿 merperson: dark skin tone
+1F9DC 200D 2642 FE0F                       ; fully-qualified     # 🧜‍♂️ merman
+1F9DC 200D 2642                            ; minimally-qualified # 🧜‍♂ merman
+1F9DC 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧜🏻‍♂️ merman: light skin tone
+1F9DC 1F3FB 200D 2642                      ; minimally-qualified # 🧜🏻‍♂ merman: light skin tone
+1F9DC 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧜🏼‍♂️ merman: medium-light skin tone
+1F9DC 1F3FC 200D 2642                      ; minimally-qualified # 🧜🏼‍♂ merman: medium-light skin tone
+1F9DC 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧜🏽‍♂️ merman: medium skin tone
+1F9DC 1F3FD 200D 2642                      ; minimally-qualified # 🧜🏽‍♂ merman: medium skin tone
+1F9DC 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧜🏾‍♂️ merman: medium-dark skin tone
+1F9DC 1F3FE 200D 2642                      ; minimally-qualified # 🧜🏾‍♂ merman: medium-dark skin tone
+1F9DC 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧜🏿‍♂️ merman: dark skin tone
+1F9DC 1F3FF 200D 2642                      ; minimally-qualified # 🧜🏿‍♂ merman: dark skin tone
+1F9DC 200D 2640 FE0F                       ; fully-qualified     # 🧜‍♀️ mermaid
+1F9DC 200D 2640                            ; minimally-qualified # 🧜‍♀ mermaid
+1F9DC 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧜🏻‍♀️ mermaid: light skin tone
+1F9DC 1F3FB 200D 2640                      ; minimally-qualified # 🧜🏻‍♀ mermaid: light skin tone
+1F9DC 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧜🏼‍♀️ mermaid: medium-light skin tone
+1F9DC 1F3FC 200D 2640                      ; minimally-qualified # 🧜🏼‍♀ mermaid: medium-light skin tone
+1F9DC 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧜🏽‍♀️ mermaid: medium skin tone
+1F9DC 1F3FD 200D 2640                      ; minimally-qualified # 🧜🏽‍♀ mermaid: medium skin tone
+1F9DC 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧜🏾‍♀️ mermaid: medium-dark skin tone
+1F9DC 1F3FE 200D 2640                      ; minimally-qualified # 🧜🏾‍♀ mermaid: medium-dark skin tone
+1F9DC 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧜🏿‍♀️ mermaid: dark skin tone
+1F9DC 1F3FF 200D 2640                      ; minimally-qualified # 🧜🏿‍♀ mermaid: dark skin tone
+1F9DD                                      ; fully-qualified     # 🧝 elf
+1F9DD 1F3FB                                ; fully-qualified     # 🧝🏻 elf: light skin tone
+1F9DD 1F3FC                                ; fully-qualified     # 🧝🏼 elf: medium-light skin tone
+1F9DD 1F3FD                                ; fully-qualified     # 🧝🏽 elf: medium skin tone
+1F9DD 1F3FE                                ; fully-qualified     # 🧝🏾 elf: medium-dark skin tone
+1F9DD 1F3FF                                ; fully-qualified     # 🧝🏿 elf: dark skin tone
+1F9DD 200D 2642 FE0F                       ; fully-qualified     # 🧝‍♂️ man elf
+1F9DD 200D 2642                            ; minimally-qualified # 🧝‍♂ man elf
+1F9DD 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧝🏻‍♂️ man elf: light skin tone
+1F9DD 1F3FB 200D 2642                      ; minimally-qualified # 🧝🏻‍♂ man elf: light skin tone
+1F9DD 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧝🏼‍♂️ man elf: medium-light skin tone
+1F9DD 1F3FC 200D 2642                      ; minimally-qualified # 🧝🏼‍♂ man elf: medium-light skin tone
+1F9DD 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧝🏽‍♂️ man elf: medium skin tone
+1F9DD 1F3FD 200D 2642                      ; minimally-qualified # 🧝🏽‍♂ man elf: medium skin tone
+1F9DD 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧝🏾‍♂️ man elf: medium-dark skin tone
+1F9DD 1F3FE 200D 2642                      ; minimally-qualified # 🧝🏾‍♂ man elf: medium-dark skin tone
+1F9DD 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧝🏿‍♂️ man elf: dark skin tone
+1F9DD 1F3FF 200D 2642                      ; minimally-qualified # 🧝🏿‍♂ man elf: dark skin tone
+1F9DD 200D 2640 FE0F                       ; fully-qualified     # 🧝‍♀️ woman elf
+1F9DD 200D 2640                            ; minimally-qualified # 🧝‍♀ woman elf
+1F9DD 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧝🏻‍♀️ woman elf: light skin tone
+1F9DD 1F3FB 200D 2640                      ; minimally-qualified # 🧝🏻‍♀ woman elf: light skin tone
+1F9DD 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧝🏼‍♀️ woman elf: medium-light skin tone
+1F9DD 1F3FC 200D 2640                      ; minimally-qualified # 🧝🏼‍♀ woman elf: medium-light skin tone
+1F9DD 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧝🏽‍♀️ woman elf: medium skin tone
+1F9DD 1F3FD 200D 2640                      ; minimally-qualified # 🧝🏽‍♀ woman elf: medium skin tone
+1F9DD 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧝🏾‍♀️ woman elf: medium-dark skin tone
+1F9DD 1F3FE 200D 2640                      ; minimally-qualified # 🧝🏾‍♀ woman elf: medium-dark skin tone
+1F9DD 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧝🏿‍♀️ woman elf: dark skin tone
+1F9DD 1F3FF 200D 2640                      ; minimally-qualified # 🧝🏿‍♀ woman elf: dark skin tone
+1F9DE                                      ; fully-qualified     # 🧞 genie
+1F9DE 200D 2642 FE0F                       ; fully-qualified     # 🧞‍♂️ man genie
+1F9DE 200D 2642                            ; minimally-qualified # 🧞‍♂ man genie
+1F9DE 200D 2640 FE0F                       ; fully-qualified     # 🧞‍♀️ woman genie
+1F9DE 200D 2640                            ; minimally-qualified # 🧞‍♀ woman genie
+1F9DF                                      ; fully-qualified     # 🧟 zombie
+1F9DF 200D 2642 FE0F                       ; fully-qualified     # 🧟‍♂️ man zombie
+1F9DF 200D 2642                            ; minimally-qualified # 🧟‍♂ man zombie
+1F9DF 200D 2640 FE0F                       ; fully-qualified     # 🧟‍♀️ woman zombie
+1F9DF 200D 2640                            ; minimally-qualified # 🧟‍♀ woman zombie
+
+# subgroup: person-activity
+1F486                                      ; fully-qualified     # 💆 person getting massage
+1F486 1F3FB                                ; fully-qualified     # 💆🏻 person getting massage: light skin tone
+1F486 1F3FC                                ; fully-qualified     # 💆🏼 person getting massage: medium-light skin tone
+1F486 1F3FD                                ; fully-qualified     # 💆🏽 person getting massage: medium skin tone
+1F486 1F3FE                                ; fully-qualified     # 💆🏾 person getting massage: medium-dark skin tone
+1F486 1F3FF                                ; fully-qualified     # 💆🏿 person getting massage: dark skin tone
+1F486 200D 2642 FE0F                       ; fully-qualified     # 💆‍♂️ man getting massage
+1F486 200D 2642                            ; minimally-qualified # 💆‍♂ man getting massage
+1F486 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 💆🏻‍♂️ man getting massage: light skin tone
+1F486 1F3FB 200D 2642                      ; minimally-qualified # 💆🏻‍♂ man getting massage: light skin tone
+1F486 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 💆🏼‍♂️ man getting massage: medium-light skin tone
+1F486 1F3FC 200D 2642                      ; minimally-qualified # 💆🏼‍♂ man getting massage: medium-light skin tone
+1F486 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 💆🏽‍♂️ man getting massage: medium skin tone
+1F486 1F3FD 200D 2642                      ; minimally-qualified # 💆🏽‍♂ man getting massage: medium skin tone
+1F486 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 💆🏾‍♂️ man getting massage: medium-dark skin tone
+1F486 1F3FE 200D 2642                      ; minimally-qualified # 💆🏾‍♂ man getting massage: medium-dark skin tone
+1F486 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 💆🏿‍♂️ man getting massage: dark skin tone
+1F486 1F3FF 200D 2642                      ; minimally-qualified # 💆🏿‍♂ man getting massage: dark skin tone
+1F486 200D 2640 FE0F                       ; fully-qualified     # 💆‍♀️ woman getting massage
+1F486 200D 2640                            ; minimally-qualified # 💆‍♀ woman getting massage
+1F486 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 💆🏻‍♀️ woman getting massage: light skin tone
+1F486 1F3FB 200D 2640                      ; minimally-qualified # 💆🏻‍♀ woman getting massage: light skin tone
+1F486 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 💆🏼‍♀️ woman getting massage: medium-light skin tone
+1F486 1F3FC 200D 2640                      ; minimally-qualified # 💆🏼‍♀ woman getting massage: medium-light skin tone
+1F486 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 💆🏽‍♀️ woman getting massage: medium skin tone
+1F486 1F3FD 200D 2640                      ; minimally-qualified # 💆🏽‍♀ woman getting massage: medium skin tone
+1F486 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 💆🏾‍♀️ woman getting massage: medium-dark skin tone
+1F486 1F3FE 200D 2640                      ; minimally-qualified # 💆🏾‍♀ woman getting massage: medium-dark skin tone
+1F486 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 💆🏿‍♀️ woman getting massage: dark skin tone
+1F486 1F3FF 200D 2640                      ; minimally-qualified # 💆🏿‍♀ woman getting massage: dark skin tone
+1F487                                      ; fully-qualified     # 💇 person getting haircut
+1F487 1F3FB                                ; fully-qualified     # 💇🏻 person getting haircut: light skin tone
+1F487 1F3FC                                ; fully-qualified     # 💇🏼 person getting haircut: medium-light skin tone
+1F487 1F3FD                                ; fully-qualified     # 💇🏽 person getting haircut: medium skin tone
+1F487 1F3FE                                ; fully-qualified     # 💇🏾 person getting haircut: medium-dark skin tone
+1F487 1F3FF                                ; fully-qualified     # 💇🏿 person getting haircut: dark skin tone
+1F487 200D 2642 FE0F                       ; fully-qualified     # 💇‍♂️ man getting haircut
+1F487 200D 2642                            ; minimally-qualified # 💇‍♂ man getting haircut
+1F487 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 💇🏻‍♂️ man getting haircut: light skin tone
+1F487 1F3FB 200D 2642                      ; minimally-qualified # 💇🏻‍♂ man getting haircut: light skin tone
+1F487 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 💇🏼‍♂️ man getting haircut: medium-light skin tone
+1F487 1F3FC 200D 2642                      ; minimally-qualified # 💇🏼‍♂ man getting haircut: medium-light skin tone
+1F487 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 💇🏽‍♂️ man getting haircut: medium skin tone
+1F487 1F3FD 200D 2642                      ; minimally-qualified # 💇🏽‍♂ man getting haircut: medium skin tone
+1F487 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 💇🏾‍♂️ man getting haircut: medium-dark skin tone
+1F487 1F3FE 200D 2642                      ; minimally-qualified # 💇🏾‍♂ man getting haircut: medium-dark skin tone
+1F487 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 💇🏿‍♂️ man getting haircut: dark skin tone
+1F487 1F3FF 200D 2642                      ; minimally-qualified # 💇🏿‍♂ man getting haircut: dark skin tone
+1F487 200D 2640 FE0F                       ; fully-qualified     # 💇‍♀️ woman getting haircut
+1F487 200D 2640                            ; minimally-qualified # 💇‍♀ woman getting haircut
+1F487 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 💇🏻‍♀️ woman getting haircut: light skin tone
+1F487 1F3FB 200D 2640                      ; minimally-qualified # 💇🏻‍♀ woman getting haircut: light skin tone
+1F487 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 💇🏼‍♀️ woman getting haircut: medium-light skin tone
+1F487 1F3FC 200D 2640                      ; minimally-qualified # 💇🏼‍♀ woman getting haircut: medium-light skin tone
+1F487 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 💇🏽‍♀️ woman getting haircut: medium skin tone
+1F487 1F3FD 200D 2640                      ; minimally-qualified # 💇🏽‍♀ woman getting haircut: medium skin tone
+1F487 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 💇🏾‍♀️ woman getting haircut: medium-dark skin tone
+1F487 1F3FE 200D 2640                      ; minimally-qualified # 💇🏾‍♀ woman getting haircut: medium-dark skin tone
+1F487 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 💇🏿‍♀️ woman getting haircut: dark skin tone
+1F487 1F3FF 200D 2640                      ; minimally-qualified # 💇🏿‍♀ woman getting haircut: dark skin tone
+1F6B6                                      ; fully-qualified     # 🚶 person walking
+1F6B6 1F3FB                                ; fully-qualified     # 🚶🏻 person walking: light skin tone
+1F6B6 1F3FC                                ; fully-qualified     # 🚶🏼 person walking: medium-light skin tone
+1F6B6 1F3FD                                ; fully-qualified     # 🚶🏽 person walking: medium skin tone
+1F6B6 1F3FE                                ; fully-qualified     # 🚶🏾 person walking: medium-dark skin tone
+1F6B6 1F3FF                                ; fully-qualified     # 🚶🏿 person walking: dark skin tone
+1F6B6 200D 2642 FE0F                       ; fully-qualified     # 🚶‍♂️ man walking
+1F6B6 200D 2642                            ; minimally-qualified # 🚶‍♂ man walking
+1F6B6 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🚶🏻‍♂️ man walking: light skin tone
+1F6B6 1F3FB 200D 2642                      ; minimally-qualified # 🚶🏻‍♂ man walking: light skin tone
+1F6B6 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🚶🏼‍♂️ man walking: medium-light skin tone
+1F6B6 1F3FC 200D 2642                      ; minimally-qualified # 🚶🏼‍♂ man walking: medium-light skin tone
+1F6B6 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🚶🏽‍♂️ man walking: medium skin tone
+1F6B6 1F3FD 200D 2642                      ; minimally-qualified # 🚶🏽‍♂ man walking: medium skin tone
+1F6B6 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🚶🏾‍♂️ man walking: medium-dark skin tone
+1F6B6 1F3FE 200D 2642                      ; minimally-qualified # 🚶🏾‍♂ man walking: medium-dark skin tone
+1F6B6 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🚶🏿‍♂️ man walking: dark skin tone
+1F6B6 1F3FF 200D 2642                      ; minimally-qualified # 🚶🏿‍♂ man walking: dark skin tone
+1F6B6 200D 2640 FE0F                       ; fully-qualified     # 🚶‍♀️ woman walking
+1F6B6 200D 2640                            ; minimally-qualified # 🚶‍♀ woman walking
+1F6B6 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🚶🏻‍♀️ woman walking: light skin tone
+1F6B6 1F3FB 200D 2640                      ; minimally-qualified # 🚶🏻‍♀ woman walking: light skin tone
+1F6B6 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🚶🏼‍♀️ woman walking: medium-light skin tone
+1F6B6 1F3FC 200D 2640                      ; minimally-qualified # 🚶🏼‍♀ woman walking: medium-light skin tone
+1F6B6 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🚶🏽‍♀️ woman walking: medium skin tone
+1F6B6 1F3FD 200D 2640                      ; minimally-qualified # 🚶🏽‍♀ woman walking: medium skin tone
+1F6B6 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🚶🏾‍♀️ woman walking: medium-dark skin tone
+1F6B6 1F3FE 200D 2640                      ; minimally-qualified # 🚶🏾‍♀ woman walking: medium-dark skin tone
+1F6B6 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🚶🏿‍♀️ woman walking: dark skin tone
+1F6B6 1F3FF 200D 2640                      ; minimally-qualified # 🚶🏿‍♀ woman walking: dark skin tone
+1F9CD                                      ; fully-qualified     # 🧍 person standing
+1F9CD 1F3FB                                ; fully-qualified     # 🧍🏻 person standing: light skin tone
+1F9CD 1F3FC                                ; fully-qualified     # 🧍🏼 person standing: medium-light skin tone
+1F9CD 1F3FD                                ; fully-qualified     # 🧍🏽 person standing: medium skin tone
+1F9CD 1F3FE                                ; fully-qualified     # 🧍🏾 person standing: medium-dark skin tone
+1F9CD 1F3FF                                ; fully-qualified     # 🧍🏿 person standing: dark skin tone
+1F9CD 200D 2642 FE0F                       ; fully-qualified     # 🧍‍♂️ man standing
+1F9CD 200D 2642                            ; minimally-qualified # 🧍‍♂ man standing
+1F9CD 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧍🏻‍♂️ man standing: light skin tone
+1F9CD 1F3FB 200D 2642                      ; minimally-qualified # 🧍🏻‍♂ man standing: light skin tone
+1F9CD 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧍🏼‍♂️ man standing: medium-light skin tone
+1F9CD 1F3FC 200D 2642                      ; minimally-qualified # 🧍🏼‍♂ man standing: medium-light skin tone
+1F9CD 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧍🏽‍♂️ man standing: medium skin tone
+1F9CD 1F3FD 200D 2642                      ; minimally-qualified # 🧍🏽‍♂ man standing: medium skin tone
+1F9CD 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧍🏾‍♂️ man standing: medium-dark skin tone
+1F9CD 1F3FE 200D 2642                      ; minimally-qualified # 🧍🏾‍♂ man standing: medium-dark skin tone
+1F9CD 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧍🏿‍♂️ man standing: dark skin tone
+1F9CD 1F3FF 200D 2642                      ; minimally-qualified # 🧍🏿‍♂ man standing: dark skin tone
+1F9CD 200D 2640 FE0F                       ; fully-qualified     # 🧍‍♀️ woman standing
+1F9CD 200D 2640                            ; minimally-qualified # 🧍‍♀ woman standing
+1F9CD 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧍🏻‍♀️ woman standing: light skin tone
+1F9CD 1F3FB 200D 2640                      ; minimally-qualified # 🧍🏻‍♀ woman standing: light skin tone
+1F9CD 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧍🏼‍♀️ woman standing: medium-light skin tone
+1F9CD 1F3FC 200D 2640                      ; minimally-qualified # 🧍🏼‍♀ woman standing: medium-light skin tone
+1F9CD 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧍🏽‍♀️ woman standing: medium skin tone
+1F9CD 1F3FD 200D 2640                      ; minimally-qualified # 🧍🏽‍♀ woman standing: medium skin tone
+1F9CD 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧍🏾‍♀️ woman standing: medium-dark skin tone
+1F9CD 1F3FE 200D 2640                      ; minimally-qualified # 🧍🏾‍♀ woman standing: medium-dark skin tone
+1F9CD 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧍🏿‍♀️ woman standing: dark skin tone
+1F9CD 1F3FF 200D 2640                      ; minimally-qualified # 🧍🏿‍♀ woman standing: dark skin tone
+1F9CE                                      ; fully-qualified     # 🧎 person kneeling
+1F9CE 1F3FB                                ; fully-qualified     # 🧎🏻 person kneeling: light skin tone
+1F9CE 1F3FC                                ; fully-qualified     # 🧎🏼 person kneeling: medium-light skin tone
+1F9CE 1F3FD                                ; fully-qualified     # 🧎🏽 person kneeling: medium skin tone
+1F9CE 1F3FE                                ; fully-qualified     # 🧎🏾 person kneeling: medium-dark skin tone
+1F9CE 1F3FF                                ; fully-qualified     # 🧎🏿 person kneeling: dark skin tone
+1F9CE 200D 2642 FE0F                       ; fully-qualified     # 🧎‍♂️ man kneeling
+1F9CE 200D 2642                            ; minimally-qualified # 🧎‍♂ man kneeling
+1F9CE 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧎🏻‍♂️ man kneeling: light skin tone
+1F9CE 1F3FB 200D 2642                      ; minimally-qualified # 🧎🏻‍♂ man kneeling: light skin tone
+1F9CE 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧎🏼‍♂️ man kneeling: medium-light skin tone
+1F9CE 1F3FC 200D 2642                      ; minimally-qualified # 🧎🏼‍♂ man kneeling: medium-light skin tone
+1F9CE 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧎🏽‍♂️ man kneeling: medium skin tone
+1F9CE 1F3FD 200D 2642                      ; minimally-qualified # 🧎🏽‍♂ man kneeling: medium skin tone
+1F9CE 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧎🏾‍♂️ man kneeling: medium-dark skin tone
+1F9CE 1F3FE 200D 2642                      ; minimally-qualified # 🧎🏾‍♂ man kneeling: medium-dark skin tone
+1F9CE 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧎🏿‍♂️ man kneeling: dark skin tone
+1F9CE 1F3FF 200D 2642                      ; minimally-qualified # 🧎🏿‍♂ man kneeling: dark skin tone
+1F9CE 200D 2640 FE0F                       ; fully-qualified     # 🧎‍♀️ woman kneeling
+1F9CE 200D 2640                            ; minimally-qualified # 🧎‍♀ woman kneeling
+1F9CE 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧎🏻‍♀️ woman kneeling: light skin tone
+1F9CE 1F3FB 200D 2640                      ; minimally-qualified # 🧎🏻‍♀ woman kneeling: light skin tone
+1F9CE 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧎🏼‍♀️ woman kneeling: medium-light skin tone
+1F9CE 1F3FC 200D 2640                      ; minimally-qualified # 🧎🏼‍♀ woman kneeling: medium-light skin tone
+1F9CE 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧎🏽‍♀️ woman kneeling: medium skin tone
+1F9CE 1F3FD 200D 2640                      ; minimally-qualified # 🧎🏽‍♀ woman kneeling: medium skin tone
+1F9CE 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧎🏾‍♀️ woman kneeling: medium-dark skin tone
+1F9CE 1F3FE 200D 2640                      ; minimally-qualified # 🧎🏾‍♀ woman kneeling: medium-dark skin tone
+1F9CE 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧎🏿‍♀️ woman kneeling: dark skin tone
+1F9CE 1F3FF 200D 2640                      ; minimally-qualified # 🧎🏿‍♀ woman kneeling: dark skin tone
+1F468 200D 1F9AF                           ; fully-qualified     # 👨‍🦯 man with probing cane
+1F468 1F3FB 200D 1F9AF                     ; fully-qualified     # 👨🏻‍🦯 man with probing cane: light skin tone
+1F468 1F3FC 200D 1F9AF                     ; fully-qualified     # 👨🏼‍🦯 man with probing cane: medium-light skin tone
+1F468 1F3FD 200D 1F9AF                     ; fully-qualified     # 👨🏽‍🦯 man with probing cane: medium skin tone
+1F468 1F3FE 200D 1F9AF                     ; fully-qualified     # 👨🏾‍🦯 man with probing cane: medium-dark skin tone
+1F468 1F3FF 200D 1F9AF                     ; fully-qualified     # 👨🏿‍🦯 man with probing cane: dark skin tone
+1F469 200D 1F9AF                           ; fully-qualified     # 👩‍🦯 woman with probing cane
+1F469 1F3FB 200D 1F9AF                     ; fully-qualified     # 👩🏻‍🦯 woman with probing cane: light skin tone
+1F469 1F3FC 200D 1F9AF                     ; fully-qualified     # 👩🏼‍🦯 woman with probing cane: medium-light skin tone
+1F469 1F3FD 200D 1F9AF                     ; fully-qualified     # 👩🏽‍🦯 woman with probing cane: medium skin tone
+1F469 1F3FE 200D 1F9AF                     ; fully-qualified     # 👩🏾‍🦯 woman with probing cane: medium-dark skin tone
+1F469 1F3FF 200D 1F9AF                     ; fully-qualified     # 👩🏿‍🦯 woman with probing cane: dark skin tone
+1F468 200D 1F9BC                           ; fully-qualified     # 👨‍🦼 man in motorized wheelchair
+1F468 1F3FB 200D 1F9BC                     ; fully-qualified     # 👨🏻‍🦼 man in motorized wheelchair: light skin tone
+1F468 1F3FC 200D 1F9BC                     ; fully-qualified     # 👨🏼‍🦼 man in motorized wheelchair: medium-light skin tone
+1F468 1F3FD 200D 1F9BC                     ; fully-qualified     # 👨🏽‍🦼 man in motorized wheelchair: medium skin tone
+1F468 1F3FE 200D 1F9BC                     ; fully-qualified     # 👨🏾‍🦼 man in motorized wheelchair: medium-dark skin tone
+1F468 1F3FF 200D 1F9BC                     ; fully-qualified     # 👨🏿‍🦼 man in motorized wheelchair: dark skin tone
+1F469 200D 1F9BC                           ; fully-qualified     # 👩‍🦼 woman in motorized wheelchair
+1F469 1F3FB 200D 1F9BC                     ; fully-qualified     # 👩🏻‍🦼 woman in motorized wheelchair: light skin tone
+1F469 1F3FC 200D 1F9BC                     ; fully-qualified     # 👩🏼‍🦼 woman in motorized wheelchair: medium-light skin tone
+1F469 1F3FD 200D 1F9BC                     ; fully-qualified     # 👩🏽‍🦼 woman in motorized wheelchair: medium skin tone
+1F469 1F3FE 200D 1F9BC                     ; fully-qualified     # 👩🏾‍🦼 woman in motorized wheelchair: medium-dark skin tone
+1F469 1F3FF 200D 1F9BC                     ; fully-qualified     # 👩🏿‍🦼 woman in motorized wheelchair: dark skin tone
+1F468 200D 1F9BD                           ; fully-qualified     # 👨‍🦽 man in manual wheelchair
+1F468 1F3FB 200D 1F9BD                     ; fully-qualified     # 👨🏻‍🦽 man in manual wheelchair: light skin tone
+1F468 1F3FC 200D 1F9BD                     ; fully-qualified     # 👨🏼‍🦽 man in manual wheelchair: medium-light skin tone
+1F468 1F3FD 200D 1F9BD                     ; fully-qualified     # 👨🏽‍🦽 man in manual wheelchair: medium skin tone
+1F468 1F3FE 200D 1F9BD                     ; fully-qualified     # 👨🏾‍🦽 man in manual wheelchair: medium-dark skin tone
+1F468 1F3FF 200D 1F9BD                     ; fully-qualified     # 👨🏿‍🦽 man in manual wheelchair: dark skin tone
+1F469 200D 1F9BD                           ; fully-qualified     # 👩‍🦽 woman in manual wheelchair
+1F469 1F3FB 200D 1F9BD                     ; fully-qualified     # 👩🏻‍🦽 woman in manual wheelchair: light skin tone
+1F469 1F3FC 200D 1F9BD                     ; fully-qualified     # 👩🏼‍🦽 woman in manual wheelchair: medium-light skin tone
+1F469 1F3FD 200D 1F9BD                     ; fully-qualified     # 👩🏽‍🦽 woman in manual wheelchair: medium skin tone
+1F469 1F3FE 200D 1F9BD                     ; fully-qualified     # 👩🏾‍🦽 woman in manual wheelchair: medium-dark skin tone
+1F469 1F3FF 200D 1F9BD                     ; fully-qualified     # 👩🏿‍🦽 woman in manual wheelchair: dark skin tone
+1F3C3                                      ; fully-qualified     # 🏃 person running
+1F3C3 1F3FB                                ; fully-qualified     # 🏃🏻 person running: light skin tone
+1F3C3 1F3FC                                ; fully-qualified     # 🏃🏼 person running: medium-light skin tone
+1F3C3 1F3FD                                ; fully-qualified     # 🏃🏽 person running: medium skin tone
+1F3C3 1F3FE                                ; fully-qualified     # 🏃🏾 person running: medium-dark skin tone
+1F3C3 1F3FF                                ; fully-qualified     # 🏃🏿 person running: dark skin tone
+1F3C3 200D 2642 FE0F                       ; fully-qualified     # 🏃‍♂️ man running
+1F3C3 200D 2642                            ; minimally-qualified # 🏃‍♂ man running
+1F3C3 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🏃🏻‍♂️ man running: light skin tone
+1F3C3 1F3FB 200D 2642                      ; minimally-qualified # 🏃🏻‍♂ man running: light skin tone
+1F3C3 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🏃🏼‍♂️ man running: medium-light skin tone
+1F3C3 1F3FC 200D 2642                      ; minimally-qualified # 🏃🏼‍♂ man running: medium-light skin tone
+1F3C3 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🏃🏽‍♂️ man running: medium skin tone
+1F3C3 1F3FD 200D 2642                      ; minimally-qualified # 🏃🏽‍♂ man running: medium skin tone
+1F3C3 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🏃🏾‍♂️ man running: medium-dark skin tone
+1F3C3 1F3FE 200D 2642                      ; minimally-qualified # 🏃🏾‍♂ man running: medium-dark skin tone
+1F3C3 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🏃🏿‍♂️ man running: dark skin tone
+1F3C3 1F3FF 200D 2642                      ; minimally-qualified # 🏃🏿‍♂ man running: dark skin tone
+1F3C3 200D 2640 FE0F                       ; fully-qualified     # 🏃‍♀️ woman running
+1F3C3 200D 2640                            ; minimally-qualified # 🏃‍♀ woman running
+1F3C3 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🏃🏻‍♀️ woman running: light skin tone
+1F3C3 1F3FB 200D 2640                      ; minimally-qualified # 🏃🏻‍♀ woman running: light skin tone
+1F3C3 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🏃🏼‍♀️ woman running: medium-light skin tone
+1F3C3 1F3FC 200D 2640                      ; minimally-qualified # 🏃🏼‍♀ woman running: medium-light skin tone
+1F3C3 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🏃🏽‍♀️ woman running: medium skin tone
+1F3C3 1F3FD 200D 2640                      ; minimally-qualified # 🏃🏽‍♀ woman running: medium skin tone
+1F3C3 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🏃🏾‍♀️ woman running: medium-dark skin tone
+1F3C3 1F3FE 200D 2640                      ; minimally-qualified # 🏃🏾‍♀ woman running: medium-dark skin tone
+1F3C3 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🏃🏿‍♀️ woman running: dark skin tone
+1F3C3 1F3FF 200D 2640                      ; minimally-qualified # 🏃🏿‍♀ woman running: dark skin tone
+1F483                                      ; fully-qualified     # 💃 woman dancing
+1F483 1F3FB                                ; fully-qualified     # 💃🏻 woman dancing: light skin tone
+1F483 1F3FC                                ; fully-qualified     # 💃🏼 woman dancing: medium-light skin tone
+1F483 1F3FD                                ; fully-qualified     # 💃🏽 woman dancing: medium skin tone
+1F483 1F3FE                                ; fully-qualified     # 💃🏾 woman dancing: medium-dark skin tone
+1F483 1F3FF                                ; fully-qualified     # 💃🏿 woman dancing: dark skin tone
+1F57A                                      ; fully-qualified     # 🕺 man dancing
+1F57A 1F3FB                                ; fully-qualified     # 🕺🏻 man dancing: light skin tone
+1F57A 1F3FC                                ; fully-qualified     # 🕺🏼 man dancing: medium-light skin tone
+1F57A 1F3FD                                ; fully-qualified     # 🕺🏽 man dancing: medium skin tone
+1F57A 1F3FE                                ; fully-qualified     # 🕺🏾 man dancing: medium-dark skin tone
+1F57A 1F3FF                                ; fully-qualified     # 🕺🏿 man dancing: dark skin tone
+1F574 FE0F                                 ; fully-qualified     # 🕴️ man in suit levitating
+1F574                                      ; unqualified         # 🕴 man in suit levitating
+1F574 1F3FB                                ; fully-qualified     # 🕴🏻 man in suit levitating: light skin tone
+1F574 1F3FC                                ; fully-qualified     # 🕴🏼 man in suit levitating: medium-light skin tone
+1F574 1F3FD                                ; fully-qualified     # 🕴🏽 man in suit levitating: medium skin tone
+1F574 1F3FE                                ; fully-qualified     # 🕴🏾 man in suit levitating: medium-dark skin tone
+1F574 1F3FF                                ; fully-qualified     # 🕴🏿 man in suit levitating: dark skin tone
+1F46F                                      ; fully-qualified     # 👯 people with bunny ears
+1F46F 200D 2642 FE0F                       ; fully-qualified     # 👯‍♂️ men with bunny ears
+1F46F 200D 2642                            ; minimally-qualified # 👯‍♂ men with bunny ears
+1F46F 200D 2640 FE0F                       ; fully-qualified     # 👯‍♀️ women with bunny ears
+1F46F 200D 2640                            ; minimally-qualified # 👯‍♀ women with bunny ears
+1F9D6                                      ; fully-qualified     # 🧖 person in steamy room
+1F9D6 1F3FB                                ; fully-qualified     # 🧖🏻 person in steamy room: light skin tone
+1F9D6 1F3FC                                ; fully-qualified     # 🧖🏼 person in steamy room: medium-light skin tone
+1F9D6 1F3FD                                ; fully-qualified     # 🧖🏽 person in steamy room: medium skin tone
+1F9D6 1F3FE                                ; fully-qualified     # 🧖🏾 person in steamy room: medium-dark skin tone
+1F9D6 1F3FF                                ; fully-qualified     # 🧖🏿 person in steamy room: dark skin tone
+1F9D6 200D 2642 FE0F                       ; fully-qualified     # 🧖‍♂️ man in steamy room
+1F9D6 200D 2642                            ; minimally-qualified # 🧖‍♂ man in steamy room
+1F9D6 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧖🏻‍♂️ man in steamy room: light skin tone
+1F9D6 1F3FB 200D 2642                      ; minimally-qualified # 🧖🏻‍♂ man in steamy room: light skin tone
+1F9D6 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧖🏼‍♂️ man in steamy room: medium-light skin tone
+1F9D6 1F3FC 200D 2642                      ; minimally-qualified # 🧖🏼‍♂ man in steamy room: medium-light skin tone
+1F9D6 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧖🏽‍♂️ man in steamy room: medium skin tone
+1F9D6 1F3FD 200D 2642                      ; minimally-qualified # 🧖🏽‍♂ man in steamy room: medium skin tone
+1F9D6 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧖🏾‍♂️ man in steamy room: medium-dark skin tone
+1F9D6 1F3FE 200D 2642                      ; minimally-qualified # 🧖🏾‍♂ man in steamy room: medium-dark skin tone
+1F9D6 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧖🏿‍♂️ man in steamy room: dark skin tone
+1F9D6 1F3FF 200D 2642                      ; minimally-qualified # 🧖🏿‍♂ man in steamy room: dark skin tone
+1F9D6 200D 2640 FE0F                       ; fully-qualified     # 🧖‍♀️ woman in steamy room
+1F9D6 200D 2640                            ; minimally-qualified # 🧖‍♀ woman in steamy room
+1F9D6 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧖🏻‍♀️ woman in steamy room: light skin tone
+1F9D6 1F3FB 200D 2640                      ; minimally-qualified # 🧖🏻‍♀ woman in steamy room: light skin tone
+1F9D6 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧖🏼‍♀️ woman in steamy room: medium-light skin tone
+1F9D6 1F3FC 200D 2640                      ; minimally-qualified # 🧖🏼‍♀ woman in steamy room: medium-light skin tone
+1F9D6 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧖🏽‍♀️ woman in steamy room: medium skin tone
+1F9D6 1F3FD 200D 2640                      ; minimally-qualified # 🧖🏽‍♀ woman in steamy room: medium skin tone
+1F9D6 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧖🏾‍♀️ woman in steamy room: medium-dark skin tone
+1F9D6 1F3FE 200D 2640                      ; minimally-qualified # 🧖🏾‍♀ woman in steamy room: medium-dark skin tone
+1F9D6 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧖🏿‍♀️ woman in steamy room: dark skin tone
+1F9D6 1F3FF 200D 2640                      ; minimally-qualified # 🧖🏿‍♀ woman in steamy room: dark skin tone
+1F9D7                                      ; fully-qualified     # 🧗 person climbing
+1F9D7 1F3FB                                ; fully-qualified     # 🧗🏻 person climbing: light skin tone
+1F9D7 1F3FC                                ; fully-qualified     # 🧗🏼 person climbing: medium-light skin tone
+1F9D7 1F3FD                                ; fully-qualified     # 🧗🏽 person climbing: medium skin tone
+1F9D7 1F3FE                                ; fully-qualified     # 🧗🏾 person climbing: medium-dark skin tone
+1F9D7 1F3FF                                ; fully-qualified     # 🧗🏿 person climbing: dark skin tone
+1F9D7 200D 2642 FE0F                       ; fully-qualified     # 🧗‍♂️ man climbing
+1F9D7 200D 2642                            ; minimally-qualified # 🧗‍♂ man climbing
+1F9D7 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧗🏻‍♂️ man climbing: light skin tone
+1F9D7 1F3FB 200D 2642                      ; minimally-qualified # 🧗🏻‍♂ man climbing: light skin tone
+1F9D7 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧗🏼‍♂️ man climbing: medium-light skin tone
+1F9D7 1F3FC 200D 2642                      ; minimally-qualified # 🧗🏼‍♂ man climbing: medium-light skin tone
+1F9D7 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧗🏽‍♂️ man climbing: medium skin tone
+1F9D7 1F3FD 200D 2642                      ; minimally-qualified # 🧗🏽‍♂ man climbing: medium skin tone
+1F9D7 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧗🏾‍♂️ man climbing: medium-dark skin tone
+1F9D7 1F3FE 200D 2642                      ; minimally-qualified # 🧗🏾‍♂ man climbing: medium-dark skin tone
+1F9D7 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧗🏿‍♂️ man climbing: dark skin tone
+1F9D7 1F3FF 200D 2642                      ; minimally-qualified # 🧗🏿‍♂ man climbing: dark skin tone
+1F9D7 200D 2640 FE0F                       ; fully-qualified     # 🧗‍♀️ woman climbing
+1F9D7 200D 2640                            ; minimally-qualified # 🧗‍♀ woman climbing
+1F9D7 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧗🏻‍♀️ woman climbing: light skin tone
+1F9D7 1F3FB 200D 2640                      ; minimally-qualified # 🧗🏻‍♀ woman climbing: light skin tone
+1F9D7 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧗🏼‍♀️ woman climbing: medium-light skin tone
+1F9D7 1F3FC 200D 2640                      ; minimally-qualified # 🧗🏼‍♀ woman climbing: medium-light skin tone
+1F9D7 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧗🏽‍♀️ woman climbing: medium skin tone
+1F9D7 1F3FD 200D 2640                      ; minimally-qualified # 🧗🏽‍♀ woman climbing: medium skin tone
+1F9D7 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧗🏾‍♀️ woman climbing: medium-dark skin tone
+1F9D7 1F3FE 200D 2640                      ; minimally-qualified # 🧗🏾‍♀ woman climbing: medium-dark skin tone
+1F9D7 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧗🏿‍♀️ woman climbing: dark skin tone
+1F9D7 1F3FF 200D 2640                      ; minimally-qualified # 🧗🏿‍♀ woman climbing: dark skin tone
+
+# subgroup: person-sport
+1F93A                                      ; fully-qualified     # 🤺 person fencing
+1F3C7                                      ; fully-qualified     # 🏇 horse racing
+1F3C7 1F3FB                                ; fully-qualified     # 🏇🏻 horse racing: light skin tone
+1F3C7 1F3FC                                ; fully-qualified     # 🏇🏼 horse racing: medium-light skin tone
+1F3C7 1F3FD                                ; fully-qualified     # 🏇🏽 horse racing: medium skin tone
+1F3C7 1F3FE                                ; fully-qualified     # 🏇🏾 horse racing: medium-dark skin tone
+1F3C7 1F3FF                                ; fully-qualified     # 🏇🏿 horse racing: dark skin tone
+26F7 FE0F                                  ; fully-qualified     # ⛷️ skier
+26F7                                       ; unqualified         # ⛷ skier
+1F3C2                                      ; fully-qualified     # 🏂 snowboarder
+1F3C2 1F3FB                                ; fully-qualified     # 🏂🏻 snowboarder: light skin tone
+1F3C2 1F3FC                                ; fully-qualified     # 🏂🏼 snowboarder: medium-light skin tone
+1F3C2 1F3FD                                ; fully-qualified     # 🏂🏽 snowboarder: medium skin tone
+1F3C2 1F3FE                                ; fully-qualified     # 🏂🏾 snowboarder: medium-dark skin tone
+1F3C2 1F3FF                                ; fully-qualified     # 🏂🏿 snowboarder: dark skin tone
+1F3CC FE0F                                 ; fully-qualified     # 🏌️ person golfing
+1F3CC                                      ; unqualified         # 🏌 person golfing
+1F3CC 1F3FB                                ; fully-qualified     # 🏌🏻 person golfing: light skin tone
+1F3CC 1F3FC                                ; fully-qualified     # 🏌🏼 person golfing: medium-light skin tone
+1F3CC 1F3FD                                ; fully-qualified     # 🏌🏽 person golfing: medium skin tone
+1F3CC 1F3FE                                ; fully-qualified     # 🏌🏾 person golfing: medium-dark skin tone
+1F3CC 1F3FF                                ; fully-qualified     # 🏌🏿 person golfing: dark skin tone
+1F3CC FE0F 200D 2642 FE0F                  ; fully-qualified     # 🏌️‍♂️ man golfing
+1F3CC 200D 2642 FE0F                       ; unqualified         # 🏌‍♂️ man golfing
+1F3CC FE0F 200D 2642                       ; unqualified         # 🏌️‍♂ man golfing
+1F3CC 200D 2642                            ; unqualified         # 🏌‍♂ man golfing
+1F3CC 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🏌🏻‍♂️ man golfing: light skin tone
+1F3CC 1F3FB 200D 2642                      ; minimally-qualified # 🏌🏻‍♂ man golfing: light skin tone
+1F3CC 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🏌🏼‍♂️ man golfing: medium-light skin tone
+1F3CC 1F3FC 200D 2642                      ; minimally-qualified # 🏌🏼‍♂ man golfing: medium-light skin tone
+1F3CC 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🏌🏽‍♂️ man golfing: medium skin tone
+1F3CC 1F3FD 200D 2642                      ; minimally-qualified # 🏌🏽‍♂ man golfing: medium skin tone
+1F3CC 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🏌🏾‍♂️ man golfing: medium-dark skin tone
+1F3CC 1F3FE 200D 2642                      ; minimally-qualified # 🏌🏾‍♂ man golfing: medium-dark skin tone
+1F3CC 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🏌🏿‍♂️ man golfing: dark skin tone
+1F3CC 1F3FF 200D 2642                      ; minimally-qualified # 🏌🏿‍♂ man golfing: dark skin tone
+1F3CC FE0F 200D 2640 FE0F                  ; fully-qualified     # 🏌️‍♀️ woman golfing
+1F3CC 200D 2640 FE0F                       ; unqualified         # 🏌‍♀️ woman golfing
+1F3CC FE0F 200D 2640                       ; unqualified         # 🏌️‍♀ woman golfing
+1F3CC 200D 2640                            ; unqualified         # 🏌‍♀ woman golfing
+1F3CC 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🏌🏻‍♀️ woman golfing: light skin tone
+1F3CC 1F3FB 200D 2640                      ; minimally-qualified # 🏌🏻‍♀ woman golfing: light skin tone
+1F3CC 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🏌🏼‍♀️ woman golfing: medium-light skin tone
+1F3CC 1F3FC 200D 2640                      ; minimally-qualified # 🏌🏼‍♀ woman golfing: medium-light skin tone
+1F3CC 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🏌🏽‍♀️ woman golfing: medium skin tone
+1F3CC 1F3FD 200D 2640                      ; minimally-qualified # 🏌🏽‍♀ woman golfing: medium skin tone
+1F3CC 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🏌🏾‍♀️ woman golfing: medium-dark skin tone
+1F3CC 1F3FE 200D 2640                      ; minimally-qualified # 🏌🏾‍♀ woman golfing: medium-dark skin tone
+1F3CC 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🏌🏿‍♀️ woman golfing: dark skin tone
+1F3CC 1F3FF 200D 2640                      ; minimally-qualified # 🏌🏿‍♀ woman golfing: dark skin tone
+1F3C4                                      ; fully-qualified     # 🏄 person surfing
+1F3C4 1F3FB                                ; fully-qualified     # 🏄🏻 person surfing: light skin tone
+1F3C4 1F3FC                                ; fully-qualified     # 🏄🏼 person surfing: medium-light skin tone
+1F3C4 1F3FD                                ; fully-qualified     # 🏄🏽 person surfing: medium skin tone
+1F3C4 1F3FE                                ; fully-qualified     # 🏄🏾 person surfing: medium-dark skin tone
+1F3C4 1F3FF                                ; fully-qualified     # 🏄🏿 person surfing: dark skin tone
+1F3C4 200D 2642 FE0F                       ; fully-qualified     # 🏄‍♂️ man surfing
+1F3C4 200D 2642                            ; minimally-qualified # 🏄‍♂ man surfing
+1F3C4 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🏄🏻‍♂️ man surfing: light skin tone
+1F3C4 1F3FB 200D 2642                      ; minimally-qualified # 🏄🏻‍♂ man surfing: light skin tone
+1F3C4 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🏄🏼‍♂️ man surfing: medium-light skin tone
+1F3C4 1F3FC 200D 2642                      ; minimally-qualified # 🏄🏼‍♂ man surfing: medium-light skin tone
+1F3C4 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🏄🏽‍♂️ man surfing: medium skin tone
+1F3C4 1F3FD 200D 2642                      ; minimally-qualified # 🏄🏽‍♂ man surfing: medium skin tone
+1F3C4 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🏄🏾‍♂️ man surfing: medium-dark skin tone
+1F3C4 1F3FE 200D 2642                      ; minimally-qualified # 🏄🏾‍♂ man surfing: medium-dark skin tone
+1F3C4 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🏄🏿‍♂️ man surfing: dark skin tone
+1F3C4 1F3FF 200D 2642                      ; minimally-qualified # 🏄🏿‍♂ man surfing: dark skin tone
+1F3C4 200D 2640 FE0F                       ; fully-qualified     # 🏄‍♀️ woman surfing
+1F3C4 200D 2640                            ; minimally-qualified # 🏄‍♀ woman surfing
+1F3C4 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🏄🏻‍♀️ woman surfing: light skin tone
+1F3C4 1F3FB 200D 2640                      ; minimally-qualified # 🏄🏻‍♀ woman surfing: light skin tone
+1F3C4 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🏄🏼‍♀️ woman surfing: medium-light skin tone
+1F3C4 1F3FC 200D 2640                      ; minimally-qualified # 🏄🏼‍♀ woman surfing: medium-light skin tone
+1F3C4 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🏄🏽‍♀️ woman surfing: medium skin tone
+1F3C4 1F3FD 200D 2640                      ; minimally-qualified # 🏄🏽‍♀ woman surfing: medium skin tone
+1F3C4 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🏄🏾‍♀️ woman surfing: medium-dark skin tone
+1F3C4 1F3FE 200D 2640                      ; minimally-qualified # 🏄🏾‍♀ woman surfing: medium-dark skin tone
+1F3C4 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🏄🏿‍♀️ woman surfing: dark skin tone
+1F3C4 1F3FF 200D 2640                      ; minimally-qualified # 🏄🏿‍♀ woman surfing: dark skin tone
+1F6A3                                      ; fully-qualified     # 🚣 person rowing boat
+1F6A3 1F3FB                                ; fully-qualified     # 🚣🏻 person rowing boat: light skin tone
+1F6A3 1F3FC                                ; fully-qualified     # 🚣🏼 person rowing boat: medium-light skin tone
+1F6A3 1F3FD                                ; fully-qualified     # 🚣🏽 person rowing boat: medium skin tone
+1F6A3 1F3FE                                ; fully-qualified     # 🚣🏾 person rowing boat: medium-dark skin tone
+1F6A3 1F3FF                                ; fully-qualified     # 🚣🏿 person rowing boat: dark skin tone
+1F6A3 200D 2642 FE0F                       ; fully-qualified     # 🚣‍♂️ man rowing boat
+1F6A3 200D 2642                            ; minimally-qualified # 🚣‍♂ man rowing boat
+1F6A3 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🚣🏻‍♂️ man rowing boat: light skin tone
+1F6A3 1F3FB 200D 2642                      ; minimally-qualified # 🚣🏻‍♂ man rowing boat: light skin tone
+1F6A3 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🚣🏼‍♂️ man rowing boat: medium-light skin tone
+1F6A3 1F3FC 200D 2642                      ; minimally-qualified # 🚣🏼‍♂ man rowing boat: medium-light skin tone
+1F6A3 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🚣🏽‍♂️ man rowing boat: medium skin tone
+1F6A3 1F3FD 200D 2642                      ; minimally-qualified # 🚣🏽‍♂ man rowing boat: medium skin tone
+1F6A3 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🚣🏾‍♂️ man rowing boat: medium-dark skin tone
+1F6A3 1F3FE 200D 2642                      ; minimally-qualified # 🚣🏾‍♂ man rowing boat: medium-dark skin tone
+1F6A3 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🚣🏿‍♂️ man rowing boat: dark skin tone
+1F6A3 1F3FF 200D 2642                      ; minimally-qualified # 🚣🏿‍♂ man rowing boat: dark skin tone
+1F6A3 200D 2640 FE0F                       ; fully-qualified     # 🚣‍♀️ woman rowing boat
+1F6A3 200D 2640                            ; minimally-qualified # 🚣‍♀ woman rowing boat
+1F6A3 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🚣🏻‍♀️ woman rowing boat: light skin tone
+1F6A3 1F3FB 200D 2640                      ; minimally-qualified # 🚣🏻‍♀ woman rowing boat: light skin tone
+1F6A3 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🚣🏼‍♀️ woman rowing boat: medium-light skin tone
+1F6A3 1F3FC 200D 2640                      ; minimally-qualified # 🚣🏼‍♀ woman rowing boat: medium-light skin tone
+1F6A3 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🚣🏽‍♀️ woman rowing boat: medium skin tone
+1F6A3 1F3FD 200D 2640                      ; minimally-qualified # 🚣🏽‍♀ woman rowing boat: medium skin tone
+1F6A3 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🚣🏾‍♀️ woman rowing boat: medium-dark skin tone
+1F6A3 1F3FE 200D 2640                      ; minimally-qualified # 🚣🏾‍♀ woman rowing boat: medium-dark skin tone
+1F6A3 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🚣🏿‍♀️ woman rowing boat: dark skin tone
+1F6A3 1F3FF 200D 2640                      ; minimally-qualified # 🚣🏿‍♀ woman rowing boat: dark skin tone
+1F3CA                                      ; fully-qualified     # 🏊 person swimming
+1F3CA 1F3FB                                ; fully-qualified     # 🏊🏻 person swimming: light skin tone
+1F3CA 1F3FC                                ; fully-qualified     # 🏊🏼 person swimming: medium-light skin tone
+1F3CA 1F3FD                                ; fully-qualified     # 🏊🏽 person swimming: medium skin tone
+1F3CA 1F3FE                                ; fully-qualified     # 🏊🏾 person swimming: medium-dark skin tone
+1F3CA 1F3FF                                ; fully-qualified     # 🏊🏿 person swimming: dark skin tone
+1F3CA 200D 2642 FE0F                       ; fully-qualified     # 🏊‍♂️ man swimming
+1F3CA 200D 2642                            ; minimally-qualified # 🏊‍♂ man swimming
+1F3CA 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🏊🏻‍♂️ man swimming: light skin tone
+1F3CA 1F3FB 200D 2642                      ; minimally-qualified # 🏊🏻‍♂ man swimming: light skin tone
+1F3CA 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🏊🏼‍♂️ man swimming: medium-light skin tone
+1F3CA 1F3FC 200D 2642                      ; minimally-qualified # 🏊🏼‍♂ man swimming: medium-light skin tone
+1F3CA 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🏊🏽‍♂️ man swimming: medium skin tone
+1F3CA 1F3FD 200D 2642                      ; minimally-qualified # 🏊🏽‍♂ man swimming: medium skin tone
+1F3CA 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🏊🏾‍♂️ man swimming: medium-dark skin tone
+1F3CA 1F3FE 200D 2642                      ; minimally-qualified # 🏊🏾‍♂ man swimming: medium-dark skin tone
+1F3CA 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🏊🏿‍♂️ man swimming: dark skin tone
+1F3CA 1F3FF 200D 2642                      ; minimally-qualified # 🏊🏿‍♂ man swimming: dark skin tone
+1F3CA 200D 2640 FE0F                       ; fully-qualified     # 🏊‍♀️ woman swimming
+1F3CA 200D 2640                            ; minimally-qualified # 🏊‍♀ woman swimming
+1F3CA 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🏊🏻‍♀️ woman swimming: light skin tone
+1F3CA 1F3FB 200D 2640                      ; minimally-qualified # 🏊🏻‍♀ woman swimming: light skin tone
+1F3CA 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🏊🏼‍♀️ woman swimming: medium-light skin tone
+1F3CA 1F3FC 200D 2640                      ; minimally-qualified # 🏊🏼‍♀ woman swimming: medium-light skin tone
+1F3CA 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🏊🏽‍♀️ woman swimming: medium skin tone
+1F3CA 1F3FD 200D 2640                      ; minimally-qualified # 🏊🏽‍♀ woman swimming: medium skin tone
+1F3CA 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🏊🏾‍♀️ woman swimming: medium-dark skin tone
+1F3CA 1F3FE 200D 2640                      ; minimally-qualified # 🏊🏾‍♀ woman swimming: medium-dark skin tone
+1F3CA 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🏊🏿‍♀️ woman swimming: dark skin tone
+1F3CA 1F3FF 200D 2640                      ; minimally-qualified # 🏊🏿‍♀ woman swimming: dark skin tone
+26F9 FE0F                                  ; fully-qualified     # ⛹️ person bouncing ball
+26F9                                       ; unqualified         # ⛹ person bouncing ball
+26F9 1F3FB                                 ; fully-qualified     # ⛹🏻 person bouncing ball: light skin tone
+26F9 1F3FC                                 ; fully-qualified     # ⛹🏼 person bouncing ball: medium-light skin tone
+26F9 1F3FD                                 ; fully-qualified     # ⛹🏽 person bouncing ball: medium skin tone
+26F9 1F3FE                                 ; fully-qualified     # ⛹🏾 person bouncing ball: medium-dark skin tone
+26F9 1F3FF                                 ; fully-qualified     # ⛹🏿 person bouncing ball: dark skin tone
+26F9 FE0F 200D 2642 FE0F                   ; fully-qualified     # ⛹️‍♂️ man bouncing ball
+26F9 200D 2642 FE0F                        ; unqualified         # ⛹‍♂️ man bouncing ball
+26F9 FE0F 200D 2642                        ; unqualified         # ⛹️‍♂ man bouncing ball
+26F9 200D 2642                             ; unqualified         # ⛹‍♂ man bouncing ball
+26F9 1F3FB 200D 2642 FE0F                  ; fully-qualified     # ⛹🏻‍♂️ man bouncing ball: light skin tone
+26F9 1F3FB 200D 2642                       ; minimally-qualified # ⛹🏻‍♂ man bouncing ball: light skin tone
+26F9 1F3FC 200D 2642 FE0F                  ; fully-qualified     # ⛹🏼‍♂️ man bouncing ball: medium-light skin tone
+26F9 1F3FC 200D 2642                       ; minimally-qualified # ⛹🏼‍♂ man bouncing ball: medium-light skin tone
+26F9 1F3FD 200D 2642 FE0F                  ; fully-qualified     # ⛹🏽‍♂️ man bouncing ball: medium skin tone
+26F9 1F3FD 200D 2642                       ; minimally-qualified # ⛹🏽‍♂ man bouncing ball: medium skin tone
+26F9 1F3FE 200D 2642 FE0F                  ; fully-qualified     # ⛹🏾‍♂️ man bouncing ball: medium-dark skin tone
+26F9 1F3FE 200D 2642                       ; minimally-qualified # ⛹🏾‍♂ man bouncing ball: medium-dark skin tone
+26F9 1F3FF 200D 2642 FE0F                  ; fully-qualified     # ⛹🏿‍♂️ man bouncing ball: dark skin tone
+26F9 1F3FF 200D 2642                       ; minimally-qualified # ⛹🏿‍♂ man bouncing ball: dark skin tone
+26F9 FE0F 200D 2640 FE0F                   ; fully-qualified     # ⛹️‍♀️ woman bouncing ball
+26F9 200D 2640 FE0F                        ; unqualified         # ⛹‍♀️ woman bouncing ball
+26F9 FE0F 200D 2640                        ; unqualified         # ⛹️‍♀ woman bouncing ball
+26F9 200D 2640                             ; unqualified         # ⛹‍♀ woman bouncing ball
+26F9 1F3FB 200D 2640 FE0F                  ; fully-qualified     # ⛹🏻‍♀️ woman bouncing ball: light skin tone
+26F9 1F3FB 200D 2640                       ; minimally-qualified # ⛹🏻‍♀ woman bouncing ball: light skin tone
+26F9 1F3FC 200D 2640 FE0F                  ; fully-qualified     # ⛹🏼‍♀️ woman bouncing ball: medium-light skin tone
+26F9 1F3FC 200D 2640                       ; minimally-qualified # ⛹🏼‍♀ woman bouncing ball: medium-light skin tone
+26F9 1F3FD 200D 2640 FE0F                  ; fully-qualified     # ⛹🏽‍♀️ woman bouncing ball: medium skin tone
+26F9 1F3FD 200D 2640                       ; minimally-qualified # ⛹🏽‍♀ woman bouncing ball: medium skin tone
+26F9 1F3FE 200D 2640 FE0F                  ; fully-qualified     # ⛹🏾‍♀️ woman bouncing ball: medium-dark skin tone
+26F9 1F3FE 200D 2640                       ; minimally-qualified # ⛹🏾‍♀ woman bouncing ball: medium-dark skin tone
+26F9 1F3FF 200D 2640 FE0F                  ; fully-qualified     # ⛹🏿‍♀️ woman bouncing ball: dark skin tone
+26F9 1F3FF 200D 2640                       ; minimally-qualified # ⛹🏿‍♀ woman bouncing ball: dark skin tone
+1F3CB FE0F                                 ; fully-qualified     # 🏋️ person lifting weights
+1F3CB                                      ; unqualified         # 🏋 person lifting weights
+1F3CB 1F3FB                                ; fully-qualified     # 🏋🏻 person lifting weights: light skin tone
+1F3CB 1F3FC                                ; fully-qualified     # 🏋🏼 person lifting weights: medium-light skin tone
+1F3CB 1F3FD                                ; fully-qualified     # 🏋🏽 person lifting weights: medium skin tone
+1F3CB 1F3FE                                ; fully-qualified     # 🏋🏾 person lifting weights: medium-dark skin tone
+1F3CB 1F3FF                                ; fully-qualified     # 🏋🏿 person lifting weights: dark skin tone
+1F3CB FE0F 200D 2642 FE0F                  ; fully-qualified     # 🏋️‍♂️ man lifting weights
+1F3CB 200D 2642 FE0F                       ; unqualified         # 🏋‍♂️ man lifting weights
+1F3CB FE0F 200D 2642                       ; unqualified         # 🏋️‍♂ man lifting weights
+1F3CB 200D 2642                            ; unqualified         # 🏋‍♂ man lifting weights
+1F3CB 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🏋🏻‍♂️ man lifting weights: light skin tone
+1F3CB 1F3FB 200D 2642                      ; minimally-qualified # 🏋🏻‍♂ man lifting weights: light skin tone
+1F3CB 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🏋🏼‍♂️ man lifting weights: medium-light skin tone
+1F3CB 1F3FC 200D 2642                      ; minimally-qualified # 🏋🏼‍♂ man lifting weights: medium-light skin tone
+1F3CB 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🏋🏽‍♂️ man lifting weights: medium skin tone
+1F3CB 1F3FD 200D 2642                      ; minimally-qualified # 🏋🏽‍♂ man lifting weights: medium skin tone
+1F3CB 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🏋🏾‍♂️ man lifting weights: medium-dark skin tone
+1F3CB 1F3FE 200D 2642                      ; minimally-qualified # 🏋🏾‍♂ man lifting weights: medium-dark skin tone
+1F3CB 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🏋🏿‍♂️ man lifting weights: dark skin tone
+1F3CB 1F3FF 200D 2642                      ; minimally-qualified # 🏋🏿‍♂ man lifting weights: dark skin tone
+1F3CB FE0F 200D 2640 FE0F                  ; fully-qualified     # 🏋️‍♀️ woman lifting weights
+1F3CB 200D 2640 FE0F                       ; unqualified         # 🏋‍♀️ woman lifting weights
+1F3CB FE0F 200D 2640                       ; unqualified         # 🏋️‍♀ woman lifting weights
+1F3CB 200D 2640                            ; unqualified         # 🏋‍♀ woman lifting weights
+1F3CB 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🏋🏻‍♀️ woman lifting weights: light skin tone
+1F3CB 1F3FB 200D 2640                      ; minimally-qualified # 🏋🏻‍♀ woman lifting weights: light skin tone
+1F3CB 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🏋🏼‍♀️ woman lifting weights: medium-light skin tone
+1F3CB 1F3FC 200D 2640                      ; minimally-qualified # 🏋🏼‍♀ woman lifting weights: medium-light skin tone
+1F3CB 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🏋🏽‍♀️ woman lifting weights: medium skin tone
+1F3CB 1F3FD 200D 2640                      ; minimally-qualified # 🏋🏽‍♀ woman lifting weights: medium skin tone
+1F3CB 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🏋🏾‍♀️ woman lifting weights: medium-dark skin tone
+1F3CB 1F3FE 200D 2640                      ; minimally-qualified # 🏋🏾‍♀ woman lifting weights: medium-dark skin tone
+1F3CB 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🏋🏿‍♀️ woman lifting weights: dark skin tone
+1F3CB 1F3FF 200D 2640                      ; minimally-qualified # 🏋🏿‍♀ woman lifting weights: dark skin tone
+1F6B4                                      ; fully-qualified     # 🚴 person biking
+1F6B4 1F3FB                                ; fully-qualified     # 🚴🏻 person biking: light skin tone
+1F6B4 1F3FC                                ; fully-qualified     # 🚴🏼 person biking: medium-light skin tone
+1F6B4 1F3FD                                ; fully-qualified     # 🚴🏽 person biking: medium skin tone
+1F6B4 1F3FE                                ; fully-qualified     # 🚴🏾 person biking: medium-dark skin tone
+1F6B4 1F3FF                                ; fully-qualified     # 🚴🏿 person biking: dark skin tone
+1F6B4 200D 2642 FE0F                       ; fully-qualified     # 🚴‍♂️ man biking
+1F6B4 200D 2642                            ; minimally-qualified # 🚴‍♂ man biking
+1F6B4 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🚴🏻‍♂️ man biking: light skin tone
+1F6B4 1F3FB 200D 2642                      ; minimally-qualified # 🚴🏻‍♂ man biking: light skin tone
+1F6B4 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🚴🏼‍♂️ man biking: medium-light skin tone
+1F6B4 1F3FC 200D 2642                      ; minimally-qualified # 🚴🏼‍♂ man biking: medium-light skin tone
+1F6B4 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🚴🏽‍♂️ man biking: medium skin tone
+1F6B4 1F3FD 200D 2642                      ; minimally-qualified # 🚴🏽‍♂ man biking: medium skin tone
+1F6B4 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🚴🏾‍♂️ man biking: medium-dark skin tone
+1F6B4 1F3FE 200D 2642                      ; minimally-qualified # 🚴🏾‍♂ man biking: medium-dark skin tone
+1F6B4 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🚴🏿‍♂️ man biking: dark skin tone
+1F6B4 1F3FF 200D 2642                      ; minimally-qualified # 🚴🏿‍♂ man biking: dark skin tone
+1F6B4 200D 2640 FE0F                       ; fully-qualified     # 🚴‍♀️ woman biking
+1F6B4 200D 2640                            ; minimally-qualified # 🚴‍♀ woman biking
+1F6B4 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🚴🏻‍♀️ woman biking: light skin tone
+1F6B4 1F3FB 200D 2640                      ; minimally-qualified # 🚴🏻‍♀ woman biking: light skin tone
+1F6B4 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🚴🏼‍♀️ woman biking: medium-light skin tone
+1F6B4 1F3FC 200D 2640                      ; minimally-qualified # 🚴🏼‍♀ woman biking: medium-light skin tone
+1F6B4 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🚴🏽‍♀️ woman biking: medium skin tone
+1F6B4 1F3FD 200D 2640                      ; minimally-qualified # 🚴🏽‍♀ woman biking: medium skin tone
+1F6B4 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🚴🏾‍♀️ woman biking: medium-dark skin tone
+1F6B4 1F3FE 200D 2640                      ; minimally-qualified # 🚴🏾‍♀ woman biking: medium-dark skin tone
+1F6B4 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🚴🏿‍♀️ woman biking: dark skin tone
+1F6B4 1F3FF 200D 2640                      ; minimally-qualified # 🚴🏿‍♀ woman biking: dark skin tone
+1F6B5                                      ; fully-qualified     # 🚵 person mountain biking
+1F6B5 1F3FB                                ; fully-qualified     # 🚵🏻 person mountain biking: light skin tone
+1F6B5 1F3FC                                ; fully-qualified     # 🚵🏼 person mountain biking: medium-light skin tone
+1F6B5 1F3FD                                ; fully-qualified     # 🚵🏽 person mountain biking: medium skin tone
+1F6B5 1F3FE                                ; fully-qualified     # 🚵🏾 person mountain biking: medium-dark skin tone
+1F6B5 1F3FF                                ; fully-qualified     # 🚵🏿 person mountain biking: dark skin tone
+1F6B5 200D 2642 FE0F                       ; fully-qualified     # 🚵‍♂️ man mountain biking
+1F6B5 200D 2642                            ; minimally-qualified # 🚵‍♂ man mountain biking
+1F6B5 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🚵🏻‍♂️ man mountain biking: light skin tone
+1F6B5 1F3FB 200D 2642                      ; minimally-qualified # 🚵🏻‍♂ man mountain biking: light skin tone
+1F6B5 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🚵🏼‍♂️ man mountain biking: medium-light skin tone
+1F6B5 1F3FC 200D 2642                      ; minimally-qualified # 🚵🏼‍♂ man mountain biking: medium-light skin tone
+1F6B5 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🚵🏽‍♂️ man mountain biking: medium skin tone
+1F6B5 1F3FD 200D 2642                      ; minimally-qualified # 🚵🏽‍♂ man mountain biking: medium skin tone
+1F6B5 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🚵🏾‍♂️ man mountain biking: medium-dark skin tone
+1F6B5 1F3FE 200D 2642                      ; minimally-qualified # 🚵🏾‍♂ man mountain biking: medium-dark skin tone
+1F6B5 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🚵🏿‍♂️ man mountain biking: dark skin tone
+1F6B5 1F3FF 200D 2642                      ; minimally-qualified # 🚵🏿‍♂ man mountain biking: dark skin tone
+1F6B5 200D 2640 FE0F                       ; fully-qualified     # 🚵‍♀️ woman mountain biking
+1F6B5 200D 2640                            ; minimally-qualified # 🚵‍♀ woman mountain biking
+1F6B5 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🚵🏻‍♀️ woman mountain biking: light skin tone
+1F6B5 1F3FB 200D 2640                      ; minimally-qualified # 🚵🏻‍♀ woman mountain biking: light skin tone
+1F6B5 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🚵🏼‍♀️ woman mountain biking: medium-light skin tone
+1F6B5 1F3FC 200D 2640                      ; minimally-qualified # 🚵🏼‍♀ woman mountain biking: medium-light skin tone
+1F6B5 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🚵🏽‍♀️ woman mountain biking: medium skin tone
+1F6B5 1F3FD 200D 2640                      ; minimally-qualified # 🚵🏽‍♀ woman mountain biking: medium skin tone
+1F6B5 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🚵🏾‍♀️ woman mountain biking: medium-dark skin tone
+1F6B5 1F3FE 200D 2640                      ; minimally-qualified # 🚵🏾‍♀ woman mountain biking: medium-dark skin tone
+1F6B5 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🚵🏿‍♀️ woman mountain biking: dark skin tone
+1F6B5 1F3FF 200D 2640                      ; minimally-qualified # 🚵🏿‍♀ woman mountain biking: dark skin tone
+1F938                                      ; fully-qualified     # 🤸 person cartwheeling
+1F938 1F3FB                                ; fully-qualified     # 🤸🏻 person cartwheeling: light skin tone
+1F938 1F3FC                                ; fully-qualified     # 🤸🏼 person cartwheeling: medium-light skin tone
+1F938 1F3FD                                ; fully-qualified     # 🤸🏽 person cartwheeling: medium skin tone
+1F938 1F3FE                                ; fully-qualified     # 🤸🏾 person cartwheeling: medium-dark skin tone
+1F938 1F3FF                                ; fully-qualified     # 🤸🏿 person cartwheeling: dark skin tone
+1F938 200D 2642 FE0F                       ; fully-qualified     # 🤸‍♂️ man cartwheeling
+1F938 200D 2642                            ; minimally-qualified # 🤸‍♂ man cartwheeling
+1F938 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤸🏻‍♂️ man cartwheeling: light skin tone
+1F938 1F3FB 200D 2642                      ; minimally-qualified # 🤸🏻‍♂ man cartwheeling: light skin tone
+1F938 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤸🏼‍♂️ man cartwheeling: medium-light skin tone
+1F938 1F3FC 200D 2642                      ; minimally-qualified # 🤸🏼‍♂ man cartwheeling: medium-light skin tone
+1F938 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤸🏽‍♂️ man cartwheeling: medium skin tone
+1F938 1F3FD 200D 2642                      ; minimally-qualified # 🤸🏽‍♂ man cartwheeling: medium skin tone
+1F938 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤸🏾‍♂️ man cartwheeling: medium-dark skin tone
+1F938 1F3FE 200D 2642                      ; minimally-qualified # 🤸🏾‍♂ man cartwheeling: medium-dark skin tone
+1F938 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤸🏿‍♂️ man cartwheeling: dark skin tone
+1F938 1F3FF 200D 2642                      ; minimally-qualified # 🤸🏿‍♂ man cartwheeling: dark skin tone
+1F938 200D 2640 FE0F                       ; fully-qualified     # 🤸‍♀️ woman cartwheeling
+1F938 200D 2640                            ; minimally-qualified # 🤸‍♀ woman cartwheeling
+1F938 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤸🏻‍♀️ woman cartwheeling: light skin tone
+1F938 1F3FB 200D 2640                      ; minimally-qualified # 🤸🏻‍♀ woman cartwheeling: light skin tone
+1F938 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤸🏼‍♀️ woman cartwheeling: medium-light skin tone
+1F938 1F3FC 200D 2640                      ; minimally-qualified # 🤸🏼‍♀ woman cartwheeling: medium-light skin tone
+1F938 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤸🏽‍♀️ woman cartwheeling: medium skin tone
+1F938 1F3FD 200D 2640                      ; minimally-qualified # 🤸🏽‍♀ woman cartwheeling: medium skin tone
+1F938 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤸🏾‍♀️ woman cartwheeling: medium-dark skin tone
+1F938 1F3FE 200D 2640                      ; minimally-qualified # 🤸🏾‍♀ woman cartwheeling: medium-dark skin tone
+1F938 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤸🏿‍♀️ woman cartwheeling: dark skin tone
+1F938 1F3FF 200D 2640                      ; minimally-qualified # 🤸🏿‍♀ woman cartwheeling: dark skin tone
+1F93C                                      ; fully-qualified     # 🤼 people wrestling
+1F93C 200D 2642 FE0F                       ; fully-qualified     # 🤼‍♂️ men wrestling
+1F93C 200D 2642                            ; minimally-qualified # 🤼‍♂ men wrestling
+1F93C 200D 2640 FE0F                       ; fully-qualified     # 🤼‍♀️ women wrestling
+1F93C 200D 2640                            ; minimally-qualified # 🤼‍♀ women wrestling
+1F93D                                      ; fully-qualified     # 🤽 person playing water polo
+1F93D 1F3FB                                ; fully-qualified     # 🤽🏻 person playing water polo: light skin tone
+1F93D 1F3FC                                ; fully-qualified     # 🤽🏼 person playing water polo: medium-light skin tone
+1F93D 1F3FD                                ; fully-qualified     # 🤽🏽 person playing water polo: medium skin tone
+1F93D 1F3FE                                ; fully-qualified     # 🤽🏾 person playing water polo: medium-dark skin tone
+1F93D 1F3FF                                ; fully-qualified     # 🤽🏿 person playing water polo: dark skin tone
+1F93D 200D 2642 FE0F                       ; fully-qualified     # 🤽‍♂️ man playing water polo
+1F93D 200D 2642                            ; minimally-qualified # 🤽‍♂ man playing water polo
+1F93D 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤽🏻‍♂️ man playing water polo: light skin tone
+1F93D 1F3FB 200D 2642                      ; minimally-qualified # 🤽🏻‍♂ man playing water polo: light skin tone
+1F93D 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤽🏼‍♂️ man playing water polo: medium-light skin tone
+1F93D 1F3FC 200D 2642                      ; minimally-qualified # 🤽🏼‍♂ man playing water polo: medium-light skin tone
+1F93D 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤽🏽‍♂️ man playing water polo: medium skin tone
+1F93D 1F3FD 200D 2642                      ; minimally-qualified # 🤽🏽‍♂ man playing water polo: medium skin tone
+1F93D 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤽🏾‍♂️ man playing water polo: medium-dark skin tone
+1F93D 1F3FE 200D 2642                      ; minimally-qualified # 🤽🏾‍♂ man playing water polo: medium-dark skin tone
+1F93D 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤽🏿‍♂️ man playing water polo: dark skin tone
+1F93D 1F3FF 200D 2642                      ; minimally-qualified # 🤽🏿‍♂ man playing water polo: dark skin tone
+1F93D 200D 2640 FE0F                       ; fully-qualified     # 🤽‍♀️ woman playing water polo
+1F93D 200D 2640                            ; minimally-qualified # 🤽‍♀ woman playing water polo
+1F93D 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤽🏻‍♀️ woman playing water polo: light skin tone
+1F93D 1F3FB 200D 2640                      ; minimally-qualified # 🤽🏻‍♀ woman playing water polo: light skin tone
+1F93D 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤽🏼‍♀️ woman playing water polo: medium-light skin tone
+1F93D 1F3FC 200D 2640                      ; minimally-qualified # 🤽🏼‍♀ woman playing water polo: medium-light skin tone
+1F93D 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤽🏽‍♀️ woman playing water polo: medium skin tone
+1F93D 1F3FD 200D 2640                      ; minimally-qualified # 🤽🏽‍♀ woman playing water polo: medium skin tone
+1F93D 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤽🏾‍♀️ woman playing water polo: medium-dark skin tone
+1F93D 1F3FE 200D 2640                      ; minimally-qualified # 🤽🏾‍♀ woman playing water polo: medium-dark skin tone
+1F93D 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤽🏿‍♀️ woman playing water polo: dark skin tone
+1F93D 1F3FF 200D 2640                      ; minimally-qualified # 🤽🏿‍♀ woman playing water polo: dark skin tone
+1F93E                                      ; fully-qualified     # 🤾 person playing handball
+1F93E 1F3FB                                ; fully-qualified     # 🤾🏻 person playing handball: light skin tone
+1F93E 1F3FC                                ; fully-qualified     # 🤾🏼 person playing handball: medium-light skin tone
+1F93E 1F3FD                                ; fully-qualified     # 🤾🏽 person playing handball: medium skin tone
+1F93E 1F3FE                                ; fully-qualified     # 🤾🏾 person playing handball: medium-dark skin tone
+1F93E 1F3FF                                ; fully-qualified     # 🤾🏿 person playing handball: dark skin tone
+1F93E 200D 2642 FE0F                       ; fully-qualified     # 🤾‍♂️ man playing handball
+1F93E 200D 2642                            ; minimally-qualified # 🤾‍♂ man playing handball
+1F93E 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤾🏻‍♂️ man playing handball: light skin tone
+1F93E 1F3FB 200D 2642                      ; minimally-qualified # 🤾🏻‍♂ man playing handball: light skin tone
+1F93E 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤾🏼‍♂️ man playing handball: medium-light skin tone
+1F93E 1F3FC 200D 2642                      ; minimally-qualified # 🤾🏼‍♂ man playing handball: medium-light skin tone
+1F93E 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤾🏽‍♂️ man playing handball: medium skin tone
+1F93E 1F3FD 200D 2642                      ; minimally-qualified # 🤾🏽‍♂ man playing handball: medium skin tone
+1F93E 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤾🏾‍♂️ man playing handball: medium-dark skin tone
+1F93E 1F3FE 200D 2642                      ; minimally-qualified # 🤾🏾‍♂ man playing handball: medium-dark skin tone
+1F93E 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤾🏿‍♂️ man playing handball: dark skin tone
+1F93E 1F3FF 200D 2642                      ; minimally-qualified # 🤾🏿‍♂ man playing handball: dark skin tone
+1F93E 200D 2640 FE0F                       ; fully-qualified     # 🤾‍♀️ woman playing handball
+1F93E 200D 2640                            ; minimally-qualified # 🤾‍♀ woman playing handball
+1F93E 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤾🏻‍♀️ woman playing handball: light skin tone
+1F93E 1F3FB 200D 2640                      ; minimally-qualified # 🤾🏻‍♀ woman playing handball: light skin tone
+1F93E 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤾🏼‍♀️ woman playing handball: medium-light skin tone
+1F93E 1F3FC 200D 2640                      ; minimally-qualified # 🤾🏼‍♀ woman playing handball: medium-light skin tone
+1F93E 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤾🏽‍♀️ woman playing handball: medium skin tone
+1F93E 1F3FD 200D 2640                      ; minimally-qualified # 🤾🏽‍♀ woman playing handball: medium skin tone
+1F93E 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤾🏾‍♀️ woman playing handball: medium-dark skin tone
+1F93E 1F3FE 200D 2640                      ; minimally-qualified # 🤾🏾‍♀ woman playing handball: medium-dark skin tone
+1F93E 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤾🏿‍♀️ woman playing handball: dark skin tone
+1F93E 1F3FF 200D 2640                      ; minimally-qualified # 🤾🏿‍♀ woman playing handball: dark skin tone
+1F939                                      ; fully-qualified     # 🤹 person juggling
+1F939 1F3FB                                ; fully-qualified     # 🤹🏻 person juggling: light skin tone
+1F939 1F3FC                                ; fully-qualified     # 🤹🏼 person juggling: medium-light skin tone
+1F939 1F3FD                                ; fully-qualified     # 🤹🏽 person juggling: medium skin tone
+1F939 1F3FE                                ; fully-qualified     # 🤹🏾 person juggling: medium-dark skin tone
+1F939 1F3FF                                ; fully-qualified     # 🤹🏿 person juggling: dark skin tone
+1F939 200D 2642 FE0F                       ; fully-qualified     # 🤹‍♂️ man juggling
+1F939 200D 2642                            ; minimally-qualified # 🤹‍♂ man juggling
+1F939 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤹🏻‍♂️ man juggling: light skin tone
+1F939 1F3FB 200D 2642                      ; minimally-qualified # 🤹🏻‍♂ man juggling: light skin tone
+1F939 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤹🏼‍♂️ man juggling: medium-light skin tone
+1F939 1F3FC 200D 2642                      ; minimally-qualified # 🤹🏼‍♂ man juggling: medium-light skin tone
+1F939 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤹🏽‍♂️ man juggling: medium skin tone
+1F939 1F3FD 200D 2642                      ; minimally-qualified # 🤹🏽‍♂ man juggling: medium skin tone
+1F939 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤹🏾‍♂️ man juggling: medium-dark skin tone
+1F939 1F3FE 200D 2642                      ; minimally-qualified # 🤹🏾‍♂ man juggling: medium-dark skin tone
+1F939 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤹🏿‍♂️ man juggling: dark skin tone
+1F939 1F3FF 200D 2642                      ; minimally-qualified # 🤹🏿‍♂ man juggling: dark skin tone
+1F939 200D 2640 FE0F                       ; fully-qualified     # 🤹‍♀️ woman juggling
+1F939 200D 2640                            ; minimally-qualified # 🤹‍♀ woman juggling
+1F939 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤹🏻‍♀️ woman juggling: light skin tone
+1F939 1F3FB 200D 2640                      ; minimally-qualified # 🤹🏻‍♀ woman juggling: light skin tone
+1F939 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤹🏼‍♀️ woman juggling: medium-light skin tone
+1F939 1F3FC 200D 2640                      ; minimally-qualified # 🤹🏼‍♀ woman juggling: medium-light skin tone
+1F939 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤹🏽‍♀️ woman juggling: medium skin tone
+1F939 1F3FD 200D 2640                      ; minimally-qualified # 🤹🏽‍♀ woman juggling: medium skin tone
+1F939 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤹🏾‍♀️ woman juggling: medium-dark skin tone
+1F939 1F3FE 200D 2640                      ; minimally-qualified # 🤹🏾‍♀ woman juggling: medium-dark skin tone
+1F939 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤹🏿‍♀️ woman juggling: dark skin tone
+1F939 1F3FF 200D 2640                      ; minimally-qualified # 🤹🏿‍♀ woman juggling: dark skin tone
+
+# subgroup: person-resting
+1F9D8                                      ; fully-qualified     # 🧘 person in lotus position
+1F9D8 1F3FB                                ; fully-qualified     # 🧘🏻 person in lotus position: light skin tone
+1F9D8 1F3FC                                ; fully-qualified     # 🧘🏼 person in lotus position: medium-light skin tone
+1F9D8 1F3FD                                ; fully-qualified     # 🧘🏽 person in lotus position: medium skin tone
+1F9D8 1F3FE                                ; fully-qualified     # 🧘🏾 person in lotus position: medium-dark skin tone
+1F9D8 1F3FF                                ; fully-qualified     # 🧘🏿 person in lotus position: dark skin tone
+1F9D8 200D 2642 FE0F                       ; fully-qualified     # 🧘‍♂️ man in lotus position
+1F9D8 200D 2642                            ; minimally-qualified # 🧘‍♂ man in lotus position
+1F9D8 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧘🏻‍♂️ man in lotus position: light skin tone
+1F9D8 1F3FB 200D 2642                      ; minimally-qualified # 🧘🏻‍♂ man in lotus position: light skin tone
+1F9D8 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧘🏼‍♂️ man in lotus position: medium-light skin tone
+1F9D8 1F3FC 200D 2642                      ; minimally-qualified # 🧘🏼‍♂ man in lotus position: medium-light skin tone
+1F9D8 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧘🏽‍♂️ man in lotus position: medium skin tone
+1F9D8 1F3FD 200D 2642                      ; minimally-qualified # 🧘🏽‍♂ man in lotus position: medium skin tone
+1F9D8 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧘🏾‍♂️ man in lotus position: medium-dark skin tone
+1F9D8 1F3FE 200D 2642                      ; minimally-qualified # 🧘🏾‍♂ man in lotus position: medium-dark skin tone
+1F9D8 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧘🏿‍♂️ man in lotus position: dark skin tone
+1F9D8 1F3FF 200D 2642                      ; minimally-qualified # 🧘🏿‍♂ man in lotus position: dark skin tone
+1F9D8 200D 2640 FE0F                       ; fully-qualified     # 🧘‍♀️ woman in lotus position
+1F9D8 200D 2640                            ; minimally-qualified # 🧘‍♀ woman in lotus position
+1F9D8 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧘🏻‍♀️ woman in lotus position: light skin tone
+1F9D8 1F3FB 200D 2640                      ; minimally-qualified # 🧘🏻‍♀ woman in lotus position: light skin tone
+1F9D8 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧘🏼‍♀️ woman in lotus position: medium-light skin tone
+1F9D8 1F3FC 200D 2640                      ; minimally-qualified # 🧘🏼‍♀ woman in lotus position: medium-light skin tone
+1F9D8 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧘🏽‍♀️ woman in lotus position: medium skin tone
+1F9D8 1F3FD 200D 2640                      ; minimally-qualified # 🧘🏽‍♀ woman in lotus position: medium skin tone
+1F9D8 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧘🏾‍♀️ woman in lotus position: medium-dark skin tone
+1F9D8 1F3FE 200D 2640                      ; minimally-qualified # 🧘🏾‍♀ woman in lotus position: medium-dark skin tone
+1F9D8 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧘🏿‍♀️ woman in lotus position: dark skin tone
+1F9D8 1F3FF 200D 2640                      ; minimally-qualified # 🧘🏿‍♀ woman in lotus position: dark skin tone
+1F6C0                                      ; fully-qualified     # 🛀 person taking bath
+1F6C0 1F3FB                                ; fully-qualified     # 🛀🏻 person taking bath: light skin tone
+1F6C0 1F3FC                                ; fully-qualified     # 🛀🏼 person taking bath: medium-light skin tone
+1F6C0 1F3FD                                ; fully-qualified     # 🛀🏽 person taking bath: medium skin tone
+1F6C0 1F3FE                                ; fully-qualified     # 🛀🏾 person taking bath: medium-dark skin tone
+1F6C0 1F3FF                                ; fully-qualified     # 🛀🏿 person taking bath: dark skin tone
+1F6CC                                      ; fully-qualified     # 🛌 person in bed
+1F6CC 1F3FB                                ; fully-qualified     # 🛌🏻 person in bed: light skin tone
+1F6CC 1F3FC                                ; fully-qualified     # 🛌🏼 person in bed: medium-light skin tone
+1F6CC 1F3FD                                ; fully-qualified     # 🛌🏽 person in bed: medium skin tone
+1F6CC 1F3FE                                ; fully-qualified     # 🛌🏾 person in bed: medium-dark skin tone
+1F6CC 1F3FF                                ; fully-qualified     # 🛌🏿 person in bed: dark skin tone
+
+# subgroup: family
+1F9D1 200D 1F91D 200D 1F9D1                ; fully-qualified     # 🧑‍🤝‍🧑 people holding hands
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FB    ; fully-qualified     # 🧑🏻‍🤝‍🧑🏻 people holding hands: light skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FB    ; fully-qualified     # 🧑🏼‍🤝‍🧑🏻 people holding hands: medium-light skin tone, light skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FC    ; fully-qualified     # 🧑🏼‍🤝‍🧑🏼 people holding hands: medium-light skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FB    ; fully-qualified     # 🧑🏽‍🤝‍🧑🏻 people holding hands: medium skin tone, light skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FC    ; fully-qualified     # 🧑🏽‍🤝‍🧑🏼 people holding hands: medium skin tone, medium-light skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FD    ; fully-qualified     # 🧑🏽‍🤝‍🧑🏽 people holding hands: medium skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FB    ; fully-qualified     # 🧑🏾‍🤝‍🧑🏻 people holding hands: medium-dark skin tone, light skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FC    ; fully-qualified     # 🧑🏾‍🤝‍🧑🏼 people holding hands: medium-dark skin tone, medium-light skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FD    ; fully-qualified     # 🧑🏾‍🤝‍🧑🏽 people holding hands: medium-dark skin tone, medium skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FE    ; fully-qualified     # 🧑🏾‍🤝‍🧑🏾 people holding hands: medium-dark skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FB    ; fully-qualified     # 🧑🏿‍🤝‍🧑🏻 people holding hands: dark skin tone, light skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FC    ; fully-qualified     # 🧑🏿‍🤝‍🧑🏼 people holding hands: dark skin tone, medium-light skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FD    ; fully-qualified     # 🧑🏿‍🤝‍🧑🏽 people holding hands: dark skin tone, medium skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FE    ; fully-qualified     # 🧑🏿‍🤝‍🧑🏾 people holding hands: dark skin tone, medium-dark skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FF    ; fully-qualified     # 🧑🏿‍🤝‍🧑🏿 people holding hands: dark skin tone
+1F46D                                      ; fully-qualified     # 👭 women holding hands
+1F46D 1F3FB                                ; fully-qualified     # 👭🏻 women holding hands: light skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FB    ; fully-qualified     # 👩🏼‍🤝‍👩🏻 women holding hands: medium-light skin tone, light skin tone
+1F46D 1F3FC                                ; fully-qualified     # 👭🏼 women holding hands: medium-light skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FB    ; fully-qualified     # 👩🏽‍🤝‍👩🏻 women holding hands: medium skin tone, light skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FC    ; fully-qualified     # 👩🏽‍🤝‍👩🏼 women holding hands: medium skin tone, medium-light skin tone
+1F46D 1F3FD                                ; fully-qualified     # 👭🏽 women holding hands: medium skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FB    ; fully-qualified     # 👩🏾‍🤝‍👩🏻 women holding hands: medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FC    ; fully-qualified     # 👩🏾‍🤝‍👩🏼 women holding hands: medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FD    ; fully-qualified     # 👩🏾‍🤝‍👩🏽 women holding hands: medium-dark skin tone, medium skin tone
+1F46D 1F3FE                                ; fully-qualified     # 👭🏾 women holding hands: medium-dark skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FB    ; fully-qualified     # 👩🏿‍🤝‍👩🏻 women holding hands: dark skin tone, light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FC    ; fully-qualified     # 👩🏿‍🤝‍👩🏼 women holding hands: dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FD    ; fully-qualified     # 👩🏿‍🤝‍👩🏽 women holding hands: dark skin tone, medium skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FE    ; fully-qualified     # 👩🏿‍🤝‍👩🏾 women holding hands: dark skin tone, medium-dark skin tone
+1F46D 1F3FF                                ; fully-qualified     # 👭🏿 women holding hands: dark skin tone
+1F46B                                      ; fully-qualified     # 👫 woman and man holding hands
+1F46B 1F3FB                                ; fully-qualified     # 👫🏻 woman and man holding hands: light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👩🏻‍🤝‍👨🏼 woman and man holding hands: light skin tone, medium-light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👩🏻‍🤝‍👨🏽 woman and man holding hands: light skin tone, medium skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FE    ; fully-qualified     # 👩🏻‍🤝‍👨🏾 woman and man holding hands: light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FF    ; fully-qualified     # 👩🏻‍🤝‍👨🏿 woman and man holding hands: light skin tone, dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👩🏼‍🤝‍👨🏻 woman and man holding hands: medium-light skin tone, light skin tone
+1F46B 1F3FC                                ; fully-qualified     # 👫🏼 woman and man holding hands: medium-light skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👩🏼‍🤝‍👨🏽 woman and man holding hands: medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FE    ; fully-qualified     # 👩🏼‍🤝‍👨🏾 woman and man holding hands: medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FF    ; fully-qualified     # 👩🏼‍🤝‍👨🏿 woman and man holding hands: medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👩🏽‍🤝‍👨🏻 woman and man holding hands: medium skin tone, light skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👩🏽‍🤝‍👨🏼 woman and man holding hands: medium skin tone, medium-light skin tone
+1F46B 1F3FD                                ; fully-qualified     # 👫🏽 woman and man holding hands: medium skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FE    ; fully-qualified     # 👩🏽‍🤝‍👨🏾 woman and man holding hands: medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FF    ; fully-qualified     # 👩🏽‍🤝‍👨🏿 woman and man holding hands: medium skin tone, dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👩🏾‍🤝‍👨🏻 woman and man holding hands: medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👩🏾‍🤝‍👨🏼 woman and man holding hands: medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👩🏾‍🤝‍👨🏽 woman and man holding hands: medium-dark skin tone, medium skin tone
+1F46B 1F3FE                                ; fully-qualified     # 👫🏾 woman and man holding hands: medium-dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FF    ; fully-qualified     # 👩🏾‍🤝‍👨🏿 woman and man holding hands: medium-dark skin tone, dark skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👩🏿‍🤝‍👨🏻 woman and man holding hands: dark skin tone, light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👩🏿‍🤝‍👨🏼 woman and man holding hands: dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👩🏿‍🤝‍👨🏽 woman and man holding hands: dark skin tone, medium skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FE    ; fully-qualified     # 👩🏿‍🤝‍👨🏾 woman and man holding hands: dark skin tone, medium-dark skin tone
+1F46B 1F3FF                                ; fully-qualified     # 👫🏿 woman and man holding hands: dark skin tone
+1F46C                                      ; fully-qualified     # 👬 men holding hands
+1F46C 1F3FB                                ; fully-qualified     # 👬🏻 men holding hands: light skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👨🏼‍🤝‍👨🏻 men holding hands: medium-light skin tone, light skin tone
+1F46C 1F3FC                                ; fully-qualified     # 👬🏼 men holding hands: medium-light skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👨🏽‍🤝‍👨🏻 men holding hands: medium skin tone, light skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👨🏽‍🤝‍👨🏼 men holding hands: medium skin tone, medium-light skin tone
+1F46C 1F3FD                                ; fully-qualified     # 👬🏽 men holding hands: medium skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👨🏾‍🤝‍👨🏻 men holding hands: medium-dark skin tone, light skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👨🏾‍🤝‍👨🏼 men holding hands: medium-dark skin tone, medium-light skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👨🏾‍🤝‍👨🏽 men holding hands: medium-dark skin tone, medium skin tone
+1F46C 1F3FE                                ; fully-qualified     # 👬🏾 men holding hands: medium-dark skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👨🏿‍🤝‍👨🏻 men holding hands: dark skin tone, light skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👨🏿‍🤝‍👨🏼 men holding hands: dark skin tone, medium-light skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👨🏿‍🤝‍👨🏽 men holding hands: dark skin tone, medium skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FE    ; fully-qualified     # 👨🏿‍🤝‍👨🏾 men holding hands: dark skin tone, medium-dark skin tone
+1F46C 1F3FF                                ; fully-qualified     # 👬🏿 men holding hands: dark skin tone
+1F48F                                      ; fully-qualified     # 💏 kiss
+1F469 200D 2764 FE0F 200D 1F48B 200D 1F468 ; fully-qualified     # 👩‍❤️‍💋‍👨 kiss: woman, man
+1F469 200D 2764 200D 1F48B 200D 1F468      ; minimally-qualified # 👩‍❤‍💋‍👨 kiss: woman, man
+1F468 200D 2764 FE0F 200D 1F48B 200D 1F468 ; fully-qualified     # 👨‍❤️‍💋‍👨 kiss: man, man
+1F468 200D 2764 200D 1F48B 200D 1F468      ; minimally-qualified # 👨‍❤‍💋‍👨 kiss: man, man
+1F469 200D 2764 FE0F 200D 1F48B 200D 1F469 ; fully-qualified     # 👩‍❤️‍💋‍👩 kiss: woman, woman
+1F469 200D 2764 200D 1F48B 200D 1F469      ; minimally-qualified # 👩‍❤‍💋‍👩 kiss: woman, woman
+1F491                                      ; fully-qualified     # 💑 couple with heart
+1F469 200D 2764 FE0F 200D 1F468            ; fully-qualified     # 👩‍❤️‍👨 couple with heart: woman, man
+1F469 200D 2764 200D 1F468                 ; minimally-qualified # 👩‍❤‍👨 couple with heart: woman, man
+1F468 200D 2764 FE0F 200D 1F468            ; fully-qualified     # 👨‍❤️‍👨 couple with heart: man, man
+1F468 200D 2764 200D 1F468                 ; minimally-qualified # 👨‍❤‍👨 couple with heart: man, man
+1F469 200D 2764 FE0F 200D 1F469            ; fully-qualified     # 👩‍❤️‍👩 couple with heart: woman, woman
+1F469 200D 2764 200D 1F469                 ; minimally-qualified # 👩‍❤‍👩 couple with heart: woman, woman
+1F46A                                      ; fully-qualified     # 👪 family
+1F468 200D 1F469 200D 1F466                ; fully-qualified     # 👨‍👩‍👦 family: man, woman, boy
+1F468 200D 1F469 200D 1F467                ; fully-qualified     # 👨‍👩‍👧 family: man, woman, girl
+1F468 200D 1F469 200D 1F467 200D 1F466     ; fully-qualified     # 👨‍👩‍👧‍👦 family: man, woman, girl, boy
+1F468 200D 1F469 200D 1F466 200D 1F466     ; fully-qualified     # 👨‍👩‍👦‍👦 family: man, woman, boy, boy
+1F468 200D 1F469 200D 1F467 200D 1F467     ; fully-qualified     # 👨‍👩‍👧‍👧 family: man, woman, girl, girl
+1F468 200D 1F468 200D 1F466                ; fully-qualified     # 👨‍👨‍👦 family: man, man, boy
+1F468 200D 1F468 200D 1F467                ; fully-qualified     # 👨‍👨‍👧 family: man, man, girl
+1F468 200D 1F468 200D 1F467 200D 1F466     ; fully-qualified     # 👨‍👨‍👧‍👦 family: man, man, girl, boy
+1F468 200D 1F468 200D 1F466 200D 1F466     ; fully-qualified     # 👨‍👨‍👦‍👦 family: man, man, boy, boy
+1F468 200D 1F468 200D 1F467 200D 1F467     ; fully-qualified     # 👨‍👨‍👧‍👧 family: man, man, girl, girl
+1F469 200D 1F469 200D 1F466                ; fully-qualified     # 👩‍👩‍👦 family: woman, woman, boy
+1F469 200D 1F469 200D 1F467                ; fully-qualified     # 👩‍👩‍👧 family: woman, woman, girl
+1F469 200D 1F469 200D 1F467 200D 1F466     ; fully-qualified     # 👩‍👩‍👧‍👦 family: woman, woman, girl, boy
+1F469 200D 1F469 200D 1F466 200D 1F466     ; fully-qualified     # 👩‍👩‍👦‍👦 family: woman, woman, boy, boy
+1F469 200D 1F469 200D 1F467 200D 1F467     ; fully-qualified     # 👩‍👩‍👧‍👧 family: woman, woman, girl, girl
+1F468 200D 1F466                           ; fully-qualified     # 👨‍👦 family: man, boy
+1F468 200D 1F466 200D 1F466                ; fully-qualified     # 👨‍👦‍👦 family: man, boy, boy
+1F468 200D 1F467                           ; fully-qualified     # 👨‍👧 family: man, girl
+1F468 200D 1F467 200D 1F466                ; fully-qualified     # 👨‍👧‍👦 family: man, girl, boy
+1F468 200D 1F467 200D 1F467                ; fully-qualified     # 👨‍👧‍👧 family: man, girl, girl
+1F469 200D 1F466                           ; fully-qualified     # 👩‍👦 family: woman, boy
+1F469 200D 1F466 200D 1F466                ; fully-qualified     # 👩‍👦‍👦 family: woman, boy, boy
+1F469 200D 1F467                           ; fully-qualified     # 👩‍👧 family: woman, girl
+1F469 200D 1F467 200D 1F466                ; fully-qualified     # 👩‍👧‍👦 family: woman, girl, boy
+1F469 200D 1F467 200D 1F467                ; fully-qualified     # 👩‍👧‍👧 family: woman, girl, girl
+
+# subgroup: person-symbol
+1F5E3 FE0F                                 ; fully-qualified     # 🗣️ speaking head
+1F5E3                                      ; unqualified         # 🗣 speaking head
+1F464                                      ; fully-qualified     # 👤 bust in silhouette
+1F465                                      ; fully-qualified     # 👥 busts in silhouette
+1F463                                      ; fully-qualified     # 👣 footprints
+
+# People & Body subtotal:		2212
+# People & Body subtotal:		447	w/o modifiers
+
+# group: Component
+
+# subgroup: skin-tone
+1F3FB                                      ; component           # 🏻 light skin tone
+1F3FC                                      ; component           # 🏼 medium-light skin tone
+1F3FD                                      ; component           # 🏽 medium skin tone
+1F3FE                                      ; component           # 🏾 medium-dark skin tone
+1F3FF                                      ; component           # 🏿 dark skin tone
+
+# subgroup: hair-style
+1F9B0                                      ; component           # 🦰 red hair
+1F9B1                                      ; component           # 🦱 curly hair
+1F9B3                                      ; component           # 🦳 white hair
+1F9B2                                      ; component           # 🦲 bald
+
+# Component subtotal:		9
+# Component subtotal:		4	w/o modifiers
+
+# group: Animals & Nature
+
+# subgroup: animal-mammal
+1F435                                      ; fully-qualified     # 🐵 monkey face
+1F412                                      ; fully-qualified     # 🐒 monkey
+1F98D                                      ; fully-qualified     # 🦍 gorilla
+1F9A7                                      ; fully-qualified     # 🦧 orangutan
+1F436                                      ; fully-qualified     # 🐶 dog face
+1F415                                      ; fully-qualified     # 🐕 dog
+1F9AE                                      ; fully-qualified     # 🦮 guide dog
+1F415 200D 1F9BA                           ; fully-qualified     # 🐕‍🦺 service dog
+1F429                                      ; fully-qualified     # 🐩 poodle
+1F43A                                      ; fully-qualified     # 🐺 wolf
+1F98A                                      ; fully-qualified     # 🦊 fox
+1F99D                                      ; fully-qualified     # 🦝 raccoon
+1F431                                      ; fully-qualified     # 🐱 cat face
+1F408                                      ; fully-qualified     # 🐈 cat
+1F981                                      ; fully-qualified     # 🦁 lion
+1F42F                                      ; fully-qualified     # 🐯 tiger face
+1F405                                      ; fully-qualified     # 🐅 tiger
+1F406                                      ; fully-qualified     # 🐆 leopard
+1F434                                      ; fully-qualified     # 🐴 horse face
+1F40E                                      ; fully-qualified     # 🐎 horse
+1F984                                      ; fully-qualified     # 🦄 unicorn
+1F993                                      ; fully-qualified     # 🦓 zebra
+1F98C                                      ; fully-qualified     # 🦌 deer
+1F42E                                      ; fully-qualified     # 🐮 cow face
+1F402                                      ; fully-qualified     # 🐂 ox
+1F403                                      ; fully-qualified     # 🐃 water buffalo
+1F404                                      ; fully-qualified     # 🐄 cow
+1F437                                      ; fully-qualified     # 🐷 pig face
+1F416                                      ; fully-qualified     # 🐖 pig
+1F417                                      ; fully-qualified     # 🐗 boar
+1F43D                                      ; fully-qualified     # 🐽 pig nose
+1F40F                                      ; fully-qualified     # 🐏 ram
+1F411                                      ; fully-qualified     # 🐑 ewe
+1F410                                      ; fully-qualified     # 🐐 goat
+1F42A                                      ; fully-qualified     # 🐪 camel
+1F42B                                      ; fully-qualified     # 🐫 two-hump camel
+1F999                                      ; fully-qualified     # 🦙 llama
+1F992                                      ; fully-qualified     # 🦒 giraffe
+1F418                                      ; fully-qualified     # 🐘 elephant
+1F98F                                      ; fully-qualified     # 🦏 rhinoceros
+1F99B                                      ; fully-qualified     # 🦛 hippopotamus
+1F42D                                      ; fully-qualified     # 🐭 mouse face
+1F401                                      ; fully-qualified     # 🐁 mouse
+1F400                                      ; fully-qualified     # 🐀 rat
+1F439                                      ; fully-qualified     # 🐹 hamster
+1F430                                      ; fully-qualified     # 🐰 rabbit face
+1F407                                      ; fully-qualified     # 🐇 rabbit
+1F43F FE0F                                 ; fully-qualified     # 🐿️ chipmunk
+1F43F                                      ; unqualified         # 🐿 chipmunk
+1F994                                      ; fully-qualified     # 🦔 hedgehog
+1F987                                      ; fully-qualified     # 🦇 bat
+1F43B                                      ; fully-qualified     # 🐻 bear
+1F428                                      ; fully-qualified     # 🐨 koala
+1F43C                                      ; fully-qualified     # 🐼 panda
+1F9A5                                      ; fully-qualified     # 🦥 sloth
+1F9A6                                      ; fully-qualified     # 🦦 otter
+1F9A8                                      ; fully-qualified     # 🦨 skunk
+1F998                                      ; fully-qualified     # 🦘 kangaroo
+1F9A1                                      ; fully-qualified     # 🦡 badger
+1F43E                                      ; fully-qualified     # 🐾 paw prints
+
+# subgroup: animal-bird
+1F983                                      ; fully-qualified     # 🦃 turkey
+1F414                                      ; fully-qualified     # 🐔 chicken
+1F413                                      ; fully-qualified     # 🐓 rooster
+1F423                                      ; fully-qualified     # 🐣 hatching chick
+1F424                                      ; fully-qualified     # 🐤 baby chick
+1F425                                      ; fully-qualified     # 🐥 front-facing baby chick
+1F426                                      ; fully-qualified     # 🐦 bird
+1F427                                      ; fully-qualified     # 🐧 penguin
+1F54A FE0F                                 ; fully-qualified     # 🕊️ dove
+1F54A                                      ; unqualified         # 🕊 dove
+1F985                                      ; fully-qualified     # 🦅 eagle
+1F986                                      ; fully-qualified     # 🦆 duck
+1F9A2                                      ; fully-qualified     # 🦢 swan
+1F989                                      ; fully-qualified     # 🦉 owl
+1F9A9                                      ; fully-qualified     # 🦩 flamingo
+1F99A                                      ; fully-qualified     # 🦚 peacock
+1F99C                                      ; fully-qualified     # 🦜 parrot
+
+# subgroup: animal-amphibian
+1F438                                      ; fully-qualified     # 🐸 frog
+
+# subgroup: animal-reptile
+1F40A                                      ; fully-qualified     # 🐊 crocodile
+1F422                                      ; fully-qualified     # 🐢 turtle
+1F98E                                      ; fully-qualified     # 🦎 lizard
+1F40D                                      ; fully-qualified     # 🐍 snake
+1F432                                      ; fully-qualified     # 🐲 dragon face
+1F409                                      ; fully-qualified     # 🐉 dragon
+1F995                                      ; fully-qualified     # 🦕 sauropod
+1F996                                      ; fully-qualified     # 🦖 T-Rex
+
+# subgroup: animal-marine
+1F433                                      ; fully-qualified     # 🐳 spouting whale
+1F40B                                      ; fully-qualified     # 🐋 whale
+1F42C                                      ; fully-qualified     # 🐬 dolphin
+1F41F                                      ; fully-qualified     # 🐟 fish
+1F420                                      ; fully-qualified     # 🐠 tropical fish
+1F421                                      ; fully-qualified     # 🐡 blowfish
+1F988                                      ; fully-qualified     # 🦈 shark
+1F419                                      ; fully-qualified     # 🐙 octopus
+1F41A                                      ; fully-qualified     # 🐚 spiral shell
+
+# subgroup: animal-bug
+1F40C                                      ; fully-qualified     # 🐌 snail
+1F98B                                      ; fully-qualified     # 🦋 butterfly
+1F41B                                      ; fully-qualified     # 🐛 bug
+1F41C                                      ; fully-qualified     # 🐜 ant
+1F41D                                      ; fully-qualified     # 🐝 honeybee
+1F41E                                      ; fully-qualified     # 🐞 lady beetle
+1F997                                      ; fully-qualified     # 🦗 cricket
+1F577 FE0F                                 ; fully-qualified     # 🕷️ spider
+1F577                                      ; unqualified         # 🕷 spider
+1F578 FE0F                                 ; fully-qualified     # 🕸️ spider web
+1F578                                      ; unqualified         # 🕸 spider web
+1F982                                      ; fully-qualified     # 🦂 scorpion
+1F99F                                      ; fully-qualified     # 🦟 mosquito
+1F9A0                                      ; fully-qualified     # 🦠 microbe
+
+# subgroup: plant-flower
+1F490                                      ; fully-qualified     # 💐 bouquet
+1F338                                      ; fully-qualified     # 🌸 cherry blossom
+1F4AE                                      ; fully-qualified     # 💮 white flower
+1F3F5 FE0F                                 ; fully-qualified     # 🏵️ rosette
+1F3F5                                      ; unqualified         # 🏵 rosette
+1F339                                      ; fully-qualified     # 🌹 rose
+1F940                                      ; fully-qualified     # 🥀 wilted flower
+1F33A                                      ; fully-qualified     # 🌺 hibiscus
+1F33B                                      ; fully-qualified     # 🌻 sunflower
+1F33C                                      ; fully-qualified     # 🌼 blossom
+1F337                                      ; fully-qualified     # 🌷 tulip
+
+# subgroup: plant-other
+1F331                                      ; fully-qualified     # 🌱 seedling
+1F332                                      ; fully-qualified     # 🌲 evergreen tree
+1F333                                      ; fully-qualified     # 🌳 deciduous tree
+1F334                                      ; fully-qualified     # 🌴 palm tree
+1F335                                      ; fully-qualified     # 🌵 cactus
+1F33E                                      ; fully-qualified     # 🌾 sheaf of rice
+1F33F                                      ; fully-qualified     # 🌿 herb
+2618 FE0F                                  ; fully-qualified     # ☘️ shamrock
+2618                                       ; unqualified         # ☘ shamrock
+1F340                                      ; fully-qualified     # 🍀 four leaf clover
+1F341                                      ; fully-qualified     # 🍁 maple leaf
+1F342                                      ; fully-qualified     # 🍂 fallen leaf
+1F343                                      ; fully-qualified     # 🍃 leaf fluttering in wind
+
+# Animals & Nature subtotal:		133
+# Animals & Nature subtotal:		133	w/o modifiers
+
+# group: Food & Drink
+
+# subgroup: food-fruit
+1F347                                      ; fully-qualified     # 🍇 grapes
+1F348                                      ; fully-qualified     # 🍈 melon
+1F349                                      ; fully-qualified     # 🍉 watermelon
+1F34A                                      ; fully-qualified     # 🍊 tangerine
+1F34B                                      ; fully-qualified     # 🍋 lemon
+1F34C                                      ; fully-qualified     # 🍌 banana
+1F34D                                      ; fully-qualified     # 🍍 pineapple
+1F96D                                      ; fully-qualified     # 🥭 mango
+1F34E                                      ; fully-qualified     # 🍎 red apple
+1F34F                                      ; fully-qualified     # 🍏 green apple
+1F350                                      ; fully-qualified     # 🍐 pear
+1F351                                      ; fully-qualified     # 🍑 peach
+1F352                                      ; fully-qualified     # 🍒 cherries
+1F353                                      ; fully-qualified     # 🍓 strawberry
+1F95D                                      ; fully-qualified     # 🥝 kiwi fruit
+1F345                                      ; fully-qualified     # 🍅 tomato
+1F965                                      ; fully-qualified     # 🥥 coconut
+
+# subgroup: food-vegetable
+1F951                                      ; fully-qualified     # 🥑 avocado
+1F346                                      ; fully-qualified     # 🍆 eggplant
+1F954                                      ; fully-qualified     # 🥔 potato
+1F955                                      ; fully-qualified     # 🥕 carrot
+1F33D                                      ; fully-qualified     # 🌽 ear of corn
+1F336 FE0F                                 ; fully-qualified     # 🌶️ hot pepper
+1F336                                      ; unqualified         # 🌶 hot pepper
+1F952                                      ; fully-qualified     # 🥒 cucumber
+1F96C                                      ; fully-qualified     # 🥬 leafy green
+1F966                                      ; fully-qualified     # 🥦 broccoli
+1F9C4                                      ; fully-qualified     # 🧄 garlic
+1F9C5                                      ; fully-qualified     # 🧅 onion
+1F344                                      ; fully-qualified     # 🍄 mushroom
+1F95C                                      ; fully-qualified     # 🥜 peanuts
+1F330                                      ; fully-qualified     # 🌰 chestnut
+
+# subgroup: food-prepared
+1F35E                                      ; fully-qualified     # 🍞 bread
+1F950                                      ; fully-qualified     # 🥐 croissant
+1F956                                      ; fully-qualified     # 🥖 baguette bread
+1F968                                      ; fully-qualified     # 🥨 pretzel
+1F96F                                      ; fully-qualified     # 🥯 bagel
+1F95E                                      ; fully-qualified     # 🥞 pancakes
+1F9C7                                      ; fully-qualified     # 🧇 waffle
+1F9C0                                      ; fully-qualified     # 🧀 cheese wedge
+1F356                                      ; fully-qualified     # 🍖 meat on bone
+1F357                                      ; fully-qualified     # 🍗 poultry leg
+1F969                                      ; fully-qualified     # 🥩 cut of meat
+1F953                                      ; fully-qualified     # 🥓 bacon
+1F354                                      ; fully-qualified     # 🍔 hamburger
+1F35F                                      ; fully-qualified     # 🍟 french fries
+1F355                                      ; fully-qualified     # 🍕 pizza
+1F32D                                      ; fully-qualified     # 🌭 hot dog
+1F96A                                      ; fully-qualified     # 🥪 sandwich
+1F32E                                      ; fully-qualified     # 🌮 taco
+1F32F                                      ; fully-qualified     # 🌯 burrito
+1F959                                      ; fully-qualified     # 🥙 stuffed flatbread
+1F9C6                                      ; fully-qualified     # 🧆 falafel
+1F95A                                      ; fully-qualified     # 🥚 egg
+1F373                                      ; fully-qualified     # 🍳 cooking
+1F958                                      ; fully-qualified     # 🥘 shallow pan of food
+1F372                                      ; fully-qualified     # 🍲 pot of food
+1F963                                      ; fully-qualified     # 🥣 bowl with spoon
+1F957                                      ; fully-qualified     # 🥗 green salad
+1F37F                                      ; fully-qualified     # 🍿 popcorn
+1F9C8                                      ; fully-qualified     # 🧈 butter
+1F9C2                                      ; fully-qualified     # 🧂 salt
+1F96B                                      ; fully-qualified     # 🥫 canned food
+
+# subgroup: food-asian
+1F371                                      ; fully-qualified     # 🍱 bento box
+1F358                                      ; fully-qualified     # 🍘 rice cracker
+1F359                                      ; fully-qualified     # 🍙 rice ball
+1F35A                                      ; fully-qualified     # 🍚 cooked rice
+1F35B                                      ; fully-qualified     # 🍛 curry rice
+1F35C                                      ; fully-qualified     # 🍜 steaming bowl
+1F35D                                      ; fully-qualified     # 🍝 spaghetti
+1F360                                      ; fully-qualified     # 🍠 roasted sweet potato
+1F362                                      ; fully-qualified     # 🍢 oden
+1F363                                      ; fully-qualified     # 🍣 sushi
+1F364                                      ; fully-qualified     # 🍤 fried shrimp
+1F365                                      ; fully-qualified     # 🍥 fish cake with swirl
+1F96E                                      ; fully-qualified     # 🥮 moon cake
+1F361                                      ; fully-qualified     # 🍡 dango
+1F95F                                      ; fully-qualified     # 🥟 dumpling
+1F960                                      ; fully-qualified     # 🥠 fortune cookie
+1F961                                      ; fully-qualified     # 🥡 takeout box
+
+# subgroup: food-marine
+1F980                                      ; fully-qualified     # 🦀 crab
+1F99E                                      ; fully-qualified     # 🦞 lobster
+1F990                                      ; fully-qualified     # 🦐 shrimp
+1F991                                      ; fully-qualified     # 🦑 squid
+1F9AA                                      ; fully-qualified     # 🦪 oyster
+
+# subgroup: food-sweet
+1F366                                      ; fully-qualified     # 🍦 soft ice cream
+1F367                                      ; fully-qualified     # 🍧 shaved ice
+1F368                                      ; fully-qualified     # 🍨 ice cream
+1F369                                      ; fully-qualified     # 🍩 doughnut
+1F36A                                      ; fully-qualified     # 🍪 cookie
+1F382                                      ; fully-qualified     # 🎂 birthday cake
+1F370                                      ; fully-qualified     # 🍰 shortcake
+1F9C1                                      ; fully-qualified     # 🧁 cupcake
+1F967                                      ; fully-qualified     # 🥧 pie
+1F36B                                      ; fully-qualified     # 🍫 chocolate bar
+1F36C                                      ; fully-qualified     # 🍬 candy
+1F36D                                      ; fully-qualified     # 🍭 lollipop
+1F36E                                      ; fully-qualified     # 🍮 custard
+1F36F                                      ; fully-qualified     # 🍯 honey pot
+
+# subgroup: drink
+1F37C                                      ; fully-qualified     # 🍼 baby bottle
+1F95B                                      ; fully-qualified     # 🥛 glass of milk
+2615                                       ; fully-qualified     # ☕ hot beverage
+1F375                                      ; fully-qualified     # 🍵 teacup without handle
+1F376                                      ; fully-qualified     # 🍶 sake
+1F37E                                      ; fully-qualified     # 🍾 bottle with popping cork
+1F377                                      ; fully-qualified     # 🍷 wine glass
+1F378                                      ; fully-qualified     # 🍸 cocktail glass
+1F379                                      ; fully-qualified     # 🍹 tropical drink
+1F37A                                      ; fully-qualified     # 🍺 beer mug
+1F37B                                      ; fully-qualified     # 🍻 clinking beer mugs
+1F942                                      ; fully-qualified     # 🥂 clinking glasses
+1F943                                      ; fully-qualified     # 🥃 tumbler glass
+1F964                                      ; fully-qualified     # 🥤 cup with straw
+1F9C3                                      ; fully-qualified     # 🧃 beverage box
+1F9C9                                      ; fully-qualified     # 🧉 mate
+1F9CA                                      ; fully-qualified     # 🧊 ice cube
+
+# subgroup: dishware
+1F962                                      ; fully-qualified     # 🥢 chopsticks
+1F37D FE0F                                 ; fully-qualified     # 🍽️ fork and knife with plate
+1F37D                                      ; unqualified         # 🍽 fork and knife with plate
+1F374                                      ; fully-qualified     # 🍴 fork and knife
+1F944                                      ; fully-qualified     # 🥄 spoon
+1F52A                                      ; fully-qualified     # 🔪 kitchen knife
+1F3FA                                      ; fully-qualified     # 🏺 amphora
+
+# Food & Drink subtotal:		123
+# Food & Drink subtotal:		123	w/o modifiers
+
+# group: Travel & Places
+
+# subgroup: place-map
+1F30D                                      ; fully-qualified     # 🌍 globe showing Europe-Africa
+1F30E                                      ; fully-qualified     # 🌎 globe showing Americas
+1F30F                                      ; fully-qualified     # 🌏 globe showing Asia-Australia
+1F310                                      ; fully-qualified     # 🌐 globe with meridians
+1F5FA FE0F                                 ; fully-qualified     # 🗺️ world map
+1F5FA                                      ; unqualified         # 🗺 world map
+1F5FE                                      ; fully-qualified     # 🗾 map of Japan
+1F9ED                                      ; fully-qualified     # 🧭 compass
+
+# subgroup: place-geographic
+1F3D4 FE0F                                 ; fully-qualified     # 🏔️ snow-capped mountain
+1F3D4                                      ; unqualified         # 🏔 snow-capped mountain
+26F0 FE0F                                  ; fully-qualified     # ⛰️ mountain
+26F0                                       ; unqualified         # ⛰ mountain
+1F30B                                      ; fully-qualified     # 🌋 volcano
+1F5FB                                      ; fully-qualified     # 🗻 mount fuji
+1F3D5 FE0F                                 ; fully-qualified     # 🏕️ camping
+1F3D5                                      ; unqualified         # 🏕 camping
+1F3D6 FE0F                                 ; fully-qualified     # 🏖️ beach with umbrella
+1F3D6                                      ; unqualified         # 🏖 beach with umbrella
+1F3DC FE0F                                 ; fully-qualified     # 🏜️ desert
+1F3DC                                      ; unqualified         # 🏜 desert
+1F3DD FE0F                                 ; fully-qualified     # 🏝️ desert island
+1F3DD                                      ; unqualified         # 🏝 desert island
+1F3DE FE0F                                 ; fully-qualified     # 🏞️ national park
+1F3DE                                      ; unqualified         # 🏞 national park
+
+# subgroup: place-building
+1F3DF FE0F                                 ; fully-qualified     # 🏟️ stadium
+1F3DF                                      ; unqualified         # 🏟 stadium
+1F3DB FE0F                                 ; fully-qualified     # 🏛️ classical building
+1F3DB                                      ; unqualified         # 🏛 classical building
+1F3D7 FE0F                                 ; fully-qualified     # 🏗️ building construction
+1F3D7                                      ; unqualified         # 🏗 building construction
+1F9F1                                      ; fully-qualified     # 🧱 brick
+1F3D8 FE0F                                 ; fully-qualified     # 🏘️ houses
+1F3D8                                      ; unqualified         # 🏘 houses
+1F3DA FE0F                                 ; fully-qualified     # 🏚️ derelict house
+1F3DA                                      ; unqualified         # 🏚 derelict house
+1F3E0                                      ; fully-qualified     # 🏠 house
+1F3E1                                      ; fully-qualified     # 🏡 house with garden
+1F3E2                                      ; fully-qualified     # 🏢 office building
+1F3E3                                      ; fully-qualified     # 🏣 Japanese post office
+1F3E4                                      ; fully-qualified     # 🏤 post office
+1F3E5                                      ; fully-qualified     # 🏥 hospital
+1F3E6                                      ; fully-qualified     # 🏦 bank
+1F3E8                                      ; fully-qualified     # 🏨 hotel
+1F3E9                                      ; fully-qualified     # 🏩 love hotel
+1F3EA                                      ; fully-qualified     # 🏪 convenience store
+1F3EB                                      ; fully-qualified     # 🏫 school
+1F3EC                                      ; fully-qualified     # 🏬 department store
+1F3ED                                      ; fully-qualified     # 🏭 factory
+1F3EF                                      ; fully-qualified     # 🏯 Japanese castle
+1F3F0                                      ; fully-qualified     # 🏰 castle
+1F492                                      ; fully-qualified     # 💒 wedding
+1F5FC                                      ; fully-qualified     # 🗼 Tokyo tower
+1F5FD                                      ; fully-qualified     # 🗽 Statue of Liberty
+
+# subgroup: place-religious
+26EA                                       ; fully-qualified     # ⛪ church
+1F54C                                      ; fully-qualified     # 🕌 mosque
+1F6D5                                      ; fully-qualified     # 🛕 hindu temple
+1F54D                                      ; fully-qualified     # 🕍 synagogue
+26E9 FE0F                                  ; fully-qualified     # ⛩️ shinto shrine
+26E9                                       ; unqualified         # ⛩ shinto shrine
+1F54B                                      ; fully-qualified     # 🕋 kaaba
+
+# subgroup: place-other
+26F2                                       ; fully-qualified     # ⛲ fountain
+26FA                                       ; fully-qualified     # ⛺ tent
+1F301                                      ; fully-qualified     # 🌁 foggy
+1F303                                      ; fully-qualified     # 🌃 night with stars
+1F3D9 FE0F                                 ; fully-qualified     # 🏙️ cityscape
+1F3D9                                      ; unqualified         # 🏙 cityscape
+1F304                                      ; fully-qualified     # 🌄 sunrise over mountains
+1F305                                      ; fully-qualified     # 🌅 sunrise
+1F306                                      ; fully-qualified     # 🌆 cityscape at dusk
+1F307                                      ; fully-qualified     # 🌇 sunset
+1F309                                      ; fully-qualified     # 🌉 bridge at night
+2668 FE0F                                  ; fully-qualified     # ♨️ hot springs
+2668                                       ; unqualified         # ♨ hot springs
+1F3A0                                      ; fully-qualified     # 🎠 carousel horse
+1F3A1                                      ; fully-qualified     # 🎡 ferris wheel
+1F3A2                                      ; fully-qualified     # 🎢 roller coaster
+1F488                                      ; fully-qualified     # 💈 barber pole
+1F3AA                                      ; fully-qualified     # 🎪 circus tent
+
+# subgroup: transport-ground
+1F682                                      ; fully-qualified     # 🚂 locomotive
+1F683                                      ; fully-qualified     # 🚃 railway car
+1F684                                      ; fully-qualified     # 🚄 high-speed train
+1F685                                      ; fully-qualified     # 🚅 bullet train
+1F686                                      ; fully-qualified     # 🚆 train
+1F687                                      ; fully-qualified     # 🚇 metro
+1F688                                      ; fully-qualified     # 🚈 light rail
+1F689                                      ; fully-qualified     # 🚉 station
+1F68A                                      ; fully-qualified     # 🚊 tram
+1F69D                                      ; fully-qualified     # 🚝 monorail
+1F69E                                      ; fully-qualified     # 🚞 mountain railway
+1F68B                                      ; fully-qualified     # 🚋 tram car
+1F68C                                      ; fully-qualified     # 🚌 bus
+1F68D                                      ; fully-qualified     # 🚍 oncoming bus
+1F68E                                      ; fully-qualified     # 🚎 trolleybus
+1F690                                      ; fully-qualified     # 🚐 minibus
+1F691                                      ; fully-qualified     # 🚑 ambulance
+1F692                                      ; fully-qualified     # 🚒 fire engine
+1F693                                      ; fully-qualified     # 🚓 police car
+1F694                                      ; fully-qualified     # 🚔 oncoming police car
+1F695                                      ; fully-qualified     # 🚕 taxi
+1F696                                      ; fully-qualified     # 🚖 oncoming taxi
+1F697                                      ; fully-qualified     # 🚗 automobile
+1F698                                      ; fully-qualified     # 🚘 oncoming automobile
+1F699                                      ; fully-qualified     # 🚙 sport utility vehicle
+1F69A                                      ; fully-qualified     # 🚚 delivery truck
+1F69B                                      ; fully-qualified     # 🚛 articulated lorry
+1F69C                                      ; fully-qualified     # 🚜 tractor
+1F3CE FE0F                                 ; fully-qualified     # 🏎️ racing car
+1F3CE                                      ; unqualified         # 🏎 racing car
+1F3CD FE0F                                 ; fully-qualified     # 🏍️ motorcycle
+1F3CD                                      ; unqualified         # 🏍 motorcycle
+1F6F5                                      ; fully-qualified     # 🛵 motor scooter
+1F9BD                                      ; fully-qualified     # 🦽 manual wheelchair
+1F9BC                                      ; fully-qualified     # 🦼 motorized wheelchair
+1F6FA                                      ; fully-qualified     # 🛺 auto rickshaw
+1F6B2                                      ; fully-qualified     # 🚲 bicycle
+1F6F4                                      ; fully-qualified     # 🛴 kick scooter
+1F6F9                                      ; fully-qualified     # 🛹 skateboard
+1F68F                                      ; fully-qualified     # 🚏 bus stop
+1F6E3 FE0F                                 ; fully-qualified     # 🛣️ motorway
+1F6E3                                      ; unqualified         # 🛣 motorway
+1F6E4 FE0F                                 ; fully-qualified     # 🛤️ railway track
+1F6E4                                      ; unqualified         # 🛤 railway track
+1F6E2 FE0F                                 ; fully-qualified     # 🛢️ oil drum
+1F6E2                                      ; unqualified         # 🛢 oil drum
+26FD                                       ; fully-qualified     # ⛽ fuel pump
+1F6A8                                      ; fully-qualified     # 🚨 police car light
+1F6A5                                      ; fully-qualified     # 🚥 horizontal traffic light
+1F6A6                                      ; fully-qualified     # 🚦 vertical traffic light
+1F6D1                                      ; fully-qualified     # 🛑 stop sign
+1F6A7                                      ; fully-qualified     # 🚧 construction
+
+# subgroup: transport-water
+2693                                       ; fully-qualified     # ⚓ anchor
+26F5                                       ; fully-qualified     # ⛵ sailboat
+1F6F6                                      ; fully-qualified     # 🛶 canoe
+1F6A4                                      ; fully-qualified     # 🚤 speedboat
+1F6F3 FE0F                                 ; fully-qualified     # 🛳️ passenger ship
+1F6F3                                      ; unqualified         # 🛳 passenger ship
+26F4 FE0F                                  ; fully-qualified     # ⛴️ ferry
+26F4                                       ; unqualified         # ⛴ ferry
+1F6E5 FE0F                                 ; fully-qualified     # 🛥️ motor boat
+1F6E5                                      ; unqualified         # 🛥 motor boat
+1F6A2                                      ; fully-qualified     # 🚢 ship
+
+# subgroup: transport-air
+2708 FE0F                                  ; fully-qualified     # ✈️ airplane
+2708                                       ; unqualified         # ✈ airplane
+1F6E9 FE0F                                 ; fully-qualified     # 🛩️ small airplane
+1F6E9                                      ; unqualified         # 🛩 small airplane
+1F6EB                                      ; fully-qualified     # 🛫 airplane departure
+1F6EC                                      ; fully-qualified     # 🛬 airplane arrival
+1FA82                                      ; fully-qualified     # 🪂 parachute
+1F4BA                                      ; fully-qualified     # 💺 seat
+1F681                                      ; fully-qualified     # 🚁 helicopter
+1F69F                                      ; fully-qualified     # 🚟 suspension railway
+1F6A0                                      ; fully-qualified     # 🚠 mountain cableway
+1F6A1                                      ; fully-qualified     # 🚡 aerial tramway
+1F6F0 FE0F                                 ; fully-qualified     # 🛰️ satellite
+1F6F0                                      ; unqualified         # 🛰 satellite
+1F680                                      ; fully-qualified     # 🚀 rocket
+1F6F8                                      ; fully-qualified     # 🛸 flying saucer
+
+# subgroup: hotel
+1F6CE FE0F                                 ; fully-qualified     # 🛎️ bellhop bell
+1F6CE                                      ; unqualified         # 🛎 bellhop bell
+1F9F3                                      ; fully-qualified     # 🧳 luggage
+
+# subgroup: time
+231B                                       ; fully-qualified     # ⌛ hourglass done
+23F3                                       ; fully-qualified     # ⏳ hourglass not done
+231A                                       ; fully-qualified     # ⌚ watch
+23F0                                       ; fully-qualified     # ⏰ alarm clock
+23F1 FE0F                                  ; fully-qualified     # ⏱️ stopwatch
+23F1                                       ; unqualified         # ⏱ stopwatch
+23F2 FE0F                                  ; fully-qualified     # ⏲️ timer clock
+23F2                                       ; unqualified         # ⏲ timer clock
+1F570 FE0F                                 ; fully-qualified     # 🕰️ mantelpiece clock
+1F570                                      ; unqualified         # 🕰 mantelpiece clock
+1F55B                                      ; fully-qualified     # 🕛 twelve o’clock
+1F567                                      ; fully-qualified     # 🕧 twelve-thirty
+1F550                                      ; fully-qualified     # 🕐 one o’clock
+1F55C                                      ; fully-qualified     # 🕜 one-thirty
+1F551                                      ; fully-qualified     # 🕑 two o’clock
+1F55D                                      ; fully-qualified     # 🕝 two-thirty
+1F552                                      ; fully-qualified     # 🕒 three o’clock
+1F55E                                      ; fully-qualified     # 🕞 three-thirty
+1F553                                      ; fully-qualified     # 🕓 four o’clock
+1F55F                                      ; fully-qualified     # 🕟 four-thirty
+1F554                                      ; fully-qualified     # 🕔 five o’clock
+1F560                                      ; fully-qualified     # 🕠 five-thirty
+1F555                                      ; fully-qualified     # 🕕 six o’clock
+1F561                                      ; fully-qualified     # 🕡 six-thirty
+1F556                                      ; fully-qualified     # 🕖 seven o’clock
+1F562                                      ; fully-qualified     # 🕢 seven-thirty
+1F557                                      ; fully-qualified     # 🕗 eight o’clock
+1F563                                      ; fully-qualified     # 🕣 eight-thirty
+1F558                                      ; fully-qualified     # 🕘 nine o’clock
+1F564                                      ; fully-qualified     # 🕤 nine-thirty
+1F559                                      ; fully-qualified     # 🕙 ten o’clock
+1F565                                      ; fully-qualified     # 🕥 ten-thirty
+1F55A                                      ; fully-qualified     # 🕚 eleven o’clock
+1F566                                      ; fully-qualified     # 🕦 eleven-thirty
+
+# subgroup: sky & weather
+1F311                                      ; fully-qualified     # 🌑 new moon
+1F312                                      ; fully-qualified     # 🌒 waxing crescent moon
+1F313                                      ; fully-qualified     # 🌓 first quarter moon
+1F314                                      ; fully-qualified     # 🌔 waxing gibbous moon
+1F315                                      ; fully-qualified     # 🌕 full moon
+1F316                                      ; fully-qualified     # 🌖 waning gibbous moon
+1F317                                      ; fully-qualified     # 🌗 last quarter moon
+1F318                                      ; fully-qualified     # 🌘 waning crescent moon
+1F319                                      ; fully-qualified     # 🌙 crescent moon
+1F31A                                      ; fully-qualified     # 🌚 new moon face
+1F31B                                      ; fully-qualified     # 🌛 first quarter moon face
+1F31C                                      ; fully-qualified     # 🌜 last quarter moon face
+1F321 FE0F                                 ; fully-qualified     # 🌡️ thermometer
+1F321                                      ; unqualified         # 🌡 thermometer
+2600 FE0F                                  ; fully-qualified     # ☀️ sun
+2600                                       ; unqualified         # ☀ sun
+1F31D                                      ; fully-qualified     # 🌝 full moon face
+1F31E                                      ; fully-qualified     # 🌞 sun with face
+1FA90                                      ; fully-qualified     # 🪐 ringed planet
+2B50                                       ; fully-qualified     # ⭐ star
+1F31F                                      ; fully-qualified     # 🌟 glowing star
+1F320                                      ; fully-qualified     # 🌠 shooting star
+1F30C                                      ; fully-qualified     # 🌌 milky way
+2601 FE0F                                  ; fully-qualified     # ☁️ cloud
+2601                                       ; unqualified         # ☁ cloud
+26C5                                       ; fully-qualified     # ⛅ sun behind cloud
+26C8 FE0F                                  ; fully-qualified     # ⛈️ cloud with lightning and rain
+26C8                                       ; unqualified         # ⛈ cloud with lightning and rain
+1F324 FE0F                                 ; fully-qualified     # 🌤️ sun behind small cloud
+1F324                                      ; unqualified         # 🌤 sun behind small cloud
+1F325 FE0F                                 ; fully-qualified     # 🌥️ sun behind large cloud
+1F325                                      ; unqualified         # 🌥 sun behind large cloud
+1F326 FE0F                                 ; fully-qualified     # 🌦️ sun behind rain cloud
+1F326                                      ; unqualified         # 🌦 sun behind rain cloud
+1F327 FE0F                                 ; fully-qualified     # 🌧️ cloud with rain
+1F327                                      ; unqualified         # 🌧 cloud with rain
+1F328 FE0F                                 ; fully-qualified     # 🌨️ cloud with snow
+1F328                                      ; unqualified         # 🌨 cloud with snow
+1F329 FE0F                                 ; fully-qualified     # 🌩️ cloud with lightning
+1F329                                      ; unqualified         # 🌩 cloud with lightning
+1F32A FE0F                                 ; fully-qualified     # 🌪️ tornado
+1F32A                                      ; unqualified         # 🌪 tornado
+1F32B FE0F                                 ; fully-qualified     # 🌫️ fog
+1F32B                                      ; unqualified         # 🌫 fog
+1F32C FE0F                                 ; fully-qualified     # 🌬️ wind face
+1F32C                                      ; unqualified         # 🌬 wind face
+1F300                                      ; fully-qualified     # 🌀 cyclone
+1F308                                      ; fully-qualified     # 🌈 rainbow
+1F302                                      ; fully-qualified     # 🌂 closed umbrella
+2602 FE0F                                  ; fully-qualified     # ☂️ umbrella
+2602                                       ; unqualified         # ☂ umbrella
+2614                                       ; fully-qualified     # ☔ umbrella with rain drops
+26F1 FE0F                                  ; fully-qualified     # ⛱️ umbrella on ground
+26F1                                       ; unqualified         # ⛱ umbrella on ground
+26A1                                       ; fully-qualified     # ⚡ high voltage
+2744 FE0F                                  ; fully-qualified     # ❄️ snowflake
+2744                                       ; unqualified         # ❄ snowflake
+2603 FE0F                                  ; fully-qualified     # ☃️ snowman
+2603                                       ; unqualified         # ☃ snowman
+26C4                                       ; fully-qualified     # ⛄ snowman without snow
+2604 FE0F                                  ; fully-qualified     # ☄️ comet
+2604                                       ; unqualified         # ☄ comet
+1F525                                      ; fully-qualified     # 🔥 fire
+1F4A7                                      ; fully-qualified     # 💧 droplet
+1F30A                                      ; fully-qualified     # 🌊 water wave
+
+# Travel & Places subtotal:		259
+# Travel & Places subtotal:		259	w/o modifiers
+
+# group: Activities
+
+# subgroup: event
+1F383                                      ; fully-qualified     # 🎃 jack-o-lantern
+1F384                                      ; fully-qualified     # 🎄 Christmas tree
+1F386                                      ; fully-qualified     # 🎆 fireworks
+1F387                                      ; fully-qualified     # 🎇 sparkler
+1F9E8                                      ; fully-qualified     # 🧨 firecracker
+2728                                       ; fully-qualified     # ✨ sparkles
+1F388                                      ; fully-qualified     # 🎈 balloon
+1F389                                      ; fully-qualified     # 🎉 party popper
+1F38A                                      ; fully-qualified     # 🎊 confetti ball
+1F38B                                      ; fully-qualified     # 🎋 tanabata tree
+1F38D                                      ; fully-qualified     # 🎍 pine decoration
+1F38E                                      ; fully-qualified     # 🎎 Japanese dolls
+1F38F                                      ; fully-qualified     # 🎏 carp streamer
+1F390                                      ; fully-qualified     # 🎐 wind chime
+1F391                                      ; fully-qualified     # 🎑 moon viewing ceremony
+1F9E7                                      ; fully-qualified     # 🧧 red envelope
+1F380                                      ; fully-qualified     # 🎀 ribbon
+1F381                                      ; fully-qualified     # 🎁 wrapped gift
+1F397 FE0F                                 ; fully-qualified     # 🎗️ reminder ribbon
+1F397                                      ; unqualified         # 🎗 reminder ribbon
+1F39F FE0F                                 ; fully-qualified     # 🎟️ admission tickets
+1F39F                                      ; unqualified         # 🎟 admission tickets
+1F3AB                                      ; fully-qualified     # 🎫 ticket
+
+# subgroup: award-medal
+1F396 FE0F                                 ; fully-qualified     # 🎖️ military medal
+1F396                                      ; unqualified         # 🎖 military medal
+1F3C6                                      ; fully-qualified     # 🏆 trophy
+1F3C5                                      ; fully-qualified     # 🏅 sports medal
+1F947                                      ; fully-qualified     # 🥇 1st place medal
+1F948                                      ; fully-qualified     # 🥈 2nd place medal
+1F949                                      ; fully-qualified     # 🥉 3rd place medal
+
+# subgroup: sport
+26BD                                       ; fully-qualified     # ⚽ soccer ball
+26BE                                       ; fully-qualified     # ⚾ baseball
+1F94E                                      ; fully-qualified     # 🥎 softball
+1F3C0                                      ; fully-qualified     # 🏀 basketball
+1F3D0                                      ; fully-qualified     # 🏐 volleyball
+1F3C8                                      ; fully-qualified     # 🏈 american football
+1F3C9                                      ; fully-qualified     # 🏉 rugby football
+1F3BE                                      ; fully-qualified     # 🎾 tennis
+1F94F                                      ; fully-qualified     # 🥏 flying disc
+1F3B3                                      ; fully-qualified     # 🎳 bowling
+1F3CF                                      ; fully-qualified     # 🏏 cricket game
+1F3D1                                      ; fully-qualified     # 🏑 field hockey
+1F3D2                                      ; fully-qualified     # 🏒 ice hockey
+1F94D                                      ; fully-qualified     # 🥍 lacrosse
+1F3D3                                      ; fully-qualified     # 🏓 ping pong
+1F3F8                                      ; fully-qualified     # 🏸 badminton
+1F94A                                      ; fully-qualified     # 🥊 boxing glove
+1F94B                                      ; fully-qualified     # 🥋 martial arts uniform
+1F945                                      ; fully-qualified     # 🥅 goal net
+26F3                                       ; fully-qualified     # ⛳ flag in hole
+26F8 FE0F                                  ; fully-qualified     # ⛸️ ice skate
+26F8                                       ; unqualified         # ⛸ ice skate
+1F3A3                                      ; fully-qualified     # 🎣 fishing pole
+1F93F                                      ; fully-qualified     # 🤿 diving mask
+1F3BD                                      ; fully-qualified     # 🎽 running shirt
+1F3BF                                      ; fully-qualified     # 🎿 skis
+1F6F7                                      ; fully-qualified     # 🛷 sled
+1F94C                                      ; fully-qualified     # 🥌 curling stone
+
+# subgroup: game
+1F3AF                                      ; fully-qualified     # 🎯 direct hit
+1FA80                                      ; fully-qualified     # 🪀 yo-yo
+1FA81                                      ; fully-qualified     # 🪁 kite
+1F3B1                                      ; fully-qualified     # 🎱 pool 8 ball
+1F52E                                      ; fully-qualified     # 🔮 crystal ball
+1F9FF                                      ; fully-qualified     # 🧿 nazar amulet
+1F3AE                                      ; fully-qualified     # 🎮 video game
+1F579 FE0F                                 ; fully-qualified     # 🕹️ joystick
+1F579                                      ; unqualified         # 🕹 joystick
+1F3B0                                      ; fully-qualified     # 🎰 slot machine
+1F3B2                                      ; fully-qualified     # 🎲 game die
+1F9E9                                      ; fully-qualified     # 🧩 puzzle piece
+1F9F8                                      ; fully-qualified     # 🧸 teddy bear
+2660 FE0F                                  ; fully-qualified     # ♠️ spade suit
+2660                                       ; unqualified         # ♠ spade suit
+2665 FE0F                                  ; fully-qualified     # ♥️ heart suit
+2665                                       ; unqualified         # ♥ heart suit
+2666 FE0F                                  ; fully-qualified     # ♦️ diamond suit
+2666                                       ; unqualified         # ♦ diamond suit
+2663 FE0F                                  ; fully-qualified     # ♣️ club suit
+2663                                       ; unqualified         # ♣ club suit
+265F FE0F                                  ; fully-qualified     # ♟️ chess pawn
+265F                                       ; unqualified         # ♟ chess pawn
+1F0CF                                      ; fully-qualified     # 🃏 joker
+1F004                                      ; fully-qualified     # 🀄 mahjong red dragon
+1F3B4                                      ; fully-qualified     # 🎴 flower playing cards
+
+# subgroup: arts & crafts
+1F3AD                                      ; fully-qualified     # 🎭 performing arts
+1F5BC FE0F                                 ; fully-qualified     # 🖼️ framed picture
+1F5BC                                      ; unqualified         # 🖼 framed picture
+1F3A8                                      ; fully-qualified     # 🎨 artist palette
+1F9F5                                      ; fully-qualified     # 🧵 thread
+1F9F6                                      ; fully-qualified     # 🧶 yarn
+
+# Activities subtotal:		90
+# Activities subtotal:		90	w/o modifiers
+
+# group: Objects
+
+# subgroup: clothing
+1F453                                      ; fully-qualified     # 👓 glasses
+1F576 FE0F                                 ; fully-qualified     # 🕶️ sunglasses
+1F576                                      ; unqualified         # 🕶 sunglasses
+1F97D                                      ; fully-qualified     # 🥽 goggles
+1F97C                                      ; fully-qualified     # 🥼 lab coat
+1F9BA                                      ; fully-qualified     # 🦺 safety vest
+1F454                                      ; fully-qualified     # 👔 necktie
+1F455                                      ; fully-qualified     # 👕 t-shirt
+1F456                                      ; fully-qualified     # 👖 jeans
+1F9E3                                      ; fully-qualified     # 🧣 scarf
+1F9E4                                      ; fully-qualified     # 🧤 gloves
+1F9E5                                      ; fully-qualified     # 🧥 coat
+1F9E6                                      ; fully-qualified     # 🧦 socks
+1F457                                      ; fully-qualified     # 👗 dress
+1F458                                      ; fully-qualified     # 👘 kimono
+1F97B                                      ; fully-qualified     # 🥻 sari
+1FA71                                      ; fully-qualified     # 🩱 one-piece swimsuit
+1FA72                                      ; fully-qualified     # 🩲 swim brief
+1FA73                                      ; fully-qualified     # 🩳 shorts
+1F459                                      ; fully-qualified     # 👙 bikini
+1F45A                                      ; fully-qualified     # 👚 woman’s clothes
+1F45B                                      ; fully-qualified     # 👛 purse
+1F45C                                      ; fully-qualified     # 👜 handbag
+1F45D                                      ; fully-qualified     # 👝 clutch bag
+1F6CD FE0F                                 ; fully-qualified     # 🛍️ shopping bags
+1F6CD                                      ; unqualified         # 🛍 shopping bags
+1F392                                      ; fully-qualified     # 🎒 backpack
+1F45E                                      ; fully-qualified     # 👞 man’s shoe
+1F45F                                      ; fully-qualified     # 👟 running shoe
+1F97E                                      ; fully-qualified     # 🥾 hiking boot
+1F97F                                      ; fully-qualified     # 🥿 flat shoe
+1F460                                      ; fully-qualified     # 👠 high-heeled shoe
+1F461                                      ; fully-qualified     # 👡 woman’s sandal
+1FA70                                      ; fully-qualified     # 🩰 ballet shoes
+1F462                                      ; fully-qualified     # 👢 woman’s boot
+1F451                                      ; fully-qualified     # 👑 crown
+1F452                                      ; fully-qualified     # 👒 woman’s hat
+1F3A9                                      ; fully-qualified     # 🎩 top hat
+1F393                                      ; fully-qualified     # 🎓 graduation cap
+1F9E2                                      ; fully-qualified     # 🧢 billed cap
+26D1 FE0F                                  ; fully-qualified     # ⛑️ rescue worker’s helmet
+26D1                                       ; unqualified         # ⛑ rescue worker’s helmet
+1F4FF                                      ; fully-qualified     # 📿 prayer beads
+1F484                                      ; fully-qualified     # 💄 lipstick
+1F48D                                      ; fully-qualified     # 💍 ring
+1F48E                                      ; fully-qualified     # 💎 gem stone
+
+# subgroup: sound
+1F507                                      ; fully-qualified     # 🔇 muted speaker
+1F508                                      ; fully-qualified     # 🔈 speaker low volume
+1F509                                      ; fully-qualified     # 🔉 speaker medium volume
+1F50A                                      ; fully-qualified     # 🔊 speaker high volume
+1F4E2                                      ; fully-qualified     # 📢 loudspeaker
+1F4E3                                      ; fully-qualified     # 📣 megaphone
+1F4EF                                      ; fully-qualified     # 📯 postal horn
+1F514                                      ; fully-qualified     # 🔔 bell
+1F515                                      ; fully-qualified     # 🔕 bell with slash
+
+# subgroup: music
+1F3BC                                      ; fully-qualified     # 🎼 musical score
+1F3B5                                      ; fully-qualified     # 🎵 musical note
+1F3B6                                      ; fully-qualified     # 🎶 musical notes
+1F399 FE0F                                 ; fully-qualified     # 🎙️ studio microphone
+1F399                                      ; unqualified         # 🎙 studio microphone
+1F39A FE0F                                 ; fully-qualified     # 🎚️ level slider
+1F39A                                      ; unqualified         # 🎚 level slider
+1F39B FE0F                                 ; fully-qualified     # 🎛️ control knobs
+1F39B                                      ; unqualified         # 🎛 control knobs
+1F3A4                                      ; fully-qualified     # 🎤 microphone
+1F3A7                                      ; fully-qualified     # 🎧 headphone
+1F4FB                                      ; fully-qualified     # 📻 radio
+
+# subgroup: musical-instrument
+1F3B7                                      ; fully-qualified     # 🎷 saxophone
+1F3B8                                      ; fully-qualified     # 🎸 guitar
+1F3B9                                      ; fully-qualified     # 🎹 musical keyboard
+1F3BA                                      ; fully-qualified     # 🎺 trumpet
+1F3BB                                      ; fully-qualified     # 🎻 violin
+1FA95                                      ; fully-qualified     # 🪕 banjo
+1F941                                      ; fully-qualified     # 🥁 drum
+
+# subgroup: phone
+1F4F1                                      ; fully-qualified     # 📱 mobile phone
+1F4F2                                      ; fully-qualified     # 📲 mobile phone with arrow
+260E FE0F                                  ; fully-qualified     # ☎️ telephone
+260E                                       ; unqualified         # ☎ telephone
+1F4DE                                      ; fully-qualified     # 📞 telephone receiver
+1F4DF                                      ; fully-qualified     # 📟 pager
+1F4E0                                      ; fully-qualified     # 📠 fax machine
+
+# subgroup: computer
+1F50B                                      ; fully-qualified     # 🔋 battery
+1F50C                                      ; fully-qualified     # 🔌 electric plug
+1F4BB                                      ; fully-qualified     # 💻 laptop computer
+1F5A5 FE0F                                 ; fully-qualified     # 🖥️ desktop computer
+1F5A5                                      ; unqualified         # 🖥 desktop computer
+1F5A8 FE0F                                 ; fully-qualified     # 🖨️ printer
+1F5A8                                      ; unqualified         # 🖨 printer
+2328 FE0F                                  ; fully-qualified     # ⌨️ keyboard
+2328                                       ; unqualified         # ⌨ keyboard
+1F5B1 FE0F                                 ; fully-qualified     # 🖱️ computer mouse
+1F5B1                                      ; unqualified         # 🖱 computer mouse
+1F5B2 FE0F                                 ; fully-qualified     # 🖲️ trackball
+1F5B2                                      ; unqualified         # 🖲 trackball
+1F4BD                                      ; fully-qualified     # 💽 computer disk
+1F4BE                                      ; fully-qualified     # 💾 floppy disk
+1F4BF                                      ; fully-qualified     # 💿 optical disk
+1F4C0                                      ; fully-qualified     # 📀 dvd
+1F9EE                                      ; fully-qualified     # 🧮 abacus
+
+# subgroup: light & video
+1F3A5                                      ; fully-qualified     # 🎥 movie camera
+1F39E FE0F                                 ; fully-qualified     # 🎞️ film frames
+1F39E                                      ; unqualified         # 🎞 film frames
+1F4FD FE0F                                 ; fully-qualified     # 📽️ film projector
+1F4FD                                      ; unqualified         # 📽 film projector
+1F3AC                                      ; fully-qualified     # 🎬 clapper board
+1F4FA                                      ; fully-qualified     # 📺 television
+1F4F7                                      ; fully-qualified     # 📷 camera
+1F4F8                                      ; fully-qualified     # 📸 camera with flash
+1F4F9                                      ; fully-qualified     # 📹 video camera
+1F4FC                                      ; fully-qualified     # 📼 videocassette
+1F50D                                      ; fully-qualified     # 🔍 magnifying glass tilted left
+1F50E                                      ; fully-qualified     # 🔎 magnifying glass tilted right
+1F56F FE0F                                 ; fully-qualified     # 🕯️ candle
+1F56F                                      ; unqualified         # 🕯 candle
+1F4A1                                      ; fully-qualified     # 💡 light bulb
+1F526                                      ; fully-qualified     # 🔦 flashlight
+1F3EE                                      ; fully-qualified     # 🏮 red paper lantern
+1FA94                                      ; fully-qualified     # 🪔 diya lamp
+
+# subgroup: book-paper
+1F4D4                                      ; fully-qualified     # 📔 notebook with decorative cover
+1F4D5                                      ; fully-qualified     # 📕 closed book
+1F4D6                                      ; fully-qualified     # 📖 open book
+1F4D7                                      ; fully-qualified     # 📗 green book
+1F4D8                                      ; fully-qualified     # 📘 blue book
+1F4D9                                      ; fully-qualified     # 📙 orange book
+1F4DA                                      ; fully-qualified     # 📚 books
+1F4D3                                      ; fully-qualified     # 📓 notebook
+1F4D2                                      ; fully-qualified     # 📒 ledger
+1F4C3                                      ; fully-qualified     # 📃 page with curl
+1F4DC                                      ; fully-qualified     # 📜 scroll
+1F4C4                                      ; fully-qualified     # 📄 page facing up
+1F4F0                                      ; fully-qualified     # 📰 newspaper
+1F5DE FE0F                                 ; fully-qualified     # 🗞️ rolled-up newspaper
+1F5DE                                      ; unqualified         # 🗞 rolled-up newspaper
+1F4D1                                      ; fully-qualified     # 📑 bookmark tabs
+1F516                                      ; fully-qualified     # 🔖 bookmark
+1F3F7 FE0F                                 ; fully-qualified     # 🏷️ label
+1F3F7                                      ; unqualified         # 🏷 label
+
+# subgroup: money
+1F4B0                                      ; fully-qualified     # 💰 money bag
+1F4B4                                      ; fully-qualified     # 💴 yen banknote
+1F4B5                                      ; fully-qualified     # 💵 dollar banknote
+1F4B6                                      ; fully-qualified     # 💶 euro banknote
+1F4B7                                      ; fully-qualified     # 💷 pound banknote
+1F4B8                                      ; fully-qualified     # 💸 money with wings
+1F4B3                                      ; fully-qualified     # 💳 credit card
+1F9FE                                      ; fully-qualified     # 🧾 receipt
+1F4B9                                      ; fully-qualified     # 💹 chart increasing with yen
+1F4B1                                      ; fully-qualified     # 💱 currency exchange
+1F4B2                                      ; fully-qualified     # 💲 heavy dollar sign
+
+# subgroup: mail
+2709 FE0F                                  ; fully-qualified     # ✉️ envelope
+2709                                       ; unqualified         # ✉ envelope
+1F4E7                                      ; fully-qualified     # 📧 e-mail
+1F4E8                                      ; fully-qualified     # 📨 incoming envelope
+1F4E9                                      ; fully-qualified     # 📩 envelope with arrow
+1F4E4                                      ; fully-qualified     # 📤 outbox tray
+1F4E5                                      ; fully-qualified     # 📥 inbox tray
+1F4E6                                      ; fully-qualified     # 📦 package
+1F4EB                                      ; fully-qualified     # 📫 closed mailbox with raised flag
+1F4EA                                      ; fully-qualified     # 📪 closed mailbox with lowered flag
+1F4EC                                      ; fully-qualified     # 📬 open mailbox with raised flag
+1F4ED                                      ; fully-qualified     # 📭 open mailbox with lowered flag
+1F4EE                                      ; fully-qualified     # 📮 postbox
+1F5F3 FE0F                                 ; fully-qualified     # 🗳️ ballot box with ballot
+1F5F3                                      ; unqualified         # 🗳 ballot box with ballot
+
+# subgroup: writing
+270F FE0F                                  ; fully-qualified     # ✏️ pencil
+270F                                       ; unqualified         # ✏ pencil
+2712 FE0F                                  ; fully-qualified     # ✒️ black nib
+2712                                       ; unqualified         # ✒ black nib
+1F58B FE0F                                 ; fully-qualified     # 🖋️ fountain pen
+1F58B                                      ; unqualified         # 🖋 fountain pen
+1F58A FE0F                                 ; fully-qualified     # 🖊️ pen
+1F58A                                      ; unqualified         # 🖊 pen
+1F58C FE0F                                 ; fully-qualified     # 🖌️ paintbrush
+1F58C                                      ; unqualified         # 🖌 paintbrush
+1F58D FE0F                                 ; fully-qualified     # 🖍️ crayon
+1F58D                                      ; unqualified         # 🖍 crayon
+1F4DD                                      ; fully-qualified     # 📝 memo
+
+# subgroup: office
+1F4BC                                      ; fully-qualified     # 💼 briefcase
+1F4C1                                      ; fully-qualified     # 📁 file folder
+1F4C2                                      ; fully-qualified     # 📂 open file folder
+1F5C2 FE0F                                 ; fully-qualified     # 🗂️ card index dividers
+1F5C2                                      ; unqualified         # 🗂 card index dividers
+1F4C5                                      ; fully-qualified     # 📅 calendar
+1F4C6                                      ; fully-qualified     # 📆 tear-off calendar
+1F5D2 FE0F                                 ; fully-qualified     # 🗒️ spiral notepad
+1F5D2                                      ; unqualified         # 🗒 spiral notepad
+1F5D3 FE0F                                 ; fully-qualified     # 🗓️ spiral calendar
+1F5D3                                      ; unqualified         # 🗓 spiral calendar
+1F4C7                                      ; fully-qualified     # 📇 card index
+1F4C8                                      ; fully-qualified     # 📈 chart increasing
+1F4C9                                      ; fully-qualified     # 📉 chart decreasing
+1F4CA                                      ; fully-qualified     # 📊 bar chart
+1F4CB                                      ; fully-qualified     # 📋 clipboard
+1F4CC                                      ; fully-qualified     # 📌 pushpin
+1F4CD                                      ; fully-qualified     # 📍 round pushpin
+1F4CE                                      ; fully-qualified     # 📎 paperclip
+1F587 FE0F                                 ; fully-qualified     # 🖇️ linked paperclips
+1F587                                      ; unqualified         # 🖇 linked paperclips
+1F4CF                                      ; fully-qualified     # 📏 straight ruler
+1F4D0                                      ; fully-qualified     # 📐 triangular ruler
+2702 FE0F                                  ; fully-qualified     # ✂️ scissors
+2702                                       ; unqualified         # ✂ scissors
+1F5C3 FE0F                                 ; fully-qualified     # 🗃️ card file box
+1F5C3                                      ; unqualified         # 🗃 card file box
+1F5C4 FE0F                                 ; fully-qualified     # 🗄️ file cabinet
+1F5C4                                      ; unqualified         # 🗄 file cabinet
+1F5D1 FE0F                                 ; fully-qualified     # 🗑️ wastebasket
+1F5D1                                      ; unqualified         # 🗑 wastebasket
+
+# subgroup: lock
+1F512                                      ; fully-qualified     # 🔒 locked
+1F513                                      ; fully-qualified     # 🔓 unlocked
+1F50F                                      ; fully-qualified     # 🔏 locked with pen
+1F510                                      ; fully-qualified     # 🔐 locked with key
+1F511                                      ; fully-qualified     # 🔑 key
+1F5DD FE0F                                 ; fully-qualified     # 🗝️ old key
+1F5DD                                      ; unqualified         # 🗝 old key
+
+# subgroup: tool
+1F528                                      ; fully-qualified     # 🔨 hammer
+1FA93                                      ; fully-qualified     # 🪓 axe
+26CF FE0F                                  ; fully-qualified     # ⛏️ pick
+26CF                                       ; unqualified         # ⛏ pick
+2692 FE0F                                  ; fully-qualified     # ⚒️ hammer and pick
+2692                                       ; unqualified         # ⚒ hammer and pick
+1F6E0 FE0F                                 ; fully-qualified     # 🛠️ hammer and wrench
+1F6E0                                      ; unqualified         # 🛠 hammer and wrench
+1F5E1 FE0F                                 ; fully-qualified     # 🗡️ dagger
+1F5E1                                      ; unqualified         # 🗡 dagger
+2694 FE0F                                  ; fully-qualified     # ⚔️ crossed swords
+2694                                       ; unqualified         # ⚔ crossed swords
+1F52B                                      ; fully-qualified     # 🔫 pistol
+1F3F9                                      ; fully-qualified     # 🏹 bow and arrow
+1F6E1 FE0F                                 ; fully-qualified     # 🛡️ shield
+1F6E1                                      ; unqualified         # 🛡 shield
+1F527                                      ; fully-qualified     # 🔧 wrench
+1F529                                      ; fully-qualified     # 🔩 nut and bolt
+2699 FE0F                                  ; fully-qualified     # ⚙️ gear
+2699                                       ; unqualified         # ⚙ gear
+1F5DC FE0F                                 ; fully-qualified     # 🗜️ clamp
+1F5DC                                      ; unqualified         # 🗜 clamp
+2696 FE0F                                  ; fully-qualified     # ⚖️ balance scale
+2696                                       ; unqualified         # ⚖ balance scale
+1F9AF                                      ; fully-qualified     # 🦯 probing cane
+1F517                                      ; fully-qualified     # 🔗 link
+26D3 FE0F                                  ; fully-qualified     # ⛓️ chains
+26D3                                       ; unqualified         # ⛓ chains
+1F9F0                                      ; fully-qualified     # 🧰 toolbox
+1F9F2                                      ; fully-qualified     # 🧲 magnet
+
+# subgroup: science
+2697 FE0F                                  ; fully-qualified     # ⚗️ alembic
+2697                                       ; unqualified         # ⚗ alembic
+1F9EA                                      ; fully-qualified     # 🧪 test tube
+1F9EB                                      ; fully-qualified     # 🧫 petri dish
+1F9EC                                      ; fully-qualified     # 🧬 dna
+1F52C                                      ; fully-qualified     # 🔬 microscope
+1F52D                                      ; fully-qualified     # 🔭 telescope
+1F4E1                                      ; fully-qualified     # 📡 satellite antenna
+
+# subgroup: medical
+1F489                                      ; fully-qualified     # 💉 syringe
+1FA78                                      ; fully-qualified     # 🩸 drop of blood
+1F48A                                      ; fully-qualified     # 💊 pill
+1FA79                                      ; fully-qualified     # 🩹 adhesive bandage
+1FA7A                                      ; fully-qualified     # 🩺 stethoscope
+
+# subgroup: household
+1F6AA                                      ; fully-qualified     # 🚪 door
+1F6CF FE0F                                 ; fully-qualified     # 🛏️ bed
+1F6CF                                      ; unqualified         # 🛏 bed
+1F6CB FE0F                                 ; fully-qualified     # 🛋️ couch and lamp
+1F6CB                                      ; unqualified         # 🛋 couch and lamp
+1FA91                                      ; fully-qualified     # 🪑 chair
+1F6BD                                      ; fully-qualified     # 🚽 toilet
+1F6BF                                      ; fully-qualified     # 🚿 shower
+1F6C1                                      ; fully-qualified     # 🛁 bathtub
+1FA92                                      ; fully-qualified     # 🪒 razor
+1F9F4                                      ; fully-qualified     # 🧴 lotion bottle
+1F9F7                                      ; fully-qualified     # 🧷 safety pin
+1F9F9                                      ; fully-qualified     # 🧹 broom
+1F9FA                                      ; fully-qualified     # 🧺 basket
+1F9FB                                      ; fully-qualified     # 🧻 roll of paper
+1F9FC                                      ; fully-qualified     # 🧼 soap
+1F9FD                                      ; fully-qualified     # 🧽 sponge
+1F9EF                                      ; fully-qualified     # 🧯 fire extinguisher
+1F6D2                                      ; fully-qualified     # 🛒 shopping cart
+
+# subgroup: other-object
+1F6AC                                      ; fully-qualified     # 🚬 cigarette
+26B0 FE0F                                  ; fully-qualified     # ⚰️ coffin
+26B0                                       ; unqualified         # ⚰ coffin
+26B1 FE0F                                  ; fully-qualified     # ⚱️ funeral urn
+26B1                                       ; unqualified         # ⚱ funeral urn
+1F5FF                                      ; fully-qualified     # 🗿 moai
+
+# Objects subtotal:		282
+# Objects subtotal:		282	w/o modifiers
+
+# group: Symbols
+
+# subgroup: transport-sign
+1F3E7                                      ; fully-qualified     # 🏧 ATM sign
+1F6AE                                      ; fully-qualified     # 🚮 litter in bin sign
+1F6B0                                      ; fully-qualified     # 🚰 potable water
+267F                                       ; fully-qualified     # ♿ wheelchair symbol
+1F6B9                                      ; fully-qualified     # 🚹 men’s room
+1F6BA                                      ; fully-qualified     # 🚺 women’s room
+1F6BB                                      ; fully-qualified     # 🚻 restroom
+1F6BC                                      ; fully-qualified     # 🚼 baby symbol
+1F6BE                                      ; fully-qualified     # 🚾 water closet
+1F6C2                                      ; fully-qualified     # 🛂 passport control
+1F6C3                                      ; fully-qualified     # 🛃 customs
+1F6C4                                      ; fully-qualified     # 🛄 baggage claim
+1F6C5                                      ; fully-qualified     # 🛅 left luggage
+
+# subgroup: warning
+26A0 FE0F                                  ; fully-qualified     # ⚠️ warning
+26A0                                       ; unqualified         # ⚠ warning
+1F6B8                                      ; fully-qualified     # 🚸 children crossing
+26D4                                       ; fully-qualified     # ⛔ no entry
+1F6AB                                      ; fully-qualified     # 🚫 prohibited
+1F6B3                                      ; fully-qualified     # 🚳 no bicycles
+1F6AD                                      ; fully-qualified     # 🚭 no smoking
+1F6AF                                      ; fully-qualified     # 🚯 no littering
+1F6B1                                      ; fully-qualified     # 🚱 non-potable water
+1F6B7                                      ; fully-qualified     # 🚷 no pedestrians
+1F4F5                                      ; fully-qualified     # 📵 no mobile phones
+1F51E                                      ; fully-qualified     # 🔞 no one under eighteen
+2622 FE0F                                  ; fully-qualified     # ☢️ radioactive
+2622                                       ; unqualified         # ☢ radioactive
+2623 FE0F                                  ; fully-qualified     # ☣️ biohazard
+2623                                       ; unqualified         # ☣ biohazard
+
+# subgroup: arrow
+2B06 FE0F                                  ; fully-qualified     # ⬆️ up arrow
+2B06                                       ; unqualified         # ⬆ up arrow
+2197 FE0F                                  ; fully-qualified     # ↗️ up-right arrow
+2197                                       ; unqualified         # ↗ up-right arrow
+27A1 FE0F                                  ; fully-qualified     # ➡️ right arrow
+27A1                                       ; unqualified         # ➡ right arrow
+2198 FE0F                                  ; fully-qualified     # ↘️ down-right arrow
+2198                                       ; unqualified         # ↘ down-right arrow
+2B07 FE0F                                  ; fully-qualified     # ⬇️ down arrow
+2B07                                       ; unqualified         # ⬇ down arrow
+2199 FE0F                                  ; fully-qualified     # ↙️ down-left arrow
+2199                                       ; unqualified         # ↙ down-left arrow
+2B05 FE0F                                  ; fully-qualified     # ⬅️ left arrow
+2B05                                       ; unqualified         # ⬅ left arrow
+2196 FE0F                                  ; fully-qualified     # ↖️ up-left arrow
+2196                                       ; unqualified         # ↖ up-left arrow
+2195 FE0F                                  ; fully-qualified     # ↕️ up-down arrow
+2195                                       ; unqualified         # ↕ up-down arrow
+2194 FE0F                                  ; fully-qualified     # ↔️ left-right arrow
+2194                                       ; unqualified         # ↔ left-right arrow
+21A9 FE0F                                  ; fully-qualified     # ↩️ right arrow curving left
+21A9                                       ; unqualified         # ↩ right arrow curving left
+21AA FE0F                                  ; fully-qualified     # ↪️ left arrow curving right
+21AA                                       ; unqualified         # ↪ left arrow curving right
+2934 FE0F                                  ; fully-qualified     # ⤴️ right arrow curving up
+2934                                       ; unqualified         # ⤴ right arrow curving up
+2935 FE0F                                  ; fully-qualified     # ⤵️ right arrow curving down
+2935                                       ; unqualified         # ⤵ right arrow curving down
+1F503                                      ; fully-qualified     # 🔃 clockwise vertical arrows
+1F504                                      ; fully-qualified     # 🔄 counterclockwise arrows button
+1F519                                      ; fully-qualified     # 🔙 BACK arrow
+1F51A                                      ; fully-qualified     # 🔚 END arrow
+1F51B                                      ; fully-qualified     # 🔛 ON! arrow
+1F51C                                      ; fully-qualified     # 🔜 SOON arrow
+1F51D                                      ; fully-qualified     # 🔝 TOP arrow
+
+# subgroup: religion
+1F6D0                                      ; fully-qualified     # 🛐 place of worship
+269B FE0F                                  ; fully-qualified     # ⚛️ atom symbol
+269B                                       ; unqualified         # ⚛ atom symbol
+1F549 FE0F                                 ; fully-qualified     # 🕉️ om
+1F549                                      ; unqualified         # 🕉 om
+2721 FE0F                                  ; fully-qualified     # ✡️ star of David
+2721                                       ; unqualified         # ✡ star of David
+2638 FE0F                                  ; fully-qualified     # ☸️ wheel of dharma
+2638                                       ; unqualified         # ☸ wheel of dharma
+262F FE0F                                  ; fully-qualified     # ☯️ yin yang
+262F                                       ; unqualified         # ☯ yin yang
+271D FE0F                                  ; fully-qualified     # ✝️ latin cross
+271D                                       ; unqualified         # ✝ latin cross
+2626 FE0F                                  ; fully-qualified     # ☦️ orthodox cross
+2626                                       ; unqualified         # ☦ orthodox cross
+262A FE0F                                  ; fully-qualified     # ☪️ star and crescent
+262A                                       ; unqualified         # ☪ star and crescent
+262E FE0F                                  ; fully-qualified     # ☮️ peace symbol
+262E                                       ; unqualified         # ☮ peace symbol
+1F54E                                      ; fully-qualified     # 🕎 menorah
+1F52F                                      ; fully-qualified     # 🔯 dotted six-pointed star
+
+# subgroup: zodiac
+2648                                       ; fully-qualified     # ♈ Aries
+2649                                       ; fully-qualified     # ♉ Taurus
+264A                                       ; fully-qualified     # ♊ Gemini
+264B                                       ; fully-qualified     # ♋ Cancer
+264C                                       ; fully-qualified     # ♌ Leo
+264D                                       ; fully-qualified     # ♍ Virgo
+264E                                       ; fully-qualified     # ♎ Libra
+264F                                       ; fully-qualified     # ♏ Scorpio
+2650                                       ; fully-qualified     # ♐ Sagittarius
+2651                                       ; fully-qualified     # ♑ Capricorn
+2652                                       ; fully-qualified     # ♒ Aquarius
+2653                                       ; fully-qualified     # ♓ Pisces
+26CE                                       ; fully-qualified     # ⛎ Ophiuchus
+
+# subgroup: av-symbol
+1F500                                      ; fully-qualified     # 🔀 shuffle tracks button
+1F501                                      ; fully-qualified     # 🔁 repeat button
+1F502                                      ; fully-qualified     # 🔂 repeat single button
+25B6 FE0F                                  ; fully-qualified     # ▶️ play button
+25B6                                       ; unqualified         # ▶ play button
+23E9                                       ; fully-qualified     # ⏩ fast-forward button
+23ED FE0F                                  ; fully-qualified     # ⏭️ next track button
+23ED                                       ; unqualified         # ⏭ next track button
+23EF FE0F                                  ; fully-qualified     # ⏯️ play or pause button
+23EF                                       ; unqualified         # ⏯ play or pause button
+25C0 FE0F                                  ; fully-qualified     # ◀️ reverse button
+25C0                                       ; unqualified         # ◀ reverse button
+23EA                                       ; fully-qualified     # ⏪ fast reverse button
+23EE FE0F                                  ; fully-qualified     # ⏮️ last track button
+23EE                                       ; unqualified         # ⏮ last track button
+1F53C                                      ; fully-qualified     # 🔼 upwards button
+23EB                                       ; fully-qualified     # ⏫ fast up button
+1F53D                                      ; fully-qualified     # 🔽 downwards button
+23EC                                       ; fully-qualified     # ⏬ fast down button
+23F8 FE0F                                  ; fully-qualified     # ⏸️ pause button
+23F8                                       ; unqualified         # ⏸ pause button
+23F9 FE0F                                  ; fully-qualified     # ⏹️ stop button
+23F9                                       ; unqualified         # ⏹ stop button
+23FA FE0F                                  ; fully-qualified     # ⏺️ record button
+23FA                                       ; unqualified         # ⏺ record button
+23CF FE0F                                  ; fully-qualified     # ⏏️ eject button
+23CF                                       ; unqualified         # ⏏ eject button
+1F3A6                                      ; fully-qualified     # 🎦 cinema
+1F505                                      ; fully-qualified     # 🔅 dim button
+1F506                                      ; fully-qualified     # 🔆 bright button
+1F4F6                                      ; fully-qualified     # 📶 antenna bars
+1F4F3                                      ; fully-qualified     # 📳 vibration mode
+1F4F4                                      ; fully-qualified     # 📴 mobile phone off
+
+# subgroup: gender
+2640 FE0F                                  ; fully-qualified     # ♀️ female sign
+2640                                       ; unqualified         # ♀ female sign
+2642 FE0F                                  ; fully-qualified     # ♂️ male sign
+2642                                       ; unqualified         # ♂ male sign
+
+# subgroup: other-symbol
+2695 FE0F                                  ; fully-qualified     # ⚕️ medical symbol
+2695                                       ; unqualified         # ⚕ medical symbol
+267E FE0F                                  ; fully-qualified     # ♾️ infinity
+267E                                       ; unqualified         # ♾ infinity
+267B FE0F                                  ; fully-qualified     # ♻️ recycling symbol
+267B                                       ; unqualified         # ♻ recycling symbol
+269C FE0F                                  ; fully-qualified     # ⚜️ fleur-de-lis
+269C                                       ; unqualified         # ⚜ fleur-de-lis
+1F531                                      ; fully-qualified     # 🔱 trident emblem
+1F4DB                                      ; fully-qualified     # 📛 name badge
+1F530                                      ; fully-qualified     # 🔰 Japanese symbol for beginner
+2B55                                       ; fully-qualified     # ⭕ hollow red circle
+2705                                       ; fully-qualified     # ✅ check mark button
+2611 FE0F                                  ; fully-qualified     # ☑️ check box with check
+2611                                       ; unqualified         # ☑ check box with check
+2714 FE0F                                  ; fully-qualified     # ✔️ check mark
+2714                                       ; unqualified         # ✔ check mark
+2716 FE0F                                  ; fully-qualified     # ✖️ multiplication sign
+2716                                       ; unqualified         # ✖ multiplication sign
+274C                                       ; fully-qualified     # ❌ cross mark
+274E                                       ; fully-qualified     # ❎ cross mark button
+2795                                       ; fully-qualified     # ➕ plus sign
+2796                                       ; fully-qualified     # ➖ minus sign
+2797                                       ; fully-qualified     # ➗ division sign
+27B0                                       ; fully-qualified     # ➰ curly loop
+27BF                                       ; fully-qualified     # ➿ double curly loop
+303D FE0F                                  ; fully-qualified     # 〽️ part alternation mark
+303D                                       ; unqualified         # 〽 part alternation mark
+2733 FE0F                                  ; fully-qualified     # ✳️ eight-spoked asterisk
+2733                                       ; unqualified         # ✳ eight-spoked asterisk
+2734 FE0F                                  ; fully-qualified     # ✴️ eight-pointed star
+2734                                       ; unqualified         # ✴ eight-pointed star
+2747 FE0F                                  ; fully-qualified     # ❇️ sparkle
+2747                                       ; unqualified         # ❇ sparkle
+203C FE0F                                  ; fully-qualified     # ‼️ double exclamation mark
+203C                                       ; unqualified         # ‼ double exclamation mark
+2049 FE0F                                  ; fully-qualified     # ⁉️ exclamation question mark
+2049                                       ; unqualified         # ⁉ exclamation question mark
+2753                                       ; fully-qualified     # ❓ question mark
+2754                                       ; fully-qualified     # ❔ white question mark
+2755                                       ; fully-qualified     # ❕ white exclamation mark
+2757                                       ; fully-qualified     # ❗ exclamation mark
+3030 FE0F                                  ; fully-qualified     # 〰️ wavy dash
+3030                                       ; unqualified         # 〰 wavy dash
+00A9 FE0F                                  ; fully-qualified     # ©️ copyright
+00A9                                       ; unqualified         # © copyright
+00AE FE0F                                  ; fully-qualified     # ®️ registered
+00AE                                       ; unqualified         # ® registered
+2122 FE0F                                  ; fully-qualified     # ™️ trade mark
+2122                                       ; unqualified         # ™ trade mark
+
+# subgroup: keycap
+0023 FE0F 20E3                             ; fully-qualified     # #️⃣ keycap: #
+0023 20E3                                  ; unqualified         # #⃣ keycap: #
+002A FE0F 20E3                             ; fully-qualified     # *️⃣ keycap: *
+002A 20E3                                  ; unqualified         # *⃣ keycap: *
+0030 FE0F 20E3                             ; fully-qualified     # 0️⃣ keycap: 0
+0030 20E3                                  ; unqualified         # 0⃣ keycap: 0
+0031 FE0F 20E3                             ; fully-qualified     # 1️⃣ keycap: 1
+0031 20E3                                  ; unqualified         # 1⃣ keycap: 1
+0032 FE0F 20E3                             ; fully-qualified     # 2️⃣ keycap: 2
+0032 20E3                                  ; unqualified         # 2⃣ keycap: 2
+0033 FE0F 20E3                             ; fully-qualified     # 3️⃣ keycap: 3
+0033 20E3                                  ; unqualified         # 3⃣ keycap: 3
+0034 FE0F 20E3                             ; fully-qualified     # 4️⃣ keycap: 4
+0034 20E3                                  ; unqualified         # 4⃣ keycap: 4
+0035 FE0F 20E3                             ; fully-qualified     # 5️⃣ keycap: 5
+0035 20E3                                  ; unqualified         # 5⃣ keycap: 5
+0036 FE0F 20E3                             ; fully-qualified     # 6️⃣ keycap: 6
+0036 20E3                                  ; unqualified         # 6⃣ keycap: 6
+0037 FE0F 20E3                             ; fully-qualified     # 7️⃣ keycap: 7
+0037 20E3                                  ; unqualified         # 7⃣ keycap: 7
+0038 FE0F 20E3                             ; fully-qualified     # 8️⃣ keycap: 8
+0038 20E3                                  ; unqualified         # 8⃣ keycap: 8
+0039 FE0F 20E3                             ; fully-qualified     # 9️⃣ keycap: 9
+0039 20E3                                  ; unqualified         # 9⃣ keycap: 9
+1F51F                                      ; fully-qualified     # 🔟 keycap: 10
+
+# subgroup: alphanum
+1F520                                      ; fully-qualified     # 🔠 input latin uppercase
+1F521                                      ; fully-qualified     # 🔡 input latin lowercase
+1F522                                      ; fully-qualified     # 🔢 input numbers
+1F523                                      ; fully-qualified     # 🔣 input symbols
+1F524                                      ; fully-qualified     # 🔤 input latin letters
+1F170 FE0F                                 ; fully-qualified     # 🅰️ A button (blood type)
+1F170                                      ; unqualified         # 🅰 A button (blood type)
+1F18E                                      ; fully-qualified     # 🆎 AB button (blood type)
+1F171 FE0F                                 ; fully-qualified     # 🅱️ B button (blood type)
+1F171                                      ; unqualified         # 🅱 B button (blood type)
+1F191                                      ; fully-qualified     # 🆑 CL button
+1F192                                      ; fully-qualified     # 🆒 COOL button
+1F193                                      ; fully-qualified     # 🆓 FREE button
+2139 FE0F                                  ; fully-qualified     # ℹ️ information
+2139                                       ; unqualified         # ℹ information
+1F194                                      ; fully-qualified     # 🆔 ID button
+24C2 FE0F                                  ; fully-qualified     # Ⓜ️ circled M
+24C2                                       ; unqualified         # Ⓜ circled M
+1F195                                      ; fully-qualified     # 🆕 NEW button
+1F196                                      ; fully-qualified     # 🆖 NG button
+1F17E FE0F                                 ; fully-qualified     # 🅾️ O button (blood type)
+1F17E                                      ; unqualified         # 🅾 O button (blood type)
+1F197                                      ; fully-qualified     # 🆗 OK button
+1F17F FE0F                                 ; fully-qualified     # 🅿️ P button
+1F17F                                      ; unqualified         # 🅿 P button
+1F198                                      ; fully-qualified     # 🆘 SOS button
+1F199                                      ; fully-qualified     # 🆙 UP! button
+1F19A                                      ; fully-qualified     # 🆚 VS button
+1F201                                      ; fully-qualified     # 🈁 Japanese “here” button
+1F202 FE0F                                 ; fully-qualified     # 🈂️ Japanese “service charge” button
+1F202                                      ; unqualified         # 🈂 Japanese “service charge” button
+1F237 FE0F                                 ; fully-qualified     # 🈷️ Japanese “monthly amount” button
+1F237                                      ; unqualified         # 🈷 Japanese “monthly amount” button
+1F236                                      ; fully-qualified     # 🈶 Japanese “not free of charge” button
+1F22F                                      ; fully-qualified     # 🈯 Japanese “reserved” button
+1F250                                      ; fully-qualified     # 🉐 Japanese “bargain” button
+1F239                                      ; fully-qualified     # 🈹 Japanese “discount” button
+1F21A                                      ; fully-qualified     # 🈚 Japanese “free of charge” button
+1F232                                      ; fully-qualified     # 🈲 Japanese “prohibited” button
+1F251                                      ; fully-qualified     # 🉑 Japanese “acceptable” button
+1F238                                      ; fully-qualified     # 🈸 Japanese “application” button
+1F234                                      ; fully-qualified     # 🈴 Japanese “passing grade” button
+1F233                                      ; fully-qualified     # 🈳 Japanese “vacancy” button
+3297 FE0F                                  ; fully-qualified     # ㊗️ Japanese “congratulations” button
+3297                                       ; unqualified         # ㊗ Japanese “congratulations” button
+3299 FE0F                                  ; fully-qualified     # ㊙️ Japanese “secret” button
+3299                                       ; unqualified         # ㊙ Japanese “secret” button
+1F23A                                      ; fully-qualified     # 🈺 Japanese “open for business” button
+1F235                                      ; fully-qualified     # 🈵 Japanese “no vacancy” button
+
+# subgroup: geometric
+1F534                                      ; fully-qualified     # 🔴 red circle
+1F7E0                                      ; fully-qualified     # 🟠 orange circle
+1F7E1                                      ; fully-qualified     # 🟡 yellow circle
+1F7E2                                      ; fully-qualified     # 🟢 green circle
+1F535                                      ; fully-qualified     # 🔵 blue circle
+1F7E3                                      ; fully-qualified     # 🟣 purple circle
+1F7E4                                      ; fully-qualified     # 🟤 brown circle
+26AB                                       ; fully-qualified     # ⚫ black circle
+26AA                                       ; fully-qualified     # ⚪ white circle
+1F7E5                                      ; fully-qualified     # 🟥 red square
+1F7E7                                      ; fully-qualified     # 🟧 orange square
+1F7E8                                      ; fully-qualified     # 🟨 yellow square
+1F7E9                                      ; fully-qualified     # 🟩 green square
+1F7E6                                      ; fully-qualified     # 🟦 blue square
+1F7EA                                      ; fully-qualified     # 🟪 purple square
+1F7EB                                      ; fully-qualified     # 🟫 brown square
+2B1B                                       ; fully-qualified     # ⬛ black large square
+2B1C                                       ; fully-qualified     # ⬜ white large square
+25FC FE0F                                  ; fully-qualified     # ◼️ black medium square
+25FC                                       ; unqualified         # ◼ black medium square
+25FB FE0F                                  ; fully-qualified     # ◻️ white medium square
+25FB                                       ; unqualified         # ◻ white medium square
+25FE                                       ; fully-qualified     # ◾ black medium-small square
+25FD                                       ; fully-qualified     # ◽ white medium-small square
+25AA FE0F                                  ; fully-qualified     # ▪️ black small square
+25AA                                       ; unqualified         # ▪ black small square
+25AB FE0F                                  ; fully-qualified     # ▫️ white small square
+25AB                                       ; unqualified         # ▫ white small square
+1F536                                      ; fully-qualified     # 🔶 large orange diamond
+1F537                                      ; fully-qualified     # 🔷 large blue diamond
+1F538                                      ; fully-qualified     # 🔸 small orange diamond
+1F539                                      ; fully-qualified     # 🔹 small blue diamond
+1F53A                                      ; fully-qualified     # 🔺 red triangle pointed up
+1F53B                                      ; fully-qualified     # 🔻 red triangle pointed down
+1F4A0                                      ; fully-qualified     # 💠 diamond with a dot
+1F518                                      ; fully-qualified     # 🔘 radio button
+1F533                                      ; fully-qualified     # 🔳 white square button
+1F532                                      ; fully-qualified     # 🔲 black square button
+
+# Symbols subtotal:		297
+# Symbols subtotal:		297	w/o modifiers
+
+# group: Flags
+
+# subgroup: flag
+1F3C1                                      ; fully-qualified     # 🏁 chequered flag
+1F6A9                                      ; fully-qualified     # 🚩 triangular flag
+1F38C                                      ; fully-qualified     # 🎌 crossed flags
+1F3F4                                      ; fully-qualified     # 🏴 black flag
+1F3F3 FE0F                                 ; fully-qualified     # 🏳️ white flag
+1F3F3                                      ; unqualified         # 🏳 white flag
+1F3F3 FE0F 200D 1F308                      ; fully-qualified     # 🏳️‍🌈 rainbow flag
+1F3F3 200D 1F308                           ; unqualified         # 🏳‍🌈 rainbow flag
+1F3F4 200D 2620 FE0F                       ; fully-qualified     # 🏴‍☠️ pirate flag
+1F3F4 200D 2620                            ; minimally-qualified # 🏴‍☠ pirate flag
+
+# subgroup: country-flag
+1F1E6 1F1E8                                ; fully-qualified     # 🇦🇨 flag: Ascension Island
+1F1E6 1F1E9                                ; fully-qualified     # 🇦🇩 flag: Andorra
+1F1E6 1F1EA                                ; fully-qualified     # 🇦🇪 flag: United Arab Emirates
+1F1E6 1F1EB                                ; fully-qualified     # 🇦🇫 flag: Afghanistan
+1F1E6 1F1EC                                ; fully-qualified     # 🇦🇬 flag: Antigua & Barbuda
+1F1E6 1F1EE                                ; fully-qualified     # 🇦🇮 flag: Anguilla
+1F1E6 1F1F1                                ; fully-qualified     # 🇦🇱 flag: Albania
+1F1E6 1F1F2                                ; fully-qualified     # 🇦🇲 flag: Armenia
+1F1E6 1F1F4                                ; fully-qualified     # 🇦🇴 flag: Angola
+1F1E6 1F1F6                                ; fully-qualified     # 🇦🇶 flag: Antarctica
+1F1E6 1F1F7                                ; fully-qualified     # 🇦🇷 flag: Argentina
+1F1E6 1F1F8                                ; fully-qualified     # 🇦🇸 flag: American Samoa
+1F1E6 1F1F9                                ; fully-qualified     # 🇦🇹 flag: Austria
+1F1E6 1F1FA                                ; fully-qualified     # 🇦🇺 flag: Australia
+1F1E6 1F1FC                                ; fully-qualified     # 🇦🇼 flag: Aruba
+1F1E6 1F1FD                                ; fully-qualified     # 🇦🇽 flag: Åland Islands
+1F1E6 1F1FF                                ; fully-qualified     # 🇦🇿 flag: Azerbaijan
+1F1E7 1F1E6                                ; fully-qualified     # 🇧🇦 flag: Bosnia & Herzegovina
+1F1E7 1F1E7                                ; fully-qualified     # 🇧🇧 flag: Barbados
+1F1E7 1F1E9                                ; fully-qualified     # 🇧🇩 flag: Bangladesh
+1F1E7 1F1EA                                ; fully-qualified     # 🇧🇪 flag: Belgium
+1F1E7 1F1EB                                ; fully-qualified     # 🇧🇫 flag: Burkina Faso
+1F1E7 1F1EC                                ; fully-qualified     # 🇧🇬 flag: Bulgaria
+1F1E7 1F1ED                                ; fully-qualified     # 🇧🇭 flag: Bahrain
+1F1E7 1F1EE                                ; fully-qualified     # 🇧🇮 flag: Burundi
+1F1E7 1F1EF                                ; fully-qualified     # 🇧🇯 flag: Benin
+1F1E7 1F1F1                                ; fully-qualified     # 🇧🇱 flag: St. Barthélemy
+1F1E7 1F1F2                                ; fully-qualified     # 🇧🇲 flag: Bermuda
+1F1E7 1F1F3                                ; fully-qualified     # 🇧🇳 flag: Brunei
+1F1E7 1F1F4                                ; fully-qualified     # 🇧🇴 flag: Bolivia
+1F1E7 1F1F6                                ; fully-qualified     # 🇧🇶 flag: Caribbean Netherlands
+1F1E7 1F1F7                                ; fully-qualified     # 🇧🇷 flag: Brazil
+1F1E7 1F1F8                                ; fully-qualified     # 🇧🇸 flag: Bahamas
+1F1E7 1F1F9                                ; fully-qualified     # 🇧🇹 flag: Bhutan
+1F1E7 1F1FB                                ; fully-qualified     # 🇧🇻 flag: Bouvet Island
+1F1E7 1F1FC                                ; fully-qualified     # 🇧🇼 flag: Botswana
+1F1E7 1F1FE                                ; fully-qualified     # 🇧🇾 flag: Belarus
+1F1E7 1F1FF                                ; fully-qualified     # 🇧🇿 flag: Belize
+1F1E8 1F1E6                                ; fully-qualified     # 🇨🇦 flag: Canada
+1F1E8 1F1E8                                ; fully-qualified     # 🇨🇨 flag: Cocos (Keeling) Islands
+1F1E8 1F1E9                                ; fully-qualified     # 🇨🇩 flag: Congo - Kinshasa
+1F1E8 1F1EB                                ; fully-qualified     # 🇨🇫 flag: Central African Republic
+1F1E8 1F1EC                                ; fully-qualified     # 🇨🇬 flag: Congo - Brazzaville
+1F1E8 1F1ED                                ; fully-qualified     # 🇨🇭 flag: Switzerland
+1F1E8 1F1EE                                ; fully-qualified     # 🇨🇮 flag: Côte d’Ivoire
+1F1E8 1F1F0                                ; fully-qualified     # 🇨🇰 flag: Cook Islands
+1F1E8 1F1F1                                ; fully-qualified     # 🇨🇱 flag: Chile
+1F1E8 1F1F2                                ; fully-qualified     # 🇨🇲 flag: Cameroon
+1F1E8 1F1F3                                ; fully-qualified     # 🇨🇳 flag: China
+1F1E8 1F1F4                                ; fully-qualified     # 🇨🇴 flag: Colombia
+1F1E8 1F1F5                                ; fully-qualified     # 🇨🇵 flag: Clipperton Island
+1F1E8 1F1F7                                ; fully-qualified     # 🇨🇷 flag: Costa Rica
+1F1E8 1F1FA                                ; fully-qualified     # 🇨🇺 flag: Cuba
+1F1E8 1F1FB                                ; fully-qualified     # 🇨🇻 flag: Cape Verde
+1F1E8 1F1FC                                ; fully-qualified     # 🇨🇼 flag: Curaçao
+1F1E8 1F1FD                                ; fully-qualified     # 🇨🇽 flag: Christmas Island
+1F1E8 1F1FE                                ; fully-qualified     # 🇨🇾 flag: Cyprus
+1F1E8 1F1FF                                ; fully-qualified     # 🇨🇿 flag: Czechia
+1F1E9 1F1EA                                ; fully-qualified     # 🇩🇪 flag: Germany
+1F1E9 1F1EC                                ; fully-qualified     # 🇩🇬 flag: Diego Garcia
+1F1E9 1F1EF                                ; fully-qualified     # 🇩🇯 flag: Djibouti
+1F1E9 1F1F0                                ; fully-qualified     # 🇩🇰 flag: Denmark
+1F1E9 1F1F2                                ; fully-qualified     # 🇩🇲 flag: Dominica
+1F1E9 1F1F4                                ; fully-qualified     # 🇩🇴 flag: Dominican Republic
+1F1E9 1F1FF                                ; fully-qualified     # 🇩🇿 flag: Algeria
+1F1EA 1F1E6                                ; fully-qualified     # 🇪🇦 flag: Ceuta & Melilla
+1F1EA 1F1E8                                ; fully-qualified     # 🇪🇨 flag: Ecuador
+1F1EA 1F1EA                                ; fully-qualified     # 🇪🇪 flag: Estonia
+1F1EA 1F1EC                                ; fully-qualified     # 🇪🇬 flag: Egypt
+1F1EA 1F1ED                                ; fully-qualified     # 🇪🇭 flag: Western Sahara
+1F1EA 1F1F7                                ; fully-qualified     # 🇪🇷 flag: Eritrea
+1F1EA 1F1F8                                ; fully-qualified     # 🇪🇸 flag: Spain
+1F1EA 1F1F9                                ; fully-qualified     # 🇪🇹 flag: Ethiopia
+1F1EA 1F1FA                                ; fully-qualified     # 🇪🇺 flag: European Union
+1F1EB 1F1EE                                ; fully-qualified     # 🇫🇮 flag: Finland
+1F1EB 1F1EF                                ; fully-qualified     # 🇫🇯 flag: Fiji
+1F1EB 1F1F0                                ; fully-qualified     # 🇫🇰 flag: Falkland Islands
+1F1EB 1F1F2                                ; fully-qualified     # 🇫🇲 flag: Micronesia
+1F1EB 1F1F4                                ; fully-qualified     # 🇫🇴 flag: Faroe Islands
+1F1EB 1F1F7                                ; fully-qualified     # 🇫🇷 flag: France
+1F1EC 1F1E6                                ; fully-qualified     # 🇬🇦 flag: Gabon
+1F1EC 1F1E7                                ; fully-qualified     # 🇬🇧 flag: United Kingdom
+1F1EC 1F1E9                                ; fully-qualified     # 🇬🇩 flag: Grenada
+1F1EC 1F1EA                                ; fully-qualified     # 🇬🇪 flag: Georgia
+1F1EC 1F1EB                                ; fully-qualified     # 🇬🇫 flag: French Guiana
+1F1EC 1F1EC                                ; fully-qualified     # 🇬🇬 flag: Guernsey
+1F1EC 1F1ED                                ; fully-qualified     # 🇬🇭 flag: Ghana
+1F1EC 1F1EE                                ; fully-qualified     # 🇬🇮 flag: Gibraltar
+1F1EC 1F1F1                                ; fully-qualified     # 🇬🇱 flag: Greenland
+1F1EC 1F1F2                                ; fully-qualified     # 🇬🇲 flag: Gambia
+1F1EC 1F1F3                                ; fully-qualified     # 🇬🇳 flag: Guinea
+1F1EC 1F1F5                                ; fully-qualified     # 🇬🇵 flag: Guadeloupe
+1F1EC 1F1F6                                ; fully-qualified     # 🇬🇶 flag: Equatorial Guinea
+1F1EC 1F1F7                                ; fully-qualified     # 🇬🇷 flag: Greece
+1F1EC 1F1F8                                ; fully-qualified     # 🇬🇸 flag: South Georgia & South Sandwich Islands
+1F1EC 1F1F9                                ; fully-qualified     # 🇬🇹 flag: Guatemala
+1F1EC 1F1FA                                ; fully-qualified     # 🇬🇺 flag: Guam
+1F1EC 1F1FC                                ; fully-qualified     # 🇬🇼 flag: Guinea-Bissau
+1F1EC 1F1FE                                ; fully-qualified     # 🇬🇾 flag: Guyana
+1F1ED 1F1F0                                ; fully-qualified     # 🇭🇰 flag: Hong Kong SAR China
+1F1ED 1F1F2                                ; fully-qualified     # 🇭🇲 flag: Heard & McDonald Islands
+1F1ED 1F1F3                                ; fully-qualified     # 🇭🇳 flag: Honduras
+1F1ED 1F1F7                                ; fully-qualified     # 🇭🇷 flag: Croatia
+1F1ED 1F1F9                                ; fully-qualified     # 🇭🇹 flag: Haiti
+1F1ED 1F1FA                                ; fully-qualified     # 🇭🇺 flag: Hungary
+1F1EE 1F1E8                                ; fully-qualified     # 🇮🇨 flag: Canary Islands
+1F1EE 1F1E9                                ; fully-qualified     # 🇮🇩 flag: Indonesia
+1F1EE 1F1EA                                ; fully-qualified     # 🇮🇪 flag: Ireland
+1F1EE 1F1F1                                ; fully-qualified     # 🇮🇱 flag: Israel
+1F1EE 1F1F2                                ; fully-qualified     # 🇮🇲 flag: Isle of Man
+1F1EE 1F1F3                                ; fully-qualified     # 🇮🇳 flag: India
+1F1EE 1F1F4                                ; fully-qualified     # 🇮🇴 flag: British Indian Ocean Territory
+1F1EE 1F1F6                                ; fully-qualified     # 🇮🇶 flag: Iraq
+1F1EE 1F1F7                                ; fully-qualified     # 🇮🇷 flag: Iran
+1F1EE 1F1F8                                ; fully-qualified     # 🇮🇸 flag: Iceland
+1F1EE 1F1F9                                ; fully-qualified     # 🇮🇹 flag: Italy
+1F1EF 1F1EA                                ; fully-qualified     # 🇯🇪 flag: Jersey
+1F1EF 1F1F2                                ; fully-qualified     # 🇯🇲 flag: Jamaica
+1F1EF 1F1F4                                ; fully-qualified     # 🇯🇴 flag: Jordan
+1F1EF 1F1F5                                ; fully-qualified     # 🇯🇵 flag: Japan
+1F1F0 1F1EA                                ; fully-qualified     # 🇰🇪 flag: Kenya
+1F1F0 1F1EC                                ; fully-qualified     # 🇰🇬 flag: Kyrgyzstan
+1F1F0 1F1ED                                ; fully-qualified     # 🇰🇭 flag: Cambodia
+1F1F0 1F1EE                                ; fully-qualified     # 🇰🇮 flag: Kiribati
+1F1F0 1F1F2                                ; fully-qualified     # 🇰🇲 flag: Comoros
+1F1F0 1F1F3                                ; fully-qualified     # 🇰🇳 flag: St. Kitts & Nevis
+1F1F0 1F1F5                                ; fully-qualified     # 🇰🇵 flag: North Korea
+1F1F0 1F1F7                                ; fully-qualified     # 🇰🇷 flag: South Korea
+1F1F0 1F1FC                                ; fully-qualified     # 🇰🇼 flag: Kuwait
+1F1F0 1F1FE                                ; fully-qualified     # 🇰🇾 flag: Cayman Islands
+1F1F0 1F1FF                                ; fully-qualified     # 🇰🇿 flag: Kazakhstan
+1F1F1 1F1E6                                ; fully-qualified     # 🇱🇦 flag: Laos
+1F1F1 1F1E7                                ; fully-qualified     # 🇱🇧 flag: Lebanon
+1F1F1 1F1E8                                ; fully-qualified     # 🇱🇨 flag: St. Lucia
+1F1F1 1F1EE                                ; fully-qualified     # 🇱🇮 flag: Liechtenstein
+1F1F1 1F1F0                                ; fully-qualified     # 🇱🇰 flag: Sri Lanka
+1F1F1 1F1F7                                ; fully-qualified     # 🇱🇷 flag: Liberia
+1F1F1 1F1F8                                ; fully-qualified     # 🇱🇸 flag: Lesotho
+1F1F1 1F1F9                                ; fully-qualified     # 🇱🇹 flag: Lithuania
+1F1F1 1F1FA                                ; fully-qualified     # 🇱🇺 flag: Luxembourg
+1F1F1 1F1FB                                ; fully-qualified     # 🇱🇻 flag: Latvia
+1F1F1 1F1FE                                ; fully-qualified     # 🇱🇾 flag: Libya
+1F1F2 1F1E6                                ; fully-qualified     # 🇲🇦 flag: Morocco
+1F1F2 1F1E8                                ; fully-qualified     # 🇲🇨 flag: Monaco
+1F1F2 1F1E9                                ; fully-qualified     # 🇲🇩 flag: Moldova
+1F1F2 1F1EA                                ; fully-qualified     # 🇲🇪 flag: Montenegro
+1F1F2 1F1EB                                ; fully-qualified     # 🇲🇫 flag: St. Martin
+1F1F2 1F1EC                                ; fully-qualified     # 🇲🇬 flag: Madagascar
+1F1F2 1F1ED                                ; fully-qualified     # 🇲🇭 flag: Marshall Islands
+1F1F2 1F1F0                                ; fully-qualified     # 🇲🇰 flag: Macedonia
+1F1F2 1F1F1                                ; fully-qualified     # 🇲🇱 flag: Mali
+1F1F2 1F1F2                                ; fully-qualified     # 🇲🇲 flag: Myanmar (Burma)
+1F1F2 1F1F3                                ; fully-qualified     # 🇲🇳 flag: Mongolia
+1F1F2 1F1F4                                ; fully-qualified     # 🇲🇴 flag: Macao SAR China
+1F1F2 1F1F5                                ; fully-qualified     # 🇲🇵 flag: Northern Mariana Islands
+1F1F2 1F1F6                                ; fully-qualified     # 🇲🇶 flag: Martinique
+1F1F2 1F1F7                                ; fully-qualified     # 🇲🇷 flag: Mauritania
+1F1F2 1F1F8                                ; fully-qualified     # 🇲🇸 flag: Montserrat
+1F1F2 1F1F9                                ; fully-qualified     # 🇲🇹 flag: Malta
+1F1F2 1F1FA                                ; fully-qualified     # 🇲🇺 flag: Mauritius
+1F1F2 1F1FB                                ; fully-qualified     # 🇲🇻 flag: Maldives
+1F1F2 1F1FC                                ; fully-qualified     # 🇲🇼 flag: Malawi
+1F1F2 1F1FD                                ; fully-qualified     # 🇲🇽 flag: Mexico
+1F1F2 1F1FE                                ; fully-qualified     # 🇲🇾 flag: Malaysia
+1F1F2 1F1FF                                ; fully-qualified     # 🇲🇿 flag: Mozambique
+1F1F3 1F1E6                                ; fully-qualified     # 🇳🇦 flag: Namibia
+1F1F3 1F1E8                                ; fully-qualified     # 🇳🇨 flag: New Caledonia
+1F1F3 1F1EA                                ; fully-qualified     # 🇳🇪 flag: Niger
+1F1F3 1F1EB                                ; fully-qualified     # 🇳🇫 flag: Norfolk Island
+1F1F3 1F1EC                                ; fully-qualified     # 🇳🇬 flag: Nigeria
+1F1F3 1F1EE                                ; fully-qualified     # 🇳🇮 flag: Nicaragua
+1F1F3 1F1F1                                ; fully-qualified     # 🇳🇱 flag: Netherlands
+1F1F3 1F1F4                                ; fully-qualified     # 🇳🇴 flag: Norway
+1F1F3 1F1F5                                ; fully-qualified     # 🇳🇵 flag: Nepal
+1F1F3 1F1F7                                ; fully-qualified     # 🇳🇷 flag: Nauru
+1F1F3 1F1FA                                ; fully-qualified     # 🇳🇺 flag: Niue
+1F1F3 1F1FF                                ; fully-qualified     # 🇳🇿 flag: New Zealand
+1F1F4 1F1F2                                ; fully-qualified     # 🇴🇲 flag: Oman
+1F1F5 1F1E6                                ; fully-qualified     # 🇵🇦 flag: Panama
+1F1F5 1F1EA                                ; fully-qualified     # 🇵🇪 flag: Peru
+1F1F5 1F1EB                                ; fully-qualified     # 🇵🇫 flag: French Polynesia
+1F1F5 1F1EC                                ; fully-qualified     # 🇵🇬 flag: Papua New Guinea
+1F1F5 1F1ED                                ; fully-qualified     # 🇵🇭 flag: Philippines
+1F1F5 1F1F0                                ; fully-qualified     # 🇵🇰 flag: Pakistan
+1F1F5 1F1F1                                ; fully-qualified     # 🇵🇱 flag: Poland
+1F1F5 1F1F2                                ; fully-qualified     # 🇵🇲 flag: St. Pierre & Miquelon
+1F1F5 1F1F3                                ; fully-qualified     # 🇵🇳 flag: Pitcairn Islands
+1F1F5 1F1F7                                ; fully-qualified     # 🇵🇷 flag: Puerto Rico
+1F1F5 1F1F8                                ; fully-qualified     # 🇵🇸 flag: Palestinian Territories
+1F1F5 1F1F9                                ; fully-qualified     # 🇵🇹 flag: Portugal
+1F1F5 1F1FC                                ; fully-qualified     # 🇵🇼 flag: Palau
+1F1F5 1F1FE                                ; fully-qualified     # 🇵🇾 flag: Paraguay
+1F1F6 1F1E6                                ; fully-qualified     # 🇶🇦 flag: Qatar
+1F1F7 1F1EA                                ; fully-qualified     # 🇷🇪 flag: Réunion
+1F1F7 1F1F4                                ; fully-qualified     # 🇷🇴 flag: Romania
+1F1F7 1F1F8                                ; fully-qualified     # 🇷🇸 flag: Serbia
+1F1F7 1F1FA                                ; fully-qualified     # 🇷🇺 flag: Russia
+1F1F7 1F1FC                                ; fully-qualified     # 🇷🇼 flag: Rwanda
+1F1F8 1F1E6                                ; fully-qualified     # 🇸🇦 flag: Saudi Arabia
+1F1F8 1F1E7                                ; fully-qualified     # 🇸🇧 flag: Solomon Islands
+1F1F8 1F1E8                                ; fully-qualified     # 🇸🇨 flag: Seychelles
+1F1F8 1F1E9                                ; fully-qualified     # 🇸🇩 flag: Sudan
+1F1F8 1F1EA                                ; fully-qualified     # 🇸🇪 flag: Sweden
+1F1F8 1F1EC                                ; fully-qualified     # 🇸🇬 flag: Singapore
+1F1F8 1F1ED                                ; fully-qualified     # 🇸🇭 flag: St. Helena
+1F1F8 1F1EE                                ; fully-qualified     # 🇸🇮 flag: Slovenia
+1F1F8 1F1EF                                ; fully-qualified     # 🇸🇯 flag: Svalbard & Jan Mayen
+1F1F8 1F1F0                                ; fully-qualified     # 🇸🇰 flag: Slovakia
+1F1F8 1F1F1                                ; fully-qualified     # 🇸🇱 flag: Sierra Leone
+1F1F8 1F1F2                                ; fully-qualified     # 🇸🇲 flag: San Marino
+1F1F8 1F1F3                                ; fully-qualified     # 🇸🇳 flag: Senegal
+1F1F8 1F1F4                                ; fully-qualified     # 🇸🇴 flag: Somalia
+1F1F8 1F1F7                                ; fully-qualified     # 🇸🇷 flag: Suriname
+1F1F8 1F1F8                                ; fully-qualified     # 🇸🇸 flag: South Sudan
+1F1F8 1F1F9                                ; fully-qualified     # 🇸🇹 flag: São Tomé & Príncipe
+1F1F8 1F1FB                                ; fully-qualified     # 🇸🇻 flag: El Salvador
+1F1F8 1F1FD                                ; fully-qualified     # 🇸🇽 flag: Sint Maarten
+1F1F8 1F1FE                                ; fully-qualified     # 🇸🇾 flag: Syria
+1F1F8 1F1FF                                ; fully-qualified     # 🇸🇿 flag: Eswatini
+1F1F9 1F1E6                                ; fully-qualified     # 🇹🇦 flag: Tristan da Cunha
+1F1F9 1F1E8                                ; fully-qualified     # 🇹🇨 flag: Turks & Caicos Islands
+1F1F9 1F1E9                                ; fully-qualified     # 🇹🇩 flag: Chad
+1F1F9 1F1EB                                ; fully-qualified     # 🇹🇫 flag: French Southern Territories
+1F1F9 1F1EC                                ; fully-qualified     # 🇹🇬 flag: Togo
+1F1F9 1F1ED                                ; fully-qualified     # 🇹🇭 flag: Thailand
+1F1F9 1F1EF                                ; fully-qualified     # 🇹🇯 flag: Tajikistan
+1F1F9 1F1F0                                ; fully-qualified     # 🇹🇰 flag: Tokelau
+1F1F9 1F1F1                                ; fully-qualified     # 🇹🇱 flag: Timor-Leste
+1F1F9 1F1F2                                ; fully-qualified     # 🇹🇲 flag: Turkmenistan
+1F1F9 1F1F3                                ; fully-qualified     # 🇹🇳 flag: Tunisia
+1F1F9 1F1F4                                ; fully-qualified     # 🇹🇴 flag: Tonga
+1F1F9 1F1F7                                ; fully-qualified     # 🇹🇷 flag: Turkey
+1F1F9 1F1F9                                ; fully-qualified     # 🇹🇹 flag: Trinidad & Tobago
+1F1F9 1F1FB                                ; fully-qualified     # 🇹🇻 flag: Tuvalu
+1F1F9 1F1FC                                ; fully-qualified     # 🇹🇼 flag: Taiwan
+1F1F9 1F1FF                                ; fully-qualified     # 🇹🇿 flag: Tanzania
+1F1FA 1F1E6                                ; fully-qualified     # 🇺🇦 flag: Ukraine
+1F1FA 1F1EC                                ; fully-qualified     # 🇺🇬 flag: Uganda
+1F1FA 1F1F2                                ; fully-qualified     # 🇺🇲 flag: U.S. Outlying Islands
+1F1FA 1F1F3                                ; fully-qualified     # 🇺🇳 flag: United Nations
+1F1FA 1F1F8                                ; fully-qualified     # 🇺🇸 flag: United States
+1F1FA 1F1FE                                ; fully-qualified     # 🇺🇾 flag: Uruguay
+1F1FA 1F1FF                                ; fully-qualified     # 🇺🇿 flag: Uzbekistan
+1F1FB 1F1E6                                ; fully-qualified     # 🇻🇦 flag: Vatican City
+1F1FB 1F1E8                                ; fully-qualified     # 🇻🇨 flag: St. Vincent & Grenadines
+1F1FB 1F1EA                                ; fully-qualified     # 🇻🇪 flag: Venezuela
+1F1FB 1F1EC                                ; fully-qualified     # 🇻🇬 flag: British Virgin Islands
+1F1FB 1F1EE                                ; fully-qualified     # 🇻🇮 flag: U.S. Virgin Islands
+1F1FB 1F1F3                                ; fully-qualified     # 🇻🇳 flag: Vietnam
+1F1FB 1F1FA                                ; fully-qualified     # 🇻🇺 flag: Vanuatu
+1F1FC 1F1EB                                ; fully-qualified     # 🇼🇫 flag: Wallis & Futuna
+1F1FC 1F1F8                                ; fully-qualified     # 🇼🇸 flag: Samoa
+1F1FD 1F1F0                                ; fully-qualified     # 🇽🇰 flag: Kosovo
+1F1FE 1F1EA                                ; fully-qualified     # 🇾🇪 flag: Yemen
+1F1FE 1F1F9                                ; fully-qualified     # 🇾🇹 flag: Mayotte
+1F1FF 1F1E6                                ; fully-qualified     # 🇿🇦 flag: South Africa
+1F1FF 1F1F2                                ; fully-qualified     # 🇿🇲 flag: Zambia
+1F1FF 1F1FC                                ; fully-qualified     # 🇿🇼 flag: Zimbabwe
+
+# subgroup: subdivision-flag
+1F3F4 E0067 E0062 E0065 E006E E0067 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁥󠁮󠁧󠁿 flag: England
+1F3F4 E0067 E0062 E0073 E0063 E0074 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁳󠁣󠁴󠁿 flag: Scotland
+1F3F4 E0067 E0062 E0077 E006C E0073 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁷󠁬󠁳󠁿 flag: Wales
+
+# Flags subtotal:		271
+# Flags subtotal:		271	w/o modifiers
+
+# Status Counts
+# fully-qualified : 3010
+# minimally-qualified : 571
+# unqualified : 246
+# component : 9
+
+#EOF
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index 876011957..f9e476ebf 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -15,9 +15,6 @@ _omz_emoji_plugin_dir="${0:h}"
 
 local LC_ALL=en_US.UTF-8
 
-typeset -gAH emoji_groups
-typeset -gAH emoji_con
-typeset -gAH emoji2
 typeset -gAH emoji_skintone
 
 source "$_omz_emoji_plugin_dir/emoji-char-definitions.zsh"
@@ -30,7 +27,6 @@ unset _omz_emoji_plugin_dir
 # 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.
-#emoji[combining_enclosing_keycap]="\U20E3"
 
 emoji[regional_indicator_symbol_letter_d_regional_indicator_symbol_letter_e]=$'\xF0\x9F\x87\xA9\xF0\x9F\x87\xAA'
 emoji[regional_indicator_symbol_letter_g_regional_indicator_symbol_letter_b]=$'\xF0\x9F\x87\xAC\xF0\x9F\x87\xA7'
@@ -43,209 +39,12 @@ emoji[regional_indicator_symbol_letter_i_regional_indicator_symbol_letter_t]=$'\
 emoji[regional_indicator_symbol_letter_u_regional_indicator_symbol_letter_s]=$'\xF0\x9F\x87\xBA\xF0\x9F\x87\xB8'
 emoji[regional_indicator_symbol_letter_r_regional_indicator_symbol_letter_u]=$'\xF0\x9F\x87\xB7\xF0\x9F\x87\xBA'
 
-# Nonstandard alias names
-emoji[vulcan_salute]=$'\U1F596'
-
-
-# Emoji combining and auxiliary characters
-
-# "Variation Selectors" for controlling text vs emoji style presentation
-# These apply to the immediately preceding character
-emoji2[text_style]=$'\UFE0E'
-emoji2[emoji_style]=$'\UFE0F'
-# Joiner that indicates a single combined-form glyph (ligature) should be used
-emoji2[zero_width_joiner]=$'\U200D'
-# Skin tone modifiers
-emoji2[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB'
-emoji2[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC'
-emoji2[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD'
-emoji2[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE'
-emoji2[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF'
-# Various other combining characters. (Incomplete list; I selected ones that sound useful)
-emoji2[combining_enclosing_circle]=$'\U20DD'
-emoji2[combining_enclosing_square]=$'\U20DE'
-emoji2[combining_enclosing_diamond]=$'\U20DF'
-emoji2[combining_enclosing_circle_backslash]=$'\U20E0'
-emoji2[combining_enclosing_screen]=$'\U20E2'
-emoji2[combining_enclosing_keycap]=$'\U20E3'
-emoji2[combining_enclosing_upward_pointing_triangle]=$'\U20E4'
-
 # Easier access to skin tone modifiers
 emoji_skintone[1_2]=$'\U1F3FB'
 emoji_skintone[3]=$'\U1F3FC'
 emoji_skintone[4]=$'\U1F3FD'
 emoji_skintone[5]=$'\U1F3FE'
 emoji_skintone[6]=$'\U1F3FF'
-
-# Emoji groups
-# These are stored in a single associative array, $emoji_groups, to avoid cluttering up the global
-# namespace, and to allow adding additional group definitions at run time.
-# The keys are the group names, and the values are whitespace-separated lists of emoji character names.
-
-emoji_groups[fruits]="
-  tomato
-  aubergine
-  grapes
-  melon
-  watermelon
-  tangerine
-  banana
-  pineapple
-  red_apple
-  green_apple
-  peach
-  cherries
-  strawberry
-  lemon
-  pear
-"
-
-emoji_groups[vehicles]="
-  airplane
-  rocket
-  railway_car
-  high_speed_train
-  high_speed_train_with_bullet_nose
-  bus
-  ambulance
-  fire_engine
-  police_car
-  taxi
-  automobile
-  recreational_vehicle
-  delivery_truck
-  ship
-  speedboat
-  bicycle
-  helicopter
-  steam_locomotive
-  train
-  light_rail
-  tram
-  oncoming_bus
-  trolleybus
-  minibus
-  oncoming_police_car
-  oncoming_taxi
-  oncoming_automobile
-  articulated_lorry
-  tractor
-  monorail
-  mountain_railway
-  suspension_railway
-  mountain_cableway
-  aerial_tramway
-  rowboat
-  bicyclist
-  mountain_bicyclist
-  sailboat
-"
-
-emoji_groups[animals]="
-  snail
-  snake
-  horse
-  sheep
-  monkey
-  chicken
-  boar
-  elephant
-  octopus
-  spiral_shell
-  bug
-  ant
-  honeybee
-  lady_beetle
-  fish
-  tropical_fish
-  blowfish
-  turtle
-  hatching_chick
-  baby_chick
-  front_facing_baby_chick
-  bird
-  penguin
-  koala
-  poodle
-  bactrian_camel
-  dolphin
-  mouse_face
-  cow_face
-  tiger_face
-  rabbit_face
-  cat_face
-  dragon_face
-  spouting_whale
-  horse_face
-  monkey_face
-  dog_face
-  pig_face
-  frog_face
-  hamster_face
-  wolf_face
-  bear_face
-  panda_face
-  rat
-  mouse
-  ox
-  water_buffalo
-  cow
-  tiger
-  leopard
-  rabbit
-  cat
-  dragon
-  crocodile
-  whale
-  ram
-  goat
-  rooster
-  dog
-  pig
-  dromedary_camel
-"
-
-emoji_groups[faces]="
-  grinning_face_with_smiling_eyes
-  face_with_tears_of_joy
-  smiling_face_with_open_mouth
-  smiling_face_with_open_mouth_and_smiling_eyes
-  smiling_face_with_open_mouth_and_cold_sweat
-  smiling_face_with_open_mouth_and_tightly_closed_eyes
-  winking_face
-  smiling_face_with_smiling_eyes
-  face_savouring_delicious_food
-  relieved_face
-  smiling_face_with_heart_shaped_eyes
-  smirking_face
-  unamused_face
-  face_with_cold_sweat
-  pensive_face
-  confounded_face
-  face_throwing_a_kiss
-  kissing_face_with_closed_eyes
-  face_with_stuck_out_tongue_and_winking_eye
-  face_with_stuck_out_tongue_and_tightly_closed_eyes
-  disappointed_face
-  angry_face
-  pouting_face
-  crying_face
-  persevering_face
-  face_with_look_of_triumph
-  disappointed_but_relieved_face
-  fearful_face
-  weary_face
-  sleepy_face
-  tired_face
-  loudly_crying_face
-  face_with_open_mouth_and_cold_sweat
-  face_screaming_in_fear
-  astonished_face
-  flushed_face
-  dizzy_face
-  face_with_medical_mask
-"
-
 }
 
 # Prints a random emoji character
@@ -264,7 +63,11 @@ function random_emoji() {
   [[ $list_size -eq 0 ]] && return 1
   local random_index=$(( ( RANDOM % $list_size ) + 1 ))
   local name=${names[$random_index]}
-  echo ${emoji[$name]}
+  if [[ "$group" == "flags" ]]; then 
+    echo ${emoji_flags[$name]}
+  else 
+    echo ${emoji[$name]}
+  fi
 }
 
 # Displays a listing of emoji with their names
@@ -281,12 +84,26 @@ function display_emoji() {
   fi
   # The extra spaces in output here are a hack for readability, since some
   # terminals treat these emoji chars as single-width.
+  local counter=1
   for i in $names; do
-    printf '%s  ' "$emoji[$i]"
+    if [[ "$group" == "flags" ]]; then 
+      printf '%s  ' "$emoji_flags[$i]"
+    else 
+      printf '%s  ' "$emoji[$i]" 
+    fi
+    # New line every 20 emoji, to avoid weirdnesses
+    if (($counter % 20 == 0)); then
+      printf "\n" 
+    fi
+    let counter=$counter+1
   done
   print
   for i in $names; do
-    echo "${emoji[$i]}  = $i"
+    if [[ "$group" == "flags" ]]; then 
+      echo "${emoji_flags[$i]}  = $i"
+    else 
+      echo "${emoji[$i]}  = $i"
+    fi
   done
 }
 
diff --git a/plugins/emoji/gemoji_db.json b/plugins/emoji/gemoji_db.json
new file mode 100644
index 000000000..9227c26d1
--- /dev/null
+++ b/plugins/emoji/gemoji_db.json
@@ -0,0 +1,21538 @@
+[
+  {
+    "emoji": "😀"
+  , "description": "grinning face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "grinning"
+    ]
+  , "tags": [
+      "smile"
+    , "happy"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😃"
+  , "description": "grinning face with big eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smiley"
+    ]
+  , "tags": [
+      "happy"
+    , "joy"
+    , "haha"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😄"
+  , "description": "grinning face with smiling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smile"
+    ]
+  , "tags": [
+      "happy"
+    , "joy"
+    , "laugh"
+    , "pleased"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😁"
+  , "description": "beaming face with smiling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "grin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😆"
+  , "description": "grinning squinting face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "laughing"
+    , "satisfied"
+    ]
+  , "tags": [
+      "happy"
+    , "haha"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😅"
+  , "description": "grinning face with sweat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sweat_smile"
+    ]
+  , "tags": [
+      "hot"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤣"
+  , "description": "rolling on the floor laughing"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "rofl"
+    ]
+  , "tags": [
+      "lol"
+    , "laughing"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "😂"
+  , "description": "face with tears of joy"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "joy"
+    ]
+  , "tags": [
+      "tears"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙂"
+  , "description": "slightly smiling face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "slightly_smiling_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🙃"
+  , "description": "upside-down face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "upside_down_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "😉"
+  , "description": "winking face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "wink"
+    ]
+  , "tags": [
+      "flirt"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😊"
+  , "description": "smiling face with smiling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "blush"
+    ]
+  , "tags": [
+      "proud"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😇"
+  , "description": "smiling face with halo"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "innocent"
+    ]
+  , "tags": [
+      "angel"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥰"
+  , "description": "smiling face with hearts"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smiling_face_with_three_hearts"
+    ]
+  , "tags": [
+      "love"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😍"
+  , "description": "smiling face with heart-eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heart_eyes"
+    ]
+  , "tags": [
+      "love"
+    , "crush"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤩"
+  , "description": "star-struck"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "star_struck"
+    ]
+  , "tags": [
+      "eyes"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😘"
+  , "description": "face blowing a kiss"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kissing_heart"
+    ]
+  , "tags": [
+      "flirt"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😗"
+  , "description": "kissing face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kissing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☺️"
+  , "description": "smiling face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "relaxed"
+    ]
+  , "tags": [
+      "blush"
+    , "pleased"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😚"
+  , "description": "kissing face with closed eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kissing_closed_eyes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😙"
+  , "description": "kissing face with smiling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kissing_smiling_eyes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😋"
+  , "description": "face savoring food"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "yum"
+    ]
+  , "tags": [
+      "tongue"
+    , "lick"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😛"
+  , "description": "face with tongue"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "stuck_out_tongue"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😜"
+  , "description": "winking face with tongue"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "stuck_out_tongue_winking_eye"
+    ]
+  , "tags": [
+      "prank"
+    , "silly"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤪"
+  , "description": "zany face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "zany_face"
+    ]
+  , "tags": [
+      "goofy"
+    , "wacky"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😝"
+  , "description": "squinting face with tongue"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "stuck_out_tongue_closed_eyes"
+    ]
+  , "tags": [
+      "prank"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤑"
+  , "description": "money-mouth face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "money_mouth_face"
+    ]
+  , "tags": [
+      "rich"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤗"
+  , "description": "hugging face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hugs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤭"
+  , "description": "face with hand over mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hand_over_mouth"
+    ]
+  , "tags": [
+      "quiet"
+    , "whoops"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🤫"
+  , "description": "shushing face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "shushing_face"
+    ]
+  , "tags": [
+      "silence"
+    , "quiet"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🤔"
+  , "description": "thinking face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "thinking"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤐"
+  , "description": "zipper-mouth face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "zipper_mouth_face"
+    ]
+  , "tags": [
+      "silence"
+    , "hush"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤨"
+  , "description": "face with raised eyebrow"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "raised_eyebrow"
+    ]
+  , "tags": [
+      "suspicious"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😐"
+  , "description": "neutral face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "neutral_face"
+    ]
+  , "tags": [
+      "meh"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😑"
+  , "description": "expressionless face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "expressionless"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😶"
+  , "description": "face without mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "no_mouth"
+    ]
+  , "tags": [
+      "mute"
+    , "silence"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😏"
+  , "description": "smirking face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smirk"
+    ]
+  , "tags": [
+      "smug"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😒"
+  , "description": "unamused face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "unamused"
+    ]
+  , "tags": [
+      "meh"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙄"
+  , "description": "face with rolling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "roll_eyes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "😬"
+  , "description": "grimacing face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "grimacing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤥"
+  , "description": "lying face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "lying_face"
+    ]
+  , "tags": [
+      "liar"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "😌"
+  , "description": "relieved face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "relieved"
+    ]
+  , "tags": [
+      "whew"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😔"
+  , "description": "pensive face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "pensive"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😪"
+  , "description": "sleepy face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sleepy"
+    ]
+  , "tags": [
+      "tired"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤤"
+  , "description": "drooling face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "drooling_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "😴"
+  , "description": "sleeping face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sleeping"
+    ]
+  , "tags": [
+      "zzz"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😷"
+  , "description": "face with medical mask"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "mask"
+    ]
+  , "tags": [
+      "sick"
+    , "ill"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤒"
+  , "description": "face with thermometer"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "face_with_thermometer"
+    ]
+  , "tags": [
+      "sick"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤕"
+  , "description": "face with head-bandage"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "face_with_head_bandage"
+    ]
+  , "tags": [
+      "hurt"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤢"
+  , "description": "nauseated face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "nauseated_face"
+    ]
+  , "tags": [
+      "sick"
+    , "barf"
+    , "disgusted"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🤮"
+  , "description": "face vomiting"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "vomiting_face"
+    ]
+  , "tags": [
+      "barf"
+    , "sick"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🤧"
+  , "description": "sneezing face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sneezing_face"
+    ]
+  , "tags": [
+      "achoo"
+    , "sick"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥵"
+  , "description": "hot face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hot_face"
+    ]
+  , "tags": [
+      "heat"
+    , "sweating"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥶"
+  , "description": "cold face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cold_face"
+    ]
+  , "tags": [
+      "freezing"
+    , "ice"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥴"
+  , "description": "woozy face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "woozy_face"
+    ]
+  , "tags": [
+      "groggy"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😵"
+  , "description": "dizzy face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "dizzy_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤯"
+  , "description": "exploding head"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "exploding_head"
+    ]
+  , "tags": [
+      "mind"
+    , "blown"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🤠"
+  , "description": "cowboy hat face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cowboy_hat_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥳"
+  , "description": "partying face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "partying_face"
+    ]
+  , "tags": [
+      "celebration"
+    , "birthday"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😎"
+  , "description": "smiling face with sunglasses"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sunglasses"
+    ]
+  , "tags": [
+      "cool"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤓"
+  , "description": "nerd face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "nerd_face"
+    ]
+  , "tags": [
+      "geek"
+    , "glasses"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧐"
+  , "description": "face with monocle"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "monocle_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😕"
+  , "description": "confused face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "confused"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😟"
+  , "description": "worried face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "worried"
+    ]
+  , "tags": [
+      "nervous"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙁"
+  , "description": "slightly frowning face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "slightly_frowning_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☹"
+  , "description": "frowning face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "frowning_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "😮"
+  , "description": "face with open mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "open_mouth"
+    ]
+  , "tags": [
+      "surprise"
+    , "impressed"
+    , "wow"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😯"
+  , "description": "hushed face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hushed"
+    ]
+  , "tags": [
+      "silence"
+    , "speechless"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😲"
+  , "description": "astonished face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "astonished"
+    ]
+  , "tags": [
+      "amazed"
+    , "gasp"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😳"
+  , "description": "flushed face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "flushed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥺"
+  , "description": "pleading face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "pleading_face"
+    ]
+  , "tags": [
+      "puppy"
+    , "eyes"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😦"
+  , "description": "frowning face with open mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "frowning"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😧"
+  , "description": "anguished face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "anguished"
+    ]
+  , "tags": [
+      "stunned"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😨"
+  , "description": "fearful face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "fearful"
+    ]
+  , "tags": [
+      "scared"
+    , "shocked"
+    , "oops"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😰"
+  , "description": "anxious face with sweat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cold_sweat"
+    ]
+  , "tags": [
+      "nervous"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😥"
+  , "description": "sad but relieved face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "disappointed_relieved"
+    ]
+  , "tags": [
+      "phew"
+    , "sweat"
+    , "nervous"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😢"
+  , "description": "crying face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cry"
+    ]
+  , "tags": [
+      "sad"
+    , "tear"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😭"
+  , "description": "loudly crying face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sob"
+    ]
+  , "tags": [
+      "sad"
+    , "cry"
+    , "bawling"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😱"
+  , "description": "face screaming in fear"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "scream"
+    ]
+  , "tags": [
+      "horror"
+    , "shocked"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😖"
+  , "description": "confounded face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "confounded"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😣"
+  , "description": "persevering face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "persevere"
+    ]
+  , "tags": [
+      "struggling"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😞"
+  , "description": "disappointed face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "disappointed"
+    ]
+  , "tags": [
+      "sad"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😓"
+  , "description": "downcast face with sweat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sweat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😩"
+  , "description": "weary face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "weary"
+    ]
+  , "tags": [
+      "tired"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😫"
+  , "description": "tired face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "tired_face"
+    ]
+  , "tags": [
+      "upset"
+    , "whine"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥱"
+  , "description": "yawning face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "yawning_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "😤"
+  , "description": "face with steam from nose"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "triumph"
+    ]
+  , "tags": [
+      "smug"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😡"
+  , "description": "pouting face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "rage"
+    , "pout"
+    ]
+  , "tags": [
+      "angry"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😠"
+  , "description": "angry face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "angry"
+    ]
+  , "tags": [
+      "mad"
+    , "annoyed"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤬"
+  , "description": "face with symbols on mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cursing_face"
+    ]
+  , "tags": [
+      "foul"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😈"
+  , "description": "smiling face with horns"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smiling_imp"
+    ]
+  , "tags": [
+      "devil"
+    , "evil"
+    , "horns"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👿"
+  , "description": "angry face with horns"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "imp"
+    ]
+  , "tags": [
+      "angry"
+    , "devil"
+    , "evil"
+    , "horns"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💀"
+  , "description": "skull"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "skull"
+    ]
+  , "tags": [
+      "dead"
+    , "danger"
+    , "poison"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☠"
+  , "description": "skull and crossbones"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "skull_and_crossbones"
+    ]
+  , "tags": [
+      "danger"
+    , "pirate"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💩"
+  , "description": "pile of poo"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hankey"
+    , "poop"
+    , "shit"
+    ]
+  , "tags": [
+      "crap"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤡"
+  , "description": "clown face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "clown_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "👹"
+  , "description": "ogre"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "japanese_ogre"
+    ]
+  , "tags": [
+      "monster"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👺"
+  , "description": "goblin"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "japanese_goblin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👻"
+  , "description": "ghost"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "ghost"
+    ]
+  , "tags": [
+      "halloween"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👽"
+  , "description": "alien"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "alien"
+    ]
+  , "tags": [
+      "ufo"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👾"
+  , "description": "alien monster"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "space_invader"
+    ]
+  , "tags": [
+      "game"
+    , "retro"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤖"
+  , "description": "robot"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "robot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "😺"
+  , "description": "grinning cat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smiley_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😸"
+  , "description": "grinning cat with smiling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smile_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😹"
+  , "description": "cat with tears of joy"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "joy_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😻"
+  , "description": "smiling cat with heart-eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heart_eyes_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😼"
+  , "description": "cat with wry smile"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smirk_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😽"
+  , "description": "kissing cat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kissing_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙀"
+  , "description": "weary cat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "scream_cat"
+    ]
+  , "tags": [
+      "horror"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😿"
+  , "description": "crying cat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "crying_cat_face"
+    ]
+  , "tags": [
+      "sad"
+    , "tear"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😾"
+  , "description": "pouting cat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "pouting_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙈"
+  , "description": "see-no-evil monkey"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "see_no_evil"
+    ]
+  , "tags": [
+      "monkey"
+    , "blind"
+    , "ignore"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙉"
+  , "description": "hear-no-evil monkey"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hear_no_evil"
+    ]
+  , "tags": [
+      "monkey"
+    , "deaf"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙊"
+  , "description": "speak-no-evil monkey"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "speak_no_evil"
+    ]
+  , "tags": [
+      "monkey"
+    , "mute"
+    , "hush"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💋"
+  , "description": "kiss mark"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kiss"
+    ]
+  , "tags": [
+      "lipstick"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💌"
+  , "description": "love letter"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "love_letter"
+    ]
+  , "tags": [
+      "email"
+    , "envelope"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💘"
+  , "description": "heart with arrow"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cupid"
+    ]
+  , "tags": [
+      "love"
+    , "heart"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💝"
+  , "description": "heart with ribbon"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "gift_heart"
+    ]
+  , "tags": [
+      "chocolates"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💖"
+  , "description": "sparkling heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sparkling_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💗"
+  , "description": "growing heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heartpulse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💓"
+  , "description": "beating heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heartbeat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💞"
+  , "description": "revolving hearts"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "revolving_hearts"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💕"
+  , "description": "two hearts"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "two_hearts"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💟"
+  , "description": "heart decoration"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heart_decoration"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❣️"
+  , "description": "heart exclamation"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heavy_heart_exclamation"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💔"
+  , "description": "broken heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "broken_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❤️"
+  , "description": "red heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heart"
+    ]
+  , "tags": [
+      "love"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧡"
+  , "description": "orange heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "orange_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "💛"
+  , "description": "yellow heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "yellow_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💚"
+  , "description": "green heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "green_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💙"
+  , "description": "blue heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "blue_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💜"
+  , "description": "purple heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "purple_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤎"
+  , "description": "brown heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "brown_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🖤"
+  , "description": "black heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "black_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🤍"
+  , "description": "white heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "white_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "💯"
+  , "description": "hundred points"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "100"
+    ]
+  , "tags": [
+      "score"
+    , "perfect"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💢"
+  , "description": "anger symbol"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "anger"
+    ]
+  , "tags": [
+      "angry"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💥"
+  , "description": "collision"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "boom"
+    , "collision"
+    ]
+  , "tags": [
+      "explode"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💫"
+  , "description": "dizzy"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "dizzy"
+    ]
+  , "tags": [
+      "star"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💦"
+  , "description": "sweat droplets"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sweat_drops"
+    ]
+  , "tags": [
+      "water"
+    , "workout"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💨"
+  , "description": "dashing away"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "dash"
+    ]
+  , "tags": [
+      "wind"
+    , "blow"
+    , "fast"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕳"
+  , "description": "hole"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hole"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💣"
+  , "description": "bomb"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "bomb"
+    ]
+  , "tags": [
+      "boom"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💬"
+  , "description": "speech balloon"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "speech_balloon"
+    ]
+  , "tags": [
+      "comment"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👁️‍🗨️"
+  , "description": "eye in speech bubble"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "eye_speech_bubble"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🗨"
+  , "description": "left speech bubble"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "left_speech_bubble"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🗯"
+  , "description": "right anger bubble"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "right_anger_bubble"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💭"
+  , "description": "thought balloon"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "thought_balloon"
+    ]
+  , "tags": [
+      "thinking"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💤"
+  , "description": "zzz"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "zzz"
+    ]
+  , "tags": [
+      "sleeping"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👋"
+  , "description": "waving hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "wave"
+    ]
+  , "tags": [
+      "goodbye"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤚"
+  , "description": "raised back of hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "raised_back_of_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🖐"
+  , "description": "hand with fingers splayed"
+  , "category": "People & Body"
+  , "aliases": [
+      "raised_hand_with_fingers_splayed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "✋"
+  , "description": "raised hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "hand"
+    , "raised_hand"
+    ]
+  , "tags": [
+      "highfive"
+    , "stop"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🖖"
+  , "description": "vulcan salute"
+  , "category": "People & Body"
+  , "aliases": [
+      "vulcan_salute"
+    ]
+  , "tags": [
+      "prosper"
+    , "spock"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "8.3"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👌"
+  , "description": "OK hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "ok_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤏"
+  , "description": "pinching hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "pinching_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "✌️"
+  , "description": "victory hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "v"
+    ]
+  , "tags": [
+      "victory"
+    , "peace"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤞"
+  , "description": "crossed fingers"
+  , "category": "People & Body"
+  , "aliases": [
+      "crossed_fingers"
+    ]
+  , "tags": [
+      "luck"
+    , "hopeful"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤟"
+  , "description": "love-you gesture"
+  , "category": "People & Body"
+  , "aliases": [
+      "love_you_gesture"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤘"
+  , "description": "sign of the horns"
+  , "category": "People & Body"
+  , "aliases": [
+      "metal"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤙"
+  , "description": "call me hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "call_me_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👈"
+  , "description": "backhand index pointing left"
+  , "category": "People & Body"
+  , "aliases": [
+      "point_left"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👉"
+  , "description": "backhand index pointing right"
+  , "category": "People & Body"
+  , "aliases": [
+      "point_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👆"
+  , "description": "backhand index pointing up"
+  , "category": "People & Body"
+  , "aliases": [
+      "point_up_2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🖕"
+  , "description": "middle finger"
+  , "category": "People & Body"
+  , "aliases": [
+      "middle_finger"
+    , "fu"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👇"
+  , "description": "backhand index pointing down"
+  , "category": "People & Body"
+  , "aliases": [
+      "point_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "☝️"
+  , "description": "index pointing up"
+  , "category": "People & Body"
+  , "aliases": [
+      "point_up"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👍"
+  , "description": "thumbs up"
+  , "category": "People & Body"
+  , "aliases": [
+      "+1"
+    , "thumbsup"
+    ]
+  , "tags": [
+      "approve"
+    , "ok"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👎"
+  , "description": "thumbs down"
+  , "category": "People & Body"
+  , "aliases": [
+      "-1"
+    , "thumbsdown"
+    ]
+  , "tags": [
+      "disapprove"
+    , "bury"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "✊"
+  , "description": "raised fist"
+  , "category": "People & Body"
+  , "aliases": [
+      "fist_raised"
+    , "fist"
+    ]
+  , "tags": [
+      "power"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👊"
+  , "description": "oncoming fist"
+  , "category": "People & Body"
+  , "aliases": [
+      "fist_oncoming"
+    , "facepunch"
+    , "punch"
+    ]
+  , "tags": [
+      "attack"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤛"
+  , "description": "left-facing fist"
+  , "category": "People & Body"
+  , "aliases": [
+      "fist_left"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤜"
+  , "description": "right-facing fist"
+  , "category": "People & Body"
+  , "aliases": [
+      "fist_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👏"
+  , "description": "clapping hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "clap"
+    ]
+  , "tags": [
+      "praise"
+    , "applause"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙌"
+  , "description": "raising hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "raised_hands"
+    ]
+  , "tags": [
+      "hooray"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👐"
+  , "description": "open hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "open_hands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤲"
+  , "description": "palms up together"
+  , "category": "People & Body"
+  , "aliases": [
+      "palms_up_together"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤝"
+  , "description": "handshake"
+  , "category": "People & Body"
+  , "aliases": [
+      "handshake"
+    ]
+  , "tags": [
+      "deal"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🙏"
+  , "description": "folded hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "pray"
+    ]
+  , "tags": [
+      "please"
+    , "hope"
+    , "wish"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "✍️"
+  , "description": "writing hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "writing_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💅"
+  , "description": "nail polish"
+  , "category": "People & Body"
+  , "aliases": [
+      "nail_care"
+    ]
+  , "tags": [
+      "beauty"
+    , "manicure"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤳"
+  , "description": "selfie"
+  , "category": "People & Body"
+  , "aliases": [
+      "selfie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💪"
+  , "description": "flexed biceps"
+  , "category": "People & Body"
+  , "aliases": [
+      "muscle"
+    ]
+  , "tags": [
+      "flex"
+    , "bicep"
+    , "strong"
+    , "workout"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦾"
+  , "description": "mechanical arm"
+  , "category": "People & Body"
+  , "aliases": [
+      "mechanical_arm"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦿"
+  , "description": "mechanical leg"
+  , "category": "People & Body"
+  , "aliases": [
+      "mechanical_leg"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦵"
+  , "description": "leg"
+  , "category": "People & Body"
+  , "aliases": [
+      "leg"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦶"
+  , "description": "foot"
+  , "category": "People & Body"
+  , "aliases": [
+      "foot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👂"
+  , "description": "ear"
+  , "category": "People & Body"
+  , "aliases": [
+      "ear"
+    ]
+  , "tags": [
+      "hear"
+    , "sound"
+    , "listen"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦻"
+  , "description": "ear with hearing aid"
+  , "category": "People & Body"
+  , "aliases": [
+      "ear_with_hearing_aid"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👃"
+  , "description": "nose"
+  , "category": "People & Body"
+  , "aliases": [
+      "nose"
+    ]
+  , "tags": [
+      "smell"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧠"
+  , "description": "brain"
+  , "category": "People & Body"
+  , "aliases": [
+      "brain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦷"
+  , "description": "tooth"
+  , "category": "People & Body"
+  , "aliases": [
+      "tooth"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦴"
+  , "description": "bone"
+  , "category": "People & Body"
+  , "aliases": [
+      "bone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👀"
+  , "description": "eyes"
+  , "category": "People & Body"
+  , "aliases": [
+      "eyes"
+    ]
+  , "tags": [
+      "look"
+    , "see"
+    , "watch"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👁"
+  , "description": "eye"
+  , "category": "People & Body"
+  , "aliases": [
+      "eye"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "👅"
+  , "description": "tongue"
+  , "category": "People & Body"
+  , "aliases": [
+      "tongue"
+    ]
+  , "tags": [
+      "taste"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👄"
+  , "description": "mouth"
+  , "category": "People & Body"
+  , "aliases": [
+      "lips"
+    ]
+  , "tags": [
+      "kiss"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👶"
+  , "description": "baby"
+  , "category": "People & Body"
+  , "aliases": [
+      "baby"
+    ]
+  , "tags": [
+      "child"
+    , "newborn"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧒"
+  , "description": "child"
+  , "category": "People & Body"
+  , "aliases": [
+      "child"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👦"
+  , "description": "boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "boy"
+    ]
+  , "tags": [
+      "child"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👧"
+  , "description": "girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "girl"
+    ]
+  , "tags": [
+      "child"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧑"
+  , "description": "person"
+  , "category": "People & Body"
+  , "aliases": [
+      "adult"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👱"
+  , "description": "person: blond hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "blond_haired_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨"
+  , "description": "man"
+  , "category": "People & Body"
+  , "aliases": [
+      "man"
+    ]
+  , "tags": [
+      "mustache"
+    , "father"
+    , "dad"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧔"
+  , "description": "man: beard"
+  , "category": "People & Body"
+  , "aliases": [
+      "bearded_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👱‍♂"
+  , "description": "man: blond hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "blond_haired_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦰"
+  , "description": "man: red hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "red_haired_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦱"
+  , "description": "man: curly hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "curly_haired_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦳"
+  , "description": "man: white hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "white_haired_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦲"
+  , "description": "man: bald"
+  , "category": "People & Body"
+  , "aliases": [
+      "bald_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩"
+  , "description": "woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman"
+    ]
+  , "tags": [
+      "girls"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👱‍♀"
+  , "description": "woman: blond hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "blond_haired_woman"
+    , "blonde_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦰"
+  , "description": "woman: red hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "red_haired_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦱"
+  , "description": "woman: curly hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "curly_haired_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦳"
+  , "description": "woman: white hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "white_haired_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦲"
+  , "description": "woman: bald"
+  , "category": "People & Body"
+  , "aliases": [
+      "bald_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧓"
+  , "description": "older person"
+  , "category": "People & Body"
+  , "aliases": [
+      "older_adult"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👴"
+  , "description": "old man"
+  , "category": "People & Body"
+  , "aliases": [
+      "older_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👵"
+  , "description": "old woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "older_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙍"
+  , "description": "person frowning"
+  , "category": "People & Body"
+  , "aliases": [
+      "frowning_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙍‍♂"
+  , "description": "man frowning"
+  , "category": "People & Body"
+  , "aliases": [
+      "frowning_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙍‍♀"
+  , "description": "woman frowning"
+  , "category": "People & Body"
+  , "aliases": [
+      "frowning_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙎"
+  , "description": "person pouting"
+  , "category": "People & Body"
+  , "aliases": [
+      "pouting_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙎‍♂"
+  , "description": "man pouting"
+  , "category": "People & Body"
+  , "aliases": [
+      "pouting_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙎‍♀"
+  , "description": "woman pouting"
+  , "category": "People & Body"
+  , "aliases": [
+      "pouting_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙅"
+  , "description": "person gesturing NO"
+  , "category": "People & Body"
+  , "aliases": [
+      "no_good"
+    ]
+  , "tags": [
+      "stop"
+    , "halt"
+    , "denied"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙅‍♂"
+  , "description": "man gesturing NO"
+  , "category": "People & Body"
+  , "aliases": [
+      "no_good_man"
+    , "ng_man"
+    ]
+  , "tags": [
+      "stop"
+    , "halt"
+    , "denied"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙅‍♀"
+  , "description": "woman gesturing NO"
+  , "category": "People & Body"
+  , "aliases": [
+      "no_good_woman"
+    , "ng_woman"
+    ]
+  , "tags": [
+      "stop"
+    , "halt"
+    , "denied"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙆"
+  , "description": "person gesturing OK"
+  , "category": "People & Body"
+  , "aliases": [
+      "ok_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙆‍♂"
+  , "description": "man gesturing OK"
+  , "category": "People & Body"
+  , "aliases": [
+      "ok_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙆‍♀"
+  , "description": "woman gesturing OK"
+  , "category": "People & Body"
+  , "aliases": [
+      "ok_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💁"
+  , "description": "person tipping hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "tipping_hand_person"
+    , "information_desk_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💁‍♂"
+  , "description": "man tipping hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "tipping_hand_man"
+    , "sassy_man"
+    ]
+  , "tags": [
+      "information"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💁‍♀"
+  , "description": "woman tipping hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "tipping_hand_woman"
+    , "sassy_woman"
+    ]
+  , "tags": [
+      "information"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙋"
+  , "description": "person raising hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "raising_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙋‍♂"
+  , "description": "man raising hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "raising_hand_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙋‍♀"
+  , "description": "woman raising hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "raising_hand_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧏"
+  , "description": "deaf person"
+  , "category": "People & Body"
+  , "aliases": [
+      "deaf_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧏‍♂"
+  , "description": "deaf man"
+  , "category": "People & Body"
+  , "aliases": [
+      "deaf_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧏‍♀"
+  , "description": "deaf woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "deaf_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙇"
+  , "description": "person bowing"
+  , "category": "People & Body"
+  , "aliases": [
+      "bow"
+    ]
+  , "tags": [
+      "respect"
+    , "thanks"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙇‍♂"
+  , "description": "man bowing"
+  , "category": "People & Body"
+  , "aliases": [
+      "bowing_man"
+    ]
+  , "tags": [
+      "respect"
+    , "thanks"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙇‍♀"
+  , "description": "woman bowing"
+  , "category": "People & Body"
+  , "aliases": [
+      "bowing_woman"
+    ]
+  , "tags": [
+      "respect"
+    , "thanks"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤦"
+  , "description": "person facepalming"
+  , "category": "People & Body"
+  , "aliases": [
+      "facepalm"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤦‍♂"
+  , "description": "man facepalming"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_facepalming"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤦‍♀"
+  , "description": "woman facepalming"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_facepalming"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤷"
+  , "description": "person shrugging"
+  , "category": "People & Body"
+  , "aliases": [
+      "shrug"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤷‍♂"
+  , "description": "man shrugging"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_shrugging"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤷‍♀"
+  , "description": "woman shrugging"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_shrugging"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍⚕"
+  , "description": "man health worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_health_worker"
+    ]
+  , "tags": [
+      "doctor"
+    , "nurse"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍⚕"
+  , "description": "woman health worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_health_worker"
+    ]
+  , "tags": [
+      "doctor"
+    , "nurse"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🎓"
+  , "description": "man student"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_student"
+    ]
+  , "tags": [
+      "graduation"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🎓"
+  , "description": "woman student"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_student"
+    ]
+  , "tags": [
+      "graduation"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🏫"
+  , "description": "man teacher"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_teacher"
+    ]
+  , "tags": [
+      "school"
+    , "professor"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🏫"
+  , "description": "woman teacher"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_teacher"
+    ]
+  , "tags": [
+      "school"
+    , "professor"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍⚖"
+  , "description": "man judge"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_judge"
+    ]
+  , "tags": [
+      "justice"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍⚖"
+  , "description": "woman judge"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_judge"
+    ]
+  , "tags": [
+      "justice"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🌾"
+  , "description": "man farmer"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_farmer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🌾"
+  , "description": "woman farmer"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_farmer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🍳"
+  , "description": "man cook"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_cook"
+    ]
+  , "tags": [
+      "chef"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🍳"
+  , "description": "woman cook"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_cook"
+    ]
+  , "tags": [
+      "chef"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🔧"
+  , "description": "man mechanic"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_mechanic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🔧"
+  , "description": "woman mechanic"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_mechanic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🏭"
+  , "description": "man factory worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_factory_worker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🏭"
+  , "description": "woman factory worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_factory_worker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍💼"
+  , "description": "man office worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_office_worker"
+    ]
+  , "tags": [
+      "business"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍💼"
+  , "description": "woman office worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_office_worker"
+    ]
+  , "tags": [
+      "business"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🔬"
+  , "description": "man scientist"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_scientist"
+    ]
+  , "tags": [
+      "research"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🔬"
+  , "description": "woman scientist"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_scientist"
+    ]
+  , "tags": [
+      "research"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍💻"
+  , "description": "man technologist"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_technologist"
+    ]
+  , "tags": [
+      "coder"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍💻"
+  , "description": "woman technologist"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_technologist"
+    ]
+  , "tags": [
+      "coder"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🎤"
+  , "description": "man singer"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_singer"
+    ]
+  , "tags": [
+      "rockstar"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🎤"
+  , "description": "woman singer"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_singer"
+    ]
+  , "tags": [
+      "rockstar"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🎨"
+  , "description": "man artist"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_artist"
+    ]
+  , "tags": [
+      "painter"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🎨"
+  , "description": "woman artist"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_artist"
+    ]
+  , "tags": [
+      "painter"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍✈"
+  , "description": "man pilot"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_pilot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍✈"
+  , "description": "woman pilot"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_pilot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🚀"
+  , "description": "man astronaut"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_astronaut"
+    ]
+  , "tags": [
+      "space"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🚀"
+  , "description": "woman astronaut"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_astronaut"
+    ]
+  , "tags": [
+      "space"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🚒"
+  , "description": "man firefighter"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_firefighter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🚒"
+  , "description": "woman firefighter"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_firefighter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👮"
+  , "description": "police officer"
+  , "category": "People & Body"
+  , "aliases": [
+      "police_officer"
+    , "cop"
+    ]
+  , "tags": [
+      "law"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👮‍♂"
+  , "description": "man police officer"
+  , "category": "People & Body"
+  , "aliases": [
+      "policeman"
+    ]
+  , "tags": [
+      "law"
+    , "cop"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👮‍♀"
+  , "description": "woman police officer"
+  , "category": "People & Body"
+  , "aliases": [
+      "policewoman"
+    ]
+  , "tags": [
+      "law"
+    , "cop"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🕵"
+  , "description": "detective"
+  , "category": "People & Body"
+  , "aliases": [
+      "detective"
+    ]
+  , "tags": [
+      "sleuth"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🕵️‍♂️"
+  , "description": "man detective"
+  , "category": "People & Body"
+  , "aliases": [
+      "male_detective"
+    ]
+  , "tags": [
+      "sleuth"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🕵️‍♀️"
+  , "description": "woman detective"
+  , "category": "People & Body"
+  , "aliases": [
+      "female_detective"
+    ]
+  , "tags": [
+      "sleuth"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💂"
+  , "description": "guard"
+  , "category": "People & Body"
+  , "aliases": [
+      "guard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💂‍♂"
+  , "description": "man guard"
+  , "category": "People & Body"
+  , "aliases": [
+      "guardsman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💂‍♀"
+  , "description": "woman guard"
+  , "category": "People & Body"
+  , "aliases": [
+      "guardswoman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👷"
+  , "description": "construction worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "construction_worker"
+    ]
+  , "tags": [
+      "helmet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👷‍♂"
+  , "description": "man construction worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "construction_worker_man"
+    ]
+  , "tags": [
+      "helmet"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👷‍♀"
+  , "description": "woman construction worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "construction_worker_woman"
+    ]
+  , "tags": [
+      "helmet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤴"
+  , "description": "prince"
+  , "category": "People & Body"
+  , "aliases": [
+      "prince"
+    ]
+  , "tags": [
+      "crown"
+    , "royal"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👸"
+  , "description": "princess"
+  , "category": "People & Body"
+  , "aliases": [
+      "princess"
+    ]
+  , "tags": [
+      "crown"
+    , "royal"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👳"
+  , "description": "person wearing turban"
+  , "category": "People & Body"
+  , "aliases": [
+      "person_with_turban"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👳‍♂"
+  , "description": "man wearing turban"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_with_turban"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👳‍♀"
+  , "description": "woman wearing turban"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_with_turban"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👲"
+  , "description": "man with Chinese cap"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_with_gua_pi_mao"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧕"
+  , "description": "woman with headscarf"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_with_headscarf"
+    ]
+  , "tags": [
+      "hijab"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤵"
+  , "description": "man in tuxedo"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_in_tuxedo"
+    ]
+  , "tags": [
+      "groom"
+    , "marriage"
+    , "wedding"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👰"
+  , "description": "bride with veil"
+  , "category": "People & Body"
+  , "aliases": [
+      "bride_with_veil"
+    ]
+  , "tags": [
+      "marriage"
+    , "wedding"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤰"
+  , "description": "pregnant woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "pregnant_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤱"
+  , "description": "breast-feeding"
+  , "category": "People & Body"
+  , "aliases": [
+      "breast_feeding"
+    ]
+  , "tags": [
+      "nursing"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👼"
+  , "description": "baby angel"
+  , "category": "People & Body"
+  , "aliases": [
+      "angel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🎅"
+  , "description": "Santa Claus"
+  , "category": "People & Body"
+  , "aliases": [
+      "santa"
+    ]
+  , "tags": [
+      "christmas"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤶"
+  , "description": "Mrs. Claus"
+  , "category": "People & Body"
+  , "aliases": [
+      "mrs_claus"
+    ]
+  , "tags": [
+      "santa"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦸"
+  , "description": "superhero"
+  , "category": "People & Body"
+  , "aliases": [
+      "superhero"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦸‍♂"
+  , "description": "man superhero"
+  , "category": "People & Body"
+  , "aliases": [
+      "superhero_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦸‍♀"
+  , "description": "woman superhero"
+  , "category": "People & Body"
+  , "aliases": [
+      "superhero_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦹"
+  , "description": "supervillain"
+  , "category": "People & Body"
+  , "aliases": [
+      "supervillain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦹‍♂"
+  , "description": "man supervillain"
+  , "category": "People & Body"
+  , "aliases": [
+      "supervillain_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦹‍♀"
+  , "description": "woman supervillain"
+  , "category": "People & Body"
+  , "aliases": [
+      "supervillain_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧙"
+  , "description": "mage"
+  , "category": "People & Body"
+  , "aliases": [
+      "mage"
+    ]
+  , "tags": [
+      "wizard"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧙‍♂"
+  , "description": "man mage"
+  , "category": "People & Body"
+  , "aliases": [
+      "mage_man"
+    ]
+  , "tags": [
+      "wizard"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧙‍♀"
+  , "description": "woman mage"
+  , "category": "People & Body"
+  , "aliases": [
+      "mage_woman"
+    ]
+  , "tags": [
+      "wizard"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧚"
+  , "description": "fairy"
+  , "category": "People & Body"
+  , "aliases": [
+      "fairy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧚‍♂"
+  , "description": "man fairy"
+  , "category": "People & Body"
+  , "aliases": [
+      "fairy_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧚‍♀"
+  , "description": "woman fairy"
+  , "category": "People & Body"
+  , "aliases": [
+      "fairy_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧛"
+  , "description": "vampire"
+  , "category": "People & Body"
+  , "aliases": [
+      "vampire"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧛‍♂"
+  , "description": "man vampire"
+  , "category": "People & Body"
+  , "aliases": [
+      "vampire_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧛‍♀"
+  , "description": "woman vampire"
+  , "category": "People & Body"
+  , "aliases": [
+      "vampire_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧜"
+  , "description": "merperson"
+  , "category": "People & Body"
+  , "aliases": [
+      "merperson"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧜‍♂"
+  , "description": "merman"
+  , "category": "People & Body"
+  , "aliases": [
+      "merman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧜‍♀"
+  , "description": "mermaid"
+  , "category": "People & Body"
+  , "aliases": [
+      "mermaid"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧝"
+  , "description": "elf"
+  , "category": "People & Body"
+  , "aliases": [
+      "elf"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧝‍♂"
+  , "description": "man elf"
+  , "category": "People & Body"
+  , "aliases": [
+      "elf_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧝‍♀"
+  , "description": "woman elf"
+  , "category": "People & Body"
+  , "aliases": [
+      "elf_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧞"
+  , "description": "genie"
+  , "category": "People & Body"
+  , "aliases": [
+      "genie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧞‍♂"
+  , "description": "man genie"
+  , "category": "People & Body"
+  , "aliases": [
+      "genie_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧞‍♀"
+  , "description": "woman genie"
+  , "category": "People & Body"
+  , "aliases": [
+      "genie_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧟"
+  , "description": "zombie"
+  , "category": "People & Body"
+  , "aliases": [
+      "zombie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧟‍♂"
+  , "description": "man zombie"
+  , "category": "People & Body"
+  , "aliases": [
+      "zombie_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧟‍♀"
+  , "description": "woman zombie"
+  , "category": "People & Body"
+  , "aliases": [
+      "zombie_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "💆"
+  , "description": "person getting massage"
+  , "category": "People & Body"
+  , "aliases": [
+      "massage"
+    ]
+  , "tags": [
+      "spa"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💆‍♂"
+  , "description": "man getting massage"
+  , "category": "People & Body"
+  , "aliases": [
+      "massage_man"
+    ]
+  , "tags": [
+      "spa"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💆‍♀"
+  , "description": "woman getting massage"
+  , "category": "People & Body"
+  , "aliases": [
+      "massage_woman"
+    ]
+  , "tags": [
+      "spa"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💇"
+  , "description": "person getting haircut"
+  , "category": "People & Body"
+  , "aliases": [
+      "haircut"
+    ]
+  , "tags": [
+      "beauty"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💇‍♂"
+  , "description": "man getting haircut"
+  , "category": "People & Body"
+  , "aliases": [
+      "haircut_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💇‍♀"
+  , "description": "woman getting haircut"
+  , "category": "People & Body"
+  , "aliases": [
+      "haircut_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚶"
+  , "description": "person walking"
+  , "category": "People & Body"
+  , "aliases": [
+      "walking"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚶‍♂"
+  , "description": "man walking"
+  , "category": "People & Body"
+  , "aliases": [
+      "walking_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚶‍♀"
+  , "description": "woman walking"
+  , "category": "People & Body"
+  , "aliases": [
+      "walking_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧍"
+  , "description": "person standing"
+  , "category": "People & Body"
+  , "aliases": [
+      "standing_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧍‍♂"
+  , "description": "man standing"
+  , "category": "People & Body"
+  , "aliases": [
+      "standing_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧍‍♀"
+  , "description": "woman standing"
+  , "category": "People & Body"
+  , "aliases": [
+      "standing_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧎"
+  , "description": "person kneeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "kneeling_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧎‍♂"
+  , "description": "man kneeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "kneeling_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧎‍♀"
+  , "description": "woman kneeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "kneeling_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦯"
+  , "description": "man with probing cane"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_with_probing_cane"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦯"
+  , "description": "woman with probing cane"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_with_probing_cane"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦼"
+  , "description": "man in motorized wheelchair"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_in_motorized_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦼"
+  , "description": "woman in motorized wheelchair"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_in_motorized_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦽"
+  , "description": "man in manual wheelchair"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_in_manual_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦽"
+  , "description": "woman in manual wheelchair"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_in_manual_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏃"
+  , "description": "person running"
+  , "category": "People & Body"
+  , "aliases": [
+      "runner"
+    , "running"
+    ]
+  , "tags": [
+      "exercise"
+    , "workout"
+    , "marathon"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏃‍♂"
+  , "description": "man running"
+  , "category": "People & Body"
+  , "aliases": [
+      "running_man"
+    ]
+  , "tags": [
+      "exercise"
+    , "workout"
+    , "marathon"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏃‍♀"
+  , "description": "woman running"
+  , "category": "People & Body"
+  , "aliases": [
+      "running_woman"
+    ]
+  , "tags": [
+      "exercise"
+    , "workout"
+    , "marathon"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💃"
+  , "description": "woman dancing"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_dancing"
+    , "dancer"
+    ]
+  , "tags": [
+      "dress"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🕺"
+  , "description": "man dancing"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_dancing"
+    ]
+  , "tags": [
+      "dancer"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🕴"
+  , "description": "man in suit levitating"
+  , "category": "People & Body"
+  , "aliases": [
+      "business_suit_levitating"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👯"
+  , "description": "people with bunny ears"
+  , "category": "People & Body"
+  , "aliases": [
+      "dancers"
+    ]
+  , "tags": [
+      "bunny"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👯‍♂"
+  , "description": "men with bunny ears"
+  , "category": "People & Body"
+  , "aliases": [
+      "dancing_men"
+    ]
+  , "tags": [
+      "bunny"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👯‍♀"
+  , "description": "women with bunny ears"
+  , "category": "People & Body"
+  , "aliases": [
+      "dancing_women"
+    ]
+  , "tags": [
+      "bunny"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧖"
+  , "description": "person in steamy room"
+  , "category": "People & Body"
+  , "aliases": [
+      "sauna_person"
+    ]
+  , "tags": [
+      "steamy"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧖‍♂"
+  , "description": "man in steamy room"
+  , "category": "People & Body"
+  , "aliases": [
+      "sauna_man"
+    ]
+  , "tags": [
+      "steamy"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧖‍♀"
+  , "description": "woman in steamy room"
+  , "category": "People & Body"
+  , "aliases": [
+      "sauna_woman"
+    ]
+  , "tags": [
+      "steamy"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧗"
+  , "description": "person climbing"
+  , "category": "People & Body"
+  , "aliases": [
+      "climbing"
+    ]
+  , "tags": [
+      "bouldering"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧗‍♂"
+  , "description": "man climbing"
+  , "category": "People & Body"
+  , "aliases": [
+      "climbing_man"
+    ]
+  , "tags": [
+      "bouldering"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧗‍♀"
+  , "description": "woman climbing"
+  , "category": "People & Body"
+  , "aliases": [
+      "climbing_woman"
+    ]
+  , "tags": [
+      "bouldering"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤺"
+  , "description": "person fencing"
+  , "category": "People & Body"
+  , "aliases": [
+      "person_fencing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🏇"
+  , "description": "horse racing"
+  , "category": "People & Body"
+  , "aliases": [
+      "horse_racing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "⛷"
+  , "description": "skier"
+  , "category": "People & Body"
+  , "aliases": [
+      "skier"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏂"
+  , "description": "snowboarder"
+  , "category": "People & Body"
+  , "aliases": [
+      "snowboarder"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏌"
+  , "description": "person golfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "golfing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏌️‍♂️"
+  , "description": "man golfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "golfing_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏌️‍♀️"
+  , "description": "woman golfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "golfing_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏄"
+  , "description": "person surfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "surfer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏄‍♂"
+  , "description": "man surfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "surfing_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏄‍♀"
+  , "description": "woman surfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "surfing_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚣"
+  , "description": "person rowing boat"
+  , "category": "People & Body"
+  , "aliases": [
+      "rowboat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚣‍♂"
+  , "description": "man rowing boat"
+  , "category": "People & Body"
+  , "aliases": [
+      "rowing_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚣‍♀"
+  , "description": "woman rowing boat"
+  , "category": "People & Body"
+  , "aliases": [
+      "rowing_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏊"
+  , "description": "person swimming"
+  , "category": "People & Body"
+  , "aliases": [
+      "swimmer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏊‍♂"
+  , "description": "man swimming"
+  , "category": "People & Body"
+  , "aliases": [
+      "swimming_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏊‍♀"
+  , "description": "woman swimming"
+  , "category": "People & Body"
+  , "aliases": [
+      "swimming_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "⛹"
+  , "description": "person bouncing ball"
+  , "category": "People & Body"
+  , "aliases": [
+      "bouncing_ball_person"
+    ]
+  , "tags": [
+      "basketball"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "⛹️‍♂️"
+  , "description": "man bouncing ball"
+  , "category": "People & Body"
+  , "aliases": [
+      "bouncing_ball_man"
+    , "basketball_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "⛹️‍♀️"
+  , "description": "woman bouncing ball"
+  , "category": "People & Body"
+  , "aliases": [
+      "bouncing_ball_woman"
+    , "basketball_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏋"
+  , "description": "person lifting weights"
+  , "category": "People & Body"
+  , "aliases": [
+      "weight_lifting"
+    ]
+  , "tags": [
+      "gym"
+    , "workout"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏋️‍♂️"
+  , "description": "man lifting weights"
+  , "category": "People & Body"
+  , "aliases": [
+      "weight_lifting_man"
+    ]
+  , "tags": [
+      "gym"
+    , "workout"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏋️‍♀️"
+  , "description": "woman lifting weights"
+  , "category": "People & Body"
+  , "aliases": [
+      "weight_lifting_woman"
+    ]
+  , "tags": [
+      "gym"
+    , "workout"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚴"
+  , "description": "person biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "bicyclist"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚴‍♂"
+  , "description": "man biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "biking_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚴‍♀"
+  , "description": "woman biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "biking_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚵"
+  , "description": "person mountain biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "mountain_bicyclist"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚵‍♂"
+  , "description": "man mountain biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "mountain_biking_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚵‍♀"
+  , "description": "woman mountain biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "mountain_biking_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤸"
+  , "description": "person cartwheeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "cartwheeling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤸‍♂"
+  , "description": "man cartwheeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_cartwheeling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤸‍♀"
+  , "description": "woman cartwheeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_cartwheeling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤼"
+  , "description": "people wrestling"
+  , "category": "People & Body"
+  , "aliases": [
+      "wrestling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🤼‍♂"
+  , "description": "men wrestling"
+  , "category": "People & Body"
+  , "aliases": [
+      "men_wrestling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🤼‍♀"
+  , "description": "women wrestling"
+  , "category": "People & Body"
+  , "aliases": [
+      "women_wrestling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🤽"
+  , "description": "person playing water polo"
+  , "category": "People & Body"
+  , "aliases": [
+      "water_polo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤽‍♂"
+  , "description": "man playing water polo"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_playing_water_polo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤽‍♀"
+  , "description": "woman playing water polo"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_playing_water_polo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤾"
+  , "description": "person playing handball"
+  , "category": "People & Body"
+  , "aliases": [
+      "handball_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤾‍♂"
+  , "description": "man playing handball"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_playing_handball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤾‍♀"
+  , "description": "woman playing handball"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_playing_handball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤹"
+  , "description": "person juggling"
+  , "category": "People & Body"
+  , "aliases": [
+      "juggling_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤹‍♂"
+  , "description": "man juggling"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_juggling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤹‍♀"
+  , "description": "woman juggling"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_juggling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧘"
+  , "description": "person in lotus position"
+  , "category": "People & Body"
+  , "aliases": [
+      "lotus_position"
+    ]
+  , "tags": [
+      "meditation"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧘‍♂"
+  , "description": "man in lotus position"
+  , "category": "People & Body"
+  , "aliases": [
+      "lotus_position_man"
+    ]
+  , "tags": [
+      "meditation"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧘‍♀"
+  , "description": "woman in lotus position"
+  , "category": "People & Body"
+  , "aliases": [
+      "lotus_position_woman"
+    ]
+  , "tags": [
+      "meditation"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🛀"
+  , "description": "person taking bath"
+  , "category": "People & Body"
+  , "aliases": [
+      "bath"
+    ]
+  , "tags": [
+      "shower"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🛌"
+  , "description": "person in bed"
+  , "category": "People & Body"
+  , "aliases": [
+      "sleeping_bed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧑‍🤝‍🧑"
+  , "description": "people holding hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "people_holding_hands"
+    ]
+  , "tags": [
+      "couple"
+    , "date"
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👭"
+  , "description": "women holding hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "two_women_holding_hands"
+    ]
+  , "tags": [
+      "couple"
+    , "date"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👫"
+  , "description": "woman and man holding hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "couple"
+    ]
+  , "tags": [
+      "date"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👬"
+  , "description": "men holding hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "two_men_holding_hands"
+    ]
+  , "tags": [
+      "couple"
+    , "date"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💏"
+  , "description": "kiss"
+  , "category": "People & Body"
+  , "aliases": [
+      "couplekiss"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👩‍❤️‍💋‍👨"
+  , "description": "kiss: woman, man"
+  , "category": "People & Body"
+  , "aliases": [
+      "couplekiss_man_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👨‍❤️‍💋‍👨"
+  , "description": "kiss: man, man"
+  , "category": "People & Body"
+  , "aliases": [
+      "couplekiss_man_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍❤️‍💋‍👩"
+  , "description": "kiss: woman, woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "couplekiss_woman_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "💑"
+  , "description": "couple with heart"
+  , "category": "People & Body"
+  , "aliases": [
+      "couple_with_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👩‍❤️‍👨"
+  , "description": "couple with heart: woman, man"
+  , "category": "People & Body"
+  , "aliases": [
+      "couple_with_heart_woman_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👨‍❤️‍👨"
+  , "description": "couple with heart: man, man"
+  , "category": "People & Body"
+  , "aliases": [
+      "couple_with_heart_man_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍❤️‍👩"
+  , "description": "couple with heart: woman, woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "couple_with_heart_woman_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👪"
+  , "description": "family"
+  , "category": "People & Body"
+  , "aliases": [
+      "family"
+    ]
+  , "tags": [
+      "home"
+    , "parents"
+    , "child"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👨‍👩‍👦"
+  , "description": "family: man, woman, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_woman_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👨‍👩‍👧"
+  , "description": "family: man, woman, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_woman_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👩‍👧‍👦"
+  , "description": "family: man, woman, girl, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_woman_girl_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👩‍👦‍👦"
+  , "description": "family: man, woman, boy, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_woman_boy_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👩‍👧‍👧"
+  , "description": "family: man, woman, girl, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_woman_girl_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👨‍👦"
+  , "description": "family: man, man, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_man_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👨‍👧"
+  , "description": "family: man, man, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_man_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👨‍👧‍👦"
+  , "description": "family: man, man, girl, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_man_girl_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👨‍👦‍👦"
+  , "description": "family: man, man, boy, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_man_boy_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👨‍👧‍👧"
+  , "description": "family: man, man, girl, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_man_girl_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍👩‍👦"
+  , "description": "family: woman, woman, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_woman_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍👩‍👧"
+  , "description": "family: woman, woman, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_woman_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍👩‍👧‍👦"
+  , "description": "family: woman, woman, girl, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_woman_girl_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍👩‍👦‍👦"
+  , "description": "family: woman, woman, boy, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_woman_boy_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍👩‍👧‍👧"
+  , "description": "family: woman, woman, girl, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_woman_girl_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👦"
+  , "description": "family: man, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👨‍👦‍👦"
+  , "description": "family: man, boy, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_boy_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👨‍👧"
+  , "description": "family: man, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👨‍👧‍👦"
+  , "description": "family: man, girl, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_girl_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👨‍👧‍👧"
+  , "description": "family: man, girl, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_girl_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👩‍👦"
+  , "description": "family: woman, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👩‍👦‍👦"
+  , "description": "family: woman, boy, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_boy_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👩‍👧"
+  , "description": "family: woman, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👩‍👧‍👦"
+  , "description": "family: woman, girl, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_girl_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👩‍👧‍👧"
+  , "description": "family: woman, girl, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_girl_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "🗣"
+  , "description": "speaking head"
+  , "category": "People & Body"
+  , "aliases": [
+      "speaking_head"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "👤"
+  , "description": "bust in silhouette"
+  , "category": "People & Body"
+  , "aliases": [
+      "bust_in_silhouette"
+    ]
+  , "tags": [
+      "user"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👥"
+  , "description": "busts in silhouette"
+  , "category": "People & Body"
+  , "aliases": [
+      "busts_in_silhouette"
+    ]
+  , "tags": [
+      "users"
+    , "group"
+    , "team"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👣"
+  , "description": "footprints"
+  , "category": "People & Body"
+  , "aliases": [
+      "footprints"
+    ]
+  , "tags": [
+      "feet"
+    , "tracks"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐵"
+  , "description": "monkey face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "monkey_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐒"
+  , "description": "monkey"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "monkey"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦍"
+  , "description": "gorilla"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "gorilla"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦧"
+  , "description": "orangutan"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "orangutan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🐶"
+  , "description": "dog face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dog"
+    ]
+  , "tags": [
+      "pet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐕"
+  , "description": "dog"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dog2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦮"
+  , "description": "guide dog"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "guide_dog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🐕‍🦺"
+  , "description": "service dog"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "service_dog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🐩"
+  , "description": "poodle"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "poodle"
+    ]
+  , "tags": [
+      "dog"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐺"
+  , "description": "wolf"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "wolf"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦊"
+  , "description": "fox"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "fox_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦝"
+  , "description": "raccoon"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "raccoon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐱"
+  , "description": "cat face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cat"
+    ]
+  , "tags": [
+      "pet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐈"
+  , "description": "cat"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cat2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦁"
+  , "description": "lion"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "lion"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🐯"
+  , "description": "tiger face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "tiger"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐅"
+  , "description": "tiger"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "tiger2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐆"
+  , "description": "leopard"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "leopard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐴"
+  , "description": "horse face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "horse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐎"
+  , "description": "horse"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "racehorse"
+    ]
+  , "tags": [
+      "speed"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦄"
+  , "description": "unicorn"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "unicorn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦓"
+  , "description": "zebra"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "zebra"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦌"
+  , "description": "deer"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "deer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🐮"
+  , "description": "cow face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐂"
+  , "description": "ox"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "ox"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐃"
+  , "description": "water buffalo"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "water_buffalo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐄"
+  , "description": "cow"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cow2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐷"
+  , "description": "pig face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "pig"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐖"
+  , "description": "pig"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "pig2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐗"
+  , "description": "boar"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "boar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐽"
+  , "description": "pig nose"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "pig_nose"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐏"
+  , "description": "ram"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "ram"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐑"
+  , "description": "ewe"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "sheep"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐐"
+  , "description": "goat"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "goat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐪"
+  , "description": "camel"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dromedary_camel"
+    ]
+  , "tags": [
+      "desert"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐫"
+  , "description": "two-hump camel"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "camel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦙"
+  , "description": "llama"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "llama"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦒"
+  , "description": "giraffe"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "giraffe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐘"
+  , "description": "elephant"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "elephant"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦏"
+  , "description": "rhinoceros"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rhinoceros"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦛"
+  , "description": "hippopotamus"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hippopotamus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐭"
+  , "description": "mouse face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "mouse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐁"
+  , "description": "mouse"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "mouse2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐀"
+  , "description": "rat"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐹"
+  , "description": "hamster"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hamster"
+    ]
+  , "tags": [
+      "pet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐰"
+  , "description": "rabbit face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rabbit"
+    ]
+  , "tags": [
+      "bunny"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐇"
+  , "description": "rabbit"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rabbit2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐿"
+  , "description": "chipmunk"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "chipmunk"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦔"
+  , "description": "hedgehog"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hedgehog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦇"
+  , "description": "bat"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🐻"
+  , "description": "bear"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bear"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐨"
+  , "description": "koala"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "koala"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐼"
+  , "description": "panda"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "panda_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦥"
+  , "description": "sloth"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "sloth"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦦"
+  , "description": "otter"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "otter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦨"
+  , "description": "skunk"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "skunk"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦘"
+  , "description": "kangaroo"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "kangaroo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦡"
+  , "description": "badger"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "badger"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐾"
+  , "description": "paw prints"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "feet"
+    , "paw_prints"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦃"
+  , "description": "turkey"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "turkey"
+    ]
+  , "tags": [
+      "thanksgiving"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🐔"
+  , "description": "chicken"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "chicken"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐓"
+  , "description": "rooster"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rooster"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐣"
+  , "description": "hatching chick"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hatching_chick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐤"
+  , "description": "baby chick"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "baby_chick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐥"
+  , "description": "front-facing baby chick"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hatched_chick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐦"
+  , "description": "bird"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bird"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐧"
+  , "description": "penguin"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "penguin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕊"
+  , "description": "dove"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dove"
+    ]
+  , "tags": [
+      "peace"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦅"
+  , "description": "eagle"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "eagle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦆"
+  , "description": "duck"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "duck"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦢"
+  , "description": "swan"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "swan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦉"
+  , "description": "owl"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "owl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦩"
+  , "description": "flamingo"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "flamingo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦚"
+  , "description": "peacock"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "peacock"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦜"
+  , "description": "parrot"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "parrot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐸"
+  , "description": "frog"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "frog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐊"
+  , "description": "crocodile"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "crocodile"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐢"
+  , "description": "turtle"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "turtle"
+    ]
+  , "tags": [
+      "slow"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦎"
+  , "description": "lizard"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "lizard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🐍"
+  , "description": "snake"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "snake"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐲"
+  , "description": "dragon face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dragon_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐉"
+  , "description": "dragon"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dragon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦕"
+  , "description": "sauropod"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "sauropod"
+    ]
+  , "tags": [
+      "dinosaur"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦖"
+  , "description": "T-Rex"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "t-rex"
+    ]
+  , "tags": [
+      "dinosaur"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐳"
+  , "description": "spouting whale"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "whale"
+    ]
+  , "tags": [
+      "sea"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐋"
+  , "description": "whale"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "whale2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐬"
+  , "description": "dolphin"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dolphin"
+    , "flipper"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐟"
+  , "description": "fish"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "fish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐠"
+  , "description": "tropical fish"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "tropical_fish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐡"
+  , "description": "blowfish"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "blowfish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦈"
+  , "description": "shark"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "shark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🐙"
+  , "description": "octopus"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "octopus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐚"
+  , "description": "spiral shell"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "shell"
+    ]
+  , "tags": [
+      "sea"
+    , "beach"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐌"
+  , "description": "snail"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "snail"
+    ]
+  , "tags": [
+      "slow"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦋"
+  , "description": "butterfly"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "butterfly"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🐛"
+  , "description": "bug"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bug"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐜"
+  , "description": "ant"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "ant"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐝"
+  , "description": "honeybee"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bee"
+    , "honeybee"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐞"
+  , "description": "lady beetle"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "beetle"
+    ]
+  , "tags": [
+      "bug"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦗"
+  , "description": "cricket"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cricket"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🕷"
+  , "description": "spider"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "spider"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕸"
+  , "description": "spider web"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "spider_web"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦂"
+  , "description": "scorpion"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "scorpion"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦟"
+  , "description": "mosquito"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "mosquito"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦠"
+  , "description": "microbe"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "microbe"
+    ]
+  , "tags": [
+      "germ"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "💐"
+  , "description": "bouquet"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bouquet"
+    ]
+  , "tags": [
+      "flowers"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌸"
+  , "description": "cherry blossom"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cherry_blossom"
+    ]
+  , "tags": [
+      "flower"
+    , "spring"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💮"
+  , "description": "white flower"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "white_flower"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏵"
+  , "description": "rosette"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rosette"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌹"
+  , "description": "rose"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rose"
+    ]
+  , "tags": [
+      "flower"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥀"
+  , "description": "wilted flower"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "wilted_flower"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🌺"
+  , "description": "hibiscus"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hibiscus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌻"
+  , "description": "sunflower"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "sunflower"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌼"
+  , "description": "blossom"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "blossom"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌷"
+  , "description": "tulip"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "tulip"
+    ]
+  , "tags": [
+      "flower"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌱"
+  , "description": "seedling"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "seedling"
+    ]
+  , "tags": [
+      "plant"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌲"
+  , "description": "evergreen tree"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "evergreen_tree"
+    ]
+  , "tags": [
+      "wood"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌳"
+  , "description": "deciduous tree"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "deciduous_tree"
+    ]
+  , "tags": [
+      "wood"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌴"
+  , "description": "palm tree"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "palm_tree"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌵"
+  , "description": "cactus"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cactus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌾"
+  , "description": "sheaf of rice"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "ear_of_rice"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌿"
+  , "description": "herb"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "herb"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☘"
+  , "description": "shamrock"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "shamrock"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🍀"
+  , "description": "four leaf clover"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "four_leaf_clover"
+    ]
+  , "tags": [
+      "luck"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍁"
+  , "description": "maple leaf"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "maple_leaf"
+    ]
+  , "tags": [
+      "canada"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍂"
+  , "description": "fallen leaf"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "fallen_leaf"
+    ]
+  , "tags": [
+      "autumn"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍃"
+  , "description": "leaf fluttering in wind"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "leaves"
+    ]
+  , "tags": [
+      "leaf"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍇"
+  , "description": "grapes"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "grapes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍈"
+  , "description": "melon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "melon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍉"
+  , "description": "watermelon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "watermelon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍊"
+  , "description": "tangerine"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "tangerine"
+    , "orange"
+    , "mandarin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍋"
+  , "description": "lemon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "lemon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍌"
+  , "description": "banana"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "banana"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍍"
+  , "description": "pineapple"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pineapple"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥭"
+  , "description": "mango"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "mango"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🍎"
+  , "description": "red apple"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "apple"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍏"
+  , "description": "green apple"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "green_apple"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍐"
+  , "description": "pear"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pear"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍑"
+  , "description": "peach"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "peach"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍒"
+  , "description": "cherries"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cherries"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍓"
+  , "description": "strawberry"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "strawberry"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥝"
+  , "description": "kiwi fruit"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "kiwi_fruit"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍅"
+  , "description": "tomato"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "tomato"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥥"
+  , "description": "coconut"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "coconut"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥑"
+  , "description": "avocado"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "avocado"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍆"
+  , "description": "eggplant"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "eggplant"
+    ]
+  , "tags": [
+      "aubergine"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥔"
+  , "description": "potato"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "potato"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥕"
+  , "description": "carrot"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "carrot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🌽"
+  , "description": "ear of corn"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "corn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌶"
+  , "description": "hot pepper"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "hot_pepper"
+    ]
+  , "tags": [
+      "spicy"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥒"
+  , "description": "cucumber"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cucumber"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥬"
+  , "description": "leafy green"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "leafy_green"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥦"
+  , "description": "broccoli"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "broccoli"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧄"
+  , "description": "garlic"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "garlic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧅"
+  , "description": "onion"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "onion"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🍄"
+  , "description": "mushroom"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "mushroom"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥜"
+  , "description": "peanuts"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "peanuts"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🌰"
+  , "description": "chestnut"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "chestnut"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍞"
+  , "description": "bread"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "bread"
+    ]
+  , "tags": [
+      "toast"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥐"
+  , "description": "croissant"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "croissant"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥖"
+  , "description": "baguette bread"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "baguette_bread"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥨"
+  , "description": "pretzel"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pretzel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥯"
+  , "description": "bagel"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "bagel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥞"
+  , "description": "pancakes"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pancakes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🧇"
+  , "description": "waffle"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "waffle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧀"
+  , "description": "cheese wedge"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cheese"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🍖"
+  , "description": "meat on bone"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "meat_on_bone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍗"
+  , "description": "poultry leg"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "poultry_leg"
+    ]
+  , "tags": [
+      "meat"
+    , "chicken"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥩"
+  , "description": "cut of meat"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cut_of_meat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥓"
+  , "description": "bacon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "bacon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍔"
+  , "description": "hamburger"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "hamburger"
+    ]
+  , "tags": [
+      "burger"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍟"
+  , "description": "french fries"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fries"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍕"
+  , "description": "pizza"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pizza"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌭"
+  , "description": "hot dog"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "hotdog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥪"
+  , "description": "sandwich"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "sandwich"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🌮"
+  , "description": "taco"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "taco"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌯"
+  , "description": "burrito"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "burrito"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥙"
+  , "description": "stuffed flatbread"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "stuffed_flatbread"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🧆"
+  , "description": "falafel"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "falafel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🥚"
+  , "description": "egg"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "egg"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍳"
+  , "description": "cooking"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fried_egg"
+    ]
+  , "tags": [
+      "breakfast"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥘"
+  , "description": "shallow pan of food"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "shallow_pan_of_food"
+    ]
+  , "tags": [
+      "paella"
+    , "curry"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍲"
+  , "description": "pot of food"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "stew"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥣"
+  , "description": "bowl with spoon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "bowl_with_spoon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥗"
+  , "description": "green salad"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "green_salad"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍿"
+  , "description": "popcorn"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "popcorn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧈"
+  , "description": "butter"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "butter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧂"
+  , "description": "salt"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "salt"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥫"
+  , "description": "canned food"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "canned_food"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🍱"
+  , "description": "bento box"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "bento"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍘"
+  , "description": "rice cracker"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "rice_cracker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍙"
+  , "description": "rice ball"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "rice_ball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍚"
+  , "description": "cooked rice"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "rice"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍛"
+  , "description": "curry rice"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "curry"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍜"
+  , "description": "steaming bowl"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "ramen"
+    ]
+  , "tags": [
+      "noodle"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍝"
+  , "description": "spaghetti"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "spaghetti"
+    ]
+  , "tags": [
+      "pasta"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍠"
+  , "description": "roasted sweet potato"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "sweet_potato"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍢"
+  , "description": "oden"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "oden"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍣"
+  , "description": "sushi"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "sushi"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍤"
+  , "description": "fried shrimp"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fried_shrimp"
+    ]
+  , "tags": [
+      "tempura"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍥"
+  , "description": "fish cake with swirl"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fish_cake"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥮"
+  , "description": "moon cake"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "moon_cake"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🍡"
+  , "description": "dango"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "dango"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥟"
+  , "description": "dumpling"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "dumpling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥠"
+  , "description": "fortune cookie"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fortune_cookie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥡"
+  , "description": "takeout box"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "takeout_box"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦀"
+  , "description": "crab"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "crab"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦞"
+  , "description": "lobster"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "lobster"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦐"
+  , "description": "shrimp"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "shrimp"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦑"
+  , "description": "squid"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "squid"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦪"
+  , "description": "oyster"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "oyster"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🍦"
+  , "description": "soft ice cream"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "icecream"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍧"
+  , "description": "shaved ice"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "shaved_ice"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍨"
+  , "description": "ice cream"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "ice_cream"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍩"
+  , "description": "doughnut"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "doughnut"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍪"
+  , "description": "cookie"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cookie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎂"
+  , "description": "birthday cake"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "birthday"
+    ]
+  , "tags": [
+      "party"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍰"
+  , "description": "shortcake"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cake"
+    ]
+  , "tags": [
+      "dessert"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧁"
+  , "description": "cupcake"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cupcake"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥧"
+  , "description": "pie"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🍫"
+  , "description": "chocolate bar"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "chocolate_bar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍬"
+  , "description": "candy"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "candy"
+    ]
+  , "tags": [
+      "sweet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍭"
+  , "description": "lollipop"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "lollipop"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍮"
+  , "description": "custard"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "custard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍯"
+  , "description": "honey pot"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "honey_pot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍼"
+  , "description": "baby bottle"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "baby_bottle"
+    ]
+  , "tags": [
+      "milk"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥛"
+  , "description": "glass of milk"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "milk_glass"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "☕"
+  , "description": "hot beverage"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "coffee"
+    ]
+  , "tags": [
+      "cafe"
+    , "espresso"
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍵"
+  , "description": "teacup without handle"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "tea"
+    ]
+  , "tags": [
+      "green"
+    , "breakfast"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍶"
+  , "description": "sake"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "sake"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍾"
+  , "description": "bottle with popping cork"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "champagne"
+    ]
+  , "tags": [
+      "bottle"
+    , "bubbly"
+    , "celebration"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🍷"
+  , "description": "wine glass"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "wine_glass"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍸"
+  , "description": "cocktail glass"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cocktail"
+    ]
+  , "tags": [
+      "drink"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍹"
+  , "description": "tropical drink"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "tropical_drink"
+    ]
+  , "tags": [
+      "summer"
+    , "vacation"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍺"
+  , "description": "beer mug"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "beer"
+    ]
+  , "tags": [
+      "drink"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍻"
+  , "description": "clinking beer mugs"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "beers"
+    ]
+  , "tags": [
+      "drinks"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥂"
+  , "description": "clinking glasses"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "clinking_glasses"
+    ]
+  , "tags": [
+      "cheers"
+    , "toast"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥃"
+  , "description": "tumbler glass"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "tumbler_glass"
+    ]
+  , "tags": [
+      "whisky"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥤"
+  , "description": "cup with straw"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cup_with_straw"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧃"
+  , "description": "beverage box"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "beverage_box"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧉"
+  , "description": "mate"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "mate"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧊"
+  , "description": "ice cube"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "ice_cube"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🥢"
+  , "description": "chopsticks"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "chopsticks"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🍽"
+  , "description": "fork and knife with plate"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "plate_with_cutlery"
+    ]
+  , "tags": [
+      "dining"
+    , "dinner"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🍴"
+  , "description": "fork and knife"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fork_and_knife"
+    ]
+  , "tags": [
+      "cutlery"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥄"
+  , "description": "spoon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "spoon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🔪"
+  , "description": "kitchen knife"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "hocho"
+    , "knife"
+    ]
+  , "tags": [
+      "cut"
+    , "chop"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏺"
+  , "description": "amphora"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "amphora"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌍"
+  , "description": "globe showing Europe-Africa"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "earth_africa"
+    ]
+  , "tags": [
+      "globe"
+    , "world"
+    , "international"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌎"
+  , "description": "globe showing Americas"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "earth_americas"
+    ]
+  , "tags": [
+      "globe"
+    , "world"
+    , "international"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌏"
+  , "description": "globe showing Asia-Australia"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "earth_asia"
+    ]
+  , "tags": [
+      "globe"
+    , "world"
+    , "international"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌐"
+  , "description": "globe with meridians"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "globe_with_meridians"
+    ]
+  , "tags": [
+      "world"
+    , "global"
+    , "international"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗺"
+  , "description": "world map"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "world_map"
+    ]
+  , "tags": [
+      "travel"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗾"
+  , "description": "map of Japan"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "japan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧭"
+  , "description": "compass"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "compass"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏔"
+  , "description": "snow-capped mountain"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mountain_snow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛰"
+  , "description": "mountain"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mountain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌋"
+  , "description": "volcano"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "volcano"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗻"
+  , "description": "mount fuji"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mount_fuji"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏕"
+  , "description": "camping"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "camping"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏖"
+  , "description": "beach with umbrella"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "beach_umbrella"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏜"
+  , "description": "desert"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "desert"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏝"
+  , "description": "desert island"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "desert_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏞"
+  , "description": "national park"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "national_park"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏟"
+  , "description": "stadium"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "stadium"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏛"
+  , "description": "classical building"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "classical_building"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏗"
+  , "description": "building construction"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "building_construction"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧱"
+  , "description": "brick"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bricks"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏘"
+  , "description": "houses"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "houses"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏚"
+  , "description": "derelict house"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "derelict_house"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏠"
+  , "description": "house"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "house"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏡"
+  , "description": "house with garden"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "house_with_garden"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏢"
+  , "description": "office building"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "office"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏣"
+  , "description": "Japanese post office"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "post_office"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏤"
+  , "description": "post office"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "european_post_office"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏥"
+  , "description": "hospital"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hospital"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏦"
+  , "description": "bank"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bank"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏨"
+  , "description": "hotel"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hotel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏩"
+  , "description": "love hotel"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "love_hotel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏪"
+  , "description": "convenience store"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "convenience_store"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏫"
+  , "description": "school"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "school"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏬"
+  , "description": "department store"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "department_store"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏭"
+  , "description": "factory"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "factory"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏯"
+  , "description": "Japanese castle"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "japanese_castle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏰"
+  , "description": "castle"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "european_castle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💒"
+  , "description": "wedding"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "wedding"
+    ]
+  , "tags": [
+      "marriage"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗼"
+  , "description": "Tokyo tower"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "tokyo_tower"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗽"
+  , "description": "Statue of Liberty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "statue_of_liberty"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛪"
+  , "description": "church"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "church"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕌"
+  , "description": "mosque"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mosque"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛕"
+  , "description": "hindu temple"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hindu_temple"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🕍"
+  , "description": "synagogue"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "synagogue"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛩"
+  , "description": "shinto shrine"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "shinto_shrine"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕋"
+  , "description": "kaaba"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "kaaba"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛲"
+  , "description": "fountain"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "fountain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛺"
+  , "description": "tent"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "tent"
+    ]
+  , "tags": [
+      "camping"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌁"
+  , "description": "foggy"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "foggy"
+    ]
+  , "tags": [
+      "karl"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌃"
+  , "description": "night with stars"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "night_with_stars"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏙"
+  , "description": "cityscape"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cityscape"
+    ]
+  , "tags": [
+      "skyline"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌄"
+  , "description": "sunrise over mountains"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sunrise_over_mountains"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌅"
+  , "description": "sunrise"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sunrise"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌆"
+  , "description": "cityscape at dusk"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "city_sunset"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌇"
+  , "description": "sunset"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "city_sunrise"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌉"
+  , "description": "bridge at night"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bridge_at_night"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♨️"
+  , "description": "hot springs"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hotsprings"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎠"
+  , "description": "carousel horse"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "carousel_horse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎡"
+  , "description": "ferris wheel"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ferris_wheel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎢"
+  , "description": "roller coaster"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "roller_coaster"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💈"
+  , "description": "barber pole"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "barber"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎪"
+  , "description": "circus tent"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "circus_tent"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚂"
+  , "description": "locomotive"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "steam_locomotive"
+    ]
+  , "tags": [
+      "train"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚃"
+  , "description": "railway car"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "railway_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚄"
+  , "description": "high-speed train"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bullettrain_side"
+    ]
+  , "tags": [
+      "train"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚅"
+  , "description": "bullet train"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bullettrain_front"
+    ]
+  , "tags": [
+      "train"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚆"
+  , "description": "train"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "train2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚇"
+  , "description": "metro"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "metro"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚈"
+  , "description": "light rail"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "light_rail"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚉"
+  , "description": "station"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "station"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚊"
+  , "description": "tram"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "tram"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚝"
+  , "description": "monorail"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "monorail"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚞"
+  , "description": "mountain railway"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mountain_railway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚋"
+  , "description": "tram car"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "train"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚌"
+  , "description": "bus"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚍"
+  , "description": "oncoming bus"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "oncoming_bus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚎"
+  , "description": "trolleybus"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "trolleybus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚐"
+  , "description": "minibus"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "minibus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚑"
+  , "description": "ambulance"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ambulance"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚒"
+  , "description": "fire engine"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "fire_engine"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚓"
+  , "description": "police car"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "police_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚔"
+  , "description": "oncoming police car"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "oncoming_police_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚕"
+  , "description": "taxi"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "taxi"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚖"
+  , "description": "oncoming taxi"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "oncoming_taxi"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚗"
+  , "description": "automobile"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "car"
+    , "red_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚘"
+  , "description": "oncoming automobile"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "oncoming_automobile"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚙"
+  , "description": "sport utility vehicle"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "blue_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚚"
+  , "description": "delivery truck"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "truck"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚛"
+  , "description": "articulated lorry"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "articulated_lorry"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚜"
+  , "description": "tractor"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "tractor"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏎"
+  , "description": "racing car"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "racing_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏍"
+  , "description": "motorcycle"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "motorcycle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛵"
+  , "description": "motor scooter"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "motor_scooter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦽"
+  , "description": "manual wheelchair"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "manual_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦼"
+  , "description": "motorized wheelchair"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "motorized_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🛺"
+  , "description": "auto rickshaw"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "auto_rickshaw"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🚲"
+  , "description": "bicycle"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bike"
+    ]
+  , "tags": [
+      "bicycle"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛴"
+  , "description": "kick scooter"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "kick_scooter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🛹"
+  , "description": "skateboard"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "skateboard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🚏"
+  , "description": "bus stop"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "busstop"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛣"
+  , "description": "motorway"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "motorway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛤"
+  , "description": "railway track"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "railway_track"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛢"
+  , "description": "oil drum"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "oil_drum"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛽"
+  , "description": "fuel pump"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "fuelpump"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚨"
+  , "description": "police car light"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "rotating_light"
+    ]
+  , "tags": [
+      "911"
+    , "emergency"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚥"
+  , "description": "horizontal traffic light"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "traffic_light"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚦"
+  , "description": "vertical traffic light"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "vertical_traffic_light"
+    ]
+  , "tags": [
+      "semaphore"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛑"
+  , "description": "stop sign"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "stop_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🚧"
+  , "description": "construction"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "construction"
+    ]
+  , "tags": [
+      "wip"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚓"
+  , "description": "anchor"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "anchor"
+    ]
+  , "tags": [
+      "ship"
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛵"
+  , "description": "sailboat"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "boat"
+    , "sailboat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛶"
+  , "description": "canoe"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "canoe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🚤"
+  , "description": "speedboat"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "speedboat"
+    ]
+  , "tags": [
+      "ship"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛳"
+  , "description": "passenger ship"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "passenger_ship"
+    ]
+  , "tags": [
+      "cruise"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛴"
+  , "description": "ferry"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ferry"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛥"
+  , "description": "motor boat"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "motor_boat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🚢"
+  , "description": "ship"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ship"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✈️"
+  , "description": "airplane"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "airplane"
+    ]
+  , "tags": [
+      "flight"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛩"
+  , "description": "small airplane"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "small_airplane"
+    ]
+  , "tags": [
+      "flight"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛫"
+  , "description": "airplane departure"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "flight_departure"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛬"
+  , "description": "airplane arrival"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "flight_arrival"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🪂"
+  , "description": "parachute"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "parachute"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "💺"
+  , "description": "seat"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "seat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚁"
+  , "description": "helicopter"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "helicopter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚟"
+  , "description": "suspension railway"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "suspension_railway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚠"
+  , "description": "mountain cableway"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mountain_cableway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚡"
+  , "description": "aerial tramway"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "aerial_tramway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛰"
+  , "description": "satellite"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "artificial_satellite"
+    ]
+  , "tags": [
+      "orbit"
+    , "space"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🚀"
+  , "description": "rocket"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "rocket"
+    ]
+  , "tags": [
+      "ship"
+    , "launch"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛸"
+  , "description": "flying saucer"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "flying_saucer"
+    ]
+  , "tags": [
+      "ufo"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🛎"
+  , "description": "bellhop bell"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bellhop_bell"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧳"
+  , "description": "luggage"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "luggage"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "⌛"
+  , "description": "hourglass done"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hourglass"
+    ]
+  , "tags": [
+      "time"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏳"
+  , "description": "hourglass not done"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hourglass_flowing_sand"
+    ]
+  , "tags": [
+      "time"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⌚"
+  , "description": "watch"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "watch"
+    ]
+  , "tags": [
+      "time"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏰"
+  , "description": "alarm clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "alarm_clock"
+    ]
+  , "tags": [
+      "morning"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏱"
+  , "description": "stopwatch"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "stopwatch"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⏲"
+  , "description": "timer clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "timer_clock"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕰"
+  , "description": "mantelpiece clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mantelpiece_clock"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕛"
+  , "description": "twelve o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock12"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕧"
+  , "description": "twelve-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock1230"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕐"
+  , "description": "one o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock1"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕜"
+  , "description": "one-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock130"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕑"
+  , "description": "two o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕝"
+  , "description": "two-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock230"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕒"
+  , "description": "three o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock3"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕞"
+  , "description": "three-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock330"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕓"
+  , "description": "four o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock4"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕟"
+  , "description": "four-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock430"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕔"
+  , "description": "five o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock5"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕠"
+  , "description": "five-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock530"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕕"
+  , "description": "six o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock6"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕡"
+  , "description": "six-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock630"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕖"
+  , "description": "seven o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock7"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕢"
+  , "description": "seven-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock730"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕗"
+  , "description": "eight o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock8"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕣"
+  , "description": "eight-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock830"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕘"
+  , "description": "nine o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock9"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕤"
+  , "description": "nine-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock930"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕙"
+  , "description": "ten o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock10"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕥"
+  , "description": "ten-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock1030"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕚"
+  , "description": "eleven o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock11"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕦"
+  , "description": "eleven-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock1130"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌑"
+  , "description": "new moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "new_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌒"
+  , "description": "waxing crescent moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "waxing_crescent_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌓"
+  , "description": "first quarter moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "first_quarter_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌔"
+  , "description": "waxing gibbous moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "moon"
+    , "waxing_gibbous_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌕"
+  , "description": "full moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "full_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌖"
+  , "description": "waning gibbous moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "waning_gibbous_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌗"
+  , "description": "last quarter moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "last_quarter_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌘"
+  , "description": "waning crescent moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "waning_crescent_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌙"
+  , "description": "crescent moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "crescent_moon"
+    ]
+  , "tags": [
+      "night"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌚"
+  , "description": "new moon face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "new_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌛"
+  , "description": "first quarter moon face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "first_quarter_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌜"
+  , "description": "last quarter moon face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "last_quarter_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌡"
+  , "description": "thermometer"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "thermometer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☀️"
+  , "description": "sun"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sunny"
+    ]
+  , "tags": [
+      "weather"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌝"
+  , "description": "full moon face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "full_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌞"
+  , "description": "sun with face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sun_with_face"
+    ]
+  , "tags": [
+      "summer"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪐"
+  , "description": "ringed planet"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ringed_planet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "⭐"
+  , "description": "star"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "star"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌟"
+  , "description": "glowing star"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "star2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌠"
+  , "description": "shooting star"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "stars"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌌"
+  , "description": "milky way"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "milky_way"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☁️"
+  , "description": "cloud"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cloud"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛅"
+  , "description": "sun behind cloud"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "partly_sunny"
+    ]
+  , "tags": [
+      "weather"
+    , "cloud"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛈"
+  , "description": "cloud with lightning and rain"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cloud_with_lightning_and_rain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌤"
+  , "description": "sun behind small cloud"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sun_behind_small_cloud"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌥"
+  , "description": "sun behind large cloud"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sun_behind_large_cloud"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌦"
+  , "description": "sun behind rain cloud"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sun_behind_rain_cloud"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌧"
+  , "description": "cloud with rain"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cloud_with_rain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌨"
+  , "description": "cloud with snow"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cloud_with_snow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌩"
+  , "description": "cloud with lightning"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cloud_with_lightning"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌪"
+  , "description": "tornado"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "tornado"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌫"
+  , "description": "fog"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "fog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌬"
+  , "description": "wind face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "wind_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌀"
+  , "description": "cyclone"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cyclone"
+    ]
+  , "tags": [
+      "swirl"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌈"
+  , "description": "rainbow"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "rainbow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌂"
+  , "description": "closed umbrella"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "closed_umbrella"
+    ]
+  , "tags": [
+      "weather"
+    , "rain"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☂️"
+  , "description": "umbrella"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "open_umbrella"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☔"
+  , "description": "umbrella with rain drops"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "umbrella"
+    ]
+  , "tags": [
+      "rain"
+    , "weather"
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛱"
+  , "description": "umbrella on ground"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "parasol_on_ground"
+    ]
+  , "tags": [
+      "beach_umbrella"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚡"
+  , "description": "high voltage"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "zap"
+    ]
+  , "tags": [
+      "lightning"
+    , "thunder"
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❄️"
+  , "description": "snowflake"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "snowflake"
+    ]
+  , "tags": [
+      "winter"
+    , "cold"
+    , "weather"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☃️"
+  , "description": "snowman"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "snowman_with_snow"
+    ]
+  , "tags": [
+      "winter"
+    , "christmas"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛄"
+  , "description": "snowman without snow"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "snowman"
+    ]
+  , "tags": [
+      "winter"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☄"
+  , "description": "comet"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "comet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔥"
+  , "description": "fire"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "fire"
+    ]
+  , "tags": [
+      "burn"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💧"
+  , "description": "droplet"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "droplet"
+    ]
+  , "tags": [
+      "water"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌊"
+  , "description": "water wave"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ocean"
+    ]
+  , "tags": [
+      "sea"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎃"
+  , "description": "jack-o-lantern"
+  , "category": "Activities"
+  , "aliases": [
+      "jack_o_lantern"
+    ]
+  , "tags": [
+      "halloween"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎄"
+  , "description": "Christmas tree"
+  , "category": "Activities"
+  , "aliases": [
+      "christmas_tree"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎆"
+  , "description": "fireworks"
+  , "category": "Activities"
+  , "aliases": [
+      "fireworks"
+    ]
+  , "tags": [
+      "festival"
+    , "celebration"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎇"
+  , "description": "sparkler"
+  , "category": "Activities"
+  , "aliases": [
+      "sparkler"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧨"
+  , "description": "firecracker"
+  , "category": "Activities"
+  , "aliases": [
+      "firecracker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "✨"
+  , "description": "sparkles"
+  , "category": "Activities"
+  , "aliases": [
+      "sparkles"
+    ]
+  , "tags": [
+      "shiny"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎈"
+  , "description": "balloon"
+  , "category": "Activities"
+  , "aliases": [
+      "balloon"
+    ]
+  , "tags": [
+      "party"
+    , "birthday"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎉"
+  , "description": "party popper"
+  , "category": "Activities"
+  , "aliases": [
+      "tada"
+    ]
+  , "tags": [
+      "hooray"
+    , "party"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎊"
+  , "description": "confetti ball"
+  , "category": "Activities"
+  , "aliases": [
+      "confetti_ball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎋"
+  , "description": "tanabata tree"
+  , "category": "Activities"
+  , "aliases": [
+      "tanabata_tree"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎍"
+  , "description": "pine decoration"
+  , "category": "Activities"
+  , "aliases": [
+      "bamboo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎎"
+  , "description": "Japanese dolls"
+  , "category": "Activities"
+  , "aliases": [
+      "dolls"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎏"
+  , "description": "carp streamer"
+  , "category": "Activities"
+  , "aliases": [
+      "flags"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎐"
+  , "description": "wind chime"
+  , "category": "Activities"
+  , "aliases": [
+      "wind_chime"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎑"
+  , "description": "moon viewing ceremony"
+  , "category": "Activities"
+  , "aliases": [
+      "rice_scene"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧧"
+  , "description": "red envelope"
+  , "category": "Activities"
+  , "aliases": [
+      "red_envelope"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎀"
+  , "description": "ribbon"
+  , "category": "Activities"
+  , "aliases": [
+      "ribbon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎁"
+  , "description": "wrapped gift"
+  , "category": "Activities"
+  , "aliases": [
+      "gift"
+    ]
+  , "tags": [
+      "present"
+    , "birthday"
+    , "christmas"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎗"
+  , "description": "reminder ribbon"
+  , "category": "Activities"
+  , "aliases": [
+      "reminder_ribbon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎟"
+  , "description": "admission tickets"
+  , "category": "Activities"
+  , "aliases": [
+      "tickets"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎫"
+  , "description": "ticket"
+  , "category": "Activities"
+  , "aliases": [
+      "ticket"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎖"
+  , "description": "military medal"
+  , "category": "Activities"
+  , "aliases": [
+      "medal_military"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏆"
+  , "description": "trophy"
+  , "category": "Activities"
+  , "aliases": [
+      "trophy"
+    ]
+  , "tags": [
+      "award"
+    , "contest"
+    , "winner"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏅"
+  , "description": "sports medal"
+  , "category": "Activities"
+  , "aliases": [
+      "medal_sports"
+    ]
+  , "tags": [
+      "gold"
+    , "winner"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥇"
+  , "description": "1st place medal"
+  , "category": "Activities"
+  , "aliases": [
+      "1st_place_medal"
+    ]
+  , "tags": [
+      "gold"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥈"
+  , "description": "2nd place medal"
+  , "category": "Activities"
+  , "aliases": [
+      "2nd_place_medal"
+    ]
+  , "tags": [
+      "silver"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥉"
+  , "description": "3rd place medal"
+  , "category": "Activities"
+  , "aliases": [
+      "3rd_place_medal"
+    ]
+  , "tags": [
+      "bronze"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "⚽"
+  , "description": "soccer ball"
+  , "category": "Activities"
+  , "aliases": [
+      "soccer"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚾"
+  , "description": "baseball"
+  , "category": "Activities"
+  , "aliases": [
+      "baseball"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥎"
+  , "description": "softball"
+  , "category": "Activities"
+  , "aliases": [
+      "softball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏀"
+  , "description": "basketball"
+  , "category": "Activities"
+  , "aliases": [
+      "basketball"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏐"
+  , "description": "volleyball"
+  , "category": "Activities"
+  , "aliases": [
+      "volleyball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏈"
+  , "description": "american football"
+  , "category": "Activities"
+  , "aliases": [
+      "football"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏉"
+  , "description": "rugby football"
+  , "category": "Activities"
+  , "aliases": [
+      "rugby_football"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎾"
+  , "description": "tennis"
+  , "category": "Activities"
+  , "aliases": [
+      "tennis"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥏"
+  , "description": "flying disc"
+  , "category": "Activities"
+  , "aliases": [
+      "flying_disc"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎳"
+  , "description": "bowling"
+  , "category": "Activities"
+  , "aliases": [
+      "bowling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏏"
+  , "description": "cricket game"
+  , "category": "Activities"
+  , "aliases": [
+      "cricket_game"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏑"
+  , "description": "field hockey"
+  , "category": "Activities"
+  , "aliases": [
+      "field_hockey"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏒"
+  , "description": "ice hockey"
+  , "category": "Activities"
+  , "aliases": [
+      "ice_hockey"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥍"
+  , "description": "lacrosse"
+  , "category": "Activities"
+  , "aliases": [
+      "lacrosse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏓"
+  , "description": "ping pong"
+  , "category": "Activities"
+  , "aliases": [
+      "ping_pong"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏸"
+  , "description": "badminton"
+  , "category": "Activities"
+  , "aliases": [
+      "badminton"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥊"
+  , "description": "boxing glove"
+  , "category": "Activities"
+  , "aliases": [
+      "boxing_glove"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥋"
+  , "description": "martial arts uniform"
+  , "category": "Activities"
+  , "aliases": [
+      "martial_arts_uniform"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥅"
+  , "description": "goal net"
+  , "category": "Activities"
+  , "aliases": [
+      "goal_net"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "⛳"
+  , "description": "flag in hole"
+  , "category": "Activities"
+  , "aliases": [
+      "golf"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛸"
+  , "description": "ice skate"
+  , "category": "Activities"
+  , "aliases": [
+      "ice_skate"
+    ]
+  , "tags": [
+      "skating"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎣"
+  , "description": "fishing pole"
+  , "category": "Activities"
+  , "aliases": [
+      "fishing_pole_and_fish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤿"
+  , "description": "diving mask"
+  , "category": "Activities"
+  , "aliases": [
+      "diving_mask"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🎽"
+  , "description": "running shirt"
+  , "category": "Activities"
+  , "aliases": [
+      "running_shirt_with_sash"
+    ]
+  , "tags": [
+      "marathon"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎿"
+  , "description": "skis"
+  , "category": "Activities"
+  , "aliases": [
+      "ski"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛷"
+  , "description": "sled"
+  , "category": "Activities"
+  , "aliases": [
+      "sled"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥌"
+  , "description": "curling stone"
+  , "category": "Activities"
+  , "aliases": [
+      "curling_stone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎯"
+  , "description": "direct hit"
+  , "category": "Activities"
+  , "aliases": [
+      "dart"
+    ]
+  , "tags": [
+      "target"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪀"
+  , "description": "yo-yo"
+  , "category": "Activities"
+  , "aliases": [
+      "yo_yo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🪁"
+  , "description": "kite"
+  , "category": "Activities"
+  , "aliases": [
+      "kite"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🎱"
+  , "description": "pool 8 ball"
+  , "category": "Activities"
+  , "aliases": [
+      "8ball"
+    ]
+  , "tags": [
+      "pool"
+    , "billiards"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔮"
+  , "description": "crystal ball"
+  , "category": "Activities"
+  , "aliases": [
+      "crystal_ball"
+    ]
+  , "tags": [
+      "fortune"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧿"
+  , "description": "nazar amulet"
+  , "category": "Activities"
+  , "aliases": [
+      "nazar_amulet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎮"
+  , "description": "video game"
+  , "category": "Activities"
+  , "aliases": [
+      "video_game"
+    ]
+  , "tags": [
+      "play"
+    , "controller"
+    , "console"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕹"
+  , "description": "joystick"
+  , "category": "Activities"
+  , "aliases": [
+      "joystick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎰"
+  , "description": "slot machine"
+  , "category": "Activities"
+  , "aliases": [
+      "slot_machine"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎲"
+  , "description": "game die"
+  , "category": "Activities"
+  , "aliases": [
+      "game_die"
+    ]
+  , "tags": [
+      "dice"
+    , "gambling"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧩"
+  , "description": "puzzle piece"
+  , "category": "Activities"
+  , "aliases": [
+      "jigsaw"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧸"
+  , "description": "teddy bear"
+  , "category": "Activities"
+  , "aliases": [
+      "teddy_bear"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "♠️"
+  , "description": "spade suit"
+  , "category": "Activities"
+  , "aliases": [
+      "spades"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♥️"
+  , "description": "heart suit"
+  , "category": "Activities"
+  , "aliases": [
+      "hearts"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♦️"
+  , "description": "diamond suit"
+  , "category": "Activities"
+  , "aliases": [
+      "diamonds"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♣️"
+  , "description": "club suit"
+  , "category": "Activities"
+  , "aliases": [
+      "clubs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♟"
+  , "description": "chess pawn"
+  , "category": "Activities"
+  , "aliases": [
+      "chess_pawn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🃏"
+  , "description": "joker"
+  , "category": "Activities"
+  , "aliases": [
+      "black_joker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🀄"
+  , "description": "mahjong red dragon"
+  , "category": "Activities"
+  , "aliases": [
+      "mahjong"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎴"
+  , "description": "flower playing cards"
+  , "category": "Activities"
+  , "aliases": [
+      "flower_playing_cards"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎭"
+  , "description": "performing arts"
+  , "category": "Activities"
+  , "aliases": [
+      "performing_arts"
+    ]
+  , "tags": [
+      "theater"
+    , "drama"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🖼"
+  , "description": "framed picture"
+  , "category": "Activities"
+  , "aliases": [
+      "framed_picture"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎨"
+  , "description": "artist palette"
+  , "category": "Activities"
+  , "aliases": [
+      "art"
+    ]
+  , "tags": [
+      "design"
+    , "paint"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧵"
+  , "description": "thread"
+  , "category": "Activities"
+  , "aliases": [
+      "thread"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧶"
+  , "description": "yarn"
+  , "category": "Activities"
+  , "aliases": [
+      "yarn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👓"
+  , "description": "glasses"
+  , "category": "Objects"
+  , "aliases": [
+      "eyeglasses"
+    ]
+  , "tags": [
+      "glasses"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕶"
+  , "description": "sunglasses"
+  , "category": "Objects"
+  , "aliases": [
+      "dark_sunglasses"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥽"
+  , "description": "goggles"
+  , "category": "Objects"
+  , "aliases": [
+      "goggles"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥼"
+  , "description": "lab coat"
+  , "category": "Objects"
+  , "aliases": [
+      "lab_coat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦺"
+  , "description": "safety vest"
+  , "category": "Objects"
+  , "aliases": [
+      "safety_vest"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "👔"
+  , "description": "necktie"
+  , "category": "Objects"
+  , "aliases": [
+      "necktie"
+    ]
+  , "tags": [
+      "shirt"
+    , "formal"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👕"
+  , "description": "t-shirt"
+  , "category": "Objects"
+  , "aliases": [
+      "shirt"
+    , "tshirt"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👖"
+  , "description": "jeans"
+  , "category": "Objects"
+  , "aliases": [
+      "jeans"
+    ]
+  , "tags": [
+      "pants"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧣"
+  , "description": "scarf"
+  , "category": "Objects"
+  , "aliases": [
+      "scarf"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧤"
+  , "description": "gloves"
+  , "category": "Objects"
+  , "aliases": [
+      "gloves"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧥"
+  , "description": "coat"
+  , "category": "Objects"
+  , "aliases": [
+      "coat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧦"
+  , "description": "socks"
+  , "category": "Objects"
+  , "aliases": [
+      "socks"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👗"
+  , "description": "dress"
+  , "category": "Objects"
+  , "aliases": [
+      "dress"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👘"
+  , "description": "kimono"
+  , "category": "Objects"
+  , "aliases": [
+      "kimono"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥻"
+  , "description": "sari"
+  , "category": "Objects"
+  , "aliases": [
+      "sari"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🩱"
+  , "description": "one-piece swimsuit"
+  , "category": "Objects"
+  , "aliases": [
+      "one_piece_swimsuit"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🩲"
+  , "description": "swim brief"
+  , "category": "Objects"
+  , "aliases": [
+      "swim_brief"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🩳"
+  , "description": "shorts"
+  , "category": "Objects"
+  , "aliases": [
+      "shorts"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "👙"
+  , "description": "bikini"
+  , "category": "Objects"
+  , "aliases": [
+      "bikini"
+    ]
+  , "tags": [
+      "beach"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👚"
+  , "description": "woman’s clothes"
+  , "category": "Objects"
+  , "aliases": [
+      "womans_clothes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👛"
+  , "description": "purse"
+  , "category": "Objects"
+  , "aliases": [
+      "purse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👜"
+  , "description": "handbag"
+  , "category": "Objects"
+  , "aliases": [
+      "handbag"
+    ]
+  , "tags": [
+      "bag"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👝"
+  , "description": "clutch bag"
+  , "category": "Objects"
+  , "aliases": [
+      "pouch"
+    ]
+  , "tags": [
+      "bag"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛍"
+  , "description": "shopping bags"
+  , "category": "Objects"
+  , "aliases": [
+      "shopping"
+    ]
+  , "tags": [
+      "bags"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎒"
+  , "description": "backpack"
+  , "category": "Objects"
+  , "aliases": [
+      "school_satchel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👞"
+  , "description": "man’s shoe"
+  , "category": "Objects"
+  , "aliases": [
+      "mans_shoe"
+    , "shoe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👟"
+  , "description": "running shoe"
+  , "category": "Objects"
+  , "aliases": [
+      "athletic_shoe"
+    ]
+  , "tags": [
+      "sneaker"
+    , "sport"
+    , "running"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥾"
+  , "description": "hiking boot"
+  , "category": "Objects"
+  , "aliases": [
+      "hiking_boot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥿"
+  , "description": "flat shoe"
+  , "category": "Objects"
+  , "aliases": [
+      "flat_shoe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👠"
+  , "description": "high-heeled shoe"
+  , "category": "Objects"
+  , "aliases": [
+      "high_heel"
+    ]
+  , "tags": [
+      "shoe"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👡"
+  , "description": "woman’s sandal"
+  , "category": "Objects"
+  , "aliases": [
+      "sandal"
+    ]
+  , "tags": [
+      "shoe"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🩰"
+  , "description": "ballet shoes"
+  , "category": "Objects"
+  , "aliases": [
+      "ballet_shoes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "👢"
+  , "description": "woman’s boot"
+  , "category": "Objects"
+  , "aliases": [
+      "boot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👑"
+  , "description": "crown"
+  , "category": "Objects"
+  , "aliases": [
+      "crown"
+    ]
+  , "tags": [
+      "king"
+    , "queen"
+    , "royal"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👒"
+  , "description": "woman’s hat"
+  , "category": "Objects"
+  , "aliases": [
+      "womans_hat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎩"
+  , "description": "top hat"
+  , "category": "Objects"
+  , "aliases": [
+      "tophat"
+    ]
+  , "tags": [
+      "hat"
+    , "classy"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎓"
+  , "description": "graduation cap"
+  , "category": "Objects"
+  , "aliases": [
+      "mortar_board"
+    ]
+  , "tags": [
+      "education"
+    , "college"
+    , "university"
+    , "graduation"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧢"
+  , "description": "billed cap"
+  , "category": "Objects"
+  , "aliases": [
+      "billed_cap"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "⛑"
+  , "description": "rescue worker’s helmet"
+  , "category": "Objects"
+  , "aliases": [
+      "rescue_worker_helmet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📿"
+  , "description": "prayer beads"
+  , "category": "Objects"
+  , "aliases": [
+      "prayer_beads"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💄"
+  , "description": "lipstick"
+  , "category": "Objects"
+  , "aliases": [
+      "lipstick"
+    ]
+  , "tags": [
+      "makeup"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💍"
+  , "description": "ring"
+  , "category": "Objects"
+  , "aliases": [
+      "ring"
+    ]
+  , "tags": [
+      "wedding"
+    , "marriage"
+    , "engaged"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💎"
+  , "description": "gem stone"
+  , "category": "Objects"
+  , "aliases": [
+      "gem"
+    ]
+  , "tags": [
+      "diamond"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔇"
+  , "description": "muted speaker"
+  , "category": "Objects"
+  , "aliases": [
+      "mute"
+    ]
+  , "tags": [
+      "sound"
+    , "volume"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔈"
+  , "description": "speaker low volume"
+  , "category": "Objects"
+  , "aliases": [
+      "speaker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔉"
+  , "description": "speaker medium volume"
+  , "category": "Objects"
+  , "aliases": [
+      "sound"
+    ]
+  , "tags": [
+      "volume"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔊"
+  , "description": "speaker high volume"
+  , "category": "Objects"
+  , "aliases": [
+      "loud_sound"
+    ]
+  , "tags": [
+      "volume"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📢"
+  , "description": "loudspeaker"
+  , "category": "Objects"
+  , "aliases": [
+      "loudspeaker"
+    ]
+  , "tags": [
+      "announcement"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📣"
+  , "description": "megaphone"
+  , "category": "Objects"
+  , "aliases": [
+      "mega"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📯"
+  , "description": "postal horn"
+  , "category": "Objects"
+  , "aliases": [
+      "postal_horn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔔"
+  , "description": "bell"
+  , "category": "Objects"
+  , "aliases": [
+      "bell"
+    ]
+  , "tags": [
+      "sound"
+    , "notification"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔕"
+  , "description": "bell with slash"
+  , "category": "Objects"
+  , "aliases": [
+      "no_bell"
+    ]
+  , "tags": [
+      "volume"
+    , "off"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎼"
+  , "description": "musical score"
+  , "category": "Objects"
+  , "aliases": [
+      "musical_score"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎵"
+  , "description": "musical note"
+  , "category": "Objects"
+  , "aliases": [
+      "musical_note"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎶"
+  , "description": "musical notes"
+  , "category": "Objects"
+  , "aliases": [
+      "notes"
+    ]
+  , "tags": [
+      "music"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎙"
+  , "description": "studio microphone"
+  , "category": "Objects"
+  , "aliases": [
+      "studio_microphone"
+    ]
+  , "tags": [
+      "podcast"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎚"
+  , "description": "level slider"
+  , "category": "Objects"
+  , "aliases": [
+      "level_slider"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎛"
+  , "description": "control knobs"
+  , "category": "Objects"
+  , "aliases": [
+      "control_knobs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎤"
+  , "description": "microphone"
+  , "category": "Objects"
+  , "aliases": [
+      "microphone"
+    ]
+  , "tags": [
+      "sing"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎧"
+  , "description": "headphone"
+  , "category": "Objects"
+  , "aliases": [
+      "headphones"
+    ]
+  , "tags": [
+      "music"
+    , "earphones"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📻"
+  , "description": "radio"
+  , "category": "Objects"
+  , "aliases": [
+      "radio"
+    ]
+  , "tags": [
+      "podcast"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎷"
+  , "description": "saxophone"
+  , "category": "Objects"
+  , "aliases": [
+      "saxophone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎸"
+  , "description": "guitar"
+  , "category": "Objects"
+  , "aliases": [
+      "guitar"
+    ]
+  , "tags": [
+      "rock"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎹"
+  , "description": "musical keyboard"
+  , "category": "Objects"
+  , "aliases": [
+      "musical_keyboard"
+    ]
+  , "tags": [
+      "piano"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎺"
+  , "description": "trumpet"
+  , "category": "Objects"
+  , "aliases": [
+      "trumpet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎻"
+  , "description": "violin"
+  , "category": "Objects"
+  , "aliases": [
+      "violin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪕"
+  , "description": "banjo"
+  , "category": "Objects"
+  , "aliases": [
+      "banjo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🥁"
+  , "description": "drum"
+  , "category": "Objects"
+  , "aliases": [
+      "drum"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "📱"
+  , "description": "mobile phone"
+  , "category": "Objects"
+  , "aliases": [
+      "iphone"
+    ]
+  , "tags": [
+      "smartphone"
+    , "mobile"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📲"
+  , "description": "mobile phone with arrow"
+  , "category": "Objects"
+  , "aliases": [
+      "calling"
+    ]
+  , "tags": [
+      "call"
+    , "incoming"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☎️"
+  , "description": "telephone"
+  , "category": "Objects"
+  , "aliases": [
+      "phone"
+    , "telephone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📞"
+  , "description": "telephone receiver"
+  , "category": "Objects"
+  , "aliases": [
+      "telephone_receiver"
+    ]
+  , "tags": [
+      "phone"
+    , "call"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📟"
+  , "description": "pager"
+  , "category": "Objects"
+  , "aliases": [
+      "pager"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📠"
+  , "description": "fax machine"
+  , "category": "Objects"
+  , "aliases": [
+      "fax"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔋"
+  , "description": "battery"
+  , "category": "Objects"
+  , "aliases": [
+      "battery"
+    ]
+  , "tags": [
+      "power"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔌"
+  , "description": "electric plug"
+  , "category": "Objects"
+  , "aliases": [
+      "electric_plug"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💻"
+  , "description": "laptop computer"
+  , "category": "Objects"
+  , "aliases": [
+      "computer"
+    ]
+  , "tags": [
+      "desktop"
+    , "screen"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🖥"
+  , "description": "desktop computer"
+  , "category": "Objects"
+  , "aliases": [
+      "desktop_computer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖨"
+  , "description": "printer"
+  , "category": "Objects"
+  , "aliases": [
+      "printer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⌨"
+  , "description": "keyboard"
+  , "category": "Objects"
+  , "aliases": [
+      "keyboard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖱"
+  , "description": "computer mouse"
+  , "category": "Objects"
+  , "aliases": [
+      "computer_mouse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖲"
+  , "description": "trackball"
+  , "category": "Objects"
+  , "aliases": [
+      "trackball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💽"
+  , "description": "computer disk"
+  , "category": "Objects"
+  , "aliases": [
+      "minidisc"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💾"
+  , "description": "floppy disk"
+  , "category": "Objects"
+  , "aliases": [
+      "floppy_disk"
+    ]
+  , "tags": [
+      "save"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💿"
+  , "description": "optical disk"
+  , "category": "Objects"
+  , "aliases": [
+      "cd"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📀"
+  , "description": "dvd"
+  , "category": "Objects"
+  , "aliases": [
+      "dvd"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧮"
+  , "description": "abacus"
+  , "category": "Objects"
+  , "aliases": [
+      "abacus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎥"
+  , "description": "movie camera"
+  , "category": "Objects"
+  , "aliases": [
+      "movie_camera"
+    ]
+  , "tags": [
+      "film"
+    , "video"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎞"
+  , "description": "film frames"
+  , "category": "Objects"
+  , "aliases": [
+      "film_strip"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📽"
+  , "description": "film projector"
+  , "category": "Objects"
+  , "aliases": [
+      "film_projector"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎬"
+  , "description": "clapper board"
+  , "category": "Objects"
+  , "aliases": [
+      "clapper"
+    ]
+  , "tags": [
+      "film"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📺"
+  , "description": "television"
+  , "category": "Objects"
+  , "aliases": [
+      "tv"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📷"
+  , "description": "camera"
+  , "category": "Objects"
+  , "aliases": [
+      "camera"
+    ]
+  , "tags": [
+      "photo"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📸"
+  , "description": "camera with flash"
+  , "category": "Objects"
+  , "aliases": [
+      "camera_flash"
+    ]
+  , "tags": [
+      "photo"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📹"
+  , "description": "video camera"
+  , "category": "Objects"
+  , "aliases": [
+      "video_camera"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📼"
+  , "description": "videocassette"
+  , "category": "Objects"
+  , "aliases": [
+      "vhs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔍"
+  , "description": "magnifying glass tilted left"
+  , "category": "Objects"
+  , "aliases": [
+      "mag"
+    ]
+  , "tags": [
+      "search"
+    , "zoom"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔎"
+  , "description": "magnifying glass tilted right"
+  , "category": "Objects"
+  , "aliases": [
+      "mag_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕯"
+  , "description": "candle"
+  , "category": "Objects"
+  , "aliases": [
+      "candle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💡"
+  , "description": "light bulb"
+  , "category": "Objects"
+  , "aliases": [
+      "bulb"
+    ]
+  , "tags": [
+      "idea"
+    , "light"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔦"
+  , "description": "flashlight"
+  , "category": "Objects"
+  , "aliases": [
+      "flashlight"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏮"
+  , "description": "red paper lantern"
+  , "category": "Objects"
+  , "aliases": [
+      "izakaya_lantern"
+    , "lantern"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪔"
+  , "description": "diya lamp"
+  , "category": "Objects"
+  , "aliases": [
+      "diya_lamp"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "📔"
+  , "description": "notebook with decorative cover"
+  , "category": "Objects"
+  , "aliases": [
+      "notebook_with_decorative_cover"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📕"
+  , "description": "closed book"
+  , "category": "Objects"
+  , "aliases": [
+      "closed_book"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📖"
+  , "description": "open book"
+  , "category": "Objects"
+  , "aliases": [
+      "book"
+    , "open_book"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📗"
+  , "description": "green book"
+  , "category": "Objects"
+  , "aliases": [
+      "green_book"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📘"
+  , "description": "blue book"
+  , "category": "Objects"
+  , "aliases": [
+      "blue_book"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📙"
+  , "description": "orange book"
+  , "category": "Objects"
+  , "aliases": [
+      "orange_book"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📚"
+  , "description": "books"
+  , "category": "Objects"
+  , "aliases": [
+      "books"
+    ]
+  , "tags": [
+      "library"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📓"
+  , "description": "notebook"
+  , "category": "Objects"
+  , "aliases": [
+      "notebook"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📒"
+  , "description": "ledger"
+  , "category": "Objects"
+  , "aliases": [
+      "ledger"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📃"
+  , "description": "page with curl"
+  , "category": "Objects"
+  , "aliases": [
+      "page_with_curl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📜"
+  , "description": "scroll"
+  , "category": "Objects"
+  , "aliases": [
+      "scroll"
+    ]
+  , "tags": [
+      "document"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📄"
+  , "description": "page facing up"
+  , "category": "Objects"
+  , "aliases": [
+      "page_facing_up"
+    ]
+  , "tags": [
+      "document"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📰"
+  , "description": "newspaper"
+  , "category": "Objects"
+  , "aliases": [
+      "newspaper"
+    ]
+  , "tags": [
+      "press"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗞"
+  , "description": "rolled-up newspaper"
+  , "category": "Objects"
+  , "aliases": [
+      "newspaper_roll"
+    ]
+  , "tags": [
+      "press"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📑"
+  , "description": "bookmark tabs"
+  , "category": "Objects"
+  , "aliases": [
+      "bookmark_tabs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔖"
+  , "description": "bookmark"
+  , "category": "Objects"
+  , "aliases": [
+      "bookmark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏷"
+  , "description": "label"
+  , "category": "Objects"
+  , "aliases": [
+      "label"
+    ]
+  , "tags": [
+      "tag"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💰"
+  , "description": "money bag"
+  , "category": "Objects"
+  , "aliases": [
+      "moneybag"
+    ]
+  , "tags": [
+      "dollar"
+    , "cream"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💴"
+  , "description": "yen banknote"
+  , "category": "Objects"
+  , "aliases": [
+      "yen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💵"
+  , "description": "dollar banknote"
+  , "category": "Objects"
+  , "aliases": [
+      "dollar"
+    ]
+  , "tags": [
+      "money"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💶"
+  , "description": "euro banknote"
+  , "category": "Objects"
+  , "aliases": [
+      "euro"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💷"
+  , "description": "pound banknote"
+  , "category": "Objects"
+  , "aliases": [
+      "pound"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💸"
+  , "description": "money with wings"
+  , "category": "Objects"
+  , "aliases": [
+      "money_with_wings"
+    ]
+  , "tags": [
+      "dollar"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💳"
+  , "description": "credit card"
+  , "category": "Objects"
+  , "aliases": [
+      "credit_card"
+    ]
+  , "tags": [
+      "subscription"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧾"
+  , "description": "receipt"
+  , "category": "Objects"
+  , "aliases": [
+      "receipt"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "💹"
+  , "description": "chart increasing with yen"
+  , "category": "Objects"
+  , "aliases": [
+      "chart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💱"
+  , "description": "currency exchange"
+  , "category": "Objects"
+  , "aliases": [
+      "currency_exchange"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💲"
+  , "description": "heavy dollar sign"
+  , "category": "Objects"
+  , "aliases": [
+      "heavy_dollar_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✉️"
+  , "description": "envelope"
+  , "category": "Objects"
+  , "aliases": [
+      "email"
+    , "envelope"
+    ]
+  , "tags": [
+      "letter"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📧"
+  , "description": "e-mail"
+  , "category": "Objects"
+  , "aliases": [
+      "e-mail"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📨"
+  , "description": "incoming envelope"
+  , "category": "Objects"
+  , "aliases": [
+      "incoming_envelope"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📩"
+  , "description": "envelope with arrow"
+  , "category": "Objects"
+  , "aliases": [
+      "envelope_with_arrow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📤"
+  , "description": "outbox tray"
+  , "category": "Objects"
+  , "aliases": [
+      "outbox_tray"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📥"
+  , "description": "inbox tray"
+  , "category": "Objects"
+  , "aliases": [
+      "inbox_tray"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📦"
+  , "description": "package"
+  , "category": "Objects"
+  , "aliases": [
+      "package"
+    ]
+  , "tags": [
+      "shipping"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📫"
+  , "description": "closed mailbox with raised flag"
+  , "category": "Objects"
+  , "aliases": [
+      "mailbox"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📪"
+  , "description": "closed mailbox with lowered flag"
+  , "category": "Objects"
+  , "aliases": [
+      "mailbox_closed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📬"
+  , "description": "open mailbox with raised flag"
+  , "category": "Objects"
+  , "aliases": [
+      "mailbox_with_mail"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📭"
+  , "description": "open mailbox with lowered flag"
+  , "category": "Objects"
+  , "aliases": [
+      "mailbox_with_no_mail"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📮"
+  , "description": "postbox"
+  , "category": "Objects"
+  , "aliases": [
+      "postbox"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗳"
+  , "description": "ballot box with ballot"
+  , "category": "Objects"
+  , "aliases": [
+      "ballot_box"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "✏️"
+  , "description": "pencil"
+  , "category": "Objects"
+  , "aliases": [
+      "pencil2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✒️"
+  , "description": "black nib"
+  , "category": "Objects"
+  , "aliases": [
+      "black_nib"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🖋"
+  , "description": "fountain pen"
+  , "category": "Objects"
+  , "aliases": [
+      "fountain_pen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖊"
+  , "description": "pen"
+  , "category": "Objects"
+  , "aliases": [
+      "pen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖌"
+  , "description": "paintbrush"
+  , "category": "Objects"
+  , "aliases": [
+      "paintbrush"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖍"
+  , "description": "crayon"
+  , "category": "Objects"
+  , "aliases": [
+      "crayon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📝"
+  , "description": "memo"
+  , "category": "Objects"
+  , "aliases": [
+      "memo"
+    , "pencil"
+    ]
+  , "tags": [
+      "document"
+    , "note"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💼"
+  , "description": "briefcase"
+  , "category": "Objects"
+  , "aliases": [
+      "briefcase"
+    ]
+  , "tags": [
+      "business"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📁"
+  , "description": "file folder"
+  , "category": "Objects"
+  , "aliases": [
+      "file_folder"
+    ]
+  , "tags": [
+      "directory"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📂"
+  , "description": "open file folder"
+  , "category": "Objects"
+  , "aliases": [
+      "open_file_folder"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗂"
+  , "description": "card index dividers"
+  , "category": "Objects"
+  , "aliases": [
+      "card_index_dividers"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📅"
+  , "description": "calendar"
+  , "category": "Objects"
+  , "aliases": [
+      "date"
+    ]
+  , "tags": [
+      "calendar"
+    , "schedule"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📆"
+  , "description": "tear-off calendar"
+  , "category": "Objects"
+  , "aliases": [
+      "calendar"
+    ]
+  , "tags": [
+      "schedule"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗒"
+  , "description": "spiral notepad"
+  , "category": "Objects"
+  , "aliases": [
+      "spiral_notepad"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗓"
+  , "description": "spiral calendar"
+  , "category": "Objects"
+  , "aliases": [
+      "spiral_calendar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📇"
+  , "description": "card index"
+  , "category": "Objects"
+  , "aliases": [
+      "card_index"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📈"
+  , "description": "chart increasing"
+  , "category": "Objects"
+  , "aliases": [
+      "chart_with_upwards_trend"
+    ]
+  , "tags": [
+      "graph"
+    , "metrics"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📉"
+  , "description": "chart decreasing"
+  , "category": "Objects"
+  , "aliases": [
+      "chart_with_downwards_trend"
+    ]
+  , "tags": [
+      "graph"
+    , "metrics"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📊"
+  , "description": "bar chart"
+  , "category": "Objects"
+  , "aliases": [
+      "bar_chart"
+    ]
+  , "tags": [
+      "stats"
+    , "metrics"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📋"
+  , "description": "clipboard"
+  , "category": "Objects"
+  , "aliases": [
+      "clipboard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📌"
+  , "description": "pushpin"
+  , "category": "Objects"
+  , "aliases": [
+      "pushpin"
+    ]
+  , "tags": [
+      "location"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📍"
+  , "description": "round pushpin"
+  , "category": "Objects"
+  , "aliases": [
+      "round_pushpin"
+    ]
+  , "tags": [
+      "location"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📎"
+  , "description": "paperclip"
+  , "category": "Objects"
+  , "aliases": [
+      "paperclip"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🖇"
+  , "description": "linked paperclips"
+  , "category": "Objects"
+  , "aliases": [
+      "paperclips"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📏"
+  , "description": "straight ruler"
+  , "category": "Objects"
+  , "aliases": [
+      "straight_ruler"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📐"
+  , "description": "triangular ruler"
+  , "category": "Objects"
+  , "aliases": [
+      "triangular_ruler"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✂️"
+  , "description": "scissors"
+  , "category": "Objects"
+  , "aliases": [
+      "scissors"
+    ]
+  , "tags": [
+      "cut"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗃"
+  , "description": "card file box"
+  , "category": "Objects"
+  , "aliases": [
+      "card_file_box"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗄"
+  , "description": "file cabinet"
+  , "category": "Objects"
+  , "aliases": [
+      "file_cabinet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗑"
+  , "description": "wastebasket"
+  , "category": "Objects"
+  , "aliases": [
+      "wastebasket"
+    ]
+  , "tags": [
+      "trash"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔒"
+  , "description": "locked"
+  , "category": "Objects"
+  , "aliases": [
+      "lock"
+    ]
+  , "tags": [
+      "security"
+    , "private"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔓"
+  , "description": "unlocked"
+  , "category": "Objects"
+  , "aliases": [
+      "unlock"
+    ]
+  , "tags": [
+      "security"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔏"
+  , "description": "locked with pen"
+  , "category": "Objects"
+  , "aliases": [
+      "lock_with_ink_pen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔐"
+  , "description": "locked with key"
+  , "category": "Objects"
+  , "aliases": [
+      "closed_lock_with_key"
+    ]
+  , "tags": [
+      "security"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔑"
+  , "description": "key"
+  , "category": "Objects"
+  , "aliases": [
+      "key"
+    ]
+  , "tags": [
+      "lock"
+    , "password"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗝"
+  , "description": "old key"
+  , "category": "Objects"
+  , "aliases": [
+      "old_key"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔨"
+  , "description": "hammer"
+  , "category": "Objects"
+  , "aliases": [
+      "hammer"
+    ]
+  , "tags": [
+      "tool"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪓"
+  , "description": "axe"
+  , "category": "Objects"
+  , "aliases": [
+      "axe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "⛏"
+  , "description": "pick"
+  , "category": "Objects"
+  , "aliases": [
+      "pick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚒"
+  , "description": "hammer and pick"
+  , "category": "Objects"
+  , "aliases": [
+      "hammer_and_pick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛠"
+  , "description": "hammer and wrench"
+  , "category": "Objects"
+  , "aliases": [
+      "hammer_and_wrench"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗡"
+  , "description": "dagger"
+  , "category": "Objects"
+  , "aliases": [
+      "dagger"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚔"
+  , "description": "crossed swords"
+  , "category": "Objects"
+  , "aliases": [
+      "crossed_swords"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔫"
+  , "description": "pistol"
+  , "category": "Objects"
+  , "aliases": [
+      "gun"
+    ]
+  , "tags": [
+      "shoot"
+    , "weapon"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏹"
+  , "description": "bow and arrow"
+  , "category": "Objects"
+  , "aliases": [
+      "bow_and_arrow"
+    ]
+  , "tags": [
+      "archery"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛡"
+  , "description": "shield"
+  , "category": "Objects"
+  , "aliases": [
+      "shield"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔧"
+  , "description": "wrench"
+  , "category": "Objects"
+  , "aliases": [
+      "wrench"
+    ]
+  , "tags": [
+      "tool"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔩"
+  , "description": "nut and bolt"
+  , "category": "Objects"
+  , "aliases": [
+      "nut_and_bolt"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚙"
+  , "description": "gear"
+  , "category": "Objects"
+  , "aliases": [
+      "gear"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗜"
+  , "description": "clamp"
+  , "category": "Objects"
+  , "aliases": [
+      "clamp"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚖"
+  , "description": "balance scale"
+  , "category": "Objects"
+  , "aliases": [
+      "balance_scale"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦯"
+  , "description": "probing cane"
+  , "category": "Objects"
+  , "aliases": [
+      "probing_cane"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🔗"
+  , "description": "link"
+  , "category": "Objects"
+  , "aliases": [
+      "link"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛓"
+  , "description": "chains"
+  , "category": "Objects"
+  , "aliases": [
+      "chains"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧰"
+  , "description": "toolbox"
+  , "category": "Objects"
+  , "aliases": [
+      "toolbox"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧲"
+  , "description": "magnet"
+  , "category": "Objects"
+  , "aliases": [
+      "magnet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "⚗"
+  , "description": "alembic"
+  , "category": "Objects"
+  , "aliases": [
+      "alembic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧪"
+  , "description": "test tube"
+  , "category": "Objects"
+  , "aliases": [
+      "test_tube"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧫"
+  , "description": "petri dish"
+  , "category": "Objects"
+  , "aliases": [
+      "petri_dish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧬"
+  , "description": "dna"
+  , "category": "Objects"
+  , "aliases": [
+      "dna"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🔬"
+  , "description": "microscope"
+  , "category": "Objects"
+  , "aliases": [
+      "microscope"
+    ]
+  , "tags": [
+      "science"
+    , "laboratory"
+    , "investigate"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔭"
+  , "description": "telescope"
+  , "category": "Objects"
+  , "aliases": [
+      "telescope"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📡"
+  , "description": "satellite antenna"
+  , "category": "Objects"
+  , "aliases": [
+      "satellite"
+    ]
+  , "tags": [
+      "signal"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💉"
+  , "description": "syringe"
+  , "category": "Objects"
+  , "aliases": [
+      "syringe"
+    ]
+  , "tags": [
+      "health"
+    , "hospital"
+    , "needle"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🩸"
+  , "description": "drop of blood"
+  , "category": "Objects"
+  , "aliases": [
+      "drop_of_blood"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "💊"
+  , "description": "pill"
+  , "category": "Objects"
+  , "aliases": [
+      "pill"
+    ]
+  , "tags": [
+      "health"
+    , "medicine"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🩹"
+  , "description": "adhesive bandage"
+  , "category": "Objects"
+  , "aliases": [
+      "adhesive_bandage"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🩺"
+  , "description": "stethoscope"
+  , "category": "Objects"
+  , "aliases": [
+      "stethoscope"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🚪"
+  , "description": "door"
+  , "category": "Objects"
+  , "aliases": [
+      "door"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛏"
+  , "description": "bed"
+  , "category": "Objects"
+  , "aliases": [
+      "bed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛋"
+  , "description": "couch and lamp"
+  , "category": "Objects"
+  , "aliases": [
+      "couch_and_lamp"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🪑"
+  , "description": "chair"
+  , "category": "Objects"
+  , "aliases": [
+      "chair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🚽"
+  , "description": "toilet"
+  , "category": "Objects"
+  , "aliases": [
+      "toilet"
+    ]
+  , "tags": [
+      "wc"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚿"
+  , "description": "shower"
+  , "category": "Objects"
+  , "aliases": [
+      "shower"
+    ]
+  , "tags": [
+      "bath"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛁"
+  , "description": "bathtub"
+  , "category": "Objects"
+  , "aliases": [
+      "bathtub"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪒"
+  , "description": "razor"
+  , "category": "Objects"
+  , "aliases": [
+      "razor"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧴"
+  , "description": "lotion bottle"
+  , "category": "Objects"
+  , "aliases": [
+      "lotion_bottle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧷"
+  , "description": "safety pin"
+  , "category": "Objects"
+  , "aliases": [
+      "safety_pin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧹"
+  , "description": "broom"
+  , "category": "Objects"
+  , "aliases": [
+      "broom"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧺"
+  , "description": "basket"
+  , "category": "Objects"
+  , "aliases": [
+      "basket"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧻"
+  , "description": "roll of paper"
+  , "category": "Objects"
+  , "aliases": [
+      "roll_of_paper"
+    ]
+  , "tags": [
+      "toilet"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧼"
+  , "description": "soap"
+  , "category": "Objects"
+  , "aliases": [
+      "soap"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧽"
+  , "description": "sponge"
+  , "category": "Objects"
+  , "aliases": [
+      "sponge"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧯"
+  , "description": "fire extinguisher"
+  , "category": "Objects"
+  , "aliases": [
+      "fire_extinguisher"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🛒"
+  , "description": "shopping cart"
+  , "category": "Objects"
+  , "aliases": [
+      "shopping_cart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🚬"
+  , "description": "cigarette"
+  , "category": "Objects"
+  , "aliases": [
+      "smoking"
+    ]
+  , "tags": [
+      "cigarette"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚰"
+  , "description": "coffin"
+  , "category": "Objects"
+  , "aliases": [
+      "coffin"
+    ]
+  , "tags": [
+      "funeral"
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚱"
+  , "description": "funeral urn"
+  , "category": "Objects"
+  , "aliases": [
+      "funeral_urn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗿"
+  , "description": "moai"
+  , "category": "Objects"
+  , "aliases": [
+      "moyai"
+    ]
+  , "tags": [
+      "stone"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏧"
+  , "description": "ATM sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "atm"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚮"
+  , "description": "litter in bin sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "put_litter_in_its_place"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚰"
+  , "description": "potable water"
+  , "category": "Symbols"
+  , "aliases": [
+      "potable_water"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♿"
+  , "description": "wheelchair symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "wheelchair"
+    ]
+  , "tags": [
+      "accessibility"
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚹"
+  , "description": "men’s room"
+  , "category": "Symbols"
+  , "aliases": [
+      "mens"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚺"
+  , "description": "women’s room"
+  , "category": "Symbols"
+  , "aliases": [
+      "womens"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚻"
+  , "description": "restroom"
+  , "category": "Symbols"
+  , "aliases": [
+      "restroom"
+    ]
+  , "tags": [
+      "toilet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚼"
+  , "description": "baby symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "baby_symbol"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚾"
+  , "description": "water closet"
+  , "category": "Symbols"
+  , "aliases": [
+      "wc"
+    ]
+  , "tags": [
+      "toilet"
+    , "restroom"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛂"
+  , "description": "passport control"
+  , "category": "Symbols"
+  , "aliases": [
+      "passport_control"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛃"
+  , "description": "customs"
+  , "category": "Symbols"
+  , "aliases": [
+      "customs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛄"
+  , "description": "baggage claim"
+  , "category": "Symbols"
+  , "aliases": [
+      "baggage_claim"
+    ]
+  , "tags": [
+      "airport"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛅"
+  , "description": "left luggage"
+  , "category": "Symbols"
+  , "aliases": [
+      "left_luggage"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚠️"
+  , "description": "warning"
+  , "category": "Symbols"
+  , "aliases": [
+      "warning"
+    ]
+  , "tags": [
+      "wip"
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚸"
+  , "description": "children crossing"
+  , "category": "Symbols"
+  , "aliases": [
+      "children_crossing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛔"
+  , "description": "no entry"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_entry"
+    ]
+  , "tags": [
+      "limit"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚫"
+  , "description": "prohibited"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_entry_sign"
+    ]
+  , "tags": [
+      "block"
+    , "forbidden"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚳"
+  , "description": "no bicycles"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_bicycles"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚭"
+  , "description": "no smoking"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_smoking"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚯"
+  , "description": "no littering"
+  , "category": "Symbols"
+  , "aliases": [
+      "do_not_litter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚱"
+  , "description": "non-potable water"
+  , "category": "Symbols"
+  , "aliases": [
+      "non-potable_water"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚷"
+  , "description": "no pedestrians"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_pedestrians"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📵"
+  , "description": "no mobile phones"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_mobile_phones"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔞"
+  , "description": "no one under eighteen"
+  , "category": "Symbols"
+  , "aliases": [
+      "underage"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☢"
+  , "description": "radioactive"
+  , "category": "Symbols"
+  , "aliases": [
+      "radioactive"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☣"
+  , "description": "biohazard"
+  , "category": "Symbols"
+  , "aliases": [
+      "biohazard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⬆️"
+  , "description": "up arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_up"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↗️"
+  , "description": "up-right arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_upper_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➡️"
+  , "description": "right arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↘️"
+  , "description": "down-right arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_lower_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⬇️"
+  , "description": "down arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↙️"
+  , "description": "down-left arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_lower_left"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⬅️"
+  , "description": "left arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_left"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↖️"
+  , "description": "up-left arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_upper_left"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↕️"
+  , "description": "up-down arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_up_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↔️"
+  , "description": "left-right arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "left_right_arrow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↩️"
+  , "description": "right arrow curving left"
+  , "category": "Symbols"
+  , "aliases": [
+      "leftwards_arrow_with_hook"
+    ]
+  , "tags": [
+      "return"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↪️"
+  , "description": "left arrow curving right"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_right_hook"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⤴️"
+  , "description": "right arrow curving up"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_heading_up"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⤵️"
+  , "description": "right arrow curving down"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_heading_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔃"
+  , "description": "clockwise vertical arrows"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrows_clockwise"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔄"
+  , "description": "counterclockwise arrows button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrows_counterclockwise"
+    ]
+  , "tags": [
+      "sync"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔙"
+  , "description": "BACK arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "back"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔚"
+  , "description": "END arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "end"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔛"
+  , "description": "ON! arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "on"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔜"
+  , "description": "SOON arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "soon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔝"
+  , "description": "TOP arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "top"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛐"
+  , "description": "place of worship"
+  , "category": "Symbols"
+  , "aliases": [
+      "place_of_worship"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚛"
+  , "description": "atom symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "atom_symbol"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕉"
+  , "description": "om"
+  , "category": "Symbols"
+  , "aliases": [
+      "om"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "✡️"
+  , "description": "star of David"
+  , "category": "Symbols"
+  , "aliases": [
+      "star_of_david"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☸"
+  , "description": "wheel of dharma"
+  , "category": "Symbols"
+  , "aliases": [
+      "wheel_of_dharma"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☯️"
+  , "description": "yin yang"
+  , "category": "Symbols"
+  , "aliases": [
+      "yin_yang"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "✝️"
+  , "description": "latin cross"
+  , "category": "Symbols"
+  , "aliases": [
+      "latin_cross"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☦"
+  , "description": "orthodox cross"
+  , "category": "Symbols"
+  , "aliases": [
+      "orthodox_cross"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☪"
+  , "description": "star and crescent"
+  , "category": "Symbols"
+  , "aliases": [
+      "star_and_crescent"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☮"
+  , "description": "peace symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "peace_symbol"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕎"
+  , "description": "menorah"
+  , "category": "Symbols"
+  , "aliases": [
+      "menorah"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔯"
+  , "description": "dotted six-pointed star"
+  , "category": "Symbols"
+  , "aliases": [
+      "six_pointed_star"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♈"
+  , "description": "Aries"
+  , "category": "Symbols"
+  , "aliases": [
+      "aries"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♉"
+  , "description": "Taurus"
+  , "category": "Symbols"
+  , "aliases": [
+      "taurus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♊"
+  , "description": "Gemini"
+  , "category": "Symbols"
+  , "aliases": [
+      "gemini"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♋"
+  , "description": "Cancer"
+  , "category": "Symbols"
+  , "aliases": [
+      "cancer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♌"
+  , "description": "Leo"
+  , "category": "Symbols"
+  , "aliases": [
+      "leo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♍"
+  , "description": "Virgo"
+  , "category": "Symbols"
+  , "aliases": [
+      "virgo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♎"
+  , "description": "Libra"
+  , "category": "Symbols"
+  , "aliases": [
+      "libra"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♏"
+  , "description": "Scorpio"
+  , "category": "Symbols"
+  , "aliases": [
+      "scorpius"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♐"
+  , "description": "Sagittarius"
+  , "category": "Symbols"
+  , "aliases": [
+      "sagittarius"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♑"
+  , "description": "Capricorn"
+  , "category": "Symbols"
+  , "aliases": [
+      "capricorn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♒"
+  , "description": "Aquarius"
+  , "category": "Symbols"
+  , "aliases": [
+      "aquarius"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♓"
+  , "description": "Pisces"
+  , "category": "Symbols"
+  , "aliases": [
+      "pisces"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛎"
+  , "description": "Ophiuchus"
+  , "category": "Symbols"
+  , "aliases": [
+      "ophiuchus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔀"
+  , "description": "shuffle tracks button"
+  , "category": "Symbols"
+  , "aliases": [
+      "twisted_rightwards_arrows"
+    ]
+  , "tags": [
+      "shuffle"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔁"
+  , "description": "repeat button"
+  , "category": "Symbols"
+  , "aliases": [
+      "repeat"
+    ]
+  , "tags": [
+      "loop"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔂"
+  , "description": "repeat single button"
+  , "category": "Symbols"
+  , "aliases": [
+      "repeat_one"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "▶️"
+  , "description": "play button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_forward"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏩"
+  , "description": "fast-forward button"
+  , "category": "Symbols"
+  , "aliases": [
+      "fast_forward"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏭"
+  , "description": "next track button"
+  , "category": "Symbols"
+  , "aliases": [
+      "next_track_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⏯"
+  , "description": "play or pause button"
+  , "category": "Symbols"
+  , "aliases": [
+      "play_or_pause_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "◀️"
+  , "description": "reverse button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_backward"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏪"
+  , "description": "fast reverse button"
+  , "category": "Symbols"
+  , "aliases": [
+      "rewind"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏮"
+  , "description": "last track button"
+  , "category": "Symbols"
+  , "aliases": [
+      "previous_track_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔼"
+  , "description": "upwards button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_up_small"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏫"
+  , "description": "fast up button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_double_up"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔽"
+  , "description": "downwards button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_down_small"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏬"
+  , "description": "fast down button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_double_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏸"
+  , "description": "pause button"
+  , "category": "Symbols"
+  , "aliases": [
+      "pause_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⏹"
+  , "description": "stop button"
+  , "category": "Symbols"
+  , "aliases": [
+      "stop_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⏺"
+  , "description": "record button"
+  , "category": "Symbols"
+  , "aliases": [
+      "record_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⏏️"
+  , "description": "eject button"
+  , "category": "Symbols"
+  , "aliases": [
+      "eject_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎦"
+  , "description": "cinema"
+  , "category": "Symbols"
+  , "aliases": [
+      "cinema"
+    ]
+  , "tags": [
+      "film"
+    , "movie"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔅"
+  , "description": "dim button"
+  , "category": "Symbols"
+  , "aliases": [
+      "low_brightness"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔆"
+  , "description": "bright button"
+  , "category": "Symbols"
+  , "aliases": [
+      "high_brightness"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📶"
+  , "description": "antenna bars"
+  , "category": "Symbols"
+  , "aliases": [
+      "signal_strength"
+    ]
+  , "tags": [
+      "wifi"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📳"
+  , "description": "vibration mode"
+  , "category": "Symbols"
+  , "aliases": [
+      "vibration_mode"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📴"
+  , "description": "mobile phone off"
+  , "category": "Symbols"
+  , "aliases": [
+      "mobile_phone_off"
+    ]
+  , "tags": [
+      "mute"
+    , "off"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♀️"
+  , "description": "female sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "female_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "♂️"
+  , "description": "male sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "male_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "⚕"
+  , "description": "medical symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "medical_symbol"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "♾"
+  , "description": "infinity"
+  , "category": "Symbols"
+  , "aliases": [
+      "infinity"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "♻️"
+  , "description": "recycling symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "recycle"
+    ]
+  , "tags": [
+      "environment"
+    , "green"
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚜"
+  , "description": "fleur-de-lis"
+  , "category": "Symbols"
+  , "aliases": [
+      "fleur_de_lis"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔱"
+  , "description": "trident emblem"
+  , "category": "Symbols"
+  , "aliases": [
+      "trident"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📛"
+  , "description": "name badge"
+  , "category": "Symbols"
+  , "aliases": [
+      "name_badge"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔰"
+  , "description": "Japanese symbol for beginner"
+  , "category": "Symbols"
+  , "aliases": [
+      "beginner"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⭕"
+  , "description": "hollow red circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "o"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✅"
+  , "description": "check mark button"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_check_mark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☑️"
+  , "description": "check box with check"
+  , "category": "Symbols"
+  , "aliases": [
+      "ballot_box_with_check"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✔️"
+  , "description": "check mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_check_mark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✖️"
+  , "description": "multiplication sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_multiplication_x"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❌"
+  , "description": "cross mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "x"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❎"
+  , "description": "cross mark button"
+  , "category": "Symbols"
+  , "aliases": [
+      "negative_squared_cross_mark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➕"
+  , "description": "plus sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_plus_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➖"
+  , "description": "minus sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_minus_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➗"
+  , "description": "division sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_division_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➰"
+  , "description": "curly loop"
+  , "category": "Symbols"
+  , "aliases": [
+      "curly_loop"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➿"
+  , "description": "double curly loop"
+  , "category": "Symbols"
+  , "aliases": [
+      "loop"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "〽️"
+  , "description": "part alternation mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "part_alternation_mark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✳️"
+  , "description": "eight-spoked asterisk"
+  , "category": "Symbols"
+  , "aliases": [
+      "eight_spoked_asterisk"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✴️"
+  , "description": "eight-pointed star"
+  , "category": "Symbols"
+  , "aliases": [
+      "eight_pointed_black_star"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❇️"
+  , "description": "sparkle"
+  , "category": "Symbols"
+  , "aliases": [
+      "sparkle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "‼️"
+  , "description": "double exclamation mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "bangbang"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⁉️"
+  , "description": "exclamation question mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "interrobang"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❓"
+  , "description": "question mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "question"
+    ]
+  , "tags": [
+      "confused"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❔"
+  , "description": "white question mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "grey_question"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❕"
+  , "description": "white exclamation mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "grey_exclamation"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❗"
+  , "description": "exclamation mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "exclamation"
+    , "heavy_exclamation_mark"
+    ]
+  , "tags": [
+      "bang"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "〰️"
+  , "description": "wavy dash"
+  , "category": "Symbols"
+  , "aliases": [
+      "wavy_dash"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "©️"
+  , "description": "copyright"
+  , "category": "Symbols"
+  , "aliases": [
+      "copyright"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "®️"
+  , "description": "registered"
+  , "category": "Symbols"
+  , "aliases": [
+      "registered"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "™️"
+  , "description": "trade mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "tm"
+    ]
+  , "tags": [
+      "trademark"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "#️⃣"
+  , "description": "keycap: #"
+  , "category": "Symbols"
+  , "aliases": [
+      "hash"
+    ]
+  , "tags": [
+      "number"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "*️⃣"
+  , "description": "keycap: *"
+  , "category": "Symbols"
+  , "aliases": [
+      "asterisk"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "0️⃣"
+  , "description": "keycap: 0"
+  , "category": "Symbols"
+  , "aliases": [
+      "zero"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "1️⃣"
+  , "description": "keycap: 1"
+  , "category": "Symbols"
+  , "aliases": [
+      "one"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "2️⃣"
+  , "description": "keycap: 2"
+  , "category": "Symbols"
+  , "aliases": [
+      "two"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "3️⃣"
+  , "description": "keycap: 3"
+  , "category": "Symbols"
+  , "aliases": [
+      "three"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "4️⃣"
+  , "description": "keycap: 4"
+  , "category": "Symbols"
+  , "aliases": [
+      "four"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "5️⃣"
+  , "description": "keycap: 5"
+  , "category": "Symbols"
+  , "aliases": [
+      "five"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "6️⃣"
+  , "description": "keycap: 6"
+  , "category": "Symbols"
+  , "aliases": [
+      "six"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "7️⃣"
+  , "description": "keycap: 7"
+  , "category": "Symbols"
+  , "aliases": [
+      "seven"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "8️⃣"
+  , "description": "keycap: 8"
+  , "category": "Symbols"
+  , "aliases": [
+      "eight"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "9️⃣"
+  , "description": "keycap: 9"
+  , "category": "Symbols"
+  , "aliases": [
+      "nine"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔟"
+  , "description": "keycap: 10"
+  , "category": "Symbols"
+  , "aliases": [
+      "keycap_ten"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔠"
+  , "description": "input latin uppercase"
+  , "category": "Symbols"
+  , "aliases": [
+      "capital_abcd"
+    ]
+  , "tags": [
+      "letters"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔡"
+  , "description": "input latin lowercase"
+  , "category": "Symbols"
+  , "aliases": [
+      "abcd"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔢"
+  , "description": "input numbers"
+  , "category": "Symbols"
+  , "aliases": [
+      "1234"
+    ]
+  , "tags": [
+      "numbers"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔣"
+  , "description": "input symbols"
+  , "category": "Symbols"
+  , "aliases": [
+      "symbols"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔤"
+  , "description": "input latin letters"
+  , "category": "Symbols"
+  , "aliases": [
+      "abc"
+    ]
+  , "tags": [
+      "alphabet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🅰️"
+  , "description": "A button (blood type)"
+  , "category": "Symbols"
+  , "aliases": [
+      "a"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆎"
+  , "description": "AB button (blood type)"
+  , "category": "Symbols"
+  , "aliases": [
+      "ab"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🅱️"
+  , "description": "B button (blood type)"
+  , "category": "Symbols"
+  , "aliases": [
+      "b"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆑"
+  , "description": "CL button"
+  , "category": "Symbols"
+  , "aliases": [
+      "cl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆒"
+  , "description": "COOL button"
+  , "category": "Symbols"
+  , "aliases": [
+      "cool"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆓"
+  , "description": "FREE button"
+  , "category": "Symbols"
+  , "aliases": [
+      "free"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "ℹ️"
+  , "description": "information"
+  , "category": "Symbols"
+  , "aliases": [
+      "information_source"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆔"
+  , "description": "ID button"
+  , "category": "Symbols"
+  , "aliases": [
+      "id"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "Ⓜ️"
+  , "description": "circled M"
+  , "category": "Symbols"
+  , "aliases": [
+      "m"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆕"
+  , "description": "NEW button"
+  , "category": "Symbols"
+  , "aliases": [
+      "new"
+    ]
+  , "tags": [
+      "fresh"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆖"
+  , "description": "NG button"
+  , "category": "Symbols"
+  , "aliases": [
+      "ng"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🅾️"
+  , "description": "O button (blood type)"
+  , "category": "Symbols"
+  , "aliases": [
+      "o2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆗"
+  , "description": "OK button"
+  , "category": "Symbols"
+  , "aliases": [
+      "ok"
+    ]
+  , "tags": [
+      "yes"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🅿️"
+  , "description": "P button"
+  , "category": "Symbols"
+  , "aliases": [
+      "parking"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆘"
+  , "description": "SOS button"
+  , "category": "Symbols"
+  , "aliases": [
+      "sos"
+    ]
+  , "tags": [
+      "help"
+    , "emergency"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆙"
+  , "description": "UP! button"
+  , "category": "Symbols"
+  , "aliases": [
+      "up"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆚"
+  , "description": "VS button"
+  , "category": "Symbols"
+  , "aliases": [
+      "vs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈁"
+  , "description": "Japanese “here” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "koko"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈂️"
+  , "description": "Japanese “service charge” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "sa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈷️"
+  , "description": "Japanese “monthly amount” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u6708"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈶"
+  , "description": "Japanese “not free of charge” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u6709"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈯"
+  , "description": "Japanese “reserved” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u6307"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🉐"
+  , "description": "Japanese “bargain” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "ideograph_advantage"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈹"
+  , "description": "Japanese “discount” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u5272"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈚"
+  , "description": "Japanese “free of charge” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u7121"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈲"
+  , "description": "Japanese “prohibited” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u7981"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🉑"
+  , "description": "Japanese “acceptable” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "accept"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈸"
+  , "description": "Japanese “application” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u7533"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈴"
+  , "description": "Japanese “passing grade” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u5408"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈳"
+  , "description": "Japanese “vacancy” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u7a7a"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "㊗️"
+  , "description": "Japanese “congratulations” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "congratulations"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "㊙️"
+  , "description": "Japanese “secret” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "secret"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈺"
+  , "description": "Japanese “open for business” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u55b6"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈵"
+  , "description": "Japanese “no vacancy” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u6e80"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔴"
+  , "description": "red circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "red_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🟠"
+  , "description": "orange circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "orange_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟡"
+  , "description": "yellow circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "yellow_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟢"
+  , "description": "green circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "green_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🔵"
+  , "description": "blue circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "large_blue_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🟣"
+  , "description": "purple circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "purple_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟤"
+  , "description": "brown circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "brown_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "⚫"
+  , "description": "black circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚪"
+  , "description": "white circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🟥"
+  , "description": "red square"
+  , "category": "Symbols"
+  , "aliases": [
+      "red_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟧"
+  , "description": "orange square"
+  , "category": "Symbols"
+  , "aliases": [
+      "orange_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟨"
+  , "description": "yellow square"
+  , "category": "Symbols"
+  , "aliases": [
+      "yellow_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟩"
+  , "description": "green square"
+  , "category": "Symbols"
+  , "aliases": [
+      "green_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟦"
+  , "description": "blue square"
+  , "category": "Symbols"
+  , "aliases": [
+      "blue_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟪"
+  , "description": "purple square"
+  , "category": "Symbols"
+  , "aliases": [
+      "purple_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟫"
+  , "description": "brown square"
+  , "category": "Symbols"
+  , "aliases": [
+      "brown_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "⬛"
+  , "description": "black large square"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_large_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⬜"
+  , "description": "white large square"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_large_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "◼️"
+  , "description": "black medium square"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_medium_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "◻️"
+  , "description": "white medium square"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_medium_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "◾"
+  , "description": "black medium-small square"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_medium_small_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "◽"
+  , "description": "white medium-small square"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_medium_small_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "▪️"
+  , "description": "black small square"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_small_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "▫️"
+  , "description": "white small square"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_small_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔶"
+  , "description": "large orange diamond"
+  , "category": "Symbols"
+  , "aliases": [
+      "large_orange_diamond"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔷"
+  , "description": "large blue diamond"
+  , "category": "Symbols"
+  , "aliases": [
+      "large_blue_diamond"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔸"
+  , "description": "small orange diamond"
+  , "category": "Symbols"
+  , "aliases": [
+      "small_orange_diamond"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔹"
+  , "description": "small blue diamond"
+  , "category": "Symbols"
+  , "aliases": [
+      "small_blue_diamond"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔺"
+  , "description": "red triangle pointed up"
+  , "category": "Symbols"
+  , "aliases": [
+      "small_red_triangle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔻"
+  , "description": "red triangle pointed down"
+  , "category": "Symbols"
+  , "aliases": [
+      "small_red_triangle_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💠"
+  , "description": "diamond with a dot"
+  , "category": "Symbols"
+  , "aliases": [
+      "diamond_shape_with_a_dot_inside"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔘"
+  , "description": "radio button"
+  , "category": "Symbols"
+  , "aliases": [
+      "radio_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔳"
+  , "description": "white square button"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_square_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔲"
+  , "description": "black square button"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_square_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏁"
+  , "description": "chequered flag"
+  , "category": "Flags"
+  , "aliases": [
+      "checkered_flag"
+    ]
+  , "tags": [
+      "milestone"
+    , "finish"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚩"
+  , "description": "triangular flag"
+  , "category": "Flags"
+  , "aliases": [
+      "triangular_flag_on_post"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎌"
+  , "description": "crossed flags"
+  , "category": "Flags"
+  , "aliases": [
+      "crossed_flags"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏴"
+  , "description": "black flag"
+  , "category": "Flags"
+  , "aliases": [
+      "black_flag"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏳"
+  , "description": "white flag"
+  , "category": "Flags"
+  , "aliases": [
+      "white_flag"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏳️‍🌈"
+  , "description": "rainbow flag"
+  , "category": "Flags"
+  , "aliases": [
+      "rainbow_flag"
+    ]
+  , "tags": [
+      "pride"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "🏴‍☠"
+  , "description": "pirate flag"
+  , "category": "Flags"
+  , "aliases": [
+      "pirate_flag"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇦🇨"
+  , "description": "flag: Ascension Island"
+  , "category": "Flags"
+  , "aliases": [
+      "ascension_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇦🇩"
+  , "description": "flag: Andorra"
+  , "category": "Flags"
+  , "aliases": [
+      "andorra"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇪"
+  , "description": "flag: United Arab Emirates"
+  , "category": "Flags"
+  , "aliases": [
+      "united_arab_emirates"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇫"
+  , "description": "flag: Afghanistan"
+  , "category": "Flags"
+  , "aliases": [
+      "afghanistan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇬"
+  , "description": "flag: Antigua & Barbuda"
+  , "category": "Flags"
+  , "aliases": [
+      "antigua_barbuda"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇮"
+  , "description": "flag: Anguilla"
+  , "category": "Flags"
+  , "aliases": [
+      "anguilla"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇱"
+  , "description": "flag: Albania"
+  , "category": "Flags"
+  , "aliases": [
+      "albania"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇲"
+  , "description": "flag: Armenia"
+  , "category": "Flags"
+  , "aliases": [
+      "armenia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇴"
+  , "description": "flag: Angola"
+  , "category": "Flags"
+  , "aliases": [
+      "angola"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇶"
+  , "description": "flag: Antarctica"
+  , "category": "Flags"
+  , "aliases": [
+      "antarctica"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇦🇷"
+  , "description": "flag: Argentina"
+  , "category": "Flags"
+  , "aliases": [
+      "argentina"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇸"
+  , "description": "flag: American Samoa"
+  , "category": "Flags"
+  , "aliases": [
+      "american_samoa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇹"
+  , "description": "flag: Austria"
+  , "category": "Flags"
+  , "aliases": [
+      "austria"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇺"
+  , "description": "flag: Australia"
+  , "category": "Flags"
+  , "aliases": [
+      "australia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇼"
+  , "description": "flag: Aruba"
+  , "category": "Flags"
+  , "aliases": [
+      "aruba"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇽"
+  , "description": "flag: Åland Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "aland_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇦🇿"
+  , "description": "flag: Azerbaijan"
+  , "category": "Flags"
+  , "aliases": [
+      "azerbaijan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇦"
+  , "description": "flag: Bosnia & Herzegovina"
+  , "category": "Flags"
+  , "aliases": [
+      "bosnia_herzegovina"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇧"
+  , "description": "flag: Barbados"
+  , "category": "Flags"
+  , "aliases": [
+      "barbados"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇩"
+  , "description": "flag: Bangladesh"
+  , "category": "Flags"
+  , "aliases": [
+      "bangladesh"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇪"
+  , "description": "flag: Belgium"
+  , "category": "Flags"
+  , "aliases": [
+      "belgium"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇫"
+  , "description": "flag: Burkina Faso"
+  , "category": "Flags"
+  , "aliases": [
+      "burkina_faso"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇬"
+  , "description": "flag: Bulgaria"
+  , "category": "Flags"
+  , "aliases": [
+      "bulgaria"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇭"
+  , "description": "flag: Bahrain"
+  , "category": "Flags"
+  , "aliases": [
+      "bahrain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇮"
+  , "description": "flag: Burundi"
+  , "category": "Flags"
+  , "aliases": [
+      "burundi"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇯"
+  , "description": "flag: Benin"
+  , "category": "Flags"
+  , "aliases": [
+      "benin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇱"
+  , "description": "flag: St. Barthélemy"
+  , "category": "Flags"
+  , "aliases": [
+      "st_barthelemy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇧🇲"
+  , "description": "flag: Bermuda"
+  , "category": "Flags"
+  , "aliases": [
+      "bermuda"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇳"
+  , "description": "flag: Brunei"
+  , "category": "Flags"
+  , "aliases": [
+      "brunei"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇴"
+  , "description": "flag: Bolivia"
+  , "category": "Flags"
+  , "aliases": [
+      "bolivia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇶"
+  , "description": "flag: Caribbean Netherlands"
+  , "category": "Flags"
+  , "aliases": [
+      "caribbean_netherlands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇧🇷"
+  , "description": "flag: Brazil"
+  , "category": "Flags"
+  , "aliases": [
+      "brazil"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇸"
+  , "description": "flag: Bahamas"
+  , "category": "Flags"
+  , "aliases": [
+      "bahamas"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇹"
+  , "description": "flag: Bhutan"
+  , "category": "Flags"
+  , "aliases": [
+      "bhutan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇻"
+  , "description": "flag: Bouvet Island"
+  , "category": "Flags"
+  , "aliases": [
+      "bouvet_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇧🇼"
+  , "description": "flag: Botswana"
+  , "category": "Flags"
+  , "aliases": [
+      "botswana"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇾"
+  , "description": "flag: Belarus"
+  , "category": "Flags"
+  , "aliases": [
+      "belarus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇿"
+  , "description": "flag: Belize"
+  , "category": "Flags"
+  , "aliases": [
+      "belize"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇦"
+  , "description": "flag: Canada"
+  , "category": "Flags"
+  , "aliases": [
+      "canada"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇨"
+  , "description": "flag: Cocos (Keeling) Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "cocos_islands"
+    ]
+  , "tags": [
+      "keeling"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇨🇩"
+  , "description": "flag: Congo - Kinshasa"
+  , "category": "Flags"
+  , "aliases": [
+      "congo_kinshasa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇫"
+  , "description": "flag: Central African Republic"
+  , "category": "Flags"
+  , "aliases": [
+      "central_african_republic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇬"
+  , "description": "flag: Congo - Brazzaville"
+  , "category": "Flags"
+  , "aliases": [
+      "congo_brazzaville"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇭"
+  , "description": "flag: Switzerland"
+  , "category": "Flags"
+  , "aliases": [
+      "switzerland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇮"
+  , "description": "flag: Côte d’Ivoire"
+  , "category": "Flags"
+  , "aliases": [
+      "cote_divoire"
+    ]
+  , "tags": [
+      "ivory"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇰"
+  , "description": "flag: Cook Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "cook_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇱"
+  , "description": "flag: Chile"
+  , "category": "Flags"
+  , "aliases": [
+      "chile"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇲"
+  , "description": "flag: Cameroon"
+  , "category": "Flags"
+  , "aliases": [
+      "cameroon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇳"
+  , "description": "flag: China"
+  , "category": "Flags"
+  , "aliases": [
+      "cn"
+    ]
+  , "tags": [
+      "china"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇨🇴"
+  , "description": "flag: Colombia"
+  , "category": "Flags"
+  , "aliases": [
+      "colombia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇵"
+  , "description": "flag: Clipperton Island"
+  , "category": "Flags"
+  , "aliases": [
+      "clipperton_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇨🇷"
+  , "description": "flag: Costa Rica"
+  , "category": "Flags"
+  , "aliases": [
+      "costa_rica"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇺"
+  , "description": "flag: Cuba"
+  , "category": "Flags"
+  , "aliases": [
+      "cuba"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇻"
+  , "description": "flag: Cape Verde"
+  , "category": "Flags"
+  , "aliases": [
+      "cape_verde"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇼"
+  , "description": "flag: Curaçao"
+  , "category": "Flags"
+  , "aliases": [
+      "curacao"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇽"
+  , "description": "flag: Christmas Island"
+  , "category": "Flags"
+  , "aliases": [
+      "christmas_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇨🇾"
+  , "description": "flag: Cyprus"
+  , "category": "Flags"
+  , "aliases": [
+      "cyprus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇿"
+  , "description": "flag: Czechia"
+  , "category": "Flags"
+  , "aliases": [
+      "czech_republic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇩🇪"
+  , "description": "flag: Germany"
+  , "category": "Flags"
+  , "aliases": [
+      "de"
+    ]
+  , "tags": [
+      "flag"
+    , "germany"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇩🇬"
+  , "description": "flag: Diego Garcia"
+  , "category": "Flags"
+  , "aliases": [
+      "diego_garcia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇩🇯"
+  , "description": "flag: Djibouti"
+  , "category": "Flags"
+  , "aliases": [
+      "djibouti"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇩🇰"
+  , "description": "flag: Denmark"
+  , "category": "Flags"
+  , "aliases": [
+      "denmark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇩🇲"
+  , "description": "flag: Dominica"
+  , "category": "Flags"
+  , "aliases": [
+      "dominica"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇩🇴"
+  , "description": "flag: Dominican Republic"
+  , "category": "Flags"
+  , "aliases": [
+      "dominican_republic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇩🇿"
+  , "description": "flag: Algeria"
+  , "category": "Flags"
+  , "aliases": [
+      "algeria"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇦"
+  , "description": "flag: Ceuta & Melilla"
+  , "category": "Flags"
+  , "aliases": [
+      "ceuta_melilla"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇪🇨"
+  , "description": "flag: Ecuador"
+  , "category": "Flags"
+  , "aliases": [
+      "ecuador"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇪"
+  , "description": "flag: Estonia"
+  , "category": "Flags"
+  , "aliases": [
+      "estonia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇬"
+  , "description": "flag: Egypt"
+  , "category": "Flags"
+  , "aliases": [
+      "egypt"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇭"
+  , "description": "flag: Western Sahara"
+  , "category": "Flags"
+  , "aliases": [
+      "western_sahara"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇪🇷"
+  , "description": "flag: Eritrea"
+  , "category": "Flags"
+  , "aliases": [
+      "eritrea"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇸"
+  , "description": "flag: Spain"
+  , "category": "Flags"
+  , "aliases": [
+      "es"
+    ]
+  , "tags": [
+      "spain"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇪🇹"
+  , "description": "flag: Ethiopia"
+  , "category": "Flags"
+  , "aliases": [
+      "ethiopia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇺"
+  , "description": "flag: European Union"
+  , "category": "Flags"
+  , "aliases": [
+      "eu"
+    , "european_union"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇫🇮"
+  , "description": "flag: Finland"
+  , "category": "Flags"
+  , "aliases": [
+      "finland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇫🇯"
+  , "description": "flag: Fiji"
+  , "category": "Flags"
+  , "aliases": [
+      "fiji"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇫🇰"
+  , "description": "flag: Falkland Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "falkland_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇫🇲"
+  , "description": "flag: Micronesia"
+  , "category": "Flags"
+  , "aliases": [
+      "micronesia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇫🇴"
+  , "description": "flag: Faroe Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "faroe_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇫🇷"
+  , "description": "flag: France"
+  , "category": "Flags"
+  , "aliases": [
+      "fr"
+    ]
+  , "tags": [
+      "france"
+    , "french"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇬🇦"
+  , "description": "flag: Gabon"
+  , "category": "Flags"
+  , "aliases": [
+      "gabon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇧"
+  , "description": "flag: United Kingdom"
+  , "category": "Flags"
+  , "aliases": [
+      "gb"
+    , "uk"
+    ]
+  , "tags": [
+      "flag"
+    , "british"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇬🇩"
+  , "description": "flag: Grenada"
+  , "category": "Flags"
+  , "aliases": [
+      "grenada"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇪"
+  , "description": "flag: Georgia"
+  , "category": "Flags"
+  , "aliases": [
+      "georgia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇫"
+  , "description": "flag: French Guiana"
+  , "category": "Flags"
+  , "aliases": [
+      "french_guiana"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇬"
+  , "description": "flag: Guernsey"
+  , "category": "Flags"
+  , "aliases": [
+      "guernsey"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇬🇭"
+  , "description": "flag: Ghana"
+  , "category": "Flags"
+  , "aliases": [
+      "ghana"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇮"
+  , "description": "flag: Gibraltar"
+  , "category": "Flags"
+  , "aliases": [
+      "gibraltar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇱"
+  , "description": "flag: Greenland"
+  , "category": "Flags"
+  , "aliases": [
+      "greenland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇬🇲"
+  , "description": "flag: Gambia"
+  , "category": "Flags"
+  , "aliases": [
+      "gambia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇳"
+  , "description": "flag: Guinea"
+  , "category": "Flags"
+  , "aliases": [
+      "guinea"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇵"
+  , "description": "flag: Guadeloupe"
+  , "category": "Flags"
+  , "aliases": [
+      "guadeloupe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇬🇶"
+  , "description": "flag: Equatorial Guinea"
+  , "category": "Flags"
+  , "aliases": [
+      "equatorial_guinea"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇷"
+  , "description": "flag: Greece"
+  , "category": "Flags"
+  , "aliases": [
+      "greece"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇸"
+  , "description": "flag: South Georgia & South Sandwich Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "south_georgia_south_sandwich_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇬🇹"
+  , "description": "flag: Guatemala"
+  , "category": "Flags"
+  , "aliases": [
+      "guatemala"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇺"
+  , "description": "flag: Guam"
+  , "category": "Flags"
+  , "aliases": [
+      "guam"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇼"
+  , "description": "flag: Guinea-Bissau"
+  , "category": "Flags"
+  , "aliases": [
+      "guinea_bissau"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇾"
+  , "description": "flag: Guyana"
+  , "category": "Flags"
+  , "aliases": [
+      "guyana"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇭🇰"
+  , "description": "flag: Hong Kong SAR China"
+  , "category": "Flags"
+  , "aliases": [
+      "hong_kong"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇭🇲"
+  , "description": "flag: Heard & McDonald Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "heard_mcdonald_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇭🇳"
+  , "description": "flag: Honduras"
+  , "category": "Flags"
+  , "aliases": [
+      "honduras"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇭🇷"
+  , "description": "flag: Croatia"
+  , "category": "Flags"
+  , "aliases": [
+      "croatia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇭🇹"
+  , "description": "flag: Haiti"
+  , "category": "Flags"
+  , "aliases": [
+      "haiti"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇭🇺"
+  , "description": "flag: Hungary"
+  , "category": "Flags"
+  , "aliases": [
+      "hungary"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇨"
+  , "description": "flag: Canary Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "canary_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇮🇩"
+  , "description": "flag: Indonesia"
+  , "category": "Flags"
+  , "aliases": [
+      "indonesia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇪"
+  , "description": "flag: Ireland"
+  , "category": "Flags"
+  , "aliases": [
+      "ireland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇱"
+  , "description": "flag: Israel"
+  , "category": "Flags"
+  , "aliases": [
+      "israel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇲"
+  , "description": "flag: Isle of Man"
+  , "category": "Flags"
+  , "aliases": [
+      "isle_of_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇮🇳"
+  , "description": "flag: India"
+  , "category": "Flags"
+  , "aliases": [
+      "india"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇴"
+  , "description": "flag: British Indian Ocean Territory"
+  , "category": "Flags"
+  , "aliases": [
+      "british_indian_ocean_territory"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇮🇶"
+  , "description": "flag: Iraq"
+  , "category": "Flags"
+  , "aliases": [
+      "iraq"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇷"
+  , "description": "flag: Iran"
+  , "category": "Flags"
+  , "aliases": [
+      "iran"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇸"
+  , "description": "flag: Iceland"
+  , "category": "Flags"
+  , "aliases": [
+      "iceland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇹"
+  , "description": "flag: Italy"
+  , "category": "Flags"
+  , "aliases": [
+      "it"
+    ]
+  , "tags": [
+      "italy"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇯🇪"
+  , "description": "flag: Jersey"
+  , "category": "Flags"
+  , "aliases": [
+      "jersey"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇯🇲"
+  , "description": "flag: Jamaica"
+  , "category": "Flags"
+  , "aliases": [
+      "jamaica"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇯🇴"
+  , "description": "flag: Jordan"
+  , "category": "Flags"
+  , "aliases": [
+      "jordan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇯🇵"
+  , "description": "flag: Japan"
+  , "category": "Flags"
+  , "aliases": [
+      "jp"
+    ]
+  , "tags": [
+      "japan"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇰🇪"
+  , "description": "flag: Kenya"
+  , "category": "Flags"
+  , "aliases": [
+      "kenya"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇬"
+  , "description": "flag: Kyrgyzstan"
+  , "category": "Flags"
+  , "aliases": [
+      "kyrgyzstan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇭"
+  , "description": "flag: Cambodia"
+  , "category": "Flags"
+  , "aliases": [
+      "cambodia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇮"
+  , "description": "flag: Kiribati"
+  , "category": "Flags"
+  , "aliases": [
+      "kiribati"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇲"
+  , "description": "flag: Comoros"
+  , "category": "Flags"
+  , "aliases": [
+      "comoros"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇳"
+  , "description": "flag: St. Kitts & Nevis"
+  , "category": "Flags"
+  , "aliases": [
+      "st_kitts_nevis"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇵"
+  , "description": "flag: North Korea"
+  , "category": "Flags"
+  , "aliases": [
+      "north_korea"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇷"
+  , "description": "flag: South Korea"
+  , "category": "Flags"
+  , "aliases": [
+      "kr"
+    ]
+  , "tags": [
+      "korea"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇰🇼"
+  , "description": "flag: Kuwait"
+  , "category": "Flags"
+  , "aliases": [
+      "kuwait"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇾"
+  , "description": "flag: Cayman Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "cayman_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇿"
+  , "description": "flag: Kazakhstan"
+  , "category": "Flags"
+  , "aliases": [
+      "kazakhstan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇦"
+  , "description": "flag: Laos"
+  , "category": "Flags"
+  , "aliases": [
+      "laos"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇧"
+  , "description": "flag: Lebanon"
+  , "category": "Flags"
+  , "aliases": [
+      "lebanon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇨"
+  , "description": "flag: St. Lucia"
+  , "category": "Flags"
+  , "aliases": [
+      "st_lucia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇮"
+  , "description": "flag: Liechtenstein"
+  , "category": "Flags"
+  , "aliases": [
+      "liechtenstein"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇰"
+  , "description": "flag: Sri Lanka"
+  , "category": "Flags"
+  , "aliases": [
+      "sri_lanka"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇷"
+  , "description": "flag: Liberia"
+  , "category": "Flags"
+  , "aliases": [
+      "liberia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇸"
+  , "description": "flag: Lesotho"
+  , "category": "Flags"
+  , "aliases": [
+      "lesotho"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇹"
+  , "description": "flag: Lithuania"
+  , "category": "Flags"
+  , "aliases": [
+      "lithuania"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇺"
+  , "description": "flag: Luxembourg"
+  , "category": "Flags"
+  , "aliases": [
+      "luxembourg"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇻"
+  , "description": "flag: Latvia"
+  , "category": "Flags"
+  , "aliases": [
+      "latvia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇾"
+  , "description": "flag: Libya"
+  , "category": "Flags"
+  , "aliases": [
+      "libya"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇦"
+  , "description": "flag: Morocco"
+  , "category": "Flags"
+  , "aliases": [
+      "morocco"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇨"
+  , "description": "flag: Monaco"
+  , "category": "Flags"
+  , "aliases": [
+      "monaco"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇲🇩"
+  , "description": "flag: Moldova"
+  , "category": "Flags"
+  , "aliases": [
+      "moldova"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇪"
+  , "description": "flag: Montenegro"
+  , "category": "Flags"
+  , "aliases": [
+      "montenegro"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇫"
+  , "description": "flag: St. Martin"
+  , "category": "Flags"
+  , "aliases": [
+      "st_martin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇲🇬"
+  , "description": "flag: Madagascar"
+  , "category": "Flags"
+  , "aliases": [
+      "madagascar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇭"
+  , "description": "flag: Marshall Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "marshall_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇲🇰"
+  , "description": "flag: Macedonia"
+  , "category": "Flags"
+  , "aliases": [
+      "macedonia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇱"
+  , "description": "flag: Mali"
+  , "category": "Flags"
+  , "aliases": [
+      "mali"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇲"
+  , "description": "flag: Myanmar (Burma)"
+  , "category": "Flags"
+  , "aliases": [
+      "myanmar"
+    ]
+  , "tags": [
+      "burma"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇳"
+  , "description": "flag: Mongolia"
+  , "category": "Flags"
+  , "aliases": [
+      "mongolia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇴"
+  , "description": "flag: Macao SAR China"
+  , "category": "Flags"
+  , "aliases": [
+      "macau"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇵"
+  , "description": "flag: Northern Mariana Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "northern_mariana_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇶"
+  , "description": "flag: Martinique"
+  , "category": "Flags"
+  , "aliases": [
+      "martinique"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇲🇷"
+  , "description": "flag: Mauritania"
+  , "category": "Flags"
+  , "aliases": [
+      "mauritania"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇸"
+  , "description": "flag: Montserrat"
+  , "category": "Flags"
+  , "aliases": [
+      "montserrat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇹"
+  , "description": "flag: Malta"
+  , "category": "Flags"
+  , "aliases": [
+      "malta"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇺"
+  , "description": "flag: Mauritius"
+  , "category": "Flags"
+  , "aliases": [
+      "mauritius"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇲🇻"
+  , "description": "flag: Maldives"
+  , "category": "Flags"
+  , "aliases": [
+      "maldives"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇼"
+  , "description": "flag: Malawi"
+  , "category": "Flags"
+  , "aliases": [
+      "malawi"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇽"
+  , "description": "flag: Mexico"
+  , "category": "Flags"
+  , "aliases": [
+      "mexico"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇾"
+  , "description": "flag: Malaysia"
+  , "category": "Flags"
+  , "aliases": [
+      "malaysia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇿"
+  , "description": "flag: Mozambique"
+  , "category": "Flags"
+  , "aliases": [
+      "mozambique"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇦"
+  , "description": "flag: Namibia"
+  , "category": "Flags"
+  , "aliases": [
+      "namibia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇨"
+  , "description": "flag: New Caledonia"
+  , "category": "Flags"
+  , "aliases": [
+      "new_caledonia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇪"
+  , "description": "flag: Niger"
+  , "category": "Flags"
+  , "aliases": [
+      "niger"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇫"
+  , "description": "flag: Norfolk Island"
+  , "category": "Flags"
+  , "aliases": [
+      "norfolk_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇳🇬"
+  , "description": "flag: Nigeria"
+  , "category": "Flags"
+  , "aliases": [
+      "nigeria"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇮"
+  , "description": "flag: Nicaragua"
+  , "category": "Flags"
+  , "aliases": [
+      "nicaragua"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇱"
+  , "description": "flag: Netherlands"
+  , "category": "Flags"
+  , "aliases": [
+      "netherlands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇴"
+  , "description": "flag: Norway"
+  , "category": "Flags"
+  , "aliases": [
+      "norway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇵"
+  , "description": "flag: Nepal"
+  , "category": "Flags"
+  , "aliases": [
+      "nepal"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇷"
+  , "description": "flag: Nauru"
+  , "category": "Flags"
+  , "aliases": [
+      "nauru"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇳🇺"
+  , "description": "flag: Niue"
+  , "category": "Flags"
+  , "aliases": [
+      "niue"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇿"
+  , "description": "flag: New Zealand"
+  , "category": "Flags"
+  , "aliases": [
+      "new_zealand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇴🇲"
+  , "description": "flag: Oman"
+  , "category": "Flags"
+  , "aliases": [
+      "oman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇦"
+  , "description": "flag: Panama"
+  , "category": "Flags"
+  , "aliases": [
+      "panama"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇪"
+  , "description": "flag: Peru"
+  , "category": "Flags"
+  , "aliases": [
+      "peru"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇫"
+  , "description": "flag: French Polynesia"
+  , "category": "Flags"
+  , "aliases": [
+      "french_polynesia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇵🇬"
+  , "description": "flag: Papua New Guinea"
+  , "category": "Flags"
+  , "aliases": [
+      "papua_new_guinea"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇭"
+  , "description": "flag: Philippines"
+  , "category": "Flags"
+  , "aliases": [
+      "philippines"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇰"
+  , "description": "flag: Pakistan"
+  , "category": "Flags"
+  , "aliases": [
+      "pakistan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇱"
+  , "description": "flag: Poland"
+  , "category": "Flags"
+  , "aliases": [
+      "poland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇲"
+  , "description": "flag: St. Pierre & Miquelon"
+  , "category": "Flags"
+  , "aliases": [
+      "st_pierre_miquelon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇵🇳"
+  , "description": "flag: Pitcairn Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "pitcairn_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇵🇷"
+  , "description": "flag: Puerto Rico"
+  , "category": "Flags"
+  , "aliases": [
+      "puerto_rico"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇸"
+  , "description": "flag: Palestinian Territories"
+  , "category": "Flags"
+  , "aliases": [
+      "palestinian_territories"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇹"
+  , "description": "flag: Portugal"
+  , "category": "Flags"
+  , "aliases": [
+      "portugal"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇼"
+  , "description": "flag: Palau"
+  , "category": "Flags"
+  , "aliases": [
+      "palau"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇾"
+  , "description": "flag: Paraguay"
+  , "category": "Flags"
+  , "aliases": [
+      "paraguay"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇶🇦"
+  , "description": "flag: Qatar"
+  , "category": "Flags"
+  , "aliases": [
+      "qatar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇷🇪"
+  , "description": "flag: Réunion"
+  , "category": "Flags"
+  , "aliases": [
+      "reunion"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇷🇴"
+  , "description": "flag: Romania"
+  , "category": "Flags"
+  , "aliases": [
+      "romania"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇷🇸"
+  , "description": "flag: Serbia"
+  , "category": "Flags"
+  , "aliases": [
+      "serbia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇷🇺"
+  , "description": "flag: Russia"
+  , "category": "Flags"
+  , "aliases": [
+      "ru"
+    ]
+  , "tags": [
+      "russia"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇷🇼"
+  , "description": "flag: Rwanda"
+  , "category": "Flags"
+  , "aliases": [
+      "rwanda"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇦"
+  , "description": "flag: Saudi Arabia"
+  , "category": "Flags"
+  , "aliases": [
+      "saudi_arabia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇧"
+  , "description": "flag: Solomon Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "solomon_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇨"
+  , "description": "flag: Seychelles"
+  , "category": "Flags"
+  , "aliases": [
+      "seychelles"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇩"
+  , "description": "flag: Sudan"
+  , "category": "Flags"
+  , "aliases": [
+      "sudan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇪"
+  , "description": "flag: Sweden"
+  , "category": "Flags"
+  , "aliases": [
+      "sweden"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇬"
+  , "description": "flag: Singapore"
+  , "category": "Flags"
+  , "aliases": [
+      "singapore"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇭"
+  , "description": "flag: St. Helena"
+  , "category": "Flags"
+  , "aliases": [
+      "st_helena"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇸🇮"
+  , "description": "flag: Slovenia"
+  , "category": "Flags"
+  , "aliases": [
+      "slovenia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇯"
+  , "description": "flag: Svalbard & Jan Mayen"
+  , "category": "Flags"
+  , "aliases": [
+      "svalbard_jan_mayen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇸🇰"
+  , "description": "flag: Slovakia"
+  , "category": "Flags"
+  , "aliases": [
+      "slovakia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇱"
+  , "description": "flag: Sierra Leone"
+  , "category": "Flags"
+  , "aliases": [
+      "sierra_leone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇲"
+  , "description": "flag: San Marino"
+  , "category": "Flags"
+  , "aliases": [
+      "san_marino"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇳"
+  , "description": "flag: Senegal"
+  , "category": "Flags"
+  , "aliases": [
+      "senegal"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇴"
+  , "description": "flag: Somalia"
+  , "category": "Flags"
+  , "aliases": [
+      "somalia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇷"
+  , "description": "flag: Suriname"
+  , "category": "Flags"
+  , "aliases": [
+      "suriname"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇸"
+  , "description": "flag: South Sudan"
+  , "category": "Flags"
+  , "aliases": [
+      "south_sudan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇹"
+  , "description": "flag: São Tomé & Príncipe"
+  , "category": "Flags"
+  , "aliases": [
+      "sao_tome_principe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇻"
+  , "description": "flag: El Salvador"
+  , "category": "Flags"
+  , "aliases": [
+      "el_salvador"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇽"
+  , "description": "flag: Sint Maarten"
+  , "category": "Flags"
+  , "aliases": [
+      "sint_maarten"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇾"
+  , "description": "flag: Syria"
+  , "category": "Flags"
+  , "aliases": [
+      "syria"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇿"
+  , "description": "flag: Eswatini"
+  , "category": "Flags"
+  , "aliases": [
+      "swaziland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇦"
+  , "description": "flag: Tristan da Cunha"
+  , "category": "Flags"
+  , "aliases": [
+      "tristan_da_cunha"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇹🇨"
+  , "description": "flag: Turks & Caicos Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "turks_caicos_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇩"
+  , "description": "flag: Chad"
+  , "category": "Flags"
+  , "aliases": [
+      "chad"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇹🇫"
+  , "description": "flag: French Southern Territories"
+  , "category": "Flags"
+  , "aliases": [
+      "french_southern_territories"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇬"
+  , "description": "flag: Togo"
+  , "category": "Flags"
+  , "aliases": [
+      "togo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇭"
+  , "description": "flag: Thailand"
+  , "category": "Flags"
+  , "aliases": [
+      "thailand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇯"
+  , "description": "flag: Tajikistan"
+  , "category": "Flags"
+  , "aliases": [
+      "tajikistan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇰"
+  , "description": "flag: Tokelau"
+  , "category": "Flags"
+  , "aliases": [
+      "tokelau"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇹🇱"
+  , "description": "flag: Timor-Leste"
+  , "category": "Flags"
+  , "aliases": [
+      "timor_leste"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇲"
+  , "description": "flag: Turkmenistan"
+  , "category": "Flags"
+  , "aliases": [
+      "turkmenistan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇳"
+  , "description": "flag: Tunisia"
+  , "category": "Flags"
+  , "aliases": [
+      "tunisia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇴"
+  , "description": "flag: Tonga"
+  , "category": "Flags"
+  , "aliases": [
+      "tonga"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇷"
+  , "description": "flag: Turkey"
+  , "category": "Flags"
+  , "aliases": [
+      "tr"
+    ]
+  , "tags": [
+      "turkey"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🇹🇹"
+  , "description": "flag: Trinidad & Tobago"
+  , "category": "Flags"
+  , "aliases": [
+      "trinidad_tobago"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇻"
+  , "description": "flag: Tuvalu"
+  , "category": "Flags"
+  , "aliases": [
+      "tuvalu"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇼"
+  , "description": "flag: Taiwan"
+  , "category": "Flags"
+  , "aliases": [
+      "taiwan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇹🇿"
+  , "description": "flag: Tanzania"
+  , "category": "Flags"
+  , "aliases": [
+      "tanzania"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇺🇦"
+  , "description": "flag: Ukraine"
+  , "category": "Flags"
+  , "aliases": [
+      "ukraine"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇺🇬"
+  , "description": "flag: Uganda"
+  , "category": "Flags"
+  , "aliases": [
+      "uganda"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇺🇲"
+  , "description": "flag: U.S. Outlying Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "us_outlying_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇺🇳"
+  , "description": "flag: United Nations"
+  , "category": "Flags"
+  , "aliases": [
+      "united_nations"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇺🇸"
+  , "description": "flag: United States"
+  , "category": "Flags"
+  , "aliases": [
+      "us"
+    ]
+  , "tags": [
+      "flag"
+    , "united"
+    , "america"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇺🇾"
+  , "description": "flag: Uruguay"
+  , "category": "Flags"
+  , "aliases": [
+      "uruguay"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇺🇿"
+  , "description": "flag: Uzbekistan"
+  , "category": "Flags"
+  , "aliases": [
+      "uzbekistan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇦"
+  , "description": "flag: Vatican City"
+  , "category": "Flags"
+  , "aliases": [
+      "vatican_city"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇻🇨"
+  , "description": "flag: St. Vincent & Grenadines"
+  , "category": "Flags"
+  , "aliases": [
+      "st_vincent_grenadines"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇪"
+  , "description": "flag: Venezuela"
+  , "category": "Flags"
+  , "aliases": [
+      "venezuela"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇬"
+  , "description": "flag: British Virgin Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "british_virgin_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇮"
+  , "description": "flag: U.S. Virgin Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "us_virgin_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇳"
+  , "description": "flag: Vietnam"
+  , "category": "Flags"
+  , "aliases": [
+      "vietnam"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇺"
+  , "description": "flag: Vanuatu"
+  , "category": "Flags"
+  , "aliases": [
+      "vanuatu"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇼🇫"
+  , "description": "flag: Wallis & Futuna"
+  , "category": "Flags"
+  , "aliases": [
+      "wallis_futuna"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇼🇸"
+  , "description": "flag: Samoa"
+  , "category": "Flags"
+  , "aliases": [
+      "samoa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇽🇰"
+  , "description": "flag: Kosovo"
+  , "category": "Flags"
+  , "aliases": [
+      "kosovo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇾🇪"
+  , "description": "flag: Yemen"
+  , "category": "Flags"
+  , "aliases": [
+      "yemen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇾🇹"
+  , "description": "flag: Mayotte"
+  , "category": "Flags"
+  , "aliases": [
+      "mayotte"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇿🇦"
+  , "description": "flag: South Africa"
+  , "category": "Flags"
+  , "aliases": [
+      "south_africa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇿🇲"
+  , "description": "flag: Zambia"
+  , "category": "Flags"
+  , "aliases": [
+      "zambia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇿🇼"
+  , "description": "flag: Zimbabwe"
+  , "category": "Flags"
+  , "aliases": [
+      "zimbabwe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🏴󠁧󠁢󠁥󠁮󠁧󠁿"
+  , "description": "flag: England"
+  , "category": "Flags"
+  , "aliases": [
+      "england"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏴󠁧󠁢󠁳󠁣󠁴󠁿"
+  , "description": "flag: Scotland"
+  , "category": "Flags"
+  , "aliases": [
+      "scotland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏴󠁧󠁢󠁷󠁬󠁳󠁿"
+  , "description": "flag: Wales"
+  , "category": "Flags"
+  , "aliases": [
+      "wales"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+]
diff --git a/plugins/emoji/update_emoji.pl b/plugins/emoji/update_emoji.pl
deleted file mode 100644
index 8034052b7..000000000
--- a/plugins/emoji/update_emoji.pl
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/perl -w
-#
-# update_emoji.pl
-#
-# This script generates the emoji.plugin.zsh emoji definitions from the Unicode
-# character data for the emoji characters.
-#
-# The data file can be found at https://unicode.org/Public/emoji/latest/emoji-data.txt
-# as referenced in Unicode TR51 (https://www.unicode.org/reports/tr51/index.html).
-#
-# This is known to work with the data file from version 1.0. It may not work with later
-# versions if the format changes. In particular, this reads line comments to get the
-# emoji character name and unicode version.
-#
-# Country names have punctuation and other non-letter characters removed from their name,
-# to avoid possible complications with having to escape the strings when using them as
-# array subscripts. The definition file seems to use some combining characters like accents
-# that get stripped during this process.
-
-use strict;
-use warnings;
-use 5.010;
-use autodie;
-
-use Path::Class;
-use File::Copy;
-
-# Parse definitions out of the data file and convert
-sub process_emoji_data_file {
-	my ( $infile, $outfilename ) = @_;
-	my $file = file($infile);
-	my $outfile = file($outfilename);
-	my $outfilebase = $outfile->basename();
-	my $tempfilename = "$outfilename.tmp";
-	my $tempfile = file($tempfilename);
-	my $outfh = $tempfile->openw();
-	$outfh->print("
-# $outfilebase - Emoji character definitions for oh-my-zsh emoji plugin
-#
-# This file is auto-generated by update_emoji.pl. Do not edit it manually.
-#
-# This contains the definition for:
-#   \$emoji         - which maps character names to Unicode characters
-#   \$emoji_flags   - maps country names to Unicode flag characters using region indicators
-
-# Main emoji
-typeset -gAH emoji
-# National flags
-typeset -gAH emoji_flags
-# Combining modifiers
-typeset -gAH emoji_mod
-
-");
-
-	my $fh = $file->openr();
-	my $line_num = 0;
-	while ( my $line = $fh->getline() ) {
-		$line_num++;
-		$_ = $line;
-		# Skip all-comment lines (from the header) and blank lines
-		# (But don't strip comments on normal lines; we need to parse those for
-		# the emoji names.)
-		next if /^\s*#/ or /^\s*$/;
-
-		if (/^(\S.*?\S)\s*;\s*(\w+)\s*;\s*(\w+)\s*;\s*(\w+)\s*;\s*(\w.*?)\s*#\s*V(\S+)\s\(.*?\)\s*(\w.*\S)\s*$/) {
-			my ($code, $style, $level, $modifier_status, $sources, $version, $keycap_name)
-				= ($1, $2, $3, $4, $5, $6, $7);
-			#print "code=$code style=$style level=$level modifier_status=$modifier_status sources=$sources version=$version name=$keycap_name\n";
-			my @code_points = split /\s+/, $code;
-			my @sources = split /\s+/, $sources;
-
-			my $flag_country = "";
-			if ( $keycap_name =~ /^flag for (\S.*?)\s*$/) {
-				$flag_country = $1;
-			}
-
-			my $zsh_code = join '', map { "\\U$_" } @code_points;
-			# Convert keycap names to valid associative array names that do not require any
-			# quoting. Works fine for most stuff, but is clumsy for flags.
-			my $omz_name = lc($keycap_name);
-			$omz_name =~ s/[^A-Za-z0-9]/_/g;
-			my $zsh_flag_country = $flag_country;
-			$zsh_flag_country =~ s/[^\p{Letter}]/_/g;
-			if ($flag_country) {
-				$outfh->print("emoji_flags[$zsh_flag_country]=\$'$zsh_code'\n");
-			} else {
-				$outfh->print("emoji[$omz_name]=\$'$zsh_code'\n");
-			}
-			# Modifiers are included in both the main set and their separate map,
-			# because they have a standalone representation as a color swatch.
-			if ( $modifier_status eq "modifier" ) {
-				$outfh->print("emoji_mod[$omz_name]=\$'$zsh_code'\n");
-			}
-		} else {
-			die "Failed parsing line $line_num: '$_'";
-		}
-	}
-	$fh->close();
-	$outfh->print("\n");
-	$outfh->close();
-
-	move($tempfilename, $outfilename)
-		or die "Failed moving temp file to $outfilename: $!";
-}
-
-my $datafile = "emoji-data.txt";
-my $zsh_def_file = "emoji-char-definitions.zsh";
-process_emoji_data_file($datafile, $zsh_def_file);
-
-print "Updated definition file $zsh_def_file\n";
-
-
-
diff --git a/plugins/emoji/update_emoji.py b/plugins/emoji/update_emoji.py
new file mode 100644
index 000000000..eb945b9ef
--- /dev/null
+++ b/plugins/emoji/update_emoji.py
@@ -0,0 +1,213 @@
+"""
+Update Emoji.py
+Refeshes OMZ emoji database based on the latest Unicode spec
+"""
+import re
+import json
+
+spec = open("emoji-data.txt", "r")
+
+# Regexes
+# regex_emoji will return, respectively:
+# the code points, its type (status), the actual emoji, and its official name
+regex_emoji = r"^([\w ].*?\S)\s*;\s*([\w-]+)\s*#\s*(.*?)\s(\S.*).*$"
+# regex_group returns the group of subgroup that a line opens
+regex_group = r"^#\s*(group|subgroup):\s*(.*)$"
+
+headers = """
+# emoji-char-definitions.zsh - Emoji definitions for oh-my-zsh emoji plugin
+#
+# This file is auto-generated by update_emoji.py. Do not edit it manually.
+#
+# This contains the definition for:
+#   $emoji         - which maps character names to Unicode characters
+#   $emoji_flags   - maps country names to Unicode flag characters using region
+#                    indicators
+#   $emoji_mod     - maps modifier components to Unicode characters
+#   $emoji_groups  - a single associative array to avoid cluttering up the
+#                    global namespace, and to allow adding additional group
+#                    definitions at run time. The keys are the group names, and
+#                    the values are whitespace-separated lists of emoji
+#                    character names.
+
+# Main emoji
+typeset -gAH emoji
+# National flags
+typeset -gAH emoji_flags
+# Combining modifiers
+typeset -gAH emoji_mod
+# Emoji groups
+typeset -gAH emoji_groups
+"""
+
+#######
+# Adding country codes
+#######
+# This is the only part of this script that relies on an external library
+# (country_converter), and is hence commented out by default.
+# You can uncomment it to have country codes added as aliases for flag
+# emojis. (By default, when you install this extension, country codes are
+# included as aliases, but not if you re-run this script without uncommenting.)
+# Warning: country_converter is very verbose, and will print warnings all over
+# your terminal.
+
+# import country_converter as coco # pylint: disable=wrong-import-position
+# cc = coco.CountryConverter()
+
+# def country_iso(_all_names, _omz_name):
+#     """ Using the external library country_converter,
+#         this funciton can detect the ISO2 and ISO3 codes
+#         of the country. It takes as argument the array
+#         with all the names of the emoji, and returns that array."""
+#     omz_no_underscore = re.sub(r'_', r' ', _omz_name)
+#     iso2 = cc.convert(names=[omz_no_underscore], to='ISO2')
+#     if iso2 != 'not found':
+#         _all_names.append(iso2)
+#         iso3 = cc.convert(names=[omz_no_underscore], to='ISO3')
+#         _all_names.append(iso3)
+#     return _all_names
+
+
+#######
+# Helper functions
+#######
+
+def code_to_omz(_code_points):
+    """ Returns a ZSH-compatible Unicode string from the code point(s) """
+    return r'\U' + r'\U'.join(_code_points.split(' '))
+
+def name_to_omz(_name, _group, _subgroup, _status):
+    """ Returns a reasonable snake_case name for the emoji. """
+    def snake_case(_string):
+        """ Does the regex work of snake_case """
+        remove_dots = re.sub(r'\.\(\)', r'', _string)
+        replace_ands = re.sub(r'\&', r'and', remove_dots)
+        remove_whitespace = re.sub(r'[^\#\*\w]', r'_', replace_ands)
+        return re.sub(r'__', r'_', remove_whitespace)
+
+    shortname = ""
+    split_at_colon = lambda s: s.split(": ")
+    # Special treatment by group and subgroup
+    # If the emoji is a flag, we strip "flag" from its name
+    if _group == "Flags" and len(split_at_colon(_name)) > 1:
+        shortname = snake_case(split_at_colon(_name)[1])
+    else:
+        shortname = snake_case(_name)
+    # Special treatment by status
+    # Enables us to have every emoji combination,
+    # even the one that are not officially sanctionned
+    # and are implemeted by, say, only one vendor
+    if _status == "unqualified":
+        shortname += "_unqualified"
+    elif _status == "minimally-qualified":
+        shortname += "_minimally"
+    return shortname
+
+def increment_name(_shortname):
+    """ Increment the short name by 1. If you get, say,
+    'woman_detective_unqualified', it returns
+    'woman_detective_unqualified_1', and then
+    'woman_detective_unqualified_2', etc. """
+    last_char = _shortname[-1]
+    if last_char.isdigit():
+        num = int(last_char)
+        return _shortname[:-1] + str(num + 1)
+    return _shortname + "_1"
+
+########
+# Going through every line
+########
+
+group, subgroup, short_name_buffer = "", "", ""
+emoji_database = []
+for line in spec:
+    # First, test if this line opens a group or subgroup
+    group_match = re.findall(regex_group, line)
+    if group_match != []:
+        gr_or_sub, name = group_match[0]
+        if gr_or_sub == "group":
+            group = name
+        elif gr_or_sub == "subgroup":
+            subgroup = name
+        continue # Moving on...
+    # Second, test if this line references one emoji
+    emoji_match = re.findall(regex_emoji, line)
+    if emoji_match != []:
+        code_points, status, emoji, name = emoji_match[0]
+        omz_codes = code_to_omz(code_points)
+        omz_name = name_to_omz(name, group, subgroup, status)
+        # If this emoji has the same shortname as the preceding one
+        if omz_name in short_name_buffer:
+            omz_name = increment_name(short_name_buffer)
+        short_name_buffer = omz_name
+        emoji_database.append(
+            [omz_codes, status, emoji, omz_name, group, subgroup])
+spec.close()
+
+########
+# Write to emoji-char-definitions.zsh
+########
+
+# Aliases for emojis are retrieved through the DB of Gemoji
+# Retrieved on Aug 9 2019 from the following URL:
+# https://raw.githubusercontent.com/github/gemoji/master/db/emoji.json
+
+gemoji_db = open("gemoji_db.json")
+j = json.load(gemoji_db)
+aliases_map = {entry['emoji']: entry['aliases'] for entry in j}
+all_omz_names = [emoji_data[3] for emoji_data in emoji_database]
+
+# Let's begin writing to this file
+output = open("emoji-char-definitions.zsh", "w")
+output.write(headers)
+
+emoji_groups = {"fruits": "\n", "vehicles": "\n", "hands": "\n",
+                "people": "\n", "animals": "\n", "faces": "\n",
+                "flags": "\n"}
+
+# First, write every emoji down
+for _omz_codes, _status, _emoji, _omz_name, _group, _subgroup in emoji_database:
+
+    # One emoji can be mapped to multiple names (aliases or country codes)
+    names_for_this_emoji = [_omz_name]
+
+    # Variable that indicates in which map the emoji will be located
+    emoji_map = "emoji"
+    if _status == "component":
+        emoji_map = "emoji_mod"
+    if _group == "Flags":
+        emoji_map = "emoji_flags"
+        # Adding country codes (Optional, see above)
+        # names_for_this_emoji = country_iso(names_for_this_emoji, _omz_name)
+
+    # Check if there is an alias available in the Gemoji DB
+    if _emoji in aliases_map.keys():
+        for alias in aliases_map[_emoji]:
+            if alias not in all_omz_names:
+                names_for_this_emoji.append(alias)
+
+    # And now we write to the definitions file
+    for one_name in names_for_this_emoji:
+        output.write(f"{emoji_map}[{one_name}]=$'{_omz_codes}'\n")
+
+    # Storing the emoji in defined subgroups for the next step
+    if _status == "fully-qualified":
+        if _subgroup == "food-fruit":
+            emoji_groups["fruits"] += f"  {_omz_name}\n"
+        elif "transport-" in _subgroup:
+            emoji_groups["vehicles"] += f"  {_omz_name}\n"
+        elif "hand-" in _subgroup:
+            emoji_groups["hands"] += f"  {_omz_name}\n"
+        elif "person-" in _subgroup or _subgroup == "family":
+            emoji_groups["people"] += f"  {_omz_name}\n"
+        elif "animal-" in _subgroup:
+            emoji_groups["animals"] += f"  {_omz_name}\n"
+        elif "face-" in _subgroup:
+            emoji_groups["faces"] += f"  {_omz_name}\n"
+        elif _group == "Flags":
+            emoji_groups["flags"] += f"  {_omz_name}\n"
+
+# Second, write the subgroups to the end of the file
+for name, string in emoji_groups.items():
+    output.write(f'\nemoji_groups[{name}]="{string}"\n')
+output.close()

From 79cf2a0d43ddda338487c85c420f67fe9c56687f Mon Sep 17 00:00:00 2001
From: Shundeev Egor <shundeevegor@gmail.com>
Date: Tue, 5 Jan 2021 19:46:05 +0300
Subject: [PATCH 353/591] fix(fastfile): fix multiple bugs in plugin (#9574)

- `fastfile_sync` didn't correctly create the aliases
- `fastfile_rm` didn't correctly remove the alias

Fixes #9151
Closes #9574
---
 plugins/fastfile/README.md           | 13 +++++++------
 plugins/fastfile/fastfile.plugin.zsh | 15 ++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/plugins/fastfile/README.md b/plugins/fastfile/README.md
index 37f5b2f53..32f619ffd 100644
--- a/plugins/fastfile/README.md
+++ b/plugins/fastfile/README.md
@@ -4,6 +4,7 @@ This plugin adds a way to reference certain files or folders used frequently usi
 a global alias or shortcut.
 
 To use it, add `fastfile` to the plugins array in your zshrc file:
+
 ```zsh
 plugins=(... fastfile)
 ```
@@ -13,36 +14,38 @@ plugins=(... fastfile)
 Example: you access folder `/code/project/backend/database` very frequently.
 
 First, generate a shortcut with the name `pjdb`:
+
 ```zsh
 $ fastfile pjdb /code/project/backend/database
 ```
 
 Next time you want to access it, use `§pjdb`. For example:
+
 ```zsh
 $ cd §pjdb
 $ subl §pjdb
 ```
+
 where § is the fastfile prefix (see [below](#options) for how to change).
 
 **Note:** shortcuts with spaces in the name are assigned a global alias
 where the spaces have been substituted with underscores (`_`). For example:
 a shortcut named `"hello world"` corresponds with `§hello_world`.
 
-
 ## Functions
 
-- `fastfile <shortcut_name> <path/to/file/or/folder>`: generate a shortcut.
+- `fastfile <shortcut_name> [path/to/file/or/folder]`: generate a shortcut.
+  If the second argument is not provided, the current directory is used.
 
 - `fastfile_print <shortcut_name>`: prints a shortcut, with the format
   `<prefix><shortcut_name> -> <shortcut_path>`.
 
 - `fastfile_ls`: lists all shortcuts.
 
-- `fastfile_rm <shortcut_name> `: remove a shortcut.
+- `fastfile_rm <shortcut_name>`: remove a shortcut.
 
 - `fastfile_sync`: generates the global aliases for the shortcuts.
 
-
 ### Internal functions
 
 - `fastfile_resolv <shortcut_name>`: resolves the location of the shortcut
@@ -51,7 +54,6 @@ a shortcut named `"hello world"` corresponds with `§hello_world`.
 
 - `fastfile_get <shortcut_name>`: get the real path of the shortcut.
 
-
 ## Aliases
 
 | Alias  | Function         |
@@ -62,7 +64,6 @@ a shortcut named `"hello world"` corresponds with `§hello_world`.
 | ffls   | `fastfile_ls`    |
 | ffsync | `fastfile_sync`  |
 
-
 ## Options
 
 These are options you can set to change certain parts of the plugin. To change
diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh
index 6288bb275..896fed5f7 100644
--- a/plugins/fastfile/fastfile.plugin.zsh
+++ b/plugins/fastfile/fastfile.plugin.zsh
@@ -44,7 +44,7 @@ function fastfile() {
 #   The path to the shortcut file
 #
 function fastfile_resolv() {
-    echo "${fastfile_dir}${1}"
+    echo "${fastfile_dir}/${1}"
 }
 
 #
@@ -78,9 +78,9 @@ function fastfile_print() {
 #    (=> fastfile_print) for each shortcut
 #
 function fastfile_ls() {
-    for f in "${fastfile_dir}"/*(NF); do
-        file=`basename "$f"` # To enable simpler handling of spaces in file names
-        varkey=`echo "$file" | tr " " "_"`
+    for f in "${fastfile_dir}"/*(N); do
+        file=$(basename "$f") # To enable simpler handling of spaces in file names
+        varkey=$(echo "$file" | tr " " "_")
 
         # Special format for columns
         echo "${fastfile_var_prefix}${varkey}|->|$(fastfile_get "$file")"
@@ -98,15 +98,16 @@ function fastfile_ls() {
 function fastfile_rm() {
     fastfile_print "$1"
     rm "$(fastfile_resolv "$1")"
+    unalias "${fastfile_var_prefix}${1}"
 }
 
 #
 # Generate the aliases for the shortcuts
 #
 function fastfile_sync() {
-    for f in "${fastfile_dir}"/*(NF); do
-        file=`basename "$f"` # To enable simpler handling of spaces in file names
-        varkey=`echo "$file" | tr " " "_"`
+    for f in "${fastfile_dir}"/*(N); do
+        file=$(basename "$f") # To enable simpler handling of spaces in file names
+        varkey=$(echo "$file" | tr " " "_")
 
         alias -g "${fastfile_var_prefix}${varkey}"="'$(fastfile_get "$file")'"
     done

From ca2652769ce283ddb77807767215e19a78642c51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Svraka?= <svraka.andras@gmail.com>
Date: Thu, 1 Apr 2021 18:01:22 +0200
Subject: [PATCH 354/591] feat(ripgrep): update ripgrep completions (#9775)

Closes #9775
---
 plugins/ripgrep/README.md |  4 ++--
 plugins/ripgrep/_ripgrep  | 32 +++++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/plugins/ripgrep/README.md b/plugins/ripgrep/README.md
index 937f73c81..a26f45823 100644
--- a/plugins/ripgrep/README.md
+++ b/plugins/ripgrep/README.md
@@ -8,6 +8,6 @@ To use it, add `ripgrep` to the plugins array in your zshrc file:
 plugins=(... ripgrep)
 ```
 
-Completion is taken from the ripgrep release [`11.0.2`](https://github.com/BurntSushi/ripgrep/releases/tag/11.0.2).
+Completion is taken from the ripgrep release [`12.1.1`](https://github.com/BurntSushi/ripgrep/releases/tag/12.1.1).
 
-Updated on August 16th, 2019.
+Updated on April 1st, 2021.
diff --git a/plugins/ripgrep/_ripgrep b/plugins/ripgrep/_ripgrep
index d7dcfd64a..828a6e601 100644
--- a/plugins/ripgrep/_ripgrep
+++ b/plugins/ripgrep/_ripgrep
@@ -3,7 +3,7 @@
 ##
 # zsh completion function for ripgrep
 #
-# Run ci/test_complete.sh after building to ensure that the options supported by
+# Run ci/test-complete after building to ensure that the options supported by
 # this function stay in synch with the `rg` binary.
 #
 # For convenience, a completion reference guide is included at the bottom of
@@ -72,11 +72,19 @@ _rg() {
     + '(count)' # Counting options
     {-c,--count}'[only show count of matching lines for each file]'
     '--count-matches[only show count of individual matches for each file]'
+    '--include-zero[include files with zero matches in summary]'
 
     + '(encoding)' # Encoding options
     {-E+,--encoding=}'[specify text encoding of files to search]: :_rg_encodings'
     $no'--no-encoding[use default text encoding]'
 
+    + '(engine)' # Engine choice options
+    '--engine=[select which regex engine to use]:when:((
+      default\:"use default engine"
+      pcre2\:"identical to --pcre2"
+      auto\:"identical to --auto-hybrid-regex"
+    ))'
+
     + file # File-input options
     '(1)*'{-f+,--file=}'[specify file containing patterns to search for]: :_files'
 
@@ -128,6 +136,10 @@ _rg() {
     '--ignore-file-case-insensitive[process ignore files case insensitively]'
     $no'--no-ignore-file-case-insensitive[process ignore files case sensitively]'
 
+    + '(ignore-exclude)' # Local exclude (ignore)-file options
+    "--no-ignore-exclude[don't respect local exclude (ignore) files]"
+    $no'--ignore-exclude[respect local exclude (ignore) files]'
+
     + '(ignore-global)' # Global ignore-file options
     "--no-ignore-global[don't respect global ignore files]"
     $no'--ignore-global[respect global ignore files]'
@@ -140,10 +152,18 @@ _rg() {
     "--no-ignore-vcs[don't respect version control ignore files]"
     $no'--ignore-vcs[respect version control ignore files]'
 
-    + '(ignore-dot)' # .ignore-file options
+    + '(require-git)' # git specific settings
+    "--no-require-git[don't require git repository to respect gitignore rules]"
+    $no'--require-git[require git repository to respect gitignore rules]'
+
+    + '(ignore-dot)' # .ignore options
     "--no-ignore-dot[don't respect .ignore files]"
     $no'--ignore-dot[respect .ignore files]'
 
+    + '(ignore-files)' # custom global ignore file options
+    "--no-ignore-files[don't respect --ignore-file flags]"
+    $no'--ignore-files[respect --ignore-file files]'
+
     + '(json)' # JSON options
     '--json[output results in JSON Lines format]'
     $no"--no-json[don't output results in JSON Lines format]"
@@ -263,6 +283,10 @@ _rg() {
     {-w,--word-regexp}'[only show matches surrounded by word boundaries]'
     {-x,--line-regexp}'[only show matches surrounded by line boundaries]'
 
+    + '(unicode)' # Unicode options
+    $no'--unicode[enable Unicode mode]'
+    '--no-unicode[disable Unicode mode]'
+
     + '(zip)' # Compression options
     '(--pre)'{-z,--search-zip}'[search in compressed files]'
     $no"--no-search-zip[don't search in compressed files]"
@@ -277,7 +301,9 @@ _rg() {
     ))'
     '*--colors=[specify color and style settings]: :->colorspec'
     '--context-separator=[specify string used to separate non-continuous context lines in output]:separator'
+    $no"--no-context-separator[don't print context separators]"
     '--debug[show debug messages]'
+    '--trace[show more verbose debug messages]'
     '--dfa-size-limit=[specify upper size limit of generated DFA]:DFA size (bytes)'
     "(1 stats)--files[show each file that would be searched (but don't search)]"
     '*--ignore-file=[specify additional ignore file]:ignore file:_files'
@@ -297,7 +323,7 @@ _rg() {
     '(--type-list)*: :_files'
   )
 
-  # This is used with test_complete.sh to verify that there are no options
+  # This is used with test-complete to verify that there are no options
   # listed in the help output that aren't also defined here
   [[ $_RG_COMPLETE_LIST_ARGS == (1|t*|y*) ]] && {
     print -rl - $args

From 1d6553e631b6b54d3696e093cfe5d3d854d9b684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Svraka?= <svraka.andras@gmail.com>
Date: Thu, 1 Apr 2021 18:05:24 +0200
Subject: [PATCH 355/591] feat(fd): update fd completions (#9775)

Closes #9775
---
 plugins/fd/README.md |   4 +-
 plugins/fd/_fd       | 325 +++++++++++++++++++++++++++++++++----------
 2 files changed, 257 insertions(+), 72 deletions(-)

diff --git a/plugins/fd/README.md b/plugins/fd/README.md
index 4d9cf190f..cf9f7815d 100644
--- a/plugins/fd/README.md
+++ b/plugins/fd/README.md
@@ -8,6 +8,6 @@ To use it, add `fd` to the plugins array in your zshrc file:
 plugins=(... fd)
 ```
 
-Completion is taken from the fd release [`7.3.0`](https://github.com/sharkdp/fd/releases/tag/v7.3.0).
+Completion is taken from the fd release [`8.2.1`](https://github.com/sharkdp/fd/releases/tag/v8.2.1).
 
-Updated on February 13th, 2019.
+Updated on April 1st, 2021.
diff --git a/plugins/fd/_fd b/plugins/fd/_fd
index 7a4c38753..f5d9e01d2 100644
--- a/plugins/fd/_fd
+++ b/plugins/fd/_fd
@@ -1,83 +1,268 @@
 #compdef fd fdfind
 
+##
+# zsh completion function for fd
+#
+# Based on ripgrep completion function.
+# Originally based on code from the zsh-users project — see copyright notice
+# below.
+
 autoload -U is-at-least
 
 _fd() {
-    typeset -A opt_args
-    typeset -a _arguments_options
-    local ret=1
+  local curcontext="$curcontext" no='!' ret=1
+  local -a context line state state_descr _arguments_options fd_types fd_args
+  local -A opt_args
 
-    if is-at-least 5.2; then
-        _arguments_options=(-s -S -C)
-    else
-        _arguments_options=(-s -C)
-    fi
+  if is-at-least 5.2; then
+    _arguments_options=( -s -S )
+  else
+    _arguments_options=( -s )
+  fi
 
-    local context curcontext="$curcontext" state line
-    _arguments "${_arguments_options[@]}" \
-'-d+[Set maximum search depth (default: none)]' \
-'--max-depth=[Set maximum search depth (default: none)]' \
-'--maxdepth=[See --max-depth]' \
-'*-t+[Filter by type: file (f), directory (d), symlink (l),
-executable (x), empty (e)]: :(f file d directory l symlink x executable e empty)' \
-'*--type=[Filter by type: file (f), directory (d), symlink (l),
-executable (x), empty (e)]: :(f file d directory l symlink x executable e empty)' \
-'*-e+[Filter by file extension]' \
-'*--extension=[Filter by file extension]' \
-'-x+[Execute a command for each search result]' \
-'--exec=[Execute a command for each search result]' \
-'(-x --exec)-X+[Execute a command with all search results at once]' \
-'(-x --exec)--exec-batch=[Execute a command with all search results at once]' \
-'*-E+[Exclude entries that match the given glob pattern]' \
-'*--exclude=[Exclude entries that match the given glob pattern]' \
-'*--ignore-file=[Add a custom ignore-file in .gitignore format]' \
-'-c+[When to use colors: never, *auto*, always]: :(never auto always)' \
-'--color=[When to use colors: never, *auto*, always]: :(never auto always)' \
-'-j+[Set number of threads to use for searching & executing]' \
-'--threads=[Set number of threads to use for searching & executing]' \
-'*-S+[Limit results based on the size of files.]' \
-'*--size=[Limit results based on the size of files.]' \
-'--max-buffer-time=[the time (in ms) to buffer, before streaming to the console]' \
-'--changed-within=[Filter by file modification time (newer than)]' \
-'--changed-before=[Filter by file modification time (older than)]' \
-'*--search-path=[(hidden)]' \
-'-H[Search hidden files and directories]' \
-'--hidden[Search hidden files and directories]' \
-'-I[Do not respect .(git|fd)ignore files]' \
-'--no-ignore[Do not respect .(git|fd)ignore files]' \
-'--no-ignore-vcs[Do not respect .gitignore files]' \
-'*-u[Alias for no-ignore and/or hidden]' \
-'-s[Case-sensitive search (default: smart case)]' \
-'--case-sensitive[Case-sensitive search (default: smart case)]' \
-'-i[Case-insensitive search (default: smart case)]' \
-'--ignore-case[Case-insensitive search (default: smart case)]' \
-'-F[Treat the pattern as a literal string]' \
-'--fixed-strings[Treat the pattern as a literal string]' \
-'-a[Show absolute instead of relative paths]' \
-'--absolute-path[Show absolute instead of relative paths]' \
-'-L[Follow symbolic links]' \
-'--follow[Follow symbolic links]' \
-'-p[Search full path (default: file-/dirname only)]' \
-'--full-path[Search full path (default: file-/dirname only)]' \
-'-0[Separate results by the null character]' \
-'--print0[Separate results by the null character]' \
-'--show-errors[Enable display of filesystem errors]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::pattern -- the search pattern, a regular expression (optional):_files' \
-'::path -- the root directory for the filesystem search (optional):_files' \
-&& ret=0
+  fd_types=(
+    {f,file}'\:"regular files"'
+    {d,directory}'\:"directories"'
+    {l,symlink}'\:"symbolic links"'
+    {e,empty}'\:"empty files or directories"'
+    {x,executable}'\:"executable (files)"'
+    {s,socket}'\:"sockets"'
+    {p,pipe}'\:"named pipes (FIFOs)"'
+  )
 
-}
+  # Do not complete rare options unless either the current prefix
+  # matches one of those options or the user has the `complete-all`
+  # style set. Note that this prefix check has to be updated manually to account
+  # for all of the potential negation options listed below!
+  if
+    # (--[bpsu]* => match all options marked with '$no')
+    [[ $PREFIX$SUFFIX == --[bopsu]* ]] ||
+    zstyle -t ":complete:$curcontext:*" complete-all
+  then
+    no=
+  fi
 
-(( $+functions[_fd_commands] )) ||
-_fd_commands() {
-    local commands; commands=(
+  # We make heavy use of argument groups here to prevent the option specs from
+  # growing unwieldy. These aren't supported in zsh <5.4, though, so we'll strip
+  # them out below if necessary. This makes the exclusions inaccurate on those
+  # older versions, but oh well — it's not that big a deal
+  fd_args=(
+    + '(hidden)' # hidden files
+    {-H,--hidden}'[search hidden files/directories]'
 
-    )
-    _describe -t commands 'fd commands' commands "$@"
+    + '(no-ignore-full)' # all ignore files
+    '(no-ignore-partial)'{-I,--no-ignore}"[don't respect .(git|fd)ignore and global ignore files]"
+    $no'(no-ignore-partial)*'{-u,--unrestricted}'[alias for --no-ignore, when repeated also alias for --hidden]'
+
+    + no-ignore-partial # some ignore files
+    "(no-ignore-full --no-ignore-vcs)--no-ignore-vcs[don't respect .gitignore files]"
+    "!(no-ignore-full --no-global-ignore-file)--no-global-ignore-file[don't respect the global ignore file]"
+
+    + '(case)' # case-sensitivity
+    {-s,--case-sensitive}'[perform a case-sensitive search]'
+    {-i,--ignore-case}'[perform a case-insensitive search]'
+
+    + '(regex-pattern)' # regex-based search pattern
+    '(no-regex-pattern)--regex[perform a regex-based search (default)]'
+
+    + '(no-regex-pattern)' # non-regex-based search pattern
+    {-g,--glob}'[perform a glob-based search]'
+    {-F,--fixed-strings}'[treat pattern as literal string instead of a regex]'
+
+    + '(match-full)' # match against full path
+    {-p,--full-path}'[match the pattern against the full path instead of the basename]'
+
+    + '(follow)' # follow symlinks
+    {-L,--follow}'[follow symbolic links to directories]'
+
+    + '(abs-path)' # show absolute paths
+    '(long-listing)'{-a,--absolute-path}'[show absolute paths instead of relative paths]'
+
+    + '(null-sep)' # use null separator for output
+    '(long-listing)'{-0,--print0}'[separate search results by the null character]'
+
+    + '(long-listing)' # long-listing output
+    '(abs-path null-sep max-results exec-cmds)'{-l,--list-details}'[use a long listing format with file metadata]'
+
+    + '(max-results)' # max number of results
+    '(long-listing exec-cmds)--max-results=[limit number of search results to given count and quit]:count'
+    '(long-listing exec-cmds)-1[limit to a single search result and quit]'
+
+    + '(fs-errors)' # file-system errors
+    $no'--show-errors[enable the display of filesystem errors]'
+
+    + '(fs-traversal)' # file-system traversal
+    $no"--one-file-system[don't descend into directories on other file systems]"
+    '!--mount'
+    '!--xdev'
+
+    + dir-depth # directory depth
+    '(--exact-depth -d --max-depth)'{-d+,--max-depth=}'[set max directory depth to descend when searching]:depth'
+    '!(--exact-depth -d --max-depth)--maxdepth:depth'
+    '(--exact-depth --min-depth)--min-depth=[set directory depth to descend before start searching]:depth'
+    '(--exact-depth -d --max-depth --maxdepth --min-depth)--exact-depth=[only search at the exact given directory depth]:depth'
+
+    + prune # pruning
+    "--prune[don't traverse into matching directories]"
+
+    + filter-misc # filter search
+    '*'{-t+,--type=}"[filter search by type]:type:(($fd_types))"
+    '*'{-e+,--extension=}'[filter search by file extension]:extension'
+    '*'{-E+,--exclude=}'[exclude files/directories that match the given glob pattern]:glob pattern'
+    '*'{-S+,--size=}'[limit search by file size]:size limit:->size'
+    '(-o --owner)'{-o+,--owner=}'[filter by owning user and/or group]:owner and/or group:->owner'
+
+    + ignore-file # extra ignore files
+    '*--ignore-file=[add a custom, low-precedence ignore-file with .gitignore format]: :_files'
+
+    + '(filter-mtime-newer)' # filter by files modified after than
+    '--changed-within=[limit search to files/directories modified within the given date/duration]:date or duration'
+    '!--change-newer-than=:date/duration'
+    '!--newer=:date/duration'
+
+    + '(filter-mtime-older)' # filter by files modified before than
+    '--changed-before=[limit search to files/directories modified before the given date/duration]:date or duration'
+    '!--change-older-than=:date/duration'
+    '!--older=:date/duration'
+
+    + '(color)' # colorize output
+    {-c+,--color=}'[declare when to colorize search results]:when to colorize:((
+      auto\:"show colors if the output goes to an interactive console (default)"
+      never\:"do not use colorized output"
+      always\:"always use colorized output"
+    ))'
+
+    + '(threads)'
+    {-j+,--threads=}'[set the number of threads for searching and executing]:number of threads'
+
+    + '(exec-cmds)' # execute command
+    '(long-listing max-results)'{-x+,--exec=}'[execute command for each search result]:command: _command_names -e:*\;::program arguments: _normal'
+    '(long-listing max-results)'{-X+,--exec-batch=}'[execute command for all search results at once]:command: _command_names -e:*\;::program arguments: _normal'
+
+    + other
+    '!(--max-buffer-time)--max-buffer-time=[set amount of time to buffer before showing output]:time (ms)'
+
+    + '(about)' # about flags
+    '(: * -)'{-h,--help}'[display help message]'
+    '(: * -)'{-v,--version}'[display version information]'
+
+    + path-sep # set path separator for output
+    $no'(--path-separator)--path-separator=[set the path separator to use when printing file paths]:path separator'
+
+    + search-path
+    $no'(--base-directory)--base-directory=[change the current working directory to the given path]:directory:_files -/'
+    $no'(*)*--search-path=[set search path (instead of positional <path> arguments)]:directory:_files -/'
+
+    + args # positional arguments
+    '1: :_guard "^-*" pattern'
+    '(--search-path)*:directory:_files -/'
+  )
+
+  # Strip out argument groups where unsupported (see above)
+  is-at-least 5.4 ||
+  fd_args=( ${(@)args:#(#i)(+|[a-z0-9][a-z0-9_-]#|\([a-z0-9][a-z0-9_-]#\))} )
+
+  _arguments $_arguments_options : $fd_args && ret=0
+
+  case ${state} in
+    owner)
+      compset -P '(\\|)\!'
+      if compset -P '*:'; then
+        _groups && ret=0
+      else
+        if
+          compset -S ':*' ||
+          # Do not add the colon suffix when completing "!user<TAB>
+          # (with a starting double-quote) otherwise pressing tab again
+          # after the inserted colon "!user:<TAB> will complete history modifiers
+          [[ $IPREFIX == (\\|\!)*  && ($QIPREFIX == \"* && -z $QISUFFIX) ]]
+        then
+          _users && ret=0
+        else
+          local q
+          # Since quotes are needed when using the negation prefix !,
+          # automatically remove the colon suffix also when closing the quote
+          if [[ $QIPREFIX == [\'\"]* ]]; then
+            q=${QIPREFIX:0:1}
+          fi
+          _users -r ": \t\n\-$q" -S : && ret=0
+        fi
+      fi
+      ;;
+
+    size)
+      if compset -P '[-+][0-9]##'; then
+        local -a suff=(
+          'B:bytes'
+          'K:kilobytes  (10^3  = 1000   bytes)'
+          'M:megabytes  (10^6  = 1000^2 bytes)'
+          'G:gigabytes  (10^9  = 1000^3 bytes)'
+          'T:terabytes  (10^12 = 1000^4 bytes)'
+          'Ki:kibibytes  ( 2^10 = 1024   bytes)'
+          'Mi:mebibytes  ( 2^20 = 1024^2 bytes)'
+          'Gi:gigibytes  ( 2^30 = 1024^3 bytes)'
+          'Ti:tebibytes  ( 2^40 = 1024^4 bytes)'
+        )
+        _describe -t units 'size limit units' suff -V 'units'
+      elif compset -P '[-+]'; then
+        _message -e 'size limit number (full format: <+-><number><unit>)'
+      else
+        _values 'size limit prefix (full format: <prefix><number><unit>)' \
+          '\+[file size must be greater or equal to]'\
+          '-[file size must be less than or equal to]' && ret=0
+      fi
+      ;;
+  esac
+
+  return ret
 }
 
 _fd "$@"
+
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for fd
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * smancill (https://github.com/smancill)
+#
+# ------------------------------------------------------------------------------
+
+# Local Variables:
+# mode: shell-script
+# coding: utf-8-unix
+# indent-tabs-mode: nil
+# sh-indentation: 2
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

From 7df7d5b4f1961083c425c4bfcacc4cf995e6bfb0 Mon Sep 17 00:00:00 2001
From: CGenie <cgenie@pm.me>
Date: Tue, 28 Dec 2021 19:04:45 +0100
Subject: [PATCH 356/591] feat(fossil): add completion for `fossil add` (#8564)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/fossil/_fossil           | 32 ++++++++++++++++++++++++++++
 plugins/fossil/fossil.plugin.zsh | 36 +-------------------------------
 2 files changed, 33 insertions(+), 35 deletions(-)
 create mode 100644 plugins/fossil/_fossil

diff --git a/plugins/fossil/_fossil b/plugins/fossil/_fossil
new file mode 100644
index 000000000..d2d48bdec
--- /dev/null
+++ b/plugins/fossil/_fossil
@@ -0,0 +1,32 @@
+#compdef fossil
+
+function _fossil_get_command_list () {
+  fossil help -a | grep -v "Usage|Common|This is"
+}
+
+function _fossil () {
+  local context state state_descr line
+  typeset -A opt_args
+
+  _arguments \
+    '1: :->command'\
+    '2: :->subcommand'
+
+  case $state in
+    command)
+      local _OUTPUT=$(fossil branch 2>&1 | grep "use --repo")
+      if [[ -z "$_OUTPUT" ]]; then
+        compadd "$(_fossil_get_command_list)"
+      else
+        compadd clone init import help version
+      fi ;;
+    subcommand)
+      case "$words[2]" in
+      help) compadd "$(_fossil_get_command_list)" ;;
+      add) compadd "$(fossil extra)" ;;
+      *) compcall -D ;;
+      esac ;;
+  esac
+}
+
+_fossil "$@"
diff --git a/plugins/fossil/fossil.plugin.zsh b/plugins/fossil/fossil.plugin.zsh
index 25a8d121d..dfad73d36 100644
--- a/plugins/fossil/fossil.plugin.zsh
+++ b/plugins/fossil/fossil.plugin.zsh
@@ -12,7 +12,7 @@ ZSH_THEME_FOSSIL_PROMPT_DIRTY=" %{$fg_bold[red]%}✖"
 # Text to display if the branch is clean
 ZSH_THEME_FOSSIL_PROMPT_CLEAN=" %{$fg_bold[green]%}✔"
 
-function fossil_prompt_info () {
+function fossil_prompt_info() {
   local _OUTPUT=`fossil branch 2>&1`
   local _STATUS=`echo $_OUTPUT | grep "use --repo"`
   if [ "$_STATUS" = "" ]; then
@@ -32,37 +32,6 @@ function fossil_prompt_info () {
   fi
 }
 
-function _fossil_get_command_list () {
-  fossil help -a | grep -v "Usage|Common|This is"
-}
-
-function _fossil () {
-  local context state state_descr line
-  typeset -A opt_args
-
-  _arguments \
-    '1: :->command'\
-    '2: :->subcommand'
-
-  case $state in
-    command)
-      local _OUTPUT=`fossil branch 2>&1 | grep "use --repo"`
-      if [ "$_OUTPUT" = "" ]; then
-        compadd `_fossil_get_command_list`
-      else
-        compadd clone init import help version
-      fi
-      ;;
-    subcommand)
-      if [ "$words[2]" = "help" ]; then
-        compadd `_fossil_get_command_list`
-      else
-        compcall -D
-      fi
-    ;;
-  esac
-}
-
 function _fossil_prompt () {
   local current=`echo $PROMPT $RPROMPT | grep fossil`
 
@@ -82,8 +51,5 @@ function _fossil_prompt () {
   fi
 }
 
-compdef _fossil fossil
-
 autoload -U add-zsh-hook
-
 add-zsh-hook precmd _fossil_prompt

From 40e0e72cd746858a9d8ed2ce628ceff5100500f3 Mon Sep 17 00:00:00 2001
From: Franco Catena <francocatena@gmail.com>
Date: Tue, 28 Dec 2021 15:07:05 -0300
Subject: [PATCH 357/591] feat(gcloud): support Homebrew Google Cloud SDK path
 (#9799)


From 89ab38fe648a9c68e8425ed8d97b3dd23ef06402 Mon Sep 17 00:00:00 2001
From: Fidel Torres <fidel.torres@hazzas.com>
Date: Fri, 13 Nov 2020 05:21:48 +1100
Subject: [PATCH 358/591] feat(git-flow): add aliases for current `feature` /
 `release` branch (#9439)

Closes #9439
---
 plugins/git-flow/git-flow.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 8f0714b16..041df3aa5 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -39,6 +39,10 @@ alias gflrf='git flow release finish'
 alias gflhp='git flow hotfix publish'
 alias gflrp='git flow release publish'
 alias gflfpll='git flow feature pull'
+alias gflffc='git flow feature finish $(echo $(current_branch) | cut -c 9-)'
+alias gflfpc='git flow feature publish $(echo $(current_branch) | cut -c 9-)'
+alias gflrfc='git flow release finish $(echo $(current_branch) | cut -c 9-)'
+alias gflrpc='git flow release publish $(echo $(current_branch) | cut -c 9-)'
 
 _git-flow ()
 {

From 7a38fa35c404fdc17fdb4a310f73e98178c3a84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 19:26:27 +0100
Subject: [PATCH 359/591] refactor(git-flow): extract `git-flow` completion
 logic

---
 plugins/git-flow/_git-flow           | 327 ++++++++++++++++++++++++
 plugins/git-flow/git-flow.plugin.zsh | 357 +--------------------------
 2 files changed, 334 insertions(+), 350 deletions(-)
 create mode 100644 plugins/git-flow/_git-flow

diff --git a/plugins/git-flow/_git-flow b/plugins/git-flow/_git-flow
new file mode 100644
index 000000000..eab712707
--- /dev/null
+++ b/plugins/git-flow/_git-flow
@@ -0,0 +1,327 @@
+#compdef git-flow
+
+_git-flow () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+  case $state in
+    (command)
+
+      local -a subcommands
+      subcommands=(
+        'init:Initialize a new git repo with support for the branching model.'
+        'feature:Manage your feature branches.'
+        'release:Manage your release branches.'
+        'hotfix:Manage your hotfix branches.'
+        'support:Manage your support branches.'
+        'version:Shows version information.'
+      )
+      _describe -t commands 'git flow' subcommands
+    ;;
+
+    (options)
+      case $line[1] in
+
+        (init)
+          _arguments \
+            -f'[Force setting of gitflow branches, even if already configured]'
+          ;;
+
+          (version)
+          ;;
+
+          (hotfix)
+            __git-flow-hotfix
+          ;;
+
+          (release)
+            __git-flow-release
+          ;;
+
+          (feature)
+            __git-flow-feature
+          ;;
+      esac
+    ;;
+  esac
+}
+
+__git-flow-release () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+  case $state in
+    (command)
+
+      local -a subcommands
+      subcommands=(
+        'start:Start a new release branch.'
+        'finish:Finish a release branch.'
+        'list:List all your release branches. (Alias to `git flow release`)'
+        'publish: public'
+        'track: track'
+      )
+      _describe -t commands 'git flow release' subcommands
+      _arguments \
+        -v'[Verbose (more) output]'
+    ;;
+
+    (options)
+      case $line[1] in
+
+        (start)
+          _arguments \
+            -F'[Fetch from origin before performing finish]'\
+            ':version:__git_flow_version_list'
+        ;;
+
+        (finish)
+          _arguments \
+            -F'[Fetch from origin before performing finish]' \
+            -s'[Sign the release tag cryptographically]'\
+            -u'[Use the given GPG-key for the digital signature (implies -s)]'\
+            -m'[Use the given tag message]'\
+            -p'[Push to $ORIGIN after performing finish]'\
+            -k'[Keep branch after performing finish]'\
+            -n"[Don't tag this release]"\
+            ':version:__git_flow_version_list'
+        ;;
+
+        (publish)
+          _arguments \
+            ':version:__git_flow_version_list'\
+        ;;
+
+        (track)
+          _arguments \
+            ':version:__git_flow_version_list'\
+        ;;
+
+        *)
+          _arguments \
+            -v'[Verbose (more) output]'
+        ;;
+      esac
+    ;;
+  esac
+}
+
+__git-flow-hotfix () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+  case $state in
+    (command)
+
+      local -a subcommands
+      subcommands=(
+        'start:Start a new hotfix branch.'
+        'finish:Finish a hotfix branch.'
+        'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
+      )
+      _describe -t commands 'git flow hotfix' subcommands
+      _arguments \
+        -v'[Verbose (more) output]'
+    ;;
+
+    (options)
+      case $line[1] in
+
+        (start)
+          _arguments \
+            -F'[Fetch from origin before performing finish]'\
+            ':hotfix:__git_flow_version_list'\
+            ':branch-name:__git_branch_names'
+        ;;
+
+        (finish)
+          _arguments \
+            -F'[Fetch from origin before performing finish]' \
+            -s'[Sign the release tag cryptographically]'\
+            -u'[Use the given GPG-key for the digital signature (implies -s)]'\
+            -m'[Use the given tag message]'\
+            -p'[Push to $ORIGIN after performing finish]'\
+            -k'[Keep branch after performing finish]'\
+            -n"[Don't tag this release]"\
+            ':hotfix:__git_flow_hotfix_list'
+        ;;
+
+        *)
+          _arguments \
+            -v'[Verbose (more) output]'
+        ;;
+      esac
+    ;;
+  esac
+}
+
+__git-flow-feature () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+  case $state in
+    (command)
+
+      local -a subcommands
+      subcommands=(
+        'start:Start a new feature branch.'
+        'finish:Finish a feature branch.'
+        'list:List all your feature branches. (Alias to `git flow feature`)'
+        'publish: publish'
+        'track: track'
+        'diff: diff'
+        'rebase: rebase'
+        'checkout: checkout'
+        'pull: pull'
+      )
+      _describe -t commands 'git flow feature' subcommands
+      _arguments \
+        -v'[Verbose (more) output]'
+    ;;
+
+    (options)
+      case $line[1] in
+
+        (start)
+          _arguments \
+            -F'[Fetch from origin before performing finish]'\
+            ':feature:__git_flow_feature_list'\
+            ':branch-name:__git_branch_names'
+        ;;
+
+        (finish)
+          _arguments \
+            -F'[Fetch from origin before performing finish]' \
+            -r'[Rebase instead of merge]'\
+            -k'[Keep branch after performing finish]'\
+            ':feature:__git_flow_feature_list'
+        ;;
+
+        (publish)
+          _arguments \
+            ':feature:__git_flow_feature_list'\
+        ;;
+
+        (track)
+          _arguments \
+            ':feature:__git_flow_feature_list'\
+        ;;
+
+        (diff)
+          _arguments \
+            ':branch:__git_flow_feature_list'\
+        ;;
+
+        (rebase)
+          _arguments \
+            -i'[Do an interactive rebase]' \
+            ':branch:__git_flow_feature_list'
+        ;;
+
+        (checkout)
+          _arguments \
+            ':branch:__git_flow_feature_list'\
+        ;;
+
+        (pull)
+          _arguments \
+            ':remote:__git_remotes'\
+            ':branch:__git_flow_feature_list'
+        ;;
+
+        *)
+          _arguments \
+            -v'[Verbose (more) output]'
+        ;;
+      esac
+    ;;
+  esac
+}
+
+__git_flow_version_list () {
+  local expl
+  declare -a versions
+
+  versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
+  __git_command_successful || return
+
+  _wanted versions expl 'version' compadd $versions
+}
+
+__git_flow_feature_list () {
+  local expl
+  declare -a features
+
+  features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
+  __git_command_successful || return
+
+  _wanted features expl 'feature' compadd $features
+}
+
+__git_remotes () {
+  local expl gitdir remotes
+
+  gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+  __git_command_successful || return
+
+  remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
+  __git_command_successful || return
+
+  # TODO: Should combine the two instead of either or.
+  if (( $#remotes > 0 )); then
+    _wanted remotes expl remote compadd $* - $remotes
+  else
+    _wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
+  fi
+}
+
+__git_flow_hotfix_list () {
+  local expl
+  declare -a hotfixes
+
+  hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
+  __git_command_successful || return
+
+  _wanted hotfixes expl 'hotfix' compadd $hotfixes
+}
+
+__git_branch_names () {
+  local expl
+  declare -a branch_names
+
+  branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+  __git_command_successful || return
+
+  _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+__git_command_successful () {
+  if (( ${#pipestatus:#0} > 0 )); then
+    _message 'not a git repository'
+    return 1
+  fi
+  return 0
+}
+
+zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
+
+# Detect if script is sourced or called via autoload
+[[ "$ZSH_EVAL_CONTEXT" != *:file ]] || return
+
+_git-flow "$@"
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 041df3aa5..13399aaa3 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -1,26 +1,4 @@
-#!zsh
-#
-# Installation
-# ------------
-#
-# To achieve git-flow completion nirvana:
-#
-#  0. Update your zsh's git-completion module to the newest version.
-#     From here. https://raw.githubusercontent.com/zsh-users/zsh/master/Completion/Unix/Command/_git
-#
-#  1. Install this file. Either:
-#
-#     a. Place it in your .zshrc:
-#
-#     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in
-#        your .zshrc:
-#
-#            source ~/.git-flow-completion.zsh
-#
-#     c. Or, use this file as an oh-my-zsh plugin.
-#
-
-#Alias
+# Aliases
 alias gfl='git flow'
 alias gfli='git flow init'
 alias gcd='git checkout $(git config gitflow.branch.develop)'
@@ -44,330 +22,9 @@ alias gflfpc='git flow feature publish $(echo $(current_branch) | cut -c 9-)'
 alias gflrfc='git flow release finish $(echo $(current_branch) | cut -c 9-)'
 alias gflrpc='git flow release publish $(echo $(current_branch) | cut -c 9-)'
 
-_git-flow ()
-{
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'init:Initialize a new git repo with support for the branching model.'
-				'feature:Manage your feature branches.'
-				'release:Manage your release branches.'
-				'hotfix:Manage your hotfix branches.'
-				'support:Manage your support branches.'
-				'version:Shows version information.'
-			)
-			_describe -t commands 'git flow' subcommands
-		;;
-
-		(options)
-			case $line[1] in
-
-				(init)
-					_arguments \
-						-f'[Force setting of gitflow branches, even if already configured]'
-					;;
-
-					(version)
-					;;
-
-					(hotfix)
-						__git-flow-hotfix
-					;;
-
-					(release)
-						__git-flow-release
-					;;
-
-					(feature)
-						__git-flow-feature
-					;;
-			esac
-		;;
-	esac
-}
-
-__git-flow-release ()
-{
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'start:Start a new release branch.'
-				'finish:Finish a release branch.'
-				'list:List all your release branches. (Alias to `git flow release`)'
-				'publish: public'
-				'track: track'
-			)
-			_describe -t commands 'git flow release' subcommands
-			_arguments \
-				-v'[Verbose (more) output]'
-		;;
-
-		(options)
-			case $line[1] in
-
-				(start)
-					_arguments \
-						-F'[Fetch from origin before performing finish]'\
-						':version:__git_flow_version_list'
-				;;
-
-				(finish)
-					_arguments \
-						-F'[Fetch from origin before performing finish]' \
-						-s'[Sign the release tag cryptographically]'\
-						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
-						-m'[Use the given tag message]'\
-						-p'[Push to $ORIGIN after performing finish]'\
-						-k'[Keep branch after performing finish]'\
-						-n"[Don't tag this release]"\
-						':version:__git_flow_version_list'
-				;;
-
-				(publish)
-					_arguments \
-						':version:__git_flow_version_list'\
-				;;
-
-				(track)
-					_arguments \
-						':version:__git_flow_version_list'\
-				;;
-
-				*)
-					_arguments \
-						-v'[Verbose (more) output]'
-				;;
-			esac
-		;;
-	esac
-}
-
-__git-flow-hotfix ()
-{
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'start:Start a new hotfix branch.'
-				'finish:Finish a hotfix branch.'
-				'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
-			)
-			_describe -t commands 'git flow hotfix' subcommands
-			_arguments \
-				-v'[Verbose (more) output]'
-		;;
-
-		(options)
-			case $line[1] in
-
-				(start)
-					_arguments \
-						-F'[Fetch from origin before performing finish]'\
-						':hotfix:__git_flow_version_list'\
-						':branch-name:__git_branch_names'
-				;;
-
-				(finish)
-					_arguments \
-						-F'[Fetch from origin before performing finish]' \
-						-s'[Sign the release tag cryptographically]'\
-						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
-						-m'[Use the given tag message]'\
-						-p'[Push to $ORIGIN after performing finish]'\
-						-k'[Keep branch after performing finish]'\
-						-n"[Don't tag this release]"\
-						':hotfix:__git_flow_hotfix_list'
-				;;
-
-				*)
-					_arguments \
-						-v'[Verbose (more) output]'
-				;;
-			esac
-		;;
-	esac
-}
-
-__git-flow-feature ()
-{
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'start:Start a new feature branch.'
-				'finish:Finish a feature branch.'
-				'list:List all your feature branches. (Alias to `git flow feature`)'
-				'publish: publish'
-				'track: track'
-				'diff: diff'
-				'rebase: rebase'
-				'checkout: checkout'
-				'pull: pull'
-			)
-			_describe -t commands 'git flow feature' subcommands
-			_arguments \
-				-v'[Verbose (more) output]'
-		;;
-
-		(options)
-			case $line[1] in
-
-				(start)
-					_arguments \
-						-F'[Fetch from origin before performing finish]'\
-						':feature:__git_flow_feature_list'\
-						':branch-name:__git_branch_names'
-				;;
-
-				(finish)
-					_arguments \
-						-F'[Fetch from origin before performing finish]' \
-						-r'[Rebase instead of merge]'\
-						-k'[Keep branch after performing finish]'\
-						':feature:__git_flow_feature_list'
-				;;
-
-				(publish)
-					_arguments \
-						':feature:__git_flow_feature_list'\
-				;;
-
-				(track)
-					_arguments \
-						':feature:__git_flow_feature_list'\
-				;;
-
-				(diff)
-					_arguments \
-						':branch:__git_flow_feature_list'\
-				;;
-
-				(rebase)
-					_arguments \
-						-i'[Do an interactive rebase]' \
-						':branch:__git_flow_feature_list'
-				;;
-
-				(checkout)
-					_arguments \
-						':branch:__git_flow_feature_list'\
-				;;
-
-				(pull)
-					_arguments \
-						':remote:__git_remotes'\
-						':branch:__git_flow_feature_list'
-				;;
-
-				*)
-					_arguments \
-						-v'[Verbose (more) output]'
-				;;
-			esac
-		;;
-	esac
-}
-
-__git_flow_version_list ()
-{
-	local expl
-	declare -a versions
-
-	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
-
-	_wanted versions expl 'version' compadd $versions
-}
-
-__git_flow_feature_list ()
-{
-	local expl
-	declare -a features
-
-	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
-
-	_wanted features expl 'feature' compadd $features
-}
-
-__git_remotes () {
-	local expl gitdir remotes
-
-	gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
-	__git_command_successful || return
-
-	remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
-	__git_command_successful || return
-
-	# TODO: Should combine the two instead of either or.
-	if (( $#remotes > 0 )); then
-		_wanted remotes expl remote compadd $* - $remotes
-	else
-		_wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
-	fi
-}
-
-__git_flow_hotfix_list ()
-{
-	local expl
-	declare -a hotfixes
-
-	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
-
-	_wanted hotfixes expl 'hotfix' compadd $hotfixes
-}
-
-__git_branch_names () {
-	local expl
-	declare -a branch_names
-
-	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
-	__git_command_successful || return
-
-	_wanted branch-names expl branch-name compadd $* - $branch_names
-}
-
-__git_command_successful () {
-	if (( ${#pipestatus:#0} > 0 )); then
-		_message 'not a git repository'
-		return 1
-	fi
-	return 0
-}
-
-zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
+# Source completion script
+# 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}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+source "${0:A:h}/_git-flow"

From 6515850a1432199f8f3eef8e9ac711b8a7860ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 19:29:39 +0100
Subject: [PATCH 360/591] feat(git-flow): add aliases for current `hotfix`
 branch

---
 plugins/git-flow/README.md           | 43 +++++++++++++++++-----------
 plugins/git-flow/git-flow.plugin.zsh | 32 +++++++++++----------
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/plugins/git-flow/README.md b/plugins/git-flow/README.md
index 9c25dec83..fc8ccf0a0 100644
--- a/plugins/git-flow/README.md
+++ b/plugins/git-flow/README.md
@@ -10,22 +10,31 @@ plugins=(... git-flow)
 
 ## Aliases
 
-| Alias   | Command                    | Description                            |
-|---------|----------------------------|----------------------------------------|
-| `gfl`   | `git flow`                 | Git-Flow command                       |
-| `gfli`  | `git flow init`            | Initialize git-flow repository         |
-| `gcd`   | `git checkout develop`     | Check out develop branch               |
-| `gch`   | `git checkout hotfix`      | Check out hotfix branch                |
-| `gcr`   | `git checkout release`     | Check out release branch               |
-| `gflf`  | `git flow feature`         | List existing feature branches         |
-| `gflh`  | `git flow hotfix`          | List existing hotfix branches          |
-| `gflr`  | `git flow release`         | List existing release branches         |
-| `gflfs` | `git flow feature start`   | Start a new feature: `gflfs <name>`    |
-| `gflhs` | `git flow hotfix start`    | Start a new hotfix: `gflhs <version>`  |
-| `gflrs` | `git flow release start`   | Start a new release: `gflrs <version>` |
-| `gflff` | `git flow feature finish`  | Finish feature: `gflff <name>`         |
-| `gflfp` | `git flow feature publish` | Publish feature: `gflfp <name>`        |
-| `gflhf` | `git flow hotfix finish`   | Finish hotfix: `gflhf <version>`       |
-| `gflrf` | `git flow release finish`  | Finish release: `gflrf <version>`      |
+| Alias     | Command                                   | Description                                    |
+| --------- | ----------------------------------------- | ---------------------------------------------- |
+| `gcd`     | `git checkout develop`                    | Check out develop branch                       |
+| `gch`     | `git checkout hotfix`                     | Check out hotfix branch                        |
+| `gcr`     | `git checkout release`                    | Check out release branch                       |
+| `gfl`     | `git flow`                                | Git-Flow command                               |
+| `gflf`    | `git flow feature`                        | List existing feature branches                 |
+| `gflff`   | `git flow feature finish`                 | Finish feature: `gflff <name>`                 |
+| `gflffc`  | `gflff ${$(git_current_branch)#feature/}` | Finish current feature                         |
+| `gflfp`   | `git flow feature publish`                | Publish feature: `gflfp <name>`                |
+| `gflfpc`  | `gflfp ${$(git_current_branch)#feature/}` | Publish current feature                        |
+| `gflfpll` | `git flow feature pull`                   | Pull remote feature: `gflfpll <remote> <name>` |
+| `gflfs`   | `git flow feature start`                  | Start a new feature: `gflfs <name>`            |
+| `gflh`    | `git flow hotfix`                         | List existing hotfix branches                  |
+| `gflhf`   | `git flow hotfix finish`                  | Finish hotfix: `gflhf <version>`               |
+| `gflhfc`  | `gflhf ${$(git_current_branch)#hotfix/}`  | Finish current hotfix                          |
+| `gflhp`   | `git flow hotfix publish`                 | Publish hostfix: `gflhp <version>`             |
+| `gflhpc`  | `gflhp ${$(git_current_branch)#hotfix/}`  | Finish current hotfix                          |
+| `gflhs`   | `git flow hotfix start`                   | Start a new hotfix: `gflhs <version>`          |
+| `gfli`    | `git flow init`                           | Initialize git-flow repository                 |
+| `gflr`    | `git flow release`                        | List existing release branches                 |
+| `gflrf`   | `git flow release finish`                 | Finish release: `gflrf <version>`              |
+| `gflrfc`  | `gflrf ${$(git_current_branch)#release/}` | Finish current release                         |
+| `gflrp`   | `git flow release publish`                | Publish release: `gflrp <version>`             |
+| `gflrpc`  | `gflrp ${$(git_current_branch)#release/}` | Publish current release                        |
+| `gflrs`   | `git flow release start`                  | Start a new release: `gflrs <version>`         |
 
 [More information about `git-flow` commands](https://github.com/nvie/gitflow/wiki/Command-Line-Arguments).
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 13399aaa3..f842de998 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -1,26 +1,28 @@
 # Aliases
-alias gfl='git flow'
-alias gfli='git flow init'
 alias gcd='git checkout $(git config gitflow.branch.develop)'
 alias gch='git checkout $(git config gitflow.prefix.hotfix)'
 alias gcr='git checkout $(git config gitflow.prefix.release)'
+alias gfl='git flow'
 alias gflf='git flow feature'
-alias gflh='git flow hotfix'
-alias gflr='git flow release'
-alias gflfs='git flow feature start'
-alias gflhs='git flow hotfix start'
-alias gflrs='git flow release start'
 alias gflff='git flow feature finish'
+alias gflffc='git flow feature finish ${$(git_current_branch)#feature/}'
 alias gflfp='git flow feature publish'
-alias gflhf='git flow hotfix finish'
-alias gflrf='git flow release finish'
-alias gflhp='git flow hotfix publish'
-alias gflrp='git flow release publish'
+alias gflfpc='git flow feature publish ${$(git_current_branch)#feature/}'
 alias gflfpll='git flow feature pull'
-alias gflffc='git flow feature finish $(echo $(current_branch) | cut -c 9-)'
-alias gflfpc='git flow feature publish $(echo $(current_branch) | cut -c 9-)'
-alias gflrfc='git flow release finish $(echo $(current_branch) | cut -c 9-)'
-alias gflrpc='git flow release publish $(echo $(current_branch) | cut -c 9-)'
+alias gflfs='git flow feature start'
+alias gflh='git flow hotfix'
+alias gflhf='git flow hotfix finish'
+alias gflhfc='git flow hotfix finish ${$(git_current_branch)#hotfix/}'
+alias gflhp='git flow hotfix publish'
+alias gflhpc='git flow hotfix publish ${$(git_current_branch)#hotfix/}'
+alias gflhs='git flow hotfix start'
+alias gfli='git flow init'
+alias gflr='git flow release'
+alias gflrf='git flow release finish'
+alias gflrfc='git flow release finish ${$(git_current_branch)#release/}'
+alias gflrp='git flow release publish'
+alias gflrpc='git flow release publish ${$(git_current_branch)#release/}'
+alias gflrs='git flow release start'
 
 # Source completion script
 # Handle $0 according to the standard:

From 875e7c4077c08b6cf5547929d403f70a52836388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=28=E2=95=AF=C2=B0=E2=96=A1=C2=B0=EF=BC=89=E2=95=AF?=
 =?UTF-8?q?=EF=B8=B5=20u=E1=B4=89=C7=9DssnH=20=C9=90=C9=9F=C9=90=CA=87soW?=
 <mostafa.hussein91@gmail.com>
Date: Tue, 28 Dec 2021 10:49:08 -0800
Subject: [PATCH 361/591] feat(helm): cache completion file in the background
 (#8326)

---
 plugins/helm/helm.plugin.zsh | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index 78499c15d..472c1c9dd 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -1,7 +1,22 @@
-# Autocompletion for helm.
-#
-# Copy from kubectl : https://github.com/pstadler
-
-if [ $commands[helm] ]; then
-  source <(helm completion zsh)
+if (( ! $+commands[helm] )); then
+  return
 fi
+
+# TODO: 2021-12-28: delete this block
+# Remove old generated file
+command rm -f "${ZSH_CACHE_DIR}/helm_completion"
+
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `helm`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
+  declare -A _comps
+  autoload -Uz _helm
+  _comps[helm]=_helm
+fi
+
+helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm" &|

From 69d0683a8cd3751178b2f7dc58126b50ed48e2ec Mon Sep 17 00:00:00 2001
From: Enrico Maria Crisostomo <enrico.m.crisostomo@gmail.com>
Date: Tue, 28 Dec 2021 20:10:15 +0100
Subject: [PATCH 362/591] feat(macports): add commands to get list of updated
 ports (#8698)

---
 plugins/macports/README.md           | 26 ++++++++++++++++++
 plugins/macports/macports.plugin.zsh | 40 +++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/plugins/macports/README.md b/plugins/macports/README.md
index ded823f3f..09bd42df2 100644
--- a/plugins/macports/README.md
+++ b/plugins/macports/README.md
@@ -15,7 +15,33 @@ plugins=(... macports)
 |-------|------------------------------------|--------------------------------------------------------------|
 | pc    | `sudo port clean --all installed`  | Clean up intermediate installation files for installed ports |
 | pi    | `sudo port install`                | Install package given as argument                            |
+| pli   | `port livecheck installed`         | Check for updates for installed ports                        |
+| plm   | `port-livecheck-maintainer`        | Check for updates of ports mainained by the specified users  |
 | psu   | `sudo port selfupdate`             | Update ports tree with MacPorts repository                   |
 | puni  | `sudo port uninstall inactive`     | Uninstall inactive ports                                     |
 | puo   | `sudo port upgrade outdated`       | Upgrade ports with newer versions available                  |
 | pup   | `psu && puo`                       | Update ports tree, then upgrade ports to newest versions     |
+
+## Commands
+
+### port-livecheck-maintainer
+
+```text
+Usage:
+  port-livecheck-maintainer
+  port-livecheck-maintainer (maintainer)+
+  port-livecheck-maintainer -h|--help
+
+Check
+
+Options:
+  maintainer  maintainer id
+  -h          print this help message and exit
+```
+
+Checks whether updates are available for ports whose maintainer is the current
+user, or any of a specified list of maintainer expressions.  The current user
+maintainer id is retrieved as follows:
+
+* The value of the `MACPORTS_MAINTAINER` variable, if set and not null.
+* The value of the `USER` variable.
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index d1fde30d4..d438057f9 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -1,6 +1,44 @@
 alias pc="sudo port clean --all installed"
 alias pi="sudo port install"
+alias pli="port livecheck installed"
+alias plm="port-livecheck-maintainer"
 alias psu="sudo port selfupdate"
 alias puni="sudo port uninstall inactive"
 alias puo="sudo port upgrade outdated"
-alias pup="psu && puo"
+alias pup="sudo port selfupdate && sudo port upgrade outdated"
+
+port-livecheck-maintainer() {
+  (( ${+commands[port]} == 0 )) || {
+    print -- "port: not found" >&2
+    return 1
+  }
+
+  local -a help_flag
+  zparseopts -D -E h=help_flag -help=help_flag
+
+  (( ${#help_flag} )) && {
+    cat << EOF >&2
+Usage:
+  port-livecheck-maintainer
+  port-livecheck-maintainer (maintainer)+
+  port-livecheck-maintainer -h|--help
+
+Check
+
+Options:
+  maintainer  maintainer id
+  -h          print this help message and exit
+EOF
+    return 1
+  }
+
+  if (( $# == 0 )); then
+    local default=${MACPORTS_MAINTAINER:-${USER}}
+    port livecheck maintainer:${default}
+    return $?
+  fi
+
+  for i in $@; do
+    port livecheck maintainer:${i}
+  done
+}

From 7568bbd9f57e0d7d90dd4a15abffc7e8a269f88f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 20:12:33 +0100
Subject: [PATCH 363/591] feat(ng): get `ng` completion from parsed help output
 (#10294)

Co-authored-by: Yannick Galatol <yannick.galatol@gmail.com>
---
 plugins/ng/_ng           | 56 +++++++++++++++++++++++++++++
 plugins/ng/ng.plugin.zsh | 78 ----------------------------------------
 2 files changed, 56 insertions(+), 78 deletions(-)
 create mode 100644 plugins/ng/_ng
 delete mode 100644 plugins/ng/ng.plugin.zsh

diff --git a/plugins/ng/_ng b/plugins/ng/_ng
new file mode 100644
index 000000000..9c96cf7e3
--- /dev/null
+++ b/plugins/ng/_ng
@@ -0,0 +1,56 @@
+#compdef ng
+
+setopt localoptions extendedglob
+
+if (( CURRENT == 2 )); then
+  local -a cmds alias
+  # Sample output (ng help):
+  # Available Commands:
+  #   add Adds support for an external library to your project.
+  for line in ${(@f)"$(ng help 2>/dev/null | sed -n '/^  /p')"}; do
+    if [[ "$line" =~ '^  ([^ ]+) \(([^)]+)\) (.*)$' ]]; then
+      alias=(${match[1]} ${(s:, :)match[2]})
+      cmds+=(${^alias}:"${match[3]//:/}")
+    elif [[ "$line" =~ '^  ([^ ]+) (.*)$' ]]; then
+      cmds+=("${match[1]}:${match[2]//:/}")
+    fi
+  done
+  _describe commands cmds && return 0
+elif (( CURRENT == 3 )); then
+  local -a flags args
+  local section description
+  # Sample output (ng build --help):
+  # --configuration (-c)
+  #   One or more named builder configurations as a comma-separated list as specified in the "configurations" section of angular.json.
+  #   The builder uses the named configurations to run the given target.
+  #   For more information, see https://angular.io/guide/workspace-config#alternate-build-configurations.
+  # Prefix --flags with literal \0, and split on that to get each flag section
+  for section in ${(s:\0:)"$(ng ${words[2]} --help 2>/dev/null | sed -e '1,/^options/ d;s/^  --/\\0--/')"}; do
+    # Split by newline and discard extra description lines (lines > 2)
+    for args description in ${${(@f)section}[1,2]}; do
+      args=(${(s: :)${${args%% #}## #}//[(),]/})
+      description=${${description%% #}## #}
+      flags+=(${^args}":$description")
+    done
+  done
+  _describe flags flags
+
+  case "$words[2]" in
+  b|build|l|lint|t|test)
+    # Sample output (ng config projects):
+    # {
+    #   "angular-project-1": {
+    #     ...
+    #   },
+    #   "angular-project-2": {
+    #     ...
+    #   }
+    # }
+    # In abscence of a proper JSON parser, just grab the lines with
+    # a 2-space indentation and only the stuff inside quotes
+    local -a projects
+    projects=(${(@f)"$(ng config projects 2>/dev/null | sed -n 's/^  "\([^"]\+\)".*$/\1/p')"})
+    _describe projects projects
+    ;;
+  esac
+fi
diff --git a/plugins/ng/ng.plugin.zsh b/plugins/ng/ng.plugin.zsh
deleted file mode 100644
index 44102e2a6..000000000
--- a/plugins/ng/ng.plugin.zsh
+++ /dev/null
@@ -1,78 +0,0 @@
-ng_opts='addon asset-sizes b build completion d destroy doc e2e g generate get github-pages:deploy gh-pages:deploy h help i init install lint make-this-awesome new s serve server set t test update v version -h --help'
-
-_ng_completion () {
-  local words cword opts
-  read -Ac words
-  read -cn cword
-  let cword-=1
-
-  case $words[cword] in
-    addon )
-      opts='-b --blueprint -d -dir --directory --dry-run -sb --skip-bower -sg --skip-git -sn --skip-npm -v --verbose'
-      ;;
-
-    asset-sizes )
-      opts='-o --output-path'
-      ;;
-
-    b | build )
-      opts='--environment --output-path --suppress-sizes --target --watch --watcher -dev -e -prod'
-      ;;
-
-    d | destroy )
-      opts='--dry-run --verbose --pod --classic --dummy --in-repo --in-repo-addon -d -v -p -c -dum -id -ir'
-      ;;
-
-    g | generate )
-      opts='class component directive enum module pipe route service --generate -d --dry-run --verbose -v --pod -p --classic -c --dummy -dum -id --in-repo --in-repo-addon -ir'
-      ;;
-
-    gh-pages:deploy | github-pages:deploy )
-      opts='--environment --gh-token --gh-username --skip-build --user-page --message'
-      ;;
-
-    h | help | -h | --help)
-      opts='--json --verbose -v'
-      ;;
-
-    init )
-      opts='--blueprint --dry-run --link-cli --mobile --name --prefix --skip-bower --skip-npm --source-dir --style --verbose -b -d -lc -n -p -sb -sd -sn -v'
-      ;;
-
-    new )
-      opts='--blueprint --directory --dry-run --link-cli --mobile --prefix --skip-bower --skip-git --skip-npm --source-dir --style --verbose -b -d -dir -lc -p -sb -sd -sg -sn -v'
-      ;;
-
-    s | serve | server )
-      opts='--environment --host --insecure-proxy --inspr --live-reload --live-reload-base-url --live-reload-host --live-reload-live-css --live-reload-port --output-path --port --proxy --ssl --ssl-cert --ssl-key --target --watcher -H -dev -e -lr -lrbu -lrh -lrp -op -out -p -pr -prod -pxy -t -w'
-      ;;
-
-    set )
-      opts='--global -g'
-      ;;
-
-    t | test )
-      opts='--browsers --colors --config-file --environment --filter --host --launch --log-level --module --path --port --query --reporter --server --silent --test-page --test-port --watch -H -c -cf -e -f -m -r -s -tp -w'
-      ;;
-      
-    update )
-      opts='--all --dryRun --force --from --migrate-only --next --registry --to -d'
-      ;;
-
-    v | version )
-      opts='--verbose'
-      ;;
-
-    ng )
-      opts=$ng_opts
-      ;;
-
-    * )
-      opts=''
-      ;;
-  esac
-
-  reply=(${=opts})
-}
-
-compctl -K _ng_completion ng

From 43046cdb35547c9dfbfe474197b2d9dc696edef3 Mon Sep 17 00:00:00 2001
From: idoroiengel <idoroiengel@gmail.com>
Date: Sun, 13 Dec 2020 17:53:59 +0200
Subject: [PATCH 364/591] feat(flutter): add a few more aliases (#9511)

Closes #9511
---
 plugins/flutter/README.md          | 29 ++++++++++++++++++-----------
 plugins/flutter/flutter.plugin.zsh | 15 +++++++++++----
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/plugins/flutter/README.md b/plugins/flutter/README.md
index 9c8169afc..e5a4fd2ea 100644
--- a/plugins/flutter/README.md
+++ b/plugins/flutter/README.md
@@ -2,20 +2,27 @@
 
 The Flutter plugin provides completion and useful aliases
 
-To use it, add flutter to the plugins array of your zshrc file:
+To use it, add `flutter` to the plugins array of your zshrc file:
 
-```
+```zsh
 plugins=(... flutter)
 ```
 
 ## Aliases
 
-| Alias      | Command                | Description                                                                |
-| :--------- | :--------------------- | :------------------------------------------------------------------------- |
-| `fl`       | `flutter`              | Shorthand for flutter command                                              |
-| `flr`      | `flutter run`          | Runs flutter app                                                           |
-| `fldoc`    | `flutter doctor`       | Runs flutter doctor                                                        |
-| `flb`      | `flutter build`        | Build flutter application                                                  |
-| `flattach` | `flutter attach`       | Attaches flutter to a running flutter application with enabled observatory |
-| `flget`    | `flutter packages get` | Installs dependencies                                                      |
-| `flc`      | `flutter clean`        | Cleans flutter project                                                     |
+| Alias      | Command                 | Description                                                                |
+| :--------- | :---------------------- | :------------------------------------------------------------------------- |
+| `fl`       | `flutter`               | Shorthand for flutter command                                              |
+| `flattach` | `flutter attach`        | Attaches flutter to a running flutter application with enabled observatory |
+| `flb`      | `flutter build`         | Build flutter application                                                  |
+| `flchnl`   | `flutter channel`       | Switches flutter channel (requires input of desired channel)               |
+| `flc`      | `flutter clean`         | Cleans flutter project                                                     |
+| `fldvcs`   | `flutter devices`       | List connected devices (if any)                                            |
+| `fldoc`    | `flutter doctor`        | Runs flutter doctor                                                        |
+| `flpub`    | `flutter pub`           | Shorthand for flutter pub command                                          |
+| `flget`    | `flutter pub get`       | Installs dependencies                                                      |
+| `flr`      | `flutter run`           | Runs flutter app                                                           |
+| `flrd`     | `flutter run --debug`   | Runs flutter app in debug mode (default mode)                              |
+| `flrp`     | `flutter run --profile` | Runs flutter app in profile mode                                           |
+| `flrr`     | `flutter run --release` | Runs flutter app in release mode                                           |
+| `flupgrd`  | `flutter upgrade`       | Upgrades flutter version depending on the current channel                  |
diff --git a/plugins/flutter/flutter.plugin.zsh b/plugins/flutter/flutter.plugin.zsh
index 01c4c9f5f..80b74f64a 100644
--- a/plugins/flutter/flutter.plugin.zsh
+++ b/plugins/flutter/flutter.plugin.zsh
@@ -1,7 +1,14 @@
 alias fl="flutter"
-alias flr="flutter run"
-alias fldoc="flutter doctor"
-alias flb="flutter build"
 alias flattach="flutter attach"
-alias flget="flutter packages get"
+alias flb="flutter build"
+alias flchnl="flutter channel"
 alias flc="flutter clean"
+alias fldvcs="flutter devices"
+alias fldoc="flutter doctor"
+alias flpub="flutter pub"
+alias flget="flutter pub get"
+alias flr="flutter run"
+alias flrd="flutter run --debug"
+alias flrp="flutter run --profile"
+alias flrr="flutter run --release"
+alias flupgrd="flutter upgrade"

From b8e4aa2b0cf53301f7decbbea7ab210cefa31e59 Mon Sep 17 00:00:00 2001
From: Roderik Muit <rm@wyz.biz>
Date: Tue, 28 Dec 2021 20:34:05 +0100
Subject: [PATCH 365/591] fix(pass): update `pass` completion to ff5ac38
 (#9761)

This fixes a problem when completion filenames with colons.

Source: https://git.zx2c4.com/password-store/commit/?id=ff5ac38f7984d7b3d2912dba106baa2fed52e530
---
 plugins/pass/_pass | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/plugins/pass/_pass b/plugins/pass/_pass
index 75f3feb4f..d911e122f 100644
--- a/plugins/pass/_pass
+++ b/plugins/pass/_pass
@@ -6,18 +6,9 @@
 #    Brian Mattern <rephorm@rephorm.com>
 #    Jason A. Donenfeld <Jason@zx2c4.com>.
 # All Rights Reserved.
-# This file is licensed under the GPLv2+.
-# Please visit https://git.zx2c4.com/password-store/tree/COPYING for more information.
+# This file is licensed under the GPLv2+. Please see COPYING for more information.
 
 
-# If you use multiple repositories, you can configure completion like this:
-#
-# compdef _pass workpass
-# zstyle ':completion::complete:workpass::' prefix "$HOME/work/pass"
-# workpass() {
-#   PASSWORD_STORE_DIR=$HOME/work/pass pass $@
-# }
-
 # If you use multiple repositories, you can configure completion like this:
 #
 # compdef _pass workpass
@@ -133,7 +124,7 @@ _pass_complete_entries_helper () {
 	local IFS=$'\n'
 	local prefix
 	zstyle -s ":completion:${curcontext}:" prefix prefix || prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' -e 's#\\#\\\\#' | sort):-""}
+	_values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' -e 's#\\#\\\\#g' -e 's#:#\\:#g' | sort):-""}
 }
 
 _pass_complete_entries_with_subdirs () {

From e33bc4035171168ea7134d1494f7476cb9d9f352 Mon Sep 17 00:00:00 2001
From: Julien Negrotto <jtnegrotto@gmail.com>
Date: Thu, 1 Sep 2016 11:08:14 -0500
Subject: [PATCH 366/591] feat(rake): support square brackets with rake binstub
 (#5361)

Closes #5361
---
 plugins/rake/README.md       | 22 +++++++++++++---------
 plugins/rake/rake.plugin.zsh | 15 +++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/plugins/rake/README.md b/plugins/rake/README.md
index e888c0785..72f2a8525 100644
--- a/plugins/rake/README.md
+++ b/plugins/rake/README.md
@@ -13,25 +13,29 @@ plugins=(... rake)
 
 The plugin aliases the rake command so you can pass arguments when invoking rake tasks
 without having to escape the brackets, i.e., you can run
-```
+
+```sh
 rake namespace:task['argument']
 ```
+
 instead of having to do
-```
+
+```sh
 rake namespace:task\['argument'\]
 ```
 
-| Alias  | Command                        | Description                                   |
-|--------|--------------------------------|-----------------------------------------------|
-| rake   | `noglob rake`                  | Allows unescaped square brackets              |
-| brake  | `noglob bundle exec rake`      | Same as above but call rake using bundler     |
-| srake  | `noglob sudo rake`             | Same as rake but using sudo                   |
-| sbrake | `noglob sudo bundle exec rake` | Same as above but using both sudo and bundler |
+| Alias      | Command                        | Description                                   |
+| ---------- | ------------------------------ | --------------------------------------------- |
+| `rake`     | `noglob rake`                  | Allows unescaped square brackets              |
+| `bin/rake` | `noglob bin/rake`              | Same as above but using rake binstub          |
+| `brake`    | `noglob bundle exec rake`      | Same as above but call rake using bundler     |
+| `srake`    | `noglob sudo rake`             | Same as rake but using sudo                   |
+| `sbrake`   | `noglob sudo bundle exec rake` | Same as above but using both sudo and bundler |
 
 ## Jim Weirich
 
 The plugin also aliases `rake` to [`jimweirich`](https://github.com/jimweirich), author of Rake
 and big time contributor to the Ruby open source community. He passed away in 2014:
 
-> Thank you Jim for everything you contributed to the Ruby and open source community 
+> Thank you Jim for everything you contributed to the Ruby and open source community
 > over the years. We will miss you dearly. — [**@robbyrussell**](https://github.com/ohmyzsh/ohmyzsh/commit/598a9c6f990756386517d66b6bcf77e53791e905)
diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh
index 3ceb20fea..0c507e628 100644
--- a/plugins/rake/rake.plugin.zsh
+++ b/plugins/rake/rake.plugin.zsh
@@ -1,10 +1,9 @@
-# Thank you Jim for everything you contributed to the Ruby and open source community 
+# Thank you Jim for everything you contributed to the Ruby and open source community
 # over the years. We will miss you dearly.
-alias jimweirich="rake"  
-
-alias rake="noglob rake" # allows square brackets for rake task invocation
-alias brake='noglob bundle exec rake' # execute the bundled rake gem
-alias srake='noglob sudo rake' # noglob must come before sudo
-alias sbrake='noglob sudo bundle exec rake' # altogether now ... 
-
+alias jimweirich='rake'
 
+alias rake='noglob rake'                    # allows square brackts for rake task invocation
+alias 'bin/rake'='noglob bin/rake'          # support use of binstub
+alias brake='noglob bundle exec rake'       # execute the bundled rake gem
+alias srake='noglob sudo rake'              # noglob must come before sudo
+alias sbrake='noglob sudo bundle exec rake' # altogether now ...

From 4491588ac04669c103790c557c6eb4aa40ec0f9e Mon Sep 17 00:00:00 2001
From: Turiok <crd.compte@gmail.com>
Date: Tue, 28 Dec 2021 20:58:50 +0100
Subject: [PATCH 367/591] feat(repo): add command completion for repo 2.8
 (#9388)

---
 plugins/repo/_repo | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/repo/_repo b/plugins/repo/_repo
index db0ecd14d..2b1f165f1 100644
--- a/plugins/repo/_repo
+++ b/plugins/repo/_repo
@@ -114,7 +114,9 @@ _repo()
         (start)
           _arguments : \
                      "(-h --help)"{-h,--help}"[Show help]" \
-                     "(--all)--all=[begin branch in all projects]"\
+                     "(--all)--all[begin branch in all projects]"\
+                     "(-r --rev --revision)"{-r,--rev,--revision=}"[point branch at this revision instead of upstream]":branch_or_rev:__repo__repo_branch_or_rev\
+                     "(--head)--head[abbreviation for --rev HEAD]"\
                     ':branch name:__repo_new__repo_branch_name' \
                     ':projects:__repo_projects_or_all' \
                     && ret=0
@@ -143,6 +145,13 @@ _repo()
                      "(-h --help)"{-h,--help}"[Show help]" \
                     && ret=0
           ;;
+        (stage)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     "(-i --interactive)"{-i,--interactive}"[use interactive staging]" \
+                    ':projects:__repo_projects' \
+                    && ret=0
+          ;;
         (status)
           _arguments : \
                      "(-h --help)"{-h,--help}"[Show help]" \

From 92a862083b2878e5bc090c121aba11c048f90320 Mon Sep 17 00:00:00 2001
From: Vsevolod Voloshyn <seva.voloshin@gmail.com>
Date: Tue, 28 Dec 2021 22:41:08 +0200
Subject: [PATCH 368/591] feat(rvm): add latest `rb*` utility functions (#9812)

---
 plugins/rvm/README.md      |  4 ++++
 plugins/rvm/rvm.plugin.zsh | 48 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/plugins/rvm/README.md b/plugins/rvm/README.md
index b0977f53a..4ddc7cc85 100644
--- a/plugins/rvm/README.md
+++ b/plugins/rvm/README.md
@@ -16,6 +16,10 @@ plugins=(... rvm)
 | `rb19`         | `rvm use ruby-1.9.3` |
 | `rb20`         | `rvm use ruby-2.0.0` |
 | `rb21`         | `rvm use ruby-2.1.2` |
+| `rb25`         | `rvm use ruby-2.5.9` |
+| `rb26`         | `rvm use ruby-2.6.7` |
+| `rb27`         | `rvm use ruby-2.7.3` |
+| `rb30`         | `rvm use ruby-3.0.1` |
 | `rvm-update`   | `rvm get head`       |
 | `gems`         | `gem list`           |
 | `rvms`         | `rvm gemset`         |
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index c5918f289..64a99278c 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -8,6 +8,10 @@ local ruby18='ruby-1.8.7'
 local ruby19='ruby-1.9.3'
 local ruby20='ruby-2.0.0'
 local ruby21='ruby-2.1.2'
+local ruby25='ruby-2.5.9'
+local ruby26='ruby-2.6.7'
+local ruby27='ruby-2.7.3'
+local ruby30='ruby-3.0.1'
 
 function rb18 {
 	if [ -z "$1" ]; then
@@ -53,6 +57,50 @@ function rb21 {
 _rb21() {compadd `ls -1 $rvm_path/gems | grep "^$ruby21@" | sed -e "s/^$ruby21@//" | awk '{print $1}'`}
 compdef _rb21 rb21
 
+function rb25 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby25"
+	else
+		rvm use "$ruby25@$1"
+	fi
+}
+
+_rb25() {compadd `ls -1 $rvm_path/gems | grep "^$ruby25@" | sed -e "s/^$ruby25@//" | awk '{print $1}'`}
+compdef _rb25 rb25
+
+function rb26 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby26"
+	else
+		rvm use "$ruby26@$1"
+	fi
+}
+
+_rb26() {compadd `ls -1 $rvm_path/gems | grep "^$ruby26@" | sed -e "s/^$ruby26@//" | awk '{print $1}'`}
+compdef _rb26 rb26
+
+function rb27 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby27"
+	else
+		rvm use "$ruby27@$1"
+	fi
+}
+
+_rb27() {compadd `ls -1 $rvm_path/gems | grep "^$ruby27@" | sed -e "s/^$ruby27@//" | awk '{print $1}'`}
+compdef _rb27 rb27
+
+function rb30 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby30"
+	else
+		rvm use "$ruby30@$1"
+	fi
+}
+
+_rb30() {compadd `ls -1 $rvm_path/gems | grep "^$ruby30@" | sed -e "s/^$ruby30@//" | awk '{print $1}'`}
+compdef _rb30 rb30
+
 function rvm-update {
 	rvm get head
 }

From 8861d5c3a7274148cd48b49225cd5f4a0ed363a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 22:09:11 +0100
Subject: [PATCH 369/591] refactor(rvm): clean up `rb*` utilities definition
 and add more versions

---
 plugins/rvm/README.md      |  36 +++++----
 plugins/rvm/rvm.plugin.zsh | 145 ++++++++++---------------------------
 2 files changed, 61 insertions(+), 120 deletions(-)

diff --git a/plugins/rvm/README.md b/plugins/rvm/README.md
index 4ddc7cc85..258c89420 100644
--- a/plugins/rvm/README.md
+++ b/plugins/rvm/README.md
@@ -10,16 +10,26 @@ plugins=(... rvm)
 
 ## Aliases
 
-| Alias          | Command              |
-|----------------|----------------------|
-| `rb18`         | `rvm use ruby-1.8.7` |
-| `rb19`         | `rvm use ruby-1.9.3` |
-| `rb20`         | `rvm use ruby-2.0.0` |
-| `rb21`         | `rvm use ruby-2.1.2` |
-| `rb25`         | `rvm use ruby-2.5.9` |
-| `rb26`         | `rvm use ruby-2.6.7` |
-| `rb27`         | `rvm use ruby-2.7.3` |
-| `rb30`         | `rvm use ruby-3.0.1` |
-| `rvm-update`   | `rvm get head`       |
-| `gems`         | `gem list`           |
-| `rvms`         | `rvm gemset`         |
+| Alias        | Command              |
+| ------------ | -------------------- |
+| `rb18`       | `rvm use ruby-1.8.7` |
+| `rb19`       | `rvm use ruby-1.9.3` |
+| `rb20`       | `rvm use ruby-2.0.0` |
+| `rb21`       | `rvm use ruby-2.1`   |
+| `rb22`       | `rvm use ruby-2.2`   |
+| `rb23`       | `rvm use ruby-2.3`   |
+| `rb24`       | `rvm use ruby-2.4`   |
+| `rb25`       | `rvm use ruby-2.5`   |
+| `rb26`       | `rvm use ruby-2.6`   |
+| `rb27`       | `rvm use ruby-2.7`   |
+| `rb30`       | `rvm use ruby-3.0`   |
+| `rvm-update` | `rvm get head`       |
+| `gems`       | `gem list`           |
+| `rvms`       | `rvm gemset`         |
+
+## Deprecated versions
+
+At the time of writing this (2021-12-28), Ruby versions until 2.5 are [EOL][1],
+and will be removed in the future.
+
+[1]: https://endoflife.date/ruby
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 64a99278c..4ba885563 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,123 +1,54 @@
-fpath=($rvm_path/scripts/zsh/Completion $fpath)
+# Completion
+fpath+=("${rvm_path}/scripts/zsh/Completion")
 
+declare -A _comps
+autoload -Uz _rvm
+_comps[rvm]=_rvm
+
+# Aliases
 alias rubies='rvm list rubies'
 alias rvms='rvm gemset'
 alias gemsets='rvms list'
 
-local ruby18='ruby-1.8.7'
-local ruby19='ruby-1.9.3'
-local ruby20='ruby-2.0.0'
-local ruby21='ruby-2.1.2'
-local ruby25='ruby-2.5.9'
-local ruby26='ruby-2.6.7'
-local ruby27='ruby-2.7.3'
-local ruby30='ruby-3.0.1'
 
-function rb18 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby18"
-	else
-		rvm use "$ruby18@$1"
-	fi
-}
+# rb{version} utilities
+# From `rvm list known`
+typeset -A rubies
+rubies=(
+  18  'ruby-1.8.7'
+  19  'ruby-1.9.3'
+  20  'ruby-2.0.0'
+  21  'ruby-2.1'
+  22  'ruby-2.2'
+  23  'ruby-2.3'
+  24  'ruby-2.4'
+  25  'ruby-2.5'
+  26  'ruby-2.6'
+  27  'ruby-2.7'
+  30  'ruby-3.0'
+)
 
-_rb18() {compadd `ls -1 $rvm_path/gems | grep "^$ruby18@" | sed -e "s/^$ruby18@//" | awk '{print $1}'`}
-compdef _rb18 rb18
+for v in ${(k)rubies}; do
+  version="${rubies[$v]}"
+  functions[rb${v}]="rvm use ${version}\${1+"@\$1"}"
+  functions[_rb${v}]="compadd \$(ls -1 \"\${rvm_path}/gems\" | grep '^${version}@' | sed -e 's/^${version}@//' | awk '{print $1}')"
+  compdef _rb$v rb$v
+done
+unset rubies v version
 
-function rb19 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby19"
-	else
-		rvm use "$ruby19@$1"
-	fi
-}
-
-_rb19() {compadd `ls -1 $rvm_path/gems | grep "^$ruby19@" | sed -e "s/^$ruby19@//" | awk '{print $1}'`}
-compdef _rb19 rb19
-
-function rb20 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby20"
-	else
-		rvm use "$ruby20@$1"
-	fi
-}
-
-_rb20() {compadd `ls -1 $rvm_path/gems | grep "^$ruby20@" | sed -e "s/^$ruby20@//" | awk '{print $1}'`}
-compdef _rb20 rb20
-
-function rb21 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby21"
-	else
-		rvm use "$ruby21@$1"
-	fi
-}
-
-_rb21() {compadd `ls -1 $rvm_path/gems | grep "^$ruby21@" | sed -e "s/^$ruby21@//" | awk '{print $1}'`}
-compdef _rb21 rb21
-
-function rb25 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby25"
-	else
-		rvm use "$ruby25@$1"
-	fi
-}
-
-_rb25() {compadd `ls -1 $rvm_path/gems | grep "^$ruby25@" | sed -e "s/^$ruby25@//" | awk '{print $1}'`}
-compdef _rb25 rb25
-
-function rb26 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby26"
-	else
-		rvm use "$ruby26@$1"
-	fi
-}
-
-_rb26() {compadd `ls -1 $rvm_path/gems | grep "^$ruby26@" | sed -e "s/^$ruby26@//" | awk '{print $1}'`}
-compdef _rb26 rb26
-
-function rb27 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby27"
-	else
-		rvm use "$ruby27@$1"
-	fi
-}
-
-_rb27() {compadd `ls -1 $rvm_path/gems | grep "^$ruby27@" | sed -e "s/^$ruby27@//" | awk '{print $1}'`}
-compdef _rb27 rb27
-
-function rb30 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby30"
-	else
-		rvm use "$ruby30@$1"
-	fi
-}
-
-_rb30() {compadd `ls -1 $rvm_path/gems | grep "^$ruby30@" | sed -e "s/^$ruby30@//" | awk '{print $1}'`}
-compdef _rb30 rb30
 
 function rvm-update {
-	rvm get head
+  rvm get head
 }
 
 # TODO: Make this usable w/o rvm.
 function gems {
-	local current_ruby=`rvm-prompt i v p`
-	local current_gemset=`rvm-prompt g`
+  local current_ruby=`rvm-prompt i v p`
+  local current_gemset=`rvm-prompt g`
 
-	gem list $@ | sed -E \
-		-e "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
-		-e "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
-		-e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
-		-e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+  gem list $@ | sed -E \
+    -e "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+    -e "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
+    -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+    -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
 }
-
-function _rvm_completion {
-  source $rvm_path"/scripts/zsh/Completion/_rvm"
-}
-compdef _rvm_completion rvm

From fe04acd97ccf60b869eb105d8b76fbfed607a90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 22:16:43 +0100
Subject: [PATCH 370/591] chore: add maintainer for `shell-proxy` plugin

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6c3eac6e7..0cb9410fc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,6 +5,7 @@ plugins/genpass/                    @atoponce
 plugins/git-lfs/                    @hellovietduc
 plugins/gitfast/                    @felipec
 plugins/sdk/                        @rgoldberg
+plugins/shell-proxy/                @septs
 plugins/universalarchive/           @Konfekt
 plugins/wp-cli/                     @joshmedeski
 plugins/zoxide/                     @ajeetdsouza

From 234ad7398d5e241ad625d3c0b1666ff8c22c4596 Mon Sep 17 00:00:00 2001
From: Angel Ramboi <angel@ramboi.com>
Date: Tue, 28 Dec 2021 23:37:50 +0100
Subject: [PATCH 371/591] chore(ipfs): update completion script for IPFS
 version 0.8.0 (#9800)

---
 plugins/ipfs/_ipfs | 94 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 84 insertions(+), 10 deletions(-)

diff --git a/plugins/ipfs/_ipfs b/plugins/ipfs/_ipfs
index 90c0a61c8..8771bc4ba 100644
--- a/plugins/ipfs/_ipfs
+++ b/plugins/ipfs/_ipfs
@@ -93,7 +93,8 @@ _ipfs_subcommand(){
             (pin)
               _arguments \
                 '(-t --type)'{-t,--type}'[The type of pinned keys to list. Can be "direct", "indirect", "recursive", or "all". Default: all.]' \
-                '(-q --quiet)'{-q,--quiet}'[Write just hashes of objects.]'
+                '(-q --quiet)'{-q,--quiet}'[Write just hashes of objects.]' \
+                '(-s --stream)'{-s,--stream}'[Enable streaming of pins as they are discovered.]'
             ;;
             (p2p)
               _arguments '(-v --headers)'{-v,--headers}'[Print table headers (Protocol, Listen, Target).]'
@@ -116,7 +117,14 @@ _ipfs_subcommand(){
             ;;
           esac
         ;;
-        (get|query|findpeer)
+        (query|findpeer)
+          case $MAIN_SUBCOMMAND in
+            (dht)
+              _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
+            ;;
+          esac
+        ;;
+        (get)
           case $MAIN_SUBCOMMAND in
             (dht)
               _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
@@ -158,22 +166,33 @@ _ipfs_subcommand(){
             ;;
           esac
         ;;
-        (cmds|diff)
+        (cmds)
           case $MAIN_SUBCOMMAND in
-            (diag|object)
+            (diag)
+              _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
+            ;;
+          esac
+        ;;
+        (diff)
+          case $MAIN_SUBCOMMAND in
+            (object)
               _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
             ;;
           esac
         ;;
         (stat)
           case $MAIN_SUBCOMMAND in
+            (dag)
+              _arguments \
+                '(-p --progress)'{-p,--progress}'[Return progressive data while reading through the DAG. Default: true.]'
+            ;;
             (object)
               _arguments '--human[Print sizes in human readable format (e.g., 1K 234M 2G).]'
             ;;
             (repo)
               _arguments \
-                '--size-only[Only report RepoSize and StorageMax.]' \
-                '--human[Print sizes in human readable format (e.g., 1K 234M 2G).]'
+                '(-s --size-only)'{-s,--size-only}'[Only report RepoSize and StorageMax.]' \
+                '(-H --human)'{-H,--human}'[Print sizes in human readable format (e.g., 1K 234M 2G).]'
             ;;
           esac
         ;;
@@ -186,7 +205,8 @@ _ipfs_subcommand(){
                 '--allow-offline[When offline, save the IPNS record to the the local datastore without broadcasting to the network instead of simply failing.]' \
                 '--ttl[Time duration this record should be cached for. Uses the same syntax as the lifetime option. (caution: experimental).]' \
                 '(-k --key)'{-k,--key}"[Name of the key to be used or a valid PeerID, as listed by 'ipfs key list -l'. Default: self.]" \
-                '(-Q --quieter)'{-Q,--quieter}'[Write only final hash.]'
+                '(-Q --quieter)'{-Q,--quieter}'[Write only final hash.]' \
+                '--ipns-base[Encoding used for keys: Can either be a multibase encoded CID or a base58btc encoded multihash. Takes {b58mh|base36|k|base32|b...}. Default: base36.]'
             ;;
           esac
         ;;
@@ -254,7 +274,7 @@ _ipfs_subcommand(){
                 '(-p --peer)'{-p,--peer}'[Specify a peer to print bandwidth for.]' \
                 '(-t --proto)'{-t,--proto}'[Specify a protocol to print bandwidth for.]' \
                 '--poll[Print bandwidth at an interval.]' \
-                '(-i --interval)'{-i,--interval}'[Time interval to wait between updating output, if 'poll' is true.]'
+                '(-i --interval)'{-i,--interval}"[Time interval to wait between updating output, if 'poll' is true.]"
             ;;
           esac
         ;;
@@ -289,6 +309,7 @@ _ipfs_subcommand(){
               _arguments \
                 '-f[Printf style format string. Default: %s.]' \
                 '-v[CID version to convert to.]' \
+                '--codec[CID codec to convert to.]' \
                 '-b[Multibase to display CID in.]'
             ;;
           esac
@@ -367,6 +388,45 @@ _ipfs_subcommand(){
             ;;
           esac
         ;;
+        (export)
+          case $MAIN_SUBCOMMAND in
+            (dag)
+              _arguments \
+                '(-p --progress)'{-p,--progress}'[Display progress on CLI. Defaults to true when STDERR is a TTY.]'
+            ;;
+            (key)
+              _arguments \
+                '(-o --output)'{-o,--output}'[The path where the output should be stored.]'
+            ;;
+          esac
+        ;;
+        (import)
+          case $MAIN_SUBCOMMAND in
+            (dag)
+              _arguments \
+                '--silent[No output.]' \
+                '--pin-roots[Pin optional roots listed in the .car headers after importing. Default: true.]'
+            ;;
+            (key)
+              _arguments \
+                '--ipns-base[Encoding used for keys: Can either be a multibase encoded CID or a base58btc encoded multihash. Takes {b58mh|base36|k|base32|b...}. Default: base36.]'
+            ;;
+          esac
+        ;;
+        (remote)
+          case $MAIN_SUBCOMMAND in
+            (pin)
+              local -a _pin_remote_arguments
+              _pin_remote_arguments=(
+                'add:Pin object to remote pinning service.'
+                'ls:List objects pinned to remote pinning service.'
+                'rm:Remove pins from remote pinning service.'
+                'service:Configure remote pinning services.'
+              )
+              _ipfs_subcommand _pin_remote_arguments
+            ;;
+          esac
+        ;;
       esac
     ;;
   esac
@@ -402,6 +462,8 @@ case $MAIN_SUBCOMMAND in
       '(--dereference-args)--dereference-args[Symlinks supplied in arguments are dereferenced.]' \
       '(--stdin-name)--stdin-name[Assign a name if the file source is stdin.]' \
       '(-H --hidden)'{-H,--hidden}'[Include files that are hidden. Only takes effect on recursive add.]' \
+      '(--ignore)--ignore[A rule (.gitignore-stype) defining which file(s) should be ignored (variadic, experimental).]' \
+      '(--ignore-rules-path)--ignore-rules-path[A path to a file with .gitignore-style ignore rules (experimental).]' \
       '(-q --quiet)'{-q,--quiet}'[Write minimal output.]' \
       '(-Q --quieter)'{-Q,--quieter}'[Write only final hash.]' \
       '(--silent)--silent[Write no output.]' \
@@ -483,6 +545,7 @@ case $MAIN_SUBCOMMAND in
   (daemon)
     _arguments \
       '--init[Initialize ipfs with default settings if not already initialized.]' \
+      '--init-config[Path to existing configuration file to be loaded during --init.]' \
       '--init-profile[Configuration profiles to apply for --init. See ipfs init --help for more.]' \
       '--routing[Overrides the routing option. Default: default.]' \
       '--mount[Mounts IPFS to the filesystem.]' \
@@ -501,9 +564,12 @@ case $MAIN_SUBCOMMAND in
   (dag)
     local -a _dag_arguments
     _dag_arguments=(
+      'export:Streams the selected DAG as a .car stream on stdout.'
       'get:Get a dag node from ipfs.'
+      'import:Import the contents of .car files'
       'put:Add a dag node to ipfs.'
       'resolve:Resolve ipld block.'
+      'stat:Gets stats for a DAG'
     )
     _ipfs_subcommand _dag_arguments
   ;;
@@ -564,21 +630,27 @@ case $MAIN_SUBCOMMAND in
       '(-l --compression-level)'{-l,--compression-level}'[The level of compression (1-9).]'
   ;;
   (id)
-    _arguments '(-f --format)'{-f,--format}'[Optional output format.]'
+    _arguments \
+      '(-f --format)'{-f,--format}'[Optional output format.]' \
+      '--peerid-base[Encoding used for peer IDs: Can either be a multibase encoded CID or a base58btc encoded multihash. Takes {b58mh|base36|k|base32|b...}. Default: b58mh.]'
   ;;
   (init)
     _arguments \
-      '(-b --bits)'{-b,--bits}'[Number of bits to use in the generated RSA private key. Default: 2048.]' \
+      '(-a --algorithm)'{-a, --algorithm}'[Cryptographic algorithm to use for key generation. Default: ed25519.]' \
+      '(-b --bits)'{-b,--bits}'[Number of bits to use in the generated RSA private key.]' \
       '(-e --empty-repo)'{-e,--empty-repo}"[Don't add and pin help files to the local storage.]" \
       '(-p --profile)'{-p,--profile}"[Apply profile settings to config. Multiple profiles can be separated by ','.]"
   ;;
   (key)
     local -a _key_arguments
     _key_arguments=(
+      'export:Export a keypair'
       'gen:Create a new keypair'
+      'import:Import a key and prints imported key id'
       'list:List all local keypairs'
       'rename:Rename a keypair'
       'rm:Remove a keypair'
+      'rotate:Rotates the ipfs identity.'
     )
     _ipfs_subcommand _key_arguments
   ;;
@@ -642,6 +714,7 @@ case $MAIN_SUBCOMMAND in
     _pin_arguments=(
       'add:Pin objects to local storage.'
       'ls:List objects pinned to local storage.'
+      'remote:Pin (and unpin) objects to remote pinning service.'
       'rm:Remove pinned objects from local storage.'
       'update:Update a recursive pin'
       'verify:Verify that recursive pins are complete.'
@@ -684,6 +757,7 @@ case $MAIN_SUBCOMMAND in
     _stats_arguments=(
       'bitswap:Show some diagnostic information on the bitswap agent.'
       'bw:Print ipfs bandwidth information.'
+      "dht:Returns statistics about the node's DHT(s)"
       'repo:Get stats for the currently used repo.'
     )
     _ipfs_subcommand _stats_arguments

From eb94df6428808afc74445a3c6433912982e4de75 Mon Sep 17 00:00:00 2001
From: Bryan Lee <doslby@gmail.com>
Date: Wed, 29 Dec 2021 16:42:35 +0800
Subject: [PATCH 372/591] feat(shell-proxy): support SOCKS protocol based on
 URI scheme (#10069)

---
 plugins/shell-proxy/ssh-proxy.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/plugins/shell-proxy/ssh-proxy.py b/plugins/shell-proxy/ssh-proxy.py
index 5efd5fd21..6773a77bc 100755
--- a/plugins/shell-proxy/ssh-proxy.py
+++ b/plugins/shell-proxy/ssh-proxy.py
@@ -2,15 +2,30 @@
 import os
 import subprocess
 import sys
-import urllib.parse
+from urllib.parse import urlparse
 
 proxy = next(os.environ[_] for _ in ("HTTP_PROXY", "HTTPS_PROXY") if _ in os.environ)
+
+parsed = urlparse(proxy)
+
+proxy_protocols = {
+    "http": "connect",
+    "https": "connect",
+    "socks": "5",
+    "socks5": "5",
+    "socks4": "4",
+    "socks4a": "4",
+}
+
+if parsed.scheme not in proxy_protocols:
+    raise TypeError('unsupported proxy protocol: "{}"'.format(parsed.scheme))
+
 argv = [
     "nc",
     "-X",
-    "connect",
+    proxy_protocols[parsed.scheme], # Supported protocols are 4 (SOCKS v4), 5 (SOCKS v5) and connect (HTTP proxy). Default SOCKS v5 is used.
     "-x",
-    urllib.parse.urlparse(proxy).netloc,  # proxy-host:proxy-port
+    parsed.netloc,  # proxy-host:proxy-port
     sys.argv[1],  # host
     sys.argv[2],  # port
 ]

From cffa9a2fda28e9b2913776c3db588f4f28412864 Mon Sep 17 00:00:00 2001
From: Celestino Gomes <tinorj@gmail.com>
Date: Wed, 29 Dec 2021 05:44:08 -0300
Subject: [PATCH 373/591] feat(ruby): add new aliases `rrun` and `rserver`
 (#10218)

---
 plugins/ruby/README.md       | 40 +++++++++++++++++++-----------------
 plugins/ruby/ruby.plugin.zsh |  2 ++
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index 59594ade7..59d839c5c 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -10,22 +10,24 @@ plugins=(... ruby)
 
 ## Aliases
 
-| Alias  | Command                                | Description                                          |
-|--------|----------------------------------------|------------------------------------------------------|
-| rb     | `ruby`                                 | The Ruby command                                     |
-| sgem   | `sudo gem`                             | Run sudo gem on the system ruby, not the active ruby |
-| rfind  | `find . -name "*.rb" \| xargs grep -n` | Find ruby file                                       |
-| gein   | `gem install`                          | Install a gem into the local repository              |
-| geun   | `gem uninstall`                        | Uninstall gems from the local repository             |
-| geli   | `gem list`                             | Display gems installed locally                       |
-| gei    | `gem info`                             | Show information for the given gem                   |
-| geiall | `gem info --all`                       | Display all gem versions                             |
-| geca   | `gem cert --add`                       | Add a trusted certificate                            |
-| gecr   | `gem cert --remove`                    | Remove a trusted certificate                         |
-| gecb   | `gem cert --build`                     | Build private key and self-signed certificate        |
-| geclup | `gem cleanup -n`                       | Do not uninstall gem                                 |
-| gegi   | `gem generate_index`                   | Generate index file for gem server                   |
-| geh    | `gem help`                             | Provide additional help                              |
-| gel    | `gem lock`                             | Generate a lockdown list of gems                     |
-| geo    | `gem open`                             | Open gem source in default editor                    |
-| geoe   | `gem open -e`                          | Open gem sources in preferred editor                 |
+| Alias   | Command                                | Description                                          |
+| ------- | -------------------------------------- | ---------------------------------------------------- |
+| rb      | `ruby`                                 | The Ruby command                                     |
+| sgem    | `sudo gem`                             | Run sudo gem on the system ruby, not the active ruby |
+| rfind   | `find . -name "*.rb" \| xargs grep -n` | Find ruby file                                       |
+| rrun    | `ruby -e`                              | Execute some code: E.g: `rrun "puts 'Hello world!'"` |
+| rserver | `ruby -e httpd . -p 8080`              | Start HTTP Webrick serving local directory/files     |
+| gein    | `gem install`                          | Install a gem into the local repository              |
+| geun    | `gem uninstall`                        | Uninstall gems from the local repository             |
+| geli    | `gem list`                             | Display gems installed locally                       |
+| gei     | `gem info`                             | Show information for the given gem                   |
+| geiall  | `gem info --all`                       | Display all gem versions                             |
+| geca    | `gem cert --add`                       | Add a trusted certificate                            |
+| gecr    | `gem cert --remove`                    | Remove a trusted certificate                         |
+| gecb    | `gem cert --build`                     | Build private key and self-signed certificate        |
+| geclup  | `gem cleanup -n`                       | Do not uninstall gem                                 |
+| gegi    | `gem generate_index`                   | Generate index file for gem server                   |
+| geh     | `gem help`                             | Provide additional help                              |
+| gel     | `gem lock`                             | Generate a lockdown list of gems                     |
+| geo     | `gem open`                             | Open gem source in default editor                    |
+| geoe    | `gem open -e`                          | Open gem sources in preferred editor                 |
diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 890fcb179..408512110 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -22,3 +22,5 @@ alias geh="gem help"
 alias gel="gem lock"
 alias geo="gem open"
 alias geoe="gem open -e"
+alias rrun="ruby -e"
+alias rserver="ruby -e httpd . -p 8080" # requires webrick

From 5b2f99bcb7186bfb11b91a8686d750af95e41eff Mon Sep 17 00:00:00 2001
From: scrouthtv <lennivh24@gmail.com>
Date: Wed, 29 Dec 2021 10:31:29 +0100
Subject: [PATCH 374/591] fix(systemd): remove `sudo` from power-related
 aliases (#9441)

---
 plugins/systemd/README.md          | 13 ++++---
 plugins/systemd/systemd.plugin.zsh | 62 +++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/plugins/systemd/README.md b/plugins/systemd/README.md
index 3fa1d2118..ffa0567a8 100644
--- a/plugins/systemd/README.md
+++ b/plugins/systemd/README.md
@@ -3,7 +3,8 @@
 The systemd plugin provides many useful aliases for systemd.
 
 To use it, add systemd to the plugins array of your zshrc file:
-```
+
+```zsh
 plugins=(... systemd)
 ```
 
@@ -22,7 +23,7 @@ plugins=(... systemd)
 | `sc-show-environment`  | `systemctl show-environment`       | Dump the systemd manager environment block                       |
 | `sc-cat`               | `systemctl cat`                    | Show backing files of one or more units                          |
 | `sc-list-timers`       | `systemctl list-timers`            | List timer units currently in memory                             |
-| **Aliases with sudo**                                                                                                          |
+| **Aliases with sudo**                                                                                                        |||
 | `sc-start`             | `sudo systemctl start`             | Start Unit(s)                                                    |
 | `sc-stop`              | `sudo systemctl stop`              | Stop Unit(s)                                                     |
 | `sc-reload`            | `sudo systemctl reload`            | Reload Unit(s)                                                   |
@@ -59,9 +60,11 @@ to your prompt, drop `$(systemd_prompt_info [unit]...)` into your prompt (more t
 may be specified).
 
 The plugin will add the following to your prompt for each `$unit`.
-```
+
+```text
 <prefix><unit>:<active|notactive><suffix>
 ```
+
 You can control these parts with the following variables:
 
 - `<prefix>`: Set `$ZSH_THEME_SYSTEMD_PROMPT_PREFIX`.
@@ -79,7 +82,7 @@ You can control these parts with the following variables:
 
 For example, if your prompt contains `PROMPT='$(systemd_prompt_info dhcpd httpd)'` and you set the following variables:
 
-```
+```sh
 ZSH_THEME_SYSTEMD_PROMPT_PREFIX="["
 ZSH_THEME_SYSTEMD_PROMPT_SUFFIX="]"
 ZSH_THEME_SYSTEMD_PROMPT_ACTIVE="+"
@@ -89,6 +92,6 @@ ZSH_THEME_SYSTEMD_PROMPT_CAPS=1
 
 If `dhcpd` is running, and `httpd` is not, then your prompt will look like this:
 
-```
+```text
 [DHCPD: +][HTTPD: X]
 ```
diff --git a/plugins/systemd/systemd.plugin.zsh b/plugins/systemd/systemd.plugin.zsh
index c6fd52990..e9ac64382 100644
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
@@ -1,3 +1,4 @@
+# systemctl aliases
 user_commands=(
   cat
   get-default
@@ -14,7 +15,8 @@ user_commands=(
   list-units
   show
   show-environment
-  status)
+  status
+)
 
 sudo_commands=(
   add-requires
@@ -28,8 +30,6 @@ sudo_commands=(
   emergency
   enable
   halt
-  hibernate
-  hybrid-sleep
   import-environment
   isolate
   kexec
@@ -38,34 +38,53 @@ sudo_commands=(
   list-machines
   load
   mask
-  poweroff
   preset
   preset-all
-  reboot
   reenable
   reload
   reload-or-restart
   reset-failed
   rescue
-  restart
   revert
   set-default
   set-environment
   set-property
   start
   stop
-  suspend
   switch-root
   try-reload-or-restart
   try-restart
   unmask
-  unset-environment)
+  unset-environment
+)
 
-for c in $user_commands; do; alias sc-$c="systemctl $c"; done
-for c in $sudo_commands; do; alias sc-$c="sudo systemctl $c"; done
-for c in $user_commands; do; alias scu-$c="systemctl --user $c"; done
-for c in $sudo_commands; do; alias scu-$c="systemctl --user $c"; done
+power_commands=(
+  hibernate
+  hybrid-sleep
+  poweroff
+  reboot
+  restart
+  suspend
+)
 
+for c in $user_commands; do
+  alias "sc-$c"="systemctl $c"
+  alias "scu-$c"="systemctl --user $c"
+done
+
+for c in $sudo_commands; do
+  alias "sc-$c"="sudo systemctl $c"
+  alias "scu-$c"="systemctl --user $c"
+done
+
+for c in $power_commands; do
+  alias "sc-$c"="systemctl $c"
+done
+
+unset c user_commands sudo_commands power_commands
+
+
+# --now commands
 alias sc-enable-now="sc-enable --now"
 alias sc-disable-now="sc-disable --now"
 alias sc-mask-now="sc-mask --now"
@@ -74,17 +93,24 @@ alias scu-enable-now="scu-enable --now"
 alias scu-disable-now="scu-disable --now"
 alias scu-mask-now="scu-mask --now"
 
+
 function systemd_prompt_info {
   local unit
-  for unit in $@; do
+  for unit in "$@"; do
     echo -n "$ZSH_THEME_SYSTEMD_PROMPT_PREFIX"
-    [[ -n "$ZSH_THEME_SYSTEMD_PROMPT_CAPS" ]] && echo -n "${(U)unit}:" || echo -n "$unit:"
-    if systemctl is-active $unit &>/dev/null; then
-        echo -n "$ZSH_THEME_SYSTEMD_PROMPT_ACTIVE" 
+
+    if [[ -n "$ZSH_THEME_SYSTEMD_PROMPT_CAPS" ]]; then
+      echo -n "${(U)unit:gs/%/%%}:"
     else
-        echo -n "$ZSH_THEME_SYSTEMD_PROMPT_NOTACTIVE"
+      echo -n "${unit:gs/%/%%}:"
     fi
+
+    if systemctl is-active "$unit" &>/dev/null; then
+      echo -n "$ZSH_THEME_SYSTEMD_PROMPT_ACTIVE"
+    else
+      echo -n "$ZSH_THEME_SYSTEMD_PROMPT_NOTACTIVE"
+    fi
+
     echo -n "$ZSH_THEME_SYSTEMD_PROMPT_SUFFIX"
   done
 }
-

From 3bb23e8e316452c40eaa0917c8f4be1a2f59ff38 Mon Sep 17 00:00:00 2001
From: Luiz <40257388+luizfelipevbll@users.noreply.github.com>
Date: Wed, 29 Dec 2021 06:32:29 -0300
Subject: [PATCH 375/591] feat(transfer): allow encryption of uploads using GPG
 (#9983)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/transfer/README.md           |  39 +++++---
 plugins/transfer/transfer.plugin.zsh | 140 ++++++++++++++++-----------
 2 files changed, 112 insertions(+), 67 deletions(-)

diff --git a/plugins/transfer/README.md b/plugins/transfer/README.md
index 5fa064445..825c9a283 100644
--- a/plugins/transfer/README.md
+++ b/plugins/transfer/README.md
@@ -2,23 +2,40 @@
 
 [`transfer.sh`](https://transfer.sh) is an easy to use file sharing service from the command line
 
-## Usage
+To use it, add `transfer` to the plugins array in your zshrc file:
 
-Add `transfer` to your plugins array in your zshrc file:
 ```zsh
 plugins=(... transfer)
 ```
 
-Then you can:
+## Usage
 
-- transfer a file:
+- Transfer a file: `transfer file.txt`.
 
-```zsh
-transfer file.txt
-```
+- Transfer a whole directory (it will be automatically compressed): `transfer dir`.
 
-- transfer a whole directory (it will be automatically compressed):
+### Encryption / Decryption
 
-```zsh
-transfer directory/
-```
+- Encrypt and upload a file with symmetric cipher and create ASCII armored output:
+
+  ```zsh
+  transfer file -ca
+  ```
+
+- Encrypt and upload directory with symmetric cipher and gpg output:
+
+  ```zsh
+  transfer directory -ca
+  ```
+
+- Decrypt file:
+
+  ```zsh
+  gpg -d file -ca
+  ```
+
+- Decrypt directory:
+
+  ```zsh
+  gpg -d your_archive.tgz.gpg | tar xz
+  ```
diff --git a/plugins/transfer/transfer.plugin.zsh b/plugins/transfer/transfer.plugin.zsh
index db744b0cd..b34e115ce 100644
--- a/plugins/transfer/transfer.plugin.zsh
+++ b/plugins/transfer/transfer.plugin.zsh
@@ -1,69 +1,97 @@
-# transfer.sh Easy file sharing from the command line
-# transfer Plugin
-# Usage Example :
-# > transfer file.txt
-# > transfer directory/
-
-
-
 # Author:
 #   Remco Verhoef <remco@dutchcoders.io>
 #   https://gist.github.com/nl5887/a511f172d3fb3cd0e42d
 #   Modified to use tar command instead of zip
 #
 
-curl --version 2>&1 > /dev/null
-if [ $? -ne 0 ]; then
-  echo "Could not find curl."
+transfer() {
+  # check arguments
+  if [[ $# -eq 0 ]]; then
+  cat <<EOF
+Error: no arguments specified.
+
+Usage: transfer [file/folder] [options]
+
+Examples:
+  transfer /tmp/test.md
+  transfer /tmp/test.md -ca
+  cat /tmp/test.md | transfer test.md
+  cat /tmp/test.md | transfer test.md -ca
+
+Options:
+  -ca  Encrypt file with symmetric cipher and create ASCII armored output
+EOF
   return 1
-fi
+  fi
 
-transfer() { 
-    # check arguments
-    if [ $# -eq 0 ]; 
-    then 
-        echo "No arguments specified. Usage:\necho transfer /tmp/test.md\ncat /tmp/test.md | transfer test.md"
+  if (( ! $+commands[curl] )); then
+    echo "Error: curl is not installed"
+    return 1
+  fi
+
+  local tmpfile tarfile item basename
+
+  # get temporarily filename, output is written to this file show progress can be showed
+  tmpfile=$(mktemp -t transferXXX)
+
+  # upload stdin or file
+  item="$1"
+
+  # crypt file with symmetric cipher and create ASCII armored output
+  local crypt=0
+  if [[ "$2" = -ca ]]; then
+    crypt=1
+    if (( ! $+commands[gpg] )); then
+      echo "Error: gpg is not installed"
+      return 1
+    fi
+  fi
+
+  if ! tty -s; then
+    # transfer from pipe
+    if (( crypt )); then
+      gpg -aco - | curl -X PUT --progress-bar -T - "https://transfer.sh/$item" >> $tmpfile
+    else
+      curl --progress-bar --upload-file - "https://transfer.sh/$item" >> $tmpfile
+    fi
+  else
+    basename=$(basename "$item" | sed -e 's/[^a-zA-Z0-9._-]/-/g')
+
+    if [[ ! -e $item ]]; then
+      echo "File $item doesn't exist."
+      return 1
+    fi
+
+    if [[ -d $item ]]; then
+      # tar directory and transfer
+      tarfile=$(mktemp -t transferXXX.tar.gz)
+      cd $(dirname $item) || {
+        echo "Error: Could not change to directory $(dirname $item)"
         return 1
+      }
+
+      tar -czf $tarfile $(basename $item)
+      if (( crypt )); then
+        gpg -cao - "$tarfile" | curl --progress-bar -T "-" "https://transfer.sh/$basename.tar.gz.gpg" >> $tmpfile
+      else
+        curl --progress-bar --upload-file "$tarfile" "https://transfer.sh/$basename.tar.gz" >> $tmpfile
+      fi
+      rm -f $tarfile
+    else
+      # transfer file
+      if (( crypt )); then
+        gpg -cao - "$item" | curl --progress-bar -T "-" "https://transfer.sh/$basename.gpg" >> $tmpfile
+      else
+        curl --progress-bar --upload-file "$item" "https://transfer.sh/$basename" >> $tmpfile
+      fi
     fi
+  fi
 
-    # get temporarily filename, output is written to this file show progress can be showed
-    tmpfile=$( mktemp -t transferXXX )
-    
-    # upload stdin or file
-    file=$1
+  # cat output link
+  cat $tmpfile
+  # add newline
+  echo
 
-    if tty -s; 
-    then 
-        basefile=$(basename "$file" | sed -e 's/[^a-zA-Z0-9._-]/-/g') 
-
-        if [ ! -e $file ];
-        then
-            echo "File $file doesn't exists."
-            return 1
-        fi
-        
-        if [ -d $file ];
-        then
-            echo $file
-            # tar directory and transfer
-            tarfile=$( mktemp -t transferXXX.tar.gz )
-            cd $(dirname $file) && tar -czf $tarfile $(basename $file)
-            curl --progress-bar --upload-file "$tarfile" "https://transfer.sh/$basefile.tar.gz" >> $tmpfile
-            rm -f $tarfile
-        else
-            # transfer file
-            curl --progress-bar --upload-file "$file" "https://transfer.sh/$basefile" >> $tmpfile
-        fi
-    else 
-        # transfer pipe
-        curl --progress-bar --upload-file "-" "https://transfer.sh/$file" >> $tmpfile
-    fi
-   
-    # cat output link
-    cat $tmpfile
-    # add newline
-    echo
-
-    # cleanup
-    rm -f $tmpfile
+  # cleanup
+  rm -f $tmpfile
 }

From 65bbd24eec6b64f2f526c974781f08373277be0c Mon Sep 17 00:00:00 2001
From: bretello <bretello@users.noreply.github.com>
Date: Wed, 29 Dec 2021 10:34:57 +0100
Subject: [PATCH 376/591] feat(vi-mode): add `INSERT_MODE_INDICATOR` (#9732)

Co-authored-by: bretello <bretello@distruzione.org>
---
 plugins/vi-mode/README.md          | 15 ++++++++++-----
 plugins/vi-mode/vi-mode.plugin.zsh |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index 46bb6d070..a1d6bc6b0 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -32,16 +32,21 @@ plugins=(... vi-mode)
 - `MODE_INDICATOR`: controls the string displayed when the shell is in normal mode.
   See [Mode indicator](#mode-indicator) for details.
 
-## Mode indicator
+- `INSERT_MODE_INDICATOR`: controls the string displayed when the shell is in insert mode.
+  See [Mode indicator](#mode-indicator) for details.
+
+## Mode indicators
 
 *Normal mode* is indicated with a red `<<<` mark at the right prompt, when it
-hasn't been defined by theme.
+hasn't been defined by theme, *Insert mode* is not displayed by default.
 
-You can change this indicator by setting the `MODE_INDICATOR` variable. This setting
-supports Prompt Expansion sequences. For example:
+You can change these indicators by setting the `MODE_INDICATOR` (*Normal mode*) and
+`INSERT_MODE_INDICATORS` (*Insert mode*) variables.
+This settings support Prompt Expansion sequences. For example:
 
 ```zsh
-MODE_INDICATOR="%F{yellow}+%f"
+MODE_INDICATOR="%F{white}+%f"
+INSERT_MODE_INDICATOR="%F{yellow}+%f"
 ```
 
 You can also use the `vi_mode_prompt_info` function in your prompt, which will display
diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index dd4afdd8b..b40b29961 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -123,7 +123,7 @@ wrap_clipboard_widgets copy vi-yank vi-yank-eol vi-backward-kill-word vi-change-
 wrap_clipboard_widgets paste vi-put-{before,after}
 unfunction wrap_clipboard_widgets
 
-# if mode indicator wasn't setup by theme, define default
+# if mode indicator wasn't setup by theme, define default, we'll leave INSERT_MODE_INDICATOR empty by default
 if [[ -z "$MODE_INDICATOR" ]]; then
   MODE_INDICATOR='%B%F{red}<%b<<%f'
 fi
@@ -136,7 +136,7 @@ function vi_mode_prompt_info() {
   # set RPS1/RPROMPT to something else in their custom config.
   : "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:=true}"
 
-  echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
+  echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/$INSERT_MODE_INDICATOR}"
 }
 
 # define right prompt, if it wasn't defined by a theme

From 8d58994d765de350f1dc66132eaab0358e10a4ab Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <matttbe@gmail.com>
Date: Wed, 29 Dec 2021 10:38:00 +0100
Subject: [PATCH 377/591] feat(zbell): add option not to use notify-send
 (#10082)

---
 plugins/zbell/README.md        |  3 +++
 plugins/zbell/zbell.plugin.zsh | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/plugins/zbell/README.md b/plugins/zbell/README.md
index 1c1c13546..eb87699c4 100644
--- a/plugins/zbell/README.md
+++ b/plugins/zbell/README.md
@@ -24,6 +24,9 @@ These settings need to be set in your zshrc file, before Oh My Zsh is sourced.
   zbell_ignore=($EDITOR $PAGER)
   ```
 
+- `zbell_use_notify_send`: If set to `true`, `notify-send` tool is used -- if
+  available -- to display a popup on the screen. Default: `true` (enabled).
+
 ## Author
 
 Adapted from an original version by [Jean-Philippe Ouellet](https://github.com/jpouellet).
diff --git a/plugins/zbell/zbell.plugin.zsh b/plugins/zbell/zbell.plugin.zsh
index 6d0416502..8e374029b 100644
--- a/plugins/zbell/zbell.plugin.zsh
+++ b/plugins/zbell/zbell.plugin.zsh
@@ -29,18 +29,31 @@ autoload -Uz regexp-replace || return
 # initialize zbell_ignore if not set
 (( ${+zbell_ignore} )) || zbell_ignore=($EDITOR $PAGER)
 
+# initialize zbell_use_notify_send if not set
+(( ${+zbell_use_notify_send} )) || zbell_use_notify_send=true
+
 # initialize it because otherwise we compare a date and an empty string
 # the first time we see the prompt. it's fine to have lastcmd empty on the
 # initial run because it evaluates to an empty string, and splitting an
 # empty string just results in an empty array.
 zbell_timestamp=$EPOCHSECONDS
 
+# UI notification function
+# $1: command
+# $2: duration in seconds
+zbell_ui_notify() {
+	[[ $zbell_use_notify_send != "true" ]] && return
+
+	if type notify-send > /dev/null; then
+		notify-send -i terminal "Command completed in ${2}s:" $1
+	fi
+}
+
 # default notification function
 # $1: command
 # $2: duration in seconds
 zbell_notify() {
-	type notify-send > /dev/null && \
-		notify-send -i terminal "Command completed in ${2}s:" $1
+	zbell_ui_notify "${@}"
 	print -n "\a"
 }
 

From fcd7da3aec8315178991aa25d57dacfc6c331ac6 Mon Sep 17 00:00:00 2001
From: Majid Hadavand <hadavand@users.noreply.github.com>
Date: Wed, 29 Dec 2021 13:15:02 +0330
Subject: [PATCH 378/591] feat(common-aliases): add single-column and recursive
 `ls` aliases (#10096)

---
 plugins/common-aliases/README.md              | 100 +++++++++---------
 .../common-aliases/common-aliases.plugin.zsh  |   2 +
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/plugins/common-aliases/README.md b/plugins/common-aliases/README.md
index b6f34cb54..0354c7a3f 100644
--- a/plugins/common-aliases/README.md
+++ b/plugins/common-aliases/README.md
@@ -12,51 +12,53 @@ plugins=(... common-aliases)
 
 ### ls command
 
-| Alias | Command       | Description                                                                    |
-|-------|---------------|--------------------------------------------------------------------------------|
-| l     | `ls -lFh`     | List files as a long list, show size, type, human-readable                     |
-| la    | `ls -lAFh`    | List almost all files as a long list show size, type, human-readable           |
-| lr    | `ls -tRFh`    | List files recursively sorted by date, show type, human-readable               |
-| lt    | `ls -ltFh`    | List files as a long list sorted by date, show type, human-readable            |
-| ll    | `ls -l`       | List files as a long list                                                      |
-| ldot  | `ls -ld .*`   | List dot files as a long list                                                  |
-| lS    | `ls -1FSsh`   | List files showing only size and name sorted by size                           |
-| lart  | `ls -1Fcart`  | List all files sorted in reverse of create/modification time (oldest first)    |
-| lrt   | `ls -1Fcrt`   | List files sorted in reverse of create/modification time(oldest first)         |
+| Alias | Command      | Description                                                                 |
+| ----- | ------------ | --------------------------------------------------------------------------- |
+| l     | `ls -lFh`    | List files as a long list, show size, type, human-readable                  |
+| la    | `ls -lAFh`   | List almost all files as a long list show size, type, human-readable        |
+| lr    | `ls -tRFh`   | List files recursively sorted by date, show type, human-readable            |
+| lt    | `ls -ltFh`   | List files as a long list sorted by date, show type, human-readable         |
+| ll    | `ls -l`      | List files as a long list                                                   |
+| ldot  | `ls -ld .*`  | List dot files as a long list                                               |
+| lS    | `ls -1FSsh`  | List files showing only size and name sorted by size                        |
+| lart  | `ls -1Fcart` | List all files sorted in reverse of create/modification time (oldest first) |
+| lrt   | `ls -1Fcrt`  | List files sorted in reverse of create/modification time(oldest first)      |
+| lsr   | `ls -lARFh`  | List all files and directories recursively                                  |
+| lsn   | `ls -1`      | List files and directories in a single column                               |
 
 ### File handling
 
-| Alias | Command               | Description                                                                        |
-|-------|-----------------------|------------------------------------------------------------------------------------|
-| rm    | `rm -i`               | Remove a file                                                                      |
-| cp    | `cp -i`               | Copy a file                                                                        |
-| mv    | `mv -i`               | Move a file                                                                        |
-| zshrc | `${=EDITOR} ~/.zshrc` | Quickly access the ~/.zshrc file                                                   |
-| dud   | `du -d 1 -h`          | Display the size of files at depth 1 in current location in human-readable form    |
-| duf   | `du -sh`              | Display the size of files in current location in human-readable form               |
-| t     | `tail -f`             | Shorthand for tail which outputs the last part of a file                           |
+| Alias | Command               | Description                                                                     |
+| ----- | --------------------- | ------------------------------------------------------------------------------- |
+| rm    | `rm -i`               | Remove a file                                                                   |
+| cp    | `cp -i`               | Copy a file                                                                     |
+| mv    | `mv -i`               | Move a file                                                                     |
+| zshrc | `${=EDITOR} ~/.zshrc` | Quickly access the ~/.zshrc file                                                |
+| dud   | `du -d 1 -h`          | Display the size of files at depth 1 in current location in human-readable form |
+| duf   | `du -sh`              | Display the size of files in current location in human-readable form            |
+| t     | `tail -f`             | Shorthand for tail which outputs the last part of a file                        |
 
 ### find and grep
 
-| Alias | Command                                             | Description                             |
-|-------|-----------------------------------------------------|-----------------------------------------|
-| fd\*  | `find . -type d -name`                              | Find a directory with the given name    |
-| ff    | `find . -type f -name`                              | Find a file with the given name         |
-| grep  | `grep --color`                                      | Searches for a query string             |
-| sgrep | `grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS}`  | Useful for searching within files       |
+| Alias | Command                                            | Description                          |
+| ----- | -------------------------------------------------- | ------------------------------------ |
+| fd\*  | `find . -type d -name`                             | Find a directory with the given name |
+| ff    | `find . -type f -name`                             | Find a file with the given name      |
+| grep  | `grep --color`                                     | Searches for a query string          |
+| sgrep | `grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS}` | Useful for searching within files    |
 
 \* Only if the [`fd`](https://github.com/sharkdp/fd) command isn't installed.
 
 ### Other Aliases
 
-| Alias     | Command             | Description                                                 |
-|-----------|---------------------|-------------------------------------------------------------|
-| h         | `history`           | Lists all recently used commands                            |
-| hgrep     | `fc -El 0 \| grep`  | Searches for a word in the list of previously used commands |
-| help      | `man`               | Opens up the man page for a command                         |
-| p         | `ps -f`             | Displays currently executing processes                      |
-| sortnr    | `sort -n -r`        | Used to sort the lines of a text file                       |
-| unexport  | `unset`             | Used to unset an environment variable                       |
+| Alias    | Command            | Description                                                 |
+| -------- | ------------------ | ----------------------------------------------------------- |
+| h        | `history`          | Lists all recently used commands                            |
+| hgrep    | `fc -El 0 \| grep` | Searches for a word in the list of previously used commands |
+| help     | `man`              | Opens up the man page for a command                         |
+| p        | `ps -f`            | Displays currently executing processes                      |
+| sortnr   | `sort -n -r`       | Used to sort the lines of a text file                       |
+| unexport | `unset`            | Used to unset an environment variable                       |
 
 ## Global aliases
 
@@ -77,7 +79,7 @@ $ find . -type f 2>/dev/null
 ```
 
 | Alias | Command                     | Description                                                 |
-|-------|-----------------------------|-------------------------------------------------------------| 
+| ----- | --------------------------- | ----------------------------------------------------------- |
 | H     | `\| head`                   | Pipes output to head which outputs the first part of a file |
 | T     | `\| tail`                   | Pipes output to tail which outputs the last part of a file  |
 | G     | `\| grep`                   | Pipes output to grep to search for some word                |
@@ -97,23 +99,23 @@ that file will be open with `acroread`.
 
 ### Reading Docs
 
-| Alias | Command     | Description                         |
-|-------|-------------|-------------------------------------|
-| pdf   | `acroread`  | Opens up a document using acroread  |
-| ps    | `gv`        | Opens up a .ps file using gv        |
-| dvi   | `xdvi`      | Opens up a .dvi file using xdvi     | 
-| chm   | `xchm`      | Opens up a .chm file using xchm     |
-| djvu  | `djview`    | Opens up a .djvu file using djview  |
+| Alias | Command    | Description                        |
+| ----- | ---------- | ---------------------------------- |
+| pdf   | `acroread` | Opens up a document using acroread |
+| ps    | `gv`       | Opens up a .ps file using gv       |
+| dvi   | `xdvi`     | Opens up a .dvi file using xdvi    |
+| chm   | `xchm`     | Opens up a .chm file using xchm    |
+| djvu  | `djview`   | Opens up a .djvu file using djview |
 
 ### Listing files inside a packed file
 
-| Alias   | Command     | Description                         |
-|---------|-------------|-------------------------------------|
-| zip     | `unzip -l`  | Lists files inside a .zip file      |
-| rar     | `unrar l`   | Lists files inside a .rar file      |
-| tar     | `tar tf`    | Lists files inside a .tar file      |
-| tar.gz  | `echo`      | Lists files inside a .tar.gz file   |
-| ace     | `unace l`   | Lists files inside a .ace file      |
+| Alias  | Command    | Description                       |
+| ------ | ---------- | --------------------------------- |
+| zip    | `unzip -l` | Lists files inside a .zip file    |
+| rar    | `unrar l`  | Lists files inside a .rar file    |
+| tar    | `tar tf`   | Lists files inside a .tar file    |
+| tar.gz | `echo`     | Lists files inside a .tar.gz file |
+| ace    | `unace l`  | Lists files inside a .ace file    |
 
 ### Some other features
 
diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 4e5ff848f..8b58b6310 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -12,6 +12,8 @@ alias ldot='ls -ld .*'
 alias lS='ls -1FSsh'
 alias lart='ls -1Fcart'
 alias lrt='ls -1Fcrt'
+alias lsr='ls -lARFh' #Recursive list of files and directories
+alias lsn='ls -1'     #A column contains name of files and directories
 
 alias zshrc='${=EDITOR} ${ZDOTDIR:-$HOME}/.zshrc' # Quick access to the .zshrc file
 

From cbd8481fe37dde252ee817a8157ed72b7bcad655 Mon Sep 17 00:00:00 2001
From: mikey dubs <mike@herebox.org>
Date: Fri, 9 Jul 2021 01:12:56 -0700
Subject: [PATCH 379/591] feat(composer): add `cs` alias for `composer show`
 (#10034)

Closes #10034
---
 plugins/composer/README.md           | 1 +
 plugins/composer/composer.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/composer/README.md b/plugins/composer/README.md
index 00ada1e13..8c79c4109 100644
--- a/plugins/composer/README.md
+++ b/plugins/composer/README.md
@@ -29,5 +29,6 @@ Original author: Daniel Gomes <me@danielcsgomes.com>
 | `cod`  | `composer outdated --direct` | Shows a list of installed packages with available updates which are direct dependencies |
 | `cr`   | `composer require`           | Adds new packages to `composer.json`                                                    |
 | `crm`  | `composer remove`            | Removes packages from `composer.json`                                                   |
+| `cs`   | `composer show`              | Lists available packages, with optional filtering                                       |
 | `csu`  | `composer self-update`       | Updates composer to the latest version                                                  |
 | `cu`   | `composer update`            | Updates composer dependencies and `composer.lock` file                                  |
diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index f2076c220..a3883a1f2 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -45,6 +45,7 @@ alias co='composer outdated'
 alias cod='composer outdated --direct'
 alias cr='composer require'
 alias crm='composer remove'
+alias cs='composer show'
 alias csu='composer self-update'
 alias cu='composer update'
 

From d384ccf31dca8b0a768c463087f156b7302c77c5 Mon Sep 17 00:00:00 2001
From: Raphael Stolt <raphael.stolt@gmail.com>
Date: Tue, 25 Apr 2017 19:52:55 +0200
Subject: [PATCH 380/591] feat(composer): add `cuh` alias for updating global
 packages (#6048)

Closes #6048
---
 plugins/composer/README.md           | 37 ++++++++++++++--------------
 plugins/composer/composer.plugin.zsh |  1 +
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/plugins/composer/README.md b/plugins/composer/README.md
index 8c79c4109..ad6ed24bc 100644
--- a/plugins/composer/README.md
+++ b/plugins/composer/README.md
@@ -14,21 +14,22 @@ Original author: Daniel Gomes <me@danielcsgomes.com>
 
 ## Aliases
 
-| Alias  | Command                      | Description                                                                             |
-| ------ | ---------------------------- | --------------------------------------------------------------------------------------- |
-| `c`    | `composer`                   | Starts composer                                                                         |
-| `ccp`  | `composer create-project`    | Create new project from an existing package                                             |
-| `cdo`  | `composer dump-autoload -o`  | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production)  |
-| `cdu`  | `composer dump-autoload`     | Updates the autoloader                                                                  |
-| `cget` | `curl -s <installer> \| php` | Installs composer in the current directory                                              |
-| `cgr`  | `composer global require`    | Allows require command to run on COMPOSER_HOME directory                                |
-| `cgrm` | `composer global remove`     | Allows remove command to run on COMPOSER_HOME directory                                 |
-| `cgu`  | `composer global update`     | Allows update command to run on COMPOSER_HOME directory                                 |
-| `ci`   | `composer install`           | Resolves and installs dependencies from `composer.json`                                 |
-| `co`   | `composer outdated`          | Shows a list of installed packages with available updates                               |
-| `cod`  | `composer outdated --direct` | Shows a list of installed packages with available updates which are direct dependencies |
-| `cr`   | `composer require`           | Adds new packages to `composer.json`                                                    |
-| `crm`  | `composer remove`            | Removes packages from `composer.json`                                                   |
-| `cs`   | `composer show`              | Lists available packages, with optional filtering                                       |
-| `csu`  | `composer self-update`       | Updates composer to the latest version                                                  |
-| `cu`   | `composer update`            | Updates composer dependencies and `composer.lock` file                                  |
+| Alias  | Command                            | Description                                                                             |
+| ------ | ---------------------------------- | --------------------------------------------------------------------------------------- |
+| `c`    | `composer`                         | Starts composer                                                                         |
+| `ccp`  | `composer create-project`          | Create new project from an existing package                                             |
+| `cdo`  | `composer dump-autoload -o`        | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production)  |
+| `cdu`  | `composer dump-autoload`           | Updates the autoloader                                                                  |
+| `cget` | `curl -s <installer> \| php`       | Installs composer in the current directory                                              |
+| `cgr`  | `composer global require`          | Allows require command to run on COMPOSER_HOME directory                                |
+| `cgrm` | `composer global remove`           | Allows remove command to run on COMPOSER_HOME directory                                 |
+| `cgu`  | `composer global update`           | Allows update command to run on COMPOSER_HOME directory                                 |
+| `ci`   | `composer install`                 | Resolves and installs dependencies from `composer.json`                                 |
+| `co`   | `composer outdated`                | Shows a list of installed packages with available updates                               |
+| `cod`  | `composer outdated --direct`       | Shows a list of installed packages with available updates which are direct dependencies |
+| `cr`   | `composer require`                 | Adds new packages to `composer.json`                                                    |
+| `crm`  | `composer remove`                  | Removes packages from `composer.json`                                                   |
+| `cs`   | `composer show`                    | Lists available packages, with optional filtering                                       |
+| `csu`  | `composer self-update`             | Updates composer to the latest version                                                  |
+| `cu`   | `composer update`                  | Updates composer dependencies and `composer.lock` file                                  |
+| `cuh`  | `composer update -d <config-home>` | Updates globally installed packages                                                     |
diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index a3883a1f2..dd0b18e27 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -48,6 +48,7 @@ alias crm='composer remove'
 alias cs='composer show'
 alias csu='composer self-update'
 alias cu='composer update'
+alias cuh='composer update --working-dir=$(composer config -g home)'
 
 
 ## If Composer not found, try to add known directories to $PATH

From b38da62b23e08271fad9fc25a0bb47e89215a431 Mon Sep 17 00:00:00 2001
From: Shahed Hosseini <sajjadhusseini92@gmail.com>
Date: Wed, 29 Dec 2021 13:28:47 +0330
Subject: [PATCH 381/591] feat(debian): add `aar` alias for autoremove (#7869)

---
 plugins/debian/debian.plugin.zsh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index bde97cd30..1d2022436 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -52,9 +52,11 @@ if [[ $use_sudo -eq 1 ]]; then
     alias ai="sudo $apt_pref install"
     # Install all packages given on the command line while using only the first word of each line:
     # acs ... | ail
+
     alias ail="sed -e 's/  */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | xargs sudo $apt_pref install"
     alias ap="sudo $apt_pref purge"
     alias ar="sudo $apt_pref remove"
+    alias aar="sudo $apt_pref autoremove"
 
     # apt-get only
     alias ads="sudo apt-get dselect-upgrade"
@@ -98,7 +100,11 @@ else
         print "$cmd"
         eval "$cmd"
     }
-
+    aar() {
+        cmd="su -lc '$apt_pref -P autoremove $@' root"
+        print "$cmd"
+        eval "$cmd"
+    }
     # Install all .deb files in the current directory
     # Assumes glob_subst is off
     alias dia='su -lc "dpkg -i ./*.deb" root'
@@ -139,6 +145,7 @@ apt_pref_compdef ai  "install"
 apt_pref_compdef ail "install"
 apt_pref_compdef ap  "purge"
 apt_pref_compdef ar  "remove"
+apt_pref_compdef aar  "autoremove"
 apt_pref_compdef ads "dselect-upgrade"
 
 # Misc. #####################################################################

From 37b278cd034f8e995a274db92aab7f4a33c0e1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 11:08:02 +0100
Subject: [PATCH 382/591] chore(debian): document previous alias

---
 plugins/debian/README.md         | 2 ++
 plugins/debian/debian.plugin.zsh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/debian/README.md b/plugins/debian/README.md
index 922d68cb3..ac2eec84d 100644
--- a/plugins/debian/README.md
+++ b/plugins/debian/README.md
@@ -44,6 +44,7 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 | `ail`    | `sed -e 's/  */ /g' -e 's/ *//' \| cut -s -d ' ' -f 1 \| xargs sudo $apt_pref install` | Install all packages given on the command line while using only the first word of each line |
 | `ap`     | `sudo $apt_pref purge`                                                                 | Removes packages along with configuration files                                             |
 | `ar`     | `sudo $apt_pref remove`                                                                | Removes packages, keeps the configuration files                                             |
+| `aar`    | `sudo $apt_pref autoremove`                                                            | Removes packages installed automatically that are no longer needed                          |
 | `ads`    | `sudo apt-get dselect-upgrade`                                                         | Installs packages from list and removes all not in the list                                 |
 | `dia`    | `sudo dpkg -i ./*.deb`                                                                 | Install all .deb files in the current directory                                             |
 | `di`     | `sudo dpkg -i`                                                                         | Install all .deb files in the current directory                                             |
@@ -54,6 +55,7 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 | Alias | Command                                                   |
 | ----- | --------------------------------------------------------- |
 | `aac` | `su -ls "$apt_pref autoclean" root`                       |
+| `aar` | `su -ls "$apt_pref autoremove" root`                      |
 | `ac`  | `su -ls "$apt_pref clean" root`                           |
 | `ad`  | `su -lc "$apt_pref update" root`                          |
 | `adg` | `su -lc "$apt_pref update && aptitude $apt_upgr" root`    |
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 1d2022436..5fa1270b8 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -100,7 +100,7 @@ else
         print "$cmd"
         eval "$cmd"
     }
-    aar() {
+    function aar() {
         cmd="su -lc '$apt_pref -P autoremove $@' root"
         print "$cmd"
         eval "$cmd"

From 7e4273f44075ff4ec81778a16bf578e05cc8ca4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Daase?= <bjoern.daase@student.hpi.de>
Date: Fri, 14 Jun 2019 20:50:16 +0200
Subject: [PATCH 383/591] feat(debian): add `alu` alias for list and upgrade
 packages (#7928)

Closes #7928
---
 plugins/debian/README.md         | 11 ++++++-----
 plugins/debian/debian.plugin.zsh |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/debian/README.md b/plugins/debian/README.md
index ac2eec84d..2ce206cfb 100644
--- a/plugins/debian/README.md
+++ b/plugins/debian/README.md
@@ -33,21 +33,22 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 | Alias    | Command                                                                                | Description                                                                                 |
 | -------- | -------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
 | `aac`    | `sudo $apt_pref autoclean`                                                             | Clears out the local repository of retrieved package files                                  |
+| `aar`    | `sudo $apt_pref autoremove`                                                            | Removes packages installed automatically that are no longer needed                          |
 | `abd`    | `sudo $apt_pref build-dep`                                                             | Installs all dependencies for building packages                                             |
 | `ac`     | `sudo $apt_pref clean`                                                                 | Clears out the local repository of retrieved package files except lock files                |
 | `ad`     | `sudo $apt_pref update`                                                                | Updates the package lists for upgrades for packages                                         |
 | `adg`    | `sudo $apt_pref update && sudo $apt_pref $apt_upgr`                                    | Update and upgrade packages                                                                 |
+| `ads`    | `sudo apt-get dselect-upgrade`                                                         | Installs packages from list and removes all not in the list                                 |
 | `adu`    | `sudo $apt_pref update && sudo $apt_pref dist-upgrade`                                 | Smart upgrade that handles dependencies                                                     |
 | `afu`    | `sudo apt-file update`                                                                 | Update the files in packages                                                                |
-| `au`     | `sudo $apt_pref $apt_upgr`                                                             | Install package upgrades                                                                    |
 | `ai`     | `sudo $apt_pref install`                                                               | Command-line tool to install package                                                        |
 | `ail`    | `sed -e 's/  */ /g' -e 's/ *//' \| cut -s -d ' ' -f 1 \| xargs sudo $apt_pref install` | Install all packages given on the command line while using only the first word of each line |
+| `alu`    | `sudo apt update && apt list -u && sudo apt upgrade`                                   | Update, list and upgrade packages                                                           |
 | `ap`     | `sudo $apt_pref purge`                                                                 | Removes packages along with configuration files                                             |
 | `ar`     | `sudo $apt_pref remove`                                                                | Removes packages, keeps the configuration files                                             |
-| `aar`    | `sudo $apt_pref autoremove`                                                            | Removes packages installed automatically that are no longer needed                          |
-| `ads`    | `sudo apt-get dselect-upgrade`                                                         | Installs packages from list and removes all not in the list                                 |
-| `dia`    | `sudo dpkg -i ./*.deb`                                                                 | Install all .deb files in the current directory                                             |
+| `au`     | `sudo $apt_pref $apt_upgr`                                                             | Install package upgrades                                                                    |
 | `di`     | `sudo dpkg -i`                                                                         | Install all .deb files in the current directory                                             |
+| `dia`    | `sudo dpkg -i ./*.deb`                                                                 | Install all .deb files in the current directory                                             |
 | `kclean` | `sudo aptitude remove -P ?and(~i~nlinux-(ima\|hea) ?not(~n$(uname -r)))`               | Remove ALL kernel images and headers EXCEPT the one in use                                  |
 
 ## Aliases - Commands using `su`
@@ -77,8 +78,8 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 | ------------------- | --------------------------------------------------------------- |
 | `apt-copy`          | Create a simple script that can be used to 'duplicate' a system |
 | `apt-history`       | Displays apt history for a command                              |
-| `kerndeb`           | Builds kernel packages                                          |
 | `apt-list-packages` | List packages by size                                           |
+| `kerndeb`           | Builds kernel packages                                          |
 
 ## Authors
 
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 5fa1270b8..e4db8fe33 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -61,6 +61,9 @@ if [[ $use_sudo -eq 1 ]]; then
     # apt-get only
     alias ads="sudo apt-get dselect-upgrade"
 
+    # apt only
+    alias alu="sudo apt update && apt list -u && sudo apt upgrade"
+
     # Install all .deb files in the current directory.
     # Warning: you will need to put the glob in single quotes if you use:
     # glob_subst

From bc7bc74469ee5e412ae54c45ebaa5e07295323c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 11:51:05 +0100
Subject: [PATCH 384/591] fix(git-prompt): fix clean prompt when stash is not
 empty (#9978)

Fixes #9978
---
 plugins/git-prompt/README.md    | 8 ++++----
 plugins/git-prompt/gitstatus.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/git-prompt/README.md b/plugins/git-prompt/README.md
index c6610fa94..83d365c84 100644
--- a/plugins/git-prompt/README.md
+++ b/plugins/git-prompt/README.md
@@ -11,7 +11,8 @@ plugins=(... git-prompt)
 
 See the [original repository](https://github.com/olivierverdier/zsh-git-prompt).
 
-## Prerequisites
+## Requirements
+
 This plugin uses `python`, so your host needs to have it installed
 
 ## Examples
@@ -30,7 +31,7 @@ The prompt may look like the following:
 
 By default, the general appearance of the prompt is:
 
-```
+```text
 (<branch><branch tracking>|<local status>)
 ```
 
@@ -58,9 +59,8 @@ The symbols are as follows:
 ## Customisation
 
 - Set the variable `ZSH_THEME_GIT_PROMPT_CACHE` to any value in order to enable caching.
-- You may also change a number of variables (whose name start with `ZSH_THEME_GIT_PROMPT_`) 
+- You may also change a number of variables (whose name start with `ZSH_THEME_GIT_PROMPT_`)
   to change the appearance of the prompt. Take a look at the bottom of the [plugin file](git-prompt.plugin.zsh)`
   to see what variables are available.
 
-
 **Enjoy!**
diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 786274a71..4dea8000f 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -81,7 +81,7 @@ for st in status:
             staged.append(st)
 
 stashed = get_stash()
-if not changed and not staged and not conflicts and not untracked and not stashed:
+if not changed and not staged and not conflicts and not untracked:
     clean = 1
 else:
     clean = 0

From eec34b32fa586559af463b0d61256a7f5d257bea Mon Sep 17 00:00:00 2001
From: Oluwafemi Sule <oluwafemisule@outlook.com>
Date: Wed, 29 Dec 2021 12:26:17 +0100
Subject: [PATCH 385/591] fix(pip): use `pip3` in `pip3 uninstall` completion
 (#10271)

---
 plugins/pip/_pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index a5adead4a..e03be6afe 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -13,7 +13,7 @@ _pip_all() {
 }
 
 _pip_installed() {
-  installed_pkgs=(`pip freeze | cut -d '=' -f 1`)
+  installed_pkgs=($($service freeze | cut -d '=' -f 1))
 }
 
 local -a _1st_arguments

From 2acb3071cade6395c1dbcee31b6b8d198ebed66a Mon Sep 17 00:00:00 2001
From: WH-2099 <wh2099@outlook.com>
Date: Wed, 29 Dec 2021 19:55:51 +0800
Subject: [PATCH 386/591] fix(pip): don't overwrite `requirements.txt` in
 internal commands (#10061)

---
 plugins/pip/pip.plugin.zsh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index a58f5704a..7eb2d2a35 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -91,11 +91,21 @@ fi
 # Create requirements file
 alias pipreq="pip freeze > requirements.txt"
 
-# Update all installed packages
-alias pipupall="pipreq && sed -i 's/==/>=/g' requirements.txt && pip install -r requirements.txt --upgrade && rm -rf requirements.txt"
-
 # Install packages from requirements file
 alias pipir="pip install -r requirements.txt"
 
+# Update all installed packages
+function pipupall {
+  # non-GNU xargs does not support nor need `--no-run-if-empty`
+  local xargs="xargs --no-run-if-empty"
+  xargs --version 2>/dev/null | grep -q GNU || xargs="xargs"
+  pip list --outdated --format freeze | cut -d= -f1 | ${=xargs} pip install --upgrade
+}
+
 # Uninstalled all installed packages
-alias pipunall="pipreq && pip uninstall -r requirements.txt -y && rm -rf requirements.txt"
+function pipunall {
+  # non-GNU xargs does not support nor need `--no-run-if-empty`
+  local xargs="xargs --no-run-if-empty"
+  xargs --version 2>/dev/null | grep -q GNU || xargs="xargs"
+  pip list --format freeze | cut -d= -f1 | ${=xargs} pip uninstall
+}

From ce9104c4f3d9ea424346d711f0653cd9e5d81303 Mon Sep 17 00:00:00 2001
From: Alex Matheson <Alex.kmatheson@gmail.com>
Date: Wed, 29 Dec 2021 07:12:52 -0600
Subject: [PATCH 387/591] feat(npm): toggle `npm install` / `npm uninstall` by
 pressing F2 twice (#9717)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/npm/README.md      | 17 ++++++++++++++++
 plugins/npm/npm.plugin.zsh | 40 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/plugins/npm/README.md b/plugins/npm/README.md
index e970c3c7a..8eafc6d61 100644
--- a/plugins/npm/README.md
+++ b/plugins/npm/README.md
@@ -29,3 +29,20 @@ plugins=(... npm)
 | `npmI`  | `npm init`                   | Run npm init                                                    |
 | `npmi`  | `npm info`                   | Run npm info                                                    |
 | `npmSe` | `npm search`                 | Run npm search                                                  |
+
+## `npm install` / `npm uninstall` toggle
+
+The plugin adds a function that toggles between `npm install` and `npm uninstall` in
+the current command or the last command, for up to 2 previous commands. **The default
+key binding is pressing <kbd>F2</kbd> twice**.
+
+You can change this key binding by adding the following line to your zshrc file:
+
+```zsh
+bindkey -M emacs '<seq>' npm_toggle_install_uninstall
+bindkey -M vicmd '<seq>' npm_toggle_install_uninstall
+bindkey -M viins '<seq>' npm_toggle_install_uninstall
+```
+
+where `<seq>` is a key sequence obtained by running `cat` and pressing the keyboard
+sequence you want.
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index f7d6d3939..6c768d614 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -69,3 +69,43 @@ alias npmi="npm info"
 
 # Run npm search
 alias npmSe="npm search"
+
+npm_toggle_install_uninstall() {
+  # Look up to the previous 2 history commands
+  local line
+  for line in "$BUFFER" \
+    "${history[$((HISTCMD-1))]}" \
+    "${history[$((HISTCMD-2))]}"
+  do
+    case "$line" in
+      "npm uninstall"*)
+        BUFFER="${line/npm uninstall/npm install}"
+        (( CURSOR = CURSOR + 2 )) # uninstall -> install: 2 chars removed
+        ;;
+      "npm install"*)
+        BUFFER="${line/npm install/npm uninstall}"
+        (( CURSOR = CURSOR + 2 )) # install -> uninstall: 2 chars added
+        ;;
+      "npm un "*)
+        BUFFER="${line/npm un/npm install}"
+        (( CURSOR = CURSOR + 5 )) # un -> install: 5 chars added
+        ;;
+      "npm i "*)
+        BUFFER="${line/npm i/npm uninstall}"
+        (( CURSOR = CURSOR + 8 )) # i -> uninstall: 8 chars added
+        ;;
+      *) continue ;;
+    esac
+    return 0
+  done
+
+  BUFFER="npm install"
+  CURSOR=${#BUFFER}
+}
+
+zle -N npm_toggle_install_uninstall
+
+# Defined shortcut keys: [F2] [F2]
+bindkey -M emacs '^[OQ^[OQ' npm_toggle_install_uninstall
+bindkey -M vicmd '^[OQ^[OQ' npm_toggle_install_uninstall
+bindkey -M viins '^[OQ^[OQ' npm_toggle_install_uninstall

From c155531402a2ca19490aa81818a0f4f58f73cabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 15:07:52 +0100
Subject: [PATCH 388/591] chore(bazel): update completion to f146202c

---
 plugins/bazel/_bazel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bazel/_bazel b/plugins/bazel/_bazel
index 827ce545c..c34c572b0 100644
--- a/plugins/bazel/_bazel
+++ b/plugins/bazel/_bazel
@@ -164,7 +164,7 @@ _get_build_targets() {
       ;;
   esac
   completions=(${$(_bazel_b query "kind(\"${rule_re}\", ${pkg}:all)" 2>/dev/null)##*:})
-  if ( (( ${#completions} > 0 )) && [[ $target_type != run ]] ); then
+  if ( (( ${#completions} > 0 )) && [[ $target_type != bin ]] ); then
     completions+=(all)
   fi
   echo ${completions[*]}

From 4ef188cebf054896b47aa91181dacc2c674b5063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 15:19:59 +0100
Subject: [PATCH 389/591] perf(yarn): skip `yarn` call if default global bin
 directory exists (#10290)

Fixes #10290
---
 plugins/yarn/yarn.plugin.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index a4f595c61..9ba24420a 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -1,5 +1,8 @@
-# Add yarn bin directory to $PATH if it exists and not in $PATH already
-bindir=$(yarn global bin 2>/dev/null) \
+# Skip yarn call if default global bin dir exists
+[[ -d "$HOME/.yarn/bin" ]] && bindir="$HOME/.yarn/bin" || bindir="$(yarn global bin 2>/dev/null)"
+
+# Add yarn bin directory to $PATH if it exists and not already in $PATH
+[[ $? -eq 0 ]] \
   && [[ -d "$bindir" ]] \
   && (( ! ${path[(Ie)$bindir]} )) \
   && path+=("$bindir")

From 3e2676f7dcafbec3c8e481e6ebfb2454bd3c232c Mon Sep 17 00:00:00 2001
From: Celestino Gomes <tinorj@gmail.com>
Date: Fri, 24 Sep 2021 17:37:09 -0300
Subject: [PATCH 390/591] feat(python): add `pyserver` alias to start an HTTP
 server (#10217)

Closes #10217
---
 plugins/python/README.md         | 20 +++++++++++---------
 plugins/python/python.plugin.zsh |  3 +++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/plugins/python/README.md b/plugins/python/README.md
index b95ffe679..eeaa1148a 100644
--- a/plugins/python/README.md
+++ b/plugins/python/README.md
@@ -3,17 +3,19 @@
 The plugin adds several aliases for useful [python](https://www.python.org/) commands.
 
 To use it, add `python` to the plugins array of your zshrc file:
-```
+
+```zsh
 plugins=(... python)
 ```
 
 ## Aliases
 
-| Command          | Description                                                                     |
-|------------------|---------------------------------------------------------------------------------|
-| `py`             | Runs `python`                                                                   |
-| `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv    |
-| `pyfind`         | Finds .py files recursively in the current directory                            |
-| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one |
-| `pygrep <text>`  | Looks for `text` in .py files                                                   |
-| `pyuserpaths`    | Add --user site-packages to PYTHONPATH, for all installed python versions.      |
+| Command          | Description                                                                           |
+| ---------------- | ------------------------------------------------------------------------------------- |
+| `py`             | Runs `python`                                                                         |
+| `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv          |
+| `pyfind`         | Finds .py files recursively in the current directory                                  |
+| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one       |
+| `pygrep <text>`  | Looks for `text` in .py files                                                         |
+| `pyuserpaths`    | Add --user site-packages to PYTHONPATH, for all installed python versions.            |
+| `pyserver`       | Starts an http.server on the current directory. Use `--directory` for a different one |
diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 276eb6f91..896fae3ca 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -48,3 +48,6 @@ alias pygrep='grep -nr --include="*.py"'
 
 # Run proper IPython regarding current virtualenv (if any)
 alias ipython="python -c 'import IPython; IPython.terminal.ipapp.launch_new_instance()'"
+
+# Share local directory as a HTTP server
+alias pyserver="python -m http.server"

From 02eb548d5ac41c57d37af6817c77dfbb57a8d281 Mon Sep 17 00:00:00 2001
From: Marijan Smetko <msmetko@ZVIJER-PC.localdomain>
Date: Thu, 1 Apr 2021 23:35:00 +0200
Subject: [PATCH 391/591] feat(python): add utilities to manage simple virtual
 environments (#9776)

Closes #9776
---
 plugins/python/README.md         |  9 +++++++++
 plugins/python/python.plugin.zsh | 33 ++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/plugins/python/README.md b/plugins/python/README.md
index eeaa1148a..4968cca6d 100644
--- a/plugins/python/README.md
+++ b/plugins/python/README.md
@@ -10,6 +10,7 @@ plugins=(... python)
 
 ## Aliases
 
+<<<<<<< HEAD
 | Command          | Description                                                                           |
 | ---------------- | ------------------------------------------------------------------------------------- |
 | `py`             | Runs `python`                                                                         |
@@ -19,3 +20,11 @@ plugins=(... python)
 | `pygrep <text>`  | Looks for `text` in .py files                                                         |
 | `pyuserpaths`    | Add --user site-packages to PYTHONPATH, for all installed python versions.            |
 | `pyserver`       | Starts an http.server on the current directory. Use `--directory` for a different one |
+
+## Virtual environments
+
+The plugin provides two utilities to manage Python venvs:
+
+- `mkv [name]`: make a new virtual environment called `name` (default: `venv`) in current directory.
+
+- `vrun [name]`: activate virtual environment called `name` (default: `venv`) in current directory.
diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 896fae3ca..6c7fc6cbb 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -51,3 +51,36 @@ alias ipython="python -c 'import IPython; IPython.terminal.ipapp.launch_new_inst
 
 # Share local directory as a HTTP server
 alias pyserver="python -m http.server"
+
+
+## venv utilities
+
+# Activate a the python virtual environment specified.
+# If none specified, use 'venv'.
+function vrun() {
+  local name="${1:-venv}"
+  local venvpath="${name:P}"
+
+  if [[ ! -d "$venvpath" ]]; then
+    echo >&2 "Error: no such venv in current directory: $name"
+    return 1
+  fi
+
+  if [[ ! -f "${venvpath}/bin/activate" ]]; then
+    echo >&2 "Error: '${name}' is not a proper virtual environment"
+    return 1
+  fi
+
+  . "${venvpath}/bin/activate" || return $?
+  echo "Activated virtual environment ${name}"
+}
+
+# Create a new virtual environment, with default name 'venv'.
+function mkv() {
+  local name="${1:-venv}"
+  local venvpath="${name:P}"
+
+  python3 -m venv "${name}" || return
+  echo >&2 "Created venv in '${venvpath}'"
+  vrun "${name}"
+}

From 0e399d47b96b6007570cd21034e8a3d6144ad111 Mon Sep 17 00:00:00 2001
From: Karn Saheb <hello@karn.io>
Date: Fri, 7 Feb 2020 21:28:18 -0500
Subject: [PATCH 392/591] feat(terraform): add PREFIX and SUFFIX settings to
 `tf_prompt_info` (#8605)

Closes #8605
---
 plugins/terraform/terraform.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index 997241c9a..86b12751c 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -1,11 +1,11 @@
 function tf_prompt_info() {
-    # dont show 'default' workspace in home dir
-    [[ "$PWD" == ~ ]] && return
-    # check if in terraform dir
-    if [[ -d .terraform && -r .terraform/environment  ]]; then
-      workspace=$(cat .terraform/environment) || return
-      echo "[${workspace}]"
-    fi
+  # dont show 'default' workspace in home dir
+  [[ "$PWD" != ~ ]] || return
+  # check if in terraform dir and file exists
+  [[ -d .terraform && -r .terraform/environment ]] || return
+
+  local workspace="$(< .terraform/environment)"
+  echo "${ZSH_THEME_TF_PROMPT_PREFIX-[}${workspace:gs/%/%%}${ZSH_THEME_TF_PROMPT_SUFFIX-]}"
 }
 
 alias tf='terraform'

From 659dbb53680c6f931d8e20d267fe879a37ba42f1 Mon Sep 17 00:00:00 2001
From: mehdicopter <mmahfoudi@meilleursagents.com>
Date: Sat, 19 Jun 2021 00:17:40 +0200
Subject: [PATCH 393/591] feat(terraform): add more aliases (#9989)

Closes #9989
---
 plugins/terraform/README.md            | 45 +++++++++++++++++---------
 plugins/terraform/terraform.plugin.zsh |  6 ++++
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index 9e9f0cdfb..474346dc0 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -1,14 +1,7 @@
-## Terraform oh-my-zsh plugin
+# Terraform plugin
 
 Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely and efficiently.
-
-Current as of Terraform v0.13
-
-### Requirements
-
- * [Terraform](https://terraform.io/)
-
-### Usage
+It adds completion for `terraform`, as well as aliases and a prompt function.
 
 To use it, add `terraform` to the plugins array of your `~/.zshrc` file:
 
@@ -16,14 +9,34 @@ To use it, add `terraform` to the plugins array of your `~/.zshrc` file:
 plugins=(... terraform)
 ```
 
- * Type `terraform` into your prompt and hit `TAB` to see available completion options
- * Type `tf` into your prompt as a short alias to `terraform`
+## Requirements
 
-### Expanding ZSH prompt with current Terraform workspace name
+* [Terraform](https://terraform.io/)
 
-If you want to get current Terraform workspace name in your ZSH prompt open
-your .zsh-theme file and in a chosen place insert:
+## Aliases
 
-```shell
-PROMPT=$'%{$fg[white]%}$(tf_prompt_info)%{$reset_color%} '
+| Alias | Command              |
+| ----- | -------------------- |
+| `tf`  | `terraform`          |
+| `tfa` | `terraform apply`    |
+| `tfd` | `terraform destroy`  |
+| `tff` | `terraform fmt`      |
+| `tfi` | `terraform init`     |
+| `tfp` | `terraform plan`     |
+| `tfv` | `terraform validate` |
+
+## Prompt function
+
+You can add the current Terraform workspace in your prompt by adding `$(tf_prompt_info)`
+to your `PROMPT` or `RPROMPT` variable.
+
+```sh
+RPROMPT='$(tf_prompt_info)'
+```
+
+You can also specify the PREFIX and SUFFIX for the workspace with the following variables:
+
+```sh
+ZSH_THEME_TF_PROMPT_PREFIX="%{$fg[white]%}"
+ZSH_THEME_TF_PROMPT_SUFFIX="%{$reset_color%}"
 ```
diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index 86b12751c..f224b79f0 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -9,3 +9,9 @@ function tf_prompt_info() {
 }
 
 alias tf='terraform'
+alias tfa='terraform apply'
+alias tfd='terraform destroy'
+alias tff='terraform fmt'
+alias tfi='terraform init'
+alias tfp='terraform plan'
+alias tfv='terraform validate'

From 8b231f2aa752238bd8624822df7034a1b9d1188e Mon Sep 17 00:00:00 2001
From: Ian Cowan <38896380+iccowan@users.noreply.github.com>
Date: Wed, 29 Dec 2021 10:18:16 -0500
Subject: [PATCH 394/591] chore(ubuntu): add documentation for `acsp` alias
 (#10325)

---
 plugins/ubuntu/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/ubuntu/README.md b/plugins/ubuntu/README.md
index 9efef0732..20f5c65ee 100644
--- a/plugins/ubuntu/README.md
+++ b/plugins/ubuntu/README.md
@@ -16,6 +16,7 @@ Commands that use `$APT` will use `apt` if installed or defer to `apt-get` other
 |---------|--------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
 | age     | `sudo $APT`                                                              | Run apt-get with sudo                                                                             |
 | acs     | `apt-cache search`                                                       | Search the apt-cache with the specified criteria                                                  |
+| acsp    | `apt-cache showpkg`                                                      | Shows information about the listed packages                                                       |
 | acp     | `apt-cache policy`                                                       | Display the package source priorities                                                             |
 | afs     | `apt-file search --regexp`                                               | Perform a regular expression apt-file search                                                      |
 | afu     | `sudo apt-file update`                                                   | Generates or updates the apt-file package database                                                |

From 8b53d0494241fe044e44e24515f7c6293717557e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 16:26:35 +0100
Subject: [PATCH 395/591] docs(sudo): document key binding change

---
 plugins/sudo/README.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/sudo/README.md b/plugins/sudo/README.md
index 4f3973ef8..012fc5325 100644
--- a/plugins/sudo/README.md
+++ b/plugins/sudo/README.md
@@ -1,6 +1,6 @@
 # sudo
 
-Easily prefix your current or previous commands with `sudo` by pressing <kbd>esc</kbd> twice
+Easily prefix your current or previous commands with `sudo` by pressing <kbd>esc</kbd> twice.
 
 To use it, add `sudo` to the plugins array in your zshrc file:
 
@@ -43,3 +43,17 @@ $ sudo rm some-system-file.txt
 Password:
 $
 ```
+
+## Key binding
+
+By default, the `sudo` plugin uses <kbd>Esc</kbd><kbd>Esc</kbd> as the trigger.
+If you want to change it, you can use the `bindkey` command to bind it to a different key:
+
+```sh
+bindkey -M emacs '<seq>' sudo-command-line
+bindkey -M vicmd '<seq>' sudo-command-line
+bindkey -M viins '<seq>' sudo-command-line
+```
+
+where `<seq>` is the sequence you want to use. You can find the keyboard sequence
+by running `cat` and pressing the keyboard combination you want to use.

From 4d8d7bed50516aab86079aa5386ee6662bde5ae0 Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd <paulrobertlloyd@users.noreply.github.com>
Date: Wed, 29 Dec 2021 15:55:35 +0000
Subject: [PATCH 396/591] docs(nvm): clarify how to get Homebrew directory
 (#10393)

---
 plugins/nvm/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/nvm/README.md b/plugins/nvm/README.md
index 0c2bbf9f0..a8bc34ae7 100644
--- a/plugins/nvm/README.md
+++ b/plugins/nvm/README.md
@@ -17,7 +17,9 @@ where you installed nvm.
 These settings should go in your zshrc file, before Oh My Zsh is sourced:
 
 - **`NVM_HOMEBREW`**: if you installed nvm via Homebrew, in a directory other than `/usr/local/opt/nvm`, you
-  can set `NVM_HOMEBREW` to be the directory where you installed it.
+  can set `NVM_HOMEBREW` to be the directory where you installed it. For example, on Apple Silicon-based Macs,
+  [Homebrew is installed in `/opt/homebrew`](https://docs.brew.sh/Installation). To get the directory where
+  nvm has been installed, regardless of chip architecture, use `NVM_HOMEBREW=$(brew --prefix nvm)`.
 
 - **`NVM_LAZY`**: if you want the plugin to defer the load of nvm to speed-up the start of your zsh session,
   set `NVM_LAZY` to `1`. This will use the `--no-use` parameter when loading nvm, and will create a function

From a01cf8562700f3e5594f66daf40f31d9fe7ec570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 17:18:21 +0100
Subject: [PATCH 397/591] fix(rust): use default toolchain when completing
 `cargo`

---
 plugins/rust/rust.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh
index ced6eb4aa..014c73b3b 100644
--- a/plugins/rust/rust.plugin.zsh
+++ b/plugins/rust/rust.plugin.zsh
@@ -25,4 +25,7 @@ fi
 
 # Generate completion files in the background
 rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
-rustup completions zsh cargo >| "$ZSH_CACHE_DIR/completions/_cargo" &|
+cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF'
+#compdef cargo
+source $(rustc +${${(z)$(rustup default)}[1]} --print sysroot)/share/zsh/site-functions/_cargo
+EOF

From 116fc2feaa40bf4ce11c3ac72077a0ffba109525 Mon Sep 17 00:00:00 2001
From: scrouthtv <lennivh24@gmail.com>
Date: Thu, 30 Dec 2021 10:44:57 +0100
Subject: [PATCH 398/591] fix(systemd): enable `--user` on restart command
 (#10543)

`restart` is a unit-related command, not power-related, so it should appear as `sc-restart=sudo systemctl restart` and `scu-restart=systemctl --user restart`
---
 plugins/systemd/systemd.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/systemd/systemd.plugin.zsh b/plugins/systemd/systemd.plugin.zsh
index e9ac64382..7afd2be58 100644
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
@@ -45,6 +45,7 @@ sudo_commands=(
   reload-or-restart
   reset-failed
   rescue
+  restart
   revert
   set-default
   set-environment
@@ -63,7 +64,6 @@ power_commands=(
   hybrid-sleep
   poweroff
   reboot
-  restart
   suspend
 )
 

From 376beafd17b5e9aeb5ef9975720e4ad3354c0f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 31 Dec 2021 20:01:03 +0100
Subject: [PATCH 399/591] docs(zsh-navigation-tools): remove installation steps
 from README (#10549)

Fixes #10549
---
 plugins/zsh-navigation-tools/README.md | 201 +++----------------------
 1 file changed, 18 insertions(+), 183 deletions(-)

diff --git a/plugins/zsh-navigation-tools/README.md b/plugins/zsh-navigation-tools/README.md
index 9fd2d5414..bdbfac976 100644
--- a/plugins/zsh-navigation-tools/README.md
+++ b/plugins/zsh-navigation-tools/README.md
@@ -3,11 +3,25 @@
 ![ZSH 5.0.0](https://img.shields.io/badge/zsh-v5.0.0-orange.svg?style=flat-square)
 [![Gitter][gitter-image]][gitter-link]
 
-![znt logo](http://imageshack.com/a/img905/2629/WK9qjN.png)
+![znt logo](https://imageshack.com/a/img905/2629/WK9qjN.png)
 
 # Zsh Navigation Tools
 
-Also check out [![ZCA](http://imageshack.com/a/img911/8084/qSpO8a.png) Zsh Command Architect](https://github.com/zdharma-continuum/zsh-cmd-architect)
+Set of tools like `n-history` – multi-word history searcher, `n-cd` – directory
+bookmark manager, `n-kill` – `htop` like kill utility, and more. Based on
+`n-list`, a tool generating selectable curses-based list of elements that has
+access to current `Zsh` session, i.e. has broad capabilities to work together
+with it. Feature highlights include incremental multi-word searching, approximate
+matching, ANSI coloring, themes, unique mode, horizontal scroll, grepping, advanced
+history management and various integrations with `Zsh`.
+
+To use it, add `zsh-navigation-tools` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... zsh-navigation-tools)
+```
+
+Also check out [![ZCA](https://imageshack.com/a/img911/8084/qSpO8a.png) Zsh Command Architect](https://github.com/zdharma-continuum/zsh-cmd-architect)
 and [Zconvey](https://github.com/zdharma-continuum/zconvey)
 
 
@@ -18,189 +32,10 @@ Videos:
 
 Screenshots:
 
-![n-history](http://imageshack.com/a/img921/5046/bqr0mk.png)
+![n-history](https://imageshack.com/a/img921/5046/bqr0mk.png)
 
-![n-history](http://imageshack.com/a/img633/9905/WzfSdl.gif)
+![n-history](https://imageshack.com/a/img633/9905/WzfSdl.gif)
 
-Set of tools like `n-history` – multi-word history searcher, `n-cd` – directory
-bookmark manager, `n-kill` – `htop` like kill utility, and more. Based on
-`n-list`, a tool generating selectable curses-based list of elements that has
-access to current `Zsh` session, i.e. has broad capabilities to work together
-with it. Feature highlights include incremental multi-word searching, approximate
-matching, ANSI coloring, themes, unique mode, horizontal scroll, grepping, advanced
-history management and various integrations with `Zsh`.
-
-## News
-* 06-10-2016
-  - **Tmux-integration** – `Ctrl-B H` in Tmux to open `n-history` in new window.
-    Then select history entry, it will be copied to the original Tmux window.
-    Use this to execute local commands on remote hosts:
-
-    ![tmux integration](http://imageshack.com/a/img922/4760/oyX7eN.gif)
-
-    All that is needed is this line added to `~/.tmux.conf`:
-
-    ```
-    bind h run-shell -b "$ZNT_REPO_DIR/doc/znt-tmux.zsh"
-    ```
-
-    or – if Homebrew or other package manager is used:
-
-    ```
-    bind h run-shell -b "$ZNT_REPO_DIR/znt-tmux.zsh"
-    ```
-
-* 16-05-2016
-  - `n-kill` has completion. It proposes **words** from what's in `ps -A`. Giving `n-kill`
-    arguments means grepping – it will start only with matching `ps` entries.
-
-* 15-05-2016
-  - Fixed problem where zsh-syntax-highlighting could render `n-history` slow (for
-    long history entries).
-
-* 14-05-2016
-  - Configuration can be set from `zshrc` (starting from `v2.1.12`). Documentation is [below](#configuration). Example:
-
-    ```zsh
-    znt_list_instant_select=1
-    znt_list_border=0
-    znt_list_bold=1
-    znt_list_colorpair="green/black"
-    znt_functions_keywords=( "zplg" "zgen" "match" )
-    znt_cd_active_text="underline"
-    znt_env_nlist_coloring_color=$'\x1b[00;33m'
-    znt_cd_hotlist=( "~/.config/znt" "/usr/share/zsh/site-functions" "/usr/share/zsh"
-                     "/usr/local/share/zsh/site-functions" "/usr/local/share/zsh"
-                     "/usr/local/bin" )
-    ```
-
-* 10-05-2016
-  - Search query rotation – use `Ctrl-A` to rotate entered words right.
-    Words `1 2 3` become `3 1 2`.
-
-* 09-05-2016
-  - New feature: n-help tool, available also from n-history via `H` key. It
-    displays help screen with various information on `ZNT`.
-
-    ![n-help](http://imageshack.com/a/img922/7595/MvtJdI.gif)
-
-* 08-05-2016
-  - Approximate matching – pressing `f` or `Ctrl-F` will enter "`FIX`" mode,
-    in which `1` or `2` errors are allowed in what's searched. This utilizes
-    original Zsh approximate matching features and is intended to be used
-    after entering search query, when a typo is discovered.
-
-    ![fix mode](http://imageshack.com/a/img921/5756/64lFnv.gif)
-
-* 06-05-2016
-  - Private history can be edited. Use `e` key or `Ctrl-E` for that when in
-    n-history. Your `$EDITOR` will start. This is a way to have handy set of
-    bookmarks prepared in private history's file.
-  - Border can be disabled. Use following snippet in `~/.config/znt/n-list.conf`
-    or any other tool-targetted config file:
-
-    ```zsh
-    # Should draw the border?
-    local border=0
-    ```
-
-* 30-04-2016
-  - New feature: color themes. Use `Ctrl-T` and `Ctrl-G` to browse predefined
-    themes. They are listed in [~/.config/znt/n-list.conf](https://github.com/zdharma-continuum/zsh-navigation-tools/blob/master/.config/znt/n-list.conf).
-    Use the file to permanently set a color scheme. Also, I sent a patch to Zsh developers
-    and starting from Zsh > 5.2 (not yet released) supported will be 256 colors.
-    The file [~/.config/znt/n-list.conf](https://github.com/zdharma-continuum/zsh-navigation-tools/blob/master/.config/znt/n-list.conf)
-    already has set of 256-color themes prepared :)
-
-    ![themes](http://imageshack.com/a/img924/4310/EbRh30.gif)
-
-* 29-04-2016
-  - New feature: private history – n-history tracks selected history entries,
-    exposes them via new view (activated with `F1`). It is shared across all
-    sessions
-
-* 28-04-2016
-  - New features:
-    1. New n-history view (activated with `F1`): Most Frequent History Words
-    2. Predefined search keywords – use F2 to quickly search for chosen
-       keywords (video: [https://youtu.be/DN9QqssAYB8](https://youtu.be/DN9QqssAYB8))
-    3. Configuration option for doing instant selection in search mode
-
-## Installation
-
-```
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/zdharma-continuum/zsh-navigation-tools/master/doc/install.sh)"
-```
-
-To update run the command again.
-
-`ZNT` will be installed at `~/.config/znt/zsh-navigation-tools`, config files will be copied to `~/.config/znt`. `.zshrc`
-will be updated with only `8` lines of code, which will be added at the bottom.
-
-After installing and reloading shell give `ZNT` a quick try with `Ctrl-R` – this keyboard shortcut will open `n-history`.
-
-## Installation With [Zinit](https://github.com/zdharma-continuum/zinit)
-Add `zinit load zdharma-continuum/zsh-navigation-tools` to `.zshrc`. The config files will be in `~/.config/znt`.
-
-## Installation With Zgenom/Zgen
-
-Add `zgen load zdharma-continuum/zsh-navigation-tools` to `.zshrc` and issue a `zgen reset` (this assumes that there is a proper `zgen save` construct in `.zshrc`).
-The config files will be available in `~/.config/znt`.
-
-## Installation With Antigen
-Add `antigen bundle zdharma-continuum/zsh-navigation-tools` to `.zshrc`. There also
-should be `antigen apply`. The config files will be in `~/.config/znt`.
-
-## Single File Manual Installation
-
-Running script `doc/generate_single_file` will create single-file version of `ZNT`.
-It can be sourced from `.zshrc`. Don't forget about configuration files as described
-above.
-
-## Manual Installation
-
-After extracting `ZNT` to `{some-directory}` add following two lines
-to `~/.zshrc`:
-
-```zsh
-fpath+=( {some-directory} )
-source "{some-directory}/zsh-navigation-tools.plugin.zsh"
-```
-
-As you can see, no plugin manager is needed to use the `*.plugin.zsh`
-file. The above two lines of code are all that almost **all** plugin
-managers do. In fact, what's actually needed is only:
-
-```zsh
-source "{some-directory}/zsh-navigation-tools.plugin.zsh"
-```
-
-because `ZNT` detects if it is used by **any** plugin manager and can
-handle `$fpath` update by itself.
-
-## Truly Manual Installation
-Copy (or link) all `n-*` and `znt-*` files to **/usr/share/zsh/site-functions/**
-(or **/usr/local/share/zsh/site-functions/**, check with `echo $fpath[1]`) and then add:
-
-    autoload n-list n-cd n-env n-kill n-panelize n-options n-aliases n-functions n-history n-help
-
-to `~/.zshrc`.
-
-Create aliases to avoid typing of the minus sign "-":
-
-```zsh
-alias naliases=n-aliases ncd=n-cd nenv=n-env nfunctions=n-functions nhistory=n-history
-alias nkill=n-kill noptions=n-options npanelize=n-panelize nhelp=n-help
-```
-
-Don't forget to copy [configuration files](https://github.com/zdharma-continuum/zsh-navigation-tools/tree/master/.config/znt). They should go to `~/.config/znt`. Moreover, `n-cd` works together with option `AUTO_PUSHD` and you should have:
-
-```zsh
-setopt AUTO_PUSHD
-```
-
-in `.zshrc` (also recommend `PUSHD_IGNORE_DUPS`). Without the option `n-cd`
-will just work as incremental searcher of directory bookmarks.
 
 ## History Widget
 

From 9c01dbc30bdfedebb986190309106d01d49f9851 Mon Sep 17 00:00:00 2001
From: vladislav doster <mvdoster@gmail.com>
Date: Fri, 31 Dec 2021 01:55:01 -0600
Subject: [PATCH 400/591] chore(python): minor corrections on README (#10548)

Closes #10548
---
 plugins/python/README.md | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/plugins/python/README.md b/plugins/python/README.md
index 4968cca6d..c1f0adef8 100644
--- a/plugins/python/README.md
+++ b/plugins/python/README.md
@@ -1,8 +1,8 @@
-# python plugin
+# Python plugin
 
-The plugin adds several aliases for useful [python](https://www.python.org/) commands.
+The plugin adds several aliases for useful [Python](https://www.python.org/) commands.
 
-To use it, add `python` to the plugins array of your zshrc file:
+To use it, add `python` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... python)
@@ -10,16 +10,15 @@ plugins=(... python)
 
 ## Aliases
 
-<<<<<<< HEAD
-| Command          | Description                                                                           |
-| ---------------- | ------------------------------------------------------------------------------------- |
-| `py`             | Runs `python`                                                                         |
-| `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv          |
-| `pyfind`         | Finds .py files recursively in the current directory                                  |
-| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one       |
-| `pygrep <text>`  | Looks for `text` in .py files                                                         |
-| `pyuserpaths`    | Add --user site-packages to PYTHONPATH, for all installed python versions.            |
-| `pyserver`       | Starts an http.server on the current directory. Use `--directory` for a different one |
+| Command          | Description                                                                            |
+| ---------------- | -------------------------------------------------------------------------------------- |
+| `py`             | Runs `python`                                                                          |
+| `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv           |
+| `pyfind`         | Finds .py files recursively in the current directory                                   |
+| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one        |
+| `pygrep <text>`  | Looks for `text` in `*.py` files in the current directory, recursively                 |
+| `pyuserpaths`    | Add user site-packages folders to `PYTHONPATH`, for Python 2 and 3                     |
+| `pyserver`       | Starts an HTTP server on the current directory (use `--directory` for a different one) |
 
 ## Virtual environments
 

From 78c91ccbf99c77bd4d9cdb74279a40776721f66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 31 Dec 2021 20:45:12 +0100
Subject: [PATCH 401/591] style(python): fix code style and some hidden bugs

---
 plugins/python/python.plugin.zsh | 49 +++++++++++++++-----------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 6c7fc6cbb..7a73ab92a 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -7,40 +7,37 @@ alias pyfind='find . -name "*.py"'
 # Remove python compiled byte-code and mypy/pytest cache in either the current
 # directory or in a list of specified directories (including sub directories).
 function pyclean() {
-    ZSH_PYCLEAN_PLACES=${*:-'.'}
-    find ${ZSH_PYCLEAN_PLACES} -type f -name "*.py[co]" -delete
-    find ${ZSH_PYCLEAN_PLACES} -type d -name "__pycache__" -delete
-    find ${ZSH_PYCLEAN_PLACES} -depth -type d -name ".mypy_cache" -exec rm -r "{}" +
-    find ${ZSH_PYCLEAN_PLACES} -depth -type d -name ".pytest_cache" -exec rm -r "{}" +
+  find "${@:-.}" -type f -name "*.py[co]" -delete
+  find "${@:-.}" -type d -name "__pycache__" -delete
+  find "${@:-.}" -depth -type d -name ".mypy_cache" -exec rm -r "{}" +
+  find "${@:-.}" -depth -type d -name ".pytest_cache" -exec rm -r "{}" +
 }
 
 # Add the user installed site-packages paths to PYTHONPATH, only if the
 #   directory exists. Also preserve the current PYTHONPATH value.
 # Feel free to autorun this when .zshrc loads.
 function pyuserpaths() {
-    local targets=("python2" "python3")  # bins
-    
-    # Get existing interpreters.
-    local interps=()
-    for target in $targets; do
-        [ `command -v $target` ] && interps+=($target)
-    done
+  setopt localoptions extendedglob
 
-    # Check for a non-standard install directory.
-    local user_base="${HOME}/.local"
-    [ $PYTHONUSERBASE ] && user_base=$PYTHONUSERBASE
+  # Check for a non-standard install directory.
+  local user_base="${PYTHONUSERBASE:-"${HOME}/.local"}"
 
-    # Add version specific paths, if:
-    #   it exists in the filesystem;
-    #   it isn't in PYTHONPATH already.
-    for interp in $interps; do
-        # Get minor release version.
-        local ver=`$interp -V 2>&1`
-        ver=`echo ${ver:7} | cut -d '.' -f 1,2`  # The patch version is variable length, truncate it.
-        
-        local site_pkgs="${user_base}/lib/python${ver}/site-packages"
-        [[ -d $site_pkgs && ! $PYTHONPATH =~ $site_pkgs ]] && export PYTHONPATH=${site_pkgs}:$PYTHONPATH
-    done
+  local python version site_pkgs
+  for python in python2 python3; do
+    # Check if command exists
+    (( ${+commands[$python]} )) || continue
+
+    # Get minor release version.
+    # The patch version is variable length, truncate it.
+    version=${(M)${"$($python -V 2>&1)":7}#[^.]##.[^.]##}
+
+    # Add version specific path, if:
+    # - it exists in the filesystem
+    # - it isn't in $PYTHONPATH already.
+    site_pkgs="${user_base}/lib/python${version}/site-packages"
+    [[ -d "$site_pkgs" && ! "$PYTHONPATH" =~ (^|:)"$site_pkgs"(:|$) ]] || continue
+    export PYTHONPATH="${site_pkgs}${PYTHONPATH+":${PYTHONPATH}"}"
+  done
 }
 
 # Grep among .py files

From d1c07f9569f4f7bb90345ccc363d71a8b8507687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 02:30:00 +0100
Subject: [PATCH 402/591] chore: add Projects Beta GitHub Action

---
 .github/workflows/project.yml | 134 ++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 .github/workflows/project.yml

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
new file mode 100644
index 000000000..ba3e115c9
--- /dev/null
+++ b/.github/workflows/project.yml
@@ -0,0 +1,134 @@
+name: Project tracking
+on:
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened, synchronize]
+
+jobs:
+  add-to-project:
+    name: Add to project
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/github-app-token@36464acb844fc53b9b8b2401da68844f6b05ebb0
+        with:
+          app_id: ${{ secrets.OHMYZSH_BOT_APP_ID }}
+          private_key: ${{ secrets.OHMYZSH_BOT_APP_PEM }}
+      - name: Read project data
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          ORGANIZATION: ohmyzsh
+          PROJECT_NUMBER: "1"
+        run: |
+          # Get Project data
+          gh api graphql -f query='
+            query($org: String!, $number: Int!) {
+              organization(login: $org){
+                projectNext(number: $number) {
+                  id
+                  fields(first:20) {
+                    nodes {
+                      id
+                      name
+                    }
+                  }
+                }
+              }
+            }
+          ' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
+
+          # Parse project data
+          cat >> $GITHUB_ENV <<EOF
+          PROJECT_ID=$(jq '.data.organization.projectNext.id' project_data.json)
+          PLUGIN_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Plugin") | .id' project_data.json)
+          THEME_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Theme") | .id' project_data.json)
+          EOF
+      - name: Add to project
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+          PR_ID: ${{ github.event.pull_request.node_id }}
+        run: |
+          item_id="$(gh api graphql -f query='
+            mutation($project: ID!, $item: ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $item}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          ' -f project=$PROJECT_ID -f item=${ISSUE_ID:-$PR_ID} --jq '.data.addProjectNextItem.projectNextItem.id')"
+
+          echo "ITEM_ID=$item_id" >> $GITHUB_ENV
+      - name: Classify Pull Request
+        if: github.event_name == 'pull_request_target'
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+        run: |
+          gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
+            /^plugins\// {
+              plugins[$2] = 1
+            }
+            /^themes\// {
+              gsub(/\.zsh-theme$/, "", $2)
+              themes[$2] = 1
+            }
+            END {
+              for (plugin in plugins) {
+                print plugin >> "plugins.list"
+              }
+              for (theme in themes) {
+                print theme >> "themes.list"
+              }
+            }
+          '
+          # If only one plugin is modified, add it to the plugin field
+          if [[ $(wc -l < plugins.list) = 1 ]]; then
+            echo "PLUGIN=$(cat plugins.list)" >> $GITHUB_ENV
+          fi
+          # If only one theme is modified, add it to the theme field
+          if [[ $(wc -l < themes.list) = 1 ]]; then
+            echo "THEME=$(cat themes.list)" >> $GITHUB_ENV
+          fi
+      - name: Fill Pull Request fields in project
+        if: github.event_name == 'pull_request_target'
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+        run: |
+          gh api graphql -f query='
+            mutation (
+              $project: ID!
+              $item: ID!
+              $plugin_field: ID!
+              $plugin_value: String!
+              $theme_field: ID!
+              $theme_value: String!
+            ) {
+              set_plugin: updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $plugin_field
+                value: $plugin_value
+              }) {
+                projectNextItem {
+                  id
+                }
+              }
+              set_theme: updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $theme_field
+                value: $theme_value
+              }) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          ' -f project=$PROJECT_ID -f item=$ITEM_ID \
+            -f plugin_field=$PLUGIN_FIELD_ID -f plugin_value=$PLUGIN \
+            -f theme_field=$THEME_FIELD_ID -f theme_value=$THEME \
+            --silent
+

From 95a66532d17181693b828bda95f4261e5421b409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:09:52 +0100
Subject: [PATCH 403/591] chore: use GITHUB_TOKEN auth for Project Beta GitHub
 Action

---
 .github/workflows/project.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index ba3e115c9..2b3cc732f 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -10,15 +10,9 @@ jobs:
     name: Add to project
     runs-on: ubuntu-latest
     steps:
-      - name: Generate token
-        id: generate_token
-        uses: tibdex/github-app-token@36464acb844fc53b9b8b2401da68844f6b05ebb0
-        with:
-          app_id: ${{ secrets.OHMYZSH_BOT_APP_ID }}
-          private_key: ${{ secrets.OHMYZSH_BOT_APP_PEM }}
       - name: Read project data
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
@@ -45,9 +39,10 @@ jobs:
           PLUGIN_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Plugin") | .id' project_data.json)
           THEME_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Theme") | .id' project_data.json)
           EOF
+
       - name: Add to project
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ISSUE_ID: ${{ github.event.issue.node_id }}
           PR_ID: ${{ github.event.pull_request.node_id }}
         run: |
@@ -62,10 +57,11 @@ jobs:
           ' -f project=$PROJECT_ID -f item=${ISSUE_ID:-$PR_ID} --jq '.data.addProjectNextItem.projectNextItem.id')"
 
           echo "ITEM_ID=$item_id" >> $GITHUB_ENV
+
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
             /^plugins\// {
@@ -92,10 +88,11 @@ jobs:
           if [[ $(wc -l < themes.list) = 1 ]]; then
             echo "THEME=$(cat themes.list)" >> $GITHUB_ENV
           fi
+
       - name: Fill Pull Request fields in project
         if: github.event_name == 'pull_request_target'
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh api graphql -f query='
             mutation (

From 1d35b30461b2cc9a31330ff4e96cc5f97f76fb22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:17:40 +0100
Subject: [PATCH 404/591] chore: fix auth in Project tracking Action

---
 .github/workflows/project.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 2b3cc732f..c25fd2e22 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -16,6 +16,8 @@ jobs:
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
+          gh auth login --with-token ${{ env.GITHUB_TOKEN }}
+
           # Get Project data
           gh api graphql -f query='
             query($org: String!, $number: Int!) {

From 861e7e24a356ac571af2f362275ddfbac4be69ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:19:46 +0100
Subject: [PATCH 405/591] chore: please work

---
 .github/workflows/project.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index c25fd2e22..1e66efda8 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -16,7 +16,7 @@ jobs:
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
-          gh auth login --with-token ${{ env.GITHUB_TOKEN }}
+          gh auth login
 
           # Get Project data
           gh api graphql -f query='

From 17c52ccfc9b06d45f041b24af35d1804d645620f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:27:25 +0100
Subject: [PATCH 406/591] chore: look ma no auth!

---
 .github/workflows/project.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 1e66efda8..7559060d5 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -12,12 +12,9 @@ jobs:
     steps:
       - name: Read project data
         env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
-          gh auth login
-
           # Get Project data
           gh api graphql -f query='
             query($org: String!, $number: Int!) {
@@ -44,7 +41,6 @@ jobs:
 
       - name: Add to project
         env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ISSUE_ID: ${{ github.event.issue.node_id }}
           PR_ID: ${{ github.event.pull_request.node_id }}
         run: |
@@ -62,8 +58,6 @@ jobs:
 
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
-        env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
             /^plugins\// {
@@ -93,8 +87,6 @@ jobs:
 
       - name: Fill Pull Request fields in project
         if: github.event_name == 'pull_request_target'
-        env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh api graphql -f query='
             mutation (

From dd7f0f22111bff8145c46f9638c0c95cbc143ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:32:07 +0100
Subject: [PATCH 407/591] chore: let's try again

---
 .github/workflows/project.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 7559060d5..0fe897587 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -12,11 +12,12 @@ jobs:
     steps:
       - name: Read project data
         env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
           # Get Project data
-          gh api graphql -f query='
+          GITHUB_TOKEN=$GITHUB_TOKEN gh api graphql -f query='
             query($org: String!, $number: Int!) {
               organization(login: $org){
                 projectNext(number: $number) {
@@ -41,6 +42,7 @@ jobs:
 
       - name: Add to project
         env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ISSUE_ID: ${{ github.event.issue.node_id }}
           PR_ID: ${{ github.event.pull_request.node_id }}
         run: |
@@ -58,6 +60,8 @@ jobs:
 
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
             /^plugins\// {
@@ -87,6 +91,8 @@ jobs:
 
       - name: Fill Pull Request fields in project
         if: github.event_name == 'pull_request_target'
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh api graphql -f query='
             mutation (

From 121ee818a52b6c88fa4b7ae993ad15a27dc99038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:37:05 +0100
Subject: [PATCH 408/591] chore: I'm dumb af

---
 .github/workflows/project.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 0fe897587..2b3cc732f 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -17,7 +17,7 @@ jobs:
           PROJECT_NUMBER: "1"
         run: |
           # Get Project data
-          GITHUB_TOKEN=$GITHUB_TOKEN gh api graphql -f query='
+          gh api graphql -f query='
             query($org: String!, $number: Int!) {
               organization(login: $org){
                 projectNext(number: $number) {

From 9dd1dc49d92da4641e83057099691a22ebd52bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 12:32:37 +0100
Subject: [PATCH 409/591] chore: simplify `GITHUB_TOKEN` env in project GitHub
 Action

---
 .github/workflows/project.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 2b3cc732f..6968e5ad4 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -9,10 +9,11 @@ jobs:
   add-to-project:
     name: Add to project
     runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
     steps:
       - name: Read project data
         env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
@@ -42,7 +43,6 @@ jobs:
 
       - name: Add to project
         env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ISSUE_ID: ${{ github.event.issue.node_id }}
           PR_ID: ${{ github.event.pull_request.node_id }}
         run: |
@@ -60,8 +60,6 @@ jobs:
 
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
-        env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
             /^plugins\// {
@@ -91,8 +89,6 @@ jobs:
 
       - name: Fill Pull Request fields in project
         if: github.event_name == 'pull_request_target'
-        env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh api graphql -f query='
             mutation (

From 512839ef7800fa32d78c47f160bdae3293ad22c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 13:02:28 +0100
Subject: [PATCH 410/591] chore: simplify project GitHub Action

---
 .github/workflows/project.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 6968e5ad4..013255890 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -43,8 +43,7 @@ jobs:
 
       - name: Add to project
         env:
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-          PR_ID: ${{ github.event.pull_request.node_id }}
+          ISSUE_OR_PR_ID: ${{ github.event.issue.node_id || github.event.pull_request.node_id }}
         run: |
           item_id="$(gh api graphql -f query='
             mutation($project: ID!, $item: ID!) {
@@ -54,7 +53,7 @@ jobs:
                 }
               }
             }
-          ' -f project=$PROJECT_ID -f item=${ISSUE_ID:-$PR_ID} --jq '.data.addProjectNextItem.projectNextItem.id')"
+          ' -f project=$PROJECT_ID -f item=$ISSUE_OR_PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
 
           echo "ITEM_ID=$item_id" >> $GITHUB_ENV
 

From 63345c4e5dd8ce210a43c9e89a883a262e755c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 13:10:53 +0100
Subject: [PATCH 411/591] ci: disable GitHub Actions on forks

---
 .github/workflows/main.yml    | 1 +
 .github/workflows/project.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7ab7efdd6..cdadc1434 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,6 +14,7 @@ jobs:
   tests:
     name: Run tests
     runs-on: ${{ matrix.os }}
+    if: github.repository == 'ohmyzsh/ohmyzsh'
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 013255890..2a27b70fc 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -9,6 +9,7 @@ jobs:
   add-to-project:
     name: Add to project
     runs-on: ubuntu-latest
+    if: github.repository == 'ohmyzsh/ohmyzsh'
     env:
       GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
     steps:

From 596cef84c75261398fe66f713d97d5ca96130146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:07:35 +0100
Subject: [PATCH 412/591] style(svn-fast-info): fix code style and `svn info`
 locale

---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index f40a59685..f2f449f79 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -1,6 +1,6 @@
 function svn_prompt_info() {
   local info
-  info=$(svn info 2>&1) || return 1 # capture stdout and stderr
+  info=$(LANG= svn info 2>&1) || return 1 # capture stdout and stderr
   local repo_need_upgrade=$(svn_repo_need_upgrade $info)
 
   if [[ -n $repo_need_upgrade ]]; then
@@ -31,7 +31,7 @@ function svn_prompt_info() {
 }
 
 function svn_repo_need_upgrade() {
-  grep -q "E155036" <<< "${1:-$(svn info 2> /dev/null)}" && \
+  command grep -q "E155036" <<< "${1:-$(LANG= svn info 2>/dev/null)}" && \
     echo "E155036: upgrade repo with svn upgrade"
 }
 
@@ -40,33 +40,33 @@ function svn_current_branch_name() {
 }
 
 function svn_repo_root_name() {
-  grep '^Repository\ Root:' <<< "${1:-$(svn info 2> /dev/null)}" | sed 's#.*/##'
+  command grep '^Repository\ Root:' <<< "${1:-$(LANG= svn info 2>/dev/null)}" | sed 's#.*/##'
 }
 
 function svn_current_revision() {
-  echo "${1:-$(svn info 2> /dev/null)}" | sed -n 's/Revision: //p'
+  echo "${1:-$(LANG= svn info 2>/dev/null)}" | sed -n 's/Revision: //p'
 }
 
 function svn_status_info() {
   local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
-  local svn_status="$(svn status 2> /dev/null)";
-  if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"
+  local svn_status="$(svn status 2>/dev/null)";
+  if command grep -E '^\s*A' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"
   fi
-  if command grep -E '^\s*D' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"
+  if command grep -E '^\s*D' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"
   fi
-  if command grep -E '^\s*M' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"
+  if command grep -E '^\s*M' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"
   fi
-  if command grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"
+  if command grep -E '^\s*[R~]' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"
   fi
-  if command grep -E '^\s*\?' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"
+  if command grep -E '^\s*\?' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"
   fi
-  if command grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DIRTY:-!}"
+  if command grep -E '^\s*[CI!L]' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_DIRTY:-!}"
   fi
   echo $svn_status_string
 }

From ef3a85cd42c671217a0bcb58685484a5a5a0ada4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:08:25 +0100
Subject: [PATCH 413/591] fix(svn-fast-info): URL-decode svn branch name

---
 plugins/svn-fast-info/svn-fast-info.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index f2f449f79..05f0ac67d 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -36,7 +36,9 @@ function svn_repo_need_upgrade() {
 }
 
 function svn_current_branch_name() {
-  grep '^URL:' <<< "${1:-$(svn info 2> /dev/null)}" | egrep -o '(tags|branches)/[^/]+|trunk'	
+  omz_urldecode "$(
+    command grep '^URL:' <<< "${1:-$(svn info 2>/dev/null)}" | command grep -Eo '(tags|branches)/[^/]+|trunk'
+  )"
 }
 
 function svn_repo_root_name() {

From 75ed59b7c09e3bb2d04a5d35065bdd9277e9947f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:09:05 +0100
Subject: [PATCH 414/591] fix(svn-fast-info): quote % characters in svn branch
 name

---
 plugins/svn-fast-info/svn-fast-info.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index 05f0ac67d..46dd5cb0c 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -20,7 +20,7 @@ function svn_prompt_info() {
       "$ZSH_PROMPT_BASE_COLOR" \
       \
       "$ZSH_THEME_BRANCH_NAME_COLOR" \
-      "$(svn_current_branch_name $info)" \
+      "${$(svn_current_branch_name $info):gs/%/%%}" \
       "$ZSH_PROMPT_BASE_COLOR" \
       \
       "$(svn_current_revision $info)" \

From c76dc91e02f7e8885e6eb71d725c21b15616ad05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 20 Dec 2021 11:22:54 +0100
Subject: [PATCH 415/591] fix(svn): return true repo name in
 `svn_get_repo_name`

---
 plugins/svn/svn.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index fbc9ee538..851f1a45e 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -19,10 +19,10 @@ in_svn() {
 }
 
 svn_get_repo_name() {
-  if in_svn; then
-    LANG=C svn info | sed -n 's/^Repository\ Root:\ .*\///p' | read SVN_ROOT
-    LANG=C svn info | sed -n "s/^URL:\ .*$SVN_ROOT\///p"
-  fi
+  local info name
+  info="${1:-$(LANG= svn info 2>/dev/null)}"
+  name="$(sed -n 's/^Repository\ Root:\ .*\///p' <<< "$info")"
+  omz_urldecode "$name"
 }
 
 svn_get_branch_name() {

From 93ec48fb0a798775b9e5d366c11a4ac3826c3ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 20 Dec 2021 11:24:00 +0100
Subject: [PATCH 416/591] fix(svn): refactor and quote % characters in
 `svn_prompt_info`

---
 plugins/svn/svn.plugin.zsh | 104 +++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 51 deletions(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 851f1a45e..9c3b50d16 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,21 +1,28 @@
 svn_prompt_info() {
-  local _DISPLAY
-  if in_svn; then
-    if [[ "$SVN_SHOW_BRANCH" = true ]]; then
-      unset SVN_SHOW_BRANCH
-      _DISPLAY=$(svn_get_branch_name)
-    else
-      _DISPLAY=$(svn_get_repo_name)
-      _DISPLAY=$(omz_urldecode "${_DISPLAY}")
-    fi
-    echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$(svn_dirty_pwd)$ZSH_PROMPT_BASE_COLOR"
+  local info display
+  info="$(LANG= svn info 2>/dev/null)" || return 1
+
+  if [[ "$SVN_SHOW_BRANCH" = true ]]; then
+    display="$(svn_get_branch_name "$info")"
+  else
+    display="$(svn_get_repo_name "$info")"
   fi
+
+  printf '%s%s%s%s%s%s%s%s%s%s' \
+    "$ZSH_PROMPT_BASE_COLOR" \
+    "$ZSH_THEME_SVN_PROMPT_PREFIX" \
+    "$ZSH_THEME_REPO_NAME_COLOR" \
+    "${display:gs/%/%%}" \
+    "$ZSH_PROMPT_BASE_COLOR" \
+    "$ZSH_THEME_SVN_PROMPT_SUFFIX" \
+    "$ZSH_PROMPT_BASE_COLOR" \
+    "$(svn_dirty $info)" \
+    "$(svn_dirty_pwd)" \
+    "$ZSH_PROMPT_BASE_COLOR"
 }
 
-
 in_svn() {
-  svn info >/dev/null 2>&1
+  svn info &>/dev/null
 }
 
 svn_get_repo_name() {
@@ -26,47 +33,44 @@ svn_get_repo_name() {
 }
 
 svn_get_branch_name() {
-  local _DISPLAY=$(
-    LANG=C svn info 2> /dev/null | \
-      awk -F/ \
-      '/^URL:/ { \
-        for (i=0; i<=NF; i++) { \
-          if ($i == "branches" || $i == "tags" ) { \
-            print $(i+1); \
-            break;\
-          }; \
-          if ($i == "trunk") { print $i; break; } \
-        } \
-      }'
+  local info branch
+  info="${1:-$(LANG= svn info 2>/dev/null)}"
+  branch=$(
+    awk -F/ '/^URL:/ {
+      for (i=0; i<=NF; i++) {
+        if ($i == "branches" || $i == "tags" ) {
+          print $(i+1)
+          break
+        };
+        if ($i == "trunk") {
+          print $i
+          break
+        }
+      }
+    }' <<< "$info"
   )
+  branch="$(omz_urldecode "$branch")"
 
-  if [[ -z "$_DISPLAY" ]]; then
-    svn_get_repo_name
-  else
-    echo $_DISPLAY
-  fi
+  echo "${branch:-$(svn_get_repo_name "$info")}"
 }
 
 svn_get_rev_nr() {
-  if in_svn; then
-    LANG=C svn info 2> /dev/null | sed -n 's/Revision:\ //p'
-  fi
+  sed -n 's/Revision:\ //p' "${1:-$(LANG= svn info 2>/dev/null)}"
 }
 
 svn_dirty() {
-  svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
+  svn_dirty_choose "${1:-$(LANG= svn info 2>/dev/null)}" $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
 }
 
 svn_dirty_choose() {
-  if in_svn; then
-    local root=$(LANG=C svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p')
-    if svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
-      # Grep exits with 0 when "One or more lines were selected", return "dirty".
-      echo $1
-    else
-      # Otherwise, no lines were found, or an error occurred. Return clean.
-      echo $2
-    fi
+  local root
+  root=$(sed -n 's/^Working Copy Root Path: //p' <<< "${1:-$(LANG= svn info 2>/dev/null)}")
+  if LANG= svn status "$root" 2>/dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
+    # Grep exits with 0 when "One or more lines were selected", return "dirty".
+    echo $1
+  else
+    # Otherwise, no lines were found, or an error occurred. Return clean.
+    echo $2
   fi
 }
 
@@ -75,13 +79,11 @@ svn_dirty_pwd () {
 }
 
 svn_dirty_choose_pwd () {
-  if in_svn; then
-    if svn status "$PWD" 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
-      # Grep exits with 0 when "One or more lines were selected", return "dirty".
-      echo $1
-    else
-      # Otherwise, no lines were found, or an error occurred. Return clean.
-      echo $2
-    fi
+  if LANG= svn status "$PWD" 2>/dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
+    # Grep exits with 0 when "One or more lines were selected", return "dirty".
+    echo $1
+  else
+    # Otherwise, no lines were found, or an error occurred. Return clean.
+    echo $2
   fi
 }

From 304af0a577336abd3090f9dec645052c4c987a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Dec 2021 13:03:16 +0100
Subject: [PATCH 417/591] fix(lib): quote % in `git_remote_status`

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 62aac8f39..be9fa7e67 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -82,7 +82,7 @@ function git_remote_status() {
         fi
 
         if [[ -n $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]]; then
-            git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
+            git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX${remote:gs/%/%%}$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
         fi
 
         echo $git_remote_status

From 5b076eab9bf8b85b48faac20383aa20ba0f8b740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 19:31:07 +0100
Subject: [PATCH 418/591] fix(lib): quote % in `nvm_prompt_info`

---
 lib/nvm.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/nvm.zsh b/lib/nvm.zsh
index 2fe57a8f4..a8989f9fe 100644
--- a/lib/nvm.zsh
+++ b/lib/nvm.zsh
@@ -2,5 +2,5 @@
 function nvm_prompt_info() {
   which nvm &>/dev/null || return
   local nvm_prompt=${$(nvm current)#v}
-  echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
+  echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt:gs/%/%%}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
 }

From 42afa6e2ea663431ae2ff0a4aae8e57ce175eb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 19:32:52 +0100
Subject: [PATCH 419/591] fix(pyenv): quote % in `pyenv_prompt_info`

---
 plugins/pyenv/pyenv.plugin.zsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 39897ed16..ebb1a708a 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -83,12 +83,14 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
   fi
 
   function pyenv_prompt_info() {
-    echo "$(pyenv version-name)"
+    local version="$(pyenv version-name)"
+    echo "${version:gs/%/%%}"
   }
 else
   # Fall back to system python
   function pyenv_prompt_info() {
-    echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')"
+    local version="$(python -V 2>&1 | cut -d' ' -f2)"
+    echo "system: ${version:gs/%/%%}"
   }
 fi
 

From e7390a860374fb38dd7bf67242ec12e8a6925a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 19:34:30 +0100
Subject: [PATCH 420/591] fix(jenv): quote % in `jenv_prompt_info`

---
 plugins/jenv/jenv.plugin.zsh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/jenv/jenv.plugin.zsh b/plugins/jenv/jenv.plugin.zsh
index 946ce18a5..240102604 100644
--- a/plugins/jenv/jenv.plugin.zsh
+++ b/plugins/jenv/jenv.plugin.zsh
@@ -18,13 +18,19 @@ if [[ $FOUND_JENV -eq 1 ]]; then
     (( $+commands[jenv] )) || export PATH="${jenvdir}/bin:$PATH"
     eval "$(jenv init - zsh)"
 
-    function jenv_prompt_info() { jenv version-name 2>/dev/null }
+    function jenv_prompt_info() {
+      local version="$(jenv version-name 2>/dev/null)"
+      echo "${version:gs/%/%%}"
+    }
 
     if [[ -d "${jenvdir}/versions" ]]; then
         export JENV_ROOT=$jenvdir
     fi
 else
-    function jenv_prompt_info() { echo "system: $(java -version 2>&1 | cut -f 2 -d ' ')" }
+    function jenv_prompt_info() {
+      local version="$(java -version 2>&1 | cut -d' ' -f2)"
+      echo "system: ${version:gs/%/%%}"
+    }
 fi
 
 unset jenvdir jenvdirs FOUND_JENV

From 3e9fe6e7720cf431d5c24a4037cfb5e8b212a6aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 20:43:54 +0100
Subject: [PATCH 421/591] fix(virtualenv): quote % in `virtualenv_prompt_info`

---
 plugins/virtualenv/virtualenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/virtualenv/virtualenv.plugin.zsh b/plugins/virtualenv/virtualenv.plugin.zsh
index 3041475ed..56707bb98 100644
--- a/plugins/virtualenv/virtualenv.plugin.zsh
+++ b/plugins/virtualenv/virtualenv.plugin.zsh
@@ -1,6 +1,6 @@
 function virtualenv_prompt_info(){
   [[ -n ${VIRTUAL_ENV} ]] || return
-  echo "${ZSH_THEME_VIRTUALENV_PREFIX=[}${VIRTUAL_ENV:t}${ZSH_THEME_VIRTUALENV_SUFFIX=]}"
+  echo "${ZSH_THEME_VIRTUALENV_PREFIX=[}${VIRTUAL_ENV:t:gs/%/%%}${ZSH_THEME_VIRTUALENV_SUFFIX=]}"
 }
 
 # disables prompt mangling in virtual_env/bin/activate

From 9836aebe672159622193f14a89eedc38ccd29a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 14 Dec 2021 11:58:58 +0100
Subject: [PATCH 422/591] fix(agnoster): quote % in prompt functions

---
 themes/agnoster.zsh-theme | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index fe7ddbac6..5f4efe813 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -135,7 +135,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
+    echo -n "${${ref:gs/%/%%}/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
   fi
 }
 
@@ -153,7 +153,7 @@ prompt_bzr() {
   if bzr_status=$(bzr status 2>&1); then
     status_mod=$(echo -n "$bzr_status" | head -n1 | grep "modified" | wc -m)
     status_all=$(echo -n "$bzr_status" | head -n1 | wc -m)
-    revision=$(bzr log -r-1 --log-format line | cut -d: -f1)
+    revision=${$(bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%}
     if [[ $status_mod -gt 0 ]] ; then
       prompt_segment yellow black "bzr@$revision ✚"
     else
@@ -183,7 +183,7 @@ prompt_hg() {
         # if working copy is clean
         prompt_segment green $CURRENT_FG
       fi
-      echo -n $(hg prompt "☿ {rev}@{branch}") $st
+      echo -n ${$(hg prompt "☿ {rev}@{branch}"):gs/%/%%} $st
     else
       st=""
       rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
@@ -197,7 +197,7 @@ prompt_hg() {
       else
         prompt_segment green $CURRENT_FG
       fi
-      echo -n "☿ $rev@$branch" $st
+      echo -n "☿ ${rev:gs/%/%%}@${branch:gs/%/%%}" $st
     fi
   fi
 }
@@ -209,9 +209,8 @@ prompt_dir() {
 
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
-  local virtualenv_path="$VIRTUAL_ENV"
-  if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
-    prompt_segment blue black "(`basename $virtualenv_path`)"
+  if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
+    prompt_segment blue black "(${VIRTUAL_ENV:t:gs/%/%%})"
   fi
 }
 
@@ -237,8 +236,8 @@ prompt_status() {
 prompt_aws() {
   [[ -z "$AWS_PROFILE" || "$SHOW_AWS_PROMPT" = false ]] && return
   case "$AWS_PROFILE" in
-    *-prod|*production*) prompt_segment red yellow  "AWS: $AWS_PROFILE" ;;
-    *) prompt_segment green black "AWS: $AWS_PROFILE" ;;
+    *-prod|*production*) prompt_segment red yellow  "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
+    *) prompt_segment green black "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
   esac
 }
 

From 4e777ef9d62f70ec971a3eaca71a23b9f4c93a54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Dec 2021 00:33:20 +0100
Subject: [PATCH 423/591] fix(trapd00r): fix potential command injection in
 `zsh_path`

---
 themes/trapd00r.zsh-theme | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index 4e3238393..849daf30b 100644
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
@@ -38,6 +38,8 @@ local c13=$'\e[38;5;196m\e[1m'
 
 
 zsh_path() {
+  setopt localoptions nopromptsubst
+
   local colors
   colors=$(echoti colors)
 

From 43be5ea32150912ae2e85e2cc278c092022ea53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Dec 2021 00:38:58 +0100
Subject: [PATCH 424/591] fix(bureau): quote % in git prompt function and
 remove global variables

---
 themes/bureau.zsh-theme | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 3b3bdc80f..7a253a688 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -17,13 +17,14 @@ ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}●%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"
 
 bureau_git_branch () {
+  local ref
   ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
   ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
   echo "${ref#refs/heads/}"
 }
 
 bureau_git_status() {
-  _STATUS=""
+  local _STATUS _INDEX
 
   # check status of files
   _INDEX=$(command git status --porcelain 2> /dev/null)
@@ -63,18 +64,22 @@ bureau_git_status() {
   echo $_STATUS
 }
 
-bureau_git_prompt () {
-  local _branch=$(bureau_git_branch)
-  local _status=$(bureau_git_status)
-  local _result=""
-  if [[ "${_branch}x" != "x" ]]; then
-    _result="$ZSH_THEME_GIT_PROMPT_PREFIX$_branch"
-    if [[ "${_status}x" != "x" ]]; then
-      _result="$_result $_status"
-    fi
-    _result="$_result$ZSH_THEME_GIT_PROMPT_SUFFIX"
+bureau_git_prompt() {
+  local branch=$(bureau_git_branch)
+  local status=$(bureau_git_status)
+  local info
+
+  if [[ -z "${branch}" ]]; then
+    return
   fi
-  echo $_result
+
+  info="${branch:gs/%/%%}"
+
+  if [[ -n "${status}" ]]; then
+    info+=" $status"
+  fi
+
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${info}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 

From a9d57eb2eec4d6234c4714a430ddfb4c57443570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Dec 2021 15:01:25 +0100
Subject: [PATCH 425/591] fix: quote % in `box_name` prompt functions

---
 themes/candy-kingdom.zsh-theme | 4 +++-
 themes/fino-time.zsh-theme     | 5 +++--
 themes/fino.zsh-theme          | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme
index ad03cc320..31e63df15 100644
--- a/themes/candy-kingdom.zsh-theme
+++ b/themes/candy-kingdom.zsh-theme
@@ -11,7 +11,9 @@ patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset
 fi
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
+  local box="${SHORT_HOST:-$HOST}"
+  [[ -f ~/.box-name ]] && box="$(< ~/.box-name)"
+  echo "${box:gs/%/%%}"
 }
 
 PROMPT='
diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
index 57c47db02..c7e2d965e 100644
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
@@ -21,10 +21,11 @@ function prompt_char {
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
+  local box="${SHORT_HOST:-$HOST}"
+  [[ -f ~/.box-name ]] && box="$(< ~/.box-name)"
+  echo "${box:gs/%/%%}"
 }
 
-
 PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}%~%{$reset_color%}\$(git_prompt_info)\$(ruby_prompt_info) %D - %*
 ╰─\$(virtualenv_info)\$(prompt_char) "
 
diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 2523c1776..9365a3c42 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -21,7 +21,9 @@ function prompt_char {
 }
 
 function box_name {
-  [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
+  local box="${SHORT_HOST:-$HOST}"
+  [[ -f ~/.box-name ]] && box="$(< ~/.box-name)"
+  echo "${box:gs/%/%%}"
 }
 
 local ruby_env='$(ruby_prompt_info)'

From 1c53ef05833b965779865e457bb8355f0700bfab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 13:58:14 +0100
Subject: [PATCH 426/591] fix(aws): quote % in `aws_prompt_info`

---
 plugins/aws/aws.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 3a3a111b4..c18bd634b 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -155,8 +155,8 @@ compctl -K _aws_profiles asp acp aws_change_access_key
 
 # AWS prompt
 function aws_prompt_info() {
-  [[ -z $AWS_PROFILE ]] && return
-  echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE}${ZSH_THEME_AWS_SUFFIX:=>}"
+  [[ -n "$AWS_PROFILE" ]] || return
+  echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE:gs/%/%%}${ZSH_THEME_AWS_SUFFIX:=>}"
 }
 
 if [[ "$SHOW_AWS_PROMPT" != false && "$RPROMPT" != *'$(aws_prompt_info)'* ]]; then

From a280726d934878a31f6dae35d8677a53551bbcf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 14:00:54 +0100
Subject: [PATCH 427/591] fix(fossil): refactor `fossil_prompt_info` and quote
 % in branch

---
 plugins/fossil/fossil.plugin.zsh | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/plugins/fossil/fossil.plugin.zsh b/plugins/fossil/fossil.plugin.zsh
index dfad73d36..a2123f415 100644
--- a/plugins/fossil/fossil.plugin.zsh
+++ b/plugins/fossil/fossil.plugin.zsh
@@ -13,23 +13,25 @@ ZSH_THEME_FOSSIL_PROMPT_DIRTY=" %{$fg_bold[red]%}✖"
 ZSH_THEME_FOSSIL_PROMPT_CLEAN=" %{$fg_bold[green]%}✔"
 
 function fossil_prompt_info() {
-  local _OUTPUT=`fossil branch 2>&1`
-  local _STATUS=`echo $_OUTPUT | grep "use --repo"`
-  if [ "$_STATUS" = "" ]; then
-    local _EDITED=`fossil changes`
-    local _EDITED_SYM="$ZSH_THEME_FOSSIL_PROMPT_CLEAN"
-    local _BRANCH=`echo $_OUTPUT | grep "* " | sed 's/* //g'`
+  local info=$(fossil branch 2>&1)
 
-    if [ "$_EDITED" != "" ]; then
-      _EDITED_SYM="$ZSH_THEME_FOSSIL_PROMPT_DIRTY"
-    fi
+  # if we're not in a fossil repo, don't show anything
+  ! command grep -q "use --repo" <<< "$info" || return
 
-    echo "$ZSH_THEME_FOSSIL_PROMPT_PREFIX" \
-      "$_BRANCH" \
-      "$ZSH_THEME_FOSSIL_PROMPT_SUFFIX" \
-      "$_EDITED_SYM"\
-      "%{$reset_color%}"
+  local branch=$(echo $info | grep "* " | sed 's/* //g')
+  local changes=$(fossil changes)
+  local dirty="$ZSH_THEME_FOSSIL_PROMPT_CLEAN"
+
+  if [[ -n "$changes" ]]; then
+    dirty="$ZSH_THEME_FOSSIL_PROMPT_DIRTY"
   fi
+
+  printf '%s %s %s %s %s' \
+    "$ZSH_THEME_FOSSIL_PROMPT_PREFIX" \
+    "${branch:gs/%/%%}" \
+    "$ZSH_THEME_FOSSIL_PROMPT_SUFFIX" \
+    "$dirty" \
+    "%{$reset_color%}"
 }
 
 function _fossil_prompt () {

From d87ab251c7fe18626b2d0c4e4a184e7bed7c508b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 14:03:36 +0100
Subject: [PATCH 428/591] fix(kubectx): quote % in `kubectx_prompt_info`

---
 plugins/kubectx/kubectx.plugin.zsh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
index abbdc254b..af9a17ef1 100644
--- a/plugins/kubectx/kubectx.plugin.zsh
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -1,9 +1,11 @@
 typeset -A kubectx_mapping
 
 function kubectx_prompt_info() {
-  if [ $commands[kubectl] ]; then
-    local current_ctx=`kubectl config current-context`
-    # use value in associative array if it exists, otherwise fall back to the context name
-    echo "${kubectx_mapping[$current_ctx]:-$current_ctx}"
-  fi
+  (( $+commands[kubectl] )) || return
+
+  local current_ctx=$(kubectl config current-context)
+
+  # use value in associative array if it exists
+  # otherwise fall back to the context name
+  echo "${${kubectx_mapping[$current_ctx]:-$current_ctx}:gs/%/%%}"
 }

From 8e973d42bd3bc5028d88ce731113b03ac8a5590c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 17:05:48 +0100
Subject: [PATCH 429/591] fix(bureau): fix `status` variable name causing error
 (#10561)

Also cleaned up the code a bit

Fixes #10561
---
 themes/bureau.zsh-theme | 53 ++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 7a253a688..50058e213 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -24,59 +24,58 @@ bureau_git_branch () {
 }
 
 bureau_git_status() {
-  local _STATUS _INDEX
+  local result gitstatus
 
   # check status of files
-  _INDEX=$(command git status --porcelain 2> /dev/null)
-  if [[ -n "$_INDEX" ]]; then
-    if $(echo "$_INDEX" | command grep -q '^[AMRD]. '); then
-      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
+  gitstatus=$(command git status --porcelain -b 2> /dev/null)
+  if [[ -n "$gitstatus" ]]; then
+    if $(echo "$gitstatus" | command grep -q '^[AMRD]. '); then
+      result+="$ZSH_THEME_GIT_PROMPT_STAGED"
     fi
-    if $(echo "$_INDEX" | command grep -q '^.[MTD] '); then
-      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
+    if $(echo "$gitstatus" | command grep -q '^.[MTD] '); then
+      result+="$ZSH_THEME_GIT_PROMPT_UNSTAGED"
     fi
-    if $(echo "$_INDEX" | command grep -q -E '^\?\? '); then
-      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
+    if $(echo "$gitstatus" | command grep -q -E '^\?\? '); then
+      result+="$ZSH_THEME_GIT_PROMPT_UNTRACKED"
     fi
-    if $(echo "$_INDEX" | command grep -q '^UU '); then
-      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
+    if $(echo "$gitstatus" | command grep -q '^UU '); then
+      result+="$ZSH_THEME_GIT_PROMPT_UNMERGED"
     fi
   else
-    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
+    result+="$ZSH_THEME_GIT_PROMPT_CLEAN"
   fi
 
   # check status of local repository
-  _INDEX=$(command git status --porcelain -b 2> /dev/null)
-  if $(echo "$_INDEX" | command grep -q '^## .*ahead'); then
-    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
+  if $(echo "$gitstatus" | command grep -q '^## .*ahead'); then
+    result+="$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
-  if $(echo "$_INDEX" | command grep -q '^## .*behind'); then
-    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
+  if $(echo "$gitstatus" | command grep -q '^## .*behind'); then
+    result+="$ZSH_THEME_GIT_PROMPT_BEHIND"
   fi
-  if $(echo "$_INDEX" | command grep -q '^## .*diverged'); then
-    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
+  if $(echo "$gitstatus" | command grep -q '^## .*diverged'); then
+    result+="$ZSH_THEME_GIT_PROMPT_DIVERGED"
   fi
 
   if $(command git rev-parse --verify refs/stash &> /dev/null); then
-    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
+    result+="$ZSH_THEME_GIT_PROMPT_STASHED"
   fi
 
-  echo $_STATUS
+  echo $result
 }
 
 bureau_git_prompt() {
-  local branch=$(bureau_git_branch)
-  local status=$(bureau_git_status)
+  local gitbranch=$(bureau_git_branch)
+  local gitstatus=$(bureau_git_status)
   local info
 
-  if [[ -z "${branch}" ]]; then
+  if [[ -z "$gitbranch" ]]; then
     return
   fi
 
-  info="${branch:gs/%/%%}"
+  info="${gitbranch:gs/%/%%}"
 
-  if [[ -n "${status}" ]]; then
-    info+=" $status"
+  if [[ -n "$gitstatus" ]]; then
+    info+=" $gitstatus"
   fi
 
   echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${info}${ZSH_THEME_GIT_PROMPT_SUFFIX}"

From a7c46d0ebdbeb23d751a61be8f9b64935572f720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 17:09:59 +0100
Subject: [PATCH 430/591] fix(ubuntu): fix `defining function based on alias`
 error (#10560)

Fixes #10560
---
 plugins/ubuntu/ubuntu.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index 989ffd1ff..7b765a406 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -53,7 +53,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 # Usage: aar ppa:xxxxxx/xxxxxx [packagename]
 # If packagename is not given as 2nd argument the function will ask for it and guess the default by taking
 # the part after the / from the ppa name which is sometimes the right name for the package you want to install
-aar() {
+function aar() {
 	if [ -n "$2" ]; then
 		PACKAGE=$2
 	else
@@ -76,7 +76,7 @@ aar() {
 #   apt-history rollback
 #   apt-history list
 # Based On: https://linuxcommando.blogspot.com/2008/08/how-to-show-apt-log-history.html
-apt-history () {
+function apt-history() {
   case "$1" in
     install)
       zgrep --no-filename 'install ' $(ls -rt /var/log/dpkg*)
@@ -105,7 +105,7 @@ apt-history () {
 }
 
 # Kernel-package building shortcut
-kerndeb () {
+function kerndeb() {
   # temporarily unset MAKEFLAGS ( '-j3' will fail )
   MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )
   print '$MAKEFLAGS set to '"'$MAKEFLAGS'"

From 31d63ea884e8ef56a40bed8771cdd8d3aec131f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 4 Jan 2022 11:38:53 +0100
Subject: [PATCH 431/591] fix(kubectx): allow prompt sequences in
 `kubectx_mapping` (#10562)

Fixes #10562
---
 plugins/kubectx/kubectx.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
index af9a17ef1..1419f102f 100644
--- a/plugins/kubectx/kubectx.plugin.zsh
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -1,4 +1,4 @@
-typeset -A kubectx_mapping
+typeset -g -A kubectx_mapping
 
 function kubectx_prompt_info() {
   (( $+commands[kubectl] )) || return
@@ -7,5 +7,5 @@ function kubectx_prompt_info() {
 
   # use value in associative array if it exists
   # otherwise fall back to the context name
-  echo "${${kubectx_mapping[$current_ctx]:-$current_ctx}:gs/%/%%}"
+  echo "${kubectx_mapping[$current_ctx]:-${current_ctx:gs/%/%%}}"
 }

From d3bb52d7d825f2a6ce2e1c76ca472b05c6f27b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 5 Jan 2022 09:10:32 +0100
Subject: [PATCH 432/591] style: declare globals properly

By default, `typeset` defines variables locally unless in the main scope.
This is specially bad when using `omz plugin load`, which happens inside
a function, so the declared variables don't continue being defined when
the function finishes and the main scope reappears.
---
 plugins/colored-man-pages/colored-man-pages.plugin.zsh | 2 +-
 plugins/deno/deno.plugin.zsh                           | 2 +-
 plugins/fnm/fnm.plugin.zsh                             | 2 +-
 plugins/gh/gh.plugin.zsh                               | 2 +-
 plugins/helm/helm.plugin.zsh                           | 2 +-
 plugins/rbw/rbw.plugin.zsh                             | 2 +-
 plugins/rust/rust.plugin.zsh                           | 4 ++--
 plugins/rvm/rvm.plugin.zsh                             | 2 +-
 plugins/volta/volta.plugin.zsh                         | 2 +-
 themes/dieter.zsh-theme                                | 2 +-
 themes/jonathan.zsh-theme                              | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index 087ddce97..981992d88 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -22,7 +22,7 @@ less_termcap[ue]="${reset_color}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
 # Absolute path to this file's directory.
-typeset __colored_man_pages_dir="${0:A:h}"
+typeset -g __colored_man_pages_dir="${0:A:h}"
 
 function colored() {
   local -a environment
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 77c2125d2..6c12bae13 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -32,7 +32,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `deno`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_deno" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _deno
   _comps[deno]=_deno
 fi
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index e22588792..044e16a04 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -18,7 +18,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `fnm`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_fnm" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _fnm
   _comps[fnm]=_fnm
 fi
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index 17995e1cf..9263220ca 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -19,7 +19,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `gh`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_gh" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _gh
   _comps[gh]=_gh
 fi
diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index 472c1c9dd..c6b91693a 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -14,7 +14,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `helm`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _helm
   _comps[helm]=_helm
 fi
diff --git a/plugins/rbw/rbw.plugin.zsh b/plugins/rbw/rbw.plugin.zsh
index 3825be7a6..56683ad06 100644
--- a/plugins/rbw/rbw.plugin.zsh
+++ b/plugins/rbw/rbw.plugin.zsh
@@ -11,7 +11,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `rbw`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_rbw" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _rbw
   _comps[rbw]=_rbw
 fi
diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh
index 014c73b3b..465b701b0 100644
--- a/plugins/rust/rust.plugin.zsh
+++ b/plugins/rust/rust.plugin.zsh
@@ -11,7 +11,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # bind it to `cargo`. Otherwise, compinit will have already done that
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_cargo" ]]; then
   autoload -Uz _cargo
-  declare -A _comps
+  typeset -g -A _comps
   _comps[cargo]=_cargo
 fi
 
@@ -19,7 +19,7 @@ fi
 # bind it to `rustup`. Otherwise, compinit will have already done that
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_rustup" ]]; then
   autoload -Uz _rustup
-  declare -A _comps
+  typeset -g -A _comps
   _comps[rustup]=_rustup
 fi
 
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 4ba885563..864389ba8 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,7 +1,7 @@
 # Completion
 fpath+=("${rvm_path}/scripts/zsh/Completion")
 
-declare -A _comps
+typeset -g -A _comps
 autoload -Uz _rvm
 _comps[rvm]=_rvm
 
diff --git a/plugins/volta/volta.plugin.zsh b/plugins/volta/volta.plugin.zsh
index 756dc84b3..79319394c 100644
--- a/plugins/volta/volta.plugin.zsh
+++ b/plugins/volta/volta.plugin.zsh
@@ -11,7 +11,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `deno`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_volta" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _volta
   _comps[volta]=_volta
 fi
diff --git a/themes/dieter.zsh-theme b/themes/dieter.zsh-theme
index 58d9f88a9..83f2dcc7c 100644
--- a/themes/dieter.zsh-theme
+++ b/themes/dieter.zsh-theme
@@ -6,7 +6,7 @@
 # The exit code visual cues will only display once.
 # (i.e. they will be reset, even if you hit enter a few times on empty command prompts)
 
-typeset -A host_repr
+typeset -g -A host_repr
 
 # translate hostnames into shortened, colorcoded strings
 host_repr=('dieter-ws-a7n8x-arch' "%{$fg_bold[green]%}ws" 'dieter-p4sci-arch' "%{$fg_bold[blue]%}p4")
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 11d799a84..e8c490884 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -66,7 +66,7 @@ if [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
   PR_LRCORNER="┘"
   PR_URCORNER="┐"
 else
-  typeset -A altchar
+  typeset -g -A altchar
   set -A altchar ${(s..)terminfo[acsc]}
   # Some stuff to help us draw nice lines
   PR_SET_CHARSET="%{$terminfo[enacs]%}"

From 7ae4f76f6dda1521505c57880ea1e5ee2f1aa183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 5 Jan 2022 09:03:30 +0100
Subject: [PATCH 433/591] refactor(kubectl): optimize completion generation

---
 plugins/kubectl/kubectl.plugin.zsh | 32 ++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 3630facaa..bf602bb7b 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -1,13 +1,22 @@
 if (( $+commands[kubectl] )); then
-    __KUBECTL_COMPLETION_FILE="${ZSH_CACHE_DIR}/kubectl_completion"
+  # TODO: 2022-01-05: remove this block
+  # remove old generated files
+  command rm -f "$ZSH_CACHE_DIR/kubectl_completion"
 
-    if [[ ! -f $__KUBECTL_COMPLETION_FILE || ! -s $__KUBECTL_COMPLETION_FILE ]]; then
-        kubectl completion zsh >! $__KUBECTL_COMPLETION_FILE
-    fi
+  # TODO: 2022-01-05: remove this bit of code as it exists in oh-my-zsh.sh
+  # Add completions folder in $ZSH_CACHE_DIR
+  command mkdir -p "$ZSH_CACHE_DIR/completions"
+  (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
-    [[ -f $__KUBECTL_COMPLETION_FILE ]] && source $__KUBECTL_COMPLETION_FILE
+  # If the completion file doesn't exist yet, we need to autoload it and
+  # bind it to `kubectl`. Otherwise, compinit will have already done that.
+  if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
+    typeset -g -A _comps
+    autoload -Uz _kubectl
+    _comps[kubectl]=_kubectl
+  fi
 
-    unset __KUBECTL_COMPLETION_FILE
+  kubectl completion zsh >! "$ZSH_CACHE_DIR/completions/_kubectl" &|
 fi
 
 # This command is used a LOT both below and in daily life
@@ -97,8 +106,9 @@ alias kdd='kubectl describe deployment'
 alias kdeld='kubectl delete deployment'
 alias ksd='kubectl scale deployment'
 alias krsd='kubectl rollout status deployment'
-kres(){
-    kubectl set env $@ REFRESHED_AT=$(date +%Y%m%d%H%M%S)
+
+function kres(){
+  kubectl set env $@ REFRESHED_AT=$(date +%Y%m%d%H%M%S)
 }
 
 # Rollout management.
@@ -170,9 +180,9 @@ alias kdelcj='kubectl delete cronjob'
 
 # Only run if the user actually has kubectl installed
 if (( ${+_comps[kubectl]} )); then
-  kj() { kubectl "$@" -o json | jq; }
-  kjx() { kubectl "$@" -o json | fx; }
-  ky() { kubectl "$@" -o yaml | yh; }
+  function kj() { kubectl "$@" -o json | jq; }
+  function kjx() { kubectl "$@" -o json | fx; }
+  function ky() { kubectl "$@" -o yaml | yh; }
 
   compdef kj=kubectl
   compdef kjx=kubectl

From 67cc59b4258a13232cddfddd75f44d8ca2b80172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 5 Jan 2022 09:23:27 +0100
Subject: [PATCH 434/591] style: some code style fixes

---
 .../frontend-search.plugin.zsh                | 32 ++++++-------
 plugins/pj/pj.plugin.zsh                      | 47 +++++++++----------
 2 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 437e477b9..7f8d5c90c 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -39,7 +39,7 @@ function frontend() {
   emulate -L zsh
 
   # define search context URLS
-  typeset -A urls
+  local -A urls
   urls=(
     angular        'https://angular.io/?search='
     angularjs      $(_frontend_fallback 'angularjs.org')
@@ -73,25 +73,23 @@ function frontend() {
   )
 
   # show help for command list
-  if [[ $# -lt 2 ]]
-  then
-      print -P "Usage: frontend %Ucontext%u %Uterm%u [...%Umore%u] (or just: %Ucontext%u %Uterm%u [...%Umore%u])"
-      print -P ""
-      print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website,"
-      print -P "and %Ucontext%u is one of the following:"
-      print -P ""
-      print -P "  angular, angularjs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow, packagephobia"
-      print -P "  dartlang, emberjs, fontello, flowtype, github, html5please, jestjs, jquery, lodash,"
-      print -P "  mdn, npmjs, nodejs, qunit, reactjs, smacss, stackoverflow, unheap, vuejs, bundlephobia"
-      print -P ""
-      print -P "For example: frontend npmjs mocha (or just: npmjs mocha)."
-      print -P ""
-      return 1
+  if [[ $# -lt 2 ]]; then
+    print -P "Usage: frontend %Ucontext%u %Uterm%u [...%Umore%u] (or just: %Ucontext%u %Uterm%u [...%Umore%u])"
+    print -P ""
+    print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website,"
+    print -P "and %Ucontext%u is one of the following:"
+    print -P ""
+    print -P "  angular, angularjs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow, packagephobia"
+    print -P "  dartlang, emberjs, fontello, flowtype, github, html5please, jestjs, jquery, lodash,"
+    print -P "  mdn, npmjs, nodejs, qunit, reactjs, smacss, stackoverflow, unheap, vuejs, bundlephobia"
+    print -P ""
+    print -P "For example: frontend npmjs mocha (or just: npmjs mocha)."
+    print -P ""
+    return 1
   fi
 
   # check whether the search context is supported
-  if [[ -z "$urls[$1]" ]]
-  then
+  if [[ -z "$urls[$1]" ]]; then
     echo "Search context \"$1\" currently not supported."
     echo ""
     echo "Valid contexts are:"
diff --git a/plugins/pj/pj.plugin.zsh b/plugins/pj/pj.plugin.zsh
index e36d49204..431576f4b 100644
--- a/plugins/pj/pj.plugin.zsh
+++ b/plugins/pj/pj.plugin.zsh
@@ -1,37 +1,34 @@
 alias pjo="pj open"
 
-pj () {
-    emulate -L zsh
+function pj() {
+  local cmd="cd"
+  local project="$1"
 
-    cmd="cd"
-    project=$1
+  if [[ "open" == "$project" ]]; then
+    shift
+    project=$*
+    cmd=${=EDITOR}
+  else
+    project=$*
+  fi
 
-    if [[ "open" == "$project" ]]; then
-        shift
-        project=$*
-        cmd=${=EDITOR}
-    else
-        project=$*
+  for basedir ($PROJECT_PATHS); do
+    if [[ -d "$basedir/$project" ]]; then
+      $cmd "$basedir/$project"
+      return
     fi
+  done
 
-    for basedir ($PROJECT_PATHS); do
-        if [[ -d "$basedir/$project" ]]; then
-            $cmd "$basedir/$project"
-            return
-        fi
-    done
-
-    echo "No such project '${project}'."
+  echo "No such project '${project}'."
 }
 
 _pj () {
-    emulate -L zsh
+  local -a projects
+  for basedir ($PROJECT_PATHS); do
+    projects+=(${basedir}/*(/N))
+  done
 
-    typeset -a projects
-    for basedir ($PROJECT_PATHS); do
-        projects+=(${basedir}/*(/N))
-    done
-
-    compadd ${projects:t}
+  compadd ${projects:t}
 }
+
 compdef _pj pj

From 4e2f4cdf686fe560cec3ec7072628c4d0f723929 Mon Sep 17 00:00:00 2001
From: Sang-Yun Oh <syoh@users.noreply.github.com>
Date: Sat, 8 Jan 2022 01:34:42 +0900
Subject: [PATCH 435/591] docs(vi-mode): fix link typo in readme (#10570)

---
 plugins/vi-mode/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index a1d6bc6b0..476666bf6 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -30,10 +30,10 @@ plugins=(... vi-mode)
   ```
 
 - `MODE_INDICATOR`: controls the string displayed when the shell is in normal mode.
-  See [Mode indicator](#mode-indicator) for details.
+  See [Mode indicators](#mode-indicators) for details.
 
 - `INSERT_MODE_INDICATOR`: controls the string displayed when the shell is in insert mode.
-  See [Mode indicator](#mode-indicator) for details.
+  See [Mode indicators](#mode-indicators) for details.
 
 ## Mode indicators
 

From 71e6d5fde87be76205e87eed2e1a306a2f3bc5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20G=C3=BCnter?= <n4zroth@gmail.com>
Date: Sat, 8 Jan 2022 19:59:59 +0100
Subject: [PATCH 436/591] fix(svn): fix output order in `svn_dirty_choose`
 (#10572)

---
 plugins/svn/svn.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 9c3b50d16..e55e5b2dd 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -67,10 +67,10 @@ svn_dirty_choose() {
   root=$(sed -n 's/^Working Copy Root Path: //p' <<< "${1:-$(LANG= svn info 2>/dev/null)}")
   if LANG= svn status "$root" 2>/dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
     # Grep exits with 0 when "One or more lines were selected", return "dirty".
-    echo $1
+    echo $2
   else
     # Otherwise, no lines were found, or an error occurred. Return clean.
-    echo $2
+    echo $3
   fi
 }
 

From c6e7f8905fb61b927f12f43fb57f8c514cd48a67 Mon Sep 17 00:00:00 2001
From: Joey Territo <54502648+jtt9340@users.noreply.github.com>
Date: Sat, 8 Jan 2022 14:03:32 -0500
Subject: [PATCH 437/591] fix(rust): fix `cargo` completion when sysroot
 contains spaces (#10571)

When generating completions for Cargo, if the Rust sysroot
(i.e. `rustc +${${(z)$(rustup default)}[1]} --print sysroot`) contains
spaces, Cargo completions will not work because the spaces are not
escaped, thus passing two arguments to the "source" command instead of
one. The spaces need to be escaped for this to work.
---
 plugins/rust/rust.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh
index 465b701b0..db6ca9e74 100644
--- a/plugins/rust/rust.plugin.zsh
+++ b/plugins/rust/rust.plugin.zsh
@@ -27,5 +27,5 @@ fi
 rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
 cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF'
 #compdef cargo
-source $(rustc +${${(z)$(rustup default)}[1]} --print sysroot)/share/zsh/site-functions/_cargo
+source "$(rustc +${${(z)$(rustup default)}[1]} --print sysroot)"/share/zsh/site-functions/_cargo
 EOF

From a92ee838f3e6b1a8dba548673555ebd514939324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 9 Jan 2022 20:27:22 +0100
Subject: [PATCH 438/591] fix(cli): follow symlinks in plugin or theme
 completions

---
 lib/cli.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 8cf8368e6..0a85402df 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -61,7 +61,7 @@ function _omz {
           # if command is "disable", only offer already enabled plugins
           valid_plugins=($plugins)
         else
-          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
           # if command is "enable", remove already enabled plugins
           [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
         fi
@@ -69,11 +69,11 @@ function _omz {
         _describe 'plugin' valid_plugins ;;
       plugin::info)
         local -aU plugins
-        plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+        plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
         _describe 'plugin' plugins ;;
       theme::(set|use))
         local -aU themes
-        themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+        themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
         _describe 'theme' themes ;;
     esac
   elif (( CURRENT > 4 )); then
@@ -85,7 +85,7 @@ function _omz {
           # if command is "disable", only offer already enabled plugins
           valid_plugins=($plugins)
         else
-          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
           # if command is "enable", remove already enabled plugins
           [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
         fi

From fbdc078fa60c2c34a7f5078846902538d162fbee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 9 Jan 2022 23:06:34 +0100
Subject: [PATCH 439/591] style: use 24bit colors in Oh My Zsh logo if
 supported

---
 tools/install.sh | 62 ++++++++++++++++++++++++++++++++++++------------
 tools/upgrade.sh | 48 ++++++++++++++++++++++++++++++-------
 2 files changed, 86 insertions(+), 24 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 731d89a29..5009bd586 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -127,6 +127,24 @@ supports_hyperlinks() {
   return 1
 }
 
+# Adapted from code and information by Anton Kochkov (@XVilka)
+# Source: https://gist.github.com/XVilka/8346728
+supports_truecolor() {
+  case "$COLORTERM" in
+  truecolor|24bit) return 0 ;;
+  esac
+
+  case "$TERM" in
+  iterm           |\
+  tmux-truecolor  |\
+  linux-truecolor |\
+  xterm-truecolor |\
+  screen-truecolor) return 0 ;;
+  esac
+
+  return 1
+}
+
 fmt_link() {
   # $1: text, $2: url, $3: fallback mode
   if supports_hyperlinks; then
@@ -155,7 +173,28 @@ fmt_error() {
 
 setup_color() {
   # Only use colors if connected to a terminal
-  if is_tty; then
+  if ! is_tty; then
+    RAINBOW=""
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    BOLD=""
+    RESET=""
+    return
+  fi
+
+  if supports_truecolor; then
+    RAINBOW="
+      $(printf '\033[38;2;255;0;0m')
+      $(printf '\033[38;2;255;97;0m')
+      $(printf '\033[38;2;247;255;0m')
+      $(printf '\033[38;2;0;255;30m')
+      $(printf '\033[38;2;77;0;255m')
+      $(printf '\033[38;2;168;0;255m')
+      $(printf '\033[38;2;245;0;172m')
+    "
+  else
     RAINBOW="
       $(printf '\033[38;5;196m')
       $(printf '\033[38;5;202m')
@@ -165,21 +204,14 @@ setup_color() {
       $(printf '\033[38;5;093m')
       $(printf '\033[38;5;163m')
     "
-    RED=$(printf '\033[31m')
-    GREEN=$(printf '\033[32m')
-    YELLOW=$(printf '\033[33m')
-    BLUE=$(printf '\033[34m')
-    BOLD=$(printf '\033[1m')
-    RESET=$(printf '\033[m')
-  else
-    RAINBOW=""
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    BOLD=""
-    RESET=""
   fi
+
+  RED=$(printf '\033[31m')
+  GREEN=$(printf '\033[32m')
+  YELLOW=$(printf '\033[33m')
+  BLUE=$(printf '\033[34m')
+  BOLD=$(printf '\033[1m')
+  RESET=$(printf '\033[0m')
 }
 
 setup_ohmyzsh() {
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 994ffe9c9..25381de7e 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -86,6 +86,24 @@ supports_hyperlinks() {
   return 1
 }
 
+# Adapted from code and information by Anton Kochkov (@XVilka)
+# Source: https://gist.github.com/XVilka/8346728
+supports_truecolor() {
+  case "$COLORTERM" in
+  truecolor|24bit) return 0 ;;
+  esac
+
+  case "$TERM" in
+  iterm           |\
+  tmux-truecolor  |\
+  linux-truecolor |\
+  xterm-truecolor |\
+  screen-truecolor) return 0 ;;
+  esac
+
+  return 1
+}
+
 fmt_link() {
   # $1: text, $2: url, $3: fallback mode
   if supports_hyperlinks; then
@@ -107,15 +125,27 @@ setopt typeset_silent
 typeset -a RAINBOW
 
 if is_tty; then
-  RAINBOW=(
-    "$(printf '\033[38;5;196m')"
-    "$(printf '\033[38;5;202m')"
-    "$(printf '\033[38;5;226m')"
-    "$(printf '\033[38;5;082m')"
-    "$(printf '\033[38;5;021m')"
-    "$(printf '\033[38;5;093m')"
-    "$(printf '\033[38;5;163m')"
-  )
+  if supports_truecolor; then
+    RAINBOW=(
+      "$(printf '\033[38;2;255;0;0m')"
+      "$(printf '\033[38;2;255;97;0m')"
+      "$(printf '\033[38;2;247;255;0m')"
+      "$(printf '\033[38;2;0;255;30m')"
+      "$(printf '\033[38;2;77;0;255m')"
+      "$(printf '\033[38;2;168;0;255m')"
+      "$(printf '\033[38;2;245;0;172m')"
+    )
+  else
+    RAINBOW=(
+      "$(printf '\033[38;5;196m')"
+      "$(printf '\033[38;5;202m')"
+      "$(printf '\033[38;5;226m')"
+      "$(printf '\033[38;5;082m')"
+      "$(printf '\033[38;5;021m')"
+      "$(printf '\033[38;5;093m')"
+      "$(printf '\033[38;5;163m')"
+    )
+  fi
 
   RED=$(printf '\033[31m')
   GREEN=$(printf '\033[32m')

From 0ca2e48ee8449439a6e0a4ca0652a4ec07031ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 10 Jan 2022 17:22:31 +0100
Subject: [PATCH 440/591] ci(project): fix `gh pr view` call to use ohmyzsh
 repository

---
 .github/workflows/project.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 2a27b70fc..bb1063acb 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -47,21 +47,23 @@ jobs:
           ISSUE_OR_PR_ID: ${{ github.event.issue.node_id || github.event.pull_request.node_id }}
         run: |
           item_id="$(gh api graphql -f query='
-            mutation($project: ID!, $item: ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $item}) {
+            mutation($project: ID!, $content: ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $content}) {
                 projectNextItem {
                   id
                 }
               }
             }
-          ' -f project=$PROJECT_ID -f item=$ISSUE_OR_PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+          ' -f project=$PROJECT_ID -f content=$ISSUE_OR_PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
 
           echo "ITEM_ID=$item_id" >> $GITHUB_ENV
 
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
         run: |
-          gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
+          gh pr view ${{ github.event.pull_request.number }} \
+            --repo ${{ github.repository }} \
+            --json files --jq '.files.[].path' | awk -F/ '
             /^plugins\// {
               plugins[$2] = 1
             }

From 971683762e3aba543b0dc787e8a5ee1c16b5ace7 Mon Sep 17 00:00:00 2001
From: WeZZard <960509+WeZZard@users.noreply.github.com>
Date: Tue, 11 Jan 2022 01:38:35 +0800
Subject: [PATCH 441/591] fix(avit): disable `log.showSignatures` in
 `_git_time_since_commit` (#10072)

---
 themes/avit.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index 1e20d8f9f..d117c4e94 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -31,7 +31,7 @@ function _git_time_since_commit() {
   local last_commit now seconds_since_last_commit
   local minutes hours days years commit_age
   # Only proceed if there is actually a commit.
-  if last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null); then
+  if last_commit=$(command git -c log.showSignatures=false log --format='%at' -1 2>/dev/null); then
     now=$(date +%s)
     seconds_since_last_commit=$((now-last_commit))
 

From 9c84c344d762b200de7acc794b9a0e7832144e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 10 Jan 2022 19:39:05 +0100
Subject: [PATCH 442/591] fix: disable `log.showSignature` in `git log` calls

---
 plugins/git/git.plugin.zsh  | 4 +---
 themes/Soliah.zsh-theme     | 4 +---
 themes/avit.zsh-theme       | 2 +-
 themes/dogenpunk.zsh-theme  | 4 +---
 themes/smt.zsh-theme        | 2 +-
 themes/wedisagree.zsh-theme | 4 +---
 tools/changelog.sh          | 2 +-
 7 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 648fa0a33..8f7e623ec 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -24,9 +24,7 @@ compdef _git _git_log_prettily=git-log
 
 # Warn if the current branch is a WIP
 function work_in_progress() {
-  if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
-    echo "WIP!!"
-  fi
+  command git -c log.showSignature=false log -n 1 2>/dev/null | grep -q -- "--wip--" && echo "WIP!!"
 }
 
 # Check if main exists and use instead of master
diff --git a/themes/Soliah.zsh-theme b/themes/Soliah.zsh-theme
index 070c54981..c3dd6af89 100644
--- a/themes/Soliah.zsh-theme
+++ b/themes/Soliah.zsh-theme
@@ -45,9 +45,7 @@ function rvm_gemset() {
 function git_time_since_commit() {
     if git rev-parse --git-dir > /dev/null 2>&1; then
         # Only proceed if there is actually a commit.
-        if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
-            # Get the last commit.
-            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+        if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
             now=`date +%s`
             seconds_since_last_commit=$((now-last_commit))
 
diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index d117c4e94..f90ba331b 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -31,7 +31,7 @@ function _git_time_since_commit() {
   local last_commit now seconds_since_last_commit
   local minutes hours days years commit_age
   # Only proceed if there is actually a commit.
-  if last_commit=$(command git -c log.showSignatures=false log --format='%at' -1 2>/dev/null); then
+  if last_commit=$(command git -c log.showSignature=false log --format='%at' -1 2>/dev/null); then
     now=$(date +%s)
     seconds_since_last_commit=$((now-last_commit))
 
diff --git a/themes/dogenpunk.zsh-theme b/themes/dogenpunk.zsh-theme
index 6a9921288..923ca74bc 100644
--- a/themes/dogenpunk.zsh-theme
+++ b/themes/dogenpunk.zsh-theme
@@ -37,9 +37,7 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
 function git_time_since_commit() {
     if git rev-parse --git-dir > /dev/null 2>&1; then
         # Only proceed if there is actually a commit.
-        if git log -n 1  > /dev/null 2>&1; then
-            # Get the last commit.
-            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+        if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
             now=`date +%s`
             seconds_since_last_commit=$((now-last_commit))
 
diff --git a/themes/smt.zsh-theme b/themes/smt.zsh-theme
index 7f54472c6..52e6d9a21 100644
--- a/themes/smt.zsh-theme
+++ b/themes/smt.zsh-theme
@@ -40,7 +40,7 @@ function git_time_since_commit() {
     local last_commit seconds_since_last_commit
 
     # Only proceed if there is actually a commit
-    if ! last_commit=$(command git log --pretty=format:'%at' -1 2>/dev/null); then
+    if ! last_commit=$(command git -c log.showSignature=false log --pretty=format:'%at' -1 2>/dev/null); then
         echo "[$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL~%{$reset_color%}]"
         return
     fi
diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme
index 07006ecd9..e9e9d6ef8 100644
--- a/themes/wedisagree.zsh-theme
+++ b/themes/wedisagree.zsh-theme
@@ -69,9 +69,7 @@ function rvm_gemset() {
 function git_time_since_commit() {
     if git rev-parse --git-dir > /dev/null 2>&1; then
         # Only proceed if there is actually a commit.
-        if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
-            # Get the last commit.
-            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+        if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
             now=`date +%s`
             seconds_since_last_commit=$((now-last_commit))
 
diff --git a/tools/changelog.sh b/tools/changelog.sh
index 664f34608..86774a7ea 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -414,7 +414,7 @@ function main {
   # --first-parent: commits from merged branches are omitted
   local SEP="0mZmAgIcSeP"
   local -a raw_commits
-  raw_commits=(${(0)"$(command git log -z \
+  raw_commits=(${(0)"$(command git -c log.showSignature=false log -z \
     --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \
     --no-merges --first-parent $range)"})
 

From b7a59e6d5c1a699b972a780b4a4eb4ffd89f22b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 11 Jan 2022 16:18:00 +0100
Subject: [PATCH 443/591] fix(installer): run `chsh` with sudo if user has
 privileges

This fixes the error in Google Cloud Shell, where a password prompt
appears when running `chsh` but the user (hello) does not have a
password.

If ran with `sudo`, the `chsh` command happens without a password
prompt.
---
 tools/install.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 5009bd586..d3be1ace4 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -317,7 +317,7 @@ EOF
     "$YELLOW" "$RESET"
   read -r opt
   case $opt in
-    y*|Y*|"") echo "Changing the shell..." ;;
+    y*|Y*|"") ;;
     n*|N*) echo "Shell change skipped."; return ;;
     *) echo "Invalid choice. Shell change skipped."; return ;;
   esac
@@ -355,11 +355,20 @@ EOF
   if [ -n "$SHELL" ]; then
     echo "$SHELL" > ~/.shell.pre-oh-my-zsh
   else
-    grep "^$USERNAME:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
+    grep "^$USER:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
   fi
 
-  # Actually change the default shell to zsh
-  if ! chsh -s "$zsh"; then
+  echo "Changing your shell to $zsh..."
+
+  # Check if user has sudo privileges and run `chsh` or `sudo chsh`
+  if LANG= sudo -l -U "$USER" 2>/dev/null | grep -q "is not allowed to run"; then
+    chsh -s "$zsh" "$USER"          # run chsh normally
+  else
+    sudo -k chsh -s "$zsh" "$USER"  # -k forces the password prompt
+  fi
+
+  # Check if the shell change was successful
+  if [ $? -ne 0 ]; then
     fmt_error "chsh command unsuccessful. Change your default shell manually."
   else
     export SHELL="$zsh"

From a0a949de56f7bc63403c521bfb1d7426843ec5b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 11 Jan 2022 18:56:18 +0100
Subject: [PATCH 444/591] fix(installer): fix `sudo` check for users with
 password or without privileges

The previous check only worked if the user could run `sudo` without typing the
password, which is almost none (I checked in Google Cloud Shell so I failed to
notice this).

This new check works whether the user has no sudo privileges, or if it has,
whether they have to type in the password or not.

It should really be easier to check if the user doesn't have privilege without
having to make them type the password.
---
 tools/install.sh | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index d3be1ace4..b7498fa64 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -56,6 +56,28 @@ command_exists() {
   command -v "$@" >/dev/null 2>&1
 }
 
+user_can_sudo() {
+  # The following command has 3 parts:
+  #
+  # 1. Run `sudo` with `-v`. Does the following:
+  #    • with privilege: asks for a password immediately.
+  #    • without privilege: exits with error code 1 and prints the message:
+  #      Sorry, user <username> may not run sudo on <hostname>
+  #
+  # 2. Pass `-S` to `sudo` to tell it to get the password from stdin
+  #    instead of from a tty, and pipe `true` to `sudo`, since it doesn't
+  #    output anything. This will make sudo exit with error code 1 and print
+  #    the message:
+  #    sudo: no password was provided
+  #
+  # 3. Check for the words "may not run sudo" in the output to really tell
+  #    whether the user has privileges or not. For that we have to make sure
+  #    to run `sudo` in the default locale (with `LANG=`) so that the message
+  #    stays consistent regardless of the user's locale.
+  #
+  true | LANG= sudo -v -S 2>&1 | grep -q "may not run sudo"
+}
+
 # The [ -t 1 ] check only works when the function is not called from
 # a subshell (like in `$(...)` or `(...)`, so this hack redefines the
 # function at the top level to always return false when stdout is not
@@ -360,8 +382,16 @@ EOF
 
   echo "Changing your shell to $zsh..."
 
-  # Check if user has sudo privileges and run `chsh` or `sudo chsh`
-  if LANG= sudo -l -U "$USER" 2>/dev/null | grep -q "is not allowed to run"; then
+  # Check if user has sudo privileges to run `chsh` with or without `sudo`
+  #
+  # This allows the call to succeed without password on systems where the
+  # user does not have a password but does have sudo privileges, like in
+  # Google Cloud Shell.
+  #
+  # On systems that don't have a user with passwordless sudo, the user will
+  # be prompted for the password either way, so this shouldn't cause any issues.
+  #
+  if user_can_sudo; then
     chsh -s "$zsh" "$USER"          # run chsh normally
   else
     sudo -k chsh -s "$zsh" "$USER"  # -k forces the password prompt

From c63ba17525b0b4344729762253c9d9e1c0823d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 11 Jan 2022 19:53:50 +0100
Subject: [PATCH 445/591] refactor(installer): simplify `user_can_sudo` check

---
 tools/install.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index b7498fa64..d3f1ee640 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -64,18 +64,18 @@ user_can_sudo() {
   #    • without privilege: exits with error code 1 and prints the message:
   #      Sorry, user <username> may not run sudo on <hostname>
   #
-  # 2. Pass `-S` to `sudo` to tell it to get the password from stdin
-  #    instead of from a tty, and pipe `true` to `sudo`, since it doesn't
-  #    output anything. This will make sudo exit with error code 1 and print
-  #    the message:
-  #    sudo: no password was provided
+  # 2. Pass `-n` to `sudo` to tell it to not ask for a password. If the
+  #    password is not required, the command will finish with exit code 0.
+  #    If one is required, sudo will exit with error code 1 and print the
+  #    message:
+  #    sudo: a password is required
   #
   # 3. Check for the words "may not run sudo" in the output to really tell
   #    whether the user has privileges or not. For that we have to make sure
   #    to run `sudo` in the default locale (with `LANG=`) so that the message
   #    stays consistent regardless of the user's locale.
   #
-  true | LANG= sudo -v -S 2>&1 | grep -q "may not run sudo"
+  LANG= sudo -n -v 2>&1 | grep -q "may not run sudo"
 }
 
 # The [ -t 1 ] check only works when the function is not called from

From b4819557618bbf8452c612f614ad824d243bb376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 11 Jan 2022 23:40:33 +0100
Subject: [PATCH 446/591] ci(project): fix .list files not found error

---
 .github/workflows/project.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index bb1063acb..800761554 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -61,6 +61,8 @@ jobs:
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
         run: |
+          touch plugins.list themes.list
+
           gh pr view ${{ github.event.pull_request.number }} \
             --repo ${{ github.repository }} \
             --json files --jq '.files.[].path' | awk -F/ '

From 93cea53618ebd3f108275c88c948f790492337b4 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Wed, 12 Jan 2022 12:19:34 +0100
Subject: [PATCH 447/591] fix(yarn): update completion (#10579)

Fixes #10578
---
 plugins/yarn/_yarn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/yarn/_yarn b/plugins/yarn/_yarn
index 9db02602e..1237ba672 100644
--- a/plugins/yarn/_yarn
+++ b/plugins/yarn/_yarn
@@ -116,7 +116,7 @@ _yarn_commands_scripts() {
   fi
 
   if [[ -n $packageJson ]]; then
-    scripts=($(cat "$packageJson" | perl -0777 -MJSON::PP -n -E '%r=decode_json($_); say for sort keys %{$r->{scripts}}'))
+    scripts=($(cat "$packageJson" | perl -0777 -MJSON::PP -n -E '$r=decode_json($_); do{($k=$_)=~s/:/\\:/g;say $k}for sort keys %{$r->{scripts}}'))
   fi
 
   _describe 'command or script' _commands -- _global_commands -- scripts -- binaries
@@ -144,7 +144,7 @@ _yarn_scripts() {
   fi
 
   if [[ -n $packageJson ]]; then
-    scripts=("${(@f)$(cat ${packageJson} | perl -0777 -MJSON::PP -n -E '%r=%{decode_json($_)->{scripts}}; printf "$_:$r{$_}\n" for sort keys %r')}")
+    scripts=("${(@f)$(cat ${packageJson} | perl -0777 -MJSON::PP -n -E '%r=%{decode_json($_)->{scripts}}; do{$k=$_;($e=$k)=~s/:/\\:/g; printf "$e:$r{$k}\n"} for sort keys %r')}")
   fi
 
   commands=('env' $scripts $binaries)

From bddecfed58058910f0aeb78d9010f4f8f6d83692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 13 Jan 2022 12:34:10 +0100
Subject: [PATCH 448/591] style(updater): remove statl from `git pull`

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 25381de7e..55412062a 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -194,7 +194,7 @@ last_commit=$(git rev-parse "$branch")
 
 # Update Oh My Zsh
 printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
-if git pull --rebase --stat $remote $branch; then
+if git pull --rebase $remote $branch; then
   # Check if it was really updated or not
   if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
     message="Oh My Zsh is already at the latest version."

From aaebe4c890394cb5d345c949aecb77aaf30b9c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 13 Jan 2022 14:29:12 +0100
Subject: [PATCH 449/591] fix(mvn): fix listing modules in completion (#10586)

---
 plugins/mvn/mvn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index e32729aa6..1b9141f21 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -117,7 +117,7 @@ function listMavenCompletions {
   done
 
   # List modules
-  modules=($(find **/pom.xml -type f | grep -v '/target/classes/META-INF/' | grep '/pom.xml' |sed 's|\(.*\)/pom\.xml|\1|'))
+  modules=($(print -l **/pom.xml(-.N:h) | grep -v '/target/classes/META-INF/'))
 
   reply=(
     # common lifecycle

From 805427e06bc0549c7b9a4f50d3e39bbf68043f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 13 Jan 2022 17:28:15 +0100
Subject: [PATCH 450/591] fix(updater): give priority to `zstyle` settings if
 set (#10587)

Fixes #10587
---
 tools/check_for_upgrade.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 293f48edf..729d8ecb5 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -10,11 +10,13 @@ fi
 # - auto: the update is performed automatically when it's time
 # - reminder: a reminder is shown to the user when it's time to update
 # - disabled: automatic update is turned off
-zstyle -s ':omz:update' mode update_mode || update_mode=prompt
+zstyle -s ':omz:update' mode update_mode || {
+  update_mode=prompt
 
-# Support old-style settings
-[[ "$DISABLE_UPDATE_PROMPT" != true ]] || update_mode=auto
-[[ "$DISABLE_AUTO_UPDATE" != true ]] || update_mode=disabled
+  # If the mode zstyle setting is not set, support old-style settings
+  [[ "$DISABLE_UPDATE_PROMPT" != true ]] || update_mode=auto
+  [[ "$DISABLE_AUTO_UPDATE" != true ]] || update_mode=disabled
+}
 
 # Cancel update if:
 # - the automatic update is disabled.

From 035c856c2cbbad2b45252ec8c065c3a9e7eefa65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 13 Jan 2022 17:46:09 +0100
Subject: [PATCH 451/591] fix: get branch name first in `omz version` and
 changelog

---
 lib/cli.zsh        | 7 ++++---
 tools/changelog.sh | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 0a85402df..ec59d1d44 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -791,12 +791,13 @@ function _omz::version {
 
     # Get the version name:
     # 1) try tag-like version
-    # 2) try name-rev
-    # 3) try branch name
+    # 2) try branch name
+    # 3) try name-rev (tag~<rev> or branch~<rev>)
     local version
     version=$(command git describe --tags HEAD 2>/dev/null) \
+    || version=$(command git symbolic-ref --quiet --short HEAD 2>/dev/null) \
     || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" HEAD 2>/dev/null) \
-    || version=$(command git symbolic-ref --quiet --short HEAD 2>/dev/null)
+    || version="<detached>"
 
     # Get short hash for the current HEAD
     local commit=$(command git rev-parse --short HEAD 2>/dev/null)
diff --git a/tools/changelog.sh b/tools/changelog.sh
index 86774a7ea..49532a4a4 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -395,12 +395,12 @@ function main {
 
   # Get the first version name:
   # 1) try tag-like version, or
-  # 2) try name-rev, or
-  # 3) try branch name, or
+  # 2) try branch name, or
+  # 3) try name-rev, or
   # 4) try short hash
   version=$(command git describe --tags $until 2>/dev/null) \
-    || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" $until 2>/dev/null) \
     || version=$(command git symbolic-ref --quiet --short $until 2>/dev/null) \
+    || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" $until 2>/dev/null) \
     || version=$(command git rev-parse --short $until 2>/dev/null)
 
   # Get commit list from $until commit until $since commit, or until root commit if $since is unset

From 1e277553bcc9f23a904bf728013df6ebfe339e74 Mon Sep 17 00:00:00 2001
From: Mykola Krachkovsky <w01dnick@gmail.com>
Date: Fri, 14 Jan 2022 16:28:39 +0200
Subject: [PATCH 452/591] fix(svn): fix sed call in `svn_get_rev_nr` (#10590)

---
 plugins/svn/svn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index e55e5b2dd..22b07b4ec 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -55,7 +55,7 @@ svn_get_branch_name() {
 }
 
 svn_get_rev_nr() {
-  sed -n 's/Revision:\ //p' "${1:-$(LANG= svn info 2>/dev/null)}"
+  sed -n 's/Revision:\ //p' <<<"${1:-$(LANG= svn info 2>/dev/null)}"
 }
 
 svn_dirty() {

From 567bd593954641bd59376f6fd5f9c06bf37bc9e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 17 Jan 2022 13:18:10 +0100
Subject: [PATCH 453/591] refactor(cli): use self-referencing in subcommand
 functions

---
 lib/cli.zsh | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index ec59d1d44..70076bcfb 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -182,7 +182,7 @@ function _omz::changelog {
     ! command git rev-parse --verify "${version}^{commit}"
   ) &>/dev/null; then
     cat >&2 <<EOF
-Usage: omz changelog [version]
+Usage: ${(j: :)${(s.::.)0#_}} [version]
 
 NOTE: <version> must be a valid branch, tag or commit.
 EOF
@@ -193,9 +193,9 @@ EOF
 }
 
 function _omz::plugin {
-  (( $# > 0 && $+functions[_omz::plugin::$1] )) || {
+  (( $# > 0 && $+functions[$0::$1] )) || {
     cat >&2 <<EOF
-Usage: omz plugin <command> [options]
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
 Available commands:
 
@@ -212,12 +212,12 @@ EOF
   local command="$1"
   shift
 
-  _omz::plugin::$command "$@"
+  $0::$command "$@"
 }
 
 function _omz::plugin::disable {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz plugin disable <plugin> [...]"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin> [...]"
     return 1
   fi
 
@@ -307,7 +307,7 @@ multi == 1 && length(\$0) > 0 {
 
 function _omz::plugin::enable {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz plugin enable <plugin> [...]"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin> [...]"
     return 1
   fi
 
@@ -383,7 +383,7 @@ multi == 1 && /^[^#]*\)/ {
 
 function _omz::plugin::info {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz plugin info <plugin>"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin>"
     return 1
   fi
 
@@ -430,7 +430,7 @@ function _omz::plugin::list {
 
 function _omz::plugin::load {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz plugin load <plugin> [...]"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin> [...]"
     return 1
   fi
 
@@ -477,9 +477,9 @@ function _omz::plugin::load {
 }
 
 function _omz::pr {
-  (( $# > 0 && $+functions[_omz::pr::$1] )) || {
+  (( $# > 0 && $+functions[$0::$1] )) || {
     cat >&2 <<EOF
-Usage: omz pr <command> [options]
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
 Available commands:
 
@@ -493,7 +493,7 @@ EOF
   local command="$1"
   shift
 
-  _omz::pr::$command "$@"
+  $0::$command "$@"
 }
 
 function _omz::pr::clean {
@@ -534,7 +534,7 @@ function _omz::pr::test {
 
   # Check the input
   if ! [[ -n "$1" && "$1" =~ ^[[:digit:]]+$ ]]; then
-    echo >&2 "Usage: omz pr test <PR_NUMBER_or_URL>"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <PR_NUMBER_or_URL>"
     return 1
   fi
 
@@ -619,9 +619,9 @@ function _omz::reload {
 }
 
 function _omz::theme {
-  (( $# > 0 && $+functions[_omz::theme::$1] )) || {
+  (( $# > 0 && $+functions[$0::$1] )) || {
     cat >&2 <<EOF
-Usage: omz theme <command> [options]
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
 Available commands:
 
@@ -636,7 +636,7 @@ EOF
   local command="$1"
   shift
 
-  _omz::theme::$command "$@"
+  $0::$command "$@"
 }
 
 function _omz::theme::list {
@@ -671,7 +671,7 @@ function _omz::theme::list {
 
 function _omz::theme::set {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz theme set <theme>"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <theme>"
     return 1
   fi
 
@@ -739,7 +739,7 @@ EOF
 
 function _omz::theme::use {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz theme use <theme>"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <theme>"
     return 1
   fi
 

From dfaad779a9bbe1f83e30820d227d4b7870bdf33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 17 Jan 2022 12:45:59 +0100
Subject: [PATCH 454/591] fix(helm): fix completion loading mechanism

---
 plugins/helm/helm.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index c6b91693a..cadfa551a 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -11,12 +11,12 @@ command rm -f "${ZSH_CACHE_DIR}/helm_completion"
 command mkdir -p "$ZSH_CACHE_DIR/completions"
 (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `helm`. Otherwise, compinit will have already done that.
+# If the completion file does not exist, generate it and then source it
+# Otherwise, source it and regenerate in the background
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
-  typeset -g -A _comps
-  autoload -Uz _helm
-  _comps[helm]=_helm
+  helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm"
+  source "$ZSH_CACHE_DIR/completions/_helm"
+else
+  source "$ZSH_CACHE_DIR/completions/_helm"
+  helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm" &|
 fi
-
-helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm" &|

From 4f2d8b4d4cbc51e609f4b568e87907883422ab41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 17 Jan 2022 12:46:20 +0100
Subject: [PATCH 455/591] fix(kubectl): source completion instead of
 autoloading it

---
 plugins/kubectl/kubectl.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index bf602bb7b..6edb59751 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -8,15 +8,15 @@ if (( $+commands[kubectl] )); then
   command mkdir -p "$ZSH_CACHE_DIR/completions"
   (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
-  # If the completion file doesn't exist yet, we need to autoload it and
-  # bind it to `kubectl`. Otherwise, compinit will have already done that.
+  # If the completion file does not exist, generate it and then source it
+  # Otherwise, source it and regenerate in the background
   if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
-    typeset -g -A _comps
-    autoload -Uz _kubectl
-    _comps[kubectl]=_kubectl
+    kubectl completion zsh >| "$ZSH_CACHE_DIR/completions/_kubectl"
+    source "$ZSH_CACHE_DIR/completions/_kubectl"
+  else
+    source "$ZSH_CACHE_DIR/completions/_kubectl"
+    kubectl completion zsh >| "$ZSH_CACHE_DIR/completions/_kubectl" &|
   fi
-
-  kubectl completion zsh >! "$ZSH_CACHE_DIR/completions/_kubectl" &|
 fi
 
 # This command is used a LOT both below and in daily life

From 540b2200afb68a3282419ffb6c49bbf8f642b67e Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 18 Jan 2022 18:46:14 +0100
Subject: [PATCH 456/591] feat(sudo): respect `$SUDO_EDITOR` and `$VISUAL`,
 switch to `sudo -e` (#10596)

---
 plugins/sudo/README.md       | 16 ++++++++++++++++
 plugins/sudo/sudo.plugin.zsh | 15 ++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/plugins/sudo/README.md b/plugins/sudo/README.md
index 012fc5325..27cd20c18 100644
--- a/plugins/sudo/README.md
+++ b/plugins/sudo/README.md
@@ -24,6 +24,20 @@ By pressing the <kbd>esc</kbd> key twice, you will have the same command with `s
 $ sudo apt-get install build-essential
 ```
 
+The same happens for editing files with your default editor (defined in `$SUDO_EDITOR`, `$VISUAL` or `$EDITOR`, in that order):
+
+If the editor defined were `vim`:
+
+```console
+$ vim /etc/hosts
+```
+
+By pressing the <kbd>esc</kbd> key twice, you will have the same command with `sudo -e` instead of the editor, that would open that editor with root privileges:
+
+```console
+$ sudo -e /etc/hosts
+```
+
 ### Previous executed commands
 
 Say you want to delete a system file and denied:
@@ -44,6 +58,8 @@ Password:
 $
 ```
 
+The same happens for file editing, as told before.
+
 ## Key binding
 
 By default, the `sudo` plugin uses <kbd>Esc</kbd><kbd>Esc</kbd> as the trigger.
diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index e02f88a87..e8d183414 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -2,7 +2,7 @@
 # Description
 # -----------
 #
-# sudo or sudoedit will be inserted before the command
+# sudo or sudo -e (replacement for sudoedit) will be inserted before the command
 #
 # ------------------------------------------------------------------------------
 # Authors
@@ -11,6 +11,7 @@
 # * Dongweiming <ciici123@gmail.com>
 # * Subhaditya Nath <github.com/subnut>
 # * Marc Cornellà <github.com/mcornella>
+# * Carlo Sala <carlosalag@protonmail.com>
 #
 # ------------------------------------------------------------------------------
 
@@ -35,10 +36,14 @@ sudo-command-line() {
     LBUFFER="${LBUFFER:1}"
   fi
 
+  # If $SUDO_EDITOR or $VISUAL are defined, then use that as $EDITOR
+  # Else use the default $EDITOR
+  local EDITOR=${SUDO_EDITOR:-${VISUAL:-$EDITOR}}
+
   # If $EDITOR is not set, just toggle the sudo prefix on and off
   if [[ -z "$EDITOR" ]]; then
     case "$BUFFER" in
-      sudoedit\ *) __sudo-replace-buffer "sudoedit" "" ;;
+      sudo\ -e\ *) __sudo-replace-buffer "sudo -e" "" ;;
       sudo\ *) __sudo-replace-buffer "sudo" "" ;;
       *) LBUFFER="sudo $LBUFFER" ;;
     esac
@@ -72,9 +77,9 @@ sudo-command-line() {
 
     # Check for editor commands in the typed command and replace accordingly
     case "$BUFFER" in
-      $editorcmd\ *) __sudo-replace-buffer "$editorcmd" "sudoedit" ;;
-      \$EDITOR\ *) __sudo-replace-buffer '$EDITOR' "sudoedit" ;;
-      sudoedit\ *) __sudo-replace-buffer "sudoedit" "$EDITOR" ;;
+      $editorcmd\ *) __sudo-replace-buffer "$editorcmd" "sudo -e" ;;
+      \$EDITOR\ *) __sudo-replace-buffer '$EDITOR' "sudo -e" ;;
+      sudo\ -e\ *) __sudo-replace-buffer "sudo -e" "$EDITOR" ;;
       sudo\ *) __sudo-replace-buffer "sudo" "" ;;
       *) LBUFFER="sudo $LBUFFER" ;;
     esac

From 957dca698cd0a0cafc6d2551eeff19fe223f41bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 18 Jan 2022 19:03:27 +0100
Subject: [PATCH 457/591] style(sudo): clean code style and reorganise logic

---
 plugins/sudo/sudo.plugin.zsh | 50 +++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index e8d183414..2a0b3bfc4 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -17,9 +17,13 @@
 
 __sudo-replace-buffer() {
   local old=$1 new=$2 space=${2:+ }
-  if [[ ${#LBUFFER} -le ${#old} ]]; then
-    RBUFFER="${space}${BUFFER#$old }"
-    LBUFFER="${new}"
+
+  # if the cursor is positioned in the $old part of the text, make
+  # the substitution and leave the cursor after the $new text
+  if [[ $CURSOR -le ${#old} ]]; then
+    BUFFER="${new}${space}${BUFFER#$old }"
+    CURSOR=${#new}
+  # otherwise just replace $old with $new in the text before the cursor
   else
     LBUFFER="${new}${space}${LBUFFER#$old }"
   fi
@@ -36,18 +40,21 @@ sudo-command-line() {
     LBUFFER="${LBUFFER:1}"
   fi
 
-  # If $SUDO_EDITOR or $VISUAL are defined, then use that as $EDITOR
-  # Else use the default $EDITOR
-  local EDITOR=${SUDO_EDITOR:-${VISUAL:-$EDITOR}}
+  {
+    # If $SUDO_EDITOR or $VISUAL are defined, then use that as $EDITOR
+    # Else use the default $EDITOR
+    local EDITOR=${SUDO_EDITOR:-${VISUAL:-$EDITOR}}
+
+    # If $EDITOR is not set, just toggle the sudo prefix on and off
+    if [[ -z "$EDITOR" ]]; then
+      case "$BUFFER" in
+        sudo\ -e\ *) __sudo-replace-buffer "sudo -e" "" ;;
+        sudo\ *) __sudo-replace-buffer "sudo" "" ;;
+        *) LBUFFER="sudo $LBUFFER" ;;
+      esac
+      return
+    fi
 
-  # If $EDITOR is not set, just toggle the sudo prefix on and off
-  if [[ -z "$EDITOR" ]]; then
-    case "$BUFFER" in
-      sudo\ -e\ *) __sudo-replace-buffer "sudo -e" "" ;;
-      sudo\ *) __sudo-replace-buffer "sudo" "" ;;
-      *) LBUFFER="sudo $LBUFFER" ;;
-    esac
-  else
     # Check if the typed command is really an alias to $EDITOR
 
     # Get the first part of the typed command
@@ -72,7 +79,8 @@ sudo-command-line() {
     if [[ "$realcmd" = (\$EDITOR|$editorcmd|${editorcmd:c}) \
       || "${realcmd:c}" = ($editorcmd|${editorcmd:c}) ]] \
       || builtin which -a "$realcmd" | command grep -Fx -q "$editorcmd"; then
-      editorcmd="$cmd" # replace $editorcmd with the typed command so it matches below
+      __sudo-replace-buffer "$cmd" "sudo -e"
+      return
     fi
 
     # Check for editor commands in the typed command and replace accordingly
@@ -83,13 +91,13 @@ sudo-command-line() {
       sudo\ *) __sudo-replace-buffer "sudo" "" ;;
       *) LBUFFER="sudo $LBUFFER" ;;
     esac
-  fi
+  } always {
+    # Preserve beginning space
+    LBUFFER="${WHITESPACE}${LBUFFER}"
 
-  # Preserve beginning space
-  LBUFFER="${WHITESPACE}${LBUFFER}"
-
-  # Redisplay edit buffer (compatibility with zsh-syntax-highlighting)
-  zle redisplay
+    # Redisplay edit buffer (compatibility with zsh-syntax-highlighting)
+    zle redisplay
+  }
 }
 
 zle -N sudo-command-line

From cddf1b69820c9fe3d33a0f00ac6eab37b9d67377 Mon Sep 17 00:00:00 2001
From: Marco Franssen <marco.franssen@gmail.com>
Date: Tue, 18 Jan 2022 20:57:07 +0100
Subject: [PATCH 458/591] feat(fig): add plugin for Fig (#10432)

---
 plugins/fig/README.md      |  9 +++++++++
 plugins/fig/fig.plugin.zsh | 13 +++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 plugins/fig/README.md
 create mode 100644 plugins/fig/fig.plugin.zsh

diff --git a/plugins/fig/README.md b/plugins/fig/README.md
new file mode 100644
index 000000000..3861958d6
--- /dev/null
+++ b/plugins/fig/README.md
@@ -0,0 +1,9 @@
+# Fig plugin
+
+This plugin sets up completion for [Fig](https://fig.io/).
+
+To use it, add `fig` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... fig)
+```
diff --git a/plugins/fig/fig.plugin.zsh b/plugins/fig/fig.plugin.zsh
new file mode 100644
index 000000000..60678bfda
--- /dev/null
+++ b/plugins/fig/fig.plugin.zsh
@@ -0,0 +1,13 @@
+if ! (( $+commands[fig] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `fig`. Otherwise, compinit will have already done that
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_fig" ]]; then
+  autoload -Uz _fig
+  typeset -g -A _comps
+  _comps[fig]=_fig
+fi
+
+fig completions zsh >| "$ZSH_CACHE_DIR/completions/_fig" &|

From 22c11da108764336d92d03d3113c1f486cdb5911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 18 Jan 2022 21:26:45 +0100
Subject: [PATCH 459/591] fix(fig): fix typo in completion command

---
 plugins/fig/fig.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fig/fig.plugin.zsh b/plugins/fig/fig.plugin.zsh
index 60678bfda..cddb6c7c0 100644
--- a/plugins/fig/fig.plugin.zsh
+++ b/plugins/fig/fig.plugin.zsh
@@ -10,4 +10,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_fig" ]]; then
   _comps[fig]=_fig
 fi
 
-fig completions zsh >| "$ZSH_CACHE_DIR/completions/_fig" &|
+fig completion zsh >| "$ZSH_CACHE_DIR/completions/_fig" &|

From fe9d87d6dc2f3e6194862799b0707f97844e83ac Mon Sep 17 00:00:00 2001
From: Mike Mattice <mmattice@users.noreply.github.com>
Date: Wed, 19 Jan 2022 08:58:34 -0600
Subject: [PATCH 460/591] feat(aws): accept aws mfa tokencode on `acp` cli call
 (#10130)

Co-authored-by: Mike Mattice <mmattice@reliant.io>
---
 plugins/aws/README.md      | 8 ++++----
 plugins/aws/aws.plugin.zsh | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 24c6429dd..d6f4f4600 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -16,10 +16,10 @@ plugins=(... aws)
   Run `asp` without arguments to clear the profile.
 * `asp [<profile>] login`: If AWS SSO has been configured in your aws profile, it will run the `aws sso login` command following profile selection. 
 
-* `acp [<profile>]`: in addition to `asp` functionality, it actually changes the profile by
-   assuming the role specified in the `<profile>` configuration. It supports MFA and sets
-   `$AWS_ACCESS_KEY_ID`, `$AWS_SECRET_ACCESS_KEY` and `$AWS_SESSION_TOKEN`, if obtained. It
-   requires the roles to be configured as per the
+* `acp [<profile>] [<mfa_token>]`: in addition to `asp` functionality, it actually changes
+   the profile by assuming the role specified in the `<profile>` configuration. It supports
+   MFA and sets `$AWS_ACCESS_KEY_ID`, `$AWS_SECRET_ACCESS_KEY` and `$AWS_SESSION_TOKEN`, if
+   obtained. It requires the roles to be configured as per the
    [official guide](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-role.html).
    Run `acp` without arguments to clear the profile.
 
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index c18bd634b..920a7139d 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -45,6 +45,7 @@ function acp() {
   fi
 
   local profile="$1"
+  local mfa_token="$2"
 
   # Get fallback credentials for if the aws command fails or no command is run
   local aws_access_key_id="$(aws configure get aws_access_key_id --profile $profile)"
@@ -58,9 +59,10 @@ function acp() {
 
   if [[ -n "$mfa_serial" ]]; then
     local -a mfa_opt
-    local mfa_token
-    echo -n "Please enter your MFA token for $mfa_serial: "
-    read -r mfa_token
+    if [[ -z "$mfa_token" ]]; then
+      echo -n "Please enter your MFA token for $mfa_serial: "
+      read -r mfa_token
+    fi
     if [[ -z "$sess_duration" ]]; then
       echo -n "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role): "
       read -r sess_duration

From 00d0735704d8e1070a51bbd1334db32d2e822fe6 Mon Sep 17 00:00:00 2001
From: kronion <kronion@users.noreply.github.com>
Date: Wed, 19 Jan 2022 09:49:24 -0600
Subject: [PATCH 461/591] feat(poetry): add plugin to provide completion for
 Poetry (#10595)

---
 plugins/poetry/README.md         |  9 +++++++++
 plugins/poetry/poetry.plugin.zsh | 16 ++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 plugins/poetry/README.md
 create mode 100644 plugins/poetry/poetry.plugin.zsh

diff --git a/plugins/poetry/README.md b/plugins/poetry/README.md
new file mode 100644
index 000000000..51780cbed
--- /dev/null
+++ b/plugins/poetry/README.md
@@ -0,0 +1,9 @@
+# Poetry Plugin
+
+This plugin automatically installs [Poetry](https://python-poetry.org/)'s completions for you, and keeps them up to date as your Poetry version changes.
+
+To use it, add `poetry` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... poetry)
+```
diff --git a/plugins/poetry/poetry.plugin.zsh b/plugins/poetry/poetry.plugin.zsh
new file mode 100644
index 000000000..e872e9fd6
--- /dev/null
+++ b/plugins/poetry/poetry.plugin.zsh
@@ -0,0 +1,16 @@
+# Return immediately if poetry is not found
+if (( ! $+commands[poetry] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `poetry`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_poetry" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _poetry
+  _comps[gh]=_poetry
+fi
+
+poetry completions zsh >| "$ZSH_CACHE_DIR/completions/_poetry" &|
+
+unset comp_file

From 0b08b70b0cc7ff286ea942f0e20a41f10bef0ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 19 Jan 2022 17:15:16 +0100
Subject: [PATCH 462/591] chore(poetry): fix copy-paste error

---
 plugins/poetry/poetry.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/poetry/poetry.plugin.zsh b/plugins/poetry/poetry.plugin.zsh
index e872e9fd6..3cb7845d6 100644
--- a/plugins/poetry/poetry.plugin.zsh
+++ b/plugins/poetry/poetry.plugin.zsh
@@ -8,7 +8,7 @@ fi
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_poetry" ]]; then
   typeset -g -A _comps
   autoload -Uz _poetry
-  _comps[gh]=_poetry
+  _comps[poetry]=_poetry
 fi
 
 poetry completions zsh >| "$ZSH_CACHE_DIR/completions/_poetry" &|

From a7efd96a60157965370e1dbc4c7fce66b7a64225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 19 Jan 2022 19:27:53 +0100
Subject: [PATCH 463/591] fix(dotenv): match for exact directory path in
 allowed/disallowed files

---
 plugins/dotenv/dotenv.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index 40ec5c46f..394455ae1 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -23,12 +23,12 @@ source_env() {
     touch "$ZSH_DOTENV_DISALLOWED_LIST"
 
     # early return if disallowed
-    if command grep -q "$dirpath" "$ZSH_DOTENV_DISALLOWED_LIST" &>/dev/null; then
+    if command grep -Fx -q "$dirpath" "$ZSH_DOTENV_DISALLOWED_LIST" &>/dev/null; then
       return
     fi
 
     # check if current directory's .env file is allowed or ask for confirmation
-    if ! command grep -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
+    if ! command grep -Fx -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
       # get cursor column and print new line before prompt if not at line beginning
       local column
       echo -ne "\e[6n" > /dev/tty

From 675a2d9922ffc1f2cf88dd3d871f22136b7e525c Mon Sep 17 00:00:00 2001
From: Billy Mathews <billy@billym.co.uk>
Date: Wed, 17 Jan 2018 00:08:38 +0000
Subject: [PATCH 464/591] feat(tmux): add `tmuxconf` alias to edit .tmux.conf
 (#6555)

Closes #6555
---
 plugins/tmux/README.md       | 21 +++++++++++----------
 plugins/tmux/tmux.plugin.zsh |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/plugins/tmux/README.md b/plugins/tmux/README.md
index 551814a39..bc192a40c 100644
--- a/plugins/tmux/README.md
+++ b/plugins/tmux/README.md
@@ -15,20 +15,21 @@ The plugin also supports the following:
 
 ## Aliases
 
-| Alias  | Command                | Description                                               |
-| ------ | -----------------------|---------------------------------------------------------- |
-| `ta`   | tmux attach -t         | Attach new tmux session to already running named session  |
-| `tad`  | tmux attach -d -t      | Detach named tmux session                                 |
-| `ts`   | tmux new-session -s    | Create a new named tmux session                           |
-| `tl`   | tmux list-sessions     | Displays a list of running tmux sessions                  |
-| `tksv` | tmux kill-server       | Terminate all running tmux sessions                       |
-| `tkss` | tmux kill-session -t   | Terminate named running tmux session                      |
-| `tmux` | `_zsh_tmux_plugin_run` | Start a new tmux session                                  |
+| Alias      | Command                | Description                                              |
+| ---------- | ---------------------- | -------------------------------------------------------- |
+| `ta`       | tmux attach -t         | Attach new tmux session to already running named session |
+| `tad`      | tmux attach -d -t      | Detach named tmux session                                |
+| `ts`       | tmux new-session -s    | Create a new named tmux session                          |
+| `tl`       | tmux list-sessions     | Displays a list of running tmux sessions                 |
+| `tksv`     | tmux kill-server       | Terminate all running tmux sessions                      |
+| `tkss`     | tmux kill-session -t   | Terminate named running tmux session                     |
+| `tmux`     | `_zsh_tmux_plugin_run` | Start a new tmux session                                 |
+| `tmuxconf` | `$EDITOR ~/.tmux.conf` | Open .tmux.conf file with an editor                      |
 
 ## Configuration Variables
 
 | Variable                            | Description                                                                   |
-|-------------------------------------|-------------------------------------------------------------------------------|
+| ----------------------------------- | ----------------------------------------------------------------------------- |
 | `ZSH_TMUX_AUTOSTART`                | Automatically starts tmux (default: `false`)                                  |
 | `ZSH_TMUX_AUTOSTART_ONCE`           | Autostart only if tmux hasn't been started previously (default: `true`)       |
 | `ZSH_TMUX_AUTOCONNECT`              | Automatically connect to a previous session if it exits (default: `true`)     |
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 5474c3522..9d333257e 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -11,6 +11,7 @@ alias ts='tmux new-session -s'
 alias tl='tmux list-sessions'
 alias tksv='tmux kill-server'
 alias tkss='tmux kill-session -t'
+alias tmuxconf='$EDITOR ~/.tmux.conf'
 
 # CONFIGURATION VARIABLES
 # Automatically start tmux

From 2b492aec93487e8e25cf03df4540aa73dbf5fc9e Mon Sep 17 00:00:00 2001
From: kronion <kronion@users.noreply.github.com>
Date: Fri, 21 Jan 2022 12:52:24 -0600
Subject: [PATCH 465/591] chore(poetry): remove unnecessary unset (#10605)

---
 plugins/poetry/poetry.plugin.zsh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/poetry/poetry.plugin.zsh b/plugins/poetry/poetry.plugin.zsh
index 3cb7845d6..cebcb46c4 100644
--- a/plugins/poetry/poetry.plugin.zsh
+++ b/plugins/poetry/poetry.plugin.zsh
@@ -12,5 +12,3 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_poetry" ]]; then
 fi
 
 poetry completions zsh >| "$ZSH_CACHE_DIR/completions/_poetry" &|
-
-unset comp_file

From 4e0f19cf923163104d86308d2366d37da35c0622 Mon Sep 17 00:00:00 2001
From: "GitHubLeakedPAN, GitHubLeakedMyautsai"
 <mckelvin@users.noreply.github.com>
Date: Sun, 23 Jan 2022 04:56:36 +0800
Subject: [PATCH 466/591] feat(ys): show `svn` repository information (#10582)

---
 themes/ys.zsh-theme | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 45bbae2d1..5ef500e14 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -19,6 +19,13 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX"
 ZSH_THEME_GIT_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY"
 ZSH_THEME_GIT_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN"
 
+# SVN info
+local svn_info='$(svn_prompt_info)'
+ZSH_THEME_SVN_PROMPT_PREFIX="${YS_VCS_PROMPT_PREFIX1}svn${YS_VCS_PROMPT_PREFIX2}"
+ZSH_THEME_SVN_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX"
+ZSH_THEME_SVN_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY"
+ZSH_THEME_SVN_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN"
+
 # HG info
 local hg_info='$(ys_hg_prompt_info)'
 ys_hg_prompt_info() {
@@ -66,6 +73,7 @@ PROMPT="
 %{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\
 ${hg_info}\
 ${git_info}\
+${svn_info}\
 ${venv_info}\
  \
 [%*] $exit_code

From 84931adcd465e9a3b5e38f3b416a1df2acc33801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 21 Jan 2022 19:03:35 +0100
Subject: [PATCH 467/591] fix: do not call chpwd hooks in subshells

---
 lib/cli.zsh                | 10 +++++-----
 tools/check_for_upgrade.sh | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 70076bcfb..2f3f293da 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -37,7 +37,7 @@ function _omz {
   elif (( CURRENT == 3 )); then
     case "$words[2]" in
       changelog) local -a refs
-        refs=("${(@f)$(cd "$ZSH"; command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
+        refs=("${(@f)$(builtin cd -q "$ZSH"; command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
       plugin) subcmds=(
         'disable:Disable plugin(s)'
@@ -176,7 +176,7 @@ function _omz::changelog {
   local version=${1:-HEAD} format=${3:-"--text"}
 
   if (
-    cd "$ZSH"
+    builtin cd -q "$ZSH"
     ! command git show-ref --verify refs/heads/$version && \
     ! command git show-ref --verify refs/tags/$version && \
     ! command git rev-parse --verify "${version}^{commit}"
@@ -761,7 +761,7 @@ function _omz::theme::use {
 }
 
 function _omz::update {
-  local last_commit=$(cd "$ZSH"; git rev-parse HEAD)
+  local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD)
 
   # Run update script
   if [[ "$1" != --unattended ]]; then
@@ -777,7 +777,7 @@ function _omz::update {
   command rm -rf "$ZSH/log/update.lock"
 
   # Restart the zsh session if there were changes
-  if [[ "$1" != --unattended && "$(cd "$ZSH"; git rev-parse HEAD)" != "$last_commit" ]]; then
+  if [[ "$1" != --unattended && "$(builtin cd -q "$ZSH"; git rev-parse HEAD)" != "$last_commit" ]]; then
     # Old zsh versions don't have ZSH_ARGZERO
     local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
     # Check whether to run a login shell
@@ -787,7 +787,7 @@ function _omz::update {
 
 function _omz::version {
   (
-    cd "$ZSH"
+    builtin cd -q "$ZSH"
 
     # Get the version name:
     # 1) try tag-like version
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 729d8ecb5..3f6d35c3e 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -36,11 +36,11 @@ function current_epoch() {
 
 function is_update_available() {
   local branch
-  branch=${"$(cd "$ZSH"; git config --local oh-my-zsh.branch)":-master}
+  branch=${"$(cd -q "$ZSH"; git config --local oh-my-zsh.branch)":-master}
 
   local remote remote_url remote_repo
-  remote=${"$(cd "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
-  remote_url=$(cd "$ZSH"; git config remote.$remote.url)
+  remote=${"$(cd -q "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
+  remote_url=$(cd -q "$ZSH"; git config remote.$remote.url)
 
   local repo
   case "$remote_url" in
@@ -58,7 +58,7 @@ function is_update_available() {
 
   # Get local HEAD. If this fails assume there are updates
   local local_head
-  local_head=$(cd "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
+  local_head=$(cd -q "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
 
   # Get remote HEAD. If no suitable command is found assume there are updates
   # On any other error, skip the update (connection may be down)
@@ -136,7 +136,7 @@ function update_ohmyzsh() {
   fi
 
   # Test if Oh My Zsh directory is a git repository
-  if ! (cd "$ZSH" && LANG= git rev-parse &>/dev/null); then
+  if ! (cd -q "$ZSH" && LANG= git rev-parse &>/dev/null); then
     echo >&2 "[oh-my-zsh] Can't update: not a git repository."
     return
   fi

From d4f5fa37e8be25e1b4f281fcf5b90cf700dc3c95 Mon Sep 17 00:00:00 2001
From: Mathias Neerup <manee12@student.sdu.dk>
Date: Thu, 31 Mar 2016 14:51:47 +0200
Subject: [PATCH 468/591] feat(simple): add color to git status indicator
 (#4962)

Closes #4962
---
 themes/simple.zsh-theme | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/themes/simple.zsh-theme b/themes/simple.zsh-theme
index 8d0070ba7..bcdecc1a5 100644
--- a/themes/simple.zsh-theme
+++ b/themes/simple.zsh-theme
@@ -1,6 +1,6 @@
-PROMPT='%(!.%{$fg[red]%}.%{$fg[green]%})%~%{$fg_bold[blue]%}$(git_prompt_info)%{$reset_color%} '
+PROMPT='%(!.%{$fg[red]%}.%{$fg[green]%})%~$(git_prompt_info)%{$reset_color%} '
 
-ZSH_THEME_GIT_PROMPT_PREFIX="("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
-ZSH_THEME_GIT_PROMPT_DIRTY=" ✗"
-ZSH_THEME_GIT_PROMPT_CLEAN=" ✔"
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg_bold[blue]%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[blue]%})"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔"

From 3f5402e2687475d83ec98613dc93373620e5ce57 Mon Sep 17 00:00:00 2001
From: Ricky Medina <ricky.medina91@gmail.com>
Date: Mon, 24 Jan 2022 09:21:34 -0500
Subject: [PATCH 469/591] feat(1password): add plugin for 1password (#8884)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/1password/1password.plugin.zsh | 46 ++++++++++++++++++++++++++
 plugins/1password/README.md            | 35 ++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 plugins/1password/1password.plugin.zsh
 create mode 100644 plugins/1password/README.md

diff --git a/plugins/1password/1password.plugin.zsh b/plugins/1password/1password.plugin.zsh
new file mode 100644
index 000000000..5af5ebb2b
--- /dev/null
+++ b/plugins/1password/1password.plugin.zsh
@@ -0,0 +1,46 @@
+if (( ${+commands[op]} )); then
+  eval "$(op completion zsh)"
+  compdef _op op
+fi
+
+# opswd puts the password of the named service into the clipboard. If there's a
+# one time password, it will be copied into the clipboard after 5 seconds. The
+# clipboard is cleared after another 10 seconds.
+function opswd() {
+  if [[ $# -lt 1 ]]; then
+    echo "Usage: opswd <service>"
+    return 1
+  fi
+
+  local service=$1
+
+  # If not logged in, print error and return
+  op list users > /dev/null || return
+
+  local password
+  # Copy the password to the clipboard
+  if ! password=$(op get item "$service" --fields password 2>/dev/null); then
+    echo "error: could not obtain password for $service"
+    return 1
+  fi
+
+  echo -n "$password" | clipcopy
+  echo "✔ password for $service copied to clipboard"
+
+  # If there's a one time password, copy it to the clipboard after 5 seconds
+  local totp
+  if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
+    sleep 10 && echo -n "$totp" | clipcopy
+    echo "✔ TOTP for $service copied to clipboard"
+  fi
+
+  (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
+}
+
+function _opswd() {
+  local -a services
+  services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
+  [[ -z "$services" ]] || compadd -a -- services
+}
+
+compdef _opswd opswd
diff --git a/plugins/1password/README.md b/plugins/1password/README.md
new file mode 100644
index 000000000..97be45437
--- /dev/null
+++ b/plugins/1password/README.md
@@ -0,0 +1,35 @@
+# 1Password
+
+This plugin adds 1Password functionality to oh-my-zsh.
+
+To use, add `1password` to the list of plugins in your `.zshrc` file:
+
+```zsh
+plugins=(... 1password)
+```
+
+Then, you can use the command `opswd` to copy passwords for services into your
+clipboard.
+
+## `opwsd`
+
+The `opswd` command is a wrapper around the `op` command. It takes a service
+name as an argument and copies the password for that service to the clipboard.
+
+If the service also contains a TOTP, it is copied to the clipboard after 10 seconds.
+Finally, after 20 seconds, the clipboard is cleared.
+
+The function has completion support, so you can use tab completion to select
+which service you want to get.
+
+For example, `opswd github.com` will put your GitHub password into your clipboard, and if
+a TOTP is available, it will be copied to the clipboard after 10 seconds.
+
+> NOTE: you need to be logged in for `opswd` to work. See:
+>
+> - [Sign in or out](https://support.1password.com/command-line/#sign-in-or-out)
+> - [Session management](https://support.1password.com/command-line/#appendix-session-management)
+
+## Requirements
+
+- [1Password's command line utility](https://1password.com/downloads/command-line/).

From c7221c5f257fc42ec8f6c6a6463bc8a5da25b00f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 15:41:40 +0100
Subject: [PATCH 470/591] style(installer): prefix formatting variables with
 `FMT_`

---
 tools/install.sh | 78 ++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index d3f1ee640..b4b90a62d 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -190,24 +190,24 @@ fmt_code() {
 }
 
 fmt_error() {
-  printf '%sError: %s%s\n' "$BOLD$RED" "$*" "$RESET" >&2
+  printf '%sError: %s%s\n' "${FMT_BOLD}${FMT_RED}" "$*" "$FMT_RESET" >&2
 }
 
 setup_color() {
   # Only use colors if connected to a terminal
   if ! is_tty; then
-    RAINBOW=""
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    BOLD=""
-    RESET=""
+    FMT_RAINBOW=""
+    FMT_RED=""
+    FMT_GREEN=""
+    FMT_YELLOW=""
+    FMT_BLUE=""
+    FMT_BOLD=""
+    FMT_RESET=""
     return
   fi
 
   if supports_truecolor; then
-    RAINBOW="
+    FMT_RAINBOW="
       $(printf '\033[38;2;255;0;0m')
       $(printf '\033[38;2;255;97;0m')
       $(printf '\033[38;2;247;255;0m')
@@ -217,7 +217,7 @@ setup_color() {
       $(printf '\033[38;2;245;0;172m')
     "
   else
-    RAINBOW="
+    FMT_RAINBOW="
       $(printf '\033[38;5;196m')
       $(printf '\033[38;5;202m')
       $(printf '\033[38;5;226m')
@@ -228,12 +228,12 @@ setup_color() {
     "
   fi
 
-  RED=$(printf '\033[31m')
-  GREEN=$(printf '\033[32m')
-  YELLOW=$(printf '\033[33m')
-  BLUE=$(printf '\033[34m')
-  BOLD=$(printf '\033[1m')
-  RESET=$(printf '\033[0m')
+  FMT_RED=$(printf '\033[31m')
+  FMT_GREEN=$(printf '\033[32m')
+  FMT_YELLOW=$(printf '\033[33m')
+  FMT_BLUE=$(printf '\033[34m')
+  FMT_BOLD=$(printf '\033[1m')
+  FMT_RESET=$(printf '\033[0m')
 }
 
 setup_ohmyzsh() {
@@ -244,7 +244,7 @@ setup_ohmyzsh() {
   # precedence over umasks except for filesystems mounted with option "noacl".
   umask g-w,o-w
 
-  echo "${BLUE}Cloning Oh My Zsh...${RESET}"
+  echo "${FMT_BLUE}Cloning Oh My Zsh...${FMT_RESET}"
 
   command_exists git || {
     fmt_error "git is not installed"
@@ -276,14 +276,14 @@ setup_zshrc() {
   # Keep most recent old .zshrc at .zshrc.pre-oh-my-zsh, and older ones
   # with datestamp of installation that moved them aside, so we never actually
   # destroy a user's original zshrc
-  echo "${BLUE}Looking for an existing zsh config...${RESET}"
+  echo "${FMT_BLUE}Looking for an existing zsh config...${FMT_RESET}"
 
   # Must use this exact name so uninstall.sh can find it
   OLD_ZSHRC=~/.zshrc.pre-oh-my-zsh
   if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
     # Skip this if the user doesn't want to replace an existing .zshrc
     if [ "$KEEP_ZSHRC" = yes ]; then
-      echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Keeping...${RESET}"
+      echo "${FMT_YELLOW}Found ~/.zshrc.${FMT_RESET} ${FMT_GREEN}Keeping...${FMT_RESET}"
       return
     fi
     if [ -e "$OLD_ZSHRC" ]; then
@@ -295,14 +295,14 @@ setup_zshrc() {
       fi
       mv "$OLD_ZSHRC" "${OLD_OLD_ZSHRC}"
 
-      echo "${YELLOW}Found old ~/.zshrc.pre-oh-my-zsh." \
-        "${GREEN}Backing up to ${OLD_OLD_ZSHRC}${RESET}"
+      echo "${FMT_YELLOW}Found old ~/.zshrc.pre-oh-my-zsh." \
+        "${FMT_GREEN}Backing up to ${OLD_OLD_ZSHRC}${FMT_RESET}"
     fi
-    echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Backing up to ${OLD_ZSHRC}${RESET}"
+    echo "${FMT_YELLOW}Found ~/.zshrc.${FMT_RESET} ${FMT_GREEN}Backing up to ${OLD_ZSHRC}${FMT_RESET}"
     mv ~/.zshrc "$OLD_ZSHRC"
   fi
 
-  echo "${GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${RESET}"
+  echo "${FMT_GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${FMT_RESET}"
 
   # Replace $HOME path with '$HOME' in $ZSH variable in .zshrc file
   omz=$(echo "$ZSH" | sed "s|^$HOME/|\$HOME/|")
@@ -327,16 +327,16 @@ setup_shell() {
   if ! command_exists chsh; then
     cat <<EOF
 I can't change your shell automatically because this system does not have chsh.
-${BLUE}Please manually change your default shell to zsh${RESET}
+${FMT_BLUE}Please manually change your default shell to zsh${FMT_RESET}
 EOF
     return
   fi
 
-  echo "${BLUE}Time to change your default shell to zsh:${RESET}"
+  echo "${FMT_BLUE}Time to change your default shell to zsh:${FMT_RESET}"
 
   # Prompt for user choice on changing the default login shell
   printf '%sDo you want to change your default shell to zsh? [Y/n]%s ' \
-    "$YELLOW" "$RESET"
+    "$FMT_YELLOW" "$FMT_RESET"
   read -r opt
   case $opt in
     y*|Y*|"") ;;
@@ -402,30 +402,30 @@ EOF
     fmt_error "chsh command unsuccessful. Change your default shell manually."
   else
     export SHELL="$zsh"
-    echo "${GREEN}Shell successfully changed to '$zsh'.${RESET}"
+    echo "${FMT_GREEN}Shell successfully changed to '$zsh'.${FMT_RESET}"
   fi
 
   echo
 }
 
-# shellcheck disable=SC2183  # printf string has more %s than arguments ($RAINBOW expands to multiple arguments)
+# shellcheck disable=SC2183  # printf string has more %s than arguments ($FMT_RAINBOW expands to multiple arguments)
 print_success() {
-  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $RAINBOW $RESET
-  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $RAINBOW $RESET
-  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $RAINBOW $RESET
-  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $RAINBOW $RESET
-  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $RAINBOW $RESET
-  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s....is now installed!%s\n' $RAINBOW $GREEN $RESET
+  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $FMT_RAINBOW $FMT_RESET
+  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $FMT_RAINBOW $FMT_RESET
+  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $FMT_RAINBOW $FMT_RESET
+  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $FMT_RAINBOW $FMT_RESET
+  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $FMT_RAINBOW $FMT_RESET
+  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s....is now installed!%s\n' $FMT_RAINBOW $FMT_GREEN $FMT_RESET
   printf '\n'
   printf '\n'
-  printf "%s %s %s\n" "Before you scream ${BOLD}${YELLOW}Oh My Zsh!${RESET} look over the" \
+  printf "%s %s %s\n" "Before you scream ${FMT_BOLD}${FMT_YELLOW}Oh My Zsh!${FMT_RESET} look over the" \
     "$(fmt_code "$(fmt_link ".zshrc" "file://$HOME/.zshrc" --text)")" \
     "file to select plugins, themes, and options."
   printf '\n'
   printf '%s\n' "• Follow us on Twitter: $(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"
   printf '%s\n' "• Join our Discord community: $(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
   printf '%s\n' "• Get stickers, t-shirts, coffee mugs and more: $(fmt_link "Planet Argon Shop" https://shop.planetargon.com/collections/oh-my-zsh)"
-  printf '%s\n' $RESET
+  printf '%s\n' $FMT_RESET
 }
 
 main() {
@@ -448,12 +448,12 @@ main() {
   setup_color
 
   if ! command_exists zsh; then
-    echo "${YELLOW}Zsh is not installed.${RESET} Please install zsh first."
+    echo "${FMT_YELLOW}Zsh is not installed.${FMT_RESET} Please install zsh first."
     exit 1
   fi
 
   if [ -d "$ZSH" ]; then
-    echo "${YELLOW}The \$ZSH folder already exists ($ZSH).${RESET}"
+    echo "${FMT_YELLOW}The \$ZSH folder already exists ($ZSH).${FMT_RESET}"
     if [ "$custom_zsh" = yes ]; then
       cat <<EOF
 
@@ -481,7 +481,7 @@ EOF
   print_success
 
   if [ $RUNZSH = no ]; then
-    echo "${YELLOW}Run zsh to try it out.${RESET}"
+    echo "${FMT_YELLOW}Run zsh to try it out.${FMT_RESET}"
     exit
   fi
 

From 861805b64d4014550808d2db176fa99bc729eebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 15:41:57 +0100
Subject: [PATCH 471/591] fix(installer): define `$USER` if not defined

Fixes missing $USER value in ArchLinux sh (bash)
---
 tools/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index b4b90a62d..9ad6f7d14 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -51,6 +51,9 @@ CHSH=${CHSH:-yes}
 RUNZSH=${RUNZSH:-yes}
 KEEP_ZSHRC=${KEEP_ZSHRC:-no}
 
+# Sane defaults
+USER=${USER:-$(whoami)}
+
 
 command_exists() {
   command -v "$@" >/dev/null 2>&1

From 788802af68af9a1adbfdb678086939c89d79d999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 15:45:42 +0100
Subject: [PATCH 472/591] fix(installer): correct check for `sudo` in shell
 change logic

---
 tools/install.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 9ad6f7d14..34dca8413 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -60,6 +60,8 @@ command_exists() {
 }
 
 user_can_sudo() {
+  # Check if sudo is installed
+  command_exists sudo || return 1
   # The following command has 3 parts:
   #
   # 1. Run `sudo` with `-v`. Does the following:
@@ -78,7 +80,7 @@ user_can_sudo() {
   #    to run `sudo` in the default locale (with `LANG=`) so that the message
   #    stays consistent regardless of the user's locale.
   #
-  LANG= sudo -n -v 2>&1 | grep -q "may not run sudo"
+  ! LANG= sudo -n -v 2>&1 | grep -q "may not run sudo"
 }
 
 # The [ -t 1 ] check only works when the function is not called from
@@ -395,9 +397,9 @@ EOF
   # be prompted for the password either way, so this shouldn't cause any issues.
   #
   if user_can_sudo; then
-    chsh -s "$zsh" "$USER"          # run chsh normally
-  else
     sudo -k chsh -s "$zsh" "$USER"  # -k forces the password prompt
+  else
+    chsh -s "$zsh" "$USER"          # run chsh normally
   fi
 
   # Check if the shell change was successful

From 8e7c33bf15ba2835da03604b396885ace635689c Mon Sep 17 00:00:00 2001
From: David Chin <david.w.h.chin@gmail.com>
Date: Mon, 24 Jan 2022 10:30:49 -0500
Subject: [PATCH 473/591] chore(1password): fix typo in `opswd` (#10614)

---
 plugins/1password/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/1password/README.md b/plugins/1password/README.md
index 97be45437..f6790ca8a 100644
--- a/plugins/1password/README.md
+++ b/plugins/1password/README.md
@@ -11,7 +11,7 @@ plugins=(... 1password)
 Then, you can use the command `opswd` to copy passwords for services into your
 clipboard.
 
-## `opwsd`
+## `opswd`
 
 The `opswd` command is a wrapper around the `op` command. It takes a service
 name as an argument and copies the password for that service to the clipboard.

From f64cabc780496636b3e4f5283ef8d77c23f18e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 17:38:32 +0100
Subject: [PATCH 474/591] fix(cli): make sure to run `zsh` command if an alias
 exists (#9737)

Fixes #9737
---
 lib/cli.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 2f3f293da..edc10e722 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -289,7 +289,7 @@ multi == 1 && length(\$0) > 0 {
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n "$zdot/.zshrc"; then
+  if ! command zsh -n "$zdot/.zshrc"; then
     _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
     command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
     command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
@@ -365,7 +365,7 @@ multi == 1 && /^[^#]*\)/ {
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n "$zdot/.zshrc"; then
+  if ! command zsh -n "$zdot/.zshrc"; then
     _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
     command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
     command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
@@ -721,7 +721,7 @@ EOF
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n "$zdot/.zshrc"; then
+  if ! command zsh -n "$zdot/.zshrc"; then
     _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
     command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
     command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
@@ -765,9 +765,9 @@ function _omz::update {
 
   # Run update script
   if [[ "$1" != --unattended ]]; then
-    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
   else
-    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" || return $?
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" || return $?
   fi
 
   # Update last updated file

From 4417faf84cf538d6b22ec613b043f23ef4023457 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Mon, 24 Jan 2022 17:45:09 +0100
Subject: [PATCH 475/591] feat(postgres): support Homebrew for Apple Silicon
 (#10618)

---
 plugins/postgres/postgres.plugin.zsh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/postgres/postgres.plugin.zsh b/plugins/postgres/postgres.plugin.zsh
index c2dbef244..b6d365d8a 100644
--- a/plugins/postgres/postgres.plugin.zsh
+++ b/plugins/postgres/postgres.plugin.zsh
@@ -1,8 +1,13 @@
 # Aliases to control Postgres
 # Paths noted below are for Postgres installed via Homebrew on OSX
+if (( ! $+commands[brew] )); then
+  return
+fi
 
-alias startpost='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
-alias stoppost='pg_ctl -D /usr/local/var/postgres stop -s -m fast'
-alias restartpost='stoppost && sleep 1 && startpost'
-alias reloadpost='pg_ctl reload -D /usr/local/var/postgres -s'
-alias statuspost='pg_ctl status -D /usr/local/var/postgres -s'
\ No newline at end of file
+local PG_BREW_DIR=$(brew --prefix)/var/postgres
+
+alias startpost="pg_ctl -D $PG_BREW_DIR -l $PG_BREW_DIR/server.log start"
+alias stoppost="pg_ctl -D $PG_BREW_DIR stop -s -m fast"
+alias restartpost="stoppost && sleep 1 && startpost"
+alias reloadpost="pg_ctl reload -D $PG_BREW_DIR -s"
+alias statuspost="pg_ctl status -D $PG_BREW_DIR -s"

From fc40b53e6460560ed9b256deb87f2165f8d48f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 18:32:36 +0100
Subject: [PATCH 476/591] style(updater): silence `git pull` output and show
 errors in English

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 55412062a..b6cb10b5a 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -194,7 +194,7 @@ last_commit=$(git rev-parse "$branch")
 
 # Update Oh My Zsh
 printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
-if git pull --rebase $remote $branch; then
+if LANG= git pull --quiet --rebase $remote $branch; then
   # Check if it was really updated or not
   if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
     message="Oh My Zsh is already at the latest version."

From 3741d1aa0253291c432e6ce3469f1d16dedbc914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 26 Jan 2022 17:13:10 +0100
Subject: [PATCH 477/591] fix(npx)!: detect new `npx` versions and fail
 gracefully (#10452)

BREAKING CHANGE: the `npx` plugin used a feature of `npx` to check for
npm packages and run them if a command was not found. This feature was
removed in v7.0.0 and was deemed insecure. The `npx` plugin is now
officially deprecated and will be removed soon.

Fixes #10452
---
 plugins/npx/README.md      | 25 +------------------------
 plugins/npx/npx.plugin.zsh | 17 +++++++++++------
 plugins/osx/osx.plugin.zsh |  4 ++--
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/plugins/npx/README.md b/plugins/npx/README.md
index 41e4c1352..4b2aba8f0 100644
--- a/plugins/npx/README.md
+++ b/plugins/npx/README.md
@@ -1,27 +1,4 @@
-# NPX Plugin
-
-> npx(1) -- execute npm package binaries. ([more info](https://github.com/npm/npx))
-
-This plugin automatically registers npx command-not-found handler if `npx` exists in your `$PATH`.
-
-To use it, add `npx` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(.... npx)
-```
-
-## Note
-
-The shell auto-fallback doesn't auto-install plain packages. In order to get it to install something, you need to add `@`:
-
-```
-➜  jasmine@latest # or just `jasmine@`
-npx: installed 13 in 1.896s
-Randomized with seed 54385
-Started
-```
-
-It does it this way so folks using the fallback don't accidentally try to install regular typoes.
+# npx plugin
 
 ## Deprecation
 
diff --git a/plugins/npx/npx.plugin.zsh b/plugins/npx/npx.plugin.zsh
index 32bb67377..c1e2eca98 100644
--- a/plugins/npx/npx.plugin.zsh
+++ b/plugins/npx/npx.plugin.zsh
@@ -1,7 +1,12 @@
-# NPX Plugin
-# https://www.npmjs.com/package/npx
-# Maintainer: Pooya Parsa <pooya@pi0.ir>
+if (( ! $+commands[npx] )); then
+  return
+fi
 
-(( $+commands[npx] )) && {
- source <(npx --shell-auto-fallback zsh)
-}
+if ! npx_fallback_script="$(npx --shell-auto-fallback zsh 2>/dev/null)"; then
+  print -u2 ${(%):-"%F{yellow}This \`npx\` version ($(npx --version)) is not supported.%f"}
+else
+  source <(<<< "$npx_fallback_script")
+fi
+
+print -u2 ${(%):-"%F{yellow}The \`npx\` plugin is deprecated and will be removed soon. %BPlease disable it%b.%f"}
+unset npx_fallback_script
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 9304e7f32..3b0935981 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -1,5 +1,5 @@
-print ${(%):-'%F{yellow}The `osx` plugin is deprecated and has been renamed to `macos`.'}
-print ${(%):-'Please update your .zshrc to use the `%Bmacos%b` plugin instead.%f'}
+print -u2 ${(%):-'%F{yellow}The `osx` plugin is deprecated and has been renamed to `macos`.'}
+print -u2 ${(%):-'Please update your .zshrc to use the `%Bmacos%b` plugin instead.%f'}
 
 (( ${fpath[(Ie)$ZSH/plugins/macos]} )) || fpath=("$ZSH/plugins/macos" $fpath)
 source "$ZSH/plugins/macos/macos.plugin.zsh"

From 59c40eee8e9232f556e9d4c8c97eb1b866846af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 27 Jan 2022 18:01:27 +0100
Subject: [PATCH 478/591] fix(installer): avoid `git clone -c` to support git
 v1.7.1 (#10621)

---
 tools/install.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 34dca8413..2290bc1eb 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -263,13 +263,19 @@ setup_ohmyzsh() {
     exit 1
   fi
 
-  git clone -c core.eol=lf -c core.autocrlf=false \
-    -c fsck.zeroPaddedFilemode=ignore \
-    -c fetch.fsck.zeroPaddedFilemode=ignore \
-    -c receive.fsck.zeroPaddedFilemode=ignore \
-    -c oh-my-zsh.remote=origin \
-    -c oh-my-zsh.branch="$BRANCH" \
-    --depth=1 --branch "$BRANCH" "$REMOTE" "$ZSH" || {
+  # Manual clone with git config options to support git < v1.7.2
+  git init "$ZSH" && cd "$ZSH" \
+  && git config core.eol lf \
+  && git config core.autocrlf false \
+  && git config fsck.zeroPaddedFilemode ignore \
+  && git config fetch.fsck.zeroPaddedFilemode ignore \
+  && git config receive.fsck.zeroPaddedFilemode ignore \
+  && git config oh-my-zsh.remote origin \
+  && git config oh-my-zsh.branch "$BRANCH" \
+  && git remote add origin "$REMOTE" \
+  && git fetch --depth=1 origin \
+  && git checkout -b "$BRANCH" "origin/$BRANCH" || {
+    rm -rf "$ZSH"
     fmt_error "git clone of oh-my-zsh repo failed"
     exit 1
   }

From 303ae79712d8d1df05b3ec6f63eb129c9a2ed031 Mon Sep 17 00:00:00 2001
From: Kuri Schlarb <246386+ntninja@users.noreply.github.com>
Date: Thu, 27 Jan 2022 20:48:42 +0000
Subject: [PATCH 479/591] fix(ys): fix `$VIRTUAL_ENV` check if `nounset` is
 enabled (#9915)

---
 themes/ys.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 5ef500e14..4c3c56ffc 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -49,7 +49,7 @@ local venv_info='$(virtenv_prompt)'
 YS_THEME_VIRTUALENV_PROMPT_PREFIX=" %{$fg[green]%}"
 YS_THEME_VIRTUALENV_PROMPT_SUFFIX=" %{$reset_color%}%"
 virtenv_prompt() {
-	[[ -n ${VIRTUAL_ENV} ]] || return
+	[[ -n "${VIRTUAL_ENV:-}" ]] || return
 	echo "${YS_THEME_VIRTUALENV_PROMPT_PREFIX}${VIRTUAL_ENV:t}${YS_THEME_VIRTUALENV_PROMPT_SUFFIX}"
 }
 

From ad8220bc6d4529db43c0968175f1b8d0e6637db0 Mon Sep 17 00:00:00 2001
From: ajr-dev <np8r39st8hn854izdxrw.septuagenarians@aleeas.com>
Date: Thu, 27 Jan 2022 17:59:04 +0100
Subject: [PATCH 480/591] fix(tmux): use `$ZSH_TMUX_CONFIG` setting in tmuxconf
 alias

---
 plugins/tmux/README.md       | 20 ++++++++++----------
 plugins/tmux/tmux.plugin.zsh | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/plugins/tmux/README.md b/plugins/tmux/README.md
index bc192a40c..7348f77c9 100644
--- a/plugins/tmux/README.md
+++ b/plugins/tmux/README.md
@@ -15,16 +15,16 @@ The plugin also supports the following:
 
 ## Aliases
 
-| Alias      | Command                | Description                                              |
-| ---------- | ---------------------- | -------------------------------------------------------- |
-| `ta`       | tmux attach -t         | Attach new tmux session to already running named session |
-| `tad`      | tmux attach -d -t      | Detach named tmux session                                |
-| `ts`       | tmux new-session -s    | Create a new named tmux session                          |
-| `tl`       | tmux list-sessions     | Displays a list of running tmux sessions                 |
-| `tksv`     | tmux kill-server       | Terminate all running tmux sessions                      |
-| `tkss`     | tmux kill-session -t   | Terminate named running tmux session                     |
-| `tmux`     | `_zsh_tmux_plugin_run` | Start a new tmux session                                 |
-| `tmuxconf` | `$EDITOR ~/.tmux.conf` | Open .tmux.conf file with an editor                      |
+| Alias      | Command                    | Description                                              |
+| ---------- | -------------------------- | -------------------------------------------------------- |
+| `ta`       | tmux attach -t             | Attach new tmux session to already running named session |
+| `tad`      | tmux attach -d -t          | Detach named tmux session                                |
+| `ts`       | tmux new-session -s        | Create a new named tmux session                          |
+| `tl`       | tmux list-sessions         | Displays a list of running tmux sessions                 |
+| `tksv`     | tmux kill-server           | Terminate all running tmux sessions                      |
+| `tkss`     | tmux kill-session -t       | Terminate named running tmux session                     |
+| `tmux`     | `_zsh_tmux_plugin_run`     | Start a new tmux session                                 |
+| `tmuxconf` | `$EDITOR $ZSH_TMUX_CONFIG` | Open .tmux.conf file with an editor                      |
 
 ## Configuration Variables
 
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 9d333257e..b9bb66d59 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -3,16 +3,6 @@ if ! (( $+commands[tmux] )); then
   return 1
 fi
 
-# ALIASES
-
-alias ta='tmux attach -t'
-alias tad='tmux attach -d -t'
-alias ts='tmux new-session -s'
-alias tl='tmux list-sessions'
-alias tksv='tmux kill-server'
-alias tkss='tmux kill-session -t'
-alias tmuxconf='$EDITOR ~/.tmux.conf'
-
 # CONFIGURATION VARIABLES
 # Automatically start tmux
 : ${ZSH_TMUX_AUTOSTART:=false}
@@ -40,6 +30,16 @@ alias tmuxconf='$EDITOR ~/.tmux.conf'
 # Set -u option to support unicode
 : ${ZSH_TMUX_UNICODE:=false}
 
+# ALIASES
+
+alias ta='tmux attach -t'
+alias tad='tmux attach -d -t'
+alias ts='tmux new-session -s'
+alias tl='tmux list-sessions'
+alias tksv='tmux kill-server'
+alias tkss='tmux kill-session -t'
+alias tmuxconf='$EDITOR $ZSH_TMUX_CONFIG'
+
 # Determine if the terminal supports 256 colors
 if [[ $terminfo[colors] == 256 ]]; then
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR

From b5edb51ee4bb0b3e9f5cbb0c46348bcbdd941f04 Mon Sep 17 00:00:00 2001
From: Lukas <matthias.doering@mldsc.de>
Date: Thu, 27 Jan 2022 22:00:50 +0100
Subject: [PATCH 481/591] style(rkj-repos): change `white` to `default` to
 support light color schemes (#6195)

Co-authored-by: Matthias Doering <matthias.doering@teamix.de>
---
 themes/rkj-repos.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index 65a075456..3cb452335 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -30,6 +30,6 @@ function mygit() {
 function retcode() {}
 
 # alternate prompt with git & hg
-PROMPT=$'%{$fg_bold[blue]%}┌─[%{$fg_bold[green]%}%n%b%{$fg[black]%}@%{$fg[cyan]%}%m%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%{$fg_bold[white]%}%~%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%b%{$fg[yellow]%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{$fg_bold[blue]%}]
+PROMPT=$'%{$fg_bold[blue]%}┌─[%{$fg_bold[green]%}%n%b%{$fg[black]%}@%{$fg[cyan]%}%m%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%{$fg_bold[default]%}%~%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%b%{$fg[yellow]%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{$fg_bold[blue]%}]
 %{$fg_bold[blue]%}└─[%{$fg_bold[magenta]%}%?$(retcode)%{$fg_bold[blue]%}] <$(mygit)$(hg_prompt_info)>%{$reset_color%} '
 PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '

From 3c5367d272011e7bca9fa4e8f9a5f9635f938d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 28 Jan 2022 13:22:31 +0100
Subject: [PATCH 482/591] fix(changelog): don't show changelog with only
 ignored type commits

---
 tools/changelog.sh | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 49532a4a4..6489a3cb2 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -23,8 +23,7 @@ TYPES=(
   test      "Testing"
 )
 
-#* Types that will be displayed in their own section,
-#* in the order specified here.
+#* Types that will be displayed in their own section, in the order specified here.
 local -a MAIN_TYPES
 MAIN_TYPES=(feat fix perf docs)
 
@@ -34,7 +33,8 @@ OTHER_TYPES=(refactor style other)
 
 #* Commit types that don't appear in $MAIN_TYPES nor $OTHER_TYPES
 #* will not be displayed and will simply be ignored.
-
+local -a IGNORED_TYPES
+IGNORED_TYPES=(${${${(@k)TYPES}:|MAIN_TYPES}:|OTHER_TYPES})
 
 ############################
 # COMMIT PARSING UTILITIES #
@@ -139,7 +139,7 @@ function parse-commit {
   #  [BREAKING CHANGE: warning]
 
   # commits holds the commit type
-  commits[$hash]="$(commit:type "$subject")"
+  types[$hash]="$(commit:type "$subject")"
   # scopes holds the commit scope
   scopes[$hash]="$(commit:scope "$subject")"
   # subjects holds the commit subject
@@ -164,26 +164,32 @@ function parse-commit {
 function display-release {
 
   # This function uses the following globals: output, version,
-  # commits (A), subjects (A), scopes (A), breaking (A) and reverts (A).
+  # types (A), subjects (A), scopes (A), breaking (A) and reverts (A).
   #
   # - output is the output format to use when formatting (raw|text|md)
   # - version is the version in which the commits are made
-  # - commits, subjects, scopes, breaking, and reverts are associative arrays
+  # - types, subjects, scopes, breaking, and reverts are associative arrays
   #   with commit hashes as keys
 
   # Remove commits that were reverted
   local hash rhash
   for hash rhash in ${(kv)reverts}; do
-    if (( ${+commits[$rhash]} )); then
+    if (( ${+types[$rhash]} )); then
       # Remove revert commit
-      unset "commits[$hash]" "subjects[$hash]" "scopes[$hash]" "breaking[$hash]"
+      unset "types[$hash]" "subjects[$hash]" "scopes[$hash]" "breaking[$hash]"
       # Remove reverted commit
-      unset "commits[$rhash]" "subjects[$rhash]" "scopes[$rhash]" "breaking[$rhash]"
+      unset "types[$rhash]" "subjects[$rhash]" "scopes[$rhash]" "breaking[$rhash]"
     fi
   done
 
+  # Remove commits from ignored types unless it has breaking change information
+  for hash in ${(k)types[(R)${(j:|:)IGNORED_TYPES}]}; do
+    (( ! ${+breaking[$hash]} )) || continue
+    unset "types[$hash]" "subjects[$hash]" "scopes[$hash]"
+  done
+
   # If no commits left skip displaying the release
-  if (( $#commits == 0 )); then
+  if (( $#types == 0 )); then
     return
   fi
 
@@ -313,7 +319,7 @@ function display-release {
     local hash type="$1"
 
     local -a hashes
-    hashes=(${(k)commits[(R)$type]})
+    hashes=(${(k)types[(R)$type]})
 
     # If no commits found of type $type, go to next type
     (( $#hashes != 0 )) || return 0
@@ -330,7 +336,7 @@ function display-release {
 
     # Commits made under types considered other changes
     local -A changes
-    changes=(${(kv)commits[(R)${(j:|:)OTHER_TYPES}]})
+    changes=(${(kv)types[(R)${(j:|:)OTHER_TYPES}]})
 
     # If no commits found under "other" types, don't display anything
     (( $#changes != 0 )) || return 0
@@ -388,7 +394,7 @@ function main {
   fi
 
   # Commit classification arrays
-  local -A commits subjects scopes breaking reverts
+  local -A types subjects scopes breaking reverts
   local truncate=0 read_commits=0
   local version tag
   local hash refs subject body
@@ -441,7 +447,7 @@ function main {
       # Output previous release
       display-release
       # Reinitialize commit storage
-      commits=()
+      types=()
       subjects=()
       scopes=()
       breaking=()

From 6f9650d940f31d9d10f07a176a85ca3b814f448f Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 28 Jan 2022 06:45:05 -0600
Subject: [PATCH 483/591] fix(gitfast): update to git-completion 1.3.6 (#10633)

---
 plugins/gitfast/_git                |   46 +-
 plugins/gitfast/git-completion.bash | 1007 +++++++++++++--------------
 plugins/gitfast/git-prompt.sh       |    7 +-
 plugins/gitfast/update              |    2 +-
 4 files changed, 518 insertions(+), 544 deletions(-)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 988f5b1c6..31bf88c1c 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -33,8 +33,9 @@ if [ -z "$script" ]; then
 		bash_completion='/usr/share/bash-completion/completions/'
 
 	locations=(
-		"$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
+		"${${funcsourcetrace[1]%:*}:A:h}"/git-completion.bash
 		"$HOME/.local/share/bash-completion/completions/git"
+		'/usr/local/share/bash-completion/completions/git'
 		"$bash_completion/git"
 		'/etc/bash_completion.d/git' # old debian
 		)
@@ -51,13 +52,20 @@ functions[complete]="$old_complete"
 
 __gitcompadd ()
 {
-	compadd -Q -p "${2-}" -S "${3- }" ${@[4,-1]} -- ${=1} && _ret=0
+	compadd -p "${2-}" -S "${3- }" -q -- ${=1} && _ret=0
 }
 
 __gitcomp ()
 {
 	emulate -L zsh
 
+	IFS=$' \t\n' __gitcompadd "$1" "${2-}" "${4- }"
+}
+
+__gitcomp_opts ()
+{
+	emulate -L zsh
+
 	local cur_="${3-$cur}"
 
 	[[ "$cur_" == *= ]] && return
@@ -70,7 +78,7 @@ __gitcomp ()
 			break
 		fi
 
-		if [[ -z "${4-}" ]]; then
+		if [[ -z "${4+set}" ]]; then
 			case $c in
 			*=) c="${c%=}"; sfx="=" ;;
 			*.) sfx="" ;;
@@ -79,7 +87,7 @@ __gitcomp ()
 		else
 			sfx="$4"
 		fi
-		__gitcompadd "$c" "${2-}" "$sfx" -q
+		__gitcompadd "$c" "${2-}" "$sfx"
 	done
 }
 
@@ -87,7 +95,10 @@ __gitcomp_nl ()
 {
 	emulate -L zsh
 
-	IFS=$'\n' __gitcompadd "$1" "${2-}" "${4- }"
+	# words that don't end up in space
+	compadd -p "${2-}" -S "${4- }" -q -- ${${(f)1}:#*\ } && _ret=0
+	# words that end in space
+	compadd -p "${2-}" -S " ${4- }" -q -- ${${(M)${(f)1}:#*\ }% } && _ret=0
 }
 
 __gitcomp_file ()
@@ -107,21 +118,6 @@ __gitcomp_file_direct ()
 	__gitcomp_file "$1" ""
 }
 
-__gitcomp_nl_append ()
-{
-	__gitcomp_nl "$@"
-}
-
-__gitcomp_direct_append ()
-{
-	__gitcomp_direct "$@"
-}
-
-_git_zsh ()
-{
-	__gitcomp "v1.2"
-}
-
 __git_complete_command ()
 {
 	emulate -L zsh
@@ -206,9 +202,7 @@ __git_zsh_main ()
 {
 	local curcontext="$curcontext" state state_descr line
 	typeset -A opt_args
-	local -a orig_words __git_C_args
-
-	orig_words=( ${words[@]} )
+	local -a __git_C_args
 
 	_arguments -C \
 		'(-p --paginate -P --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
@@ -245,7 +239,7 @@ __git_zsh_main ()
 		emulate ksh -c __git_complete_config_variable_name_and_value
 		;;
 	(arg)
-		local command="${words[1]}" __git_dir
+		local command="${words[1]}" __git_dir __git_cmd_idx=1
 
 		if (( $+opt_args[--bare] )); then
 			__git_dir='.'
@@ -259,7 +253,7 @@ __git_zsh_main ()
 
 		(( $+opt_args[--help] )) && command='help'
 
-		words=( ${orig_words[@]} )
+		words=( git ${words[@]} )
 
 		__git_zsh_bash_func $command
 		;;
@@ -269,7 +263,7 @@ __git_zsh_main ()
 _git ()
 {
 	local _ret=1
-	local cur cword prev
+	local cur cword prev __git_cmd_idx=0
 
 	cur=${words[CURRENT]}
 	prev=${words[CURRENT-1]}
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index f7b09b2c1..2603ba7bb 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -29,6 +29,15 @@
 # tell the completion to use commit completion.  This also works with aliases
 # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
 #
+# If you have a command that is not part of git, but you would still
+# like completion, you can use __git_complete:
+#
+#   __git_complete gl git_log
+#
+# Or if it's a main command (i.e. git or gitk):
+#
+#   __git_complete gk gitk
+#
 # Compatible with bash 3.2.57.
 #
 # You can set the following environment variables to influence the behavior of
@@ -45,6 +54,145 @@
 #     When set to "1" suggest all options, including options which are
 #     typically hidden (e.g. '--allow-empty' for 'git commit').
 
+# The following functions are meant to modify COMPREPLY, which should not be
+# modified directly.  The purpose is to localize the modifications so it's
+# easier to emulate it in Zsh. Every time a new __gitcomp* function is added,
+# the corresponding function should be added to Zsh.
+
+__gitcompadd ()
+{
+	local x i=${#COMPREPLY[@]}
+	for x in $1; do
+		if [[ "$x" == "$3"* ]]; then
+			COMPREPLY[i++]="$2$x$4"
+		fi
+	done
+}
+
+# Creates completion replies.
+# It accepts 1 to 4 arguments:
+# 1: List of possible completion words.
+# 2: A prefix to be added to each possible completion word (optional).
+# 3: Generate possible completion matches for this word (optional).
+# 4: A suffix to be appended to each possible completion word (optional).
+__gitcomp ()
+{
+	local IFS=$' \t\n'
+	__gitcompadd "$1" "${2-}" "${3-$cur}" "${4- }"
+}
+
+# Generates completion reply from newline-separated possible completion words
+# by appending a space to all of them. The result is appended to COMPREPLY.
+# It accepts 1 to 4 arguments:
+# 1: List of possible completion words, separated by a single newline.
+# 2: A prefix to be added to each possible completion word (optional).
+# 3: Generate possible completion matches for this word (optional).
+# 4: A suffix to be appended to each possible completion word instead of
+#    the default space (optional).  If specified but empty, nothing is
+#    appended.
+__gitcomp_nl ()
+{
+	local IFS=$'\n'
+	__gitcompadd "$1" "${2-}" "${3-$cur}" "${4- }"
+}
+
+# Appends prefiltered words to COMPREPLY without any additional processing.
+# Callers must take care of providing only words that match the current word
+# to be completed and adding any prefix and/or suffix (trailing space!), if
+# necessary.
+# 1: List of newline-separated matching completion words, complete with
+#    prefix and suffix.
+__gitcomp_direct ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY+=($1)
+}
+
+# Generates completion reply with compgen from newline-separated possible
+# completion filenames.
+# It accepts 1 to 3 arguments:
+# 1: List of possible completion filenames, separated by a single newline.
+# 2: A directory prefix to be added to each possible completion filename
+#    (optional).
+# 3: Generate possible completion matches for this word (optional).
+__gitcomp_file ()
+{
+	local IFS=$'\n'
+
+	# XXX does not work when the directory prefix contains a tilde,
+	# since tilde expansion is not applied.
+	# This means that COMPREPLY will be empty and Bash default
+	# completion will be used.
+	__gitcompadd "$1" "${2-}" "${3-$cur}" ""
+
+	# use a hack to enable file mode in bash < 4
+	compopt -o filenames +o nospace 2>/dev/null ||
+	compgen -f /non-existing-dir/ >/dev/null ||
+	true
+}
+
+# Fills the COMPREPLY array with prefiltered paths without any additional
+# processing.
+# Callers must take care of providing only paths that match the current path
+# to be completed and adding any prefix path components, if necessary.
+# 1: List of newline-separated matching paths, complete with all prefix
+#    path components.
+__gitcomp_file_direct ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY+=($1)
+
+	# use a hack to enable file mode in bash < 4
+	compopt -o filenames +o nospace 2>/dev/null ||
+	compgen -f /non-existing-dir/ >/dev/null ||
+	true
+}
+
+# Creates completion replies, reorganizing options and adding suffixes as needed.
+# It accepts 1 to 4 arguments:
+# 1: List of possible completion words.
+# 2: A prefix to be added to each possible completion word (optional).
+# 3: Generate possible completion matches for this word (optional).
+# 4: A suffix to be appended to each possible completion word (optional).
+__gitcomp_opts ()
+{
+	local cur_="${3-$cur}"
+
+	if [[ "$cur_" == *= ]]; then
+		return
+	fi
+
+	local c i=0 IFS=$' \t\n' sfx
+	for c in $1; do
+		if [[ $c == "--" ]]; then
+			if [[ "$cur_" == --no-* ]]; then
+				continue
+			fi
+
+			if [[ --no == "$cur_"* ]]; then
+				COMPREPLY[i++]="--no-... "
+			fi
+			break
+		fi
+		if [[ $c == "$cur_"* ]]; then
+			if [[ -z "${4+set}" ]]; then
+				case $c in
+				*=|*.) sfx="" ;;
+				*) sfx=" " ;;
+				esac
+			else
+				sfx="$4"
+			fi
+			COMPREPLY[i++]="${2-}$c$sfx"
+		fi
+	done
+}
+
+# __gitcomp functions end here
+# ==============================================================================
+
 # Discovers the path to the git repository taking any '--git-dir=<path>' and
 # '-C <path>' options into account and stores it in the $__git_repo_path
 # variable.
@@ -63,7 +211,7 @@ __git_find_repo_path ()
 		test -d "$__git_dir" &&
 		__git_repo_path="$__git_dir"
 	elif [ -n "${GIT_DIR-}" ]; then
-		test -d "${GIT_DIR-}" &&
+		test -d "$GIT_DIR" &&
 		__git_repo_path="$GIT_DIR"
 	elif [ -d .git ]; then
 		__git_repo_path=.git
@@ -159,230 +307,6 @@ __git_dequote ()
 	done
 }
 
-# The following function is based on code from:
-#
-#   bash_completion - programmable completion functions for bash 3.2+
-#
-#   Copyright © 2006-2008, Ian Macdonald <ian@caliban.org>
-#             © 2009-2010, Bash Completion Maintainers
-#                     <bash-completion-devel@lists.alioth.debian.org>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
-#
-#   The latest version of this software can be obtained here:
-#
-#   http://bash-completion.alioth.debian.org/
-#
-#   RELEASE: 2.x
-
-# This function can be used to access a tokenized list of words
-# on the command line:
-#
-#	__git_reassemble_comp_words_by_ref '=:'
-#	if test "${words_[cword_-1]}" = -w
-#	then
-#		...
-#	fi
-#
-# The argument should be a collection of characters from the list of
-# word completion separators (COMP_WORDBREAKS) to treat as ordinary
-# characters.
-#
-# This is roughly equivalent to going back in time and setting
-# COMP_WORDBREAKS to exclude those characters.  The intent is to
-# make option types like --date=<type> and <rev>:<path> easy to
-# recognize by treating each shell word as a single token.
-#
-# It is best not to set COMP_WORDBREAKS directly because the value is
-# shared with other completion scripts.  By the time the completion
-# function gets called, COMP_WORDS has already been populated so local
-# changes to COMP_WORDBREAKS have no effect.
-#
-# Output: words_, cword_, cur_.
-
-__git_reassemble_comp_words_by_ref()
-{
-	local exclude i j first
-	# Which word separators to exclude?
-	exclude="${1//[^$COMP_WORDBREAKS]}"
-	cword_=$COMP_CWORD
-	if [ -z "$exclude" ]; then
-		words_=("${COMP_WORDS[@]}")
-		return
-	fi
-	# List of word completion separators has shrunk;
-	# re-assemble words to complete.
-	for ((i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
-		# Append each nonempty word consisting of just
-		# word separator characters to the current word.
-		first=t
-		while
-			[ $i -gt 0 ] &&
-			[ -n "${COMP_WORDS[$i]}" ] &&
-			# word consists of excluded word separators
-			[ "${COMP_WORDS[$i]//[^$exclude]}" = "${COMP_WORDS[$i]}" ]
-		do
-			# Attach to the previous token,
-			# unless the previous token is the command name.
-			if [ $j -ge 2 ] && [ -n "$first" ]; then
-				((j--))
-			fi
-			first=
-			words_[$j]=${words_[j]}${COMP_WORDS[i]}
-			if [ $i = $COMP_CWORD ]; then
-				cword_=$j
-			fi
-			if (($i < ${#COMP_WORDS[@]} - 1)); then
-				((i++))
-			else
-				# Done.
-				return
-			fi
-		done
-		words_[$j]=${words_[j]}${COMP_WORDS[i]}
-		if [ $i = $COMP_CWORD ]; then
-			cword_=$j
-		fi
-	done
-}
-
-if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
-_get_comp_words_by_ref ()
-{
-	local exclude cur_ words_ cword_
-	if [ "$1" = "-n" ]; then
-		exclude=$2
-		shift 2
-	fi
-	__git_reassemble_comp_words_by_ref "$exclude"
-	cur_=${words_[cword_]}
-	while [ $# -gt 0 ]; do
-		case "$1" in
-		cur)
-			cur=$cur_
-			;;
-		prev)
-			prev=${words_[$cword_-1]}
-			;;
-		words)
-			words=("${words_[@]}")
-			;;
-		cword)
-			cword=$cword_
-			;;
-		esac
-		shift
-	done
-}
-fi
-
-# Fills the COMPREPLY array with prefiltered words without any additional
-# processing.
-# Callers must take care of providing only words that match the current word
-# to be completed and adding any prefix and/or suffix (trailing space!), if
-# necessary.
-# 1: List of newline-separated matching completion words, complete with
-#    prefix and suffix.
-__gitcomp_direct ()
-{
-	local IFS=$'\n'
-
-	COMPREPLY=($1)
-}
-
-# Similar to __gitcomp_direct, but appends to COMPREPLY instead.
-# Callers must take care of providing only words that match the current word
-# to be completed and adding any prefix and/or suffix (trailing space!), if
-# necessary.
-# 1: List of newline-separated matching completion words, complete with
-#    prefix and suffix.
-__gitcomp_direct_append ()
-{
-	local IFS=$'\n'
-
-	COMPREPLY+=($1)
-}
-
-__gitcompappend ()
-{
-	local x i=${#COMPREPLY[@]}
-	for x in $1; do
-		if [[ "$x" == "$3"* ]]; then
-			COMPREPLY[i++]="$2$x$4"
-		fi
-	done
-}
-
-__gitcompadd ()
-{
-	COMPREPLY=()
-	__gitcompappend "$@"
-}
-
-# Generates completion reply, appending a space to possible completion words,
-# if necessary.
-# It accepts 1 to 4 arguments:
-# 1: List of possible completion words.
-# 2: A prefix to be added to each possible completion word (optional).
-# 3: Generate possible completion matches for this word (optional).
-# 4: A suffix to be appended to each possible completion word (optional).
-__gitcomp ()
-{
-	local cur_="${3-$cur}"
-
-	case "$cur_" in
-	*=)
-		;;
-	--no-*)
-		local c i=0 IFS=$' \t\n'
-		for c in $1; do
-			if [[ $c == "--" ]]; then
-				continue
-			fi
-			c="$c${4-}"
-			if [[ $c == "$cur_"* ]]; then
-				case $c in
-				--*=|*.) ;;
-				*) c="$c " ;;
-				esac
-				COMPREPLY[i++]="${2-}$c"
-			fi
-		done
-		;;
-	*)
-		local c i=0 IFS=$' \t\n'
-		for c in $1; do
-			if [[ $c == "--" ]]; then
-				c="--no-...${4-}"
-				if [[ $c == "$cur_"* ]]; then
-					COMPREPLY[i++]="${2-}$c "
-				fi
-				break
-			fi
-			c="$c${4-}"
-			if [[ $c == "$cur_"* ]]; then
-				case $c in
-				*=|*.) ;;
-				*) c="$c " ;;
-				esac
-				COMPREPLY[i++]="${2-}$c"
-			fi
-		done
-		;;
-	esac
-}
-
 # Clear the variables caching builtins' options when (re-)sourcing
 # the completion script.
 if [[ -n ${ZSH_VERSION-} ]]; then
@@ -391,107 +315,108 @@ else
 	unset $(compgen -v __gitcomp_builtin_)
 fi
 
-__gitcomp_builtin_add_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_am_default=" --interactive --3way --quiet --signoff --utf8 --keep --keep-non-patch --message-id --keep-cr --no-keep-cr --scissors --whitespace= --ignore-space-change --ignore-whitespace --directory= --exclude= --include= --patch-format= --reject --resolvemsg= --continue --resolved --skip --abort --quit --show-current-patch --committer-date-is-author-date --ignore-date --rerere-autoupdate --gpg-sign -- --no-interactive --no-3way --no-quiet --no-signoff --no-utf8 --no-keep --no-keep-non-patch --no-message-id --no-scissors --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-directory --no-exclude --no-include --no-patch-format --no-reject --no-resolvemsg --no-committer-date-is-author-date --no-ignore-date --no-rerere-autoupdate --no-gpg-sign"
-__gitcomp_builtin_apply_default=" --exclude= --include= --no-add --stat --numstat --summary --check --index --intent-to-add --cached --apply --3way --build-fake-ancestor= --whitespace= --ignore-space-change --ignore-whitespace --reverse --unidiff-zero --reject --allow-overlap --verbose --inaccurate-eof --recount --directory= --add -- --no-stat --no-numstat --no-summary --no-check --no-index --no-intent-to-add --no-cached --no-apply --no-3way --no-build-fake-ancestor --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-reverse --no-unidiff-zero --no-reject --no-allow-overlap --no-verbose --no-inaccurate-eof --no-recount --no-directory"
+__gitcomp_builtin_add_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --sparse --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-sparse --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_am_default=" --interactive --3way --quiet --signoff --utf8 --keep --keep-non-patch --message-id --keep-cr --no-keep-cr --scissors --quoted-cr= --whitespace= --ignore-space-change --ignore-whitespace --directory= --exclude= --include= --patch-format= --reject --resolvemsg= --continue --resolved --skip --abort --quit --show-current-patch --allow-empty --committer-date-is-author-date --ignore-date --rerere-autoupdate --gpg-sign --empty= -- --no-interactive --no-3way --no-quiet --no-signoff --no-utf8 --no-keep --no-keep-non-patch --no-message-id --no-scissors --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-directory --no-exclude --no-include --no-patch-format --no-reject --no-resolvemsg --no-committer-date-is-author-date --no-ignore-date --no-rerere-autoupdate --no-gpg-sign"
+__gitcomp_builtin_apply_default=" --exclude= --include= --no-add --stat --numstat --summary --check --index --intent-to-add --cached --apply --3way --build-fake-ancestor= --whitespace= --ignore-space-change --ignore-whitespace --reverse --unidiff-zero --reject --allow-overlap --verbose --quiet --inaccurate-eof --recount --directory= --allow-empty --add -- --no-stat --no-numstat --no-summary --no-check --no-index --no-intent-to-add --no-cached --no-apply --no-3way --no-build-fake-ancestor --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-reverse --no-unidiff-zero --no-reject --no-allow-overlap --no-verbose --no-quiet --no-inaccurate-eof --no-recount --no-directory --no-allow-empty"
 __gitcomp_builtin_archive_default=" --output= --remote= --exec= --no-output -- --no-remote --no-exec"
-__gitcomp_builtin_bisect__helper_default=" --next-all --write-terms --bisect-clean-state --check-expected-revs --bisect-reset --bisect-write --check-and-set-terms --bisect-next-check --bisect-terms --bisect-start --bisect-next --bisect-auto-next --bisect-autostart --no-log --log"
+__gitcomp_builtin_bisect__helper_default=" --bisect-reset --bisect-next-check --bisect-terms --bisect-start --bisect-next --bisect-state --bisect-log --bisect-replay --bisect-skip --bisect-visualize --bisect-run --no-log --log"
 __gitcomp_builtin_blame_default=" --incremental --root --show-stats --progress --score-debug --show-name --show-number --porcelain --line-porcelain --show-email --ignore-rev= --ignore-revs-file= --color-lines --color-by-age --minimal --contents= --abbrev --no-incremental -- --no-root --no-show-stats --no-progress --no-score-debug --no-show-name --no-show-number --no-porcelain --no-line-porcelain --no-show-email --no-ignore-rev --no-ignore-revs-file --no-color-lines --no-color-by-age --no-minimal --no-contents --no-abbrev"
-__gitcomp_builtin_branch_default=" --verbose --quiet --track --set-upstream-to= --unset-upstream --color --remotes --contains --no-contains --abbrev --all --delete --move --copy --list --show-current --create-reflog --edit-description --merged --no-merged --column --sort= --points-at= --ignore-case --format= -- --no-verbose --no-quiet --no-track --no-set-upstream-to --no-unset-upstream --no-color --no-remotes --no-abbrev --no-all --no-delete --no-move --no-copy --no-list --no-show-current --no-create-reflog --no-edit-description --no-column --no-points-at --no-ignore-case --no-format"
+__gitcomp_builtin_branch_default=" --verbose --quiet --track --set-upstream-to= --unset-upstream --color --remotes --contains --no-contains --abbrev --all --delete --move --copy --list --show-current --create-reflog --edit-description --merged --no-merged --column --sort= --points-at= --ignore-case --format= -- --no-verbose --no-quiet --no-track --no-set-upstream-to --no-unset-upstream --no-color --no-remotes --no-abbrev --no-all --no-delete --no-move --no-copy --no-list --no-show-current --no-create-reflog --no-edit-description --no-column --no-sort --no-points-at --no-ignore-case --no-format"
 __gitcomp_builtin_bugreport_default=" --output-directory= --suffix= --no-output-directory -- --no-suffix"
 __gitcomp_builtin_cat_file_default=" --textconv --filters --path= --allow-unknown-type --buffer --batch --batch-check --follow-symlinks --batch-all-objects --unordered --no-path -- --no-allow-unknown-type --no-buffer --no-follow-symlinks --no-batch-all-objects --no-unordered"
 __gitcomp_builtin_check_attr_default=" --all --cached --stdin --no-all -- --no-cached --no-stdin"
 __gitcomp_builtin_check_ignore_default=" --quiet --verbose --stdin --non-matching --no-index --index -- --no-quiet --no-verbose --no-stdin --no-non-matching"
 __gitcomp_builtin_check_mailmap_default=" --stdin --no-stdin"
 __gitcomp_builtin_checkout_default=" --guess --overlay --quiet --recurse-submodules --progress --merge --conflict= --detach --track --orphan= --ignore-other-worktrees --ours --theirs --patch --ignore-skip-worktree-bits --pathspec-from-file= --pathspec-file-nul --no-guess -- --no-overlay --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-detach --no-track --no-orphan --no-ignore-other-worktrees --no-patch --no-ignore-skip-worktree-bits --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_checkout__worker_default=" --prefix= --no-prefix"
 __gitcomp_builtin_checkout_index_default=" --all --force --quiet --no-create --index --stdin --temp --prefix= --stage= --create -- --no-all --no-force --no-quiet --no-index --no-stdin --no-temp --no-prefix"
 __gitcomp_builtin_cherry_default=" --abbrev --verbose --no-abbrev -- --no-verbose"
 __gitcomp_builtin_cherry_pick_default=" --quit --continue --abort --skip --cleanup= --no-commit --edit --signoff --mainline= --rerere-autoupdate --strategy= --strategy-option= --gpg-sign --ff --allow-empty --allow-empty-message --keep-redundant-commits --commit -- --no-cleanup --no-edit --no-signoff --no-mainline --no-rerere-autoupdate --no-strategy --no-strategy-option --no-gpg-sign --no-ff --no-allow-empty --no-allow-empty-message --no-keep-redundant-commits"
 __gitcomp_builtin_clean_default=" --quiet --dry-run --interactive --exclude= --no-quiet -- --no-dry-run --no-interactive"
-__gitcomp_builtin_clone_default=" --verbose --quiet --progress --no-checkout --bare --mirror --local --no-hardlinks --shared --recurse-submodules --recursive --jobs= --template= --reference= --reference-if-able= --dissociate --origin= --branch= --upload-pack= --depth= --shallow-since= --shallow-exclude= --single-branch --no-tags --shallow-submodules --separate-git-dir= --config= --server-option= --ipv4 --ipv6 --filter= --remote-submodules --sparse --checkout --hardlinks --tags -- --no-verbose --no-quiet --no-progress --no-bare --no-mirror --no-local --no-shared --no-recurse-submodules --no-recursive --no-jobs --no-template --no-reference --no-reference-if-able --no-dissociate --no-origin --no-branch --no-upload-pack --no-depth --no-shallow-since --no-shallow-exclude --no-single-branch --no-shallow-submodules --no-separate-git-dir --no-config --no-server-option --no-ipv4 --no-ipv6 --no-filter --no-remote-submodules --no-sparse"
+__gitcomp_builtin_clone_default=" --verbose --quiet --progress --reject-shallow --no-checkout --bare --mirror --local --no-hardlinks --shared --recurse-submodules --jobs= --template= --reference= --reference-if-able= --dissociate --origin= --branch= --upload-pack= --depth= --shallow-since= --shallow-exclude= --single-branch --no-tags --shallow-submodules --separate-git-dir= --config= --server-option= --ipv4 --ipv6 --filter= --remote-submodules --sparse --checkout --hardlinks --tags -- --no-verbose --no-quiet --no-progress --no-reject-shallow --no-bare --no-mirror --no-local --no-shared --no-recurse-submodules --no-recursive --no-jobs --no-template --no-reference --no-reference-if-able --no-dissociate --no-origin --no-branch --no-upload-pack --no-depth --no-shallow-since --no-shallow-exclude --no-single-branch --no-shallow-submodules --no-separate-git-dir --no-config --no-server-option --no-ipv4 --no-ipv6 --no-filter --no-remote-submodules --no-sparse"
 __gitcomp_builtin_column_default=" --command= --mode --raw-mode= --width= --indent= --nl= --padding= --no-command -- --no-mode --no-raw-mode --no-width --no-indent --no-nl --no-padding"
-__gitcomp_builtin_commit_default=" --quiet --verbose --file= --author= --date= --message= --reedit-message= --reuse-message= --fixup= --squash= --reset-author --signoff --template= --edit --cleanup= --status --gpg-sign --all --include --interactive --patch --only --no-verify --dry-run --short --branch --ahead-behind --porcelain --long --null --amend --no-post-rewrite --untracked-files --pathspec-from-file= --pathspec-file-nul --verify --post-rewrite -- --no-quiet --no-verbose --no-file --no-author --no-date --no-message --no-reedit-message --no-reuse-message --no-fixup --no-squash --no-reset-author --no-signoff --no-template --no-edit --no-cleanup --no-status --no-gpg-sign --no-all --no-include --no-interactive --no-patch --no-only --no-dry-run --no-short --no-branch --no-ahead-behind --no-porcelain --no-long --no-null --no-amend --no-untracked-files --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_commit_default=" --quiet --verbose --file= --author= --date= --message= --reedit-message= --reuse-message= --fixup= --squash= --reset-author --trailer= --signoff --template= --edit --cleanup= --status --gpg-sign --all --include --interactive --patch --only --no-verify --dry-run --short --branch --ahead-behind --porcelain --long --null --amend --no-post-rewrite --untracked-files --pathspec-from-file= --pathspec-file-nul --verify --post-rewrite -- --no-quiet --no-verbose --no-file --no-author --no-date --no-message --no-reedit-message --no-reuse-message --no-fixup --no-squash --no-reset-author --no-signoff --no-template --no-edit --no-cleanup --no-status --no-gpg-sign --no-all --no-include --no-interactive --no-patch --no-only --no-dry-run --no-short --no-branch --no-ahead-behind --no-porcelain --no-long --no-null --no-amend --no-untracked-files --no-pathspec-from-file --no-pathspec-file-nul"
 __gitcomp_builtin_commit_graph_default=" --object-dir= --no-object-dir"
-__gitcomp_builtin_config_default=" --global --system --local --worktree --file= --blob= --get --get-all --get-regexp --get-urlmatch --replace-all --add --unset --unset-all --rename-section --remove-section --list --edit --get-color --get-colorbool --type= --bool --int --bool-or-int --bool-or-str --path --expiry-date --null --name-only --includes --show-origin --show-scope --default= --no-global -- --no-system --no-local --no-worktree --no-file --no-blob --no-get --no-get-all --no-get-regexp --no-get-urlmatch --no-replace-all --no-add --no-unset --no-unset-all --no-rename-section --no-remove-section --no-list --no-edit --no-get-color --no-get-colorbool --no-type --no-null --no-name-only --no-includes --no-show-origin --no-show-scope --no-default"
+__gitcomp_builtin_config_default=" --global --system --local --worktree --file= --blob= --get --get-all --get-regexp --get-urlmatch --replace-all --add --unset --unset-all --rename-section --remove-section --list --fixed-value --edit --get-color --get-colorbool --type= --bool --int --bool-or-int --bool-or-str --path --expiry-date --null --name-only --includes --show-origin --show-scope --default= --no-global -- --no-system --no-local --no-worktree --no-file --no-blob --no-get --no-get-all --no-get-regexp --no-get-urlmatch --no-replace-all --no-add --no-unset --no-unset-all --no-rename-section --no-remove-section --no-list --no-fixed-value --no-edit --no-get-color --no-get-colorbool --no-type --no-null --no-name-only --no-includes --no-show-origin --no-show-scope --no-default"
 __gitcomp_builtin_count_objects_default=" --verbose --human-readable --no-verbose -- --no-human-readable"
 __gitcomp_builtin_credential_cache_default=" --timeout= --socket= --no-timeout -- --no-socket"
 __gitcomp_builtin_credential_cache__daemon_default=" --debug --no-debug"
 __gitcomp_builtin_credential_store_default=" --file= --no-file"
 __gitcomp_builtin_describe_default=" --contains --debug --all --tags --long --first-parent --abbrev --exact-match --candidates= --match= --exclude= --always --dirty --broken --no-contains -- --no-debug --no-all --no-tags --no-long --no-first-parent --no-abbrev --no-exact-match --no-candidates --no-match --no-exclude --no-always --no-dirty --no-broken"
-__gitcomp_builtin_difftool_default=" --gui --dir-diff --no-prompt --symlinks --tool= --tool-help --trust-exit-code --extcmd= --no-index -- --no-gui --no-dir-diff --no-symlinks --no-tool --no-tool-help --no-trust-exit-code --no-extcmd"
+__gitcomp_builtin_difftool_default=" --gui --dir-diff --no-prompt --symlinks --tool= --tool-help --trust-exit-code --extcmd= --no-index --index -- --no-gui --no-dir-diff --no-symlinks --no-tool --no-tool-help --no-trust-exit-code --no-extcmd"
 __gitcomp_builtin_env__helper_default=" --type= --default= --exit-code --no-default -- --no-exit-code"
 __gitcomp_builtin_fast_export_default=" --progress= --signed-tags= --tag-of-filtered-object= --reencode= --export-marks= --import-marks= --import-marks-if-exists= --fake-missing-tagger --full-tree --use-done-feature --no-data --refspec= --anonymize --anonymize-map= --reference-excluded-parents --show-original-ids --mark-tags --data -- --no-progress --no-signed-tags --no-tag-of-filtered-object --no-reencode --no-export-marks --no-import-marks --no-import-marks-if-exists --no-fake-missing-tagger --no-full-tree --no-use-done-feature --no-refspec --no-anonymize --no-reference-excluded-parents --no-show-original-ids --no-mark-tags"
-__gitcomp_builtin_fetch_default=" --verbose --quiet --all --set-upstream --append --upload-pack= --force --multiple --tags --jobs= --prune --prune-tags --recurse-submodules --dry-run --write-fetch-head --keep --update-head-ok --progress --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --filter= --auto-maintenance --auto-gc --show-forced-updates --write-commit-graph --stdin --no-verbose -- --no-quiet --no-all --no-set-upstream --no-append --no-upload-pack --no-force --no-multiple --no-tags --no-jobs --no-prune --no-prune-tags --no-recurse-submodules --no-dry-run --no-write-fetch-head --no-keep --no-update-head-ok --no-progress --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-filter --no-auto-maintenance --no-auto-gc --no-show-forced-updates --no-write-commit-graph --no-stdin"
-__gitcomp_builtin_fmt_merge_msg_default=" --log --message= --file= --no-log -- --no-message --no-file"
-__gitcomp_builtin_for_each_ref_default=" --shell --perl --python --tcl --count= --format= --color --sort= --points-at= --merged --no-merged --contains --no-contains --ignore-case -- --no-shell --no-perl --no-python --no-tcl --no-count --no-format --no-color --no-points-at --no-ignore-case"
-__gitcomp_builtin_format_patch_default=" --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --to= --cc= --from --in-reply-to= --attach --inline --thread --signature= --base= --signature-file= --quiet --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-numbered --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-to --no-cc --no-from --no-in-reply-to --no-attach --no-thread --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
+__gitcomp_builtin_fetch_default=" --verbose --quiet --all --set-upstream --append --atomic --upload-pack= --force --multiple --tags --jobs= --prefetch --prune --prune-tags --recurse-submodules --dry-run --write-fetch-head --keep --update-head-ok --progress --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --negotiate-only --filter= --auto-maintenance --auto-gc --show-forced-updates --write-commit-graph --stdin --no-verbose -- --no-quiet --no-all --no-set-upstream --no-append --no-atomic --no-upload-pack --no-force --no-multiple --no-tags --no-jobs --no-prefetch --no-prune --no-prune-tags --no-recurse-submodules --no-dry-run --no-write-fetch-head --no-keep --no-update-head-ok --no-progress --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-negotiate-only --no-filter --no-auto-maintenance --no-auto-gc --no-show-forced-updates --no-write-commit-graph --no-stdin"
+__gitcomp_builtin_fmt_merge_msg_default=" --log --message= --into-name= --file= --no-log -- --no-message --no-into-name --no-file"
+__gitcomp_builtin_for_each_ref_default=" --shell --perl --python --tcl --count= --format= --color --sort= --points-at= --merged --no-merged --contains --no-contains --ignore-case -- --no-shell --no-perl --no-python --no-tcl --no-count --no-format --no-color --no-sort --no-points-at --no-ignore-case"
+__gitcomp_builtin_for_each_repo_default=" --config= --no-config"
+__gitcomp_builtin_format_patch_default=" --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --filename-max-length= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --to= --cc= --from --in-reply-to= --attach --inline --thread --signature= --base= --signature-file= --quiet --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-numbered --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-filename-max-length --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-to --no-cc --no-from --no-in-reply-to --no-attach --no-thread --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
 __gitcomp_builtin_fsck_default=" --verbose --unreachable --dangling --tags --root --cache --reflogs --full --connectivity-only --strict --lost-found --progress --name-objects --no-verbose -- --no-unreachable --no-dangling --no-tags --no-root --no-cache --no-reflogs --no-full --no-connectivity-only --no-strict --no-lost-found --no-progress --no-name-objects"
 __gitcomp_builtin_fsck_objects_default=" --verbose --unreachable --dangling --tags --root --cache --reflogs --full --connectivity-only --strict --lost-found --progress --name-objects --no-verbose -- --no-unreachable --no-dangling --no-tags --no-root --no-cache --no-reflogs --no-full --no-connectivity-only --no-strict --no-lost-found --no-progress --no-name-objects"
 __gitcomp_builtin_gc_default=" --quiet --prune --aggressive --keep-largest-pack --no-quiet -- --no-prune --no-aggressive --no-keep-largest-pack"
 __gitcomp_builtin_grep_default=" --cached --no-index --untracked --exclude-standard --recurse-submodules --invert-match --ignore-case --word-regexp --text --textconv --recursive --max-depth= --extended-regexp --basic-regexp --fixed-strings --perl-regexp --line-number --column --full-name --files-with-matches --name-only --files-without-match --only-matching --count --color --break --heading --context= --before-context= --after-context= --threads= --show-function --function-context --and --or --not --quiet --all-match --index -- --no-cached --no-untracked --no-exclude-standard --no-recurse-submodules --no-invert-match --no-ignore-case --no-word-regexp --no-text --no-textconv --no-recursive --no-extended-regexp --no-basic-regexp --no-fixed-strings --no-perl-regexp --no-line-number --no-column --no-full-name --no-files-with-matches --no-name-only --no-files-without-match --no-only-matching --no-count --no-color --no-break --no-heading --no-context --no-before-context --no-after-context --no-threads --no-show-function --no-function-context --no-or --no-quiet --no-all-match"
 __gitcomp_builtin_hash_object_default=" --stdin --stdin-paths --no-filters --literally --path= --filters -- --no-stdin --no-stdin-paths --no-literally --no-path"
-__gitcomp_builtin_help_default=" --all --guides --config --man --web --info --verbose --no-all -- --no-guides --no-config --no-man --no-web --no-info --no-verbose"
+__gitcomp_builtin_help_default=" --all --man --web --info --verbose --guides --config --no-man -- --no-web --no-info --no-verbose"
 __gitcomp_builtin_init_default=" --template= --bare --shared --quiet --separate-git-dir= --initial-branch= --object-format= --no-template -- --no-bare --no-quiet --no-separate-git-dir --no-initial-branch --no-object-format"
 __gitcomp_builtin_init_db_default=" --template= --bare --shared --quiet --separate-git-dir= --initial-branch= --object-format= --no-template -- --no-bare --no-quiet --no-separate-git-dir --no-initial-branch --no-object-format"
 __gitcomp_builtin_interpret_trailers_default=" --in-place --trim-empty --where= --if-exists= --if-missing= --only-trailers --only-input --unfold --parse --no-divider --trailer= --divider -- --no-in-place --no-trim-empty --no-where --no-if-exists --no-if-missing --no-only-trailers --no-only-input --no-unfold --no-trailer"
-__gitcomp_builtin_log_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
-__gitcomp_builtin_ls_files_default=" --cached --deleted --modified --others --ignored --stage --killed --directory --eol --empty-directory --unmerged --resolve-undo --exclude= --exclude-from= --exclude-per-directory= --exclude-standard --full-name --recurse-submodules --error-unmatch --with-tree= --abbrev --debug --no-cached -- --no-deleted --no-modified --no-others --no-ignored --no-stage --no-killed --no-directory --no-eol --no-empty-directory --no-unmerged --no-resolve-undo --no-exclude-per-directory --no-recurse-submodules --no-error-unmatch --no-with-tree --no-abbrev --no-debug"
-__gitcomp_builtin_ls_remote_default=" --quiet --upload-pack= --tags --heads --refs --get-url --sort= --symref --server-option= --no-quiet -- --no-upload-pack --no-tags --no-heads --no-refs --no-get-url --no-symref --no-server-option"
+__gitcomp_builtin_log_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_ls_files_default=" --cached --deleted --modified --others --ignored --stage --killed --directory --eol --empty-directory --unmerged --resolve-undo --exclude= --exclude-from= --exclude-per-directory= --exclude-standard --full-name --recurse-submodules --error-unmatch --with-tree= --abbrev --debug --deduplicate --sparse --no-cached -- --no-deleted --no-modified --no-others --no-ignored --no-stage --no-killed --no-directory --no-eol --no-empty-directory --no-unmerged --no-resolve-undo --no-exclude-per-directory --no-recurse-submodules --no-error-unmatch --no-with-tree --no-abbrev --no-debug --no-deduplicate --no-sparse"
+__gitcomp_builtin_ls_remote_default=" --quiet --upload-pack= --tags --heads --refs --get-url --sort= --symref --server-option= --no-quiet -- --no-upload-pack --no-tags --no-heads --no-refs --no-get-url --no-sort --no-symref --no-server-option"
 __gitcomp_builtin_ls_tree_default=" --long --name-only --name-status --full-name --full-tree --abbrev --no-long -- --no-name-only --no-name-status --no-full-name --no-full-tree --no-abbrev"
-__gitcomp_builtin_merge_default=" --stat --summary --log --squash --commit --edit --cleanup= --ff --ff-only --rerere-autoupdate --verify-signatures --strategy= --strategy-option= --message= --file --verbose --quiet --abort --quit --continue --allow-unrelated-histories --progress --gpg-sign --autostash --overwrite-ignore --signoff --no-verify --verify -- --no-stat --no-summary --no-log --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-rerere-autoupdate --no-verify-signatures --no-strategy --no-strategy-option --no-message --no-verbose --no-quiet --no-abort --no-quit --no-continue --no-allow-unrelated-histories --no-progress --no-gpg-sign --no-autostash --no-overwrite-ignore --no-signoff"
+__gitcomp_builtin_merge_default=" --stat --summary --log --squash --commit --edit --cleanup= --ff --ff-only --rerere-autoupdate --verify-signatures --strategy= --strategy-option= --message= --file --into-name= --verbose --quiet --abort --quit --continue --allow-unrelated-histories --progress --gpg-sign --autostash --overwrite-ignore --signoff --no-verify --verify -- --no-stat --no-summary --no-log --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-rerere-autoupdate --no-verify-signatures --no-strategy --no-strategy-option --no-message --no-into-name --no-verbose --no-quiet --no-abort --no-quit --no-continue --no-allow-unrelated-histories --no-progress --no-gpg-sign --no-autostash --no-overwrite-ignore --no-signoff"
 __gitcomp_builtin_merge_base_default=" --all --octopus --independent --is-ancestor --fork-point --no-all"
-__gitcomp_builtin_merge_file_default=" --stdout --diff3 --ours --theirs --union --marker-size= --quiet --no-stdout -- --no-diff3 --no-ours --no-theirs --no-union --no-marker-size --no-quiet"
+__gitcomp_builtin_merge_file_default=" --stdout --diff3 --zdiff3 --ours --theirs --union --marker-size= --quiet --no-stdout -- --no-diff3 --no-zdiff3 --no-ours --no-theirs --no-union --no-marker-size --no-quiet"
 __gitcomp_builtin_mktree_default=" --missing --batch --no-missing -- --no-batch"
-__gitcomp_builtin_multi_pack_index_default=" --object-dir= --progress --batch-size= --no-object-dir -- --no-progress"
-__gitcomp_builtin_mv_default=" --verbose --dry-run --no-verbose -- --no-dry-run"
+__gitcomp_builtin_multi_pack_index_default=" --object-dir= --no-object-dir"
+__gitcomp_builtin_mv_default=" --verbose --dry-run --sparse --no-verbose -- --no-dry-run --no-sparse"
 __gitcomp_builtin_name_rev_default=" --name-only --tags --refs= --exclude= --all --stdin --undefined --always --no-name-only -- --no-tags --no-refs --no-exclude --no-all --no-stdin --no-undefined --no-always"
 __gitcomp_builtin_notes_default=" --ref= --no-ref"
-__gitcomp_builtin_pack_objects_default=" --quiet --progress --all-progress --all-progress-implied --index-version= --max-pack-size= --local --incremental --window= --window-memory= --depth= --reuse-delta --reuse-object --delta-base-offset --threads= --non-empty --revs --unpacked --all --reflog --indexed-objects --stdout --include-tag --keep-unreachable --pack-loose-unreachable --unpack-unreachable --sparse --thin --shallow --honor-pack-keep --keep-pack= --compression= --keep-true-parents --use-bitmap-index --write-bitmap-index --filter= --missing= --exclude-promisor-objects --delta-islands --uri-protocol= --no-quiet -- --no-progress --no-all-progress --no-all-progress-implied --no-local --no-incremental --no-window --no-depth --no-reuse-delta --no-reuse-object --no-delta-base-offset --no-threads --no-non-empty --no-revs --no-stdout --no-include-tag --no-keep-unreachable --no-pack-loose-unreachable --no-unpack-unreachable --no-sparse --no-thin --no-shallow --no-honor-pack-keep --no-keep-pack --no-compression --no-keep-true-parents --no-use-bitmap-index --no-write-bitmap-index --no-filter --no-exclude-promisor-objects --no-delta-islands --no-uri-protocol"
+__gitcomp_builtin_pack_objects_default=" --quiet --progress --all-progress --all-progress-implied --index-version= --max-pack-size= --local --incremental --window= --window-memory= --depth= --reuse-delta --reuse-object --delta-base-offset --threads= --non-empty --revs --unpacked --all --reflog --indexed-objects --stdin-packs --stdout --include-tag --keep-unreachable --pack-loose-unreachable --unpack-unreachable --sparse --thin --shallow --honor-pack-keep --keep-pack= --compression= --keep-true-parents --use-bitmap-index --write-bitmap-index --filter= --missing= --exclude-promisor-objects --delta-islands --uri-protocol= --no-quiet -- --no-progress --no-all-progress --no-all-progress-implied --no-local --no-incremental --no-window --no-depth --no-reuse-delta --no-reuse-object --no-delta-base-offset --no-threads --no-non-empty --no-revs --no-stdin-packs --no-stdout --no-include-tag --no-keep-unreachable --no-pack-loose-unreachable --no-unpack-unreachable --no-sparse --no-thin --no-shallow --no-honor-pack-keep --no-keep-pack --no-compression --no-keep-true-parents --no-use-bitmap-index --no-write-bitmap-index --no-filter --no-exclude-promisor-objects --no-delta-islands --no-uri-protocol"
 __gitcomp_builtin_pack_refs_default=" --all --prune --no-all -- --no-prune"
 __gitcomp_builtin_pickaxe_default=" --incremental --root --show-stats --progress --score-debug --show-name --show-number --porcelain --line-porcelain --show-email --ignore-rev= --ignore-revs-file= --color-lines --color-by-age --minimal --contents= --abbrev --no-incremental -- --no-root --no-show-stats --no-progress --no-score-debug --no-show-name --no-show-number --no-porcelain --no-line-porcelain --no-show-email --no-ignore-rev --no-ignore-revs-file --no-color-lines --no-color-by-age --no-minimal --no-contents --no-abbrev"
 __gitcomp_builtin_prune_default=" --dry-run --verbose --progress --expire= --exclude-promisor-objects --no-dry-run -- --no-verbose --no-progress --no-expire --no-exclude-promisor-objects"
 __gitcomp_builtin_prune_packed_default=" --dry-run --quiet --no-dry-run -- --no-quiet"
-__gitcomp_builtin_pull_default=" --verbose --quiet --progress --recurse-submodules --rebase --stat --log --signoff --squash --commit --edit --cleanup= --ff --ff-only --verify-signatures --autostash --strategy= --strategy-option= --gpg-sign --allow-unrelated-histories --all --append --upload-pack= --force --tags --prune --jobs --dry-run --keep --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --show-forced-updates --set-upstream --no-verbose -- --no-quiet --no-progress --no-recurse-submodules --no-rebase --no-stat --no-log --no-signoff --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-verify-signatures --no-autostash --no-strategy --no-strategy-option --no-gpg-sign --no-allow-unrelated-histories --no-all --no-append --no-upload-pack --no-force --no-tags --no-prune --no-jobs --no-dry-run --no-keep --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-show-forced-updates --no-set-upstream"
-__gitcomp_builtin_push_default=" --verbose --quiet --repo= --all --mirror --delete --tags --dry-run --porcelain --force --force-with-lease --recurse-submodules= --receive-pack= --exec= --set-upstream --progress --prune --no-verify --follow-tags --signed --atomic --push-option= --ipv4 --ipv6 --verify -- --no-verbose --no-quiet --no-repo --no-all --no-mirror --no-delete --no-tags --no-dry-run --no-porcelain --no-force --no-force-with-lease --no-recurse-submodules --no-receive-pack --no-exec --no-set-upstream --no-progress --no-prune --no-follow-tags --no-signed --no-atomic --no-push-option --no-ipv4 --no-ipv6"
-__gitcomp_builtin_range_diff_default=" --creation-factor= --no-dual-color --notes --patch --no-patch --unified --function-context --raw --patch-with-raw --patch-with-stat --numstat --shortstat --dirstat --cumulative --dirstat-by-file --check --summary --name-only --name-status --stat --stat-width= --stat-name-width= --stat-graph-width= --stat-count= --compact-summary --binary --full-index --color --ws-error-highlight= --abbrev --src-prefix= --dst-prefix= --line-prefix= --no-prefix --inter-hunk-context= --output-indicator-new= --output-indicator-old= --output-indicator-context= --break-rewrites --find-renames --irreversible-delete --find-copies --find-copies-harder --no-renames --rename-empty --follow --minimal --ignore-all-space --ignore-space-change --ignore-space-at-eol --ignore-cr-at-eol --ignore-blank-lines --indent-heuristic --patience --histogram --diff-algorithm= --anchored= --word-diff --word-diff-regex= --color-words --color-moved --color-moved-ws= --relative --text --exit-code --quiet --ext-diff --textconv --ignore-submodules --submodule --ita-invisible-in-index --ita-visible-in-index --pickaxe-all --pickaxe-regex --find-object= --diff-filter= --output= --dual-color -- --no-creation-factor --no-notes --no-function-context --no-compact-summary --no-full-index --no-color --no-abbrev --no-find-copies-harder --no-rename-empty --no-follow --no-minimal --no-indent-heuristic --no-color-moved --no-color-moved-ws --no-relative --no-text --no-exit-code --no-quiet --no-ext-diff --no-textconv"
+__gitcomp_builtin_pull_default=" --verbose --quiet --progress --recurse-submodules --rebase --stat --log --signoff --squash --commit --edit --cleanup= --ff --ff-only --verify --verify-signatures --autostash --strategy= --strategy-option= --gpg-sign --allow-unrelated-histories --all --append --upload-pack= --force --tags --prune --jobs --dry-run --keep --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --show-forced-updates --set-upstream --no-verbose -- --no-quiet --no-progress --no-recurse-submodules --no-rebase --no-stat --no-log --no-signoff --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-verify --no-verify-signatures --no-autostash --no-strategy --no-strategy-option --no-gpg-sign --no-allow-unrelated-histories --no-all --no-append --no-upload-pack --no-force --no-tags --no-prune --no-jobs --no-dry-run --no-keep --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-show-forced-updates --no-set-upstream"
+__gitcomp_builtin_push_default=" --verbose --quiet --repo= --all --mirror --delete --tags --dry-run --porcelain --force --force-with-lease --force-if-includes --recurse-submodules= --receive-pack= --exec= --set-upstream --progress --prune --no-verify --follow-tags --signed --atomic --push-option= --ipv4 --ipv6 --verify -- --no-verbose --no-quiet --no-repo --no-all --no-mirror --no-delete --no-tags --no-dry-run --no-porcelain --no-force --no-force-with-lease --no-force-if-includes --no-recurse-submodules --no-receive-pack --no-exec --no-set-upstream --no-progress --no-prune --no-follow-tags --no-signed --no-atomic --no-push-option --no-ipv4 --no-ipv6"
+__gitcomp_builtin_range_diff_default=" --creation-factor= --no-dual-color --notes --left-only --right-only --patch --no-patch --unified --function-context --raw --patch-with-raw --patch-with-stat --numstat --shortstat --dirstat --cumulative --dirstat-by-file --check --summary --name-only --name-status --stat --stat-width= --stat-name-width= --stat-graph-width= --stat-count= --compact-summary --binary --full-index --color --ws-error-highlight= --abbrev --src-prefix= --dst-prefix= --line-prefix= --no-prefix --inter-hunk-context= --output-indicator-new= --output-indicator-old= --output-indicator-context= --break-rewrites --find-renames --irreversible-delete --find-copies --find-copies-harder --no-renames --rename-empty --follow --minimal --ignore-all-space --ignore-space-change --ignore-space-at-eol --ignore-cr-at-eol --ignore-blank-lines --ignore-matching-lines= --indent-heuristic --patience --histogram --diff-algorithm= --anchored= --word-diff --word-diff-regex= --color-words --color-moved --color-moved-ws= --relative --text --exit-code --quiet --ext-diff --textconv --ignore-submodules --submodule --ita-invisible-in-index --ita-visible-in-index --pickaxe-all --pickaxe-regex --rotate-to= --skip-to= --find-object= --diff-filter= --output= --dual-color -- --no-creation-factor --no-notes --no-left-only --no-right-only --no-function-context --no-compact-summary --no-full-index --no-color --no-abbrev --no-find-copies-harder --no-rename-empty --no-follow --no-minimal --no-ignore-matching-lines --no-indent-heuristic --no-color-moved --no-color-moved-ws --no-relative --no-text --no-exit-code --no-quiet --no-ext-diff --no-textconv"
 __gitcomp_builtin_read_tree_default=" --index-output= --empty --verbose --trivial --aggressive --reset --prefix= --exclude-per-directory= --dry-run --no-sparse-checkout --debug-unpack --recurse-submodules --quiet --sparse-checkout -- --no-empty --no-verbose --no-trivial --no-aggressive --no-reset --no-dry-run --no-debug-unpack --no-recurse-submodules --no-quiet"
 __gitcomp_builtin_rebase_default=" --onto= --keep-base --no-verify --quiet --verbose --no-stat --signoff --committer-date-is-author-date --reset-author-date --ignore-whitespace --whitespace= --force-rebase --no-ff --continue --skip --abort --quit --edit-todo --show-current-patch --apply --merge --interactive --rerere-autoupdate --empty= --autosquash --gpg-sign --autostash --exec= --rebase-merges --fork-point --strategy= --strategy-option= --root --reschedule-failed-exec --reapply-cherry-picks --verify --stat --ff -- --no-onto --no-keep-base --no-quiet --no-verbose --no-signoff --no-committer-date-is-author-date --no-reset-author-date --no-ignore-whitespace --no-whitespace --no-force-rebase --no-rerere-autoupdate --no-autosquash --no-gpg-sign --no-autostash --no-exec --no-rebase-merges --no-fork-point --no-strategy --no-strategy-option --no-root --no-reschedule-failed-exec --no-reapply-cherry-picks"
-__gitcomp_builtin_rebase__interactive_default=" --ff --rebase-merges --rebase-cousins --autosquash --signoff --verbose --continue --skip --edit-todo --show-current-patch --shorten-ids --expand-ids --check-todo-list --rearrange-squash --add-exec-commands --onto= --restrict-revision= --squash-onto= --upstream= --head-name= --gpg-sign --strategy= --strategy-opts= --switch-to= --onto-name= --cmd= --rerere-autoupdate --reschedule-failed-exec --no-ff -- --no-rebase-merges --no-rebase-cousins --no-autosquash --no-signoff --no-verbose --no-head-name --no-gpg-sign --no-strategy --no-strategy-opts --no-switch-to --no-onto-name --no-cmd --no-rerere-autoupdate --no-reschedule-failed-exec"
 __gitcomp_builtin_receive_pack_default=" --quiet --no-quiet"
-__gitcomp_builtin_reflog_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_reflog_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
 __gitcomp_builtin_remote_default=" --verbose --no-verbose"
-__gitcomp_builtin_repack_default=" --quiet --local --write-bitmap-index --delta-islands --unpack-unreachable= --keep-unreachable --window= --window-memory= --depth= --threads= --max-pack-size= --pack-kept-objects --keep-pack= --no-quiet -- --no-local --no-write-bitmap-index --no-delta-islands --no-unpack-unreachable --no-keep-unreachable --no-window --no-window-memory --no-depth --no-threads --no-max-pack-size --no-pack-kept-objects --no-keep-pack"
+__gitcomp_builtin_repack_default=" --quiet --local --write-bitmap-index --delta-islands --unpack-unreachable= --keep-unreachable --window= --window-memory= --depth= --threads= --max-pack-size= --pack-kept-objects --keep-pack= --geometric= --write-midx --no-quiet -- --no-local --no-write-bitmap-index --no-delta-islands --no-unpack-unreachable --no-keep-unreachable --no-window --no-window-memory --no-depth --no-threads --no-max-pack-size --no-pack-kept-objects --no-keep-pack --no-geometric --no-write-midx"
 __gitcomp_builtin_replace_default=" --list --delete --edit --graft --convert-graft-file --raw --format= --no-raw -- --no-format"
 __gitcomp_builtin_rerere_default=" --rerere-autoupdate --no-rerere-autoupdate"
 __gitcomp_builtin_reset_default=" --quiet --mixed --soft --hard --merge --keep --recurse-submodules --patch --intent-to-add --pathspec-from-file= --pathspec-file-nul --no-quiet -- --no-mixed --no-soft --no-hard --no-merge --no-keep --no-recurse-submodules --no-patch --no-intent-to-add --no-pathspec-from-file --no-pathspec-file-nul"
 __gitcomp_builtin_restore_default=" --source= --staged --worktree --ignore-unmerged --overlay --quiet --recurse-submodules --progress --merge --conflict= --ours --theirs --patch --ignore-skip-worktree-bits --pathspec-from-file= --pathspec-file-nul --no-source -- --no-staged --no-worktree --no-ignore-unmerged --no-overlay --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-patch --no-ignore-skip-worktree-bits --no-pathspec-from-file --no-pathspec-file-nul"
 __gitcomp_builtin_revert_default=" --quit --continue --abort --skip --cleanup= --no-commit --edit --signoff --mainline= --rerere-autoupdate --strategy= --strategy-option= --gpg-sign --commit -- --no-cleanup --no-edit --no-signoff --no-mainline --no-rerere-autoupdate --no-strategy --no-strategy-option --no-gpg-sign"
-__gitcomp_builtin_rm_default=" --dry-run --quiet --cached --ignore-unmatch --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-quiet --no-cached --no-ignore-unmatch --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_send_pack_default=" --verbose --quiet --receive-pack= --exec= --remote= --all --dry-run --mirror --force --signed --push-option= --progress --thin --atomic --stateless-rpc --stdin --helper-status --force-with-lease --no-verbose -- --no-quiet --no-receive-pack --no-exec --no-remote --no-all --no-dry-run --no-mirror --no-force --no-signed --no-push-option --no-progress --no-thin --no-atomic --no-stateless-rpc --no-stdin --no-helper-status --no-force-with-lease"
+__gitcomp_builtin_rm_default=" --dry-run --quiet --cached --ignore-unmatch --sparse --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-quiet --no-cached --no-ignore-unmatch --no-sparse --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_send_pack_default=" --verbose --quiet --receive-pack= --exec= --remote= --all --dry-run --mirror --force --signed --push-option= --progress --thin --atomic --stateless-rpc --stdin --helper-status --force-with-lease --force-if-includes --no-verbose -- --no-quiet --no-receive-pack --no-exec --no-remote --no-all --no-dry-run --no-mirror --no-force --no-signed --no-push-option --no-progress --no-thin --no-atomic --no-stateless-rpc --no-stdin --no-helper-status --no-force-with-lease --no-force-if-includes"
 __gitcomp_builtin_shortlog_default=" --committer --numbered --summary --email --group= --no-committer -- --no-numbered --no-summary --no-email --no-group"
-__gitcomp_builtin_show_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_show_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
 __gitcomp_builtin_show_branch_default=" --all --remotes --color --more --list --no-name --current --sha1-name --merge-base --independent --topo-order --topics --sparse --date-order --reflog --name -- --no-all --no-remotes --no-color --no-more --no-list --no-current --no-sha1-name --no-merge-base --no-independent --no-topo-order --no-topics --no-sparse --no-date-order"
 __gitcomp_builtin_show_index_default=" --object-format= --no-object-format"
 __gitcomp_builtin_show_ref_default=" --tags --heads --verify --head --dereference --hash --abbrev --quiet --exclude-existing --no-tags -- --no-heads --no-verify --no-head --no-dereference --no-hash --no-abbrev --no-quiet"
 __gitcomp_builtin_sparse_checkout_default=""
-__gitcomp_builtin_stage_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_stage_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --sparse --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-sparse --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
 __gitcomp_builtin_stash_default=""
 __gitcomp_builtin_status_default=" --verbose --short --branch --show-stash --ahead-behind --porcelain --long --null --untracked-files --ignored --ignore-submodules --column --no-renames --find-renames --renames -- --no-verbose --no-short --no-branch --no-show-stash --no-ahead-behind --no-porcelain --no-long --no-null --no-untracked-files --no-ignored --no-ignore-submodules --no-column"
 __gitcomp_builtin_stripspace_default=" --strip-comments --comment-lines"
 __gitcomp_builtin_switch_default=" --create= --force-create= --guess --discard-changes --quiet --recurse-submodules --progress --merge --conflict= --detach --track --orphan= --ignore-other-worktrees --no-create -- --no-force-create --no-guess --no-discard-changes --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-detach --no-track --no-orphan --no-ignore-other-worktrees"
 __gitcomp_builtin_symbolic_ref_default=" --quiet --delete --short --no-quiet -- --no-delete --no-short"
-__gitcomp_builtin_tag_default=" --list --delete --verify --annotate --message= --file= --edit --sign --cleanup= --local-user= --force --create-reflog --column --contains --no-contains --merged --no-merged --sort= --points-at --format= --color --ignore-case -- --no-annotate --no-file --no-edit --no-sign --no-cleanup --no-local-user --no-force --no-create-reflog --no-column --no-points-at --no-format --no-color --no-ignore-case"
+__gitcomp_builtin_tag_default=" --list --delete --verify --annotate --message= --file= --edit --sign --cleanup= --local-user= --force --create-reflog --column --contains --no-contains --merged --no-merged --sort= --points-at --format= --color --ignore-case -- --no-annotate --no-file --no-edit --no-sign --no-cleanup --no-local-user --no-force --no-create-reflog --no-column --no-sort --no-points-at --no-format --no-color --no-ignore-case"
 __gitcomp_builtin_update_index_default=" --ignore-submodules --add --replace --remove --unmerged --refresh --really-refresh --cacheinfo --chmod= --assume-unchanged --no-assume-unchanged --skip-worktree --no-skip-worktree --ignore-skip-worktree-entries --info-only --force-remove --stdin --index-info --unresolve --again --ignore-missing --verbose --clear-resolve-undo --index-version= --split-index --untracked-cache --test-untracked-cache --force-untracked-cache --force-write-index --fsmonitor --fsmonitor-valid --no-fsmonitor-valid -- --no-ignore-submodules --no-add --no-replace --no-remove --no-unmerged --no-ignore-skip-worktree-entries --no-info-only --no-force-remove --no-ignore-missing --no-verbose --no-index-version --no-split-index --no-untracked-cache --no-test-untracked-cache --no-force-untracked-cache --no-force-write-index --no-fsmonitor"
 __gitcomp_builtin_update_ref_default=" --no-deref --stdin --create-reflog --deref -- --no-stdin --no-create-reflog"
 __gitcomp_builtin_update_server_info_default=" --force --no-force"
-__gitcomp_builtin_upload_pack_default=" --stateless-rpc --advertise-refs --strict --timeout= --no-stateless-rpc -- --no-advertise-refs --no-strict --no-timeout"
+__gitcomp_builtin_upload_pack_default=" --stateless-rpc --strict --timeout= --no-stateless-rpc -- --no-strict --no-timeout"
 __gitcomp_builtin_verify_commit_default=" --verbose --raw --no-verbose -- --no-raw"
 __gitcomp_builtin_verify_pack_default=" --verbose --stat-only --object-format= --no-verbose -- --no-stat-only --no-object-format"
 __gitcomp_builtin_verify_tag_default=" --verbose --raw --format= --no-verbose -- --no-raw --no-format"
 __gitcomp_builtin_version_default=" --build-options --no-build-options"
-__gitcomp_builtin_whatchanged_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_whatchanged_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
 __gitcomp_builtin_write_tree_default=" --missing-ok --prefix= --no-missing-ok -- --no-prefix"
-__gitcomp_builtin_send_email_default=" --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --to= --cc= --from --in-reply-to= --attach --inline --thread --signature= --base= --signature-file= --quiet --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-numbered --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-to --no-cc --no-from --no-in-reply-to --no-attach --no-thread --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
+__gitcomp_builtin_send_email_default="--cc= --smtp-server= --identity= --smtp-ssl --sender= --from= --cc-cover --no-to-cover --sendmail-cmd= --signed-off-cc --signed-off-by-cc --in-reply-to= --no-cc --confirm= --no-bcc --to= --annotate --smtp-encryption= --relogin-delay= --to-cmd= --smtp-domain= --smtp-auth= --bcc= --quiet --subject= --chain-reply-to --cc-cmd= --no-format-patch --transfer-encoding= --smtp-user= --reply-to= --force --dry-run --no-identity --no-validate --8bit-encoding= --to-cover --compose --thread --format-patch --no-thread --smtp-server-option= --compose-encoding= --smtp-server-port= --no-smtp-auth --no-signed-off-cc --no-signed-off-by-cc --smtp-debug= --no-suppress-from --suppress-from --no-to --dump-aliases --xmailer --no-annotate --no-cc-cover --smtp-pass= --smtp-ssl-cert-path= --no-chain-reply-to --suppress-cc= --validate --batch-size= --envelope-sender= --no-xmailer --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --filename-max-length= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --from --attach --inline --signature= --base= --signature-file= --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-filename-max-length --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-from --no-in-reply-to --no-attach --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
 
 __gitcomp_builtin_get_default ()
 {
@@ -500,7 +425,7 @@ __gitcomp_builtin_get_default ()
 
 # This function is equivalent to
 #
-#    __gitcomp "$(git xxx --git-completion-helper) ..."
+#    __gitcomp_opts "$(git xxx --git-completion-helper) ..."
 #
 # except that the output is cached. Accept 1-3 arguments:
 # 1: the git command to execute, this is also the cache key
@@ -520,7 +445,7 @@ __gitcomp_builtin ()
 
 	if [ -z "$options" ]; then
 		local completion_helper
-		if [ "$GIT_COMPLETION_SHOW_ALL" = "1" ]; then
+		if [ "${GIT_COMPLETION_SHOW_ALL-}" = "1" ]; then
 			completion_helper="--git-completion-helper-all"
 		else
 			completion_helper="--git-completion-helper"
@@ -537,71 +462,7 @@ __gitcomp_builtin ()
 		eval "$var=\"$options\""
 	fi
 
-	__gitcomp "$options"
-}
-
-# Variation of __gitcomp_nl () that appends to the existing list of
-# completion candidates, COMPREPLY.
-__gitcomp_nl_append ()
-{
-	local IFS=$'\n'
-	__gitcompappend "$1" "${2-}" "${3-$cur}" "${4- }"
-}
-
-# Generates completion reply from newline-separated possible completion words
-# by appending a space to all of them.
-# It accepts 1 to 4 arguments:
-# 1: List of possible completion words, separated by a single newline.
-# 2: A prefix to be added to each possible completion word (optional).
-# 3: Generate possible completion matches for this word (optional).
-# 4: A suffix to be appended to each possible completion word instead of
-#    the default space (optional).  If specified but empty, nothing is
-#    appended.
-__gitcomp_nl ()
-{
-	COMPREPLY=()
-	__gitcomp_nl_append "$@"
-}
-
-# Fills the COMPREPLY array with prefiltered paths without any additional
-# processing.
-# Callers must take care of providing only paths that match the current path
-# to be completed and adding any prefix path components, if necessary.
-# 1: List of newline-separated matching paths, complete with all prefix
-#    path components.
-__gitcomp_file_direct ()
-{
-	local IFS=$'\n'
-
-	COMPREPLY=($1)
-
-	# use a hack to enable file mode in bash < 4
-	compopt -o filenames +o nospace 2>/dev/null ||
-	compgen -f /non-existing-dir/ >/dev/null ||
-	true
-}
-
-# Generates completion reply with compgen from newline-separated possible
-# completion filenames.
-# It accepts 1 to 3 arguments:
-# 1: List of possible completion filenames, separated by a single newline.
-# 2: A directory prefix to be added to each possible completion filename
-#    (optional).
-# 3: Generate possible completion matches for this word (optional).
-__gitcomp_file ()
-{
-	local IFS=$'\n'
-
-	# XXX does not work when the directory prefix contains a tilde,
-	# since tilde expansion is not applied.
-	# This means that COMPREPLY will be empty and Bash default
-	# completion will be used.
-	__gitcompadd "$1" "${2-}" "${3-$cur}" ""
-
-	# use a hack to enable file mode in bash < 4
-	compopt -o filenames +o nospace 2>/dev/null ||
-	compgen -f /non-existing-dir/ >/dev/null ||
-	true
+	__gitcomp_opts "$options"
 }
 
 # Execute 'git ls-files', unless the --committable option is specified, in
@@ -610,7 +471,7 @@ __gitcomp_file ()
 # argument, and using the options specified in the second argument.
 __git_ls_files_helper ()
 {
-	if [ "$2" == "--committable" ]; then
+	if [ "$2" = "--committable" ]; then
 		__git -C "$1" -c core.quotePath=false diff-index \
 			--name-only --relative HEAD -- "${3//\\/\\\\}*"
 	else
@@ -839,7 +700,7 @@ __git_refs ()
 			track=""
 			;;
 		*)
-			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
+			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD; do
 				case "$i" in
 				$match*)
 					if [ -e "$dir/$i" ]; then
@@ -947,7 +808,7 @@ __git_complete_refs ()
 
 	# Append DWIM remote branch names if requested
 	if [ "$dwim" = "yes" ]; then
-		__gitcomp_direct_append "$(__git_dwim_remote_heads "$pfx" "$cur_" "$sfx")"
+		__gitcomp_direct "$(__git_dwim_remote_heads "$pfx" "$cur_" "$sfx")"
 	fi
 }
 
@@ -1103,8 +964,8 @@ __git_complete_revlist ()
 
 __git_complete_remote_or_refspec ()
 {
-	local cur_="$cur" cmd="${words[1]}"
-	local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0
+	local cur_="$cur" cmd="${words[__git_cmd_idx]}"
+	local i c=$((__git_cmd_idx+1)) remote="" pfx="" lhs=1 no_complete_refspec=0
 	if [ "$cmd" = "remote" ]; then
 		((c++))
 	fi
@@ -1184,7 +1045,7 @@ __git_complete_strategy ()
 		return 0
 		;;
 	-X)
-		__gitcomp "$__git_merge_strategy_options"
+		__gitcomp_opts "$__git_merge_strategy_options"
 		return 0
 		;;
 	esac
@@ -1194,7 +1055,7 @@ __git_complete_strategy ()
 		return 0
 		;;
 	--strategy-option=*)
-		__gitcomp "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
+		__gitcomp_opts "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
 		return 0
 		;;
 	esac
@@ -1226,7 +1087,7 @@ __git_pretty_aliases ()
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
-	local cur=$1 last list word cmdline
+	local cur=$1 last list= word cmdline
 
 	while [[ -n "$cur" ]]; do
 		if [[ "$list" == *" $cur "* ]]; then
@@ -1273,7 +1134,7 @@ __git_aliased_command ()
 # --show-idx: Optionally show the index of the found word in the $words array.
 __git_find_on_cmdline ()
 {
-	local word c=1 show_idx
+	local word c="$__git_cmd_idx" show_idx
 
 	while test $# -gt 1; do
 		case "$1" in
@@ -1318,7 +1179,7 @@ __git_find_last_on_cmdline ()
 	done
 	local wordlist="$1"
 
-	while [ $c -gt 1 ]; do
+	while [ $c -gt "$__git_cmd_idx" ]; do
 		((c--))
 		for word in $wordlist; do
 			if [ "$word" = "${words[c]}" ]; then
@@ -1403,7 +1264,7 @@ __git_count_arguments ()
 	local word i c=0
 
 	# Skip "git" (first argument)
-	for ((i=1; i < ${#words[@]}; i++)); do
+	for ((i=$__git_cmd_idx; i < ${#words[@]}; i++)); do
 		word="${words[i]}"
 
 		case "$word" in
@@ -1430,12 +1291,13 @@ __git_whitespacelist="nowarn warn error error-all fix"
 __git_patchformat="mbox stgit stgit-series hg mboxrd"
 __git_showcurrentpatch="diff raw"
 __git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
+__git_quoted_cr="nowarn warn strip"
 
 _git_am ()
 {
 	__git_find_repo_path
 	if [ -d "$__git_repo_path"/rebase-apply ]; then
-		__gitcomp "$__git_am_inprogress_options"
+		__gitcomp_opts "$__git_am_inprogress_options"
 		return
 	fi
 	case "$cur" in
@@ -1451,6 +1313,10 @@ _git_am ()
 		__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
 		return
 		;;
+	--quoted-cr=*)
+		__gitcomp "$__git_quoted_cr" "" "${cur##--quoted-cr=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin am "" \
 			"$__git_am_inprogress_options"
@@ -1495,7 +1361,7 @@ _git_archive ()
 {
 	case "$cur" in
 	--format=*)
-		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
+		__gitcomp_nl "$(git archive --list)" "" "${cur##--format=}"
 		return
 		;;
 	--remote=*)
@@ -1539,13 +1405,15 @@ __git_ref_fieldlist="refname objecttype objectsize objectname upstream push HEAD
 
 _git_branch ()
 {
-	local i c=1 only_local_ref="n" has_r="n"
+	local i c="$__git_cmd_idx" only_local_ref="n" has_r="n"
 
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|--delete|-m|--move)	only_local_ref="y" ;;
-		-r|--remotes)		has_r="y" ;;
+		-d|-D|--delete|-m|-M|--move|-c|-C|--copy)
+			only_local_ref="y" ;;
+		-r|--remotes)
+			has_r="y" ;;
 		esac
 		((c++))
 	done
@@ -1569,12 +1437,12 @@ _git_branch ()
 
 _git_bundle ()
 {
-	local cmd="${words[2]}"
+	local cmd="${words[__git_cmd_idx+1]}"
 	case "$cword" in
-	2)
+	$((__git_cmd_idx+1)))
 		__gitcomp "create list-heads verify unbundle"
 		;;
-	3)
+	$((__git_cmd_idx+2)))
 		# looking for a file
 		;;
 	*)
@@ -1590,14 +1458,15 @@ _git_bundle ()
 # Helper function to decide whether or not we should enable DWIM logic for
 # git-switch and git-checkout.
 #
-# To decide between the following rules in priority order
-# 1) the last provided of "--guess" or "--no-guess" explicitly enable or
-#    disable completion of DWIM logic respectively.
-# 2) If the --no-track option is provided, take this as a hint to disable the
-#    DWIM completion logic
-# 3) If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion
-#    logic, as requested by the user.
-# 4) Enable DWIM logic otherwise.
+# To decide between the following rules in decreasing priority order:
+# - the last provided of "--guess" or "--no-guess" explicitly enable or
+#   disable completion of DWIM logic respectively.
+# - If checkout.guess is false, disable completion of DWIM logic.
+# - If the --no-track option is provided, take this as a hint to disable the
+#   DWIM completion logic
+# - If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion
+#   logic, as requested by the user.
+# - Enable DWIM logic otherwise.
 #
 __git_checkout_default_dwim_mode ()
 {
@@ -1608,11 +1477,17 @@ __git_checkout_default_dwim_mode ()
 	fi
 
 	# --no-track disables DWIM, but with lower priority than
-	# --guess/--no-guess
+	# --guess/--no-guess/checkout.guess
 	if [ -n "$(__git_find_on_cmdline "--no-track")" ]; then
 		dwim_opt=""
 	fi
 
+	# checkout.guess = false disables DWIM, but with lower priority than
+	# --guess/--no-guess
+	if [ "$(__git config --type=bool checkout.guess)" = "false" ]; then
+		dwim_opt=""
+	fi
+
 	# Find the last provided --guess or --no-guess
 	last_option="$(__git_find_last_on_cmdline "--guess --no-guess")"
 	case "$last_option" in
@@ -1649,7 +1524,7 @@ _git_checkout ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--*)
 		__gitcomp_builtin checkout
@@ -1682,7 +1557,7 @@ _git_cherry_pick ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
-		__gitcomp "$__git_cherry_pick_inprogress_options"
+		__gitcomp_opts "$__git_cherry_pick_inprogress_options"
 		return
 	fi
 
@@ -1811,8 +1686,14 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--submodule --submodule= --ignore-submodules
 			--indent-heuristic --no-indent-heuristic
 			--textconv --no-textconv
+			--patch --no-patch
+			--anchored=
 "
 
+__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex
+			--base --ours --theirs --no-index --relative --merge-base
+			$__git_diff_common_options"
+
 _git_diff ()
 {
 	__git_has_doubledash && return
@@ -1835,10 +1716,7 @@ _git_diff ()
 		return
 		;;
 	--*)
-		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
-			--base --ours --theirs --no-index
-			$__git_diff_common_options
-			"
+		__gitcomp_opts "$__git_diff_difftool_options"
 		return
 		;;
 	esac
@@ -1860,11 +1738,7 @@ _git_difftool ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin difftool "$__git_diff_common_options
-					--base --cached --ours --theirs
-					--pickaxe-all --pickaxe-regex
-					--relative --staged
-					"
+		__gitcomp_builtin difftool "$__git_diff_difftool_options"
 		return
 		;;
 	esac
@@ -1901,9 +1775,7 @@ _git_format_patch ()
 {
 	case "$cur" in
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--base=*|--interdiff=*|--range-diff=*)
@@ -1930,7 +1802,7 @@ _git_fsck ()
 
 _git_gitk ()
 {
-	_gitk
+	__gitk_main
 }
 
 # Lists matching symbol names from a tag (as in ctags) file.
@@ -1984,7 +1856,7 @@ _git_grep ()
 	esac
 
 	case "$cword,$prev" in
-	2,*|*,-*)
+	$((__git_cmd_idx+1)),*|*,-*)
 		__git_complete_symbol && return
 		;;
 	esac
@@ -2000,7 +1872,7 @@ _git_help ()
 		return
 		;;
 	esac
-	if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
+	if test -n "${GIT_TESTING_ALL_COMMAND_LIST-}"
 	then
 		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
 	else
@@ -2085,7 +1957,7 @@ __git_log_shortlog_options="
 "
 
 __git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd"
-__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
+__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default human raw unix auto: format:"
 
 _git_log ()
 {
@@ -2136,7 +2008,7 @@ _git_log ()
 		return
 		;;
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			$__git_log_common_options
 			$__git_log_shortlog_options
 			$__git_log_gitk_options
@@ -2154,11 +2026,9 @@ _git_log ()
 			--no-walk --no-walk= --do-walk
 			--parents --children
 			--expand-tabs --expand-tabs= --no-expand-tabs
-			--patch
 			$merge
 			$__git_diff_common_options
 			--pickaxe-all --pickaxe-regex
-			--patch --no-patch
 			"
 		return
 		;;
@@ -2201,7 +2071,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
+		__gitcomp_opts "--tool= --prompt --no-prompt --gui --no-gui"
 		return
 		;;
 	esac
@@ -2349,7 +2219,7 @@ _git_range_diff ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			--creation-factor= --no-dual-color
 			$__git_diff_common_options
 		"
@@ -2366,11 +2236,11 @@ _git_rebase ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "$__git_rebase_interactive_inprogress_options"
+		__gitcomp_opts "$__git_rebase_interactive_inprogress_options"
 		return
 	elif [ -d "$__git_repo_path"/rebase-apply ] || \
 	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "$__git_rebase_inprogress_options"
+		__gitcomp_opts "$__git_rebase_inprogress_options"
 		return
 	fi
 	__git_complete_strategy && return
@@ -2404,6 +2274,7 @@ _git_reflog ()
 	fi
 }
 
+__git_send_email_options="--no-cc-cover --cc= --no-bcc --force --relogin-delay= --to= --suppress-cc= --no-annotate --no-chain-reply-to --sendmail-cmd= --no-identity --transfer-encoding= --validate --no-smtp-auth --confirm= --no-format-patch --reply-to= --smtp-pass= --smtp-server= --annotate --envelope-sender= --no-validate --dry-run --no-thread --smtp-debug= --no-to --thread --no-xmailer --identity= --no-signed-off-cc --no-signed-off-by-cc --smtp-domain= --to-cover --8bit-encoding= --bcc= --smtp-ssl-cert-path= --smtp-user= --cc-cmd= --to-cmd= --no-cc --smtp-server-option= --in-reply-to= --subject= --batch-size= --smtp-auth= --compose --smtp-server-port= --xmailer --no-to-cover --chain-reply-to --smtp-encryption= --dump-aliases --quiet --smtp-ssl --signed-off-cc --signed-off-by-cc --suppress-from --compose-encoding= --no-suppress-from --sender= --from= --format-patch --cc-cover --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --filename-max-length= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --from --attach --inline --signature= --base= --signature-file= --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-filename-max-length --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-from --no-in-reply-to --no-attach --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
 __git_send_email_confirm_options="always never auto cc compose"
 __git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all"
 
@@ -2411,7 +2282,7 @@ _git_send_email ()
 {
 	case "$prev" in
 	--to|--cc|--bcc|--from)
-		__gitcomp "$(__git send-email --dump-aliases)"
+		__gitcomp_nl "$(__git send-email --dump-aliases)"
 		return
 		;;
 	esac
@@ -2435,9 +2306,7 @@ _git_send_email ()
 		return
 		;;
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--to=*|--cc=*|--bcc=*|--from=*)
@@ -2445,16 +2314,7 @@ _git_send_email ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
-			--compose --confirm= --dry-run --envelope-sender
-			--from --identity
-			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
-			--no-suppress-from --no-thread --quiet --reply-to
-			--signed-off-by-cc --smtp-pass --smtp-server
-			--smtp-server-port --smtp-encryption= --smtp-user
-			--subject --suppress-cc= --suppress-from --thread --to
-			--validate --no-validate
-			$__git_format_patch_extra_options"
+		__gitcomp_builtin send-email "$__git_send_email_options $__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -2532,7 +2392,7 @@ _git_switch ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--*)
 		__gitcomp_builtin switch
@@ -2566,7 +2426,7 @@ _git_switch ()
 __git_config_get_set_variables ()
 {
 	local prevword word config_file= c=$cword
-	while [ $c -gt 1 ]; do
+	while [ $c -gt "$__git_cmd_idx" ]; do
 		word="${words[c]}"
 		case "$word" in
 		--system|--global|--local|--file=*)
@@ -2629,7 +2489,7 @@ __git_complete_config_variable_value ()
 		return
 		;;
 	branch.*.rebase)
-		__gitcomp "false true merges preserve interactive" "" "$cur_"
+		__gitcomp "false true merges interactive" "" "$cur_"
 		return
 		;;
 	remote.pushdefault)
@@ -2717,7 +2577,7 @@ __git_complete_config_variable_value ()
 #                 subsections) instead of the default space.
 __git_complete_config_variable_name ()
 {
-	local cur_="$cur" sfx
+	local cur_="$cur" sfx=" "
 
 	while test $# != 0; do
 		case "$1" in
@@ -2739,7 +2599,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "${sfx:- }"
+		__gitcomp "autoSetupMerge autoSetupRebase" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	guitool.*.*)
@@ -2773,7 +2633,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__git_compute_all_commands
-		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "${sfx:- }"
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	remote.*.*)
@@ -2789,7 +2649,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "${sfx:- }"
+		__gitcomp "pushDefault" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	url.*.*)
@@ -2804,7 +2664,7 @@ __git_complete_config_variable_name ()
 		;;
 	*)
 		__git_compute_config_vars
-		__gitcomp "$(echo "$__git_config_vars" |
+		__gitcomp_nl "$(echo "$__git_config_vars" |
 				awk -F . '{
 					sections[$1] = 1
 				}
@@ -2812,7 +2672,7 @@ __git_complete_config_variable_name ()
 					for (s in sections)
 						print s "."
 				}
-				')" "" "$cur_"
+				')" "" "$cur_" ""
 		;;
 	esac
 }
@@ -2906,7 +2766,7 @@ _git_remote ()
 		__gitcomp_builtin remote_update
 		;;
 	update,*)
-		__gitcomp "$(__git_remotes) $(__git_get_config_variables "remotes")"
+		__gitcomp_nl "$(__git_remotes) $(__git_get_config_variables "remotes")"
 		;;
 	set-url,--*)
 		__gitcomp_builtin remote_set-url
@@ -2973,7 +2833,7 @@ _git_restore ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--source=*)
 		__git_complete_refs --cur="${cur##--source=}"
@@ -2990,7 +2850,7 @@ _git_revert ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
-		__gitcomp "$__git_revert_inprogress_options"
+		__gitcomp_opts "$__git_revert_inprogress_options"
 		return
 	fi
 	__git_complete_strategy && return
@@ -3022,7 +2882,7 @@ _git_shortlog ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			$__git_log_common_options
 			$__git_log_shortlog_options
 			--numbered --summary --email
@@ -3060,8 +2920,8 @@ _git_show ()
 		return
 		;;
 	--*)
-		__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
-			--oneline --show-signature --patch
+		__gitcomp_opts "--pretty= --format= --abbrev-commit --no-abbrev-commit
+			--oneline --show-signature
 			--expand-tabs --expand-tabs= --no-expand-tabs
 			$__git_diff_common_options
 			"
@@ -3093,10 +2953,10 @@ _git_sparse_checkout ()
 
 	case "$subcommand,$cur" in
 	init,--*)
-		__gitcomp "--cone"
+		__gitcomp_opts "--cone"
 		;;
 	set,--*)
-		__gitcomp "--stdin"
+		__gitcomp_opts "--stdin"
 		;;
 	*)
 		;;
@@ -3105,63 +2965,48 @@ _git_sparse_checkout ()
 
 _git_stash ()
 {
-	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
 	local subcommands='push list show apply clear drop pop create branch'
 	local subcommand="$(__git_find_on_cmdline "$subcommands save")"
-	if [ -z "$subcommand" -a -n "$(__git_find_on_cmdline "-p")" ]; then
-		subcommand="push"
-	fi
+
 	if [ -z "$subcommand" ]; then
-		case "$cur" in
-		--*)
-			__gitcomp "$save_opts"
+		case "$((cword - __git_cmd_idx)),$cur" in
+		*,--*)
+			__gitcomp_builtin stash_push
 			;;
-		sa*)
-			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
-				__gitcomp "save"
-			fi
+		1,sa*)
+			__gitcomp "save"
 			;;
-		*)
-			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
-				__gitcomp "$subcommands"
-			fi
+		1,*)
+			__gitcomp "$subcommands"
 			;;
 		esac
-	else
-		case "$subcommand,$cur" in
-		push,--*)
-			__gitcomp "$save_opts --message"
-			;;
-		save,--*)
-			__gitcomp "$save_opts"
-			;;
-		apply,--*|pop,--*)
-			__gitcomp "--index --quiet"
-			;;
-		drop,--*)
-			__gitcomp "--quiet"
-			;;
-		list,--*)
-			__gitcomp "--name-status --oneline --patch-with-stat"
-			;;
-		show,--*|branch,--*)
-			;;
-		branch,*)
-			if [ $cword -eq 3 ]; then
-				__git_complete_refs
-			else
-				__gitcomp_nl "$(__git stash list \
-						| sed -n -e 's/:.*//p')"
-			fi
-			;;
-		show,*|apply,*|drop,*|pop,*)
+		return
+	fi
+
+	case "$subcommand,$cur" in
+	list,--*)
+		# NEEDSWORK: can we somehow unify this with the options in _git_log() and _git_show()
+		__gitcomp_builtin stash_list "$__git_log_common_options $__git_diff_common_options"
+		;;
+	show,--*)
+		__gitcomp_builtin stash_show "$__git_diff_common_options"
+		;;
+	*,--*)
+		__gitcomp_builtin "stash_$subcommand"
+		;;
+	branch,*)
+		if [ $cword -eq $((__git_cmd_idx+2)) ]; then
+			__git_complete_refs
+		else
 			__gitcomp_nl "$(__git stash list \
 					| sed -n -e 's/:.*//p')"
-			;;
-		*)
-			;;
-		esac
-	fi
+		fi
+		;;
+	show,*|apply,*|drop,*|pop,*)
+		__gitcomp_nl "$(__git stash list \
+				| sed -n -e 's/:.*//p')"
+		;;
+	esac
 }
 
 _git_submodule ()
@@ -3173,7 +3018,7 @@ _git_submodule ()
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
-			__gitcomp "--quiet"
+			__gitcomp_opts "--quiet"
 			;;
 		*)
 			__gitcomp "$subcommands"
@@ -3184,29 +3029,29 @@ _git_submodule ()
 
 	case "$subcommand,$cur" in
 	add,--*)
-		__gitcomp "--branch --force --name --reference --depth"
+		__gitcomp_opts "--branch --force --name --reference --depth"
 		;;
 	status,--*)
-		__gitcomp "--cached --recursive"
+		__gitcomp_opts "--cached --recursive"
 		;;
 	deinit,--*)
-		__gitcomp "--force --all"
+		__gitcomp_opts "--force --all"
 		;;
 	update,--*)
-		__gitcomp "
+		__gitcomp_opts "
 			--init --remote --no-fetch
 			--recommend-shallow --no-recommend-shallow
 			--force --rebase --merge --reference --depth --recursive --jobs
 		"
 		;;
 	set-branch,--*)
-		__gitcomp "--default --branch"
+		__gitcomp_opts "--default --branch"
 		;;
 	summary,--*)
-		__gitcomp "--cached --files --summary-limit"
+		__gitcomp_opts "--cached --files --summary-limit"
 		;;
 	foreach,--*|sync,--*)
-		__gitcomp "--recursive"
+		__gitcomp_opts "--recursive"
 		;;
 	*)
 		;;
@@ -3247,64 +3092,64 @@ _git_svn ()
 
 		case "$subcommand,$cur" in
 		fetch,--*)
-			__gitcomp "--revision= --fetch-all $fc_opts"
+			__gitcomp_opts "--revision= --fetch-all $fc_opts"
 			;;
 		clone,--*)
-			__gitcomp "--revision= $fc_opts $init_opts"
+			__gitcomp_opts "--revision= $fc_opts $init_opts"
 			;;
 		init,--*)
-			__gitcomp "$init_opts"
+			__gitcomp_opts "$init_opts"
 			;;
 		dcommit,--*)
-			__gitcomp "
+			__gitcomp_opts "
 				--merge --strategy= --verbose --dry-run
 				--fetch-all --no-rebase --commit-url
 				--revision --interactive $cmt_opts $fc_opts
 				"
 			;;
 		set-tree,--*)
-			__gitcomp "--stdin $cmt_opts $fc_opts"
+			__gitcomp_opts "--stdin $cmt_opts $fc_opts"
 			;;
 		create-ignore,--*|propget,--*|proplist,--*|show-ignore,--*|\
 		show-externals,--*|mkdirs,--*)
-			__gitcomp "--revision="
+			__gitcomp_opts "--revision="
 			;;
 		log,--*)
-			__gitcomp "
+			__gitcomp_opts "
 				--limit= --revision= --verbose --incremental
 				--oneline --show-commit --non-recursive
 				--authors-file= --color
 				"
 			;;
 		rebase,--*)
-			__gitcomp "
+			__gitcomp_opts "
 				--merge --verbose --strategy= --local
 				--fetch-all --dry-run $fc_opts
 				"
 			;;
 		commit-diff,--*)
-			__gitcomp "--message= --file= --revision= $cmt_opts"
+			__gitcomp_opts "--message= --file= --revision= $cmt_opts"
 			;;
 		info,--*)
-			__gitcomp "--url"
+			__gitcomp_opts "--url"
 			;;
 		branch,--*)
-			__gitcomp "--dry-run --message --tag"
+			__gitcomp_opts "--dry-run --message --tag"
 			;;
 		tag,--*)
-			__gitcomp "--dry-run --message"
+			__gitcomp_opts "--dry-run --message"
 			;;
 		blame,--*)
-			__gitcomp "--git-format"
+			__gitcomp_opts "--git-format"
 			;;
 		migrate,--*)
-			__gitcomp "
+			__gitcomp_opts "
 				--config-dir= --ignore-paths= --minimize
 				--no-auth-cache --username=
 				"
 			;;
 		reset,--*)
-			__gitcomp "--revision= --parent"
+			__gitcomp_opts "--revision= --parent"
 			;;
 		*)
 			;;
@@ -3314,7 +3159,7 @@ _git_svn ()
 
 _git_tag ()
 {
-	local i c=1 f=0
+	local i c="$__git_cmd_idx" f=0
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
@@ -3357,9 +3202,10 @@ _git_whatchanged ()
 __git_complete_worktree_paths ()
 {
 	local IFS=$'\n'
+	# Generate completion reply from worktree list skipping the first
+	# entry: it's the path of the main worktree, which can't be moved,
+	# removed, locked, etc.
 	__gitcomp_nl "$(git worktree list --porcelain |
-		# Skip the first entry: it's the path of the main worktree,
-		# which can't be moved, removed, locked, etc.
 		sed -n -e '2,$ s/^worktree //p')"
 }
 
@@ -3458,15 +3304,19 @@ __git_support_parseopt_helper () {
 	esac
 }
 
+__git_have_func () {
+	declare -f -- "$1" >/dev/null 2>&1
+}
+
 __git_complete_command () {
 	local command="$1"
 	local completion_func="_git_${command//-/_}"
-	if ! declare -f $completion_func >/dev/null 2>/dev/null &&
-		declare -f _completion_loader >/dev/null 2>/dev/null
+	if ! __git_have_func $completion_func &&
+		__git_have_func _completion_loader
 	then
 		_completion_loader "git-$command"
 	fi
-	if declare -f $completion_func >/dev/null 2>/dev/null
+	if __git_have_func $completion_func
 	then
 		$completion_func
 		return 0
@@ -3483,21 +3333,40 @@ __git_main ()
 {
 	local i c=1 command __git_dir __git_repo_path
 	local __git_C_args C_args_count=0
+	local __git_cmd_idx
 
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
-		--git-dir)   ((c++)) ; __git_dir="${words[c]}" ;;
-		--bare)      __git_dir="." ;;
-		--help) command="help"; break ;;
-		-c|--work-tree|--namespace) ((c++)) ;;
-		-C)	__git_C_args[C_args_count++]=-C
+		--git-dir=*)
+			__git_dir="${i#--git-dir=}"
+			;;
+		--git-dir)
+			((c++))
+			__git_dir="${words[c]}"
+			;;
+		--bare)
+			__git_dir="."
+			;;
+		--help)
+			command="help"
+			break
+			;;
+		-c|--work-tree|--namespace)
+			((c++))
+			;;
+		-C)
+			__git_C_args[C_args_count++]=-C
 			((c++))
 			__git_C_args[C_args_count++]="${words[c]}"
 			;;
-		-*) ;;
-		*) command="$i"; break ;;
+		-*)
+			;;
+		*)
+			command="$i"
+			__git_cmd_idx="$c"
+			break
+			;;
 		esac
 		((c++))
 	done
@@ -3519,7 +3388,8 @@ __git_main ()
 			;;
 		esac
 		case "$cur" in
-		--*)   __gitcomp "
+		--*)
+			__gitcomp_opts "
 			--paginate
 			--no-pager
 			--git-dir=
@@ -3541,7 +3411,7 @@ __git_main ()
 			then
 				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
 			else
-				__gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+				__gitcomp_nl "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
 			fi
 			;;
 		esac
@@ -3570,7 +3440,7 @@ __gitk_main ()
 	fi
 	case "$cur" in
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			$__git_log_common_options
 			$__git_log_gitk_options
 			$merge
@@ -3586,17 +3456,106 @@ if [[ -n ${ZSH_VERSION-} && -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
 	return
 fi
 
+# The following function is based on code from:
+#
+#   bash_completion - programmable completion functions for bash 3.2+
+#
+#   Copyright © 2006-2008, Ian Macdonald <ian@caliban.org>
+#             © 2009-2010, Bash Completion Maintainers
+#                     <bash-completion-devel@lists.alioth.debian.org>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
+#
+#   The latest version of this software can be obtained here:
+#
+#   http://bash-completion.alioth.debian.org/
+#
+#   RELEASE: 2.x
+
+# This function reorganizes the words on the command line to be processed by
+# the rest of the script.
+#
+# This is roughly equivalent to going back in time and setting
+# COMP_WORDBREAKS to exclude '=' and ':'.  The intent is to
+# make option types like --date=<type> and <rev>:<path> easy to
+# recognize by treating each shell word as a single token.
+#
+# It is best not to set COMP_WORDBREAKS directly because the value is
+# shared with other completion scripts.  By the time the completion
+# function gets called, COMP_WORDS has already been populated so local
+# changes to COMP_WORDBREAKS have no effect.
+
+if ! type __git_get_comp_words_by_ref >/dev/null 2>&1; then
+__git_get_comp_words_by_ref ()
+{
+	local exclude i j first
+
+	# Which word separators to exclude?
+	exclude="${COMP_WORDBREAKS//[^=:]}"
+	cword=$COMP_CWORD
+	if [ -n "$exclude" ]; then
+		# List of word completion separators has shrunk;
+		# re-assemble words to complete.
+		for ((i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
+			# Append each nonempty word consisting of just
+			# word separator characters to the current word.
+			first=t
+			while
+				[ $i -gt 0 ] &&
+				[ -n "${COMP_WORDS[$i]}" ] &&
+				# word consists of excluded word separators
+				[ "${COMP_WORDS[$i]//[^$exclude]}" = "${COMP_WORDS[$i]}" ]
+			do
+				# Attach to the previous token,
+				# unless the previous token is the command name.
+				if [ $j -ge 2 ] && [ -n "$first" ]; then
+					((j--))
+				fi
+				first=
+				words[$j]=${words[j]}${COMP_WORDS[i]}
+				if [ $i = $COMP_CWORD ]; then
+					cword=$j
+				fi
+				if (($i < ${#COMP_WORDS[@]} - 1)); then
+					((i++))
+				else
+					# Done.
+					break 2
+				fi
+			done
+			words[$j]=${words[j]}${COMP_WORDS[i]}
+			if [ $i = $COMP_CWORD ]; then
+				cword=$j
+			fi
+		done
+	else
+		words=("${COMP_WORDS[@]}")
+	fi
+
+	cur=${words[cword]}
+	prev=${words[cword-1]}
+}
+fi
+
 __git_func_wrap ()
 {
-	local cur words cword prev
-	_get_comp_words_by_ref -n =: cur words cword prev
+	local cur words cword prev __git_cmd_idx=0
+	__git_get_comp_words_by_ref
 	$1
 }
 
-# Setup completion for certain functions defined above by setting common
-# variables and workarounds.
-# This is NOT a public function; use at your own risk.
-__git_complete ()
+___git_complete ()
 {
 	local wrapper="__git_wrap${2}"
 	eval "$wrapper () { __git_func_wrap $2 ; }"
@@ -3604,15 +3563,35 @@ __git_complete ()
 		|| complete -o default -o nospace -F $wrapper $1
 }
 
+# Setup the completion for git commands
+# 1: command or alias
+# 2: function to call (e.g. `git`, `gitk`, `git_fetch`)
+__git_complete ()
+{
+	local func
+
+	if __git_have_func $2; then
+		func=$2
+	elif __git_have_func __$2_main; then
+		func=__$2_main
+	elif __git_have_func _$2; then
+		func=_$2
+	else
+		echo "ERROR: could not find function '$2'" 1>&2
+		return 1
+	fi
+	___git_complete $1 $func
+}
+
 if ! git --list-cmds=main >/dev/null 2>&1; then
 
 	declare -A __git_cmds
 	__git_cmds[list-complete]="apply blame cherry config difftool fsck help instaweb mergetool prune reflog remote repack replace request-pull send-email show-branch stage whatchanged"
-	__git_cmds[list-guide]="attributes cli core-tutorial credentials cvs-migration diffcore everyday faq glossary hooks ignore modules namespaces remote-helpers repository-layout revisions submodules tutorial-2 tutorial workflows"
-	__git_cmds[list-mainporcelain]="add am archive bisect branch bundle checkout cherry-pick citool clean clone commit describe diff fetch format-patch gc grep gui init gitk log maintenance merge mv notes pull push range-diff rebase reset restore revert rm shortlog show sparse-checkout stash status submodule switch tag worktree"
-	__git_cmds[main]="add add--interactive am annotate apply archimport archive bisect bisect--helper blame branch bugreport bundle cat-file check-attr check-ignore check-mailmap check-ref-format checkout checkout-index cherry cherry-pick citool clean clone column commit commit-graph commit-tree config count-objects credential credential-cache credential-cache--daemon credential-gnome-keyring credential-libsecret credential-store cvsexportcommit cvsimport cvsserver daemon describe diff diff-files diff-index diff-tree difftool difftool--helper env--helper fast-export fast-import fetch fetch-pack filter-branch fmt-merge-msg for-each-ref format-patch fsck fsck-objects gc get-tar-commit-id grep gui gui--askpass hash-object help http-backend http-fetch http-push imap-send index-pack init init-db instaweb interpret-trailers log ls-files ls-remote ls-tree mailinfo mailsplit maintenance merge merge-base merge-file merge-index merge-octopus merge-one-file merge-ours merge-recursive merge-recursive-ours merge-recursive-theirs merge-resolve merge-subtree merge-tree mergetool mktag mktree multi-pack-index mv mw name-rev notes p4 pack-objects pack-redundant pack-refs patch-id pickaxe prune prune-packed pull push quiltimport range-diff read-tree rebase rebase--interactive receive-pack reflog remote remote-ext remote-fd remote-ftp remote-ftps remote-http remote-https remote-mediawiki repack replace request-pull rerere reset restore rev-list rev-parse revert rm send-email send-pack sh-i18n--envsubst shell shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace submodule submodule--helper subtree svn switch symbolic-ref tag unpack-file unpack-objects update-index update-ref update-server-info upload-archive upload-archive--writer upload-pack var verify-commit verify-pack verify-tag version web--browse whatchanged worktree write-tree"
-	__git_cmds[others]="compare reintegrate related remote-hg remote-sync send-series smartlist"
-	__git_cmds[parseopt]="add am apply archive bisect--helper blame branch bugreport cat-file check-attr check-ignore check-mailmap checkout checkout-index cherry cherry-pick clean clone column commit commit-graph config count-objects credential-cache credential-cache--daemon credential-store describe difftool env--helper fast-export fetch fmt-merge-msg for-each-ref format-patch fsck fsck-objects gc grep hash-object help init init-db interpret-trailers log ls-files ls-remote ls-tree merge merge-base merge-file mktree multi-pack-index mv name-rev notes pack-objects pack-refs pickaxe prune prune-packed pull push range-diff read-tree rebase rebase--interactive receive-pack reflog remote repack replace rerere reset restore revert rm send-pack shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace switch symbolic-ref tag update-index update-ref update-server-info upload-pack verify-commit verify-pack verify-tag version whatchanged write-tree "
+	__git_cmds[list-guide]="attributes cli core-tutorial credentials cvs-migration diffcore everyday faq glossary hooks ignore mailmap modules namespaces remote-helpers repository-layout revisions submodules tutorial tutorial-2 workflows"
+	__git_cmds[list-mainporcelain]="add am archive bisect branch bundle checkout cherry-pick citool clean clone commit describe diff fetch format-patch gc grep gui init log maintenance merge mv notes pull push range-diff rebase reset restore revert rm shortlog show sparse-checkout stash status submodule switch tag worktree gitk"
+	__git_cmds[main]="add add--interactive am annotate apply archimport archive bisect bisect--helper blame branch bugreport bundle cat-file check-attr check-ignore check-mailmap check-ref-format checkout checkout--worker checkout-index cherry cherry-pick citool clean clone column commit commit-graph commit-tree config count-objects credential credential-cache credential-cache--daemon credential-gnome-keyring credential-libsecret credential-store cvsexportcommit cvsimport cvsserver daemon describe diff diff-files diff-index diff-tree difftool difftool--helper env--helper fast-export fast-import fetch fetch-pack filter-branch fmt-merge-msg for-each-ref for-each-repo format-patch fsck fsck-objects gc get-tar-commit-id grep gui gui--askpass hash-object help http-backend http-fetch http-push imap-send index-pack init init-db instaweb interpret-trailers log ls-files ls-remote ls-tree mailinfo mailsplit maintenance merge merge-base merge-file merge-index merge-octopus merge-one-file merge-ours merge-recursive merge-recursive-ours merge-recursive-theirs merge-resolve merge-subtree merge-tree mergetool mktag mktree multi-pack-index mv mw name-rev notes p4 pack-objects pack-redundant pack-refs patch-id pickaxe prune prune-packed pull push quiltimport range-diff read-tree rebase receive-pack reflog remote remote-ext remote-fd remote-ftp remote-ftps remote-http remote-https remote-mediawiki repack replace request-pull rerere reset restore rev-list rev-parse revert rm send-email send-pack sh-i18n--envsubst shell shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace submodule submodule--helper subtree svn switch symbolic-ref tag unpack-file unpack-objects update-index update-ref update-server-info upload-archive upload-archive--writer upload-pack var verify-commit verify-pack verify-tag version web--browse whatchanged worktree write-tree"
+	__git_cmds[others]=""
+	__git_cmds[parseopt]="add am apply archive bisect--helper blame branch bugreport cat-file check-attr check-ignore check-mailmap checkout checkout--worker checkout-index cherry cherry-pick clean clone column commit commit-graph config count-objects credential-cache credential-cache--daemon credential-store describe difftool env--helper fast-export fetch fmt-merge-msg for-each-ref for-each-repo format-patch fsck fsck-objects gc grep hash-object help init init-db interpret-trailers log ls-files ls-remote ls-tree merge merge-base merge-file mktree multi-pack-index mv name-rev notes pack-objects pack-refs pickaxe prune prune-packed pull push range-diff read-tree rebase receive-pack reflog remote repack replace rerere reset restore revert rm send-pack shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace switch symbolic-ref tag update-index update-ref update-server-info upload-pack verify-commit verify-pack verify-tag version whatchanged write-tree "
 
 	# Override __git
 	__git ()
@@ -3641,13 +3620,13 @@ if ! git --list-cmds=main >/dev/null 2>&1; then
 
 fi
 
-__git_complete git __git_main
-__git_complete gitk __gitk_main
+___git_complete git __git_main
+___git_complete gitk __gitk_main
 
 # The following are necessary only for Cygwin, and only are needed
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
 if [ "$OSTYPE" = cygwin ]; then
-	__git_complete git.exe __git_main
+	___git_complete git.exe __git_main
 fi
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index 54e123d63..db7c0068f 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -138,6 +138,7 @@ __git_ps1_show_upstream ()
 	done <<< "$output"
 
 	# parse configuration values
+	local option
 	for option in ${GIT_PS1_SHOWUPSTREAM}; do
 		case "$option" in
 		git|svn) upstream="$option" ;;
@@ -432,8 +433,8 @@ __git_ps1 ()
 	fi
 
 	local sparse=""
-	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
-	   [ -z "${GIT_PS1_OMITSPARSESTATE}" ] &&
+	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
+	   [ -z "${GIT_PS1_OMITSPARSESTATE-}" ] &&
 	   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
 		sparse="|SPARSE"
 	fi
@@ -542,7 +543,7 @@ __git_ps1 ()
 			u="%${ZSH_VERSION+%}"
 		fi
 
-		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
+		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
 		   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
 			h="?"
 		fi
diff --git a/plugins/gitfast/update b/plugins/gitfast/update
index 5311065a1..5ebaaef3d 100755
--- a/plugins/gitfast/update
+++ b/plugins/gitfast/update
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 url="https://raw.githubusercontent.com/felipec/git-completion"
-version="1.2"
+version="1.3.6"
 
 curl -s -o _git "${url}/v${version}/git-completion.zsh" &&
 curl -s -o git-completion.bash "${url}/v${version}/git-completion.bash" &&

From 11a87eac47c579366620f995330532f47dc651f2 Mon Sep 17 00:00:00 2001
From: Gheritarish <ilissiae@gmail.com>
Date: Fri, 28 Jan 2022 13:47:41 +0100
Subject: [PATCH 484/591] chore(1password): fix comments to follow code
 (#10634)

---
 plugins/1password/1password.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/1password/1password.plugin.zsh b/plugins/1password/1password.plugin.zsh
index 5af5ebb2b..9398b02b4 100644
--- a/plugins/1password/1password.plugin.zsh
+++ b/plugins/1password/1password.plugin.zsh
@@ -4,8 +4,8 @@ if (( ${+commands[op]} )); then
 fi
 
 # opswd puts the password of the named service into the clipboard. If there's a
-# one time password, it will be copied into the clipboard after 5 seconds. The
-# clipboard is cleared after another 10 seconds.
+# one time password, it will be copied into the clipboard after 10 seconds. The
+# clipboard is cleared after another 20 seconds.
 function opswd() {
   if [[ $# -lt 1 ]]; then
     echo "Usage: opswd <service>"

From 46f5d38b1dc6a725e78bd53ca35a6299b4e91ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 28 Jan 2022 20:53:30 +0100
Subject: [PATCH 485/591] refactor(installer): use POSIX-standard's `id -u -n`
 to define `$USER`

---
 tools/install.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 2290bc1eb..e64e39063 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -37,6 +37,13 @@
 #
 set -e
 
+# Make sure important variables exist if not already defined
+#
+# $USER is defined by login(1) which is not always executed (e.g. containers)
+# POSIX: https://pubs.opengroup.org/onlinepubs/009695299/utilities/id.html
+USER=${USER:-$(id -u -n)}
+
+
 # Track if $ZSH was provided
 custom_zsh=${ZSH:+yes}
 
@@ -51,9 +58,6 @@ CHSH=${CHSH:-yes}
 RUNZSH=${RUNZSH:-yes}
 KEEP_ZSHRC=${KEEP_ZSHRC:-no}
 
-# Sane defaults
-USER=${USER:-$(whoami)}
-
 
 command_exists() {
   command -v "$@" >/dev/null 2>&1

From eabec36586f990b883e7dbf4583e6d86ac46c7ea Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Fri, 28 Jan 2022 23:28:19 +0100
Subject: [PATCH 486/591] style(init): use consistent code style in init script
 (#10601)

---
 oh-my-zsh.sh | 71 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index b388b341d..ab32ee9d3 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -57,14 +57,14 @@ mkdir -p "$ZSH_CACHE_DIR/completions"
 (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
 # Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
-  source $ZSH/tools/check_for_upgrade.sh
+if [[ "$DISABLE_AUTO_UPDATE" != true ]]; then
+  source "$ZSH/tools/check_for_upgrade.sh"
 fi
 
 # Initializes Oh My Zsh
 
 # add a function path
-fpath=($ZSH/functions $ZSH/completions $fpath)
+fpath=("$ZSH/functions" "$ZSH/completions" $fpath)
 
 # Load all stock functions (from $fpath files) called below.
 autoload -U compaudit compinit
@@ -75,7 +75,6 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
-
 is_plugin() {
   local base_dir=$1
   local name=$2
@@ -86,10 +85,10 @@ is_plugin() {
 # Add all defined plugins to fpath. This must be done
 # before running compinit.
 for plugin ($plugins); do
-  if is_plugin $ZSH_CUSTOM $plugin; then
-    fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)
-  elif is_plugin $ZSH $plugin; then
-    fpath=($ZSH/plugins/$plugin $fpath)
+  if is_plugin "$ZSH_CUSTOM" "$plugin"; then
+    fpath=("$ZSH_CUSTOM/plugins/$plugin" $fpath)
+  elif is_plugin "$ZSH" "$plugin"; then
+    fpath=("$ZSH/plugins/$plugin" $fpath)
   else
     echo "[oh-my-zsh] plugin '$plugin' not found"
   fi
@@ -98,14 +97,14 @@ done
 # Figure out the SHORT hostname
 if [[ "$OSTYPE" = darwin* ]]; then
   # macOS's $HOST changes with dhcp, etc. Use ComputerName if possible.
-  SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST=${HOST/.*/}
+  SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST="${HOST/.*/}"
 else
-  SHORT_HOST=${HOST/.*/}
+  SHORT_HOST="${HOST/.*/}"
 fi
 
 # Save the location of the current completion dump file.
-if [ -z "$ZSH_COMPDUMP" ]; then
-  ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
+if [[ -z "$ZSH_COMPDUMP" ]]; then
+  ZSH_COMPDUMP="${ZDOTDIR:-$HOME}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 fi
 
 # Construct zcompdump OMZ metadata
@@ -119,15 +118,15 @@ if ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null \
   zcompdump_refresh=1
 fi
 
-if [[ $ZSH_DISABLE_COMPFIX != true ]]; then
-  source $ZSH/lib/compfix.zsh
+if [[ "$ZSH_DISABLE_COMPFIX" != true ]]; then
+  source "$ZSH/lib/compfix.zsh"
   # If completion insecurities exist, warn the user
   handle_completion_insecurities
   # Load only from secure directories
-  compinit -i -C -d "${ZSH_COMPDUMP}"
+  compinit -i -C -d "$ZSH_COMPDUMP"
 else
   # If the user wants it, load from all found directories
-  compinit -u -C -d "${ZSH_COMPDUMP}"
+  compinit -u -C -d "$ZSH_COMPDUMP"
 fi
 
 # Append zcompdump metadata if missing
@@ -140,40 +139,48 @@ $zcompdump_revision
 $zcompdump_fpath
 EOF
 fi
-
 unset zcompdump_revision zcompdump_fpath zcompdump_refresh
 
-
 # Load all of the config files in ~/oh-my-zsh that end in .zsh
 # TIP: Add files you don't want in git to .gitignore
-for config_file ($ZSH/lib/*.zsh); do
-  custom_config_file="${ZSH_CUSTOM}/lib/${config_file:t}"
-  [ -f "${custom_config_file}" ] && config_file=${custom_config_file}
-  source $config_file
+for config_file ("$ZSH"/lib/*.zsh); do
+  custom_config_file="$ZSH_CUSTOM/lib/${config_file:t}"
+  [[ -f "$custom_config_file" ]] && config_file="$custom_config_file"
+  source "$config_file"
 done
+unset custom_config_file
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
-  if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
-    source $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh
-  elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
-    source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+  if [[ -f "$ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh" ]]; then
+    source "$ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh"
+  elif [[ -f "$ZSH/plugins/$plugin/$plugin.plugin.zsh" ]]; then
+    source "$ZSH/plugins/$plugin/$plugin.plugin.zsh"
   fi
 done
+unset plugin
 
 # Load all of your custom configurations from custom/
-for config_file ($ZSH_CUSTOM/*.zsh(N)); do
-  source $config_file
+for config_file ("$ZSH_CUSTOM"/*.zsh(N)); do
+  source "$config_file"
 done
 unset config_file
 
 # Load the theme
-if [ ! "$ZSH_THEME" = ""  ]; then
-  if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then
+is_theme() {
+  local base_dir=$1
+  local name=$2
+  builtin test -f $base_dir/$name.zsh-theme
+}
+
+if [[ -n "$ZSH_THEME" ]]; then
+  if is_theme "$ZSH_CUSTOM" "$ZSH_THEME"; then
     source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
-  elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]; then
+  elif is_theme "$ZSH_CUSTOM/themes" "$ZSH_THEME"; then
     source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
-  else
+  elif is_theme "$ZSH/themes" "$ZSH_THEME"; then
     source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+  else
+    echo "[oh-my-zsh] theme '$ZSH_THEME' not found"
   fi
 fi

From 73001e9382db99ebd6effcf0bdcd227985109142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 1 Feb 2022 12:56:22 +0100
Subject: [PATCH 487/591] refactor(django): remove deprecated `django` plugin

BREAKING CHANGE: the `django` plugin was deprecated in 2021-09-22. With
this change it has now been removed altogether. Zsh already provides
built-in completion for Django commands.
---
 plugins/django/README.md         |  12 -
 plugins/django/django.plugin.zsh | 407 -------------------------------
 2 files changed, 419 deletions(-)
 delete mode 100644 plugins/django/README.md
 delete mode 100644 plugins/django/django.plugin.zsh

diff --git a/plugins/django/README.md b/plugins/django/README.md
deleted file mode 100644
index cfab43980..000000000
--- a/plugins/django/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Django plugin
-
-This plugin adds completion for the [Django Project](https://www.djangoproject.com/) commands
-(`manage.py`, `django-admin`, ...).
-
-## Deprecation (2021-09-22)
-
-The plugin used to provide completion for `./manage.py` and `django-admin`, but Zsh already provides
-a better, more extensive completion for those, so this plugin is no longer needed.
-
-Right now a warning message is shown, but in the near future the plugin will stop working altogether.
-So you can remove it from your plugins and you'll automatically start using Zsh's django completion.
diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
deleted file mode 100644
index a07a30889..000000000
--- a/plugins/django/django.plugin.zsh
+++ /dev/null
@@ -1,407 +0,0 @@
-#compdef manage.py
-
-typeset -ga nul_args
-nul_args=(
-  '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))'
-  '--settings=-[the Python path to a settings module.]:file:_files'
-  '--pythonpath=-[a directory to add to the Python path.]:directory:_directories'
-  '--traceback[print traceback on exception.]'
-  "--no-color[Don't colorize the command output.]"
-  "--version[show program's version number and exit.]"
-  {-h,--help}'[show this help message and exit.]'
-)
-
-typeset -ga start_args
-start_args=(
-  '--template=-[The path or URL to load the template from.]:directory:_directories'
-  '--extension=-[The file extension(s) to render (default: "py").]'
-  '--name=-[The file name(s) to render.]:file:_files'
-)
-
-typeset -ga db_args
-db_args=(
-  '--database=-[Nominates a database. Defaults to the "default" database.]'
-)
-
-typeset -ga noinput_args
-noinput_args=(
-  '--noinput[tells Django to NOT prompt the user for input of any kind.]'
-)
-
-typeset -ga no_init_data_args
-no_init_data_args=(
-  '--no-initial-data[Tells Django not to load any initial data after database synchronization.]'
-)
-
-typeset -ga tag_args
-tag_args=(
-  '--tag=-[Run only checks labeled with given tag.]'
-  '--list-tags[List available tags.]'
-)
-
-_managepy-check(){
-  _arguments -s : \
-    $tag_args \
-    $nul_args && ret=0
-}
-
-_managepy-changepassword(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-createcachetable(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-createsuperuser(){
-  _arguments -s : \
-    '--username=-[Specifies the login for the superuser.]' \
-    '--email=-[Specifies the email for the superuser.]' \
-    $noinput_args \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-collectstatic(){
-  _arguments -s : \
-    '--link[Create a symbolic link to each file instead of copying.]' \
-    '--no-post-process[Do NOT post process collected files.]' \
-    '--ignore=-[Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.]' \
-    '--dry-run[Do everything except modify the filesystem.]' \
-    '--clear[Clear the existing files using the storage before trying to copy or link the original file.]' \
-    '--link[Create a symbolic link to each file instead of copying.]' \
-    '--no-default-ignore[Do not ignore the common private glob-style patterns "CVS", ".*" and "*~".]' \
-    $noinput_args \
-    $nul_args && ret=0
-}
-
-_managepy-dbshell(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-diffsettings(){
-  _arguments -s : \
-    "--all[Display all settings, regardless of their value.]"
-    $nul_args && ret=0
-}
-
-_managepy-dumpdata(){
-  _arguments -s : \
-    '--format=-[Specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
-    '--indent=-[Specifies the indent level to use when pretty-printing output.]' \
-    '--exclude=-[An app_label or app_label.ModelName to exclude (use multiple --exclude to exclude multiple apps/models).]' \
-    '--natural-foreign[Use natural foreign keys if they are available.]' \
-    '--natural-primary[Use natural primary keys if they are available.]' \
-    "--all[Use Django's base manager to dump all models stored in the database.]" \
-    '--pks=-[Only dump objects with given primary keys.]' \
-    $db_args \
-    $nul_args \
-    '*::appname:_applist' && ret=0
-}
-
-_managepy-flush(){
-  _arguments -s : \
-    $no_init_data_args \
-    $db_args \
-    $noinput_args \
-    $nul_args && ret=0
-}
-
-_managepy-help(){
-  _arguments -s : \
-    '*:command:_managepy_cmds' \
-    $nul_args && ret=0
-}
-
-_managepy_cmds(){
-    local line
-    local -a cmd
-    _call_program help-command ./manage.py help \
-      |& sed -n '/^ /s/[(), ]/ /gp' \
-      | while read -A line; do cmd=($line $cmd) done
-    _describe -t managepy-command 'manage.py command' cmd
-}
-
-_managepy-inspectdb(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-loaddata(){
-  _arguments -s : \
-    '--ignorenonexistent[Ignores entries in the serialized data for fields that do not currently exist on the model.]' \
-    '--app=-[Only look for fixtures in the specified app.]:appname:_applist' \
-    '*::file:_files' \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-makemessages(){
-  _arguments -s : \
-    '--locale=-[Creates or updates the message files for the given locale(s) (e.g. pt_BR).]' \
-    '--domain=-[The domain of the message files (default: "django").]' \
-    '--all[Updates the message files for all existing locales.]' \
-    '--extension=-[The file extension(s) to examine (default: "html,txt", or "js" if the domain is "djangojs").]' \
-    '--symlinks[Follows symlinks to directories when examining source code and templates for translation strings.]' \
-    '--ignore=-[Ignore files or directories matching this glob-style pattern.]' \
-    "--no-default-ignore[Don't ignore the common glob-style patterns 'CVS', '.*', '*~' and '*.pyc'.]" \
-    "--no-wrap[Don't break long message lines into several lines.]" \
-    "--no-location[Don't write '#: filename:line' lines.]" \
-    '--no-obsolete[Remove obsolete message strings.]' \
-    '--keep-pot[Keep .pot file after making messages.]' \
-    $nul_args && ret=0
-}
-_managepy-makemigrations(){
-  _arguments -s : \
-    '--dry-run[Just show what migrations would be made]' \
-    '--merge[Enable fixing of migration conflicts.]' \
-    '--empty[Create an empty migration.]' \
-    $noinput_args \
-    $nul_args && ret=0
-}
-_managepy-migrate(){
-  _arguments -s : \
-    '--fake[Mark migrations as run without actually running them]' \
-    '--list[Show a list of all known migrations and which are applied]' \
-    $no_init_data_args \
-    $noinput_args \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-runfcgi(){
-  local state
-
-  local fcgi_opts
-  fcgi_opts=(
-    'protocol[fcgi, scgi, ajp, ... (default fcgi)]:protocol:(fcgi scgi ajp)'
-    'host[hostname to listen on..]:'
-    'port[port to listen on.]:'
-    'socket[UNIX socket to listen on.]:file:_files'
-    'method[prefork or threaded (default prefork)]:method:(prefork threaded)'
-    'maxrequests[number of requests a child handles before it is killed and a new child is forked (0 = no limit).]:'
-    'maxspare[max number of spare processes / threads.]:'
-    'minspare[min number of spare processes / threads.]:'
-    'maxchildren[hard limit number of processes / threads.]:'
-    'daemonize[whether to detach from terminal.]:boolean:(False True)'
-    'pidfile[write the spawned process-id to this file.]:file:_files'
-    'workdir[change to this directory when daemonizing.]:directory:_files'
-    'outlog[write stdout to this file.]:file:_files'
-    'errlog[write stderr to this file.]:file:_files'
-  )
-
-  _arguments -s : \
-    $nul_args \
-    '*: :_values "FCGI Setting" $fcgi_opts' && ret=0
-}
-
-_managepy-runserver(){
-  _arguments -s : \
-    '--ipv6[Tells Django to use an IPv6 address.]' \
-    '--nothreading[Tells Django to NOT use threading.]' \
-    '--noreload[Tells Django to NOT use the auto-reloader.]' \
-    '--nostatic[Tells Django to NOT automatically serve static files at STATIC_URL.]' \
-    '--insecure[Allows serving static files even if DEBUG is False.]' \
-    $nul_args && ret=0
-}
-
-_managepy-shell(){
-  _arguments -s : \
-    '--plain[Tells Django to use plain Python, not IPython.]' \
-    '--no-startup[When using plain Python, ignore the PYTHONSTARTUP environment variable and ~/.pythonrc.py script.]' \
-    '--interface=-[Specify an interactive interpreter interface.]:INTERFACE:((ipython bpython))' \
-    $nul_args && ret=0
-}
-
-_managepy-sql(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlall(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlclear(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlcustom(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-dropindexes(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlflush(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlindexes(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlinitialdata(){
-  _arguments -s : \
-    $nul_args && ret=0
-}
-
-_managepy-sqlsequencereset(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-squashmigrations(){
-  _arguments -s : \
-    '--no-optimize[Do not try to optimize the squashed operations.]' \
-    $noinput_args \
-    $nul_args && ret=0
-}
-
-_managepy-startapp(){
-  _arguments -s : \
-    $start_args \
-    $nul_args && ret=0
-}
-_managepy-startproject(){
-  _arguments -s : \
-    $start_args \
-    $nul_args && ret=0
-}
-
-_managepy-syncdb() {
-  _arguments -s : \
-    $noinput_args \
-    $no_init_data_args \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-test() {
-  _arguments -s : \
-    '--failfast[Tells Django to stop running the test suite after first failed test.]' \
-    '--testrunner=-[Tells Django to use specified test runner class instead of the one specified by the TEST_RUNNER setting.]' \
-    '--liveserver=-[Overrides the default address where the live server (used with LiveServerTestCase) is expected to run from. The default value is localhost:8081.]' \
-    '--top-level-directory=-[Top level of project for unittest discovery.]' \
-    '--pattern=-[The test matching pattern. Defaults to test*.py.]:' \
-    $noinput_args \
-    '*::appname:_applist' \
-    $nul_args && ret=0
-}
-
-_managepy-testserver() {
-  _arguments -s : \
-    '--addrport=-[port number or ipaddr:port to run the server on.]' \
-    '--ipv6[Tells Django to use an IPv6 address.]' \
-    $noinput_args \
-    '*::fixture:_files' \
-    $nul_args && ret=0
-}
-
-_managepy-validate() {
-  _arguments -s : \
-    $tag_args \
-    $nul_args && ret=0
-}
-
-_managepy-commands() {
-  local -a commands
-
-  commands=(
-    "changepassword:Change a user's password for django.contrib.auth."
-    'check:Checks the entire Django project for potential problems.'
-    'compilemessages:Compiles .po files to .mo files for use with builtin gettext support.'
-    'createcachetable:Creates the table needed to use the SQL cache backend.'
-    'createsuperuser:Used to create a superuser.'
-    'collectstatic:Collect static files in a single location.'
-    'dbshell:Runs the command-line client for the current DATABASE_ENGINE.'
-    "diffsettings:Displays differences between the current settings.py and Django's default settings."
-    'dumpdata:Output the contents of the database as a fixture of the given format.'
-    'flush:Executes ``sqlflush`` on the current database.'
-    'help:manage.py help.'
-    'inspectdb:Introspects the database tables in the given database and outputs a Django model module.'
-    'loaddata:Installs the named fixture(s) in the database.'
-    'makemessages:Runs over the entire source tree of the current directory and pulls out all strings marked for translation.'
-    'makemigrations:Creates new migration(s) for apps.'
-    'migrate:Updates database schema. Manages both apps with migrations and those without.'
-    'runfcgi:Run this project as a fastcgi (or some other protocol supported by flup) application,'
-    'runserver:Starts a lightweight Web server for development.'
-    'shell:Runs a Python interactive interpreter.'
-    'showmigrations:Shows all available migrations for the current project.'
-    'sql:Prints the CREATE TABLE SQL statements for the given app name(s).'
-    'sqlall:Prints the CREATE TABLE, custom SQL and CREATE INDEX SQL statements for the given model module name(s).'
-    'sqlclear:Prints the DROP TABLE SQL statements for the given app name(s).'
-    'sqlcustom:Prints the custom table modifying SQL statements for the given app name(s).'
-    'sqldropindexes:Prints the DROP INDEX SQL statements for the given model module name(s).'
-    'sqlflush:Returns a list of the SQL statements required to return all tables in the database to the state they were in just after they were installed.'
-    'sqlindexes:Prints the CREATE INDEX SQL statements for the given model module name(s).'
-    "sqlinitialdata:RENAMED: see 'sqlcustom'"
-    'sqlsequencereset:Prints the SQL statements for resetting sequences for the given app name(s).'
-    'squashmigrations:Squashes an existing set of migrations (from first until specified) into a single new one.'
-    "startapp:Creates a Django app directory structure for the given app name in this project's directory."
-    "startproject:Creates a Django project directory structure for the given project name in this current directory."
-    "syncdb:Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
-    'test:Runs the test suite for the specified applications, or the entire site if no apps are specified.'
-    'testserver:Runs a development server with data from the given fixture(s).'
-    'validate:Validates all installed models.'
-  )
-
-  _describe -t commands 'manage.py command' commands && ret=0
-}
-
-_applist() {
-  local line
-  local -a apps
-  _call_program help-command "python -c \"import sys; del sys.path[0];\\
-                                          import os.path as op, re, django.conf;\\
-                                          bn=op.basename(op.abspath(op.curdir));[sys\\
-                                          .stdout.write(str(re.sub(r'^%s\.(.*?)$' %
-                                          bn, r'\1', i)) + '\n') for i in django.conf.settings.\\
-                                          INSTALLED_APPS if re.match(r'^%s' % bn, i)]\"" \
-                             | while read -A line; do apps=($line $apps) done
-  _values 'Application' $apps && ret=0
-}
-
-_managepy() {
-  local curcontext=$curcontext ret=1
-
-  if ((CURRENT == 2)); then
-    _managepy-commands
-  else
-    shift words
-    (( CURRENT -- ))
-    curcontext="${curcontext%:*:*}:managepy-$words[1]:"
-    _call_function ret _managepy-$words[1]
-  fi
-}
-
-compdef _managepy manage.py
-compdef _managepy django
-compdef _managepy django-admin
-compdef _managepy django-admin.py
-compdef _managepy django-manage
-
-print -P "%F{yellow}The django plugin is deprecated in favor of Zsh's Django completion.
-%BPlease remove it from your plugins to stop using it.%b%f"

From 3fdad09d095c0d415e0bd9b5710f57fe30fc962a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 1 Feb 2022 13:07:53 +0100
Subject: [PATCH 488/591] chore: update copyright year

---
 LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index becd6a7bd..2d7ca6f52 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2009-2021 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
+Copyright (c) 2009-2022 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 0be7c897f824223fa1cd22976b07ae79eff6aaea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 1 Feb 2022 13:11:49 +0100
Subject: [PATCH 489/591] refactor(zsh_reload)!: remove deprecated plugin

BREAKING CHANGE: the `zsh_reload` was deprecated long ago and showed
a deprecation message. The `src` function was replaced by the CLI
command `omz reload`, so use that instead from now on.
---
 plugins/zsh_reload/README.md             | 3 ---
 plugins/zsh_reload/zsh_reload.plugin.zsh | 7 -------
 2 files changed, 10 deletions(-)
 delete mode 100644 plugins/zsh_reload/README.md
 delete mode 100644 plugins/zsh_reload/zsh_reload.plugin.zsh

diff --git a/plugins/zsh_reload/README.md b/plugins/zsh_reload/README.md
deleted file mode 100644
index 0b2e2a775..000000000
--- a/plugins/zsh_reload/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# zsh_reload plugin
-
-**This plugin is deprecated.** Use `omz reload` or `exec zsh` instead.
diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
deleted file mode 100644
index 6a058ec5e..000000000
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ /dev/null
@@ -1,7 +0,0 @@
-print ${(%):-"%F{yellow}The \`zsh_reload\` plugin is deprecated and will be removed."}
-print ${(%):-"Use \`%Bomz reload%b\` or \`%Bexec zsh%b\` instead.%f"}
-
-src() {
-  print ${(%):-"%F{yellow}$0 is deprecated. Use \`%Bomz reload%b\` or \`%Bexec zsh%b\` instead.%f\n"}
-  omz reload
-}

From 4ee0cf3cb4c64568430f9af5b1edca2602ab5807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Civan=20Yavuz=C5=9Fen?= <civanyavuzsen@gmail.com>
Date: Tue, 1 Feb 2022 23:48:14 +0100
Subject: [PATCH 490/591] feat(multipass): add plugin for multipass (#10140)

Co-authored-by: C. Yavuzsen <cyavuzsen@comscore.com>
---
 plugins/multipass/README.md            | 22 ++++++++
 plugins/multipass/_multipass           | 73 ++++++++++++++++++++++++++
 plugins/multipass/multipass.plugin.zsh |  7 +++
 3 files changed, 102 insertions(+)
 create mode 100644 plugins/multipass/README.md
 create mode 100644 plugins/multipass/_multipass
 create mode 100644 plugins/multipass/multipass.plugin.zsh

diff --git a/plugins/multipass/README.md b/plugins/multipass/README.md
new file mode 100644
index 000000000..f6b2d76f4
--- /dev/null
+++ b/plugins/multipass/README.md
@@ -0,0 +1,22 @@
+# multipass
+
+This plugin provides completion for [multipass](https://multipass.run), as well as aliases
+for multipass commands.
+
+To use it, add `multipass` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... multipass)
+```
+
+## Aliases
+
+| Alias  | Command                                                             |
+| ------ | ------------------------------------------------------------------- |
+| `mp`   | `multipass`                                                         |
+| `mpl`  | `multipass list`                                                    |
+| `mpla` | `multipass launch`                                                  |
+| `mpln` | `multipass launch --network en0 --network name=bridge0,mode=manual` |
+| `mps`  | `multipass shell`                                                   |
+| `mpsp` | `multipass stop`                                                    |
+| `mpst` | `multipass start`                                                   |
diff --git a/plugins/multipass/_multipass b/plugins/multipass/_multipass
new file mode 100644
index 000000000..c742df650
--- /dev/null
+++ b/plugins/multipass/_multipass
@@ -0,0 +1,73 @@
+#compdef multipass
+
+_multipass_get_command_list () {
+  # Sample output:
+  # $ multipass --help
+  # ...
+  # Options:
+  #   -h, --help     Display this help
+  #   -v, --verbose  Increase logging verbosity. Repeat the 'v' in the short option
+  #                  for more detail. Maximum verbosity is obtained with 4 (or more)
+  #                  v's, i.e. -vvvv.
+  # ...
+  # Available commands:
+  #   alias     Create an alias
+  #   aliases   List available aliases
+  #   ...
+  #
+  $_comp_command1 --help | sed '1,/Available commands/d' | awk '/^[ \t]*[a-z]+/ { print $1 }'
+}
+
+_multipass_get_args_list () {
+  # Sample output:
+  # $ multpass help stop
+  # ...
+  # Options:
+  # -h, --help         Display this help
+  # -v, --verbose      Increase logging verbosity. Repeat the 'v' in the short
+  #                     option for more detail. Maximum verbosity is obtained with
+  #                     4 (or more) v's, i.e. -vvvv.
+  # --all              Stop all instances
+  # -t, --time <time>  Time from now, in minutes, to delay shutdown of the
+  #                     instance
+  # -c, --cancel       Cancel a pending delayed shutdown
+  #
+  # Arguments:
+  # name               Names of instances to stop. If omitted, and without the
+  #                     --all option, 'primary' will be assumed.
+  #
+  local arg_name=$($_comp_command1 help ${words[2]} | sed '1,/Arguments/d' | awk '/^[ \t]*[a-z]+/ { print $1; exit }')
+
+  case $arg_name in
+    name)
+      # Sample output:
+      # $ multipass list
+      # Name                    State             IPv4             Image
+      # workable-poacher        Running           10.2.0.28        Ubuntu openHAB Home Appliance
+      #
+      $_comp_command1 list | sed '1d' | awk '/^[ \t]*[^ ]+/ { print $1 }'
+    ;;
+    command)
+      _multipass_get_command_list
+    ;;
+  esac
+}
+
+_multipass () {
+  typeset -A opt_args
+
+  _arguments \
+    '1: :->command'\
+    '*: :->args'
+
+  case $state in
+    command)
+      compadd $(_multipass_get_command_list)
+    ;;
+    *)
+      compadd $(_multipass_get_args_list)
+    ;;
+  esac
+}
+
+_multipass "$@"
diff --git a/plugins/multipass/multipass.plugin.zsh b/plugins/multipass/multipass.plugin.zsh
new file mode 100644
index 000000000..95025b2ad
--- /dev/null
+++ b/plugins/multipass/multipass.plugin.zsh
@@ -0,0 +1,7 @@
+alias mp="multipass"
+alias mpl="multipass list"
+alias mpla="multipass launch"
+alias mpln="multipass launch --network en0 --network name=bridge0,mode=manual"
+alias mps="multipass shell"
+alias mpsp="multipass stop"
+alias mpst="multipass start"

From e1a9d0ce3e142003bf137e8ca3e204474b8c148f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 2 Feb 2022 23:02:23 +0100
Subject: [PATCH 491/591] fix(cli): allow `omz` commands to be used in a script
 (#10645)

The commands `omz plugin {enable,disable}` and `omz theme set`
automatically reload the zsh session on success. With this
change, the CLI checks whether the commands are run in an
interactive session before reloading the zsh session.

This change also conditionally sets the completion function
for `omz` so that it's not done in a non-interactive session.
---
 lib/cli.zsh | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index edc10e722..e7f997013 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -105,7 +105,10 @@ function _omz {
   return 0
 }
 
-compdef _omz omz
+# If run from a script, do not set the completion function
+if (( ${+functions[compdef]} )); then
+  compdef _omz omz
+fi
 
 ## Utility functions
 
@@ -299,10 +302,8 @@ multi == 1 && length(\$0) > 0 {
   # Restart the zsh session if there were no errors
   _omz::log info "plugins disabled: ${(j:, :)dis_plugins}."
 
-  # Old zsh versions don't have ZSH_ARGZERO
-  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
-  # Check whether to run a login shell
-  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
 }
 
 function _omz::plugin::enable {
@@ -375,10 +376,8 @@ multi == 1 && /^[^#]*\)/ {
   # Restart the zsh session if there were no errors
   _omz::log info "plugins enabled: ${(j:, :)add_plugins}."
 
-  # Old zsh versions don't have ZSH_ARGZERO
-  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
-  # Check whether to run a login shell
-  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
 }
 
 function _omz::plugin::info {
@@ -731,10 +730,8 @@ EOF
   # Restart the zsh session if there were no errors
   _omz::log info "'$1' theme set correctly."
 
-  # Old zsh versions don't have ZSH_ARGZERO
-  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
-  # Check whether to run a login shell
-  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
 }
 
 function _omz::theme::use {

From d9c58d5fa10a1e9911d61adf7ccfbd64b24e713f Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 3 Feb 2022 14:42:47 +0100
Subject: [PATCH 492/591] feat(yarn): add setting to disable adding global dir
 to `$PATH` (#10642)

---
 plugins/yarn/README.md       |  9 +++++++++
 plugins/yarn/yarn.plugin.zsh | 18 ++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index 9a0d1708d..9c16ff2c3 100644
--- a/plugins/yarn/README.md
+++ b/plugins/yarn/README.md
@@ -9,6 +9,15 @@ To use it, add `yarn` to the plugins array in your zshrc file:
 plugins=(... yarn)
 ```
 
+## Global scripts directory
+
+It also adds `yarn` global scripts dir (commonly `~/.yarn/bin`) to the `$PATH`.
+To disable this feature, set the following style in your `.zshrc`:
+
+```zsh
+zstyle ':omz:plugins:yarn' global-path false
+```
+
 ## Aliases
 
 | Alias | Command                                   | Description                                                                   |
diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 9ba24420a..bcb8661cf 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -1,12 +1,14 @@
-# Skip yarn call if default global bin dir exists
-[[ -d "$HOME/.yarn/bin" ]] && bindir="$HOME/.yarn/bin" || bindir="$(yarn global bin 2>/dev/null)"
+if zstyle -T ':omz:plugins:yarn' global-path; then
+  # Skip yarn call if default global bin dir exists
+  [[ -d "$HOME/.yarn/bin" ]] && bindir="$HOME/.yarn/bin" || bindir="$(yarn global bin 2>/dev/null)"
 
-# Add yarn bin directory to $PATH if it exists and not already in $PATH
-[[ $? -eq 0 ]] \
-  && [[ -d "$bindir" ]] \
-  && (( ! ${path[(Ie)$bindir]} )) \
-  && path+=("$bindir")
-unset bindir
+  # Add yarn bin directory to $PATH if it exists and not already in $PATH
+  [[ $? -eq 0 ]] \
+    && [[ -d "$bindir" ]] \
+    && (( ! ${path[(Ie)$bindir]} )) \
+    && path+=("$bindir")
+  unset bindir
+fi
 
 alias y="yarn"
 alias ya="yarn add"

From 2d3bae965a445ac0f6edeed0b277a15d09e6a261 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Feb 2022 19:07:27 -0800
Subject: [PATCH 493/591] Introducing the ANSI logo graphic

Trying this on for size for a while.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 94a200850..5a6b98443 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png" alt="Oh My Zsh"></p>
+<p align="center"><img src="https://ohmyzsh.s3.amazonaws.com/omz-ansi-github.png" alt="Oh My Zsh"></p>
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](https://www.zsh.org/) configuration.
 

From 9e9831fcf22cf77a797eb277f7155c442ff77f16 Mon Sep 17 00:00:00 2001
From: Harris Miller <hmiller@alteryx.com>
Date: Fri, 4 Feb 2022 13:08:03 -0700
Subject: [PATCH 494/591] fix(bureau): fix never `CLEAN` git status (#10656)

Closes #10656
---
 themes/bureau.zsh-theme | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 50058e213..3ca231f6f 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -25,20 +25,21 @@ bureau_git_branch () {
 
 bureau_git_status() {
   local result gitstatus
+  gitstatus="$(command git status --porcelain -b 2>/dev/null)"
 
   # check status of files
-  gitstatus=$(command git status --porcelain -b 2> /dev/null)
-  if [[ -n "$gitstatus" ]]; then
-    if $(echo "$gitstatus" | command grep -q '^[AMRD]. '); then
+  local gitfiles="$(tail -n +2 <<< "$gitstatus")"
+  if [[ -n "$gitfiles" ]]; then
+    if $(echo "$gitfiles" | command grep -q '^[AMRD]. '); then
       result+="$ZSH_THEME_GIT_PROMPT_STAGED"
     fi
-    if $(echo "$gitstatus" | command grep -q '^.[MTD] '); then
+    if $(echo "$gitfiles" | command grep -q '^.[MTD] '); then
       result+="$ZSH_THEME_GIT_PROMPT_UNSTAGED"
     fi
-    if $(echo "$gitstatus" | command grep -q -E '^\?\? '); then
+    if $(echo "$gitfiles" | command grep -q -E '^\?\? '); then
       result+="$ZSH_THEME_GIT_PROMPT_UNTRACKED"
     fi
-    if $(echo "$gitstatus" | command grep -q '^UU '); then
+    if $(echo "$gitfiles" | command grep -q '^UU '); then
       result+="$ZSH_THEME_GIT_PROMPT_UNMERGED"
     fi
   else
@@ -46,13 +47,14 @@ bureau_git_status() {
   fi
 
   # check status of local repository
-  if $(echo "$gitstatus" | command grep -q '^## .*ahead'); then
+  local gitbranch="$(head -n 1 <<< "$gitstatus")"
+  if $(echo "$gitbranch" | command grep -q '^## .*ahead'); then
     result+="$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
-  if $(echo "$gitstatus" | command grep -q '^## .*behind'); then
+  if $(echo "$gitbranch" | command grep -q '^## .*behind'); then
     result+="$ZSH_THEME_GIT_PROMPT_BEHIND"
   fi
-  if $(echo "$gitstatus" | command grep -q '^## .*diverged'); then
+  if $(echo "$gitbranch" | command grep -q '^## .*diverged'); then
     result+="$ZSH_THEME_GIT_PROMPT_DIVERGED"
   fi
 

From 74a3db75e46067ebc627a22b12aac523a9606b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Feb 2022 17:44:05 +0100
Subject: [PATCH 495/591] perf(bureau): remove multiple grep calls in git
 status check

---
 themes/bureau.zsh-theme | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 3ca231f6f..a5a8a2b20 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -16,7 +16,7 @@ ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}●%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"
 
-bureau_git_branch () {
+bureau_git_info () {
   local ref
   ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
   ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
@@ -30,16 +30,16 @@ bureau_git_status() {
   # check status of files
   local gitfiles="$(tail -n +2 <<< "$gitstatus")"
   if [[ -n "$gitfiles" ]]; then
-    if $(echo "$gitfiles" | command grep -q '^[AMRD]. '); then
+    if [[ "$gitfiles" =~ $'(^|\n)[AMRD]. ' ]]; then
       result+="$ZSH_THEME_GIT_PROMPT_STAGED"
     fi
-    if $(echo "$gitfiles" | command grep -q '^.[MTD] '); then
+    if [[ "$gitfiles" =~ $'(^|\n).[MTD] ' ]]; then
       result+="$ZSH_THEME_GIT_PROMPT_UNSTAGED"
     fi
-    if $(echo "$gitfiles" | command grep -q -E '^\?\? '); then
+    if [[ "$gitfiles" =~ $'(^|\n)\\?\\? ' ]]; then
       result+="$ZSH_THEME_GIT_PROMPT_UNTRACKED"
     fi
-    if $(echo "$gitfiles" | command grep -q '^UU '); then
+    if [[ "$gitfiles" =~ $'(^|\n)UU ' ]]; then
       result+="$ZSH_THEME_GIT_PROMPT_UNMERGED"
     fi
   else
@@ -48,17 +48,18 @@ bureau_git_status() {
 
   # check status of local repository
   local gitbranch="$(head -n 1 <<< "$gitstatus")"
-  if $(echo "$gitbranch" | command grep -q '^## .*ahead'); then
+  if [[ "$gitbranch" =~ '^## .*ahead' ]]; then
     result+="$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
-  if $(echo "$gitbranch" | command grep -q '^## .*behind'); then
+  if [[ "$gitbranch" =~ '^## .*behind' ]]; then
     result+="$ZSH_THEME_GIT_PROMPT_BEHIND"
   fi
-  if $(echo "$gitbranch" | command grep -q '^## .*diverged'); then
+  if [[ "$gitbranch" =~ '^## .*diverged' ]]; then
     result+="$ZSH_THEME_GIT_PROMPT_DIVERGED"
   fi
 
-  if $(command git rev-parse --verify refs/stash &> /dev/null); then
+  # check if there are stashed changes
+  if command git rev-parse --verify refs/stash &> /dev/null; then
     result+="$ZSH_THEME_GIT_PROMPT_STASHED"
   fi
 
@@ -66,21 +67,22 @@ bureau_git_status() {
 }
 
 bureau_git_prompt() {
-  local gitbranch=$(bureau_git_branch)
-  local gitstatus=$(bureau_git_status)
-  local info
-
-  if [[ -z "$gitbranch" ]]; then
+  # check git information
+  local gitinfo=$(bureau_git_info)
+  if [[ -z "$gitinfo" ]]; then
     return
   fi
 
-  info="${gitbranch:gs/%/%%}"
+  # quote % in git information
+  local output="${gitinfo:gs/%/%%}"
 
+  # check git status
+  local gitstatus=$(bureau_git_status)
   if [[ -n "$gitstatus" ]]; then
-    info+=" $gitstatus"
+    output+=" $gitstatus"
   fi
 
-  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${info}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${output}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 

From 1e26ad1187cdee286d0332dbdffb6828a71140c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Feb 2022 17:52:57 +0100
Subject: [PATCH 496/591] fix(bureau): fix top line space computation

Takes into account $ZLE_RPROMPT_INDENT and doesn't add the extra
space at the end so it doesn't bleed into the next line.
---
 themes/bureau.zsh-theme | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index a5a8a2b20..698aa2ff8 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -103,19 +103,14 @@ get_space () {
   local STR=$1$2
   local zero='%([BSUbfksu]|([FB]|){*})'
   local LENGTH=${#${(S%%)STR//$~zero/}}
-  local SPACES=""
-  (( LENGTH = ${COLUMNS} - $LENGTH - 1))
+  local SPACES=$(( COLUMNS - LENGTH - ${ZLE_RPROMPT_INDENT:-1} ))
 
-  for i in {0..$LENGTH}
-    do
-      SPACES="$SPACES "
-    done
-
-  echo $SPACES
+  (( SPACES > 0 )) || return
+  printf ' %.0s' {1..$SPACES}
 }
 
 _1LEFT="$_USERNAME $_PATH"
-_1RIGHT="[%*] "
+_1RIGHT="[%*]"
 
 bureau_precmd () {
   _1SPACES=`get_space $_1LEFT $_1RIGHT`

From f0f42828fa6842af631cc3dbf45f5454ea88fa3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Feb 2022 18:58:47 +0100
Subject: [PATCH 497/591] feat(updater): do not update when user already typed
 some characters (#9699)

Fixes #9699
---
 tools/check_for_upgrade.sh | 43 +++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 3f6d35c3e..4484df4fe 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -146,26 +146,35 @@ function update_ohmyzsh() {
     return
   fi
 
-  # Ask for confirmation before updating unless in auto mode
+  # Don't ask for confirmation before updating if in auto mode
   if [[ "$update_mode" = auto ]]; then
     update_ohmyzsh
-  elif [[ "$update_mode" = reminder ]]; then
-    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
-  else
-    # input sink to swallow all characters typed before the prompt
-    # and add a newline if there wasn't one after characters typed
-    while read -t -k 1 option; do true; done
-    [[ "$option" != ($'\n'|"") ]] && echo
-
-    echo -n "[oh-my-zsh] Would you like to update? [Y/n] "
-    read -r -k 1 option
-    [[ "$option" != $'\n' ]] && echo
-    case "$option" in
-      [yY$'\n']) update_ohmyzsh ;;
-      [nN]) update_last_updated_file ;&
-      *) echo "[oh-my-zsh] You can update manually by running \`omz update\`" ;;
-    esac
+    return $?
   fi
+
+  # If in reminder mode show reminder and exit
+  if [[ "$update_mode" = reminder ]]; then
+    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
+    return 0
+  fi
+
+  # If user has typed input, show reminder and exit
+  if read -t -k 1; then
+    echo
+    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
+    return 0
+  fi
+
+  # Ask for confirmation and only update on 'y', 'Y' or Enter
+  # Otherwise just show a reminder for how to update
+  echo -n "[oh-my-zsh] Would you like to update? [Y/n] "
+  read -r -k 1 option
+  [[ "$option" = $'\n' ]] || echo
+  case "$option" in
+    [yY$'\n']) update_ohmyzsh ;;
+    [nN]) update_last_updated_file ;&
+    *) echo "[oh-my-zsh] You can update manually by running \`omz update\`" ;;
+  esac
 }
 
 unset update_mode

From 897fa09f1517e648bfbeb8549db4848a66f19c4f Mon Sep 17 00:00:00 2001
From: Michael Favia <michael@favish.com>
Date: Wed, 9 Feb 2022 03:25:12 -0600
Subject: [PATCH 498/591] fix(kubectl): fix arguments in `keti` alias to allow
 completion (#10669)

---
 plugins/kubectl/kubectl.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 6edb59751..eed5727d1 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -29,7 +29,7 @@ alias kca='_kca(){ kubectl "$@" --all-namespaces;  unset -f _kca; }; _kca'
 alias kaf='kubectl apply -f'
 
 # Drop into an interactive terminal on a container
-alias keti='kubectl exec -ti'
+alias keti='kubectl exec -t -i'
 
 # Manage configuration quickly to switch contexts between local, dev ad staging.
 alias kcuc='kubectl config use-context'

From c41f2e7a0947139db79ae234b994467ff921f4cb Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Wed, 9 Feb 2022 22:55:05 +0100
Subject: [PATCH 499/591] feat(rbw): add `rbwpw` function to copy passwords to
 the clipboard (#10639)

---
 plugins/rbw/README.md      | 10 ++++++++++
 plugins/rbw/rbw.plugin.zsh | 30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/plugins/rbw/README.md b/plugins/rbw/README.md
index 87d073d24..cae36cead 100644
--- a/plugins/rbw/README.md
+++ b/plugins/rbw/README.md
@@ -9,4 +9,14 @@ To use it, add `rbw` to the plugins array in your zshrc file:
 plugins=(... rbw)
 ```
 
+## `rbwpw`
+
+The `rbwpw` function is a wrapper around `rbw`. It copies the password in the
+clipboard for the service you ask for and clears the clipboard 20s later.
+The usage is as follows:
+
+```zsh
+rbwpw <service>
+```
+
 This plugin does not add any aliases.
diff --git a/plugins/rbw/rbw.plugin.zsh b/plugins/rbw/rbw.plugin.zsh
index 56683ad06..523e35aff 100644
--- a/plugins/rbw/rbw.plugin.zsh
+++ b/plugins/rbw/rbw.plugin.zsh
@@ -17,3 +17,33 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_rbw" ]]; then
 fi
 
 rbw gen-completions zsh >| "$ZSH_CACHE_DIR/completions/_rbw" &|
+
+# rbwpw function copies the password of a service to the clipboard
+# and clears it after 20 seconds
+function rbwpw {
+  if [[ $# -ne 1 ]]; then
+    echo "usage: rbwpw <service>"
+    return 1
+  fi
+  local service=$1
+  if ! rbw unlock; then
+    echo "rbw is locked"
+    return 1
+  fi
+  local pw=$(rbw get $service 2>/dev/null)
+  if [[ -z $pw ]]; then
+    echo "$service not found"
+    return 1
+  fi
+  echo -n $pw | clipcopy
+  echo "password for $service copied!"
+  {sleep 20 && clipcopy </dev/null 2>/dev/null} &|
+}
+
+function _rbwpw {
+  local -a services
+  services=("${(@f)$(rbw ls 2>/dev/null)}")
+  [[ -n "$services" ]] && compadd -a -- services
+}
+
+compdef _rbwpw rbwpw

From f045810697d423d108617ccd48bd7a414cb58734 Mon Sep 17 00:00:00 2001
From: sed-i <82407168+sed-i@users.noreply.github.com>
Date: Mon, 15 Nov 2021 16:27:19 -0500
Subject: [PATCH 500/591] feat(juju): add `jclean` function to destroy all
 registered controllers (#10426)

Closes #10426
---
 plugins/juju/README.md       |  1 +
 plugins/juju/juju.plugin.zsh | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/plugins/juju/README.md b/plugins/juju/README.md
index 49f8b0d47..2417c4669 100644
--- a/plugins/juju/README.md
+++ b/plugins/juju/README.md
@@ -113,5 +113,6 @@ Naming convention:
 
 - `jaddr <app_name> [unit_num]`: display app or unit IP address.
 - `jreld <relation_name> <app_name> <unit_num>`: display app and unit relation data.
+- `jclean`: destroy all controllers
 - `wjst [interval_secs] [args_for_watch]`: watch juju status, with optional interval
   (default: 5s); you may pass additional arguments to `watch`.
diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
index 07f15b392..cf89418c6 100644
--- a/plugins/juju/juju.plugin.zsh
+++ b/plugins/juju/juju.plugin.zsh
@@ -95,6 +95,37 @@ jaddr() {
   fi
 }
 
+# Destroy all controllers
+jclean() {
+  if (( ! ${+commands[jq]} )); then
+    echo "jq is required but could not be found." >&2
+    return 1
+  fi
+
+  local controllers=$(juju controllers --format=json | jq -r '.controllers | keys[]' 2>/dev/null)
+  if [[ -z "$controllers" ]]; then
+    echo "No controllers registered"
+    return 0
+  fi
+
+  echo "This will forcefully destroy all storages, models and controllers."
+  echo "Controllers to be destroyed:"
+  echo "$controllers"
+
+  if ! read -q '?Are you sure (y/n)? '; then
+    echo
+    echo "Aborted."
+    return 0
+  fi
+
+  echo
+  for controller in ${=controllers}; do
+    timeout 2m juju destroy-controller --destroy-all-models --destroy-storage --force --no-wait -y $controller
+    timeout 2m juju kill-controller -y -t 0 $controller 2>/dev/null
+    timeout 10s juju unregister $controller 2>/dev/null
+  done
+}
+
 # Display app and unit relation data
 jreld() {
   # $1 = relation name
@@ -125,3 +156,4 @@ wjst() {
   shift $(( $# > 0 ))
   watch -n "$interval" --color juju status --relations --storage --color "$@"
 }
+

From cdd2d6efc612b75577db49604eeb7dc35ba5f9b5 Mon Sep 17 00:00:00 2001
From: sed-i <82407168+sed-i@users.noreply.github.com>
Date: Mon, 15 Nov 2021 16:31:19 -0500
Subject: [PATCH 501/591] feat(juju): introduce additional juju aliases
 (#10426)

---
 plugins/juju/README.md       | 34 ++++++++++++++++++++++------------
 plugins/juju/juju.plugin.zsh | 12 +++++++++++-
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/plugins/juju/README.md b/plugins/juju/README.md
index 2417c4669..918c08de5 100644
--- a/plugins/juju/README.md
+++ b/plugins/juju/README.md
@@ -18,26 +18,36 @@ Naming convention:
 
 ### General
 
-| Alias  | Command                                     | Description                                            |
-|--------|---------------------------------------------|--------------------------------------------------------|
-| `jdl`  | `juju debug-log --ms`                       | Display log, with millisecond resolution               |
-| `jdlr` | `juju debug-log --ms --replay`              | Replay entire log                                      |
-| `jh`   | `juju help`                                 | Show help on a command or other topic                  |
-| `jssl` | `juju juju show-status-log`                 | Output past statuses for the specified entity          |
-| `jstj` | `juju status --format=json`                 | Show status in json format (more detailed)             |
-| `jst`  | `juju status --relations --storage --color` | Show status, including relations and storage, in color |
+| Alias   | Command                                     | Description                                            |
+|---------|---------------------------------------------|--------------------------------------------------------|
+| `j`     | `juju`                                      | The juju command                                       |
+| `jcld`  | `juju clouds`                               | Lists all clouds with registered credentials           |
+| `jclda` | `juju clouds --all`                         | Lists all clouds available to Juju                     |
+| `jdl`   | `juju debug-log --ms`                       | Display log, with millisecond resolution               |
+| `jdlr`  | `juju debug-log --ms --replay`              | Replay entire log                                      |
+| `jh`    | `juju help`                                 | Show help on a command or other topic                  |
+| `jssl`  | `juju show-status-log`                      | Output past statuses for the specified entity          |
+| `jstj`  | `juju status --format=json`                 | Show status in json format (more detailed)             |
+| `jst`   | `juju status --relations --color`           | Show status, including relations, in color             |
+| `jsts`  | `juju status --relations --storage --color` | Show status, including relations and storage, in color |
 
 ### Bootstrap
 
-| Alias | Command                   | Description                               |
-|-------|---------------------------|-------------------------------------------|
-| `jb`  | `juju bootstrap`          | Initializing a Juju cloud environment     |
-| `jbm` | `juju bootstrap microk8s` | Initializing a MicroK8s cloud environment |
+| Alias   | Command                             | Description                                           |
+|---------|-------------------------------------|-------------------------------------------------------|
+| `jb`    | `juju bootstrap`                    | Initializing a Juju cloud environment                 |
+| `jbng`  | `juju bootstrap --no-gui`           | Initializing a Juju cloud environment without GUI     |
+| `jbl`   | `juju bootstrap localhost`          | Initializing an lxd cloud environment                 |
+| `jblng` | `juju bootstrap --no-gui localhost` | Initializing an lxd cloud environment without GUI     |
+| `jbm`   | `juju bootstrap microk8s`           | Initializing a MicroK8s cloud environment             |
+| `jbmng` | `juju bootstrap --no-gui microk8s`  | Initializing a MicroK8s cloud environment without GUI |
 
 ### Controller
 
 | Alias    | Command                                                                               | Description                                                       |
 |----------|---------------------------------------------------------------------------------------|-------------------------------------------------------------------|
+| `jctl`   | `juju controllers`                                                                    | List all controllers                                              |
+| `jctlr`  | `juju controllers --refresh`                                                          | List all controllers (download latest details)                    |
 | `jdc`    | `juju destroy-controller --destroy-all-models`                                        | Destroy a controller                                              |
 | `jdc!`   | `juju destroy-controller --destroy-all-models --force --no-wait -y`                   | Destroy a controller                                              |
 | `jdcds`  | `juju destroy-controller --destroy-all-models --destroy-storage`                      | Destroy a controller and associated storage                       |
diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
index cf89418c6..81fcd6376 100644
--- a/plugins/juju/juju.plugin.zsh
+++ b/plugins/juju/juju.plugin.zsh
@@ -17,11 +17,20 @@ unset completion_file
 #   - `!` means --force --no-wait -y                         #
 #   - `ds` suffix means --destroy-storage                    #
 # ---------------------------------------------------------- #
+alias j="juju"
 alias jam="juju add-model --config logging-config=\"<root>=WARNING; unit=DEBUG\"\
  --config update-status-hook-interval=\"60m\""
 alias jb='juju bootstrap'
+alias jbng='juju bootstrap --no-gui'
+alias jbl='juju bootstrap localhost'
+alias jblng='juju bootstrap --no-gui localhost'
 alias jbm='juju bootstrap microk8s'
+alias jbmng='juju bootstrap --no-gui microk8s'
 alias jc='juju config'
+alias jcld='juju clouds'
+alias jclda='juju clouds --all'
+alias jctl='juju controllers'
+alias jctlr='juju controllers --refresh'
 alias jdc='juju destroy-controller --destroy-all-models'
 alias 'jdc!'='juju destroy-controller --destroy-all-models --force --no-wait -y'
 alias jdcds='juju destroy-controller --destroy-all-models --destroy-storage'
@@ -61,7 +70,8 @@ alias jshc='juju ssh --container'
 alias jshm='juju show-model'
 alias jssl='juju show-status-log'
 alias jstj='juju status --format=json'
-alias jst='juju status --relations --storage --color'
+alias jst='juju status --relations --color'
+alias jsts='juju status --relations --storage --color'
 alias jsu='juju show-unit'
 alias jsw='juju switch'
 

From 564a60608ca3c21d474e27bb436b36ae86c12751 Mon Sep 17 00:00:00 2001
From: sed-i <82407168+sed-i@users.noreply.github.com>
Date: Thu, 3 Feb 2022 02:15:54 -0500
Subject: [PATCH 502/591] style(juju)!: don't show storage status in `wjst` for
 consistency (#10426)

BREAKING CHANGE: `wjst` will no longer show storage in the status
output. This is done for consistency with the `jst` and `jsts`
aliases.
---
 plugins/juju/juju.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
index 81fcd6376..408692dc7 100644
--- a/plugins/juju/juju.plugin.zsh
+++ b/plugins/juju/juju.plugin.zsh
@@ -164,6 +164,6 @@ jreld() {
 wjst() {
   local interval="${1:-5}"
   shift $(( $# > 0 ))
-  watch -n "$interval" --color juju status --relations --storage --color "$@"
+  watch -n "$interval" --color juju status --relations --color "$@"
 }
 

From aaaa55424ad7c440506024fac86927fc9916348f Mon Sep 17 00:00:00 2001
From: sed-i <82407168+sed-i@users.noreply.github.com>
Date: Mon, 7 Feb 2022 01:34:20 -0500
Subject: [PATCH 503/591] refactor(juju)!: use the jsh prefix for `juju show-*`
 commands (#10426)

BREAKING CHANGE: some aliases have been renamed to be consistent with the rest.
Mainly, aliases for `juju show-` commands are renamed to `jsh*`. This also means
that `jsh` and `jshc` have been renamed to `jssh` and `jsshc`. Have a look at the
README for the complete alias changes.
---
 plugins/juju/README.md       | 10 ++++++----
 plugins/juju/juju.plugin.zsh | 11 +++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/plugins/juju/README.md b/plugins/juju/README.md
index 918c08de5..f0c65309c 100644
--- a/plugins/juju/README.md
+++ b/plugins/juju/README.md
@@ -15,6 +15,7 @@ Naming convention:
 
 - `!` suffix: `--force --no-wait -y`.
 - `ds` suffix: `--destroy-storage`.
+- `jsh` prefix means `juju show-*`.
 
 ### General
 
@@ -26,7 +27,7 @@ Naming convention:
 | `jdl`   | `juju debug-log --ms`                       | Display log, with millisecond resolution               |
 | `jdlr`  | `juju debug-log --ms --replay`              | Replay entire log                                      |
 | `jh`    | `juju help`                                 | Show help on a command or other topic                  |
-| `jssl`  | `juju show-status-log`                      | Output past statuses for the specified entity          |
+| `jshsl` | `juju show-status-log`                      | Output past statuses for the specified entity          |
 | `jstj`  | `juju status --format=json`                 | Show status in json format (more detailed)             |
 | `jst`   | `juju status --relations --color`           | Show status, including relations, in color             |
 | `jsts`  | `juju status --relations --storage --color` | Show status, including relations and storage, in color |
@@ -53,6 +54,7 @@ Naming convention:
 | `jdcds`  | `juju destroy-controller --destroy-all-models --destroy-storage`                      | Destroy a controller and associated storage                       |
 | `jdcds!` | `juju destroy-controller --destroy-all-models --destroy-storage --force --no-wait -y` | Destroy a controller and associated storage                       |
 | `jkc`    | `juju kill-controller -y -t 0`                                                        | Forcibly terminate all associated resources for a Juju controller |
+| `jshc`   | `juju show-controller`                                                                | Shows detailed information of a controller                    |
 | `jsw`    | `juju switch`                                                                         | Select or identify the current controller and model               |
 
 ### Model
@@ -84,9 +86,9 @@ Naming convention:
 | `jrmds!` | `juju remove-application --destroy-storage --force --no-wait` | Remove application forcefully, destroying attached storage                |
 | `jrp`    | `juju refresh --path`                                         | Upgrade charm from local charm file                                       |
 | `jsa`    | `juju scale-application`                                      | Set the desired number of application units                               |
-| `jsh`    | `juju ssh`                                                    | Initiate an SSH session or execute a command on a Juju target             |
-| `jshc`   | `juju ssh --container`                                        | Initiate an SSH session or execute a command on a given container         |
-| `jsu`    | `juju show-unit`                                              | Displays information about a unit                                         |
+| `jssh`   | `juju ssh`                                                    | Initiate an SSH session or execute a command on a Juju target             |
+| `jsshc`  | `juju ssh --container`                                        | Initiate an SSH session or execute a command on a given container         |
+| `jshu`   | `juju show-unit`                                              | Displays information about a unit                                         |
 
 ### Storage
 
diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
index 408692dc7..be8a2c7ae 100644
--- a/plugins/juju/juju.plugin.zsh
+++ b/plugins/juju/juju.plugin.zsh
@@ -16,6 +16,7 @@ unset completion_file
 # Generally,                                                 #
 #   - `!` means --force --no-wait -y                         #
 #   - `ds` suffix means --destroy-storage                    #
+#   - `jsh` prefix means juju show-*                         #
 # ---------------------------------------------------------- #
 alias j="juju"
 alias jam="juju add-model --config logging-config=\"<root>=WARNING; unit=DEBUG\"\
@@ -65,14 +66,16 @@ alias jrp='juju refresh --path'
 alias jrs='juju remove-storage'
 alias 'jrs!'='juju remove-storage --force'
 alias jsa='juju scale-application'
-alias jsh='juju ssh'
-alias jshc='juju ssh --container'
+alias jsha='juju show-application'
+alias jshc='juju show-controller'
 alias jshm='juju show-model'
-alias jssl='juju show-status-log'
+alias jshsl='juju show-status-log'
+alias jshu='juju show-unit'
+alias jssh='juju ssh'
+alias jsshc='juju ssh --container'
 alias jstj='juju status --format=json'
 alias jst='juju status --relations --color'
 alias jsts='juju status --relations --storage --color'
-alias jsu='juju show-unit'
 alias jsw='juju switch'
 
 # ---------------------------------------------------------- #

From 0da33ca22be19452e26ed44aef8e99972d0bf866 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 10 Feb 2022 11:50:04 +0100
Subject: [PATCH 504/591] fix(cli): disable GPG signing in `omz pr test` to
 avoid key prompt (#10677)

---
 lib/cli.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index e7f997013..c2fba8556 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -573,7 +573,7 @@ function _omz::pr::test {
 
     # Rebase pull request branch against the current master
     _omz::log info "rebasing PR #$1..."
-    command git rebase master ohmyzsh/pull-$1 || {
+    command git rebase --no-gpg-sign master ohmyzsh/pull-$1 || {
       command git rebase --abort &>/dev/null
       _omz::log warn "could not rebase PR #$1 on top of master."
       _omz::log warn "you might not see the latest stable changes."

From 1e615b71d636c3697d7e4aee8fbcd1dc01fd7da3 Mon Sep 17 00:00:00 2001
From: Zachary Cutlip <uid000@gmail.com>
Date: Thu, 10 Feb 2022 07:25:23 -0800
Subject: [PATCH 505/591] fix(virtualenvwrapper): only deactivate if virtual
 env is still present (#10671)

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index c30216f51..d359e0c21 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -56,7 +56,13 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       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
-        deactivate && unset CD_VIRTUAL_ENV
+        if [[ -n "$VIRTUAL_ENV" ]]; then
+          # Only deactivate if VIRTUAL_ENV was set
+          # User may have deactivated manually or via another mechanism
+          deactivate
+        fi
+        # clean up regardless
+        unset CD_VIRTUAL_ENV
       fi
       if [[ "$ENV_NAME" != "" ]]; then
         # Activate the environment only if it is not already active

From 6396dfb97f13f5fbb0ef98cd5221600b89ff889a Mon Sep 17 00:00:00 2001
From: Sam Cook <sam.lindenrathen@gmail.com>
Date: Thu, 10 Feb 2022 16:00:45 +0000
Subject: [PATCH 506/591] fix(kubectx): don't error on missing k8s context
 (#10675)

---
 plugins/kubectx/kubectx.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
index 1419f102f..6096feeae 100644
--- a/plugins/kubectx/kubectx.plugin.zsh
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -3,7 +3,9 @@ typeset -g -A kubectx_mapping
 function kubectx_prompt_info() {
   (( $+commands[kubectl] )) || return
 
-  local current_ctx=$(kubectl config current-context)
+  local current_ctx=$(kubectl config current-context 2> /dev/null)
+
+  [[ -n "$current_ctx" ]] || return
 
   # use value in associative array if it exists
   # otherwise fall back to the context name

From 7b708519b9395914fb47b6c31132fb67fb8b721b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 10 Feb 2022 18:25:09 +0100
Subject: [PATCH 507/591] fix(emotty): show error on missing plugin
 dependencies (#9811)

---
 themes/emotty.zsh-theme | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/themes/emotty.zsh-theme b/themes/emotty.zsh-theme
index 044b317e8..ba0840950 100644
--- a/themes/emotty.zsh-theme
+++ b/themes/emotty.zsh-theme
@@ -46,6 +46,16 @@
 # is shown (see vcs_action_glyph variable, default: chevron).
 # ------------------------------------------------------------------------------
 
+(( ${+functions[emotty]} )) || {
+  echo "error: the emotty theme requires the emotty plugin" >&2
+  return 1
+}
+
+(( ${+emoji} )) || {
+  echo "error: the emotty theme requires the emoji plugin" >&2
+  return 1
+}
+
 user_prompt="$(emotty)"
 root_prompt="$emoji[skull]"
 warn_prompt="$emoji[collision_symbol]"

From dbd92a62ce1fc25a6819ae6d0a29dc8b8ec9a7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 11 Feb 2022 10:01:48 +0100
Subject: [PATCH 508/591] fix(updater): do not swallow 1 character in check for
 user input

Co-authored-by: Philippe Troin <phil@fifi.org>
---
 tools/check_for_upgrade.sh | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 4484df4fe..33f30c85a 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -89,6 +89,23 @@ function update_ohmyzsh() {
   fi
 }
 
+function has_typed_input() {
+  # Created by Philippe Troin <phil@fifi.org>
+  # https://zsh.org/mla/users/2022/msg00062.html
+  emulate -L zsh
+  zmodload zsh/zselect
+
+  {
+    local termios=$(stty --save)
+    stty -icanon
+
+    zselect -t 0 -r 0
+    return $?
+  } always {
+    stty $termios
+  }
+}
+
 () {
   emulate -L zsh
 
@@ -159,7 +176,7 @@ function update_ohmyzsh() {
   fi
 
   # If user has typed input, show reminder and exit
-  if read -t -k 1; then
+  if has_typed_input; then
     echo
     echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
     return 0

From 69e29378915d53655d8fa8dc181b6cf526754569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 11 Feb 2022 19:51:52 +0100
Subject: [PATCH 509/591] fix(updater): fix input check on non-interactive runs

Reference: https://www.zsh.org/mla/users/2022/msg00067.html
---
 tools/check_for_upgrade.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 33f30c85a..a36aecb84 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -95,13 +95,21 @@ function has_typed_input() {
   emulate -L zsh
   zmodload zsh/zselect
 
+  # Back up stty settings prior to disabling canonical mode
+  # Consider that no input can be typed if stty fails
+  # (this might happen if stdin is not a terminal)
+  local termios
+  termios=$(stty --save 2>/dev/null) || return 1
   {
-    local termios=$(stty --save)
+    # Disable canonical mode so that typed input counts
+    # regardless of whether Enter was pressed
     stty -icanon
 
+    # Poll stdin (fd 0) for data ready to be read
     zselect -t 0 -r 0
     return $?
   } always {
+    # Restore stty settings
     stty $termios
   }
 }

From 5fad26ca4fae7169f5bba8fa6718d58cb2c0bd20 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Fri, 11 Feb 2022 20:45:09 +0100
Subject: [PATCH 510/591] feat(ripgrep): update `rg` completion to v13.0.0
 (#10687)

Source: https://github.com/BurntSushi/ripgrep/blob/13.0.0/complete/_rg
---
 plugins/ripgrep/README.md | 4 ----
 plugins/ripgrep/_ripgrep  | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/ripgrep/README.md b/plugins/ripgrep/README.md
index a26f45823..ab9d04116 100644
--- a/plugins/ripgrep/README.md
+++ b/plugins/ripgrep/README.md
@@ -7,7 +7,3 @@ To use it, add `ripgrep` to the plugins array in your zshrc file:
 ```zsh
 plugins=(... ripgrep)
 ```
-
-Completion is taken from the ripgrep release [`12.1.1`](https://github.com/BurntSushi/ripgrep/releases/tag/12.1.1).
-
-Updated on April 1st, 2021.
diff --git a/plugins/ripgrep/_ripgrep b/plugins/ripgrep/_ripgrep
index 828a6e601..31bc697c7 100644
--- a/plugins/ripgrep/_ripgrep
+++ b/plugins/ripgrep/_ripgrep
@@ -121,7 +121,7 @@ _rg() {
     "(pretty-vimgrep)--no-heading[don't show matches grouped by file name]"
 
     + '(hidden)' # Hidden-file options
-    '--hidden[search hidden files and directories]'
+    {-.,--hidden}'[search hidden files and directories]'
     $no"--no-hidden[don't search hidden files and directories]"
 
     + '(hybrid)' # hybrid regex options
@@ -303,6 +303,8 @@ _rg() {
     '--context-separator=[specify string used to separate non-continuous context lines in output]:separator'
     $no"--no-context-separator[don't print context separators]"
     '--debug[show debug messages]'
+    '--field-context-separator[set string to delimit fields in context lines]'
+    '--field-match-separator[set string to delimit fields in matching lines]'
     '--trace[show more verbose debug messages]'
     '--dfa-size-limit=[specify upper size limit of generated DFA]:DFA size (bytes)'
     "(1 stats)--files[show each file that would be searched (but don't search)]"

From 02b52a03a5a78362c57d75c507240f69d4260d9a Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Fri, 11 Feb 2022 21:47:44 +0100
Subject: [PATCH 511/591] feat(fd): update `fd` completion to v8.3.2 (#10688)

Source: https://github.com/sharkdp/fd/blob/v8.3.2/contrib/completion/_fd
---
 plugins/fd/README.md | 4 ----
 plugins/fd/_fd       | 9 +++++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/fd/README.md b/plugins/fd/README.md
index cf9f7815d..f3341612f 100644
--- a/plugins/fd/README.md
+++ b/plugins/fd/README.md
@@ -7,7 +7,3 @@ To use it, add `fd` to the plugins array in your zshrc file:
 ```zsh
 plugins=(... fd)
 ```
-
-Completion is taken from the fd release [`8.2.1`](https://github.com/sharkdp/fd/releases/tag/v8.2.1).
-
-Updated on April 1st, 2021.
diff --git a/plugins/fd/_fd b/plugins/fd/_fd
index f5d9e01d2..45b8ca477 100644
--- a/plugins/fd/_fd
+++ b/plugins/fd/_fd
@@ -1,4 +1,4 @@
-#compdef fd fdfind
+#compdef fd
 
 ##
 # zsh completion function for fd
@@ -57,6 +57,7 @@ _fd() {
     + no-ignore-partial # some ignore files
     "(no-ignore-full --no-ignore-vcs)--no-ignore-vcs[don't respect .gitignore files]"
     "!(no-ignore-full --no-global-ignore-file)--no-global-ignore-file[don't respect the global ignore file]"
+    $no'(no-ignore-full --no-ignore-parent)--no-ignore-parent[]'
 
     + '(case)' # case-sensitivity
     {-s,--case-sensitive}'[perform a case-sensitive search]'
@@ -138,6 +139,7 @@ _fd() {
     + '(exec-cmds)' # execute command
     '(long-listing max-results)'{-x+,--exec=}'[execute command for each search result]:command: _command_names -e:*\;::program arguments: _normal'
     '(long-listing max-results)'{-X+,--exec-batch=}'[execute command for all search results at once]:command: _command_names -e:*\;::program arguments: _normal'
+    '(long-listing max-results)--batch-size=[max number of args for each -X call]:size'
 
     + other
     '!(--max-buffer-time)--max-buffer-time=[set amount of time to buffer before showing output]:time (ms)'
@@ -153,6 +155,9 @@ _fd() {
     $no'(--base-directory)--base-directory=[change the current working directory to the given path]:directory:_files -/'
     $no'(*)*--search-path=[set search path (instead of positional <path> arguments)]:directory:_files -/'
 
+    + strip-cwd-prefix
+    $no'(strip-cwd-prefix exec-cmds)--strip-cwd-prefix[Strip ./ prefix when output is redirected]'
+
     + args # positional arguments
     '1: :_guard "^-*" pattern'
     '(--search-path)*:directory:_files -/'
@@ -220,7 +225,7 @@ _fd() {
 _fd "$@"
 
 # ------------------------------------------------------------------------------
-# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# Copyright (c) 2011 GitHub zsh-users - http://github.com/zsh-users
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

From ef3f7c43a91eb2c90098843b0ee9193bb52cdc96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 13 Feb 2022 18:59:27 +0100
Subject: [PATCH 512/591] fix: apply workaround patch for vcs_info
 (CVE-2021-45444)

This lib function applies a patch to the VCS_INFO_formats function
in zsh versions from v5.0.3 until v5.8, which don't quote % chars
in some arguments received. Normally that just means that some
% characters in these strings (branch names, directories, etc.)
will be incorrectly parsed as formatting sequences.

With CVE-2021-45444, however, this means that one of these strings
from a malicious source (e.g. a malicious git repository) can
trigger command injection and run arbitrary code in the user's
machine when visiting such git repository.

Zsh 5.8.1 fixes this vulnerability [1], but older vcs_info setups
still need a workaround such as this one to patch the vulnerability.

[1] https://github.com/zsh-users/zsh/commit/c3ea1e5d52eff8b7b172fa8c1ccc3462b43b2790
---
 lib/vcs_info.zsh | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 lib/vcs_info.zsh

diff --git a/lib/vcs_info.zsh b/lib/vcs_info.zsh
new file mode 100644
index 000000000..01dcd90b6
--- /dev/null
+++ b/lib/vcs_info.zsh
@@ -0,0 +1,50 @@
+# Impacted versions go from v5.0.3 to v5.8 (v5.8.1 is the first patched version)
+autoload -Uz is-at-least
+if is-at-least 5.8.1 || ! is-at-least 5.0.3; then
+  return
+fi
+
+# Quote necessary $hook_com[<field>] items just before they are used
+# in the line "VCS_INFO_hook 'post-backend'" of the VCS_INFO_formats
+# function, where <field> is:
+#
+#   base:       the full path of the repository's root directory.
+#   base-name:  the name of the repository's root directory.
+#   branch:     the name of the currently checked out branch.
+#   misc:       a string that may contain anything the vcs_info backend wants.
+#   revision:   an identifier of the currently checked out revision.
+#   subdir:     the path of the current directory relative to the
+#               repository's root directory.
+#
+# This patch %-quotes these fields previous to their use in vcs_info hooks and
+# the zformat call and, eventually, when they get expanded in the prompt.
+# It's important to quote these here, and not later after hooks have modified the
+# fields, because then we could be quoting % characters from valid prompt sequences,
+# like %F{color}, %B, etc.
+#
+#  32   │ hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})"
+#  33   │ hook_com[subdir_orig]="${hook_com[subdir]}"
+#  34   │
+#  35 + │ for tmp in base base-name branch misc revision subdir; do
+#  36 + │     hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"
+#  37 + │ done
+#  38 + │
+#  39   │ VCS_INFO_hook 'post-backend'
+#
+# This is especially important so that no command substitution is performed
+# due to malicious input as a consequence of CVE-2021-45444, which affects
+# zsh versions from 5.0.3 to 5.8.
+#
+autoload -Uz +X regexp-replace VCS_INFO_formats
+
+# We use $tmp here because it's already a local variable in VCS_INFO_formats
+typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
+# Unique string to avoid reapplying the patch if this code gets called twice
+typeset PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b
+# Only patch the VCS_INFO_formats function if not already patched
+if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then
+  regexp-replace 'functions[VCS_INFO_formats]' \
+    "VCS_INFO_hook 'post-backend'" \
+    ': ${PATCH_ID}; ${PATCH}; ${MATCH}'
+fi
+unset PATCH PATCH_ID

From 3427da4057dbe302933a7b5b19b4e23bfb9d0969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 18 Feb 2022 19:41:21 +0100
Subject: [PATCH 513/591] fix(dotenv): actually exit when .env syntax is broken

---
 plugins/dotenv/dotenv.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index 394455ae1..46cd4b10a 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -52,7 +52,10 @@ source_env() {
   fi
 
   # test .env syntax
-  zsh -fn $ZSH_DOTENV_FILE || echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
+  zsh -fn $ZSH_DOTENV_FILE || {
+    echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
+    return 1
+  }
 
   setopt localoptions allexport
   source $ZSH_DOTENV_FILE

From 07b829c894738e4ad594dc5f8d73401fbd83f203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 21 Feb 2022 18:34:28 +0100
Subject: [PATCH 514/591] fix(vcs_info): quote % in relevant fields on all
 current Zsh releases

---
 lib/vcs_info.zsh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/vcs_info.zsh b/lib/vcs_info.zsh
index 01dcd90b6..edb515ce0 100644
--- a/lib/vcs_info.zsh
+++ b/lib/vcs_info.zsh
@@ -1,8 +1,11 @@
-# Impacted versions go from v5.0.3 to v5.8 (v5.8.1 is the first patched version)
-autoload -Uz is-at-least
-if is-at-least 5.8.1 || ! is-at-least 5.0.3; then
-  return
-fi
+# Don't skip this file until a Zsh release does the necessary quoting.
+# This is because even though 5.8.1 undid recursive prompt_subst inside
+# prompt sequences, % characters in relevant fields will still be rendered
+# incorrectly in vcs_info, on all Zsh releases up to writing this.
+#
+# There is no release yet that does this right, since it requires changing
+# how what vcs_info hooks expect to receive. Even so, I'd rather be correct
+# and break custom vcs_info hooks than have a broken prompt.
 
 # Quote necessary $hook_com[<field>] items just before they are used
 # in the line "VCS_INFO_hook 'post-backend'" of the VCS_INFO_formats

From ebfd7cb2191bdf02ebdc2df6c47697d3a9d195e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 21 Feb 2022 19:27:21 +0100
Subject: [PATCH 515/591] ci: cancel current runs on new trigger

---
 .github/workflows/main.yml    | 4 ++++
 .github/workflows/project.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cdadc1434..50e00f9c9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,6 +10,10 @@ on:
     branches: 
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     name: Run tests
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 800761554..4b671d449 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -5,6 +5,10 @@ on:
   pull_request_target:
     types: [opened, synchronize]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   add-to-project:
     name: Add to project

From b00b59364a019894ee4b9ba4062d922fedaa5ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 21 Feb 2022 20:28:40 +0100
Subject: [PATCH 516/591] fix(vcs_info): don't patch VCS_INFO_formats if not
 found

---
 lib/vcs_info.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vcs_info.zsh b/lib/vcs_info.zsh
index edb515ce0..e60938c14 100644
--- a/lib/vcs_info.zsh
+++ b/lib/vcs_info.zsh
@@ -38,7 +38,7 @@
 # due to malicious input as a consequence of CVE-2021-45444, which affects
 # zsh versions from 5.0.3 to 5.8.
 #
-autoload -Uz +X regexp-replace VCS_INFO_formats
+autoload -Uz +X regexp-replace VCS_INFO_formats 2>/dev/null || return
 
 # We use $tmp here because it's already a local variable in VCS_INFO_formats
 typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'

From 11a23144ad189b6befee2332383188dbffecee6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 22 Feb 2022 11:18:43 +0100
Subject: [PATCH 517/591] feat(copypath): add plugin to copy file paths to
 clipboard (#7569)

Closes #7569
Closes #10714
---
 plugins/copypath/README.md           | 15 +++++++++++++++
 plugins/copypath/copypath.plugin.zsh | 15 +++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 plugins/copypath/README.md
 create mode 100644 plugins/copypath/copypath.plugin.zsh

diff --git a/plugins/copypath/README.md b/plugins/copypath/README.md
new file mode 100644
index 000000000..1e5a463a6
--- /dev/null
+++ b/plugins/copypath/README.md
@@ -0,0 +1,15 @@
+# copypath plugin
+
+Copies the path of given directory or file to the system clipboard.
+
+To use it, add `copypath` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... copypath)
+```
+
+## Usage
+
+- `copypath`: copies the absolute path of the current directory.
+
+- `copypath <file_or_directory>`: copies the absolute path of the given file.
diff --git a/plugins/copypath/copypath.plugin.zsh b/plugins/copypath/copypath.plugin.zsh
new file mode 100644
index 000000000..8fe0a85f4
--- /dev/null
+++ b/plugins/copypath/copypath.plugin.zsh
@@ -0,0 +1,15 @@
+# Copies the path of given directory or file to the system or X Windows clipboard.
+# Copy current directory if no parameter.
+function copypath {
+  # If no argument passed, use current directory
+  local file="${1:-.}"
+
+  # If argument is not an absolute path, prepend $PWD
+  [[ $file = /* ]] || file="$PWD/$file"
+
+  # Copy the absolute path without resolving symlinks
+  # If clipcopy fails, exit the function with an error
+  print -n "${file:a}" | clipcopy || return 1
+
+  echo ${(%):-"%B${file:a}%b copied to clipboard."}
+}

From 6f1036293cdc1af12dbe6390a061c147de1196ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 22 Feb 2022 11:23:14 +0100
Subject: [PATCH 518/591] refactor(copydir)!: deprecate plugin in favor of
 `copypath`

BREAKING CHANGE: the `copydir` plugin is deprecated. Instead of
using `copydir`, use `copypath` which also supports copying
the path of other files or directories specified.
---
 plugins/copydir/README.md          | 9 +--------
 plugins/copydir/copydir.plugin.zsh | 8 +++++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/plugins/copydir/README.md b/plugins/copydir/README.md
index 594bf1065..cf24b789f 100644
--- a/plugins/copydir/README.md
+++ b/plugins/copydir/README.md
@@ -1,10 +1,3 @@
 # copydir plugin
 
-Copies the path of your current folder to the system clipboard.
-
-To use, add `copydir` to your plugins array:
-```
-plugins=(... copydir)
-```
-
-Then use the command `copydir` to copy the $PWD.
+This plugin is deprecated. Use the [`copypath` plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/copypath) instead.
diff --git a/plugins/copydir/copydir.plugin.zsh b/plugins/copydir/copydir.plugin.zsh
index c45106240..a2b489ec0 100644
--- a/plugins/copydir/copydir.plugin.zsh
+++ b/plugins/copydir/copydir.plugin.zsh
@@ -1,5 +1,7 @@
-# Copies the pathname of the current directory to the system or X Windows clipboard
+echo ${(%):-'%F{yellow}The `%Bcopydir%b` plugin is deprecated. Use the `%Bcopypath%b` plugin instead.%f'}
+source "$ZSH/plugins/copypath/copypath.plugin.zsh"
+
+# TODO: 2022-02-22: Remove deprecated copydir function.
 function copydir {
-  emulate -L zsh
-  print -n $PWD | clipcopy
+  copypath
 }

From 9b883aa4171585995475d9ddff2ef59401199b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 21 Feb 2022 20:10:18 +0100
Subject: [PATCH 519/591] fix(installer): set `$HOME` if not defined (#10680)

Fixes #10680
---
 tools/install.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index e64e39063..c80c09365 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -42,13 +42,17 @@ set -e
 # $USER is defined by login(1) which is not always executed (e.g. containers)
 # POSIX: https://pubs.opengroup.org/onlinepubs/009695299/utilities/id.html
 USER=${USER:-$(id -u -n)}
+# $HOME is defined at the time of login, but it could be unset. If it is unset,
+# a tilde by itself (~) will not be expanded to the current user's home directory.
+# POSIX: https://pubs.opengroup.org/onlinepubs/009696899/basedefs/xbd_chap08.html#tag_08_03
+HOME="${HOME:-$(getent passwd $USER | cut -d: -f6)}"
 
 
 # Track if $ZSH was provided
 custom_zsh=${ZSH:+yes}
 
 # Default settings
-ZSH=${ZSH:-~/.oh-my-zsh}
+ZSH="${ZSH:-$HOME/.oh-my-zsh}"
 REPO=${REPO:-ohmyzsh/ohmyzsh}
 REMOTE=${REMOTE:-https://github.com/${REPO}.git}
 BRANCH=${BRANCH:-master}

From 914b6399e88a16fdced427c2ae7738785dcb16b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 21 Feb 2022 20:18:58 +0100
Subject: [PATCH 520/591] fix(installer): silence `git init`

---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index c80c09365..7953ad112 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -272,7 +272,7 @@ setup_ohmyzsh() {
   fi
 
   # Manual clone with git config options to support git < v1.7.2
-  git init "$ZSH" && cd "$ZSH" \
+  git init --quiet "$ZSH" && cd "$ZSH" \
   && git config core.eol lf \
   && git config core.autocrlf false \
   && git config fsck.zeroPaddedFilemode ignore \

From ff298365626c4366eac930793918c6fbfb8c5d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 23 Feb 2022 18:44:31 +0100
Subject: [PATCH 521/591] fix(updater): timeout after 2s on available update
 check

---
 tools/check_for_upgrade.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index a36aecb84..2ad1fca92 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -65,11 +65,11 @@ function is_update_available() {
   local remote_head
   remote_head=$(
     if (( ${+commands[curl]} )); then
-      curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
+      curl -m 2 -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
     elif (( ${+commands[wget]} )); then
-      wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
+      wget -T 2 -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
     elif (( ${+commands[fetch]} )); then
-      HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null
+      HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -T 2 -o - $api_url 2>/dev/null
     else
       exit 0
     fi

From 0b0af4df6aab075d257d4a0dcfd1bf42318fc69a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 23 Feb 2022 19:23:54 +0100
Subject: [PATCH 522/591] fix(updater): fix check for latest commit in local
 repository

The previous check simply compared whether the last commit of the branch
was the same in the local and the remote repository.

This commit also checks whether the remote commit is an ancestor of the
local commit. This fixes the case where the local repository has new
commits after the last published commit.
---
 tools/check_for_upgrade.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 2ad1fca92..76d42d388 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -75,8 +75,17 @@ function is_update_available() {
     fi
   ) || return 1
 
-  # Compare local and remote HEADs
-  [[ "$local_head" != "$remote_head" ]]
+  # Compare local and remote HEADs (if they're equal there are no updates)
+  [[ "$local_head" != "$remote_head" ]] || return 1
+
+  # If local and remote HEADs don't match, check if there's a common ancestor
+  # If the merge-base call fails, $remote_head might not be downloaded so assume there are updates
+  local base
+  base=$(cd -q "$ZSH"; git merge-base $local_head $remote_head 2>/dev/null) || return 0
+
+  # If the common ancestor ($base) is not $remote_head,
+  # the local HEAD is older than the remote HEAD
+  [[ $base != $remote_head ]]
 }
 
 function update_last_updated_file() {

From 201e9dea594ea0a477370ae8dba6d09f9ae79149 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 24 Feb 2022 13:52:52 +0100
Subject: [PATCH 523/591] fix(michelebologna): use `$HOST` variable instead of
 running `hostname` (#10724)

---
 themes/michelebologna.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index 7ff6a7ffe..bb567b3d8 100644
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
@@ -40,7 +40,7 @@ local username_root_color=$red
 local hostname_root_color=$red
 
 # calculating hostname color with hostname characters
-for i in `hostname`; local hostname_normal_color=$color_array[$[((#i))%7+1]]
+for i in $HOST; local hostname_normal_color=$color_array[$[((#i))%7+1]]
 local -a hostname_color
 hostname_color=%(!.$hostname_root_color.$hostname_normal_color)
 

From 28dc8c58ef14325d94feb7f34616839c7975e7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 23 Feb 2022 19:55:33 +0100
Subject: [PATCH 524/591] refactor(michelebologna): simplify and clean up code

---
 themes/michelebologna.zsh-theme | 38 ++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index bb567b3d8..bb86d68db 100644
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
@@ -35,23 +35,17 @@ local reset="%{$reset_color%}"
 local -a color_array
 color_array=($green $red $cyan $yellow $blue $magenta $white)
 
-local username_normal_color=$white
-local username_root_color=$red
-local hostname_root_color=$red
-
-# calculating hostname color with hostname characters
-for i in $HOST; local hostname_normal_color=$color_array[$[((#i))%7+1]]
-local -a hostname_color
-hostname_color=%(!.$hostname_root_color.$hostname_normal_color)
-
+local username_color=$white
+local hostname_color=$color_array[$[((#HOST))%7+1]] # choose hostname color based on first character
 local current_dir_color=$blue
-local username_command="%n"
-local hostname_command="%m"
+
+local username="%n"
+local hostname="%m"
 local current_dir="%~"
 
-local username_output="%(!..$username_normal_color$username_command$reset@)"
-local hostname_output="$hostname_color$hostname_command$reset"
-local current_dir_output="$current_dir_color$current_dir$reset"
+local username_output="%(!..${username_color}${username}${reset}@)"
+local hostname_output="${hostname_color}${hostname}${reset}"
+local current_dir_output="${current_dir_color}${current_dir}${reset}"
 local jobs_bg="${red}fg: %j$reset"
 local last_command_output="%(?.%(!.$red.$green).$yellow)"
 
@@ -68,8 +62,18 @@ ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=">"
 ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="<"
 ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="$red<>"
 
-PROMPT='$username_output$hostname_output:$current_dir_output%1(j. [$jobs_bg].)'
-GIT_PROMPT='$(out=$(git_prompt_info)$(git_prompt_status)$(git_remote_status);if [[ -n $out ]]; then printf %s " $white($green$out$white)$reset";fi)'
-PROMPT+="$GIT_PROMPT"
+function michelebologna_git_prompt {
+  local out=$(git_prompt_info)$(git_prompt_status)$(git_remote_status)
+  [[ -n $out ]] || return
+  printf " %s(%s%s%s)%s" \
+    "%{$fg_bold[white]%}" \
+    "%{$fg_bold[green]%}" \
+    "$out" \
+    "%{$fg_bold[white]%}" \
+    "%{$reset_color%}"
+}
+
+PROMPT="$username_output$hostname_output:$current_dir_output%1(j. [$jobs_bg].)"
+PROMPT+='$(michelebologna_git_prompt)'
 PROMPT+=" $last_command_output%#$reset "
 RPROMPT=''

From 97e6989729efce1f091d02e0274392ed547b9bb4 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 24 Feb 2022 19:23:15 +0100
Subject: [PATCH 525/591] fix(helm): support completion for snap installs
 (#10723)

---
 plugins/helm/helm.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index cadfa551a..05bb19a44 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -14,9 +14,9 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file does not exist, generate it and then source it
 # Otherwise, source it and regenerate in the background
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
-  helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm"
+  helm completion zsh | tee "$ZSH_CACHE_DIR/completions/_helm" >/dev/null
   source "$ZSH_CACHE_DIR/completions/_helm"
 else
   source "$ZSH_CACHE_DIR/completions/_helm"
-  helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm" &|
+  helm completion zsh | tee "$ZSH_CACHE_DIR/completions/_helm" >/dev/null &|
 fi

From e9348575371aa8ec8811356d997942559c026d07 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 24 Feb 2022 19:23:41 +0100
Subject: [PATCH 526/591] fix(kubectl): support completion for snap installs
 (#10727)

---
 plugins/kubectl/kubectl.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index eed5727d1..89efeaca5 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -11,11 +11,11 @@ if (( $+commands[kubectl] )); then
   # If the completion file does not exist, generate it and then source it
   # Otherwise, source it and regenerate in the background
   if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
-    kubectl completion zsh >| "$ZSH_CACHE_DIR/completions/_kubectl"
+    kubectl completion zsh | tee "$ZSH_CACHE_DIR/completions/_kubectl" >/dev/null
     source "$ZSH_CACHE_DIR/completions/_kubectl"
   else
     source "$ZSH_CACHE_DIR/completions/_kubectl"
-    kubectl completion zsh >| "$ZSH_CACHE_DIR/completions/_kubectl" &|
+    kubectl completion zsh | tee "$ZSH_CACHE_DIR/completions/_kubectl" >/dev/null &|
   fi
 fi
 

From 99460351eb8d8d9d5ea2e44b66e1b9ceaaa4a368 Mon Sep 17 00:00:00 2001
From: "Markus (Vock) Arians" <mvock@users.noreply.github.com>
Date: Fri, 25 Feb 2022 13:29:22 +0100
Subject: [PATCH 527/591] feat(lib): support auto title in foot terminal
 (#10735)

Co-authored-by: Markus Arians <markus.arians@andrena.de>
---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 4035d10a1..80ca7ef78 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -17,7 +17,7 @@ function title {
   : ${2=$1}
 
   case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*|foot)
       print -Pn "\e]2;${2:q}\a" # set window name
       print -Pn "\e]1;${1:q}\a" # set tab name
       ;;

From c81804825c03e563ab748aae84c3f63458961208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 25 Feb 2022 14:06:19 +0100
Subject: [PATCH 528/591] fix(installer): fix removal of OMZ directory on
 failure

When the `git init` call fails, the directory is not created,
so the rm command fails with a not found error. This change
checks whether the directory exists before deleting it.
---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 7953ad112..93608eb7c 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -283,7 +283,7 @@ setup_ohmyzsh() {
   && git remote add origin "$REMOTE" \
   && git fetch --depth=1 origin \
   && git checkout -b "$BRANCH" "origin/$BRANCH" || {
-    rm -rf "$ZSH"
+    [ ! -d "$ZSH" ] || rm -rf "$ZSH" 2>/dev/null
     fmt_error "git clone of oh-my-zsh repo failed"
     exit 1
   }

From 511ed65408231d04ed266066bba777d48ebec795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 28 Feb 2022 10:03:02 +0100
Subject: [PATCH 529/591] fix(aws): allow empty prefix and suffix in prompt
 function (#10744)

Fixes #10744
---
 plugins/aws/aws.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 920a7139d..b8625d7ac 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -158,7 +158,7 @@ compctl -K _aws_profiles asp acp aws_change_access_key
 # AWS prompt
 function aws_prompt_info() {
   [[ -n "$AWS_PROFILE" ]] || return
-  echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE:gs/%/%%}${ZSH_THEME_AWS_SUFFIX:=>}"
+  echo "${ZSH_THEME_AWS_PREFIX=<aws:}${AWS_PROFILE:gs/%/%%}${ZSH_THEME_AWS_SUFFIX=>}"
 }
 
 if [[ "$SHOW_AWS_PROMPT" != false && "$RPROMPT" != *'$(aws_prompt_info)'* ]]; then

From eaa60244210ffddb99451910e569790e3630bf89 Mon Sep 17 00:00:00 2001
From: "JM\" (Jason Meridth)" <jmeridth@gmail.com>
Date: Wed, 2 Mar 2022 13:47:55 -0600
Subject: [PATCH 530/591] feat(autoenv): add path for Apple Silicon Homebrew
 (#10749)

---
 plugins/autoenv/autoenv.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
index bd03cf4b2..229a8a834 100644
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -13,6 +13,7 @@ if ! type autoenv_init >/dev/null; then
       ~/.autoenv
       ~/.local/bin
       /usr/local/opt/autoenv
+      /opt/homebrew/opt/autoenv
       /usr/local/bin
       /usr/share/autoenv-git
       ~/Library/Python/bin

From 04b1b75b9da2d0295c40e12e01ed222a4f00ec39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 3 Mar 2022 17:48:31 +0100
Subject: [PATCH 531/591] style: remove VCS_INFO svn settings from themes that
 don't enable it

---
 themes/jnrowe.zsh-theme    | 1 -
 themes/linuxonly.zsh-theme | 1 -
 themes/trapd00r.zsh-theme  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
index 9d8fb2488..5a5ab349f 100644
--- a/themes/jnrowe.zsh-theme
+++ b/themes/jnrowe.zsh-theme
@@ -4,7 +4,6 @@ autoload -Uz vcs_info
 zstyle ':vcs_info:*' actionformats \
        '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
 zstyle ':vcs_info:*' formats '%F{2}%s%F{7}:%F{2}(%F{1}%b%F{2})%f '
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 zstyle ':vcs_info:*' enable git
 
 add-zsh-hook precmd prompt_vcs
diff --git a/themes/linuxonly.zsh-theme b/themes/linuxonly.zsh-theme
index 2afae8fc3..98572b904 100644
--- a/themes/linuxonly.zsh-theme
+++ b/themes/linuxonly.zsh-theme
@@ -28,7 +28,6 @@ zstyle ':vcs_info:*' actionformats \
     '%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
 zstyle ':vcs_info:*' formats \
     "%{$c8%}%s%{$c7%}:%{$c7%}(%{$c9%}%b%{$c7%})%f "
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 zstyle ':vcs_info:*' enable git
 
 add-zsh-hook precmd prompt_jnrowe_precmd
diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index 849daf30b..260c9e701 100644
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
@@ -102,7 +102,6 @@ zstyle ':vcs_info:*' actionformats \
 zstyle ':vcs_info:*' formats \
     "%{$c8%}%s%%{$c7%}❨ %{$c9%}%{$c11%}%b%{$c7%} ❩%{$reset_color%}%f "
 
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 zstyle ':vcs_info:*' enable git
 
 add-zsh-hook precmd prompt_jnrowe_precmd

From 46195d3aa7b21c2477e3ddacd57ac82856b3be76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 3 Mar 2022 17:53:03 +0100
Subject: [PATCH 532/591] fix: fix svn branch output in themes: apple, gentoo,
 kolo, zhann (#10751)

Fixes #10751
---
 themes/apple.zsh-theme  | 18 +++++++-----------
 themes/gentoo.zsh-theme |  4 +++-
 themes/kolo.zsh-theme   | 18 ++++++++++--------
 themes/zhann.zsh-theme  | 18 ++++++++++--------
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/themes/apple.zsh-theme b/themes/apple.zsh-theme
index 95e6249fa..0c183258e 100644
--- a/themes/apple.zsh-theme
+++ b/themes/apple.zsh-theme
@@ -2,27 +2,23 @@ function toon {
   echo -n ""
 }
 
-get_git_dirty() {
-  git diff --quiet || echo '*'
-}
-
 autoload -Uz vcs_info
 zstyle ':vcs_info:*' check-for-changes true
 zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unstaged changes
 zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
-zstyle ':vcs_info:*' actionformats \
-    '%F{5}%F{5}[%F{2}%b%F{3}|%F{1}%a%c%u%F{5}]%f '
-zstyle ':vcs_info:*' formats       \
-    '%F{5}%F{5}[%F{2}%b%c%u%F{5}]%f '
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:*' actionformats '%F{5}[%F{2}%b%F{3}|%F{1}%a%c%u%F{5}]%f '
+zstyle ':vcs_info:*' formats '%F{5}[%F{2}%b%c%u%F{5}]%f '
+zstyle ':vcs_info:svn:*' branchformat '%b'
+zstyle ':vcs_info:svn:*' actionformats '%F{5}[%F{2}%b%F{1}:%F{3}%i%F{3}|%F{1}%a%c%u%F{5}]%f '
+zstyle ':vcs_info:svn:*' formats '%F{5}[%F{2}%b%F{1}:%F{3}%i%c%u%F{5}]%f '
 zstyle ':vcs_info:*' enable git cvs svn
 
 theme_precmd () {
-    vcs_info
+  vcs_info
 }
 
 setopt prompt_subst
 PROMPT='%{$fg[magenta]%}$(toon)%{$reset_color%} %~/ %{$reset_color%}${vcs_info_msg_0_}%{$reset_color%}'
 
 autoload -U add-zsh-hook
-add-zsh-hook precmd theme_precmd
\ No newline at end of file
+add-zsh-hook precmd theme_precmd
diff --git a/themes/gentoo.zsh-theme b/themes/gentoo.zsh-theme
index 7ac461036..b1aef21df 100644
--- a/themes/gentoo.zsh-theme
+++ b/themes/gentoo.zsh-theme
@@ -6,7 +6,9 @@ zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unst
 zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
 zstyle ':vcs_info:*' actionformats '%F{5}(%F{2}%b%F{3}|%F{1}%a%c%u%m%F{5})%f '
 zstyle ':vcs_info:*' formats '%F{5}(%F{2}%b%c%u%m%F{5})%f '
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:svn:*' branchformat '%b'
+zstyle ':vcs_info:svn:*' actionformats '%F{5}(%F{2}%b%F{1}:%{3}%i%F{3}|%F{1}%a%c%u%m%F{5})%f '
+zstyle ':vcs_info:svn:*' formats '%F{5}(%F{2}%b%F{1}:%F{3}%i%c%u%m%F{5})%f '
 zstyle ':vcs_info:*' enable git cvs svn
 zstyle ':vcs_info:git*+set-message:*' hooks untracked-git
 
diff --git a/themes/kolo.zsh-theme b/themes/kolo.zsh-theme
index 51b0af724..e07be75c4 100644
--- a/themes/kolo.zsh-theme
+++ b/themes/kolo.zsh-theme
@@ -3,16 +3,18 @@ autoload -Uz vcs_info
 zstyle ':vcs_info:*' stagedstr '%F{green}●'
 zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
 zstyle ':vcs_info:*' check-for-changes true
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
+zstyle ':vcs_info:svn:*' branchformat '%b'
+zstyle ':vcs_info:svn:*' formats ' [%b%F{1}:%F{11}%i%c%u%B%F{green}]'
 zstyle ':vcs_info:*' enable git svn
-theme_precmd () {
-    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
-        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
-    } else {
-        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
-    }
 
-    vcs_info
+theme_precmd () {
+  if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{green}]'
+  else
+    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
+  fi
+
+  vcs_info
 }
 
 setopt prompt_subst
diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
index 27597ec6c..a00650ac8 100644
--- a/themes/zhann.zsh-theme
+++ b/themes/zhann.zsh-theme
@@ -3,16 +3,18 @@ autoload -Uz vcs_info
 zstyle ':vcs_info:*' stagedstr '%F{green}●'
 zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
 zstyle ':vcs_info:*' check-for-changes true
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
+zstyle ':vcs_info:svn:*' branchformat '%b'
+zstyle ':vcs_info:svn:*' formats ' [%b%F{1}:%F{11}%i%c%u%B%F{green}]'
 zstyle ':vcs_info:*' enable git svn
-theme_precmd () {
-    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
-        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
-    } else {
-        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
-    }
 
-    vcs_info
+theme_precmd () {
+  if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{green}]'
+  else
+    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
+  fi
+
+  vcs_info
 }
 
 setopt prompt_subst

From af0c3b64b8c7eb6afcdabc8db89241ff72bcc66a Mon Sep 17 00:00:00 2001
From: SBado <16034687+SBado@users.noreply.github.com>
Date: Fri, 4 Mar 2022 15:54:51 +0000
Subject: [PATCH 533/591] fix(updater): prefix `cd` with `builtin` when it is
 aliased (#10753)

---
 tools/check_for_upgrade.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 76d42d388..d3ad7582c 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -36,11 +36,11 @@ function current_epoch() {
 
 function is_update_available() {
   local branch
-  branch=${"$(cd -q "$ZSH"; git config --local oh-my-zsh.branch)":-master}
+  branch=${"$(builtin cd -q "$ZSH"; git config --local oh-my-zsh.branch)":-master}
 
   local remote remote_url remote_repo
-  remote=${"$(cd -q "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
-  remote_url=$(cd -q "$ZSH"; git config remote.$remote.url)
+  remote=${"$(builtin cd -q "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
+  remote_url=$(builtin cd -q "$ZSH"; git config remote.$remote.url)
 
   local repo
   case "$remote_url" in
@@ -58,7 +58,7 @@ function is_update_available() {
 
   # Get local HEAD. If this fails assume there are updates
   local local_head
-  local_head=$(cd -q "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
+  local_head=$(builtin cd -q "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
 
   # Get remote HEAD. If no suitable command is found assume there are updates
   # On any other error, skip the update (connection may be down)
@@ -81,7 +81,7 @@ function is_update_available() {
   # If local and remote HEADs don't match, check if there's a common ancestor
   # If the merge-base call fails, $remote_head might not be downloaded so assume there are updates
   local base
-  base=$(cd -q "$ZSH"; git merge-base $local_head $remote_head 2>/dev/null) || return 0
+  base=$(builtin cd -q "$ZSH"; git merge-base $local_head $remote_head 2>/dev/null) || return 0
 
   # If the common ancestor ($base) is not $remote_head,
   # the local HEAD is older than the remote HEAD
@@ -170,7 +170,7 @@ function has_typed_input() {
   fi
 
   # Test if Oh My Zsh directory is a git repository
-  if ! (cd -q "$ZSH" && LANG= git rev-parse &>/dev/null); then
+  if ! (builtin cd -q "$ZSH" && LANG= git rev-parse &>/dev/null); then
     echo >&2 "[oh-my-zsh] Can't update: not a git repository."
     return
   fi

From f96a900ea3f33868310749aaf4e5a68b3118e621 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Sat, 5 Mar 2022 19:18:56 +0100
Subject: [PATCH 534/591] feat(fzf)!: default to using `fd` before `rg`
 (#10757)

BREAKING CHANGE: if both `fd` and `rg` are installed, default to using `fd`. This
is the recommendation of the ripgrep author, and it's been found to be faster.
If you want to force using `rg`, set the `FZF_DEFAULT_COMMAND` variable.
---
 plugins/fzf/README.md      | 2 +-
 plugins/fzf/fzf.plugin.zsh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/fzf/README.md b/plugins/fzf/README.md
index 15d4d31f3..beedf4690 100644
--- a/plugins/fzf/README.md
+++ b/plugins/fzf/README.md
@@ -31,8 +31,8 @@ export FZF_DEFAULT_COMMAND='<your fzf default command>'
 
 If not set, the plugin will try to set it to these, in the order in which they're found:
 
-- [`rg`](https://github.com/BurntSushi/ripgrep)
 - [`fd`](https://github.com/sharkdp/fd)
+- [`rg`](https://github.com/BurntSushi/ripgrep)
 - [`ag`](https://github.com/ggreer/the_silver_searcher)
 
 ### `DISABLE_FZF_AUTO_COMPLETION`
diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 102605958..b86af0d2d 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -191,10 +191,10 @@ fzf_setup_using_openbsd \
 unset -f -m 'fzf_setup_*'
 
 if [[ -z "$FZF_DEFAULT_COMMAND" ]]; then
-  if (( $+commands[rg] )); then
-    export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git/*"'
-  elif (( $+commands[fd] )); then
+  if (( $+commands[fd] )); then
     export FZF_DEFAULT_COMMAND='fd --type f --hidden --exclude .git'
+  elif (( $+commands[rg] )); then
+    export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git/*"'
   elif (( $+commands[ag] )); then
     export FZF_DEFAULT_COMMAND='ag -l --hidden -g "" --ignore .git'
   fi

From 3343891ea6e8fd84632fabc6bc11a43f8b024e9e Mon Sep 17 00:00:00 2001
From: Vitul Rana <vitulrana@gmail.com>
Date: Mon, 7 Mar 2022 15:08:56 +0530
Subject: [PATCH 535/591] feat(kubectl): add aliases for job management (#9992)

---
 plugins/kubectl/README.md          | 5 +++++
 plugins/kubectl/kubectl.plugin.zsh | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index f6651c8cd..f77788482 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -120,6 +120,11 @@ plugins=(... kubectl)
 | kecj    | `kubectl edit cronjob`              | Edit CronJob from the default editor                                                             |
 | kdcj    | `kubectl describe cronjob`          | Describe a CronJob in details                                                                    |
 | kdelcj  | `kubectl delete cronjob`            | Delete the CronJob                                                                               |
+|         |                                     | **Job management**                                                                               |
+| kgj     | `kubectl get job`                   | List all Job in ps output format                                                                 |
+| kej     | `kubectl edit job`                  | Edit a Job in details                                                                            |
+| kdj     | `kubectl describe job`              | Describe the Job                                                                                 |
+| kdelj   | `kubectl delete job`                | Delete the Job                                                                                   |
 
 ## Wrappers
 
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 89efeaca5..3e87c2395 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -178,6 +178,12 @@ alias kecj='kubectl edit cronjob'
 alias kdcj='kubectl describe cronjob'
 alias kdelcj='kubectl delete cronjob'
 
+# Job management.
+alias kgj='kubectl get job'
+alias kej='kubectl edit job'
+alias kdj='kubectl describe job'
+alias kdelj='kubectl delete job'
+
 # Only run if the user actually has kubectl installed
 if (( ${+_comps[kubectl]} )); then
   function kj() { kubectl "$@" -o json | jq; }

From d4c939d61ebd204599240a60d7473bbc241fb5b7 Mon Sep 17 00:00:00 2001
From: Eric Semeniuc <3838856+esemeniuc@users.noreply.github.com>
Date: Mon, 7 Mar 2022 01:43:05 -0800
Subject: [PATCH 536/591] feat(kubectl): add aliases for replicasets (#10100)

---
 plugins/kubectl/README.md          | 8 +++++---
 plugins/kubectl/kubectl.plugin.zsh | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index f77788482..579a90b3b 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -22,7 +22,7 @@ plugins=(... kubectl)
 | kcsc    | `kubectl config set-context`        | Set a context entry in kubeconfig                                                                |
 | kcdc    | `kubectl config delete-context`     | Delete the specified context from the kubeconfig                                                 |
 | kccc    | `kubectl config current-context`    | Display the current-context                                                                      |
-| kcgc    | `kubectl config get-contexts`       | List of contexts available
+| kcgc    | `kubectl config get-contexts`       | List of contexts available                                                                       |
 |         |                                     | **General aliases**                                                                              |
 | kdel    | `kubectl delete`                    | Delete resources by filenames, stdin, resources and names, or by resources and label selector    |
 | kdelf   | `kubectl delete -f`                 | Delete a pod using the type and name specified in -f argument                                    |
@@ -71,9 +71,11 @@ plugins=(... kubectl)
 | kdeld   | `kubectl delete deployment`         | Delete the deployment                                                                            |
 | ksd     | `kubectl scale deployment`          | Scale a deployment                                                                               |
 | krsd    | `kubectl rollout status deployment` | Check the rollout status of a deployment                                                         |
-| kres    | `kubectl set env $@ REFRESHED_AT=...` | Recreate all pods in deployment with zero-downtime                                                         |
+| kres    | `kubectl set env $@ REFRESHED_AT=...` | Recreate all pods in deployment with zero-downtime                                             |
 |         |                                     | **Rollout management**                                                                           |
-| kgrs    | `kubectl get rs`                    | To see the ReplicaSet `rs` created by the deployment                                             |
+| kgrs    | `kubectl get replicaset`            | List all ReplicaSets `rs` created by the deployment                                              |
+| kdrs    | `kubectl describe replicaset`       | Describe ReplicaSet in detail                                                                    |
+| kers    | `kubectl edit replicaset`           | Edit ReplicaSet from the default editor                                                          |
 | krh     | `kubectl rollout history`           | Check the revisions of this deployment                                                           |
 | kru     | `kubectl rollout undo`              | Rollback to the previous revision                                                                |
 |         |                                     | **Port forwarding**                                                                              |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 3e87c2395..0ee252ac3 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -112,7 +112,9 @@ function kres(){
 }
 
 # Rollout management.
-alias kgrs='kubectl get rs'
+alias kgrs='kubectl get replicaset'
+alias kdrs='kubectl describe replicaset'
+alias kers='kubectl edit replicaset'
 alias krh='kubectl rollout history'
 alias kru='kubectl rollout undo'
 

From 93b348b172506be46000f3be1cebda76d4c71999 Mon Sep 17 00:00:00 2001
From: Ivan <c.ivan.felix.r@gmail.com>
Date: Mon, 7 Mar 2022 03:58:18 -0600
Subject: [PATCH 537/591] feat(rvm): add `rb31` shortcut to use ruby 3.1
 (#10745)

---
 plugins/rvm/README.md      | 1 +
 plugins/rvm/rvm.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/rvm/README.md b/plugins/rvm/README.md
index 258c89420..576b037b0 100644
--- a/plugins/rvm/README.md
+++ b/plugins/rvm/README.md
@@ -23,6 +23,7 @@ plugins=(... rvm)
 | `rb26`       | `rvm use ruby-2.6`   |
 | `rb27`       | `rvm use ruby-2.7`   |
 | `rb30`       | `rvm use ruby-3.0`   |
+| `rb31`       | `rvm use ruby-3.1`   |
 | `rvm-update` | `rvm get head`       |
 | `gems`       | `gem list`           |
 | `rvms`       | `rvm gemset`         |
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 864389ba8..2a091d019 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -26,6 +26,7 @@ rubies=(
   26  'ruby-2.6'
   27  'ruby-2.7'
   30  'ruby-3.0'
+  31  'ruby-3.1'
 )
 
 for v in ${(k)rubies}; do

From 9350e1ff8724341534a8def2ce76ede88a4c2868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Mar 2022 11:13:18 +0100
Subject: [PATCH 538/591] fix(coffee): fix completion bug on missing `coffee`
 command (#10759)

This commit fixes the error

  _coffee:49: bad math expression: operand expected at `< 2 '

when the coffee command is missing or the `coffee --version` command fails.

It also uses is-at-least to check for the cut-off version for suggesting
`--lint` and `--require` arguments, instead of using `cut` multiple times.

Fixes #10759
---
 plugins/coffee/_coffee | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/coffee/_coffee b/plugins/coffee/_coffee
index 5e52b30e6..e2814f7ba 100644
--- a/plugins/coffee/_coffee
+++ b/plugins/coffee/_coffee
@@ -39,14 +39,14 @@
 #
 # ------------------------------------------------------------------------------
 
-local curcontext="$curcontext" state line ret=1 version opts first second third
+local curcontext="$curcontext" state line ret=1 version
+local -a opts
 typeset -A opt_args
-version=(${(f)"$(_call_program version $words[1] --version)"})
+version=(${(f)"$(_call_program version $words[1] --version)"}) || return ret
 version=${${(z)${version[1]}}[3]}
-first=$(echo $version|cut -d '.' -f 1)
-second=$(echo $version|cut -d '.' -f 2)
-third=$(echo $version|cut -d '.' -f 3)
-if (( $first < 2 )) &&  (( $second < 7 )) && (( $third < 3 ));then
+
+autoload -Uz is-at-least
+if ! is-at-least 1.6.3 "$version"; then
   opts+=('(-l --lint)'{-l,--lint}'[pipe the compiled JavaScript through JavaScript Lint]'
          '(-r --require)'{-r,--require}'[require a library before executing your script]:library')
 fi

From 4f0b680248e1acf71e9e557af62f3a08bb5b96c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Mar 2022 11:38:48 +0100
Subject: [PATCH 539/591] fix(installer): fix `$HOME` setting if `getent` is
 not found (macOS)

Related: https://github.com/ohmyzsh/ohmyzsh/pull/10713/files#r820219899
---
 tools/install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 93608eb7c..f04d0dc9c 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -45,7 +45,9 @@ USER=${USER:-$(id -u -n)}
 # $HOME is defined at the time of login, but it could be unset. If it is unset,
 # a tilde by itself (~) will not be expanded to the current user's home directory.
 # POSIX: https://pubs.opengroup.org/onlinepubs/009696899/basedefs/xbd_chap08.html#tag_08_03
-HOME="${HOME:-$(getent passwd $USER | cut -d: -f6)}"
+HOME="${HOME:-$(getent passwd $USER 2>/dev/null | cut -d: -f6)}"
+# macOS does not have getent, but this works even if $HOME is unset
+HOME="${HOME:-$(eval echo ~$USER)}"
 
 
 # Track if $ZSH was provided

From 3075d0c0ab823fbf3f52e9dfa33edd4be70f4679 Mon Sep 17 00:00:00 2001
From: Alexey Poimtsev <25312+alec-c4@users.noreply.github.com>
Date: Fri, 15 Jan 2021 22:23:15 +0300
Subject: [PATCH 540/591] feat(rails)!: run old rake aliases with `rails`
 (#9601)

BREAKING CHANGE: we've updated the aliases that run `rake` to use
`rails` instead because that's how they are run since Rails v5.
The old `rake` aliases can still be run by using the `rk` prefix
(e.g. the `rake test` alias has been changed from `rt` to `rkt`).

Closes #9601
Closes #9813
Fixes #10696

Co-authored-by: Vsevolod Voloshyn <seva.voloshin@gmail.com>
---
 plugins/rails/README.md        | 111 ++++++++++++++++++++-------------
 plugins/rails/rails.plugin.zsh |  70 +++++++++++++--------
 2 files changed, 113 insertions(+), 68 deletions(-)

diff --git a/plugins/rails/README.md b/plugins/rails/README.md
index efdb8f8ba..0a6c68c75 100644
--- a/plugins/rails/README.md
+++ b/plugins/rails/README.md
@@ -12,47 +12,46 @@ plugins=(... rails)
 
 ### Rails aliases
 
-| Alias | Command                    | Description                                        |
-|-------|----------------------------|----------------------------------------------------|
-| `rc`  | `rails console`            | Interact with your Rails app from the CLI          |
-| `rcs` | `rails console --sandbox`  | Test code in a sandbox, without changing any data  |
-| `rd`  | `rails destroy`            | Undo a generate operation                          |
-| `rdb` | `rails dbconsole`          | Interact with your db from the console             |
-| `rgen`| `rails generate`           | Generate boilerplate code                          |
-| `rgm` | `rails generate migration` | Generate a db migration                            |
-| `rp`  | `rails plugin`             | Run a Rails plugin command                         |
-| `rr`  | `rails routes`             | List all defined routes                            |
-| `rrg` | `rails routes \| grep`     | List and filter the defined routes                 |
-| `ru`  | `rails runner`             | Run Ruby code in the context of Rails              |
-| `rs`  | `rails server`             | Launch a web server                                |
-| `rsd` | `rails server --debugger`  | Launch a web server with debugger                  |
-| `rsp` | `rails server --port`      | Launch a web server and specify the listening port |
-
-### Rake aliases
-
-| Alias   | Command                         | Description                                            |
-|---------|---------------------------------|--------------------------------------------------------|
-| `rdm`   | `rake db:migrate`               | Run pending db migrations                              |
-| `rdms`  | `rake db:migrate:status`        | Show current db migration status                       |
-| `rdmtc` | `rake db:migrate db:test:clone` | Run pending migrations and clone db into test database |
-| `rdr`   | `rake db:rollback`              | Roll back the last migration                           |
-| `rdc`   | `rake db:create`                | Create the database                                    |
-| `rds`   | `rake db:seed`                  | Seed the database                                      |
-| `rdd`   | `rake db:drop`                  | Delete the database                                    |
-| `rdrs`  | `rake db:reset`                 | Delete the database and set it up again                |
-| `rdtc`  | `rake db:test:clone`            | Clone the database into the test database              |
-| `rdtp`  | `rake db:test:prepare`          | Duplicate the db schema into your test database        |
-| `rdsl`  | `rake db:schema:load`           | Load the database schema                               |
-| `rlc`   | `rake log:clear`                | Clear Rails logs                                       |
-| `rn`    | `rake notes`                    | Search for notes (`FIXME`, `TODO`) in code comments    |
-| `rt`    | `rake test`                     | Run Rails tests                                        |
-| `rmd`   | `rake middleware`               | Interact with Rails middlewares                        |
-| `rsts`  | `rake stats`                    | Print code statistics                                  |
+| Alias   | Command                          | Description                                            |
+| ------- | -------------------------------- | ------------------------------------------------------ |
+| `rc`    | `rails console`                  | Interact with your Rails app from the CLI              |
+| `rcs`   | `rails console --sandbox`        | Test code in a sandbox, without changing any data      |
+| `rd`    | `rails destroy`                  | Undo a generate operation                              |
+| `rdb`   | `rails dbconsole`                | Interact with your db from the console                 |
+| `rdc`   | `rails db:create`                | Create the database                                    |
+| `rdd`   | `rails db:drop`                  | Delete the database                                    |
+| `rdm`   | `rails db:migrate`               | Run pending db migrations                              |
+| `rdmd`  | `rails db:migrate:down`          | Undo specific db migration                             |
+| `rdmr`  | `rails db:migrate:redo`          | Redo specific db migration                             |
+| `rdms`  | `rails db:migrate:status`        | Show current db migration status                       |
+| `rdmtc` | `rails db:migrate db:test:clone` | Run pending migrations and clone db into test database |
+| `rdmu`  | `rails db:migrate:up`            | Run specific db migration                              |
+| `rdr`   | `rails db:rollback`              | Roll back the last migration                           |
+| `rdrs`  | `rails db:reset`                 | Delete the database and set it up again                |
+| `rds`   | `rails db:seed`                  | Seed the database                                      |
+| `rdsl`  | `rails db:schema:load`           | Load the database schema                               |
+| `rdtc`  | `rails db:test:clone`            | Clone the database into the test database              |
+| `rdtp`  | `rails db:test:prepare`          | Duplicate the db schema into your test database        |
+| `rgen`  | `rails generate`                 | Generate boilerplate code                              |
+| `rgm`   | `rails generate migration`       | Generate a db migration                                |
+| `rlc`   | `rails log:clear`                | Clear Rails logs                                       |
+| `rmd`   | `rails middleware`               | Interact with Rails middlewares                        |
+| `rn`    | `rails notes`                    | Search for notes (`FIXME`, `TODO`) in code comments    |
+| `rp`    | `rails plugin`                   | Run a Rails plugin command                             |
+| `rr`    | `rails routes`                   | List all defined routes                                |
+| `rrg`   | `rails routes \| grep`           | List and filter the defined routes                     |
+| `rs`    | `rails server`                   | Launch a web server                                    |
+| `rsb`   | `rails server --bind`            | Launch a web server binding it to a specific IP        |
+| `rsd`   | `rails server --debugger`        | Launch a web server with debugger                      |
+| `rsp`   | `rails server --port`            | Launch a web server and specify the listening port     |
+| `rsts`  | `rails stats`                    | Print code statistics                                  |
+| `rt`    | `rails test`                     | Run Rails tests                                        |
+| `ru`    | `rails runner`                   | Run Ruby code in the context of Rails                  |
 
 ### Utility aliases
 
 | Alias     | Command                       | Description                                    |
-|-----------|-------------------------------|------------------------------------------------|
+| --------- | ----------------------------- | ---------------------------------------------- |
 | `devlog`  | `tail -f log/development.log` | Show and follow changes to the development log |
 | `prodlog` | `tail -f log/production.log`  | Show and follow changes to the production log  |
 | `testlog` | `tail -f log/test.log`        | Show and follow changes to the test log        |
@@ -60,7 +59,7 @@ plugins=(... rails)
 ### Environment settings
 
 | Alias | Command                 | Description                     |
-|-------|-------------------------|---------------------------------|
+| ----- | ----------------------- | ------------------------------- |
 | `RED` | `RAILS_ENV=development` | Sets `RAILS_ENV` to development |
 | `REP` | `RAILS_ENV=production`  | Sets `RAILS_ENV` to production  |
 | `RET` | `RAILS_ENV=test`        | Sets `RAILS_ENV` to test        |
@@ -68,15 +67,41 @@ plugins=(... rails)
 These are global aliases. Use in combination with a command or just run them
 separately. For example: `REP rake db:migrate` will migrate the production db.
 
+### Legacy rake aliases
+
+The following commands are run [using `rails` instead of `rake` since Rails v5][1], but are preserved under the
+prefix `rk` for backwards compatibility.
+
+[1]: https://guides.rubyonrails.org/v5.2/command_line.html#bin-rails
+
+| Alias    | Command                         | Description                                            |
+| -------- | ------------------------------- | ------------------------------------------------------ |
+| `rkdc`   | `rake db:create`                | Create the database                                    |
+| `rkdd`   | `rake db:drop`                  | Delete the database                                    |
+| `rkdm`   | `rake db:migrate`               | Run pending db migrations                              |
+| `rkdms`  | `rake db:migrate:status`        | Show current db migration status                       |
+| `rkdmtc` | `rake db:migrate db:test:clone` | Run pending migrations and clone db into test database |
+| `rkdr`   | `rake db:rollback`              | Roll back the last migration                           |
+| `rkdrs`  | `rake db:reset`                 | Delete the database and set it up again                |
+| `rkds`   | `rake db:seed`                  | Seed the database                                      |
+| `rkdsl`  | `rake db:schema:load`           | Load the database schema                               |
+| `rkdtc`  | `rake db:test:clone`            | Clone the database into the test database              |
+| `rkdtp`  | `rake db:test:prepare`          | Duplicate the db schema into your test database        |
+| `rklc`   | `rake log:clear`                | Clear Rails logs                                       |
+| `rkmd`   | `rake middleware`               | Interact with Rails middlewares                        |
+| `rkn`    | `rake notes`                    | Search for notes (`FIXME`, `TODO`) in code comments    |
+| `rksts`  | `rake stats`                    | Print code statistics                                  |
+| `rkt`    | `rake test`                     | Run Rails tests                                        |
+
 ### Legacy stuff
 
 | Alias   | Command                            |
-|---------|------------------------------------|
-| `sstat` | `thin --stats "/thin/stats" start` |
-| `sg`    | `ruby script/generate`             |
+| ------- | ---------------------------------- |
+| `sc`    | `ruby script/console`              |
 | `sd`    | `ruby script/destroy`              |
+| `sd`    | `ruby script/server --debugger`    |
+| `sg`    | `ruby script/generate`             |
 | `sp`    | `ruby script/plugin`               |
 | `sr`    | `ruby script/runner`               |
 | `ssp`   | `ruby script/spec`                 |
-| `sc`    | `ruby script/console`              |
-| `sd`    | `ruby script/server --debugger`    |
+| `sstat` | `thin --stats "/thin/stats" start` |
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 29b413434..f2b0f8293 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -43,47 +43,67 @@ alias rc='rails console'
 alias rcs='rails console --sandbox'
 alias rd='rails destroy'
 alias rdb='rails dbconsole'
+alias rdc='rails db:create'
+alias rdd='rails db:drop'
+alias rdm='rails db:migrate'
+alias rdmd='rails db:migrate:down'
+alias rdmr='rails db:migrate:redo'
+alias rdms='rails db:migrate:status'
+alias rdmtc='rails db:migrate db:test:clone'
+alias rdmu='rails db:migrate:up'
+alias rdr='rails db:rollback'
+alias rdrs='rails db:reset'
+alias rds='rails db:seed'
+alias rdsl='rails db:schema:load'
+alias rdtc='rails db:test:clone'
+alias rdtp='rails db:test:prepare'
 alias rgen='rails generate'
 alias rgm='rails generate migration'
+alias rlc='rails log:clear'
+alias rmd='rails middleware'
+alias rn='rails notes'
 alias rp='rails plugin'
 alias rr='rails routes'
 alias rrg='rails routes | grep'
-alias ru='rails runner'
 alias rs='rails server'
+alias rsb='rails server --bind'
 alias rsd='rails server --debugger'
 alias rsp='rails server --port'
-alias rsb='rails server --bind'
+alias rsts='rails stats'
+alias rt='rails test'
+alias ru='rails runner'
+
 
 # Rake aliases
-alias rdm='rake db:migrate'
-alias rdmr='rake db:migrate:redo'
-alias rdmd='rake db:migrate:down'
-alias rdms='rake db:migrate:status'
-alias rdmu='rake db:migrate:up'
-alias rdr='rake db:rollback'
-alias rdc='rake db:create'
-alias rds='rake db:seed'
-alias rdd='rake db:drop'
-alias rdrs='rake db:reset'
-alias rdtc='rake db:test:clone'
-alias rdtp='rake db:test:prepare'
-alias rdmtc='rake db:migrate db:test:clone'
-alias rdsl='rake db:schema:load'
-alias rlc='rake log:clear'
-alias rn='rake notes'
-alias rt='rake test'
-alias rmd='rake middleware'
-alias rsts='rake stats'
+alias rkdc='rake db:create'
+alias rkdd='rake db:drop'
+alias rkdm='rake db:migrate'
+alias rkdmd='rake db:migrate:down'
+alias rkdmr='rake db:migrate:redo'
+alias rkdms='rake db:migrate:status'
+alias rkdmtc='rake db:migrate db:test:clone'
+alias rkdmu='rake db:migrate:up'
+alias rkdr='rake db:rollback'
+alias rkdrs='rake db:reset'
+alias rkds='rake db:seed'
+alias rkdsl='rake db:schema:load'
+alias rkdtc='rake db:test:clone'
+alias rkdtp='rake db:test:prepare'
+alias rklc='rake log:clear'
+alias rkmd='rake middleware'
+alias rkn='rake notes'
+alias rksts='rake stats'
+alias rkt='rake test'
 
 # legacy stuff
-alias sstat='thin --stats "/thin/stats" start'
-alias sg='ruby script/generate'
+alias sc='ruby script/console'
 alias sd='ruby script/destroy'
+alias sd='ruby script/server --debugger'
+alias sg='ruby script/generate'
 alias sp='ruby script/plugin'
 alias sr='ruby script/runner'
 alias ssp='ruby script/spec'
-alias sc='ruby script/console'
-alias sd='ruby script/server --debugger'
+alias sstat='thin --stats "/thin/stats" start'
 
 function remote_console() {
   /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"

From 47d313c90409f63ee6b06c65f2372bbf847c106b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Mar 2022 15:20:03 +0100
Subject: [PATCH 541/591] chore(rails): fix comments and docs

---
 plugins/rails/README.md        | 11 ++++++++---
 plugins/rails/rails.plugin.zsh | 12 ++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/plugins/rails/README.md b/plugins/rails/README.md
index 0a6c68c75..3eee12fbd 100644
--- a/plugins/rails/README.md
+++ b/plugins/rails/README.md
@@ -1,6 +1,7 @@
 # Rails
 
-This plugin adds completion for [Ruby On Rails Framework](https://rubyonrails.org/) and [Rake](https://ruby.github.io/rake/) commands, as well as some aliases for logs and environment variables.
+This plugin adds completion for [Ruby On Rails Framework](https://rubyonrails.org/) and
+[Rake](https://ruby.github.io/rake/) commands, as well as some aliases for logs and environment variables.
 
 To use it, add `rails` to the plugins array in your zshrc file:
 
@@ -67,7 +68,9 @@ plugins=(... rails)
 These are global aliases. Use in combination with a command or just run them
 separately. For example: `REP rake db:migrate` will migrate the production db.
 
-### Legacy rake aliases
+## Legacy
+
+### Rake aliases
 
 The following commands are run [using `rails` instead of `rake` since Rails v5][1], but are preserved under the
 prefix `rk` for backwards compatibility.
@@ -93,7 +96,7 @@ prefix `rk` for backwards compatibility.
 | `rksts`  | `rake stats`                    | Print code statistics                                  |
 | `rkt`    | `rake test`                     | Run Rails tests                                        |
 
-### Legacy stuff
+### Other
 
 | Alias   | Command                            |
 | ------- | ---------------------------------- |
@@ -105,3 +108,5 @@ prefix `rk` for backwards compatibility.
 | `sr`    | `ruby script/runner`               |
 | `ssp`   | `ruby script/spec`                 |
 | `sstat` | `thin --stats "/thin/stats" start` |
+
+- `remote_console <server> <directory>`: runs `ruby script/console production` on a remote server.
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index f2b0f8293..e724bffc4 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -1,3 +1,4 @@
+# rails command wrapper
 function _rails_command () {
   if [ -e "bin/stubs/rails" ]; then
     bin/stubs/rails $@
@@ -12,28 +13,31 @@ function _rails_command () {
   fi
 }
 
+alias rails='_rails_command'
+compdef _rails_command=rails
+
+# rake command wrapper
 function _rake_command () {
   if [ -e "bin/stubs/rake" ]; then
     bin/stubs/rake $@
   elif [ -e "bin/rake" ]; then
     bin/rake $@
-  elif type bundle &> /dev/null && ([ -e "Gemfile" ] || [ -e "gems.rb" ]); then
+  elif type bundle &> /dev/null && [[ -e "Gemfile" || -e "gems.rb" ]]; then
     bundle exec rake $@
   else
     command rake $@
   fi
 }
 
-alias rails='_rails_command'
-compdef _rails_command=rails
-
 alias rake='_rake_command'
 compdef _rake_command=rake
 
+# Log aliases
 alias devlog='tail -f log/development.log'
 alias prodlog='tail -f log/production.log'
 alias testlog='tail -f log/test.log'
 
+# Environment settings
 alias -g RED='RAILS_ENV=development'
 alias -g REP='RAILS_ENV=production'
 alias -g RET='RAILS_ENV=test'

From 98ed582e6a143517d8c1ac229a4da8e4246217f1 Mon Sep 17 00:00:00 2001
From: romanch <romanchsharma@gmail.com>
Date: Fri, 15 Jan 2021 09:33:48 +0530
Subject: [PATCH 542/591] feat(rails): add `fmns` alias for `foreman start`
 (#9600)

Closes #9600
---
 plugins/rails/README.md        | 6 ++++++
 plugins/rails/rails.plugin.zsh | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/plugins/rails/README.md b/plugins/rails/README.md
index 3eee12fbd..fa66750f0 100644
--- a/plugins/rails/README.md
+++ b/plugins/rails/README.md
@@ -49,6 +49,12 @@ plugins=(... rails)
 | `rt`    | `rails test`                     | Run Rails tests                                        |
 | `ru`    | `rails runner`                   | Run Ruby code in the context of Rails                  |
 
+### Foreman
+
+| Alias  | Command         | Description                               |
+| ------ | --------------- | ----------------------------------------- |
+| `fmns` | `foreman start` | Interact with your Rails app from the CLI |
+
 ### Utility aliases
 
 | Alias     | Command                       | Description                                    |
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index e724bffc4..b11cbb5c7 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -77,6 +77,8 @@ alias rsts='rails stats'
 alias rt='rails test'
 alias ru='rails runner'
 
+# Foreman aliases
+alias fmns='foreman start'
 
 # Rake aliases
 alias rkdc='rake db:create'

From 40f49342f587167292461242dc13fdb93363278a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Mar 2022 16:01:34 +0100
Subject: [PATCH 543/591] fix(rails): bundle more up-to-date zsh-completions
 completion version

Source: https://github.com/zsh-users/zsh-completions/blob/55d07cc/src/_rails
---
 plugins/rails/_rails | 672 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 615 insertions(+), 57 deletions(-)

diff --git a/plugins/rails/_rails b/plugins/rails/_rails
index ad7505506..6dc85d458 100644
--- a/plugins/rails/_rails
+++ b/plugins/rails/_rails
@@ -1,66 +1,624 @@
 #compdef rails
-#autoload
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Ruby on Rails (http://rubyonrails.org/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Kazuya Takeshima (https://github.com/mitukiii)
+#
+# ------------------------------------------------------------------------------
 
-local -a _1st_arguments
-_1st_arguments=(
-    'generate:Generate new code (short-cut alias: "g")'
-    'console:Start the Rails console (short-cut alias: "c")'
-    'server:Start the Rails server (short-cut alias: "s")'
-    'dbconsole:Start a console for the database specified in config/database.yml (short-cut alias: "db")'
-    'new:Create a new Rails application. "rails new my_app" creates a new application called MyApp in "./my_app"'
-    'application:Generate the Rails application code'
-    'destroy:Undo code generated with "generate"'
 
-    'benchmarker:See how fast a piece of code runs'
-    'profiler:Get profile information from a piece of code'
-    'plugin:Install a plugin'
+_rails() {
+  local context state line curcontext="$curcontext"
 
-    'plugin new:Generates skeleton for developing a Rails plugin'
-    'runner:Run a piece of code in the application environment (short-cut alias: "r")'
-)
-
-_rails_generate_arguments() {
-    generate_arguments=(
-        assets
-        controller
-        decorator
-        generator
-        helper
-        integration_test
-        mailer
-        migration
-        model
-        observer
-        performance_test
-        plugin
-        resource
-        scaffold
-        scaffold_controller
-        session_migration
-        stylesheets
-        task
-    )
+  if (( CURRENT > 2 )); then
+    (( CURRENT-- ))
+    shift words
+    _call_function - "_rails_${words[1]}" || _nothing
+  else
+    __rails_commands
+  fi
 }
 
+__rails_commands() {
+  local context state line curcontext="$curcontext"
 
-_arguments \
-    '(--version)--version[show version]' \
-    '(--help)--help[show help]' \
-    '*:: :->subcmds' && return 0
+  local -a rails_options
+  __rails_setup_rails_options
 
-if (( CURRENT == 1 )); then
-  _describe -t commands "rails subcommand" _1st_arguments
-  return
-else
-  _files
-  return
-fi
+  _arguments -C \
+    $rails_options \
+    ': :->command'
 
-case "$words[1]" in
-  g|generate)
-    _rails_generate_arguments
-    _wanted generate_arguments expl 'all generate' compadd -a generate_arguments ;;
-  d|destroy)
-    _rails_generate_arguments
-    _wanted generate_arguments expl 'all generate' compadd -a generate_arguments ;;
-esac
+  case "$state" in
+    command)
+      local -a commands
+      local application_directory
+      __rails_setup_application_directory
+
+      if [ -n "$application_directory" ]; then
+        commands=(
+          {generate,g}'[Generate new code]'
+          {console,c}'[Start the Rails console]'
+          {server,s}'[Start the Rails server]'
+          {dbconsole,db}'[Start a console for the database specified in config/database.yml]'
+          application'[Generate the Rails application code]'
+          {destroy,d}'[Undo code generated with "generate"]'
+          benchmarker'[See how fast a piece of code runs]'
+          profiler'[Get profile information from a piece of code]'
+          plugin'[Install a plugin]'
+          {runner,r}'[Run a piece of code in the application environment]'
+          {test,t}'[Run tests]'
+        )
+      else
+        commands=(
+          new'[Create a new Rails application]'
+        )
+      fi
+
+      _values 'command' $commands
+      ;;
+  esac
+}
+
+__rails_setup_application_directory() {
+  application_directory="$(pwd)"
+
+  while [ -n "$application_directory" ]; do
+    if [ -f "${application_directory}/script/rails" -o -f "${application_directory}/bin/rails" ]; then
+      return
+    fi
+    application_directory="${application_directory%/*}"
+  done
+
+  application_directory=
+}
+
+__rails_setup_rails_options() {
+  rails_options=(
+    {-h,--help}'[Show this help message and quit]'
+    {-v,--version}'[Show Rails version number and quit]'
+  )
+}
+
+__rails_setup_runtime_options() {
+  runtime_options=(
+    '(-f --force)'{-f,--force}'[Overwrite files that already exist]'
+    '(-p --pretend)'{-p,--pretend}'[Run but do not make any changes]'
+    '(-q --quiet)'{-q,--quiet}'[Suppress status output]'
+    '(-s --skip)'{-s,--skip}'[Skip files that already exist]'
+  )
+}
+
+__rails_setup_generators_options() {
+  local -a runtime_options
+  __rails_setup_runtime_options
+
+  generators_options=(
+    $runtime_options
+    --skip-namespace'[Skip namespace (affects only isolated applications)]'
+    --old-style-hash"[Force using old style hash (:foo => 'bar') on Ruby >= 1.9]"
+  )
+}
+
+__rails_setup_model_generators_options() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  model_generators_options=(
+    $generators_options
+    '(-o --orm)'{-o,--orm=}'[Orm to be invoked]:orm'
+  )
+}
+
+__rails_setup_resource_generators_options() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  resource_generators_options=(
+    $model_generators_options
+    --force-plural'[Forces the use of a plural ModelName]'
+    --resource-route'[Indicates when to generate resource route]: :__rails_boolean'
+  )
+}
+
+__rails_boolean() {
+  _values 'boolean' 'true' 'false'
+}
+
+__rails_migration_fields() {
+  if compset -P '*:*:'; then
+    _values 'index' 'index' 'uniq'
+  else
+    if compset -P '*:'; then
+      _values -s ':' 'type' 'string' 'text' 'integer' 'float' 'decimal' 'datetime' 'timestamp' 'time' 'date' 'binary' 'boolean' 'references'
+    else
+      _guard '[[:alnum:]_]#' 'field'
+    fi
+  fi
+}
+
+_rails_generate() {
+  local context state line curcontext="$curcontext"
+
+  if (( CURRENT > 2 )); then
+    (( CURRENT-- ))
+    shift words
+    _call_function - "_rails_generate_${words[1]}" || _rails_generate_default
+  else
+    __rails_generate_commands
+  fi
+}
+
+_rails_g() {
+  _rails_generate
+}
+
+__rails_generate_commands() {
+  local context curcontext="$curcontext" update_policy
+
+  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+  if [ -z "$update_policy" ]; then
+    zstyle ":completion:${curcontext}:" cache-policy _rails_generate_commands_caching_policy
+  fi
+
+  local application_directory
+  __rails_setup_application_directory
+  local cache_name
+  cache_name="rails/${application_directory##*/}/all_generators"
+  if ! _retrieve_cache ${cache_name}; then
+    local -a all_generators
+    all_generators=($(_call_program rails_generators rails generate 2> /dev/null | awk '/^  [a-zA-Z_]+/{ print $1 }'))
+    _store_cache ${cache_name} all_generators
+  fi
+
+  local -a rails_generators
+  rails_generators=(${all_generators:#*:*})
+  _describe -t rails_generators 'rails generator' rails_generators
+
+  local -a -U namespaces
+  local namespace
+  local -a generators
+  namespaces=(${(R)${(M)all_generators:#*:*}%:*})
+  for namespace in $namespaces; do
+    generators=(${${(M)all_generators:#${namespace}:*}/:/\\:})
+    _describe -t ${namespace}_generators "${namespace/_/ } generator" generators
+  done
+}
+
+_rails_generate_commands_caching_policy() {
+  local application_directory
+  __rails_setup_application_directory
+
+  if [ "${application_directory}/Gemfile" -nt "$1" ]; then
+    return 0
+  fi
+
+  local -a oldp
+  oldp=( "$1"(Nmw+1) )
+  (( $#oldp ))
+}
+
+_rails_generate_default() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '*:argument'
+}
+
+_rails_generate_assets() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-j --javascripts)'{-j,--javascripts}'[Generate JavaScripts]: :__rails_boolean' \
+    '(-y --stylesheets)'{-y,--stylesheets}'[Generate Stylesheets]: :__rails_boolean' \
+    '(-je --javascript-engine)'{-je,--javascript-engine=}'[Engine for JavaScripts]:javascript engine' \
+    '(-se --stylesheet-engine)'{-se,--stylesheet-engine=}'[Engine for Stylesheets]:stylesheet engine' \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_controller() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+    --helper'[Indicates when to generate helper]: :__rails_boolean' \
+    --assets'[Indicates when to generate assets]: :__rails_boolean' \
+    ': :_guard "^-*" "name"' \
+    '*: :_guard "^-*" "action"'
+}
+
+_rails_generate_generator() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    --namespace'[Namespace generator under lib/generators/name]: :__rails_boolean' \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_helper() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+    ': :_guard "^-*" "name"' \
+}
+
+_rails_generate_integration_test() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    --integration-tool='[Integration tool to be invoke]:integration tool' \
+    ': :_guard "^-*" "name"' \
+}
+
+_rails_generate_jbuilder() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    ': :_guard "^-*" "name"' \
+    '*: :__rails_migration_fields'
+}
+
+_rails_generate_mailer() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+    ': :_guard "^-*" "name"' \
+    '*: :_guard "^-*" "method"'
+}
+
+_rails_generate_migration() {
+  local -a modelgenerators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    ': :_guard "^-*" "name"' \
+    '*: :__rails_migration_fields'
+}
+
+_rails_generate_model() {
+  _rails_generate_migration
+}
+
+_rails_generate_observer() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_performance_test() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    --performance-tool='[Performance tool to be invoked]:performance tool' \
+    ': :_guard "^-*" "name"' \
+}
+
+_rails_generate_resource() {
+  local context state line curcontext="$curcontext"
+
+  local -a resource_generators_options
+  __rails_setup_resource_generators_options
+
+  _arguments -C \
+    $resource_generators_options \
+    '(-c --resource-controller)'{-c,--resource-controller=}'[Resource controller to be invoked]:name' \
+    '(-a --actions)'{-a,--actions=}'[Actions for the resource controller]: :->actions' \
+    ': :->name' \
+    '*: :->fields'
+
+  if (( words[(I)(--actions=*|-a)] > 0 && words[(I)(--actions=*|-a)] == words[(I)-*] )); then
+    state=actions
+  fi
+
+  case "$state" in
+    actions)
+      _guard "[[:alnum:]_]#" "actions"
+      ;;
+    name)
+      _guard "^-*" "name"
+      ;;
+    fields)
+      __rails_migration_fields
+      ;;
+  esac
+}
+
+_rails_generate_scaffold() {
+  local -a resource_generators_options
+  __rails_setup_resource_generators_options
+
+  _arguments \
+    $resource_generators_options \
+    '(-y --stylesheets)'{-y,--stylesheets}'[Generate Stylesheets]: :__rails_boolean' \
+    '(-se --stylesheet-engine)'{-se,--stylesheet-engine=}'[Engine for Stylesheets]:stylesheet engine' \
+    '(-c --scaffold-controller)'{-c,--scaffold-controller=}'[Scaffold controller to be invoked]:name' \
+    --assets'[Indicates when to generate assets]:boolean:(true false)' \
+    ': :_guard "^-*" "name"' \
+    '*: :__rails_migration_fields'
+}
+
+_rails_generate_scaffold_controller() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+      --helper'[Indicates when to generate helper]: :__rails_boolean' \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_session_migration() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_task() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    ': :_guard "^-*" "name"' \
+    '*: :_guard "^-*" "action"'
+}
+
+_rails_console() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-s --sandbox)'{-s,--sandbox}'[Rollback database modifications on exit]' \
+    --debugger'[Enable ruby-debugging for the console]'
+}
+
+_rails_c() {
+  _rails_console
+}
+
+_rails_server() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-p --port)'{-p,--port=}'[Runs Rails on the specified port]: :_guard "[[\:digit\:]]#" "port"' \
+    '(-b --binding)'{-b,--binding=}'[Binds Rails to the specified ip]:ip:_hosts' \
+    '(-c --config)'{-c,--config=}'[Use custom rackup configuration file]:file:_files -g "*.ru"' \
+    '(-d --daemon)'{-d,--daemon}'[Make server run as a Daemon]' \
+    '(-u --debugger)'{-u,--debugger}'[Enable ruby-debugging for the server]' \
+    '(-e --environment)'{-e,--environment=}'[Specifies the environment to run this server under (test/development/production)]:name:(test development production)' \
+    '(-P --pid)'{-P,--pid=}'[Specifies the PID file]:pid:_files -g "*.pid"'
+}
+
+_rails_s() {
+  _rails_server
+}
+
+_rails_dbconsole() {
+  _arguments \
+    '(- *)'--help'[Show this help message]' \
+    '(-p --include-password)'{-p,--include-password}'[Automatically provide the password from database.yml]' \
+    --mode'[Automatically put the sqlite3 database in the specified mode (html, list, line, column)]:mode:(html list line column)' \
+    --header
+}
+
+_rails_new() {
+  local context state line curcontext="$curcontext"
+
+  local _a rails_options runtime_options
+  __rails_setup_rails_options
+  __rails_setup_runtime_options
+
+  _arguments -C \
+    $rails_options \
+    $runtime_options \
+    '(-r --ruby)'{-r,--ruby=}'[Path to the Ruby binary of your choice]:path' \
+    '(-b --builder)'{-b,--builder=}'[Path to a application builder (can be a filesystem path or URL)]: :->path_or_url' \
+    '(-m --template)'{-m,--template=}'[Path to an application template (can be a filesystem path or URL)]: :->path_or_url' \
+    --skip-gemfile"[Don't create a Gemfile]" \
+    --skip-bundle"[Don't run bundle install]" \
+    '(-G --skip-git)'{-G,--skip-git}'[Skip Git ignores and keeps]' \
+    '(-O --skip-active-record)'{-O,--skip-active-record}'[Skip Active Record files]' \
+    '(-S --skip-sprockets)'{-S,--skip-sprockets}'[Skip Sprockets files]' \
+    '(-d --database)'{-d,--database=}'[Preconfigure for selected database]:database:(mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc)' \
+    '(-j --javascript)'{-j,--javascript=}'[Preconfigure for selected JavaScript library]:javascript' \
+    '(-J --skip-javascript)'{-J,--skip-javascript}'[Skip JavaScript files]' \
+    --dev'[Setup the application with Gemfile pointing to your Rails checkout]' \
+    --edge'[Setup the application with Gemfile pointing to Rails repository]' \
+    '(-T --skip-test-unit)'{-T,--skip-test-unit}'[Skip Test::Unit files]' \
+    --old-style-hash"[Force using old style hash (:foo => 'bar') on Ruby >= 1.9]" \
+    ':app path:_directories'
+
+  case "$state" in
+    path_or_url)
+      _alternative \
+        'files:path:_files -g "*.rb"' \
+        'url:url:_urls'
+      ;;
+  esac
+}
+
+_rails_application() {
+  _rails_new
+}
+
+_rails_db() {
+  _rails_dbconsole
+}
+
+_rails_destroy() {
+  _rails_generate
+}
+
+_rails_d() {
+  _rails_destroy
+}
+
+_rails_benchmarker() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-r --runs)'{-r,--runs}'[Number of runs]: :_guard "[[\:digit\:]]#" "number"' \
+    '(-o --output)'{-o,--output}'[Directory to use when writing the results]:directory:_directories' \
+    '(-m --metrics)'{-m,--metrics}'[Metrics to use]: :_values -s "," "metrics" "wall_time" "memory" "objects" "gc_runs" "gc_time"' \
+    '*: :_guard "^-*" "ruby code"'
+}
+
+_rails_profiler() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-r --runs)'{-r,--runs}'[Number of runs]: :_guard "[[\:digit\:]]#" "number"' \
+    '(-o --output)'{-o,--output}'[Directory to use when writing the results]:directory:_directories' \
+    '(-m --metrics)'{-m,--metrics}'[Metrics to use]: :_values -s "," "metrics" "process_time" "memory" "objects"' \
+    '(-f --formats)'{-f,--formats}'[Formats to output to]: :_values -s "," "formats" "flat" "graph" "html" "call_tree" "call_stack"' \
+    '*: :_guard "^-*" "ruby code"'
+}
+
+_rails_plugin() {
+  local context state line curcontext="$curcontext"
+
+  if (( CURRENT > 2 )); then
+    (( CURRENT-- ))
+    shift words
+    _call_function - "_rails_plugin_${words[1]}" || _nothing
+  else
+    __rails_plugin_commands
+  fi
+}
+
+__rails_plugin_commands() {
+  _values 'plugin command' \
+    install'[Install plugin(s) from known repositories or URLs]' \
+    remove'[Uninstall plugins]' \
+    new
+}
+
+_rails_plugin_install() {
+  _arguments \
+    '(-x --externals)'{-x,--externals}'[Use svn:externals to grab the plugin. Enables plugin updates and plugin versioning]' \
+    '(-o --checkout)'{-o,--checkout}'[Use svn checkout to grab the plugin. Enables updating but does not add a svn:externals entry]' \
+    '(-e --export)'{-e,--export}'[Use svn export to grab the plugin. Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry]' \
+    '(-q --quiet)'{-q,--quiet}'[Suppresses the output from installation. Ignored if -v is passed (rails plugin -v install ...)]' \
+    '(-r --revision)'{-r,--revision=}'[Checks out the given revision from subversion or git. Ignored if subversion/git is not used]:revision' \
+    '(-f --force)'{-f,--force}"[Reinstalls a plugin if it's already installed]" \
+    '*:plugin:_urls'
+}
+
+_rails_plugin_remove() {
+  local -a plugins
+
+  plugins=($(_call_program rails_plugins ls -1 vendor/plugins))
+
+  _describe -t plugins 'plugin' plugins
+}
+
+_rails_plugin_new() {
+  _rails_new
+}
+
+_rails_runner() {
+  local context state line curcontext="$curcontext"
+
+  _arguments -C \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-e --environment)'{-e,--environment=}'[Specifies the environment for the runner to operate under (test/development/production)]:name:(test development production)' \
+    ': :->code_or_path'
+
+  case "$state" in
+    code_or_path)
+      _alternative \
+        'files:filename:_files -g "*.rb"' \
+        'codes:ruby code:_guard "^-*" "ruby code"'
+      ;;
+  esac
+}
+
+_rails_r() {
+  _rails_runner
+}
+
+_rails_test() {
+  local context state line curcontext="$curcontext"
+
+  _arguments -C \
+    ': :->path'
+
+  case "$state" in
+    path)
+      _alternative \
+        'files:filename:_files -g "*.rb"'
+      ;;
+  esac
+}
+
+_rails_t() {
+  _rails_test
+}
+
+_rails "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

From c10241f3d1d7bf77d483e11869a6a00f1d2e5e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 10 Mar 2022 12:58:46 +0100
Subject: [PATCH 544/591] chore: add Carlo sponsorship

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 484a8cf53..6c86ac450 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,2 @@
-github: [ohmyzsh, robbyrussell, mcornella, larson-carter]
+github: [ohmyzsh, robbyrussell, mcornella, larson-carter, carlosala]
 open_collective: ohmyzsh

From c4699f8ee11ab74cd5ef1d7ae13c170fd5e7f976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 10 Mar 2022 20:41:10 +0100
Subject: [PATCH 545/591] fix(dash): fix "no application knows how to open URL"
 error (#10767)

Fixes #10767
---
 plugins/dash/dash.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dash/dash.plugin.zsh b/plugins/dash/dash.plugin.zsh
index ace2e33c1..0a627cb7d 100644
--- a/plugins/dash/dash.plugin.zsh
+++ b/plugins/dash/dash.plugin.zsh
@@ -1,5 +1,5 @@
 # Usage: dash [keyword:]query
-dash() { open dash://"$*" }
+dash() { open -a Dash.app dash://"$*" }
 compdef _dash dash
 
 _dash() {

From 345976874550efa09fa7e9cdbe1215ce27d1541b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 10 Mar 2022 20:56:37 +0100
Subject: [PATCH 546/591] perf(dash): improve dash completion performance

---
 plugins/dash/dash.plugin.zsh | 130 ++++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 63 deletions(-)

diff --git a/plugins/dash/dash.plugin.zsh b/plugins/dash/dash.plugin.zsh
index 0a627cb7d..f6801a870 100644
--- a/plugins/dash/dash.plugin.zsh
+++ b/plugins/dash/dash.plugin.zsh
@@ -5,76 +5,80 @@ compdef _dash dash
 _dash() {
   # No sense doing this for anything except the 2nd position and if we haven't
   # specified which docset to query against
-  if [[ $CURRENT -eq 2 && ! "$words[2]" =~ ":" ]]; then
-    local -a _all_docsets
-    _all_docsets=()
-    # Use defaults to get the array of docsets from preferences
-    # Have to smash it into one big line so that each docset is an element of
-    # our DOCSETS array
-    DOCSETS=("${(@f)$(defaults read com.kapeli.dashdoc docsets | tr -d '\n' | grep -oE '\{.*?\}')}")
+  if [[ $CURRENT -ne 2 || "$words[2]" =~ ":" ]]; then
+    return
+  fi
 
-    # remove all newlines since defaults prints so pretty like
-    # Now get each docset and output each on their own line
-    for doc in "$DOCSETS[@]"; do
-      # Only output docsets that are actually enabled
-      if [[ "`echo $doc | grep -Eo \"isEnabled = .*?;\" | sed 's/[^01]//g'`" == "0" ]]; then
+  local -aU docsets
+  docsets=()
+
+  # Use defaults to get the array of docsets from preferences
+  # Have to smash it into one big line so that each docset is an element of our docsets array
+  # Only output docsets that are actually enabled
+  local -a enabled_docsets
+  enabled_docsets=("${(@f)$(defaults read com.kapeli.dashdoc docsets \
+    | tr -d '\n' | grep -oE '\{.*?\}' | grep -E 'isEnabled = 1;')}")
+
+  local docset name keyword
+  # Now get each docset and output each on their own line
+  for docset in "$enabled_docsets[@]"; do
+    keyword=''
+    # Order of preference as explained to me by @kapeli via email
+    for locator in keyword suggestedKeyword platform; do
+      # Echo the docset, try to find the appropriate keyword
+      # Strip doublequotes and colon from any keyword so that everything has the
+      # same format when output (we'll add the colon in the completion)
+      if [[ "$docset" =~ "$locator = ([^;]*);" ]]; then
+        keyword="${match[1]//[\":]}"
+      fi
+
+      if [[ -z "$keyword" ]]; then
         continue
       fi
 
-      keyword=''
-
-      # Order of preference as explained to me by @kapeli via email
-      KEYWORD_LOCATORS=(keyword suggestedKeyword platform)
-      for locator in "$KEYWORD_LOCATORS[@]"; do
-        # Echo the docset, try to find the appropriate keyword
-        # Strip doublequotes and colon from any keyword so that everything has the
-        # same format when output (we'll add the colon in the completion)
-        keyword=`echo $doc | grep -Eo "$locator = .*?;" | sed -e "s/$locator = \(.*\);/\1/" -e "s/[\":]//g"`
-        if [[ ! -z "$keyword" ]]; then
-          # if we fall back to platform, we should do some checking per @kapeli
-          if [[ "$locator" == "platform" ]]; then
-            # Since these are the only special cases right now, let's not do the
-            # expensive processing unless we have to
-            if [[ "$keyword" = (python|java|qt|cocos2d) ]]; then
-              docsetName=`echo $doc | grep -Eo "docsetName = .*?;" | sed -e "s/docsetName = \(.*\);/\1/" -e "s/[\":]//g"`
-              case "$keyword" in
-                python)
-                  case "$docsetName" in
-                    "Python 2") keyword="python2" ;;
-                    "Python 3") keyword="python3" ;;
-                  esac ;;
-                java)
-                  case "$docsetName" in
-                    "Java SE7") keyword="java7" ;;
-                    "Java SE6") keyword="java6" ;;
-                    "Java SE8") keyword="java8" ;;
-                  esac ;;
-                qt)
-                  case "$docsetName" in
-                    "Qt 5") keyword="qt5" ;;
-                    "Qt 4"|Qt) keyword="qt4" ;;
-                  esac ;;
-                cocos2d)
-                  case "$docsetName" in
-                    Cocos3D) keyword="cocos3d" ;;
-                  esac ;;
-              esac
-            fi
+      # if we fall back to platform, we should do some checking per @kapeli
+      if [[ "$locator" == "platform" ]]; then
+        # Since these are the only special cases right now, let's not do the
+        # expensive processing unless we have to
+        if [[ "$keyword" = (python|java|qt|cocos2d) ]]; then
+          if [[ "$docset" =~ "docsetName = ([^;]*);" ]]; then
+            name="${match[1]//[\":]}"
+            case "$keyword" in
+              python)
+                case "$name" in
+                  "Python 2") keyword="python2" ;;
+                  "Python 3") keyword="python3" ;;
+                esac ;;
+              java)
+                case "$name" in
+                  "Java SE7") keyword="java7" ;;
+                  "Java SE6") keyword="java6" ;;
+                  "Java SE8") keyword="java8" ;;
+                esac ;;
+              qt)
+                case "$name" in
+                  "Qt 5") keyword="qt5" ;;
+                  "Qt 4"|Qt) keyword="qt4" ;;
+                esac ;;
+              cocos2d)
+                case "$name" in
+                  Cocos3D) keyword="cocos3d" ;;
+                esac ;;
+            esac
           fi
-
-          # Bail once we have a match
-          break
         fi
-      done
-
-      # If we have a keyword, add it to the list!
-      if [[ ! -z "$keyword" ]]; then
-        _all_docsets+=($keyword)
       fi
+
+      # Bail once we have a match
+      break
     done
 
-    # special thanks to [arx] on #zsh for getting me sorted on this piece
-    compadd -qS: -- "$_all_docsets[@]"
-    return
-  fi
+    # If we have a keyword, add it to the list!
+    if [[ -n "$keyword" ]]; then
+      docsets+=($keyword)
+    fi
+  done
+
+  # special thanks to [arx] on #zsh for getting me sorted on this piece
+  compadd -qS: -- "$docsets[@]"
 }

From 0f2715bb45ef025b48469817712a4cd3e23839b6 Mon Sep 17 00:00:00 2001
From: Bunyamin Shabanov <42899786+MetaMmodern@users.noreply.github.com>
Date: Mon, 14 Mar 2022 19:09:45 +0200
Subject: [PATCH 547/591] docs: add Table of Contents to README (#10766)

Co-authored-by: Mohan Sha <mohansha@outlook.com>
---
 README.md | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 5a6b98443..4c41fad81 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,41 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 [![Gitpod ready](https://img.shields.io/badge/Gitpod-ready-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ohmyzsh/ohmyzsh)
 [![huntr.dev](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev/bounties/disclose/?utm_campaign=ohmyzsh%2Fohmyzsh&utm_medium=social&utm_source=github&target=https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh)
 
+<details>
+<summary>Table of Contents</summary>
+
+- [Getting Started](#getting-started)
+  - [Prerequisites](#prerequisites)
+  - [Basic Installation](#basic-installation)
+    - [Manual inspection](#manual-inspection)
+- [Using Oh My Zsh](#using-oh-my-zsh)
+  - [Plugins](#plugins)
+    - [Enabling Plugins](#enabling-plugins)
+    - [Using Plugins](#using-plugins)
+  - [Themes](#themes)
+    - [Selecting a Theme](#selecting-a-theme)
+  - [FAQ](#faq)
+- [Advanced Topics](#advanced-topics)
+  - [Advanced Installation](#advanced-installation)
+    - [Custom Directory](#custom-directory)
+    - [Unattended install](#unattended-install)
+    - [Installing from a forked repository](#installing-from-a-forked-repository)
+    - [Manual Installation](#manual-installation)
+  - [Installation Problems](#installation-problems)
+  - [Custom Plugins and Themes](#custom-plugins-and-themes)
+- [Getting Updates](#getting-updates)
+  - [Manual Updates](#manual-updates)
+- [Uninstalling Oh My Zsh](#uninstalling-oh-my-zsh)
+- [How do I contribute to Oh My Zsh?](#how-do-i-contribute-to-oh-my-zsh)
+  - [Do NOT send us themes](#do-not-send-us-themes)
+- [Contributors](#contributors)
+- [Follow Us](#follow-us)
+- [Merchandise](#merchandise)
+- [License](#license)
+- [About Planet Argon](#about-planet-argon)
+
+</details>
+
 ## Getting Started
 
 ### Prerequisites
@@ -32,7 +67,7 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl`, `wget` or another similar tool.
 
 | Method    | Command                                                                                           |
-|:----------|:--------------------------------------------------------------------------------------------------|
+| :-------- | :------------------------------------------------------------------------------------------------ |
 | **curl**  | `sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
 | **wget**  | `sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`   |
 | **fetch** | `sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
@@ -82,7 +117,7 @@ _Note that the plugins are separated by whitespace (spaces, tabs, new lines...).
 
 #### Using Plugins
 
-Each plugin includes a __README__, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin.
+Each plugin includes a **README**, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin.
 
 ### Themes
 
@@ -194,19 +229,19 @@ REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh
 
 #### Manual Installation
 
-##### 1. Clone the repository
+##### 1. Clone the repository <!-- omit in toc -->
 
 ```sh
 git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh
 ```
 
-##### 2. *Optionally*, backup your existing `~/.zshrc` file
+##### 2. _Optionally_, backup your existing `~/.zshrc` file <!-- omit in toc -->
 
 ```sh
 cp ~/.zshrc ~/.zshrc.orig
 ```
 
-##### 3. Create a new zsh configuration file
+##### 3. Create a new zsh configuration file <!-- omit in toc -->
 
 You can create a new zsh config file by copying the template that we have included for you.
 
@@ -214,7 +249,7 @@ You can create a new zsh config file by copying the template that we have includ
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 ```
 
-##### 4. Change your default shell
+##### 4. Change your default shell <!-- omit in toc -->
 
 ```sh
 chsh -s $(which zsh)
@@ -222,7 +257,7 @@ chsh -s $(which zsh)
 
 You must log out from your user session and log back in to see this change.
 
-##### 5. Initialize your new zsh configuration
+##### 5. Initialize your new zsh configuration <!-- omit in toc -->
 
 Once you open up a new terminal window, it should load zsh with Oh My Zsh's configuration.
 
@@ -230,10 +265,8 @@ Once you open up a new terminal window, it should load zsh with Oh My Zsh's conf
 
 If you have any hiccups installing, here are a few common fixes.
 
-- You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after
-switching to `oh-my-zsh`.
-- If you installed manually or changed the install location, check the `ZSH` environment variable in
-`~/.zshrc`.
+- You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after switching to `oh-my-zsh`.
+- If you installed manually or changed the install location, check the `ZSH` environment variable in `~/.zshrc`.
 
 ### Custom Plugins and Themes
 

From 4a988c46609c4c2d32240092899ae0aae45b11a6 Mon Sep 17 00:00:00 2001
From: thinszx <1217641779@qq.com>
Date: Thu, 17 Mar 2022 19:54:47 +0800
Subject: [PATCH 548/591] fix(updater): change remote using deprecated `git:`
 protocol (#10779)

---
 tools/upgrade.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index b6cb10b5a..afc6a98dd 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -164,6 +164,10 @@ git remote -v | while read remote url extra; do
   git@github.com:robbyrussell/oh-my-zsh(|.git))
     git remote set-url "$remote" "git@github.com:ohmyzsh/ohmyzsh.git"
     break ;;
+  # Update out-of-date "unauthenticated git protocol on port 9418" to https
+  git://github.com/robbyrussell/oh-my-zsh(|.git))
+    git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git"
+    break ;;
   esac
 done
 

From f0b5cb133063b16c25afd8740a0c96ca884ee822 Mon Sep 17 00:00:00 2001
From: Leon <82407168+sed-i@users.noreply.github.com>
Date: Fri, 18 Mar 2022 12:09:05 +0000
Subject: [PATCH 549/591] feat(terraform): add alias `tfo` for terraform output
 (#10667)

---
 plugins/terraform/README.md            | 1 +
 plugins/terraform/terraform.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index 474346dc0..59c6e7f2a 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -22,6 +22,7 @@ plugins=(... terraform)
 | `tfd` | `terraform destroy`  |
 | `tff` | `terraform fmt`      |
 | `tfi` | `terraform init`     |
+| `tfo` | `terraform output`   |
 | `tfp` | `terraform plan`     |
 | `tfv` | `terraform validate` |
 
diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index f224b79f0..d9e39e6ac 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -13,5 +13,6 @@ alias tfa='terraform apply'
 alias tfd='terraform destroy'
 alias tff='terraform fmt'
 alias tfi='terraform init'
+alias tfo='terraform output'
 alias tfp='terraform plan'
 alias tfv='terraform validate'

From c96fc233c4903ba75fba5bc55e7f91f9dc8e460e Mon Sep 17 00:00:00 2001
From: Wayne Lloyd <waynelloyd@outlook.com>
Date: Fri, 18 Mar 2022 12:11:00 +0000
Subject: [PATCH 550/591] fix(gpg-agent): suppress errors from `gpgconf`
 (#10769)

---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 0adc8de5d..1f4be20b0 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -9,7 +9,7 @@ autoload -U add-zsh-hook
 add-zsh-hook preexec _gpg-agent_update-tty_preexec
 
 # If enable-ssh-support is set, fix ssh agent integration
-if [[ $(gpgconf --list-options gpg-agent | awk -F: '$1=="enable-ssh-support" {print $10}') = 1 ]]; then
+if [[ $(gpgconf --list-options gpg-agent 2>/dev/null | awk -F: '$1=="enable-ssh-support" {print $10}') = 1 ]]; then
   unset SSH_AGENT_PID
   if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]]; then
     export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"

From 50113a53f379b7d98e6921ba58e8440324beb32c Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 22 Mar 2022 22:39:37 +0100
Subject: [PATCH 551/591] feat(toolbox): add plugin to show `toolbox` prompt
 info (#10685)

---
 plugins/toolbox/README.md          | 19 +++++++++++++++++++
 plugins/toolbox/kubectx.plugin.zsh |  3 +++
 2 files changed, 22 insertions(+)
 create mode 100644 plugins/toolbox/README.md
 create mode 100644 plugins/toolbox/kubectx.plugin.zsh

diff --git a/plugins/toolbox/README.md b/plugins/toolbox/README.md
new file mode 100644
index 000000000..aac2bb3b0
--- /dev/null
+++ b/plugins/toolbox/README.md
@@ -0,0 +1,19 @@
+# toolbox plugin
+
+Plugin for [toolbox](https://containertoolbx.org), a tool to use containerized CLI environments.
+
+To use it, add `toolbox` to your plugins array in your `.zshrc` file:
+
+```zsh
+plugins=(... toolbox)
+```
+
+## Prompt function
+
+This plugins adds `toolbox_prompt_info()` function. Using it in your prompt, it will show the toolbox indicator ⬢ (if you are running in a toolbox container), and nothing if not.
+
+You can use it by adding `$(toolbox_prompt_info)` to your `PROMPT` or `RPROMPT` variable:
+
+```zsh
+RPROMPT='$(toolbox_prompt_info)'
+```
diff --git a/plugins/toolbox/kubectx.plugin.zsh b/plugins/toolbox/kubectx.plugin.zsh
new file mode 100644
index 000000000..8b6bf5ecd
--- /dev/null
+++ b/plugins/toolbox/kubectx.plugin.zsh
@@ -0,0 +1,3 @@
+function toolbox_prompt_info() {
+  [[ -f /run/.toolboxenv ]] && echo "⬢"
+}

From 4dce175e0e4a678b7f93be80c64247c8f5fbab3e Mon Sep 17 00:00:00 2001
From: Suchandra Thapa <suchandra+github@gmail.com>
Date: Thu, 24 Mar 2022 01:21:36 -1000
Subject: [PATCH 552/591] feat(fzf): support `fzf` installed with MacPorts
 (#10794)

---
 plugins/fzf/fzf.plugin.zsh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index b86af0d2d..a946cf762 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -173,6 +173,32 @@ function fzf_setup_using_cygwin() {
   return 0
 }
 
+function fzf_setup_using_macports() {
+  # If the command is not found, the package isn't installed
+  (( $+commands[fzf] )) || return 1
+
+  # The fzf-zsh-completion package installs the auto-completion in
+  local completions="/opt/local/share/zsh/site-functions/fzf"
+  # The fzf-zsh-completion package installs the key-bindings file in
+  local key_bindings="/opt/local/share/fzf/shell/key-bindings.zsh"
+
+  if [[ ! -f "$completions" || ! -f "$key_bindings" ]]; then
+    return 1
+  fi
+
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "$completions" 2>/dev/null
+  fi
+
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "$key_bindings" 2>/dev/null
+  fi
+
+  return 0
+}
+
 # Indicate to user that fzf installation not found if nothing worked
 function fzf_setup_error() {
   cat >&2 <<'EOF'
@@ -185,6 +211,7 @@ fzf_setup_using_openbsd \
   || fzf_setup_using_debian \
   || fzf_setup_using_opensuse \
   || fzf_setup_using_cygwin \
+  || fzf_setup_using_macports \
   || fzf_setup_using_base_dir \
   || fzf_setup_error
 

From a64d9403775f45036daf3b66693c35df7bab3c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 26 Mar 2022 15:10:56 +0100
Subject: [PATCH 553/591] refactor(1password): extract `opswd` function

---
 plugins/1password/1password.plugin.zsh | 51 ++++----------------------
 plugins/1password/_opswd               |  9 +++++
 plugins/1password/opswd                | 37 +++++++++++++++++++
 3 files changed, 53 insertions(+), 44 deletions(-)
 create mode 100644 plugins/1password/_opswd
 create mode 100644 plugins/1password/opswd

diff --git a/plugins/1password/1password.plugin.zsh b/plugins/1password/1password.plugin.zsh
index 9398b02b4..941523ca8 100644
--- a/plugins/1password/1password.plugin.zsh
+++ b/plugins/1password/1password.plugin.zsh
@@ -1,46 +1,9 @@
-if (( ${+commands[op]} )); then
-  eval "$(op completion zsh)"
-  compdef _op op
-fi
+# Do nothing if op is not installed
+(( ${+commands[op]} )) || return
 
-# opswd puts the password of the named service into the clipboard. If there's a
-# one time password, it will be copied into the clipboard after 10 seconds. The
-# clipboard is cleared after another 20 seconds.
-function opswd() {
-  if [[ $# -lt 1 ]]; then
-    echo "Usage: opswd <service>"
-    return 1
-  fi
+# Load op completion
+eval "$(op completion zsh)"
+compdef _op op
 
-  local service=$1
-
-  # If not logged in, print error and return
-  op list users > /dev/null || return
-
-  local password
-  # Copy the password to the clipboard
-  if ! password=$(op get item "$service" --fields password 2>/dev/null); then
-    echo "error: could not obtain password for $service"
-    return 1
-  fi
-
-  echo -n "$password" | clipcopy
-  echo "✔ password for $service copied to clipboard"
-
-  # If there's a one time password, copy it to the clipboard after 5 seconds
-  local totp
-  if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
-    sleep 10 && echo -n "$totp" | clipcopy
-    echo "✔ TOTP for $service copied to clipboard"
-  fi
-
-  (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
-}
-
-function _opswd() {
-  local -a services
-  services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
-  [[ -z "$services" ]] || compadd -a -- services
-}
-
-compdef _opswd opswd
+# Load opswd function
+autoload -Uz opswd
diff --git a/plugins/1password/_opswd b/plugins/1password/_opswd
new file mode 100644
index 000000000..b92bf8fc8
--- /dev/null
+++ b/plugins/1password/_opswd
@@ -0,0 +1,9 @@
+#compdef opswd
+
+function _opswd() {
+  local -a services
+  services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
+  [[ -z "$services" ]] || compadd -a -- services
+}
+
+_opswd "$@"
diff --git a/plugins/1password/opswd b/plugins/1password/opswd
new file mode 100644
index 000000000..6849d42b3
--- /dev/null
+++ b/plugins/1password/opswd
@@ -0,0 +1,37 @@
+#autoload
+
+# opswd puts the password of the named service into the clipboard. If there's a
+# one time password, it will be copied into the clipboard after 10 seconds. The
+# clipboard is cleared after another 20 seconds.
+function opswd() {
+  if [[ $# -lt 1 ]]; then
+    echo "Usage: opswd <service>"
+    return 1
+  fi
+
+  local service=$1
+
+  # If not logged in, print error and return
+  op list users > /dev/null || return
+
+  local password
+  # Copy the password to the clipboard
+  if ! password=$(op get item "$service" --fields password 2>/dev/null); then
+    echo "error: could not obtain password for $service"
+    return 1
+  fi
+
+  echo -n "$password" | clipcopy
+  echo "✔ password for $service copied to clipboard"
+
+  # If there's a one time password, copy it to the clipboard after 5 seconds
+  local totp
+  if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
+    sleep 10 && echo -n "$totp" | clipcopy
+    echo "✔ TOTP for $service copied to clipboard"
+  fi
+
+  (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
+}
+
+opswd "$@"

From dbadfa0810c0be346b98c02cc802c33fa43bee11 Mon Sep 17 00:00:00 2001
From: Adam Pike <adam.pike@1password.com>
Date: Sat, 26 Mar 2022 15:11:04 +0100
Subject: [PATCH 554/591] refactor(1password): support CLI 2 and soft-deprecate
 CLI 1 (#10787)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change still supports CLI 1, but shows a deprecation warning
on the first run of `opswd`. Support for CLI 1 shall be removed
in the near future.

Closes #10787

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/1password/README.md | 11 ++++++---
 plugins/1password/_opswd    | 12 ++++++++-
 plugins/1password/opswd     | 49 ++++++++++++++++++++++++++++++++++---
 3 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/plugins/1password/README.md b/plugins/1password/README.md
index f6790ca8a..f6854da53 100644
--- a/plugins/1password/README.md
+++ b/plugins/1password/README.md
@@ -25,11 +25,14 @@ which service you want to get.
 For example, `opswd github.com` will put your GitHub password into your clipboard, and if
 a TOTP is available, it will be copied to the clipboard after 10 seconds.
 
-> NOTE: you need to be logged in for `opswd` to work. See:
+> NOTE: you need to be signed in for `opswd` to work. If you are using biometric unlock,
+> 1Password CLI will automatically prompt you to sign in. See:
 >
-> - [Sign in or out](https://support.1password.com/command-line/#sign-in-or-out)
-> - [Session management](https://support.1password.com/command-line/#appendix-session-management)
+> - [Get started with 1Password CLI 2: Sign in](https://developer.1password.com/docs/cli/get-started#sign-in)
+> - [Sign in to your 1Password account manually](https://developer.1password.com/docs/cli/sign-in-manually)
 
 ## Requirements
 
-- [1Password's command line utility](https://1password.com/downloads/command-line/).
+- [1Password CLI 2](https://developer.1password.com/docs/cli/get-started#install)
+
+  > NOTE: if you're using 1Password CLI 1, [see how to upgrade to CLI 2](https://developer.1password.com/docs/cli/upgrade).
diff --git a/plugins/1password/_opswd b/plugins/1password/_opswd
index b92bf8fc8..dbc094f87 100644
--- a/plugins/1password/_opswd
+++ b/plugins/1password/_opswd
@@ -2,8 +2,18 @@
 
 function _opswd() {
   local -a services
-  services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
+  services=("${(@f)$(op item list --categories Login --cache 2>/dev/null | awk 'NR != 1 { print $2 }')}")
   [[ -z "$services" ]] || compadd -a -- services
 }
 
+# TODO: 2022-03-26: Remove support for op CLI 1
+autoload -Uz is-at-least
+is-at-least 2.0.0 $(op --version) || {
+  function _opswd() {
+    local -a services
+    services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
+    [[ -z "$services" ]] || compadd -a -- services
+  }
+}
+
 _opswd "$@"
diff --git a/plugins/1password/opswd b/plugins/1password/opswd
index 6849d42b3..57672807e 100644
--- a/plugins/1password/opswd
+++ b/plugins/1password/opswd
@@ -12,11 +12,11 @@ function opswd() {
   local service=$1
 
   # If not logged in, print error and return
-  op list users > /dev/null || return
+  op user list > /dev/null || return
 
   local password
   # Copy the password to the clipboard
-  if ! password=$(op get item "$service" --fields password 2>/dev/null); then
+  if ! password=$(op item get "$service" --fields password 2>/dev/null); then
     echo "error: could not obtain password for $service"
     return 1
   fi
@@ -24,9 +24,9 @@ function opswd() {
   echo -n "$password" | clipcopy
   echo "✔ password for $service copied to clipboard"
 
-  # If there's a one time password, copy it to the clipboard after 5 seconds
+  # If there's a one time password, copy it to the clipboard after 10 seconds
   local totp
-  if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
+  if totp=$(op item get --otp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
     sleep 10 && echo -n "$totp" | clipcopy
     echo "✔ TOTP for $service copied to clipboard"
   fi
@@ -34,4 +34,45 @@ function opswd() {
   (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
 }
 
+# TODO: 2022-03-26: Remove support for op CLI 1
+autoload -Uz is-at-least
+is-at-least 2.0.0 $(op --version) || {
+  print -ru2 ${(%):-"%F{yellow}opswd: usage with op version $(op --version) is deprecated. Upgrade to CLI 2 and reload zsh.
+For instructions, see https://developer.1password.com/docs/cli/upgrade.%f"}
+
+  # opswd puts the password of the named service into the clipboard. If there's a
+  # one time password, it will be copied into the clipboard after 10 seconds. The
+  # clipboard is cleared after another 20 seconds.
+  function opswd() {
+    if [[ $# -lt 1 ]]; then
+      echo "Usage: opswd <service>"
+      return 1
+    fi
+
+    local service=$1
+
+    # If not logged in, print error and return
+    op list users > /dev/null || return
+
+    local password
+    # Copy the password to the clipboard
+    if ! password=$(op get item "$service" --fields password 2>/dev/null); then
+      echo "error: could not obtain password for $service"
+      return 1
+    fi
+
+    echo -n "$password" | clipcopy
+    echo "✔ password for $service copied to clipboard"
+
+    # If there's a one time password, copy it to the clipboard after 5 seconds
+    local totp
+    if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
+      sleep 10 && echo -n "$totp" | clipcopy
+      echo "✔ TOTP for $service copied to clipboard"
+    fi
+
+    (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
+  }
+}
+
 opswd "$@"

From 3f214329d631b3ae39d6b283262c77819a0078de Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Mon, 28 Mar 2022 13:38:49 +0200
Subject: [PATCH 555/591] chore: removing old completion code (#10616)

---
 plugins/cargo/cargo.plugin.zsh     |  8 --------
 plugins/deno/deno.plugin.zsh       | 13 -------------
 plugins/fnm/fnm.plugin.zsh         | 13 -------------
 plugins/gh/gh.plugin.zsh           | 13 -------------
 plugins/helm/helm.plugin.zsh       |  9 ---------
 plugins/kubectl/kubectl.plugin.zsh |  9 ---------
 plugins/rbw/rbw.plugin.zsh         |  6 ------
 plugins/rust/rust.plugin.zsh       |  5 -----
 plugins/rustup/rustup.plugin.zsh   |  8 --------
 plugins/volta/volta.plugin.zsh     |  5 -----
 10 files changed, 89 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index e4b338207..692025e8f 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,14 +1,6 @@
 print ${(%):-'%F{yellow}The `cargo` plugin is deprecated and has been moved to the `rust` plugin.'}
 print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 
-# TODO: 2021-12-28: remove this block
-# 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}}"
-0="${${(M)0:#/*}:-$PWD/$0}"
-# Remove old generated completion file
-command rm -f "${0:A:h}/_cargo" "$ZSH_CACHE_DIR/cargo_version"
-
 (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
   fpath=("$ZSH/plugins/rust" $fpath)
   source "$ZSH/plugins/rust/rust.plugin.zsh"
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 6c12bae13..7708f84df 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -16,19 +16,6 @@ if (( ! $+commands[deno] )); then
   return
 fi
 
-# TODO: 2021-12-28: remove this block
-# 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}}"
-0="${${(M)0:#/*}:-$PWD/$0}"
-# Remove old generated files
-command rm -f "${0:A:h}/_deno" "$ZSH_CACHE_DIR/deno_version"
-
-# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
-# Add completions folder in $ZSH_CACHE_DIR
-command mkdir -p "$ZSH_CACHE_DIR/completions"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `deno`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_deno" ]]; then
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index 044e16a04..6219025cd 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -2,19 +2,6 @@ if (( ! $+commands[fnm] )); then
   return
 fi
 
-# TODO: 2021-12-28: remove this block
-# 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}}"
-0="${${(M)0:#/*}:-$PWD/$0}"
-# remove old generated files
-command rm -f "${0:A:h}/_fnm" "$ZSH_CACHE_DIR/fnm_version"
-
-# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
-# Add completions folder in $ZSH_CACHE_DIR
-command mkdir -p "$ZSH_CACHE_DIR/completions"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `fnm`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_fnm" ]]; then
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index 9263220ca..1d8d84c55 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -3,19 +3,6 @@ if (( ! $+commands[gh] )); then
   return
 fi
 
-# TODO: 2021-12-28: remove this block
-# 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}}"
-0="${${(M)0:#/*}:-$PWD/$0}"
-# Remove old generated files
-command rm -f "${0:A:h}/_gh" "$ZSH_CACHE_DIR/gh_version"
-
-# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
-# Add completions folder in $ZSH_CACHE_DIR
-command mkdir -p "$ZSH_CACHE_DIR/completions"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `gh`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_gh" ]]; then
diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index 05bb19a44..151c43d88 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -2,15 +2,6 @@ if (( ! $+commands[helm] )); then
   return
 fi
 
-# TODO: 2021-12-28: delete this block
-# Remove old generated file
-command rm -f "${ZSH_CACHE_DIR}/helm_completion"
-
-# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
-# Add completions folder in $ZSH_CACHE_DIR
-command mkdir -p "$ZSH_CACHE_DIR/completions"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
 # If the completion file does not exist, generate it and then source it
 # Otherwise, source it and regenerate in the background
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 0ee252ac3..095d2b328 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -1,13 +1,4 @@
 if (( $+commands[kubectl] )); then
-  # TODO: 2022-01-05: remove this block
-  # remove old generated files
-  command rm -f "$ZSH_CACHE_DIR/kubectl_completion"
-
-  # TODO: 2022-01-05: remove this bit of code as it exists in oh-my-zsh.sh
-  # Add completions folder in $ZSH_CACHE_DIR
-  command mkdir -p "$ZSH_CACHE_DIR/completions"
-  (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
   # If the completion file does not exist, generate it and then source it
   # Otherwise, source it and regenerate in the background
   if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
diff --git a/plugins/rbw/rbw.plugin.zsh b/plugins/rbw/rbw.plugin.zsh
index 523e35aff..b6cecf8b4 100644
--- a/plugins/rbw/rbw.plugin.zsh
+++ b/plugins/rbw/rbw.plugin.zsh
@@ -2,12 +2,6 @@ if (( ! $+commands[rbw] )); then
   return
 fi
 
-# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
-# Add completions folder in $ZSH_CACHE_DIR
-command mkdir -p "$ZSH_CACHE_DIR/completions"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
-
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `rbw`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_rbw" ]]; then
diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh
index db6ca9e74..858f14126 100644
--- a/plugins/rust/rust.plugin.zsh
+++ b/plugins/rust/rust.plugin.zsh
@@ -2,11 +2,6 @@ if ! (( $+commands[rustup] && $+commands[cargo] )); then
   return
 fi
 
-# Add completions folder in $ZSH_CACHE_DIR
-# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
-command mkdir -p "$ZSH_CACHE_DIR/completions"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `cargo`. Otherwise, compinit will have already done that
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_cargo" ]]; then
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index 3d59c1c54..ef141cf8f 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,14 +1,6 @@
 print ${(%):-'%F{yellow}The `rustup` plugin is deprecated and has been moved to the `rust` plugin.'}
 print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 
-# TODO: 2021-12-28: remove this block
-# 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}}"
-0="${${(M)0:#/*}:-$PWD/$0}"
-# Remove old generated completion file
-command rm -f "${0:A:h}/_rustup" "$ZSH_CACHE_DIR/rustup_version"
-
 (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
   fpath=("$ZSH/plugins/rust" $fpath)
   source "$ZSH/plugins/rust/rust.plugin.zsh"
diff --git a/plugins/volta/volta.plugin.zsh b/plugins/volta/volta.plugin.zsh
index 79319394c..ab05ed5df 100644
--- a/plugins/volta/volta.plugin.zsh
+++ b/plugins/volta/volta.plugin.zsh
@@ -3,11 +3,6 @@ if (( ! $+commands[volta] )); then
   return
 fi
 
-# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
-# Add completions folder in $ZSH_CACHE_DIR
-command mkdir -p "$ZSH_CACHE_DIR/completions"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `deno`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_volta" ]]; then

From 9e967b4eccbe26701315860a3b0bad01fde725c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 28 Mar 2022 16:33:03 +0200
Subject: [PATCH 556/591] fix(installer): exit install directory on setup
 (#10804)

---
 tools/install.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index f04d0dc9c..495ad2c11 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -285,10 +285,15 @@ setup_ohmyzsh() {
   && git remote add origin "$REMOTE" \
   && git fetch --depth=1 origin \
   && git checkout -b "$BRANCH" "origin/$BRANCH" || {
-    [ ! -d "$ZSH" ] || rm -rf "$ZSH" 2>/dev/null
+    [ ! -d "$ZSH" ] || {
+      cd -
+      rm -rf "$ZSH" 2>/dev/null
+    }
     fmt_error "git clone of oh-my-zsh repo failed"
     exit 1
   }
+  # Exit installation directory
+  cd -
 
   echo
 }

From d77ac9e29d6079a7ecd561417772c3218aac94b1 Mon Sep 17 00:00:00 2001
From: Mark Mercado <mmercado@digitalocean.com>
Date: Tue, 29 Mar 2022 05:45:20 -0400
Subject: [PATCH 557/591] feat(charm): add plugin for `charm` (#10803)

---
 plugins/charm/README.md        |  9 +++++++++
 plugins/charm/charm.plugin.zsh | 14 ++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 plugins/charm/README.md
 create mode 100644 plugins/charm/charm.plugin.zsh

diff --git a/plugins/charm/README.md b/plugins/charm/README.md
new file mode 100644
index 000000000..f237dceeb
--- /dev/null
+++ b/plugins/charm/README.md
@@ -0,0 +1,9 @@
+# Charm plugin
+
+This plugin adds completion for the [charm](https://github.com/charmbracelet/charm) CLI.
+
+To use it, add `charm` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... charm)
+```
diff --git a/plugins/charm/charm.plugin.zsh b/plugins/charm/charm.plugin.zsh
new file mode 100644
index 000000000..52361ce95
--- /dev/null
+++ b/plugins/charm/charm.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for the Charm CLI (charm).
+if (( ! $+commands[charm] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `charm`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_charm" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _charm
+  _comps[charm]=_charm
+fi
+
+charm completion zsh >| "$ZSH_CACHE_DIR/completions/_charm" &|

From 93435bff4947ca0855d4d8ecc4786877578f0dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gast=C3=B3n=20Alvarez?= <alegasalv@gmail.com>
Date: Tue, 29 Mar 2022 17:23:45 +0200
Subject: [PATCH 558/591] docs(bazel): improve plugin README (#10806)

---
 plugins/bazel/README.md | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugins/bazel/README.md b/plugins/bazel/README.md
index e5ffe6ea1..fc375d219 100644
--- a/plugins/bazel/README.md
+++ b/plugins/bazel/README.md
@@ -1,5 +1,14 @@
-## Bazel autocomplete plugin
+# Bazel plugin
 
-A copy of the completion script from the
-[bazelbuild/bazel](https://github.com/bazelbuild/bazel/master/scripts/zsh_completion/_bazel)
-git repo.
+This plugin adds completion for [bazel](https://bazel.build), an open-source build and
+test tool that scalably supports multi-language and multi-platform projects.
+
+To use it, add `bazel` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... bazel)
+```
+
+The plugin has a copy of [the completion script from the git repository][1].
+
+[1]: https://github.com/bazelbuild/bazel/blob/master/scripts/zsh_completion/_bazel

From 141d06b602b670638a6354e05686e5d3bc56d1a6 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 31 Mar 2022 09:27:58 +0200
Subject: [PATCH 559/591] fix(cli): turn of `commit.gpgsign` compatibly with
 git v1.7.1 (#10679)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 lib/cli.zsh | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index c2fba8556..bf783d9f3 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -573,12 +573,27 @@ function _omz::pr::test {
 
     # Rebase pull request branch against the current master
     _omz::log info "rebasing PR #$1..."
-    command git rebase --no-gpg-sign master ohmyzsh/pull-$1 || {
-      command git rebase --abort &>/dev/null
-      _omz::log warn "could not rebase PR #$1 on top of master."
-      _omz::log warn "you might not see the latest stable changes."
-      _omz::log info "run \`zsh\` to test the changes."
-      return 1
+    local gpgsign
+    {
+      # Back up commit.gpgsign setting: use --local to get the current repository
+      # setting, not the global one. If --local is not a known option, it will
+      # exit with a 129 status code.
+      gpgsign=$(command git config --local commit.gpgsign 2>/dev/null)
+      [[ $? -ne 129 ]] || gpgsign=$(command git config commit.gpgsign 2>/dev/null)
+      command git config commit.gpgsign false
+
+      command git rebase master ohmyzsh/pull-$1 || {
+        command git rebase --abort &>/dev/null
+        _omz::log warn "could not rebase PR #$1 on top of master."
+        _omz::log warn "you might not see the latest stable changes."
+        _omz::log info "run \`zsh\` to test the changes."
+        return 1
+      }
+    } always {
+      case "$gpgsign" in
+      "") command git config --unset commit.gpgsign ;;
+      *) command git config commit.gpgsign "$gpgsign" ;;
+      esac
     }
 
     _omz::log info "fetch of PR #${1} successful."

From e079babdce1f41a6c85296fba7df1672d98e04bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 31 Mar 2022 12:31:09 +0200
Subject: [PATCH 560/591] chore: fix some instances of bad wording

Co-authored-by: inclusive-coding-bot <inclusive-coding-bot@github.com>
---
 plugins/sprunge/README.md              | 8 +++++++-
 plugins/sprunge/sprunge.plugin.zsh     | 4 ----
 plugins/svn-fast-info/README.md        | 4 ++--
 plugins/zsh-navigation-tools/README.md | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugins/sprunge/README.md b/plugins/sprunge/README.md
index fb70d42eb..01274cabb 100644
--- a/plugins/sprunge/README.md
+++ b/plugins/sprunge/README.md
@@ -18,7 +18,8 @@ plugins=(... sprunge)
 | `echo data \| sprunge`       | Any piped data will be uploaded           |
 
 Once sprunge has processed the input it will give you a unique HTTP address:
-```
+
+```console
 $ sprunge "hello"
 http://sprunge.us/XxjnKz
 ```
@@ -30,3 +31,8 @@ http://sprunge.us/XxjnKz
 - Argument precedence goes as follows: stdin > piped input > text strings.
 - If a filename is misspelled or doesn't have the necessary path description, it will NOT
   generate an error, but instead treat it as a text string.
+
+## Credits
+
+- Original code: [shellperson.net](https://web.archive.org/web/20190601000000*/https://www.shellperson.net/sprunge-pastebin-script/).
+- Adapted by: Matt Parnell (@ilikenwf).
diff --git a/plugins/sprunge/sprunge.plugin.zsh b/plugins/sprunge/sprunge.plugin.zsh
index 5d5687a82..48dff5837 100644
--- a/plugins/sprunge/sprunge.plugin.zsh
+++ b/plugins/sprunge/sprunge.plugin.zsh
@@ -1,7 +1,3 @@
-# Contributed and SLIGHTLY modded by Matt Parnell/ilikenwf <parwok -at- gmail>
-# Created by the blogger at the URL below...I don't know where to find his/her name
-# Original found at https://www.shellperson.net/sprunge-pastebin-script/
-
 sprunge() {
   if [[ "$1" = --help ]]; then
     fmt -s >&2 << EOF
diff --git a/plugins/svn-fast-info/README.md b/plugins/svn-fast-info/README.md
index 771378254..e86ba21e3 100644
--- a/plugins/svn-fast-info/README.md
+++ b/plugins/svn-fast-info/README.md
@@ -9,10 +9,10 @@ To use it, add `svn-fast-info` to the plugins array in your zshrc file:
 plugins=(... svn-fast-info)
 ```
 
-It's faster because his efficient use of svn (single svn call) which saves a lot on a huge codebase
+It's faster because it has an efficient use of svn (single svn call) which saves a lot on a huge codebase.
 It displays the current status of the local files (added, deleted, modified, replaced, or else...)
 
-Use `svn_prompt_info` method to display the svn repository status in your theme. 
+Use `svn_prompt_info` method to display the svn repository status in your theme.
 
 ## Functions
 
diff --git a/plugins/zsh-navigation-tools/README.md b/plugins/zsh-navigation-tools/README.md
index bdbfac976..4dc9cdba2 100644
--- a/plugins/zsh-navigation-tools/README.md
+++ b/plugins/zsh-navigation-tools/README.md
@@ -226,7 +226,7 @@ Zsh plugins may look scary, as they seem to have some "architecture". In fact, w
 1. It has its directory added to `fpath`
 2. It has any first `*.plugin.zsh` file sourced
 
-That's it. When one contributes to Oh-My-Zsh or creates a plugin for any plugin manager, he only needs to account for this.
+That's it. When one contributes to Oh-My-Zsh or creates a plugin for any plugin manager, they only need to account for this.
 The same with doing any non-typical Zsh Navigation Tools installation.
 
 ## More

From 6fa5a4f71da2981e0242c139d11c0b4324bab5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 31 Mar 2022 12:35:26 +0200
Subject: [PATCH 561/591] chore(sprunge): fix Internet Archive URL

---
 plugins/sprunge/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/sprunge/README.md b/plugins/sprunge/README.md
index 01274cabb..80e3b30dc 100644
--- a/plugins/sprunge/README.md
+++ b/plugins/sprunge/README.md
@@ -34,5 +34,5 @@ http://sprunge.us/XxjnKz
 
 ## Credits
 
-- Original code: [shellperson.net](https://web.archive.org/web/20190601000000*/https://www.shellperson.net/sprunge-pastebin-script/).
+- Original code: [shellperson.net](https://web.archive.org/web/20190910065842/https://www.shellperson.net/sprunge-pastebin-script/).
 - Adapted by: Matt Parnell (@ilikenwf).

From 53863e7b3ff0c2e2816e90dab3d870adebdf49c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 31 Mar 2022 14:01:17 +0200
Subject: [PATCH 562/591] chore: remove obsolete spelling-action files

---
 .github/actions/spelling/README.md    |   15 -
 .github/actions/spelling/advice.md    |   25 -
 .github/actions/spelling/allow.txt    |    0
 .github/actions/spelling/excludes.txt |   41 -
 .github/actions/spelling/expect.txt   | 4494 -------------------------
 .github/actions/spelling/patterns.txt |   73 -
 .github/actions/spelling/reject.txt   |    7 -
 7 files changed, 4655 deletions(-)
 delete mode 100644 .github/actions/spelling/README.md
 delete mode 100644 .github/actions/spelling/advice.md
 delete mode 100644 .github/actions/spelling/allow.txt
 delete mode 100644 .github/actions/spelling/excludes.txt
 delete mode 100644 .github/actions/spelling/expect.txt
 delete mode 100644 .github/actions/spelling/patterns.txt
 delete mode 100644 .github/actions/spelling/reject.txt

diff --git a/.github/actions/spelling/README.md b/.github/actions/spelling/README.md
deleted file mode 100644
index dcd237ba2..000000000
--- a/.github/actions/spelling/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# check-spelling/check-spelling configuration
-
-File | Purpose | Format | Info
--|-|-|-
-[dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)
-[allow.txt](allow.txt) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
-[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
-[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
-[only.txt](only.txt) | Only check matching files (applied after excludes) | perl regular expression | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)
-[patterns.txt](patterns.txt) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
-[expect.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
-[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
-
-Note: you can replace any of these files with a directory by the same name (minus the suffix)
-and then include multiple files inside that directory (with that suffix) to merge multiple files together.
diff --git a/.github/actions/spelling/advice.md b/.github/actions/spelling/advice.md
deleted file mode 100644
index c83423a8e..000000000
--- a/.github/actions/spelling/advice.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
-<details><summary>If the flagged items do not appear to be text</summary>
-
-If items relate to a ...
-* well-formed pattern.
-
-  If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it,
-  try adding it to the `patterns.txt` file.
-
-  Patterns are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
-
-  Note that patterns can't match multiline strings.
-
-* binary file.
-
-  Please add a file path to the `excludes.txt` file matching the containing file.
-
-  File paths are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
-
-  `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
-../tree/HEAD/README.md) (on whichever branch you're using).
-
-</details>
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
deleted file mode 100644
index f1cfeefbb..000000000
--- a/.github/actions/spelling/excludes.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
-(?:^|/)(?i)COPYRIGHT
-(?:^|/)(?i)LICEN[CS]E
-(?:^|/)package(?:-lock|)\.json$
-(?:^|/)vendor/
-ignore$
-\.avi$
-\.ico$
-\.jpe?g$
-\.lock$
-\.map$
-\.min\..
-\.mod$
-\.mp[34]$
-\.png$
-\.wav$
-^\.github/
-^\Qplugins/archlinux/archlinux.plugin.zsh\E$
-^\Qplugins/cp/cp.plugin.zsh\E$
-^\Qplugins/extract/_extract\E$
-^\Qplugins/genpass/genpass.plugin.zsh\E$
-^\Qplugins/gitignore/gitignore.plugin.zsh\E$
-^\Qplugins/gnu-utils/gnu-utils.plugin.zsh\E$
-^\Qplugins/hitchhiker/fortunes/hitchhiker\E$
-^\Qplugins/jhbuild/jhbuild.plugin.zsh\E$
-^\Qplugins/jhbuild/README.md\E$
-^\Qplugins/jruby/jruby.plugin.zsh\E$
-^\Qplugins/kubectl/kubectl.plugin.zsh\E$
-^\Qplugins/lol/lol.plugin.zsh\E$
-^\Qplugins/mosh/mosh.plugin.zsh\E$
-^\Qplugins/npx/npx.plugin.zsh\E$
-^\Qplugins/powder/_powder\E$
-^\Qplugins/suse/suse.plugin.zsh\E$
-^\Qplugins/thor/_thor\E$
-^\Qplugins/universalarchive/_universalarchive\E$
-^\Qplugins/vagrant/vagrant.plugin.zsh\E$
-^\Qplugins/wp-cli/README.md\E$
-^\Qplugins/wp-cli/wp-cli.plugin.zsh\E$
-^\Qthemes/clean.zsh-theme\E$
-^\Qthemes/philips.zsh-theme\E$
-^\Qthemes/tonotdo.zsh-theme\E$
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
deleted file mode 100644
index 5c5a04ff1..000000000
--- a/.github/actions/spelling/expect.txt
+++ /dev/null
@@ -1,4494 +0,0 @@
-AAAAC
-aac
-aar
-abcdefghjkmnpqrstvwxyz
-ABRT
-absorbgitdirs
-abspath
-abtvfr
-acceptorthreads
-accessip
-ACDIM
-acking
-ackmate
-ackup
-ACLs
-acon
-aconf
-acp
-acpi
-acpitool
-acr
-acroread
-acs
-acsc
-acsp
-acss
-actionformats
-Adamantium
-adb
-adbd
-adben
-addgroups
-addhistory
-addon
-addprincipals
-addrport
-addrs
-addusergroups
-addwin
-adelcampo
-adg
-ADK
-adminalias
-adminport
-Admins
-adoc
-adu
-aeiouy
-afh
-afind
-afmagic
-afs
-afu
-agb
-agc
-agd
-agentpath
-agi
-agignore
-agli
-aglu
-agnoster
-agp
-agrimaldi
-ags
-agu
-agud
-agug
-aguu
-AHg
-ainv
-aip
-Airbender
-ajp
-ajs
-Akinori
-akoenig
-alacritty
-albers
-alberto
-alertmanager
-alex
-alexandre
-aliasfiletype
-aliaspassword
-allexport
-alloc
-allocstatus
-allownoncomponentcallers
-allpkgs
-alnum
-ALRM
-altchar
-Altoid
-alwayz
-amanda
-amazonaws
-amazonec
-ambyj
-amd
-amqp
-AMRD
-anche
-andi
-andrewrdwyer
-angularjs
-anley
-anlp
-annots
-anonymize
-anotherfolder
-ansible
-antrun
-anycommand
-apexcodefile
-apextests
-api
-apidocs
-apiversion
-apjanke
-apk
-apklib
-aplaybook
-appid
-applica
-applist
-appname
-apps
-appup
-aps
-apull
-arachnophobia
-araxis
-ARCHFLAGS
-archimport
-archlinux
-arci
-arcizan
-ard
-ardc
-ardnu
-ardnupc
-ardp
-ardpc
-ARGC
-args
-argset
-argslist
-argu
-argv
-ARGZERO
-arh
-arinit
-arl
-arli
-arpa
-arquillian
-artifactory
-asadmin
-asc
-asciicast
-asciidoc
-asciidoctor
-asciinema
-asdeps
-asdf
-askpass
-asm
-asmo
-asrc
-assem
-associatewiththread
-ASTs
-asyncreplication
-atlassian
-attr
-ATTRIBUTENAME
-aufs
-auin
-auinsd
-auloc
-auls
-aulst
-aumir
-auown
-auownloc
-auownls
-aur
-aure
-aurem
-aurep
-aurinsd
-aurph
-aurrep
-authmethods
-authorizationdb
-authpriv
-authrealmname
-authz
-autoapplyenabled
-autoclean
-autocomplete
-autocompleted
-autocompletion
-AUTOCONNECT
-autocrlf
-autodetermine
-autodie
-autoenv
-autohadboverride
-autoipd
-autojump
-autoload
-autolock
-autolocking
-autopep
-AUTOQUIT
-autoreload
-autoreloading
-autoremove
-autorun
-autoscale
-autoscaling
-autoselect
-autoshortened
-autosquash
-autostart
-autostash
-autoupdate
-auupd
-auupg
-availabilityenabled
-avh
-avi
-AVIT
-avivrosenberg
-avneet
-avz
-avzu
-aws
-awscli
-awslogs
-babakks
-backend
-backendconfig
-backtick
-backupconfig
-backupdir
-backupfile
-backuptheme
-bactrian
-baidu
-bamshuf
-bamtobed
-bamtofastq
-Barsi
-Basecamp
-basedir
-basedn
-basefile
-baseurl
-basevmdk
-bashcompinit
-bashdefault
-bashrc
-batchid
-baz
-bazel
-bazelbuild
-bbd
-bbdiff
-bbedit
-BBM
-bbpb
-bcc
-bcdfghjklmnpqrstvwxz
-bck
-bcn
-bcubc
-bcubo
-beaglidx
-becc
-bedcov
-BEDGRAPH
-BEDPE
-bedpetobam
-bedtobam
-bedtools
-Belarus
-bem
-benchmarker
-benchmem
-benchtime
-bento
-benwilcock
-berks
-Bertinelli
-bgnotify
-bgrewriteeaof
-bgsave
-binarynights
-bindaddress
-binded
-bindir
-bindkey
-binpack
-binstub
-bintray
-bip
-bira
-bisd
-bitboxer
-bitbucket
-bitswap
-bitwarden
-blkio
-blockprofile
-blockprofilerate
-blod
-blog
-blogger
-blogspot
-blpop
-bluebox
-Bluetooth
-bobwilliams
-bodycc
-Bonetti
-bookmarked
-booknames
-bootclasspath
-bootscript
-bootsnipp
-borland
-borrowck
-Boudreau
-Boushh
-Bouvet
-BPtmux
-bpython
-bqr
-brainstormr
-Brainville
-branchformat
-branchname
-branchrefs
-brewp
-brewsp
-briancarper
-bringz
-Broadcom
-Brodersen
-brpop
-brpoplpush
-btannous
-btih
-btn
-btrestart
-btrfs
-btw
-bubc
-bubu
-buf
-buffersizebytes
-buflines
-bugfix
-bugfixes
-bugreport
-bugsnag
-Buildfile
-buildinstance
-buildnumber
-buildpackage
-buildpacks
-buildscript
-builtins
-bundlephobia
-bunzip
-Burkina
-Busybox
-bwaht
-Bxegedabagacad
-bypjyp
-bytebuffertype
-bytecode
-bytewise
-byznis
-bzip
-bzr
-cabextract
-CACERT
-cacertfile
-cacheinfo
-cachename
-caiifr
-Cakefile
-cakephp
-callvim
-calmd
-calways
-caname
-caniuse
-cano
-capath
-Capfile
-capify
-capistrano
-capistranorb
-capit
-CARETCOLOR
-caserta
-Caskroom
-catimg
-catserver
-catspeak
-cbr
-ccat
-cccmd
-ccflags
-ccl
-ccomp
-ccp
-cdargs
-cdcmd
-cdo
-CDPATH
-cdu
-cdx
-cdylib
-cecho
-cehlrtx
-celerybeat
-celeryev
-celerymon
-celeryproject
-Celso
-celsomiranda
-certfile
-certname
-certs
-cfa
-cfap
-cfbpk
-cfbs
-cfc
-cfdel
-cfdm
-cfdor
-cfds
-cfe
-cfev
-cfg
-cfgfile
-cfhu
-cfl
-cflg
-cflr
-cfp
-cfpc
-cfpm
-cfr
-cfsc
-cfsh
-cfsp
-cfsrt
-cfsrtall
-cfstg
-cfstp
-cfstpall
-cft
-cfup
-cfus
-cget
-cgi
-cgit
-cgr
-cgrm
-cgroup
-cgroupns
-cgu
-changelog
-changepassword
-changeset
-charmap
-charset
-chaselinks
-chcid
-chdir
-cheatsheet
-checkin
-checkinit
-checkonly
-checkports
-checkstyle
-cheeseshops
-Chesal
-chiark
-childlogdir
-chlrtx
-chmod
-chown
-chpwd
-chroot
-chruby
-chrubydirs
-chsh
-chucknorris
-chucknorrisfacts
-Chucktatorship
-Chucktober
-chunker
-cidfile
-cidr
-CIDs
-cidv
-ciici
-cim
-cirw
-citool
-civis
-cjk
-clamav
-classfile
-classloaders
-classloading
-classmap
-classname
-classpath
-CLDR
-cleardump
-cless
-CLICOLOR
-clientauthenabled
-clientid
-clipcmd
-clipcopy
-clippaste
-Clipperton
-clj
-Clojure
-closelim
-cloudfoundry
-cloudproviders
-CLOUDSDK
-clrz
-clustertype
-cmdargs
-cmdline
-cmds
-Cmp
-CMR
-cms
-cmt
-cnorm
-cobertura
-cocoapods
-codebase
-codeclimate
-codecompare
-codecoverage
-codegen
-codepen
-coderwall
-CODESET
-codium
-coffeescript
-colemak
-Colindres
-collectstatic
-colorbool
-colorcoded
-colorcoding
-colorify
-colorized
-colorls
-colorpair
-colorset
-colorspec
-colourised
-Colouriser
-colsearch
-COMMANDLINE
-commandlinefu
-committerdate
-Comoros
-compadd
-comparguments
-compassdoc
-compaudit
-compbiome
-compcall
-compctl
-compdef
-compdescribe
-compdump
-compfiles
-compfix
-compgen
-compgroups
-compilemessages
-compinit
-compl
-completemarks
-completionsdir
-complist
-componentname
-compopt
-compquote
-COMPREPLY
-COMPRESSSPARSESTATE
-compset
-compstate
-comptags
-comptry
-compvalues
-CONDA
-CONFG
-config
-configfile
-confighelp
-configmap
-configstoretype
-connectiondefinition
-connectionpoolid
-conssec
-Consts
-contacto
-containerd
-contenttype
-contextinitialization
-contextroot
-contoroll
-contreras
-controlargs
-conventionalcommits
-COOKBOOKNAME
-cookbookversion
-coproc
-copybuffer
-copydir
-copyfile
-copypaste
-copypasteable
-cordova
-coreutil
-cors
-cowsay
-cowthink
-cpan
-cpanm
-cpanminus
-cpantesters
-cpio
-cpp
-cprint
-cprof
-cpuprofile
-cpuset
-cpv
-createcachetable
-createdlastdays
-createsuperuser
-createtables
-creationretryattempts
-creationretryinterval
-cription
-crlf
-crm
-crockford
-cron
-cronjob
-crt
-cseuckr
-cseucpkdfmtjapanese
-csh
-csibm
-csiso
-csisolatin
-cskoi
-csksc
-css
-cssflow
-cssh
-csshiftjis
-csu
-csv
-csvfile
-ctag
-ctl
-ctlseqs
-ctx
-ctype
-culater
-Cunha
-curcontext
-curdir
-curhistsize
-curkeyword
-curpath
-currentartist
-currentdir
-currenttrack
-cursored
-curtheme
-Customisation
-CUTBUFFER
-cvccvc
-cvf
-cvhs
-cvjf
-cvs
-cvsexportcommit
-cvsimport
-cvsserver
-cvvis
-cvzf
-cwd
-cword
-cxx
-cya
-cycledleft
-cycledright
-cygpath
-cygstart
-cygwin
-cygwyn
-czf
-daemonize
-daemonized
-daemonizing
-daemonset
-dalias
-dango
-danielcsgomes
-darcs
-dartdoc
-dartlang
-dashdoc
-DATABAGNAME
-datafieldenc
-datasift
-datasourceclassname
-datastore
-datestamp
-datetime
-daylerees
-dbbolton
-dbconsole
-dbfile
-dbhome
-dbhost
-dbport
-dbshell
-dbsize
-dburl
-dbus
-dbuser
-dbvendor
-dbvendorname
-dccmd
-dcdn
-dce
-dck
-dcl
-dclf
-dco
-dcom
-dcommit
-dcps
-dcpull
-dcr
-dcrestart
-dcrm
-dcstart
-dcstop
-dcup
-dcupb
-dcupd
-ddg
-ddl
-deadwyler
-debian
-debman
-debuginfo
-debuglevel
-decr
-decrby
-DECSCUSR
-defaultleasettl
-defaultpackagedir
-Defaultsfdx
-defaultvs
-defaultwebmodule
-definitionfile
-definitionjson
-deinit
-deinstall
-delwin
-denable
-deno
-dependencyfile
-deploydir
-deployers
-deploymentplan
-deps
-depthfrom
-dequote
-dequoted
-deref
-derek
-descr
-dest
-DESTDIR
-destroot
-desttype
-devcenter
-devdocs
-devfolder
-devicehost
-devicemapper
-deviceport
-devlog
-devops
-devpath
-dfa
-dffx
-dflt
-dfmt
-dfs
-dhcp
-dhcpd
-dhcpip
-dht
-dhtrc
-dhtt
-diagdump
-didexit
-diffcore
-diffmerge
-diffs
-diffsettings
-difftool
-digitalocean
-diiirrrty
-dijcaf
-dircolors
-dircycle
-direnv
-dirhistory
-dirname
-dirpath
-dirpersist
-dirs
-dirstack
-DIRSTACKSIZE
-dirstat
-dirver
-disablemasking
-disksize
-diskutil
-displayconfiguration
-displayname
-distcache
-distcheck
-distclean
-distro
-dists
-django
-djangojs
-djangoproject
-djangopypi
-djview
-djvu
-dli
-dlist
-dls
-dman
-dmatching
-dmesg
-dmg
-dna
-dnf
-dnfc
-dnfgi
-dnfgl
-dnfgr
-dnfi
-dnfl
-dnfli
-dnfmc
-dnfp
-dnfr
-dnfu
-dng
-dnote
-dns
-dnsmasq
-dnsrr
-doap
-docck
-dockerd
-dockerdaemon
-dockerenv
-Dockerfile
-dockerport
-dockersearch
-docopt
-docset
-docstring
-doctl
-doctorjellyface
-dogenpunk
-doitclient
-domaindir
-domainname
-domainproperties
-domterm
-Donenfeld
-dongweiming
-donotwant
-dopts
-dotall
-dotenv
-dotest
-dotfile
-dotnet
-doubledash
-doublequotes
-dowant
-dpkg
-drca
-drcb
-drcg
-drcj
-drcm
-drcml
-drcr
-drct
-drcv
-drdmp
-dren
-dreurmail
-drf
-drfi
-drfr
-drfra
-drfu
-Driessen
-drif
-dris
-driverclassname
-drn
-drnew
-droid
-dropandcreatetables
-dropindexes
-droplr
-dropreplace
-droptables
-drpm
-drpu
-drst
-drup
-drush
-drushrc
-drv
-drvd
-drvg
-drw
-dsa
-dselect
-dsl
-dssh
-dst
-dsupport
-Dtest
-dtrace
-dts
-duckduckgo
-duf
-dumpconfig
-dumpdata
-dumpfiles
-duplessis
-durationdays
-durrheimer
-dutchcoders
-dvd
-dvi
-dwim
-dwr
-dylib
-eal
-eastermonday
-eauth
-ebuild
-ecd
-ecdsa
-echotc
-echoti
-ecma
-ecmerge
-ecosia
-ecto
-editorcmd
-edu
-eecms
-eed
-eeval
-efforted
-efile
-eframe
-egrep
-ein
-Eisentraut
-ejb
-ekzsh
-Eley
-ELGNRCIS
-elidable
-elif
-elim
-elisp
-elllen
-elot
-emacs
-emacsclient
-emacsfun
-emacswiki
-emails
-emberjs
-Emelianenko
-emoji
-emotty
-enablesnoop
-enacs
-endswith
-ent
-entrypoint
-enum
-envsubst
-envvar
-enwom
-eocw
-EOH
-eol
-eoq
-eow
-eoww
-eoy
-EPOCHREALTIME
-epochseconds
-eprof
-eread
-erl
-errlog
-Errored
-esac
-escripts
-essembeh
-etcd
-ethanschoonover
-ets
-etwlogs
-euc
-EUID
-EULAs
-eunit
-evals
-evalstatus
-evan
-eventlet
-eventname
-Evernote
-Evt
-exe
-executables
-execv
-exfxcxdxbxbxbxbxbxbxbx
-exfxcxdxbxegedabagacad
-existentials
-exitcode
-exoscale
-expandvars
-expaning
-expireat
-expl
-explaintypes
-explicitouter
-expn
-expr
-exps
-exs
-extcmd
-extdirs
-extendedglob
-externalid
-extmethods
-fabfile
-facebook
-factoryclass
-faidx
-failconnection
-failfast
-failurefatal
-fakeroot
-faqs
-fargs
-Faroe
-fasd
-FASTA
-fastcgi
-fastfile
-fastprint
-FASTQ
-favlist
-fbterm
-fcap
-Fcart
-fcgi
-Fcrt
-fcss
-fdfind
-fdlimit
-feditor
-fedoraproject
-felipe
-felixr
-ffls
-ffp
-ffrm
-ffsync
-fghijk
-fgrep
-Fiala
-fieldlist
-Filemode
-filepath
-filesize
-filestore
-filesystem
-filetype
-filevaultmaster
-FILLBAR
-filtername
-findpeer
-findprovs
-finetune
-firefox
-firewalld
-firewalls
-firstline
-fishshell
-fitzpatrick
-fixmate
-fixme
-fixperms
-FIXTERM
-fizsh
-fjs
-flagstat
-flatlist
-flattach
-flc
-fldoc
-flget
-flickr
-flowgraph
-flowtype
-flr
-fluentd
-flup
-flushall
-flushdb
-flv
-fnd
-fnm
-fns
-Fnv
-Folgers
-fontello
-foodcritic
-foqtam
-forall
-forceoverwrite
-forceupgrade
-foreach
-forrest
-fortunecity
-forw
-fosmid
-fotqoh
-fpath
-fprof
-fqn
-framep
-frecency
-frecent
-freebsd
-freenode
-freqs
-fri
-Friesel
-fromaddress
-frontend
-frontmost
-fsc
-fscache
-fsck
-fsl
-fsmonitor
-FSsh
-fstgpy
-ftp
-fts
-fucnul
-func
-funcsourcetrace
-functrace
-funtoo
-Futuna
-futuret
-fwl
-fwp
-fwr
-fwrp
-fzf
-fzfdirs
-gaa
-gallifrey
-gamc
-Gamera
-gamscp
-gapt
-gasconfig
-Gatorade
-gatsbyjs
-gav
-gba
-gbd
-gbda
-gbk
-gbl
-gbnm
-gbr
-gbs
-gbsb
-gbsg
-gbsr
-gca
-gcam
-gcan
-gcasm
-gcb
-gcc
-gccd
-gccgo
-gccgoflags
-gcf
-gcflags
-gch
-gcl
-gclean
-gcloud
-gcm
-gcmsg
-gcn
-gco
-gcor
-gcount
-gcp
-gcpa
-gcpc
-gcplogs
-gcr
-gcs
-gcsm
-gcssm
-gdc
-gdca
-gdct
-gdcw
-gdd
-gdm
-gdnolock
-gdt
-gdup
-gdv
-gdw
-geca
-gecb
-gecho
-geclup
-gecr
-geeknote
-gegi
-geh
-gei
-geiall
-gelcyv
-gelf
-geli
-gemb
-gemfile
-gemoji
-gemp
-gemset
-gemspec
-gemy
-generatekey
-generatermistubs
-genomecov
-genpass
-genpaths
-genzshcomp
-geoe
-geoff
-geoffgarside
-getattr
-getbit
-getcomposer
-getdir
-geteip
-getenv
-getfasta
-getgb
-getip
-getline
-getln
-getopt
-getrange
-getset
-gettext
-geun
-gevent
-Geza
-gezalore
-gfa
-gfg
-gfl
-gflf
-gflff
-gflfp
-gflfpll
-gflh
-gflhf
-gflhp
-gfli
-gflr
-gflrf
-gflrp
-gfo
-gga
-ggf
-ggfl
-ggl
-ggp
-ggpnp
-ggpull
-ggpur
-ggpush
-ggsup
-ggu
-ghci
-ghf
-ghff
-ghfh
-ghfr
-ghfu
-ghh
-ghostrevery
-gignore
-gignored
-gimmeh
-giobi
-gistcomment
-gitbranch
-gitbranchsize
-gitcomp
-gitcompadd
-gitcompappend
-gitcompletion
-gitdir
-gitex
-gitfast
-gitflow
-github
-gitignore
-gitinfo
-gitk
-gitmodules
-gitpod
-GITSS
-gitstatus
-gitstring
-gitweb
-givero
-gke
-gkrellmd
-glfsi
-glfsls
-glfsmi
-glfst
-glg
-glgg
-glgga
-glgm
-glgp
-glidenote
-glo
-globalias
-globals
-globbing
-globsubst
-glods
-glog
-gloga
-glol
-glola
-glp
-gls
-gma
-gmail
-gmom
-gmtl
-gmtlvim
-gmum
-Gneat
-Gniazdowski
-gnore
-gnupg
-goc
-godoc
-Godzilla
-gof
-gofa
-gofmt
-goga
-Gohr
-golang
-gom
-GOMAXPROCS
-Gomes
-Gonz
-goodreads
-google
-googlecode
-gop
-gopath
-gopb
-GOROOT
-goroutine
-gota
-gpf
-gpg
-gpgconf
-gplfs
-GPLv
-gpoat
-gpr
-gpristine
-gpsup
-gpu
-gpus
-gpv
-gradle
-gradlew
-graphviz
-grb
-grba
-grbc
-grbd
-grbi
-grbm
-grbo
-grbom
-grc
-greenend
-greer
-grename
-grep
-grepping
-grev
-grh
-grhh
-GRIMALDI
-grk
-Grlm
-grm
-grmc
-grml
-grmv
-groh
-grok
-Grosenbach
-groupby
-groupinstall
-grouplist
-groupremove
-groupsmap
-growlnotify
-grrm
-grset
-grss
-grst
-grt
-gru
-gruntfile
-grup
-grv
-gsb
-gsd
-gsemet
-gsh
-gsi
-gsps
-gsr
-gss
-gst
-gsta
-gstaa
-gstall
-gstc
-gstd
-gstl
-gstp
-gstu
-gsu
-gsub
-gsw
-gswc
-gswd
-gswm
-gtb
-gtfo
-gtl
-gts
-gtv
-gua
-Guake
-Guerci
-gui
-guidovansteen
-guitool
-gulpfile
-gulpjs
-gunignore
-gunwip
-gunzip
-gupa
-gupav
-gupv
-gvim
-gvimdiff
-gwc
-gwch
-gwip
-gwt
-Gxfxcxdxbxegedabagacad
-gxvx
-gyazo
-Gyver
-gzip
-Hackage
-Hacktoberfest
-hackzor
-hacluster
-hadouken
-hai
-haldaemon
-Halis
-Hamelink
-hammertest
-hanami
-hanamirb
-har
-hardcoded
-hardlinks
-hardstatus
-harishnarayanan
-hashh
-Hashicorp
-haskell
-haskellstack
-Hasklig
-hawaga
-hax
-HBAR
-hbm
-Hcode
-hda
-hdc
-hdd
-hdel
-hdp
-hdrs
-hdtp
-hdv
-hea
-healthcheck
-healthcheckerinterval
-healthcheckertimeout
-healthcheckerurl
-heduled
-heg
-Helens
-helpmojo
-heroku
-hexdocs
-hexdump
-hexists
-hga
-hgb
-hgba
-hgbk
-hgc
-hgca
-hgchangeset
-hgco
-hgd
-hged
-hget
-hgetall
-hgi
-hgic
-hgl
-hglg
-hglgp
-hglr
-hgm
-hgo
-hgoc
-hgp
-hgrc
-hgrep
-hgs
-hgsl
-hgun
-hhatto
-hhh
-hidefiles
-highlighter
-hincrby
-HISTCMD
-HISTFILE
-HISTNO
-historywords
-histsize
-histsubstrsrch
-hitokoto
-hkeys
-hkscs
-hlen
-hmget
-hmset
-Hocevar
-hocho
-hoeg
-Homeboy
-homepage
-hostip
-hostname
-hostpath
-hotfix
-hotfixes
-hotlist
-hotpink
-howto
-howtorun
-hpodder
-href
-hrg
-hscolour
-hscroll
-hset
-hsetnx
-hsi
-hsp
-hsqldb
-htm
-html
-htmlsingle
-htop
-htslib
-HTT
-http
-httpd
-httpie
-httplisteners
-httpparams
-httpsrouting
-httpstatus
-hubflow
-hukkan
-humza
-huyy
-hvals
-hyperlink
-hypermedia
-hyperv
-hypervisor
-iam
-ian
-ianchesal
-ibest
-icanhas
-icanhazip
-icba
-icbi
-icc
-icode
-icpaa
-icpai
-icpra
-icpri
-icra
-icri
-icrosoft
-icrsa
-icrsi
-idlekeytimeoutseconds
-idletimeout
-idmv
-idx
-idxstats
-ietf
-ifargs
-ifconfig
-iflist
-iglob
-ignoredescriptoritem
-ignoreerrors
-ignorenonexistent
-ignorewarnings
-igv
-ihasbucket
-iiop
-iiopport
-ilikenwf
-ilkka
-ima
-imageshack
-imap
-imatch
-imatches
-img
-imgur
-iminurbase
-imnp
-imonit
-impl
-implicits
-importpath
-inbox
-incrby
-indexopts
-inet
-infocmp
-ini
-initsql
-inkytonik
-inl
-inliner
-inlining
-inplace
-inprogress
-Inproper
-inputenc
-inr
-insecureskipverify
-insns
-inspectdb
-inspr
-instagram
-Installable
-installationkey
-installationkeybypass
-installdeps
-installdir
-installsuffix
-instancealias
-instanceport
-instanceurl
-instaweb
-instrs
-integ
-Intellij
-interactivecomments
-interdiff
-interfacename
-interoperability
-interp
-Intf
-inur
-invicem
-iojs
-iokit
-ionescu
-ionicframework
-iops
-ioreg
-ipa
-ipaddr
-ipam
-ipamdriver
-ipapp
-ipc
-ipcidr
-ipe
-ipfs
-ipld
-ipns
-IPREFIX
-ipsw
-iptables
-ipv
-ipython
-irb
-irc
-IRTY
-isconnectvalidatereq
-isdefaultprovider
-isdeleted
-isearch
-isfile
-isisolationguaranteed
-isodate
-isodatesec
-isolationlevel
-isredeploy
-istio
-ISUFFIX
-isundeploy
-iterm
-itertools
-itunes
-ivan
-Ivoire
-ixfuk
-izakaya
-ize
-jacc
-jaccard
-jaddr
-jaischeema
-jakefile
-jakejs
-Janke
-japvyz
-jarfile
-JARIN
-jarsigner
-javabootclasspath
-javac
-javadoc
-javaextdirs
-javamail
-javap
-javascript
-javax
-jbm
-jboss
-jcon
-jdbc
-jdc
-jdcds
-jde
-jdeps
-JDK
-jdkinternals
-jdl
-jdlr
-jdm
-jdmds
-jdwp
-jeb
-jecdyq
-ject
-Jedis
-jeffmhubbard
-jenv
-jenvdir
-jepgad
-jerryling
-jestjs
-jex
-jexec
-jfrog
-jgitflow
-jgpagent
-jid
-jimhester
-jimweirich
-jira
-jis
-jisse
-jkc
-jkenabled
-JLine
-jlist
-jmc
-jmsdbpassword
-jmsdest
-jmx
-jndi
-jndilookupname
-jnrowe
-jobid
-jobspec
-jobstates
-jobtexts
-jof
-johnhamelink
-joly
-jonas
-jonmosco
-jorge
-journald
-jpeg
-jpg
-jpo
-jprofile
-jql
-jquery
-jra
-jraw
-jrel
-jreld
-jrm
-jrmds
-jrmrel
-jrmsas
-jrp
-jrs
-jrspec
-jruby
-jsa
-jsh
-jshc
-jshm
-json
-jsonfunc
-jsonpath
-jsontool
-jsp
-jspa
-jssl
-jst
-jstj
-jsu
-jsw
-jukie
-junegunn
-junex
-junit
-junkbust
-JUNKFOOD
-Juraj
-jvenant
-jvm
-jvmargs
-jvmoptions
-jwt
-jwtkeyfile
-jxr
-kajrod
-kalsi
-kapeli
-kapow
-kate
-Kaving
-kbd
-kca
-kcbt
-kccc
-kcdc
-kcgc
-kclean
-kcn
-kcp
-kcsc
-kcub
-kcuc
-kcud
-kcuf
-kcuu
-kdch
-kdcj
-kdcm
-kdd
-kde
-kdel
-kdelcj
-kdelcm
-kdeld
-kdelf
-kdeli
-kdelno
-kdelns
-kdelp
-kdelpvc
-kdelsa
-kdelsec
-kdelss
-kdi
-kdialog
-kdiff
-kdm
-kdno
-kdns
-kdp
-kdpvc
-kds
-kdsa
-kdsec
-Keanu
-kecj
-kecm
-keds
-keepfailedstubs
-keepreposdir
-keepstate
-kei
-kepvc
-kerndeb
-kes
-keti
-kevinkirkup
-kexec
-kextload
-kextunload
-keybindings
-keycap
-keychain
-keyfile
-keygen
-keymap
-keymetrics
-keypair
-keyring
-keyshares
-keysize
-keyspace
-keythreshold
-KEYTIMEOUT
-keytooloptions
-keywordisfresh
-keywordmsg
-keywordquickly
-kga
-kgaa
-kgcj
-kgcm
-kgd
-kgdsw
-kgdw
-kgdwide
-kgi
-kgno
-kgns
-kgp
-kgpl
-kgpn
-kgpvc
-kgpvcw
-kgpw
-kgpwide
-kgrs
-kgs
-kgsec
-kgssw
-kgsswide
-kgsw
-kgswide
-Khas
-khome
-killall
-killit
-Kindergarteners
-Kitts
-kiwiirc
-kiwish
-kjx
-klf
-Klingberg
-knative
-kni
-knifecmd
-knifesubcmd
-knp
-knu
-koenig
-Kombat
-kompare
-konsole
-kotlin
-kotlintest
-kpf
-kphoen
-kpkg
-kpp
-kres
-krh
-Krivitsky
-krsd
-krsss
-kru
-ksc
-ksd
-ksh
-ksharrays
-kshautoload
-kshglob
-kshoptionprint
-ksshaskpass
-ksss
-kthxbai
-kts
-kube
-kubeconfig
-kubectl
-kubectx
-kubens
-kubeoff
-kubeon
-kubernetes
-kungfoo
-Kurapati
-kwargs
-kypkvcw
-Kyrgyzstan
-Lacheze
-lambdalift
-lando
-langinfo
-laravel
-lart
-lastcategory
-lastcmd
-lastfull
-lastrun
-lastsave
-launchctl
-lazyconnectionassociation
-lazyconnectionenlistment
-lazyvals
-lbenableallapplications
-lbenableallinstances
-lbenabled
-lblue
-lbname
-lbpolicy
-lbpolicymodule
-lbtargets
-lbuf
-LBUFFER
-lbweight
-lcmd
-ldap
-ldflags
-ldot
-leakreclaim
-leaktimeout
-leavebrowseropen
-lein
-leiningen
-lemy
-len
-Lengyel
-leonhartx
-LESSCLOSE
-lesskey
-LESSKEYIN
-LESSOPEN
-letcat
-leter
-lexduv
-lexer
-lfs
-lho
-lhs
-libc
-libedit
-libexec
-libnotify
-libp
-libreadline
-libsecret
-lifecycle
-lighthouseapp
-limegreen
-lindex
-linearizer
-linewords
-linkcheck
-linkname
-linsert
-linux
-linuxcommando
-linuxcontainers
-linuxmain
-liquibase
-listeneraddress
-listenerport
-livecheck
-liveserver
-llc
-LLCORNER
-llen
-llr
-llvm
-lmnop
-lname
-loadconfig
-loaddata
-loadorder
-localhost
-localonly
-localoptions
-localtime
-localtraps
-lockdown
-lockfile
-lodash
-logcat
-logdriver
-logentries
-logfile
-logid
-loginurl
-loglevel
-logname
-logreportederrors
-logrotate
-logtype
-lol
-lowerip
-lpop
-lpr
-lpush
-lpushx
-lrange
-lrbu
-LRCORNER
-lrem
-lrh
-lrp
-lrt
-lrunzip
-lrz
-lrzip
-lrzuntar
-lsa
-lsb
-lscolors
-lset
-lsof
-lstheme
-lstrip
-lto
-ltrim
-lubs
-lucentbeing
-lvi
-lways
-lwc
-lwd
-lxc
-lxd
-lzcat
-lzip
-lzma
-lzo
-lzop
-LZW
-Maarten
-macos
-macports
-macromates
-Maeda
-Magento
-magerun
-magicequalsubst
-magick
-mailhost
-mailinfo
-mailmap
-mailnull
-mailrc
-mailsplit
-mailuser
-mainporcelain
-maintail
-maintainership
-makecache
-MAKEFLAGS
-makemessages
-makemigrations
-makewindows
-managedreleased
-managepy
-manni
-manpage
-manpath
-mapcar
-mapfile
-mappedpassword
-mappedusername
-markname
-markpath
-maskfasta
-maskray
-masq
-massimiliano
-matchconnections
-mathfunc
-Mattern
-Matth
-matthewratzloff
-matthr
-maxbytes
-maxchildren
-maxconnectionscount
-maxconnectionusagecount
-maxdepth
-maxleasettl
-maxpoolsize
-maxqueuesize
-maxrank
-maxrate
-maxrequests
-maxspare
-maxtasksperchild
-maxthreadpoolsize
-maxwait
-Mayen
-Mayra
-mbean
-mbegin
-mbologna
-mbox
-mboxrd
-mbp
-mca
-mcl
-mcm
-mco
-mcornella
-mct
-mdapi
-mdb
-mde
-mdi
-mdn
-mds
-meanlife
-mediawiki
-megazord
-meh
-Mek
-mekanics
-memprofile
-memprofilerate
-memq
-menuselect
-MENUSIZE
-mergetool
-mergewebxml
-merkledag
-Mery
-messagebus
-messagestoretype
-metacpan
-metadata
-metricscollector
-mfa
-mfaerevaag
-mfs
-mget
-miam
-michelebologna
-microk
-microsoft
-middleware
-midsommar
-midsommarafton
-mikeh
-millis
-mindepth
-minfds
-minidisc
-minikube
-minlogprob
-minprocs
-minspare
-minthreadpoolsize
-mirko
-mirrorlist
-mixin
-mkcd
-mkdir
-mkdirs
-mktag
-mktemp
-mktree
-mkv
-mkvirtualenv
-mla
-mldonkey
-Mleb
-MLH
-mli
-mlo
-mlog
-mlp
-mls
-mlterm
-MMA
-mmap
-mmin
-mng
-mnt
-moar
-modded
-modifiedlastdays
-modulename
-Moldova
-mongocli
-mongodb
-monit
-monitorable
-monokai
-Morote
-Mosco
-mosh
-mostfrequent
-MOTD
-mountpoint
-mov
-moyai
-mozilla
-mpa
-mpeg
-mpileup
-mpkg
-mplayer
-mplex
-mpr
-mputniorz
-mqhost
-mqpassword
-mqport
-mquser
-mre
-mrp
-mset
-msetnx
-msgnum
-msgs
-msh
-msil
-msp
-mst
-msvs
-msw
-msys
-msysgit
-mtime
-mtu
-Mudkipz
-multiaddresses
-multibase
-multicastaddress
-multicastport
-multicov
-multihashes
-multiinter
-multiline
-multios
-multiset
-mumpub
-munication
-MURI
-muscato
-mutex
-muxer
-mvim
-mvn
-mvnag
-mvnboot
-mvnc
-mvncd
-mvnce
-mvnci
-mvncie
-mvncini
-mvncist
-mvncisto
-mvncom
-mvncp
-mvnct
-mvncv
-mvncvst
-mvnd
-mvndocs
-mvndt
-mvne
-mvnfmt
-mvnjetty
-mvnp
-mvnqdev
-mvnsrc
-mvnt
-mvntc
-mvnw
-Mvt
-Myanmar
-myapp
-myargs
-myd
-mydeb
-myers
-myfile
-myfirstnamemylastname
-mygit
-myissues
-mymark
-myns
-myprop
-mypy
-myrole
-myserver
-mysql
-mysqladmin
-mysqlrestart
-mysqlstart
-mysqlstatus
-mysqlstop
-mytime
-myuser
-myvalue
-myvirtualenv
-myzsh
-nables
-nagios
-naliases
-nameddirs
-namespace
-namesys
-nanoant
-nanoc
-Narayanan
-Naruto
-nativelibrarypath
-ncd
-ncipe
-NCOLOR
-ncpu
-ncs
-ncv
-ndjson
-NDUw
-NEm
-nenv
-neovim
-netbsd
-netdump
-netloc
-netmask
-netstat
-networkdriver
-networklisteners
-neuralsandwich
-newcons
-newpl
-newvol
-nextgenthemes
-nfsnobody
-nfunctions
-nginx
-ngnix
-ngth
-nhelp
-nhistory
-nhughes
-nicoulaj
-Nicoulaud
-nixos
-nkeywords
-nkill
-nle
-nlinux
-nlist
-nmap
-nmatches
-Nmh
-Nms
-Nmw
-noacl
-noancestors
-noargs
-noautonamedirs
-noautopushd
-noblock
-nobootcp
-nobreak
-nocache
-nochunk
-nocleanup
-nocolor
-nocopy
-nocorrect
-nodaemon
-nodedir
-nodefaultpolicy
-nodegroup
-nodehost
-nodeid
-nodejs
-nodense
-nodestatus
-noexec
-noexpand
-noglob
-noheading
-nohelpers
-nohup
-noinput
-nojline
-noksh
-nomadproject
-nomnom
-nomz
-nonamespace
-nondistributable
-nongnu
-NONINFRINGEMENT
-nonomatch
-NONSELECTABLE
-nontransactionalconnections
-nopassword
-noposixbuiltins
-noprofile
-noprompt
-nopromptsubst
-noptions
-nopushdminus
-norc
-noreload
-NORMARG
-NORRIS
-noshortloops
-noshwordsplit
-nospace
-nosplash
-nostatic
-nostatus
-nostream
-notactive
-notailcalls
-notest
-nothreading
-notifu
-notnull
-nounit
-noverbose
-nowai
-nowarn
-noword
-noyes
-NPAGE
-npanelize
-npm
-npmd
-npmg
-npmi
-npmjs
-npmrc
-npmst
-npmt
-npr
-nproc
-npu
-npx
-nroff
-nscd
-nsu
-nthemes
-ntlp
-ntp
-ntu
-nubxa
-nuc
-nuget
-numstat
-nvcsformats
-nvie
-nvimdiff
-nvm
-nvmrc
-Oakv
-oanward
-oathtool
-OAuth
-objectname
-objectsize
-objecttype
-obsrun
-obtw
-octocat
-octozen
-oden
-ofd
-ogg
-ogm
-ohmyz
-ohmyzsh
-oid
-oldp
-oldpatmat
-OLDPWD
-OMITSPARSESTATE
-OMMIT
-omz
-omztemp
-onbehalfof
-oneline
-onlyrepos
-onoz
-ooanward
-oom
-openbsd
-opendiff
-openr
-openshift
-opensource
-openssh
-openstack
-opensuse
-openvpn
-openw
-OPTARG
-optimisations
-OPTIND
-orderby
-orgdir
-orgs
-oris
-ority
-orm
-ornicar
-orss
-osascript
-osname
-osscan
-ostype
-osver
-osx
-oth
-otp
-otpcode
-Ouellet
-oug
-outfh
-outfile
-outfilebase
-outfilename
-outlog
-outputdir
-outputtedto
-Outputters
-pacac
-pacaur
-pacdisowned
-pacfiles
-pacfileupg
-pacin
-pacinsd
-packagecreaterequestid
-packageid
-packagekitd
-packagename
-packageobjects
-packagephobia
-packagetype
-packageversionid
-paclist
-pacloc
-pacls
-paclsorphans
-pacman
-pacmanallkeys
-pacmansignkeys
-pacmir
-pacoc
-pacown
-pacre
-pacrem
-pacrep
-pacrmorphans
-pacupd
-pacupg
-pacweb
-pagage
-pagename
-painsd
-pairtobed
-pairtopair
-paloc
-palst
-pamc
-pame
-pamf
-pamfa
-pamir
-pamj
-paml
-pamm
-pamn
-pamp
-pampp
-pamr
-pamt
-panelize
-paorph
-paperclips
-paqf
-paqft
-paql
-paqr
-paqt
-paqw
-paralint
-params
-parem
-parep
-PARGON
-parhaat
-paroc
-parseable
-parseopt
-parwok
-passivepopup
-passphrase
-passthrough
-passthru
-passwd
-passwordstore
-pastebin
-pasu
-patchformat
-pathspec
-patmat
-patshead
-paupd
-paupg
-pausedservices
-pavic
-paypal
-paypalobjects
-pbcopy
-pbi
-pbl
-pbo
-pbpaste
-pbs
-pbu
-pcap
-pch
-pchk
-pcl
-pcmode
-pcpu
-PCR
-pcre
-pdf
-PDoc
-peb
-peepcode
-peerid
-pem
-percol
-perflog
-perl
-perlbrew
-perldoc
-permset
-permsetname
-petere
-peterhoeg
-Pfenniger
-pfs
-pgp
-pgpkeys
-pgr
-pgrep
-pgs
-phab
-phing
-phome
-php
-phx
-pid
-pidev
-pidfile
-pidof
-pigz
-pipenv
-pipestatus
-pipfile
-pipir
-piplist
-pipreq
-pipunall
-pipupall
-Pitcairn
-pjdb
-pjo
-PKGBUILD
-pkgfile
-plaetinck
-planetargon
-playlists
-playpause
-ple
-pleted
-plist
-Plug'n
-plugin
-pluginsdir
-plz
-pmat
-pmd
-pmin
-pmset
-png
-pnp
-podfile
-podspec
-policyconfigfactoryclass
-policyproviderclass
-polipo
-polkitd
-poo
-poolname
-poolresize
-Poorter
-popd
-Popen
-porcheron
-portbase
-portdir
-Portfile
-portlist
-portname
-posix
-possen
-posteo
-posterasure
-postgres
-postinstallurl
-posva
-powd
-powed
-Powerline
-poweroff
-powershell
-powify
-powit
-PPAGE
-ppap
-ppid
-ppy
-precache
-precaire
-precmd
-precompilejsp
-precompilewait
-predef
-preexec
-prefetching
-prefiltered
-prefork
-preload
-premajor
-preminor
-prepatch
-prepends
-prepopulate
-prettylist
-previewer
-prevword
-pri
-princ
-principalsmap
-printenv
-printf
-printflags
-printprompt
-privhist
-privoxy
-procfs
-procs
-prodlog
-progfile
-projectname
-PROMPTCOLOR
-PROMPTPREFIX
-promptsize
-promptsubst
-promptvars
-propget
-proplist
-protobuf
-providertype
-prun
-pscpu
-pseudoword
-psgrep
-psh
-psmem
-psprint
-pstadler
-pstree
-psu
-psubscribe
-psy
-psykorebase
-pthree
-ptot
-ptree
-pubgrub
-publishwait
-pubsub
-puni
-punsubscribe
-puo
-pushd
-pushdefault
-pushdf
-pushdignoredups
-pushdminus
-pushdsilent
-pushln
-pushremote
-pushurl
-Putniorz
-pvc
-pvenv
-pvm
-pwd
-PWDCASECORRECT
-PWDLEN
-pwdsize
-pwdx
-pwgen
-pwh
-pwned
-pxd
-pxy
-pybundles
-pyc
-pycache
-pyclean
-pyenv
-pyenvdirs
-pyfind
-pygmentize
-pygments
-pygrep
-pylint
-pypa
-pypi
-pytb
-pytest
-pythonhosted
-pythonpath
-pythonrc
-PYTHONSTARTUP
-PYTHONUSERBASE
-pyuserpaths
-Qdt
-qiqmiq
-qkey
-qlmanage
-qpwd
-Qql
-Qqo
-qqq
-qqwtzgejwgqve
-Qtdq
-quarkus
-quicklisp
-quickstart
-quiltimport
-qunit
-qunitjs
-quotationspage
-quotedir
-quu
-quux
-qwant
-qwerty
-qxtm
-qyjti
-rabin
-rackspace
-rackup
-radvd
-raek
-Rakefile
-raname
-randomkey
-rangepos
-rar
-ratijas
-rawurldecode
-rawurlencode
-rbenv
-rbenvdirs
-rbfu
-RBUFFER
-rbw
-rcfile
-Rchive
-rcs
-rdargument
-rdb
-rdc
-rdd
-rdependents
-rdeps
-rdm
-rdmd
-rdmr
-rdmtc
-rdmu
-rdoc
-rdp
-rdr
-rds
-rdsl
-rdtc
-rdtp
-reactjs
-readline
-readlink
-readme
-readonly
-readthedocs
-readtimeoutmillis
-Reagle
-realcmd
-reauthor
-rebased
-rebases
-rebasing
-receivepack
-reddit
-redirectport
-redis
-rediscli
-redistrubute
-redzone
-reencode
-reexec
-refactor
-refchecks
-reflogs
-refmap
-refname
-refspec
-regex
-regexes
-regexn
-regexp
-reheader
-reintializes
-Reitsma
-rej
-reldates
-reldist
-releasenotesurl
-releaseversion
-relid
-reloadinterval
-reloadpost
-reltool
-remco
-remoteonly
-remotetestdir
-removegroups
-removeprincipals
-removeusergroups
-renamenx
-rephorm
-replacetokens
-repow
-reprovider
-requestauthrecipient
-requestauthsource
-requestid
-rerere
-resetstat
-resolv
-resolvemsg
-responseauthrecipient
-responseauthsource
-responsetimeout
-restartpost
-restype
-resultformat
-retcode
-retlog
-retrievefile
-retrievetargetdir
-returncode
-RETVAL
-revdeps
-revlist
-rfa
-rfakeroot
-rfap
-rfbu
-rfc
-RFh
-rfind
-rgm
-rhash
-rinass
-rinf
-ripgrep
-riseup
-RIXIUS
-rlc
-Rli
-rlib
-Rlvi
-rmacs
-rmcup
-rmd
-rmdir
-rmdsstore
-rmdup
-rmi
-rmkx
-rnand
-rnatv
-rnaw
-rnios
-rniosse
-rniosx
-rniosxr
-rniosxsm
-rnipad
-rnipada
-rnipadm
-rnipadp
-rnipadr
-rnland
-rnlink
-rnlios
-rns
-robby
-robbyrussell
-ROLENAME
-rollbackonerror
-rootdir
-rosrc
-roswell
-ROSWELLPATH
-roundhoused
-routecookie
-rpath
-rpc
-rpcuser
-rpmpackage
-rpms
-rpo
-rpop
-rpoplpush
-rprompt
-rpush
-rpushx
-rra
-rrg
-rsa
-rsb
-rsd
-rset
-rsh
-rsp
-rspec
-rsrra
-rst
-rsto
-rstrip
-rsync
-rtfm
-rtkit
-rtorrent
-rts
-rubocop
-rubygems
-rubyonrails
-rubyprompt
-rubypromptsize
-rubyversion
-Rudkin
-rulz
-runfcgi
-runningservers
-runningservices
-runpy
-runserver
-runtests
-runtfile
-runtimes
-RUNZSH
-Ruslan
-ruslanspivak
-rustc
-rustup
-Rvi
-rvm
-rvmprompt
-rvmpromptsize
-rxvt
-saas
-sadd
-salesforce
-samtools
-sandboxed
-SAVEHIST
-savelogin
-savemasterpassword
-sba
-sbc
-sbcc
-sbcln
-sbco
-sbcp
-sbcq
-sbd
-sbdc
-sbdi
-sbgi
-sbin
-sbp
-sbpl
-sbr
-sbrake
-sbrm
-sbt
-sbu
-sbx
-scalac
-scaladoc
-scalatest
-scaleway
-scandeps
-scard
-scd
-scdalias
-scdaliases
-scdhistory
-scdignore
-scgi
-sched
-scheduledrundatetime
-Schlatow
-scm
-scmpublish
-scorpius
-scottkidder
-scp
-screencast
-screenshot
-SCTP
-scu
-scutil
-scw
-scwsearch
-sdiff
-sdiffstore
-sdist
-sdk
-sdkman
-Sdl
-sdurrheimer
-Seagal
-searchterm
-seccomp
-securityenabled
-securitymap
-securitytype
-segfault
-selectables
-selectionkeyhandler
-selectiveanf
-selectivecps
-selectorpolltimeoutmillis
-selfupdate
-selinux
-semver
-sendemail
-sendperiod
-serialfile
-serialno
-serverlist
-servername
-serverurl
-serviceproperties
-serviceuser
-servlet
-setab
-setaf
-setalias
-setapp
-setbit
-setdefaultdevhubusername
-setdefaulttimeout
-setdefaultusername
-setenv
-setex
-setnx
-setopt
-setprompt
-setrange
-sfcl
-sfcontainer
-sfcw
-sfdc
-sfdev
-sfdx
-sfdxcli
-sfdxurl
-sfdxurlfile
-sfffe
-sfgb
-sfgc
-sfgcom
-sfge
-sfn
-sfprod
-sfroute
-SFSB
-sfsr
-sfsu
-sftp
-sfx
-sgem
-sgr
-sgrep
-sgtatham
-shasum
-sheerun
-shellcheck
-shellinit
-shellperson
-SHELLPROXY
-shitload
-SHLVL
-shm
-Shohei
-shopt
-shortlist
-shortlog
-shortname
-shortstat
-SHOWCOLORHINTS
-showcurrentpatch
-showdeprecated
-SHOWDIRTYSTATE
-showfiles
-showformat
-showmigrations
-showpkg
-SHOWSTASHSTATE
-showsubclasses
-SHOWUNTRACKEDFILES
-showupstream
-shpotify
-shuf
-shunit
-Shyamshankar
-sid
-sidekiq
-sideload
-SIGINT
-SIGKILL
-sigs
-SIMBL
-Sindre
-sindresorhus
-singlechar
-singlepackage
-Sint
-sinterstore
-sirech
-sismember
-sitecookbooks
-sitesearch
-sjis
-skintone
-skiptraceflag
-skitch
-slaveof
-slicehost
-sln
-slogin
-slp
-smacs
-smartlist
-smartsync
-smcup
-smembers
-smerge
-smkx
-Smood
-smove
-smt
-smtp
-Smurf
-snapshotname
-snowboarder
-sobject
-sobjectid
-sobjecttreefiles
-sobjecttype
-sobjecttypecategory
-socio
-socw
-softlayer
-solaris
-som
-soq
-soql
-Sorhus
-sorin
-sortconip
-sortcons
-sortnr
-sortr
-sourceapiversion
-sourced
-sourcedir
-sourcefile
-sourceforge
-sourceorg
-sourcepath
-sourcetype
-sourcing
-soww
-soyc
-spacewander
-spam
-spd
-spearce
-speartail
-spf
-spi
-Spivak
-splitbrain
-splitlines
-splunk
-spock
-spop
-spork
-spotify
-springframework
-sprintf
-sprunge
-spu
-spx
-sql
-sqlall
-sqlc
-sqlclear
-sqlcustom
-sqldropindexes
-sqlflush
-sqlindexes
-sqlinitialdata
-sqlq
-sqlsan
-sqlsequencereset
-sqltracelisteners
-squashmigrations
-srake
-srandmember
-src
-srem
-ssh
-sshd
-sshkey
-sshkeyfile
-sshkeypassphrase
-sshpassword
-sshport
-sshpublickeyfile
-sshuser
-ssl
-sslproxyhost
-sslproxyport
-ssm
-sso
-sst
-sstat
-stackoverflow
-stacktrace
-stagedstr
-standalone
-standaloneonly
-startapp
-startpage
-startpost
-startproject
-startswith
-startus
-statd
-statedb
-statefile
-statefulset
-statelist
-statementcachesize
-statementleakreclaim
-statementleaktimeout
-statementtimeout
-STATESEPARATOR
-staticlib
-statuspost
-stderr
-stdin
-stdio
-stdlayout
-stdlib
-stdout
-steadypoolsize
-stedolan
-steeef
-sterr
-stevelosh
-stgit
-stil
-STITLE
-stn
-stoppedservers
-stoppedservices
-stoppost
-stopwait
-storeprotocol
-storeprotocolclass
-stp
-strfile
-strftime
-stringification
-stringified
-stringify
-stripspace
-strlen
-strverscmp
-Strzelecki
-sts
-stt
-stty
-stu
-stylesheets
-subcmds
-subdigital
-subdir
-subdomain
-subfolder
-Subhaditya
-subl
-sublimemerge
-sublimetext
-subm
-subnut
-subpage
-subpath
-subscriberfile
-subscriberorg
-subservices
-subshells
-subspec
-substr
-subsubcmds
-Subsubcommands
-Subsubsubcommands
-sudo
-sudoedit
-suitenames
-sunaku
-sunion
-sunionstore
-supad
-superaccessors
-supervisorctl
-supervisord
-suppresscc
-suprl
-suprm
-suprr
-suprs
-supso
-supsr
-supu
-Suraj
-surryhill
-suse
-svcat
-svg
-svm
-svn
-svnsync
-svntrunk
-swiftc
-swiftpm
-sxa
-sxc
-sxd
-sxf
-sxfn
-sxm
-sxn
-sxp
-sxu
-sxw
-sxy
-sykora
-symfony
-symkinds
-symlink
-Symlinking
-symref
-syms
-syncdb
-SYNOPSYS
-syns
-syohex
-sys
-sysadmins
-sysctl
-syslog
-sysread
-sysroot
-systemadmin
-systemctl
-systemd
-systeminfo
-systemproperties
-Syu
-Syua
-Syy
-Tabone
-tagname
-tailcalls
-Tajikistan
-takedir
-takegit
-takeurl
-tanabata
-tarball
-tarfile
-targetcut
-targetdevhubusername
-targetprotocol
-targetted
-targetusername
-Tasche
-Tascii
-taskwarrior
-Tassilo
-tatooine
-tavric
-tbz
-tcl
-tcp
-tcpdump
-tcpip
-tcpnodelay
-tcsh
-tdiff
-tdiffstr
-tempdir
-tempfile
-tempfilename
-TEMPLATENAME
-terday
-termcap
-termcolor
-Termfile
-terminalapp
-terminfo
-terminitor
-termsupport
-termux
-TERMWIDTH
-terraform
-terremark
-testflag
-testfunc
-testlevel
-testlog
-testname
-testng
-testrb
-testrunid
-testrunner
-testserver
-textastic
-textasticapp
-textconv
-textfile
-textmate
-tformat
-tfstate
-tftp
-tfvars
-tgz
-thedir
-thefuck
-themeisfresh
-thememsg
-there're
-thibault
-thisfcn
-Thoumie
-threadpool
-threadpoolid
-thu
-tif
-timeoutmsec
-timeremaining
-timetolive
-timewait
-timothybasanov
-tion
-titlebar
-tjkirch
-tkachenko
-tkdiff
-tkss
-tksv
-tldr
-Tlp
-tls
-tlscacert
-tlscert
-tlsciphers
-tlsenabled
-tlskey
-tlsrollbackenabled
-tlsverify
-tlz
-tmp
-tmpdir
-tmpfile
-tmpfs
-tmux
-tmuxinator
-tne
-tnn
-tobed
-todo
-Tokenise
-tokenized
-tolower
-tomee
-tonotdo
-toolchain
-toolcp
-toplevel
-Toponce
-torrez
-torromeo
-tortoisemerge
-totp
-totpkey
-Touron
-tput
-traceroute
-trackball
-transactionlogdir
-transactionsupport
-transferencoding
-transprotocol
-transprotocolclass
-trapd
-trconf
-triggerevents
-triggername
-trins
-trinsd
-trizen
-trloc
-trlst
-trmir
-Troiae
-Trojanowski
-trorph
-trre
-trrem
-trrep
-trsu
-trunc
-trupd
-trupg
-tsdh
-tsl
-ttl
-ttr
-ttyctl
-ttys
-tview
-twohead
-txl
-txn
-txo
-txs
-txz
-tycho
-typechecking
-typescriptlang
-typesetsilent
-typespec
-typoes
-tzst
-uapprox
-uberjar
-Ubfksu
-ubuntu
-udp
-uescape
-UFE
-ufw
-uid
-ukpog
-ULCORNER
-ulimit
-Ullrich
-ultiple
-umask
-umd
-umich
-unace
-unalias
-uname
-unarchive
-Uncomment
-uncommit
-uncompress
-uncurry
-undelete
-undeploy
-unedit
-unescape
-unexport
-unexpose
-unfunction
-unhash
-unheap
-unhost
-unicode
-unidiff
-unindex
-uninst
-uninstall
-uninstalling
-unionbedg
-uniq
-uniqid
-uniquetablenames
-unittest
-universalarchive
-unixfs
-unixstamp
-unlimit
-unlzma
-unmark
-unmatch
-unmonitor
-unmute
-unpause
-unrar
-unreachability
-unsetopt
-unshallow
-unshare
-unstagedstr
-unstartup
-unsubscribe
-untag
-unversioned
-unwatch
-unwip
-unxz
-unzstd
-updatedb
-updateonsave
-updatestartuptty
-upgr
-upgradable
-upgradetype
-uploadpack
-upperip
-upsert
-urandom
-URCORNER
-uri
-url
-urldecode
-urlencode
-urllib
-urlmatch
-urlonly
-urlparse
-urlstring
-urltools
-urxvt
-usb
-usbmux
-usejavacp
-uselimit
-usemasterpassword
-usergroups
-userguide
-userland
-username
-userns
-userpass
-userpassword
-usetoolingapi
-usetty
-usr
-utc
-utf
-utils
-utm
-uucp
-UUID
-Vagrantfile
-vagrantup
-valentinbud
-validateatmostonceperiod
-validateddeployrequestid
-validateschema
-validationclassname
-validationmethod
-validationtable
-Valodim
-vals
-varargs
-vared
-varkey
-varname
-vaultproject
-vba
-vbl
-vbm
-vbo
-vbox
-vbqs
-vbr
-vbu
-vcf
-vcmp
-vcs
-vcsa
-vdf
-vectorize
-Venant
-vendored
-venv
-Verhoef
-Verma
-VERSINFO
-versioncomp
-versiondescription
-versioned
-versioning
-versionname
-versionnumber
-versiontagprefix
-verstr
-vfs
-vgi
-vgrepping
-vgs
-vguerci
-vhost
-vhsp
-vicmd
-viewtopic
-viins
-vimdiff
-vimgrep
-vimrc
-violenz
-viopp
-virtenv
-virtualbox
-virtualenv
-virtualenvwrapper
-virtualizing
-virtualservers
-virumque
-visitpage
-visualforce
-visualstudio
-VMDK
-VMs
-vmwarefusion
-vmwarevcloudair
-vmwarevsphere
-vnc
-vncviewer
-vnd
-voggom
-Voldemort
-volumedriver
-vonnegut
-Vop
-vopts
-vpaivatorres
-vpc
-vpli
-vpll
-vplu
-vplun
-vpr
-vrdp
-vre
-vrp
-vsc
-vsca
-vscd
-vscde
-vscg
-vscie
-vscl
-vscn
-vscode
-vscodium
-vscr
-vscu
-vscue
-vscv
-vscw
-vsh
-vsix
-vsp
-vsplit
-vssh
-vsshc
-vssp
-vst
-VTE
-vterm
-Vue
-vuejs
-vulns
-vulscan
-vundle
-vup
-vvsp
-vvv
-vwxyz
-vydpig
-waittime
-wakeonlan
-walle
-wantlist
-warpdir
-warprc
-wav
-wclip
-wcomp
-Webchat
-weblog
-webm
-webrick
-webscr
-webserver
-website
-webtraffic
-Wegner
-Weiming
-Weirich
-Wez
-wfilter
-wget
-whatchanged
-whatisthor
-whatthecommit
-whatwg
-whitespacelist
-whl
-whoami
-wiki
-wikipedia
-wil
-willmendesneto
-wincmd
-windowid
-windowsdomain
-windowspassword
-windowsuser
-wip
-wjst
-wks
-wlne
-wolframalpha
-womens
-wordbits
-WORDBREAKS
-WORDCHARS
-wordlist
-wordpress
-workaround
-workdir
-workflow
-workon
-workpass
-workqueues
-workspaces
-worktree
-would've
-wrapjdbcobjects
-writetimeoutmillis
-WSL
-wslpath
-wtf
-wtfpl
-www
-wwwrun
-Wzf
-xargs
-xcb
-xcconfig
-xcdd
-xchm
-xclick
-xclip
-xcode
-xcodebuild
-xcodeproj
-xcp
-xcsel
-xcselv
-xcworkspace
-XDCHDSBDSDG
-xdg
-xdvi
-xfn
-xfree
-xfs
-xit
-XIVIEWER
-xjnmahqewy
-xkcd
-Xkten
-XLBUFFER
-xlbuflines
-xml
-xnode
-xontab
-xor
-Xout
-xperl
-xphp
-xpi
-xpm
-xpowered
-xprop
-xpython
-XRBUFFER
-xrbuflines
-xruby
-xsel
-xshell
-xstrat
-xterm
-XTRACE
-xudmec
-xunit
-xvf
-xvjf
-xxd
-xxdiff
-Xxjn
-xzcat
-yaconf
-yain
-yainsd
-yaloc
-yalst
-yamir
-yaml
-yandex
-yandsearch
-Yanovich
-yaorph
-yarem
-yarep
-yarnpkg
-yarnrc
-yasu
-yaupd
-yaupg
-ybalrid
-ycc
-yesorno
-yga
-ygi
-ygl
-ygr
-ygrm
-ygu
-yii
-yiic
-yiiframework
-yireo
-yleo
-ylep
-yli
-yln
-ylnf
-yls
-ymc
-yml
-yolo
-Yonchu
-YOSHIDA
-yout
-youtube
-yrl
-yrm
-yrun
-yst
-ytc
-yuc
-yui
-yuil
-yuyuchu
-yws
-yyy
-yzf
-zadd
-zake
-zal
-zall
-zas
-zbell
-ZCA
-zcard
-zcl
-zcompcache
-zcompdump
-zcompile
-Zconvey
-zcount
-zcu
-zcurses
-zdbc
-zdbcm
-zdbm
-zdbmigrate
-zdbr
-zdbreset
-ZDgw
-zdharma
-zdirs
-zdotdir
-zdup
-zenerate
-zenmap
-zerver
-zfs
-zgen
-zgrep
-zhimingwang
-zhse
-zic
-zif
-zin
-zincrby
-zinit
-zinr
-zinterstore
-zipalign
-zipfile
-zkat
-zle
-zleparameter
-zlicenses
-zll
-zlogin
-zlogout
-zlp
-zlr
-zls
-zlu
-zma
-zmodload
-zmr
-zms
-znr
-znt
-zocmez
-zonsole
-zoxide
-zpa
-zparseopts
-zpatch
-zpattern
-zpch
-zpchk
-zpd
-zplg
-zplug
-zplugin
-zproduct
-zprofile
-zps
-zpt
-zrake
-zrange
-zrangebyscore
-zrank
-zref
-zregexparse
-zrem
-zremrangebyrank
-zremrangebyscore
-zrevrange
-zrevrangebyscore
-zrevrank
-zrl
-zrm
-zrn
-zrr
-zrs
-zscore
-zse
-zsh
-zsh'ed
-zshaddhistory
-zshcmd
-zshcommands
-zshcompfunc
-zshconfig
-zshell
-zshenv
-zshexpn
-zshids
-zshrc
-zshtheme
-zshwiki
-zshzle
-zsi
-zsocket
-Zsolt
-zsource
-zspec
-zsr
-zsrc
-zst
-Zstandard
-zstat
-zstd
-zstdcat
-zstyle
-zsw
-ztart
-ztos
-zucumber
-zunctional
-zunionstore
-zunits
-zunner
-zup
-zutil
-zvcmp
-zve
-zweep
-zwip
-ZWJ
-zwp
-zxvf
-zyg
-zypper
-zzz
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
deleted file mode 100644
index 93dfa201c..000000000
--- a/.github/actions/spelling/patterns.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
-
-# YouTube
-https?://(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_]*
-<\s*youtube\s+id=['"][-a-zA-Z0-9?_]*['"]
-\bimg\.youtube\.com/vi/[-a-zA-Z0-9?&=_]*
-# Google Analytics
-\bgoogle-analytics\.com/collect.[-0-9a-zA-Z?%=&_.~]*
-# Google APIs
-\bgoogleapis\.com/[a-z]+/v\d+/[a-z]+/[@./?=\w]+
-\b[-a-zA-Z0-9.]*\bstorage\d*\.googleapis\.com(?:/\S*|)
-# Google Calendar
-\bcalendar\.google\.com/calendar(?:/u/\d+|)/embed\?src=[@./?=\w&%]+
-\w+\@group\.calendar\.google\.com\b
-# Google DataStudio
-\bdatastudio\.google\.com/(?:(?:c/|)u/\d+/|)(?:embed/|)(?:open|reporting|datasources|s)/[-0-9a-zA-Z]+(?:/page/[-0-9a-zA-Z]+|)
-# The leading `/` here is as opposed to the `\b` above
-# ... a short way to match `https://` or `http://` since most urls have one of those prefixes
-# Google Docs
-/docs\.google\.com/[a-z]+/d/(?:e/|)[0-9a-zA-Z_-]+/?
-# Google Drive
-\bdrive\.google\.com/file/d/[0-9a-zA-Z_?=]*
-# Google Groups
-\bgroups\.google\.com/(?:forum/#!|d/)(?:msg|topic)/[^/]+/[a-zA-Z0-9]+(?:/[a-zA-Z0-9]+|)
-# Google themes
-themes\.googleusercontent\.com/static/fonts/[^/]+/v\d+/[^.]+.
-# Google CDN
-\bclients2\.google(?:usercontent|)\.com[-0-9a-zA-Z/.]*
-# Goo.gl
-/goo\.gl/[a-zA-Z0-9]+
-# Google Chrome Store
-\bchrome\.google\.com/webstore/detail/\w*(?:/\w*|)
-# Google Books
-\bbooks\.google\.(?:\w{2,4})/books\?[-\w\d=&#.]*
-# Google Fonts
-\bfonts\.(?:googleapis|gstatic)\.com/[-/?=:;+&0-9a-zA-Z]*
-
-# GitHub SHAs
-\bapi.github\.com/repos/[^/]+/[^/]+/[^/]+/[0-9a-f]+\b
-(?:\[[0-9a-f]+\]\(https:/|)/(?:www\.|)github\.com/[^/]+/[^/]+(?:/[^/]+/[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b|)
-\bgithub\.com/[^/]+/[^/]+[@#][0-9a-f]+\b
-# githubusercontent
-/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
-# gist github
-/gist\.github\.com/[^/]+/[0-9a-f]+
-# git.io
-\bgit\.io/[0-9a-zA-Z]+
-# GitHub JSON
-"node_id": "[-a-zA-Z=;:/0-9+]*"
-# Contributor
-\[[^\]]+]\(https://github\.com/[^/]+\)
-# GHSA
-GHSA(?:-[0-9a-z]{4}){3}
-
-LS_COLORS=(["']).*?\g{-1}
-
-(\\?)%[a-zA-Z]+\g{-1}(?!%)
-
-# URL escaped characters
-\%[0-9A-F]{2}
-# hex digits including css/html color classes:
-(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9a-fA-FgGrR_]{2,}(?:[uU]?[lL]{0,2}|u\d+)\b
-
-# https://www.gnu.org/software/groff/manual/groff.html
-# man troff content
-\\f[BCIPR]
-
-# Compiler flags
-[\t "'`=]-[LPWXY]
-[\t "'`=]-D(?!ebian)
-
-# ignore long runs of a single character:
-\b([A-Za-z])\g{-1}{3,}\b
diff --git a/.github/actions/spelling/reject.txt b/.github/actions/spelling/reject.txt
deleted file mode 100644
index a5ba6f639..000000000
--- a/.github/actions/spelling/reject.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-^attache$
-benefitting
-occurence
-Sorce
-^[Ss]pae
-^untill
-^wether

From 4d9e5ce9a7d8db3c3aadcae81580a5c3ff5a0e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Apr 2022 21:40:08 +0200
Subject: [PATCH 563/591] ci(project): sort issues and PRs when reopened

---
 .github/workflows/project.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 4b671d449..b2219893d 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -1,9 +1,9 @@
 name: Project tracking
 on:
   issues:
-    types: [opened]
+    types: [opened, reopened]
   pull_request_target:
-    types: [opened, synchronize]
+    types: [opened, reopened, synchronize]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

From b3999a4b156185b617a5608317497399f88dc8fe Mon Sep 17 00:00:00 2001
From: Richard Mitchell <rwmitchell@gmail.com>
Date: Wed, 6 Apr 2022 16:22:47 -0400
Subject: [PATCH 564/591] fix(vi-mode): use system clipboard also for
 `vi-delete-char` (#10820)

---
 plugins/vi-mode/vi-mode.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index b40b29961..149d6bbd5 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -119,7 +119,7 @@ function wrap_clipboard_widgets() {
   done
 }
 
-wrap_clipboard_widgets copy vi-yank vi-yank-eol vi-backward-kill-word vi-change-whole-line vi-delete
+wrap_clipboard_widgets copy vi-yank vi-yank-eol vi-backward-kill-word vi-change-whole-line vi-delete vi-delete-char
 wrap_clipboard_widgets paste vi-put-{before,after}
 unfunction wrap_clipboard_widgets
 

From 0818df057cca59a949ffa88947a6b16dec2411ca Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Sat, 9 Apr 2022 14:45:42 +0200
Subject: [PATCH 565/591] fix: use `python3` for all `python` invocations
 (#10832)

---
 plugins/aliases/aliases.plugin.zsh       |  4 ++--
 plugins/aliases/cheatsheet.py            |  2 +-
 plugins/git-prompt/README.md             |  2 +-
 plugins/git-prompt/git-prompt.plugin.zsh |  2 +-
 plugins/git-prompt/gitstatus.py          |  2 +-
 plugins/jsontools/jsontools.plugin.zsh   | 12 ++++++------
 plugins/pyenv/pyenv.plugin.zsh           |  2 +-
 plugins/python/README.md                 |  2 +-
 plugins/python/python.plugin.zsh         |  6 +++---
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/plugins/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh
index b3d9340f0..4e1e0558e 100644
--- a/plugins/aliases/aliases.plugin.zsh
+++ b/plugins/aliases/aliases.plugin.zsh
@@ -3,9 +3,9 @@
 # - acs: alias cheatsheet
 #   group alias by command, pass addition argv to grep.
 function acs(){
-  (( $+commands[python] )) || {
+  (( $+commands[python3] )) || {
     echo "[error] No python executable detected"
     return
   }
-  alias | python ${functions_source[$0]:h}/cheatsheet.py $@
+  alias | python3 ${functions_source[$0]:h}/cheatsheet.py $@
 }
diff --git a/plugins/aliases/cheatsheet.py b/plugins/aliases/cheatsheet.py
index 694afd31c..a7e3968b0 100644
--- a/plugins/aliases/cheatsheet.py
+++ b/plugins/aliases/cheatsheet.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 import itertools
 import termcolor
diff --git a/plugins/git-prompt/README.md b/plugins/git-prompt/README.md
index 83d365c84..8775af893 100644
--- a/plugins/git-prompt/README.md
+++ b/plugins/git-prompt/README.md
@@ -13,7 +13,7 @@ See the [original repository](https://github.com/olivierverdier/zsh-git-prompt).
 
 ## Requirements
 
-This plugin uses `python`, so your host needs to have it installed
+This plugin uses `python3`, so your host needs to have it installed.
 
 ## Examples
 
diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index c86c1f59b..0485e317c 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -36,7 +36,7 @@ function update_current_git_vars() {
     unset __CURRENT_GIT_STATUS
 
     local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
-    _GIT_STATUS=$(python ${gitstatus} 2>/dev/null)
+    _GIT_STATUS=$(python3 ${gitstatus} 2>/dev/null)
      __CURRENT_GIT_STATUS=("${(@s: :)_GIT_STATUS}")
     GIT_BRANCH=$__CURRENT_GIT_STATUS[1]
     GIT_AHEAD=$__CURRENT_GIT_STATUS[2]
diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 4dea8000f..b5c3c9a0c 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 
 import os
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 857ca0ec9..49828d32d 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -8,7 +8,7 @@ fi
 
 # If method undefined, find the first one that is installed
 if [[ -z "$JSONTOOLS_METHOD" ]]; then
-  for JSONTOOLS_METHOD in node python ruby; do
+  for JSONTOOLS_METHOD in node python3 ruby; do
     # If method found, break out of loop
     (( $+commands[$JSONTOOLS_METHOD] )) && break
     # Otherwise unset the variable
@@ -45,12 +45,12 @@ case "$JSONTOOLS_METHOD" in
       xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"
     }
   ;;
-  python)
+  python3)
     function pp_json() {
-      python -c 'import sys; del sys.path[0]; import runpy; runpy._run_module_as_main("json.tool")'
+      python3 -c 'import sys; del sys.path[0]; import runpy; runpy._run_module_as_main("json.tool")'
     }
     function is_json() {
-      python -c '
+      python3 -c '
 import sys; del sys.path[0];
 import json
 try:
@@ -61,14 +61,14 @@ except ValueError:
       '
     }
     function urlencode_json() {
-      python -c '
+      python3 -c '
 import sys; del sys.path[0];
 from urllib.parse import quote_plus
 print(quote_plus(sys.stdin.read()))
       '
     }
     function urldecode_json() {
-      python -c '
+      python3 -c '
 import sys; del sys.path[0];
 from urllib.parse import unquote_plus
 print(unquote_plus(sys.stdin.read()))
diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index ebb1a708a..7fbd1589e 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -89,7 +89,7 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
 else
   # Fall back to system python
   function pyenv_prompt_info() {
-    local version="$(python -V 2>&1 | cut -d' ' -f2)"
+    local version="$(python3 -V 2>&1 | cut -d' ' -f2)"
     echo "system: ${version:gs/%/%%}"
   }
 fi
diff --git a/plugins/python/README.md b/plugins/python/README.md
index c1f0adef8..97c1a34ee 100644
--- a/plugins/python/README.md
+++ b/plugins/python/README.md
@@ -12,7 +12,7 @@ plugins=(... python)
 
 | Command          | Description                                                                            |
 | ---------------- | -------------------------------------------------------------------------------------- |
-| `py`             | Runs `python`                                                                          |
+| `py`             | Runs `python3`                                                                         |
 | `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv           |
 | `pyfind`         | Finds .py files recursively in the current directory                                   |
 | `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one        |
diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 7a73ab92a..2fbb59577 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -1,5 +1,5 @@
 # python command
-alias py='python'
+alias py='python3'
 
 # Find python file
 alias pyfind='find . -name "*.py"'
@@ -44,10 +44,10 @@ function pyuserpaths() {
 alias pygrep='grep -nr --include="*.py"'
 
 # Run proper IPython regarding current virtualenv (if any)
-alias ipython="python -c 'import IPython; IPython.terminal.ipapp.launch_new_instance()'"
+alias ipython="python3 -c 'import IPython; IPython.terminal.ipapp.launch_new_instance()'"
 
 # Share local directory as a HTTP server
-alias pyserver="python -m http.server"
+alias pyserver="python3 -m http.server"
 
 
 ## venv utilities

From fcceeb666452c5a41b786f3cde9c8635ddde5448 Mon Sep 17 00:00:00 2001
From: PierreD <39910767+PierreDemailly@users.noreply.github.com>
Date: Sat, 9 Apr 2022 15:18:24 +0200
Subject: [PATCH 566/591] fix(frisk): fix color typo in `PS2` (#10839)

---
 themes/frisk.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme
index 653c7461f..f4f934d05 100644
--- a/themes/frisk.zsh-theme
+++ b/themes/frisk.zsh-theme
@@ -2,7 +2,7 @@ PROMPT=$'
 %{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)$(bzr_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
 %{$fg_bold[black]%}>%{$reset_color%} '
 
-PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"
+PROMPT2="%{$fg_bold[black]%}%_> %{$reset_color%}"
 
 GIT_CB="git::"
 ZSH_THEME_SCM_PROMPT_PREFIX="%{$fg[green]%}["

From 846f417eb8ec76e8eee70000e289b8b81f19d480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 10 Apr 2022 10:20:51 +0200
Subject: [PATCH 567/591] feat(updater): check for typed input before
 automatically updating (#10830)

---
 tools/check_for_upgrade.sh | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index d3ad7582c..149500aa9 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -180,25 +180,19 @@ function has_typed_input() {
     return
   fi
 
+  # If in reminder mode or user has typed input, show reminder and exit
+  if [[ "$update_mode" = reminder ]] || has_typed_input; then
+    printf '\r\e[0K' # move cursor to first column and clear whole line
+    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
+    return 0
+  fi
+
   # Don't ask for confirmation before updating if in auto mode
   if [[ "$update_mode" = auto ]]; then
     update_ohmyzsh
     return $?
   fi
 
-  # If in reminder mode show reminder and exit
-  if [[ "$update_mode" = reminder ]]; then
-    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
-    return 0
-  fi
-
-  # If user has typed input, show reminder and exit
-  if has_typed_input; then
-    echo
-    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
-    return 0
-  fi
-
   # Ask for confirmation and only update on 'y', 'Y' or Enter
   # Otherwise just show a reminder for how to update
   echo -n "[oh-my-zsh] Would you like to update? [Y/n] "

From 9fa3f4612224ed1db75d2e3cf1fc8d09d76adb45 Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Tue, 12 Apr 2022 19:26:22 +0800
Subject: [PATCH 568/591] fix(shell-proxy): make ssh-proxy compatible with
 macOS (#10640)

---
 plugins/shell-proxy/.editorconfig |  3 +++
 plugins/shell-proxy/ssh-proxy.py  | 23 +++++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 plugins/shell-proxy/.editorconfig

diff --git a/plugins/shell-proxy/.editorconfig b/plugins/shell-proxy/.editorconfig
new file mode 100644
index 000000000..b7c70d16d
--- /dev/null
+++ b/plugins/shell-proxy/.editorconfig
@@ -0,0 +1,3 @@
+[*.py]
+indent_size = 4
+indent_style = space
diff --git a/plugins/shell-proxy/ssh-proxy.py b/plugins/shell-proxy/ssh-proxy.py
index 6773a77bc..a498c84bc 100755
--- a/plugins/shell-proxy/ssh-proxy.py
+++ b/plugins/shell-proxy/ssh-proxy.py
@@ -20,14 +20,17 @@ proxy_protocols = {
 if parsed.scheme not in proxy_protocols:
     raise TypeError('unsupported proxy protocol: "{}"'.format(parsed.scheme))
 
-argv = [
-    "nc",
-    "-X",
-    proxy_protocols[parsed.scheme], # Supported protocols are 4 (SOCKS v4), 5 (SOCKS v5) and connect (HTTP proxy). Default SOCKS v5 is used.
-    "-x",
-    parsed.netloc,  # proxy-host:proxy-port
-    sys.argv[1],  # host
-    sys.argv[2],  # port
-]
+def make_argv():
+    yield "nc"
+    if sys.platform == 'linux':
+        # caveats: macOS built-in netcat command not supported proxy-type
+        yield "-X" # --proxy-type
+        # Supported protocols are 4 (SOCKS v4), 5 (SOCKS v5) and connect (HTTP proxy).
+        # Default SOCKS v5 is used.
+        yield proxy_protocols[parsed.scheme]
+    yield "-x" # --proxy
+    yield parsed.netloc # proxy-host:proxy-port
+    yield sys.argv[1] # host
+    yield sys.argv[2] # port
 
-subprocess.call(argv)
+subprocess.call(make_argv())

From c6f0504cf0f75bc17cc422e82fdb84f0c994c461 Mon Sep 17 00:00:00 2001
From: Abhinav M <abhinavmanchanda@users.noreply.github.com>
Date: Wed, 13 Apr 2022 01:22:41 +0530
Subject: [PATCH 569/591] feat(docker): add aliases to `docker` plugin (#6527)

---
 plugins/docker/README.md         | 43 ++++++++++++++++++++++++++++++--
 plugins/docker/docker.plugin.zsh | 39 +++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 plugins/docker/docker.plugin.zsh

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index fab7aa8f1..8a88bda48 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -1,6 +1,6 @@
 # Docker plugin
 
-This plugin adds auto-completion for [docker](https://www.docker.com/).
+This plugin adds auto-completion and aliases for [docker](https://www.docker.com/).
 
 To use it add `docker` to the plugins array in your zshrc file.
 
@@ -28,7 +28,46 @@ the lines below to your zshrc file**, but be aware of the side effects:
 >
 > Therefore, this behavior is disabled by default. To enable it:
 >
-> ```
+> ```sh
 > zstyle ':completion:*:*:docker:*' option-stacking yes
 > zstyle ':completion:*:*:docker-*:*' option-stacking yes
 > ```
+
+## Aliases
+
+| Alias   | Command                     | Description                                                                              |
+| :------ | :-------------------------- | :--------------------------------------------------------------------------------------- |
+| dbl     | `docker build`              | Build an image from a Dockerfile                                                         |
+| dcin    | `docker container inspect`  | Display detailed information on one or more containers                                   |
+| dlo     | `docker container logs`     | Fetch the logs of a docker container                                                     |
+| dls     | `docker container ls`       | List all the running docker containers                                                   |
+| dlsa    | `docker container ls -a`    | List all running and stopped containers                                                  |
+| dpo     | `docker container port`     | List port mappings or a specific mapping for the container                               |
+| dpu     | `docker pull`               | Pull an image or a repository from a registry                                            |
+| dr      | `docker container run`      | Create a new container and start it using the specified command                          |
+| drit    | `docker container run -it`  | Create a new container and start it in an interactive shell                              |
+| drm     | `docker container rm`       | Remove the specified container(s)                                                        |
+| drm!    | `docker container rm -f`    | Force the removal of a running container (uses SIGKILL)                                  |
+| dst     | `docker container start`    | Start one or more stopped containers                                                     |
+| dstp    | `docker container stop`     | Stop one or more running containers                                                      |
+| dtop    | `docker top`                | Display the running processes of a container                                             |
+| dxc     | `docker container exec`     | Run a new command in a running container                                                 |
+| dxcit   | `docker container exec -it` | Run a new command in a running container in an interactive shell                         |
+|         |                             | **Docker Images**                                                                        |
+| dib     | `docker image build`        | Build an image from a Dockerfile (same as docker build)                                  |
+| dii     | `docker image inspect`      | Display detailed information on one or more images                                       |
+| dils    | `docker image ls`           | List docker images                                                                       |
+| dip     | `docker image push`         | Push an image or repository to a remote registry                                         |
+| dirm    | `docker image rm`           | Remove one or more images                                                                |
+| dit     | `docker image tag`          | Add a name and tag to a particular image                                                 |
+|         |                             | **Docker Network**                                                                       |
+| dnc     | `docker network create`     | Create a new network                                                                     |
+| dncn    | `docker network connect`    | Connect a container to a network                                                         |
+| dndcn   | `docker network disconnect` | Disconnect a container from a network                                                    |
+| dni     | `docker network inspect`    | Return information about one or more networks                                            |
+| dnls    | `docker network ls`         | List all networks the engine daemon knows about, including those spanning multiple hosts |
+| dnrm    | `docker network rm`         | Remove one or more networks                                                              |
+|         |                             | **Docker Volume**                                                                        |
+| dvi     | `docker volume inspect`     | Display detailed information about one or more volumes                                   |
+| dvls    | `docker volume ls`          | List all the volumes known to  docker                                                    |
+| dvprune | `docker volume prune`       | Cleanup dangling volumes                                                                 |
diff --git a/plugins/docker/docker.plugin.zsh b/plugins/docker/docker.plugin.zsh
new file mode 100644
index 000000000..1d1ed5f5f
--- /dev/null
+++ b/plugins/docker/docker.plugin.zsh
@@ -0,0 +1,39 @@
+alias dbl='docker build'
+alias dpu='docker pull'
+alias dtop='docker top'
+
+# docker containers
+alias dcin='docker container inspect'
+alias dlo='docker container logs'
+alias dls='docker container ls'
+alias dlsa='docker container ls -a'
+alias dpo='docker container port'
+alias dr='docker container run'
+alias drit='docker container run -it'
+alias drm='docker container rm'
+alias 'drm!'='docker container rm -f'
+alias dst='docker container start'
+alias dstp='docker container stop'
+alias dxc='docker container exec'
+alias dxcit='docker container exec -it'
+
+# docker images
+alias dib='docker image build'
+alias dii='docker image inspect'
+alias dils='docker image ls'
+alias dip='docker image push'
+alias dirm='docker image rm'
+alias dit='docker image tag'
+
+# docker network
+alias dnc='docker network create'
+alias dncn='docker network connect'
+alias dndcn='docker network disconnect'
+alias dni='docker network inspect'
+alias dnls='docker network ls'
+alias dnrm='docker network rm'
+
+# docker volume
+alias dvi='docker volume inspect'
+alias dvls='docker volume ls'
+alias dvprune='docker volume prune'

From ac82e156ca89ec7554e3cc9e2119c750c0b9b305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 13 Apr 2022 13:14:38 +0200
Subject: [PATCH 570/591] style(systemadmin): use `function` to avoid alias
 conflicts

---
 plugins/systemadmin/systemadmin.plugin.zsh | 46 +++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index 9a2129060..8e5e0af71 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -34,109 +34,109 @@ alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head
 alias hist10='print -l ${(o)history%% *} | uniq -c | sort -nr | head -n 10'
 
 # directory LS
-dls () {
+function dls() {
     print -l *(/)
 }
-psgrep() {
+function psgrep() {
     ps aux | grep "${1:-.}" | grep -v grep
 }
 # Kills any process that matches a regexp passed to it
-killit() {
+function killit() {
     ps aux | grep -v "grep" | grep "$@" | awk '{print $2}' | xargs sudo kill
 }
 
 # list contents of directories in a tree-like format
 if ! (( $+commands[tree] )); then
-    tree () {
+    function tree() {
         find $@ -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
     }
 fi
 
 # Sort connection state
-sortcons() {
+function sortcons() {
     netstat -nat |awk '{print $6}'|sort|uniq -c|sort -rn
 }
 
 # View all 80 Port Connections
-con80() {
+function con80() {
     netstat -nat|grep -i ":80"|wc -l
 }
 
 # On the connected IP sorted by the number of connections
-sortconip() {
+function sortconip() {
     netstat -ntu | awk '{print $5}' | cut -d: -f1 | sort | uniq -c | sort -n
 }
 
 # top20 of Find the number of requests on 80 port
-req20() {
+function req20() {
     netstat -anlp|grep 80|grep tcp|awk '{print $5}'|awk -F: '{print $1}'|sort|uniq -c|sort -nr|head -n20
 }
 
 # top20 of Using tcpdump port 80 access to view
-http20() {
+function http20() {
     sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -n 20
 }
 
 # top20 of Find time_wait connection
-timewait20() {
+function timewait20() {
     netstat -n|grep TIME_WAIT|awk '{print $5}'|sort|uniq -c|sort -rn|head -n20
 }
 
 # top20 of Find SYN connection
-syn20() {
+function syn20() {
     netstat -an | grep SYN | awk '{print $5}' | awk -F: '{print $1}' | sort | uniq -c | sort -nr|head -n20
 }
 
 # Printing process according to the port number
-port_pro() {
+function port_pro() {
     netstat -ntlp | grep "${1:-.}" | awk '{print $7}' | cut -d/ -f1
 }
 
 # top10 of gain access to the ip address
-accessip10() {
+function accessip10() {
     awk '{counts[$(11)]+=1}; END {for(url in counts) print counts[url], url}' "$(retlog)"
 }
 
 # top20 of Most Visited file or page
-visitpage20() {
+function visitpage20() {
     awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -n 20
 }
 
 # top100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences
-consume100() {
+function consume100() {
     awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
     # if django website or other website make by no suffix language
     # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
 }
 
 # Website traffic statistics (G)
-webtraffic() {
+function webtraffic() {
     awk "{sum+=$10} END {print sum/1024/1024/1024}" "$(retlog)"
 }
 
 # Statistical connections 404
-c404() {
+function c404() {
     awk '($9 ~/404/)' "$(retlog)" | awk '{print $9,$7}' | sort
 }
 
 # Statistical http status.
-httpstatus() {
+function httpstatus() {
     awk '{counts[$(9)]+=1}; END {for(code in counts) print code, counts[code]}' "$(retlog)"
 }
 
 # Delete 0 byte file
-d0() {
+function d0() {
     find "${1:-.}" -type f -size 0 -exec rm -rf {} \;
 }
 
 # gather external ip address
-geteip() {
+function geteip() {
     curl -s -S -4 https://icanhazip.com
     curl -s -S -6 https://icanhazip.com
 }
 
 # determine local IP address(es)
-getip() {
+function getip() {
     if (( ${+commands[ip]} )); then
         ip addr | awk '/inet /{print $2}' | command grep -v 127.0.0.1
     else
@@ -145,11 +145,11 @@ getip() {
 }
 
 # Clear zombie processes
-clrz() {
+function clrz() {
     ps -eal | awk '{ if ($2 == "Z") {print $4}}' | kill -9
 }
 
 # Second concurrent
-conssec() {
+function conssec() {
     awk '{if($9~/200|30|404/)COUNT[$4]++}END{for( a in COUNT) print a,COUNT[a]}' "$(retlog)"|sort -k 2 -nr|head -n10
 }

From 7ea6ff8d04acd665ebcd151d183ec67af5be1281 Mon Sep 17 00:00:00 2001
From: Abhinav M <abhinavmanchanda@users.noreply.github.com>
Date: Wed, 13 Apr 2022 18:35:55 +0530
Subject: [PATCH 571/591] fix(docker): rename `dls` and `dlsa` aliases to avoid
 conflict (#10852)

---
 plugins/docker/README.md         | 4 ++--
 plugins/docker/docker.plugin.zsh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index 8a88bda48..2b721c770 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -40,8 +40,8 @@ the lines below to your zshrc file**, but be aware of the side effects:
 | dbl     | `docker build`              | Build an image from a Dockerfile                                                         |
 | dcin    | `docker container inspect`  | Display detailed information on one or more containers                                   |
 | dlo     | `docker container logs`     | Fetch the logs of a docker container                                                     |
-| dls     | `docker container ls`       | List all the running docker containers                                                   |
-| dlsa    | `docker container ls -a`    | List all running and stopped containers                                                  |
+| dcls     | `docker container ls`       | List all the running docker containers                                                   |
+| dclsa    | `docker container ls -a`    | List all running and stopped containers                                                  |
 | dpo     | `docker container port`     | List port mappings or a specific mapping for the container                               |
 | dpu     | `docker pull`               | Pull an image or a repository from a registry                                            |
 | dr      | `docker container run`      | Create a new container and start it using the specified command                          |
diff --git a/plugins/docker/docker.plugin.zsh b/plugins/docker/docker.plugin.zsh
index 1d1ed5f5f..843c8e241 100644
--- a/plugins/docker/docker.plugin.zsh
+++ b/plugins/docker/docker.plugin.zsh
@@ -5,8 +5,8 @@ alias dtop='docker top'
 # docker containers
 alias dcin='docker container inspect'
 alias dlo='docker container logs'
-alias dls='docker container ls'
-alias dlsa='docker container ls -a'
+alias dcls='docker container ls'
+alias dclsa='docker container ls -a'
 alias dpo='docker container port'
 alias dr='docker container run'
 alias drit='docker container run -it'

From f1a5fb5ee99f51f06a18b7b0ffecd8763f8d96d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 14 Apr 2022 12:05:02 +0200
Subject: [PATCH 572/591] fix(cli): fix `commit.gpgsign` test in `omz pr test`

Since `set -e` is enabled, when `commit.gpgsign` is not set the
`git config` command would show an error. Given that it is technically
not ignored, the subshell would exit.

With this change, the `commit.gpgsign` setting is properly tested
by doing the fallback test if the command fails, so no exit status
code ends up quiting the subshell.
---
 lib/cli.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index bf783d9f3..56d5b91de 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -578,8 +578,9 @@ function _omz::pr::test {
       # Back up commit.gpgsign setting: use --local to get the current repository
       # setting, not the global one. If --local is not a known option, it will
       # exit with a 129 status code.
-      gpgsign=$(command git config --local commit.gpgsign 2>/dev/null)
-      [[ $? -ne 129 ]] || gpgsign=$(command git config commit.gpgsign 2>/dev/null)
+      if ! gpgsign=$(command git config --local commit.gpgsign 2>/dev/null); then
+        [[ $? -ne 129 ]] || gpgsign=$(command git config commit.gpgsign 2>/dev/null)
+      fi
       command git config commit.gpgsign false
 
       command git rebase master ohmyzsh/pull-$1 || {

From 30e23a643ba4f892c42e8d8d8a2ab31a6e68a9a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 14 Apr 2022 12:13:53 +0200
Subject: [PATCH 573/591] refactor(cli): fix `commit.gpgsign` test in `omz pr
 test`

---
 lib/cli.zsh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 56d5b91de..b71f6d9ce 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -573,14 +573,13 @@ function _omz::pr::test {
 
     # Rebase pull request branch against the current master
     _omz::log info "rebasing PR #$1..."
-    local gpgsign
+    local ret gpgsign
     {
       # Back up commit.gpgsign setting: use --local to get the current repository
       # setting, not the global one. If --local is not a known option, it will
       # exit with a 129 status code.
-      if ! gpgsign=$(command git config --local commit.gpgsign 2>/dev/null); then
-        [[ $? -ne 129 ]] || gpgsign=$(command git config commit.gpgsign 2>/dev/null)
-      fi
+      gpgsign=$(command git config --local commit.gpgsign 2>/dev/null) || ret=$?
+      [[ $ret -ne 129 ]] || gpgsign=$(command git config commit.gpgsign 2>/dev/null)
       command git config commit.gpgsign false
 
       command git rebase master ohmyzsh/pull-$1 || {

From eb00b95d26e8f264af80f508d50ac32e50619027 Mon Sep 17 00:00:00 2001
From: "Olivia (Zoe)" <zoe.i2k1@gmail.com>
Date: Thu, 14 Apr 2022 16:31:17 +0200
Subject: [PATCH 574/591] chore: minor documentation tweaks (#10853)

---
 CONTRIBUTING.md |  8 ++++----
 README.md       | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 605142845..2bd877892 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,7 +47,7 @@ It should include the data gathered as indicated above, along with:
 2. What the correct behavior should be
 3. What the actual behavior is
 
-Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle
+Please copy to anyone relevant (e.g. plugin maintainers) by mentioning their GitHub handle
 (starting with `@`) in your message.
 
 We will do our very best to help you.
@@ -59,7 +59,7 @@ your suggestion.
 
 If you find one, comment on it so we can know there are more people supporting it.
 
-If not, you can go ahead and create an issue. Please copy to anyone relevant (_eg_ plugin
+If not, you can go ahead and create an issue. Please copy to anyone relevant (e.g. plugin
 maintainers) by mentioning their GitHub handle (starting with `@`) in your message.
 
 ## Submitting Pull Requests
@@ -99,10 +99,10 @@ covering or related to what you want to add.
 
 If you find one, try it out and work with the author on a common solution.
 
-If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin
+If not, then go ahead and submit a PR. Please copy to anyone relevant (e.g. plugin
 maintainers) by mentioning their GitHub handle (starting with `@`) in your message.
 
-For any extensive change, _eg_ a new plugin, you will have to find testers to +1 your PR.
+For any extensive change, such as a new plugin, you will have to find testers to +1 your PR.
 
 ----
 
diff --git a/README.md b/README.md
index 4c41fad81..1e4b7ff70 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Oh My Zsh is installed by running one of the following commands in your terminal
 | **wget**  | `sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`   |
 | **fetch** | `sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
 
-_Note that previous configuration in `.zshrc` will be placed in `.pre-oh-my-zsh`. After installation you can move configuration you want to preserve into `.zshrc`._
+_Note that any previous `.zshrc` will be renamed to `.zshrc.pre-oh-my-zsh`. After installation, you can move the configuration you want to preserve into the new `.zshrc`._
 
 #### Manual inspection
 
@@ -117,7 +117,7 @@ _Note that the plugins are separated by whitespace (spaces, tabs, new lines...).
 
 #### Using Plugins
 
-Each plugin includes a **README**, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin.
+Each built-in plugin includes a **README**, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin.
 
 ### Themes
 
@@ -140,7 +140,7 @@ ZSH_THEME="agnoster" # (this is one of the fancy ones)
 # see https://github.com/ohmyzsh/ohmyzsh/wiki/Themes#agnoster
 ```
 
-_Note: many themes require installing the [Powerline Fonts](https://github.com/powerline/fonts) in order to render properly._
+_Note: many themes require installing a [Powerline Font](https://github.com/powerline/fonts) or a [Nerd Font](https://github.com/ryanoasis/nerd-fonts) in order to render properly. Without them, these themes will render [weird prompt symbols](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ#i-have-a-weird-character-in-my-prompt)_
 
 Open up a new terminal window and your prompt should look something like this:
 
@@ -196,9 +196,9 @@ ZSH="$HOME/.dotfiles/oh-my-zsh" sh install.sh
 
 #### Unattended install
 
-If you're running the Oh My Zsh install script as part of an automated install, you can pass the
-flag `--unattended` to the `install.sh` script. This will have the effect of not trying to change
-the default shell, and also won't run `zsh` when the installation has finished.
+If you're running the Oh My Zsh install script as part of an automated install, you can pass the `--unattended`
+flag to the `install.sh` script. This will have the effect of not trying to change
+the default shell, and it also won't run `zsh` when the installation has finished.
 
 ```sh
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
@@ -329,7 +329,7 @@ Before you participate in our delightful community, please read the [code of con
 
 I'm far from being a [Zsh](https://www.zsh.org/) expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
 
-We also need people to test out pull-requests. So take a look through [the open issues](https://github.com/ohmyzsh/ohmyzsh/issues) and help where you can.
+We also need people to test out pull requests. So take a look through [the open issues](https://github.com/ohmyzsh/ohmyzsh/issues) and help where you can.
 
 See [Contributing](CONTRIBUTING.md) for more details.
 

From ed411d3ff196e32844409ebe0f8b3e21b0b1c9f6 Mon Sep 17 00:00:00 2001
From: David Davis <daviddavis@users.noreply.github.com>
Date: Mon, 18 Apr 2022 06:56:55 -0400
Subject: [PATCH 575/591] fix(httpie): remove unnecessary `https` alias
 (#10856)

---
 plugins/httpie/README.md         | 6 ------
 plugins/httpie/httpie.plugin.zsh | 7 -------
 2 files changed, 13 deletions(-)
 delete mode 100644 plugins/httpie/httpie.plugin.zsh

diff --git a/plugins/httpie/README.md b/plugins/httpie/README.md
index 40d60c47d..25bdd0c7d 100644
--- a/plugins/httpie/README.md
+++ b/plugins/httpie/README.md
@@ -11,10 +11,4 @@ plugins=(... httpie)
 
 It uses completion from [zsh-completions](https://github.com/zsh-users/zsh-completions).
 
-## Aliases
-
-| Alias        | Command                                                          |
-| ------------ | ---------------------------------------------------------------- |
-| `https`      | `http --default-scheme=https`                                    |
-
 **Maintainer:** [lululau](https://github.com/lululau)
diff --git a/plugins/httpie/httpie.plugin.zsh b/plugins/httpie/httpie.plugin.zsh
deleted file mode 100644
index 088a1f1cf..000000000
--- a/plugins/httpie/httpie.plugin.zsh
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Aliases
-# (sorted alphabetically)
-#
-
-alias https='http --default-scheme=https'
-

From 51555fc4b3abad57784da98d920a3369f558c480 Mon Sep 17 00:00:00 2001
From: Robert Lankford <robert.lankford@grafana.com>
Date: Tue, 19 Apr 2022 06:18:05 -0500
Subject: [PATCH 576/591] feat(gnu-utils): include `ghostname` if present
 (#10867)

---
 plugins/gnu-utils/gnu-utils.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index 6ede9e3a7..9419127d8 100644
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -35,6 +35,9 @@ __gnu_utils() {
   # Not part of either coreutils or findutils, installed separately.
   gcmds+=('gsed' 'gtar' 'gtime' 'gmake' 'ggrep')
 
+  # can be built optionally
+  gcmds+=('ghostname')
+
   for gcmd in "${gcmds[@]}"; do
     # Do nothing if the command isn't found
     (( ${+commands[$gcmd]} )) || continue

From a26d72baa27a46cfd2f35afa789529dccf7fc212 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 19 Apr 2022 19:23:54 +0200
Subject: [PATCH 577/591] fix(init): check for unsafe directories in `fpath`
 (#10672)

---
 oh-my-zsh.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index ab32ee9d3..925ee46aa 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -120,17 +120,18 @@ fi
 
 if [[ "$ZSH_DISABLE_COMPFIX" != true ]]; then
   source "$ZSH/lib/compfix.zsh"
-  # If completion insecurities exist, warn the user
-  handle_completion_insecurities
   # Load only from secure directories
-  compinit -i -C -d "$ZSH_COMPDUMP"
+  compinit -i -d "$ZSH_COMPDUMP"
+  # If completion insecurities exist, warn the user
+  handle_completion_insecurities &|
 else
   # If the user wants it, load from all found directories
-  compinit -u -C -d "$ZSH_COMPDUMP"
+  compinit -u -d "$ZSH_COMPDUMP"
 fi
 
 # Append zcompdump metadata if missing
-if (( $zcompdump_refresh )); then
+if (( $zcompdump_refresh )) \
+  || ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null; then
   # Use `tee` in case the $ZSH_COMPDUMP filename is invalid, to silence the error
   # See https://github.com/ohmyzsh/ohmyzsh/commit/dd1a7269#commitcomment-39003489
   tee -a "$ZSH_COMPDUMP" &>/dev/null <<EOF

From a879ff1515b6bd80eea695c03e22289bd6743718 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Fri, 22 Apr 2022 19:37:57 +0200
Subject: [PATCH 578/591] fix(nvm): support path from Apple Silicon Homebrew
 (#10875)

---
 plugins/nvm/nvm.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 3ef8cc1d8..b8f28c27c 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -16,7 +16,7 @@ if [[ -f "$NVM_DIR/nvm.sh" ]]; then
 else
   # Otherwise try to load nvm installed via Homebrew
   # User can set this if they have an unusual Homebrew setup
-  NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}"
+  NVM_HOMEBREW="${NVM_HOMEBREW:-${HOMEBREW_PREFIX:-$(brew --prefix)}/opt/nvm}"
   # Load nvm from Homebrew location if it exists
   if [[ -f "$NVM_HOMEBREW/nvm.sh" ]]; then
     source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"}

From 8741664e5561c244d841be780b171171ae665fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 24 Apr 2022 18:58:36 +0200
Subject: [PATCH 579/591] fix(nvm): don't try to load nvm via `brew` if not
 found (#10878)

Fixes #10878
---
 plugins/nvm/nvm.plugin.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index b8f28c27c..630854a71 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -8,12 +8,13 @@ if [[ -z "$NVM_DIR" ]]; then
 fi
 
 # Don't try to load nvm if command already available
-which nvm &> /dev/null && return
+# Note: nvm is a function so we need to use `which`
+! which nvm &>/dev/null || return
 
 if [[ -f "$NVM_DIR/nvm.sh" ]]; then
   # Load nvm if it exists in $NVM_DIR
   source "$NVM_DIR/nvm.sh" ${NVM_LAZY+"--no-use"}
-else
+elif (( $+commands[brew] )); then
   # Otherwise try to load nvm installed via Homebrew
   # User can set this if they have an unusual Homebrew setup
   NVM_HOMEBREW="${NVM_HOMEBREW:-${HOMEBREW_PREFIX:-$(brew --prefix)}/opt/nvm}"
@@ -21,9 +22,10 @@ else
   if [[ -f "$NVM_HOMEBREW/nvm.sh" ]]; then
     source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"}
   else
-    # Exit the plugin if we couldn't find nvm
     return
   fi
+else
+  return
 fi
 
 # Call nvm when first using node, npm or yarn

From 8f56a8bdf39d7727ab0e220f0164f78c77f9c50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 23 Apr 2022 11:56:33 +0200
Subject: [PATCH 580/591] refactor(boot2docker)!: remove plugin for abandoned
 boot2docker (#10877)

BREAKING CHANGE: the boot2docker project was abandoned in 2020,
so it makes no sense to keep the plugin. If you were using it,
remove it from the `$plugins` array.

Fixes #10877
---
 plugins/boot2docker/README.md    |  6 ---
 plugins/boot2docker/_boot2docker | 73 --------------------------------
 2 files changed, 79 deletions(-)
 delete mode 100644 plugins/boot2docker/README.md
 delete mode 100644 plugins/boot2docker/_boot2docker

diff --git a/plugins/boot2docker/README.md b/plugins/boot2docker/README.md
deleted file mode 100644
index 9551e2351..000000000
--- a/plugins/boot2docker/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Boot2docker autocomplete plugin
-
-- Adds autocomplete options for all boot2docker commands.
-
-
-Maintainer : Manfred Touron ([@moul](https://github.com/moul))
diff --git a/plugins/boot2docker/_boot2docker b/plugins/boot2docker/_boot2docker
deleted file mode 100644
index 3116bd14c..000000000
--- a/plugins/boot2docker/_boot2docker
+++ /dev/null
@@ -1,73 +0,0 @@
-#compdef boot2docker
-
-# Boot2docker autocompletion for oh-my-zsh
-# Requires: Boot2docker installed
-# Author: Manfred Touron (@moul)
-
-local -a _1st_arguments
-_1st_arguments=(
-   "init":"Create a new Boot2Docker VM."
-   "up":"Start VM from any states."
-   "start":"Start VM from any states."
-   "boot":"Start VM from any states."
-   "ssh":"[ssh-command] Login to VM via SSH."
-   "save":"Suspend VM and save state to disk."
-   "suspend":"Suspend VM and save state to disk."
-   "down":"Gracefully shutdown the VM."
-   "stop":"Gracefully shutdown the VM."
-   "halt":"Gracefully shutdown the VM."
-   "restart":"Gracefully reboot the VM."
-   "poweroff":"Forcefully power off the VM (may corrupt disk image)."
-   "reset":"Forcefully power cycle the VM (may corrupt disk image)."
-   "delete":"Delete Boot2Docker VM and its disk image."
-   "destroy":"Delete Boot2Docker VM and its disk image."
-   "config":"Show selected profile file settings."
-   "cfg":"Show selected profile file settings."
-   "info":"Display detailed information of VM."
-   "ip":"Display the IP address of the VM's Host-only network."
-   "socket":"Display the DOCKER_HOST socket to connect to."
-   "shellinit":"Display the shell command to set up the Docker client."
-   "status":"Display current state of VM."
-   "download":"Download Boot2Docker ISO image."
-   "upgrade":"Upgrade the Boot2Docker ISO image (restart if running)."
-   "version":"Display version information."
-)
-
-_arguments \
-  '(--basevmdk)--basevmdk[Path to VMDK to use as base for persistent partition]' \
-  '(--cpus)'{-c,--cpus}'[number of CPUs for boot2docker.]' \
-  '(--clobber)--clobber[overwrite Docker client binary on boot2docker upgrade]' \
-  '(--dhcp)--dhcp[enable VirtualBox host-only network DHCP.]' \
-  '(--dhcpip)--dhcpip[VirtualBox host-only network DHCP server address.]' \
-  '(-s --disksize)'{-s,--disksize}'[boot2docker disk image size (in MB).]' \
-  '(--dockerport)--dockerport[host Docker port (forward to port 2376 in VM). (deprecated - use with care)]' \
-  '(--driver)--driver[hypervisor driver.]' \
-  '(--force-upgrade-download)--force-upgrade-download[always download on boot2docker upgrade, never skip.]' \
-  '(--hostip)--hostip[VirtualBox host-only network IP address.]' \
-  '(--iso)--iso[path to boot2docker ISO image.]' \
-  '(--iso-url)--iso-url[/api.github.com/repos/boot2docker/boot2docker/releases": source URL to provision the boot2docker ISO image.]' \
-  '(--lowerip)--lowerip[VirtualBox host-only network DHCP lower bound.]' \
-  '(--memory)'{-m,--memory}'[virtual machine memory size (in MB).]' \
-  '(--netmask)--netmask[VirtualBox host-only network mask.]' \
-  '(--no-dummy)--no-dummy[Example parameter for the dummy driver.]' \
-  '(--retries)--retries[number of port knocking retries during 'start']' \
-  '(--serial)--serial[try serial console to get IP address (experimental)]' \
-  '(--serialfile)--serialfile[path to the serial socket/pipe.]' \
-  '(--ssh)--ssh[path to SSH client utility.]' \
-  '(--ssh-keygen)--ssh-keygen[path to ssh-keygen utility.]' \
-  '(--sshkey)--sshkey[path to SSH key to use.]' \
-  '(--sshport)--sshport[host SSH port (forward to port 22 in VM).]' \
-  '(--upperip)--upperip[VirtualBox host-only network DHCP upper bound.]' \
-  '(--vbm)--vbm[path to VirtualBox management utility.]' \
-  '(--vbox-share)--vbox-share[(defaults to "/Users=Users" if no shares are specified; use "disable" to explicitly prevent any shares from being created) List of directories to share during "up|start|boot" via VirtualBox Guest Additions, with optional labels]' \
-  '(--verbose)'{-v,--verbose}'[display verbose command invocations.]' \
-  '(--vm)--vm[virtual machine name.]' \
-  '(--waittime)--waittime[Time in milliseconds to wait between port knocking retries during 'start']' \
-  '*:: :->subcmds' && return 0
-
-#_arguments '*:: :->command'
-
-if (( CURRENT == 1 )); then
-    _describe -t commands "boot2docker command" _1st_arguments
-    return
-fi

From 4674384d1a1182484705b3fa4bd7b3267295d9cc Mon Sep 17 00:00:00 2001
From: Will LE <lexuandinhct@gmail.com>
Date: Thu, 12 May 2022 16:31:00 +0700
Subject: [PATCH 581/591] fix(lib): don't return clean with `hide-dirty=1` in
 `parse_git_dirty` (#10897)

---
 lib/git.zsh | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index be9fa7e67..390c0ad4b 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -34,26 +34,30 @@ function git_prompt_info() {
 
 # Checks if working tree is dirty
 function parse_git_dirty() {
+  if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-dirty)" == "1" ]]; then
+    return 0
+  fi
+
   local STATUS
   local -a FLAGS
   FLAGS=('--porcelain')
-  if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
-    if [[ "${DISABLE_UNTRACKED_FILES_DIRTY:-}" == "true" ]]; then
-      FLAGS+='--untracked-files=no'
-    fi
-    case "${GIT_STATUS_IGNORE_SUBMODULES:-}" in
-      git)
-        # let git decide (this respects per-repo config in .gitmodules)
-        ;;
-      *)
-        # if unset: ignore dirty submodules
-        # other values are passed to --ignore-submodules
-        FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
-        ;;
-    esac
-    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n 1)
+  if [[ "${DISABLE_UNTRACKED_FILES_DIRTY:-}" == "true" ]]; then
+    FLAGS+='--untracked-files=no'
   fi
-  if [[ -n $STATUS ]]; then
+
+  case "${GIT_STATUS_IGNORE_SUBMODULES:-}" in
+    git)
+      # let git decide (this respects per-repo config in .gitmodules)
+      ;;
+    *)
+      # if unset: ignore dirty submodules
+      # other values are passed to --ignore-submodules
+      FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
+      ;;
+  esac
+
+  STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n 1)
+  if [[ -n "$STATUS" ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
   else
     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

From 140c977a3d82410f48c198596de193d2d6b7b9b5 Mon Sep 17 00:00:00 2001
From: jackh <jackhuang1205@gmail.com>
Date: Wed, 4 May 2022 00:30:18 +0800
Subject: [PATCH 582/591] fix(web-search): URL-encode search parameters
 (#10910)

Fixes #10884
---
 plugins/web-search/web-search.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 0a2b8809e..229948894 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -35,7 +35,7 @@ function web_search() {
   if [[ $# -gt 1 ]]; then
     # build search url:
     # join arguments passed with '+', then append to search engine URL
-    url="${urls[$1]}${(j:+:)@[2,-1]}"
+    url="${urls[$1]}$(omz_urlencode ${@[2,-1]})"
   else
     # build main page url:
     # split by '/', then rejoin protocol (1) and domain (2) parts with '//'

From d7fc9b87f92fbd0c03eb99b8c69318468f69e61e Mon Sep 17 00:00:00 2001
From: jackh <jackhuang1205@gmail.com>
Date: Wed, 4 May 2022 00:34:22 +0800
Subject: [PATCH 583/591] fix(frontend-search): URL-encode search parameters
 (#10910)

Fixes #10884
Closes #10910
---
 plugins/frontend-search/frontend-search.plugin.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 7f8d5c90c..b9e2fe95d 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -103,8 +103,7 @@ function frontend() {
 
   # build search url:
   # join arguments passed with '%20', then append to search context URL
-  # TODO substitute for proper urlencode method
-  url="${urls[$1]}${(j:%20:)@[2,-1]}"
+  url="${urls[$1]}$(omz_urlencode -P ${@[2,-1]})"
 
   echo "Opening $url ..."
 

From dfee71c7735b739d6db478b2353752aeb6bc1ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 12 May 2022 18:25:02 +0200
Subject: [PATCH 584/591] Revert "fix(lib): don't return clean with
 `hide-dirty=1` in `parse_git_dirty`" (#10927)

---
 lib/git.zsh | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 390c0ad4b..be9fa7e67 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -34,30 +34,26 @@ function git_prompt_info() {
 
 # Checks if working tree is dirty
 function parse_git_dirty() {
-  if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-dirty)" == "1" ]]; then
-    return 0
-  fi
-
   local STATUS
   local -a FLAGS
   FLAGS=('--porcelain')
-  if [[ "${DISABLE_UNTRACKED_FILES_DIRTY:-}" == "true" ]]; then
-    FLAGS+='--untracked-files=no'
+  if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
+    if [[ "${DISABLE_UNTRACKED_FILES_DIRTY:-}" == "true" ]]; then
+      FLAGS+='--untracked-files=no'
+    fi
+    case "${GIT_STATUS_IGNORE_SUBMODULES:-}" in
+      git)
+        # let git decide (this respects per-repo config in .gitmodules)
+        ;;
+      *)
+        # if unset: ignore dirty submodules
+        # other values are passed to --ignore-submodules
+        FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
+        ;;
+    esac
+    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n 1)
   fi
-
-  case "${GIT_STATUS_IGNORE_SUBMODULES:-}" in
-    git)
-      # let git decide (this respects per-repo config in .gitmodules)
-      ;;
-    *)
-      # if unset: ignore dirty submodules
-      # other values are passed to --ignore-submodules
-      FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
-      ;;
-  esac
-
-  STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n 1)
-  if [[ -n "$STATUS" ]]; then
+  if [[ -n $STATUS ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
   else
     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

From 39b600e9e564db3dec265fcf2e3db4b5568dd93a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 15 May 2022 13:20:33 +0200
Subject: [PATCH 585/591] fix(lib): encode all arguments besides the first in
 `omz_urlencode`

Fixes https://github.com/ohmyzsh/ohmyzsh/commit/140c977a3d82410f48c198596de193d2d6b7b9b5#commitcomment-73688165
---
 lib/functions.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 61f4dd49e..dfcc4d961 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -144,7 +144,7 @@ zmodload zsh/langinfo
 # Returns nonzero if encoding failed.
 #
 # Usage:
-#  omz_urlencode [-r] [-m] [-P] <string>
+#  omz_urlencode [-r] [-m] [-P] <string> [<string> ...]
 #
 #    -r causes reserved characters (;/?:@&=+$,) to be escaped
 #
@@ -156,7 +156,7 @@ function omz_urlencode() {
   local -a opts
   zparseopts -D -E -a opts r m P
 
-  local in_str=$1
+  local in_str="$@"
   local url_str=""
   local spaces_as_plus
   if [[ -z $opts[(r)-P] ]]; then spaces_as_plus=1; fi

From e9e8c6b54d594109041bdd4bc3902b40f9ae8849 Mon Sep 17 00:00:00 2001
From: Steven Pitts <25968054+stevenpitts@users.noreply.github.com>
Date: Wed, 25 May 2022 10:32:33 -0400
Subject: [PATCH 586/591] feat(git): add `gupom` and `gupomi` aliases (#10261)

Co-authored-by: Steven Pitts <spitts@teikametrics.com>
---
 plugins/git/README.md      | 2 ++
 plugins/git/git.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index b9af3488f..b9a0309f3 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -181,6 +181,8 @@ plugins=(... git)
 | gupv                 | git pull --rebase -v                                                                                                             |
 | gupa                 | git pull --rebase --autostash                                                                                                    |
 | gupav                | git pull --rebase --autostash -v                                                                                                 |
+| gupom                | git pull --rebase origin $(git_main_branch)                                                                                      |
+| gupomi               | git pull --rebase=interactive origin $(git_main_branch)                                                                          |
 | glum                 | git pull upstream $(git_main_branch)                                                                                             |
 | gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                               |
 | gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"           |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8f7e623ec..be6adc7ce 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -307,6 +307,8 @@ alias gup='git pull --rebase'
 alias gupv='git pull --rebase -v'
 alias gupa='git pull --rebase --autostash'
 alias gupav='git pull --rebase --autostash -v'
+alias gupom='git pull --rebase origin $(git_main_branch)'
+alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
 alias glum='git pull upstream $(git_main_branch)'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'

From 18e7e5d0339f3491a6c0324e2443415309b56173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 1 Jun 2022 09:11:49 +0200
Subject: [PATCH 587/591] fix(updater): use `curl --connect-timeout` in new
 update check

---
 tools/check_for_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 149500aa9..009c273fa 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -65,7 +65,7 @@ function is_update_available() {
   local remote_head
   remote_head=$(
     if (( ${+commands[curl]} )); then
-      curl -m 2 -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
+      curl --conect-timeout 2 -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
     elif (( ${+commands[wget]} )); then
       wget -T 2 -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
     elif (( ${+commands[fetch]} )); then

From 6622210d7d4afe859f11c5d50c177bd5e500f2c6 Mon Sep 17 00:00:00 2001
From: FaeTheWolf <faelin.landy@gmail.com>
Date: Sun, 5 Jun 2022 09:59:44 -0400
Subject: [PATCH 588/591] fix(oc): fix completion for oc 4.9 and 4.10 (#10973)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #10939

Co-authored-by: Jorge Francisco Varela Gutiérrez <jvarela@jfvarela.redhat.com>
---
 plugins/oc/oc.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/oc/oc.plugin.zsh b/plugins/oc/oc.plugin.zsh
index b968c4bd4..f0e2fc3bc 100644
--- a/plugins/oc/oc.plugin.zsh
+++ b/plugins/oc/oc.plugin.zsh
@@ -4,4 +4,5 @@
 
 if [ $commands[oc] ]; then
   source <(oc completion zsh)
+  compdef _oc oc
 fi

From d41ca84af1271e8bfbe26f581cebe3b86521d0db Mon Sep 17 00:00:00 2001
From: Maxim Derbenev <maxim_ek@mail.ru>
Date: Mon, 6 Jun 2022 18:37:42 +0500
Subject: [PATCH 589/591] fix(docker): rename `dip` alias to `dipu` to avoid
 naming conflict (#10957)

---
 plugins/docker/README.md         | 2 +-
 plugins/docker/docker.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index 2b721c770..606690f14 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -57,7 +57,7 @@ the lines below to your zshrc file**, but be aware of the side effects:
 | dib     | `docker image build`        | Build an image from a Dockerfile (same as docker build)                                  |
 | dii     | `docker image inspect`      | Display detailed information on one or more images                                       |
 | dils    | `docker image ls`           | List docker images                                                                       |
-| dip     | `docker image push`         | Push an image or repository to a remote registry                                         |
+| dipu     | `docker image push`         | Push an image or repository to a remote registry                                         |
 | dirm    | `docker image rm`           | Remove one or more images                                                                |
 | dit     | `docker image tag`          | Add a name and tag to a particular image                                                 |
 |         |                             | **Docker Network**                                                                       |
diff --git a/plugins/docker/docker.plugin.zsh b/plugins/docker/docker.plugin.zsh
index 843c8e241..9c8ad8a28 100644
--- a/plugins/docker/docker.plugin.zsh
+++ b/plugins/docker/docker.plugin.zsh
@@ -21,7 +21,7 @@ alias dxcit='docker container exec -it'
 alias dib='docker image build'
 alias dii='docker image inspect'
 alias dils='docker image ls'
-alias dip='docker image push'
+alias dipu='docker image push'
 alias dirm='docker image rm'
 alias dit='docker image tag'
 

From 055c3b6cb30c5e658914000597b8582afc3aa40e Mon Sep 17 00:00:00 2001
From: Jon Mosco <1970496+jonmosco@users.noreply.github.com>
Date: Sun, 12 Jun 2022 13:41:52 -0400
Subject: [PATCH 590/591] chore(kube-ps1): update to most recent version
 (#10980)

---
 plugins/kube-ps1/README.md           |  3 +++
 plugins/kube-ps1/kube-ps1.plugin.zsh | 39 +++++++++++++++++++---------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/plugins/kube-ps1/README.md b/plugins/kube-ps1/README.md
index b08997b0f..1ed3e4438 100644
--- a/plugins/kube-ps1/README.md
+++ b/plugins/kube-ps1/README.md
@@ -128,6 +128,7 @@ the following environment variables:
 | `KUBE_PS1_NS_ENABLE` | `true` | Display the namespace. If set to `false`, this will also disable `KUBE_PS1_DIVIDER` |
 | `KUBE_PS1_PREFIX` | `(` | Prompt opening character  |
 | `KUBE_PS1_SYMBOL_ENABLE` | `true ` | Display the prompt Symbol. If set to `false`, this will also disable `KUBE_PS1_SEPARATOR` |
+| `KUBE_PS1_SYMBOL_PADDING` | `false` | Adds a space (padding) after the symbol to prevent clobbering prompt characters |
 | `KUBE_PS1_SYMBOL_DEFAULT` | `⎈ ` | Default prompt symbol. Unicode `\u2388` |
 | `KUBE_PS1_SYMBOL_USE_IMG` | `false` | ☸️  ,  Unicode `\u2638` as the prompt symbol |
 | `KUBE_PS1_SEPARATOR` | &#124; | Separator between symbol and context name |
@@ -151,8 +152,10 @@ The default colors are set with the following environment variables:
 
 | Variable | Default | Meaning |
 | :------- | :-----: | ------- |
+| `KUBE_PS1_PREFIX_COLOR` | `null` | Set default color of the prompt prefix |
 | `KUBE_PS1_SYMBOL_COLOR` | `blue` | Set default color of the Kubernetes symbol |
 | `KUBE_PS1_CTX_COLOR` | `red` | Set default color of the context |
+| `KUBE_PS1_SUFFIX_COLOR` | `null` | Set default color of the prompt suffix |
 | `KUBE_PS1_NS_COLOR` | `cyan` | Set default color of the namespace |
 | `KUBE_PS1_BG_COLOR` | `null` | Set default color of the prompt background |
 
diff --git a/plugins/kube-ps1/kube-ps1.plugin.zsh b/plugins/kube-ps1/kube-ps1.plugin.zsh
index 9e77cbc19..894e0f7f0 100644
--- a/plugins/kube-ps1/kube-ps1.plugin.zsh
+++ b/plugins/kube-ps1/kube-ps1.plugin.zsh
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Kubernetes prompt helper for bash/zsh
 # Displays current context and namespace
 
-# Copyright 2019 Jon Mosco
+# Copyright 2021 Jon Mosco
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,8 @@
 # Override these values in ~/.zshrc or ~/.bashrc
 KUBE_PS1_BINARY="${KUBE_PS1_BINARY:-kubectl}"
 KUBE_PS1_SYMBOL_ENABLE="${KUBE_PS1_SYMBOL_ENABLE:-true}"
-KUBE_PS1_SYMBOL_DEFAULT=${KUBE_PS1_SYMBOL_DEFAULT:-$'\u2388 '}
+KUBE_PS1_SYMBOL_DEFAULT=${KUBE_PS1_SYMBOL_DEFAULT:-$'\u2388'}
+KUBE_PS1_SYMBOL_PADDING="${KUBE_PS1_SYMBOL_PADDING:-false}"
 KUBE_PS1_SYMBOL_USE_IMG="${KUBE_PS1_SYMBOL_USE_IMG:-false}"
 KUBE_PS1_NS_ENABLE="${KUBE_PS1_NS_ENABLE:-true}"
 KUBE_PS1_CONTEXT_ENABLE="${KUBE_PS1_CONTEXT_ENABLE:-true}"
@@ -32,10 +33,12 @@ KUBE_PS1_PREFIX="${KUBE_PS1_PREFIX-(}"
 KUBE_PS1_SEPARATOR="${KUBE_PS1_SEPARATOR-|}"
 KUBE_PS1_DIVIDER="${KUBE_PS1_DIVIDER-:}"
 KUBE_PS1_SUFFIX="${KUBE_PS1_SUFFIX-)}"
+
 KUBE_PS1_SYMBOL_COLOR="${KUBE_PS1_SYMBOL_COLOR-blue}"
 KUBE_PS1_CTX_COLOR="${KUBE_PS1_CTX_COLOR-red}"
 KUBE_PS1_NS_COLOR="${KUBE_PS1_NS_COLOR-cyan}"
 KUBE_PS1_BG_COLOR="${KUBE_PS1_BG_COLOR}"
+
 KUBE_PS1_KUBECONFIG_CACHE="${KUBECONFIG}"
 KUBE_PS1_DISABLE_PATH="${HOME}/.kube/kube-ps1/disabled"
 KUBE_PS1_LAST_TIME=0
@@ -149,18 +152,17 @@ _kube_ps1_symbol() {
 
   case "${KUBE_PS1_SHELL}" in
     bash)
-      if ((BASH_VERSINFO[0] >= 4)) && [[ $'\u2388 ' != "\\u2388 " ]]; then
+      if ((BASH_VERSINFO[0] >= 4)) && [[ $'\u2388' != "\\u2388" ]]; then
         KUBE_PS1_SYMBOL="${KUBE_PS1_SYMBOL_DEFAULT}"
-        # KUBE_PS1_SYMBOL=$'\u2388 '
-        KUBE_PS1_SYMBOL_IMG=$'\u2638 '
+        KUBE_PS1_SYMBOL_IMG=$'\u2638\ufe0f'
       else
-        KUBE_PS1_SYMBOL=$'\xE2\x8E\x88 '
-        KUBE_PS1_SYMBOL_IMG=$'\xE2\x98\xB8 '
+        KUBE_PS1_SYMBOL=$'\xE2\x8E\x88'
+        KUBE_PS1_SYMBOL_IMG=$'\xE2\x98\xB8'
       fi
       ;;
     zsh)
       KUBE_PS1_SYMBOL="${KUBE_PS1_SYMBOL_DEFAULT}"
-      KUBE_PS1_SYMBOL_IMG="\u2638 ";;
+      KUBE_PS1_SYMBOL_IMG="\u2638";;
     *)
       KUBE_PS1_SYMBOL="k8s"
   esac
@@ -169,7 +171,12 @@ _kube_ps1_symbol() {
     KUBE_PS1_SYMBOL="${KUBE_PS1_SYMBOL_IMG}"
   fi
 
-  echo "${KUBE_PS1_SYMBOL}"
+  if [[ "${KUBE_PS1_SYMBOL_PADDING}" == true ]]; then
+    echo "${KUBE_PS1_SYMBOL} "
+  else
+    echo "${KUBE_PS1_SYMBOL}"
+  fi
+
 }
 
 _kube_ps1_split() {
@@ -339,7 +346,11 @@ kube_ps1() {
   [[ -n "${KUBE_PS1_BG_COLOR}" ]] && KUBE_PS1+="$(_kube_ps1_color_bg ${KUBE_PS1_BG_COLOR})"
 
   # Prefix
-  [[ -n "${KUBE_PS1_PREFIX}" ]] && KUBE_PS1+="${KUBE_PS1_PREFIX}"
+  if [[ -z "${KUBE_PS1_PREFIX_COLOR:-}" ]] && [[ -n "${KUBE_PS1_PREFIX}" ]]; then
+      KUBE_PS1+="${KUBE_PS1_PREFIX}"
+  else
+      KUBE_PS1+="$(_kube_ps1_color_fg $KUBE_PS1_PREFIX_COLOR)${KUBE_PS1_PREFIX}${KUBE_PS1_RESET_COLOR}"
+  fi
 
   # Symbol
   KUBE_PS1+="$(_kube_ps1_color_fg $KUBE_PS1_SYMBOL_COLOR)$(_kube_ps1_symbol)${KUBE_PS1_RESET_COLOR}"
@@ -362,7 +373,11 @@ kube_ps1() {
   fi
 
   # Suffix
-  [[ -n "${KUBE_PS1_SUFFIX}" ]] && KUBE_PS1+="${KUBE_PS1_SUFFIX}"
+  if [[ -z "${KUBE_PS1_SUFFIX_COLOR:-}" ]] && [[ -n "${KUBE_PS1_SUFFIX}" ]]; then
+      KUBE_PS1+="${KUBE_PS1_SUFFIX}"
+  else
+      KUBE_PS1+="$(_kube_ps1_color_fg $KUBE_PS1_SUFFIX_COLOR)${KUBE_PS1_SUFFIX}${KUBE_PS1_RESET_COLOR}"
+  fi
 
   # Close Background color if defined
   [[ -n "${KUBE_PS1_BG_COLOR}" ]] && KUBE_PS1+="${_KUBE_PS1_OPEN_ESC}${_KUBE_PS1_DEFAULT_BG}${_KUBE_PS1_CLOSE_ESC}"

From 50550c70eaa36e79fdf380bdc4ddad4a1ad581a0 Mon Sep 17 00:00:00 2001
From: Sukka <isukkaw@gmail.com>
Date: Mon, 13 Jun 2022 02:22:29 +0800
Subject: [PATCH 591/591] fix(github): deprecate the `git.io` command (#10896)

---
 plugins/github/README.md         | 1 -
 plugins/github/github.plugin.zsh | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/github/README.md b/plugins/github/README.md
index af2b8a4e7..5d8b62501 100644
--- a/plugins/github/README.md
+++ b/plugins/github/README.md
@@ -11,7 +11,6 @@ This plugin supports working with GitHub from the command line. It provides a fe
 * `empty_gh` - Creates a new empty repo (with a `README.md`) and pushes it to GitHub
 * `new_gh` - Initializes an existing directory as a repo and pushes it to GitHub
 * `exist_gh` - Takes an existing repo and pushes it to GitHub
-* `git.io` - Shortens a URL using [git.io](https://git.io)
 
 
 ## Installation
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 8e4b97352..79114ff69 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -68,8 +68,9 @@ exist_gh() { # [DIRECTORY]
 # documentation: https://github.com/blog/985-git-io-github-url-shortener
 #
 git.io() {
-  emulate -L zsh
-  curl -i -s https://git.io -F "url=$1" | grep "Location" | cut -f 2 -d " "
+  # emulate -L zsh
+  # curl -i -s https://git.io -F "url=$1" | grep "Location" | cut -f 2 -d " "
+  print -u2 ${(%):-"%F{yellow}%BThe \`git.io\` is deprecated.%b\nView the announcement made by GitHub: https://github.blog/changelog/2022-01-11-git-io-no-longer-accepts-new-urls/%f"}
 }
 
 # End Functions #############################################################