diff --git a/.editorconfig b/.editorconfig
index aa18e0e5c..b5321de59 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,7 +4,5 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
-
-[*.sh]
-indent_size = 4
-indent_style = tab
+indent_size = 2
+indent_style = space
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cba8e93af..c6b3e8ce9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,12 @@
 # Plugin owners
-plugins/gitfast/ @felipec
-plugins/sdk/ @rgoldberg
+plugins/archlinux/                  @ratijas
+plugins/aws/                        @maksyms
+plugins/genpass/                    @atoponce
+plugins/git-lfs/                    @hellovietduc
+plugins/gitfast/                    @felipec
+plugins/react-native                @esthor
+plugins/sdk/                        @rgoldberg
+plugins/shell-proxy/                @septs
+plugins/universalarchive/           @Konfekt
+plugins/wp-cli/                     @joshmedeski
+plugins/zoxide/                     @ajeetdsouza
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index c44bb2475..6c86ac450 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,2 @@
-github: [robbyrussell, mcornella, larson-carter]
+github: [ohmyzsh, robbyrussell, mcornella, larson-carter, carlosala]
 open_collective: ohmyzsh
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 611d8ebae..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve Oh My Zsh
-
----
-
-<!--
-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..98f66b1d2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,68 @@
+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
+        - 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: 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/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/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c6b4cef42..3ddd72a15 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,8 @@
 blank_issues_enabled: true
 contact_links:
+  - name: Support
+    url: https://github.com/ohmyzsh/ohmyzsh/discussions
+    about: Ask the community for support
   - name: Get help on Discord
     url: https://discord.gg/ohmyzsh
     about: Have a quick question? Join the Discord server and ask on the appropriate channel.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 8c20544c8..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..ac966dfd9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,37 @@
+name: Feature request
+description: Suggest a feature for Oh My Zsh
+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.
+      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!
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
deleted file mode 100644
index 697f0c0c8..000000000
--- a/.github/ISSUE_TEMPLATE/support.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Support
-about: Request support for any problem you're having with Oh My Zsh
-labels: 'support'
-
----
-
-1. Look for similar issues already posted (including closed ones)
-2. Include as much relevant information as possible
-3. Try to make sure the issue is due to Oh My Zsh
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6bcb90efe..5c94caeb5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,7 @@
 ## Standards checklist:
 
+<!-- Fill with an x the ones that apply. Example: [x] -->
+
 - [ ] The PR title is descriptive.
 - [ ] The PR doesn't replicate another PR which is already open.
 - [ ] I have read the contribution guide and followed all the instructions.
@@ -7,6 +9,7 @@
 - [ ] The code is mine or it's from somewhere with an MIT-compatible license.
 - [ ] The code is efficient, to the best of my ability, and does not waste computer resources.
 - [ ] The code is stable and I have tested it myself, to the best of my abilities.
+- [ ] If the code introduces new aliases, I provide a valid use case for all plugin users down below.
 
 ## Changes:
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7ab7efdd6..57a1e3833 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,10 +10,18 @@ on:
     branches: 
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 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
new file mode 100644
index 000000000..999cc08e2
--- /dev/null
+++ b/.github/workflows/project.yml
@@ -0,0 +1,136 @@
+name: Project tracking
+on:
+  issues:
+    types: [opened, reopened]
+  pull_request_target:
+    types: [opened, reopened, synchronize]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions: {}
+jobs:
+  add-to-project:
+    name: Add to project
+    runs-on: ubuntu-latest
+    if: github.repository == 'ohmyzsh/ohmyzsh'
+    env:
+      GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
+    steps:
+      - name: Read project data
+        env:
+          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:
+          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!, $content: ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $content}) {
+                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: |
+          touch plugins.list themes.list
+
+          gh pr view ${{ github.event.pull_request.number }} \
+            --repo ${{ github.repository }} \
+            --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'
+        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
+
diff --git a/.gitignore b/.gitignore
index ec24a19bb..71ae444e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@ cache/
 log/
 *.swp
 .DS_Store
+
+# editor configs
+.vscode
\ No newline at end of file
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 000000000..b35c80dfb
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,5 @@
+FROM gitpod/workspace-full
+
+RUN sudo apt-get update && \
+    sudo apt-get install -y zsh && \
+    sudo rm -rf /var/lib/apt/lists/*
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 000000000..ccc57242c
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,9 @@
+image:
+  file: .gitpod.Dockerfile
+
+tasks:
+  - init: |
+      export EDITOR="command gp open -w" VISUAL="command gp open -w"
+      cp -f /workspace/ohmyzsh/templates/zshrc.zsh-template ~/.zshrc
+      ln -sf /workspace/ohmyzsh ~/.oh-my-zsh
+    command: exec zsh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index be67e93b0..e78bd8192 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,16 +11,22 @@ issues and pull requests. Please read them closely.
 Foremost, be so kind as to [search](#use-the-search-luke). This ensures any contribution
 you would make is not already covered.
 
-* [Issues](#reporting-issues)
-  * [You have a problem](#you-have-a-problem)
-  * [You have a suggestion](#you-have-a-suggestion)
-* [Pull Requests](#submitting-pull-requests)
-  * [Getting started](#getting-started)
-  * [You have a solution](#you-have-a-solution)
-  * [You have an addition](#you-have-an-addition)
-* [Information sources (_aka_ search)](#use-the-search-luke)
+<!-- TOC updateonsave:true depthfrom:2 -->
 
-**BONUS:** [Volunteering](#you-have-spare-time-to-volunteer)
+- [Reporting Issues](#reporting-issues)
+  - [You have a problem](#you-have-a-problem)
+  - [You have a suggestion](#you-have-a-suggestion)
+- [Submitting Pull Requests](#submitting-pull-requests)
+  - [Getting started](#getting-started)
+  - [You have a solution](#you-have-a-solution)
+  - [You have an addition](#you-have-an-addition)
+- [Use the Search, Luke](#use-the-search-luke)
+- [Commit Guidelines](#commit-guidelines)
+  - [Format](#format)
+  - [Style](#style)
+- [Volunteer](#volunteer)
+
+<!-- /TOC -->
 
 ## Reporting Issues
 
@@ -41,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.
@@ -53,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
@@ -93,10 +99,31 @@ 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.
+
+### New plugin aliases
+
+We acknowledge that aliases are a core part of Oh My Zsh. There are plugins that have +100 aliases!
+
+This has become an issue for two opposing reasons:
+
+- Some users want to have their personal aliases in Oh My Zsh.
+- Some users don't want any aliases at all and feel that there are too many.
+
+Because of this, from now on we're requiring that new aliases follow these conditions:
+
+1. They will be used by many people, not just a few.
+2. The aliases will be used many times and for common tasks.
+3. Prefer one generic alias over many specific ones.
+4. When justifying the need for an alias, talk about workflows where you'll use it,
+   preferably in combination with other aliases.
+5. If there exists a command with the same name, look for a different alias name.
+
+This list is not exhaustive! Please remember that your alias will be in the machines of many people,
+so it should be justified why they should have it.
 
 ----
 
@@ -117,7 +144,100 @@ and [create an issue](#reporting-issues) or [submit a PR](#submitting-pull-reque
 
 ----
 
-### You have spare time to volunteer
+## Commit Guidelines
+
+Oh My Zsh uses the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
+specification. The automatic changelog tool uses these to automatically generate
+a changelog based on the commit messages. Here's a guide to writing a commit message
+to allow this:
+
+### Format
+
+```
+type(scope)!: subject
+```
+
+- `type`: the type of the commit is one of the following:
+
+  - `feat`: new features.
+  - `fix`: bug fixes.
+  - `docs`: documentation changes.
+  - `refactor`: refactor of a particular code section without introducing
+    new features or bug fixes.
+  - `style`: code style improvements.
+  - `perf`: performance improvements.
+  - `test`: changes to the test suite.
+  - `ci`: changes to the CI system.
+  - `build`: changes to the build system (we don't yet have one so this shouldn't apply).
+  - `chore`: for other changes that don't match previous types. This doesn't appear
+    in the changelog.
+
+- `scope`: section of the codebase that the commit makes changes to. If it makes changes to
+  many sections, or if no section in particular is modified, leave blank without the parentheses.
+  Examples:
+
+  - Commit that changes the `git` plugin:
+  ```
+  feat(git): add alias for `git commit`
+  ```
+
+  - Commit that changes many plugins:
+  ```
+  style: fix inline declaration of arrays
+  ```
+
+  For changes to plugins or themes, the scope should be the plugin or theme name:
+
+  - ✅ `fix(agnoster): commit subject`
+  - ❌ `fix(theme/agnoster): commit subject`
+
+- `!`: this goes after the `scope` (or the `type` if scope is empty), to indicate that the commit
+  introduces breaking changes.
+
+  Optionally, you can specify a message that the changelog tool will display to the user to indicate
+  what's changed and what they can do to deal with it. You can use multiple lines to type this message;
+  the changelog parser will keep reading until the end of the commit message or until it finds an empty
+  line.
+
+  Example (made up):
+
+  ```
+  style(agnoster)!: change dirty git repo glyph
+
+  BREAKING CHANGE: the glyph to indicate when a git repository is dirty has
+  changed from a Powerline character to a standard UTF-8 emoji. You can
+  change it back by setting `ZSH_THEME_DIRTY_GLYPH`.
+
+  Fixes #420
+
+  Co-authored-by: Username <email>
+  ```
+
+- `subject`: a brief description of the changes. This will be displayed in the changelog. If you need
+  to specify other details you can use the commit body but it won't be visible.
+
+  Formatting tricks: the commit subject may contain:
+
+  - Links to related issues or PRs by writing `#issue`. This will be highlighted by the changelog tool:
+    ```
+    feat(archlinux): add support for aura AUR helper (#9467)
+    ```
+
+  - 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)
+    ```
+
+### Style
+
+Try to keep the first commit line short. This is harder to do using this commit style but try to be
+concise and if you need more space, you can use the commit body. Try to make sure that the commit
+subject is clear and precise enough that users will know what changed by just looking at the changelog.
+
+----
+
+## Volunteer
 
 Very nice!! :)
 
diff --git a/LICENSE.txt b/LICENSE.txt
index 45ba85a37..2d7ca6f52 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2009-2020 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
diff --git a/README.md b/README.md
index 0c292e100..1e4b7ff70 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.
 
@@ -15,6 +15,43 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 [![CI](https://github.com/ohmyzsh/ohmyzsh/workflows/CI/badge.svg)](https://github.com/ohmyzsh/ohmyzsh/actions?query=workflow%3ACI)
 [![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)
+
+<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
 
@@ -30,18 +67,20 @@ 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)"` |
 
+_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
 
 It's a good idea to inspect the install script from projects you don't yet know. You can do
 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
 ```
@@ -56,18 +95,18 @@ 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
   dotenv
-  osx
+  macos
   rake
   rbenv
   ruby
@@ -78,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
 
@@ -90,18 +129,18 @@ _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
 ```
 
-_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:
 
@@ -111,13 +150,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"
@@ -126,7 +165,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)
 ```
 
@@ -151,17 +190,17 @@ 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
 ```
 
 #### 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.
 
-```shell
+```sh
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 ```
 
@@ -184,41 +223,41 @@ 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
 ```
 
 #### Manual Installation
 
-##### 1. Clone the repository
+##### 1. Clone the repository <!-- omit in toc -->
 
-```shell
+```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 -->
 
-```shell
+```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.
 
-```shell
+```sh
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 ```
 
-##### 4. Change your default shell
+##### 4. Change your default shell <!-- omit in toc -->
 
-```shell
+```sh
 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.
 
@@ -226,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
 
@@ -241,23 +278,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
 ```
 
@@ -275,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.
 
@@ -294,7 +348,7 @@ Thank you so much!
 We're on social media:
 
 - [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. You should follow it.
-- [FaceBook](https://www.facebook.com/Oh-My-Zsh-296616263819290/) poke us.
+- [Facebook](https://www.facebook.com/Oh-My-Zsh-296616263819290/) poke us.
 - [Instagram](https://www.instagram.com/_ohmyzsh/) tag us in your post showing Oh My Zsh!
 - [Discord](https://discord.gg/ohmyzsh) to chat with us!
 
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..7e5c8eed0
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,24 @@
+# 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 and the automated updates
+to minimize the time between vulnerability publication and patch release.
+
+| 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
+
+**Do not submit an issue or pull request**: this might reveal the vulnerability.
+
+Instead, you should email the maintainers directly at: [**security@ohmyz.sh**](mailto:security@ohmyz.sh).
+
+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.
diff --git a/lib/cli.zsh b/lib/cli.zsh
index c1ae2bdf2..fed00d21d 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -1,211 +1,820 @@
 #!/usr/bin/env zsh
 
 function omz {
-    [[ $# -gt 0 ]] || {
-        _omz::help
-        return 1
-    }
+  [[ $# -gt 0 ]] || {
+    _omz::help
+    return 1
+  }
 
-    local command="$1"
-    shift
+  local command="$1"
+  shift
 
-    # Subcommand functions start with _ so that they don't
-    # appear as completion entries when looking for `omz`
-    (( $+functions[_omz::$command] )) || {
-        _omz::help
-        return 1
-    }
+  # Subcommand functions start with _ so that they don't
+  # appear as completion entries when looking for `omz`
+  (( $+functions[_omz::$command] )) || {
+    _omz::help
+    return 1
+  }
 
-    _omz::$command "$@"
+  _omz::$command "$@"
 }
 
 function _omz {
-    local -a cmds subcmds
-    cmds=(
-        'help:Usage information'
-        'update:Update Oh My Zsh'
-        'pr:Commands for Oh My Zsh Pull Requests'
-    )
+  local -a cmds subcmds
+  cmds=(
+    'changelog:Print the changelog'
+    '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'
+    'version:Show the version'
+  )
 
-    if (( CURRENT == 2 )); then
-        _describe 'command' cmds
-    elif (( CURRENT == 3 )); then
-        case "$words[2]" in
-            pr) subcmds=( 'test:Test a Pull Request' 'clean:Delete all Pull Request branches' )
-                _describe 'command' subcmds ;;
-        esac
-    fi
+  if (( CURRENT == 2 )); then
+    _describe 'command' cmds
+  elif (( CURRENT == 3 )); then
+    case "$words[2]" in
+      changelog) local -a refs
+        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)'
+        'enable:Enable plugin(s)'
+        'info:Get plugin information'
+        'list:List plugins'
+        'load:Load plugin(s)'
+      )
+        _describe 'command' subcmds ;;
+      pr) subcmds=('clean:Delete all Pull Request branches' 'test:Test a Pull Request')
+        _describe 'command' subcmds ;;
+      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
+    case "${words[2]}::${words[3]}" in
+      plugin::(disable|enable|load))
+        local -aU valid_plugins
 
-    return 0
+        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
+        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"/:::))
+        _describe 'theme' themes ;;
+    esac
+  elif (( CURRENT > 4 )); then
+    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
+        args=(${words[4,$(( CURRENT - 1))]})
+        valid_plugins=(${valid_plugins:|args})
+
+        _describe 'plugin' valid_plugins ;;
+    esac
+  fi
+
+  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
+
+function _omz::confirm {
+  # If question supplied, ask it before reading the answer
+  # NOTE: uses the logname of the caller function
+  if [[ -n "$1" ]]; then
+    _omz::log prompt "$1" "${${functrace[1]#_}%:*}"
+  fi
+
+  # Read one character
+  read -r -k 1
+
+  # If no newline entered, add a newline
+  if [[ "$REPLY" != $'\n' ]]; then
+    echo
+  fi
+}
+
+function _omz::log {
+  # if promptsubst is set, a message with `` or $()
+  # will be run even if quoted due to `print -P`
+  setopt localoptions nopromptsubst
+
+  # $1 = info|warn|error|debug
+  # $2 = text
+  # $3 = (optional) name of the logger
+
+  local logtype=$1
+  local logname=${3:-${${functrace[1]#_}%:*}}
+
+  # Don't print anything if debug is not active
+  if [[ $logtype = debug && -z $_OMZ_DEBUG ]]; then
+    return
+  fi
+
+  # Choose coloring based on log type
+  case "$logtype" in
+    prompt) print -Pn "%S%F{blue}$logname%f%s: $2" ;;
+    debug) print -P "%F{white}$logname%f: $2" ;;
+    info) print -P "%F{green}$logname%f: $2" ;;
+    warn) print -P "%S%F{yellow}$logname%f%s: $2" ;;
+    error) print -P "%S%F{red}$logname%f%s: $2" ;;
+  esac >&2
+}
+
+## User-facing commands
 
 function _omz::help {
-    cat <<EOF
+  cat >&2 <<EOF
 Usage: omz <command> [options]
 
 Available commands:
 
-    help                Print this help message
-    update              Update Oh My Zsh
-    pr <command>        Commands for Oh My Zsh Pull Requests
+  help                Print this help message
+  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
+  version             Show the version
 
 EOF
 }
 
-function _omz::log {
-    # if promptsubst is set, a message with `` or $()
-    # will be run even if quoted due to `print -P`
-    setopt localoptions nopromptsubst
+function _omz::changelog {
+  local version=${1:-HEAD} format=${3:-"--text"}
 
-    # $1 = info|warn|error|debug
-    # $@ = text
+  if (
+    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}"
+  ) &>/dev/null; then
+    cat >&2 <<EOF
+Usage: ${(j: :)${(s.::.)0#_}} [version]
 
-    local logtype=$1
-    local logname=${${functrace[1]#_}%:*}
-    shift
+NOTE: <version> must be a valid branch, tag or commit.
+EOF
+    return 1
+  fi
 
-    # Don't print anything if debug is not active
-    if [[ $logtype = debug && -z $_OMZ_DEBUG ]]; then
-        return
-    fi
-
-    # Choose coloring based on log type
-    case "$logtype" in
-        prompt) print -Pn "%S%F{blue}$logname%f%s: $@" ;;
-        debug) print -P "%F{white}$logname%f: $@" ;;
-        info) print -P "%F{green}$logname%f: $@" ;;
-        warn) print -P "%S%F{yellow}$logname%f%s: $@" ;;
-        error) print -P "%S%F{red}$logname%f%s: $@" ;;
-    esac >&2
+  "$ZSH/tools/changelog.sh" "$version" "${2:-}" "$format"
 }
 
-function _omz::pr {
-    (( $# > 0 && $+functions[_omz::pr::$1] )) || {
-        cat <<EOF
-Usage: omz pr <command> [options]
+function _omz::plugin {
+  (( $# > 0 && $+functions[$0::$1] )) || {
+    cat >&2 <<EOF
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
 Available commands:
 
-    clean                       Delete all PR branches (ohmyzsh/pull-*)
-    test <PR_number_or_URL>     Fetch PR #NUMBER and rebase against master
+  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
-    }
+    return 1
+  }
 
-    local command="$1"
-    shift
+  local command="$1"
+  shift
 
-    _omz::pr::$command "$@"
+  $0::$command "$@"
+}
+
+function _omz::plugin::disable {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <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
+
+  # Remove plugins substitution awk script
+  local awk_subst_plugins="\
+  gsub(/[ \t]+(${(j:|:)dis_plugins})/, \"\") # with spaces before
+  gsub(/(${(j:|:)dis_plugins})[ \t]+/, \"\") # 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
+/^[ \t]*plugins=\([^#]+\).*\$/ {
+  $awk_subst_plugins
+  print \$0
+  next
+}
+
+# if plugins=() is in multiline form, enable multi flag and disable plugins if they're there
+/^[ \t]*plugins=\(/ {
+  multi=1
+  $awk_subst_plugins
+  print \$0
+  next
+}
+
+# if multi flag is enabled and we find a valid closing parenthesis, remove plugins and disable multi flag
+multi == 1 && /^[^#]*\)/ {
+  multi=0
+  $awk_subst_plugins
+  print \$0
+  next
+}
+
+multi == 1 && length(\$0) > 0 {
+  $awk_subst_plugins
+  if (length(\$0) > 0) print \$0
+  next
+}
+
+{ print \$0 }
+"
+
+  local zdot="${ZDOTDIR:-$HOME}"
+  local zshrc="${${:-"${zdot}/.zshrc"}:A}"
+  awk "$awk_script" "$zshrc" > "$zdot/.zshrc.new" \
+  && command cp -f "$zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$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 ! command zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc.bck" "$zshrc"
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+  _omz::log info "plugins disabled: ${(j:, :)dis_plugins}."
+
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
+}
+
+function _omz::plugin::enable {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <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
+/^[ \t]*plugins=\([^#]+\).*\$/ {
+  sub(/\)/, \" $add_plugins&\")
+  print \$0
+  next
+}
+
+# if plugins=() is in multiline form, enable multi flag
+/^[ \t]*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 }
+"
+
+  local zdot="${ZDOTDIR:-$HOME}"
+  local zshrc="${${:-"${zdot}/.zshrc"}:A}"
+  awk "$awk_script" "$zshrc" > "$zdot/.zshrc.new" \
+  && command cp -f "$zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$zshrc"
+
+  # Exit if the new .zshrc file wasn't created correctly
+  [[ $? -eq 0 ]] || {
+    local ret=$?
+    _omz::log error "error enabling plugins."
+    return $ret
+  }
+
+  # Exit if the new .zshrc file has syntax errors
+  if ! command zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc.bck" "$zshrc"
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+  _omz::log info "plugins enabled: ${(j:, :)add_plugins}."
+
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
+}
+
+function _omz::plugin::info {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin>"
+    return 1
+  fi
+
+  local readme
+  for readme in "$ZSH_CUSTOM/plugins/$1/README.md" "$ZSH/plugins/$1/README.md"; do
+    if [[ -f "$readme" ]]; then
+      (( ${+commands[less]} )) && less "$readme" || cat "$readme"
+      return 0
+    fi
+  done
+
+  if [[ -d "$ZSH_CUSTOM/plugins/$1" || -d "$ZSH/plugins/$1" ]]; then
+    _omz::log error "the '$1' plugin doesn't have a README file"
+  else
+    _omz::log error "'$1' plugin not found"
+  fi
+
+  return 1
+}
+
+function _omz::plugin::list {
+  local -a custom_plugins builtin_plugins
+  custom_plugins=("$ZSH_CUSTOM"/plugins/*(-/N:t))
+  builtin_plugins=("$ZSH"/plugins/*(-/N:t))
+
+  # If the command is being piped, print all found line by line
+  if [[ ! -t 1 ]]; then
+    print -l ${(q-)custom_plugins} ${(q-)builtin_plugins}
+    return
+  fi
+
+  if (( ${#custom_plugins} )); then
+    print -P "%U%BCustom plugins%b%u:"
+    print -lac ${(q-)custom_plugins}
+  fi
+
+  if (( ${#builtin_plugins} )); then
+    (( ${#custom_plugins} )) && echo # add a line of separation
+
+    print -P "%U%BBuilt-in plugins%b%u:"
+    print -lac ${(q-)builtin_plugins}
+  fi
+}
+
+function _omz::plugin::load {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin> [...]"
+    return 1
+  fi
+
+  local plugin base has_completion=0
+  for plugin in "$@"; 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
+    local -a comp_files
+    comp_files=($base/_*(N))
+    has_completion=$(( $#comp_files > 0 ))
+
+    # 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[$0::$1] )) || {
+    cat >&2 <<EOF
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
+
+Available commands:
+
+  clean                       Delete all PR branches (ohmyzsh/pull-*)
+  test <PR_number_or_URL>     Fetch PR #NUMBER and rebase against master
+
+EOF
+    return 1
+  }
+
+  local command="$1"
+  shift
+
+  $0::$command "$@"
 }
 
 function _omz::pr::clean {
-    (
-        set -e
-        builtin cd -q "$ZSH"
+  (
+    set -e
+    builtin cd -q "$ZSH"
 
-        _omz::log info "removing all Oh My Zsh Pull Request branches..."
-        command git branch --list 'ohmyzsh/pull-*' | while read branch; do
-            command git branch -D "$branch"
-        done
-    )
+    # Check if there are PR branches
+    local fmt branches
+    fmt="%(color:bold blue)%(align:18,right)%(refname:short)%(end)%(color:reset) %(color:dim bold red)%(objectname:short)%(color:reset) %(color:yellow)%(contents:subject)"
+    branches="$(command git for-each-ref --sort=-committerdate --color --format="$fmt" "refs/heads/ohmyzsh/pull-*")"
+
+    # Exit if there are no PR branches
+    if [[ -z "$branches" ]]; then
+      _omz::log info "there are no Pull Request branches to remove."
+      return
+    fi
+
+    # Print found PR branches
+    echo "$branches\n"
+    # Confirm before removing the branches
+    _omz::confirm "do you want remove these Pull Request branches? [Y/n] "
+    # Only proceed if the answer is a valid yes option
+    [[ "$REPLY" != [yY$'\n'] ]] && return
+
+    _omz::log info "removing all Oh My Zsh Pull Request branches..."
+    command git branch --list 'ohmyzsh/pull-*' | while read branch; do
+      command git branch -D "$branch"
+    done
+  )
 }
 
 function _omz::pr::test {
-    # Allow $1 to be a URL to the pull request
-    if [[ "$1" = https://* ]]; then
-        1="${1:t}"
-    fi
+  # Allow $1 to be a URL to the pull request
+  if [[ "$1" = https://* ]]; then
+    1="${1:t}"
+  fi
 
-    # Check the input
-    if ! [[ -n "$1" && "$1" =~ ^[[:digit:]]+$ ]]; then
-        echo >&2 "Usage: omz pr test <PR_NUMBER_or_URL>"
-        return 1
-    fi
+  # Check the input
+  if ! [[ -n "$1" && "$1" =~ ^[[:digit:]]+$ ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <PR_NUMBER_or_URL>"
+    return 1
+  fi
 
-    # Save current git HEAD
-    local branch
-    branch=$(builtin cd -q "$ZSH"; git symbolic-ref --short HEAD) || {
-        _omz::log error "error when getting the current git branch. Aborting..."
-        return 1
+  # Save current git HEAD
+  local branch
+  branch=$(builtin cd -q "$ZSH"; git symbolic-ref --short HEAD) || {
+    _omz::log error "error when getting the current git branch. Aborting..."
+    return 1
+  }
+
+
+  # Fetch PR onto ohmyzsh/pull-<PR_NUMBER> branch and rebase against master
+  # If any of these operations fail, undo the changes made
+  (
+    set -e
+    builtin cd -q "$ZSH"
+
+    # Get the ohmyzsh git remote
+    command git remote -v | while read remote url _; do
+      case "$url" in
+      https://github.com/ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
+      git@github.com:ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
+      esac
+    done
+
+    (( $found )) || {
+      _omz::log error "could not found the ohmyzsh git remote. Aborting..."
+      return 1
     }
 
+    # Fetch pull request head
+    _omz::log info "fetching PR #$1 to ohmyzsh/pull-$1..."
+    command git fetch -f "$remote" refs/pull/$1/head:ohmyzsh/pull-$1 || {
+      _omz::log error "error when trying to fetch PR #$1."
+      return 1
+    }
 
-    # Fetch PR onto ohmyzsh/pull-<PR_NUMBER> branch and rebase against master
-    # If any of these operations fail, undo the changes made
-    (
-        set -e
-        builtin cd -q "$ZSH"
+    # Rebase pull request branch against the current master
+    _omz::log info "rebasing PR #$1..."
+    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.
+      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
 
-        # Get the ohmyzsh git remote
-        command git remote -v | while read remote url _; do
-            case "$url" in
-            https://github.com/ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
-            git@github.com:ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
-            esac
-        done
+      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
+    }
 
-        (( $found )) || {
-            _omz::log error "could not found the ohmyzsh git remote. Aborting..."
-            return 1
-        }
+    _omz::log info "fetch of PR #${1} successful."
+  )
 
-        # Fetch pull request head
-        _omz::log info "fetching PR #$1 to ohmyzsh/pull-$1..."
-        command git fetch -f "$remote" refs/pull/$1/head:ohmyzsh/pull-$1 || {
-            _omz::log error "error when trying to fetch PR #$1."
-            return 1
-        }
+  # If there was an error, abort running zsh to test the PR
+  [[ $? -eq 0 ]] || return 1
 
-        # Rebase pull request branch against the current master
-        _omz::log info "rebasing PR #$1..."
-        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
-        }
+  # Run zsh to test the changes
+  _omz::log info "running \`zsh\` to test the changes. Run \`exit\` to go back."
+  command zsh -l
 
-        _omz::log info "fetch of PR #${1} successful."
-    )
+  # After testing, go back to the previous HEAD if the user wants
+  _omz::confirm "do you want to go back to the previous branch? [Y/n] "
+  # Only proceed if the answer is a valid yes option
+  [[ "$REPLY" != [yY$'\n'] ]] && return
 
-    # If there was an error, abort running zsh to test the PR
-    [[ $? -eq 0 ]] || return 1
+  (
+    set -e
+    builtin cd -q "$ZSH"
 
-    # Run zsh to test the changes
-    _omz::log info "running \`zsh\` to test the changes. Run \`exit\` to go back."
-    command zsh -l
+    command git checkout "$branch" -- || {
+      _omz::log error "could not go back to the previous branch ('$branch')."
+      return 1
+    }
+  )
+}
 
-    # After testing, go back to the previous HEAD if the user wants
-    _omz::log prompt "do you want to go back to the previous branch? [Y/n] "
-    read -r -k 1
+function _omz::reload {
+  # Delete current completion cache
+  command rm -f $_comp_dumpfile $ZSH_COMPDUMP
 
-    # If no newline entered, add a newline
-    [[ "$REPLY" != $'\n' ]] && echo
-    # If NO selected, do nothing else
-    [[ "$REPLY" = [nN] ]] && return
+  # 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"
+}
 
-    (
-        set -e
-        builtin cd -q "$ZSH"
+function _omz::theme {
+  (( $# > 0 && $+functions[$0::$1] )) || {
+    cat >&2 <<EOF
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
-        command git checkout "$branch" -- || {
-            _omz::log error "could not go back to the previous branch ('$branch')."
-            return 1
-        }
-    )
+Available commands:
+
+  list            List all available Oh My Zsh themes
+  set <theme>     Set a theme in your .zshrc file
+  use <theme>     Load a theme
+
+EOF
+    return 1
+  }
+
+  local command="$1"
+  shift
+
+  $0::$command "$@"
+}
+
+function _omz::theme::list {
+  local -a custom_themes builtin_themes
+  custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+  builtin_themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r))
+
+  # If the command is being piped, print all found line by line
+  if [[ ! -t 1 ]]; then
+    print -l ${(q-)custom_themes} ${(q-)builtin_themes}
+    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 -lac ${(q-)custom_themes}
+    echo
+  fi
+
+  # Print built-in themes
+  print -P "%U%BBuilt-in themes%b%u:"
+  print -lac ${(q-)builtin_themes}
+}
+
+function _omz::theme::set {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <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 && /^[ \t]*ZSH_THEME=[^#]+.*$/ {
+  set=1
+  sub(/^[ \t]*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
+}
+'
+
+  local zdot="${ZDOTDIR:-$HOME}"
+  local zshrc="${${:-"${zdot}/.zshrc"}:A}"
+  awk "$awk_script" "$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 "$zdot/.zshrc"
+  } > "$zdot/.zshrc.new" \
+  && command cp -f "$zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.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 ! command zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc.bck" "$zshrc"
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+  _omz::log info "'$1' theme set correctly."
+
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
+}
+
+function _omz::theme::use {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <theme>"
+    return 1
+  fi
+
+  # Respect compatibility with old lookup order
+  if [[ -f "$ZSH_CUSTOM/$1.zsh-theme" ]]; then
+    source "$ZSH_CUSTOM/$1.zsh-theme"
+  elif [[ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]]; then
+    source "$ZSH_CUSTOM/themes/$1.zsh-theme"
+  elif [[ -f "$ZSH/themes/$1.zsh-theme" ]]; then
+    source "$ZSH/themes/$1.zsh-theme"
+  else
+    _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 {
-    # Run update script
-    env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
-    # Update last updated file
-    zmodload zsh/datetime
-    echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
-    # Remove update lock if it exists
-    command rm -rf "$ZSH/log/update.lock"
+  local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD)
+
+  # Run update script
+  if [[ "$1" != --unattended ]]; then
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
+  else
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" || return $?
+  fi
+
+  # Update last updated file
+  zmodload zsh/datetime
+  echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
+  # Remove update lock if it exists
+  command rm -rf "$ZSH/log/update.lock"
+
+  # Restart the zsh session if there were changes
+  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
+    [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+  fi
+}
+
+function _omz::version {
+  (
+    builtin cd -q "$ZSH"
+
+    # Get the version name:
+    # 1) try tag-like version
+    # 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="<detached>"
+
+    # 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"
+  )
 }
diff --git a/lib/clipboard.zsh b/lib/clipboard.zsh
index 122145f15..ad83fc4b2 100644
--- a/lib/clipboard.zsh
+++ b/lib/clipboard.zsh
@@ -10,8 +10,8 @@
 # - pbcopy, pbpaste (macOS)
 # - cygwin (Windows running Cygwin)
 # - wl-copy, wl-paste (if $WAYLAND_DISPLAY is set)
-# - xclip (if $DISPLAY is set)
 # - xsel (if $DISPLAY is set)
+# - xclip (if $DISPLAY is set)
 # - lemonade (for SSH) https://github.com/pocke/lemonade
 # - doitclient (for SSH) http://www.chiark.greenend.org.uk/~sgtatham/doit/
 # - win32yank (Windows)
@@ -52,37 +52,37 @@ function detect-clipboard() {
   emulate -L zsh
 
   if [[ "${OSTYPE}" == darwin* ]] && (( ${+commands[pbcopy]} )) && (( ${+commands[pbpaste]} )); then
-    function clipcopy() { pbcopy < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | pbcopy; }
     function clippaste() { pbpaste; }
   elif [[ "${OSTYPE}" == (cygwin|msys)* ]]; then
     function clipcopy() { cat "${1:-/dev/stdin}" > /dev/clipboard; }
     function clippaste() { cat /dev/clipboard; }
   elif [ -n "${WAYLAND_DISPLAY:-}" ] && (( ${+commands[wl-copy]} )) && (( ${+commands[wl-paste]} )); then
-    function clipcopy() { wl-copy < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | wl-copy &>/dev/null &|; }
     function clippaste() { wl-paste; }
-  elif [ -n "${DISPLAY:-}" ] && (( ${+commands[xclip]} )); then
-    function clipcopy() { xclip -in -selection clipboard < "${1:-/dev/stdin}"; }
-    function clippaste() { xclip -out -selection clipboard; }
   elif [ -n "${DISPLAY:-}" ] && (( ${+commands[xsel]} )); then
-    function clipcopy() { xsel --clipboard --input < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | xsel --clipboard --input; }
     function clippaste() { xsel --clipboard --output; }
+  elif [ -n "${DISPLAY:-}" ] && (( ${+commands[xclip]} )); then
+    function clipcopy() { cat "${1:-/dev/stdin}" | xclip -selection clipboard -in &>/dev/null &|; }
+    function clippaste() { xclip -out -selection clipboard; }
   elif (( ${+commands[lemonade]} )); then
-    function clipcopy() { lemonade copy < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | lemonade copy; }
     function clippaste() { lemonade paste; }
   elif (( ${+commands[doitclient]} )); then
-    function clipcopy() { doitclient wclip < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | doitclient wclip; }
     function clippaste() { doitclient wclip -r; }
   elif (( ${+commands[win32yank]} )); then
-    function clipcopy() { win32yank -i < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | win32yank -i; }
     function clippaste() { win32yank -o; }
   elif [[ $OSTYPE == linux-android* ]] && (( $+commands[termux-clipboard-set] )); then
-    function clipcopy() { termux-clipboard-set "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | termux-clipboard-set; }
     function clippaste() { termux-clipboard-get; }
   elif [ -n "${TMUX:-}" ] && (( ${+commands[tmux]} )); then
     function clipcopy() { tmux load-buffer "${1:--}"; }
     function clippaste() { tmux save-buffer -; }
   elif [[ $(uname -r) = *icrosoft* ]]; then
-    function clipcopy() { clip.exe < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | clip.exe; }
     function clippaste() { powershell.exe -noprofile -command Get-Clipboard; }
   else
     function _retry_clipboard_detection_or_fail() {
diff --git a/lib/completion.zsh b/lib/completion.zsh
index a3873cd08..2c5695487 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -1,7 +1,7 @@
 # fixme - the load process here seems a bit bizarre
 zmodload -i zsh/complist
 
-WORDCHARS='_-'
+WORDCHARS=''
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
@@ -32,9 +32,9 @@ zstyle ':completion:*' list-colors ''
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 
 if [[ "$OSTYPE" = solaris* ]]; then
-  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USERNAME -o pid,user,comm"
 else
-  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USERNAME -o pid,user,comm -w -w"
 fi
 
 # disable named-directories autocompletion
@@ -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/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
diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index 001de42b7..eaeba7d23 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -112,7 +112,7 @@ function _omz_diag_dump_one_big_text() {
   command uname -a
   builtin echo OSTYPE=$OSTYPE
   builtin echo ZSH_VERSION=$ZSH_VERSION
-  builtin echo User: $USER
+  builtin echo User: $USERNAME
   builtin echo umask: $(umask)
   builtin echo
   _omz_diag_dump_os_specific_version
@@ -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 cf87bd7e4..c62f56468 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'
@@ -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 58f0e3fb0..dfcc4d961 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 -n20 | column -c3 -s " " -t | nl
+    | grep -v "./" | sort -nr | head -n 20 | column -c3 -s " " -t | nl
 }
 
 function uninstall_oh_my_zsh() {
@@ -9,21 +9,8 @@ function uninstall_oh_my_zsh() {
 }
 
 function upgrade_oh_my_zsh() {
-  if (( $+functions[_omz::update] )); then
-    echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
-  fi
-
-  # Run update script
-  env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
-  # Update last updated file
-  zmodload zsh/datetime
-  echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
-  # Remove update lock if it exists
-  command rm -rf "$ZSH/log/update.lock"
-}
-
-function take() {
-  mkdir -p $@ && cd ${@:$#}
+  echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
+  omz update
 }
 
 function open_command() {
@@ -46,6 +33,38 @@ function open_command() {
   ${=open_cmd} "$@" &>/dev/null
 }
 
+# take functions
+
+# mkcd is equivalent to takedir
+function mkcd takedir() {
+  mkdir -p $@ && cd ${@:$#}
+}
+
+function takeurl() {
+  local data thedir
+  data="$(mktemp)"
+  curl -L "$1" > "$data"
+  tar xf "$data"
+  thedir="$(tar tf "$data" | head -n 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 "$@"
+  fi
+}
+
 #
 # Get the value of an alias.
 #
@@ -125,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
 #
@@ -134,9 +153,10 @@ zmodload zsh/langinfo
 #    -P causes spaces to be encoded as '%20' instead of '+'
 function omz_urlencode() {
   emulate -L zsh
+  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
@@ -217,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)
diff --git a/lib/git.zsh b/lib/git.zsh
index ffc7c01a1..be9fa7e67 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -9,14 +9,27 @@ function __git_prompt_git() {
   GIT_OPTIONAL_LOCKS=0 command git "$@"
 }
 
-# Outputs current branch info in prompt format
 function git_prompt_info() {
-  local ref
-  if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
-    ref=$(__git_prompt_git symbolic-ref HEAD 2> /dev/null) || \
-    ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) || return 0
-    echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  # If we are on a folder not tracked by git, get out.
+  # Otherwise, check for hide-info at global and local repository level
+  if ! __git_prompt_git rev-parse --git-dir &> /dev/null \
+     || [[ "$(__git_prompt_git config --get oh-my-zsh.hide-info 2>/dev/null)" == 1 ]]; then
+    return 0
   fi
+
+  local ref
+  ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null) \
+  || ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) \
+  || return 0
+
+  # Use global ZSH_THEME_GIT_SHOW_UPSTREAM=1 for including upstream remote info
+  local upstream
+  if (( ${+ZSH_THEME_GIT_SHOW_UPSTREAM} )); then
+    upstream=$(__git_prompt_git rev-parse --abbrev-ref --symbolic-full-name "@{upstream}" 2>/dev/null) \
+    && upstream=" -> ${upstream}"
+  fi
+
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 # Checks if working tree is dirty
@@ -38,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 -n1)
+    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n 1)
   fi
   if [[ -n $STATUS ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
@@ -69,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
@@ -147,44 +160,103 @@ function git_prompt_long_sha() {
   SHA=$(__git_prompt_git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 
-# Get the status of the working tree
 function git_prompt_status() {
-  emulate -L zsh
+  [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
 
-  local INDEX STATUS
-  INDEX=$(__git_prompt_git status --porcelain -b 2> /dev/null) || return 0
-  STATUS=""
-  if [[ "${INDEX}" =~ $'(^|\n)\\?\\? ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
+  # Maps a git status prefix to an internal constant
+  # This cannot use the prompt constants, as they may be empty
+  local -A prefix_constant_map
+  prefix_constant_map=(
+    '\?\? '     'UNTRACKED'
+    'A  '       'ADDED'
+    'M  '       'ADDED'
+    'MM '       'MODIFIED'
+    ' M '       'MODIFIED'
+    'AM '       'MODIFIED'
+    ' T '       'MODIFIED'
+    'R  '       'RENAMED'
+    ' D '       'DELETED'
+    'D  '       'DELETED'
+    'UU '       'UNMERGED'
+    'ahead'     'AHEAD'
+    'behind'    'BEHIND'
+    'diverged'  'DIVERGED'
+    'stashed'   'STASHED'
+  )
+
+  # Maps the internal constant to the prompt theme
+  local -A constant_prompt_map
+  constant_prompt_map=(
+    'UNTRACKED' "$ZSH_THEME_GIT_PROMPT_UNTRACKED"
+    'ADDED'     "$ZSH_THEME_GIT_PROMPT_ADDED"
+    'MODIFIED'  "$ZSH_THEME_GIT_PROMPT_MODIFIED"
+    'RENAMED'   "$ZSH_THEME_GIT_PROMPT_RENAMED"
+    'DELETED'   "$ZSH_THEME_GIT_PROMPT_DELETED"
+    'UNMERGED'  "$ZSH_THEME_GIT_PROMPT_UNMERGED"
+    'AHEAD'     "$ZSH_THEME_GIT_PROMPT_AHEAD"
+    'BEHIND'    "$ZSH_THEME_GIT_PROMPT_BEHIND"
+    'DIVERGED'  "$ZSH_THEME_GIT_PROMPT_DIVERGED"
+    'STASHED'   "$ZSH_THEME_GIT_PROMPT_STASHED"
+  )
+
+  # The order that the prompt displays should be added to the prompt
+  local status_constants
+  status_constants=(
+    UNTRACKED ADDED MODIFIED RENAMED DELETED
+    STASHED UNMERGED AHEAD BEHIND DIVERGED
+  )
+
+  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
+    return 1
   fi
-  if [[ "${INDEX}" =~ $'(^|\n)(A |M |MM) ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
+
+  # A lookup table of each git status encountered
+  local -A statuses_seen
+
+  if __git_prompt_git rev-parse --verify refs/stash &>/dev/null; then
+    statuses_seen[STASHED]=1
   fi
-  if [[ "${INDEX}" =~ $'(^|\n)([ AM]M| T) ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+
+  local status_lines
+  status_lines=("${(@f)${status_text}}")
+
+  # If the tracking line exists, get and parse it
+  if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then
+    local branch_statuses
+    branch_statuses=("${(@s/,/)match}")
+    for branch_status in $branch_statuses; do
+      if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then
+        continue
+      fi
+      local last_parsed_status=$prefix_constant_map[$match[1]]
+      statuses_seen[$last_parsed_status]=$match[2]
+    done
   fi
-  if [[ "${INDEX}" =~ $'(^|\n)R  ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)([A ]D|D ) ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  fi
-  if $(__git_prompt_git rev-parse --verify refs/stash >/dev/null 2>&1); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)UU ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*ahead' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*behind' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*diverged' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
-  fi
-  echo $STATUS
+
+  # For each status prefix, do a regex comparison
+  for status_prefix in ${(k)prefix_constant_map}; do
+    local status_constant="${prefix_constant_map[$status_prefix]}"
+    local status_regex=$'(^|\n)'"$status_prefix"
+
+    if [[ "$status_text" =~ $status_regex ]]; then
+      statuses_seen[$status_constant]=1
+    fi
+  done
+
+  # Display the seen statuses in the order specified
+  local status_prompt
+  for status_constant in $status_constants; do
+    if (( ${+statuses_seen[$status_constant]} )); then
+      local next_display=$constant_prompt_map[$status_constant]
+      status_prompt="$next_display$status_prompt"
+    fi
+  done
+
+  echo $status_prompt
 }
 
 # Outputs the name of the current user
diff --git a/lib/grep.zsh b/lib/grep.zsh
index a725e0f26..54e0f694e 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -24,8 +24,8 @@ else
     if [[ -n "$GREP_OPTIONS" ]]; then
         # export grep, egrep and fgrep settings
         alias grep="grep $GREP_OPTIONS"
-        alias egrep="egrep $GREP_OPTIONS"
-        alias fgrep="fgrep $GREP_OPTIONS"
+        alias egrep="grep -E $GREP_OPTIONS"
+        alias fgrep="grep -F $GREP_OPTIONS"
 
         # write to cache file if cache directory is writable
         if [[ -w "$ZSH_CACHE_DIR" ]]; then
diff --git a/lib/history.zsh b/lib/history.zsh
index 0ee8cfe7a..794076904 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -6,7 +6,8 @@ function omz_history {
   if [[ -n "$clear" ]]; then
     # if -c provided, clobber the history file
     echo -n >| "$HISTFILE"
-    echo >&2 History file deleted. Reload the session to see its effects.
+    fc -p "$HISTFILE"
+    echo >&2 History file deleted.
   elif [[ -n "$list" ]]; then
     # if -l provided, run as if calling `fc' directly
     builtin fc "$@"
diff --git a/lib/misc.zsh b/lib/misc.zsh
index a5d3af998..1f637083a 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -24,10 +24,10 @@ env_default 'LESS' '-R'
 ## super user alias
 alias _='sudo '
 
-## more intelligent acking for ubuntu users
+## more intelligent acking for ubuntu users and no alias for users without ack
 if (( $+commands[ack-grep] )); then
   alias afind='ack-grep -il'
-else
+elif (( $+commands[ack] )); then
   alias afind='ack -il'
 fi
 
diff --git a/lib/nvm.zsh b/lib/nvm.zsh
index 4a8b6811e..a8989f9fe 100644
--- a/lib/nvm.zsh
+++ b/lib/nvm.zsh
@@ -1,9 +1,6 @@
-# get the node.js version
+# get the nvm-controlled node.js version
 function nvm_prompt_info() {
-  [[ -f "$NVM_DIR/nvm.sh" ]] || return
-  local nvm_prompt
-  nvm_prompt=$(node -v 2>/dev/null)
-  [[ "${nvm_prompt}x" == "x" ]] && return
-  nvm_prompt=${nvm_prompt:1}
-  echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
+  which nvm &>/dev/null || return
+  local nvm_prompt=${$(nvm current)#v}
+  echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt:gs/%/%%}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
 }
diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 5069c4b21..e5535848b 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -18,6 +18,7 @@ function chruby_prompt_info \
   vi_mode_prompt_info \
   virtualenv_prompt_info \
   jenv_prompt_info \
+  tf_prompt_info \
 {
   return 1
 }
@@ -29,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/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 8cb2389e2..80ca7ef78 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -7,17 +7,17 @@
 # (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
 
-  [[ "$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
   : ${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
       ;;
@@ -29,12 +29,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
       ;;
@@ -42,7 +39,7 @@ function title {
 }
 
 ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
-ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
+ZSH_THEME_TERM_TITLE_IDLE="%n@%m:%~"
 # Avoid duplication of directory in terminals with independent dir display
 if [[ "$TERM_PROGRAM" == Apple_Terminal ]]; then
   ZSH_THEME_TERM_TITLE_IDLE="%n@%m"
@@ -50,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
@@ -99,16 +96,18 @@ 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 -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
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
 
diff --git a/lib/vcs_info.zsh b/lib/vcs_info.zsh
new file mode 100644
index 000000000..e60938c14
--- /dev/null
+++ b/lib/vcs_info.zsh
@@ -0,0 +1,53 @@
+# 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
+# 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 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]//\%/%%}"'
+# 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
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 16e244be5..29d39ca23 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,3 +1,43 @@
+# Protect against non-zsh execution of Oh My Zsh (use POSIX syntax here)
+[ -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
+  omz_f() {
+    [ $# -gt 0 ] || return
+    IFS=";" printf "\033[%sm" $*
+  }
+  # If stdout is not a terminal ignore all formatting
+  [ -t 1 ] || omz_f() { :; }
+
+  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
+      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 "$(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
+}
+
 # If ZSH is not defined, use the current script's directory.
 [[ -z "$ZSH" ]] && export ZSH="${${(%):-%x}:a:h}"
 
@@ -7,18 +47,27 @@ if [[ -z "$ZSH_CACHE_DIR" ]]; then
   ZSH_CACHE_DIR="$ZSH/cache"
 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}/oh-my-zsh"
+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)
+
 # 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
+autoload -U compaudit compinit zrecompile
 
 # Set ZSH_CUSTOM to the path where your custom config files
 # and plugins exists, or else we will use the default custom/
@@ -26,7 +75,6 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
-
 is_plugin() {
   local base_dir=$1
   local name=$2
@@ -37,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
@@ -49,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
@@ -70,19 +118,20 @@ 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 completion insecurities exist, warn the user
-  handle_completion_insecurities
+if [[ "$ZSH_DISABLE_COMPFIX" != true ]]; then
+  source "$ZSH/lib/compfix.zsh"
   # 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
@@ -91,40 +140,51 @@ $zcompdump_revision
 $zcompdump_fpath
 EOF
 fi
-
 unset zcompdump_revision zcompdump_fpath zcompdump_refresh
 
+# zcompile the completion dump file if the .zwc is older or missing.
+zrecompile -q -p "$ZSH_COMPDUMP" && command rm -f "$ZSH_COMPDUMP.zwc.old"
 
 # 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
diff --git a/plugins/1password/1password.plugin.zsh b/plugins/1password/1password.plugin.zsh
new file mode 100644
index 000000000..941523ca8
--- /dev/null
+++ b/plugins/1password/1password.plugin.zsh
@@ -0,0 +1,9 @@
+# Do nothing if op is not installed
+(( ${+commands[op]} )) || return
+
+# Load op completion
+eval "$(op completion zsh)"
+compdef _op op
+
+# Load opswd function
+autoload -Uz opswd
diff --git a/plugins/1password/README.md b/plugins/1password/README.md
new file mode 100644
index 000000000..f6854da53
--- /dev/null
+++ b/plugins/1password/README.md
@@ -0,0 +1,38 @@
+# 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.
+
+## `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.
+
+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 signed in for `opswd` to work. If you are using biometric unlock,
+> 1Password CLI will automatically prompt you to sign in. See:
+>
+> - [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 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
new file mode 100644
index 000000000..dbc094f87
--- /dev/null
+++ b/plugins/1password/_opswd
@@ -0,0 +1,19 @@
+#compdef opswd
+
+function _opswd() {
+  local -a services
+  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
new file mode 100644
index 000000000..57672807e
--- /dev/null
+++ b/plugins/1password/opswd
@@ -0,0 +1,78 @@
+#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 user list > /dev/null || return
+
+  local password
+  # Copy the password to the clipboard
+  if ! password=$(op item get "$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 10 seconds
+  local totp
+  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
+
+  (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 "$@"
diff --git a/plugins/ag/README.md b/plugins/ag/README.md
new file mode 100644
index 000000000..1983aaa41
--- /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=(... ag)
+```
+
+## 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
+}
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/README.md b/plugins/aliases/README.md
new file mode 100644
index 000000000..66fd84584
--- /dev/null
+++ b/plugins/aliases/README.md
@@ -0,0 +1,28 @@
+# 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.
+
+To use it, add `aliases` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(aliases)
+```
+
+Requirements: Python needs to be installed.
+
+## Usage
+
+- `acs`: show all aliases by group.
+
+- `acs -h/--help`: print help mesage.
+
+- `acs <keyword>`: filter aliases by `<keyword>` and highlight.
+
+- `acs -g <group>/--group <group`: show only aliases for group `<group>`. Multiple uses of the flag show all groups,
+
+- `acs --groups-only`: show only group names
+
+  ![screenshot](https://cloud.githubusercontent.com/assets/3602957/11581913/cb54fb8a-9a82-11e5-846b-5a67f67ad9ad.png)
diff --git a/plugins/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh
new file mode 100644
index 000000000..9864de957
--- /dev/null
+++ b/plugins/aliases/aliases.plugin.zsh
@@ -0,0 +1,14 @@
+# 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 '
+  function acs(){
+    (( $+commands[python3] )) || {
+      echo "[error] No python executable detected"
+      return
+    }
+    alias | python3 "'"${0:h}"'/cheatsheet.py" "$@"
+  }
+'
diff --git a/plugins/aliases/cheatsheet.py b/plugins/aliases/cheatsheet.py
new file mode 100644
index 000000000..3362a6ab6
--- /dev/null
+++ b/plugins/aliases/cheatsheet.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+import sys
+import itertools
+import termcolor
+import argparse
+
+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, highlight=None, only_groupname=False):
+    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 highlight and len(highlight)>0:
+        print (group_hl_formatter(key, highlight))
+        if not only_groupname:
+            print ('\n'.join([alias_hl_formatter(alias, highlight) for alias in aliases]))
+    else:
+        print (group_formatter(key))
+        if not only_groupname:
+            print ('\n'.join([alias_formatter(alias) for alias in aliases]))
+    print ('')
+
+def pretty_print(cheatsheet, wfilter, group_list=None, groups_only=False):
+    sorted_key = sorted(cheatsheet.keys())
+    for key in sorted_key:
+        if group_list and key not in group_list:
+            continue
+        aliases = cheatsheet.get(key)
+        if not wfilter:
+            pretty_print_group(key, aliases, wfilter, groups_only)
+        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__':
+    parser = argparse.ArgumentParser(description="Pretty print aliases.")
+    parser.add_argument('filter', nargs="*", help="search aliases matching string")
+    parser.add_argument('-g', '--group', dest="group_list", action='append', help="only print aliases in given groups")
+    parser.add_argument('--groups', dest='groups_only', action='store_true', help="only print alias groups")
+    args = parser.parse_args()
+
+    lines = sys.stdin.readlines()
+    group_list = args.group_list or None
+    wfilter = " ".join(args.filter) or None
+    pretty_print(cheatsheet(lines), wfilter, group_list, args.groups_only)
diff --git a/plugins/aliases/termcolor.py b/plugins/aliases/termcolor.py
new file mode 100644
index 000000000..bb725e905
--- /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>
+
+"""ANSI 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'])
+
diff --git a/plugins/ansible/ansible.plugin.zsh b/plugins/ansible/ansible.plugin.zsh
index f68ff23a5..75393b704 100644
--- a/plugins/ansible/ansible.plugin.zsh
+++ b/plugins/ansible/ansible.plugin.zsh
@@ -4,7 +4,7 @@ function ansible-version(){
 }
 
 function ansible-role-init(){
-    if ! [ -z $1] ; then
+    if ! [ -z $1 ] ; then
         echo "Ansible Role : $1 Creating...."
         ansible-galaxy init $1
         tree $1
@@ -25,4 +25,4 @@ alias ainv='ansible-inventory '
 alias adoc='ansible-doc '
 alias agal='ansible-galaxy '
 alias apull='ansible-pull '
-alias aval='ansible-vault'
\ No newline at end of file
+alias aval='ansible-vault'
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
index 0b738c94f..5f6382521 100644
--- a/plugins/ant/ant.plugin.zsh
+++ b/plugins/ant/ant.plugin.zsh
@@ -1,16 +1,2 @@
-_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
+# Default to colored output
+export ANT_ARGS='-logger org.apache.tools.ant.listener.AnsiColorLogger'
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'
diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index 5882c7603..fd772c61a 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -1,4 +1,4 @@
-# Archlinux plugin
+# Arch Linux plugin
 
 This plugin adds some aliases and functions to work with Arch Linux.
 
@@ -10,145 +10,174 @@ plugins=(... archlinux)
 
 ## Features
 
-#### YAY
+### Pacman
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| yaconf  | yay -Pg                            | Print current configuration                                         |
-| 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                 |
-| yaloc   | yay -Qi                            | Display information about a package in the local database           |
-| yalocs  | yay -Qs                            | Search for packages in the local database                           |
-| yalst   | yay -Qe                            | List installed packages including from AUR (tagged as "local")      |
-| yamir   | yay -Syy                           | Force refresh of all package lists after updating mirrorlist        |
-| yaorph  | yay -Qtd                           | Remove orphans using yay                                            |
-| yare    | yay -R                             | Remove packages, keeping its settings and dependencies              |
-| yarem   | yay -Rns                           | Remove packages, including its settings and unneeded dependencies   |
-| yarep   | yay -Si                            | Display information about a package in the repositories             |
-| yareps  | yay -Ss                            | Search for packages in the repositories                             |
-| yaupg   | yay -Syu                           | Sync with repositories before upgrading packages                    |
-| yasu    | yay -Syu --no-confirm              | Same as `yaupg`, but without confirmation                           |
+| Alias        | Command                                | Description                                                      |
+|--------------|----------------------------------------|------------------------------------------------------------------|
+| 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           |
+| pacrem       | `sudo pacman -Rns`                     | Remove packages, including its settings and dependencies         |
+| pacrep       | `pacman -Si`                           | Display information about a package in the repositories          |
+| pacreps      | `pacman -Ss`                           | Search for packages in the repositories                          |
+| pacrmorphans | `sudo pacman -Rs $(pacman -Qtdq)`      | Delete all orphaned packages                                     |
+| pacupd       | `sudo pacman -Sy`                      | Update and refresh local package, ABS and AUR databases          |
+| pacupg       | `sudo pacman -Syu`                     | Sync with repositories before upgrading packages                 |
+| pacfileupg   | `sudo pacman -Fy`                      | Download fresh package databases from the server                 |
+| 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[¹](#f1) | `sudo pacman -Syu`                  | Sync with repositories before upgrading packages                 |
 
-#### TRIZEN
+| Function       | Description                                               |
+|----------------|-----------------------------------------------------------|
+| pacdisowned    | List all disowned files in your system                    |
+| paclist        | List all explicitly installed packages with a description |
+| pacmanallkeys  | Get all keys for developers and trusted users             |
+| pacmansignkeys | Locally trust all keys passed as parameters               |
+| pacweb         | Open the website of an ArchLinux package                  |
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| trconf  | trizen -C                          | Fix all configuration files with vimdiff                            |
-| 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                 |
-| trloc   | trizen -Qi                         | Display information about a package in the local database           |
-| trlocs  | trizen -Qs                         | Search for packages in the local database                           |
-| trlst   | trizen -Qe                         | List installed packages including from AUR (tagged as "local")      |
-| trmir   | trizen -Syy                        | Force refresh of all package lists after updating mirrorlist        |
-| trorph  | trizen -Qtd                        | Remove orphans using yaourt                                         |
-| trre    | trizen -R                          | Remove packages, keeping its settings and dependencies              |
-| trrem   | trizen -Rns                        | Remove packages, including its settings and unneeded dependencies   |
-| trrep   | trizen -Si                         | Display information about a package in the repositories             |
-| trreps  | trizen -Ss                         | Search for packages in the repositories                             |
-| trupd   | trizen -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
-| trupd   | trizen -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
-| trupd   | trizen -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
-| trupd   | trizen -Sy                         | Update and refresh the local package database                       |
-| 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 | trizen -Syu                        | Sync with repositories before upgrading packages                    |
+Note: paclist used to print packages with a description which are (1) explicitly installed
+and (2) available for upgrade. Due to flawed scripting, it also printed all packages if no
+upgrades were available. Use `pacman -Que` instead.
 
-#### YAOURT
+### AUR helpers
 
-| 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 && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
-| yaupd   | yaourt -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
-| yaupd   | yaourt -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
-| yaupd   | yaourt -Sy                         | Update and refresh the local package database                       |
-| 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 | yaourt -Syu                        | Sync with repositories before upgrading packages                    |
+#### Aura
 
-#### PACAUR
+| 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                                     |
+| auinsd  | `sudo aura -S --asdeps`                         | Install packages as dependencies of another package (repositories only) |
+| aurinsd | `sudo aura -A --asdeps`                         | Install packages as dependencies of another package (AUR only)          |
+| auloc   | `aura -Qi`                                      | Display information about a package in the local database               |
+| aulocs  | `aura -Qs`                                      | Search for packages in the local database                               |
+| auls    | `aura -Qql`                                     | List all files owned by a given package                                 |
+| aulst   | `aura -Qe`                                      | List installed packages including from AUR (tagged as "local")          |
+| aumir   | `sudo aura -Syy`                                | Force refresh of all package lists after updating mirrorlist            |
+| aurph   | `sudo aura -Oj`                                 | Remove orphans using aura                                               |
+| auown   | `aura -Qqo`                                     | Search for packages that own the specified file(s)                      |
+| aure    | `sudo aura -R`                                  | Remove packages, keeping its settings and dependencies                  |
+| aurem   | `sudo aura -Rns`                                | Remove packages, including its settings and unneeded dependencies       |
+| aurep   | `aura -Si`                                      | Display information about a package in the repositories                 |
+| aurrep  | `aura -Ai`                                      | Display information about a package from AUR                            |
+| aureps  | `aura -As --both`                               | Search for packages in the repositories and AUR                         |
+| auras   | `aura -As --both`                               | Same as above                                                           |
+| 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[¹](#f1) | `sudo aura -Syu`                        | Sync with repositories before upgrading packages                        |
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| 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                 |
-| paloc   | pacaur -Qi                         | Display information about a package in the local database           |
-| palocs  | pacaur -Qs                         | Search for packages in the local database                           |
-| palst   | pacaur -Qe                         | List installed packages including from AUR (tagged as "local")      |
-| pamir   | pacaur -Syy                        | Force refresh of all package lists after updating mirrorlist        |
-| paorph  | pacaur -Qtd                        | Remove orphans using pacaur                                         |
-| pare    | pacaur -R                          | Remove packages, keeping its settings and dependencies              |
-| parem   | pacaur -Rns                        | Remove packages, including its settings and unneeded dependencies   |
-| parep   | pacaur -Si                         | Display information about a package in the repositories             |
-| pareps  | pacaur -Ss                         | Search for packages in the repositories                             |
-| paupd   | pacaur -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
-| paupd   | pacaur -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
-| paupd   | pacaur -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
-| paupd   | pacaur -Sy                         | Update and refresh the local package database                       |
-| 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 | pacaur -Syu                        | Sync with repositories before upgrading packages                    |
+| Function        | Description                                                         |
+|-----------------|---------------------------------------------------------------------|
+| auownloc _file_ | Display information about a package that owns the specified file(s) |
+| auownls  _file_ | List all files owned by a package that owns the specified file(s)   |
 
-#### PACMAN
+#### Pacaur
 
-| Alias        | Command                                 | Description                                                  |
-|--------------|-----------------------------------------|--------------------------------------------------------------|
-| 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          |
-| pacloc       | pacman -Qi                              | Display information about a package in the local database    |
-| paclocs      | pacman -Qs                              | Search for packages in the local database                    |
-| 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       |
-| pacrem       | sudo pacman -Rns                        | Remove packages, including its settings and dependencies     |
-| pacrep       | pacman -Si                              | Display information about a package in the repositories      |
-| pacreps      | pacman -Ss                              | Search for packages in the repositories                      |
-| pacrmorphans | sudo pacman -Rs $(pacman -Qtdq)         | Delete all orphaned packages                                 |
-| pacupd       | sudo pacman -Sy && sudo abs && sudo aur | Update and refresh the local package, ABS and AUR databases  |
-| pacupd       | sudo pacman -Sy && sudo abs             | Update and refresh the local package and ABS databases       |
-| pacupd       | sudo pacman -Sy && sudo aur             | Update and refresh the local package and AUR databases       |
-| pacupd       | sudo pacman -Sy                         | Update and refresh the local package database                |
-| pacupg       | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
-| upgrade      | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
-| pacfileupg   | sudo pacman -Fy                         | Download fresh package databases from the server             |
-| 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                               |
+| 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                 |
+| paloc   | `pacaur -Qi`                      | Display information about a package in the local database           |
+| palocs  | `pacaur -Qs`                      | Search for packages in the local database                           |
+| palst   | `pacaur -Qe`                      | List installed packages including from AUR (tagged as "local")      |
+| pamir   | `pacaur -Syy`                     | Force refresh of all package lists after updating mirrorlist        |
+| paorph  | `pacaur -Qtd`                     | Remove orphans using pacaur                                         |
+| pare    | `pacaur -R`                       | Remove packages, keeping its settings and dependencies              |
+| parem   | `pacaur -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
+| parep   | `pacaur -Si`                      | Display information about a package in the repositories             |
+| pareps  | `pacaur -Ss`                      | Search for packages in the repositories                             |
+| 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[¹](#f1) | `pacaur -Syu`             | Sync with repositories before upgrading packages                    |
 
-| Function       | Description                                          |
-|----------------|------------------------------------------------------|
-| pacdisowned    | List all disowned files in your system               |
-| paclist        | List all installed packages with a short description |
-| pacmanallkeys  | Get all keys for developers and trusted users        |
-| pacmansignkeys | Locally trust all keys passed as parameters          |
-| pacweb         | Open the website of an ArchLinux package             |
+#### Trizen
+
+| 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                 |
+| trloc   | `trizen -Qi`                      | Display information about a package in the local database           |
+| trlocs  | `trizen -Qs`                      | Search for packages in the local database                           |
+| trlst   | `trizen -Qe`                      | List installed packages including from AUR (tagged as "local")      |
+| trmir   | `trizen -Syy`                     | Force refresh of all package lists after updating mirrorlist        |
+| trorph  | `trizen -Qtd`                     | Remove orphans using yaourt                                         |
+| trre    | `trizen -R`                       | Remove packages, keeping its settings and dependencies              |
+| trrem   | `trizen -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
+| trrep   | `trizen -Si`                      | Display information about a package in the repositories             |
+| trreps  | `trizen -Ss`                      | Search for packages in the repositories                             |
+| 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[¹](#f1) | `trizen -Syu`             | Sync with repositories before upgrading packages                    |
+
+#### Yay
+
+| 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               |
+| yaloc   | `yay -Qi`                      | Display information about a package in the local database         |
+| yalocs  | `yay -Qs`                      | Search for packages in the local database                         |
+| yalst   | `yay -Qe`                      | List installed packages including from AUR (tagged as "local")    |
+| yamir   | `yay -Syy`                     | Force refresh of all package lists after updating mirrorlist      |
+| yaorph  | `yay -Qtd`                     | Remove orphans using yay                                          |
+| yare    | `yay -R`                       | Remove packages, keeping its settings and dependencies            |
+| yarem   | `yay -Rns`                     | Remove packages, including its settings and unneeded dependencies |
+| yarep   | `yay -Si`                      | Display information about a package in the repositories           |
+| yareps  | `yay -Ss`                      | Search for packages in the repositories                           |
+| 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[¹](#f1) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
 
 ---
 
+<span id="f1">¹</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. `trizen`
+3. `pacaur`
+4. `aura`
+5. `pacman`
+
 ## Contributors
 
 - Benjamin Boudreau - dreurmail@gmail.com
 - Celso Miranda - contacto@celsomiranda.net
+- ratijas (ivan tkachenko) - me@ratijas.tk
+- Juraj Fiala - doctorjellyface@riseup.net
 - KhasMek - Boushh@gmail.com
+- Majora320 (Moses Miller) - Majora320@gmail.com
 - Martin Putniorz - mputniorz@gmail.com
 - MatthR3D - matthr3d@gmail.com
 - ornicar - thibault.duplessis@gmail.com
-- Juraj Fiala - doctorjellyface@riseup.net
-- Majora320 (Moses Miller) - Majora320@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 4d39bd86b..4f1364779 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -1,143 +1,13 @@
-if (( $+commands[trizen] )); then
-  alias trconf='trizen -C'
-  alias trupg='trizen -Syua'
-  alias trsu='trizen -Syua --noconfirm'
-  alias trin='trizen -S'
-  alias trins='trizen -U'
-  alias trre='trizen -R'
-  alias trrem='trizen -Rns'
-  alias trrep='trizen -Si'
-  alias trreps='trizen -Ss'
-  alias trloc='trizen -Qi'
-  alias trlocs='trizen -Qs'
-  alias trlst='trizen -Qe'
-  alias trorph='trizen -Qtd'
-  alias trinsd='trizen -S --asdeps'
-  alias trmir='trizen -Syy'
-
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias trupd='trizen -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias trupd='trizen -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias trupd='trizen -Sy && sudo aur'
-  else
-    alias trupd='trizen -Sy'
-  fi
-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'
-
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias yaupd='yaourt -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias yaupd='yaourt -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias yaupd='yaourt -Sy && sudo aur'
-  else
-    alias yaupd='yaourt -Sy'
-  fi
-fi
-
-if (( $+commands[yay] )); then
-  alias yaconf='yay -Pg'
-  alias yaupg='yay -Syu'
-  alias yasu='yay -Syu --noconfirm'
-  alias yain='yay -S'
-  alias yains='yay -U'
-  alias yare='yay -R'
-  alias yarem='yay -Rns'
-  alias yarep='yay -Si'
-  alias yareps='yay -Ss'
-  alias yaloc='yay -Qi'
-  alias yalocs='yay -Qs'
-  alias yalst='yay -Qe'
-  alias yaorph='yay -Qtd'
-  alias yainsd='yay -S --asdeps'
-  alias yamir='yay -Syy'
-
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias yaupd='yay -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias yaupd='yay -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias yaupd='yay -Sy && sudo aur'
-  else
-    alias yaupd='yay -Sy'
-  fi
-fi
-
-if (( $+commands[pacaur] )); then
-  alias paupg='pacaur -Syu'
-  alias pasu='pacaur -Syu --noconfirm'
-  alias pain='pacaur -S'
-  alias pains='pacaur -U'
-  alias pare='pacaur -R'
-  alias parem='pacaur -Rns'
-  alias parep='pacaur -Si'
-  alias pareps='pacaur -Ss'
-  alias paloc='pacaur -Qi'
-  alias palocs='pacaur -Qs'
-  alias palst='pacaur -Qe'
-  alias paorph='pacaur -Qtd'
-  alias painsd='pacaur -S --asdeps'
-  alias pamir='pacaur -Syy'
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias paupd='pacaur -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias paupd='pacaur -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias paupd='pacaur -Sy && sudo aur'
-  else
-    alias paupd='pacaur -Sy'
-  fi
-fi
-
-if (( $+commands[trizen] )); then
-  function upgrade() {
-    trizen -Syu
-  }
-elif (( $+commands[pacaur] )); then
-  function upgrade() {
-    pacaur -Syu
-  }
-elif (( $+commands[yaourt] )); then
-  function upgrade() {
-    yaourt -Syu
-  }
-elif (( $+commands[yay] )); then
-  function upgrade() {
-    yay -Syu
-  }
-else
-  function upgrade() {
-    sudo pacman -Syu
-  }
-fi
+#######################################
+#               Pacman                #
+#######################################
 
 # 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'
@@ -152,33 +22,24 @@ alias pacfileupg='sudo pacman -Fy'
 alias pacfiles='pacman -F'
 alias pacls='pacman -Ql'
 alias pacown='pacman -Qo'
-
-
-if (( $+commands[abs] && $+commands[aur] )); then
-  alias pacupd='sudo pacman -Sy && sudo abs && sudo aur'
-elif (( $+commands[abs] )); then
-  alias pacupd='sudo pacman -Sy && sudo abs'
-elif (( $+commands[aur] )); then
-  alias pacupd='sudo pacman -Sy && sudo aur'
-else
-  alias pacupd='sudo pacman -Sy'
-fi
+alias pacupd="sudo pacman -Sy"
+alias upgrade='sudo pacman -Syu'
 
 function paclist() {
-  # Source: https://bbs.archlinux.org/viewtopic.php?id=93683
-  LC_ALL=C pacman -Qei $(pacman -Qu | cut -d " " -f 1) | \
-    awk 'BEGIN {FS=":"} /^Name/{printf("\033[1;36m%s\033[1;37m", $2)} /^Description/{print $2}'
+  # Based on https://bbs.archlinux.org/viewtopic.php?id=93683
+  pacman -Qqe | \
+    xargs -I '{}' \
+      expac "${bold_color}% 20n ${fg_no_bold[white]}%d${reset_color}" '{}'
 }
 
 function pacdisowned() {
-  emulate -L zsh
-
+  local tmp db fs
   tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
   db=$tmp/db
   fs=$tmp/fs
 
   mkdir "$tmp"
-  trap  'rm -rf "$tmp"' EXIT
+  trap 'rm -rf "$tmp"' EXIT
 
   pacman -Qlq | sort -u > "$db"
 
@@ -188,16 +49,11 @@ function pacdisowned() {
   comm -23 "$fs" "$db"
 }
 
-function pacmanallkeys() {
-  emulate -L zsh
-  curl -s https://www.archlinux.org/people/{developers,trustedusers}/ | \
-    awk -F\" '(/pgp.mit.edu/) { sub(/.*search=0x/,""); print $1}' | \
-    xargs sudo pacman-key --recv-keys
-}
+alias pacmanallkeys='sudo pacman-key --refresh-keys'
 
 function pacmansignkeys() {
-  emulate -L zsh
-  for key in $*; do
+  local key
+  for key in $@; do
     sudo pacman-key --recv-keys $key
     sudo pacman-key --lsign-key $key
     printf 'trust\n3\n' | sudo gpg --homedir /etc/pacman.d/gnupg \
@@ -207,13 +63,122 @@ function pacmansignkeys() {
 
 if (( $+commands[xdg-open] )); then
   function pacweb() {
-    pkg="$1"
-    infos="$(LANG=C pacman -Si "$pkg")"
+    if [[ $# = 0 || "$1" =~ '--help|-h' ]]; then
+      local underline_color="\e[${color[underline]}m"
+      echo "$0 - open the website of an ArchLinux package"
+      echo
+      echo "Usage:"
+      echo "    $bold_color$0$reset_color ${underline_color}target${reset_color}"
+      return 1
+    fi
+
+    local pkg="$1"
+    local infos="$(LANG=C pacman -Si "$pkg")"
     if [[ -z "$infos" ]]; then
       return
     fi
-    repo="$(grep -m 1 '^Repo' <<< "$infos" | grep -oP '[^ ]+$')"
-    arch="$(grep -m 1 '^Arch' <<< "$infos" | grep -oP '[^ ]+$')"
+    local repo="$(grep -m 1 '^Repo' <<< "$infos" | grep -oP '[^ ]+$')"
+    local arch="$(grep -m 1 '^Arch' <<< "$infos" | grep -oP '[^ ]+$')"
     xdg-open "https://www.archlinux.org/packages/$repo/$arch/$pkg/" &>/dev/null
   }
 fi
+
+#######################################
+#             AUR helpers             #
+#######################################
+
+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'
+  alias auloc='aura -Qi'
+  alias aulocs='aura -Qs'
+  alias aulst='aura -Qe'
+  alias aumir='sudo aura -Syy'
+  alias aurph='sudo aura -Oj'
+  alias aure='sudo aura -R'
+  alias aurem='sudo aura -Rns'
+  alias aurep='aura -Si'
+  alias aurrep='aura -Ai'
+  alias aureps='aura -As --both'
+  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 upgrade='sudo aura -Syu'
+
+  # extra bonus specially for aura
+  alias auown="aura -Qqo"
+  alias auls="aura -Qql"
+  function auownloc() { aura -Qi  $(aura -Qqo $@); }
+  function auownls () { aura -Qql $(aura -Qqo $@); }
+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'
+  alias pains='pacaur -U'
+  alias pare='pacaur -R'
+  alias parem='pacaur -Rns'
+  alias parep='pacaur -Si'
+  alias pareps='pacaur -Ss'
+  alias paloc='pacaur -Qi'
+  alias palocs='pacaur -Qs'
+  alias palst='pacaur -Qe'
+  alias paorph='pacaur -Qtd'
+  alias painsd='pacaur -S --asdeps'
+  alias pamir='pacaur -Syy'
+  alias paupd="pacaur -Sy"
+  alias upgrade='pacaur -Syu'
+fi
+
+if (( $+commands[trizen] )); then
+  alias trconf='trizen -C'
+  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'
+  alias trrep='trizen -Si'
+  alias trreps='trizen -Ss'
+  alias trloc='trizen -Qi'
+  alias trlocs='trizen -Qs'
+  alias trlst='trizen -Qe'
+  alias trorph='trizen -Qtd'
+  alias trinsd='trizen -S --asdeps'
+  alias trmir='trizen -Syy'
+  alias trupd="trizen -Sy"
+  alias upgrade='trizen -Syu'
+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'
+  alias yains='yay -U'
+  alias yare='yay -R'
+  alias yarem='yay -Rns'
+  alias yarep='yay -Si'
+  alias yareps='yay -Ss'
+  alias yaloc='yay -Qi'
+  alias yalocs='yay -Qs'
+  alias yalst='yay -Qe'
+  alias yaorph='yay -Qtd'
+  alias yainsd='yay -S --asdeps'
+  alias yamir='yay -Syy'
+  alias yaupd="yay -Sy"
+  alias upgrade='yay -Syu'
+fi
diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh
index c386d57ed..3016282c6 100644
--- a/plugins/asdf/asdf.plugin.zsh
+++ b/plugins/asdf/asdf.plugin.zsh
@@ -2,18 +2,26 @@
 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
-   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
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
diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index f40b0e931..8593353b2 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -8,8 +8,10 @@ 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)
 )
 
 for file in $autojump_paths; do
diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 57c3b54ac..d6f4f4600 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -14,6 +14,14 @@ 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>] [<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.
 
 * `agp`: gets the current value of `$AWS_PROFILE`.
 
@@ -33,6 +41,36 @@ plugins=(... aws)
 The plugin creates an `aws_prompt_info` function that you can use in your theme, which displays
 the current `$AWS_PROFILE`. It uses two variables to control how that is shown:
 
-- ZSH_THEME_AWS_PREFIX: sets the prefix of the AWS_PROFILE. Defaults to `<aws:`.
+* ZSH_THEME_AWS_PREFIX: sets the prefix of the AWS_PROFILE. Defaults to `<aws:`.
 
-- ZSH_THEME_AWS_SUFFIX: sets the suffix of the AWS_PROFILE. Defaults to `>`.
+* ZSH_THEME_AWS_SUFFIX: sets the suffix of the AWS_PROFILE. Defaults to `>`.
+
+## Configuration
+
+[Configuration and credential file settings](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html) by AWS
+
+### Scenario: IAM roles with a source profile and MFA authentication
+
+Source profile credentials in `~/.aws/credentials`:
+
+```
+[source-profile-name]
+aws_access_key_id = ...
+aws_secret_access_key = ...
+```
+
+Role configuration in `~/.aws/config`:
+
+```
+[profile source-profile-name]
+mfa_serial = arn:aws:iam::111111111111:mfa/myuser
+region = us-east-1
+output = json
+
+[profile profile-with-role]
+role_arn = arn:aws:iam::9999999999999:role/myrole
+mfa_serial = arn:aws:iam::111111111111:mfa/myuser
+source_profile = source-profile-name
+region = us-east-1
+output = json
+```
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index ecf78b2c2..2167f552c 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -21,6 +21,112 @@ 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
+function acp() {
+  if [[ -z "$1" ]]; then
+    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE
+    unset AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
+    echo AWS profile cleared.
+    return
+  fi
+
+  local -a available_profiles
+  available_profiles=($(aws_profiles))
+  if [[ -z "${available_profiles[(r)$1]}" ]]; then
+    echo "${fg[red]}Profile '$1' not found in '${AWS_CONFIG_FILE:-$HOME/.aws/config}'" >&2
+    echo "Available profiles: ${(j:, :)available_profiles:-no profiles found}${reset_color}" >&2
+    return 1
+  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)"
+  local aws_secret_access_key="$(aws configure get aws_secret_access_key --profile $profile)"
+  local aws_session_token="$(aws configure get aws_session_token --profile $profile)"
+
+
+  # First, if the profile has MFA configured, lets get the token and session duration
+  local mfa_serial="$(aws configure get mfa_serial --profile $profile)"
+  local sess_duration="$(aws configure get duration_seconds --profile $profile)"
+
+  if [[ -n "$mfa_serial" ]]; then
+    local -a mfa_opt
+    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
+    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)"
+
+  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"
+  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
+  if [[ -n "${aws_access_key_id}" && -n "$aws_secret_access_key" ]]; then
+    export AWS_DEFAULT_PROFILE="$profile"
+    export AWS_PROFILE="$profile"
+    export AWS_EB_PROFILE="$profile"
+    export AWS_ACCESS_KEY_ID="$aws_access_key_id"
+    export AWS_SECRET_ACCESS_KEY="$aws_secret_access_key"
+
+    if [[ -n "$aws_session_token" ]]; then
+      export AWS_SESSION_TOKEN="$aws_session_token"
+    else
+      unset AWS_SESSION_TOKEN
+    fi
+
+    echo "Switched to AWS Profile: $profile"
+  fi
 }
 
 function aws_change_access_key() {
@@ -29,33 +135,33 @@ function aws_change_access_key() {
     return 1
   fi
 
-  echo Insert the credentials when asked.
+  echo "Insert the credentials when asked."
   asp "$1" || return 1
   AWS_PAGER="" aws iam create-access-key
   AWS_PAGER="" aws configure --profile "$1"
 
-  echo You can now safely delete the old access key running \`aws iam delete-access-key --access-key-id ID\`
-  echo Your current keys are:
+  echo "You can now safely delete the old access key running \`aws iam delete-access-key --access-key-id ID\`"
+  echo "Your current keys are:"
   AWS_PAGER="" aws iam list-access-keys
 }
 
 function aws_profiles() {
   [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
-  grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9@_\.-]*\).*/\1/'
+  grep --color=never -Eo '\[.*\]' "${AWS_CONFIG_FILE:-$HOME/.aws/config}" | sed -E 's/^[[:space:]]*\[(profile)?[[:space:]]*([^[:space:]]+)\][[:space:]]*$/\2/g'
 }
 
 function _aws_profiles() {
   reply=($(aws_profiles))
 }
-compctl -K _aws_profiles asp aws_change_access_key
+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 ]; then
+if [[ "$SHOW_AWS_PROMPT" != false && "$RPROMPT" != *'$(aws_prompt_info)'* ]]; then
   RPROMPT='$(aws_prompt_info)'"$RPROMPT"
 fi
 
@@ -64,6 +170,7 @@ fi
 
 # AWS CLI v2 comes with its own autocompletion. Check if that is there, otherwise fall back
 if command -v aws_completer &> /dev/null; then
+  autoload -Uz bashcompinit && bashcompinit
   complete -C aws_completer aws
 else
   function _awscli-homebrew-installed() {
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 755ec8d64..db5eeb93a 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -10,20 +10,17 @@
 # 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() {
     ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ Yes'
   }
-
   function battery_pct() {
-    local battery_status="$(ioreg -rc AppleSmartBattery)"
-    local -i capacity=$(sed -n -e '/MaxCapacity/s/^.*"MaxCapacity"\ =\ //p' <<< $battery_status)
-    local -i current=$(sed -n -e '/CurrentCapacity/s/^.*"CurrentCapacity"\ =\ //p' <<< $battery_status)
-    echo $(( current * 100 / capacity ))
+    pmset -g batt | grep -Eo "\d+%" | cut -d% -f1
   }
-
   function battery_pct_remaining() {
     if battery_is_charging; then
       echo "External Power"
@@ -31,7 +28,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
@@ -45,7 +41,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
@@ -64,17 +59,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
@@ -82,7 +74,6 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       echo "External Power"
     fi
   }
-
   function battery_time_remaining() {
     local remaining_time
     remaining_time=$(sysctl -n hw.acpi.battery.time)
@@ -92,7 +83,6 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       printf %02d:%02d $hour $minute
     fi
   }
-
   function battery_pct_prompt() {
     local battery_pct color
     battery_pct=$(battery_pct_remaining)
@@ -109,19 +99,22 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
-
-elif [[ "$OSTYPE" = linux*  ]]; then
-
+elif [[ "$OSTYPE" = linux-android ]] && (( ${+commands[termux-battery-status]} )); then
   function battery_is_charging() {
-    ! acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -q '^Battery.*Discharging'
+    termux-battery-status 2>/dev/null | command awk '/status/ { exit ($0 ~ /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:]'
-    fi
+    # 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
@@ -129,13 +122,72 @@ 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_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
+      ! 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
+      local -i pct=$(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 }
+        ')
+      echo $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
+    else
+      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)
@@ -152,7 +204,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 }
@@ -177,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
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
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[*]}
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/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
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
diff --git a/plugins/bower/bower.plugin.zsh b/plugins/bower/bower.plugin.zsh
index 6019b9d37..c4f71c2ae 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"
 
@@ -7,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
 
@@ -20,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]')
 
@@ -52,7 +54,7 @@ _bower ()
         _arguments \
         $_dopts \
         $_save_dev \
-        $_force_lastest \
+        $_force_latest \
         $_no_color \
         $_production
         ;;
@@ -60,7 +62,7 @@ _bower ()
         _arguments \
         $_dopts \
         $_no_color \
-        $_force_lastest
+        $_force_latest
         _bower_installed_packages
         compadd "$@" $(echo $bower_package_list)
         ;;
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
 }
diff --git a/plugins/brew/README.md b/plugins/brew/README.md
index b714b7ac0..9ce2c5bb0 100644
--- a/plugins/brew/README.md
+++ b/plugins/brew/README.md
@@ -8,19 +8,26 @@ To use it, add `brew` to the plugins array of your zshrc file:
 plugins=(... brew)
 ```
 
+## Shellenv
+
+If `brew` is not found in the PATH, this plugin will attempt to find it in common
+locations, and execute `brew shellenv` to set the environment appropriately.
+This plugin will also export `HOMEBREW_PREFIX="$(brew --prefix)"` if not previously
+defined for convenience.
+
 ## Aliases
 
-| Alias    | Command                                                       | Description                                                         |
-|----------|-------------------------------------------------------------  |---------------------------------------------------------------------|
-| `brewp`  | `brew pin`                                                    | Pin a specified formula so that it's not upgraded.                  |
-| `brews`  | `brew list -1`                                                | List installed formulae or the installed files for a given formula. |
-| `brewsp` | `brew list --pinned`                                          | List pinned formulae, or show the version of a given formula.       |
-| `bubo`   | `brew update && brew outdated`                                | Update Homebrew data, then list outdated formulae and casks.        |
-| `bubc`   | `brew upgrade && brew cleanup`                                | Upgrade outdated formulae and casks, then run cleanup.              |
-| `bubu`   | `bubo && bubc`                                                | Do the last two operations above.                                   |
-| `buf`    | `brew upgrade --formula`                                      | Upgrade only formulas (not casks).                                  |
-| `bcubo`  | `brew update && brew outdated --cask`                         | Update Homebrew data, then list outdated casks.                     |
-| `bcubc`  | `brew cask reinstall $(brew outdated --cask) && brew cleanup` | Update outdated casks, then run cleanup.                            |
+| Alias    | Command                               | Description                                                         |
+| -------- | ------------------------------------- | ------------------------------------------------------------------- |
+| `bcubc`  | `brew upgrade --cask && brew cleanup` | Update outdated casks, then run cleanup.                            |
+| `bcubo`  | `brew update && brew outdated --cask` | Update Homebrew data, then list outdated casks.                     |
+| `brewp`  | `brew pin`                            | Pin a specified formula so that it's not upgraded.                  |
+| `brews`  | `brew list -1`                        | List installed formulae or the installed files for a given formula. |
+| `brewsp` | `brew list --pinned`                  | List pinned formulae, or show the version of a given formula.       |
+| `bubc`   | `brew upgrade && brew cleanup`        | Upgrade outdated formulae and casks, then run cleanup.              |
+| `bubo`   | `brew update && brew outdated`        | Update Homebrew data, then list outdated formulae and casks.        |
+| `bubu`   | `bubo && bubc`                        | Do the last two operations above.                                   |
+| `buf`    | `brew upgrade --formula`              | Upgrade only formulas (not casks).                                  |
 
 ## Completion
 
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 30eb135bb..41420b5b7 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,9 +1,48 @@
+if (( ! $+commands[brew] )); then
+  if [[ -x /opt/homebrew/bin/brew ]]; then
+    BREW_LOCATION="/opt/homebrew/bin/brew"
+  elif [[ -x /usr/local/bin/brew ]]; then
+    BREW_LOCATION="/usr/local/bin/brew"
+  elif [[ -x /home/linuxbrew/.linuxbrew/bin/brew ]]; then
+    BREW_LOCATION="/home/linuxbrew/.linuxbrew/bin/brew"
+  elif [[ -x "$HOME/.linuxbrew/bin/brew" ]]; then
+    BREW_LOCATION="$HOME/.linuxbrew/bin/brew"
+  else
+    return
+  fi
+
+  # Only add Homebrew installation to PATH, MANPATH, and INFOPATH if brew is
+  # not already on the path, to prevent duplicate entries. This aligns with
+  # the behavior of the brew installer.sh post-install steps.
+  eval "$("$BREW_LOCATION" shellenv)"
+  unset BREW_LOCATION
+fi
+
+if [[ -z "$HOMEBREW_PREFIX" ]]; then
+  # Maintain compatability with potential custom user profiles, where we had
+  # previously relied on always sourcing shellenv. OMZ plugins should not rely
+  # on this to be defined due to out of order processing.
+  export HOMEBREW_PREFIX="$(brew --prefix)"
+fi
+
+alias bcubc='brew upgrade --cask && brew cleanup'
+alias bcubo='brew update && brew outdated --cask'
 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'
+alias bubo='brew update && brew outdated'
 alias bubu='bubo && bubc'
 alias buf='brew upgrade --formula'
-alias bcubo='brew update && brew outdated --cask'
-alias bcubc='brew cask reinstall $(brew outdated --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}"
+}
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
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 6293dc28a..c1cbb13dd 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
@@ -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
diff --git a/plugins/cargo/README.md b/plugins/cargo/README.md
deleted file mode 100644
index 31bae4efe..000000000
--- a/plugins/cargo/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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).
diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
deleted file mode 100644
index 12694901e..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)
-                    _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)
-                    _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)
-                    _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)
-                    _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/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/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" &|
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 f7fedb5f2..d7a28d4e2 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):gs/%/%%}"
 }
 
-# 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
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
diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
index 0eb6e2e99..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.
 %
@@ -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.
 %
@@ -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.
 %
@@ -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.
+%
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"
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
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..e6a46f296 100644
--- a/plugins/colemak/colemak.plugin.zsh
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -19,4 +19,20 @@ 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
+# 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"
+
+# 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
diff --git a/plugins/colored-man-pages/README.md b/plugins/colored-man-pages/README.md
index f34941e73..4cbf64d3e 100644
--- a/plugins/colored-man-pages/README.md
+++ b/plugins/colored-man-pages/README.md
@@ -16,3 +16,17 @@ You can also try to color other pages by prefixing the respective command with `
 ```zsh
 colored git help clone
 ```
+
+## Customization
+
+The plugin declares global associative array `less_termcap`, which maps termcap capabilities to escape
+sequences for the `less` pager. This mapping can be further customized by the user after the plugin is
+loaded. Check out sources for more.
+
+For example: `less_termcap[md]` maps to `LESS_TERMCAP_md` which is the escape sequence that tells `less`
+how to print something in bold. It's currently shown in bold red, but if you want to change it, you
+can redefine `less_termcap[md]` in your zshrc file, after OMZ is sourced:
+
+```zsh
+less_termcap[md]="${fg_bold[blue]}" # this tells less to print bold text in bold blue
+```
diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index ec518472c..981992d88 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -1,39 +1,53 @@
-if [[ "$OSTYPE" = solaris* ]]
-then
-	if [[ ! -x "$HOME/bin/nroff" ]]
-	then
-		mkdir -p "$HOME/bin"
-		cat > "$HOME/bin/nroff" <<EOF
-#!/bin/sh
-if [ -n "\$_NROFF_U" -a "\$1,\$2,\$3" = "-u0,-Tlp,-man" ]; then
-	shift
-	exec /usr/bin/nroff -u\$_NROFF_U "\$@"
-fi
-#-- Some other invocation of nroff
-exec /usr/bin/nroff "\$@"
-EOF
-		chmod +x "$HOME/bin/nroff"
-	fi
-fi
+# Requires colors autoload.
+# See termcap(5).
+
+# Set up once, and then reuse. This way it supports user overrides after the
+# plugin is loaded.
+typeset -AHg less_termcap
+
+# bold & blinking mode
+less_termcap[mb]="${fg_bold[red]}"
+less_termcap[md]="${fg_bold[red]}"
+less_termcap[me]="${reset_color}"
+# standout mode
+less_termcap[so]="${fg_bold[yellow]}${bg[blue]}"
+less_termcap[se]="${reset_color}"
+# underlining
+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 -g __colored_man_pages_dir="${0:A:h}"
 
 function colored() {
-	command env \
-		LESS_TERMCAP_mb=$(printf "\e[1;31m") \
-		LESS_TERMCAP_md=$(printf "\e[1;31m") \
-		LESS_TERMCAP_me=$(printf "\e[0m") \
-		LESS_TERMCAP_se=$(printf "\e[0m") \
-		LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
-		LESS_TERMCAP_ue=$(printf "\e[0m") \
-		LESS_TERMCAP_us=$(printf "\e[1;32m") \
-		PAGER="${commands[less]:-$PAGER}" \
-		_NROFF_U=1 \
-		PATH="$HOME/bin:$PATH" \
-			"$@"
+  local -a environment
+
+  # Convert associative array to plain array of NAME=VALUE items.
+  local k v
+  for k v in "${(@kv)less_termcap}"; do
+    environment+=( "LESS_TERMCAP_${k}=${v}" )
+  done
+
+  # Prefer `less` whenever available, since we specifically configured
+  # environment for it.
+  environment+=( PAGER="${commands[less]:-$PAGER}" )
+
+  # See ./nroff script.
+  if [[ "$OSTYPE" = solaris* ]]; then
+    environment+=( PATH="${__colored_man_pages_dir}:$PATH" )
+  fi
+
+  command env $environment "$@"
 }
 
 # Colorize man and dman/debman (from debian-goodies)
 function man \
-	dman \
-	debman {
-	colored $0 "$@"
+  dman \
+  debman {
+  colored $0 "$@"
 }
diff --git a/plugins/colored-man-pages/nroff b/plugins/colored-man-pages/nroff
new file mode 100755
index 000000000..4ae155d29
--- /dev/null
+++ b/plugins/colored-man-pages/nroff
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# The whole point of this wrapper is to replace emboldening factor -u0 with
+# -u1 under certain circumstances on Solaris.
+
+if [ "$1,$2,$3" = "-u0,-Tlp,-man" ]; then
+  shift
+  exec /usr/bin/nroff -u1 "$@"
+else
+  # Some other invocation of nroff
+  exec /usr/bin/nroff "$@"
+fi
diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 80b69190f..a9da6cf83 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -6,7 +6,8 @@ alias cless="colorize_less"
 ZSH_COLORIZE_PLUGIN_PATH=$0:A
 
 colorize_check_requirements() {
-    local available_tools=("chroma" "pygmentize")
+    local -a available_tools
+    available_tools=("chroma" "pygmentize")
 
     if [ -z "$ZSH_COLORIZE_TOOL" ]; then
         if (( $+commands[pygmentize] )); then
@@ -81,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
@@ -95,7 +96,7 @@ colorize_less() {
         # which assumes that his LESSOPEN has been executed.
         local LESSCLOSE=""
 
-        LESS="$LESS" LESSOPEN="$LESSOPEN" LESSCLOSE="$LESSCLOSE" less "$@"
+        LESS="$LESS" LESSOPEN="$LESSOPEN" LESSCLOSE="$LESSCLOSE" command less "$@"
     }
 
     if [ -t 0 ]; then
diff --git a/plugins/command-not-found/README.md b/plugins/command-not-found/README.md
index 1cf4ba66e..5a373c537 100644
--- a/plugins/command-not-found/README.md
+++ b/plugins/command-not-found/README.md
@@ -28,5 +28,7 @@ It works out of the box with the command-not-found packages for:
 - [macOS (Homebrew)](https://github.com/Homebrew/homebrew-command-not-found)
 - [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 81d76e638..cb8a8989c 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -1,38 +1,69 @@
-# Uses the command-not-found package zsh support
-# as seen in https://www.porcheron.info/command-not-found-for-zsh/
-# this is installed in Ubuntu
+## Platforms with a built-in command-not-found handler init file
 
-[[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
+for file (
+  # Arch Linux. Must have pkgfile installed: https://wiki.archlinux.org/index.php/Pkgfile#Command_not_found
+  /usr/share/doc/pkgfile/command-not-found.zsh
+  # macOS (M1 and classic Homebrew): https://github.com/Homebrew/homebrew-command-not-found
+  /opt/homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
+  /usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
+); do
+  if [[ -r "$file" ]]; then
+    source "$file"
+    unset file
+    return 0
+  fi
+done
+unset file
 
-# Arch Linux command-not-found support, you must have package pkgfile installed
-# https://wiki.archlinux.org/index.php/Pkgfile#.22Command_not_found.22_hook
-[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh
 
-# Fedora command-not-found support
-if [ -f /usr/libexec/pk-command-not-found ]; then
-    command_not_found_handler () {
-        runcnf=1
-        retval=127
-        [ ! -S /var/run/dbus/system_bus_socket ] && runcnf=0
-        [ ! -x /usr/libexec/packagekitd ] && runcnf=0
-        if [ $runcnf -eq 1 ]
-            then
-            /usr/libexec/pk-command-not-found $@
-            retval=$?
-        fi
-        return $retval
-    }
+## Platforms with manual command_not_found_handler() setup
+
+# Debian and derivatives: https://launchpad.net/ubuntu/+source/command-not-found
+if [[ -x /usr/lib/command-not-found || -x /usr/share/command-not-found/command-not-found ]]; then
+  command_not_found_handler() {
+    if [[ -x /usr/lib/command-not-found ]]; then
+      /usr/lib/command-not-found -- "$1"
+      return $?
+    elif [[ -x /usr/share/command-not-found/command-not-found ]]; then
+      /usr/share/command-not-found/command-not-found -- "$1"
+      return $?
+    else
+      printf "zsh: command not found: %s\n" "$1" >&2
+      return 127
+    fi
+  }
 fi
 
-# OSX command-not-found support
-# https://github.com/Homebrew/homebrew-command-not-found
-if [[ -s '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh' ]]; then
-    source '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh'
+# Fedora: https://fedoraproject.org/wiki/Features/PackageKitCommandNotFound
+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 "$@"
+      return $?
+    fi
+
+    printf "zsh: command not found: %s\n" "$1" >&2
+    return 127
+  }
 fi
 
-# NixOS command-not-found support
-if [ -x /run/current-system/sw/bin/command-not-found ]; then
-    command_not_found_handler () {
-        /run/current-system/sw/bin/command-not-found $@
-    }
+# 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 "$@"
+  }
+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"
+  }
+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
diff --git a/plugins/common-aliases/README.md b/plugins/common-aliases/README.md
index d198a29ac..1417c3056 100644
--- a/plugins/common-aliases/README.md
+++ b/plugins/common-aliases/README.md
@@ -12,49 +12,55 @@ 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                        |
+
+\* Only if the [`duf`](https://github.com/muesli/duf) command isn't installed.
 
 ### 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
 
@@ -62,12 +68,15 @@ These aliases are expanded in any position in the command line, meaning you can
 end of the command you've typed. Examples:
 
 Quickly pipe to less:
+
 ```zsh
 $ ls -l /var/log L
 # will run
 $ ls -l /var/log | less
 ```
+
 Silences stderr output:
+
 ```zsh
 $ find . -type f NE
 # will run
@@ -75,7 +84,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                |
@@ -95,23 +104,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 a9d4f1a3d..3139b821a 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
 
@@ -33,8 +35,8 @@ alias -g NUL="> /dev/null 2>&1"
 alias -g P="2>&1| pygmentize -l pytb"
 
 alias dud='du -d 1 -h'
-alias duf='du -sh *'
-alias fd='find . -type d -name'
+(( $+commands[duf] )) || alias duf='du -sh *'
+(( $+commands[fd] )) || alias fd='find . -type d -name'
 alias ff='find . -type f -name'
 
 alias h='history'
diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/compleat.plugin.zsh
index 247240c20..38f1b396a 100644
--- a/plugins/compleat/compleat.plugin.zsh
+++ b/plugins/compleat/compleat.plugin.zsh
@@ -10,8 +10,11 @@ if (( ${+commands[compleat]} )); then
   local setup="${prefix}/share/compleat-1.0/compleat_setup" 
 
   if [[ -f "$setup" ]]; then
+    if ! bashcompinit >/dev/null 2>&1; then
+      autoload -U bashcompinit
+      bashcompinit -i
+    fi
+
     source "$setup" 
   fi
-
-  unset prefix setup
 fi
diff --git a/plugins/composer/README.md b/plugins/composer/README.md
index 7a5f7256e..ad6ed24bc 100644
--- a/plugins/composer/README.md
+++ b/plugins/composer/README.md
@@ -10,22 +10,26 @@ 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`                                                   |
+| `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 75b03ffe7..dd0b18e27 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -1,70 +1,76 @@
-# ------------------------------------------------------------------------------
-#          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 () {
+## 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
+
+## 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 cs='composer show'
+alias csu='composer self-update'
+alias cu='composer update'
+alias cuh='composer update --working-dir=$(composer config -g home)'
 
-# 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
+## 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
diff --git a/plugins/copybuffer/README.md b/plugins/copybuffer/README.md
index da138bdbd..a53d1c813 100644
--- a/plugins/copybuffer/README.md
+++ b/plugins/copybuffer/README.md
@@ -1,7 +1,7 @@
 # `copybuffer` plugin
 
-This plugin binds the ctrl-o keyboard shortcut to a command that copies the text
-that is currently typed in the command line ($BUFFER) to the system clipboard.
+This plugin adds the <kbd>ctrl-o</kbd> keyboard shortcut to copy the current text
+in the command line to the system clipboard.
 
 This is useful if you type a command - and before you hit enter to execute it - want
 to copy it maybe so you can paste it into a script, gist or whatnot.
diff --git a/plugins/copybuffer/copybuffer.plugin.zsh b/plugins/copybuffer/copybuffer.plugin.zsh
index 483ed5a5f..e67f920f0 100644
--- a/plugins/copybuffer/copybuffer.plugin.zsh
+++ b/plugins/copybuffer/copybuffer.plugin.zsh
@@ -5,10 +5,12 @@ 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
 }
 
 zle -N copybuffer
 
-bindkey "^O" copybuffer
+bindkey -M emacs "^O" copybuffer
+bindkey -M viins "^O" copybuffer
+bindkey -M vicmd "^O" copybuffer
diff --git a/plugins/copydir/README.md b/plugins/copydir/README.md
deleted file mode 100644
index 594bf1065..000000000
--- a/plugins/copydir/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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.
diff --git a/plugins/copydir/copydir.plugin.zsh b/plugins/copydir/copydir.plugin.zsh
deleted file mode 100644
index c45106240..000000000
--- a/plugins/copydir/copydir.plugin.zsh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copies the pathname of the current directory to the system or X Windows clipboard
-function copydir {
-  emulate -L zsh
-  print -n $PWD | clipcopy
-}
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."}
+}
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
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/dash/dash.plugin.zsh b/plugins/dash/dash.plugin.zsh
index ace2e33c1..f6801a870 100644
--- a/plugins/dash/dash.plugin.zsh
+++ b/plugins/dash/dash.plugin.zsh
@@ -1,80 +1,84 @@
 # Usage: dash [keyword:]query
-dash() { open dash://"$*" }
+dash() { open -a Dash.app dash://"$*" }
 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[@]"
 }
diff --git a/plugins/debian/README.md b/plugins/debian/README.md
index da5675c66..1db534f13 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.
@@ -30,30 +30,32 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 
 ## Superuser Operations Aliases
 
-| Alias    | Command                                                                                | Description                                                                                 |
-| -------- | -------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
-| `aac`    | `sudo $apt_pref autoclean`                                                             | Clears out the local repository of retrieved package files                                  |
-| `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                                                                 |
-| `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 |
-| `ap`     | `sudo $apt_pref purge`                                                                 | Removes packages along with configuration files                                             |
-| `ar`     | `sudo $apt_pref remove`                                                                | Removes packages, keeps the configuration files                                             |
-| `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                                             |
-| `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                                  |
+| 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                                                                |
+| `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                                             |
+| `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`
 
 | 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`    |
@@ -75,8 +77,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 68c6df1ae..2d8c4666e 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'
@@ -52,13 +52,17 @@ 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"
 
+    # 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
@@ -66,7 +70,7 @@ if [[ $use_sudo -eq 1 ]]; then
     alias di="sudo dpkg -i"
 
     # Remove ALL kernel images and headers EXCEPT the one in use
-    alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n$(uname -r)))'
+    alias kclean='sudo aptitude remove -P "?and(~i~nlinux-(ima|hea) ?not(~n$(uname -r)))"'
 
 
 # commands using su #########
@@ -84,28 +88,27 @@ else
     alias afu="su -lc '$apt-file update'"
     alias au="su -lc '$apt_pref $apt_upgr' root"
     function ai() {
-        cmd="su -lc 'aptitude -P install $@' root"
+        cmd="su -lc '$apt_pref install $@' root"
         print "$cmd"
         eval "$cmd"
     }
     function ap() {
-        cmd="su -lc '$apt_pref -P purge $@' root"
+        cmd="su -lc '$apt_pref purge $@' root"
         print "$cmd"
         eval "$cmd"
     }
-    function ar() {
-        cmd="su -lc '$apt_pref -P remove $@' root"
+    function aar() {
+        cmd="su -lc '$apt_pref 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'
     alias di='su -lc "dpkg -i" root'
 
     # Remove ALL kernel images and headers EXCEPT the one in use
-    alias kclean='su -lc "aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n$(uname -r)))" root'
+    alias kclean='su -lc "aptitude remove -P \"?and(~i~nlinux-(ima|hea) ?not(~n$(uname -r)))\"" root'
 fi
 
 # Completion ################################################################
@@ -138,7 +141,7 @@ apt_pref_compdef au  "$apt_upgr"
 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. #####################################################################
diff --git a/plugins/deno/README.md b/plugins/deno/README.md
new file mode 100644
index 000000000..691318397
--- /dev/null
+++ b/plugins/deno/README.md
@@ -0,0 +1,19 @@
+# Deno Plugin
+
+This plugin sets up completion and aliases for [Deno](https://deno.land).
+
+## Aliases
+
+| Alias | Full command     |
+| ----- | ---------------- |
+| db    | deno bundle      |
+| dc    | deno compile     |
+| dca   | deno cache       |
+| dfmt  | deno fmt         |
+| 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
new file mode 100644
index 000000000..7708f84df
--- /dev/null
+++ b/plugins/deno/deno.plugin.zsh
@@ -0,0 +1,27 @@
+# ALIASES
+alias db='deno bundle'
+alias dc='deno compile'
+alias dca='deno cache'
+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'
+
+# COMPLETION FUNCTION
+if (( ! $+commands[deno] )); then
+  return
+fi
+
+# 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
+  typeset -g -A _comps
+  autoload -Uz _deno
+  _comps[deno]=_deno
+fi
+
+deno completions zsh >| "$ZSH_CACHE_DIR/completions/_deno" &|
diff --git a/plugins/dirhistory/README.md b/plugins/dirhistory/README.md
index 223650727..ede9b5410 100644
--- a/plugins/dirhistory/README.md
+++ b/plugins/dirhistory/README.md
@@ -12,16 +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 |
+
+**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:
 
@@ -32,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 (`/`).
diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 35c43d76a..7021fc03a 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -1,8 +1,8 @@
-## 
-#   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. (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
 #
@@ -14,25 +14,25 @@ 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() {
-  eval "$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() {
-  eval "$1='$dirhistory_future[$#dirhistory_future]'"
+  typeset -g $1="${dirhistory_future[$#dirhistory_future]}"
   if [[ $#dirhistory_future -gt 0 ]]; then
     dirhistory_future[$#dirhistory_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)
@@ -108,44 +108,56 @@ function dirhistory_forward() {
 # Bind keys to history navigation
 function dirhistory_zle_dirhistory_back() {
   # Erase current line in buffer
-  zle kill-buffer
-  dirhistory_back 
-  zle accept-line
+  zle .kill-buffer
+  dirhistory_back
+  zle .accept-line
 }
 
 function dirhistory_zle_dirhistory_future() {
   # Erase current line in buffer
-  zle kill-buffer
+  zle .kill-buffer
   dirhistory_forward
-  zle accept-line
+  zle .accept-line
 }
 
 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" ]]; then
-  bindkey "^[b" dirhistory_zle_dirhistory_back
-fi
-# Putty:
-bindkey "\e\e[D" dirhistory_zle_dirhistory_back
-# GNU screen:
-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
-  bindkey "^[f" dirhistory_zle_dirhistory_future
-fi
-bindkey "\e\e[C" dirhistory_zle_dirhistory_future
-bindkey "\eO3C" dirhistory_zle_dirhistory_future
 
+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
-# 
+#
 
 # Move up in hierarchy
 function dirhistory_up() {
@@ -160,32 +172,50 @@ function dirhistory_down() {
 
 # Bind keys to hierarchy navigation
 function dirhistory_zle_dirhistory_up() {
-  zle kill-buffer   # Erase current line in buffer
+  zle .kill-buffer   # Erase current line in buffer
   dirhistory_up
-  zle accept-line
+  zle .accept-line
 }
 
 function dirhistory_zle_dirhistory_down() {
-  zle kill-buffer   # Erase current line in buffer
+  zle .kill-buffer   # Erase current line in buffer
   dirhistory_down
-  zle accept-line
+  zle .accept-line
 }
 
 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
-# Putty:
-bindkey "\e\e[A" dirhistory_zle_dirhistory_up
-# GNU screen:
-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
-bindkey "\e\e[B" dirhistory_zle_dirhistory_down
-bindkey "\eO3B" dirhistory_zle_dirhistory_down
+
+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
diff --git a/plugins/django/README.md b/plugins/django/README.md
deleted file mode 100644
index 1740e55e5..000000000
--- a/plugins/django/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Django plugin
-
-This plugin adds completion and hints for the [Django Project](https://www.djangoproject.com/) `manage.py` commands
-and options.
-
-To use it, add `django` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... django)
-```
-
-## 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
-...
-```
diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
deleted file mode 100644
index c2d00c171..000000000
--- a/plugins/django/django.plugin.zsh
+++ /dev/null
@@ -1,404 +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
diff --git a/plugins/dnote/README.md b/plugins/dnote/README.md
index e1b9b7044..7b41b9027 100644
--- a/plugins/dnote/README.md
+++ b/plugins/dnote/README.md
@@ -1,6 +1,6 @@
 # Dnote Plugin
 
-This plugin adds auto-completion for [Dnote](https://dnote.io) project.
+This plugin adds auto-completion for [Dnote](https://www.getdnote.com/), a simple command line notebook.
 
 To use it, add `dnote` to the plugins array in your zshrc file:
 
diff --git a/plugins/docker-compose/README.md b/plugins/docker-compose/README.md
index a81c2c78e..13f3c2cea 100644
--- a/plugins/docker-compose/README.md
+++ b/plugins/docker-compose/README.md
@@ -11,21 +11,22 @@ plugins=(... docker-compose)
 
 ## Aliases
 
-| Alias     | Command                  | Description                                                      |
-|-----------|--------------------------|------------------------------------------------------------------|
-| dco       | `docker-compose`         | Docker-compose main command                                      |
-| dcb       | `docker-compose build`   | Build containers                                                 |
-| dce       | `docker-compose exec`    | Execute command inside a container                               |
-| dcps      | `docker-compose ps`      | List containers                                                  |
-| dcrestart | `docker-compose restart` | Restart container                                                |
-| dcrm      | `docker-compose rm`      | Remove container                                                 |
-| dcr       | `docker-compose run`     | Run a command in container                                       |
-| dcstop    | `docker-compose stop`    | Stop a container                                                 |
-| dcup      | `docker-compose up`      | Build, (re)create, start, and attach to containers for a service |
-| dcupd     | `docker-compose up -d`   | Same as `dcup`, but starts as daemon                             |
-| dcdn      | `docker-compose down`    | Stop and remove containers                                       |
-| dcl       | `docker-compose logs`    | Show logs of container                                           |
-| dclf      | `docker-compose logs -f` | Show logs and follow output                                      |
-| dcpull    | `docker-compose pull`    | Pull image of a service                                          |
-| dcstart   | `docker-compose start`   | Start a container                                                |
-| dck       | `docker-compose kill`    | Kills containers                                                 |
+| Alias     | Command                        | Description                                                      |
+|-----------|--------------------------------|------------------------------------------------------------------|
+| dco       | `docker-compose`               | Docker-compose main command                                      |
+| dcb       | `docker-compose build`         | Build containers                                                 |
+| dce       | `docker-compose exec`          | Execute command inside a container                               |
+| dcps      | `docker-compose ps`            | List containers                                                  |
+| dcrestart | `docker-compose restart`       | Restart container                                                |
+| dcrm      | `docker-compose rm`            | Remove container                                                 |
+| dcr       | `docker-compose run`           | Run a command in container                                       |
+| dcstop    | `docker-compose stop`          | Stop a container                                                 |
+| dcup      | `docker-compose up`            | Build, (re)create, start, and attach to containers for a service |
+| dcupb     | `docker-compose up --build`    | Same as `dcup`, but build images before starting containers      |
+| dcupd     | `docker-compose up -d`         | Same as `dcup`, but starts as daemon                             |
+| dcdn      | `docker-compose down`          | Stop and remove containers                                       |
+| dcl       | `docker-compose logs`          | Show logs of container                                           |
+| dclf      | `docker-compose logs -f`       | Show logs and follow output                                      |
+| dcpull    | `docker-compose pull`          | Pull image of a service                                          |
+| dcstart   | `docker-compose start`         | Start a container                                                |
+| dck       | `docker-compose kill`          | Kills containers                                                 |
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"
diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 5b25b63b9..b8a4b067d 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -1,27 +1,22 @@
-# Authors:
-# https://github.com/tristola
-#
-# Docker-compose related zsh aliases
+# support Compose v2 as docker CLI plugin
+(( ${+commands[docker-compose]} )) && 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 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
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/docker/README.md b/plugins/docker/README.md
index fab7aa8f1..606690f14 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                                                     |
+| 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                          |
+| 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                                                                       |
+| 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**                                                                       |
+| 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 b/plugins/docker/_docker
index 10c19e233..8ee35abcf 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -624,7 +624,8 @@ __docker_container_subcommand() {
         "($help)--entrypoint=[Overwrite the default entrypoint of the image]:entry point: "
         "($help)*--env-file=[Read environment variables from a file]:environment file:_files"
         "($help)*--expose=[Expose a port from the container without publishing it]: "
-        "($help)*--group=[Set one or more supplementary user groups for the container]:group:_groups"
+        "($help)*--gpus=[GPU devices to add to the container ('all' to pass all GPUs)]:device: "
+        "($help)*--group-add=[Set one or more supplementary user groups for the container]:group:_groups"
         "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts"
         "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]"
         "($help)--init[Run an init inside the container that forwards signals and reaps processes]"
@@ -750,6 +751,7 @@ __docker_container_subcommand() {
                 $opts_attach_exec_run_start \
                 "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \
                 "($help)*"{-e=,--env=}"[Set environment variables]:environment variable: " \
+                "($help)*--env-file=[Read environment variables from a file]:environment file:_files" \
                 "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" \
                 "($help)--privileged[Give extended Linux capabilities to the command]" \
                 "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \
@@ -791,7 +793,7 @@ __docker_container_subcommand() {
                 "($help -f --follow)"{-f,--follow}"[Follow log output]" \
                 "($help -s --since)"{-s=,--since=}"[Show logs since this timestamp]:timestamp: " \
                 "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \
-                "($help)--tail=[Output the last K lines]:lines:(1 10 20 50 all)" \
+                "($help -n --tail)"{-n=,--tail=}"[Number of lines to show from the end of the logs]:lines:(1 10 20 50 all)" \
                 "($help -)*:containers:__docker_complete_containers" && ret=0
             ;;
         (ls|list)
@@ -1018,6 +1020,7 @@ __docker_image_subcommand() {
                 "($help)*--shm-size=[Size of '/dev/shm' (format is '<number><unit>')]:shm size: " \
                 "($help)--squash[Squash newly built layers into a single new layer]" \
                 "($help -t --tag)*"{-t=,--tag=}"[Repository, name and tag for the image]: :__docker_complete_repositories_with_tags" \
+                "($help)--target=[Set the target build stage to build.]" \
                 "($help)*--ulimit=[ulimit options]:ulimit: " \
                 "($help)--userns=[Container user namespace]:user namespace:(host)" \
                 "($help -):path or URL:_directories" && ret=0
@@ -1340,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
 
@@ -1958,6 +1961,8 @@ __docker_service_subcommand() {
 
     opts_help=("(: -)--help[Print usage]")
     opts_create_update=(
+        "($help)*--cap-add=[Add Linux capabilities]:capability: "
+        "($help)*--cap-drop=[Drop Linux capabilities]:capability: "
         "($help)*--constraint=[Placement constraints]:constraint: "
         "($help)--endpoint-mode=[Placement constraints]:mode:(dnsrr vip)"
         "($help)*"{-e=,--env=}"[Set environment variables]:env: "
@@ -1970,6 +1975,7 @@ __docker_service_subcommand() {
         "($help)*--label=[Service labels]:label: "
         "($help)--limit-cpu=[Limit CPUs]:value: "
         "($help)--limit-memory=[Limit Memory]:value: "
+        "($help)--limit-pids[Limit maximum number of processes (default 0 = unlimited)]"
         "($help)--log-driver=[Logging driver for service]:logging driver:__docker_complete_log_drivers"
         "($help)*--log-opt=[Logging driver options]:log driver options:__docker_complete_log_options"
         "($help)*--mount=[Attach a filesystem mount to the service]:mount: "
@@ -2012,6 +2018,7 @@ __docker_service_subcommand() {
                 "($help)*--dns-option=[Set DNS options]:DNS option: " \
                 "($help)*--dns-search=[Set custom DNS search domains]:DNS search: " \
                 "($help)*--env-file=[Read environment variables from a file]:environment file:_files" \
+                "($help)*--group=[Set one or more supplementary user groups for the container]:group: _groups " \
                 "($help)--mode=[Service Mode]:mode:(global replicated)" \
                 "($help)--name=[Service name]:name: " \
                 "($help)*--placement-pref=[Add a placement preference]:pref:__docker_service_complete_placement_pref" \
@@ -2035,7 +2042,7 @@ __docker_service_subcommand() {
                 "($help)--no-task-ids[Do not include task IDs]" \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help)--since=[Show logs since timestamp]:timestamp: " \
-                "($help)--tail=[Number of lines to show from the end of the logs]:lines:(1 10 20 50 all)" \
+                "($help -n --tail)"{-n=,--tail=}"[Number of lines to show from the end of the logs]:lines:(1 10 20 50 all)" \
                 "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \
                 "($help -)1:service:__docker_complete_services" && ret=0
             ;;
@@ -2537,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 ))
@@ -2569,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
@@ -2624,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 \
@@ -2639,6 +2739,8 @@ __docker_subcommand() {
                 "($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \
                 "($help)--config-file=[Path to daemon configuration file]:Config File:_files" \
                 "($help)--containerd=[Path to containerd socket]:socket:_files -g \"*.sock\"" \
+                "($help)--containerd-namespace=[Containerd namespace to use]:containerd namespace:" \
+                "($help)--containerd-plugins-namespace=[Containerd namespace to use for plugins]:containerd namespace:" \
                 "($help)--data-root=[Root directory of persisted Docker data]:path:_directories" \
                 "($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
                 "($help)--default-gateway[Container default gateway IPv4 address]:IPv4 address: " \
@@ -2689,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)
diff --git a/plugins/docker/docker.plugin.zsh b/plugins/docker/docker.plugin.zsh
new file mode 100644
index 000000000..9c8ad8a28
--- /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 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'
+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 dipu='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'
diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index 24f285df5..46cd4b10a 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -11,41 +11,54 @@
 ## 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 -Fx -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 -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
+      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
+    return 1
+  }
+
+  setopt localoptions allexport
+  source $ZSH_DOTENV_FILE
 }
 
 autoload -U add-zsh-hook
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..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}"
 }
 
@@ -30,3 +30,4 @@ alias ds='dotnet sln'
 alias da='dotnet add'
 alias dp='dotnet pack'
 alias dng='dotnet nuget'
+alias db='dotnet build'
diff --git a/plugins/drush/README.md b/plugins/drush/README.md
index df7b82bdd..29b429e3b 100644
--- a/plugins/drush/README.md
+++ b/plugins/drush/README.md
@@ -1,83 +1,66 @@
 # 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                          |
+| `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
 
-### 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 178750c24..48e8ddb1e 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,62 +20,62 @@ 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
+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"
@@ -86,17 +85,23 @@ 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"
+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
+bashcompinit
 source $(dirname $0)/drush.complete.sh
diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index db0ab13af..fede5b0c4 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -9,47 +9,60 @@
 # - 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"
+# 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 EDITOR if not already defined.
-    export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
+# Path to custom emacsclient launcher
+export EMACS_PLUGIN_LAUNCHER="${0:A:h}/emacsclient.sh"
 
-    alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait"
-    alias e=emacs
-    # open terminal emacsclient
-    alias te="$EMACS_PLUGIN_LAUNCHER -nw"
+# set EDITOR if not already defined.
+export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
 
-    # 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'
+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'
 
-    # 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 \"
-    }
+# 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
 
-    # 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}"
+}
diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 0aa8d6f40..96893c932 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -1,29 +1,38 @@
 #!/bin/sh
 
-_emacsfun()
-{
-    # get list of emacs frames.
-    frameslist=`emacsclient --alternate-editor '' --eval '(frame-list)' 2>/dev/null | egrep -o '(frame)+'`
+emacsfun() {
+  local cmd frames
 
-    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
+  # 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 |sed 's/.*\x07//g' )"
+
+  # Only create another X frame if there isn't one present
+  if [ -z "$frames" -o "$frames" = nil ]; 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
+# 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
-    tempfile="$(mktemp --tmpdir emacs-stdin-$USER.XXXXXXX 2>/dev/null \
-                || mktemp -t emacs-stdin-$USER)" # support BSD mktemp
-    cat - > "$tempfile"
-    _emacsfun --no-wait $tempfile
-else
-    _emacsfun "$@"
+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"
+  # Reset $2 to the tempfile so that "$@" works as expected
+  set -- "$1" "$tempfile" "${@:3}"
 fi
+
+emacsfun "$@"
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'
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 7876f1c89..f9e476ebf 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -4,15 +4,17 @@
 #
 # 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}"
 
 () {
 
 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"
@@ -20,12 +22,11 @@ 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
 # 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'
@@ -38,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
@@ -259,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
@@ -276,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..18b3c060d
--- /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 function 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 implemented 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()
diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index e288b5cfb..661169a8b 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"
@@ -29,7 +34,7 @@ function emotty() {
   # Parse tty number via prompt expansion. %l equals:
   # - N      if tty = /dev/ttyN
   # - pts/N  if tty = /dev/pts/N
-  local tty = ${${(%):-%l}##pts/}
+  local tty=${${(%):-%l}##pts/}
   # Normalize it to an emotty set index
   (( tty = (tty % ${#${=emotty}}) + 1 ))
 
diff --git a/plugins/extract/README.md b/plugins/extract/README.md
index b2b731e39..44f0b05a1 100644
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@@ -21,7 +21,10 @@ plugins=(... extract)
 | `apk`             | Android app file                     |
 | `aar`             | Android library file                 |
 | `bz2`             | Bzip2 file                           |
+| `cab`             | Microsoft cabinet archive            |
+| `cpio`            | Cpio archive                         |
 | `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..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|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|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 46e69f08d..1112dd52f 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -1,82 +1,85 @@
 alias x=extract
 
 extract() {
-	local remove_archive
-	local success
-	local extract_dir
+  setopt localoptions noautopushd
 
-	if (( $# == 0 )); then
-		cat <<-'EOF' >&2
-			Usage: extract [-option] [file ...]
+  if (( $# == 0 )); then
+    cat >&2 <<'EOF'
+Usage: extract [-option] [file ...]
 
-			Options:
-			    -r, --remove    Remove archive after unpacking.
-		EOF
-	fi
+Options:
+    -r, --remove    Remove archive after unpacking.
+EOF
+  fi
 
-	remove_archive=1
-	if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
-		remove_archive=0
-		shift
-	fi
+  local remove_archive=1
+  if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
+    remove_archive=0
+    shift
+  fi
 
-	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
 
-		success=0
-		extract_dir="${1:t:r}"
-		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|*.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" ;;
-			(*.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 ..
-			;;
-			(*.zst) unzstd "$1" ;;
-			(*)
-				echo "extract: '$1' cannot be extracted" >&2
-				success=1
-			;;
-		esac
+    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 = $success > 0 ? $success : $? ))
-		(( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
-		shift
-	done
+    (( 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
 }
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 ccbbce3b2..896fed5f7 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="."
@@ -44,7 +44,7 @@ function fastfile() {
 #   The path to the shortcut file
 #
 function fastfile_resolv() {
-    echo "${fastfile_dir}${1}"
+    echo "${fastfile_dir}/${1}"
 }
 
 #
@@ -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
-        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 colums
+        # Special format for columns
         echo "${fastfile_var_prefix}${varkey}|->|$(fastfile_get "$file")"
     done | column -t -s "|"
 }
@@ -93,20 +93,21 @@ 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"
     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 handeling 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
diff --git a/plugins/fd/README.md b/plugins/fd/README.md
index aabd624b8..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 [`7.3.0`](https://github.com/sharkdp/fd/releases/tag/v7.3.0).
-
-Updated on Febrary 13th, 2019.
diff --git a/plugins/fd/_fd b/plugins/fd/_fd
index 7a4c38753..45b8ca477 100644
--- a/plugins/fd/_fd
+++ b/plugins/fd/_fd
@@ -1,83 +1,273 @@
-#compdef fd fdfind
+#compdef fd
+
+##
+# 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]"
+    $no'(no-ignore-full --no-ignore-parent)--no-ignore-parent[]'
+
+    + '(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'
+    '(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)'
+
+    + '(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 -/'
+
+    + 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 -/'
+  )
+
+  # 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
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"
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..cddb6c7c0
--- /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 completion zsh >| "$ZSH_CACHE_DIR/completions/_fig" &|
diff --git a/plugins/flutter/README.md b/plugins/flutter/README.md
index be419144f..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 porject                                                     |
+| 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 b/plugins/flutter/_flutter
deleted file mode 100644
index ab6ce4265..000000000
--- a/plugins/flutter/_flutter
+++ /dev/null
@@ -1,37 +0,0 @@
-#compdef flutter
-#autoload
-
-local -a _1st_arguments
-_1st_arguments=(
-  "analyze":"Analyze the project's Dart code."
-  "assemble":"Assemble and build flutter resources."
-  "attach":"Attach to a running application."
-  "build":"Flutter build commands."
-  "channel":"List or switch flutter channels."
-  "clean":"Delete the build/ and .dart_tool/ directories."
-  "config":"Configure Flutter settings."
-  "create":"Create a new Flutter project."
-  "devices":"List all connected devices."
-  "doctor":"Show information about the installed tooling."
-  "drive":"Runs Flutter Driver tests for the current project."
-  "emulators":"List, launch and create emulators."
-  "format":" Format one or more dart files."
-  "help":"Display help information for flutter."
-  "install":"Install a Flutter app on an attached device."
-  "logs":"Show log output for running Flutter apps."
-  "make-host-app-editable":"Moves host apps from generated directories to non-generated directories so that they can be edited by developers."
-  "precache":"Populates the Flutter tool's cache of binary artifacts."
-  "pub":"Commands for managing Flutter packages."
-  "run":"Run your Flutter app on an attached device."
-  "screenshot":"Take a screenshot from a connected device."
-  "test":"Run Flutter unit tests for the current project."
-  "upgrade":"Upgrade your copy of Flutter."
-  "version":"List or switch flutter versions."
-)
-
-_arguments -C '*:: :->subcmds'
-
-if (( CURRENT == 1 )); then
-  _describe -t commands "flutter command" _1st_arguments
-  return
-fi
diff --git a/plugins/flutter/flutter.plugin.zsh b/plugins/flutter/flutter.plugin.zsh
index 01c4c9f5f..44d196cd4 100644
--- a/plugins/flutter/flutter.plugin.zsh
+++ b/plugins/flutter/flutter.plugin.zsh
@@ -1,7 +1,29 @@
 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"
+
+# COMPLETION FUNCTION
+if (( ! $+commands[flutter] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `flutter`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_flutter" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _flutter
+  _comps[flutter]=_flutter
+fi
+
+flutter zsh-completion >| "$ZSH_CACHE_DIR/completions/_flutter" &|
\ No newline at end of file
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..6219025cd
--- /dev/null
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -0,0 +1,13 @@
+if (( ! $+commands[fnm] )); then
+  return
+fi
+
+# 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
+  typeset -g -A _comps
+  autoload -Uz _fnm
+  _comps[fnm]=_fnm
+fi
+
+fnm completions --shell=zsh >| "$ZSH_CACHE_DIR/completions/_fnm" &|
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 1ae166e62..fadf6095d 100644
--- a/plugins/fossil/fossil.plugin.zsh
+++ b/plugins/fossil/fossil.plugin.zsh
@@ -12,55 +12,25 @@ 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 () {
-  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'`
+function fossil_prompt_info() {
+  local branch=$(fossil branch current 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" <<< "$branch" || return
 
-    echo "$ZSH_THEME_FOSSIL_PROMPT_PREFIX" \
-      "$_BRANCH" \
-      "$ZSH_THEME_FOSSIL_PROMPT_SUFFIX" \
-      "$_EDITED_SYM"\
-      "%{$reset_color%}"
+  local changes=$(fossil changes)
+  local dirty="$ZSH_THEME_FOSSIL_PROMPT_CLEAN"
+
+  if [[ -n "$changes" ]]; then
+    dirty="$ZSH_THEME_FOSSIL_PROMPT_DIRTY"
   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
+  printf '%s %s %s %s %s' \
+    "$ZSH_THEME_FOSSIL_PROMPT_PREFIX" \
+    "${branch:gs/%/%%}" \
+    "$ZSH_THEME_FOSSIL_PROMPT_SUFFIX" \
+    "$dirty" \
+    "%{$reset_color%}"
 }
 
 function _fossil_prompt () {
@@ -73,17 +43,14 @@ function _fossil_prompt () {
     local is_prompt=`echo $PROMPT | grep git`
 
     if [ "$is_prompt" = "" ]; then
-      export RPROMPT="$_rprompt"'$(fossil_prompt_info)'
+      RPROMPT="$_rprompt"'$(fossil_prompt_info)'
     else
-      export PROMPT="$_prompt"'$(fossil_prompt_info) '
+      PROMPT="$_prompt"'$(fossil_prompt_info) '
     fi
 
     _FOSSIL_PROMPT="1"
   fi
 }
 
-compdef _fossil fossil
-
 autoload -U add-zsh-hook
-
 add-zsh-hook precmd _fossil_prompt
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
diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 4517e21a8..b9e2fe95d 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -29,21 +29,17 @@ 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() {
   emulate -L zsh
 
   # define search context URLS
-  typeset -A urls
+  local -A urls
   urls=(
     angular        'https://angular.io/?search='
     angularjs      $(_frontend_fallback 'angularjs.org')
@@ -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:'
@@ -77,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:"
@@ -109,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 ..."
 
diff --git a/plugins/fzf/README.md b/plugins/fzf/README.md
index d9617563a..beedf4690 100644
--- a/plugins/fzf/README.md
+++ b/plugins/fzf/README.md
@@ -1,33 +1,52 @@
 # fzf
 
-This plugin enables [junegunn's fzf](https://github.com/junegunn/fzf) fuzzy auto-completion and key bindings
+This plugin tries to find [junegunn's fzf](https://github.com/junegunn/fzf) based on where
+it's been installed, and enables its fuzzy auto-completion and key bindings.
 
 To use it, add `fzf` to the plugins array in your zshrc file:
+
 ```zsh
 plugins=(... fzf)
 ```
 
 ## Settings
 
-Add these before the `plugins=()` line in your zshrc file:
+All these settings should go in your zshrc file, before Oh My Zsh is sourced.
+
+### `FZF_BASE`
+
+Set to fzf installation directory path:
 
 ```zsh
-# Set fzf installation directory path
-# export FZF_BASE=/path/to/fzf/install/dir
-
-# Uncomment to set the FZF_DEFAULT_COMMAND
-# export FZF_DEFAULT_COMMAND='<your fzf default commmand>'
-
-# Uncomment the following line to disable fuzzy completion
-# DISABLE_FZF_AUTO_COMPLETION="true"
-
-# Uncomment the following line to disable key bindings (CTRL-T, CTRL-R, ALT-C)
-# DISABLE_FZF_KEY_BINDINGS="true"
+export FZF_BASE=/path/to/fzf/install/dir
 ```
 
-| Setting                     | Example value              | Description                                                 |
-|-----------------------------|----------------------------|-------------------------------------------------------------|
-| FZF_BASE                    | `/path/to/fzf/install/dir` | Set fzf installation directory path (**export**)            |
-| FZF_DEFAULT_COMMAND         | `fd --type f`              | Set default command to use when input is tty (**export**)   |
-| DISABLE_FZF_AUTO_COMPLETION | `true`                     | Set whether to load fzf auto-completion                     |
-| DISABLE_FZF_KEY_BINDINGS    | `true`                     | Set whether to disable key bindings (CTRL-T, CTRL-R, ALT-C) |
+### `FZF_DEFAULT_COMMAND`
+
+Set default command to use when input is tty:
+
+```zsh
+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:
+
+- [`fd`](https://github.com/sharkdp/fd)
+- [`rg`](https://github.com/BurntSushi/ripgrep)
+- [`ag`](https://github.com/ggreer/the_silver_searcher)
+
+### `DISABLE_FZF_AUTO_COMPLETION`
+
+Set whether to load fzf auto-completion:
+
+```zsh
+DISABLE_FZF_AUTO_COMPLETION="true"
+```
+
+### `DISABLE_FZF_KEY_BINDINGS`
+
+Set whether to disable key bindings (CTRL-T, CTRL-R, ALT-C):
+
+```zsh
+DISABLE_FZF_KEY_BINDINGS="true"
+```
diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 0b831b7f7..a946cf762 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -1,110 +1,228 @@
-function setup_using_base_dir() {
-    # Declare all variables local not no mess with outside env in any way
-    local fzf_base
-    local fzf_shell
-    local fzfdirs
-    local 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"
-          "/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[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
-        # 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
+  if [[ ! -d "${fzf_base}" ]]; then
+    return 1
+  fi
 
-        # Setup fzf binary path
-        if ! (( ${+commands[fzf]} )) && [[ ! "$PATH" == *$fzf_base/bin* ]]; then
-          export PATH="$PATH:$fzf_base/bin"
-        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
 
-        # Auto-completion
-        if [[ ! "$DISABLE_FZF_AUTO_COMPLETION" == "true" ]]; then
-          [[ $- == *i* ]] && source "${fzf_shell}/completion.zsh" 2> /dev/null
-        fi
+  # Setup fzf binary path
+  if (( ! ${+commands[fzf]} )) && [[ "$PATH" != *$fzf_base/bin* ]]; then
+    export PATH="$PATH:$fzf_base/bin"
+  fi
 
-        # Key bindings
-        if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
-          source "${fzf_shell}/key-bindings.zsh"
-        fi
-    else
-        return 1
-    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
 }
 
 
-function setup_using_debian_package() {
-    (( $+commands[dpkg] )) && dpkg -s fzf &> /dev/null
-    if (( $? )); then
-        # Either not a debian based distro, or no fzf installed. In any case skip ahead
-        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
 
-    # Determine completion file path: first bullseye/sid, then buster/stretch
-    local completions="/usr/share/doc/fzf/examples/completion.zsh"
-    [[ -f "$completions" ]] || completions="/usr/share/zsh/vendor-completions/_fzf"
+  local completions key_bindings
 
-    local key_bindings="/usr/share/doc/fzf/examples/key-bindings.zsh"
+  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 [[ $- == *i* ]] && [[ ! "$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 indicate_error() {
-    print "[oh-my-zsh] fzf plugin: Cannot find fzf installation directory.\n"\
-          "Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc" >&2
+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"
+
+  # 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
+
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "$key_bindings" 2>/dev/null
+  fi
+
+  return 0
+}
+
+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"
+
+  # 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
+}
+
+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
+}
+
+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
 }
 
-# Check for debian package first, because it easy to short cut
 # Indicate to user that fzf installation not found if nothing worked
-setup_using_debian_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_debian_package setup_using_base_dir indicate_error
+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
+
+unset -f -m 'fzf_setup_*'
 
 if [[ -z "$FZF_DEFAULT_COMMAND" ]]; then
-    if (( $+commands[rg] )); then
-        export FZF_DEFAULT_COMMAND='rg --files --hidden'
-    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 ""'
-    fi
+  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
 fi
diff --git a/plugins/gb/README.md b/plugins/gb/README.md
deleted file mode 100644
index 822c29aaa..000000000
--- a/plugins/gb/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# `gb` plugin
-
-> A project based build tool for the Go programming language.
-
-See https://getgb.io for the full `gb` documentation
-
-* * * *
-
-- Adds completion support for all `gb` commands.
-- Also supports completion for the [`gb-vendor` plugin](https://godoc.org/github.com/constabulary/gb/cmd/gb-vendor).
-
-To use it, add `gb` to your plugins array:
-```sh
-plugins=(... gb)
-```
-
-## Caveats
-
-The `git` plugin defines an alias `gb` that usually conflicts with the `gb` program.
-If you're having trouble with it, remove it by adding `unalias gb` at the end of your
-zshrc file.
diff --git a/plugins/gb/_gb b/plugins/gb/_gb
deleted file mode 100644
index 8148adf16..000000000
--- a/plugins/gb/_gb
+++ /dev/null
@@ -1,111 +0,0 @@
-#compdef gb
-#autoload
-
-_gb () {
-	local ret=1 state
-	_arguments -C ':command:->command' '*::options:->options' && ret=0
-
-	case $state in
-	(command)
-		local -a subcommands
-		subcommands=(
-			"build:build a package"
-			"doc:show documentation for a package or symbol"
-			"env:print project environment variables"
-			"generate:generate Go files by processing source"
-			"help:displays the help"
-			"info:info returns information about this project"
-			"list:list the packages named by the importpaths"
-			"test:test packages"
-			"vendor:manage your vendored dependencies"
-		)
-		_describe -t subcommands 'gb subcommands' subcommands && ret=0
-		;;
-	(options)
-		case $line[1] in
-		(build)
-			_arguments \
-				-f'[ignore cached packages]' \
-				-F'[do not cache packages]' \
-				-q'[decreases verbosity]' \
-				-P'[the number of build jobs to run in parallel]' \
-				-R'[sets the base of the project root search path]' \
-				-dotfile'[output a dot formatted file of the build steps]' \
-				-ldflags'["flag list" arguments to pass to the linker]' \
-				-gcflags'["arg list" arguments to pass to the compiler]' \
-				-race'[enable data race detection]' \
-				-tags'["tag list" additional build tags]'
-			;;
-		(list)
-			_arguments \
-				-f'[alternate format for the list, using the syntax of package template]' \
-				-s'[read format template from STDIN]' \
-				-json'[prints output in structured JSON format]'
-			;;
-		(test)
-			_arguments \
-				-v'[print output from test subprocess]' \
-				-ldflags'["flag list" arguments to pass to the linker]' \
-				-gcflags'["arg list" arguments to pass to the compiler]' \
-				-race'[enable data race detection]' \
-				-tags'["tag list" additional build tags]'
-			;;
-		(vendor)
-			_gb-vendor
-		esac
-		;;
-	esac
-
-	return ret
-}
-
-_gb-vendor () {
-	local curcontext="$curcontext" state line
-	_arguments -C ':command:->command' '*::options:->options'
-
-	case $state in
-	(command)
-		local -a subcommands
-		subcommands=(
-			'delete:deletes a local dependency'
-			'fetch:fetch a remote dependency'
-			'list:lists dependencies, one per line'
-			'purge:remove all unreferenced dependencies'
-			'restore:restore dependencies from the manifest'
-			'update:update a local dependency'
-		)
-		_describe -t subcommands 'gb vendor subcommands' subcommands && ret=0
-		;;
-	(options)
-		case $line[1] in
-			(delete)
-				_arguments \
-					-all'[remove all dependencies]'
-				;;
-			(fetch)
-				_arguments \
-					-branch'[fetch from a particular branch]' \
-					-no-recurse'[do not fetch recursively]' \
-					-tag'[fetch the specified tag]' \
-					-revision'[fetch the specific revision from the branch (if supplied)]' \
-					-precaire'[allow the use of insecure protocols]' \
-				;;
-			(list)
-				_arguments \
-					-f'[controls the template used for printing each manifest entry]'
-				;;
-			(restore)
-				_arguments \
-					-precaire'[allow the use of insecure protocols]'
-				;;
-			(update)
-				_arguments \
-					-all'[update all dependencies in the manifest or supply a given dependency]' \
-					-precaire'[allow the use of insecure protocols]'
-				;;
-		esac
-		;;
-	esac
-}
-
-_gb
diff --git a/plugins/gcloud/gcloud.plugin.zsh b/plugins/gcloud/gcloud.plugin.zsh
index c7aebe697..9be9d68aa 100644
--- a/plugins/gcloud/gcloud.plugin.zsh
+++ b/plugins/gcloud/gcloud.plugin.zsh
@@ -7,10 +7,13 @@ 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/"
+    "/usr/lib/google-cloud-sdk"
+    "/usr/lib64/google-cloud-sdk"
     "/opt/google-cloud-sdk"
+    "/opt/local/libexec/google-cloud-sdk"
   )
 
   for gcloud_sdk_location in $search_locations; do
@@ -19,15 +22,28 @@ if [[ -z "${CLOUDSDK_HOME}" ]]; then
       break
     fi
   done
+  unset search_locations gcloud_sdk_location
 fi
 
 if (( ${+CLOUDSDK_HOME} )); then
+  # Only source this if gcloud isn't already on the path
   if (( ! $+commands[gcloud] )); then
-    # Only source this if GCloud isn't already on the path
     if [[ -f "${CLOUDSDK_HOME}/path.zsh.inc" ]]; then
       source "${CLOUDSDK_HOME}/path.zsh.inc"
     fi
   fi
-  source "${CLOUDSDK_HOME}/completion.zsh.inc"
+
+  # Look for completion file in different paths
+  for comp_file (
+    "${CLOUDSDK_HOME}/completion.zsh.inc"             # default location
+    "/usr/share/google-cloud-sdk/completion.zsh.inc"  # apt-based location
+  ); do
+    if [[ -f "${comp_file}" ]]; then
+      source "${comp_file}"
+      break
+    fi
+  done
+  unset comp_file
+
   export CLOUDSDK_HOME
 fi
diff --git a/plugins/genpass/README.md b/plugins/genpass/README.md
new file mode 100644
index 000000000..a5ff4a876
--- /dev/null
+++ b/plugins/genpass/README.md
@@ -0,0 +1,66 @@
+# genpass
+
+This plugin provides three unique password generators for ZSH. Each generator
+has at least a 128-bit security margin and generates passwords from the
+cryptographically secure `/dev/urandom`. Each generator can also take an
+optional numeric argument to generate multiple passwords.
+
+To use it from an interactive ZSH, add `genpass` to the plugins array in your
+zshrc file:
+
+    plugins=(... genpass)
+
+You can also invoke password generators directly (they are implemented as
+standalone executable files), which can be handy when you need to generate
+passwords in a script:
+
+    ~/.oh-my-zsh/plugins/genpass/genpass-apple 3
+
+## genpass-apple
+
+Generates a pronounceable pseudoword passphrase of the "cvccvc" consonant/vowel
+syntax, inspired by [Apple's iCloud Keychain password generator][1]. Each
+password has exactly 1 digit placed at the edge of a "word" and exactly 1
+capital letter to satisfy most password security requirements.
+
+    % genpass-apple
+    gelcyv-foqtam-fotqoh-viMleb-lexduv-6ixfuk
+
+    % genpass-apple 3
+    japvyz-qyjti4-kajrod-nubxaW-hukkan-dijcaf
+    vydpig-fucnul-3ukpog-voggom-zygNad-jepgad
+    zocmez-byznis-hegTaj-jecdyq-qiqmiq-5enwom
+
+[1]: https://developer.apple.com/password-rules/
+
+## genpass-monkey
+
+Generates visually unambiguous random meaningless strings using [Crockford's
+base32][2].
+
+    % genpass-monkey
+    xt7gn976e7jj3fstgpy27330x3
+
+    % genpass-monkey 3
+    n1qqwtzgejwgqve9yzf2gxvx4m
+    r2n3f5s6vbqs2yx7xjnmahqewy
+    296w9y9rts3p5r9yay0raek8e5
+
+[2]: https://www.crockford.com/base32.html
+
+## genpass-xkcd
+
+Generates passphrases from `/usr/share/dict/words` inspired by the [famous (and
+slightly misleading) XKCD comic][3]. Each passphrase is prepended with a digit
+showing the number of words in the passphrase to adhere to password security
+requirements that require digits. Each word is 6 characters or less.
+
+    % genpass-xkcd
+    9-eaten-Slav-rife-aired-hill-cordon-splits-welsh-napes
+
+    % genpass-xkcd 3
+    9-worker-Vlad-horde-shrubs-smite-thwart-paw-alters-prawns
+    9-tutors-stink-rhythm-junk-snappy-hooray-barbs-mewl-clomp
+    9-vital-escape-Angkor-Huff-wet-Mayra-abbés-putts-guzzle
+
+[3]: https://xkcd.com/936/
diff --git a/plugins/genpass/genpass-apple b/plugins/genpass/genpass-apple
new file mode 100755
index 000000000..963ab6447
--- /dev/null
+++ b/plugins/genpass/genpass-apple
@@ -0,0 +1,79 @@
+#!/usr/bin/env zsh
+#
+# Usage: genpass-apple [NUM]
+#
+# Generate a password made of 6 pseudowords of 6 characters each
+# with the security margin of at least 128 bits.
+#
+# Example password: xudmec-4ambyj-tavric-mumpub-mydVop-bypjyp
+#
+# If given a numerical argument, generate that many passwords.
+
+emulate -L zsh -o no_unset -o warn_create_global -o warn_nested_var
+
+if [[ ARGC -gt 1 || ${1-1} != ${~:-<1-$((16#7FFFFFFF))>} ]]; then
+  print -ru2 -- "usage: $0 [NUM]"
+  return 1
+fi
+
+zmodload zsh/system zsh/mathfunc || return
+
+{
+  local -r vowels=aeiouy
+  local -r consonants=bcdfghjklmnpqrstvwxz
+  local -r digits=0123456789
+
+  # Sets REPLY to a uniformly distributed random number in [1, $1].
+  # Requires: $1 <= 256.
+  function -$0-rand() {
+    local c
+    while true; do
+      sysread -s1 c || return
+      # Avoid bias towards smaller numbers.
+      (( #c < 256 / $1 * $1 )) && break
+    done
+    typeset -g REPLY=$((#c % $1 + 1))
+  }
+
+  local REPLY chars
+
+  repeat ${1-1}; do
+    # Generate 6 pseudowords of the form cvccvc where c and v
+    # denote random consonants and vowels respectively.
+    local words=()
+    repeat 6; do
+      words+=('')
+      repeat 2; do
+        for chars in $consonants $vowels $consonants; do
+          -$0-rand $#chars || return
+          words[-1]+=$chars[REPLY]
+        done
+      done
+    done
+
+    local pwd=${(j:-:)words}
+
+    # Replace either the first or the last character in one of
+    # the words with a random digit.
+    -$0-rand $#digits || return
+    local digit=$digits[REPLY]
+    -$0-rand $((2 * $#words)) || return
+    pwd[REPLY/2*7+2*(REPLY%2)-1]=$digit
+
+    # Convert one lower-case character to upper case.
+    while true; do
+      -$0-rand $#pwd || return
+      [[ $vowels$consonants == *$pwd[REPLY]* ]] && break
+    done
+    # NOTE: We aren't using ${(U)c} here because its results are
+    # locale-dependent. For example, when upper-casing 'i' in Turkish
+    # locale we would get 'İ', a.k.a. latin capital letter i with dot
+    # above. We could set LC_CTYPE=C locally but then we would run afoul
+    # of this zsh bug: https://www.zsh.org/mla/workers/2020/msg00588.html.
+    local c=$pwd[REPLY]
+    printf -v c '%o' $((#c - 32))
+    printf "%s\\$c%s\\n" "$pwd[1,REPLY-1]" "$pwd[REPLY+1,-1]" || return
+  done
+} always {
+  unfunction -m -- "-${(b)0}-*"
+} </dev/urandom
diff --git a/plugins/genpass/genpass-monkey b/plugins/genpass/genpass-monkey
new file mode 100755
index 000000000..94ff5e131
--- /dev/null
+++ b/plugins/genpass/genpass-monkey
@@ -0,0 +1,32 @@
+#!/usr/bin/env zsh
+#
+# Usage: genpass-monkey [NUM]
+#
+# Generate a password made of 26 alphanumeric characters
+# with the security margin of at least 128 bits.
+#
+# Example password: nz5ej2kypkvcw0rn5cvhs6qxtm
+#
+# If given a numerical argument, generate that many passwords.
+
+emulate -L zsh -o no_unset -o warn_create_global -o warn_nested_var
+
+if [[ ARGC -gt 1 || ${1-1} != ${~:-<1-$((16#7FFFFFFF))>} ]]; then
+  print -ru2 -- "usage: $0 [NUM]"
+  return 1
+fi
+
+zmodload zsh/system || return
+
+{
+  local -r chars=abcdefghjkmnpqrstvwxyz0123456789
+  local c
+  repeat ${1-1}; do
+    repeat 26; do
+      sysread -s1 c || return
+      # There is uniform because $#chars divides 256.
+      print -rn -- $chars[#c%$#chars+1]
+    done
+    print
+  done
+} </dev/urandom
diff --git a/plugins/genpass/genpass-xkcd b/plugins/genpass/genpass-xkcd
new file mode 100755
index 000000000..ed0397138
--- /dev/null
+++ b/plugins/genpass/genpass-xkcd
@@ -0,0 +1,68 @@
+#!/usr/bin/env zsh
+#
+# Usage: genpass-xkcd [NUM]
+#
+# Generate a password made of words from /usr/share/dict/words
+# with the security margin of at least 128 bits.
+#
+# Example password: 9-mien-flood-Patti-buxom-dozes-ickier-pay-ailed-Foster
+#
+# If given a numerical argument, generate that many passwords.
+#
+# The name of this utility is a reference to https://xkcd.com/936/.
+
+emulate -L zsh -o no_unset -o warn_create_global -o warn_nested_var -o extended_glob
+
+if [[ ARGC -gt 1 || ${1-1} != ${~:-<1-$((16#7FFFFFFF))>} ]]; then
+  print -ru2 -- "usage: $0 [NUM]"
+  return 1
+fi
+
+zmodload zsh/system zsh/mathfunc || return
+
+local -r dict=/usr/share/dict/words
+
+if [[ ! -e $dict ]]; then
+  print -ru2 -- "$0: file not found: $dict"
+  return 1
+fi
+
+# Read all dictionary words and leave only those made of 1-6 characters.
+local -a words
+words=(${(M)${(f)"$(<$dict)"}:#[a-zA-Z](#c1,6)}) || return
+
+if (( $#words < 2 )); then
+  print -ru2 -- "$0: not enough suitable words in $dict"
+  return 1
+fi
+
+if (( $#words > 16#7FFFFFFF )); then
+  print -ru2 -- "$0: too many words in $dict"
+  return 1
+fi
+
+# Figure out how many words we need for 128 bits of security margin.
+# Each word adds log2($#words) bits.
+local -i n=$((ceil(128. / (log($#words) / log(2)))))
+
+{
+  local c
+  repeat ${1-1}; do
+    print -rn -- $n
+    repeat $n; do
+      while true; do
+        # Generate a random number in [0, 2**31).
+        local -i rnd=0
+        repeat 4; do
+          sysread -s1 c || return
+          (( rnd = (~(1 << 23) & rnd) << 8 | #c ))
+        done
+        # Avoid bias towards words in the beginning of the list.
+        (( rnd < 16#7FFFFFFF / $#words * $#words )) || continue
+        print -rn -- -$words[rnd%$#words+1]
+        break
+      done
+    done
+    print
+  done
+} </dev/urandom
diff --git a/plugins/genpass/genpass.plugin.zsh b/plugins/genpass/genpass.plugin.zsh
new file mode 100644
index 000000000..a0ea841cd
--- /dev/null
+++ b/plugins/genpass/genpass.plugin.zsh
@@ -0,0 +1 @@
+autoload -Uz genpass-apple genpass-monkey genpass-xkcd
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..1d8d84c55
--- /dev/null
+++ b/plugins/gh/gh.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for the GitHub CLI (gh).
+if (( ! $+commands[gh] )); then
+  return
+fi
+
+# 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
+  typeset -g -A _comps
+  autoload -Uz _gh
+  _comps[gh]=_gh
+fi
+
+gh completion --shell zsh >| "$ZSH_CACHE_DIR/completions/_gh" &|
diff --git a/plugins/git-auto-fetch/README.md b/plugins/git-auto-fetch/README.md
index 35f3c2f71..e96ab42a3 100644
--- a/plugins/git-auto-fetch/README.md
+++ b/plugins/git-auto-fetch/README.md
@@ -1,26 +1,29 @@
 # Git auto-fetch
 
-Automatically fetches all changes from all remotes while you are working in git-initialized directory.
+Automatically fetches all changes from all remotes while you are working in a git-initialized directory.
 
-#### Usage
-
-Add `git-auto-fetch` to the plugins array in your zshrc file:
+To use it, add `git-auto-fetch` to the plugins array in your zshrc file:
 
 ```shell
 plugins=(... git-auto-fetch)
 ```
 
-Every time you launch a command in your shell all remotes will be fetched in background.
-By default autofetch will be triggered only if last fetch was done at least 60 seconds ago.
-You can change fetch interval in your .zshrc:
-```
-GIT_AUTO_FETCH_INTERVAL=1200 #in seconds
-```
-Log of `git fetch --all` will be saved into `.git/FETCH_LOG`
+## Usage
 
+Every time the command prompt is shown all remotes will be fetched in the background. By default,
+`git-auto-fetch` will be triggered only if the last auto-fetch was done at least 60 seconds ago.
+You can change the fetch interval in your .zshrc:
 
-#### Toggle auto fetch per folder
-If you are using mobile connection or for any other reason you can disable git-auto-fetch for any folder:
+```sh
+GIT_AUTO_FETCH_INTERVAL=1200 # in seconds
+```
+
+A log of `git fetch --all` will be saved in `.git/FETCH_LOG`.
+
+## Toggle auto-fetch per folder
+
+If you are using a mobile connection or for any other reason you can disable git-auto-fetch
+for any folder:
 
 ```shell
 $ cd to/your/project
@@ -29,3 +32,19 @@ disabled
 $ git-auto-fetch
 enabled
 ```
+
+## Caveats
+
+Automatically fetching all changes defeats the purpose of `git push --force-with-lease`,
+and makes it behave like `git push --force` in some cases. For example:
+
+Consider that you made some changes and possibly rebased some stuff, which means you'll
+need to use `--force-with-lease` to overwrite the remote history of a branch. Between the
+time when you make the changes (maybe do a `git log`) and the time when you `git push`,
+it's possible that someone else updates the branch you're working on.
+
+If `git-auto-fetch` triggers then, you'll have fetched the remote changes without knowing
+it, and even though you're running the push with `--force-with-lease`, git will overwrite
+the recent changes because you already have them in your local repository. The
+[`git push --force-with-lease` docs](https://git-scm.com/docs/git-push) talk about possible
+solutions to this problem.
diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 5c42c21a7..2df34bb7b 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -1,36 +1,65 @@
-GIT_AUTO_FETCH_INTERVAL=${GIT_AUTO_FETCH_INTERVAL:=60}
+# Default auto-fetch interval: 60 seconds
+: ${GIT_AUTO_FETCH_INTERVAL:=60}
+
+# Necessary for the git-fetch-all function
+zmodload zsh/datetime
+zmodload -F zsh/stat b:zstat  # only zstat command, not stat command
 
 function git-fetch-all {
-  (`command git rev-parse --is-inside-work-tree 2>/dev/null` &&
-  dir=`command git rev-parse --git-dir` &&
-  [[ ! -f $dir/NO_AUTO_FETCH ]] &&
-  (( `date +%s` - `date -r $dir/FETCH_LOG +%s 2>/dev/null || echo 0` > $GIT_AUTO_FETCH_INTERVAL )) &&
-  GIT_SSH_COMMAND="command ssh -o BatchMode=yes" \
-    command git fetch --all 2>/dev/null &>! $dir/FETCH_LOG &)
+  (
+    # Get git root directory
+    if ! gitdir="$(command git rev-parse --git-dir 2>/dev/null)"; then
+      return 0
+    fi
+
+    # 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
+
+    # Get time (seconds) when auto-fetch was last run
+    lastrun="$(zstat +mtime "$gitdir/FETCH_LOG" 2>/dev/null || echo 0)"
+    # Do nothing if not enough time has passed since last auto-fetch
+    if (( EPOCHSECONDS - lastrun < $GIT_AUTO_FETCH_INTERVAL )); then
+      return 0
+    fi
+
+    # Fetch all remotes (avoid ssh passphrase prompt)
+    date -R &>! "$gitdir/FETCH_LOG"
+    GIT_SSH_COMMAND="command ssh -o BatchMode=yes" \
+    GIT_TERMINAL_PROMPT=0 \
+      command git fetch --all 2>/dev/null &>> "$gitdir/FETCH_LOG"
+  ) &|
 }
 
 function git-auto-fetch {
-  `command git rev-parse --is-inside-work-tree 2>/dev/null` || return
-  guard="`command git rev-parse --git-dir`/NO_AUTO_FETCH"
+  # Do nothing if not in a git repository
+  command git rev-parse --is-inside-work-tree &>/dev/null || return 0
 
-  (rm $guard 2>/dev/null &&
-    echo "${fg_bold[green]}enabled${reset_color}") ||
-  (touch $guard &&
-    echo "${fg_bold[red]}disabled${reset_color}")
+  # Remove or create guard file depending on its existence
+  local guard="$(command git rev-parse --git-dir)/NO_AUTO_FETCH"
+  if [[ -f "$guard" ]]; then
+    command rm "$guard" && echo "${fg_bold[green]}enabled${reset_color}"
+  else
+    command touch "$guard" && echo "${fg_bold[red]}disabled${reset_color}"
+  fi
 }
 
-# Override zle-line-init if it exists
-if (( $+functions[zle-line-init] )); then
-  eval "override-git-auto-fetch-$(declare -f zle-line-init)"
-  
-  function zle-line-init () {
-    git-fetch-all
-    override-git-auto-fetch-zle-line-init
-  }
-else
-  function zle-line-init () {
-    git-fetch-all
-  }
-fi
-  
-zle -N zle-line-init
+# zle-line-init widget (don't redefine if already defined)
+(( ! ${+functions[_git-auto-fetch_zle-line-init]} )) || return 0
+
+case "$widgets[zle-line-init]" in
+  # Simply define the function if zle-line-init doesn't yet exist
+  builtin|"") function _git-auto-fetch_zle-line-init() {
+      git-fetch-all
+    } ;;
+  # Override the current zle-line-init widget, calling the old one
+  user:*) zle -N _git-auto-fetch_orig_zle-line-init "${widgets[zle-line-init]#user:}"
+    function _git-auto-fetch_zle-line-init() {
+      git-fetch-all
+      zle _git-auto-fetch_orig_zle-line-init -- "$@"
+    } ;;
+esac
+
+zle -N zle-line-init _git-auto-fetch_zle-line-init
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 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 eab969d8a..f842de998 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -1,370 +1,32 @@
-#!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 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 gfli='git flow init'
-alias gcd='git checkout develop'
-alias gch='git checkout hotfix'
-alias gcr='git checkout release'
 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 gflfp='git flow feature publish'
-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 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'
 
-_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"
diff --git a/plugins/git-lfs/README.md b/plugins/git-lfs/README.md
new file mode 100644
index 000000000..1222b2767
--- /dev/null
+++ b/plugins/git-lfs/README.md
@@ -0,0 +1,24 @@
+# git lfs plugin
+
+The git lfs plugin provides [aliases](#aliases) and [functions](#functions) for [git-lfs](https://github.com/git-lfs/git-lfs).
+
+To use it, add `git-lfs` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... git-lfs)
+```
+
+## Aliases
+
+| Alias    | Command                             |
+| :------- | :---------------------------------- |
+| `glfsi`  | `git lfs install`                   |
+| `glfst`  | `git lfs track`                     |
+| `glfsls` | `git lfs ls-files`                  |
+| `glfsmi` | `git lfs migrate import --include=` |
+
+## Functions
+
+| Function | Command                                         |
+| :------- | :---------------------------------------------- |
+| `gplfs`  | `git lfs push origin "$(current_branch)" --all` |
diff --git a/plugins/git-lfs/git-lfs.plugin.zsh b/plugins/git-lfs/git-lfs.plugin.zsh
new file mode 100644
index 000000000..e7bb67603
--- /dev/null
+++ b/plugins/git-lfs/git-lfs.plugin.zsh
@@ -0,0 +1,17 @@
+#
+# Aliases
+#
+
+alias glfsi='git lfs install'
+alias glfst='git lfs track'
+alias glfsls='git lfs ls-files'
+alias glfsmi='git lfs migrate import --include='
+
+#
+# Functions
+#
+
+function gplfs() {
+  local b="$(git_current_branch)"
+  git lfs push origin "$b" --all
+}
diff --git a/plugins/git-prompt/README.md b/plugins/git-prompt/README.md
index e3b2d623a..8775af893 100644
--- a/plugins/git-prompt/README.md
+++ b/plugins/git-prompt/README.md
@@ -11,6 +11,10 @@ plugins=(... git-prompt)
 
 See the [original repository](https://github.com/olivierverdier/zsh-git-prompt).
 
+## Requirements
+
+This plugin uses `python3`, so your host needs to have it installed.
+
 ## Examples
 
 The prompt may look like the following:
@@ -21,12 +25,13 @@ The prompt may look like the following:
 - `(master|✖2✚3)`: on branch `master`, 2 conflicts, 3 files changed
 - `(experimental↓2↑3|✔)`: on branch `experimental`; your branch has diverged by 3 commits, remote by 2 commits; the repository is otherwise clean
 - `(:70c2952|✔)`: not on any branch; parent commit has hash `70c2952`; the repository is otherwise clean
+- `(master|⚑2)`: on branch `master`, there are 2 stashed changes
 
 ## Prompt Structure
 
 By default, the general appearance of the prompt is:
 
-```
+```text
 (<branch><branch tracking>|<local status>)
 ```
 
@@ -40,6 +45,7 @@ The symbols are as follows:
 | ●n     | there are `n` staged files     |
 | ✖n     | there are `n` unmerged files   |
 | ✚n     | there are `n` unstaged files   |
+| ⚑n     | there are `n` stashed changes  |
 | …      | there are some untracked files |
 
 ### Branch Tracking Symbols
@@ -53,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/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index da674af98..0485e317c 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
@@ -31,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]
@@ -40,6 +45,8 @@ function update_current_git_vars() {
     GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5]
     GIT_CHANGED=$__CURRENT_GIT_STATUS[6]
     GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
+    GIT_STASHED=$__CURRENT_GIT_STATUS[8]
+    GIT_CLEAN=$__CURRENT_GIT_STATUS[9]
 }
 
 git_super_status() {
@@ -63,9 +70,12 @@ git_super_status() {
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
       fi
       if [ "$GIT_UNTRACKED" -ne "0" ]; then
-          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED$GIT_UNTRACKED%{${reset_color}%}"
       fi
-      if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
+      if [ "$GIT_STASHED" -ne "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STASHED$GIT_STASHED%{${reset_color}%}"
+      fi
+      if [ "$GIT_CLEAN" -eq "1" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
       fi
       STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
@@ -83,7 +93,8 @@ ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}"
 ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}"
 ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}"
 ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{…%G%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%}%{…%G%}"
+ZSH_THEME_GIT_PROMPT_STASHED="%{$fg_bold[blue]%}%{⚑%G%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}"
 
 # Set the prompt.
diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 300365d71..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
@@ -11,11 +11,11 @@ def get_tagname_or_hash():
     """return tagname if exists else hash"""
     # get hash
     hash_cmd = ['git', 'rev-parse', '--short', 'HEAD']
-    hash_ = check_output(hash_cmd).strip()
+    hash_ = check_output(hash_cmd).decode('utf-8').strip()
 
     # get tagname
     tags_cmd = ['git', 'for-each-ref', '--points-at=HEAD', '--count=2', '--sort=-version:refname', '--format=%(refname:short)', 'refs/tags']
-    tags = check_output(tags_cmd).split()
+    tags = check_output(tags_cmd).decode('utf-8').split()
 
     if tags:
         return tags[0] + ('+' if len(tags) > 1 else '')
@@ -23,6 +23,18 @@ def get_tagname_or_hash():
         return hash_
     return None
 
+# Re-use method from https://github.com/magicmonty/bash-git-prompt to get stashs count
+def get_stash():
+    cmd = Popen(['git', 'rev-parse', '--git-dir'], stdout=PIPE, stderr=PIPE)
+    so, se = cmd.communicate()
+    stash_file = '%s%s' % (so.decode('utf-8').rstrip(), '/logs/refs/stash')
+
+    try:
+        with open(stash_file) as f:
+            return sum(1 for _ in f)
+    except IOError:
+        return 0
+
 
 # `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
@@ -68,6 +80,12 @@ for st in status:
         elif st[0] != ' ':
             staged.append(st)
 
+stashed = get_stash()
+if not changed and not staged and not conflicts and not untracked:
+    clean = 1
+else:
+    clean = 0
+
 out = ' '.join([
     branch,
     str(ahead),
@@ -76,5 +94,7 @@ out = ' '.join([
     str(len(conflicts)),
     str(len(changed)),
     str(len(untracked)),
+    str(stashed),
+    str(clean)
 ])
 print(out, end='')
diff --git a/plugins/git/README.md b/plugins/git/README.md
index b7f216813..050c13d81 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 \| grep -vE "^([+*]\|\s*(<span>$</span>(git_main_branch)\|<span>$</span>(git_develop_branch))\s*<span>$</span>)" \| xargs git branch -d 2>/dev/null |
 | gbD                  | git branch -D                                                                                                                    |
 | gbl                  | git blame -b -w                                                                                                                  |
 | gbnm                 | git branch --no-merged                                                                                                           |
@@ -41,16 +41,20 @@ 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                                                                                                                |
 | gcl                  | git clone --recurse-submodules                                                                                                   |
+| gccd                 | git clone --recurse-submodules "<span>$</span>@" && cd "<span>$</span>(basename <span>$</span>_ .git)"                           |
 | 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                                                                                                |
 | gcount               | git shortlog -sn                                                                                                                 |
 | gcp                  | git cherry-pick                                                                                                                  |
 | gcpa                 | git cherry-pick --abort                                                                                                          |
@@ -63,6 +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"                                                                 |
+| gdup                 | git diff @{upstream}                                                                                                             |
 | gdv                  | git diff -w $@ \| view -                                                                                                         |
 | gdw                  | git diff --word-diff                                                                                                             |
 | gf                   | git fetch                                                                                                                        |
@@ -85,9 +90,9 @@ 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                                                                                 |
-| gk                   | gitk --all --branches                                                                                                            |
-| gke                  | gitk --all $(git log -g --pretty=%h)                                                                                             |
+| 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                                                                                                                         |
 | glg                  | git log --stat                                                                                                                   |
 | glgp                 | git log --stat -p                                                                                                                |
@@ -95,25 +100,26 @@ 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\>                                                                                                      |
 | gm                   | git merge                                                                                                                        |
-| 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)                                                                                                          |
+| gmom                 | git merge origin/$(git_main_branch)                                                                                              |
+| 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                                                                                                                         |
 | gpd                  | git push --dry-run                                                                                                               |
 | 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                                                                                                                       |
@@ -121,9 +127,11 @@ 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)                                                                                                                  |
+| grbm                 | git rebase $(git_main_branch)                                                                                                    |
+| grbom                | git rebase origin/$(git_main_branch)                                                                                             |
+| grbo                 | git rebase --onto                                                                                                                |
 | grbs                 | git rebase --skip                                                                                                                |
 | grev                 | git revert                                                                                                                       |
 | grh                  | git reset                                                                                                                        |
@@ -136,6 +144,7 @@ plugins=(... git)
 | grs                  | git restore                                                                                                                      |
 | grset                | git remote set-url                                                                                                               |
 | grss                 | git restore --source                                                                                                             |
+| grst                 | git restore --staged                                                                                                             |
 | grt                  | cd "$(git rev-parse --show-toplevel \|\| echo .)"                                                                                |
 | gru                  | git reset --                                                                                                                     |
 | grup                 | git remote update                                                                                                                |
@@ -161,6 +170,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                                                                       |
@@ -170,7 +181,10 @@ 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)                                                                                                           |
+| gupom                | git pull --rebase origin $(git_main_branch)                                                                                      |
+| gupomi               | git pull --rebase=interactive origin $(git_main_branch)                                                                          |
+| glum                 | git pull upstream $(git_main_branch)                                                                                             |
+| gluc                 | git pull upstream $(git_current_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                                                                                                                           |
@@ -208,13 +222,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 ccb9d8461..f25453bc1 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -24,18 +24,33 @@ 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
 function git_main_branch() {
-  if [[ -n "$(git branch --list main)" ]]; then
-    echo main
-  else
-    echo master
-  fi
+  command git rev-parse --git-dir &>/dev/null || return
+  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
+  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
 }
 
 #
@@ -56,7 +71,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 git branch -d 2>/dev/null'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
@@ -76,20 +91,32 @@ 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'
+
+function gccd() {
+  command git clone --recurse-submodules "$@"
+  [[ -d "$_" ]] && cd "$_" || cd "${${_:t}%.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'
 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'
 alias gcount='git shortlog -sn'
 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'
@@ -97,6 +124,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 gdup='git diff @{upstream}'
 alias gdw='git diff --word-diff'
 
 function gdnolock() {
@@ -178,8 +206,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'
@@ -188,19 +216,19 @@ 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"
 
 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'
 
@@ -209,6 +237,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'
 
@@ -217,9 +246,11 @@ 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 grbom='git rebase origin/$(git_main_branch)'
+alias grbo='git rebase --onto'
 alias grbs='git rebase --skip'
 alias grev='git revert'
 alias grh='git reset'
@@ -232,6 +263,7 @@ alias grrm='git remote remove'
 alias grs='git restore'
 alias grset='git remote set-url'
 alias grss='git restore --source'
+alias grst='git restore --staged'
 alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
 alias gru='git reset --'
 alias grup='git remote update'
@@ -257,11 +289,13 @@ alias gstd='git stash drop'
 alias gstl='git stash list'
 alias gstp='git stash pop'
 alias gsts='git stash show --text'
-alias gstu='git stash --include-untracked'
+alias gstu='gsta --include-untracked'
 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'
@@ -273,7 +307,10 @@ 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 gluc='git pull upstream $(git_current_branch)'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
 alias 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/gitfast/_git b/plugins/gitfast/_git
index 78a6dbb3d..31bf88c1c 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -2,25 +2,24 @@
 
 # zsh completion wrapper for git
 #
-# Copyright (c) 2012-2013 Felipe Contreras <felipe.contreras@gmail.com>
+# Copyright (c) 2012-2020 Felipe Contreras <felipe.contreras@gmail.com>
 #
-# You need git's bash completion script installed somewhere, by default it
-# would be the location bash-completion uses.
+# The recommended way to install this script is to make a copy of it as a
+# file named '_git' inside any directory in your fpath.
 #
-# If your script is somewhere else, you can configure it on your ~/.zshrc:
-#
-#  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
-#
-# The recommended way to install this script is to copy to '~/.zsh/_git', and
-# then add the following to your ~/.zshrc file:
+# For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git',
+# and then add the following to your ~/.zshrc file:
 #
 #  fpath=(~/.zsh $fpath)
-
-complete ()
-{
-	# do nothing
-	return 0
-}
+#
+# You need git's bash completion script installed. By default bash-completion's
+# location will be used (e.g. pkg-config --variable=completionsdir bash-completion).
+#
+# If your bash completion script is somewhere else, you can specify the
+# location in your ~/.zshrc:
+#
+#  zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
+#
 
 zstyle -T ':completion:*:*:git:*' tag-order && \
 	zstyle ':completion:*:*:git:*' tag-order 'common-commands'
@@ -28,78 +27,114 @@ zstyle -T ':completion:*:*:git:*' tag-order && \
 zstyle -s ":completion:*:*:git:*" script script
 if [ -z "$script" ]; then
 	local -a locations
-	local e
+	local e bash_completion
+
+	bash_completion=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null) ||
+		bash_completion='/usr/share/bash-completion/completions/'
+
 	locations=(
-		"$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash"
-		'/etc/bash_completion.d/git' # fedora, old debian
-		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
-		'/usr/share/bash-completion/git' # gentoo
+		"${${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
 		)
 	for e in $locations; do
 		test -f $e && script="$e" && break
 	done
 fi
-ZSH_VERSION='' . "$script"
+
+local old_complete="$functions[complete]"
+functions[complete]=:
+COMP_WORDBREAKS=':'
+GIT_SOURCING_ZSH_COMPLETION=y . "$script"
+functions[complete]="$old_complete"
+
+__gitcompadd ()
+{
+	compadd -p "${2-}" -S "${3- }" -q -- ${=1} && _ret=0
+}
 
 __gitcomp ()
 {
 	emulate -L zsh
 
-	local cur_="${3-$cur}"
-
-	case "$cur_" in
-	--*=)
-		;;
-	*)
-		local c IFS=$' \t\n'
-		local -a array
-		for c in ${=1}; do
-			c="$c${4-}"
-			case $c in
-			--*=*|*.) ;;
-			*) c="$c " ;;
-			esac
-			array+=("$c")
-		done
-		compset -P '*[=:]'
-		compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
-		;;
-	esac
+	IFS=$' \t\n' __gitcompadd "$1" "${2-}" "${4- }"
 }
 
-__gitcomp_direct ()
+__gitcomp_opts ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
-	compset -P '*[=:]'
-	compadd -Q -- ${=1} && _ret=0
+	local cur_="${3-$cur}"
+
+	[[ "$cur_" == *= ]] && return
+
+	local c IFS=$' \t\n' sfx
+	for c in ${=1}; do
+		if [[ $c == "--" ]]; then
+			[[ "$cur_" == --no-* ]] && continue
+			__gitcompadd "--no-..."
+			break
+		fi
+
+		if [[ -z "${4+set}" ]]; then
+			case $c in
+			*=) c="${c%=}"; sfx="=" ;;
+			*.) sfx="" ;;
+			*) sfx=" " ;;
+			esac
+		else
+			sfx="$4"
+		fi
+		__gitcompadd "$c" "${2-}" "$sfx"
+	done
 }
 
 __gitcomp_nl ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
-	compset -P '*[=:]'
-	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
-}
-
-__gitcomp_nl_append ()
-{
-	emulate -L zsh
-
-	local IFS=$'\n'
-	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+	# 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 ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
+	compadd -f -p "${2-}" -- ${(f)1} && _ret=0
+}
+
+__gitcomp_direct ()
+{
+	__gitcomp_nl "$1" "" "" ""
+}
+
+__gitcomp_file_direct ()
+{
+	__gitcomp_file "$1" ""
+}
+
+__git_complete_command ()
+{
+	emulate -L zsh
+
 	compset -P '*[=:]'
-	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+
+	local command="$1"
+	local completion_func="_git_${command//-/_}"
+	if (( $+functions[$completion_func] )); then
+		emulate ksh -c $completion_func
+		return 0
+	elif emulate ksh -c "__git_support_parseopt_helper $command"; then
+		emulate ksh -c "__git_complete_common $command"
+		return 0
+	else
+		return 1
+	fi
 }
 
 __git_zsh_bash_func ()
@@ -108,14 +143,12 @@ __git_zsh_bash_func ()
 
 	local command=$1
 
-	local completion_func="_git_${command//-/_}"
-	declare -f $completion_func >/dev/null && $completion_func && return
+	__git_complete_command "$command" && return
 
 	local expansion=$(__git_aliased_command "$command")
 	if [ -n "$expansion" ]; then
 		words[1]=$expansion
-		completion_func="_git_${expansion//-/_}"
-		declare -f $completion_func >/dev/null && $completion_func
+		__git_complete_command "$expansion"
 	fi
 }
 
@@ -140,9 +173,11 @@ __git_zsh_cmd_common ()
 	push:'update remote refs along with associated objects'
 	rebase:'forward-port local commits to the updated upstream head'
 	reset:'reset current HEAD to the specified state'
+	restore:'restore working tree files'
 	rm:'remove files from the working tree and from the index'
 	show:'show various types of objects'
 	status:'show the working tree status'
+	switch:'switch branches'
 	tag:'create, list, delete or verify a tag object signed with GPG')
 	_describe -t common-commands 'common commands' list && _ret=0
 }
@@ -150,8 +185,9 @@ __git_zsh_cmd_common ()
 __git_zsh_cmd_alias ()
 {
 	local -a list
-	list=(${${${(0)"$(git config -z --get-regexp '^alias\.')"}#alias.}%$'\n'*})
-	_describe -t alias-commands 'aliases' list $* && _ret=0
+	list=(${${(0)"$(git config -z --get-regexp '^alias\.*')"}#alias.})
+	list=(${(f)"$(printf "%s:alias for '%s'\n" ${(f@)list})"})
+	_describe -t alias-commands 'aliases' list && _ret=0
 }
 
 __git_zsh_cmd_all ()
@@ -166,46 +202,58 @@ __git_zsh_main ()
 {
 	local curcontext="$curcontext" state state_descr line
 	typeset -A opt_args
-	local -a orig_words
-
-	orig_words=( ${words[@]} )
+	local -a __git_C_args
 
 	_arguments -C \
-		'(-p --paginate --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
-		'(-p --paginate)--no-pager[do not pipe git output into a pager]' \
-		'--git-dir=-[set the path to the repository]: :_directories' \
-		'--bare[treat the repository as a bare repository]' \
+		'(-p --paginate -P --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
+		'(-p --paginate -P --no-pager)'{-P,--no-pager}'[do not pipe git output into a pager]' \
+		'(--bare)--git-dir=[set the path to the repository]: :_directories' \
+		'(--git-dir)--bare[treat the repository as a bare repository]' \
 		'(- :)--version[prints the git suite version]' \
-		'--exec-path=-[path to where your core git programs are installed]:: :_directories' \
-		'--html-path[print the path where git''s HTML documentation is installed]' \
-		'--info-path[print the path where the Info files are installed]' \
-		'--man-path[print the manpath (see `man(1)`) for the man pages]' \
-		'--work-tree=-[set the path to the working tree]: :_directories' \
-		'--namespace=-[set the git namespace]' \
+		'--exec-path=[path to where your core git programs are installed]: :_directories' \
+		'(- :)--exec-path[print the path where your core git programs are installed]' \
+		'(- :)--html-path[print the path where git''s HTML documentation is installed]' \
+		'(- :)--info-path[print the path where the Info files are installed]' \
+		'(- :)--man-path[print the manpath (see `man(1)`) for the man pages]' \
+		'--work-tree=[set the path to the working tree]: :_directories' \
+		'--namespace=[set the git namespace]:' \
 		'--no-replace-objects[do not use replacement refs to replace git objects]' \
 		'(- :)--help[prints the synopsis and a list of the most commonly used commands]: :->arg' \
+		'*-C[run as if git was started in the given path]: :_directories' \
+		'*-c[pass a configuration parameter to the command]: :->config' \
 		'(-): :->command' \
 		'(-)*:: :->arg' && return
 
 	case $state in
 	(command)
-		_alternative \
-                         'alias-commands:alias:__git_zsh_cmd_alias' \
-                         'common-commands:common:__git_zsh_cmd_common' \
-                         'all-commands:all:__git_zsh_cmd_all' && _ret=0
+		_tags common-commands alias-commands all-commands
+		while _tags; do
+			_requested common-commands && __git_zsh_cmd_common
+			_requested alias-commands && __git_zsh_cmd_alias
+			_requested all-commands && __git_zsh_cmd_all
+			let _ret || break
+		done
+		;;
+	(config)
+		compset -P '*[=:]'
+		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='.'
 		else
-			__git_dir=${opt_args[--git-dir]}
+			__git_dir=${~opt_args[--git-dir]}
 		fi
 
+		for x in ${(s.:.)opt_args[-C]}; do
+			__git_C_args+=('-C' ${~x})
+		done
+
 		(( $+opt_args[--help] )) && command='help'
 
-		words=( ${orig_words[@]} )
+		words=( git ${words[@]} )
 
 		__git_zsh_bash_func $command
 		;;
@@ -215,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]}
@@ -227,6 +275,8 @@ _git ()
 		emulate ksh -c __${service}_main
 	elif (( $+functions[_${service}] )); then
 		emulate ksh -c _${service}
+	elif ((	$+functions[_${service//-/_}] )); then
+		emulate ksh -c _${service//-/_}
 	fi
 
 	let _ret && _default && _ret=0
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index b6ff5dc08..dd06b5048 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -29,25 +29,181 @@
 # 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
 # the completion routines:
 #
 #   GIT_COMPLETION_CHECKOUT_NO_GUESS
 #
 #     When set to "1", do not include "DWIM" suggestions in git-checkout
-#     completion (e.g., completing "foo" when "origin/foo" exists).
+#     and git-switch completion (e.g., completing "foo" when "origin/foo"
+#     exists).
+#
+#   GIT_COMPLETION_SHOW_ALL_COMMANDS
+#
+#     When set to "1" suggest all commands, including plumbing commands
+#     which are hidden by default (e.g. "cat-file" on "git ca<TAB>").
+#
+#   GIT_COMPLETION_SHOW_ALL
+#
+#     When set to "1" suggest all options, including options which are
+#     typically hidden (e.g. '--allow-empty' for 'git commit').
 
-case "$COMP_WORDBREAKS" in
-*:*) : great ;;
-*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
-esac
+# 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.
 __git_find_repo_path ()
 {
-	if [ -n "$__git_repo_path" ]; then
+	if [ -n "${__git_repo_path-}" ]; then
 		# we already know where it is
 		return
 	fi
@@ -60,7 +216,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
@@ -92,237 +248,228 @@ __git ()
 		${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
 }
 
-# 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()
+# Removes backslash escaping, single quotes and double quotes from a word,
+# stores the result in the variable $dequoted_word.
+# 1: The word to dequote.
+__git_dequote ()
 {
-	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
-}
+	local rest="$1" len ch
 
-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_
+	dequoted_word=""
+
+	while test -n "$rest"; do
+		len=${#dequoted_word}
+		dequoted_word="$dequoted_word${rest%%[\\\'\"]*}"
+		rest="${rest:$((${#dequoted_word}-$len))}"
+
+		case "${rest:0:1}" in
+		\\)
+			ch="${rest:1:1}"
+			case "$ch" in
+			$'\n')
+				;;
+			*)
+				dequoted_word="$dequoted_word$ch"
+				;;
+			esac
+			rest="${rest:2}"
 			;;
-		prev)
-			prev=${words_[$cword_-1]}
+		\')
+			rest="${rest:1}"
+			len=${#dequoted_word}
+			dequoted_word="$dequoted_word${rest%%\'*}"
+			rest="${rest:$((${#dequoted_word}-$len+1))}"
 			;;
-		words)
-			words=("${words_[@]}")
-			;;
-		cword)
-			cword=$cword_
+		\")
+			rest="${rest:1}"
+			while test -n "$rest" ; do
+				len=${#dequoted_word}
+				dequoted_word="$dequoted_word${rest%%[\\\"]*}"
+				rest="${rest:$((${#dequoted_word}-$len))}"
+				case "${rest:0:1}" in
+				\\)
+					ch="${rest:1:1}"
+					case "$ch" in
+					\"|\\|\$|\`)
+						dequoted_word="$dequoted_word$ch"
+						;;
+					$'\n')
+						;;
+					*)
+						dequoted_word="$dequoted_word\\$ch"
+						;;
+					esac
+					rest="${rest:2}"
+					;;
+				\")
+					rest="${rest:1}"
+					break
+					;;
+				esac
+			done
 			;;
 		esac
-		shift
 	done
 }
+
+# Clear the variables caching builtins' options when (re-)sourcing
+# the completion script.
+if [[ -n ${ZSH_VERSION-} ]]; then
+	unset ${(M)${(k)parameters[@]}:#__gitcomp_builtin_*} 2>/dev/null
+else
+	unset $(compgen -v __gitcomp_builtin_)
 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'
+__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=" --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 --recurse-submodules --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-recurse-submodules --no-format"
+__gitcomp_builtin_bugreport_default=" --output-directory= --suffix= --no-output-directory -- --no-suffix"
+__gitcomp_builtin_cat_file_default=" --allow-unknown-type --batch --batch-check --batch-command --batch-all-objects --buffer --follow-symlinks --unordered --textconv --filters --path= --no-allow-unknown-type -- --no-buffer --no-follow-symlinks --no-unordered --no-path"
+__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 --ignore-skip-worktree-bits --force --quiet --no-create --index --stdin --temp --prefix= --stage= --create -- --no-all --no-ignore-skip-worktree-bits --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 --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= --also-filter-submodules --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-also-filter-submodules --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 --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 --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 --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 --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 --refetch --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_fsmonitor__daemon_default=""
+__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 --external-commands --aliases --man --web --info --verbose --guides --config --no-external-commands -- --no-aliases --no-man --no-web --no-info --no-verbose"
+__gitcomp_builtin_hook_default=""
+__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 --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 --object-only --full-name --full-tree --format= --abbrev --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 --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 --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= --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 --annotate-stdin --undefined --always --no-name-only -- --no-tags --no-refs --no-exclude --no-all --no-stdin --no-annotate-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 --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 --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_receive_pack_default=" --quiet --no-quiet"
+__gitcomp_builtin_reflog_default=""
+__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= --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 --no-refresh --mixed --soft --hard --merge --keep --recurse-submodules --patch --intent-to-add --pathspec-from-file= --pathspec-file-nul --refresh -- --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 --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 --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 --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-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 --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 --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="--sender= --from= --smtp-auth= --8bit-encoding= --no-format-patch --no-bcc --no-suppress-from --no-annotate --relogin-delay= --no-cc --no-signed-off-cc --no-signed-off-by-cc --no-chain-reply-to --smtp-debug= --smtp-domain= --chain-reply-to --dry-run --compose --bcc= --smtp-user= --thread --cc-cover --identity= --to= --reply-to= --no-cc-cover --suppress-cc= --to-cmd= --smtp-server= --smtp-ssl-cert-path= --no-thread --smtp-server-option= --quiet --batch-size= --envelope-sender= --smtp-ssl --no-to --validate --format-patch --suppress-from --cc= --compose-encoding= --to-cover --in-reply-to= --annotate --smtp-encryption= --cc-cmd= --smtp-server-port= --smtp-pass= --signed-off-cc --signed-off-by-cc --no-xmailer --subject= --no-to-cover --confirm= --transfer-encoding= --no-smtp-auth --sendmail-cmd= --no-validate --no-identity --dump-aliases --xmailer --force --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"
 
-	COMPREPLY=($1)
+__gitcomp_builtin_get_default ()
+{
+	eval "test -n \"\$${1}_default\" && echo \"\$${1}_default\""
 }
 
-__gitcompappend ()
+# This function is equivalent to
+#
+#    __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
+# 2: extra options to be added on top (e.g. negative forms)
+# 3: options to be excluded
+__gitcomp_builtin ()
 {
-	local x i=${#COMPREPLY[@]}
-	for x in $1; do
-		if [[ "$x" == "$3"* ]]; then
-			COMPREPLY[i++]="$2$x$4"
+	# spaces must be replaced with underscore for multi-word
+	# commands, e.g. "git remote add" becomes remote_add.
+	local cmd="$1"
+	local incl="${2-}"
+	local excl="${3-}"
+
+	local var=__gitcomp_builtin_"${cmd//-/_}"
+	local options
+	eval "options=\${$var-}"
+
+	if [ -z "$options" ]; then
+		local completion_helper
+		if [ "${GIT_COMPLETION_SHOW_ALL-}" = "1" ]; then
+			completion_helper="--git-completion-helper-all"
+		else
+			completion_helper="--git-completion-helper"
 		fi
-	done
-}
+		completion="$(__git ${cmd/_/ } $completion_helper ||
+			__gitcomp_builtin_get_default $var)" || return
+		# leading and trailing spaces are significant to make
+		# option removal work correctly.
+		options=" $incl $completion "
 
-__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
-	--*=)
-		;;
-	*)
-		local c i=0 IFS=$' \t\n'
-		for c in $1; do
-			c="$c${4-}"
-			if [[ $c == "$cur_"* ]]; then
-				case $c in
-				--*=*|*.) ;;
-				*) c="$c " ;;
-				esac
-				COMPREPLY[i++]="${2-}$c"
-			fi
+		for i in $excl; do
+			options="${options/ $i / }"
 		done
-		;;
-	esac
-}
+		eval "$var=\"$options\""
+	fi
 
-# 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 "$@"
-}
-
-# 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
+	__gitcomp_opts "$options"
 }
 
 # Execute 'git ls-files', unless the --committable option is specified, in
@@ -331,11 +478,13 @@ __gitcomp_file ()
 # argument, and using the options specified in the second argument.
 __git_ls_files_helper ()
 {
-	if [ "$2" == "--committable" ]; then
-		__git -C "$1" diff-index --name-only --relative HEAD
+	if [ "$2" = "--committable" ]; then
+		__git -C "$1" -c core.quotePath=false diff-index \
+			--name-only --relative HEAD -- "${3//\\/\\\\}*"
 	else
 		# NOTE: $2 is not quoted in order to support multiple options
-		__git -C "$1" ls-files --exclude-standard $2
+		__git -C "$1" -c core.quotePath=false ls-files \
+			--exclude-standard $2 -- "${3//\\/\\\\}*"
 	fi
 }
 
@@ -346,17 +495,103 @@ __git_ls_files_helper ()
 #    If provided, only files within the specified directory are listed.
 #    Sub directories are never recursed.  Path must have a trailing
 #    slash.
+# 3: List only paths matching this path component (optional).
 __git_index_files ()
 {
-	local root="${2-.}" file
+	local root="$2" match="$3"
 
-	__git_ls_files_helper "$root" "$1" |
-	while read -r file; do
-		case "$file" in
-		?*/*) echo "${file%%/*}" ;;
-		*) echo "$file" ;;
-		esac
-	done | sort | uniq
+	__git_ls_files_helper "$root" "$1" "${match:-?}" |
+	awk -F / -v pfx="${2//\\/\\\\}" '{
+		paths[$1] = 1
+	}
+	END {
+		for (p in paths) {
+			if (substr(p, 1, 1) != "\"") {
+				# No special characters, easy!
+				print pfx p
+				continue
+			}
+
+			# The path is quoted.
+			p = dequote(p)
+			if (p == "")
+				continue
+
+			# Even when a directory name itself does not contain
+			# any special characters, it will still be quoted if
+			# any of its (stripped) trailing path components do.
+			# Because of this we may have seen the same directory
+			# both quoted and unquoted.
+			if (p in paths)
+				# We have seen the same directory unquoted,
+				# skip it.
+				continue
+			else
+				print pfx p
+		}
+	}
+	function dequote(p,    bs_idx, out, esc, esc_idx, dec) {
+		# Skip opening double quote.
+		p = substr(p, 2)
+
+		# Interpret backslash escape sequences.
+		while ((bs_idx = index(p, "\\")) != 0) {
+			out = out substr(p, 1, bs_idx - 1)
+			esc = substr(p, bs_idx + 1, 1)
+			p = substr(p, bs_idx + 2)
+
+			if ((esc_idx = index("abtvfr\"\\", esc)) != 0) {
+				# C-style one-character escape sequence.
+				out = out substr("\a\b\t\v\f\r\"\\",
+						 esc_idx, 1)
+			} else if (esc == "n") {
+				# Uh-oh, a newline character.
+				# We cannot reliably put a pathname
+				# containing a newline into COMPREPLY,
+				# and the newline would create a mess.
+				# Skip this path.
+				return ""
+			} else {
+				# Must be a \nnn octal value, then.
+				dec = esc             * 64 + \
+				      substr(p, 1, 1) * 8  + \
+				      substr(p, 2, 1)
+				out = out sprintf("%c", dec)
+				p = substr(p, 3)
+			}
+		}
+		# Drop closing double quote, if there is one.
+		# (There is not any if this is a directory, as it was
+		# already stripped with the trailing path components.)
+		if (substr(p, length(p), 1) == "\"")
+			out = out substr(p, 1, length(p) - 1)
+		else
+			out = out p
+
+		return out
+	}'
+}
+
+# __git_complete_index_file requires 1 argument:
+# 1: the options to pass to ls-file
+#
+# The exception is --committable, which finds the files appropriate commit.
+__git_complete_index_file ()
+{
+	local dequoted_word pfx="" cur_
+
+	__git_dequote "$cur"
+
+	case "$dequoted_word" in
+	?*/*)
+		pfx="${dequoted_word%/*}/"
+		cur_="${dequoted_word##*/}"
+		;;
+	*)
+		cur_="$dequoted_word"
+	esac
+
+	__gitcomp_file_direct "$(__git_index_files "$1" "$pfx" "$cur_")"
 }
 
 # Lists branches from the local repository.
@@ -372,6 +607,19 @@ __git_heads ()
 			"refs/heads/$cur_*" "refs/heads/$cur_*/**"
 }
 
+# Lists branches from remote repositories.
+# 1: A prefix to be added to each listed branch (optional).
+# 2: List only branches matching this word (optional; list all branches if
+#    unset or empty).
+# 3: A suffix to be appended to each listed branch (optional).
+__git_remote_heads ()
+{
+	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
+
+	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
+			"refs/remotes/$cur_*" "refs/remotes/$cur_*/**"
+}
+
 # Lists tags from the local repository.
 # Accepts the same positional parameters as __git_heads() above.
 __git_tags ()
@@ -382,6 +630,26 @@ __git_tags ()
 			"refs/tags/$cur_*" "refs/tags/$cur_*/**"
 }
 
+# List unique branches from refs/remotes used for 'git checkout' and 'git
+# switch' tracking DWIMery.
+# 1: A prefix to be added to each listed branch (optional)
+# 2: List only branches matching this word (optional; list all branches if
+#    unset or empty).
+# 3: A suffix to be appended to each listed branch (optional).
+__git_dwim_remote_heads ()
+{
+	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
+	local fer_pfx="${pfx//\%/%%}" # "escape" for-each-ref format specifiers
+
+	# employ the heuristic used by git checkout and git switch
+	# Try to find a remote branch that cur_es the completion word
+	# but only output if the branch name is unique
+	__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
+		--sort="refname:strip=3" \
+		"refs/remotes/*/$cur_*" "refs/remotes/*/$cur_*/**" | \
+	uniq -u
+}
+
 # Lists refs from the local (by default) or from a remote repository.
 # It accepts 0, 1 or 2 arguments:
 # 1: The remote to list refs from (optional; ignored, if set but empty).
@@ -439,7 +707,7 @@ __git_refs ()
 			track=""
 			;;
 		*)
-			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_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
@@ -457,13 +725,7 @@ __git_refs ()
 		__git_dir="$dir" __git for-each-ref --format="$fer_pfx%($format)$sfx" \
 			"${refs[@]}"
 		if [ -n "$track" ]; then
-			# employ the heuristic used by git checkout
-			# Try to find a remote branch that matches the completion word
-			# but only output if the branch name is unique
-			__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
-				--sort="refname:strip=3" \
-				"refs/remotes/*/$match*" "refs/remotes/*/$match*/**" | \
-			uniq -u
+			__git_dwim_remote_heads "$pfx" "$match" "$sfx"
 		fi
 		return
 	fi
@@ -510,29 +772,51 @@ __git_refs ()
 # Usage: __git_complete_refs [<option>]...
 # --remote=<remote>: The remote to list refs from, can be the name of a
 #                    configured remote, a path, or a URL.
-# --track: List unique remote branches for 'git checkout's tracking DWIMery.
+# --dwim: List unique remote branches for 'git switch's tracking DWIMery.
 # --pfx=<prefix>: A prefix to be added to each ref.
 # --cur=<word>: The current ref to be completed.  Defaults to the current
 #               word to be completed.
 # --sfx=<suffix>: A suffix to be appended to each ref instead of the default
 #                 space.
+# --mode=<mode>: What set of refs to complete, one of 'refs' (the default) to
+#                complete all refs, 'heads' to complete only branches, or
+#                'remote-heads' to complete only remote branches. Note that
+#                --remote is only compatible with --mode=refs.
 __git_complete_refs ()
 {
-	local remote track pfx cur_="$cur" sfx=" "
+	local remote= dwim= pfx= cur_="$cur" sfx=" " mode="refs"
 
 	while test $# != 0; do
 		case "$1" in
 		--remote=*)	remote="${1##--remote=}" ;;
-		--track)	track="yes" ;;
+		--dwim)		dwim="yes" ;;
+		# --track is an old spelling of --dwim
+		--track)	dwim="yes" ;;
 		--pfx=*)	pfx="${1##--pfx=}" ;;
 		--cur=*)	cur_="${1##--cur=}" ;;
 		--sfx=*)	sfx="${1##--sfx=}" ;;
+		--mode=*)	mode="${1##--mode=}" ;;
 		*)		return 1 ;;
 		esac
 		shift
 	done
 
-	__gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" "$sfx")"
+	# complete references based on the specified mode
+	case "$mode" in
+		refs)
+			__gitcomp_direct "$(__git_refs "$remote" "" "$pfx" "$cur_" "$sfx")" ;;
+		heads)
+			__gitcomp_direct "$(__git_heads "$pfx" "$cur_" "$sfx")" ;;
+		remote-heads)
+			__gitcomp_direct "$(__git_remote_heads "$pfx" "$cur_" "$sfx")" ;;
+		*)
+			return 1 ;;
+	esac
+
+	# Append DWIM remote branch names if requested
+	if [ "$dwim" = "yes" ]; then
+		__gitcomp_direct "$(__git_dwim_remote_heads "$pfx" "$cur_" "$sfx")"
+	fi
 }
 
 # __git_refs2 requires 1 argument (to pass to __git_refs)
@@ -594,7 +878,7 @@ __git_is_configured_remote ()
 
 __git_list_merge_strategies ()
 {
-	git merge -s help 2>&1 |
+	LANG=C LC_ALL=C git merge -s help 2>&1 |
 	sed -n -e '/[Aa]vailable strategies are: /,/^$/{
 		s/\.$//
 		s/.*://
@@ -604,6 +888,7 @@ __git_list_merge_strategies ()
 	}'
 }
 
+__git_merge_strategies_default='octopus ours recursive resolve subtree'
 __git_merge_strategies=
 # 'git merge -s help' (and thus detection of the merge strategy
 # list) fails, unfortunately, if run outside of any git working
@@ -613,12 +898,18 @@ __git_merge_strategies=
 __git_compute_merge_strategies ()
 {
 	test -n "$__git_merge_strategies" ||
-	__git_merge_strategies=$(__git_list_merge_strategies)
+	{ __git_merge_strategies=$(__git_list_merge_strategies);
+		__git_merge_strategies="${__git_merge_strategies:-__git_merge_strategies_default}"; }
 }
 
+__git_merge_strategy_options="ours theirs subtree subtree= patience
+	histogram diff-algorithm= ignore-space-change ignore-all-space
+	ignore-space-at-eol renormalize no-renormalize no-renames
+	find-renames find-renames= rename-threshold="
+
 __git_complete_revlist_file ()
 {
-	local pfx ls ref cur_="$cur"
+	local dequoted_word pfx ls ref cur_="$cur"
 	case "$cur_" in
 	*..?*:*)
 		return
@@ -626,14 +917,18 @@ __git_complete_revlist_file ()
 	?*:*)
 		ref="${cur_%%:*}"
 		cur_="${cur_#*:}"
-		case "$cur_" in
+
+		__git_dequote "$cur_"
+
+		case "$dequoted_word" in
 		?*/*)
-			pfx="${cur_%/*}"
-			cur_="${cur_##*/}"
+			pfx="${dequoted_word%/*}"
+			cur_="${dequoted_word##*/}"
 			ls="$ref:$pfx"
 			pfx="$pfx/"
 			;;
 		*)
+			cur_="$dequoted_word"
 			ls="$ref"
 			;;
 		esac
@@ -643,21 +938,10 @@ __git_complete_revlist_file ()
 		*)   pfx="$ref:$pfx" ;;
 		esac
 
-		__gitcomp_nl "$(__git ls-tree "$ls" \
-				| sed '/^100... blob /{
-				           s,^.*	,,
-				           s,$, ,
-				       }
-				       /^120000 blob /{
-				           s,^.*	,,
-				           s,$, ,
-				       }
-				       /^040000 tree /{
-				           s,^.*	,,
-				           s,$,/,
-				       }
-				       s/^.*	//')" \
-			"$pfx" "$cur_" ""
+		__gitcomp_file "$(__git ls-tree "$ls" \
+				| sed 's/^.*	//
+				       s/$//')" \
+			"$pfx" "$cur_"
 		;;
 	*...*)
 		pfx="${cur_%...*}..."
@@ -675,26 +959,6 @@ __git_complete_revlist_file ()
 	esac
 }
 
-
-# __git_complete_index_file requires 1 argument:
-# 1: the options to pass to ls-file
-#
-# The exception is --committable, which finds the files appropriate commit.
-__git_complete_index_file ()
-{
-	local pfx="" cur_="$cur"
-
-	case "$cur_" in
-	?*/*)
-		pfx="${cur_%/*}"
-		cur_="${cur_##*/}"
-		pfx="${pfx}/"
-		;;
-	esac
-
-	__gitcomp_file "$(__git_index_files "$1" ${pfx:+"$pfx"})" "$pfx" "$cur_"
-}
-
 __git_complete_file ()
 {
 	__git_complete_revlist_file
@@ -707,8 +971,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
@@ -726,6 +990,7 @@ __git_complete_remote_or_refspec ()
 			*) ;;
 			esac
 			;;
+		--multiple) no_complete_refspec=1; break ;;
 		-*) ;;
 		*) remote="$i"; break ;;
 		esac
@@ -785,136 +1050,30 @@ __git_complete_strategy ()
 	-s|--strategy)
 		__gitcomp "$__git_merge_strategies"
 		return 0
+		;;
+	-X)
+		__gitcomp_opts "$__git_merge_strategy_options"
+		return 0
+		;;
 	esac
 	case "$cur" in
 	--strategy=*)
 		__gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}"
 		return 0
 		;;
+	--strategy-option=*)
+		__gitcomp_opts "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
+		return 0
+		;;
 	esac
 	return 1
 }
 
-__git_commands () {
-	if test -n "${GIT_TESTING_COMMAND_COMPLETION:-}"
-	then
-		printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}"
-	else
-		git help -a|egrep '^  [a-zA-Z0-9]'
-	fi
-}
-
-__git_list_all_commands ()
-{
-	local i IFS=" "$'\n'
-	for i in $(__git_commands)
-	do
-		case $i in
-		*--*)             : helper pattern;;
-		*) echo $i;;
-		esac
-	done
-}
-
 __git_all_commands=
 __git_compute_all_commands ()
 {
 	test -n "$__git_all_commands" ||
-	__git_all_commands=$(__git_list_all_commands)
-}
-
-__git_list_porcelain_commands ()
-{
-	local i IFS=" "$'\n'
-	__git_compute_all_commands
-	for i in $__git_all_commands
-	do
-		case $i in
-		*--*)             : helper pattern;;
-		applymbox)        : ask gittus;;
-		applypatch)       : ask gittus;;
-		archimport)       : import;;
-		cat-file)         : plumbing;;
-		check-attr)       : plumbing;;
-		check-ignore)     : plumbing;;
-		check-mailmap)    : plumbing;;
-		check-ref-format) : plumbing;;
-		checkout-index)   : plumbing;;
-		column)           : internal helper;;
-		commit-tree)      : plumbing;;
-		count-objects)    : infrequent;;
-		credential)       : credentials;;
-		credential-*)     : credentials helper;;
-		cvsexportcommit)  : export;;
-		cvsimport)        : import;;
-		cvsserver)        : daemon;;
-		daemon)           : daemon;;
-		diff-files)       : plumbing;;
-		diff-index)       : plumbing;;
-		diff-tree)        : plumbing;;
-		fast-import)      : import;;
-		fast-export)      : export;;
-		fsck-objects)     : plumbing;;
-		fetch-pack)       : plumbing;;
-		fmt-merge-msg)    : plumbing;;
-		for-each-ref)     : plumbing;;
-		hash-object)      : plumbing;;
-		http-*)           : transport;;
-		index-pack)       : plumbing;;
-		init-db)          : deprecated;;
-		local-fetch)      : plumbing;;
-		ls-files)         : plumbing;;
-		ls-remote)        : plumbing;;
-		ls-tree)          : plumbing;;
-		mailinfo)         : plumbing;;
-		mailsplit)        : plumbing;;
-		merge-*)          : plumbing;;
-		mktree)           : plumbing;;
-		mktag)            : plumbing;;
-		pack-objects)     : plumbing;;
-		pack-redundant)   : plumbing;;
-		pack-refs)        : plumbing;;
-		parse-remote)     : plumbing;;
-		patch-id)         : plumbing;;
-		prune)            : plumbing;;
-		prune-packed)     : plumbing;;
-		quiltimport)      : import;;
-		read-tree)        : plumbing;;
-		receive-pack)     : plumbing;;
-		remote-*)         : transport;;
-		rerere)           : plumbing;;
-		rev-list)         : plumbing;;
-		rev-parse)        : plumbing;;
-		runstatus)        : plumbing;;
-		sh-setup)         : internal;;
-		shell)            : daemon;;
-		show-ref)         : plumbing;;
-		send-pack)        : plumbing;;
-		show-index)       : plumbing;;
-		ssh-*)            : transport;;
-		stripspace)       : plumbing;;
-		symbolic-ref)     : plumbing;;
-		unpack-file)      : plumbing;;
-		unpack-objects)   : plumbing;;
-		update-index)     : plumbing;;
-		update-ref)       : plumbing;;
-		update-server-info) : daemon;;
-		upload-archive)   : plumbing;;
-		upload-pack)      : plumbing;;
-		write-tree)       : plumbing;;
-		var)              : infrequent;;
-		verify-pack)      : infrequent;;
-		verify-tag)       : plumbing;;
-		*) echo $i;;
-		esac
-	done
-}
-
-__git_porcelain_commands=
-__git_compute_porcelain_commands ()
-{
-	test -n "$__git_porcelain_commands" ||
-	__git_porcelain_commands=$(__git_list_porcelain_commands)
+	__git_all_commands=$(__git --list-cmds=main,others,alias,nohelpers)
 }
 
 # Lists all set config variables starting with the given section prefix,
@@ -932,45 +1091,75 @@ __git_pretty_aliases ()
 	__git_get_config_variables "pretty"
 }
 
-__git_aliases ()
-{
-	__git_get_config_variables "alias"
-}
-
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
-	local word cmdline=$(__git config --get "alias.$1")
-	for word in $cmdline; do
-		case "$word" in
-		\!gitk|gitk)
-			echo "gitk"
+	local cur=$1 last list= word cmdline
+
+	while [[ -n "$cur" ]]; do
+		if [[ "$list" == *" $cur "* ]]; then
+			# loop detected
 			return
-			;;
-		\!*)	: shell command alias ;;
-		-*)	: option ;;
-		*=*)	: setting env ;;
-		git)	: git itself ;;
-		\(\))   : skip parens of shell function definition ;;
-		{)	: skip start of shell helper function ;;
-		:)	: skip null command ;;
-		\'*)	: skip opening quote after sh -c ;;
-		*)
-			echo "$word"
-			return
-		esac
+		fi
+
+		cmdline=$(__git config --get "alias.$cur")
+		list=" $cur $list"
+		last=$cur
+		cur=
+
+		for word in $cmdline; do
+			case "$word" in
+			\!gitk|gitk)
+				cur="gitk"
+				break
+				;;
+			\!*)	: shell command alias ;;
+			-*)	: option ;;
+			*=*)	: setting env ;;
+			git)	: git itself ;;
+			\(\))   : skip parens of shell function definition ;;
+			{)	: skip start of shell helper function ;;
+			:)	: skip null command ;;
+			\'*)	: skip opening quote after sh -c ;;
+			*)
+				cur="$word"
+				break
+			esac
+		done
 	done
+
+	cur=$last
+	if [[ "$cur" != "$1" ]]; then
+		echo "$cur"
+	fi
 }
 
-# __git_find_on_cmdline requires 1 argument
+# Check whether one of the given words is present on the command line,
+# and print the first word found.
+#
+# Usage: __git_find_on_cmdline [<option>]... "<wordlist>"
+# --show-idx: Optionally show the index of the found word in the $words array.
 __git_find_on_cmdline ()
 {
-	local word subcommand c=1
+	local word c="$__git_cmd_idx" show_idx
+
+	while test $# -gt 1; do
+		case "$1" in
+		--show-idx)	show_idx=y ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+	local wordlist="$1"
+
 	while [ $c -lt $cword ]; do
-		word="${words[c]}"
-		for subcommand in $1; do
-			if [ "$subcommand" = "$word" ]; then
-				echo "$subcommand"
+		for word in $wordlist; do
+			if [ "$word" = "${words[c]}" ]; then
+				if [ -n "${show_idx-}" ]; then
+					echo "$c $word"
+				else
+					echo "$word"
+				fi
 				return
 			fi
 		done
@@ -978,6 +1167,40 @@ __git_find_on_cmdline ()
 	done
 }
 
+# Similar to __git_find_on_cmdline, except that it loops backwards and thus
+# prints the *last* word found. Useful for finding which of two options that
+# supersede each other came last, such as "--guess" and "--no-guess".
+#
+# Usage: __git_find_last_on_cmdline [<option>]... "<wordlist>"
+# --show-idx: Optionally show the index of the found word in the $words array.
+__git_find_last_on_cmdline ()
+{
+	local word c=$cword show_idx
+
+	while test $# -gt 1; do
+		case "$1" in
+		--show-idx)	show_idx=y ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+	local wordlist="$1"
+
+	while [ $c -gt "$__git_cmd_idx" ]; do
+		((c--))
+		for word in $wordlist; do
+			if [ "$word" = "${words[c]}" ]; then
+				if [ -n "$show_idx" ]; then
+					echo "$c $word"
+				else
+					echo "$word"
+				fi
+				return
+			fi
+		done
+	done
+}
+
 # Echo the value of an option set on the command line or config
 #
 # $1: short option name
@@ -1048,7 +1271,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
@@ -1072,12 +1295,16 @@ __git_count_arguments ()
 }
 
 __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 "--skip --continue --resolved --abort"
+		__gitcomp_opts "$__git_am_inprogress_options"
 		return
 	fi
 	case "$cur" in
@@ -1085,13 +1312,21 @@ _git_am ()
 		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
 		return
 		;;
+	--patch-format=*)
+		__gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
+		return
+		;;
+	--show-current-patch=*)
+		__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
+		return
+		;;
+	--quoted-cr=*)
+		__gitcomp "$__git_quoted_cr" "" "${cur##--quoted-cr=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--3way --committer-date-is-author-date --ignore-date
-			--ignore-whitespace --ignore-space-change
-			--interactive --keep --no-utf8 --signoff --utf8
-			--whitespace= --scissors
-			"
+		__gitcomp_builtin am "" \
+			"$__git_am_inprogress_options"
 		return
 	esac
 }
@@ -1104,14 +1339,7 @@ _git_apply ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--stat --numstat --summary --check --index
-			--cached --index-info --reverse --reject --unidiff-zero
-			--apply --no-add --exclude=
-			--ignore-whitespace --ignore-space-change
-			--whitespace= --inaccurate-eof --verbose
-			--recount --directory=
-			"
+		__gitcomp_builtin apply
 		return
 	esac
 }
@@ -1119,11 +1347,12 @@ _git_apply ()
 _git_add ()
 {
 	case "$cur" in
+	--chmod=*)
+		__gitcomp "+x -x" "" "${cur##--chmod=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--interactive --refresh --patch --update --dry-run
-			--ignore-errors --intent-to-add --force --edit --chmod=
-			"
+		__gitcomp_builtin add
 		return
 	esac
 
@@ -1139,7 +1368,7 @@ _git_archive ()
 {
 	case "$cur" in
 	--format=*)
-		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
+		__gitcomp_nl "$(git archive --list)" "" "${cur##--format=}"
 		return
 		;;
 	--remote=*)
@@ -1147,10 +1376,7 @@ _git_archive ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--format= --list --verbose
-			--prefix= --remote= --exec= --output
-			"
+		__gitcomp_builtin archive "--format= --list --verbose --prefix= --worktree-attributes"
 		return
 		;;
 	esac
@@ -1182,15 +1408,19 @@ _git_bisect ()
 	esac
 }
 
+__git_ref_fieldlist="refname objecttype objectsize objectname upstream push HEAD symref"
+
 _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
@@ -1200,13 +1430,7 @@ _git_branch ()
 		__git_complete_refs --cur="${cur##--set-upstream-to=}"
 		;;
 	--*)
-		__gitcomp "
-			--color --no-color --verbose --abbrev= --no-abbrev
-			--track --no-track --contains --no-contains --merged --no-merged
-			--set-upstream-to= --edit-description --list
-			--unset-upstream --delete --move --copy --remotes
-			--column --no-column --sort= --points-at
-			"
+		__gitcomp_builtin branch
 		;;
 	*)
 		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
@@ -1220,12 +1444,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
 		;;
 	*)
@@ -1238,49 +1462,118 @@ _git_bundle ()
 	esac
 }
 
+# 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 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 ()
+{
+	local last_option dwim_opt="--dwim"
+
+	if [ "${GIT_COMPLETION_CHECKOUT_NO_GUESS-}" = "1" ]; then
+		dwim_opt=""
+	fi
+
+	# --no-track disables DWIM, but with lower priority than
+	# --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
+		--guess)
+			dwim_opt="--dwim"
+			;;
+		--no-guess)
+			dwim_opt=""
+			;;
+	esac
+
+	echo "$dwim_opt"
+}
+
 _git_checkout ()
 {
 	__git_has_doubledash && return
 
-	case "$cur" in
-	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
-		;;
-	--*)
-		__gitcomp "
-			--quiet --ours --theirs --track --no-track --merge
-			--conflict= --orphan --patch --detach --ignore-skip-worktree-bits
-			--recurse-submodules --no-recurse-submodules
-			"
+	local dwim_opt="$(__git_checkout_default_dwim_mode)"
+
+	case "$prev" in
+	-b|-B|--orphan)
+		# Complete local branches (and DWIM branch
+		# remote branch names) for an option argument
+		# specifying a new branch name. This is for
+		# convenience, assuming new branches are
+		# possibly based on pre-existing branch names.
+		__git_complete_refs $dwim_opt --mode="heads"
+		return
 		;;
 	*)
-		# check if --track, --no-track, or --no-guess was specified
-		# if so, disable DWIM mode
-		local flags="--track --no-track --no-guess" track_opt="--track"
-		if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
-		   [ -n "$(__git_find_on_cmdline "$flags")" ]; then
-			track_opt=''
+		;;
+	esac
+
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
+		;;
+	--*)
+		__gitcomp_builtin checkout
+		;;
+	*)
+		# At this point, we've already handled special completion for
+		# the arguments to -b/-B, and --orphan. There are 3 main
+		# things left we can possibly complete:
+		# 1) a start-point for -b/-B, -d/--detach, or --orphan
+		# 2) a remote head, for --track
+		# 3) an arbitrary reference, possibly including DWIM names
+		#
+
+		if [ -n "$(__git_find_on_cmdline "-b -B -d --detach --orphan")" ]; then
+			__git_complete_refs --mode="refs"
+		elif [ -n "$(__git_find_on_cmdline "--track")" ]; then
+			__git_complete_refs --mode="remote-heads"
+		else
+			__git_complete_refs $dwim_opt --mode="refs"
 		fi
-		__git_complete_refs $track_opt
 		;;
 	esac
 }
 
-_git_cherry ()
-{
-	__git_complete_refs
-}
+__git_sequencer_inprogress_options="--continue --quit --abort --skip"
+
+__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options
 
 _git_cherry_pick ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
-		__gitcomp "--continue --quit --abort"
+		__gitcomp_opts "$__git_cherry_pick_inprogress_options"
 		return
 	fi
+
+	__git_complete_strategy && return
+
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --no-commit --signoff --strategy= --mainline"
+		__gitcomp_builtin cherry-pick "" \
+			"$__git_cherry_pick_inprogress_options"
 		;;
 	*)
 		__git_complete_refs
@@ -1292,7 +1585,7 @@ _git_clean ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run --quiet"
+		__gitcomp_builtin clean
 		return
 		;;
 	esac
@@ -1303,28 +1596,20 @@ _git_clean ()
 
 _git_clone ()
 {
+	case "$prev" in
+	-c|--config)
+		__git_complete_config_variable_name_and_value
+		return
+		;;
+	esac
 	case "$cur" in
+	--config=*)
+		__git_complete_config_variable_name_and_value \
+			--cur="${cur##--config=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--local
-			--no-hardlinks
-			--shared
-			--reference
-			--quiet
-			--no-checkout
-			--bare
-			--mirror
-			--origin
-			--upload-pack
-			--template=
-			--depth
-			--single-branch
-			--no-tags
-			--branch
-			--recurse-submodules
-			--no-single-branch
-			--shallow-submodules
-			"
+		__gitcomp_builtin clone
 		return
 		;;
 	esac
@@ -1357,16 +1642,7 @@ _git_commit ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--all --author= --signoff --verify --no-verify
-			--edit --no-edit
-			--amend --include --only --interactive
-			--dry-run --reuse-message= --reedit-message=
-			--reset-author --file= --message= --template=
-			--cleanup= --untracked-files --untracked-files=
-			--verbose --quiet --fixup= --squash=
-			--patch --short --date --allow-empty
-			"
+		__gitcomp_builtin commit
 		return
 	esac
 
@@ -1382,11 +1658,7 @@ _git_describe ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--all --tags --contains --abbrev= --candidates=
-			--exact-match --debug --long --match --always --first-parent
-			--exclude --dirty --broken
-			"
+		__gitcomp_builtin describe
 		return
 	esac
 	__git_complete_refs
@@ -1396,9 +1668,16 @@ __git_diff_algorithms="myers minimal patience histogram"
 
 __git_diff_submodule_formats="diff log short"
 
+__git_color_moved_opts="no default plain blocks zebra dimmed-zebra"
+
+__git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change
+			ignore-all-space allow-indentation-change"
+
 __git_diff_common_options="--stat --numstat --shortstat --summary
 			--patch-with-stat --name-only --name-status --color
 			--no-color --color-words --no-renames --check
+			--color-moved --color-moved= --no-color-moved
+			--color-moved-ws= --no-color-moved-ws
 			--full-index --binary --abbrev --diff-filter=
 			--find-copies-harder --ignore-cr-at-eol
 			--text --ignore-space-at-eol --ignore-space-change
@@ -1411,9 +1690,17 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
-			--submodule --submodule=
+			--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
@@ -1427,11 +1714,16 @@ _git_diff ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--color-moved=*)
+		__gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
+		return
+		;;
+	--color-moved-ws=*)
+		__gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
+		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
@@ -1439,7 +1731,8 @@ _git_diff ()
 }
 
 __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
-			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
+			tkdiff vimdiff nvimdiff gvimdiff xxdiff araxis p4merge
+			bc codecompare smerge
 "
 
 _git_difftool ()
@@ -1452,11 +1745,7 @@ _git_difftool ()
 		return
 		;;
 	--*)
-		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
-			--base --ours --theirs
-			--no-renames --diff-filter= --find-copies-harder
-			--relative --ignore-submodules
-			--tool="
+		__gitcomp_builtin difftool "$__git_diff_difftool_options"
 		return
 		;;
 	esac
@@ -1465,12 +1754,6 @@ _git_difftool ()
 
 __git_fetch_recurse_submodules="yes on-demand no"
 
-__git_fetch_options="
-	--quiet --verbose --append --upload-pack --force --keep --depth=
-	--tags --no-tags --all --prune --dry-run --recurse-submodules=
-	--unshallow --update-shallow
-"
-
 _git_fetch ()
 {
 	case "$cur" in
@@ -1478,34 +1761,36 @@ _git_fetch ()
 		__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
 		return
 		;;
+	--filter=*)
+		__gitcomp "blob:none blob:limit= sparse:oid=" "" "${cur##--filter=}"
+		return
+		;;
 	--*)
-		__gitcomp "$__git_fetch_options"
+		__gitcomp_builtin fetch
 		return
 		;;
 	esac
 	__git_complete_remote_or_refspec
 }
 
-__git_format_patch_options="
-	--stdout --attach --no-attach --thread --thread= --no-thread
-	--numbered --start-number --numbered-files --keep-subject --signoff
-	--signature --no-signature --in-reply-to= --cc= --full-index --binary
-	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
-	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
-	--output-directory --reroll-count --to= --quiet --notes
+__git_format_patch_extra_options="
+	--full-index --not --all --no-prefix --src-prefix=
+	--dst-prefix= --notes
 "
 
 _git_format_patch ()
 {
 	case "$cur" in
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
+		return
+		;;
+	--base=*|--interdiff=*|--range-diff=*)
+		__git_complete_refs --cur="${cur#--*=}"
 		return
 		;;
 	--*)
-		__gitcomp "$__git_format_patch_options"
+		__gitcomp_builtin format-patch "$__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -1516,20 +1801,7 @@ _git_fsck ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--tags --root --unreachable --cache --no-reflogs --full
-			--strict --verbose --lost-found --name-objects
-			"
-		return
-		;;
-	esac
-}
-
-_git_gc ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp "--prune --aggressive"
+		__gitcomp_builtin fsck
 		return
 		;;
 	esac
@@ -1537,7 +1809,7 @@ _git_gc ()
 
 _git_gitk ()
 {
-	_gitk
+	__gitk_main
 }
 
 # Lists matching symbol names from a tag (as in ctags) file.
@@ -1585,27 +1857,13 @@ _git_grep ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--cached
-			--text --ignore-case --word-regexp --invert-match
-			--full-name --line-number
-			--extended-regexp --basic-regexp --fixed-strings
-			--perl-regexp
-			--threads
-			--files-with-matches --name-only
-			--files-without-match
-			--max-depth
-			--count
-			--and --or --not --all-match
-			--break --heading --show-function --function-context
-			--untracked --no-index
-			"
+		__gitcomp_builtin grep
 		return
 		;;
 	esac
 
 	case "$cword,$prev" in
-	2,*|*,-*)
+	$((__git_cmd_idx+1)),*|*,-*)
 		__git_complete_symbol && return
 		;;
 	esac
@@ -1617,17 +1875,16 @@ _git_help ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--all --guides --info --man --web"
+		__gitcomp_builtin help
 		return
 		;;
 	esac
-	__git_compute_all_commands
-	__gitcomp "$__git_all_commands $(__git_aliases)
-		attributes cli core-tutorial cvs-migration
-		diffcore everyday gitk glossary hooks ignore modules
-		namespaces repository-layout revisions tutorial tutorial-2
-		workflows
-		"
+	if test -n "${GIT_TESTING_ALL_COMMAND_LIST-}"
+	then
+		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
+	else
+		__gitcomp "$(__git --list-cmds=main,nohelpers,alias,list-guide) gitk"
+	fi
 }
 
 _git_init ()
@@ -1640,7 +1897,7 @@ _git_init ()
 		return
 		;;
 	--*)
-		__gitcomp "--quiet --bare --template= --shared --shared="
+		__gitcomp_builtin init
 		return
 		;;
 	esac
@@ -1650,13 +1907,7 @@ _git_ls_files ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --deleted --modified --others --ignored
-			--stage --directory --no-empty-directory --unmerged
-			--killed --exclude= --exclude-from=
-			--exclude-per-directory= --exclude-standard
-			--error-unmatch --with-tree= --full-name
-			--abbrev --ignored --exclude-per-directory
-			"
+		__gitcomp_builtin ls-files
 		return
 		;;
 	esac
@@ -1670,7 +1921,7 @@ _git_ls_remote ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--heads --tags --refs --get-url --symref"
+		__gitcomp_builtin ls-remote
 		return
 		;;
 	esac
@@ -1679,6 +1930,13 @@ _git_ls_remote ()
 
 _git_ls_tree ()
 {
+	case "$cur" in
+	--*)
+		__gitcomp_builtin ls-tree
+		return
+		;;
+	esac
+
 	__git_complete_file
 }
 
@@ -1705,8 +1963,8 @@ __git_log_shortlog_options="
 	--all-match --invert-grep
 "
 
-__git_log_pretty_formats="oneline short medium full fuller email raw format:"
-__git_log_date_formats="relative iso8601 rfc2822 short local default raw"
+__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 human raw unix auto: format:"
 
 _git_log ()
 {
@@ -1752,23 +2010,29 @@ _git_log ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--no-walk=*)
+		__gitcomp "sorted unsorted" "" "${cur##--no-walk=}"
+		return
+		;;
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			$__git_log_common_options
 			$__git_log_shortlog_options
 			$__git_log_gitk_options
 			--root --topo-order --date-order --reverse
 			--follow --full-diff
-			--abbrev-commit --abbrev=
+			--abbrev-commit --no-abbrev-commit --abbrev=
 			--relative-date --date=
 			--pretty= --format= --oneline
 			--show-signature
 			--cherry-mark
 			--cherry-pick
 			--graph
-			--decorate --decorate=
+			--decorate --decorate= --no-decorate
 			--walk-reflogs
+			--no-walk --no-walk= --do-walk
 			--parents --children
+			--expand-tabs --expand-tabs= --no-expand-tabs
 			$merge
 			$__git_diff_common_options
 			--pickaxe-all --pickaxe-regex
@@ -1794,22 +2058,13 @@ _git_log ()
 	__git_complete_revlist
 }
 
-# Common merge options shared by git-merge(1) and git-pull(1).
-__git_merge_options="
-	--no-commit --no-stat --log --no-log --squash --strategy
-	--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
-	--verify-signatures --no-verify-signatures --gpg-sign
-	--quiet --verbose --progress --no-progress
-"
-
 _git_merge ()
 {
 	__git_complete_strategy && return
 
 	case "$cur" in
 	--*)
-		__gitcomp "$__git_merge_options
-			--rerere-autoupdate --no-rerere-autoupdate --abort --continue"
+		__gitcomp_builtin merge
 		return
 	esac
 	__git_complete_refs
@@ -1823,7 +2078,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool= --prompt --no-prompt"
+		__gitcomp_opts "--tool= --prompt --no-prompt --gui --no-gui"
 		return
 		;;
 	esac
@@ -1833,7 +2088,7 @@ _git_merge_base ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--octopus --independent --is-ancestor --fork-point"
+		__gitcomp_builtin merge-base
 		return
 		;;
 	esac
@@ -1844,7 +2099,7 @@ _git_mv ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin mv
 		return
 		;;
 	esac
@@ -1858,19 +2113,14 @@ _git_mv ()
 	fi
 }
 
-_git_name_rev ()
-{
-	__gitcomp "--tags --all --stdin"
-}
-
 _git_notes ()
 {
-	local subcommands='add append copy edit list prune remove show'
+	local subcommands='add append copy edit get-ref list merge prune remove show'
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 
 	case "$subcommand,$cur" in
 	,--*)
-		__gitcomp '--ref'
+		__gitcomp_builtin notes
 		;;
 	,*)
 		case "$prev" in
@@ -1882,21 +2132,14 @@ _git_notes ()
 			;;
 		esac
 		;;
-	add,--reuse-message=*|append,--reuse-message=*|\
-	add,--reedit-message=*|append,--reedit-message=*)
+	*,--reuse-message=*|*,--reedit-message=*)
 		__git_complete_refs --cur="${cur#*=}"
 		;;
-	add,--*|append,--*)
-		__gitcomp '--file= --message= --reedit-message=
-				--reuse-message='
+	*,--*)
+		__gitcomp_builtin notes_$subcommand
 		;;
-	copy,--*)
-		__gitcomp '--stdin'
-		;;
-	prune,--*)
-		__gitcomp '--dry-run --verbose'
-		;;
-	prune,*)
+	prune,*|get-ref,*)
+		# this command does not take a ref, do not complete it
 		;;
 	*)
 		case "$prev" in
@@ -1920,12 +2163,8 @@ _git_pull ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--rebase --no-rebase
-			--autostash --no-autostash
-			$__git_merge_options
-			$__git_fetch_options
-		"
+		__gitcomp_builtin pull
+
 		return
 		;;
 	esac
@@ -1976,27 +2215,39 @@ _git_push ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--all --mirror --tags --dry-run --force --verbose
-			--quiet --prune --delete --follow-tags
-			--receive-pack= --repo= --set-upstream
-			--force-with-lease --force-with-lease= --recurse-submodules=
-		"
+		__gitcomp_builtin push
 		return
 		;;
 	esac
 	__git_complete_remote_or_refspec
 }
 
+_git_range_diff ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp_opts "
+			--creation-factor= --no-dual-color
+			$__git_diff_common_options
+		"
+		return
+		;;
+	esac
+	__git_complete_revlist
+}
+
+__git_rebase_inprogress_options="--continue --skip --abort --quit --show-current-patch"
+__git_rebase_interactive_inprogress_options="$__git_rebase_inprogress_options --edit-todo"
+
 _git_rebase ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "--continue --skip --abort --quit --edit-todo"
+		__gitcomp_opts "$__git_rebase_interactive_inprogress_options"
 		return
 	elif [ -d "$__git_repo_path"/rebase-apply ] || \
 	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "--continue --skip --abort --quit"
+		__gitcomp_opts "$__git_rebase_inprogress_options"
 		return
 	fi
 	__git_complete_strategy && return
@@ -2005,19 +2256,13 @@ _git_rebase ()
 		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
 		return
 		;;
+	--onto=*)
+		__git_complete_refs --cur="${cur##--onto=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--onto --merge --strategy --interactive
-			--preserve-merges --stat --no-stat
-			--committer-date-is-author-date --ignore-date
-			--ignore-whitespace --whitespace=
-			--autosquash --no-autosquash
-			--fork-point --no-fork-point
-			--autostash --no-autostash
-			--verify --no-verify
-			--keep-empty --root --force-rebase --no-ff
-			--exec
-			"
+		__gitcomp_builtin rebase "" \
+			"$__git_rebase_interactive_inprogress_options"
 
 		return
 	esac
@@ -2036,6 +2281,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"
 
@@ -2043,7 +2289,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
@@ -2067,9 +2313,7 @@ _git_send_email ()
 		return
 		;;
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--to=*|--cc=*|--bcc=*|--from=*)
@@ -2077,16 +2321,7 @@ _git_send_email ()
 		return
 		;;
 	--*)
-		__gitcomp "--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
-			--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_options"
+		__gitcomp_builtin send-email "$__git_send_email_options $__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -2119,11 +2354,7 @@ _git_status ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--short --branch --porcelain --long --verbose
-			--untracked-files= --ignore-submodules= --ignored
-			--column= --no-column
-			"
+		__gitcomp_builtin status
 		return
 		;;
 	esac
@@ -2148,10 +2379,61 @@ _git_status ()
 	__git_complete_index_file "$complete_opt"
 }
 
+_git_switch ()
+{
+	local dwim_opt="$(__git_checkout_default_dwim_mode)"
+
+	case "$prev" in
+	-c|-C|--orphan)
+		# Complete local branches (and DWIM branch
+		# remote branch names) for an option argument
+		# specifying a new branch name. This is for
+		# convenience, assuming new branches are
+		# possibly based on pre-existing branch names.
+		__git_complete_refs $dwim_opt --mode="heads"
+		return
+		;;
+	*)
+		;;
+	esac
+
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
+		;;
+	--*)
+		__gitcomp_builtin switch
+		;;
+	*)
+		# Unlike in git checkout, git switch --orphan does not take
+		# a start point. Thus we really have nothing to complete after
+		# the branch name.
+		if [ -n "$(__git_find_on_cmdline "--orphan")" ]; then
+			return
+		fi
+
+		# At this point, we've already handled special completion for
+		# -c/-C, and --orphan. There are 3 main things left to
+		# complete:
+		# 1) a start-point for -c/-C or -d/--detach
+		# 2) a remote head, for --track
+		# 3) a branch name, possibly including DWIM remote branches
+
+		if [ -n "$(__git_find_on_cmdline "-c -C -d --detach")" ]; then
+			__git_complete_refs --mode="refs"
+		elif [ -n "$(__git_find_on_cmdline "--track")" ]; then
+			__git_complete_refs --mode="remote-heads"
+		else
+			__git_complete_refs $dwim_opt --mode="heads"
+		fi
+		;;
+	esac
+}
+
 __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=*)
@@ -2170,496 +2452,287 @@ __git_config_get_set_variables ()
 	__git config $config_file --name-only --list
 }
 
-_git_config ()
+__git_config_vars=
+__git_compute_config_vars ()
 {
-	case "$prev" in
+	test -n "$__git_config_vars" ||
+	__git_config_vars="$(git help --config-for-completion | sort -u)"
+}
+
+# Completes possible values of various configuration variables.
+#
+# Usage: __git_complete_config_variable_value [<option>]...
+# --varname=<word>: The name of the configuration variable whose value is
+#                   to be completed.  Defaults to the previous word on the
+#                   command line.
+# --cur=<word>: The current value to be completed.  Defaults to the current
+#               word to be completed.
+__git_complete_config_variable_value ()
+{
+	local varname="$prev" cur_="$cur"
+
+	while test $# != 0; do
+		case "$1" in
+		--varname=*)	varname="${1##--varname=}" ;;
+		--cur=*)	cur_="${1##--cur=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
+		varname="${varname,,}"
+	else
+		varname="$(echo "$varname" |tr A-Z a-z)"
+	fi
+
+	case "$varname" in
 	branch.*.remote|branch.*.pushremote)
-		__gitcomp_nl "$(__git_remotes)"
+		__gitcomp_nl "$(__git_remotes)" "" "$cur_"
 		return
 		;;
 	branch.*.merge)
-		__git_complete_refs
+		__git_complete_refs --cur="$cur_"
 		return
 		;;
 	branch.*.rebase)
-		__gitcomp "false true preserve interactive"
+		__gitcomp "false true merges interactive" "" "$cur_"
 		return
 		;;
 	remote.pushdefault)
-		__gitcomp_nl "$(__git_remotes)"
+		__gitcomp_nl "$(__git_remotes)" "" "$cur_"
 		return
 		;;
 	remote.*.fetch)
-		local remote="${prev#remote.}"
+		local remote="${varname#remote.}"
 		remote="${remote%.fetch}"
-		if [ -z "$cur" ]; then
+		if [ -z "$cur_" ]; then
 			__gitcomp_nl "refs/heads/" "" "" ""
 			return
 		fi
-		__gitcomp_nl "$(__git_refs_remotes "$remote")"
+		__gitcomp_nl "$(__git_refs_remotes "$remote")" "" "$cur_"
 		return
 		;;
 	remote.*.push)
-		local remote="${prev#remote.}"
+		local remote="${varname#remote.}"
 		remote="${remote%.push}"
 		__gitcomp_nl "$(__git for-each-ref \
-			--format='%(refname):%(refname)' refs/heads)"
+			--format='%(refname):%(refname)' refs/heads)" "" "$cur_"
 		return
 		;;
 	pull.twohead|pull.octopus)
 		__git_compute_merge_strategies
-		__gitcomp "$__git_merge_strategies"
-		return
-		;;
-	color.branch|color.diff|color.interactive|\
-	color.showbranch|color.status|color.ui)
-		__gitcomp "always never auto"
+		__gitcomp "$__git_merge_strategies" "" "$cur_"
 		return
 		;;
 	color.pager)
-		__gitcomp "false true"
+		__gitcomp "false true" "" "$cur_"
 		return
 		;;
 	color.*.*)
 		__gitcomp "
 			normal black red green yellow blue magenta cyan white
 			bold dim ul blink reverse
-			"
+			" "" "$cur_"
+		return
+		;;
+	color.*)
+		__gitcomp "false true always never auto" "" "$cur_"
 		return
 		;;
 	diff.submodule)
-		__gitcomp "log short"
+		__gitcomp "$__git_diff_submodule_formats" "" "$cur_"
 		return
 		;;
 	help.format)
-		__gitcomp "man info web html"
+		__gitcomp "man info web html" "" "$cur_"
 		return
 		;;
 	log.date)
-		__gitcomp "$__git_log_date_formats"
+		__gitcomp "$__git_log_date_formats" "" "$cur_"
 		return
 		;;
-	sendemail.aliasesfiletype)
-		__gitcomp "mutt mailrc pine elm gnus"
+	sendemail.aliasfiletype)
+		__gitcomp "mutt mailrc pine elm gnus" "" "$cur_"
 		return
 		;;
 	sendemail.confirm)
-		__gitcomp "$__git_send_email_confirm_options"
+		__gitcomp "$__git_send_email_confirm_options" "" "$cur_"
 		return
 		;;
 	sendemail.suppresscc)
-		__gitcomp "$__git_send_email_suppresscc_options"
+		__gitcomp "$__git_send_email_suppresscc_options" "" "$cur_"
 		return
 		;;
 	sendemail.transferencoding)
-		__gitcomp "7bit 8bit quoted-printable base64"
-		return
-		;;
-	--get|--get-all|--unset|--unset-all)
-		__gitcomp_nl "$(__git_config_get_set_variables)"
+		__gitcomp "7bit 8bit quoted-printable base64" "" "$cur_"
 		return
 		;;
 	*.*)
 		return
 		;;
 	esac
-	case "$cur" in
-	--*)
-		__gitcomp "
-			--system --global --local --file=
-			--list --replace-all
-			--get --get-all --get-regexp
-			--add --unset --unset-all
-			--remove-section --rename-section
-			--name-only
-			"
-		return
-		;;
+}
+
+# Completes configuration sections, subsections, variable names.
+#
+# Usage: __git_complete_config_variable_name [<option>]...
+# --cur=<word>: The current configuration section/variable name to be
+#               completed.  Defaults to the current word to be completed.
+# --sfx=<suffix>: A suffix to be appended to each fully completed
+#                 configuration variable name (but not to sections or
+#                 subsections) instead of the default space.
+__git_complete_config_variable_name ()
+{
+	local cur_="$cur" sfx=" "
+
+	while test $# != 0; do
+		case "$1" in
+		--cur=*)	cur_="${1##--cur=}" ;;
+		--sfx=*)	sfx="${1##--sfx=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	case "$cur_" in
 	branch.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	branch.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
+		__gitcomp "autoSetupMerge autoSetupRebase" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	guitool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
 		__gitcomp "
-			argprompt cmd confirm needsfile noconsole norescan
-			prompt revprompt revunmerged title
-			" "$pfx" "$cur_"
+			argPrompt cmd confirm needsFile noConsole noRescan
+			prompt revPrompt revUnmerged title
+			" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	difftool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	man.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	mergetool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	pager.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__git_compute_all_commands
-		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_"
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	remote.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
 		__gitcomp "
 			url proxy fetch push mirror skipDefaultUpdate
-			receivepack uploadpack tagopt pushurl
-			" "$pfx" "$cur_"
+			receivepack uploadpack tagOpt pushurl
+			" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	remote.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushdefault" "$pfx" "$cur_"
+		__gitcomp "pushDefault" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	url.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" "$sfx"
+		return
+		;;
+	*.*)
+		__git_compute_config_vars
+		__gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
+		;;
+	*)
+		__git_compute_config_vars
+		__gitcomp_nl "$(echo "$__git_config_vars" |
+				awk -F . '{
+					sections[$1] = 1
+				}
+				END {
+					for (s in sections)
+						print s "."
+				}
+				')" "" "$cur_" ""
+		;;
+	esac
+}
+
+# Completes '='-separated configuration sections/variable names and values
+# for 'git -c section.name=value'.
+#
+# Usage: __git_complete_config_variable_name_and_value [<option>]...
+# --cur=<word>: The current configuration section/variable name/value to be
+#               completed. Defaults to the current word to be completed.
+__git_complete_config_variable_name_and_value ()
+{
+	local cur_="$cur"
+
+	while test $# != 0; do
+		case "$1" in
+		--cur=*)	cur_="${1##--cur=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	case "$cur_" in
+	*=*)
+		__git_complete_config_variable_value \
+			--varname="${cur_%%=*}" --cur="${cur_#*=}"
+		;;
+	*)
+		__git_complete_config_variable_name --cur="$cur_" --sfx='='
+		;;
+	esac
+}
+
+_git_config ()
+{
+	case "$prev" in
+	--get|--get-all|--unset|--unset-all)
+		__gitcomp_nl "$(__git_config_get_set_variables)"
+		return
+		;;
+	*.*)
+		__git_complete_config_variable_value
 		return
 		;;
 	esac
-	__gitcomp "
-		add.ignoreErrors
-		advice.amWorkDir
-		advice.commitBeforeMerge
-		advice.detachedHead
-		advice.implicitIdentity
-		advice.pushAlreadyExists
-		advice.pushFetchFirst
-		advice.pushNeedsForce
-		advice.pushNonFFCurrent
-		advice.pushNonFFMatching
-		advice.pushUpdateRejected
-		advice.resolveConflict
-		advice.rmHints
-		advice.statusHints
-		advice.statusUoption
-		advice.ignoredHook
-		alias.
-		am.keepcr
-		am.threeWay
-		apply.ignorewhitespace
-		apply.whitespace
-		branch.autosetupmerge
-		branch.autosetuprebase
-		browser.
-		clean.requireForce
-		color.branch
-		color.branch.current
-		color.branch.local
-		color.branch.plain
-		color.branch.remote
-		color.decorate.HEAD
-		color.decorate.branch
-		color.decorate.remoteBranch
-		color.decorate.stash
-		color.decorate.tag
-		color.diff
-		color.diff.commit
-		color.diff.frag
-		color.diff.func
-		color.diff.meta
-		color.diff.new
-		color.diff.old
-		color.diff.plain
-		color.diff.whitespace
-		color.grep
-		color.grep.context
-		color.grep.filename
-		color.grep.function
-		color.grep.linenumber
-		color.grep.match
-		color.grep.selected
-		color.grep.separator
-		color.interactive
-		color.interactive.error
-		color.interactive.header
-		color.interactive.help
-		color.interactive.prompt
-		color.pager
-		color.showbranch
-		color.status
-		color.status.added
-		color.status.changed
-		color.status.header
-		color.status.localBranch
-		color.status.nobranch
-		color.status.remoteBranch
-		color.status.unmerged
-		color.status.untracked
-		color.status.updated
-		color.ui
-		commit.cleanup
-		commit.gpgSign
-		commit.status
-		commit.template
-		commit.verbose
-		core.abbrev
-		core.askpass
-		core.attributesfile
-		core.autocrlf
-		core.bare
-		core.bigFileThreshold
-		core.checkStat
-		core.commentChar
-		core.compression
-		core.createObject
-		core.deltaBaseCacheLimit
-		core.editor
-		core.eol
-		core.excludesfile
-		core.fileMode
-		core.fsyncobjectfiles
-		core.gitProxy
-		core.hideDotFiles
-		core.hooksPath
-		core.ignoreStat
-		core.ignorecase
-		core.logAllRefUpdates
-		core.loosecompression
-		core.notesRef
-		core.packedGitLimit
-		core.packedGitWindowSize
-		core.packedRefsTimeout
-		core.pager
-		core.precomposeUnicode
-		core.preferSymlinkRefs
-		core.preloadindex
-		core.protectHFS
-		core.protectNTFS
-		core.quotepath
-		core.repositoryFormatVersion
-		core.safecrlf
-		core.sharedRepository
-		core.sparseCheckout
-		core.splitIndex
-		core.sshCommand
-		core.symlinks
-		core.trustctime
-		core.untrackedCache
-		core.warnAmbiguousRefs
-		core.whitespace
-		core.worktree
-		credential.helper
-		credential.useHttpPath
-		credential.username
-		credentialCache.ignoreSIGHUP
-		diff.autorefreshindex
-		diff.external
-		diff.ignoreSubmodules
-		diff.mnemonicprefix
-		diff.noprefix
-		diff.renameLimit
-		diff.renames
-		diff.statGraphWidth
-		diff.submodule
-		diff.suppressBlankEmpty
-		diff.tool
-		diff.wordRegex
-		diff.algorithm
-		difftool.
-		difftool.prompt
-		fetch.recurseSubmodules
-		fetch.unpackLimit
-		format.attach
-		format.cc
-		format.coverLetter
-		format.from
-		format.headers
-		format.numbered
-		format.pretty
-		format.signature
-		format.signoff
-		format.subjectprefix
-		format.suffix
-		format.thread
-		format.to
-		gc.
-		gc.aggressiveDepth
-		gc.aggressiveWindow
-		gc.auto
-		gc.autoDetach
-		gc.autopacklimit
-		gc.logExpiry
-		gc.packrefs
-		gc.pruneexpire
-		gc.reflogexpire
-		gc.reflogexpireunreachable
-		gc.rerereresolved
-		gc.rerereunresolved
-		gc.worktreePruneExpire
-		gitcvs.allbinary
-		gitcvs.commitmsgannotation
-		gitcvs.dbTableNamePrefix
-		gitcvs.dbdriver
-		gitcvs.dbname
-		gitcvs.dbpass
-		gitcvs.dbuser
-		gitcvs.enabled
-		gitcvs.logfile
-		gitcvs.usecrlfattr
-		guitool.
-		gui.blamehistoryctx
-		gui.commitmsgwidth
-		gui.copyblamethreshold
-		gui.diffcontext
-		gui.encoding
-		gui.fastcopyblame
-		gui.matchtrackingbranch
-		gui.newbranchtemplate
-		gui.pruneduringfetch
-		gui.spellingdictionary
-		gui.trustmtime
-		help.autocorrect
-		help.browser
-		help.format
-		http.lowSpeedLimit
-		http.lowSpeedTime
-		http.maxRequests
-		http.minSessions
-		http.noEPSV
-		http.postBuffer
-		http.proxy
-		http.sslCipherList
-		http.sslVersion
-		http.sslCAInfo
-		http.sslCAPath
-		http.sslCert
-		http.sslCertPasswordProtected
-		http.sslKey
-		http.sslVerify
-		http.useragent
-		i18n.commitEncoding
-		i18n.logOutputEncoding
-		imap.authMethod
-		imap.folder
-		imap.host
-		imap.pass
-		imap.port
-		imap.preformattedHTML
-		imap.sslverify
-		imap.tunnel
-		imap.user
-		init.templatedir
-		instaweb.browser
-		instaweb.httpd
-		instaweb.local
-		instaweb.modulepath
-		instaweb.port
-		interactive.singlekey
-		log.date
-		log.decorate
-		log.showroot
-		mailmap.file
-		man.
-		man.viewer
-		merge.
-		merge.conflictstyle
-		merge.log
-		merge.renameLimit
-		merge.renormalize
-		merge.stat
-		merge.tool
-		merge.verbosity
-		mergetool.
-		mergetool.keepBackup
-		mergetool.keepTemporaries
-		mergetool.prompt
-		notes.displayRef
-		notes.rewrite.
-		notes.rewrite.amend
-		notes.rewrite.rebase
-		notes.rewriteMode
-		notes.rewriteRef
-		pack.compression
-		pack.deltaCacheLimit
-		pack.deltaCacheSize
-		pack.depth
-		pack.indexVersion
-		pack.packSizeLimit
-		pack.threads
-		pack.window
-		pack.windowMemory
-		pager.
-		pretty.
-		pull.octopus
-		pull.twohead
-		push.default
-		push.followTags
-		rebase.autosquash
-		rebase.stat
-		receive.autogc
-		receive.denyCurrentBranch
-		receive.denyDeleteCurrent
-		receive.denyDeletes
-		receive.denyNonFastForwards
-		receive.fsckObjects
-		receive.unpackLimit
-		receive.updateserverinfo
-		remote.pushdefault
-		remotes.
-		repack.usedeltabaseoffset
-		rerere.autoupdate
-		rerere.enabled
-		sendemail.
-		sendemail.aliasesfile
-		sendemail.aliasfiletype
-		sendemail.bcc
-		sendemail.cc
-		sendemail.cccmd
-		sendemail.chainreplyto
-		sendemail.confirm
-		sendemail.envelopesender
-		sendemail.from
-		sendemail.identity
-		sendemail.multiedit
-		sendemail.signedoffbycc
-		sendemail.smtpdomain
-		sendemail.smtpencryption
-		sendemail.smtppass
-		sendemail.smtpserver
-		sendemail.smtpserveroption
-		sendemail.smtpserverport
-		sendemail.smtpuser
-		sendemail.suppresscc
-		sendemail.suppressfrom
-		sendemail.thread
-		sendemail.to
-		sendemail.tocmd
-		sendemail.validate
-		sendemail.smtpbatchsize
-		sendemail.smtprelogindelay
-		showbranch.default
-		status.relativePaths
-		status.showUntrackedFiles
-		status.submodulesummary
-		submodule.
-		tar.umask
-		transfer.unpackLimit
-		url.
-		user.email
-		user.name
-		user.signingkey
-		web.browser
-		branch. remote.
-	"
+	case "$cur" in
+	--*)
+		__gitcomp_builtin config
+		;;
+	*)
+		__git_complete_config_variable_name
+		;;
+	esac
 }
 
 _git_remote ()
@@ -2672,7 +2745,7 @@ _git_remote ()
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
-			__gitcomp "--verbose"
+			__gitcomp_builtin remote
 			;;
 		*)
 			__gitcomp "$subcommands"
@@ -2683,33 +2756,33 @@ _git_remote ()
 
 	case "$subcommand,$cur" in
 	add,--*)
-		__gitcomp "--track --master --fetch --tags --no-tags --mirror="
+		__gitcomp_builtin remote_add
 		;;
 	add,*)
 		;;
 	set-head,--*)
-		__gitcomp "--auto --delete"
+		__gitcomp_builtin remote_set-head
 		;;
 	set-branches,--*)
-		__gitcomp "--add"
+		__gitcomp_builtin remote_set-branches
 		;;
 	set-head,*|set-branches,*)
 		__git_complete_remote_or_refspec
 		;;
 	update,--*)
-		__gitcomp "--prune"
+		__gitcomp_builtin remote_update
 		;;
 	update,*)
-		__gitcomp "$(__git_get_config_variables "remotes")"
+		__gitcomp_nl "$(__git_remotes) $(__git_get_config_variables "remotes")"
 		;;
 	set-url,--*)
-		__gitcomp "--push --add --delete"
+		__gitcomp_builtin remote_set-url
 		;;
 	get-url,--*)
-		__gitcomp "--push --all"
+		__gitcomp_builtin remote_get-url
 		;;
 	prune,--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin remote_prune
 		;;
 	*)
 		__gitcomp_nl "$(__git_remotes)"
@@ -2720,8 +2793,12 @@ _git_remote ()
 _git_replace ()
 {
 	case "$cur" in
+	--format=*)
+		__gitcomp "short medium long" "" "${cur##--format=}"
+		return
+		;;
 	--*)
-		__gitcomp "--edit --graft --format= --list --delete"
+		__gitcomp_builtin replace
 		return
 		;;
 	esac
@@ -2745,26 +2822,53 @@ _git_reset ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "--merge --mixed --hard --soft --patch --keep"
+		__gitcomp_builtin reset
 		return
 		;;
 	esac
 	__git_complete_refs
 }
 
+_git_restore ()
+{
+	case "$prev" in
+	-s)
+		__git_complete_refs
+		return
+		;;
+	esac
+
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
+		;;
+	--source=*)
+		__git_complete_refs --cur="${cur##--source=}"
+		;;
+	--*)
+		__gitcomp_builtin restore
+		;;
+	*)
+		if __git rev-parse --verify --quiet HEAD >/dev/null; then
+			__git_complete_index_file "--modified"
+		fi
+	esac
+}
+
+__git_revert_inprogress_options=$__git_sequencer_inprogress_options
+
 _git_revert ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
-		__gitcomp "--continue --quit --abort"
+		__gitcomp_opts "$__git_revert_inprogress_options"
 		return
 	fi
+	__git_complete_strategy && return
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--edit --mainline --no-edit --no-commit --signoff
-			--strategy= --strategy-option=
-			"
+		__gitcomp_builtin revert "" \
+			"$__git_revert_inprogress_options"
 		return
 		;;
 	esac
@@ -2775,7 +2879,7 @@ _git_rm ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
+		__gitcomp_builtin rm
 		return
 		;;
 	esac
@@ -2789,7 +2893,7 @@ _git_shortlog ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			$__git_log_common_options
 			$__git_log_shortlog_options
 			--numbered --summary --email
@@ -2818,9 +2922,18 @@ _git_show ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--color-moved=*)
+		__gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
+		return
+		;;
+	--color-moved-ws=*)
+		__gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
+		return
+		;;
 	--*)
-		__gitcomp "--pretty= --format= --abbrev-commit --oneline
-			--show-signature
+		__gitcomp_opts "--pretty= --format= --abbrev-commit --no-abbrev-commit
+			--oneline --show-signature
+			--expand-tabs --expand-tabs= --no-expand-tabs
 			$__git_diff_common_options
 			"
 		return
@@ -2833,78 +2946,118 @@ _git_show_branch ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--all --remotes --topo-order --date-order --current --more=
-			--list --independent --merge-base --no-name
-			--color --no-color
-			--sha1-name --sparse --topics --reflog
-			"
+		__gitcomp_builtin show-branch
 		return
 		;;
 	esac
 	__git_complete_revlist
 }
 
-_git_stash ()
+__gitcomp_directories ()
 {
-	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
-	local subcommands='push save list show apply clear drop pop create branch'
+	local _tmp_dir _tmp_completions _found=0
+
+	# Get the directory of the current token; this differs from dirname
+	# in that it keeps up to the final trailing slash.  If no slash found
+	# that's fine too.
+	[[ "$cur" =~ .*/ ]]
+	_tmp_dir=$BASH_REMATCH
+
+	# Find possible directory completions, adding trailing '/' characters,
+	# de-quoting, and handling unusual characters.
+	while IFS= read -r -d $'\0' c ; do
+		# If there are directory completions, find ones that start
+		# with "$cur", the current token, and put those in COMPREPLY
+		if [[ $c == "$cur"* ]]; then
+			COMPREPLY+=("$c/")
+			_found=1
+		fi
+	done < <(git ls-tree -z -d --name-only HEAD $_tmp_dir)
+
+	if [[ $_found == 0 ]] && [[ "$cur" =~ /$ ]]; then
+		# No possible further completions any deeper, so assume we're at
+		# a leaf directory and just consider it complete
+		__gitcomp_direct_append "$cur "
+	fi
+}
+
+_git_sparse_checkout ()
+{
+	local subcommands="list init set disable add reapply"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
-		case "$cur" in
-		--*)
-			__gitcomp "$save_opts"
+		__gitcomp "$subcommands"
+		return
+	fi
+
+	case "$subcommand,$cur" in
+	*,--*)
+		__gitcomp_builtin sparse-checkout_$subcommand "" "--"
+		;;
+	set,*|add,*)
+		if [ "$(__git config core.sparseCheckoutCone)" == "true" ] ||
+		[ -n "$(__git_find_on_cmdline --cone)" ]; then
+			__gitcomp_directories
+		fi
+	esac
+}
+
+_git_stash ()
+{
+	local subcommands='push list show apply clear drop pop create branch'
+	local subcommand="$(__git_find_on_cmdline "$subcommands save")"
+
+	if [ -z "$subcommand" ]; then
+		case "$((cword - __git_cmd_idx)),$cur" in
+		*,--*)
+			__gitcomp_builtin stash_push
 			;;
-		*)
-			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
-				__gitcomp "$subcommands"
-			fi
+		1,sa*)
+			__gitcomp "save"
+			;;
+		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"
-			;;
-		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 ()
 {
 	__git_has_doubledash && return
 
-	local subcommands="add status init deinit update summary foreach sync"
+	local subcommands="add status init deinit update set-branch set-url summary foreach sync absorbgitdirs"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
-			__gitcomp "--quiet"
+			__gitcomp_opts "--quiet"
 			;;
 		*)
 			__gitcomp "$subcommands"
@@ -2915,26 +3068,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_opts "--default --branch"
+		;;
 	summary,--*)
-		__gitcomp "--cached --files --summary-limit"
+		__gitcomp_opts "--cached --files --summary-limit"
 		;;
 	foreach,--*|sync,--*)
-		__gitcomp "--recursive"
+		__gitcomp_opts "--recursive"
 		;;
 	*)
 		;;
@@ -2960,6 +3116,7 @@ _git_svn ()
 			--log-window-size= --no-checkout --quiet
 			--repack-flags --use-log-author --localtime
 			--add-author-from
+			--recursive
 			--ignore-paths= --include-paths= $remote_opts
 			"
 		local init_opts="
@@ -2974,64 +3131,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"
 			;;
 		*)
 			;;
@@ -3041,11 +3198,11 @@ _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
-		-d|-v)
+		-d|--delete|-v|--verify)
 			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
 			return
 			;;
@@ -3071,11 +3228,7 @@ _git_tag ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--list --delete --verify --annotate --message --file
-			--sign --cleanup --local-user --force --column --sort=
-			--contains --no-contains --points-at --merged --no-merged --create-reflog
-			"
+		__gitcomp_builtin tag
 		;;
 	esac
 }
@@ -3085,29 +3238,133 @@ _git_whatchanged ()
 	_git_log
 }
 
+__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 |
+		sed -n -e '2,$ s/^worktree //p')"
+}
+
 _git_worktree ()
 {
-	local subcommands="add list lock prune unlock"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if [ -z "$subcommand" ]; then
+	local subcommands="add list lock move prune remove unlock"
+	local subcommand subcommand_idx
+
+	subcommand="$(__git_find_on_cmdline --show-idx "$subcommands")"
+	subcommand_idx="${subcommand% *}"
+	subcommand="${subcommand#* }"
+
+	case "$subcommand,$cur" in
+	,*)
 		__gitcomp "$subcommands"
-	else
-		case "$subcommand,$cur" in
-		add,--*)
-			__gitcomp "--detach"
+		;;
+	*,--*)
+		__gitcomp_builtin worktree_$subcommand
+		;;
+	add,*)	# usage: git worktree add [<options>] <path> [<commit-ish>]
+		# 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/reset.
+			__git_complete_refs
 			;;
-		list,--*)
-			__gitcomp "--porcelain"
+		-*)	# The previous word is an -o|--option without an
+			# unstuck argument: have to complete the path for
+			# the new worktree, so don't list anything, but let
+			# Bash fall back to filename completion.
 			;;
-		lock,--*)
-			__gitcomp "--reason"
-			;;
-		prune,--*)
-			__gitcomp "--dry-run --expire --verbose"
-			;;
-		*)
+		*)	# The previous word is not an --option, so it must
+			# be either the 'add' subcommand, the unstuck
+			# argument of an option (e.g. branch for -b|-B), or
+			# the path for the new worktree.
+			if [ $cword -eq $((subcommand_idx+1)) ]; then
+				# Right after the 'add' subcommand: have to
+				# complete the path, so fall back to Bash
+				# filename completion.
+				:
+			else
+				case "${words[cword-2]}" in
+				-b|-B)	# After '-b <branch>': have to
+					# complete the path, so fall back
+					# to Bash filename completion.
+					;;
+				*)	# After the path: have to complete
+					# the ref to be checked out.
+					__git_complete_refs
+					;;
+				esac
+			fi
 			;;
 		esac
+		;;
+	lock,*|remove,*|unlock,*)
+		__git_complete_worktree_paths
+		;;
+	move,*)
+		if [ $cword -eq $((subcommand_idx+1)) ]; then
+			# The first parameter must be an existing working
+			# tree to be moved.
+			__git_complete_worktree_paths
+		else
+			# The second parameter is the destination: it could
+			# be any path, so don't list anything, but let Bash
+			# fall back to filename completion.
+			:
+		fi
+		;;
+	esac
+}
+
+__git_complete_common () {
+	local command="$1"
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin "$command"
+		;;
+	esac
+}
+
+__git_cmds_with_parseopt_helper=
+__git_support_parseopt_helper () {
+	test -n "$__git_cmds_with_parseopt_helper" ||
+		__git_cmds_with_parseopt_helper="$(__git --list-cmds=parseopt)"
+
+	case " $__git_cmds_with_parseopt_helper " in
+	*" $1 "*)
+		return 0
+		;;
+	*)
+		return 1
+		;;
+	esac
+}
+
+__git_have_func () {
+	declare -f -- "$1" >/dev/null 2>&1
+}
+
+__git_complete_command () {
+	local command="$1"
+	local completion_func="_git_${command//-/_}"
+	if ! __git_have_func $completion_func &&
+		__git_have_func _completion_loader
+	then
+		_completion_loader "git-$command"
+	fi
+	if __git_have_func $completion_func
+	then
+		$completion_func
+		return 0
+	elif __git_support_parseopt_helper "$command"
+	then
+		__git_complete_common "$command"
+		return 0
+	else
+		return 1
 	fi
 }
 
@@ -3115,39 +3372,63 @@ __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
 
-	if [ -z "$command" ]; then
+	if [ -z "${command-}" ]; then
 		case "$prev" in
 		--git-dir|-C|--work-tree)
 			# these need a path argument, let's fall back to
 			# Bash filename completion
 			return
 			;;
-		-c|--namespace)
+		-c)
+			__git_complete_config_variable_name_and_value
+			return
+			;;
+		--namespace)
 			# we don't support completing these options' arguments
 			return
 			;;
 		esac
 		case "$cur" in
-		--*)   __gitcomp "
+		--*)
+			__gitcomp_opts "
 			--paginate
 			--no-pager
 			--git-dir=
@@ -3164,20 +3445,30 @@ __git_main ()
 			--help
 			"
 			;;
-		*)     __git_compute_porcelain_commands
-		       __gitcomp "$__git_porcelain_commands $(__git_aliases)" ;;
+		*)
+			if test -n "${GIT_TESTING_PORCELAIN_COMMAND_LIST-}"
+			then
+				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
+			else
+				local list_cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config
+
+				if test "${GIT_COMPLETION_SHOW_ALL_COMMANDS-}" = "1"
+				then
+					list_cmds=builtins,$list_cmds
+				fi
+				__gitcomp_nl "$(__git --list-cmds=$list_cmds)"
+			fi
+			;;
 		esac
 		return
 	fi
 
-	local completion_func="_git_${command//-/_}"
-	declare -f $completion_func >/dev/null 2>/dev/null && $completion_func && return
+	__git_complete_command "$command" && return
 
 	local expansion=$(__git_aliased_command "$command")
 	if [ -n "$expansion" ]; then
 		words[1]=$expansion
-		completion_func="_git_${expansion//-/_}"
-		declare -f $completion_func >/dev/null 2>/dev/null && $completion_func
+		__git_complete_command "$expansion"
 	fi
 }
 
@@ -3194,7 +3485,7 @@ __gitk_main ()
 	fi
 	case "$cur" in
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			$__git_log_common_options
 			$__git_log_gitk_options
 			$merge
@@ -3205,90 +3496,111 @@ __gitk_main ()
 	__git_complete_revlist
 }
 
-if [[ -n ${ZSH_VERSION-} ]]; then
-	echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
-
-	autoload -U +X compinit && compinit
-
-	__gitcomp ()
-	{
-		emulate -L zsh
-
-		local cur_="${3-$cur}"
-
-		case "$cur_" in
-		--*=)
-			;;
-		*)
-			local c IFS=$' \t\n'
-			local -a array
-			for c in ${=1}; do
-				c="$c${4-}"
-				case $c in
-				--*=*|*.) ;;
-				*) c="$c " ;;
-				esac
-				array[${#array[@]}+1]="$c"
-			done
-			compset -P '*[=:]'
-			compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
-			;;
-		esac
-	}
-
-	__gitcomp_direct ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -Q -- ${=1} && _ret=0
-	}
-
-	__gitcomp_nl ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
-	}
-
-	__gitcomp_file ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
-	}
-
-	_git ()
-	{
-		local _ret=1 cur cword prev
-		cur=${words[CURRENT]}
-		prev=${words[CURRENT-1]}
-		let cword=CURRENT-1
-		emulate ksh -c __${service}_main
-		let _ret && _default && _ret=0
-		return _ret
-	}
-
-	compdef _git git gitk
+if [[ -n ${ZSH_VERSION-} && -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
+	echo "ERROR: this script is obsolete, please see git-completion.zsh" 1>&2
 	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 ; }"
@@ -3296,25 +3608,70 @@ __git_complete ()
 		|| complete -o default -o nospace -F $wrapper $1
 }
 
-# wrapper for backwards compatibility
-_git ()
+# Setup the completion for git commands
+# 1: command or alias
+# 2: function to call (e.g. `git`, `gitk`, `git_fetch`)
+__git_complete ()
 {
-	__git_wrap__git_main
+	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
 }
 
-# wrapper for backwards compatibility
-_gitk ()
-{
-	__git_wrap__gitk_main
-}
+if ! git --list-cmds=main >/dev/null 2>&1; then
 
-__git_complete git __git_main
-__git_complete gitk __gitk_main
+	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 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-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 fsmonitor--daemon gc get-tar-commit-id grep gui gui--askpass hash-object help hook http-backend http-fetch http-push imap-send index-pack init init-db instaweb interpret-trailers legacy-rebase legacy-stash 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 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--helper receive-pack reflog relink remote remote-ext remote-fd remote-ftp remote-ftps remote-http remote-https remote-testsvn repack replace request-pull rerere reset restore rev-list rev-parse revert rm send-email send-pack serve sh-i18n--envsubst shell shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace submodule submodule--helper 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 fsmonitor--daemon gc grep hash-object help hook 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 ()
+	{
+		case "$1" in
+		--list-cmds=*)
+			while read -r -d ',' x; do
+				case "$x" in
+				nohelpers)
+					;;
+				alias)
+					;;
+				config)
+					;;
+				*)
+					echo ${__git_cmds[$x]}
+					;;
+				esac
+			done <<< "${1##--list-cmds=},"
+			return
+			;;
+		esac
+		git ${__git_C_args:+"${__git_C_args[@]}"} \
+			${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
+	}
+
+fi
+
+___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
+if [ "$OSTYPE" = cygwin ]; then
+	___git_complete git.exe __git_main
 fi
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index fd2b049db..1435548e0 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -66,15 +66,24 @@
 #     git           always compare HEAD to @{upstream}
 #     svn           always compare HEAD to your SVN upstream
 #
-# You can change the separator between the branch name and the above
-# state symbols by setting GIT_PS1_STATESEPARATOR. The default separator
-# is SP.
-#
 # By default, __git_ps1 will compare HEAD to your SVN upstream if it can
 # find one, or @{upstream} otherwise.  Once you have set
 # GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
 # setting the bash.showUpstream config variable.
 #
+# You can change the separator between the branch name and the above
+# state symbols by setting GIT_PS1_STATESEPARATOR. The default separator
+# is SP.
+#
+# When there is an in-progress operation such as a merge, rebase,
+# revert, cherry-pick, or bisect, the prompt will include information
+# related to the operation, often in the form "|<OPERATION-NAME>".
+#
+# When the repository has a sparse-checkout, a notification of the form
+# "|SPARSE" will be included in the prompt.  This can be shortened to a
+# single '?' character by setting GIT_PS1_COMPRESSSPARSESTATE, or omitted
+# by setting GIT_PS1_OMITSPARSESTATE.
+#
 # If you would like to see more information about the identity of
 # commits checked out as a detached HEAD, set GIT_PS1_DESCRIBE_STYLE
 # to one of these values:
@@ -88,7 +97,8 @@
 # If you would like a colored hint about the current dirty state, set
 # GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
 # the colored output of "git status -sb" and are available only when
-# using __git_ps1 for PROMPT_COMMAND or precmd.
+# using __git_ps1 for PROMPT_COMMAND or precmd in Bash,
+# but always available in Zsh.
 #
 # If you would like __git_ps1 to do nothing in the case when the current
 # directory is set up to be ignored by git, then set
@@ -105,7 +115,7 @@ __git_ps1_show_upstream ()
 {
 	local key value
 	local svn_remote svn_url_pattern count n
-	local upstream=git legacy="" verbose="" name=""
+	local upstream_type=git legacy="" verbose="" name=""
 
 	svn_remote=()
 	# get some config options from git-config
@@ -122,24 +132,25 @@ __git_ps1_show_upstream ()
 		svn-remote.*.url)
 			svn_remote[$((${#svn_remote[@]} + 1))]="$value"
 			svn_url_pattern="$svn_url_pattern\\|$value"
-			upstream=svn+git # default upstream is SVN if available, else git
+			upstream_type=svn+git # default upstream type is SVN if available, else git
 			;;
 		esac
 	done <<< "$output"
 
 	# parse configuration values
+	local option
 	for option in ${GIT_PS1_SHOWUPSTREAM}; do
 		case "$option" in
-		git|svn) upstream="$option" ;;
+		git|svn) upstream_type="$option" ;;
 		verbose) verbose=1 ;;
 		legacy)  legacy=1  ;;
 		name)    name=1 ;;
 		esac
 	done
 
-	# Find our upstream
-	case "$upstream" in
-	git)    upstream="@{upstream}" ;;
+	# Find our upstream type
+	case "$upstream_type" in
+	git)    upstream_type="@{upstream}" ;;
 	svn*)
 		# get the upstream from the "git-svn-id: ..." in a commit message
 		# (git-svn uses essentially the same procedure internally)
@@ -156,12 +167,12 @@ __git_ps1_show_upstream ()
 
 			if [[ -z "$svn_upstream" ]]; then
 				# default branch name for checkouts with no layout:
-				upstream=${GIT_SVN_ID:-git-svn}
+				upstream_type=${GIT_SVN_ID:-git-svn}
 			else
-				upstream=${svn_upstream#/}
+				upstream_type=${svn_upstream#/}
 			fi
-		elif [[ "svn+git" = "$upstream" ]]; then
-			upstream="@{upstream}"
+		elif [[ "svn+git" = "$upstream_type" ]]; then
+			upstream_type="@{upstream}"
 		fi
 		;;
 	esac
@@ -169,11 +180,11 @@ __git_ps1_show_upstream ()
 	# Find how many commits we are ahead/behind our upstream
 	if [[ -z "$legacy" ]]; then
 		count="$(git rev-list --count --left-right \
-				"$upstream"...HEAD 2>/dev/null)"
+				"$upstream_type"...HEAD 2>/dev/null)"
 	else
 		# produce equivalent output to --count for older versions of git
 		local commits
-		if commits="$(git rev-list --left-right "$upstream"...HEAD 2>/dev/null)"
+		if commits="$(git rev-list --left-right "$upstream_type"...HEAD 2>/dev/null)"
 		then
 			local commit behind=0 ahead=0
 			for commit in $commits
@@ -203,26 +214,26 @@ __git_ps1_show_upstream ()
 		*)	    # diverged from upstream
 			p="<>" ;;
 		esac
-	else
+	else # verbose, set upstream instead of p
 		case "$count" in
 		"") # no upstream
-			p="" ;;
+			upstream="" ;;
 		"0	0") # equal to upstream
-			p=" u=" ;;
+			upstream="|u=" ;;
 		"0	"*) # ahead of upstream
-			p=" u+${count#0	}" ;;
+			upstream="|u+${count#0	}" ;;
 		*"	0") # behind upstream
-			p=" u-${count%	0}" ;;
+			upstream="|u-${count%	0}" ;;
 		*)	    # diverged from upstream
-			p=" u+${count#*	}-${count%	*}" ;;
+			upstream="|u+${count#*	}-${count%	*}" ;;
 		esac
 		if [[ -n "$count" && -n "$name" ]]; then
 			__git_ps1_upstream_name=$(git rev-parse \
-				--abbrev-ref "$upstream" 2>/dev/null)
+				--abbrev-ref "$upstream_type" 2>/dev/null)
 			if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
-				p="$p \${__git_ps1_upstream_name}"
+				upstream="$upstream \${__git_ps1_upstream_name}"
 			else
-				p="$p ${__git_ps1_upstream_name}"
+				upstream="$upstream ${__git_ps1_upstream_name}"
 				# not needed anymore; keep user's
 				# environment clean
 				unset __git_ps1_upstream_name
@@ -234,7 +245,8 @@ __git_ps1_show_upstream ()
 
 # Helper function that is meant to be called from __git_ps1.  It
 # injects color codes into the appropriate gitstring variables used
-# to build a gitstring.
+# to build a gitstring. Colored variables are responsible for clearing
+# their own color.
 __git_ps1_colorize_gitstring ()
 {
 	if [[ -n ${ZSH_VERSION-} ]]; then
@@ -260,22 +272,23 @@ __git_ps1_colorize_gitstring ()
 	else
 		branch_color="$bad_color"
 	fi
-	c="$branch_color$c"
+	if [ -n "$c" ]; then
+		c="$branch_color$c$c_clear"
+	fi
+	b="$branch_color$b$c_clear"
 
-	z="$c_clear$z"
-	if [ "$w" = "*" ]; then
-		w="$bad_color$w"
+	if [ -n "$w" ]; then
+		w="$bad_color$w$c_clear"
 	fi
 	if [ -n "$i" ]; then
-		i="$ok_color$i"
+		i="$ok_color$i$c_clear"
 	fi
 	if [ -n "$s" ]; then
-		s="$flags_color$s"
+		s="$flags_color$s$c_clear"
 	fi
 	if [ -n "$u" ]; then
-		u="$bad_color$u"
+		u="$bad_color$u$c_clear"
 	fi
-	r="$c_clear$r"
 }
 
 # Helper function to read the first line of a file into a variable.
@@ -286,6 +299,37 @@ __git_eread ()
 	test -r "$1" && IFS=$'\r\n' read "$2" <"$1"
 }
 
+# see if a cherry-pick or revert is in progress, if the user has committed a
+# conflict resolution with 'git commit' in the middle of a sequence of picks or
+# reverts then CHERRY_PICK_HEAD/REVERT_HEAD will not exist so we have to read
+# the todo file.
+__git_sequencer_status ()
+{
+	local todo
+	if test -f "$g/CHERRY_PICK_HEAD"
+	then
+		r="|CHERRY-PICKING"
+		return 0;
+	elif test -f "$g/REVERT_HEAD"
+	then
+		r="|REVERTING"
+		return 0;
+	elif __git_eread "$g/sequencer/todo" todo
+	then
+		case "$todo" in
+		p[\ \	]|pick[\ \	]*)
+			r="|CHERRY-PICKING"
+			return 0
+		;;
+		revert[\ \	]*)
+			r="|REVERTING"
+			return 0
+		;;
+		esac
+	fi
+	return 1
+}
+
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)
 # when called from PS1 using command substitution
 # in this mode it prints text to add to bash PS1 prompt (includes branch name)
@@ -390,6 +434,13 @@ __git_ps1 ()
 		return $exit
 	fi
 
+	local sparse=""
+	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
+	   [ -z "${GIT_PS1_OMITSPARSESTATE-}" ] &&
+	   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
+		sparse="|SPARSE"
+	fi
+
 	local r=""
 	local b=""
 	local step=""
@@ -398,11 +449,7 @@ __git_ps1 ()
 		__git_eread "$g/rebase-merge/head-name" b
 		__git_eread "$g/rebase-merge/msgnum" step
 		__git_eread "$g/rebase-merge/end" total
-		if [ -f "$g/rebase-merge/interactive" ]; then
-			r="|REBASE-i"
-		else
-			r="|REBASE-m"
-		fi
+		r="|REBASE"
 	else
 		if [ -d "$g/rebase-apply" ]; then
 			__git_eread "$g/rebase-apply/next" step
@@ -417,10 +464,8 @@ __git_ps1 ()
 			fi
 		elif [ -f "$g/MERGE_HEAD" ]; then
 			r="|MERGING"
-		elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
-			r="|CHERRY-PICKING"
-		elif [ -f "$g/REVERT_HEAD" ]; then
-			r="|REVERTING"
+		elif __git_sequencer_status; then
+			:
 		elif [ -f "$g/BISECT_LOG" ]; then
 			r="|BISECTING"
 		fi
@@ -467,8 +512,10 @@ __git_ps1 ()
 	local i=""
 	local s=""
 	local u=""
+	local h=""
 	local c=""
-	local p=""
+	local p="" # short version of upstream state indicator
+	local upstream="" # verbose version of upstream state indicator
 
 	if [ "true" = "$inside_gitdir" ]; then
 		if [ "true" = "$bare_repo" ]; then
@@ -499,6 +546,11 @@ __git_ps1 ()
 			u="%${ZSH_VERSION+%}"
 		fi
 
+		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
+		   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
+			h="?"
+		fi
+
 		if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
 			__git_ps1_show_upstream
 		fi
@@ -506,6 +558,12 @@ __git_ps1 ()
 
 	local z="${GIT_PS1_STATESEPARATOR-" "}"
 
+	b=${b##refs/heads/}
+	if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
+		__git_ps1_branch_name=$b
+		b="\${__git_ps1_branch_name}"
+	fi
+
 	# NO color option unless in PROMPT_COMMAND mode or it's Zsh
 	if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
 		if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
@@ -513,14 +571,8 @@ __git_ps1 ()
 		fi
 	fi
 
-	b=${b##refs/heads/}
-	if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
-		__git_ps1_branch_name=$b
-		b="\${__git_ps1_branch_name}"
-	fi
-
-	local f="$w$i$s$u"
-	local gitstring="$c$b${f:+$z$f}$r$p"
+	local f="$h$w$i$s$u$p"
+	local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}"
 
 	if [ $pcmode = yes ]; then
 		if [ "${__git_printf_supports_v-}" != yes ]; then
diff --git a/plugins/gitfast/gitfast.plugin.zsh b/plugins/gitfast/gitfast.plugin.zsh
index 7b6b67e92..a6db0c6bd 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/gitfast/update b/plugins/gitfast/update
index 05054245f..feb13ff7e 100755
--- a/plugins/gitfast/update
+++ b/plugins/gitfast/update
@@ -1,9 +1,8 @@
 #!/bin/sh
 
-url="https://git.kernel.org/pub/scm/git/git.git/plain/contrib/completion"
-version="2.16.0"
+url="https://raw.githubusercontent.com/felipec/git-completion"
+version="1.3.7"
 
-curl -s -o _git "${url}/git-completion.zsh?h=v${version}" &&
-curl -s -o git-completion.bash "${url}/git-completion.bash?h=v${version}" &&
-curl -s -o git-prompt.sh "${url}/git-prompt.sh?h=v${version}" &&
-git apply updates.patch
+curl -s -o _git "${url}/v${version}/git-completion.zsh" &&
+curl -s -o git-completion.bash "${url}/v${version}/git-completion.bash" &&
+curl -s -o git-prompt.sh "${url}/v${version}/git-prompt.sh"
diff --git a/plugins/gitfast/updates.patch b/plugins/gitfast/updates.patch
deleted file mode 100644
index 28a31f859..000000000
--- a/plugins/gitfast/updates.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git b/plugins/gitfast/_git a/plugins/gitfast/_git
-index e2554130..a2e3bef5 100644
---- b/plugins/gitfast/_git
-+++ a/plugins/gitfast/_git
-@@ -30,7 +30,7 @@ if [ -z "$script" ]; then
- 	local -a locations
- 	local e
- 	locations=(
--		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
-+		"$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash"
- 		'/etc/bash_completion.d/git' # fedora, old debian
- 		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
- 		'/usr/share/bash-completion/git' # gentoo
-@@ -214,8 +214,10 @@ _git ()
- 
- 	if (( $+functions[__${service}_zsh_main] )); then
- 		__${service}_zsh_main
--	else
-+	elif (( $+functions[__${service}_main] )); then
- 		emulate ksh -c __${service}_main
-+	elif (( $+functions[_${service}] )); then
-+		emulate ksh -c _${service}
- 	fi
- 
- 	let _ret && _default && _ret=0
-diff --git b/plugins/gitfast/git-completion.bash a/plugins/gitfast/git-completion.bash
-index 9c8f7380..14012cab 100644
---- b/plugins/gitfast/git-completion.bash
-+++ a/plugins/gitfast/git-completion.bash
-@@ -2915,6 +2915,6 @@ __git_complete gitk __gitk_main
- # when the user has tab-completed the executable name and consequently
- # included the '.exe' suffix.
- #
--if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
-+if [[ "$OSTYPE" = cygwin* ]]; then
- __git_complete git.exe __git_main
- fi
-diff --git b/plugins/gitfast/git-prompt.sh a/plugins/gitfast/git-prompt.sh
-index 97eacd78..c1de34eb 100644
---- b/plugins/gitfast/git-prompt.sh
-+++ a/plugins/gitfast/git-prompt.sh
-@@ -502,9 +502,11 @@ __git_ps1 ()
- 
- 	local z="${GIT_PS1_STATESEPARATOR-" "}"
- 
--	# NO color option unless in PROMPT_COMMAND mode
--	if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
--		__git_ps1_colorize_gitstring
-+	# NO color option unless in PROMPT_COMMAND mode or it's Zsh
-+	if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-+		if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
-+			__git_ps1_colorize_gitstring
-+		fi
- 	fi
- 
- 	b=${b##refs/heads/}
diff --git a/plugins/github/README.md b/plugins/github/README.md
index 70b863f64..5d8b62501 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
@@ -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 #############################################################
diff --git a/plugins/globalias/README.md b/plugins/globalias/README.md
index 0b064105d..cd7fc3cb2 100644
--- a/plugins/globalias/README.md
+++ b/plugins/globalias/README.md
@@ -17,6 +17,9 @@ Then just press `SPACE` to trigger the expansion of a command you've written.
 If you only want to insert a space without expanding the command line, press
 `CTRL`+`SPACE`.
 
+if you would like to filter out any values from expanding set `GLOBALIAS_FILTER_VALUES` to
+an array of said values. See [Filtered values](#filtered-values).
+
 ## Examples
 
 #### Glob expressions
@@ -37,7 +40,6 @@ $ ls folder/file.json anotherfolder/another.json
 $ mkdir "`date -R`"
 # expands to
 $ mkdir Tue,\ 04\ Oct\ 2016\ 13:54:03\ +0300
-
 ```
 
 #### Aliases
@@ -60,3 +62,18 @@ $ S<space>
 # expands to:
 $ sudo systemctl
 ```
+
+#### Filtered values
+
+```
+# .zshrc
+alias l='ls -lh'
+alias la='ls --color=auto -lah'
+GLOBALIAS_FILTER_VALUES=(l)
+
+$ l<space>
+# does not expand
+$ la<space>
+# expands to:
+$ ls --color=auto -lah
+```
diff --git a/plugins/globalias/globalias.plugin.zsh b/plugins/globalias/globalias.plugin.zsh
index 9602a9606..bd27d589d 100644
--- a/plugins/globalias/globalias.plugin.zsh
+++ b/plugins/globalias/globalias.plugin.zsh
@@ -1,6 +1,12 @@
 globalias() {
-   zle _expand_alias
-   zle expand-word
+   # Get last word to the left of the cursor:
+   # (z) splits into words using shell parsing
+   # (A) makes it an array even if there's only one element
+   local word=${${(Az)LBUFFER}[-1]}
+   if [[ $GLOBALIAS_FILTER_VALUES[(Ie)$word] -eq 0 ]]; then
+      zle _expand_alias
+      zle expand-word
+   fi
    zle self-insert
 }
 zle -N globalias
diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index 23e00c295..9419127d8 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'
@@ -36,48 +33,31 @@ __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')
+
+  # can be built optionally
+  gcmds+=('ghostname')
 
   for gcmd in "${gcmds[@]}"; do
     # Do nothing if the command isn't found
     (( ${+commands[$gcmd]} )) || continue
     
     # This method allows for builtin commands to be primary but it's
-    # lost if hash -r or rehash -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
-}
-
-function rehash() {
-  if [[ "$*" =~ "-f" ]]; then
-    builtin rehash "$@"
-    __gnu_utils
-  else
-    builtin rehash "$@"
-  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
 }
 
+autoload -Uz add-zsh-hook
+add-zsh-hook preexec __gnu_utils_preexec
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"
diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 0a1b43c30..3b7d1e19f 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -11,20 +11,28 @@ 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 |
-| gog     | `go get`                | Downloads packages and then installs them to $GOPATH          |
-| 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                                                    |
-| 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 |
+| gow    | `go work`         | Work provides access to operations on workspaces              |
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 47b10988e..0dbaab069 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -1,274 +1,35 @@
-# install in /etc/zsh/zshrc or your personal .zshrc
+## completion
+compctl -g "*.go" gofmt # standard go tools
+compctl -g "*.go" gccgo # gccgo
 
 # 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
-
-# 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'
 alias gof='go fmt'
 alias gofa='go fmt ./...'
+alias gofx='go fix'
 alias gog='go get'
+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'
 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'
+alias gow='go work'
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..1f4be20b0 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 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)"
+  fi
 fi
diff --git a/plugins/gradle/_gradle b/plugins/gradle/_gradle
index e77b23cdb..770723d85 100644
--- a/plugins/gradle/_gradle
+++ b/plugins/gradle/_gradle
@@ -96,7 +96,7 @@ __gradle-generate-script-cache() {
         zle -R "Generating Gradle build script cache"
         # Cache all Gradle scripts
         local -a gradle_build_scripts
-        gradle_build_scripts=( $(find $project_root_dir -type f -name "*.gradle" -o -name "*.gradle.kts" 2>/dev/null | egrep -v "$script_exclude_pattern") )
+        gradle_build_scripts=( $(find $project_root_dir -type f -name "*.gradle" -o -name "*.gradle.kts" 2>/dev/null | grep -E -v "$script_exclude_pattern") )
         printf "%s\n" "${gradle_build_scripts[@]}" >| $cache_dir/$cache_name
     fi
 }
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/grc/README.md b/plugins/grc/README.md
new file mode 100644
index 000000000..515e87640
--- /dev/null
+++ b/plugins/grc/README.md
@@ -0,0 +1,15 @@
+# Generic Colouriser plugin
+
+This plugin adds wrappers for commands supported by [Generic Colouriser](https://github.com/garabik/grc):
+
+To use it, add `grc` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... grc)
+```
+
+## Commands
+
+The plugin sources the bundled alias generator from the installation, available at `/etc/grc.zsh`.
+The complete list of wrapped commands may vary depending on the installed version of `grc`, look
+at the file mentioned above (`/etc/grc.zsh`) to see which commands are wrapped.
diff --git a/plugins/grc/grc.plugin.zsh b/plugins/grc/grc.plugin.zsh
new file mode 100644
index 000000000..b709b9e02
--- /dev/null
+++ b/plugins/grc/grc.plugin.zsh
@@ -0,0 +1,17 @@
+#!/usr/bin/env zsh
+
+# common grc.zsh paths
+files=(
+  /etc/grc.zsh            # default
+  /usr/local/etc/grc.zsh  # homebrew
+)
+
+# verify the file is readable and source it
+for file in $files; do
+  if [[ -r "$file" ]]; then
+    source "$file"
+    break
+  fi
+done
+
+unset file files
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/hanami/README.md b/plugins/hanami/README.md
index 3ac8defbb..c9e09f4f2 100644
--- a/plugins/hanami/README.md
+++ b/plugins/hanami/README.md
@@ -1,32 +1,45 @@
-# Hanami Plugin #
-This plugin adds convenient ways to work with [Hanami](https://hanamirb.org/) via console.
+# Hanami Plugin
+
+This plugin adds convenient aliases to work with [Hanami](https://hanamirb.org/) via console.
 It's inspired by Rails plugin, so if you've used it, you'll feel like home.
 
-## Usage ##
+To use it, add `hanami` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... hanami)
+```
+
+## Usage
 
 For example, type `hc` into your console when you're within Hanami project directory to run
 the application console. Have a look at available shortcuts below. You can read more about
 these commands [on the official website](https://hanamirb.org/guides/command-line/applications/).
 
-## Aliases ##
+## Aliases
 
-| Alias | Command                   | Description                                             |
-|-------|---------------------------|---------------------------------------------------------|
-| HED   | HANAMI_ENV=development    | Set environment variable HANAMI_ENV to development      |
-| HEP   | HANAMI_ENV=production     | Set environment variable HANAMI_ENV to production       |
-| HET   | HANAMI_ENV=test           | Set environment variable HANAMI_ENV to test             |
-| hc    | hanami console            | Run application console                                 |
-| hd    | hanami destroy            | Remove specified hanami resource                        |
-| hg    | hanami generate           | Create specified hanami resource                        |
-| hgm   | hanami generate migration | Create migration file                                   |
-| hs    | hanami server             | Launch server with hanami application                   |
-| hsp   | hanami server -p          | Launch server with specified port                       |
-| hr    | hanami routes             | List application routes                                 |
-| hdc   | hanami db create          | Create application database                             |
-| hdd   | hanami db drop            | Delete application database                             |
-| hdp   | hanami db prepare         | Prepare database for the current environment            |
-| hda   | hanami db apply           | Recreates a fresh schema after migrations (destructive) |
-| hdv   | hanami db version         | Print current database version                          |
-| hdrs  | hdd && hdp                | Drop and recreate application database                  |
-| hdtp  | HET hdp                   | Actualize test environment database                     |
-| hrg   | hr &#124; grep            | Grep hanami routes with specified pattern               |
+| Alias | Command                     | Description                                             |
+|-------|-----------------------------|---------------------------------------------------------|
+| HED\* | `HANAMI_ENV=development`    | Set environment variable HANAMI_ENV to development      |
+| HEP\* | `HANAMI_ENV=production`     | Set environment variable HANAMI_ENV to production       |
+| HET\* | `HANAMI_ENV=test`           | Set environment variable HANAMI_ENV to test             |
+| hc    | `hanami console`            | Run application console                                 |
+| hd    | `hanami destroy`            | Remove specified hanami resource                        |
+| hg    | `hanami generate`           | Create specified hanami resource                        |
+| hgm   | `hanami generate migration` | Create migration file                                   |
+| hs    | `hanami server`             | Launch server with hanami application                   |
+| hsp   | `hanami server -p`          | Launch server with specified port                       |
+| hr    | `hanami routes`             | List application routes                                 |
+| hdc   | `hanami db create`          | Create application database                             |
+| hdd   | `hanami db drop`            | Delete application database                             |
+| hdp   | `hanami db prepare`         | Prepare database for the current environment            |
+| hda   | `hanami db apply`           | Recreates a fresh schema after migrations (destructive) |
+| hdv   | `hanami db version`         | Print current database version                          |
+| hdrs  | `hdd && hdp`                | Drop and recreate application database                  |
+| hdtp  | `HET hdp`                   | Actualize test environment database                     |
+| hrg   | `hr | grep`                 | Grep hanami routes with specified pattern               |
+
+\* You should use these at the beginning of a command, for example:
+
+```console
+$ HED hdd # equivalent to 'HANAMI_ENV=development hanami db drop'
+```
diff --git a/plugins/hanami/hanami.plugin.zsh b/plugins/hanami/hanami.plugin.zsh
index 349c42cae..42143b428 100644
--- a/plugins/hanami/hanami.plugin.zsh
+++ b/plugins/hanami/hanami.plugin.zsh
@@ -1,6 +1,6 @@
-alias -g HED='HANAMI_ENV=development'
-alias -g HEP='HANAMI_ENV=production'
-alias -g HET='HANAMI_ENV=test'
+alias HED='HANAMI_ENV=development '
+alias HEP='HANAMI_ENV=production '
+alias HET='HANAMI_ENV=test '
 
 alias hc='hanami console'
 alias hd='hanami destroy'
diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index 78499c15d..151c43d88 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -1,7 +1,13 @@
-# Autocompletion for helm.
-#
-# Copy from kubectl : https://github.com/pstadler
-
-if [ $commands[helm] ]; then
-  source <(helm completion zsh)
+if (( ! $+commands[helm] )); then
+  return
+fi
+
+# 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 | tee "$ZSH_CACHE_DIR/completions/_helm" >/dev/null
+  source "$ZSH_CACHE_DIR/completions/_helm"
+else
+  source "$ZSH_CACHE_DIR/completions/_helm"
+  helm completion zsh | tee "$ZSH_CACHE_DIR/completions/_helm" >/dev/null &|
 fi
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
diff --git a/plugins/history-substring-search/history-substring-search.plugin.zsh b/plugins/history-substring-search/history-substring-search.plugin.zsh
index d2c749bc3..63f0bdd42 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/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/hitchhiker/.gitignore b/plugins/hitchhiker/.gitignore
new file mode 100644
index 000000000..63c2b54c4
--- /dev/null
+++ b/plugins/hitchhiker/.gitignore
@@ -0,0 +1 @@
+fortunes/hitchhiker.dat
diff --git a/plugins/hitchhiker/README.md b/plugins/hitchhiker/README.md
new file mode 100644
index 000000000..d12a1e93f
--- /dev/null
+++ b/plugins/hitchhiker/README.md
@@ -0,0 +1,44 @@
+# hitchhiker
+
+This plugin adds quotes from The Hitchhiker's Guide to the Galaxy, from Douglas Adams.
+
+To use it, add `hitchhiker` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... hitchhiker)
+```
+
+## Aliases
+
+- `hitchhiker`: displays a quote from the book using `fortune`.
+- `hitchhiker_cow`: displays a quote from the book using `cowthink`.
+
+```console
+$ hitchhiker_cow
+ _______________________________________
+( "OK, so ten out of ten for style, but )
+( minus several million for good        )
+( thinking, yeah? "                     )
+ ---------------------------------------
+        o   ^__^
+         o  (oo)\_______
+            (__)\       )\/\
+                ||----w |
+                ||     ||
+```
+
+## Requirements
+
+- `fortune` and `strfile`.
+- `cowthink` if using the `hitchhiker_cow` command.
+
+## Credits
+
+Fortune file: Andreas Gohr <andi@splitbrain.org> ([splitbrain.org](https://www.splitbrain.org/projects/fortunes/hg2g))
+
+Spelling and formatting fixes: grok@resist.ca
+
+Original quotes from:
+
+- https://web.archive.org/web/20120106083254/http://tatooine.fortunecity.com/vonnegut/29/hitch/parhaat.html
+- https://web.archive.org/web/20011112065737/http://www-personal.umd.umich.edu/~nhughes/dna/faqs/quotedir.html
diff --git a/plugins/hitchhiker/fortunes/hitchhiker b/plugins/hitchhiker/fortunes/hitchhiker
new file mode 100644
index 000000000..825b86cd6
--- /dev/null
+++ b/plugins/hitchhiker/fortunes/hitchhiker
@@ -0,0 +1,275 @@
+"`...You hadn't exactly gone out of your way to call attention to them had you? I mean like actually telling anyone or anything.' `But the plans were on display...' `On display? I eventually had to go down to the cellar to find them.' `That's the display department.' `With a torch.' `Ah, well the lights had probably gone.' `So had the stairs.' `But look you found the notice didn't you?' `Yes,' said Arthur, `yes I did. It was on display in the bottom of a locked filing cabinet stuck in a disused lavatory with a sign on the door saying "Beware of The Leopard".'"
+
+- Arthur singing the praises of the local council planning department.
+%
+"`Time is an illusion. Lunchtime doubly so.' `Very deep,' said Arthur, `you should send that in to the "Reader's Digest". They've got a page for people like you.'"
+
+- Ford convincing Arthur to drink three pints in ten minutes at lunchtime.
+%
+"`This must be Thursday,' said Arthur to himself, sinking low over his beer, `I never could get the hang of Thursdays.'"
+
+- Arthur, on what was to be his last Thursday on Earth.
+%
+"Pages one and two [of Zaphod's presidential speech] had been salvaged by a Damogran Frond Crested Eagle and had already become incorporated into an extraordinary new form of nest which the eagle had invented. It was constructed largely of papier mache and it was virtually impossible for a newly hatched baby eagle to break out of it. The Damogran Frond Crested Eagle had heard of the notion of survival of the species but wanted no truck with it."
+
+- An example of Damogran wildlife.
+%
+"`How do you feel?' he asked him. `Like a military academy,' said Arthur, `bits of me keep passing out.'" .... `We're safe,' he said. `Oh good,' said Arthur. `We're in a small galley cabin,' said Ford, `in one of the spaceships of the Vogon Constructor Fleet.' `Ah,' said Arthur, `this is obviously some strange usage of the word "safe" that I wasn't previously aware of.'
+
+- Arthur after his first ever teleport ride.
+%
+"`The best way to get a drink out of a Vogon is to stick your finger down his throat...'"
+
+- The Book, on one of the Vogon's social inadequacies.
+%
+"`You'd better be prepared for the jump into hyperspace. It's unpleasantly like being drunk.' `What's so unpleasant about being drunk?' `You ask a glass of water.'"
+
+- Arthur getting ready for his first jump into hyperspace.
+%
+"`You know,' said Arthur, `it's at times like this, when I'm trapped in a Vogon airlock with a man from Betelgeuse, and about to die from asphyxiation in deep space that I really wish I'd listened to what my mother told me when I was young.' `Why, what did she tell you?' `I don't know, I didn't listen.'"
+
+- Arthur coping with certain death as best as he could.
+%
+"`Ford, you're turning into a penguin. Stop it.'"
+
+- Arthur experiences the improbability drive at work.
+%
+"`I think you ought to know that I'm feeling very depressed.'" "`Life, don't talk to me about life.'" "`Here I am, brain the size of a planet and they ask me to take you down to the bridge. Call that "job satisfaction"? 'Cos I don't.'" "`I've got this terrible pain in all the diodes down my left side.'"
+
+- Guess who.
+%
+"`If there's anything more important than my ego around, I want it caught and shot now.'"
+
+- Zaphod.
+%
+"`In those days spirits were brave, the stakes were high, men were REAL men, women were REAL women, and small furry creatures from Alpha Centauri were REAL small furry creatures from Aplha Centauri.'"
+
+- The Book getting all nostalgic.
+%
+"`Hey this is terrific!' Zaphod said. `Someone down there is trying to kill us!' `Terrific,' said Arthur. `But don't you see what this means?' `Yes. We are going to die.' `Yes, but apart from that.' `APART from that?' `It means we must be on to something!' `How soon can we get off it?'"
+
+- Zaphod and Arthur in a certain death situation over Magrathea.
+%
+"And wow! Hey! What's this thing coming towards me very fast? Very very fast. So big and flat and round, it needs a big wide sounding word like... ow... ound... round... ground! That's it! That's a good name - ground! I wonder if it will be friends with me?"
+
+- For the sperm whale, it wasn't.
+%
+"Oh no, not again."
+
+- A bowl of petunias on it's way to certain death.
+%
+"`Er, hey Earthman...' `Arthur,' said Arthur. `Yeah, could you just sort of keep this robot with you and guard this end of the passageway. OK?' `Guard?' said Arthur. `What from? You just said there's no one here.' `Yeah, well, just for safety, OK?' said Zaphod. `Whose? Yours or mine?'"
+
+- Arthur drawing the short straw on Magrathea.
+%
+"There are of course many problems connected with life, of which some of the most popular are `Why are people born?' `Why do they die?' `Why do they spend so much of the intervening time wearing digital watches?'"
+
+- The Book.
+%
+"`Right,' said Ford, `I'm going to have a look.' He glanced round at the others. `Is no one going to say, "No you can't possibly, let me go instead"?' They all shook their heads. `Oh well.'"
+
+- Ford attempting to be heroic whilst being seiged by Shooty and Bangbang.
+%
+"In the beginning the Universe was created. This has made a lot of people very angry and been widely regarded as a bad move." - The Book just recapping what happened in the last book. "`I am so amazingly cool you could keep a side of meat in me for a month. I am so hip I have difficulty seeing over my pelvis.'"
+
+- Zaphod being cool.
+%
+"`You ARE Zaphod Beeblebrox?' `Yeah,' said Zaphod, `but don't shout it out or they'll all want one.' `THE Zaphod Beeblebrox?' `No, just A Zaphod Bebblebrox, didn't you hear I come in six packs?' `But sir,' it squealed, `I just heard on the sub-ether radio report. It said you were dead...' `Yeah, that's right, I just haven't stopped moving yet.'"
+
+- Zaphod and the Guide's receptionist.
+%
+"The fronting for the eighty-yard-long marble-topped bar had been made by stitching together nearly twenty thousand Antarean Mosaic Lizard skins, despite the fact that the twenty thousand lizards concerned had needed them to keep their insides in."
+
+- The Book decribing Milliways' politically incorrect decor.
+%
+"`...and the Universe,' continued the waiter, determined not to be deflected on his home stretch, `will explode later for your pleasure.' Ford's head swivelled slowly towards him. He spoke with feeling. `Wow,' he said, `What sort of drinks do you serve in this place?' The waiter laughed a polite little waiter's laugh. `Ah,' he said, `I think sir has perhaps misunderstood me.' `Oh, I hope not,' breathed Ford."
+
+- Ford in paradise.
+%
+"Zaphod grinned two manic grins, sauntered over to the bar and bought most of it."
+
+- Zaphod in paradise.
+%
+"`Maybe somebody here tipped off the Galactic Police,' said Trillian. `Everybody saw you come in.' `You mean they want to arrest me over the phone?' said Zaphod, `Could be. I'm a pretty dangerous dude when I'm cornered.' `Yeah,' said a voice from under the table [Ford's now completely rat-arsed at this point], `you go to pieces so fast people get hit by the shrapnel.'"
+
+- Zaphod getting paranoid over a phone call.
+%
+"`Hand me the rap-rod, Plate Captain.' The little waiter's eyebrows wandered about his forehead in confusion. `I beg your pardon, sir?' he said. `The phone, waiter,' said Zaphod, grabbing it off him. `Shee, you guys are so unhip it's a wonder your bums don't fall off.'"
+
+- Zaphod discovers that waiters are the least hip people in the Universe.
+%
+"The main reception foyer was almost empty but Ford nevertheless weaved his way through it."
+
+- Ford making his way out of Milliways whilst under the influence of enough alcohol to make a rhino sing.
+%
+"`The first ten million years were the worst,' said Marvin, `and the second ten million, they were the worst too. The third ten million I didn't enjoy at all. After that I went into a bit of a decline.'"
+
+- Marvin reflecting back on his 576,000,003,579 year career as Milliways' car park attendent.
+%
+"`Incidentally,' he said, `what does teleport mean?' Another moment passed. Slowly, the others turned to face him. `Probably the wrong moment to ask,' said Arthur, `It's just I remember you use the word a short while ago and I only bring it up because...' `Where,' said Ford quietly, `does it say teleport?' `Well, just over here in fact,' said Arthur, pointing at a dark control box in the rear of the cabin, `Just under the word "emergency", above the word "system" and beside the sign saying "out of order".'"
+
+- Arthur finding an escape route from a certain death situation.
+%
+"I teleported home one night With Ron and Sid and Meg. Ron stole Meggie's heart away And I got Sidney's leg."
+
+- A poem about matter transference beams.
+%
+"Anyone who is capable of getting themselves made President should on no account be allowed to do the job."
+
+- Some wisdom from The Book.
+%
+"`We've got to find out what people want from fire, how they relate to it, what sort of image it has for them.' The crowd were tense. They were expecting something wonderful from Ford. `Stick it up your nose,' he said. `Which is precisely the sort of thing we need to know,' insisted the girl, `Do people want fire that can be fitted nasally?'"
+
+- Ford "debating" what to do with fire with a marketing girl.
+%
+"The story goes that I first had the idea for THHGTTG while lying drunk in a field in Innsbruck (or `Spain' as the BBC TV publicity department authoritatively has it, probably because it's easier to spell)." - Foreward by DNA.
+
+FORD 	Six pints of bitter. And quickly please, the world's about to 	end. BARMAN	Oh yes, sir? Nice weather for it.
+%
+BOOK	Meanwhile, the starship has landed on the surface of Magrathea 	and Trillian is about to make one of the most important 	statements of her life. Its importance is not immediately 	recognised by her companions. TRILL.	Hey, my white mice have escaped. ZAPHOD	Nuts to your white mice.
+%
+BOOK	...Man had always assumed that he was more intelligent than 	dolphins because he had achieved so much... the wheel, New York, 	wars, and so on, whilst all the dolphins had ever done was muck 	about in the water having a good time. But conversely the 	dolphins believed themselves to be more intelligent than man for 	precisely the same reasons.
+%
+ARTHUR	What is an Algolian Zylatburger anyway? FORD	They're a kind of meatburger made from the most unpleasant parts 	of a creature well known for its total lack of any pleasant 	parts. ARTHUR	So you mean that the Universe does actually end not with a bang 	but with a Wimpy?
+
+- Cut dialogue from Fit the Fifth.
+%
+BOOK	There is a theory which states that if ever anyone discovers 	exactly what the Universe is for and why it is here, it will 	instantly disappear and be replaced by something even more 	bizarrely inexplicable. 	There is another theory which states that this has already happened.
+
+- Introduction to Fit the Seventh.
+%
+FORD	Tell me Arthur... ARTHUR	Yes? FORD	This boulder we're stuck under, how big would you say it was? Roughly? ARTHUR	Oh, about the size of Coventry Cathedral. FORD	Do you think we could move it? (Arthur doesn't reply) Just asking.
+
+- Ford and Arthur in a tricky situation, Fit the Eighth.
+%
+BOOK	What to do if you find yourself stuck in a crack in the ground 	underneath a giant boulder you can't move, with no hope of 	rescue. Consider how lucky you are that life has been good to 	you so far. Alternatively, if life hasn't been good to you so 	far, which given your current circumstances seems more likely, 	consider how lucky you are that it won't be troubling you much 	longer.
+
+- Comforting advice for Ford and Arthur in this current situation, Fit the Eighth.
+%
+ZAPHOD	Hey, this rock... FORD	Marble... ZAPHOD	Marble... FORD	Ice-covered marble... ZAPHOD	Right... it's as slippery as... as... What's the slipperiest 	thing you can think of? FORD	At the moment? This marble. ZAPHOD	Right. This marble is as slippery as this marble.
+
+- Zaphod and Ford trying to get a grip on things in Brontitall, Fit the Tenth.
+%
+ARTHUR	It's not a question of whose habitat it is, it's a 	question of how hard you hit it.
+
+- Arthur pointing out one of the disadvantages of gravity, Fit the Tenth.
+%
+ARTHUR	It probably seems a terrible thing to say, but you 	know what I sometimes think would be useful in these situations? LINT.	What? ARTHUR	A gun of some sort. LINT.2	Will this help? ARTHUR	What is it? LINT.2	A gun of some sort. ARTHUR	Oh, that'll help. Can you make it fire? LINT.	Er... F/X	DEAFENING ROAR LINT.	Yes.
+
+- Arthur and the Lintillas gaining the upper hand, Fit the Twelfth.
+%
+"He stood up straight and looked the world squarely in the fields and hills. To add weight to his words he stuck the rabbit bone in his hair. He spread his arms out wide. `I will go mad!' he announced."
+
+- Arthur discovering a way of coping with life on Prehistoric Earth.
+%
+"`... then I decided that I was a lemon for a couple of weeks. I kept myself amused all that time jumping in and out of a gin and tonic.' Arthur cleared his throat, and then did it again. `Where,' he said, `did you...?' `Find a gin and tonic?' said Ford brightly. `I found a small lake that thought it was a gin and tonic, and jumped in and out of that. At least, I think it thought it was a gin and tonic.' `I may,' he addded with a grin which would have sent sane men scampering into the trees, `have been imagining it.'"
+
+- Ford updating Arthur about what he's been doing for the past four years.
+%
+"`Eddies,' said Ford, `in the space-time continuum.' `Ah,' nodded Arthur, `is he? Is he?'"
+
+- Arthur failing in his first lesson of galactic physics in four years.
+%
+"Ford grabbed him by the lapels of his dressing gown and spoke to him as slowly and distinctly and patiently as if he were somebody from a telephone company accounts department."
+
+- Ford trying to rectify that situation.
+%
+"...[Arthur] leapt to his feet like an author hearing the phone ring..."
+
+- Who says that the character of Arthur isn't autobiographical?
+%
+"Arthur's consciousness approached his body as from a great distance, and reluctantly. It had had some bad times in there. Slowly, nervously, it entered and settled down into its accustomed position. Arthur sat up. `Where am I?' he said. `Lord's Cricket Ground,' said Ford. `Fine,' said Arthur, and his consciousness stepped out again for a quick breather. His body flopped back on the grass."
+
+- Arthur coping with his return to Earth as best as he could.
+%
+"`A curse,' said Slartibartfast, `which will engulf the Galaxy in fire and destruction, and possibly bring the Universe to a premature doom. I mean it,' he added. `Sounds like a bad time,' said Ford, `with luck I'll be drunk enough not to notice.'"
+
+- Ford ensuring everyone knew where his priorities lay.
+%
+"`My doctor says that I have a malformed public-duty gland and a natural deficiency in moral fibre, and that I am therefore excused from saving Universes.'"
+
+- Ford's last-ditch attempt to get out of helping Slartibartfast.
+%
+"Trillian did a little research in the ship's copy of THHGTTG. It had some advice to offer on drunkenness. `Go to it,' it said, `and good luck.' It was cross-referenced to the entry concerning the size of the Universe and ways of coping with that."
+
+- One of the more preferable pieces of advice contained in the Guide.
+%
+"His eyes seemed to be popping out of his head. He wasn't certain if this was because they were trying to see more clearly, or if they simply wanted to leave at this point."QUOTEHERESTRINGMAGIC1234- Arthur trying to see who had diverted him from going to a party.
+%
+"Arthur yawed wildly as his skin tried to jump one way and his skeleton the other, whilst his brain tried to work out which of his ears it most wanted to crawl out of. `Bet you weren't expecting to see me again,' said the monster, which Arthur couldn't help thinking was a strange remark for it to make, seeing as he had never met the creature before. He could tell that he hadn't met the creature before from the simple fact that he was able to sleep at nights."QUOTEHERESTRINGMAGIC1234- Arthur discovering who had diverted him from going to a party.
+%
+"`That young girl is one of the least benightedly unintelligent organic life forms it has been my profound lack of pleasure not to be able to avoid meeting.'"QUOTEHERESTRINGMAGIC1234- Marvin's first ever compliment about anybody.
+%
+"Arthur hoped and prayed that there wasn't an afterlife. Then he realised there was a contradiction there and merely hoped that there wasn't an afterlife."QUOTEHERESTRINGMAGIC1234- Arthur realising that he's in a certain death situation with a supernova bomb that is shaped like a cricket ball.
+%
+"`Credit?' he said. `Aaaargggh...' These two words are usually coupled together in the Old Pink Dog Bar."QUOTEHERESTRINGMAGIC1234- Ford in a spot of bother.
+%
+"`...we might as well start with where your hand is now.' Arthur said, `So which way do I go?' `Down,' said Fenchurch, `on this occasion.' He moved his hand. `Down,' she said, `is in fact the other way.' `Oh yes.'"QUOTEHERESTRINGMAGIC1234- Arthur trying to discover which part of Fenchurch is wrong.
+%
+"There was a point to this story, but it has temporarily escaped the chronicler's mind."QUOTEHERESTRINGMAGIC1234- This line perhaps best sums up the whole book.
+%
+"The last time anybody made a list of the top hundred character attributes of New Yorkers, common sense snuck in at number 79. .... When it's fall in New York, the air smells as if someone's been frying goats in it, and if you are keen to breathe the best plan is to open a window and stick your head in a building."QUOTEHERESTRINGMAGIC1234- Nuff said??
+%
+"`What's been happening here?' he demanded. `Oh just the nicest things, sir, just the nicest things. can I sit on your lap please?'" "`Colin, I am going to abandon you to your fate.' `I'm so happy.'" "`It will be very, very nasty for you, and that's just too bad. Got it?' `I gurgle with pleasure.'"QUOTEHERESTRINGMAGIC1234- Ford and Colin the robot.
+%
+"What the hell, he thought, you're only young once, and threw himself out of the window. That would at least keep the element of surprise on his side."QUOTEHERESTRINGMAGIC1234- Ford outwitting a Vogon with a rocket launcher by going into another certain death situation.
+%
+"The major difference between a thing that might go wrong and a thing that cannot possibly go wrong is that when a thing that cannot possibly go wrong goes wrong it usually turns out to be impossible to get at or repair."QUOTEHERESTRINGMAGIC1234- One of the laws of computers and programming revealed.
+%
+"`You know they've reintroduced the death penalty for insurance company directors?' `Really?' said Arthur. `No I didn't. For what offence?' Trillian frowned. `What do you mean, offence?' `I see.'"QUOTEHERESTRINGMAGIC1234- Evidence that there will be some justice in the Universe eventually.
+%
+"`She hit me on the head with the rock again.' `I think I can confirm that that was my daughter.' `Sweet kid.' `You have to get to know her,' said Arthur. `She eases up does she?' `No,' said Arthur, `but you get a better sense of when to duck.'"QUOTEHERESTRINGMAGIC1234- Ford and Arthur on Random.
+%
+"Far out in the uncharted backwaters of the unfashionable end of the western spiral arm of the Galaxy lies a small unregarded yellow sun. "
+%
+"Ah, " said Arthur, "this is obviously some strange usage of the word safe that I wasn't previously aware of. "
+%
+"I don't know, " said the voice on the PA, "apathetic bloody planet, I've no sympathy at all. "
+%
+"Now it is such a bizarrely improbable coincidence that anything so mindboggingly useful could have evolved purely by chance that some thinkers have chosen to see it as the final and clinching proof of the non-existence of God. "The argument goes something like this: `I refuse to prove that I exist,' says God, `for proof denies faith, and without faith I am nothing.' "`But,' says Man, `The Babel fish is a dead giveaway, isn't it? It could not have evolved by chance. It proves you exist, and so therefore, by your own arguments, you don't. QED.'
+%
+"Prostetnic Vogon Jeltz smiled very slowly. This was done not so much for effect as because he was trying to remember the sequence of muscle movements. "
+%
+"OK, so ten out of ten for style, but minus several million for good thinking, yeah? "
+%
+"In those days spirits were brave, the stakes were high, men were real men, women were real women, and small furry creatures from Alpha Centauri were real small furry creatures from Alpha Centauri. "
+%
+"For a moment, nothing happened. Then, after a second or so, nothing continued to happen. "
+%
+(aikamuotojen k�ytt� aikamatkustuksessa) "You can arrive (mayan arivan on-when) for any sitting you like without prior (late fore-when) reservation because you can book retrospectively, as it were when you return to your own time. (you can have on-book haventa forewhen presooning returningwenta retrohome.) "
+%
+"The suit into which the man's body had been stuffed looked as if it's only purpose in life was to demonstrate how difficult it was to get this sort of body into a suit. "
+%
+"He dropped his voice still lower. In the stillness, a fly would not have dared clear its throat. "
+%
+"And finally, " said Max, quieting the audience down and putting on his solemn face, "finally I believe we have with us here tonight, a party of believers, very devout believers, from the Church of the Second Coming of the Great Prophet Zarquon. " ... "There they are, " said Max, "sitting there, patiently. He said he'd come again, and he's kept you waiting a long time, so let's hope he's hurrying fellas, because he's only got eight minutes left! "
+%
+"As he came into the light they could see his black and gold uniform on which the buttons were so highly polished that they shone with an intensity that would have made an approaching motorist flash his lights in annoyance. "
+%
+"You're very sure of your facts, " he said at last, "I couldn't trust the thinking of a man who takes the Universe - if there is one - for granted. "
+%
+"What are you talking about? " "Never mind, eat the fruit. " "You know, this place almost looks like the Garden of Eden. " "Eat the fruit. " "Sounds quite like it too. "
+%
+"Rome wasn't burned in a day. "
+%
+"Does it worry you that you don't talk any kind of sense? "
+%
+"One's never alone with a rubber duck. "
+%
+"Another world, another day, another dawn. "
+%
+"He expanded his chest to make it totally clear that here was the sort of man you only dared to cross if you had a team of Sherpas with you. "
+%
+"It was real. At least, if it wasn't real, it did support them, and as that is what sofas are supposed to do, this, by any test that mattered, was a real sofa. "
+%
+Arthur said, "So which way do I go? " "Down, " said Fenchurch, "on this occasion. " He moved his hand. "Down, " she said, "is in fact the other way. " "Oh yes. "
+%
+"You're one hundred percent positive that the ship which is crashed on the bottom of this ocean is the ship which you said you were one hundred percent positive could one hundred percent positively never crash? "
+%
+"Yes, it's the right planet, all right, " he said again. "Right planet, wrong universe. "
+%
+"Ford had his own code of ethics. It wasn't much of one, but it was his and he stuck by it, more or less. One rule he made was never to buy his own drinks. He wasn't sure if that counted as an ethic, but you have to go with what you've got. "
+%
+"Arthur felt at a bit of a loss. There was a whole Galaxy of stuff out there for him, and he wondered if it was churlish of him to complain to himself that it lacked just two things: the world he was born on and the woman he loved. "
+%
+"What was the self-sacrifice? " "I jettisoned half of a much loved and I think irreplaceable pair of shoes. " "Why was that self-sacrifice? " "Because they were mine! " said Ford crossly. "I think we have different value systems. " "Well mine's better. " "That's according to your... oh never mind. " 
diff --git a/plugins/hitchhiker/hitchhiker.plugin.zsh b/plugins/hitchhiker/hitchhiker.plugin.zsh
new file mode 100644
index 000000000..0b1a30119
--- /dev/null
+++ b/plugins/hitchhiker/hitchhiker.plugin.zsh
@@ -0,0 +1,28 @@
+# 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
+alias hitchhiker="fortune -a $HITCHHIKER_DIR"
+alias hitchhiker_cow="hitchhiker | cowthink"
+
+() {
+  # Don't generate hitchhiker.dat if it exists and is up-to-date
+  if [[ -f "$HITCHHIKER_DIR/hitchhiker.dat" ]] && ! [[ "$HITCHHIKER_DIR/hitchhiker.dat" -ot "$HITCHHIKER_DIR/hitchhiker" ]]; then
+    return
+  fi
+
+  # If strfile is not found: some systems install strfile in /usr/sbin but it's not in $PATH
+  if ! command -v strfile &>/dev/null && ! [[ -f /usr/sbin/strfile ]]; then
+    echo "[oh-my-zsh] hitchhiker 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
+
+  "${commands[strfile]:-/usr/sbin/strfile}" "$HITCHHIKER_DIR/hitchhiker" "$HITCHHIKER_DIR/hitchhiker.dat" >/dev/null
+}
+
+unset HITCHHIKER_DIR
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/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'
-
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
diff --git a/plugins/ipfs/_ipfs b/plugins/ipfs/_ipfs
index 9ee8bd79c..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
   ;;
@@ -596,7 +668,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 \
@@ -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
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""
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
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/jake-node/jake-node.plugin.zsh b/plugins/jake-node/jake-node.plugin.zsh
index 3b692f899..c2dad28af 100644
--- a/plugins/jake-node/jake-node.plugin.zsh
+++ b/plugins/jake-node/jake-node.plugin.zsh
@@ -6,7 +6,7 @@
 # Inspiration : https://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh
 
 function _jake () {
-  if [ -f Jakefile ]||[ -f jakefile ]; then
+  if [ -f Jakefile ] || [ -f jakefile ] || [ -f Jakefile.js ] || [ -f jakefile.js ]; then
     compadd `jake -T | cut -d " " -f 2 | sed -E "s/.\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"`
   fi
 }
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/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
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
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 912c83509..49828d32d 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -1,42 +1,113 @@
 # 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 "
-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 sys; del sys.path[0];
-import urllib, json;
-print urllib.quote_plus(sys.stdin.read())
-sys.exit(0)"'
-	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)"'
+# If method undefined, find the first one that is installed
+if [[ -z "$JSONTOOLS_METHOD" ]]; then
+  for JSONTOOLS_METHOD in node python3 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
+  [[ -n "$JSONTOOLS_METHOD" ]] || return 1
 fi
 
+# Define json tools for each method
+case "$JSONTOOLS_METHOD" in
+  node)
+    # 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]))"
+    }
+  ;;
+  python3)
+    function pp_json() {
+      python3 -c 'import sys; del sys.path[0]; import runpy; runpy._run_module_as_main("json.tool")'
+    }
+    function is_json() {
+      python3 -c '
+import sys; del sys.path[0];
+import json
+try:
+  json.loads(sys.stdin.read())
+  print("true"); sys.exit(0)
+except ValueError:
+  print("false"); sys.exit(1)
+      '
+    }
+    function urlencode_json() {
+      python3 -c '
+import sys; del sys.path[0];
+from urllib.parse import quote_plus
+print(quote_plus(sys.stdin.read()))
+      '
+    }
+    function urldecode_json() {
+      python3 -c '
+import sys; del sys.path[0];
+from urllib.parse import unquote_plus
+print(unquote_plus(sys.stdin.read()))
+      '
+    }
+  ;;
+  ruby)
+    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
 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
+}
diff --git a/plugins/juju/README.md b/plugins/juju/README.md
new file mode 100644
index 000000000..f0c65309c
--- /dev/null
+++ b/plugins/juju/README.md
@@ -0,0 +1,130 @@
+# 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`.
+- `jsh` prefix means `juju show-*`.
+
+### General
+
+| 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                  |
+| `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 |
+
+### Bootstrap
+
+| 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                       |
+| `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
+
+| 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                               |
+| `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
+
+| 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.
+- `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
new file mode 100644
index 000000000..be8a2c7ae
--- /dev/null
+++ b/plugins/juju/juju.plugin.zsh
@@ -0,0 +1,172 @@
+# ---------------------------------------------------------- #
+# 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                    #
+#   - `jsh` prefix means juju show-*                         #
+# ---------------------------------------------------------- #
+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'
+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 jsha='juju show-application'
+alias jshc='juju show-controller'
+alias jshm='juju show-model'
+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 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
+}
+
+# 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
+  # $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 --color "$@"
+}
+
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
diff --git a/plugins/kube-ps1/README.md b/plugins/kube-ps1/README.md
index a14337278..1ed3e4438 100644
--- a/plugins/kube-ps1/README.md
+++ b/plugins/kube-ps1/README.md
@@ -6,14 +6,6 @@ configured on `kubectl` to your Bash/Zsh prompt strings (i.e. the `$PS1`).
 
 Inspired by several tools used to simplify usage of `kubectl`.
 
-![prompt](img/screenshot2.png)
-
-![prompt_sol_light](img/screenshot-sol-light.png)
-
-![prompt_img](img/screenshot-img.png)
-
-![prompt demo](img/kube-ps1.gif)
-
 ## Installing
 
 ### MacOS
@@ -136,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 |
@@ -159,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}"
diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index ee05a8af1..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                                    |
@@ -49,7 +49,7 @@ plugins=(... kubectl)
 | kdeli   | `kubectl delete ingress`            | Delete ingress resources matching passed argument                                                |
 |         |                                     | **Namespace management**                                                                         |
 | kgns    | `kubectl get namespaces`            | List the current namespaces in a cluster                                                         |
-| kcn     | `kubectl config set-context ...`    | Change current namespace |
+| kcn     | `kubectl config set-context --current --namespace` | Change current namespace |
 | kens    | `kubectl edit namespace`            | Edit namespace resource from the default editor                                                  |
 | kdns    | `kubectl describe namespace`        | Describe namespace resource in detail                                                            |
 | kdelns  | `kubectl delete namespace`          | Delete the namespace. WARNING! This deletes everything in the namespace                          |
@@ -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**                                                                              |
@@ -91,13 +93,13 @@ plugins=(... kubectl)
 | keno    | `kubectl edit node`                 | Edit nodes resource from the default editor                                                      |
 | kdno    | `kubectl describe node`             | Describe node resource in detail                                                                 |
 | kdelno  | `kubectl delete node`               | Delete the node                                                                                  |
-|         |                                   | **Persistent Volume Claim management**                                                           |
+|         |                                     | **Persistent Volume Claim management**                                                           |
 | kgpvc   | `kubectl get pvc`                   | List all PVCs                                                                                    |
 | kgpvcw  | `kgpvc --watch`                     | After listing/getting the requested object, watch for changes                                    |
 | kepvc   | `kubectl edit pvc`                  | Edit pvcs from the default editor                                                                |
-| kdpvc   | `kubectl describe pvc`              | Descirbe all pvcs                                                                                |
+| kdpvc   | `kubectl describe pvc`              | Describe all pvcs                                                                                |
 | kdelpvc | `kubectl delete pvc`                | Delete all pvcs matching passed arguments                                                        |
-|         |                                     |                                                                                                  |
+|         |                                     | **StatefulSets management**                                                                      |
 | kgss    | `kubectl get statefulset`           | List the statefulsets in ps format                                                               |
 | kgssw   | `kgss --watch`                      | After getting the list of statefulsets, watch for changes                                        |
 | kgsswide| `kgss -o wide`                      | After getting the statefulsets, output in plain-text format with any additional information      |
@@ -106,3 +108,30 @@ plugins=(... kubectl)
 | kdelss  | `kubectl delete statefulset`        | Delete the statefulset                                                                           |
 | ksss    | `kubectl scale statefulset`         | Scale a statefulset                                                                              |
 | krsss   | `kubectl rollout status statefulset`| Check the rollout status of a deployment                                                         |
+|         |                                     | **Service Accounts management**                                                                  |
+| kdsa    | `kubectl describe sa`               | Describe a service account in details                                                            |
+| kdelsa  | `kubectl delete sa`                 | Delete the service account                                                                       |
+|         |                                     | **DaemonSet management**                                                                         |
+| kgds    | `kubectl get daemonset`             | List all DaemonSets in ps output format                                                          |
+| kgdsw   | `kgds --watch`                      | After listing all DaemonSets, watch for changes                                                  |
+| keds    | `kubectl edit daemonset`            | Edit DaemonSets from the default editor                                                          |
+| kdds    | `kubectl describe daemonset`        | Describe all DaemonSets in detail                                                                |
+| kdelds  | `kubectl delete daemonset`          | Delete all DaemonSets matching passed argument                                                   |
+|         |                                     | **CronJob management**                                                                           |
+| kgcj    | `kubectl get cronjob`               | List all CronJobs in ps output format                                                            |
+| 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
+
+This plugin provides 3 wrappers to colorize kubectl output in JSON and YAML using various tools (which must be installed):
+
+- `kj`: JSON, colorized with [`jq`](https://stedolan.github.io/jq/).
+- `kjx`: JSON, colorized with [`fx`](https://github.com/antonmedv/fx).
+- `ky`: YAML, colorized with [`yh`](https://github.com/andreazorzetto/yh).
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 647d029c1..095d2b328 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -1,13 +1,13 @@
 if (( $+commands[kubectl] )); then
-    __KUBECTL_COMPLETION_FILE="${ZSH_CACHE_DIR}/kubectl_completion"
-
-    if [[ ! -f $__KUBECTL_COMPLETION_FILE ]]; then
-        kubectl completion zsh >! $__KUBECTL_COMPLETION_FILE
-    fi
-
-    [[ -f $__KUBECTL_COMPLETION_FILE ]] && source $__KUBECTL_COMPLETION_FILE
-
-    unset __KUBECTL_COMPLETION_FILE
+  # 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 | tee "$ZSH_CACHE_DIR/completions/_kubectl" >/dev/null
+    source "$ZSH_CACHE_DIR/completions/_kubectl"
+  else
+    source "$ZSH_CACHE_DIR/completions/_kubectl"
+    kubectl completion zsh | tee "$ZSH_CACHE_DIR/completions/_kubectl" >/dev/null &|
+  fi
 fi
 
 # This command is used a LOT both below and in daily life
@@ -20,7 +20,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'
@@ -43,6 +43,7 @@ alias kgpwide='kgp -o wide'
 alias kep='kubectl edit pods'
 alias kdp='kubectl describe pods'
 alias kdelp='kubectl delete pods'
+alias kgpall='kubectl get pods --all-namespaces -o wide'
 
 # get pod by label: kgpl "app=myapp" -n myns
 alias kgpl='kgp -l'
@@ -71,7 +72,7 @@ alias kgns='kubectl get namespaces'
 alias kens='kubectl edit namespace'
 alias kdns='kubectl describe namespace'
 alias kdelns='kubectl delete namespace'
-alias kcn='kubectl config set-context $(kubectl config current-context) --namespace'
+alias kcn='kubectl config set-context --current --namespace'
 
 # ConfigMap management
 alias kgcm='kubectl get configmaps'
@@ -96,12 +97,15 @@ 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.
-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'
 
@@ -150,3 +154,36 @@ alias kepvc='kubectl edit pvc'
 alias kdpvc='kubectl describe pvc'
 alias kdelpvc='kubectl delete pvc'
 
+# Service account management.
+alias kdsa="kubectl describe sa"
+alias kdelsa="kubectl delete sa"
+
+# DaemonSet management.
+alias kgds='kubectl get daemonset'
+alias kgdsw='kgds --watch'
+alias keds='kubectl edit daemonset'
+alias kdds='kubectl describe daemonset'
+alias kdelds='kubectl delete daemonset'
+
+# CronJob management.
+alias kgcj='kubectl get cronjob'
+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; }
+  function kjx() { kubectl "$@" -o json | fx; }
+  function ky() { kubectl "$@" -o yaml | yh; }
+
+  compdef kj=kubectl
+  compdef kjx=kubectl
+  compdef ky=kubectl
+fi
diff --git a/plugins/kubectx/README.md b/plugins/kubectx/README.md
new file mode 100644
index 000000000..98f1cf032
--- /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..6096feeae
--- /dev/null
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -0,0 +1,13 @@
+typeset -g -A kubectx_mapping
+
+function kubectx_prompt_info() {
+  (( $+commands[kubectl] )) || return
+
+  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
+  echo "${kubectx_mapping[$current_ctx]:-${current_ctx:gs/%/%%}}"
+}
diff --git a/plugins/kubectx/prod.png b/plugins/kubectx/prod.png
new file mode 100644
index 000000000..0c194a66d
Binary files /dev/null and b/plugins/kubectx/prod.png differ
diff --git a/plugins/kubectx/stage.png b/plugins/kubectx/stage.png
new file mode 100644
index 000000000..ac15b3929
Binary files /dev/null and b/plugins/kubectx/stage.png differ
diff --git a/plugins/lando/LICENSE b/plugins/lando/LICENSE
new file mode 100644
index 000000000..1d4983163
--- /dev/null
+++ b/plugins/lando/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Joshua Bedford
+
+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.
\ No newline at end of file
diff --git a/plugins/lando/README.md b/plugins/lando/README.md
new file mode 100644
index 000000000..928a42bca
--- /dev/null
+++ b/plugins/lando/README.md
@@ -0,0 +1,37 @@
+# Lando ZSH (lando-zsh)
+
+This plugin adds aliases for using various languages and frameworks with [Lando](https://docs.lando.dev/basics/) for Docker. It will only run within lando-driven project directories.
+
+To use it, add `lando` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... lando)
+```
+
+## ALIASES:
+
+| Alias      | Description      |
+|:----------:|:----------------:|
+| `artisan`  | `lando artisan`  |
+| `composer` | `lando composer` |
+| `drush`    | `lando drush`    |
+| `gulp`     | `lando gulp`     |
+| `npm`      | `lando npm`      |
+| `wp`       | `lando wp`       |
+| `yarn`     | `lando yarn`     |
+
+## How It Works:
+
+This plugin removes the requirement to type `lando` before a command. It utilizes the lando version of supported commands run within directories with the following criteria:
+- The `.lando.yml` file is found in the current directory or any parent directory within `$LANDO_ZSH_SITES_DIRECTORY`.
+- The current directory is within `$LANDO_ZSH_SITES_DIRECTORY` but is not `$LANDO_ZSH_SITES_DIRECTORY` itself.
+
+## Settings:
+
+- `LANDO_ZSH_SITES_DIRECTORY`: The plugin will stop searching through parents for `CONFIG_FILE` once it hits this directory.
+- `LANDO_ZSH_CONFIG_FILE`: The plugin will check to see if this provided file exists to check for presence of Lando.
+
+## Author:
+
+- Author: Joshua Bedford
+- URL: [https://github.com/joshuabedford/lando-zsh](https://github.com/joshuabedford/lando-zsh)
diff --git a/plugins/lando/lando.plugin.zsh b/plugins/lando/lando.plugin.zsh
new file mode 100644
index 000000000..af53e7e5a
--- /dev/null
+++ b/plugins/lando/lando.plugin.zsh
@@ -0,0 +1,41 @@
+# Settings
+: ${LANDO_ZSH_SITES_DIRECTORY:="$HOME/Sites"}
+: ${LANDO_ZSH_CONFIG_FILE:=.lando.yml}
+
+# Enable multiple commands with lando.
+function artisan \
+         composer \
+         drush \
+         gulp \
+         npm \
+         php \
+         wp \
+         yarn {
+  if checkForLandoFile; then
+    lando "$0" "$@"
+  else
+    command "$0" "$@"
+  fi
+}
+
+# Check for the file in the current and parent directories.
+checkForLandoFile() {
+  # Only bother checking for lando within the Sites directory.
+  if [[ "$PWD/" != "$LANDO_ZSH_SITES_DIRECTORY"/* ]]; then
+    # Not within $LANDO_ZSH_SITES_DIRECTORY
+    return 1
+  fi
+
+  local curr_dir="$PWD"
+  # Checking for file: $LANDO_ZSH_CONFIG_FILE within $LANDO_ZSH_SITES_DIRECTORY...
+  while [[ "$curr_dir" != "$LANDO_ZSH_SITES_DIRECTORY" ]]; do
+    if [[ -f "$curr_dir/$LANDO_ZSH_CONFIG_FILE" ]]; then
+      return 0
+    fi
+    curr_dir="${curr_dir:h}"
+  done
+
+  # Could not find $LANDO_ZSH_CONFIG_FILE in the current directory
+  # or in any of its parents up to $LANDO_ZSH_SITES_DIRECTORY.
+  return 1
+}
\ No newline at end of file
diff --git a/plugins/last-working-dir/README.md b/plugins/last-working-dir/README.md
index ced9e0370..b5cc55828 100644
--- a/plugins/last-working-dir/README.md
+++ b/plugins/last-working-dir/README.md
@@ -1,15 +1,33 @@
 # last-working-dir plugin
 
 Keeps track of the last used working directory and automatically jumps into it
-for new shells, unless:
+for new shells, unless the starting directory is not `$HOME`.
 
-- The plugin is already loaded.
-- The current `$PWD` is not `$HOME`.
-
-Also adds `lwd` function to jump to the last working directory.
+Also adds a `lwd` function to jump to the last working directory.
 
 To use it, add `last-working-dir` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... last-working-dir)
 ```
+
+## Features
+
+### Use separate last-working-dir files with different SSH keys
+
+If the same user account is used by multiple users connecting via different SSH keys, you can
+configure SSH to map them to different `SSH_USER`s and the plugin will use separate lwd files
+for each one.
+
+Make sure that your SSH server allows environment variables. You can enable this feature
+within the `/etc/sshd/sshd_config` file:
+
+```
+PermitUserEnvironment yes
+```
+
+Then, add `environment="SSH_USER=<SSH_USERNAME>"` before the SSH keys in your `authorized_keys` file:
+
+```
+environment="SSH_USER=a.test@example.com" ssh-ed25519 AAAAC3Nz...
+```
diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index fd21705ae..905a02a70 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -5,16 +5,18 @@ typeset -g ZSH_LAST_WORKING_DIRECTORY
 autoload -U add-zsh-hook
 add-zsh-hook chpwd chpwd_last_working_dir
 chpwd_last_working_dir() {
-	if [ "$ZSH_SUBSHELL" = 0 ]; then
-		local cache_file="$ZSH_CACHE_DIR/last-working-dir"
-		pwd >| "$cache_file"
-	fi
+  # Don't run in subshells
+  [[ "$ZSH_SUBSHELL" -eq 0 ]] || return 0
+  # Add ".$SSH_USER" suffix to cache file if $SSH_USER is set and non-empty
+  local cache_file="$ZSH_CACHE_DIR/last-working-dir${SSH_USER:+.$SSH_USER}"
+  pwd >| "$cache_file"
 }
 
 # Changes directory to the last working directory
 lwd() {
-	local cache_file="$ZSH_CACHE_DIR/last-working-dir"
-	[[ -r "$cache_file" ]] && cd "$(cat "$cache_file")"
+  # Add ".$SSH_USER" suffix to cache file if $SSH_USER is set and non-empty
+  local cache_file="$ZSH_CACHE_DIR/last-working-dir${SSH_USER:+.$SSH_USER}"
+  [[ -r "$cache_file" ]] && cd "$(cat "$cache_file")"
 }
 
 # Jump to last directory automatically unless:
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..621a7bcd7
--- /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 standard 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
diff --git a/plugins/macos/README.md b/plugins/macos/README.md
new file mode 100644
index 000000000..1bc4244a4
--- /dev/null
+++ b/plugins/macos/README.md
@@ -0,0 +1,63 @@
+# MacOS plugin
+
+This plugin provides a few utilities to make it more enjoyable on macOS (previously named OSX).
+
+To start using it, add the `macos` plugin to your plugins array in `~/.zshrc`:
+
+```zsh
+plugins=(... macos)
+```
+
+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                             |
+| `freespace`   | Erases purgeable disk space with 0s on the selected disk |
+
+## Acknowledgements
+
+This application makes use of the following third party scripts:
+
+[shpotify](https://github.com/hnarayanan/shpotify)
+
+Copyright (c) 2012–2019 [Harish Narayanan](https://harishnarayanan.org/).
+
+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.
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 84%
rename from plugins/osx/osx.plugin.zsh
rename to plugins/macos/macos.plugin.zsh
index 7842e9f73..b540eecb5 100644
--- a/plugins/osx/osx.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'
 
@@ -11,7 +16,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 +29,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 +82,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 +130,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
@@ -219,7 +224,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
 
@@ -232,6 +238,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"
 
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/osx/spotify b/plugins/macos/spotify
similarity index 99%
rename from plugins/osx/spotify
rename to plugins/macos/spotify
index 663215a74..491a60686 100644
--- a/plugins/osx/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/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/_port b/plugins/macports/_port
index 6a9ebe0c6..897598a46 100644
--- a/plugins/macports/_port
+++ b/plugins/macports/_port
@@ -43,6 +43,7 @@ subcmds=(
 'provides'
 'rdependents'
 'rdeps'
+'reclaim'
 'rpmpackage'
 'search'
 'selfupdate'
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
+}
diff --git a/plugins/magic-enter/magic-enter.plugin.zsh b/plugins/magic-enter/magic-enter.plugin.zsh
index 2d4d578b6..55b893535 100644
--- a/plugins/magic-enter/magic-enter.plugin.zsh
+++ b/plugins/magic-enter/magic-enter.plugin.zsh
@@ -1,27 +1,38 @@
-# Bind quick stuff to enter!
-#
-# Pressing enter in a git directory runs `git status`
-# in other directories `ls`
-magic-enter () {
-  # If commands are not already set, use the defaults
-  [ -z "$MAGIC_ENTER_GIT_COMMAND" ] && MAGIC_ENTER_GIT_COMMAND="git status -u ."
-  [ -z "$MAGIC_ENTER_OTHER_COMMAND" ] && MAGIC_ENTER_OTHER_COMMAND="ls -lh ."
+# Default commands
+: ${MAGIC_ENTER_GIT_COMMAND:="git status -u ."} # run when in a git repository
+: ${MAGIC_ENTER_OTHER_COMMAND:="ls -lh ."}      # run anywhere else
 
-  if [[ -z $BUFFER ]]; then
-    echo ""
-    if git rev-parse --is-inside-work-tree &>/dev/null; then
-      eval "$MAGIC_ENTER_GIT_COMMAND"
-    else
-      eval "$MAGIC_ENTER_OTHER_COMMAND"
-    fi
-    zle redisplay
+magic-enter() {
+  # Only run MAGIC_ENTER commands when in PS1 and command line is empty
+  # http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#User_002dDefined-Widgets
+  if [[ -n "$BUFFER" || "$CONTEXT" != start ]]; then
+    return
+  fi
+
+  if command git rev-parse --is-inside-work-tree &>/dev/null; then
+    BUFFER="$MAGIC_ENTER_GIT_COMMAND"
   else
-    zle accept-line
+    BUFFER="$MAGIC_ENTER_OTHER_COMMAND"
   fi
 }
 
-zle -N magic-enter
+# Wrapper for the accept-line zle widget (run when pressing Enter)
 
-bindkey -M emacs "^M" magic-enter
-bindkey -M vicmd "^M" magic-enter
-bindkey -M viins "^M" magic-enter
+# If the wrapper already exists don't redefine it
+(( ! ${+functions[_magic-enter_accept-line]} )) || return 0
+
+case "$widgets[accept-line]" in
+  # Override the current accept-line widget, calling the old one
+  user:*) zle -N _magic-enter_orig_accept-line "${widgets[accept-line]#user:}"
+    function _magic-enter_accept-line() {
+      magic-enter
+      zle _magic-enter_orig_accept-line -- "$@"
+    } ;;
+  # If no user widget defined, call the original accept-line widget
+  builtin) function _magic-enter_accept-line() {
+      magic-enter
+      zle .accept-line
+    } ;;
+esac
+
+zle -N accept-line _magic-enter_accept-line
diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index 80ea2de31..19d4a17b1 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -11,25 +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`                                                                                               |
+| Alias   | Command                                     |
+| ------- | ------------------------------------------- |
+| `hga`   | `hg add`                                    |
+| `hgc`   | `hg commit`                                 |
+| `hgca`  | `hg commit --amend`                         |
+| `hgci`  | `hg commit --interactive`                   |
+| `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
 
@@ -60,7 +63,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/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index f13430476..9b85d02f6 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'
@@ -10,56 +11,108 @@ 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'
 alias hgl='hg pull -u'
 alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
-
-function in_hg() {
-  if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then
-    echo 1
-  fi
-}
-
-function hg_get_branch_name() {
-  if [ $(in_hg) ]; then
-    echo $(hg branch)
-  fi
-}
-
-function hg_prompt_info {
-  if [ $(in_hg) ]; then
-    _DISPLAY=$(hg_get_branch_name)
-    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
-}
-
-function hg_dirty_choose {
-  if [ $(in_hg) ]; then
-    hg status 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'
-    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
-    fi
-  fi
-}
-
-function hg_dirty {
-  hg_dirty_choose $ZSH_THEME_HG_PROMPT_DIRTY $ZSH_THEME_HG_PROMPT_CLEAN
-}
+alias hglg='hg log --stat -v'
+alias hglgp='hg log --stat  -p -v'
 
 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
+}
+
+# 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 {
+  # 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*[ACDIMR!?L].*$' <<< "$hg_status"; then
+    echo $ZSH_THEME_HG_PROMPT_DIRTY
+    return
+  fi
+
+  echo $ZSH_THEME_HG_PROMPT_CLEAN
 }
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
 }
diff --git a/plugins/mongocli/README.md b/plugins/mongocli/README.md
new file mode 100644
index 000000000..e245f2a4a
--- /dev/null
+++ b/plugins/mongocli/README.md
@@ -0,0 +1,19 @@
+# mongocli plugin
+
+The plugin adds several aliases for common [mongocli](https://docs.mongodb.com/mongocli/stable/) commands.
+
+To use it, add `mongocli` to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... mongocli)
+```
+
+## Aliases
+
+| Alias    | Command                                                     | Description                                            |
+|----------|-------------------------------------------------------------|--------------------------------------------------------|
+| `ma`     | `mongocli atlas`                                            | Shortcut for mongocli Atlas commands.                  |
+| `mcm`    | `mongocli cloud-manager`                                    | Shortcut for mongocli Cloud Manager commands.          |
+| `mom`    | `mongocli ops-manager`                                      | Shortcut for mongocli Cloud Manager commands.          |
+| `miam`   | `mongocli iam`                                              | Shortcut for mongocli IAM commands.                    |
+
diff --git a/plugins/mongocli/mongocli.plugin.zsh b/plugins/mongocli/mongocli.plugin.zsh
new file mode 100644
index 000000000..0ca877e61
--- /dev/null
+++ b/plugins/mongocli/mongocli.plugin.zsh
@@ -0,0 +1,4 @@
+alias ma='mongocli atlas'
+alias mcm='mongocli cloud-manager'
+alias mom='mongocli ops-manager'
+alias miam='mongocli iam'
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"
diff --git a/plugins/mvn/README.md b/plugins/mvn/README.md
index cbe7f30fa..815dfd57c 100644
--- a/plugins/mvn/README.md
+++ b/plugins/mvn/README.md
@@ -19,6 +19,7 @@ if it's found, or the mvn command otherwise.
 | `mvn!`               | `mvn -f <root>/pom.xml`                         |
 | `mvnag`              | `mvn archetype:generate`                        |
 | `mvnboot`            | `mvn spring-boot:run`                           |
+| `mvnqdev`            | `mvn quarkus:dev`                               |
 | `mvnc`               | `mvn clean`                                     |
 | `mvncd`              | `mvn clean deploy`                              |
 | `mvnce`              | `mvn clean eclipse:clean eclipse:eclipse`       |
diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 7cb94b42f..1b9141f21 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)
@@ -62,6 +69,7 @@ alias mvne='mvn eclipse:eclipse'
 alias mvnfmt='mvn fmt:format'
 alias mvnjetty='mvn jetty:run'
 alias mvnp='mvn package'
+alias mvnqdev='mvn quarkus:dev'
 alias mvns='mvn site'
 alias mvnsrc='mvn dependency:sources'
 alias mvnt='mvn test'
@@ -71,256 +79,262 @@ alias mvn-updates='mvn versions:display-dependency-updates'
 
 
 function listMavenCompletions {
-	local file new_file
-	local -a profiles POM_FILES
+  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
 
-	reply=(
-		# common lifecycle
-		clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
+  # List modules
+  modules=($(print -l **/pom.xml(-.N:h) | grep -v '/target/classes/META-INF/'))
 
-		# integration testing
-		pre-integration-test integration-test
+  reply=(
+    # common lifecycle
+    clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
 
-		# 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
+    # integration testing
+    pre-integration-test integration-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
+    # 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
 
-		# 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
+    # 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
 
-		# 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
+    # 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
 
-		# eclipse
-		eclipse:clean eclipse:eclipse
-		# idea
-		idea:clean idea:idea
+    # 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
 
-		# 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
-		# 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
+    # eclipse
+    eclipse:clean eclipse:eclipse
+    # idea
+    idea:clean idea:idea
 
-		# 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
+    # 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
 
-		# 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
+    # 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
 
-		# 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="
+    # 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
 
-		# 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
+    # 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="
 
-		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)
+    # 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
 
-		$profiles
-	)
+    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
+  )
 }
 
 compctl -K listMavenCompletions mvn mvnw
diff --git a/plugins/ng/_ng b/plugins/ng/_ng
new file mode 100644
index 000000000..86c6ce187
--- /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 absence 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
diff --git a/plugins/npm/README.md b/plugins/npm/README.md
index 0b1a2280f..8eafc6d61 100644
--- a/plugins/npm/README.md
+++ b/plugins/npm/README.md
@@ -10,13 +10,15 @@ 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           |
 | `npmD`  | `npm i -D`                   | Install and save to dev-dependencies in your package.json       |
+| `npmF`  | `npm i -f`                   | Force install from remote registries ignoring local cache       |
 | `npmE`  | `PATH="$(npm bin)":"$PATH"`  | Run command from node_modules folder based on current directory |
 | `npmO`  | `npm outdated`               | Check which npm modules are outdated                            |
+| `npmU`  | `npm update`                 | Update all the packages listed to the latest version            |
 | `npmV`  | `npm -v`                     | Check package versions                                          |
 | `npmL`  | `npm list`                   | List installed packages                                         |
 | `npmL0` | `npm ls --depth=0`           | List top-level installed packages                               |
@@ -25,3 +27,22 @@ plugins=(... npm)
 | `npmR`  | `npm run`                    | Run npm scripts                                                 |
 | `npmP`  | `npm publish`                | Run npm publish                                                 |
 | `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 87c68f3fb..6c768d614 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -27,6 +27,9 @@ alias npmS="npm i -S "
 # npmd is used by https://github.com/dominictarr/npmd
 alias npmD="npm i -D "
 
+# Force npm to fetch remote resources even if a local copy exists on disk.
+alias npmF='npm i -f'
+
 # Execute command from node_modules folder based on current directory
 # i.e npmE gulp
 alias npmE='PATH="$(npm bin)":"$PATH"'
@@ -34,6 +37,9 @@ alias npmE='PATH="$(npm bin)":"$PATH"'
 # Check which npm modules are outdated
 alias npmO="npm outdated"
 
+# Update all the packages listed to the latest version
+alias npmU="npm update"
+
 # Check package versions
 alias npmV="npm -v"
 
@@ -57,3 +63,49 @@ alias npmP="npm publish"
 
 # Run npm init
 alias npmI="npm init"
+
+# Run npm info
+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
diff --git a/plugins/npx/README.md b/plugins/npx/README.md
deleted file mode 100644
index 1c052930b..000000000
--- a/plugins/npx/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# NPX Plugin
-> npx(1) -- execute npm package binaries. ([more info](https://github.com/zkat/npx))
-
-This plugin automatically registers npx command-not-found handler if `npx` exists in your `$PATH`.
-
-## Setup
-
-- Add plugin to `~/.zshrc`
-
-```bash
-plugins=(.... npx)
-```
-
-- Globally install npx binary (npx will be auto installed with recent versions of Node.js)
-```bash
-sudo npm install -g 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.
-
diff --git a/plugins/npx/npx.plugin.zsh b/plugins/npx/npx.plugin.zsh
deleted file mode 100644
index 32bb67377..000000000
--- a/plugins/npx/npx.plugin.zsh
+++ /dev/null
@@ -1,7 +0,0 @@
-# NPX Plugin
-# https://www.npmjs.com/package/npx
-# Maintainer: Pooya Parsa <pooya@pi0.ir>
-
-(( $+commands[npx] )) && {
- source <(npx --shell-auto-fallback zsh)
-}
diff --git a/plugins/nvm/README.md b/plugins/nvm/README.md
index 079cf0009..1acf12050 100644
--- a/plugins/nvm/README.md
+++ b/plugins/nvm/README.md
@@ -1,9 +1,34 @@
 # nvm plugin
 
-This plugin adds autocompletions for [nvm](https://github.com/creationix/nvm) — a Node.js version manager.
+This plugin adds autocompletions for [nvm](https://github.com/nvm-sh/nvm) — a Node.js version manager.
 It also automatically sources nvm, so you don't need to do it manually in your `.zshrc`.
 
 To use it, add `nvm` to the plugins array of your zshrc file:
+
 ```zsh
 plugins=(... nvm)
 ```
+
+## Settings
+
+If you installed nvm in a directory other than `$HOME/.nvm`, set and export `NVM_DIR` to be the directory
+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. 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 source nvm script only when using it, and will create a function for `node`,
+  `npm`, `pnpm`, `yarn`, and the command(s) specified by `NVM_LAZY_CMD`, so when you call either of them,
+  nvm will be loaded and run with default version.
+
+- **`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
+  which node version to load.
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 4bab8e9d7..1fb4d238b 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -1,8 +1,73 @@
-# Set NVM_DIR if it isn't already defined
-[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
-
-# Try to load nvm only if command not already available
-if ! type "nvm" &> /dev/null; then
-    # Load nvm if it exists
-    [[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
+# See https://github.com/nvm-sh/nvm#installation-and-update
+if [[ -z "$NVM_DIR" ]]; then
+  if [[ -d "$HOME/.nvm" ]]; then
+    export NVM_DIR="$HOME/.nvm"
+  elif [[ -d "${XDG_CONFIG_HOME:-$HOME/.config}/nvm" ]]; then
+    export NVM_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/nvm"
+  elif (( $+commands[brew] )); then
+    NVM_HOMEBREW="${NVM_HOMEBREW:-${HOMEBREW_PREFIX:-$(brew --prefix)}/opt/nvm}"
+    if [[ -d "$NVM_HOMEBREW" ]]; then
+      export NVM_DIR="$NVM_HOMEBREW"
+    fi
+  fi
 fi
+
+# Don't try to load nvm if command already available
+# Note: nvm is a function so we need to use `which`
+which nvm &>/dev/null && return
+
+if (( $+NVM_LAZY )); then
+  # Call nvm when first using nvm, node, npm, pnpm, yarn or $NVM_LAZY_CMD
+  function nvm node npm pnpm yarn $NVM_LAZY_CMD {
+    unfunction nvm node npm pnpm yarn $NVM_LAZY_CMD
+    # Load nvm if it exists in $NVM_DIR
+    [[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
+    "$0" "$@"
+  }
+elif [[ -f "$NVM_DIR/nvm.sh" ]]; then
+  # Load nvm if it exists in $NVM_DIR
+  source "$NVM_DIR/nvm.sh"
+else
+  return
+fi
+
+# Autoload nvm when finding a .nvmrc file in the current directory
+# Adapted from: https://github.com/nvm-sh/nvm#zsh
+if (( $+NVM_AUTOLOAD )); then
+  load-nvmrc() {
+    local node_version="$(nvm version)"
+    local nvmrc_path="$(nvm_find_nvmrc)"
+
+    if [[ -n "$nvmrc_path" ]]; then
+      local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")
+
+      if [[ "$nvmrc_node_version" = "N/A" ]]; then
+        nvm install
+      elif [[ "$nvmrc_node_version" != "$node_version" ]]; then
+        nvm use
+      fi
+    elif [[ "$node_version" != "$(nvm version default)" ]]; then
+      echo "Reverting to nvm default version"
+      nvm use default
+    fi
+  }
+
+  autoload -U add-zsh-hook
+  add-zsh-hook chpwd load-nvmrc
+
+  load-nvmrc
+fi
+
+# Load nvm bash completion
+for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
+  if [[ -f "$nvm_completion" ]]; then
+    # Load bashcompinit
+    autoload -U +X bashcompinit && bashcompinit
+    # Bypass compinit call in nvm bash completion script. See:
+    # https://github.com/nvm-sh/nvm/blob/4436638/bash_completion#L86-L93
+    ZSH_VERSION= source "$nvm_completion"
+    break
+  fi
+done
+
+unset NVM_HOMEBREW NVM_LAZY NVM_AUTOLOAD nvm_completion
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:
 
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
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
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
diff --git a/plugins/osx/README.md b/plugins/osx/README.md
deleted file mode 100644
index ecc9327d0..000000000
--- a/plugins/osx/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# OSX 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`:
-
-```zsh
-plugins=(... osx)
-```
-
-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                          |
-
-## Acknowledgements
-
-This application makes use of the following third party scripts:
-
-[shpotify](https://github.com/hnarayanan/shpotify)
-
-Copyright (c) 2012–2019 [Harish Narayanan](https://harishnarayanan.org/).
-
-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.
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 () {
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/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
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
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 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
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index a46e7658c..7eb2d2a35 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -82,5 +82,30 @@ 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"
+
+# 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
+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
+}
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
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/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..faa6a3404
--- /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[formatted 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 launching 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|describe)
+        _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'
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..cebcb46c4
--- /dev/null
+++ b/plugins/poetry/poetry.plugin.zsh
@@ -0,0 +1,14 @@
+# 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[poetry]=_poetry
+fi
+
+poetry completions zsh >| "$ZSH_CACHE_DIR/completions/_poetry" &|
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"
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/pyenv/README.md b/plugins/pyenv/README.md
index d063b55b9..b9ee937b7 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,14 @@ 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.
+
+- `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 82ba6ff8c..7fbd1589e 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -1,46 +1,98 @@
+pyenv_config_warning() {
+  [[ "$ZSH_PYENV_QUIET" != true ]] || return 0
+
+  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.
 
-# Load pyenv only if command not already available
-if command -v pyenv &> /dev/null && [[ "$(uname -r)" != *icrosoft* ]]; then
-    FOUND_PYENV=1
+# 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=0
+  FOUND_PYENV=1
 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
+    # 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
-    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)"
-    }
+  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)"
+  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 [[ "$(pyenv commands)" =~ "virtualenv-init" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
+    eval "$(pyenv virtualenv-init - zsh)"
+  fi
+
+  function pyenv_prompt_info() {
+    local version="$(pyenv version-name)"
+    echo "${version:gs/%/%%}"
+  }
 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() {
+    local version="$(python3 -V 2>&1 | cut -d' ' -f2)"
+    echo "system: ${version:gs/%/%%}"
+  }
 fi
 
 unset FOUND_PYENV pyenvdirs dir
+unfunction pyenv_config_warning
diff --git a/plugins/python/README.md b/plugins/python/README.md
index 0180218a2..97c1a34ee 100644
--- a/plugins/python/README.md
+++ b/plugins/python/README.md
@@ -1,18 +1,29 @@
-# 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)
 ```
 
 ## Aliases
 
-| Command          | Description                                                                     |
-|------------------|---------------------------------------------------------------------------------|
-| `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 `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        |
+| `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
+
+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 c3c1474c1..2fbb59577 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -1,47 +1,83 @@
+# python command
+alias py='python3'
+
 # Find python file
 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
 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="python3 -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}"
+}
diff --git a/plugins/rails/README.md b/plugins/rails/README.md
index 9fb1cecf1..fa66750f0 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:
 
@@ -12,47 +13,52 @@ 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                         |
-| `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 |
+| 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                  |
 
-### Rake aliases
+### Foreman
 
-| 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    |
-| `rr`    | `rake routes`                   | List all defined routes                                |
-| `rrg`   | `rake routes \| grep`           | List and filter the defined routes                     |
-| `rt`    | `rake test`                     | Run Rails tests                                        |
-| `rmd`   | `rake middleware`               | Interact with Rails middlewares                        |
-| `rsts`  | `rake stats`                    | Print code statistics                                  |
+| Alias  | Command         | Description                               |
+| ------ | --------------- | ----------------------------------------- |
+| `fmns` | `foreman start` | Interact with your Rails app from the CLI |
 
 ### 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 +66,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 +74,45 @@ 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 stuff
+## 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                                        |
+
+### Other
 
 | 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` |
+
+- `remote_console <server> <directory>`: runs `ruby script/console production` on a remote server.
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
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 1fd5f0f86..b11cbb5c7 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'
@@ -43,43 +47,69 @@ 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 ru='rails runner'
+alias rr='rails routes'
+alias rrg='rails routes | grep'
 alias rs='rails server'
+alias rsb='rails server --bind'
 alias rsd='rails server --debugger'
 alias rsp='rails server --port'
+alias rsts='rails stats'
+alias rt='rails test'
+alias ru='rails runner'
+
+# Foreman aliases
+alias fmns='foreman start'
 
 # Rake aliases
-alias rdm='rake db:migrate'
-alias rdms='rake db:migrate:status'
-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 rr='rake routes'
-alias rrg='rake routes | grep'
-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 )"
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 121150017..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 brackts 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 ...
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”"
 }
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 0f2d366e2..d758aebae 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):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}"
+  }
 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 ' ' | sed 's/%/%%/g')"
+    echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
+  }
 fi
 
 unset FOUND_RBENV rbenvdirs dir
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..27dc3eec6 100644
--- a/plugins/rbfu/rbfu.plugin.zsh
+++ b/plugins/rbfu/rbfu.plugin.zsh
@@ -5,38 +5,45 @@
 # 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.
+(( ${+functions[rvm_prompt_info]} )) || \
+function rvm_prompt_info() { echo "${${RBFU_RUBY_VERSION:=system}:gs/%/%%}" }
diff --git a/plugins/rbw/README.md b/plugins/rbw/README.md
new file mode 100644
index 000000000..cae36cead
--- /dev/null
+++ b/plugins/rbw/README.md
@@ -0,0 +1,22 @@
+# 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)
+```
+
+## `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
new file mode 100644
index 000000000..b6cecf8b4
--- /dev/null
+++ b/plugins/rbw/rbw.plugin.zsh
@@ -0,0 +1,43 @@
+if (( ! $+commands[rbw] )); then
+  return
+fi
+
+# 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
+  typeset -g -A _comps
+  autoload -Uz _rbw
+  _comps[rbw]=_rbw
+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
diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index d0a53b8d7..807c063a5 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -11,66 +11,78 @@ plugins=(... react-native)
 
 ## Aliases
 
-| Alias          | React Native command                                                         |
-| :------------  | :-------------------------------------------------                           |
-| **rn**         | `react-native`                                                               |
-| **rns**        | `react-native start`                                                         |
-| **rnlink**     | `react-native link`                                                          |
-| _Logging_      |                                                                              |
-| **rnland**     | `react-native log-android`                                                   |
-| **rnlios**     | `react-native log-ios`                                                       |
-| _App Testing_  |                                                                              |
-| **rnand**      | `react-native run-android`                                                   |
-| **rnios**      | `react-native run-ios`                                                       |
-| _iPhone_       |                                                                              |
-| **rnios4s**    | `react-native run-ios --simulator "iPhone 4s"`                               |
-| **rnios5**     | `react-native run-ios --simulator "iPhone 5"`                                |
-| **rnios5s**    | `react-native run-ios --simulator "iPhone 5s"`                               |
-| **rnios6**     | `react-native run-ios --simulator "iPhone 6"`                                |
-| **rnios6s**    | `react-native run-ios --simulator "iPhone 6s"`                               |
-| **rnios6p**    | `react-native run-ios --simulator "iPhone 6 Plus"`                           |
-| **rnios6sp**   | `react-native run-ios --simulator "iPhone 6s Plus"`                          |
-| **rnios7**     | `react-native run-ios --simulator "iPhone 7"`                                |
-| **rnios7p**    | `react-native run-ios --simulator "iPhone 7 Plus"`                           |
-| **rnios8**     | `react-native run-ios --simulator "iPhone 8"`                                |
-| **rnios8p**    | `react-native run-ios --simulator "iPhone 8 Plus"`                           |
-| **rniosse**    | `react-native run-ios --simulator "iPhone SE"`                               |
-| **rniosx**     | `react-native run-ios --simulator "iPhone X"`                                |
-| **rniosxs**    | `react-native run-ios --simulator "iPhone Xs"`                               |
-| **rniosxsm**   | `react-native run-ios --simulator "iPhone Xs Max"`                           |
-| **rniosxr**    | `react-native run-ios --simulator "iPhone Xʀ"`                               |
-| **rnios11**    | `react-native run-ios --simulator "iPhone 11"`                               |
-| **rnios11p**   | `react-native run-ios --simulator "iPhone 11 Pro"`                           |
-| **rnios11pm**  | `react-native run-ios --simulator "iPhone 11 Pro Max"`                       |
-| _iPad_         |                                                                              |
-| **rnipad2**    | `react-native run-ios --simulator "iPad 2"`                                  |
-| **rnipad5**    | `react-native run-ios --simulator "iPad (5th generation)"`                   |
-| **rnipad6**    | `react-native run-ios --simulator "iPad (6th generation)"`                   |
-| **rnipadr**    | `react-native run-ios --simulator "iPad Retina"`                             |
-| **rnipada**    | `react-native run-ios --simulator "iPad Air"`                                |
-| **rnipada2**   | `react-native run-ios --simulator "iPad Air 2"`                              |
-| **rnipada3**   | `react-native run-ios --simulator "iPad Air (3rd generation)"`               |
-| **rnipadm2**   | `react-native run-ios --simulator "iPad mini 2"`                             |
-| **rnipadm3**   | `react-native run-ios --simulator "iPad mini 3"`                             |
-| **rnipadm4**   | `react-native run-ios --simulator "iPad mini 4"`                             |
-| **rnipadm5**   | `react-native run-ios --simulator "iPad mini (5th generation)"`              |
-| **rnipadp9**   | `react-native run-ios --simulator "iPad Pro (9.7-inch)"`                     |
-| **rnipadp12**  | `react-native run-ios --simulator "iPad Pro (12.9-inch)"`                    |
-| **rnipadp122** | `react-native run-ios --simulator "iPad Pro (12.9-inch) (2nd generation)"`   |
-| **rnipadp10**  | `react-native run-ios --simulator "iPad Pro (10.5-inch)"`                    |
-| **rnipad11**   | `react-native run-ios --simulator "iPad Pro (11-inch)"`                      |
-| **rnipad123**  | `react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"`   |
-| _Apple TV_     |                                                                              |
-| **rnatv**      | `react-native run-ios --simulator "Apple TV"`                                |
-| **rnatv4k**    | `react-native run-ios --simulator "Apple TV 4K"`                             |
-| **rnatv4k1080**| `react-native run-ios --simulator "Apple TV 4K (at 1080p)"`                  |
-| **rnipad123**  | `react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"`   |
-| _Apple Watch_  |                                                                              |
-| **rnaw38**     | `react-native run-ios --simulator "Apple Watch - 38mm"`                      |
-| **rnaw42**     | `react-native run-ios --simulator "Apple Watch - 42mm"`                      |
-| **rnaws238**   | `react-native run-ios --simulator "Apple Watch Series 2 - 38mm"`             |
-| **rnaws242**   | `react-native run-ios --simulator "Apple Watch Series 2 - 42mm"`             |
-| **rnaws338**   | `react-native run-ios --simulator "Apple Watch Series 3 - 38mm"`             |
-| **rnaws342**   | `react-native run-ios --simulator "Apple Watch Series 3 - 42mm"`             |
-| **rnaws440**   | `react-native run-ios --simulator "Apple Watch Series 4 - 40mm"`             |
-| **rnaws444**   | `react-native run-ios --simulator "Apple Watch Series 4 - 44mm"`             |
+| Alias           | React Native command                                                       |
+| :-------------- | :------------------------------------------------------------------------- |
+| **rn**          | `react-native`                                                             |
+| **rns**         | `react-native start`                                                       |
+| **rnlink**      | `react-native link`                                                        |
+| _Logging_       |                                                                            |
+| **rnland**      | `react-native log-android`                                                 |
+| **rnlios**      | `react-native log-ios`                                                     |
+| _App Testing_   |                                                                            |
+| **rnand**       | `react-native run-android`                                                 |
+| **rnios**       | `react-native run-ios`                                                     |
+| _iPhone_        |                                                                            |
+| **rnios4s**     | `react-native run-ios --simulator "iPhone 4s"`                             |
+| **rnios5**      | `react-native run-ios --simulator "iPhone 5"`                              |
+| **rnios5s**     | `react-native run-ios --simulator "iPhone 5s"`                             |
+| **rnios6**      | `react-native run-ios --simulator "iPhone 6"`                              |
+| **rnios6s**     | `react-native run-ios --simulator "iPhone 6s"`                             |
+| **rnios6p**     | `react-native run-ios --simulator "iPhone 6 Plus"`                         |
+| **rnios6sp**    | `react-native run-ios --simulator "iPhone 6s Plus"`                        |
+| **rnios7**      | `react-native run-ios --simulator "iPhone 7"`                              |
+| **rnios7p**     | `react-native run-ios --simulator "iPhone 7 Plus"`                         |
+| **rnios8**      | `react-native run-ios --simulator "iPhone 8"`                              |
+| **rnios8p**     | `react-native run-ios --simulator "iPhone 8 Plus"`                         |
+| **rniosse**     | `react-native run-ios --simulator "iPhone SE"`                             |
+| **rniosx**      | `react-native run-ios --simulator "iPhone X"`                              |
+| **rniosxs**     | `react-native run-ios --simulator "iPhone Xs"`                             |
+| **rniosxsm**    | `react-native run-ios --simulator "iPhone Xs Max"`                         |
+| **rniosxr**     | `react-native run-ios --simulator "iPhone Xʀ"`                             |
+| **rnios11**     | `react-native run-ios --simulator "iPhone 11"`                             |
+| **rnios11p**    | `react-native run-ios --simulator "iPhone 11 Pro"`                         |
+| **rnios11pm**   | `react-native run-ios --simulator "iPhone 11 Pro Max"`                     |
+| **rnios12**     | `react-native run-ios --simulator "iPhone 12"`                             |
+| **rnios12m**    | `react-native run-ios --simulator "iPhone 12 mini"`                        |
+| **rnios12p**    | `react-native run-ios --simulator "iPhone 12 Pro"`                         |
+| **rnios12pm**   | `react-native run-ios --simulator "iPhone 12 Pro Max"`                     |
+| **rnios13**     | `react-native run-ios --simulator "iPhone 13"`                             |
+| **rnios13m**    | `react-native run-ios --simulator "iPhone 13 mini"`                        |
+| **rnios13p**    | `react-native run-ios --simulator "iPhone 13 Pro"`                         |
+| **rnios13pm**   | `react-native run-ios --simulator "iPhone 13 Pro Max"`                     |
+| **rnios14**     | `react-native run-ios --simulator "iPhone 14"`                             |
+| **rnios14pl**   | `react-native run-ios --simulator "iPhone 14 Plus"`                        |
+| **rnios14p**    | `react-native run-ios --simulator "iPhone 14 Pro"`                         |
+| **rnios14pm**   | `react-native run-ios --simulator "iPhone 14 Pro Max"`                     |
+| _iPad_          |                                                                            |
+| **rnipad2**     | `react-native run-ios --simulator "iPad 2"`                                |
+| **rnipad5**     | `react-native run-ios --simulator "iPad (5th generation)"`                 |
+| **rnipad6**     | `react-native run-ios --simulator "iPad (6th generation)"`                 |
+| **rnipadr**     | `react-native run-ios --simulator "iPad Retina"`                           |
+| **rnipada**     | `react-native run-ios --simulator "iPad Air"`                              |
+| **rnipada2**    | `react-native run-ios --simulator "iPad Air 2"`                            |
+| **rnipada3**    | `react-native run-ios --simulator "iPad Air (3rd generation)"`             |
+| **rnipadm2**    | `react-native run-ios --simulator "iPad mini 2"`                           |
+| **rnipadm3**    | `react-native run-ios --simulator "iPad mini 3"`                           |
+| **rnipadm4**    | `react-native run-ios --simulator "iPad mini 4"`                           |
+| **rnipadm5**    | `react-native run-ios --simulator "iPad mini (5th generation)"`            |
+| **rnipadp9**    | `react-native run-ios --simulator "iPad Pro (9.7-inch)"`                   |
+| **rnipadp12**   | `react-native run-ios --simulator "iPad Pro (12.9-inch)"`                  |
+| **rnipadp122**  | `react-native run-ios --simulator "iPad Pro (12.9-inch) (2nd generation)"` |
+| **rnipadp10**   | `react-native run-ios --simulator "iPad Pro (10.5-inch)"`                  |
+| **rnipad11**    | `react-native run-ios --simulator "iPad Pro (11-inch)"`                    |
+| **rnipad123**   | `react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"` |
+| _Apple TV_      |                                                                            |
+| **rnatv**       | `react-native run-ios --simulator "Apple TV"`                              |
+| **rnatv4k**     | `react-native run-ios --simulator "Apple TV 4K"`                           |
+| **rnatv4k1080** | `react-native run-ios --simulator "Apple TV 4K (at 1080p)"`                |
+| **rnipad123**   | `react-native run-ios --simulator "iPad Pro (12.9-inch) (3rd generation)"` |
+| _Apple Watch_   |                                                                            |
+| **rnaw38**      | `react-native run-ios --simulator "Apple Watch - 38mm"`                    |
+| **rnaw42**      | `react-native run-ios --simulator "Apple Watch - 42mm"`                    |
+| **rnaws238**    | `react-native run-ios --simulator "Apple Watch Series 2 - 38mm"`           |
+| **rnaws242**    | `react-native run-ios --simulator "Apple Watch Series 2 - 42mm"`           |
+| **rnaws338**    | `react-native run-ios --simulator "Apple Watch Series 3 - 38mm"`           |
+| **rnaws342**    | `react-native run-ios --simulator "Apple Watch Series 3 - 42mm"`           |
+| **rnaws440**    | `react-native run-ios --simulator "Apple Watch Series 4 - 40mm"`           |
+| **rnaws444**    | `react-native run-ios --simulator "Apple Watch Series 4 - 44mm"`           |
diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index b33dedfed..afeaab4fd 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -27,7 +27,18 @@ alias rniosxr='react-native run-ios --simulator "iPhone Xʀ"'
 alias rnios11='react-native run-ios --simulator "iPhone 11"'
 alias rnios11p='react-native run-ios --simulator "iPhone 11 Pro"'
 alias rnios11pm='react-native run-ios --simulator "iPhone 11 Pro Max"'
-
+alias rnios12='react-native run-ios --simulator "iPhone 12"'
+alias rnios12m='react-native run-ios --simulator "iPhone 12 mini"'
+alias rnios12p='react-native run-ios --simulator "iPhone 12 Pro"'
+alias rnios12pm='react-native run-ios --simulator "iPhone 12 Pro Max"'
+alias rnios13='react-native run-ios --simulator "iPhone 13"'
+alias rnios13m='react-native run-ios --simulator "iPhone 13 mini"'
+alias rnios13p='react-native run-ios --simulator "iPhone 13 Pro"'
+alias rnios13pm='react-native run-ios --simulator "iPhone 13 Pro Max"'
+alias rnios14='react-native run-ios --simulator "iPhone 14"'
+alias rnios14pl='react-native run-ios --simulator "iPhone 14 Plus"'
+alias rnios14p='react-native run-ios --simulator "iPhone 14 Pro"'
+alias rnios14pm='react-native run-ios --simulator "iPhone 14 Pro Max"'
 
 # iPad
 alias rnipad2='react-native run-ios --simulator "iPad 2"'
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/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]" \
diff --git a/plugins/ripgrep/README.md b/plugins/ripgrep/README.md
index 937f73c81..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 [`11.0.2`](https://github.com/BurntSushi/ripgrep/releases/tag/11.0.2).
-
-Updated on August 16th, 2019.
diff --git a/plugins/ripgrep/_ripgrep b/plugins/ripgrep/_ripgrep
index d7dcfd64a..31bc697c7 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'
 
@@ -113,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
@@ -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,11 @@ _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]'
+    '--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)]"
     '*--ignore-file=[specify additional ignore file]:ignore file:_files'
@@ -297,7 +325,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
diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index ad2755bbf..59d839c5c 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -10,11 +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                                       |
-| 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                       |
+| 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 177b35b31..408512110 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
@@ -9,6 +8,19 @@ 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 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"
+alias rrun="ruby -e"
+alias rserver="ruby -e httpd . -p 8080" # requires webrick
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..858f14126
--- /dev/null
+++ b/plugins/rust/rust.plugin.zsh
@@ -0,0 +1,26 @@
+if ! (( $+commands[rustup] && $+commands[cargo] )); then
+  return
+fi
+
+# 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
+  typeset -g -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
+  typeset -g -A _comps
+  _comps[rustup]=_rustup
+fi
+
+# Generate completion files in the background
+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
+EOF
diff --git a/plugins/rustup/README.md b/plugins/rustup/README.md
deleted file mode 100644
index ba037f8f6..000000000
--- a/plugins/rustup/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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)
-```
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/rvm/README.md b/plugins/rvm/README.md
index 1ed8d46a2..576b037b0 100644
--- a/plugins/rvm/README.md
+++ b/plugins/rvm/README.md
@@ -10,11 +10,27 @@ 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` |
-| `rvm-update`   | `rvm get head`       |
-| `gems`         | `gem list`           |
+| 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`   |
+| `rb31`       | `rvm use ruby-3.1`   |
+| `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 53e809aaf..2a091d019 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,74 +1,55 @@
-fpath=($rvm_path/scripts/zsh/Completion $fpath)
+# Completion
+fpath+=("${rvm_path}/scripts/zsh/Completion")
 
+typeset -g -A _comps
+autoload -Uz _rvm
+_comps[rvm]=_rvm
+
+# Aliases
 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'
-local ruby20='ruby-2.0.0'
-local ruby21='ruby-2.1.2'
 
-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'
+  31  'ruby-3.1'
+)
 
-_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 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
diff --git a/plugins/safe-paste/safe-paste.plugin.zsh b/plugins/safe-paste/safe-paste.plugin.zsh
index 75f1791d7..d443ae8a2 100644
--- a/plugins/safe-paste/safe-paste.plugin.zsh
+++ b/plugins/safe-paste/safe-paste.plugin.zsh
@@ -1,54 +1,100 @@
+# A good summary of the zsh 5.1 Bracketed Paste Mode changes is at:
+# https://archive.zhimingwang.org/blog/2015-09-21-zsh-51-and-bracketed-paste.html
+
+# zsh 5.1 (September 2015) introduced built-in support for Bracketed Paste Mode
+# https://github.com/zsh-users/zsh/blob/68405f31a043bdd5bf338eb06688ed3e1f740937/README#L38-L45
+#
+# zsh 5.1 breaks url-quote-magic and other widgets replacing self-insert
+# zsh-users' bracketed-paste-magic resolves these issues:
+# https://github.com/zsh-users/zsh/blob/f702e17b14d75aa21bff014168fa9048124db286/Functions/Zle/bracketed-paste-magic#L9-L12
+
+# Load bracketed-paste-magic if zsh version is >= 5.1
+if [[ ${ZSH_VERSION:0:3} -ge 5.1 ]]; then
+  set zle_bracketed_paste  # Explicitly restore this zsh default
+  autoload -Uz bracketed-paste-magic
+  zle -N bracketed-paste bracketed-paste-magic
+  return  ### The rest of this file is NOT executed on zsh version >= 5.1 ###
+fi
+
+######################################################################
+#    The rest of this file is ONLY executed if zsh version < 5.1
+######################################################################
+
 # Code from Mikael Magnusson: https://www.zsh.org/mla/users/2011/msg00367.html
 #
-# Requires xterm, urxvt, iTerm2 or any other terminal that supports bracketed
-# paste mode as documented: https://www.xfree86.org/current/ctlseqs.html
+# Requires xterm, urxvt, iTerm2 or any other terminal that supports
+# Bracketed Paste Mode as documented:
+# https://www.xfree86.org/current/ctlseqs.html#Bracketed%20Paste%20Mode
+#
+# For tmux, use:   bind ] paste-buffer -p
+#
+# Additional technical details: https://cirw.in/blog/bracketed-paste
 
-# create a new keymap to use while pasting
-bindkey -N paste
-# make everything in this keymap call our custom widget
-bindkey -R -M paste "^@"-"\M-^?" paste-insert
-# these are the codes sent around the pasted text in bracketed
-# paste mode.
-# do the first one with both -M viins and -M vicmd in vi mode
-bindkey '^[[200~' _start_paste
-bindkey -M paste '^[[201~' _end_paste
-# insert newlines rather than carriage returns when pasting newlines
-bindkey -M paste -s '^M' '^J'
+# Create a new keymap to use while pasting
+bindkey -N bracketed-paste
+# Make everything in this new keymap enqueue characters for pasting
+bindkey -RM bracketed-paste '\x00-\xFF' bracketed-paste-enqueue
+# These are the codes sent around the pasted text in bracketed paste mode
+bindkey -M main            '^[[200~' _bracketed_paste_begin
+bindkey -M bracketed-paste '^[[201~' _bracketed_paste_end
+# Insert newlines rather than carriage returns when pasting newlines
+bindkey -M bracketed-paste -s '^M' '^J'
 
-zle -N _start_paste
-zle -N _end_paste
-zle -N zle-line-init _zle_line_init
-zle -N zle-line-finish _zle_line_finish
-zle -N paste-insert _paste_insert
+zle -N _bracketed_paste_begin
+zle -N _bracketed_paste_end
+zle -N bracketed-paste-enqueue _bracketed_paste_enqueue
 
-# switch the active keymap to paste mode
-function _start_paste() {
-  bindkey -A paste main
+# Attempt to not clobber zle_line_{init,finish}
+# Use https://github.com/willghatch/zsh-hooks if available
+if typeset -f hooks-add-hook > /dev/null; then
+  hooks-add-hook zle_line_init_hook   _bracketed_paste_zle_init
+  hooks-add-hook zle_line_finish_hook _bracketed_paste_zle_finish
+else
+  zle -N zle-line-init   _bracketed_paste_zle_init
+  zle -N zle-line-finish _bracketed_paste_zle_finish
+fi
+
+# Switch the active keymap to paste mode
+_bracketed_paste_begin() {
+  # Save the bindkey command to restore the active ("main") keymap
+  # Tokenise the restorative bindkey command into an array
+  _bracketed_paste_restore_keymap=( ${(z)"$(bindkey -lL main)"} )
+  bindkey -A bracketed-paste main
 }
 
-# go back to our normal keymap, and insert all the pasted text in the
-# command line. this has the nice effect of making the whole paste be
+# Go back to our normal keymap, and insert all the pasted text in the
+# command line. This has the nice effect of making the whole paste be
 # a single undo/redo event.
-function _end_paste() {
-#use bindkey -v here with vi mode probably. maybe you want to track
-#if you were in ins or cmd mode and restore the right one.
-  bindkey -e
-  LBUFFER+=$_paste_content
-  unset _paste_content
+_bracketed_paste_end() {
+  # Only execute the restore command if it starts with 'bindkey'
+  # Allow for option KSH_ARRAYS being set (indexing starts at 0)
+  if [ ${_bracketed_paste_restore_keymap[@]:0:1} = 'bindkey' ]; then
+    $_bracketed_paste_restore_keymap
+  fi
+  LBUFFER+=$_bracketed_paste_content
+  unset _bracketed_paste_content _bracketed_paste_restore_keymap
 }
 
-function _paste_insert() {
-  _paste_content+=$KEYS
+# Append a pasted character to the content which is later inserted as a whole
+_bracketed_paste_enqueue() {
+  _bracketed_paste_content+=$KEYS
 }
 
-function _zle_line_init() {
-  # Tell terminal to send escape codes around pastes.
-  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color || $TERM = screen || $TERM = screen-256color ]] && printf '\e[?2004h'
+# Run at zle-line-init
+_bracketed_paste_zle_init() {
+  _bracketed_paste_content=''
+  # Tell terminal to send escape codes around pastes
+  if [[ $TERM =~ '^(rxvt-unicode|xterm(-256color)?|screen(-256color)?)$' ]]; then
+    printf '\e[?2004h'
+  fi
 }
 
-function _zle_line_finish() {
-  # Tell it to stop when we leave zle, so pasting in other programs
-  # doesn't get the ^[[200~ codes around the pasted text.
-  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color || $TERM = screen || $TERM = screen-256color ]] && printf '\e[?2004l'
+# Run at zle-line-finish
+_bracketed_paste_zle_finish() {
+  # Turn off bracketed paste when we leave ZLE, so pasting in other programs
+  # doesn't get the ^[[200~ codes around the pasted text
+  if [[ $TERM =~ '^(rxvt-unicode|xterm(-256color)?|screen(-256color)?)$' ]]; then
+    printf '\e[?2004l'
+  fi
 }
 
diff --git a/plugins/salt/_salt b/plugins/salt/_salt
index 78d8611d2..589d21d8b 100644
--- a/plugins/salt/_salt
+++ b/plugins/salt/_salt
@@ -9,7 +9,7 @@
 # zstyle ':completion::complete:salt(|-call):modules:'                use-cache true
 # zstyle ':completion::complete:salt(|-cp|-call|-run|-key):salt_dir:' use-cache true
 #
-# cache validation can be controled with the style cache-ttl.
+# cache validation can be controlled with the style cache-ttl.
 # it expects two arguments: number (days|hours|weeks|months)
 # to invalidate the minion cache after four days:
 # zstyle ':completion::complete:salt(|-cp|-call):minions:'            cache-ttl 4 days
@@ -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/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
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/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/screen/screen.plugin.zsh b/plugins/screen/screen.plugin.zsh
index 7009e7a91..c1db8ad92 100644
--- a/plugins/screen/screen.plugin.zsh
+++ b/plugins/screen/screen.plugin.zsh
@@ -2,7 +2,7 @@
 # of the tab window should be.
 if [[ "$TERM" == screen* ]]; then
   if [[ $_GET_PATH == '' ]]; then
-    _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^\/home\//~/;s/^~$USER/~/"'
+    _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^\/home\//~/;s/^~$USERNAME/~/"'
   fi
   if [[ $_GET_HOST == '' ]]; then
     _GET_HOST='echo $HOST | sed "s/\..*//"'
@@ -51,4 +51,4 @@ if [[ "$TERM" == screen* ]]; then
     eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_PROMPT"
     screen_set $tab_title $tab_hardstatus
   }
-fi
\ No newline at end of file
+fi
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/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/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 2b62f6cb5..14f2944cc 100755
--- a/plugins/shell-proxy/proxy.py
+++ b/plugins/shell-proxy/proxy.py
@@ -5,15 +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():
-    if "DEFAULT_PROXY" in os.environ:
-        return os.environ["DEFAULT_PROXY"]
-    if os.path.isfile(user_proxy):
-        return check_output(user_proxy).decode("utf-8").strip()
-    raise Exception("Not found, Proxy configuration")
+    default_proxy = os.environ.get(proxy_env)
+    if default_proxy:
+        return default_proxy
+    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):
@@ -30,7 +37,7 @@ def merge(mapping: dict):
 class CommandSet:
     proxies = make_proxies(get_http_proxy())
     aliases = {
-        _: "env NAME=%s %s" % (_, ssh_agent)
+        _: "env __SSH_PROGRAM_NAME__=%s %s" % (_, ssh_agent)
         for _ in ("ssh", "sftp", "scp", "slogin", "ssh-copy-id")
     }
 
@@ -52,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):
@@ -64,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 fd0e2fe79..4fdbe9322 100644
--- a/plugins/shell-proxy/shell-proxy.plugin.zsh
+++ b/plugins/shell-proxy/shell-proxy.plugin.zsh
@@ -1,16 +1,44 @@
 #!/usr/bin/bash
-# shellcheck disable=SC1090
+# shellcheck disable=SC1090,SC2154
 
-__PROXY__="${0:A:h}/proxy.py"
+# 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}"
 
-proxy() {
-	source <("$__PROXY__" "$1")
-}
+eval '
+  proxy() {
+    # 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="'"${0: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
diff --git a/plugins/shell-proxy/ssh-agent.py b/plugins/shell-proxy/ssh-agent.py
index 61cf84c0b..4ee24b755 100755
--- a/plugins/shell-proxy/ssh-agent.py
+++ b/plugins/shell-proxy/ssh-agent.py
@@ -6,7 +6,7 @@ import sys
 ssh_proxy = os.path.join(os.path.dirname(__file__), "ssh-proxy.py")
 
 argv = [
-    os.environ.get("NAME", "ssh"),
+    os.environ.get("__SSH_PROGRAM_NAME__", "ssh"),
     "-o",
     "ProxyCommand={} %h %p".format(ssh_proxy),
     "-o",
diff --git a/plugins/shell-proxy/ssh-proxy.py b/plugins/shell-proxy/ssh-proxy.py
index 5efd5fd21..a498c84bc 100755
--- a/plugins/shell-proxy/ssh-proxy.py
+++ b/plugins/shell-proxy/ssh-proxy.py
@@ -2,17 +2,35 @@
 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)
-argv = [
-    "nc",
-    "-X",
-    "connect",
-    "-x",
-    urllib.parse.urlparse(proxy).netloc,  # proxy-host:proxy-port
-    sys.argv[1],  # host
-    sys.argv[2],  # port
-]
 
-subprocess.call(argv)
+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))
+
+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(make_argv())
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}
diff --git a/plugins/sprunge/README.md b/plugins/sprunge/README.md
index 28ed1834a..80e3b30dc 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
 ```
@@ -28,5 +29,10 @@ 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.
+
+## Credits
+
+- Original code: [shellperson.net](https://web.archive.org/web/20190910065842/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/ssh-agent/README.md b/plugins/ssh-agent/README.md
index 0b96d9bb5..fa6a996d4 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -9,22 +9,62 @@ To enable it, add `ssh-agent` to your plugins:
 plugins=(... ssh-agent)
 ```
 
-## Instructions
+## Settings
 
 **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
 ```
 
-To **load multiple identities** use the `identities` style, For example:
+### `helper`
+
+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
+```
+
+### `identities`
+
+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
 ```
 
+**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}
+```
+
+### `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)
 (see _TIME FORMATS_). If left unspecified, the default lifetime is forever.
@@ -33,6 +73,32 @@ 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:
+
+```zsh
+zstyle :omz:plugins:ssh-agent ssh-add-args -K -c -a /run/user/1000/ssh-auth
+```
+
+These will then be passed the the `ssh-add` call as if written directly. The example
+above will turn into:
+
+```zsh
+ssh-add -K -c -a /run/user/1000/ssh-auth <identities>
+```
+
+For valid `ssh-add` arguments run `ssh-add --help` or `man ssh-add`.
+
 ## 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 6ab041c21..78ac46b13 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,82 +1,108 @@
-typeset _agent_forwarding _ssh_env_cache
+# Get the filename to store/lookup the environment from
+ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
 
 function _start_agent() {
-	local lifetime
-	zstyle -s :omz:plugins:ssh-agent lifetime lifetime
+  # Check if ssh-agent is already running
+  if [[ -f "$ssh_env_cache" ]]; then
+    . "$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
+    # 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
+  local lifetime
+  zstyle -s :omz:plugins:ssh-agent lifetime lifetime
+
+  # start ssh-agent and setup environment
+  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
 }
 
 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 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
-		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
+    # 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)$file]} -le 0 ]]; then
+      sig="$(ssh-keygen -lf "$file" | awk '{print $2}')"
+      [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$file")
+    fi
+  done
 
-	[[ -n "$not_loaded" ]] && ssh-add ${^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
+
+  # if ssh-agent quiet mode, pass -q to ssh-add
+  zstyle -t :omz:plugins:ssh-agent quiet && args=(-q $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 >&2 "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
-_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
-	# Add a nifty symlink for screen/tmux if agent forwarding
-	[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen
-elif [[ -f "$_ssh_env_cache" ]]; then
-	# Source SSH settings, if applicable
-	. $_ssh_env_cache > /dev/null
-	if [[ $USER == "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 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
+  _start_agent
 fi
 
-_add_identities
+# Don't add identities if lazy-loading is enabled
+if ! zstyle -t :omz:plugins:ssh-agent lazy; then
+  _add_identities
+fi
 
-# tidy up after ourselves
-unset _agent_forwarding _ssh_env_cache
+unset agent_forwarding ssh_env_cache
 unfunction _start_agent _add_identities
diff --git a/plugins/stack/stack.plugin.zsh b/plugins/stack/stack.plugin.zsh
index e3b6503a5..45ef38761 100644
--- a/plugins/stack/stack.plugin.zsh
+++ b/plugins/stack/stack.plugin.zsh
@@ -1,3 +1,4 @@
 (( $+commands[stack] )) || return
 
+autoload -U +X bashcompinit && bashcompinit
 source <(stack --bash-completion-script stack)
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"
     )
diff --git a/plugins/sudo/README.md b/plugins/sudo/README.md
index 4f3973ef8..27cd20c18 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:
 
@@ -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:
@@ -43,3 +57,19 @@ $ sudo rm some-system-file.txt
 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.
+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.
diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index b3749eff7..2a0b3bfc4 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -2,55 +2,106 @@
 # Description
 # -----------
 #
-# sudo or sudoedit will be inserted before the command
+# sudo or sudo -e (replacement for sudoedit) will be inserted before the command
 #
 # ------------------------------------------------------------------------------
 # Authors
 # -------
 #
 # * Dongweiming <ciici123@gmail.com>
+# * Subhaditya Nath <github.com/subnut>
+# * Marc Cornellà <github.com/mcornella>
+# * Carlo Sala <carlosalag@protonmail.com>
 #
 # ------------------------------------------------------------------------------
 
+__sudo-replace-buffer() {
+  local old=$1 new=$2 space=${2:+ }
+
+  # 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
+}
+
 sudo-command-line() {
-    [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
+  # If line is empty, get the last run command from history
+  [[ -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
+
+  {
+    # 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 [[ -n $EDITOR && $BUFFER == $EDITOR\ * ]]; then
-        if [[ ${#LBUFFER} -le ${#EDITOR} ]]; then
-            RBUFFER=" ${BUFFER#$EDITOR }"
-            LBUFFER="sudoedit"
-        else
-            LBUFFER="sudoedit ${LBUFFER#$EDITOR }"
-        fi
-    elif [[ $BUFFER == sudoedit\ * ]]; then
-        if [[ ${#LBUFFER} -le 8 ]]; then
-            RBUFFER=" ${BUFFER#sudoedit }"
-            LBUFFER="$EDITOR"
-        else
-            LBUFFER="$EDITOR ${LBUFFER#sudoedit }"
-        fi
-    elif [[ $BUFFER == sudo\ * ]]; then
-        if [[ ${#LBUFFER} -le 4 ]]; then
-            RBUFFER="${BUFFER#sudo }"
-            LBUFFER=""
-        else
-            LBUFFER="${LBUFFER#sudo }"
-        fi
-    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
+      __sudo-replace-buffer "$cmd" "sudo -e"
+      return
     fi
 
+    # Check for editor commands in the typed command and replace accordingly
+    case "$BUFFER" in
+      $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
+  } always {
     # Preserve beginning space
     LBUFFER="${WHITESPACE}${LBUFFER}"
+
+    # Redisplay edit buffer (compatibility with zsh-syntax-highlighting)
+    zle redisplay
+  }
 }
+
 zle -N sudo-command-line
+
 # Defined shortcut keys: [Esc] [Esc]
 bindkey -M emacs '\e\e' sudo-command-line
 bindkey -M vicmd '\e\e' sudo-command-line
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 cf1997c5b..ad5430275 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.
+# 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'
+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'
diff --git a/plugins/suse/README.md b/plugins/suse/README.md
index b9b069574..f37ec1695 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 running 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'
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/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index f40a59685..46dd5cb0c 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
@@ -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)" \
@@ -31,42 +31,44 @@ 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"
 }
 
 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() {
-  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
 }
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index fbc9ee538..22b07b4ec 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,72 +1,76 @@
 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() {
-  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() {
-  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 $2
+  else
+    # Otherwise, no lines were found, or an error occurred. Return clean.
+    echo $3
   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
 }
diff --git a/plugins/swiftpm/_swift b/plugins/swiftpm/_swift
index fe6f1c9aa..3a923226d 100644
--- a/plugins/swiftpm/_swift
+++ b/plugins/swiftpm/_swift
@@ -301,7 +301,7 @@ _swift_package_init() {
 _swift_package_unedit() {
     arguments=(
         ":The name of the package to unedit:_swift_dependency"
-        "--force[Unedit the package even if it has uncommited and unpushed changes.]"
+        "--force[Unedit the package even if it has uncommitted and unpushed changes.]"
     )
     _arguments $arguments && return
 }
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/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 () {
diff --git a/plugins/systemadmin/README.md b/plugins/systemadmin/README.md
index edca4d87d..3a9d9de66 100644
--- a/plugins/systemadmin/README.md
+++ b/plugins/systemadmin/README.md
@@ -10,17 +10,17 @@ plugins=(... systemadmin)
 
 ## Aliases
 
-| Alias   | Command                                                                | Description                                                        |
-|---------|------------------------------------------------------------------------|--------------------------------------------------------------------|
-| ping    | `ping -c 5`                                                            | Sends only 5 ICMP Messages                                         |
-| clr     | `clear; echo Currently logged in on $TTY, as $USER in directory $PWD.` | Clears the screen and prints the current user, TTY, and directory  |
-| 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,1n`                                 | Display the processes using the most memory                        |
-| psmem10 | `ps -e -orss=,args= \| sort -b -k1,1n \| head -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                    |
-| hist10  | `print -l ${(o)history%% *} \| uniq -c \| sort -nr \| head -n 10`      | Display the top 10 most used commands in the history               |
+| Alias   | Command                                                                    | Description                                                        |
+|---------|----------------------------------------------------------------------------|--------------------------------------------------------------------|
+| ping    | `ping -c 5`                                                                | Sends only 5 ICMP Messages                                         |
+| clr     | `clear; echo Currently logged in on $TTY, as $USERNAME in directory $PWD.` | Clears the screen and prints the current user, TTY, and directory  |
+| 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 -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 -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
 
@@ -41,7 +41,7 @@ plugins=(... systemadmin)
 | accessip10  | List the top 10 accesses to the ip address in the nginx/access.log file or another log file if specified              |
 | visitpage20 | List the top 20 most visited files or pages in the nginx/access.log file or another log file if specified             |
 | consume100  | List the 100 most time-consuming Page lists (more than 60 seconds) as well as the corresponding number of occurrences |
-| webtraffic  | List website traffic statistics in GB from tne nginx/access.log file or another log file if specified                 |
+| webtraffic  | List website traffic statistics in GB from the nginx/access.log file or another log file if specified                 |
 | c404        | List statistics on 404 connections in the nginx/access.log file or another log file if specified                      |
 | httpstatus  | List statistics based on http status in the nginx/access.log file or another log file if specified                    |
 | d0          | Delete 0 byte files recursively in the current directory or another if specified                                      |
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index ded25c3a9..8e5e0af71 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -21,121 +21,122 @@ function retlog() {
 }
 
 alias ping='ping -c 5'
-alias clr='clear; echo Currently logged in on $TTY, as $USER in directory $PWD.'
+alias clr='clear; echo Currently logged in on $TTY, as $USERNAME in directory $PWD.'
 alias path='print -l $path'
 alias mkdir='mkdir -pv'
 # get top process eating memory
-alias psmem='ps -e -orss=,args= | sort -b -k1,1n'
-alias psmem10='ps -e -orss=,args= | sort -b -k1,1n| head -10'
-# get top process eating cpu if not work try excute : export LC_ALL='C'
+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 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 -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'
 
 # 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() {
-    sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -20
+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() {
-    awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -20
+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() {
-    awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
-    # if django website or other webiste make by no suffix language
-    # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+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() {
-    curl -s -S https://icanhazip.com
+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
@@ -144,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
 }
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..7afd2be58 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,10 +38,8 @@ sudo_commands=(
   list-machines
   load
   mask
-  poweroff
   preset
   preset-all
-  reboot
   reenable
   reload
   reload-or-restart
@@ -54,18 +52,39 @@ sudo_commands=(
   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
+  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
 }
-
diff --git a/plugins/term_tab/README b/plugins/term_tab/README
new file mode 100644
index 000000000..316062e73
--- /dev/null
+++ b/plugins/term_tab/README
@@ -0,0 +1,16 @@
+
+term_tab - 'cwd' for all open zsh sessions
+******************************************
+
+What it does:
+*************
+This plugin allows to complete the 'cwd' of other Zsh sessions. Sounds
+complicated but is rather simple. E.g. if you have three zsh sessions open, in
+each session you are in a different folder, you can hit Ctrl+v in one session
+to show you the current working directory of the other open zsh sessions.
+
+How it works:
+*************
+* It uses 'pidof zsh' to determine all zsh PIDs
+* It reads procfs to get the current working directory of this session
+* Everything is fed into zsh's completion magic
diff --git a/plugins/term_tab/term_tab.plugin.zsh b/plugins/term_tab/term_tab.plugin.zsh
new file mode 100644
index 000000000..1b612df68
--- /dev/null
+++ b/plugins/term_tab/term_tab.plugin.zsh
@@ -0,0 +1,41 @@
+# Copyright (C) 2014 Julian Vetter <death.jester@web.de>
+#
+# 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 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+function _term_list(){
+  local -a expl
+  local -au dirs
+
+  PREFIX="$IPREFIX$PREFIX"
+  IPREFIX=
+  SUFFIX="$SUFFIX$ISUFFIX"
+  ISUFFIX=
+
+  [[ -o magicequalsubst ]] && compset -P '*='
+
+  case $OSTYPE in
+    solaris*) dirs=( ${(M)${${(f)"$(pgrep -U $UID -x zsh|xargs pwdx)"}:#$$:*}%%/*} ) ;;
+    linux*) dirs=( /proc/${^$(pidof zsh):#$$}/cwd(N:A) ) ;;
+  esac
+  dirs=( ${(D)dirs} )
+
+  compstate[pattern_match]='*'
+  _wanted directories expl 'current directory from other shell' \
+      compadd -Q -M "r:|/=* r:|=*" -f -a dirs
+}
+
+zle -C term_list menu-complete _generic
+bindkey "^v" term_list
+zstyle ':completion:term_list::::' completer _term_list
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/terraform/README.md b/plugins/terraform/README.md
index 9e9f0cdfb..59c6e7f2a 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,35 @@ 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`     |
+| `tfo` | `terraform output`   |
+| `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 b/plugins/terraform/_terraform
index e4298f2ab..625834563 100644
--- a/plugins/terraform/_terraform
+++ b/plugins/terraform/_terraform
@@ -6,14 +6,16 @@ _terraform_cmds=(
     'console:Interactive console for Terraform interpolations'
     'destroy:Destroy Terraform-managed infrastructure'
     'fmt:Rewrites config files to canonical format'
+    'force-unlock:Manually unlock the terraform state'
     'get:Download and install modules for the configuration'
     'graph:Create a visual graph of Terraform resources'
     'import:Import existing infrastructure into Terraform'
     'init:Initialize a Terraform working directory'
+    'login:Obtain and save credentials for a remote host'
+    'logout:Remove locally-stored credentials for a remote host'
     'output:Read an output from a state file'
     'plan:Generate and show an execution plan'
     'providers:Prints a tree of the providers used in the configuration'
-    'push:Upload this Terraform module to Atlas to run'
     'refresh:Update local state file against real resources'
     'show:Inspect Terraform state or plan'
     'state:Advanced state management'
@@ -23,6 +25,7 @@ _terraform_cmds=(
     'version:Prints the Terraform version'
     'workspace:Workspace management'
     '0.12upgrade:Rewrites pre-0.12 module source code for v0.12'
+    '0.13upgrade:Rewrites pre-0.13 module source code for v0.13'
 )
 
 __012upgrade() {
@@ -31,45 +34,51 @@ __012upgrade() {
     '-force[ Override the heuristic that attempts to detect if a configuration is already written for v0.12 or later.  Some of the transformations made by this command are not idempotent, so re-running against the same module may change the meanings expressions in the module.]'
 }
 
+__013upgrade() {
+  _arguments \
+    '-yes[Skip the initial introduction messages and interactive confirmation. This can be used to run this command in batch from a script.]'
+}
+
 __apply() {
     _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
         '-auto-approve[Skip interactive approval of plan before applying.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
+        '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-no-color[If specified, output wil be colorless.]' \
+        '-no-color[If specified, output will be colorless.]' \
         '-parallelism=[(10) Limit the number of parallel resource operations.]' \
         '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
-        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]' \
-        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
-        '-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
+        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]:statefile:_files -g "*.tfstate"' \
+        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -g "*.tfstate"' \
+        '*-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __console() {
     _arguments \
         '-state=[(terraform.tfstate) Path to read state.]' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __destroy() {
     _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
         '-auto-approve[Skip interactive approval before destroying.]' \
         '-force[Deprecated: same as auto-approve.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-no-color[If specified, output will contain no color.]' \
         '-parallelism=[(10) Limit the number of concurrent operations.]' \
         '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
-        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]' \
-        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
-        '-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
+        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]:statefile:_files -g "*.tfstate"' \
+        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -g "*.tfstate"' \
+        '*-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __fmt() {
@@ -81,33 +90,36 @@ __fmt() {
         '-recursive=[(false) Also process files in subdirectories. By default, only the given directory (or current directory) is processed.]'
 }
 
+__force_unlock() {
+    _arguments \
+        "-force[Don't ask for input for unlock confirmation.]"
+}
+
 __get() {
     _arguments \
         '-update=[(false) If true, modules already downloaded will be checked for updates and updated if necessary.]' \
-        '-no-color[If specified, output will contain no color.]'
+        '-no-color[Disable text coloring in the output.]'
 }
 
 __graph() {
     _arguments \
         '-draw-cycles[Highlight any cycles in the graph with colored edges. This helps when diagnosing cycle errors.]' \
-        '-no-color[If specified, output will contain no color.]' \
         '-type=[(plan) Type of graph to output. Can be: plan, plan-destroy, apply, validate, input, refresh.]'
 }
 
 __import() {
     _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
         '-config=[(path) Path to a directory of Terraform configuration files to use to configure the provider. Defaults to pwd. If no config files are present, they must be provided via the input prompts or env vars.]' \
         '-allow-missing-config[Allow import when no resource configuration block exists.]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-no-color[If specified, output will contain no color.]' \
-        '-provider=[(provider) Specific provider to use for import. This is used for specifying aliases, such as "aws.eu". Defaults to the normal provider prefix of the resource being imported.]' \
-        '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]' \
-        '-state-out=[(PATH) Path to the destination state file to write to. If this is not specified, the source state file will be used. This can be a new or existing path.]' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times. This is only useful with the "-config" flag.]' \
-        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
+        '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -g "*.tfstate"' \
+        '-state-out=[(PATH) Path to the destination state file to write to. If this is not specified, the source state file will be used. This can be a new or existing path.]:statefile:_files -g "*.tfstate"' \
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times. This is only useful with the "-config" flag.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __init() {
@@ -115,80 +127,94 @@ __init() {
         '-backend=[(true) Configure the backend for this configuration.]' \
         '-backend-config=[This can be either a path to an HCL file with key/value assignments (same format as terraform.tfvars) or a 'key=value' format. This is merged with what is in the configuration file. This can be specified multiple times. The backend type must be in the configuration itself.]' \
         '-force-copy[Suppress prompts about copying state data. This is equivalent to providing a "yes" to all confirmation prompts.]' \
-        '-from-module=[Copy the contents of the given module into the target directory before initialization.]' \
+        '-from-module=[(SOURCE) Copy the contents of the given module into the target directory before initialization.]' \
         '-get=[(true) Download any modules for this configuration.]' \
         '-get-plugins=[(true) Download any missing plugins for this configuration.]' \
         '-input=[(true) Ask for input if necessary. If false, will error if input was required.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-no-color[If specified, output will contain no color.]' \
-        '-plugin-dir[Directory containing plugin binaries. This overrides all default search paths for plugins, and prevents the automatic installation of plugins. This flag can be used multiple times.]' \
+        '-plugin-dir[Directory containing plugin binaries. This overrides all default search paths for plugins, and prevents the automatic installation of plugins. This flag can be used multiple times.]:plugin_dir:_files -/' \
         '-reconfigure[Reconfigure the backend, ignoring any saved configuration.]' \
         '-upgrade=[(false) If installing modules (-get) or plugins (-get-plugins), ignore previously-downloaded objects and install the latest version allowed within configured constraints.]' \
         '-verify-plugins=[(true) Verify the authenticity and integrity of automatically downloaded plugins.]'
 }
 
+__login() {
+    _arguments \
+
+}
+
+__logout() {
+    _arguments \
+
+}
+
 __output() {
     _arguments \
-        '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate".]' \
-        '-no-color[ If specified, output will contain no color.]' \
-        '-module=[(name) If specified, returns the outputs for a specific module]' \
+        '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
+        '-no-color[If specified, output will contain no color.]' \
         '-json[If specified, machine readable output will be printed in JSON format]'
 }
 
 __plan() {
     _arguments \
-        '-destroy[() If set, a plan will be generated to destroy all resources managed by the given configuration and state.]' \
+        '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
+        '-destroy[If set, a plan will be generated to destroy all resources managed by the given configuration and state.]' \
         '-detailed-exitcode[() Return detailed exit codes when the command exits. This will change the meaning of exit codes to: 0 - Succeeded, diff is empty (no changes); 1 - Errored, 2 - Succeeded; there is a diff]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
-        '-module-depth=[(n) Specifies the depth of modules to show in the output. This does not affect the plan itself, only the output shown. By default, this is -1, which will expand all.]' \
         '-no-color[() If specified, output will contain no color.]' \
         '-out=[(path) Write a plan file to the given path. This can be used as input to the "apply" command.]' \
         '-parallelism=[(10) Limit the number of concurrent operations.]' \
         '-refresh=[(true) Update state prior to checking for differences.]' \
-        '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]' \
-        '-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]' \
+        '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]:statefile:_files -g "*.tfstate"' \
+        '*-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __providers() {
-    _arguments \
+    local -a __providers_cmds
+    __providers_cmds=(
+      'mirror:Mirrors the provider plugins needed for the current configuration'
+      'schema:Prints the schemas of the providers used in the configuration'
+    )
+    _describe -t providers "providers commands" __providers_cmds
 
 }
 
-__push() {
+__providers_mirror() {
     _arguments \
-        '-atlas-address=[(url) An alternate address to an Atlas instance. Defaults to https://atlas.hashicorp.com.]' \
-        '-upload-modules=[(true) If true (default), then the modules being used are all locked at their current checkout and uploaded completely to Atlas. This prevents Atlas from running terraform get for you.]' \
-        '-name=[(name) Name of the infrastructure configuration in Atlas. The format of this is: "username/name" so that you can upload configurations not just to your account but to other accounts and organizations. This setting can also be set in the configuration in the Atlas section.]' \
-        '-no-color[Disables output with coloring]' \
-        '-overwrite=[(foo) Marks a specific variable to be updated on Atlas. Normally, if a variable is already set in Atlas, Terraform will not send the local value (even if it is different). This forces it to send the local value to Atlas. This flag can be repeated multiple times.]' \
-        '-token=[(token) Atlas API token to use to authorize the upload. If blank or unspecified, the ATLAS_TOKEN environmental variable will be used.]' \
-        '-var=[("foo=bar") Set the value of a variable for the Terraform configuration.]' \
-        '-var-file=[(foo) Set the value of variables using a variable file.]' \
-        '-vcs=[(true) If true (default), then Terraform will detect if a VCS is in use, such as Git, and will only upload files that are committed to version control. If no version control system is detected, Terraform will upload all files in path (parameter to the command).]'
+      '-platform=[(os_arch) Choose which target platform to build a mirror for.]' \
+      "*:target_dir:_files -/"
+}
+
+__providers_schema() {
+    _arguments \
+      '-json[]' \
+      '::'
 }
 
 __refresh() {
     _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]::backupfile:_files -g "*.backup"' \
+        '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-no-color[If specified, output will not contain any color.]' \
-        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
-        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
-        '-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
+        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -g "*.tfstate"' \
+        '*-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __show() {
     _arguments \
-        '-module-depth=[(n) The maximum depth to expand modules. By default this is zero, which will not expand modules at all.]' \
+        '-json[If specified, output the Terraform plan or state in a machine-readable form.]' \
         '-no-color[If specified, output will not contain any color.]'
 }
 
@@ -199,6 +225,7 @@ __state() {
       'mv:Move an item in the state'
       'pull:Pull current state and output to stdout'
       'push:Update remote state from a local state file'
+      'replace-provider:Replace provider for resources in the Terraform state'
       'rm:Remove instances from the state' 
       'show:Show a resource in the state'
     )
@@ -207,7 +234,7 @@ __state() {
 
 __state_list() {
   _arguments \
-    '-state=[(path) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]' \
+    '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default, Terraform will consult the state of the currently-selected workspace.]' \
     '-id=[(id) Filters the results to include only instances whose resource types have an attribute named id whose value equals the given id string.]' \
     "*:address:__statelist" 
 }
@@ -215,12 +242,12 @@ __state_list() {
 __state_mv() {
   _arguments \
     "-dry-run[If set, prints out what would've been moved but doesn't actually move anything.]" \
-    "-backup=[(path) Path where Terraform should write the backup for the original state. This can't be disabled. If not set, Terraform will write it to the same path as the statefile with a \".backup\" extension.]:file:_files" \
-    "-backup-out=[(path) Path where Terraform should write the backup for the destination state. This can't be disabled. If not set, Terraform will write it to the same path as the destination state file with a backup extension. This only needs to be specified if -state-out is set to a different path than -state.]:file:_files" \
-    "-lock=[(true|false) Lock the state files when locking is supported.]:lock:(true false)" \
-    "-lock-timeout=[(seconds) Duration to retry a state lock.]" \
-    '-state=[(path) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:file:_files' \
-    "-state-out=[(path) Path to the destination state file to write to. If this isn't specified, the source state file will be used. This can be a new or existing path.]:file:_files" \
+    '-backup=[(PATH) Path where Terraform should write the backup for the original state. This can"t be disabled. If not set, Terraform will write it to the same path as the statefile with a ".backup" extension.]:backupfile:_files -g "*.backup"' \
+    '-backup-out=[(PATH) Path where Terraform should write the backup for the destination state. This can"t be disabled. If not set, Terraform will write it to the same path as the destination state file with a backup extension. This only needs to be specified if -state-out is set to a different path than -state.]:backupfile:_files -g "*.backup"' \
+    "-lock=[(true) Lock the state files when locking is supported.]:lock:(true false)" \
+    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
+    '-state=[(path) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -g "*.tfstate"' \
+    '-state-out=[(path) Path to the destination state file to write to. If this isn"t specified, the source state file will be used. This can be a new or existing path.]:statefile:_files -g "*.tfstate"' \
     "::" \
     ":source:__statelist" \
     ":destination: " 
@@ -229,26 +256,37 @@ __state_mv() {
 __state_push() {
   _arguments \
     "-force[Write the state even if lineages don't match or the remote serial is higher.]" \
-    '-lock=[(true|false) Lock the state file when locking is supported.]:lock:(true false)' \
-    "-lock-timeout=[(seconds) Duration to retry a state lock.]" \
+    '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
+    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
     "::" \
     ":destination:_files"
 }
 
+__state_replace_provider() {
+  _arguments \
+    '-auto-approve[Skip interactive approval.]' \
+    '-backup=[(PATH) Path where Terraform should write the backup for the state file. This can"t be disabled. If not set, Terraform will write it to the same path as the state file with a ".backup" extension.]:backupfile:_files -g "*.backup"' \
+    "-lock=[(true) Lock the state files when locking is supported.]:lock:(true false)" \
+    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
+    '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -g "*.tfstate"' \
+    ":from_provider_fqn:" \
+    ":to_provider_fqn:"
+}
+
 __state_rm() {
   _arguments \
     "-dry-run[If set, prints out what would've been removed but doesn't actually remove anything.]" \
-    "-backup=[(path) Path where Terraform should write the backup for the original state.]:file:_files" \
-    "-lock=[(true|false) Lock the state files when locking is supported.]:lock:(true false)" \
-    "-lock-timeout=[(seconds) Duration to retry a state lock.]" \
-    '-state=[(path) Path to the state file to update. Defaults to the current workspace state.]:file:_files' \
+    '-backup=[(PATH) Path where Terraform should write the backup for the original state.]::backupfile:_files -g "*.backup"' \
+    "-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)" \
+    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
+    '-state=[(PATH) Path to the state file to update. Defaults to the current workspace state.]:statefile:_files -g "*.tfstate"' \
     "*:address:__statelist" 
 }
 
 
 __state_show() {
   _arguments \
-    '-state=[(path) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]' \
+    '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]:statefile:_files -g "*.tfstate"' \
     "*:address:__statelist" 
 }
 
@@ -259,34 +297,36 @@ __statelist() {
 __taint() {
     _arguments \
         '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
-        '-no-color[If specified, output will not contain any color.]' \
-        '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]' \
-        '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]' \
+        '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
+        '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]:statefile:_files -g "*.tfstate"' \
         "*:address:__statelist" 
 }
 
 __untaint() {
     _arguments \
     '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
-    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
-    '-lock=[(true) Lock the state file when locking is supported.]' \
+    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
+    '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
     '-lock-timeout=[(0s) Duration to retry a state lock.]' \
     '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
-    '-no-color[If specified, output will not contain any color.]' \
-    '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]' \
-    '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]'
+    '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
+    '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]:statefile:_files -g "*.tfstate"'
 }
 
 __validate() {
     _arguments \
-    '-check-variables=[(true) If set to true (default), the command will check whether all required variables have been specified.]' \
     '-no-color[If specified, output will not contain any color.]' \
-    '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-    '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+    '-json[Produce output in a machine-readable JSON format, suitable for use in text editor integrations and other automated systems.]' \
+    ':dir:_files -/'
+}
+
+__version() {
+    _arguments \
+    '-json[Output the version information as a JSON object.]'
 }
 
 __workspace() {
@@ -312,6 +352,8 @@ local -a _command_args
 case "$words[1]" in
   0.12upgrade)
     __012upgrade ;;
+  0.13upgrade)
+    __013upgrade ;;
   apply)
     __apply ;;
   console)
@@ -320,6 +362,8 @@ case "$words[1]" in
     __destroy ;;
   fmt)
     __fmt;;
+  force-unlock)
+    __force_unlock;;
   get)
     __get ;;
   graph)
@@ -328,14 +372,19 @@ case "$words[1]" in
     __import;;
   init)
     __init ;;
+  login)
+    __login ;;
+  logout)
+    __logout ;;
   output)
     __output ;;
   plan)
     __plan ;;
   providers)
-    __providers ;;
-  push)
-    __push ;;
+    test $CURRENT -lt 3 && __providers
+    [[ $words[2] = "mirror" ]] && __providers_mirror
+    [[ $words[2] = "schema" ]] && __providers_schema
+    ;;
   refresh)
     __refresh ;;
   show)
@@ -345,6 +394,7 @@ case "$words[1]" in
     [[ $words[2] = "list" ]] && __state_list
     [[ $words[2] = "mv" ]] && __state_mv
     [[ $words[2] = "push" ]] && __state_push
+    [[ $words[2] = "replace-provider" ]] && __state_replace_provider
     [[ $words[2] = "rm" ]] && __state_rm
     [[ $words[2] = "show" ]] && __state_show
     ;;
@@ -354,6 +404,8 @@ case "$words[1]" in
     __untaint ;;
   validate)
     __validate ;;
+  version)
+    __version ;;
   workspace)
     test $CURRENT -lt 3 && __workspace ;;
 esac
diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index 2c42d394d..d9e39e6ac 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -1,11 +1,18 @@
 function tf_prompt_info() {
-    # dont show 'default' workspace in home dir
-    [[ "$PWD" == ~ ]] && return
-    # check if in terraform dir
-    if [ -d .terraform ]; then
-      workspace=$(terraform workspace show 2> /dev/null) || 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'
+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'
diff --git a/plugins/thefuck/README.md b/plugins/thefuck/README.md
index bd407b316..84f7255ce 100644
--- a/plugins/thefuck/README.md
+++ b/plugins/thefuck/README.md
@@ -2,6 +2,10 @@
 
 [The Fuck](https://github.com/nvbn/thefuck) plugin — magnificent app which corrects your previous console command.
 
+To use it, add thefuck to the plugins array of your zshrc file:
+
+plugins=(... thefuck)
+
 ## Usage
 Press `ESC` twice to correct previous console command.
 
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)"
diff --git a/plugins/tmux/README.md b/plugins/tmux/README.md
index 2ceaf1ad5..7348f77c9 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 $ZSH_TMUX_CONFIG` | 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`)     |
@@ -39,3 +40,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..b9bb66d59 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -3,15 +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'
-
 # CONFIGURATION VARIABLES
 # Automatically start tmux
 : ${ZSH_TMUX_AUTOSTART:=false}
@@ -39,6 +30,16 @@ alias tkss='tmux kill-session -t'
 # 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
@@ -46,6 +47,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
@@ -76,7 +82,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
diff --git a/plugins/toolbox/README.md b/plugins/toolbox/README.md
new file mode 100644
index 000000000..abaca31f4
--- /dev/null
+++ b/plugins/toolbox/README.md
@@ -0,0 +1,25 @@
+# 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)'
+```
+
+## Aliases
+
+| Alias | Command              | Description                            |
+|-------|----------------------|----------------------------------------|
+| tb    | `toolbox enter`      | Enters the toolbox environment         |
diff --git a/plugins/toolbox/toolbox.plugin.zsh b/plugins/toolbox/toolbox.plugin.zsh
new file mode 100644
index 000000000..d24d6d396
--- /dev/null
+++ b/plugins/toolbox/toolbox.plugin.zsh
@@ -0,0 +1,5 @@
+function toolbox_prompt_info() {
+  [[ -f /run/.toolboxenv ]] && echo "⬢"
+}
+
+alias tb="toolbox enter"
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
 }
diff --git a/plugins/ubuntu/README.md b/plugins/ubuntu/README.md
index f72182f5c..20f5c65ee 100644
--- a/plugins/ubuntu/README.md
+++ b/plugins/ubuntu/README.md
@@ -16,10 +16,11 @@ 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                                                |
-| 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/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index a53752fb2..7b765a406 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'
@@ -50,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
@@ -73,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*)
@@ -102,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'"
diff --git a/plugins/universalarchive/README.md b/plugins/universalarchive/README.md
new file mode 100644
index 000000000..93a1bd9fc
--- /dev/null
+++ b/plugins/universalarchive/README.md
@@ -0,0 +1,46 @@
+# universalarchive plugin
+
+Lets you compress files by a command `ua <format> <files>`, supporting various
+compression formats (e.g. 7z, tar.gz, lzma, ...).
+
+To enable it, add `universalarchive` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... universalarchive)
+```
+
+## Usage
+
+Run `ua <format> <files>` to compress `<files>` into an archive file using `<format>`.
+For example:
+
+```sh
+ua xz *.html
+```
+
+this command will compress all `.html` files in directory `folder` into `folder.xz`.
+
+This plugin saves you from having to remember which command line arguments compress a file.
+
+## Supported compression formats
+
+| Extension        | Description                    |
+|:-----------------|:-------------------------------|
+| `7z`             | 7zip file                      |
+| `bz2`            | Bzip2 file                     |
+| `gz`             | Gzip file                      |
+| `lzma`           | LZMA archive                   |
+| `lzo`            | LZO archive                    |
+| `rar`            | WinRAR archive                 |
+| `tar`            | Tarball                        |
+| `tbz`/`tar.bz2`  | Tarball with bzip2 compression |
+| `tgz`/`tar.gz`   | Tarball with gzip compression  |
+| `tlz`/`tar.lzma` | Tarball with lzma compression  |
+| `txz`/`tar.xz`   | Tarball with lzma2 compression |
+| `tZ`/`tar.Z`     | Tarball with LZW compression   |
+| `xz`             | LZMA2 archive                  |
+| `Z`              | Z archive (LZW)                |
+| `zip`            | Zip archive                    |
+| `zst`            | Zstd archive                   |
+
+See [list of archive formats](https://en.wikipedia.org/wiki/List_of_archive_formats) for more information regarding the archive formats.
diff --git a/plugins/universalarchive/_universalarchive b/plugins/universalarchive/_universalarchive
new file mode 100644
index 000000000..17cfd782e
--- /dev/null
+++ b/plugins/universalarchive/_universalarchive
@@ -0,0 +1,6 @@
+#compdef ua
+
+_arguments \
+  "1:archive format:(7z bz2 gz lzma lzo rar tar tar.bz2 tar.gz tar.lzma tar.xz tar.Z tbz tgz tlz txz tZ xz Z zip zst)" \
+  "*:input files:_files" \
+&& return 0
diff --git a/plugins/universalarchive/universalarchive.plugin.zsh b/plugins/universalarchive/universalarchive.plugin.zsh
new file mode 100644
index 000000000..b287c22b2
--- /dev/null
+++ b/plugins/universalarchive/universalarchive.plugin.zsh
@@ -0,0 +1,70 @@
+function ua() {
+  local usage=\
+"Archive files and directories using a given compression algorithm.
+
+Usage:   $0 <format> <files>
+Example: $0 tbz PKGBUILD
+
+Supported archive formats are:
+7z, bz2, gz, lzma, lzo, rar, tar, tbz (tar.bz2), tgz (tar.gz),
+tlz (tar.lzma), txz (tar.xz), tZ (tar.Z), xz, Z, zip, and zst."
+
+  if [[ $# -lt 2 ]]; then
+    print -u2 -- "$usage"
+    return 1
+  fi
+
+  local ext="$1"
+  local input="${2:a}"
+
+  shift
+
+  if [[ ! -e "$input" ]]; then
+    print -u2 -- "$input not found"
+    return 1
+  fi
+
+  # generate output file name
+  local output
+  if [[ $# -gt 1 ]]; then
+    output="${input:h:t}"
+  elif [[ -f "$input" ]]; then
+    output="${input:r:t}"
+  elif [[ -d "$input" ]]; then
+    output="${input:t}"
+  fi
+
+  # if output file exists, generate a random name
+  if [[ -f "${output}.${ext}" ]]; then
+    output=$(mktemp "${output}_XXX") && rm "$output" || return 1
+  fi
+
+  # add extension
+  output="${output}.${ext}"
+
+  # safety check
+  if [[ -f "$output" ]]; then
+    print -u2 -- "output file '$output' already exists. Aborting"
+    return 1
+  fi
+
+  case "$ext" in
+    7z)           7z u                        "${output}"   "${@}" ;;
+    bz2)          bzip2 -vcf                  "${@}" > "${output}" ;;
+    gz)           gzip -vcf                   "${@}" > "${output}" ;;
+    lzma)         lzma -vc -T0                "${@}" > "${output}" ;;
+    lzo)          lzop -vc                    "${@}" > "${output}" ;;
+    rar)          rar a                       "${output}"   "${@}" ;;
+    tar)          tar -cvf                    "${output}"   "${@}" ;;
+    tbz|tar.bz2)  tar -cvjf                   "${output}"   "${@}" ;;
+    tgz|tar.gz)   tar -cvzf                   "${output}"   "${@}" ;;
+    tlz|tar.lzma) XZ_OPT=-T0 tar --lzma -cvf  "${output}"   "${@}" ;;
+    txz|tar.xz)   XZ_OPT=-T0 tar -cvJf        "${output}"   "${@}" ;;
+    tZ|tar.Z)     tar -cvZf                   "${output}"   "${@}" ;;
+    xz)           xz -vc -T0                  "${@}" > "${output}" ;;
+    Z)            compress -vcf               "${@}" > "${output}" ;;
+    zip)          zip -rull                   "${output}"   "${@}" ;;
+    zst)          zstd -c -T0                 "${@}" > "${output}" ;;
+    *) print -u2 -- "$usage"; return 1 ;;
+  esac
+}
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)
 }
 
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/vi-mode/README.md b/plugins/vi-mode/README.md
index 8519a5592..476666bf6 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -1,34 +1,77 @@
-vi-mode
-=======
+# vi-mode plugin
+
 This plugin increase `vi-like` zsh functionality.
 
+To use it, add `vi-mode` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... vi-mode)
+```
+
+## Settings
+
+- `VI_MODE_RESET_PROMPT_ON_MODE_CHANGE`: controls whether the prompt is redrawn when
+  switching to a different input mode. If this is unset, the mode indicator will not
+  be updated when changing to a different mode.
+  Set it to `true` to enable it. For example:
+
+  ```zsh
+  VI_MODE_RESET_PROMPT_ON_MODE_CHANGE=true
+  ```
+
+  The default value is unset, unless `vi_mode_prompt_info` is used, in which case it'll
+  automatically be set to `true`.
+
+- `VI_MODE_SET_CURSOR`: controls whether the cursor style is changed when switching
+  to a different input mode. Set it to `true` to enable it (default: unset):
+
+  ```zsh
+  VI_MODE_SET_CURSOR=true
+  ```
+
+- `MODE_INDICATOR`: controls the string displayed when the shell is in normal mode.
+  See [Mode indicators](#mode-indicators) for details.
+
+- `INSERT_MODE_INDICATOR`: controls the string displayed when the shell is in insert mode.
+  See [Mode indicators](#mode-indicators) for details.
+
+## Mode indicators
+
+*Normal mode* is indicated with a red `<<<` mark at the right prompt, when it
+hasn't been defined by theme, *Insert mode* is not displayed by default.
+
+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{white}+%f"
+INSERT_MODE_INDICATOR="%F{yellow}+%f"
+```
+
+You can also use the `vi_mode_prompt_info` function in your prompt, which will display
+this mode indicator.
+
+## Key bindings
+
 Use `ESC` or `CTRL-[` to enter `Normal mode`.
 
+NOTE: some of these key bindings are set by zsh by default when using a vi-mode keymap.
 
-History
--------
+### History
 
 - `ctrl-p` : Previous command in history
 - `ctrl-n` : Next command in history
 - `/`      : Search backward in history
 - `n`      : Repeat the last `/`
 
+### Vim edition
 
-Mode indicators
----------------
+- `vv`     : Edit current command line in Vim
 
-*Normal mode* is indicated with red `<<<` mark at the right prompt, when it
-wasn't defined by theme.
+NOTE: this used to be bound to `v`. That is now the default (`visual-mode`).
 
-
-Vim edition
------------
-
-- `v`   : Edit current command line in Vim
-
-
-Movement
---------
+### Movement
 
 - `$`   : To the end of the line
 - `^`   : To the first non-blank character of the line
@@ -46,9 +89,7 @@ Movement
 - `;`   : Repeat latest f, t, F or T [count] times
 - `,`   : Repeat latest f, t, F or T in opposite direction
 
-
-Insertion
----------
+### Insertion
 
 - `i`   : Insert text before the cursor
 - `I`   : Insert text before the first character in the line
@@ -57,9 +98,7 @@ Insertion
 - `o`   : Insert new command line below the current one
 - `O`   : Insert new command line above the current one
 
-
-Delete and Insert
------------------
+### Delete and Insert
 
 - `ctrl-h`      : While in *Insert mode*: delete character before the cursor
 - `ctrl-w`      : While in *Insert mode*: delete word before the cursor
@@ -71,5 +110,23 @@ Delete and Insert
 - `C`           : Delete to the end of the line and start insert
 - `r{char}`     : Replace the character under the cursor with {char}
 - `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
+- `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`)
+```
diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index c91ba05ba..149d6bbd5 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -1,32 +1,77 @@
+# Control whether to force a redraw on each mode change.
+#
+# Resetting the prompt on every mode change can cause lag when switching modes.
+# This is especially true if the prompt does things like checking git status.
+#
+# Set to "true" to force the prompt to reset on each mode change.
+# Unset or set to any other value to do the opposite.
+#
+# The default is not to reset, unless we're showing the mode in RPS1.
+typeset -g VI_MODE_RESET_PROMPT_ON_MODE_CHANGE
+# Control whether to change the cursor style on mode change.
+#
+# Set to "true" to change the cursor on each mode change.
+# Unset or set to any other value to do the opposite.
+typeset -g VI_MODE_SET_CURSOR
+
+typeset -g VI_KEYMAP=main
+
+function _vi-mode-set-cursor-shape-for-keymap() {
+  [[ "$VI_MODE_SET_CURSOR" = true ]] || return
+
+  # https://vt100.net/docs/vt510-rm/DECSCUSR
+  local _shape=0
+  case "${1:-${VI_KEYMAP:-main}}" in
+    main)    _shape=6 ;; # vi insert: line
+    viins)   _shape=6 ;; # vi insert: line
+    isearch) _shape=6 ;; # inc search: line
+    command) _shape=6 ;; # read a command name
+    vicmd)   _shape=2 ;; # vi cmd: block
+    visual)  _shape=2 ;; # vi visual mode: block
+    viopp)   _shape=0 ;; # vi operation pending: blinking block
+    *)       _shape=0 ;;
+  esac
+  printf $'\e[%d q' "${_shape}"
+}
+
 # Updates editor information when the keymap changes.
 function zle-keymap-select() {
   # update keymap variable for the prompt
-  VI_KEYMAP=$KEYMAP
+  typeset -g VI_KEYMAP=$KEYMAP
 
-  zle reset-prompt
-  zle -R
+  if [[ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" = true ]]; then
+    zle reset-prompt
+    zle -R
+  fi
+  _vi-mode-set-cursor-shape-for-keymap "${VI_KEYMAP}"
 }
-
 zle -N zle-keymap-select
 
-function vi-accept-line() {
-  VI_KEYMAP=main
-  zle accept-line
+# These "echoti" statements were originally set in lib/key-bindings.zsh
+# Not sure the best way to extend without overriding.
+function zle-line-init() {
+  local prev_vi_keymap
+  prev_vi_keymap="${VI_KEYMAP:-}"
+  typeset -g VI_KEYMAP=main
+  [[ "$prev_vi_keymap" != 'main' ]] && [[ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" = true ]] && zle reset-prompt
+  (( ! ${+terminfo[smkx]} )) || echoti smkx
+  _vi-mode-set-cursor-shape-for-keymap "${VI_KEYMAP}"
 }
+zle -N zle-line-init
 
-zle -N vi-accept-line
-
+function zle-line-finish() {
+  typeset -g VI_KEYMAP=main
+  (( ! ${+terminfo[rmkx]} )) || echoti rmkx
+  _vi-mode-set-cursor-shape-for-keymap default
+}
+zle -N zle-line-finish
 
 bindkey -v
 
-# use custom accept-line widget to update $VI_KEYMAP
-bindkey -M vicmd '^J' vi-accept-line
-bindkey -M vicmd '^M' vi-accept-line
-
-# allow v to edit the command line (standard behaviour)
+# allow vv to edit the command line (standard behaviour)
 autoload -Uz edit-command-line
 zle -N edit-command-line
-bindkey -M vicmd 'v' edit-command-line
+bindkey -M vicmd 'vv' edit-command-line
 
 # allow ctrl-p, ctrl-n for navigate history (standard behaviour)
 bindkey '^P' up-history
@@ -45,16 +90,56 @@ bindkey '^s' history-incremental-search-forward
 bindkey '^a' beginning-of-line
 bindkey '^e' end-of-line
 
-# if mode indicator wasn't setup by theme, define default
-if [[ "$MODE_INDICATOR" == "" ]]; then
-  MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
+function wrap_clipboard_widgets() {
+  # NB: Assume we are the first wrapper and that we only wrap native widgets
+  # See zsh-autosuggestions.zsh for a more generic and more robust wrapper
+  local verb="$1"
+  shift
+
+  local widget
+  local wrapped_name
+  for widget in "$@"; do
+    wrapped_name="_zsh-vi-${verb}-${widget}"
+    if [ "${verb}" = copy ]; then
+      eval "
+        function ${wrapped_name}() {
+          zle .${widget}
+          printf %s \"\${CUTBUFFER}\" | clipcopy 2>/dev/null || true
+        }
+      "
+    else
+      eval "
+        function ${wrapped_name}() {
+          CUTBUFFER=\"\$(clippaste 2>/dev/null || echo \$CUTBUFFER)\"
+          zle .${widget}
+        }
+      "
+    fi
+    zle -N "${widget}" "${wrapped_name}"
+  done
+}
+
+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
+
+# 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
 
 function vi_mode_prompt_info() {
-  echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
+  # If we're using the prompt to display mode info, and we haven't explicitly
+  # disabled "reset prompt on mode change", then set it here.
+  #
+  # We do that here instead of the `if` statement below because the user may
+  # 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)/$INSERT_MODE_INDICATOR}"
 }
 
 # define right prompt, if it wasn't defined by a theme
-if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then
+if [[ -z "$RPS1" && -z "$RPROMPT" ]]; then
   RPS1='$(vi_mode_prompt_info)'
 fi
diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 010f998d3..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,10 +18,20 @@ EOH
     return 0
   fi
 
-  local cmd=""
-  local before="<esc>"
-  local after=""
-  local name="GVIM"
+  # 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
@@ -35,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
diff --git a/plugins/virtualenv/virtualenv.plugin.zsh b/plugins/virtualenv/virtualenv.plugin.zsh
index e250eb63e..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
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 88217a7f5..d359e0c21 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=""
@@ -64,18 +56,31 @@ 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
-        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
   }
 
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.plugin.zsh b/plugins/volta/volta.plugin.zsh
new file mode 100644
index 000000000..ab05ed5df
--- /dev/null
+++ b/plugins/volta/volta.plugin.zsh
@@ -0,0 +1,14 @@
+# COMPLETION FUNCTION
+if (( ! $+commands[volta] )); then
+  return
+fi
+
+# 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
+  typeset -g -A _comps
+  autoload -Uz _volta
+  _comps[volta]=_volta
+fi
+
+volta completions zsh >| "$ZSH_CACHE_DIR/completions/_volta" &|
diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
index 87d1d0858..ca2ca7c65 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/wd/wd.sh b/plugins/wd/wd.sh
index d5d38f25b..9085c5b7b 100644
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -71,7 +71,7 @@ wd_print_msg()
 
 wd_print_usage()
 {
-    cat <<- EOF
+    command cat <<- EOF
 Usage: wd [command] [point]
 
 Commands:
@@ -175,9 +175,9 @@ wd_add()
     elif [[ $point =~ "[[:space:]]+" ]]
     then
         wd_exit_fail "Warp point should not contain whitespace"
-    elif [[ $point == *:* ]]
+    elif [[ $point =~ : ]] || [[ $point =~ / ]]
     then
-        wd_exit_fail "Warp point cannot contain colons"
+        wd_exit_fail "Warp point contains illegal character (:/)"
     elif [[ ${points[$point]} == "" ]] || [ ! -z "$force" ]
     then
         wd_remove "$point" > /dev/null
@@ -185,7 +185,7 @@ wd_add()
         if (whence sort >/dev/null); then
             local config_tmp=$(mktemp "${TMPDIR:-/tmp}/wd.XXXXXXXXXX")
             # use 'cat' below to ensure we respect $WD_CONFIG as a symlink
-            sort -o "${config_tmp}" "$WD_CONFIG"  && cat "${config_tmp}" > "$WD_CONFIG" && rm "${config_tmp}"
+            command sort -o "${config_tmp}" "$WD_CONFIG" && command cat "${config_tmp}" > "$WD_CONFIG" && command rm "${config_tmp}"
         fi
 
         wd_export_static_named_directories
@@ -270,7 +270,7 @@ wd_ls()
 wd_path()
 {
     wd_getdir "$1"
-    echo "$(echo "$dir" | sed "s:${HOME}:~:g")"
+    echo "$(echo "$dir" | sed "s:~:${HOME}:g")"
 }
 
 wd_show()
diff --git a/plugins/web-search/README.md b/plugins/web-search/README.md
index da90f90a0..54232a910 100644
--- a/plugins/web-search/README.md
+++ b/plugins/web-search/README.md
@@ -25,9 +25,10 @@ $ google oh-my-zsh
 Available search contexts are:
 
 | Context               | URL                                      |
-|-----------------------|------------------------------------------|
+| --------------------- | ---------------------------------------- |
 | `bing`                | `https://www.bing.com/search?q=`         |
 | `google`              | `https://www.google.com/search?q=`       |
+| `brs` or `brave`      | `https://search.brave.com/search?q=`     |
 | `yahoo`               | `https://search.yahoo.com/search?p=`     |
 | `ddg` or `duckduckgo` | `https://www.duckduckgo.com/?q=`         |
 | `sp` or `startpage`   | `https://www.startpage.com/do/search?q=` |
diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 0a2b8809e..d8b4a7f8b 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -7,22 +7,23 @@ function web_search() {
   typeset -A urls
   urls=(
     $ZSH_WEB_SEARCH_ENGINES
-    google      "https://www.google.com/search?q="
-    bing        "https://www.bing.com/search?q="
-    yahoo       "https://search.yahoo.com/search?p="
-    duckduckgo  "https://www.duckduckgo.com/?q="
-    startpage   "https://www.startpage.com/do/search?q="
-    yandex      "https://yandex.ru/yandsearch?text="
-    github      "https://github.com/search?q="
-    baidu       "https://www.baidu.com/s?wd="
-    ecosia      "https://www.ecosia.org/search?q="
-    goodreads   "https://www.goodreads.com/search?q="
-    qwant       "https://www.qwant.com/?q="
-    givero      "https://www.givero.com/search?q="
-    stackoverflow  "https://stackoverflow.com/search?q="
-    wolframalpha   "https://www.wolframalpha.com/input/?i="
-    archive     "https://web.archive.org/web/*/"
-    scholar        "https://scholar.google.com/scholar?q="
+    google          "https://www.google.com/search?q="
+    bing            "https://www.bing.com/search?q="
+    brave           "https://search.brave.com/search?q="
+    yahoo           "https://search.yahoo.com/search?p="
+    duckduckgo      "https://www.duckduckgo.com/?q="
+    startpage       "https://www.startpage.com/do/search?q="
+    yandex          "https://yandex.ru/yandsearch?text="
+    github          "https://github.com/search?q="
+    baidu           "https://www.baidu.com/s?wd="
+    ecosia          "https://www.ecosia.org/search?q="
+    goodreads       "https://www.goodreads.com/search?q="
+    qwant           "https://www.qwant.com/?q="
+    givero          "https://www.givero.com/search?q="
+    stackoverflow   "https://stackoverflow.com/search?q="
+    wolframalpha    "https://www.wolframalpha.com/input/?i="
+    archive         "https://web.archive.org/web/*/"
+    scholar         "https://scholar.google.com/scholar?q="
   )
 
   # check whether the search engine is supported
@@ -35,7 +36,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 '//'
@@ -47,6 +48,7 @@ function web_search() {
 
 
 alias bing='web_search bing'
+alias brs='web_search brave'
 alias google='web_search google'
 alias yahoo='web_search yahoo'
 alias ddg='web_search duckduckgo'
diff --git a/plugins/wp-cli/README.md b/plugins/wp-cli/README.md
index 43c41eb53..c4993ab4c 100644
--- a/plugins/wp-cli/README.md
+++ b/plugins/wp-cli/README.md
@@ -1,107 +1,109 @@
 # WP-CLI
 
+The [WordPress CLI](https://wp-cli.org/) is a command-line tool for managing WordPress installations. You can update plugins, set up multisite installs and much more, without using a web browser.
+
+This plugin adds [tab completion](https://wp-cli.org/#tab-completions) for `wp-cli` as well as several aliases for commonly used commands.
+
+To use it, add `wp-cli` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... wp-cli)
+```
+
 **Maintainer:** [joshmedeski](https://github.com/joshmedeski)
 
-WordPress Command Line Interface (https://wp-cli.org/)
+## Aliases
 
-WP-CLI is a set of command-line tools for managing WordPress installations. You can update plugins, set up multisite installs and much more, without using a web browser.
-
-This plugin adds [tab completion](https://wp-cli.org/#tab-completions) for `wp-cli` as well as several aliases.
-
-## List of Aliases
-
-### Core
-- wpcc='wp core config'
-- wpcd='wp core download'
-- wpci='wp core install'
-- wpcii='wp core is-installed'
-- wpcmc='wp core multisite-convert'
-- wpcmi='wp core multisite-install'
-- wpcu='wp core update'
-- wpcudb='wp core update-db'
-- wpcvc='wp core verify-checksums'
-
-### Cron
-- wpcre='wp cron event'
-- wpcrs='wp cron schedule'
-- wpcrt='wp cron test'
-
-### Menu
-- wpmc='wp menu create'
-- wpmd='wp menu delete'
-- wpmi='wp menu item'
-- wpml='wp menu list'
-- wpmlo='wp menu location'
-
-### Plugin
-- wppa='activate'
-- wppda='deactivate'
-- wppd='delete'
-- wppg='get'
-- wppi='install'
-- wppis='is-installed'
-- wppl='list'
-- wppp='path'
-- wpps='search'
-- wppst='status'
-- wppt='toggle'
-- wppun='uninstall'
-- wppu='update'
-
-### Post
-- wppoc='wp post create'
-- wppod='wp post delete'
-- wppoe='wp post edit'
-- wppogen='wp post generate'
-- wppog='wp post get'
-- wppol='wp post list'
-- wppom='wp post meta'
-- wppou='wp post update'
-- wppourl='wp post url'
-
-### Sidebar
-- wpsbl='wp sidebar list'
-
-### Theme
-- wpta='wp theme activate'
-- wptd='wp theme delete'
-- wptdis='wp theme disable'
-- wpte='wp theme enable'
-- wptg='wp theme get'
-- wpti='wp theme install'
-- wptis='wp theme is-installed'
-- wptl='wp theme list'
-- wptm='wp theme mod'
-- wptp='wp theme path'
-- wpts='wp theme search'
-- wptst='wp theme status'
-- wptu='wp theme update'
-
-### User
-- wpuac='wp user add-cap'
-- wpuar='wp user add-role'
-- wpuc='wp user create'
-- wpud='wp user delete'
-- wpugen='wp user generate'
-- wpug='wp user get'
-- wpui='wp user import-csv'
-- wpul='wp user list'
-- wpulc='wp user list-caps'
-- wpum='wp user meta'
-- wpurc='wp user remove-cap'
-- wpurr='wp user remove-role'
-- wpusr='wp user set-role'
-- wpuu='wp user update'
-
-### Widget
-- wpwa='wp widget add'
-- wpwda='wp widget deactivate'
-- wpwd='wp widget delete'
-- wpwl='wp widget list'
-- wpwm='wp widget move'
-- wpwu='wp widget update'
-
-The entire list of wp-cli commands can be found here: https://wp-cli.org/commands/
-
-I only included the commands that are most used. Please feel free to contribute to this project if you want more commands.
+The entire list of `wp-cli` commands can be found here: https://developer.wordpress.org/cli/commands/
 
+| Alias     | Command                     |
+|-----------|-----------------------------|
+| **Core**                                |
+| `wpcc`    | `wp core config`            |
+| `wpcd`    | `wp core download`          |
+| `wpci`    | `wp core install`           |
+| `wpcii`   | `wp core is-installed`      |
+| `wpcmc`   | `wp core multisite-convert` |
+| `wpcmi`   | `wp core multisite-install` |
+| `wpcu`    | `wp core update`            |
+| `wpcudb`  | `wp core update-db`         |
+| `wpcvc`   | `wp core verify-checksums`  |
+| **Cron**                                |
+| `wpcre`   | `wp cron event`             |
+| `wpcrs`   | `wp cron schedule`          |
+| `wpcrt`   | `wp cron test`              |
+| **Database**                            |
+| `wpdbe`   | `wp db export`              |
+| `wpdbi`   | `wp db import`              |
+| `wpdbcr`  | `wp db create`              |
+| `wpdbs`   | `wp db search`              |
+| `wpdbch`  | `wp db check`               |
+| `wpdbr`   | `wp db repair`              |
+| **Menu**                                |
+| `wpmc`    | `wp menu create`            |
+| `wpmd`    | `wp menu delete`            |
+| `wpmi`    | `wp menu item`              |
+| `wpml`    | `wp menu list`              |
+| `wpmlo`   | `wp menu location`          |
+| **Plugin**                              |
+| `wppa`    | `wp plugin activate`        |
+| `wppda`   | `wp plugin deactivate`      |
+| `wppd`    | `wp plugin delete`          |
+| `wppg`    | `wp plugin get`             |
+| `wppi`    | `wp plugin install`         |
+| `wppis`   | `wp plugin is-installed`    |
+| `wppl`    | `wp plugin list`            |
+| `wppp`    | `wp plugin path`            |
+| `wpps`    | `wp plugin search`          |
+| `wppst`   | `wp plugin status`          |
+| `wppt`    | `wp plugin toggle`          |
+| `wppun`   | `wp plugin uninstall`       |
+| `wppu`    | `wp plugin update`          |
+| **Post**                                |
+| `wppoc`   | `wp post create`            |
+| `wppod`   | `wp post delete`            |
+| `wppoe`   | `wp post edit`              |
+| `wppogen` | `wp post generate`          |
+| `wppog`   | `wp post get`               |
+| `wppol`   | `wp post list`              |
+| `wppom`   | `wp post meta`              |
+| `wppou`   | `wp post update`            |
+| `wppourl` | `wp post url`               |
+| **Sidebar**                             |
+| `wpsbl`   | `wp sidebar list`           |
+| **Theme**                               |
+| `wpta`    | `wp theme activate`         |
+| `wptd`    | `wp theme delete`           |
+| `wptdis`  | `wp theme disable`          |
+| `wpte`    | `wp theme enable`           |
+| `wptg`    | `wp theme get`              |
+| `wpti`    | `wp theme install`          |
+| `wptis`   | `wp theme is-installed`     |
+| `wptl`    | `wp theme list`             |
+| `wptm`    | `wp theme mod`              |
+| `wptp`    | `wp theme path`             |
+| `wpts`    | `wp theme search`           |
+| `wptst`   | `wp theme status`           |
+| `wptu`    | `wp theme update`           |
+| **User**                                |
+| `wpuac`   | `wp user add-cap`           |
+| `wpuar`   | `wp user add-role`          |
+| `wpuc`    | `wp user create`            |
+| `wpud`    | `wp user delete`            |
+| `wpugen`  | `wp user generate`          |
+| `wpug`    | `wp user get`               |
+| `wpui`    | `wp user import-csv`        |
+| `wpul`    | `wp user list`              |
+| `wpulc`   | `wp user list-caps`         |
+| `wpum`    | `wp user meta`              |
+| `wpurc`   | `wp user remove-cap`        |
+| `wpurr`   | `wp user remove-role`       |
+| `wpusr`   | `wp user set-role`          |
+| `wpuu`    | `wp user update`            |
+| **Widget**                              |
+| `wpwa`    | `wp widget add`             |
+| `wpwda`   | `wp widget deactivate`      |
+| `wpwd`    | `wp widget delete`          |
+| `wpwl`    | `wp widget list`            |
+| `wpwm`    | `wp widget move`            |
+| `wpwu`    | `wp widget update`          |
diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
index 05ecc4b8a..09bdf3260 100644
--- a/plugins/wp-cli/wp-cli.plugin.zsh
+++ b/plugins/wp-cli/wp-cli.plugin.zsh
@@ -2,14 +2,6 @@
 # A command line interface for WordPress
 # https://wp-cli.org/
 
-# Cache
-
-# Cap
-
-# CLI
-
-# Comment
-
 # Core
 alias wpcc='wp core config'
 alias wpcd='wp core download'
@@ -27,18 +19,12 @@ alias wpcrs='wp cron schedule'
 alias wpcrt='wp cron test'
 
 # Db
-
-# Eval
-
-# Eval-File
-
-# Export
-
-# Help
-
-# Import
-
-# Media
+alias wpdbe='wp db export'
+alias wpdbi='wp db import'
+alias wpdbcr='wp db create'
+alias wpdbs='wp db search'
+alias wpdbch='wp db check'
+alias wpdbr='wp db repair'
 
 # Menu
 alias wpmc='wp menu create'
@@ -47,10 +33,6 @@ alias wpmi='wp menu item'
 alias wpml='wp menu list'
 alias wpmlo='wp menu location'
 
-# Network
-
-# Option
-
 # Plugin
 alias wppa='wp plugin activate'
 alias wppda='wp plugin deactivate'
@@ -77,25 +59,9 @@ alias wppom='wp post meta'
 alias wppou='wp post update'
 alias wppourl='wp post url'
 
-# Rewrite
-
-# Role
-
-# Scaffold
-
-# Search-Replace
-
-# Shell
-
 # Sidebar
 alias wpsbl='wp sidebar list'
 
-# Site
-
-# Super-Admin
-
-# Term
-
 # Theme
 alias wpta='wp theme activate'
 alias wptd='wp theme delete'
@@ -111,8 +77,6 @@ alias wpts='wp theme search'
 alias wptst='wp theme status'
 alias wptu='wp theme update'
 
-# Transient
-
 # User
 alias wpuac='wp user add-cap'
 alias wpuar='wp user add-role'
@@ -138,8 +102,8 @@ alias wpwm='wp widget move'
 alias wpwu='wp widget update'
 
 
-# bash completion for the `wp` command
-
+# Completion for wp
+autoload -U +X bashcompinit && bashcompinit
 _wp_complete() {
 	local cur=${COMP_WORDS[COMP_CWORD]}
 
diff --git a/plugins/xcode/README.md b/plugins/xcode/README.md
index 37f882638..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. 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`, `.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 89703fe3c..3bd12cdec 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,swiftpm},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
diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index fd748b742..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                                                                   |
@@ -28,6 +37,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 b/plugins/yarn/_yarn
index 70e783b86..1237ba672 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,53 +56,98 @@ _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'
 )
 
+_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
-  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'))
-  _describe 'command or script' _commands -- _global_commands -- scripts
+  local -a scripts binaries
+  local packageJson
+
+  if [[ -n $opt_args[--cwd] ]]; then
+    packageJson=$(_yarn_find_package_json $opt_args[--cwd])
+    binaries=($(cd $opt_args[--cwd] && echo node_modules/.bin/*(x:t)))
+  else
+    packageJson=$(_yarn_find_package_json $pwd)
+    binaries=($(echo node_modules/.bin/*(x:t)))
+  fi
+
+  if [[ -n $packageJson ]]; then
+    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
 }
 
 _yarn_scripts() {
-  local -a commands binaries scripts
-  local -a scriptNames scriptCommands
-  local i runJSON
+  local -a binaries scripts
+  local -a commands
+  local packageJson
 
-  runJSON=$(yarn run --json 2>/dev/null)
-  # 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")}")
+  if [[ -n $_yarn_run_cwd ]]; then
+    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
+    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
 
-  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}}; do{$k=$_;($e=$k)=~s/:/\\:/g; printf "$e:$r{$k}\n"} for sort keys %r')}")
+  fi
 
-  commands=($scripts $binaries)
+  commands=('env' $scripts $binaries)
   _describe 'command' commands
 }
 
@@ -110,6 +161,23 @@ _yarn_commands() {
   _describe 'command' _commands -- _global_commands
 }
 
+_yarn_add_files() {
+  if compset -P "(file|link):"; then
+    _files
+  fi
+}
+
+_yarn_workspaces() {
+  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
+}
+
 _yarn() {
   local context state state_descr line
   typeset -A opt_args
@@ -118,37 +186,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 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 -/' \
+    '--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 +255,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 +316,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 +341,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 +364,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 +398,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 +418,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 +439,10 @@ _yarn() {
         ;;
       esac
     ;;
+    groups_args)
+      local dependency_groups=(devDependencies dependencies optionalDependencies peerDependencies bundledDependencies)
+      _values -s ',' 'groups' $dependency_groups
+    ;;
 
     owner_args)
       case $words[1] in
diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 4a5192c61..bcb8661cf 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -1,3 +1,15 @@
+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
+fi
+
 alias y="yarn"
 alias ya="yarn add"
 alias yad="yarn add --dev"
@@ -13,6 +25,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"
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/plugins/z/LICENSE b/plugins/z/LICENSE
new file mode 100644
index 000000000..d1cca7ae5
--- /dev/null
+++ b/plugins/z/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018-2022 Alexandros Kozak
+
+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.
diff --git a/plugins/z/MANUAL.md b/plugins/z/MANUAL.md
new file mode 100644
index 000000000..dcca3c452
--- /dev/null
+++ b/plugins/z/MANUAL.md
@@ -0,0 +1,343 @@
+# Zsh-z
+
+Zsh-z is a command line tool that allows you to jump quickly to directories that you have visited frequently in the past, or recently -- but most often a combination of the two (a concept known as ["frecency"](https://en.wikipedia.org/wiki/Frecency)). It works by keeping track of when you go to directories and how much time you spend in them. It is then in the position to guess where you want to go when you type a partial string, e.g., `z src` might take you to `~/src/zsh`. `z zsh` might also get you there, and `z c/z` might prove to be even more specific -- it all depends on your habits and how much time you have been using Zsh-z to build up a database. After using Zsh-z for a little while, you will get to where you want to be by typing considerably less than you would need if you were using `cd`.
+
+Zsh-z is a native Zsh port of [rupa/z](https://github.com/rupa/z), a tool written for `bash` and Zsh that uses embedded `awk` scripts to do the heavy lifting. It was quite possibly my most used command line tool for a couple of years. I decided to translate it, `awk` parts and all, into pure Zsh script, to see if by eliminating calls to external tools (`awk`, `sort`, `date`, `sed`, `mv`, `rm`, and `chown`) and reducing forking through subshells I could make it faster. The performance increase is impressive, particularly on systems where forking is slow, such as Cygwin, MSYS2, and WSL. I have found that, in those environments, switching directories using Zsh-z can be over 100% faster than it is using `rupa/z`.
+
+There is a noteworthy stability increase as well. Race conditions have always been a problem with `rupa/z`, and users of that utility will occasionally lose their `.z` databases. By having Zsh-z only use Zsh (`rupa/z` uses a hybrid shell code that works on `bash` as well), I have been able to implement a `zsh/system`-based file-locking mechanism similar to [the one @mafredri once proposed for `rupa/z`](https://github.com/rupa/z/pull/199). It is now nearly impossible to crash the database, even through extreme testing.
+
+There are other, smaller improvements which I try to document in [Improvements and Fixes](#improvements-and-fixes). These include the new default behavior of sorting your tab completions by frecency rather than just letting Zsh sort the raw results alphabetically (a behavior which can be restored if you like it -- [see below](#settings)).
+
+Zsh-z is a drop-in replacement for `rupa/z` and will, by default, use the same database (`~/.z`), so you can go on using `rupa/z` when you launch `bash`.
+
+## Table of Contents
+- [News](#news)
+- [Installation](#installation)
+- [Command Line Options](#command-line-options)
+- [Settings](#settings)
+- [Case Sensitivity](#case-sensitivity)
+- [`ZSHZ_UNCOMMON`](#zshz_uncommon)
+- [Making `--add` work for you](#making---add-work-for-you)
+- [Other Improvements and Fixes](#other-improvements-and-fixes)
+- [Migrating from Other Tools](#migrating-from-other-tools)
+- [`COMPLETE_ALIASES`](#complete_aliases)
+- [Known Bugs](#known-bugs)
+
+## News
+
+<details>
+    <summary>Here are the latest features and updates.</summary>
+
+- June 29, 2022
+    + Zsh-z is less likely to leave temporary files sitting around (props @mafredri).
+- June 27, 2022
+    + A bug was fixed which was preventing paths with spaces in them from being updated ([#61](https://github.com/agkozak/zsh-z/issues/61)).
+    + If writing to the temporary database file fails, the database will not be clobbered (props @mafredri).
+- December 19, 2021
+    + ZSH-z will now display tildes for `HOME` during completion when `ZSHZ_TILDE=1` has been set.
+- November 11, 2021
+    + A bug was fixed which was preventing ranks from being incremented.
+    + `--add` has been made to work with relative paths and has been documented for the user.
+- October 14, 2021
+    + Completions were being sorted alphabetically, rather than by rank; this error has been fixed.
+- September 25, 2021
+    + Orthographical change: "Zsh," not "ZSH."
+- September 23, 2021
+    + `z -xR` will now remove a directory *and its subdirectories* from the database.
+    + `z -x` and `z -xR` can now take an argument; without one, `PWD` is assumed.
+- September 7, 2021
+    + Fixed the unload function so that it removes the `$ZSHZ_CMD` alias (default: `z`).
+- August 27, 2021
+    + Using `print -v ... -f` instead of `print -v` to work around longstanding bug in Zsh involving `print -v` and multibyte strings.
+- August 13, 2021
+    + Fixed the explanation string printed during completion so that it may be formatted with `zstyle`.
+    + Zsh-z now declares `ZSHZ_EXCLUDE_DIRS` as an array with unique elements so that you do not have to.
+- July 29, 2021
+    + Temporarily disabling use of `print -v`, which seems to be mangling CJK multibyte strings.
+- July 27, 2021
+    + Internal escaping of path names now works with older versions of ZSH.
+    + Zsh-z now detects and discards any incomplete or incorrectly formattted database entries.
+- July 10, 2021
+    + Setting `ZSHZ_TRAILING_SLASH=1` makes it so that a search pattern ending in `/` can match the end of a path; e.g. `z foo/` can match `/path/to/foo`.
+- June 25, 2021
+    + Setting `ZSHZ_TILDE=1` displays the `HOME` directory as `~`.
+- May 7, 2021
+    + Setting `ZSHZ_ECHO=1` will cause Zsh-z to display the new path when you change directories.
+    + Better escaping of path names to deal paths containing the characters ``\`()[]``.
+- February 15, 2021
+    + Ranks are displayed the way `rupa/z` now displays them, i.e. as large integers. This should help Zsh-z to integrate with other tools.
+- January 31, 2021
+    + Zsh-z is now efficient enough that, on MSYS2 and Cygwin, it is faster to run it in the foreground than it is to fork a subshell for it.
+    + `_zshz_precmd` simply returns if `PWD` is `HOME` or in `ZSH_EXCLUDE_DIRS`, rather than waiting for `zshz` to do that.
+- January 17, 2021
+    + Made sure that the `PUSHD_IGNORE_DUPS` option is respected.
+- January 14, 2021
+    + The `z -h` help text now breaks at spaces.
+    + `z -l` was not working for Zsh version < 5.
+- January 11, 2021
+    + Major refactoring of the code.
+    + `z -lr` and `z -lt` work as expected.
+    + `EXTENDED_GLOB` has been disabled within the plugin to accomodate old-fashioned Windows directories with names such as `Progra~1`.
+    + Removed `zshelldoc` documentation.
+- January 6, 2021
+    + I have corrected the frecency routine so that it matches `rupa/z`'s math, but for the present, Zsh-z will continue to display ranks as 1/10000th of what they are in `rupa/z` -- [they had to multiply theirs by 10000](https://github.com/rupa/z/commit/f1f113d9bae9effaef6b1e15853b5eeb445e0712) to work around `bash`'s inadequacies at dealing with decimal fractions.
+- January 5, 2021
+    + If you try `z foo`, and `foo` is not in the database but `${PWD}/foo` is a valid directory, Zsh-z will `cd` to it.
+- December 22, 2020
+    + `ZSHZ_CASE`: when set to `ignore`, pattern matching is case-insensitive; when set to `smart`, patterns are matched case-insensitively when they are all lowercase and case-sensitively when they have uppercase characters in them (a behavior very much like Vim's `smartcase` setting).
+    + `ZSHZ_KEEP_DIRS` is an array of directory names that should not be removed from the database, even if they are not currently available (useful when a drive is not always mounted).
+    + Symlinked datafiles were having their symlinks overwritten; this bug has been fixed.
+
+</details>
+
+## Installation
+
+### General observations
+
+This script can be installed simply by downloading it and sourcing it from your `.zshrc`:
+
+    source /path/to/zsh-z.plugin.zsh
+
+For tab completion to work, you will want to have loaded `compinit`. The frameworks handle this themselves. If you are not using a framework, put
+
+    autoload -U compinit && compinit
+
+in your .zshrc somewhere below where you source `zsh-z.plugin.zsh`.
+
+If you add
+
+    zstyle ':completion:*' menu select
+
+to your `.zshrc`, your completion menus will look very nice. This `zstyle` invocation should work with any of the frameworks below as well.
+
+### For [antigen](https://github.com/zsh-users/antigen) users
+
+Add the line
+
+    antigen bundle agkozak/zsh-z
+
+to your `.zshrc`, somewhere above the line that says `antigen apply`.
+
+### For [oh-my-zsh](http://ohmyz.sh/) users
+
+Execute the following command:
+
+    git clone https://github.com/agkozak/zsh-z ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-z
+
+and add `zsh-z` to the line of your `.zshrc` that specifies `plugins=()`, e.g., `plugins=( git zsh-z )`.
+
+### For [prezto](https://github.com/sorin-ionescu/prezto) users
+
+Execute the following command:
+
+    git clone https://github.com/agkozak/zsh-z.git ~/.zprezto-contrib/zsh-z
+
+Then edit your `~/.zpreztorc` file. Make sure the line that says
+
+    zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib
+
+is uncommented. Then find the section that specifies which modules are to be loaded; it should look something like this:
+
+    zstyle ':prezto:load' pmodule \
+        'environment' \
+        'terminal' \
+        'editor' \
+        'history' \
+        'directory' \
+        'spectrum' \
+        'utility' \
+        'completion' \
+        'prompt'
+
+Add a backslash to the end of the last line add `'zsh-z'` to the list, e.g.,
+
+    zstyle ':prezto:load' pmodule \
+        'environment' \
+        'terminal' \
+        'editor' \
+        'history' \
+        'directory' \
+        'spectrum' \
+        'utility' \
+        'completion' \
+        'prompt' \
+        'zsh-z'
+
+Then relaunch `zsh`.
+
+### For [zcomet](https://github.com/agkozak/zcomet) users
+        
+Simply add
+
+    zcomet load agkozak/zsh-z
+
+to your `.zshrc` (below where you source `zcomet.zsh` and above where you run `zcomet compinit`).
+
+### For [zgen](https://github.com/tarjoilija/zgen) users
+
+Add the line
+
+    zgen load agkozak/zsh-z
+
+somewhere above the line that says `zgen save`. Then run
+
+    zgen reset
+    zsh
+
+to refresh your init script.
+
+### For [Zim](https://github.com/zimfw/zimfw)
+
+Add the following line to your `.zimrc`:
+
+    zmodule https://github.com/agkozak/zsh-z
+
+Then run
+
+    zimfw install
+
+and restart your shell.
+
+### For [Zinit](https://github.com/zdharma-continuum/zinit) users
+
+Add the line
+
+    zinit load agkozak/zsh-z
+
+to your `.zshrc`.
+
+`zsh-z` supports `zinit`'s `unload` feature; just run `zinit unload agkozak/zshz` to restore the shell to its state before `zsh-z` was loaded.
+
+### For [Znap](https://github.com/marlonrichert/zsh-snap) users
+
+Add the line
+
+    znap source agkozak/zsh-z
+
+somewhere below the line where you `source` Znap itself.
+
+### For [zplug](https://github.com/zplug/zplug) users
+
+Add the line
+
+    zplug "agkozak/zsh-z"
+
+somewhere above the line that says `zplug load`. Then run
+
+    zplug install
+    zplug load
+
+to install `zsh-z`.
+
+## Command Line Options
+
+- `--add` Add a directory to the database
+- `-c`    Only match subdirectories of the current directory
+- `-e`    Echo the best match without going to it
+- `-h`    Display help
+- `-l`    List all matches without going to them
+- `-r`    Match by rank (i.e. how much time you spend in directories)
+- `-t`    Time -- match by how recently you have been to directories
+- `-x`    Remove a directory (by default, the current directory) from the database
+- `-xR`   Remove a directory (by default, the current directory) and its subdirectories from the database
+
+# Settings
+
+Zsh-z has environment variables (they all begin with `ZSHZ_`) that change its behavior if you set them; you can also keep your old ones if you have been using `rupa/z` (they begin with `_Z_`).
+
+* `ZSHZ_CMD` changes the command name (default: `z`)
+* `ZSHZ_COMPLETION` can be `'frecent'` (default) or `'legacy'`, depending on whether you want your completion results sorted according to frecency or simply sorted alphabetically
+* `ZSHZ_DATA` changes the database file (default: `~/.z`)
+* `ZSHZ_ECHO` displays the new path name when changing directories (default: `0`)
+* `ZSHZ_EXCLUDE_DIRS` is an array of directories to keep out of the database (default: empty)
+* `ZSHZ_KEEP_DIRS` is an array of directories that should not be removed from the database, even if they are not currently available (useful when a drive is not always mounted) (default: empty)
+* `ZSHZ_MAX_SCORE` is the maximum combined score the database entries can have before they begin to age and potentially drop out of the database (default: 9000)
+* `ZSHZ_NO_RESOLVE_SYMLINKS` prevents symlink resolution (default: `0`)
+* `ZSHZ_OWNER` allows usage when in `sudo -s` mode (default: empty)
+* `ZSHZ_TILDE` displays the name of the `HOME` directory as a `~` (default: `0`)
+* `ZSHZ_TRAILING_SLASH` makes it so that a search pattern ending in `/` can match the final element in a path; e.g., `z foo/` can match `/path/to/foo` (default: `0`)
+* `ZSHZ_UNCOMMON` changes the logic used to calculate the directory jumped to; [see below](#zshz_uncommon`) (default: `0`)
+
+## Case sensitivity
+
+The default behavior of Zsh-z is to try to find a case-sensitive match. If there is none, then Zsh-z tries to find a case-insensitive match.
+
+Some users prefer simple case-insensitivity; this behavior can be enabled by setting
+
+    ZSHZ_CASE=ignore
+
+If you like Vim's `smartcase` setting, where lowercase patterns are case-insensitive while patterns with any uppercase characters are treated case-sensitively, try setting
+
+    ZSHZ_CASE=smart
+
+## `ZSHZ_UNCOMMON`
+
+A common complaint about the default behavior of `rupa/z` and Zsh-z involves "common prefixes." If you type `z code` and the best matches, in increasing order, are
+
+    /home/me/code/foo
+    /home/me/code/bar
+    /home/me/code/bat
+
+Zsh-z will see that all possible matches share a common prefix and will send you to that directory -- `/home/me/code` -- which is often a desirable result. But if the possible matches are
+
+    /home/me/.vscode/foo
+    /home/me/code/foo
+    /home/me/code/bar
+    /home/me/code/bat
+
+then there is no common prefix. In this case, `z code` will simply send you to the highest-ranking match, `/home/me/code/bat`.
+
+You may enable an alternate, experimental behavior by setting `ZSHZ_UNCOMMON=1`. If you do that, Zsh-z will not jump to a common prefix, even if one exists. Instead, it chooses the highest-ranking match -- but it drops any subdirectories that do not include the search term. So if you type `z bat` and `/home/me/code/bat` is the best match, that is exactly where you will end up. If, however, you had typed `z code` and the best match was also `/home/me/code/bat`, you would have ended up in `/home/me/code` (because `code` was what you had searched for). This feature is still in development, and feedback is welcome.
+
+## Making `--add` Work for You
+
+Zsh-z internally uses the `--add` option to add paths to its database. @zachriggle pointed out to me that users might want to use `--add` themselves, so I have altered it a little to make it more user-friendly.
+
+A good example might involve a directory tree that has Git repositories within it. The working directories could be added to the Zsh-z database as a batch with
+
+    for i in $(find $PWD -maxdepth 3 -name .git -type d); do
+      z --add ${i:h}
+    done
+
+(As a Zsh user, I tend to use `**` instead of `find`, but it is good to see how deep your directory trees go before doing that.)
+
+
+## Other Improvements and Fixes
+
+* `z -x` works, with the help of `chpwd_functions`.
+* Zsh-z works on Solaris.
+* Zsh-z uses the "new" `zshcompsys` completion system instead of the old `compctl` one.
+* There is no error message when the database file has not yet been created.
+* There is support for special characters (e.g., `[`) in directory names.
+* If `z -l` only returns one match, a common root is not printed.
+* Exit status codes increasingly make sense.
+* Completions work with options `-c`, `-r`, and `-t`.
+* If `~/foo` and `~/foob` are matches, `~/foo` is *not* the common root. Only a common parent directory can be a common root.
+* `z -x` and the new, recursive `z -xR` can take an argument so that you can remove directories other than `PWD` from the database.
+
+## Migrating from Other Tools
+
+Zsh-z's database format is identical to that of `rupa/z`. You may switch freely between the two tools (I still use `rupa/z` for `bash`). `fasd` also uses that database format, but it stores it by default in `~/.fasd`, so you will have to `cp ~/.fasd ~/.z` if you want to use your old directory history.
+
+If you are coming to Zsh-z (or even to the original `rupa/z`, for that matter) from `autojump`, try using my [`jumpstart-z`](https://github.com/agkozak/jumpstart-z/blob/master/jumpstart-z) tool to convert your old database to the Zsh-z format, or simply run
+
+    awk -F "\t" '{printf("%s|%0.f|%s\n", $2, $1, '"$(date +%s)"')}' < /path/to/autojump.txt > ~/.z
+
+## `COMPLETE_ALIASES`
+
+`z`, or any alternative you set up using `$ZSH_CMD` or `$_Z_CMD`, is an alias. `setopt COMPLETE_ALIASES` divorces the tab completion for aliases from the underlying commands they invoke, so if you enable `COMPLETE_ALIASES`, tab completion for Zsh-z will be broken. You can get it working again, however, by adding under
+
+    setopt COMPLETE_ALIASES
+
+the line
+
+    compdef _zshz ${ZSHZ_CMD:-${_Z_CMD:-z}}
+
+That will re-bind `z` or the command of your choice to the underlying Zsh-z function.
+
+## Known Bugs
+It is possible to run a completion on a string with spaces in it, e.g., `z us bi<TAB>` might take you to `/usr/local/bin`. This works, but as things stand, after the completion the command line reads
+
+    z us /usr/local/bin.
+
+You get where you want to go, but the detritus on the command line is annoying. This is also a problem in `rupa/z`, but I am keen on eventually eliminating this glitch. Advice is welcome.
diff --git a/plugins/z/Makefile b/plugins/z/Makefile
deleted file mode 100644
index dcf433d40..000000000
--- a/plugins/z/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-readme:
-	@groff -man -Tascii z.1 | col -bx
-
-.PHONY: readme
diff --git a/plugins/z/README b/plugins/z/README
deleted file mode 100644
index 56261cff4..000000000
--- a/plugins/z/README
+++ /dev/null
@@ -1,144 +0,0 @@
-Z(1)                             User Commands                            Z(1)
-
-
-
-NAME
-       z - jump around
-
-SYNOPSIS
-       z [-chlrtx] [regex1 regex2 ... regexn]
-
-AVAILABILITY
-       bash, zsh
-
-DESCRIPTION
-       Tracks your most used directories, based on 'frecency'.
-
-       After  a  short  learning  phase, z will take you to the most 'frecent'
-       directory that matches ALL of the regexes given on the command line, in
-       order.
-
-       For example, z foo bar would match /foo/bar but not /bar/foo.
-
-OPTIONS
-       -c     restrict matches to subdirectories of the current directory
-
-       -h     show a brief help message
-
-       -l     list only
-
-       -r     match by rank only
-
-       -t     match by recent access only
-
-       -x     remove the current directory from the datafile
-
-EXAMPLES
-       z foo         cd to most frecent dir matching foo
-
-       z foo bar     cd to most frecent dir matching foo, then bar
-
-       z -r foo      cd to highest ranked dir matching foo
-
-       z -t foo      cd to most recently accessed dir matching foo
-
-       z -l foo      list all dirs matching foo (by frecency)
-
-NOTES
-   Installation:
-       Put something like this in your $HOME/.bashrc or $HOME/.zshrc:
-
-              . /path/to/z.sh
-
-       cd around for a while to build up the db.
-
-       PROFIT!!
-
-       Optionally:
-              Set $_Z_CMD to change the command name (default z).
-              Set $_Z_DATA to change the datafile (default $HOME/.z).
-              Set $_Z_NO_RESOLVE_SYMLINKS to prevent symlink resolution.
-              Set $_Z_NO_PROMPT_COMMAND to handle PROMPT_COMMAND/precmd  your-
-              self.
-              Set $_Z_EXCLUDE_DIRS to an array of directory trees to  exclude.
-              Set $_Z_OWNER to allow usage when in 'sudo -s' mode.
-              (These  settings  should  go  in  .bashrc/.zshrc before the line
-              added above.)
-              Install   the   provided   man   page   z.1    somewhere    like
-              /usr/local/man/man1.
-
-   Aging:
-       The rank of directories maintained by z undergoes aging based on a sim-
-       ple formula. The rank of each entry is incremented  every  time  it  is
-       accessed.  When the sum of ranks is over 9000, all ranks are multiplied
-       by 0.99. Entries with a rank lower than 1 are forgotten.
-
-   Frecency:
-       Frecency is a portmanteau of 'recent' and 'frequency'. It is a weighted
-       rank  that depends on how often and how recently something occurred. As
-       far as I know, Mozilla came up with the term.
-
-       To z, a directory that has low ranking but has been  accessed  recently
-       will  quickly  have  higher rank than a directory accessed frequently a
-       long time ago.
-
-       Frecency is determined at runtime.
-
-   Common:
-       When multiple directories match all queries, and they all have a common
-       prefix, z will cd to the shortest matching directory, without regard to
-       priority.  This has been in effect, if  undocumented,  for  quite  some
-       time, but should probably be configurable or reconsidered.
-
-   Tab Completion:
-       z  supports tab completion. After any number of arguments, press TAB to
-       complete on directories that match each argument. Due to limitations of
-       the  completion  implementations,  only  the last argument will be com-
-       pleted in the shell.
-
-       Internally, z decides you've requested a completion if the  last  argu-
-       ment  passed  is  an  absolute  path to an existing directory. This may
-       cause unexpected behavior if the last argument to z begins with /.
-
-ENVIRONMENT
-       A function _z() is defined.
-
-       The contents of the variable $_Z_CMD is aliased to _z 2>&1. If not set,
-       $_Z_CMD defaults to z.
-
-       The  environment  variable $_Z_DATA can be used to control the datafile
-       location. If it is not defined, the location defaults to $HOME/.z.
-
-       The environment variable $_Z_NO_RESOLVE_SYMLINKS can be set to  prevent
-       resolving  of  symlinks.  If  it  is  not  set,  symbolic links will be
-       resolved when added to the datafile.
-
-       In bash, z appends a command to the PROMPT_COMMAND environment variable
-       to maintain its database. In zsh, z appends a function _z_precmd to the
-       precmd_functions array.
-
-       The environment variable $_Z_NO_PROMPT_COMMAND can be set if  you  want
-       to handle PROMPT_COMMAND or precmd yourself.
-
-       The  environment  variable  $_Z_EXCLUDE_DIRS  can be set to an array of
-       directory trees to exclude from tracking.  $HOME  is  always  excluded.
-       Directories must be full paths without trailing slashes.
-
-       The  environment  variable  $_Z_OWNER  can  be set to your username, to
-       allow usage of z when your sudo environment keeps $HOME set.
-
-FILES
-       Data is stored in $HOME/.z. This  can  be  overridden  by  setting  the
-       $_Z_DATA  environment variable. When initialized, z will raise an error
-       if this path is a directory, and not function correctly.
-
-       A man page (z.1) is provided.
-
-SEE ALSO
-       regex(7), pushd, popd, autojump, cdargs
-
-       Please file bugs at https://github.com/rupa/z/
-
-
-
-z                                January 2013                             Z(1)
diff --git a/plugins/z/README.md b/plugins/z/README.md
index ea8d4610a..5b7d6f649 100644
--- a/plugins/z/README.md
+++ b/plugins/z/README.md
@@ -1,8 +1,9 @@
 # z - jump around
 
-This plugin defines the [z command](https://github.com/rupa/z) that tracks your most visited directories and allows you to access them with very few keystrokes.
+This plugin defines the [z command](https://github.com/agkozak/zsh-z) that tracks your most visited directories and allows you to access them with very few keystrokes.
 
 ### Example
+
 Assume that you have previously visited directory `~/.oh-my-zsh/plugins`. From any folder in your command line, you can quickly access it by using a regex match to this folder:
 
 ```bash
@@ -11,6 +12,7 @@ Assume that you have previously visited directory `~/.oh-my-zsh/plugins`. From a
 ```
 
 ### Setup
+
 To enable z, add `z` to your `plugins` array in your zshrc file:
 
 ```zsh
@@ -19,5 +21,4 @@ plugins=(... z)
 
 ### Further reading
 
-For advanced usage and details of z, see [README](./README) (in man page format, copied from [rupa/z](https://github.com/rupa/z)).
-
+For advanced usage and details of z, see [MANUAL](./MANUAL.md) (copied from [agkozak/zsh-z](https://github.com/agkozak/zsh-z)).
diff --git a/plugins/z/_z b/plugins/z/_z
new file mode 100644
index 000000000..9891a52ed
--- /dev/null
+++ b/plugins/z/_z
@@ -0,0 +1,82 @@
+#compdef zshz ${ZSHZ_CMD:-${_Z_CMD:-z}}
+#
+# Zsh-z - jump around with Zsh - A native Zsh version of z without awk, sort,
+# date, or sed
+#
+# https://github.com/agkozak/zsh-z
+#
+# Copyright (c) 2018-2022 Alexandros Kozak
+#
+# 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.
+#
+# z (https://github.com/rupa/z) is copyright (c) 2009 rupa deadwyler and
+# licensed under the WTFPL license, Version 2.a
+#
+# shellcheck shell=ksh
+
+############################################################
+# Zsh-z COMPLETIONS
+############################################################
+emulate -L zsh
+(( ZSHZ_DEBUG )) &&
+  setopt LOCAL_OPTIONS WARN_CREATE_GLOBAL NO_WARN_NESTED_VAR 2> /dev/null
+
+# TODO: This routine currently reproduces z's feature of allowing spaces to be
+# used as wildcards in completions, so that
+#
+#   z us lo bi
+#
+# can expand to
+#
+#   z /usr/local/bin
+#
+# but it also reproduces z's buggy display on the commandline, viz.
+#
+#   z us lo /usr/local/bin
+#
+# Address.
+
+local completions expl completion
+local -a completion_list
+
+completions=$(zshz --complete ${(@)words:1})
+[[ -z $completions ]] && return 1
+
+for completion in ${(f)completions[@]}; do
+  if (( ZSHZ_TILDE )) && [[ $completion == ${HOME}* ]]; then
+    completion="~${(q)${completion#${HOME}}}"
+  else
+    completion="${(q)completion}"
+  fi
+  completion_list+=( $completion )
+done
+
+_description -V completion_list expl 'directories'
+
+if [[ $ZSHZ_COMPLETION == 'legacy' ]]; then
+  compadd "${expl[@]}" -QU -- "${completion_list[@]}"
+else
+  compadd "${expl[@]}" -QU -V zsh-z -- "${completion_list[@]}"
+fi
+
+compstate[insert]=menu
+
+return 0
+
+# vim: ft=zsh:fdm=indent:ts=2:et:sts=2:sw=2:
diff --git a/plugins/z/z.1 b/plugins/z/z.1
deleted file mode 100644
index d4cac1ac2..000000000
--- a/plugins/z/z.1
+++ /dev/null
@@ -1,170 +0,0 @@
-.TH "Z" "1" "January 2013" "z" "User Commands"
-.SH
-NAME
-z \- jump around
-.SH
-SYNOPSIS
-z [\-chlrtx] [regex1 regex2 ... regexn]
-.SH
-AVAILABILITY
-bash, zsh
-.SH
-DESCRIPTION
-Tracks your most used directories, based on 'frecency'.
-.P
-After a short learning phase, \fBz\fR will take you to the most 'frecent'
-directory that matches ALL of the regexes given on the command line, in order.
-
-For example, \fBz foo bar\fR would match \fB/foo/bar\fR but not \fB/bar/foo\fR.
-.SH
-OPTIONS
-.TP
-\fB\-c\fR
-restrict matches to subdirectories of the current directory
-.TP
-\fB\-e\fR
-echo the best match, don't cd
-.TP
-\fB\-h\fR
-show a brief help message
-.TP
-\fB\-l\fR
-list only
-.TP
-\fB\-r\fR
-match by rank only
-.TP
-\fB\-t\fR
-match by recent access only
-.TP
-\fB\-x\fR
-remove the current directory from the datafile
-.SH EXAMPLES
-.TP 14
-\fBz foo\fR
-cd to most frecent dir matching foo
-.TP 14
-\fBz foo bar\fR
-cd to most frecent dir matching foo, then bar
-.TP 14
-\fBz -r foo\fR
-cd to highest ranked dir matching foo
-.TP 14
-\fBz -t foo\fR
-cd to most recently accessed dir matching foo
-.TP 14
-\fBz -l foo\fR
-list all dirs matching foo (by frecency)
-.SH
-NOTES
-.SS
-Installation:
-.P
-Put something like this in your \fB$HOME/.bashrc\fR or \fB$HOME/.zshrc\fR:
-.RS
-.P
-\fB. /path/to/z.sh\fR
-.RE
-.P
-\fBcd\fR around for a while to build up the db.
-.P
-PROFIT!!
-.P
-Optionally:
-.RS
-Set \fB$_Z_CMD\fR to change the command name (default \fBz\fR).
-.RE
-.RS
-Set \fB$_Z_DATA\fR to change the datafile (default \fB$HOME/.z\fR).
-.RE
-.RS
-Set \fB$_Z_NO_RESOLVE_SYMLINKS\fR to prevent symlink resolution.
-.RE
-.RS
-Set \fB$_Z_NO_PROMPT_COMMAND\fR to handle \fBPROMPT_COMMAND/precmd\fR yourself.
-.RE
-.RS
-Set \fB$_Z_EXCLUDE_DIRS\fR to an array of directory trees to exclude.
-.RE
-.RS
-Set \fB$_Z_OWNER\fR to allow usage when in 'sudo -s' mode.
-.RE
-.RS
-(These settings should go in .bashrc/.zshrc before the line added above.)
-.RE
-.RS
-Install the provided man page \fBz.1\fR somewhere in your \f$MANPATH, like
-\fB/usr/local/man/man1\fR.
-.RE
-.SS
-Aging:
-The rank of directories maintained by \fBz\fR undergoes aging based on a simple
-formula. The rank of each entry is incremented every time it is accessed. When
-the sum of ranks is over 9000, all ranks are multiplied by 0.99. Entries with a
-rank lower than 1 are forgotten.
-.SS
-Frecency:
-Frecency is a portmanteau of 'recent' and 'frequency'. It is a weighted rank
-that depends on how often and how recently something occurred. As far as I
-know, Mozilla came up with the term.
-.P
-To \fBz\fR, a directory that has low ranking but has been accessed recently
-will quickly have higher rank than a directory accessed frequently a long time
-ago.
-.P
-Frecency is determined at runtime.
-.SS
-Common:
-When multiple directories match all queries, and they all have a common prefix,
-\fBz\fR will cd to the shortest matching directory, without regard to priority.
-This has been in effect, if undocumented, for quite some time, but should
-probably be configurable or reconsidered.
-.SS
-Tab Completion:
-\fBz\fR supports tab completion. After any number of arguments, press TAB to
-complete on directories that match each argument. Due to limitations of the
-completion implementations, only the last argument will be completed in the
-shell.
-.P
-Internally, \fBz\fR decides you've requested a completion if the last argument
-passed is an absolute path to an existing directory. This may cause unexpected
-behavior if the last argument to \fBz\fR begins with \fB/\fR.
-.SH
-ENVIRONMENT
-A function \fB_z()\fR is defined.
-.P
-The contents of the variable \fB$_Z_CMD\fR is aliased to \fB_z 2>&1\fR. If not
-set, \fB$_Z_CMD\fR defaults to \fBz\fR.
-.P
-The environment variable \fB$_Z_DATA\fR can be used to control the datafile
-location. If it is not defined, the location defaults to \fB$HOME/.z\fR.
-.P
-The environment variable \fB$_Z_NO_RESOLVE_SYMLINKS\fR can be set to prevent
-resolving of symlinks. If it is not set, symbolic links will be resolved when
-added to the datafile.
-.P
-In bash, \fBz\fR appends a command to the \fBPROMPT_COMMAND\fR environment
-variable to maintain its database. In zsh, \fBz\fR appends a function
-\fB_z_precmd\fR to the \fBprecmd_functions\fR array.
-.P
-The environment variable \fB$_Z_NO_PROMPT_COMMAND\fR can be set if you want to
-handle \fBPROMPT_COMMAND\fR or \fBprecmd\fR yourself.
-.P
-The environment variable \fB$_Z_EXCLUDE_DIRS\fR can be set to an array of
-directory trees to exclude from tracking. \fB$HOME\fR is always excluded.
-Directories must be full paths without trailing slashes.
-.P
-The environment variable \fB$_Z_OWNER\fR can be set to your username, to
-allow usage of \fBz\fR when your sudo environment keeps \fB$HOME\fR set.
-.SH
-FILES
-Data is stored in \fB$HOME/.z\fR. This can be overridden by setting the
-\fB$_Z_DATA\fR environment variable. When initialized, \fBz\fR will raise an
-error if this path is a directory, and not function correctly.
-.P
-A man page (\fBz.1\fR) is provided.
-.SH
-SEE ALSO
-regex(7), pushd, popd, autojump, cdargs
-.P
-Please file bugs at https://github.com/rupa/z/
diff --git a/plugins/z/z.plugin.zsh b/plugins/z/z.plugin.zsh
index 96abee890..209edfea7 100644
--- a/plugins/z/z.plugin.zsh
+++ b/plugins/z/z.plugin.zsh
@@ -1 +1,968 @@
-source "${0:h}/z.sh"
+################################################################################
+# Zsh-z - jump around with Zsh - A native Zsh version of z without awk, sort,
+# date, or sed
+#
+# https://github.com/agkozak/zsh-z
+#
+# Copyright (c) 2018-2022 Alexandros Kozak
+#
+# 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.
+#
+# z (https://github.com/rupa/z) is copyright (c) 2009 rupa deadwyler and
+# licensed under the WTFPL license, Version 2.
+#
+# Zsh-z maintains a jump-list of the directories you actually use.
+#
+# INSTALL:
+#   * put something like this in your .zshrc:
+#       source /path/to/zsh-z.plugin.zsh
+#   * cd around for a while to build up the database
+#
+# USAGE:
+#   * z foo       cd to the most frecent directory matching foo
+#   * z foo bar   cd to the most frecent directory matching both foo and bar
+#                   (e.g. /foo/bat/bar/quux)
+#   * z -r foo    cd to the highest ranked directory matching foo
+#   * z -t foo    cd to most recently accessed directory matching foo
+#   * z -l foo    List matches instead of changing directories
+#   * z -e foo    Echo the best match without changing directories
+#   * z -c foo    Restrict matches to subdirectories of PWD
+#   * z -x        Remove a directory (default: PWD) from the database
+#   * z -xR       Remove a directory (default: PWD) and its subdirectories from
+#                   the database
+#
+# ENVIRONMENT VARIABLES:
+#
+#   ZSHZ_CASE -> if `ignore', pattern matching is case-insensitive; if `smart',
+#     pattern matching is case-insensitive only when the pattern is all
+#     lowercase
+#   ZSHZ_CMD -> name of command (default: z)
+#   ZSHZ_COMPLETION -> completion method (default: 'frecent'; 'legacy' for
+#     alphabetic sorting)
+#   ZSHZ_DATA -> name of datafile (default: ~/.z)
+#   ZSHZ_EXCLUDE_DIRS -> array of directories to exclude from your database
+#     (default: empty)
+#   ZSHZ_KEEP_DIRS -> array of directories that should not be removed from the
+#     database, even if they are not currently available (default: empty)
+#   ZSHZ_MAX_SCORE -> maximum combined score the database entries can have
+#     before beginning to age (default: 9000)
+#   ZSHZ_NO_RESOLVE_SYMLINKS -> '1' prevents symlink resolution
+#   ZSHZ_OWNER -> your username (if you want use Zsh-z while using sudo -s)
+#   ZSHZ_UNCOMMON -> if 1, do not jump to "common directories," but rather drop
+#     subdirectories based on what the search string was (default: 0)
+################################################################################
+
+autoload -U is-at-least
+
+if ! is-at-least 4.3.11; then
+  print "Zsh-z requires Zsh v4.3.11 or higher." >&2 && exit
+fi
+
+############################################################
+# The help message
+#
+# Globals:
+#   ZSHZ_CMD
+############################################################
+_zshz_usage() {
+  print "Usage: ${ZSHZ_CMD:-${_Z_CMD:-z}} [OPTION]... [ARGUMENT]
+Jump to a directory that you have visited frequently or recently, or a bit of both, based on the partial string ARGUMENT.
+
+With no ARGUMENT, list the directory history in ascending rank.
+
+  --add Add a directory to the database
+  -c    Only match subdirectories of the current directory
+  -e    Echo the best match without going to it
+  -h    Display this help and exit
+  -l    List all matches without going to them
+  -r    Match by rank
+  -t    Match by recent access
+  -x    Remove a directory from the database (by default, the current directory)
+  -xR   Remove a directory and its subdirectories from the database (by default, the current directory)" |
+    fold -s -w $COLUMNS >&2
+}
+
+# Load zsh/datetime module, if necessary
+(( $+EPOCHSECONDS )) || zmodload zsh/datetime
+
+# Load zsh/files, if necessary
+[[ ${builtins[zf_chown]} == 'defined' &&
+   ${builtins[zf_mv]}    == 'defined' &&
+   ${builtins[zf_rm]}    == 'defined' ]] ||
+  zmodload -F zsh/files b:zf_chown b:zf_mv b:zf_rm
+
+# Load zsh/system, if necessary
+[[ ${modules[zsh/system]} == 'loaded' ]] || zmodload zsh/system &> /dev/null
+
+# Global associative array for internal use
+typeset -gA ZSHZ
+
+# Make sure ZSHZ_EXCLUDE_DIRS has been declared so that other scripts can
+# simply append to it
+(( ${+ZSHZ_EXCLUDE_DIRS} )) || typeset -gUa ZSHZ_EXCLUDE_DIRS
+
+# Determine if zsystem flock is available
+zsystem supports flock &> /dev/null && ZSHZ[USE_FLOCK]=1
+
+# Determine if `print -v' is supported
+is-at-least 5.3.0 && ZSHZ[PRINTV]=1
+
+############################################################
+# The Zsh-z Command
+#
+# Globals:
+#   ZSHZ
+#   ZSHZ_CASE
+#   ZSHZ_COMPLETION
+#   ZSHZ_DATA
+#   ZSHZ_DEBUG
+#   ZSHZ_EXCLUDE_DIRS
+#   ZSHZ_KEEP_DIRS
+#   ZSHZ_MAX_SCORE
+#   ZSHZ_OWNER
+#
+# Arguments:
+#   $* Command options and arguments
+############################################################
+zshz() {
+
+  # Don't use `emulate -L zsh' - it breaks PUSHD_IGNORE_DUPS
+  setopt LOCAL_OPTIONS NO_KSH_ARRAYS NO_SH_WORD_SPLIT EXTENDED_GLOB
+  (( ZSHZ_DEBUG )) && setopt LOCAL_OPTIONS WARN_CREATE_GLOBAL
+
+  local REPLY
+  local -a lines
+
+  # Allow the user to specify the datafile name in $ZSHZ_DATA (default: ~/.z)
+  # If the datafile is a symlink, it gets dereferenced
+  local datafile=${${ZSHZ_DATA:-${_Z_DATA:-${HOME}/.z}}:A}
+
+  # If the datafile is a directory, print a warning and exit
+  if [[ -d $datafile ]]; then
+    print "ERROR: Zsh-z's datafile (${datafile}) is a directory." >&2
+    exit
+  fi
+
+  # Make sure that the datafile exists before attempting to read it or lock it
+  # for writing
+  [[ -f $datafile ]] || touch "$datafile"
+
+  # Bail if we don't own the datafile and $ZSHZ_OWNER is not set
+  [[ -z ${ZSHZ_OWNER:-${_Z_OWNER}} && -f $datafile && ! -O $datafile ]] &&
+    return
+
+  # Load the datafile into an array and parse it
+  lines=( ${(f)"$(< $datafile)"} )
+  # Discard entries that are incomplete or incorrectly formatted
+  lines=( ${(M)lines:#/*\|[[:digit:]]##[.,]#[[:digit:]]#\|[[:digit:]]##} )
+
+  ############################################################
+  # Add a path to or remove one from the datafile
+  #
+  # Globals:
+  #   ZSHZ
+  #   ZSHZ_EXCLUDE_DIRS
+  #   ZSHZ_OWNER
+  #
+  # Arguments:
+  #   $1 Which action to perform (--add/--remove)
+  #   $2 The path to add
+  ############################################################
+  _zshz_add_or_remove_path() {
+    local action=${1}
+    shift
+
+    if [[ $action == '--add' ]]; then
+
+      # TODO: The following tasks are now handled by _agkozak_precmd. Dead code?
+
+      # Don't add $HOME
+      [[ $* == $HOME ]] && return
+
+      # Don't track directory trees excluded in ZSHZ_EXCLUDE_DIRS
+      local exclude
+      for exclude in ${(@)ZSHZ_EXCLUDE_DIRS:-${(@)_Z_EXCLUDE_DIRS}}; do
+        case $* in
+          ${exclude}|${exclude}/*) return ;;
+        esac
+      done
+    fi
+
+    # A temporary file that gets copied over the datafile if all goes well
+    local tempfile="${datafile}.${RANDOM}"
+
+    # See https://github.com/rupa/z/pull/199/commits/ed6eeed9b70d27c1582e3dd050e72ebfe246341c
+    if (( ZSHZ[USE_FLOCK] )); then
+
+      local lockfd
+
+      # Grab exclusive lock (released when function exits)
+      zsystem flock -f lockfd "$datafile" 2> /dev/null || return
+
+    fi
+
+    integer tmpfd
+    case $action in
+      --add)
+        exec {tmpfd}>|"$tempfile"  # Open up tempfile for writing
+        _zshz_update_datafile $tmpfd "$*"
+        local ret=$?
+        ;;
+      --remove)
+        local xdir  # Directory to be removed
+
+        if (( ${ZSHZ_NO_RESOLVE_SYMLINKS:-${_Z_NO_RESOLVE_SYMLINKS}} )); then
+          [[ -d ${${*:-${PWD}}:a} ]] && xdir=${${*:-${PWD}}:a}
+        else
+          [[ -d ${${*:-${PWD}}:A} ]] && xdir=${${*:-${PWD}}:a}
+        fi
+
+        local -a lines_to_keep
+        if (( ${+opts[-R]} )); then
+          # Prompt user before deleting entire database
+          if [[ $xdir == '/' ]] && ! read -q "?Delete entire Zsh-z database? "; then
+            print && return 1
+          fi
+          # All of the lines that don't match the directory to be deleted
+          lines_to_keep=( ${lines:#${xdir}\|*} )
+          # Or its subdirectories
+          lines_to_keep=( ${lines_to_keep:#${xdir%/}/**} )
+        else
+          # All of the lines that don't match the directory to be deleted
+          lines_to_keep=( ${lines:#${xdir}\|*} )
+        fi
+        if [[ $lines != "$lines_to_keep" ]]; then
+          lines=( $lines_to_keep )
+        else
+          return 1  # The $PWD isn't in the datafile
+        fi
+        exec {tmpfd}>|"$tempfile"  # Open up tempfile for writing
+        print -u $tmpfd -l -- $lines
+        local ret=$?
+        ;;
+    esac
+
+    if (( tmpfd != 0 )); then
+      # Close tempfile
+      exec {tmpfd}>&-
+    fi
+
+    if (( ret != 0 )); then
+      # Avoid clobbering the datafile if the write to tempfile failed
+      zf_rm -f "$tempfile"
+      return $ret
+    fi
+
+    local owner
+    owner=${ZSHZ_OWNER:-${_Z_OWNER}}
+
+    if (( ZSHZ[USE_FLOCK] )); then
+      zf_mv "$tempfile" "$datafile" 2> /dev/null || zf_rm -f "$tempfile"
+
+      if [[ -n $owner ]]; then
+        zf_chown ${owner}:"$(id -ng ${owner})" "$datafile"
+      fi
+    else
+      if [[ -n $owner ]]; then
+        zf_chown "${owner}":"$(id -ng "${owner}")" "$tempfile"
+      fi
+      zf_mv -f "$tempfile" "$datafile" 2> /dev/null || zf_rm -f "$tempfile"
+    fi
+
+    # In order to make z -x work, we have to disable zsh-z's adding
+    # to the database until the user changes directory and the
+    # chpwd_functions are run
+    if [[ $action == '--remove' ]]; then
+      ZSHZ[DIRECTORY_REMOVED]=1
+    fi
+  }
+
+  ############################################################
+  # Read the curent datafile contents, update them, "age" them
+  # when the total rank gets high enough, and print the new
+  # contents to STDOUT.
+  #
+  # Globals:
+  #   ZSHZ_KEEP_DIRS
+  #   ZSHZ_MAX_SCORE
+  #
+  # Arguments:
+  #   $1 File descriptor linked to tempfile
+  #   $2 Path to be added to datafile
+  ############################################################
+  _zshz_update_datafile() {
+
+    integer fd=$1
+    local -A rank time
+
+    # Characters special to the shell (such as '[]') are quoted with backslashes
+    # See https://github.com/rupa/z/issues/246
+    local add_path=${(q)2}
+
+    local -a existing_paths
+    local now=$EPOCHSECONDS line dir
+    local path_field rank_field time_field count x
+
+    rank[$add_path]=1
+    time[$add_path]=$now
+
+    # Remove paths from database if they no longer exist
+    for line in $lines; do
+      if [[ ! -d ${line%%\|*} ]]; then
+        for dir in ${(@)ZSHZ_KEEP_DIRS}; do
+          if [[ ${line%%\|*} == ${dir}/* ||
+                ${line%%\|*} == $dir     ||
+                $dir == '/' ]]; then
+            existing_paths+=( $line )
+          fi
+        done
+      else
+        existing_paths+=( $line )
+      fi
+    done
+    lines=( $existing_paths )
+
+    for line in $lines; do
+      path_field=${(q)line%%\|*}
+      rank_field=${${line%\|*}#*\|}
+      time_field=${line##*\|}
+
+      # When a rank drops below 1, drop the path from the database
+      (( rank_field < 1 )) && continue
+
+      if [[ $path_field == $add_path ]]; then
+        rank[$path_field]=$rank_field
+        (( rank[$path_field]++ ))
+        time[$path_field]=$now
+      else
+        rank[$path_field]=$rank_field
+        time[$path_field]=$time_field
+      fi
+      (( count += rank_field ))
+    done
+    if (( count > ${ZSHZ_MAX_SCORE:-${_Z_MAX_SCORE:-9000}} )); then
+      # Aging
+      for x in ${(k)rank}; do
+        print -u $fd -- "$x|$(( 0.99 * rank[$x] ))|${time[$x]}" || return 1
+      done
+    else
+      for x in ${(k)rank}; do
+        print -u $fd -- "$x|${rank[$x]}|${time[$x]}" || return 1
+      done
+    fi
+  }
+
+  ############################################################
+  # The original tab completion method
+  #
+  # String processing is smartcase -- case-insensitive if the
+  # search string is lowercase, case-sensitive if there are
+  # any uppercase letters. Spaces in the search string are
+  # treated as *'s in globbing. Read the contents of the
+  # datafile and print matches to STDOUT.
+  #
+  # Arguments:
+  #   $1 The string to be completed
+  ############################################################
+  _zshz_legacy_complete() {
+
+    local line path_field path_field_normalized
+
+    # Replace spaces in the search string with asterisks for globbing
+    1=${1//[[:space:]]/*}
+
+    for line in $lines; do
+
+      path_field=${line%%\|*}
+
+      path_field_normalized=$path_field
+      if (( ZSHZ_TRAILING_SLASH )); then
+        path_field_normalized=${path_field%/}/
+      fi
+
+      # If the search string is all lowercase, the search will be case-insensitive
+      if [[ $1 == "${1:l}" && ${path_field_normalized:l} == *${~1}* ]]; then
+        print -- $path_field
+      # Otherwise, case-sensitive
+      elif [[ $path_field_normalized == *${~1}* ]]; then
+        print -- $path_field
+      fi
+
+    done
+    # TODO: Search strings with spaces in them are currently treated case-
+    # insensitively.
+  }
+
+  ############################################################
+  # `print' or `printf' to REPLY
+  #
+  # Variable assignment through command substitution, of the
+  # form
+  #
+  #   foo=$( bar )
+  #
+  # requires forking a subshell; on Cygwin/MSYS2/WSL1 that can
+  # be surprisingly slow. Zsh-z avoids doing that by printing
+  # values to the variable REPLY. Since Zsh v5.3.0 that has
+  # been possible with `print -v'; for earlier versions of the
+  # shell, the values are placed on the editing buffer stack
+  # and then `read' into REPLY.
+  #
+  # Globals:
+  #   ZSHZ
+  #
+  # Arguments:
+  #   Options and parameters for `print'
+  ############################################################
+  _zshz_printv() {
+    # NOTE: For a long time, ZSH's `print -v' had a tendency
+    # to mangle multibyte strings:
+    #
+    #   https://www.zsh.org/mla/workers/2020/msg00307.html
+    #
+    # The bug was fixed in late 2020:
+    #
+    #   https://github.com/zsh-users/zsh/commit/b6ba74cd4eaec2b6cb515748cf1b74a19133d4a4#diff-32bbef18e126b837c87b06f11bfc61fafdaa0ed99fcb009ec53f4767e246b129
+    #
+    # In order to support shells with the bug, we must use a form of `printf`,
+    # which does not exhibit the undesired behavior. See
+    #
+    #   https://www.zsh.org/mla/workers/2020/msg00308.html
+
+    if (( ZSHZ[PRINTV] )); then
+      builtin print -v REPLY -f %s $@
+    else
+      builtin print -z $@
+      builtin read -rz REPLY
+    fi
+  }
+
+  ############################################################
+  # If matches share a common root, find it, and put it in
+  # REPLY for _zshz_output to use.
+  #
+  # Arguments:
+  #   $1 Name of associative array of matches and ranks
+  ############################################################
+  _zshz_find_common_root() {
+    local -a common_matches
+    local x short
+
+    common_matches=( ${(@Pk)1} )
+
+    for x in ${(@)common_matches}; do
+      if [[ -z $short ]] || (( $#x < $#short )) || [[ $x != ${short}/* ]]; then
+        short=$x
+      fi
+    done
+
+    [[ $short == '/' ]] && return
+
+    for x in ${(@)common_matches}; do
+      [[ $x != $short* ]] && return
+    done
+
+    _zshz_printv -- $short
+  }
+
+  ############################################################
+  # Calculate a common root, if there is one. Then do one of
+  # the following:
+  #
+  #   1) Print a list of completions in frecent order;
+  #   2) List them (z -l) to STDOUT; or
+  #   3) Put a common root or best match into REPLY
+  #
+  # Globals:
+  #   ZSHZ_UNCOMMON
+  #
+  # Arguments:
+  #   $1 Name of an associative array of matches and ranks
+  #   $2 The best match or best case-insensitive match
+  #   $3 Whether to produce a completion, a list, or a root or
+  #        match
+  ############################################################
+  _zshz_output() {
+
+    local match_array=$1 match=$2 format=$3
+    local common k x
+    local -a descending_list output
+    local -A output_matches
+
+    output_matches=( ${(Pkv)match_array} )
+
+    _zshz_find_common_root $match_array
+    common=$REPLY
+
+    case $format in
+
+      completion)
+        for k in ${(@k)output_matches}; do
+          _zshz_printv -f "%.2f|%s" ${output_matches[$k]} $k
+          descending_list+=( ${(f)REPLY} )
+          REPLY=''
+        done
+        descending_list=( ${${(@On)descending_list}#*\|} )
+        print -l $descending_list
+        ;;
+
+      list)
+        local path_to_display
+        for x in ${(k)output_matches}; do
+          if (( ${output_matches[$x]} )); then
+            path_to_display=$x
+            (( ZSHZ_TILDE )) &&
+              path_to_display=${path_to_display/#${HOME}/\~}
+            _zshz_printv -f "%-10d %s\n" ${output_matches[$x]} $path_to_display
+            output+=( ${(f)REPLY} )
+            REPLY=''
+          fi
+        done
+        if [[ -n $common ]]; then
+          (( ZSHZ_TILDE )) && common=${common/#${HOME}/\~}
+          (( $#output > 1 )) && printf "%-10s %s\n" 'common:' $common
+        fi
+        # -lt
+        if (( $+opts[-t] )); then
+          for x in ${(@On)output}; do
+            print -- $x
+          done
+        # -lr
+        elif (( $+opts[-r] )); then
+          for x in ${(@on)output}; do
+            print -- $x
+          done
+        # -l
+        else
+          for x in ${(@on)output}; do
+            print $x
+          done
+        fi
+        ;;
+
+      *)
+        if (( ! ZSHZ_UNCOMMON )) && [[ -n $common ]]; then
+          _zshz_printv -- $common
+        else
+          _zshz_printv -- ${(P)match}
+        fi
+        ;;
+    esac
+  }
+
+  ############################################################
+  # Match a pattern by rank, time, or a combination of the
+  # two, and output the results as completions, a list, or a
+  # best match.
+  #
+  # Globals:
+  #   ZSHZ
+  #   ZSHZ_CASE
+  #   ZSHZ_KEEP_DIRS
+  #   ZSHZ_OWNER
+  #
+  # Arguments:
+  #   #1 Pattern to match
+  #   $2 Matching method (rank, time, or [default] frecency)
+  #   $3 Output format (completion, list, or [default] store
+  #     in REPLY
+  ############################################################
+  _zshz_find_matches() {
+    setopt LOCAL_OPTIONS NO_EXTENDED_GLOB
+
+    local fnd=$1 method=$2 format=$3
+
+    local -a existing_paths
+    local line dir path_field rank_field time_field rank dx escaped_path_field
+    local -A matches imatches
+    local best_match ibest_match hi_rank=-9999999999 ihi_rank=-9999999999
+
+    # Remove paths from database if they no longer exist
+    for line in $lines; do
+      if [[ ! -d ${line%%\|*} ]]; then
+        for dir in ${(@)ZSHZ_KEEP_DIRS}; do
+          if [[ ${line%%\|*} == ${dir}/* ||
+                ${line%%\|*} == $dir     ||
+                $dir == '/' ]]; then
+            existing_paths+=( $line )
+          fi
+        done
+      else
+        existing_paths+=( $line )
+      fi
+    done
+    lines=( $existing_paths )
+
+    for line in $lines; do
+      path_field=${line%%\|*}
+      rank_field=${${line%\|*}#*\|}
+      time_field=${line##*\|}
+
+      case $method in
+        rank) rank=$rank_field ;;
+        time) (( rank = time_field - EPOCHSECONDS )) ;;
+        *)
+          # Frecency routine
+          (( dx = EPOCHSECONDS - time_field ))
+          rank=$(( 10000 * rank_field * (3.75/((0.0001 * dx + 1) + 0.25)) ))
+          ;;
+      esac
+
+      # Use spaces as wildcards
+      local q=${fnd//[[:space:]]/\*}
+
+      # If $ZSHZ_TRAILING_SLASH is set, use path_field with a trailing slash for matching.
+      local path_field_normalized=$path_field
+      if (( ZSHZ_TRAILING_SLASH )); then
+        path_field_normalized=${path_field%/}/
+      fi
+
+      # If $ZSHZ_CASE is 'ignore', be case-insensitive.
+      #
+      # If it's 'smart', be case-insensitive unless the string to be matched
+      # includes capital letters.
+      #
+      # Otherwise, the default behavior of Zsh-z is to match case-sensitively if
+      # possible, then to fall back on a case-insensitive match if possible.
+      if [[ $ZSHZ_CASE == 'smart' && ${1:l} == $1 &&
+            ${path_field_normalized:l} == ${~q:l} ]]; then
+        imatches[$path_field]=$rank
+      elif [[ $ZSHZ_CASE != 'ignore' && $path_field_normalized == ${~q} ]]; then
+        matches[$path_field]=$rank
+      elif [[ $ZSHZ_CASE != 'smart' && ${path_field_normalized:l} == ${~q:l} ]]; then
+        imatches[$path_field]=$rank
+      fi
+
+      # Escape characters that would cause "invalid subscript" errors
+      # when accessing the associative array.
+      escaped_path_field=${path_field//'\'/'\\'}
+      escaped_path_field=${escaped_path_field//'`'/'\`'}
+      escaped_path_field=${escaped_path_field//'('/'\('}
+      escaped_path_field=${escaped_path_field//')'/'\)'}
+      escaped_path_field=${escaped_path_field//'['/'\['}
+      escaped_path_field=${escaped_path_field//']'/'\]'}
+
+      if (( matches[$escaped_path_field] )) &&
+         (( matches[$escaped_path_field] > hi_rank )); then
+        best_match=$path_field
+        hi_rank=${matches[$escaped_path_field]}
+      elif (( imatches[$escaped_path_field] )) &&
+           (( imatches[$escaped_path_field] > ihi_rank )); then
+        ibest_match=$path_field
+        ihi_rank=${imatches[$escaped_path_field]}
+        ZSHZ[CASE_INSENSITIVE]=1
+      fi
+    done
+
+    # Return 1 when there are no matches
+    [[ -z $best_match && -z $ibest_match ]] && return 1
+
+    if [[ -n $best_match ]]; then
+      _zshz_output matches best_match $format
+    elif [[ -n $ibest_match ]]; then
+      _zshz_output imatches ibest_match $format
+    fi
+  }
+
+  # THE MAIN ROUTINE
+
+  local -A opts
+
+  zparseopts -E -D -A opts -- \
+    -add \
+    -complete \
+    c \
+    e \
+    h \
+    -help \
+    l \
+    r \
+    R \
+    t \
+    x
+
+  if [[ $1 == '--' ]]; then
+    shift
+  elif [[ -n ${(M)@:#-*} && -z $compstate ]]; then
+    print "Improper option(s) given."
+    _zshz_usage
+    return 1
+  fi
+
+  local opt output_format method='frecency' fnd prefix req
+
+  for opt in ${(k)opts}; do
+    case $opt in
+      --add)
+        [[ ! -d $* ]] && return 1
+        local dir
+        # Cygwin and MSYS2 have a hard time with relative paths expressed from /
+        if [[ $OSTYPE == (cygwin|msys) && $PWD == '/' && $* != /* ]]; then
+          set -- "/$*"
+        fi
+        if (( ${ZSHZ_NO_RESOLVE_SYMLINKS:-${_Z_NO_RESOLVE_SYMLINKS}} )); then
+          dir=${*:a}
+        else
+          dir=${*:A}
+        fi
+        _zshz_add_or_remove_path --add "$dir"
+        return
+        ;;
+      --complete)
+        if [[ -s $datafile && ${ZSHZ_COMPLETION:-frecent} == 'legacy' ]]; then
+          _zshz_legacy_complete "$1"
+          return
+        fi
+        output_format='completion'
+        ;;
+      -c) [[ $* == ${PWD}/* || $PWD == '/' ]] || prefix="$PWD " ;;
+      -h|--help)
+        _zshz_usage
+        return
+        ;;
+      -l) output_format='list' ;;
+      -r) method='rank' ;;
+      -t) method='time' ;;
+      -x)
+        # Cygwin and MSYS2 have a hard time with relative paths expressed from /
+        if [[ $OSTYPE == (cygwin|msys) && $PWD == '/' && $* != /* ]]; then
+          set -- "/$*"
+        fi
+        _zshz_add_or_remove_path --remove $*
+        return
+        ;;
+    esac
+  done
+  req="$*"
+  fnd="$prefix$*"
+
+  [[ -n $fnd && $fnd != "$PWD " ]] || {
+    [[ $output_format != 'completion' ]] && output_format='list'
+  }
+
+  #########################################################
+  # If $ZSHZ_ECHO == 1, display paths as you jump to them.
+  # If it is also the case that $ZSHZ_TILDE == 1, display
+  # the home directory as a tilde.
+  #########################################################
+  _zshz_echo() {
+    if (( ZSHZ_ECHO )); then
+      if (( ZSHZ_TILDE )); then
+        print ${PWD/#${HOME}/\~}
+      else
+        print $PWD
+      fi
+    fi
+  }
+
+  if [[ ${@: -1} == /* ]] && (( ! $+opts[-e] && ! $+opts[-l] )); then
+    # cd if possible; echo the new path if $ZSHZ_ECHO == 1
+    [[ -d ${@: -1} ]] && builtin cd ${@: -1} && _zshz_echo && return
+  fi
+
+  # With option -c, make sure query string matches beginning of matches;
+  # otherwise look for matches anywhere in paths
+
+  # zpm-zsh/colors has a global $c, so we'll avoid math expressions here
+  if [[ ! -z ${(tP)opts[-c]} ]]; then
+    _zshz_find_matches "$fnd*" $method $output_format
+  else
+    _zshz_find_matches "*$fnd*" $method $output_format
+  fi
+
+  local ret2=$?
+
+  local cd
+  cd=$REPLY
+
+  # New experimental "uncommon" behavior
+  #
+  # If the best choice at this point is something like /foo/bar/foo/bar, and the  # search pattern is `bar', go to /foo/bar/foo/bar; but if the search pattern
+  # is `foo', go to /foo/bar/foo
+  if (( ZSHZ_UNCOMMON )) && [[ -n $cd ]]; then
+    if [[ -n $cd ]]; then
+
+      # In the search pattern, replace spaces with *
+      local q=${fnd//[[:space:]]/\*}
+      q=${q%/} # Trailing slash has to be removed
+
+      # As long as the best match is not case-insensitive
+      if (( ! ZSHZ[CASE_INSENSITIVE] )); then
+        # Count the number of characters in $cd that $q matches
+        local q_chars=$(( ${#cd} - ${#${cd//${~q}/}} ))
+        # Try dropping directory elements from the right; stop when it affects
+        # how many times the search pattern appears
+        until (( ( ${#cd:h} - ${#${${cd:h}//${~q}/}} ) != q_chars )); do
+          cd=${cd:h}
+        done
+
+      # If the best match is case-insensitive
+      else
+        local q_chars=$(( ${#cd} - ${#${${cd:l}//${~${q:l}}/}} ))
+        until (( ( ${#cd:h} - ${#${${${cd:h}:l}//${~${q:l}}/}} ) != q_chars )); do
+          cd=${cd:h}
+        done
+      fi
+
+      ZSHZ[CASE_INSENSITIVE]=0
+    fi
+  fi
+
+  if (( ret2 == 0 )) && [[ -n $cd ]]; then
+    if (( $+opts[-e] )); then               # echo
+      (( ZSHZ_TILDE )) && cd=${cd/#${HOME}/\~}
+      print -- "$cd"
+    else
+      # cd if possible; echo the new path if $ZSHZ_ECHO == 1
+      [[ -d $cd ]] && builtin cd "$cd" && _zshz_echo
+    fi
+  else
+    # if $req is a valid path, cd to it; echo the new path if $ZSHZ_ECHO == 1
+    if ! (( $+opts[-e] || $+opts[-l] )) && [[ -d $req ]]; then
+      builtin cd "$req" && _zshz_echo
+    else
+      return $ret2
+    fi
+  fi
+}
+
+alias ${ZSHZ_CMD:-${_Z_CMD:-z}}='zshz 2>&1'
+
+############################################################
+# precmd - add path to datafile unless `z -x' has just been
+#   run
+#
+# Globals:
+#   ZSHZ
+############################################################
+_zshz_precmd() {
+  # Do not add PWD to datafile when in HOME directory, or
+  # if `z -x' has just been run
+  [[ $PWD == "$HOME" ]] || (( ZSHZ[DIRECTORY_REMOVED] )) && return
+
+  # Don't track directory trees excluded in ZSHZ_EXCLUDE_DIRS
+  local exclude
+  for exclude in ${(@)ZSHZ_EXCLUDE_DIRS:-${(@)_Z_EXCLUDE_DIRS}}; do
+    case $PWD in
+      ${exclude}|${exclude}/*) return ;;
+    esac
+  done
+
+  # It appears that forking a subshell is so slow in Windows that it is better
+  # just to add the PWD to the datafile in the foreground
+  if [[ $OSTYPE == (cygwin|msys) ]]; then
+      zshz --add "$PWD"
+  else
+      (zshz --add "$PWD" &)
+  fi
+
+  # See https://github.com/rupa/z/pull/247/commits/081406117ea42ccb8d159f7630cfc7658db054b6
+  : $RANDOM
+}
+
+############################################################
+# chpwd
+#
+# When the $PWD is removed from the datafile with `z -x',
+# Zsh-z refrains from adding it again until the user has
+# left the directory.
+#
+# Globals:
+#   ZSHZ
+############################################################
+_zshz_chpwd() {
+  ZSHZ[DIRECTORY_REMOVED]=0
+}
+
+autoload -Uz add-zsh-hook
+
+add-zsh-hook precmd _zshz_precmd
+add-zsh-hook chpwd _zshz_chpwd
+
+############################################################
+# Completion
+############################################################
+
+# Standarized $0 handling
+# (See https://github.com/agkozak/Zsh-100-Commits-Club/blob/master/Zsh-Plugin-Standard.adoc)
+0=${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}
+0=${${(M)0:#/*}:-$PWD/$0}
+
+(( ${fpath[(ie)${0:A:h}]} <= ${#fpath} )) || fpath=( "${0:A:h}" "${fpath[@]}" )
+
+############################################################
+# zsh-z functions
+############################################################
+ZSHZ[FUNCTIONS]='_zshz_usage
+                 _zshz_add_or_remove_path
+                 _zshz_update_datafile
+                 _zshz_legacy_complete
+                 _zshz_printv
+                 _zshz_find_common_root
+                 _zshz_output
+                 _zshz_find_matches
+                 zshz
+                 _zshz_precmd
+                 _zshz_chpwd
+                 _zshz'
+
+############################################################
+# Enable WARN_NESTED_VAR for functions listed in
+#   ZSHZ[FUNCTIONS]
+############################################################
+(( ZSHZ_DEBUG )) && () {
+  if is-at-least 5.4.0; then
+    local x
+    for x in ${=ZSHZ[FUNCTIONS]}; do
+      functions -W $x
+    done
+  fi
+}
+
+############################################################
+# Unload function
+#
+# See https://github.com/agkozak/Zsh-100-Commits-Club/blob/master/Zsh-Plugin-Standard.adoc#unload-fun
+#
+# Globals:
+#   ZSHZ
+#   ZSHZ_CMD
+############################################################
+zsh-z_plugin_unload() {
+  emulate -L zsh
+
+  add-zsh-hook -D precmd _zshz_precmd
+  add-zsh-hook -d chpwd _zshz_chpwd
+
+  local x
+  for x in ${=ZSHZ[FUNCTIONS]}; do
+    (( ${+functions[$x]} )) && unfunction $x
+  done
+
+  unset ZSHZ
+
+  fpath=( "${(@)fpath:#${0:A:h}}" )
+
+  (( ${+aliases[${ZSHZ_CMD:-${_Z_CMD:-z}}]} )) &&
+    unalias ${ZSHZ_CMD:-${_Z_CMD:-z}}
+
+  unfunction $0
+}
+
+# vim: fdm=indent:ts=2:et:sts=2:sw=2:
diff --git a/plugins/z/z.sh b/plugins/z/z.sh
deleted file mode 100644
index 5c5771d62..000000000
--- a/plugins/z/z.sh
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright (c) 2009 rupa deadwyler. Licensed under the WTFPL license, Version 2
-
-# maintains a jump-list of the directories you actually use
-#
-# INSTALL:
-#     * put something like this in your .bashrc/.zshrc:
-#         . /path/to/z.sh
-#     * cd around for a while to build up the db
-#     * PROFIT!!
-#     * optionally:
-#         set $_Z_CMD in .bashrc/.zshrc to change the command (default z).
-#         set $_Z_DATA in .bashrc/.zshrc to change the datafile (default ~/.z).
-#         set $_Z_NO_RESOLVE_SYMLINKS to prevent symlink resolution.
-#         set $_Z_NO_PROMPT_COMMAND if you're handling PROMPT_COMMAND yourself.
-#         set $_Z_EXCLUDE_DIRS to an array of directories to exclude.
-#         set $_Z_OWNER to your username if you want use z while sudo with $HOME kept
-#
-# USE:
-#     * z foo     # cd to most frecent dir matching foo
-#     * z foo bar # cd to most frecent dir matching foo and bar
-#     * z -r foo  # cd to highest ranked dir matching foo
-#     * z -t foo  # cd to most recently accessed dir matching foo
-#     * z -l foo  # list matches instead of cd
-#     * z -e foo  # echo the best match, don't cd
-#     * z -c foo  # restrict matches to subdirs of $PWD
-
-[ -d "${_Z_DATA:-$HOME/.z}" ] && {
-    echo "ERROR: z.sh's datafile (${_Z_DATA:-$HOME/.z}) is a directory."
-}
-
-_z() {
-
-    local datafile="${_Z_DATA:-$HOME/.z}"
-
-    # if symlink, dereference
-    [ -h "$datafile" ] && datafile=$(readlink "$datafile")
-
-    # bail if we don't own ~/.z and $_Z_OWNER not set
-    [ -z "$_Z_OWNER" -a -f "$datafile" -a ! -O "$datafile" ] && return
-
-    _z_dirs () {
-        local line
-        while read line; do
-            # only count directories
-            [ -d "${line%%\|*}" ] && echo "$line"
-        done < "$datafile"
-        return 0
-    }
-
-    # add entries
-    if [ "$1" = "--add" ]; then
-        shift
-
-        # $HOME isn't worth matching
-        [ "$*" = "$HOME" ] && return
-
-        # don't track excluded directory trees
-        local exclude
-        for exclude in "${_Z_EXCLUDE_DIRS[@]}"; do
-            case "$*" in "$exclude*") return;; esac
-        done
-
-        # maintain the data file
-        local tempfile="$datafile.$RANDOM"
-        _z_dirs | awk -v path="$*" -v now="$(date +%s)" -F"|" '
-            BEGIN {
-                rank[path] = 1
-                time[path] = now
-            }
-            $2 >= 1 {
-                # drop ranks below 1
-                if( $1 == path ) {
-                    rank[$1] = $2 + 1
-                    time[$1] = now
-                } else {
-                    rank[$1] = $2
-                    time[$1] = $3
-                }
-                count += $2
-            }
-            END {
-                if( count > 9000 ) {
-                    # aging
-                    for( x in rank ) print x "|" 0.99*rank[x] "|" time[x]
-                } else for( x in rank ) print x "|" rank[x] "|" time[x]
-            }
-        ' 2>/dev/null >| "$tempfile"
-        # do our best to avoid clobbering the datafile in a race condition.
-        if [ $? -ne 0 -a -f "$datafile" ]; then
-            env rm -f "$tempfile"
-        else
-            [ "$_Z_OWNER" ] && chown $_Z_OWNER:"$(id -ng $_Z_OWNER)" "$tempfile"
-            env mv -f "$tempfile" "$datafile" || env rm -f "$tempfile"
-        fi
-
-    # tab completion
-    elif [ "$1" = "--complete" -a -s "$datafile" ]; then
-        _z_dirs | awk -v q="$2" -F"|" '
-            BEGIN {
-                q = substr(q, 3)
-                if( q == tolower(q) ) imatch = 1
-                gsub(/ /, ".*", q)
-            }
-            {
-                if( imatch ) {
-                    if( tolower($1) ~ q ) print $1
-                } else if( $1 ~ q ) print $1
-            }
-        ' 2>/dev/null
-
-    else
-        # list/go
-        local echo fnd last list opt typ
-        while [ "$1" ]; do case "$1" in
-            --) while [ "$1" ]; do shift; fnd="$fnd${fnd:+ }$1";done;;
-            -*) opt=${1:1}; while [ "$opt" ]; do case ${opt:0:1} in
-                    c) fnd="^$PWD $fnd";;
-                    e) echo=1;;
-                    h) echo "${_Z_CMD:-z} [-cehlrtx] args" >&2; return;;
-                    l) list=1;;
-                    r) typ="rank";;
-                    t) typ="recent";;
-                    x) sed -i -e "\:^${PWD}|.*:d" "$datafile";;
-                esac; opt=${opt:1}; done;;
-             *) fnd="$fnd${fnd:+ }$1";;
-        esac; last=$1; [ "$#" -gt 0 ] && shift; done
-        [ "$fnd" -a "$fnd" != "^$PWD " ] || list=1
-
-        # if we hit enter on a completion just go there
-        case "$last" in
-            # completions will always start with /
-            /*) [ -z "$list" -a -d "$last" ] && builtin cd "$last" && return;;
-        esac
-
-        # no file yet
-        [ -f "$datafile" ] || return
-
-        local cd
-        cd="$( < <( _z_dirs ) awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -F"|" '
-            function frecent(rank, time) {
-                # relate frequency and time
-                dx = t - time
-                if( dx < 3600 ) return rank * 4
-                if( dx < 86400 ) return rank * 2
-                if( dx < 604800 ) return rank / 2
-                return rank / 4
-            }
-            function output(matches, best_match, common) {
-                # list or return the desired directory
-                if( list ) {
-                    cmd = "sort -g >&2"
-                    for( x in matches ) {
-                        if( matches[x] ) {
-                            printf "%-10s %s\n", matches[x], x | cmd
-                        }
-                    }
-                    if( common ) {
-                        printf "%-10s %s\n", "common:", common > "/dev/stderr"
-                    }
-                } else {
-                    if( common ) best_match = common
-                    print best_match
-                }
-            }
-            function common(matches) {
-                # find the common root of a list of matches, if it exists
-                for( x in matches ) {
-                    if( matches[x] && (!short || length(x) < length(short)) ) {
-                        short = x
-                    }
-                }
-                if( short == "/" ) return
-                for( x in matches ) if( matches[x] && index(x, short) != 1 ) {
-                    return
-                }
-                return short
-            }
-            BEGIN {
-                gsub(" ", ".*", q)
-                hi_rank = ihi_rank = -9999999999
-            }
-            {
-                if( typ == "rank" ) {
-                    rank = $2
-                } else if( typ == "recent" ) {
-                    rank = $3 - t
-                } else rank = frecent($2, $3)
-                if( $1 ~ q ) {
-                    matches[$1] = rank
-                } else if( tolower($1) ~ tolower(q) ) imatches[$1] = rank
-                if( matches[$1] && matches[$1] > hi_rank ) {
-                    best_match = $1
-                    hi_rank = matches[$1]
-                } else if( imatches[$1] && imatches[$1] > ihi_rank ) {
-                    ibest_match = $1
-                    ihi_rank = imatches[$1]
-                }
-            }
-            END {
-                # prefer case sensitive
-                if( best_match ) {
-                    output(matches, best_match, common(matches))
-                } else if( ibest_match ) {
-                    output(imatches, ibest_match, common(imatches))
-                }
-            }
-        ')"
-
-        [ $? -eq 0 ] && [ "$cd" ] && {
-          if [ "$echo" ]; then echo "$cd"; else builtin cd "$cd"; fi
-        }
-    fi
-}
-
-alias ${_Z_CMD:-z}='_z 2>&1'
-
-[ "$_Z_NO_RESOLVE_SYMLINKS" ] || _Z_RESOLVE_SYMLINKS="-P"
-
-if type compctl >/dev/null 2>&1; then
-    # zsh
-    [ "$_Z_NO_PROMPT_COMMAND" ] || {
-        # populate directory list, avoid clobbering any other precmds.
-        if [ "$_Z_NO_RESOLVE_SYMLINKS" ]; then
-            _z_precmd() {
-                (_z --add "${PWD:a}" &)
-                # Reference $RANDOM to refresh its value inside the subshell
-                # Otherwise, multiple runs get the same value
-                : $RANDOM
-            }
-        else
-            _z_precmd() {
-                (_z --add "${PWD:A}" &)
-                # Reference $RANDOM to refresh its value inside the subshell
-                # Otherwise, multiple runs get the same value
-                : $RANDOM
-            }
-        fi
-        [[ -n "${precmd_functions[(r)_z_precmd]}" ]] || {
-            precmd_functions[$(($#precmd_functions+1))]=_z_precmd
-        }
-    }
-    _z_zsh_tab_completion() {
-        # tab completion
-        local compl
-        read -l compl
-        reply=(${(f)"$(_z --complete "$compl")"})
-    }
-    compctl -U -K _z_zsh_tab_completion _z
-elif type complete >/dev/null 2>&1; then
-    # bash
-    # tab completion
-    complete -o filenames -C '_z --complete "$COMP_LINE"' ${_Z_CMD:-z}
-    [ "$_Z_NO_PROMPT_COMMAND" ] || {
-        # populate directory list. avoid clobbering other PROMPT_COMMANDs.
-        grep "_z --add" <<< "$PROMPT_COMMAND" >/dev/null || {
-            PROMPT_COMMAND="$PROMPT_COMMAND"$'\n''(_z --add "$(command pwd '$_Z_RESOLVE_SYMLINKS' 2>/dev/null)" 2>/dev/null &);'
-        }
-    }
-fi
diff --git a/plugins/zbell/README.md b/plugins/zbell/README.md
new file mode 100644
index 000000000..eb87699c4
--- /dev/null
+++ b/plugins/zbell/README.md
@@ -0,0 +1,33 @@
+# zbell plugin
+
+This plugin prints a bell character when a command finishes if it has been
+running for longer than a specified duration.
+
+To use it, add `zbell` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... zbell)
+```
+
+## Settings
+
+These settings need to be set in your zshrc file, before Oh My Zsh is sourced.
+
+- `zbell_duration`: duration in seconds after which to consider notifying
+  the end of a command. Default: 15 seconds.
+
+- `zbell_ignore`: if there are programs that you know run long that you
+  don't want to bell after, then add them to the `zbell_ignore` array.
+  By default, `$EDITOR` and `$PAGER` are ignored:
+
+  ```zsh
+  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).
+Made available under the ISC license.
diff --git a/plugins/zbell/zbell.plugin.zsh b/plugins/zbell/zbell.plugin.zsh
new file mode 100644
index 000000000..8e374029b
--- /dev/null
+++ b/plugins/zbell/zbell.plugin.zsh
@@ -0,0 +1,96 @@
+#!/usr/bin/env zsh
+
+# This script prints a bell character when a command finishes
+# if it has been running for longer than $zbell_duration seconds.
+# If there are programs that you know run long that you don't
+# want to bell after, then add them to $zbell_ignore.
+#
+# This script uses only zsh builtins so its fast, there's no needless
+# forking, and its only dependency is zsh and its standard modules
+#
+# Written by Jean-Philippe Ouellet <jpo@vt.edu>
+# Made available under the ISC license.
+
+# only do this if we're in an interactive shell
+[[ -o interactive ]] || return
+
+# get $EPOCHSECONDS. builtins are faster than date(1)
+zmodload zsh/datetime || return
+
+# make sure we can register hooks
+autoload -Uz add-zsh-hook || return
+
+# make sure we can do regexp replace
+autoload -Uz regexp-replace || return
+
+# initialize zbell_duration if not set
+(( ${+zbell_duration} )) || zbell_duration=15
+
+# 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() {
+	zbell_ui_notify "${@}"
+	print -n "\a"
+}
+
+# right before we begin to execute something, store the time it started at
+zbell_begin() {
+	zbell_timestamp=$EPOCHSECONDS
+	zbell_lastcmd=$1
+}
+
+# when it finishes, if it's been running longer than $zbell_duration,
+# and we dont have an ignored command in the line, then print a bell.
+zbell_end() {
+	local cmd_duration=$(( $EPOCHSECONDS - $zbell_timestamp ))
+	local ran_long=$(( $cmd_duration >= $zbell_duration ))
+
+	local zbell_lastcmd_tmp="$zbell_lastcmd"
+	regexp-replace zbell_lastcmd_tmp '^sudo ' ''
+
+	[[ $zbell_last_timestamp == $zbell_timestamp ]] && return
+
+	[[ $zbell_lastcmd_tmp == "" ]] && return
+
+	zbell_last_timestamp=$zbell_timestamp
+
+	local has_ignored_cmd=0
+	for cmd in ${(s:;:)zbell_lastcmd_tmp//|/;}; do
+		words=(${(z)cmd})
+		util=${words[1]}
+		if (( ${zbell_ignore[(i)$util]} <= ${#zbell_ignore} )); then
+			has_ignored_cmd=1
+			break
+		fi
+	done
+
+	(( ! $has_ignored_cmd && ran_long )) && zbell_notify $zbell_lastcmd $cmd_duration
+}
+
+# register the functions as hooks
+add-zsh-hook preexec zbell_begin
+add-zsh-hook precmd zbell_end
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
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..4dc9cdba2 100644
--- a/plugins/zsh-navigation-tools/README.md
+++ b/plugins/zsh-navigation-tools/README.md
@@ -1,15 +1,28 @@
 [![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)
+![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/psprint/zsh-cmd-architect)
-and [Zconvey](https://github.com/psprint/zconvey)
+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)
 
 
 
@@ -19,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/psprint/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)
-    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/psprint/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 [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 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`).
-The config files will be available in `~/.config/znt`.
-
-## Installation With Antigen
-Add `antigen bundle psprint/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/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:
-
-```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
 
@@ -392,20 +226,12 @@ 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
 
-- 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 +255,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 000000000..fa23de00d
Binary files /dev/null and b/plugins/zsh-navigation-tools/doc/img/n-history2.png differ
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..54c819810 100644
--- a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
+++ b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
@@ -8,9 +8,10 @@
 #
 
 # 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}"
 export ZNT_CONFIG_DIR="$HOME/.config/znt"
 
diff --git a/plugins/zsh_reload/README.md b/plugins/zsh_reload/README.md
deleted file mode 100644
index d31a827fe..000000000
--- a/plugins/zsh_reload/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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!
-```
diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
deleted file mode 100644
index 0d29a7ce3..000000000
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ /dev/null
@@ -1,22 +0,0 @@
-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
-}
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 307618104..7e1c7997c 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -23,14 +23,13 @@ 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 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
 
 # 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"
@@ -45,6 +44,9 @@ ZSH_THEME="robbyrussell"
 # ENABLE_CORRECTION="true"
 
 # Uncomment the following line to display red dots whilst waiting for completion.
+# 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
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/adben.zsh-theme b/themes/adben.zsh-theme
index b9ac77d00..c2fdbed23 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -29,86 +29,90 @@
 # # This theme's look and feel is based on the Aaron Toponce's zsh theme, more info:
 # # https://pthree.org/2008/11/23/727/
 # # enjoy!
+
 ########## 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}]%}'
+  typeset -g PR_$COLOR="%b%{$fg[${(L)COLOR}]%}"
+  typeset -g 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}"
-# ########## COLOR ###########
-# ########## 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}"
-# ########## SVN ###########
-# ########## 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}"
-# ########## GIT ###########
-function precmd {
-    #gets the fortune
-    ps1_fortune () {
-        #Choose from all databases, regardless of whether they are considered "offensive"
-        fortune -a
-    }
-    #obtains the tip
-    ps1_command_tip () {
-        wget -qO - http://www.commandlinefu.com/commands/random/plaintext | sed 1d | sed '/^$/d'
-    }
-    prompt_header () {
-        if [[ "true" == "$ENABLE_COMMAND_TIP" ]]; then
-            ps1_command_tip
-        else
-            ps1_fortune
-        fi
-    }
-    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
+
+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_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_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() {
+  if (( ${+commands[fortune]} )); then
+    fortune
+  fi
+}
+
+# Obtain a command tip
+ps1_command_tip() {
+  {
+    if (( ${+commands[wget]} )); then
+      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;/^$/d'
+}
+
+# Show prompt header (fortune / command tip)
+prompt_header() {
+  local header=$(
+    case "${ENABLE_COMMAND_TIP:-}" in
+    true) ps1_command_tip ;;
+    *) ps1_fortune ;;
+    esac
+  )
+
+  # 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 [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-        echo -n "${PR_RESET}${PR_RED}$USER@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
-    else
-        echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
-    fi
+prompt_context() {
+  if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+    echo -n "${PR_RESET}${PR_RED}%n@%m"
+  fi
 }
 
-set_prompt () {
-    # required for the prompt
-    setopt prompt_subst
-    autoload zsh/terminfo
+########## SETUP ###########
 
-    # ######### 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}'
-    # Matching continuation prompt
-    PROMPT2='${GREEN_BASE_START}${PR_RESET} %_ ${GREEN_BASE_START}${PR_RESET} '
-    # ######### PROMPT #########
-}
+# Required for the prompt
+setopt prompt_subst
 
-set_prompt
+# 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_START} %_ ${GREEN_START} "
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 1d2af3458..2ef9b02d7 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%}"
diff --git a/themes/afowler.zsh-theme b/themes/afowler.zsh-theme
index 3a4753fc1..f6d3ef82a 100644
--- a/themes/afowler.zsh-theme
+++ b/themes/afowler.zsh-theme
@@ -1,10 +1,10 @@
-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~ $(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=""
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 79748e45e..5f4efe813 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -88,7 +88,7 @@ prompt_end() {
 
 # Context: user@hostname (who am I and where am I)
 prompt_context() {
-  if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+  if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
     prompt_segment black default "%(!.%{%F{yellow}%}.)%n@%m"
   fi
 }
@@ -131,11 +131,11 @@ prompt_git() {
     zstyle ':vcs_info:*' get-revision true
     zstyle ':vcs_info:*' check-for-changes true
     zstyle ':vcs_info:*' stagedstr '✚'
-    zstyle ':vcs_info:*' unstagedstr '●'
+    zstyle ':vcs_info:*' unstagedstr '±'
     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
 }
 
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/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/avit.zsh-theme b/themes/avit.zsh-theme
index 921ed99d3..f90ba331b 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -17,7 +17,7 @@ function _user_host() {
   local me
   if [[ -n $SSH_CONNECTION ]]; then
     me="%n@%m"
-  elif [[ $LOGNAME != $USER ]]; then
+  elif [[ $LOGNAME != $USERNAME ]]; then
     me="%n"
   fi
   if [[ -n $me ]]; then
@@ -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.showSignature=false log --format='%at' -1 2>/dev/null); then
     now=$(date +%s)
     seconds_since_last_commit=$((now-last_commit))
 
diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
index cdae68d6c..42a70a018 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%(!.%{$fg[red]%}.%{$fg[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"
diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 3b3bdc80f..698aa2ff8 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -16,65 +16,73 @@ 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
   echo "${ref#refs/heads/}"
 }
 
 bureau_git_status() {
-  _STATUS=""
+  local result gitstatus
+  gitstatus="$(command git status --porcelain -b 2>/dev/null)"
 
   # 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"
+  local gitfiles="$(tail -n +2 <<< "$gitstatus")"
+  if [[ -n "$gitfiles" ]]; then
+    if [[ "$gitfiles" =~ $'(^|\n)[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 [[ "$gitfiles" =~ $'(^|\n).[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 [[ "$gitfiles" =~ $'(^|\n)\\?\\? ' ]]; then
+      result+="$ZSH_THEME_GIT_PROMPT_UNTRACKED"
     fi
-    if $(echo "$_INDEX" | command grep -q '^UU '); then
-      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
+    if [[ "$gitfiles" =~ $'(^|\n)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"
+  local gitbranch="$(head -n 1 <<< "$gitstatus")"
+  if [[ "$gitbranch" =~ '^## .*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 [[ "$gitbranch" =~ '^## .*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 [[ "$gitbranch" =~ '^## .*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"
+  # check if there are stashed changes
+  if command git rev-parse --verify refs/stash &> /dev/null; then
+    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 _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() {
+  # check git information
+  local gitinfo=$(bureau_git_info)
+  if [[ -z "$gitinfo" ]]; then
+    return
   fi
-  echo $_result
+
+  # quote % in git information
+  local output="${gitinfo:gs/%/%%}"
+
+  # check git status
+  local gitstatus=$(bureau_git_status)
+  if [[ -n "$gitstatus" ]]; then
+    output+=" $gitstatus"
+  fi
+
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${output}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 
@@ -95,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`
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/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/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/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/emotty.zsh-theme b/themes/emotty.zsh-theme
index 13adad78d..ba0840950 100644
--- a/themes/emotty.zsh-theme
+++ b/themes/emotty.zsh-theme
@@ -46,14 +46,24 @@
 # 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]"
 
 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]"
diff --git a/themes/essembeh.zsh-theme b/themes/essembeh.zsh-theme
index 939bb7a4c..43d4093b1 100644
--- a/themes/essembeh.zsh-theme
+++ b/themes/essembeh.zsh-theme
@@ -1,24 +1,14 @@
-# Theme with full path names and hostname
-# Handy if you work on different servers all the time;
-
-local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
-
-function my_git_prompt_info() {
-	ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-	GIT_STATUS=$(git_prompt_status)
-	[[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS"
-	echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
-}
-
-# Colored prompt
-ZSH_THEME_COLOR_USER="green" 
-ZSH_THEME_COLOR_HOST="green" 
-ZSH_THEME_COLOR_PWD="yellow" 
-test -n "$SSH_CONNECTION" && ZSH_THEME_COLOR_USER="red" && ZSH_THEME_COLOR_HOST="red"
-test `id -u` = 0 && ZSH_THEME_COLOR_USER="magenta" && ZSH_THEME_COLOR_HOST="magenta"
-PROMPT='%{$fg_bold[$ZSH_THEME_COLOR_USER]%}%n@%{$fg_bold[$ZSH_THEME_COLOR_HOST]%}%M%{$reset_color%}:%{$fg_bold[$ZSH_THEME_COLOR_PWD]%}%~%{$reset_color%} $(my_git_prompt_info)%(!.#.$) '
-RPS1="${return_code}"
+# My custom theme:
+#   - single line
+#   - quite simple by default: user@host:$PWD
+#   - green for local shell as non root
+#   - red for ssh shell as non root
+#   - magenta for root sessions
+#   - prefix with remote address for ssh shells
+#   - prefix to detect docker containers or chroot
+#   - git plugin to display current branch and status
 
+# git plugin 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}("
 ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
@@ -28,3 +18,33 @@ ZSH_THEME_GIT_PROMPT_RENAMED="~"
 ZSH_THEME_GIT_PROMPT_DELETED="!"
 ZSH_THEME_GIT_PROMPT_UNMERGED="?"
 
+function zsh_essembeh_gitstatus {
+	ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+	GIT_STATUS=$(git_prompt_status)
+	if [[ -n $GIT_STATUS ]]; then
+		GIT_STATUS=" $GIT_STATUS"
+	fi
+	echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
+}
+
+# by default, use green for user@host and no prefix
+local ZSH_ESSEMBEH_COLOR="green"
+local ZSH_ESSEMBEH_PREFIX=""
+if [[ -n "$SSH_CONNECTION" ]]; then
+	# display the source address if connected via ssh
+	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[$(echo $SSH_CONNECTION | awk '{print $1}')]%{$reset_color%} "
+	# use red color to highlight a remote connection
+	ZSH_ESSEMBEH_COLOR="red"
+elif [[ -r /etc/debian_chroot ]]; then 
+	# 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 container
+	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[docker]%{$reset_color%} "
+fi
+if [[ $UID = 0 ]]; then
+	# always use magenta for root sessions, even in ssh
+	ZSH_ESSEMBEH_COLOR="magenta"
+fi
+PROMPT='${ZSH_ESSEMBEH_PREFIX}%{$fg[$ZSH_ESSEMBEH_COLOR]%}%n@%M%{$reset_color%}:%{%B$fg[yellow]%}%~%{$reset_color%b%} $(zsh_essembeh_gitstatus)%(!.#.$) '
+RPROMPT="%(?..%{$fg[red]%}%?%{$reset_color%})"
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 1d8bb30e1..9365a3c42 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -11,26 +11,37 @@
 #
 # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
 
+function virtualenv_prompt_info {
+  [[ -n ${VIRTUAL_ENV} ]] || return
+  echo "${ZSH_THEME_VIRTUALENV_PREFIX:=[}${VIRTUAL_ENV:t}${ZSH_THEME_VIRTUALENV_SUFFIX:=]}"
+}
+
 function prompt_char {
-  git branch >/dev/null 2>/dev/null && echo "±" && return
-  echo '○'
+  command git branch &>/dev/null && echo "±" || echo '○'
 }
 
 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='using%{$FG[243]%} $(ruby_prompt_info)'
+local ruby_env='$(ruby_prompt_info)'
 local git_info='$(git_prompt_info)'
+local virtualenv_info='$(virtualenv_prompt_info)'
 local prompt_char='$(prompt_char)'
 
-
-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_info} %{$FG[239]%}${ruby_env}
+PROMPT="╭─${FG[040]}%n ${FG[239]}at ${FG[033]}$(box_name) ${FG[239]}in %B${FG[226]}%~%b${git_info}${ruby_env}${virtualenv_info}
 ╰─${prompt_char}%{$reset_color%} "
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX=" ${FG[239]}on%{$reset_color%} ${FG[255]}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔"
-ZSH_THEME_RUBY_PROMPT_PREFIX="‹"
+ZSH_THEME_GIT_PROMPT_DIRTY="${FG[202]}✘✘✘"
+ZSH_THEME_GIT_PROMPT_CLEAN="${FG[040]}✔"
+
+ZSH_THEME_RUBY_PROMPT_PREFIX=" ${FG[239]}using${FG[243]} ‹"
 ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}"
+
+export VIRTUAL_ENV_DISABLE_PROMPT=1
+ZSH_THEME_VIRTUALENV_PREFIX=" ${FG[239]}using${FG[243]} «"
+ZSH_THEME_VIRTUALENV_SUFFIX="»%{$reset_color%}"
diff --git a/themes/flazz.zsh-theme b/themes/flazz.zsh-theme
index c0a7fb5d0..e21b52ef5 100644
--- a/themes/flazz.zsh-theme
+++ b/themes/flazz.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$USER" = "root" ]
+if [ "$USERNAME" = "root" ]
 then CARETCOLOR="red"
 else CARETCOLOR="blue"
 fi
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]%}["
diff --git a/themes/frontcube.zsh-theme b/themes/frontcube.zsh-theme
index f9488d0ac..de6348329 100644
--- a/themes/frontcube.zsh-theme
+++ b/themes/frontcube.zsh-theme
@@ -1,7 +1,7 @@
 
 PROMPT='
 %{$fg_bold[gray]%}%~%{$fg_bold[blue]%}%{$fg_bold[blue]%} % %{$reset_color%}
-%{$fg[green]%}➞  %{$reset_color%'
+%{$fg[green]%}➞  %{$reset_color%}'
 
 RPROMPT='$(git_prompt_info) $(ruby_prompt_info)'
 
diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index e6c2d8142..bb97bfb17 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -1,16 +1,18 @@
 # Depends on the git plugin for work_in_progress()
+(( $+functions[work_in_progress] )) || work_in_progress() {}
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+# Customized git status, oh-my-zsh currently does not allow render dirty status before branch
 git_custom_status() {
-  local cb=$(git_current_branch)
-  if [ -n "$cb" ]; then
-    echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
-  fi
+  local branch=$(git_current_branch)
+  [[ -n "$branch" ]] || return 0
+  echo "$(parse_git_dirty)\
+%{${fg_bold[yellow]}%}$(work_in_progress)%{$reset_color%}\
+${ZSH_THEME_GIT_PROMPT_PREFIX}${branch}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 # RVM component of prompt
@@ -18,6 +20,5 @@ ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}["
 ZSH_THEME_RUBY_PROMPT_SUFFIX="]%{$reset_color%}"
 
 # Combine it all into a final right-side prompt
-RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1'
-
+RPS1="\$(git_custom_status)\$(ruby_prompt_info)${RPS1:+ $RPS1}"
 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
diff --git a/themes/gentoo.zsh-theme b/themes/gentoo.zsh-theme
index 5f2427c7a..b1aef21df 100644
--- a/themes/gentoo.zsh-theme
+++ b/themes/gentoo.zsh-theme
@@ -1,8 +1,30 @@
-function prompt_char {
-	if [ $UID -eq 0 ]; then echo "#"; else echo $; fi
+autoload -Uz colors && colors
+
+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{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: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
+
++vi-untracked-git() {
+  if command git status --porcelain 2>/dev/null | command grep -q '??'; then
+    hook_com[misc]='%F{red}?'
+  else
+    hook_com[misc]=''
+  fi
 }
 
-PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(git_prompt_info)$(prompt_char)%{$reset_color%} '
+gentoo_precmd() {
+  vcs_info
+}
 
-ZSH_THEME_GIT_PROMPT_PREFIX="("
-ZSH_THEME_GIT_PROMPT_SUFFIX=") "
+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_}%F{blue}%(!.#.$)%k%b%f '
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%} "
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/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 2f0e77431..e8c490884 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 TERMWIDTH=$(( COLUMNS - ${ZLE_RPROMPT_INDENT:-1} ))
 
+  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 ))
+  elif [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
+    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize) ))::${PR_HBAR}:)}"
+  else
+    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
+  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
+  typeset -g PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
+  typeset -g 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]%} %{%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
+  PR_SET_CHARSET=""
+  PR_HBAR="─"
+  PR_ULCORNER="┌"
+  PR_LLCORNER="└"
+  PR_LRCORNER="┘"
+  PR_URCORNER="┐"
+else
+  typeset -g -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/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/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/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/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index 7ff6a7ffe..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 `hostname`; 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=''
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 '
diff --git a/themes/mlh.zsh-theme b/themes/mlh.zsh-theme
index a21a546bc..baff3fb63 100644
--- a/themes/mlh.zsh-theme
+++ b/themes/mlh.zsh-theme
@@ -1,23 +1,53 @@
-# The Official Theme of 
-##     ## ##       ##     ## 
-###   ### ##       ##     ## 
-#### #### ##       ##     ## 
-## ### ## ##       ######### 
-##     ## ##       ##     ## 
-##     ## ##       ##     ## 
-##     ## ######## ##     ## 
+# The Official Theme of Major League Hacking
+
+##     ## ##       ##     ##
+###   ### ##       ##     ##
+#### #### ##       ##     ##
+## ### ## ##       #########
+##     ## ##       ##     ##
+##     ## ##       ##     ##
+##     ## ######## ##     ##
 
 # # # # # # # # # # # # # # # # # #
 # # # 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
 
-AT_SYMBOL=" @ "
-IN_SYMBOL=" in "
-ON_SYMBOL=" on "
-SYMBOL="$"
+# right prompt default settings
+if [ -z "$MLH_PRINT_EXIT_CODE" ]; then
+  MLH_PRINT_EXIT_CODE=true
+fi
 
+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}"
 DEVICE_COLOR="%F{033}"
 DIR_COLOR="%F{220}"
@@ -25,35 +55,43 @@ 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 [ "$MLH_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 [ "$MLH_PRINT_EXIT_CODE" = true ]; then
+    echo "%(?..%F{001}exit %?)%f"
+  fi
 }
 
-# Set the git_prompt_info text
-ZSH_THEME_GIT_PROMPT_PREFIX="${ON_SYMBOL}${BRANCH_COLOR}"
+prompt_end() {
+  printf "\n$MLH_SHELL_SYMBOL"
+}
+
+# Set git_prompt_info text
+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 $SYMBOL '
-RPROMPT="$(return_status) $(current_time)"
+PROMPT='%b$(username)$MLH_AT_SYMBOL$(device)$MLH_IN_SYMBOL$(directory)$(git_prompt_info)%b$(prompt_end)'
+RPROMPT="$(exit_code)$(current_time)"
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/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.
 # ------------------------------------------------------------------------------
diff --git a/themes/obraun.zsh-theme b/themes/obraun.zsh-theme
index 7af44056f..c64362b04 100644
--- a/themes/obraun.zsh-theme
+++ b/themes/obraun.zsh-theme
@@ -1,11 +1,10 @@
-if [ "$USER" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
+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%}"
-
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/random.zsh-theme b/themes/random.zsh-theme
index f0b8e5c18..28af84e23 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
diff --git a/themes/re5et.zsh-theme b/themes/re5et.zsh-theme
index 95af1e2ee..bdf342f49 100644
--- a/themes/re5et.zsh-theme
+++ b/themes/re5et.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$USER" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="magenta"; fi
+if [ "$USERNAME" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="magenta"; fi
 
 local return_code="%(?..%{$fg_bold[red]%}:( %?%{$reset_color%})"
 
diff --git a/themes/refined.zsh-theme b/themes/refined.zsh-theme
index 2a4188c9d..5e2de7a87 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
@@ -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.
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 '
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index ef91c5ee3..287781d9e 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -1,130 +1,95 @@
-# 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 {
+function theme_precmd {
+  PR_FILLBAR=""
+  PR_PWDLEN=""
 
-    local TERMWIDTH
-    (( TERMWIDTH = ${COLUMNS} - 1 ))
+  local promptsize=${#${(%):--(%n@%M:)--(%l)-}}
+  local pwdsize=${#${(%):-%~}}
+  local gitbranchsize="${#${(%)$(git_prompt_info)}:-}"
+  local rvmpromptsize="${#${(%)$(ruby_prompt_info):-}}"
 
-
-    ###
-    # Truncate the path if it's too long.
-
-    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:-''}}
-
-    if [[ "$promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize" -gt $TERMWIDTH ]]; then
-        ((PR_PWDLEN=$TERMWIDTH - $promptsize))
-    else
-        PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize)))..${PR_SPACE}.)}"
-    fi
+  # Truncate the path if it's too long.
+  if (( promptsize + pwdsize + rvmpromptsize + gitbranchsize > COLUMNS )); then
+    (( PR_PWDLEN = COLUMNS - promptsize ))
+  else
+    PR_FILLBAR="\${(l.$(( COLUMNS - (promptsize + pwdsize + rvmpromptsize + gitbranchsize) ))..${PR_SPACE}.)}"
+  fi
 }
 
+function theme_preexec {
+  setopt local_options extended_glob
+  if [[ "$TERM" == "screen" ]]; then
+    local CMD=${1[(wr)^(*=*|sudo|-*)]}
+    echo -n "\ek$CMD\e\\"
+  fi
 
-setopt extended_glob
+  if [[ "$TERM" == "xterm" ]]; then
+    print -Pn "\e]0;$1\a"
+  fi
 
-preexec () {
-    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" == "rxvt" ]]; then
-        print -Pn "\e]0;$1\a"
-    fi
+  if [[ "$TERM" == "rxvt" ]]; then
+    print -Pn "\e]0;$1\a"
+  fi
 
 }
 
-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
+  typeset -g PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
+  typeset -g 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.
+# Modify RVM prompt
+ZSH_THEME_RUBY_PROMPT_PREFIX=" ["
+ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
 
-    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="]"
-
-
-###
 # Decide if we need to set titlebar text.
+case $TERM in
+  xterm*|*rxvt*)
+    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\\%}'
+    ;;
+  *)
+    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}\
+$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\
 
@@ -132,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
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]%}✔"
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/sunrise.zsh-theme b/themes/sunrise.zsh-theme
index 2111576c3..11f6af127 100644
--- a/themes/sunrise.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -9,7 +9,7 @@ Y=$fg_no_bold[yellow]
 B=$fg_no_bold[blue]
 RESET=$reset_color
 
-if [ "$USER" = "root" ]; then
+if [ "$USERNAME" = "root" ]; then
     PROMPTCOLOR="%{$R%}" PROMPTPREFIX="-!-";
 else
     PROMPTCOLOR="" PROMPTPREFIX="---";
diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index 4e3238393..260c9e701 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)
 
@@ -100,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
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/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 89d5355dc..4c3c56ffc 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -6,7 +6,7 @@
 # Mar 2013 Yad Smood
 
 # VCS
-YS_VCS_PROMPT_PREFIX1=" %{$fg[white]%}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"
@@ -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() {
@@ -26,15 +33,26 @@ ys_hg_prompt_info() {
 	if [ -d '.hg' ]; then
 		echo -n "${YS_VCS_PROMPT_PREFIX1}hg${YS_VCS_PROMPT_PREFIX2}"
 		echo -n $(hg branch 2>/dev/null)
-		if [ -n "$(hg status 2>/dev/null)" ]; then
-			echo -n "$YS_VCS_PROMPT_DIRTY"
-		else
-			echo -n "$YS_VCS_PROMPT_CLEAN"
+		if [[ "$(hg config oh-my-zsh.hide-dirty 2>/dev/null)" != "1" ]]; then
+			if [ -n "$(hg status 2>/dev/null)" ]; then
+				echo -n "$YS_VCS_PROMPT_DIRTY"
+			else
+				echo -n "$YS_VCS_PROMPT_CLEAN"
+			fi
 		fi
 		echo -n "$YS_VCS_PROMPT_SUFFIX"
 	fi
 }
 
+# Virtualenv
+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
+	echo "${YS_THEME_VIRTUALENV_PROMPT_PREFIX}${VIRTUAL_ENV:t}${YS_THEME_VIRTUALENV_PROMPT_SUFFIX}"
+}
+
 local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%})"
 
 # Prompt format:
@@ -49,12 +67,14 @@ 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]%}@ \
+%{$reset_color%}@ \
 %{$fg[green]%}%m \
-%{$fg[white]%}in \
+%{$reset_color%}in \
 %{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\
 ${hg_info}\
 ${git_info}\
+${svn_info}\
+${venv_info}\
  \
-%{$fg[white]%}[%*] $exit_code
+[%*] $exit_code
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
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
diff --git a/tools/changelog.sh b/tools/changelog.sh
new file mode 100755
index 000000000..6489a3cb2
--- /dev/null
+++ b/tools/changelog.sh
@@ -0,0 +1,476 @@
+#!/usr/bin/env zsh
+
+cd "$ZSH"
+setopt extendedglob
+
+##############################
+# CHANGELOG SCRIPT CONSTANTS #
+##############################
+
+#* Holds the list of valid types recognized in a commit subject
+#* and the display string of such type
+local -A TYPES
+TYPES=(
+  build     "Build system"
+  chore     "Chore"
+  ci        "CI"
+  docs      "Documentation"
+  feat      "Features"
+  fix       "Bug fixes"
+  perf      "Performance"
+  refactor  "Refactor"
+  style     "Style"
+  test      "Testing"
+)
+
+#* Types that will be displayed in their own section, in the order specified here.
+local -a MAIN_TYPES
+MAIN_TYPES=(feat fix perf docs)
+
+#* Types that will be displayed under the category of other changes
+local -a OTHER_TYPES
+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 #
+############################
+
+function parse-commit {
+
+  # This function uses the following globals as output: commits (A),
+  # subjects (A), scopes (A) and breaking (A). All associative arrays (A)
+  # have $hash as the key.
+  # - commits holds the commit type
+  # - subjects holds the commit subject
+  # - scopes holds the scope of a commit
+  # - breaking holds the breaking change warning if a commit does
+  #   make a breaking change
+
+  function commit:type {
+    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 "$type" && -n "${(k)TYPES[(i)$type]}" ]]; then
+      echo $type
+    else
+      echo other
+    fi
+  }
+
+  function commit:scope {
+    local scope
+
+    # Try to find scope in "type(<scope>):" format
+    if [[ "$1" =~ '^[a-zA-Z_\-]+\((.+)\)!?: .+$' ]]; then
+      echo "${match[1]}"
+      return
+    fi
+
+    # If no scope found, try to find it in "<scope>:" format
+    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
+  }
+
+  function commit:subject {
+    # 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.
+    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
+  function commit:is-breaking {
+    local subject="$1" body="$2" message
+
+    if [[ "$body" =~ "BREAKING CHANGE: (.*)" || \
+      "$subject" =~ '^[^ :\)]+\)?!: (.*)$' ]]; then
+      message="${match[1]}"
+      # remove CR characters (might be inserted in GitHub UI commit description form)
+      message="${message//$'\r'/}"
+      # skip next paragraphs (separated by two newlines or more)
+      message="${message%%$'\n\n'*}"
+      # ... and replace newlines with spaces
+      echo "${message//$'\n'/ }"
+    else
+      return 1
+    fi
+  }
+
+  # Return truncated hash of the reverted commit
+  function commit:is-revert {
+    local subject="$1" body="$2"
+
+    if [[ "$subject" = Revert* && \
+      "$body" =~ "This reverts commit ([^.]+)\." ]]; then
+      echo "${match[1]:0:7}"
+    else
+      return 1
+    fi
+  }
+
+  # Parse commit with hash $1
+  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:
+  #
+  #  type[(scope)][!]: subject
+  #
+  #  commit body
+  #  [BREAKING CHANGE: warning]
+
+  # commits holds the commit type
+  types[$hash]="$(commit:type "$subject")"
+  # scopes holds the commit scope
+  scopes[$hash]="$(commit:scope "$subject")"
+  # subjects holds the commit subject
+  subjects[$hash]="$(commit:subject "$subject")"
+
+  # breaking holds whether a commit has breaking changes
+  # and its warning message if it does
+  if warning=$(commit:is-breaking "$subject" "$body"); then
+    breaking[$hash]="$warning"
+  fi
+
+  # reverts holds commits reverted in the same release
+  if rhash=$(commit:is-revert "$subject" "$body"); then
+    reverts[$hash]=$rhash
+  fi
+}
+
+#############################
+# RELEASE CHANGELOG DISPLAY #
+#############################
+
+function display-release {
+
+  # This function uses the following globals: output, version,
+  # 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
+  # - 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 (( ${+types[$rhash]} )); then
+      # Remove revert commit
+      unset "types[$hash]" "subjects[$hash]" "scopes[$hash]" "breaking[$hash]"
+      # Remove reverted commit
+      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 (( $#types == 0 )); then
+    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
+  # If no parameter is passed, assume it comes from `$hash`
+  function fmt:hash {
+    #* Uses $hash from outer scope
+    local hash="${1:-$hash}"
+    case "$output" in
+    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
+  }
+
+  # Format headers according to output format
+  # Levels 1 to 2 are considered special, the rest are formatted
+  # the same, except in md output format.
+  function fmt:header {
+    local header="$1" level="$2"
+    case "$output" in
+    raw)
+      case "$level" in
+      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%s\e[0m\n\n' "$header" ;; # bold, underlined
+      *) printf '\e[1m%s:\e[0m\n\n' "$header" ;; # bold
+      esac ;;
+    md) printf '%s %s\n\n' "$(printf '%.0s#' {1..${level}})" "$header" ;;
+    esac
+  }
+
+  function fmt:scope {
+    #* Uses $scopes (A) and $hash from outer scope
+    local scope="${1:-${scopes[$hash]}}"
+
+    # 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:: :):-}"
+
+    # If no scope, print padding and 3 spaces (equivalent to "[] ")
+    if [[ -z "$scope" ]]; then
+      printf "${padding}   "
+      return
+    fi
+
+    # Print [scope]
+    case "$output" in
+    raw|md) printf '[%s]%s ' "$scope" "$padding";;
+    text) printf '[\e[38;5;9m%s\e[0m]%s ' "$scope" "$padding";; # red 9
+    esac
+  }
+
+  # If no parameter is passed, assume it comes from `$subjects[$hash]`
+  function fmt:subject {
+    #* Uses $subjects (A) and $hash from outer scope
+    local subject="${1:-${subjects[$hash]}}"
+
+    # Capitalize first letter of the subject
+    subject="${(U)subject:0:1}${subject:1}"
+
+    case "$output" in
+    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
+    md) sed -E 's|#([0-9]+)|[#\1](https://github.com/ohmyzsh/ohmyzsh/issues/\1)|g' <<< "$subject" ;;
+    esac
+  }
+
+  function fmt:type {
+    #* Uses $type from outer scope
+    local type="${1:-${TYPES[$type]:-${(C)type}}}"
+    [[ -z "$type" ]] && return 0
+    case "$output" in
+    raw|md) printf '%s: ' "$type" ;;
+    text) printf '\e[4m%s\e[24m: ' "$type" ;; # underlined
+    esac
+  }
+
+  ##* Section functions
+
+  function display:version {
+    fmt:header "$version" 2
+  }
+
+  function display:breaking {
+    (( $#breaking != 0 )) || return 0
+
+    case "$output" in
+    text) printf '\e[31m'; fmt:header "BREAKING CHANGES" 3 ;;
+    raw) fmt:header "BREAKING CHANGES" 3 ;;
+    md) fmt:header "BREAKING CHANGES ⚠" 3 ;;
+    esac
+
+    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)
+      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
+  }
+
+  function display:type {
+    local hash type="$1"
+
+    local -a hashes
+    hashes=(${(k)types[(R)$type]})
+
+    # If no commits found of type $type, go to next type
+    (( $#hashes != 0 )) || return 0
+
+    fmt:header "${TYPES[$type]}" 3
+    for hash in $hashes; do
+      echo " - $(fmt:hash) $(fmt:scope)$(fmt:subject)"
+    done | sort -k3 # sort by scope
+    echo
+  }
+
+  function display:others {
+    local hash type
+
+    # Commits made under types considered other changes
+    local -A changes
+    changes=(${(kv)types[(R)${(j:|:)OTHER_TYPES}]})
+
+    # If no commits found under "other" types, don't display anything
+    (( $#changes != 0 )) || return 0
+
+    fmt:header "Other changes" 3
+    for hash type in ${(kv)changes}; do
+      case "$type" in
+      other) echo " - $(fmt:hash) $(fmt:scope)$(fmt:subject)" ;;
+      *) echo " - $(fmt:hash) $(fmt:scope)$(fmt:type)$(fmt:subject)" ;;
+      esac
+    done | sort -k3 # sort by scope
+    echo
+  }
+
+  ##* Release sections order
+
+  # Display version header
+  display:version
+
+  # Display breaking changes first
+  display:breaking
+
+  # Display changes for commit types in the order specified
+  for type in $MAIN_TYPES; do
+    display:type "$type"
+  done
+
+  # Display other changes
+  display:others
+}
+
+function main {
+  # $1 = until commit, $2 = since commit
+  local until="$1" since="$2"
+
+  # $3 = output format (--text|--raw|--md)
+  # --md:   uses markdown formatting
+  # --raw:  outputs without style
+  # --text: uses ANSI escape codes to style the output
+  local output=${${3:-"--text"}#--*}
+
+  if [[ -z "$until" ]]; then
+    until=HEAD
+  fi
+
+  if [[ -z "$since" ]]; then
+    # If $since is not specified:
+    # 1) try to find the version used before updating
+    # 2) try to find the first version tag before $until
+    since=$(command git config --get oh-my-zsh.lastVersion 2>/dev/null) || \
+    since=$(command git describe --abbrev=0 --tags "$until^" 2>/dev/null) || \
+    unset since
+  elif [[ "$since" = --all ]]; then
+    unset since
+  fi
+
+  # Commit classification arrays
+  local -A types subjects scopes breaking reverts
+  local truncate=0 read_commits=0
+  local version tag
+  local hash refs subject body
+
+  # Get the first version name:
+  # 1) try tag-like version, 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 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
+  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
+  # --first-parent: commits from merged branches are omitted
+  local SEP="0mZmAgIcSeP"
+  local -a raw_commits
+  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)"})
+
+  local raw_commit
+  local -a raw_fields
+  for raw_commit in $raw_commits; do
+    # Truncate list on versions with a lot of commits
+    if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
+      truncate=1
+      break
+    fi
+
+    # Read the commit fields (@ is needed to keep empty values)
+    eval "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 [[ "$refs" = *tag:\ * ]]; then
+      # Parse tag name (needs: setopt extendedglob)
+      tag="${${refs##*tag: }%%,# *}"
+      # Output previous release
+      display-release
+      # Reinitialize commit storage
+      types=()
+      subjects=()
+      scopes=()
+      breaking=()
+      reverts=()
+      # Start work on next release
+      version="$tag"
+      read_commits=1
+    fi
+
+    parse-commit "$hash" "$subject" "$body"
+  done
+
+  display-release
+
+  if (( truncate )); then
+    echo " ...more commits omitted"
+    echo
+  fi
+}
+
+# Use raw output if stdout is not a tty
+if [[ ! -t 1 && -z "$3" ]]; then
+  main "$1" "$2" --raw
+else
+  main "$@"
+fi
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index cadd5fe49..cc527e72d 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -1,88 +1,209 @@
 # Migrate .zsh-update file to $ZSH_CACHE_DIR
 if [[ -f ~/.zsh-update && ! -f "${ZSH_CACHE_DIR}/.zsh-update" ]]; then
-    mv ~/.zsh-update "${ZSH_CACHE_DIR}/.zsh-update"
+  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
+
+  # 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.
 # - 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
-    return
+  unset update_mode
+  return
 fi
 
-
 function current_epoch() {
-    zmodload zsh/datetime
-    echo $(( EPOCHSECONDS / 60 / 60 / 24 ))
+  zmodload zsh/datetime
+  echo $(( EPOCHSECONDS / 60 / 60 / 24 ))
+}
+
+function is_update_available() {
+  local branch
+  branch=${"$(builtin cd -q "$ZSH"; git config --local oh-my-zsh.branch)":-master}
+
+  local remote remote_url remote_repo
+  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
+  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 HEAD. If this fails assume there are updates
+  local local_head
+  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)
+  local remote_head
+  remote_head=$(
+    if (( ${+commands[curl]} )); then
+      curl --connect-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
+      HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -T 2 -o - $api_url 2>/dev/null
+    else
+      exit 0
+    fi
+  ) || return 1
+
+  # 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=$(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
+  [[ $base != $remote_head ]]
 }
 
 function update_last_updated_file() {
-    echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update"
+  echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update"
 }
 
 function update_ohmyzsh() {
-    ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
+  if ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive; then
     update_last_updated_file
+  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
+
+  # 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
+  {
+    # 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
+  }
 }
 
 () {
-    emulate -L zsh
+  emulate -L zsh
 
-    local epoch_target mtime option LAST_EPOCH
+  local epoch_target mtime option LAST_EPOCH
 
-    # Remove lock directory if older than a day
-    zmodload zsh/datetime
-    zmodload -F zsh/stat b:zstat
-    if mtime=$(zstat +mtime "$ZSH/log/update.lock" 2>/dev/null); then
-        if (( (mtime + 3600 * 24) < EPOCHSECONDS )); then
-            command rm -rf "$ZSH/log/update.lock"
-        fi
+  # Remove lock directory if older than a day
+  zmodload zsh/datetime
+  zmodload -F zsh/stat b:zstat
+  if mtime=$(zstat +mtime "$ZSH/log/update.lock" 2>/dev/null); then
+    if (( (mtime + 3600 * 24) < EPOCHSECONDS )); then
+      command rm -rf "$ZSH/log/update.lock"
     fi
+  fi
 
-    # Check for lock directory
-    if ! command mkdir "$ZSH/log/update.lock" 2>/dev/null; then
-        return
-    fi
+  # Check for lock directory
+  if ! command mkdir "$ZSH/log/update.lock" 2>/dev/null; then
+    return
+  fi
 
-    # Remove lock directory on exit. `return 1` 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.
-    trap "command rm -rf '$ZSH/log/update.lock'; return 1" EXIT INT QUIT
+  # 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 "
+    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
 
-    # Create or update .zsh-update file if missing or malformed
-    if ! source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || [[ -z "$LAST_EPOCH" ]]; then
-        update_last_updated_file
-        return
-    fi
+  # Create or update .zsh-update file if missing or malformed
+  if ! source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || [[ -z "$LAST_EPOCH" ]]; then
+    update_last_updated_file
+    return
+  fi
 
-    # Number of days before trying to update again
-    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
+  # Number of days before trying to update again
+  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
-        update_ohmyzsh
-    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
+  # Test if Oh My Zsh directory is a git repository
+  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
 
-        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 ;;
-        esac
-    fi
+  # Check if there are updates available before proceeding
+  if ! is_update_available; then
+    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
+
+  # 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 -f current_epoch update_last_updated_file update_ohmyzsh
+unset update_mode
+unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh
diff --git a/tools/install.sh b/tools/install.sh
index 61b21cb9e..a6538f9d7 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -37,8 +37,24 @@
 #
 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)}
+# $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 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
+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}
@@ -50,250 +66,458 @@ KEEP_ZSHRC=${KEEP_ZSHRC:-no}
 
 
 command_exists() {
-	command -v "$@" >/dev/null 2>&1
+  command -v "$@" >/dev/null 2>&1
 }
 
-error() {
-	echo ${RED}"Error: $@"${RESET} >&2
+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:
+  #    • 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 `-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.
+  #
+  ! LANG= sudo -n -v 2>&1 | grep -q "may not run sudo"
 }
 
-underline() {
-	echo "$(printf '\033[4m')$@$(printf '\033[24m')"
+# 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 also supports hyperlinks
+  if [ -n "$WT_SESSION" ]; then
+    return 0
+  fi
+
+  # Konsole supports hyperlinks, but it's an opt-in setting that can't be detected
+  # https://github.com/ohmyzsh/ohmyzsh/issues/10964
+  # if [ -n "$KONSOLE_VERSION" ]; then
+  #   return 0
+  # fi
+
+  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
+    printf '\033]8;;%s\033\\%s\033]8;;\033\\\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' "${FMT_BOLD}${FMT_RED}" "$*" "$FMT_RESET" >&2
 }
 
 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 ! is_tty; then
+    FMT_RAINBOW=""
+    FMT_RED=""
+    FMT_GREEN=""
+    FMT_YELLOW=""
+    FMT_BLUE=""
+    FMT_BOLD=""
+    FMT_RESET=""
+    return
+  fi
+
+  if supports_truecolor; then
+    FMT_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
+    FMT_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
+
+  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() {
-	# Prevent the cloned repository from having insecure permissions. Failing to do
-	# so causes compinit() calls to fail with "command not found: compdef" errors
-	# for users with insecure umasks (e.g., "002", allowing group writability). Note
-	# that this will be ignored under Cygwin by default, as Windows ACLs take
-	# precedence over umasks except for filesystems mounted with option "noacl".
-	umask g-w,o-w
+  # Prevent the cloned repository from having insecure permissions. Failing to do
+  # so causes compinit() calls to fail with "command not found: compdef" errors
+  # for users with insecure umasks (e.g., "002", allowing group writability). Note
+  # that this will be ignored under Cygwin by default, as Windows ACLs take
+  # 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 || {
-		error "git is not installed"
-		exit 1
-	}
+  command_exists git || {
+    fmt_error "git is not installed"
+    exit 1
+  }
 
-	if [ "$OSTYPE" = cygwin ] && git --version | grep -q msysgit; then
-		error "Windows/MSYS Git is not supported on Cygwin"
-		error "Make sure the Cygwin git package is installed and is first on the \$PATH"
-		exit 1
-	fi
+  ostype=$(uname)
+  if [ -z "${ostype%CYGWIN*}" ] && git --version | grep -Eq 'msysgit|windows'; then
+    fmt_error "Windows/MSYS Git is not supported on Cygwin"
+    fmt_error "Make sure the Cygwin git package is installed and is first on the \$PATH"
+    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 \
-		--depth=1 --branch "$BRANCH" "$REMOTE" "$ZSH" || {
-		error "git clone of oh-my-zsh repo failed"
-		exit 1
-	}
+  # Manual clone with git config options to support git < v1.7.2
+  git init --quiet "$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" || {
+    [ ! -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
+  echo
 }
 
 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}"
+  # 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 "${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}"
-			return
-		fi
-		if [ -e "$OLD_ZSHRC" ]; then
-			OLD_OLD_ZSHRC="${OLD_ZSHRC}-$(date +%Y-%m-%d_%H-%M-%S)"
-			if [ -e "$OLD_OLD_ZSHRC" ]; then
-				error "$OLD_OLD_ZSHRC exists. Can't back up ${OLD_ZSHRC}"
-				error "re-run the installer again in a couple of seconds"
-				exit 1
-			fi
-			mv "$OLD_ZSHRC" "${OLD_OLD_ZSHRC}"
+  # 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 "${FMT_YELLOW}Found ~/.zshrc.${FMT_RESET} ${FMT_GREEN}Keeping...${FMT_RESET}"
+      return
+    fi
+    if [ -e "$OLD_ZSHRC" ]; then
+      OLD_OLD_ZSHRC="${OLD_ZSHRC}-$(date +%Y-%m-%d_%H-%M-%S)"
+      if [ -e "$OLD_OLD_ZSHRC" ]; then
+        fmt_error "$OLD_OLD_ZSHRC exists. Can't back up ${OLD_ZSHRC}"
+        fmt_error "re-run the installer again in a couple of seconds"
+        exit 1
+      fi
+      mv "$OLD_ZSHRC" "${OLD_OLD_ZSHRC}"
 
-			echo "${YELLOW}Found old ~/.zshrc.pre-oh-my-zsh." \
-				"${GREEN}Backing up to ${OLD_OLD_ZSHRC}${RESET}"
-		fi
-		echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Backing up to ${OLD_ZSHRC}${RESET}"
-		mv ~/.zshrc "$OLD_ZSHRC"
-	fi
+      echo "${FMT_YELLOW}Found old ~/.zshrc.pre-oh-my-zsh." \
+        "${FMT_GREEN}Backing up to ${OLD_OLD_ZSHRC}${FMT_RESET}"
+    fi
+    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}"
 
-	sed "/^export ZSH=/ c\\
-export ZSH=\"$ZSH\"
-" "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
-	mv -f ~/.zshrc-omztemp ~/.zshrc
+  # 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
+  echo
 }
 
 setup_shell() {
-	# Skip setup if the user wants or stdin is closed (not running interactively).
-	if [ $CHSH = no ]; then
-		return
-	fi
+  # Skip setup if the user wants or stdin is closed (not running interactively).
+  if [ "$CHSH" = no ]; then
+    return
+  fi
 
-	# If this user's login shell is already "zsh", do not attempt to switch.
-	if [ "$(basename "$SHELL")" = "zsh" ]; then
-		return
-	fi
+  # If this user's login shell is already "zsh", do not attempt to switch.
+  if [ "$(basename -- "$SHELL")" = "zsh" ]; then
+    return
+  fi
 
-	# If this platform doesn't provide a "chsh" command, bail out.
-	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}
-		EOF
-		return
-	fi
+  # If this platform doesn't provide a "chsh" command, bail out.
+  if ! command_exists chsh; then
+    cat <<EOF
+I can't change your shell automatically because this system does not have chsh.
+${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 "${YELLOW}Do you want to change your default shell to zsh? [Y/n]${RESET} "
-	read opt
-	case $opt in
-		y*|Y*|"") echo "Changing the shell..." ;;
-		n*|N*) echo "Shell change skipped."; return ;;
-		*) echo "Invalid choice. Shell change skipped."; return ;;
-	esac
+  # Prompt for user choice on changing the default login shell
+  printf '%sDo you want to change your default shell to zsh? [Y/n]%s ' \
+    "$FMT_YELLOW" "$FMT_RESET"
+  read -r opt
+  case $opt in
+    y*|Y*|"") ;;
+    n*|N*) echo "Shell change skipped."; return ;;
+    *) echo "Invalid choice. Shell change skipped."; return ;;
+  esac
 
-	# Check if we're running on Termux
-	case "$PREFIX" in
-		*com.termux*) termux=true; zsh=zsh ;;
-		*) termux=false ;;
-	esac
+  # Check if we're running on Termux
+  case "$PREFIX" in
+    *com.termux*) termux=true; zsh=zsh ;;
+    *) termux=false ;;
+  esac
 
-	if [ "$termux" != true ]; then
-		# Test for the right location of the "shells" file
-		if [ -f /etc/shells ]; then
-			shells_file=/etc/shells
-		elif [ -f /usr/share/defaults/etc/shells ]; then # Solus OS
-			shells_file=/usr/share/defaults/etc/shells
-		else
-			error "could not find /etc/shells file. Change your default shell manually."
-			return
-		fi
+  if [ "$termux" != true ]; then
+    # Test for the right location of the "shells" file
+    if [ -f /etc/shells ]; then
+      shells_file=/etc/shells
+    elif [ -f /usr/share/defaults/etc/shells ]; then # Solus OS
+      shells_file=/usr/share/defaults/etc/shells
+    else
+      fmt_error "could not find /etc/shells file. Change your default shell manually."
+      return
+    fi
 
-		# Get the path to the right zsh binary
-		# 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=$(which zsh) || ! grep -qx "$zsh" "$shells_file"; then
-			if ! zsh=$(grep '^/.*/zsh$' "$shells_file" | tail -1) || [ ! -f "$zsh" ]; then
-				error "no zsh binary found or not present in '$shells_file'"
-				error "change your default shell manually."
-				return
-			fi
-		fi
-	fi
+    # Get the path to the right zsh binary
+    # 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 -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
+      fi
+    fi
+  fi
 
-	# We're going to change the default shell, so back up the current one
-	if [ -n "$SHELL" ]; then
-		echo $SHELL > ~/.shell.pre-oh-my-zsh
-	else
-		grep "^$USER:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
-	fi
+  # We're going to change the default shell, so back up the current one
+  if [ -n "$SHELL" ]; then
+    echo "$SHELL" > ~/.shell.pre-oh-my-zsh
+  else
+    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
-		error "chsh command unsuccessful. Change your default shell manually."
-	else
-		export SHELL="$zsh"
-		echo "${GREEN}Shell successfully changed to '$zsh'.${RESET}"
-	fi
+  echo "Changing your shell to $zsh..."
 
-	echo
+  # 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
+    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
+  if [ $? -ne 0 ]; then
+    fmt_error "chsh command unsuccessful. Change your default shell manually."
+  else
+    export SHELL="$zsh"
+    echo "${FMT_GREEN}Shell successfully changed to '$zsh'.${FMT_RESET}"
+  fi
+
+  echo
+}
+
+# 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'      $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 ${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' $FMT_RESET
 }
 
 main() {
-	# Run as unattended if stdin is closed
-	if [ ! -t 0 ]; then
-		RUNZSH=no
-		CHSH=no
-	fi
+  # Run as unattended if stdin is not a tty
+  if [ ! -t 0 ]; then
+    RUNZSH=no
+    CHSH=no
+  fi
 
-	# Parse arguments
-	while [ $# -gt 0 ]; do
-		case $1 in
-			--unattended) RUNZSH=no; CHSH=no ;;
-			--skip-chsh) CHSH=no ;;
-			--keep-zshrc) KEEP_ZSHRC=yes ;;
-		esac
-		shift
-	done
+  # Parse arguments
+  while [ $# -gt 0 ]; do
+    case $1 in
+      --unattended) RUNZSH=no; CHSH=no ;;
+      --skip-chsh) CHSH=no ;;
+      --keep-zshrc) KEEP_ZSHRC=yes ;;
+    esac
+    shift
+  done
 
-	setup_color
+  setup_color
 
-	if ! command_exists zsh; then
-		echo "${YELLOW}Zsh is not installed.${RESET} Please install zsh first."
-		exit 1
-	fi
+  if ! command_exists zsh; then
+    echo "${FMT_YELLOW}Zsh is not installed.${FMT_RESET} Please install zsh first."
+    exit 1
+  fi
 
-	if [ -d "$ZSH" ]; then
-		cat <<-EOF
-			${YELLOW}You already have Oh My Zsh installed.${RESET}
-			You'll need to remove '$ZSH' if you want to reinstall.
-		EOF
-		exit 1
-	fi
+  if [ -d "$ZSH" ]; then
+    echo "${FMT_YELLOW}The \$ZSH folder already exists ($ZSH).${FMT_RESET}"
+    if [ "$custom_zsh" = yes ]; then
+      cat <<EOF
 
-	setup_ohmyzsh
-	setup_zshrc
-	setup_shell
+You ran the installer with the \$ZSH setting or the \$ZSH variable is
+exported. You have 3 options:
 
-	printf "$GREEN"
-	cat <<-'EOF'
-		         __                                     __
-		  ____  / /_     ____ ___  __  __   ____  _____/ /_
-		 / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \
-		/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / /
-		\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/
-		                        /____/                       ....is now installed!
+1. Unset the ZSH variable when calling the installer:
+   $(fmt_code "ZSH= sh install.sh")
+2. Install Oh My Zsh to a directory that doesn't exist yet:
+   $(fmt_code "ZSH=path/to/new/ohmyzsh/folder sh install.sh")
+3. (Caution) If the folder doesn't contain important information,
+   you can just remove it with $(fmt_code "rm -r $ZSH")
 
+EOF
+    else
+      echo "You'll need to remove it if you want to reinstall."
+    fi
+    exit 1
+  fi
 
-	EOF
-	cat <<-EOF
-		Before you scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
+  setup_ohmyzsh
+  setup_zshrc
+  setup_shell
 
-		• Follow us on Twitter: $(underline https://twitter.com/ohmyzsh)
-		• Join our Discord server: $(underline https://discord.gg/ohmyzsh)
-		• Get stickers, shirts, coffee mugs and other swag: $(underline https://shop.planetargon.com/collections/oh-my-zsh)
+  print_success
 
-	EOF
-	printf "$RESET"
+  if [ $RUNZSH = no ]; then
+    echo "${FMT_YELLOW}Run zsh to try it out.${FMT_RESET}"
+    exit
+  fi
 
-	if [ $RUNZSH = no ]; then
-		echo "${YELLOW}Run zsh to try it out.${RESET}"
-		exit
-	fi
-
-	exec zsh -l
+  exec zsh -l
 }
 
 main "$@"
diff --git a/tools/require_tool.sh b/tools/require_tool.sh
index 1fa77f77a..19c5f6fa9 100755
--- a/tools/require_tool.sh
+++ b/tools/require_tool.sh
@@ -107,7 +107,7 @@ usage() {
 NAME
     require_tool.sh - Ensure version of a tool is greater than the one expected
 
-SYNOPSYS
+SYNOPSIS
     require_tool.sh [ -h ]
                     [ --help ]
                     [ TOOL MIN_VERSION ]
diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh
index 82ae5857c..3883f1d37 100755
--- a/tools/theme_chooser.sh
+++ b/tools/theme_chooser.sh
@@ -25,6 +25,7 @@ function theme_preview() {
     print "$fg[blue]${(l.((${COLUMNS}-${#THEME_NAME}-5))..─.)}$reset_color $THEME_NAME $fg[blue]───$reset_color"
     source "$THEMES_DIR/$THEME"
     cols=$(tput cols)
+    (exit 1)
     print -P "$PROMPT                                                                                      $RPROMPT"
 }
 
diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index b327a0163..6a0e7b4c7 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -9,20 +9,20 @@ if [ -d ~/.oh-my-zsh ]; then
   rm -rf ~/.oh-my-zsh
 fi
 
+if [ -e ~/.zshrc ]; then
+  ZSHRC_SAVE=~/.zshrc.omz-uninstalled-$(date +%Y-%m-%d_%H-%M-%S)
+  echo "Found ~/.zshrc -- Renaming to ${ZSHRC_SAVE}"
+  mv ~/.zshrc "${ZSHRC_SAVE}"
+fi
+
 echo "Looking for original zsh config..."
 ZSHRC_ORIG=~/.zshrc.pre-oh-my-zsh
 if [ -e "$ZSHRC_ORIG" ]; then
   echo "Found $ZSHRC_ORIG -- Restoring to ~/.zshrc"
-
-  if [ -e ~/.zshrc ]; then
-    ZSHRC_SAVE=~/.zshrc.omz-uninstalled-$(date +%Y-%m-%d_%H-%M-%S)
-    echo "Found ~/.zshrc -- Renaming to ${ZSHRC_SAVE}"
-    mv ~/.zshrc "${ZSHRC_SAVE}"
-  fi
-
   mv "$ZSHRC_ORIG" ~/.zshrc
-
   echo "Your original zsh config was restored."
+else
+  echo "No original zsh config found"
 fi
 
 if hash chsh >/dev/null 2>&1 && [ -f ~/.shell.pre-oh-my-zsh ]; then
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
old mode 100644
new mode 100755
index e005519d6..596a59302
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,40 +1,181 @@
-# Use colors, but only if connected to a terminal, and that terminal
-# supports them.
+#!/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.
+
+# 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
-  RB_RED=$(printf '\033[38;5;196m')
-  RB_ORANGE=$(printf '\033[38;5;202m')
-  RB_YELLOW=$(printf '\033[38;5;226m')
-  RB_GREEN=$(printf '\033[38;5;082m')
-  RB_BLUE=$(printf '\033[38;5;021m')
-  RB_INDIGO=$(printf '\033[38;5;093m')
-  RB_VIOLET=$(printf '\033[38;5;163m')
+  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 also supports hyperlinks
+  if [ -n "$WT_SESSION" ]; then
+    return 0
+  fi
+
+  # Konsole supports hyperlinks, but it's an opt-in setting that can't be detected
+  # https://github.com/ohmyzsh/ohmyzsh/issues/10964
+  # if [ -n "$KONSOLE_VERSION" ]; then
+  #   return 0
+  # fi
+
+  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
+    printf '\033]8;;%s\033\\%s\033]8;;\033\\\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
+
+if is_tty; then
+  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')
   YELLOW=$(printf '\033[33m')
   BLUE=$(printf '\033[34m')
   BOLD=$(printf '\033[1m')
-  UNDER=$(printf '\033[4m')
-  RESET=$(printf '\033[m')
-else
-  RB_RED=""
-  RB_ORANGE=""
-  RB_YELLOW=""
-  RB_GREEN=""
-  RB_BLUE=""
-  RB_INDIGO=""
-  RB_VIOLET=""
-
-  RED=""
-  GREEN=""
-  YELLOW=""
-  BLUE=""
-  UNDER=""
-  BOLD=""
-  RESET=""
+  RESET=$(printf '\033[0m')
 fi
 
-cd "$ZSH"
+# Update upstream remote to ohmyzsh org
+git remote -v | while read remote url extra; do
+  case "$url" in
+  https://github.com/robbyrussell/oh-my-zsh(|.git))
+    git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git"
+    break ;;
+  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
 
 # Set git-config values known to fix git errors
 # Line endings (#4069)
@@ -45,33 +186,61 @@ git config fsck.zeroPaddedFilemode ignore
 git config fetch.fsck.zeroPaddedFilemode ignore
 git config receive.fsck.zeroPaddedFilemode ignore
 # autostash on rebase (#7172)
-resetAutoStash=$(git config --bool rebase.autoStash 2>&1)
+resetAutoStash=$(git config --bool rebase.autoStash 2>/dev/null)
 git config rebase.autoStash true
 
-# Update upstream remote to ohmyzsh org
-remote=$(git remote -v | awk '/https:\/\/github\.com\/robbyrussell\/oh-my-zsh\.git/{ print $1; exit }')
-if [ -n "$remote" ]; then
-  git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git"
-fi
+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"
-if git pull --rebase --stat origin master
-then
-  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf '%s / __ \%s/ __ \  %s / __ `__ \%s/ / / / %s /_  / %s/ ___/%s __ \ %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
-  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "To keep up on 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"
+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."
+  else
+    message="Hooray! Oh My Zsh has been updated!"
+
+    # Save the commit prior to updating
+    git config oh-my-zsh.lastVersion "$last_commit"
+
+    # Print changelog to the terminal
+    if [[ "$1" = --interactive ]]; then
+      "$ZSH/tools/changelog.sh" HEAD "$last_commit"
+    fi
+
+    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 '\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)"
+  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
-  status=$?
+  ret=$?
   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 ;;
@@ -79,4 +248,4 @@ case "$resetAutoStash" in
 esac
 
 # Exit with `1` if the update failed
-exit $status
+exit $ret