From a463959a365a5d618a79c96a26f6506e700d6ea3 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 1 Oct 2020 01:43:07 +0300
Subject: [PATCH 001/389] Initial work on highlighting changed settings. Some
 refactoring to simplify addition of new settings

---
 .../helpers/boolean_setting.vue               |  57 +++++++++
 .../helpers/shared_computed_object.js         |  23 +---
 .../settings_modal/tabs/filtering_tab.js      |   4 +-
 .../settings_modal/tabs/filtering_tab.vue     |  42 +++----
 .../settings_modal/tabs/general_tab.js        |   4 +-
 .../settings_modal/tabs/general_tab.vue       | 118 +++++++++---------
 src/modules/config.js                         |  24 ++--
 7 files changed, 161 insertions(+), 111 deletions(-)
 create mode 100644 src/components/settings_modal/helpers/boolean_setting.vue

diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
new file mode 100644
index 00000000..11b354ed
--- /dev/null
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -0,0 +1,57 @@
+<template>
+  <label
+    class="BooleanSetting"
+  >
+    <Checkbox
+      :checked="state"
+      @change="update"
+      :disabled="disabled"
+      >
+      <span
+        v-if="!!$slots.default"
+        class="label"
+        >
+        <slot />
+      </span>
+    </Checkbox>
+    <span v-if="isChanged">
+      <strong>CHANGED</strong>
+    </span>
+  </label>
+</template>
+
+<script>
+import { get, set } from 'lodash'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+export default {
+  props: [
+    'path',
+    'disabled'
+  ],
+  components: {
+    Checkbox
+  },
+  computed: {
+    pathDefault () {
+      const [firstSegment, ...rest] = this.path.split('.')
+      return [firstSegment + 'DefaultValue', ...rest].join('.')
+    },
+    state () {
+      return get(this.$parent, this.path)
+    },
+    isChanged () {
+      return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault)
+    }
+  },
+  methods: {
+    update (e) {
+      set(this.$parent, this.path, e)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.BooleanSetting {
+}
+</style>
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index 86703697..3cbcd288 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -1,29 +1,16 @@
-import {
-  instanceDefaultProperties,
-  multiChoiceProperties,
-  defaultState as configDefaultState
-} from 'src/modules/config.js'
+import { defaultState as configDefaultState } from 'src/modules/config.js'
 
 const SharedComputedObject = () => ({
   user () {
     return this.$store.state.users.currentUser
   },
-  // Getting localized values for instance-default properties
-  ...instanceDefaultProperties
-    .filter(key => multiChoiceProperties.includes(key))
+  // Getting values for default properties
+  ...Object.keys(configDefaultState)
     .map(key => [
       key + 'DefaultValue',
       function () {
-        return this.$store.getters.instanceDefaultConfig[key]
-      }
-    ])
-    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
-  ...instanceDefaultProperties
-    .filter(key => !multiChoiceProperties.includes(key))
-    .map(key => [
-      key + 'LocalizedValue',
-      function () {
-        return this.$t('settings.values.' + this.$store.getters.instanceDefaultConfig[key])
+        console.log(this.$store.getters.defaultConfig)
+        return this.$store.getters.defaultConfig[key]
       }
     ])
     .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 3b2df556..04273211 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -1,5 +1,5 @@
 import { filter, trim } from 'lodash'
-import Checkbox from 'src/components/checkbox/checkbox.vue'
+import BooleanSetting from '../helpers/boolean_setting.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
@@ -10,7 +10,7 @@ const FilteringTab = {
     }
   },
   components: {
-    Checkbox
+    BooleanSetting
   },
   computed: {
     ...SharedComputedObject(),
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index eea41514..6c42718b 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -5,34 +5,34 @@
         <span class="label">{{ $t('settings.notification_visibility') }}</span>
         <ul class="option-list">
           <li>
-            <Checkbox v-model="notificationVisibility.likes">
+            <BooleanSetting path="notificationVisibility.likes">
               {{ $t('settings.notification_visibility_likes') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox v-model="notificationVisibility.repeats">
+            <BooleanSetting path="notificationVisibility.repeats">
               {{ $t('settings.notification_visibility_repeats') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox v-model="notificationVisibility.follows">
+            <BooleanSetting path="notificationVisibility.follows">
               {{ $t('settings.notification_visibility_follows') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox v-model="notificationVisibility.mentions">
+            <BooleanSetting path="notificationVisibility.mentions">
               {{ $t('settings.notification_visibility_mentions') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox v-model="notificationVisibility.moves">
+            <BooleanSetting path="notificationVisibility.moves">
               {{ $t('settings.notification_visibility_moves') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox v-model="notificationVisibility.emojiReactions">
+            <BooleanSetting path="notificationVisibility.emojiReactions">
               {{ $t('settings.notification_visibility_emoji_reactions') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
         </ul>
       </div>
@@ -57,14 +57,14 @@
         </label>
       </div>
       <div>
-        <Checkbox v-model="hidePostStats">
-          {{ $t('settings.hide_post_stats') }} {{ $t('settings.instance_default', { value: hidePostStatsLocalizedValue }) }}
-        </Checkbox>
+        <BooleanSetting path="hidePostStats">
+          {{ $t('settings.hide_post_stats') }}
+        </BooleanSetting>
       </div>
       <div>
-        <Checkbox v-model="hideUserStats">
-          {{ $t('settings.hide_user_stats') }} {{ $t('settings.instance_default', { value: hideUserStatsLocalizedValue }) }}
-        </Checkbox>
+        <BooleanSetting path="hideUserStats">
+          {{ $t('settings.hide_user_stats') }}
+        </BooleanSetting>
       </div>
     </div>
     <div class="setting-item">
@@ -76,9 +76,9 @@
         />
       </div>
       <div>
-        <Checkbox v-model="hideFilteredStatuses">
-          {{ $t('settings.hide_filtered_statuses') }} {{ $t('settings.instance_default', { value: hideFilteredStatusesLocalizedValue }) }}
-        </Checkbox>
+        <BooleanSetting path="hideFilteredStatuses">
+          {{ $t('settings.hide_filtered_statuses') }}
+        </BooleanSetting>
       </div>
     </div>
   </div>
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 0eb37e44..679ef684 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -1,4 +1,4 @@
-import Checkbox from 'src/components/checkbox/checkbox.vue'
+import BooleanSetting from '../helpers/boolean_setting.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
@@ -16,7 +16,7 @@ const GeneralTab = {
     }
   },
   components: {
-    Checkbox,
+    BooleanSetting,
     InterfaceLanguageSwitcher
   },
   computed: {
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 7f06d0bd..e03e731b 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -7,9 +7,9 @@
           <interface-language-switcher />
         </li>
         <li v-if="instanceSpecificPanelPresent">
-          <Checkbox v-model="hideISP">
+          <BooleanSetting path="hideISP">
             {{ $t('settings.hide_isp') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -17,46 +17,46 @@
       <h2>{{ $t('nav.timeline') }}</h2>
       <ul class="setting-list">
         <li>
-          <Checkbox v-model="hideMutedPosts">
-            {{ $t('settings.hide_muted_posts') }} {{ $t('settings.instance_default', { value: hideMutedPostsLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="hideMutedPosts">
+            {{ $t('settings.hide_muted_posts') }}
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="collapseMessageWithSubject">
-            {{ $t('settings.collapse_subject') }} {{ $t('settings.instance_default', { value: collapseMessageWithSubjectLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="collapseMessageWithSubject">
+            {{ $t('settings.collapse_subject') }}
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="streaming">
+          <BooleanSetting path="streaming">
             {{ $t('settings.streaming') }}
-          </Checkbox>
+          </BooleanSetting>
           <ul
             class="setting-list suboptions"
             :class="[{disabled: !streaming}]"
           >
             <li>
-              <Checkbox
-                v-model="pauseOnUnfocused"
+              <BooleanSetting
+                path="pauseOnUnfocused"
                 :disabled="!streaming"
               >
                 {{ $t('settings.pause_on_unfocused') }}
-              </Checkbox>
+              </BooleanSetting>
             </li>
           </ul>
         </li>
         <li>
-          <Checkbox v-model="useStreamingApi">
+          <BooleanSetting path="useStreamingApi">
             {{ $t('settings.useStreamingApi') }}
             <br>
             <small>
               {{ $t('settings.useStreamingApiWarning') }}
             </small>
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="emojiReactionsOnTimeline">
+          <BooleanSetting path="emojiReactionsOnTimeline">
             {{ $t('settings.emoji_reactions_on_timeline') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -65,14 +65,14 @@
       <h2>{{ $t('settings.composing') }}</h2>
       <ul class="setting-list">
         <li>
-          <Checkbox v-model="scopeCopy">
-            {{ $t('settings.scope_copy') }} {{ $t('settings.instance_default', { value: scopeCopyLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="scopeCopy">
+            {{ $t('settings.scope_copy') }}
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="alwaysShowSubjectInput">
-            {{ $t('settings.subject_input_always_show') }} {{ $t('settings.instance_default', { value: alwaysShowSubjectInputLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="alwaysShowSubjectInput">
+            {{ $t('settings.subject_input_always_show') }}
+          </BooleanSetting>
         </li>
         <li>
           <div>
@@ -127,19 +127,19 @@
           </div>
         </li>
         <li>
-          <Checkbox v-model="minimalScopesMode">
-            {{ $t('settings.minimal_scopes_mode') }} {{ $t('settings.instance_default', { value: minimalScopesModeLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="minimalScopesMode">
+            {{ $t('settings.minimal_scopes_mode') }} {{ minimalScopesModeDefaultValue }}
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="autohideFloatingPostButton">
+          <BooleanSetting path="autohideFloatingPostButton">
             {{ $t('settings.autohide_floating_post_button') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="padEmoji">
+          <BooleanSetting path="padEmoji">
             {{ $t('settings.pad_emoji') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -148,14 +148,14 @@
       <h2>{{ $t('settings.attachments') }}</h2>
       <ul class="setting-list">
         <li>
-          <Checkbox v-model="hideAttachments">
+          <BooleanSetting path="hideAttachments">
             {{ $t('settings.hide_attachments_in_tl') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="hideAttachmentsInConv">
+          <BooleanSetting path="hideAttachmentsInConv">
             {{ $t('settings.hide_attachments_in_convo') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
           <label for="maxThumbnails">
@@ -163,7 +163,7 @@
           </label>
           <input
             id="maxThumbnails"
-            v-model.number="maxThumbnails"
+            path.number="maxThumbnails"
             class="number-input"
             type="number"
             min="0"
@@ -171,48 +171,48 @@
           >
         </li>
         <li>
-          <Checkbox v-model="hideNsfw">
+          <BooleanSetting path="hideNsfw">
             {{ $t('settings.nsfw_clickthrough') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <ul class="setting-list suboptions">
           <li>
-            <Checkbox
-              v-model="preloadImage"
+            <BooleanSetting
+              path="preloadImage"
               :disabled="!hideNsfw"
             >
               {{ $t('settings.preload_images') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox
-              v-model="useOneClickNsfw"
+            <BooleanSetting
+              path="useOneClickNsfw"
               :disabled="!hideNsfw"
             >
               {{ $t('settings.use_one_click_nsfw') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
         </ul>
         <li>
-          <Checkbox v-model="stopGifs">
+          <BooleanSetting path="stopGifs">
             {{ $t('settings.stop_gifs') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="loopVideo">
+          <BooleanSetting path="loopVideo">
             {{ $t('settings.loop_video') }}
-          </Checkbox>
+          </BooleanSetting>
           <ul
             class="setting-list suboptions"
             :class="[{disabled: !streaming}]"
           >
             <li>
-              <Checkbox
-                v-model="loopVideoSilentOnly"
+              <BooleanSetting
+                path="loopVideoSilentOnly"
                 :disabled="!loopVideo || !loopSilentAvailable"
               >
                 {{ $t('settings.loop_video_silent_only') }}
-              </Checkbox>
+              </BooleanSetting>
               <div
                 v-if="!loopSilentAvailable"
                 class="unavailable"
@@ -223,14 +223,14 @@
           </ul>
         </li>
         <li>
-          <Checkbox v-model="playVideosInModal">
+          <BooleanSetting path="playVideosInModal">
             {{ $t('settings.play_videos_in_modal') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="useContainFit">
+          <BooleanSetting path="useContainFit">
             {{ $t('settings.use_contain_fit') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -239,9 +239,9 @@
       <h2>{{ $t('settings.notifications') }}</h2>
       <ul class="setting-list">
         <li>
-          <Checkbox v-model="webPushNotifications">
+          <BooleanSetting path="webPushNotifications">
             {{ $t('settings.enable_web_push_notifications') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -250,9 +250,9 @@
       <h2>{{ $t('settings.fun') }}</h2>
       <ul class="setting-list">
         <li>
-          <Checkbox v-model="greentext">
-            {{ $t('settings.greentext') }} {{ $t('settings.instance_default', { value: greentextLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="greentext">
+            {{ $t('settings.greentext') }}
+          </BooleanSetting>
         </li>
       </ul>
     </div>
diff --git a/src/modules/config.js b/src/modules/config.js
index 409d77a4..2c1e881f 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -74,18 +74,24 @@ export const instanceDefaultProperties = Object.entries(defaultState)
   .map(([key, value]) => key)
 
 const config = {
-  state: defaultState,
+  state: { ...defaultState },
   getters: {
-    mergedConfig (state, getters, rootState, rootGetters) {
+    defaultConfig (state, getters, rootState, rootGetters) {
       const { instance } = rootState
+      console.log('DC', instance.minimalScopesMode)
       return {
-        ...state,
-        ...instanceDefaultProperties
-          .map(key => [key, state[key] === undefined
-            ? instance[key]
-            : state[key]
-          ])
-          .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
+        ...defaultState,
+        ...Object.fromEntries(
+          instanceDefaultProperties.map(key => [key, instance[key]])
+        )
+      }
+    },
+    mergedConfig (state, getters, rootState, rootGetters) {
+      const { defaultConfig } = rootGetters
+      console.log('DC2', defaultConfig.hideISP)
+      return {
+        ...defaultConfig,
+        ...state
       }
     }
   },

From e695506c514e49964dfd81c7db5c5b4d4918f47d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 17 Oct 2020 22:28:49 +0300
Subject: [PATCH 002/389] proper modified icon + popup

---
 .../helpers/boolean_setting.vue               | 10 ++--
 .../settings_modal/helpers/modified_icon.vue  | 46 +++++++++++++++++++
 src/i18n/en.json                              |  1 +
 3 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 src/components/settings_modal/helpers/modified_icon.vue

diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 11b354ed..f7c392cd 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -6,30 +6,30 @@
       :checked="state"
       @change="update"
       :disabled="disabled"
-      >
+    >
       <span
         v-if="!!$slots.default"
         class="label"
         >
         <slot />
       </span>
+      <ModifiedIcon :changed="isChanged" />
     </Checkbox>
-    <span v-if="isChanged">
-      <strong>CHANGED</strong>
-    </span>
   </label>
 </template>
 
 <script>
 import { get, set } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
+import ModifiedIcon from './modified_icon.vue'
 export default {
   props: [
     'path',
     'disabled'
   ],
   components: {
-    Checkbox
+    Checkbox,
+    ModifiedIcon
   },
   computed: {
     pathDefault () {
diff --git a/src/components/settings_modal/helpers/modified_icon.vue b/src/components/settings_modal/helpers/modified_icon.vue
new file mode 100644
index 00000000..27e0a9c5
--- /dev/null
+++ b/src/components/settings_modal/helpers/modified_icon.vue
@@ -0,0 +1,46 @@
+<template>
+  <span
+    v-if="changed"
+    class="ModifiedIcon"
+    >
+    <Popover
+      trigger="hover"
+      >
+      <i
+        slot="trigger"
+        class="icon icon-wrench"
+        />
+      <div
+        class="modified-tooltip"
+        slot="content"
+        >
+      {{ $t('settings.setting_changed') }}
+      </div>
+    </Popover>
+  </span>
+</template>
+
+<script>
+import Popover from 'src/components/popover/popover.vue'
+export default {
+  props: ['changed'],
+  components: { Popover }
+}
+</script>
+
+<style lang="scss">
+.ModifiedIcon {
+  display: inline-block;
+  position: relative;
+
+  .icon {
+    display: inline-block;
+  }
+
+  .modified-tooltip {
+    margin: 0.5em 1em;
+    min-width: 10em;
+    text-align: center;
+  }
+}
+</style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d3d57562..e25bda8f 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -240,6 +240,7 @@
   "settings": {
     "app_name": "App name",
     "security": "Security",
+    "setting_changed": "Setting is different from default",
     "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
     "mfa": {
       "otp": "OTP",

From 38142182774ea772aacc88f26586512d6279267f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 19 Oct 2020 19:38:49 +0300
Subject: [PATCH 003/389] Some initial work on replacing icons with FA5

---
 package.json                                  |   4 +
 src/App.scss                                  |   9 +-
 src/components/emoji_input/emoji_input.js     |   9 +
 src/components/emoji_input/emoji_input.vue    |   2 +-
 src/components/emoji_picker/emoji_picker.js   |  16 +-
 src/components/emoji_picker/emoji_picker.scss |   2 +-
 src/components/emoji_picker/emoji_picker.vue  |   4 +-
 src/components/extra_buttons/extra_buttons.js |   4 +
 .../extra_buttons/extra_buttons.vue           |   6 +-
 .../favorite_button/favorite_button.js        |  14 +-
 .../favorite_button/favorite_button.vue       |  33 ++--
 src/components/media_upload/media_upload.js   |   8 +
 src/components/media_upload/media_upload.vue  |  10 +-
 src/components/nav_panel/nav_panel.js         |  23 +++
 src/components/nav_panel/nav_panel.vue        | 160 +++++++++---------
 src/components/poll/poll_form.js              |  12 ++
 src/components/poll/poll_form.vue             |  16 +-
 .../post_status_form/post_status_form.js      |  17 ++
 .../post_status_form/post_status_form.vue     |  31 ++--
 src/components/react_button/react_button.js   |   4 +
 src/components/react_button/react_button.vue  |   6 +-
 src/components/reply_button/reply_button.js   |   4 +
 src/components/reply_button/reply_button.vue  |  28 ++-
 .../retweet_button/retweet_button.js          |   8 +-
 .../retweet_button/retweet_button.vue         |  48 ++++--
 .../scope_selector/scope_selector.js          |  15 ++
 .../scope_selector/scope_selector.vue         |  50 +++---
 src/components/status/status.js               |  49 +++++-
 src/components/status/status.scss             |  26 +--
 src/components/status/status.vue              |  70 ++++----
 src/components/timeline_menu/timeline_menu.js |  18 ++
 .../timeline_menu/timeline_menu.vue           |  32 ++--
 src/main.js                                   |   4 +
 yarn.lock                                     |  31 ++++
 34 files changed, 528 insertions(+), 245 deletions(-)

diff --git a/package.json b/package.json
index 75d9ee56..6bc285c8 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,10 @@
   "dependencies": {
     "@babel/runtime": "^7.7.6",
     "@chenfengyuan/vue-qrcode": "^1.0.0",
+    "@fortawesome/fontawesome-svg-core": "^1.2.32",
+    "@fortawesome/free-regular-svg-icons": "^5.15.1",
+    "@fortawesome/free-solid-svg-icons": "^5.15.1",
+    "@fortawesome/vue-fontawesome": "^2.0.0",
     "body-scroll-lock": "^2.6.4",
     "chromatism": "^3.0.0",
     "cropperjs": "^1.4.3",
diff --git a/src/App.scss b/src/App.scss
index e1e1bdd0..d34698e2 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -318,7 +318,7 @@ option {
   }
 }
 
-i[class*=icon-] {
+i[class*=icon-], .svg-inline--fa  {
   color: $fallback--icon;
   color: var(--icon, $fallback--icon);
 }
@@ -808,7 +808,12 @@ nav {
 }
 
 .button-icon {
-  font-size: 1.2em;
+  &i,
+  &.svg-inline--fa.fa-lg {
+    display: inline-block;
+    padding: 0 0.3em;
+    font-size: 1.1em;
+  }
 }
 
 @keyframes shakeError {
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index f0123447..87303d08 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -3,6 +3,15 @@ import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import { take } from 'lodash'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faSmileBeam
+} from '@fortawesome/free-regular-svg-icons'
+
+library.add(
+  faSmileBeam
+)
+
 /**
  * EmojiInput - augmented inputs for emoji and autocomplete support in inputs
  * without having to give up the comfort of <input/> and <textarea/> elements
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index b9a74572..224e72cf 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -11,7 +11,7 @@
         class="emoji-picker-icon"
         @click.prevent="togglePicker"
       >
-        <i class="icon-smile" />
+        <FAIcon :icon="['far', 'smile-beam']" />
       </div>
       <EmojiPicker
         v-if="enableEmojiPicker"
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 3ad80df3..b1671566 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -1,4 +1,16 @@
 import Checkbox from '../checkbox/checkbox.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faUnderline,
+  faStickyNote,
+  faSmileBeam
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faUnderline,
+  faStickyNote,
+  faSmileBeam
+)
 
 // At widest, approximately 20 emoji are visible in a row,
 // loading 3 rows, could be overkill for narrow picker
@@ -177,13 +189,13 @@ const EmojiPicker = {
         {
           id: 'custom',
           text: this.$t('emoji.custom'),
-          icon: 'icon-smile',
+          icon: 'smile-beam',
           emojis: customEmojis
         },
         {
           id: 'standard',
           text: this.$t('emoji.unicode'),
-          icon: 'icon-picture',
+          icon: 'underline',
           emojis: filterByKeyword(standardEmojis, this.keyword)
         }
       ]
diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index 8bd07e45..ec711758 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -82,7 +82,7 @@
       &.active {
         border-bottom: 4px solid;
 
-        i {
+        svg {
           color: $fallback--lightText;
           color: var(--lightText, $fallback--lightText);
         }
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 191b9fa1..bd093c99 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -13,7 +13,7 @@
           :title="group.text"
           @click.prevent="highlight(group.id)"
         >
-          <i :class="group.icon" />
+          <FAIcon :icon="group.icon" fixed-width/>
         </span>
       </span>
       <span
@@ -26,7 +26,7 @@
           :title="$t('emoji.stickers')"
           @click.prevent="toggleStickers"
         >
-          <i class="icon-star" />
+          <FAIcon icon="sticky-note" fixed-width/>
         </span>
       </span>
     </div>
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 5e0c36bb..6892dabc 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -1,4 +1,8 @@
 import Popover from '../popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faEllipsisH } from '@fortawesome/free-solid-svg-icons'
+
+library.add(faEllipsisH)
 
 const ExtraButtons = {
   props: [ 'status' ],
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 7a4e8642..0af264a5 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -73,9 +73,11 @@
         </button>
       </div>
     </div>
-    <i
+    <FAIcon
       slot="trigger"
-      class="icon-ellipsis button-icon"
+      class="button-icon"
+      icon="ellipsis-h"
+      size="lg"
     />
   </Popover>
 </template>
diff --git a/src/components/favorite_button/favorite_button.js b/src/components/favorite_button/favorite_button.js
index 5014d84f..2a2ee84a 100644
--- a/src/components/favorite_button/favorite_button.js
+++ b/src/components/favorite_button/favorite_button.js
@@ -1,4 +1,14 @@
 import { mapGetters } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faStar } from '@fortawesome/free-solid-svg-icons'
+import {
+  faStar as faStarRegular
+} from '@fortawesome/free-regular-svg-icons'
+
+library.add(
+  faStar,
+  faStarRegular
+)
 
 const FavoriteButton = {
   props: ['status', 'loggedIn'],
@@ -23,9 +33,7 @@ const FavoriteButton = {
   computed: {
     classes () {
       return {
-        'icon-star-empty': !this.status.favorited,
-        'icon-star': this.status.favorited,
-        'animate-spin': this.animated
+        '-favorited': this.status.favorited
       }
     },
     ...mapGetters(['mergedConfig'])
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index fbc90f84..6c7bfdab 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -1,18 +1,23 @@
 <template>
   <div v-if="loggedIn">
-    <i
+    <FAIcon
       :class="classes"
-      class="button-icon favorite-button fav-active"
+      class="FavoriteButton button-icon -interactive"
       :title="$t('tool_tip.favorite')"
+      :icon="[status.favorited ? 'fas' : 'far', 'star']"
+      :spin="animated"
+      size="lg"
       @click.prevent="favorite()"
     />
     <span v-if="!mergedConfig.hidePostStats && status.fave_num > 0">{{ status.fave_num }}</span>
   </div>
   <div v-else>
-    <i
+    <FAIcon
       :class="classes"
-      class="button-icon favorite-button"
+      class="FavoriteButton button-icon"
       :title="$t('tool_tip.favorite')"
+      :icon="['far', 'star']"
+      size="lg"
     />
     <span v-if="!mergedConfig.hidePostStats && status.fave_num > 0">{{ status.fave_num }}</span>
   </div>
@@ -23,18 +28,20 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.fav-active {
-  cursor: pointer;
-  animation-duration: 0.6s;
+.FavoriteButton {
+  &.-interactive {
+    cursor: pointer;
+    animation-duration: 0.6s;
 
-  &:hover {
+    &:hover {
+      color: $fallback--cOrange;
+      color: var(--cOrange, $fallback--cOrange);
+    }
+  }
+
+  &.-favorited {
     color: $fallback--cOrange;
     color: var(--cOrange, $fallback--cOrange);
   }
 }
-
-.favorite-button.icon-star {
-  color: $fallback--cOrange;
-  color: var(--cOrange, $fallback--cOrange);
-}
 </style>
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 7b8a76cc..669d8190 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -2,6 +2,14 @@
 import statusPosterService from '../../services/status_poster/status_poster.service.js'
 import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faUpload, faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faUpload,
+  faCircleNotch
+)
+
 const mediaUpload = {
   data () {
     return {
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index c8865d77..38e00702 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -7,13 +7,15 @@
       class="label"
       :title="$t('tool_tip.media_upload')"
     >
-      <i
+      <FAIcon
         v-if="uploading"
-        class="progress-icon icon-spin4 animate-spin"
+        class="progress-icon animate-spin"
+        icon="circle-notch"
       />
-      <i
+      <FAIcon
         v-if="!uploading"
-        class="new-icon icon-upload"
+        class="new-icon"
+        icon="upload"
       />
       <input
         v-if="uploadReady"
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 623dfaec..87e54133 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -1,6 +1,29 @@
 import { timelineNames } from '../timeline_menu/timeline_menu.js'
 import { mapState, mapGetters } from 'vuex'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faUsers,
+  faGlobeEurope,
+  faBookmark,
+  faEnvelope,
+  faHome,
+  faComments,
+  faBell,
+  faInfoCircle
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faUsers,
+  faGlobeEurope,
+  faBookmark,
+  faEnvelope,
+  faHome,
+  faComments,
+  faBell,
+  faInfoCircle
+)
+
 const NavPanel = {
   created () {
     if (this.currentUser && this.currentUser.locked) {
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 4f944c95..f3e131ff 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="nav-panel">
+  <div class="NavPanel">
     <div class="panel panel-default">
       <ul>
         <li v-if="currentUser || !privateMode">
@@ -7,12 +7,14 @@
             :to="{ name: timelinesRoute }"
             :class="onTimelineRoute && 'router-link-active'"
           >
-            <i class="button-icon icon-home-2" />{{ $t("nav.timelines") }}
+            <FAIcon fixed-width size="lg" class="button-icon" icon="home" />
+            {{ $t("nav.timelines") }}
           </router-link>
         </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-bell-alt" />{{ $t("nav.interactions") }}
+            <FAIcon fixed-width size="lg" class="button-icon" icon="bell" />
+            {{ $t("nav.interactions") }}
           </router-link>
         </li>
         <li v-if="currentUser && pleromaChatMessagesAvailable">
@@ -23,12 +25,14 @@
             >
               {{ unreadChatCount }}
             </div>
-            <i class="button-icon icon-chat" />{{ $t("nav.chats") }}
+            <FAIcon fixed-width size="lg" class="button-icon" icon="comments" />
+            {{ $t("nav.chats") }}
           </router-link>
         </li>
         <li v-if="currentUser && currentUser.locked">
           <router-link :to="{ name: 'friend-requests' }">
-            <i class="button-icon icon-user-plus" />{{ $t("nav.friend_requests") }}
+            <FAIcon fixed-width size="lg" class="button-icon" icon="user-plus" />
+            {{ $t("nav.friend_requests") }}
             <span
               v-if="followRequestCount > 0"
               class="badge follow-request-count"
@@ -39,7 +43,7 @@
         </li>
         <li>
           <router-link :to="{ name: 'about' }">
-            <i class="button-icon icon-info-circled" />{{ $t("nav.about") }}
+            <FAIcon fixed-width size="lg" class="button-icon" icon="info-circle" />{{ $t("nav.about") }}
           </router-link>
         </li>
       </ul>
@@ -52,84 +56,88 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.nav-panel .panel {
-  overflow: hidden;
-  box-shadow: var(--panelShadow);
-}
-.nav-panel ul {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.follow-request-count {
-  margin: -6px 10px;
-  background-color: $fallback--bg;
-  background-color: var(--input, $fallback--faint);
-}
-
-.nav-panel li {
-  border-bottom: 1px solid;
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
-  padding: 0;
-
-  &:first-child a {
-    border-top-right-radius: $fallback--panelRadius;
-    border-top-right-radius: var(--panelRadius, $fallback--panelRadius);
-    border-top-left-radius: $fallback--panelRadius;
-    border-top-left-radius: var(--panelRadius, $fallback--panelRadius);
+.NavPanel {
+  .panel {
+    overflow: hidden;
+    box-shadow: var(--panelShadow);
   }
 
-  &:last-child a {
-    border-bottom-right-radius: $fallback--panelRadius;
-    border-bottom-right-radius: var(--panelRadius, $fallback--panelRadius);
-    border-bottom-left-radius: $fallback--panelRadius;
-    border-bottom-left-radius: var(--panelRadius, $fallback--panelRadius);
-  }
-}
-
-.nav-panel li:last-child {
-  border: none;
-}
-
-.nav-panel a {
-  display: block;
-  padding: 0.8em 0.85em;
-
-  &:hover {
-    background-color: $fallback--lightBg;
-    background-color: var(--selectedMenu, $fallback--lightBg);
-    color: $fallback--link;
-    color: var(--selectedMenuText, $fallback--link);
-    --faint: var(--selectedMenuFaintText, $fallback--faint);
-    --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
-    --lightText: var(--selectedMenuLightText, $fallback--lightText);
-    --icon: var(--selectedMenuIcon, $fallback--icon);
+  ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
   }
 
-  &.router-link-active {
-    font-weight: bolder;
-    background-color: $fallback--lightBg;
-    background-color: var(--selectedMenu, $fallback--lightBg);
-    color: $fallback--text;
-    color: var(--selectedMenuText, $fallback--text);
-    --faint: var(--selectedMenuFaintText, $fallback--faint);
-    --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
-    --lightText: var(--selectedMenuLightText, $fallback--lightText);
-    --icon: var(--selectedMenuIcon, $fallback--icon);
+  .follow-request-count {
+    margin: -6px 10px;
+    background-color: $fallback--bg;
+    background-color: var(--input, $fallback--faint);
+  }
 
-    &:hover {
-      text-decoration: underline;
+  li {
+    border-bottom: 1px solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
+    padding: 0;
+
+    &:first-child a {
+      border-top-right-radius: $fallback--panelRadius;
+      border-top-right-radius: var(--panelRadius, $fallback--panelRadius);
+      border-top-left-radius: $fallback--panelRadius;
+      border-top-left-radius: var(--panelRadius, $fallback--panelRadius);
+    }
+
+    &:last-child a {
+      border-bottom-right-radius: $fallback--panelRadius;
+      border-bottom-right-radius: var(--panelRadius, $fallback--panelRadius);
+      border-bottom-left-radius: $fallback--panelRadius;
+      border-bottom-left-radius: var(--panelRadius, $fallback--panelRadius);
     }
   }
-}
 
-.nav-panel .button-icon {
-  margin-right: 0.5em;
-}
+  li:last-child {
+    border: none;
+  }
 
-.nav-panel .button-icon:before {
-  width: 1.1em;
+  a {
+    display: block;
+    padding: 0.8em 0.85em;
+
+    &:hover {
+      background-color: $fallback--lightBg;
+      background-color: var(--selectedMenu, $fallback--lightBg);
+      color: $fallback--link;
+      color: var(--selectedMenuText, $fallback--link);
+      --faint: var(--selectedMenuFaintText, $fallback--faint);
+      --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
+      --lightText: var(--selectedMenuLightText, $fallback--lightText);
+      --icon: var(--selectedMenuIcon, $fallback--icon);
+    }
+
+    &.router-link-active {
+      font-weight: bolder;
+      background-color: $fallback--lightBg;
+      background-color: var(--selectedMenu, $fallback--lightBg);
+      color: $fallback--text;
+      color: var(--selectedMenuText, $fallback--text);
+      --faint: var(--selectedMenuFaintText, $fallback--faint);
+      --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
+      --lightText: var(--selectedMenuLightText, $fallback--lightText);
+      --icon: var(--selectedMenuIcon, $fallback--icon);
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  .button-icon {
+    margin-left: -0.1em;
+    margin-right: 0.2em;
+  }
+
+  .button-icon:before {
+    width: 1.1em;
+  }
 }
 </style>
diff --git a/src/components/poll/poll_form.js b/src/components/poll/poll_form.js
index df93f038..1f8df3f9 100644
--- a/src/components/poll/poll_form.js
+++ b/src/components/poll/poll_form.js
@@ -1,5 +1,17 @@
 import * as DateUtils from 'src/services/date_utils/date_utils.js'
 import { uniq } from 'lodash'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes,
+  faChevronDown,
+  faPlus
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes,
+  faChevronDown,
+  faPlus
+)
 
 export default {
   name: 'PollForm',
diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index d53f3837..3a8a2f42 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -24,8 +24,8 @@
         v-if="options.length > 2"
         class="icon-container"
       >
-        <i
-          class="icon-cancel"
+        <FAIcon
+          icon="times"
           @click="deleteOption(index)"
         />
       </div>
@@ -35,7 +35,8 @@
       class="add-option faint"
       @click="addOption"
     >
-      <i class="icon-plus" />
+      <FAIcon icon="plus" size="sm"/>
+
       {{ $t("polls.add_option") }}
     </a>
     <div class="poll-type-expiry">
@@ -55,7 +56,7 @@
             <option value="single">{{ $t('polls.single_choice') }}</option>
             <option value="multiple">{{ $t('polls.multiple_choices') }}</option>
           </select>
-          <i class="icon-down-open" />
+          <FAIcon class="icon-down-open" icon="chevron-down"/>
         </label>
       </div>
       <div
@@ -83,7 +84,7 @@
               {{ $t(`time.${unit}_short`, ['']) }}
             </option>
           </select>
-          <i class="icon-down-open" />
+          <FAIcon class="icon-down-open" icon="chevron-down"/>
         </label>
       </div>
     </div>
@@ -103,6 +104,7 @@
   .add-option {
     align-self: flex-start;
     padding-top: 0.25em;
+    padding-left: 0.1em;
     cursor: pointer;
   }
 
@@ -124,8 +126,8 @@
 
   .icon-container {
     // Hack: Move the icon over the input box
-    width: 2em;
-    margin-left: -2em;
+    width: 1.5em;
+    margin-left: -1.5em;
     z-index: 1;
   }
 
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index ad149506..1267225d 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -12,6 +12,23 @@ import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters, mapState } from 'vuex'
 import Checkbox from '../checkbox/checkbox.vue'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faChevronDown,
+  faSmileBeam,
+  faPollH,
+  faUpload,
+  faBan
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faChevronDown,
+  faSmileBeam,
+  faPollH,
+  faUpload,
+  faBan
+)
+
 const buildMentionsString = ({ user, attentions = [] }, currentUser) => {
   let allAttentions = [...attentions]
 
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index d67d9ae9..9a5be689 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -12,10 +12,11 @@
         v-show="showDropIcon !== 'hide'"
         :style="{ animation: showDropIcon === 'show' ? 'fade-in 0.25s' : 'fade-out 0.5s' }"
         class="drop-indicator"
-        :class="[uploadFileLimitReached ? 'icon-block' : 'icon-upload']"
         @dragleave="fileDragStop"
         @drop.stop="fileDrop"
-      />
+      >
+        <FAIcon :icon="uploadFileLimitReached ? 'ban' : 'upload'"/>
+      </div>
       <div class="form-group">
         <i18n
           v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
@@ -198,7 +199,7 @@
                   {{ $t(`post_status.content_type["${postFormat}"]`) }}
                 </option>
               </select>
-              <i class="icon-down-open" />
+              <FAIcon class="icon-down-open" icon="chevron-down"/>
             </label>
           </div>
           <div
@@ -235,22 +236,22 @@
           <div
             class="emoji-icon"
           >
-            <i
+            <div
               :title="$t('emoji.add_emoji')"
-              class="icon-smile btn btn-default"
+              class="btn btn-default"
               @click="showEmojiPicker"
-            />
+            >
+              <FAIcon icon="smile-beam"/>
+            </div>
           </div>
           <div
             v-if="pollsAvailable"
             class="poll-icon"
             :class="{ selected: pollFormVisible }"
+            :title="$t('polls.add_poll')"
+            @click="togglePollForm"
           >
-            <i
-              :title="$t('polls.add_poll')"
-              class="icon-chart-bar btn btn-default"
-              @click="togglePollForm"
-            />
+            <FAIcon icon="poll-h" />
           </div>
         </div>
         <button
@@ -392,7 +393,7 @@
     &:hover {
       text-decoration: underline;
     }
-    i {
+    svg, i {
       margin-left: 0.2em;
       font-size: 0.8em;
       transform: rotate(90deg);
@@ -434,18 +435,20 @@
 
   .media-upload-icon, .poll-icon, .emoji-icon {
     font-size: 26px;
+    line-height: 1.1;
     flex: 1;
+    padding: 0 0.1em;
 
     &.selected, &:hover {
       // needs to be specific to override icon default color
-      i, label {
+      svg, i, label {
         color: $fallback--lightText;
         color: var(--lightText, $fallback--lightText);
       }
     }
 
     &.disabled {
-      i {
+      svg, i {
         cursor: not-allowed;
         color: $fallback--icon;
         color: var(--btnDisabledText, $fallback--icon);
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index dd71e546..de0df70c 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -1,4 +1,8 @@
 import Popover from '../popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faSmileBeam } from '@fortawesome/free-regular-svg-icons'
+
+library.add(faSmileBeam)
 
 const ReactButton = {
   props: ['status'],
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 0b34add1..8395d5e3 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -36,9 +36,11 @@
         <div class="reaction-bottom-fader" />
       </div>
     </div>
-    <i
+    <FAIcon
       slot="trigger"
-      class="icon-smile button-icon add-reaction-button"
+      class="button-icon add-reaction-button"
+      :icon="['far', 'smile-beam']"
+      size="lg"
       :title="$t('tool_tip.add_reaction')"
     />
   </Popover>
diff --git a/src/components/reply_button/reply_button.js b/src/components/reply_button/reply_button.js
index 22957650..c7bd2a2b 100644
--- a/src/components/reply_button/reply_button.js
+++ b/src/components/reply_button/reply_button.js
@@ -1,3 +1,7 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faReply } from '@fortawesome/free-solid-svg-icons'
+
+library.add(faReply)
 
 const ReplyButton = {
   name: 'ReplyButton',
diff --git a/src/components/reply_button/reply_button.vue b/src/components/reply_button/reply_button.vue
index b2904b5c..ae7b0e26 100644
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@@ -1,15 +1,19 @@
 <template>
   <div>
-    <i
+    <FAIcon
       v-if="loggedIn"
-      class="button-icon button-reply icon-reply"
+      class="ReplyButton button-icon -interactive"
+      icon="reply"
+      size="lg"
       :title="$t('tool_tip.reply')"
       :class="{'-active': replying}"
       @click.prevent="$emit('toggle')"
     />
-    <i
+    <FAIcon
       v-else
-      class="button-icon button-reply -disabled icon-reply"
+      icon="reply"
+      size="lg"
+      class="ReplyButton button-icon"
       :title="$t('tool_tip.reply')"
     />
     <span v-if="status.replies_count > 0">
@@ -19,3 +23,19 @@
 </template>
 
 <script src="./reply_button.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.ReplyButton {
+  &.-interactive {
+    cursor: pointer;
+
+    &:hover,
+    &.-active {
+      color: $fallback--cBlue;
+      color: var(--cBlue, $fallback--cBlue);
+    }
+  }
+}
+</style>
diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js
index 5a41f22d..5ee4179a 100644
--- a/src/components/retweet_button/retweet_button.js
+++ b/src/components/retweet_button/retweet_button.js
@@ -1,3 +1,7 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faRetweet } from '@fortawesome/free-solid-svg-icons'
+
+library.add(faRetweet)
 
 const RetweetButton = {
   props: ['status', 'loggedIn', 'visibility'],
@@ -22,9 +26,7 @@ const RetweetButton = {
   computed: {
     classes () {
       return {
-        'retweeted': this.status.repeated,
-        'retweeted-empty': !this.status.repeated,
-        'animate-spin': this.animated
+        '-repeated': this.status.repeated
       }
     },
     mergedConfig () {
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 074f7747..3e15f30b 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -1,26 +1,33 @@
 <template>
   <div v-if="loggedIn">
     <template v-if="visibility !== 'private' && visibility !== 'direct'">
-      <i
-        :class="classes"
-        class="button-icon retweet-button icon-retweet rt-active"
-        :title="$t('tool_tip.repeat')"
-        @click.prevent="retweet()"
-      />
+    <FAIcon
+      :class="classes"
+      class="RetweetButton button-icon -interactive"
+      icon="retweet"
+      size="lg"
+      :spin="animated"
+      :title="$t('tool_tip.repeat')"
+      @click.prevent="retweet()"
+    />
       <span v-if="!mergedConfig.hidePostStats && status.repeat_num > 0">{{ status.repeat_num }}</span>
     </template>
     <template v-else>
-      <i
+      <FAIcon
         :class="classes"
-        class="button-icon icon-lock"
+        class="RetweetButton button-icon"
+        icon="lock"
+        size="lg"
         :title="$t('timeline.no_retweet_hint')"
       />
     </template>
   </div>
   <div v-else-if="!loggedIn">
-    <i
+    <FAIcon
       :class="classes"
-      class="button-icon icon-retweet"
+      class="button-icon"
+      icon="retweet"
+      size="lg"
       :title="$t('tool_tip.repeat')"
     />
     <span v-if="!mergedConfig.hidePostStats && status.repeat_num > 0">{{ status.repeat_num }}</span>
@@ -31,16 +38,21 @@
 
 <style lang="scss">
 @import '../../_variables.scss';
-.rt-active {
-  cursor: pointer;
-  animation-duration: 0.6s;
-  &:hover {
+
+.RetweetButton {
+  &.-interactive {
+    cursor: pointer;
+    animation-duration: 0.6s;
+
+    &:hover {
+      color: $fallback--cGreen;
+      color: var(--cGreen, $fallback--cGreen);
+    }
+  }
+
+  &.-repeated {
     color: $fallback--cGreen;
     color: var(--cGreen, $fallback--cGreen);
   }
 }
-.icon-retweet.retweeted {
-  color: $fallback--cGreen;
-  color: var(--cGreen, $fallback--cGreen);
-}
 </style>
diff --git a/src/components/scope_selector/scope_selector.js b/src/components/scope_selector/scope_selector.js
index e9ccdefc..34efdc00 100644
--- a/src/components/scope_selector/scope_selector.js
+++ b/src/components/scope_selector/scope_selector.js
@@ -1,3 +1,18 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faEnvelope,
+  faLock,
+  faLockOpen,
+  faGlobeEurope
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faEnvelope,
+  faGlobeEurope,
+  faLock,
+  faLockOpen
+)
+
 const ScopeSelector = {
   props: [
     'showAll',
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index 291236f2..5b9abd64 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -1,36 +1,44 @@
 <template>
   <div
     v-if="!showNothing"
-    class="scope-selector"
-  >
-    <i
+    class="ScopeSelector"
+    >
+    <span
       v-if="showDirect"
-      class="icon-mail-alt"
+      class="scope"
       :class="css.direct"
       :title="$t('post_status.scope.direct')"
       @click="changeVis('direct')"
-    />
-    <i
+      >
+      <FAIcon icon="envelope" class="button-icon" size="lg" />
+    </span>
+    <span
+      class="scope"
       v-if="showPrivate"
-      class="icon-lock"
       :class="css.private"
       :title="$t('post_status.scope.private')"
       @click="changeVis('private')"
-    />
-    <i
+      >
+      <FAIcon icon="lock" class="button-icon" size="lg" />
+    </span>
+    <span
       v-if="showUnlisted"
-      class="icon-lock-open-alt"
+      class="scope"
       :class="css.unlisted"
       :title="$t('post_status.scope.unlisted')"
       @click="changeVis('unlisted')"
-    />
-    <i
+      >
+      <FAIcon icon="lock-open" class="button-icon" size="lg" />
+    </span>
+    <span
       v-if="showPublic"
-      class="icon-globe"
+      class="scope"
       :class="css.public"
       :title="$t('post_status.scope.public')"
       @click="changeVis('public')"
-    />
+      >
+      <FAIcon icon="globe-europe" class="button-icon" size="lg" />
+    </span>
   </div>
 </template>
 
@@ -39,12 +47,16 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.scope-selector {
-  i {
-    font-size: 1.2em;
-    cursor: pointer;
+.ScopeSelector {
 
-    &.selected {
+  .scope {
+    display: inline-block;
+    cursor: pointer;
+    min-width: 1.3em;
+    min-height: 1.3em;
+    text-align: center;
+
+    &.selected svg {
       color: $fallback--lightText;
       color: var(--lightText, $fallback--lightText);
     }
diff --git a/src/components/status/status.js b/src/components/status/status.js
index e48b2eb8..f7a0ff83 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -17,6 +17,47 @@ import { highlightClass, highlightStyle } from '../../services/user_highlighter/
 import { muteWordHits } from '../../services/status_parser/status_parser.js'
 import { unescape, uniqBy } from 'lodash'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faEnvelope,
+  faLock,
+  faLockOpen,
+  faGlobeEurope,
+  faTimes,
+  faRetweet,
+  faReply,
+  faExternalLinkSquareAlt,
+  faPlusSquare,
+  faSmileBeam,
+  faEllipsisH,
+  faStar,
+  faEyeSlash,
+  faEye,
+  faThumbtack
+} from '@fortawesome/free-solid-svg-icons'
+import {
+  faStar as faStarRegular
+} from '@fortawesome/free-regular-svg-icons'
+
+library.add(
+  faEnvelope,
+  faGlobeEurope,
+  faLock,
+  faLockOpen,
+  faTimes,
+  faRetweet,
+  faReply,
+  faExternalLinkSquareAlt,
+  faPlusSquare,
+  faStar,
+  faStarRegular,
+  faSmileBeam,
+  faEllipsisH,
+  faEyeSlash,
+  faEye,
+  faThumbtack
+)
+
 const Status = {
   name: 'Status',
   components: {
@@ -227,13 +268,13 @@ const Status = {
     visibilityIcon (visibility) {
       switch (visibility) {
         case 'private':
-          return 'icon-lock'
+          return 'lock'
         case 'unlisted':
-          return 'icon-lock-open-alt'
+          return 'lock-open'
         case 'direct':
-          return 'icon-mail-alt'
+          return 'envelope'
         default:
-          return 'icon-globe'
+          return 'globe-europe'
       }
     },
     showError (error) {
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 66a91c1e..cd5366ed 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -200,7 +200,6 @@ $status-margin: 0.75em;
   }
 
   .reply-to {
-    display: flex;
     position: relative;
   }
 
@@ -208,7 +207,6 @@ $status-margin: 0.75em;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    margin-left: 0.2em;
   }
 
   .replies-separator {
@@ -232,16 +230,10 @@ $status-margin: 0.75em;
 
   .repeat-info {
     padding: 0.4em $status-margin;
-    line-height: 22px;
 
-    .right-side {
-      display: flex;
-      align-content: center;
-      flex-wrap: wrap;
-    }
-
-    i {
-      padding: 0 0.2em;
+    .repeat-icon {
+      color: $fallback--cGreen;
+      color: var(--cGreen, $fallback--cGreen);
     }
   }
 
@@ -291,18 +283,6 @@ $status-margin: 0.75em;
     }
   }
 
-  .button-reply {
-    &:not(.-disabled) {
-      cursor: pointer;
-    }
-
-    &:not(.-disabled):hover,
-    &.-active {
-      color: $fallback--cBlue;
-      color: var(--cBlue, $fallback--cBlue);
-    }
-  }
-
   .muted {
     padding: 0.25em 0.6em;
     height: 1.2em;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index ffae32fc..b9b967cc 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -10,17 +10,20 @@
       class="alert error"
     >
       {{ error }}
-      <i
-        class="button-icon icon-cancel"
+      <span
+        class="button-icon"
         @click="clearError"
-      />
+        >
+        <FAIcon icon="times" />
+      </span>
     </div>
     <template v-if="muted && !isPreview">
       <div class="status-container muted">
         <small class="status-username">
-          <i
+          <FAIcon
             v-if="muted && retweet"
-            class="button-icon icon-retweet"
+            class="button-icon repeat-icon"
+            icon="retweet"
           />
           <router-link :to="userProfileLink">
             {{ status.user.screen_name }}
@@ -46,9 +49,11 @@
         </small>
         <a
           href="#"
-          class="unmute"
+          class="unmute button-icon"
           @click.prevent="toggleMute"
-        ><i class="button-icon icon-eye-off" /></a>
+          >
+          <FAIcon icon="eye-slash" class="button-icon" size="lg" />
+        </a>
       </div>
     </template>
     <template v-else>
@@ -56,7 +61,7 @@
         v-if="showPinned"
         class="pin"
       >
-        <i class="fa icon-pin faint" />
+        <FAIcon icon="thumbtack" class="faint" />
         <span class="faint">{{ $t('status.pinned') }}</span>
       </div>
       <div
@@ -86,8 +91,9 @@
               :to="retweeterProfileLink"
             >{{ retweeter }}</router-link>
           </span>
-          <i
-            class="fa icon-retweet retweeted"
+          <FAIcon
+            icon="retweet"
+            class="repeat-icon"
             :title="$t('tool_tip.repeat')"
           />
           {{ $t('timeline.repeated') }}
@@ -167,15 +173,13 @@
                     :auto-update="60"
                   />
                 </router-link>
-                <div
+                <span
                   v-if="status.visibility"
-                  class="button-icon visibility-icon"
-                >
-                  <i
-                    :class="visibilityIcon(status.visibility)"
-                    :title="status.visibility | capitalize"
-                  />
-                </div>
+                  class="visibility-icon"
+                  :title="status.visibility | capitalize"
+                  >
+                  <FAIcon class="button-icon" :icon="visibilityIcon(status.visibility)" size="lg" />
+                </span>
                 <a
                   v-if="!status.is_local && !isPreview"
                   :href="status.external_url"
@@ -183,22 +187,23 @@
                   class="source_url"
                   title="Source"
                 >
-                  <i class="button-icon icon-link-ext-alt" />
+                  <FAIcon class="button-icon" icon="external-link-square-alt" size="lg" />
+                </a>
+                <a
+                  v-if="expandable && !isPreview"
+                  href="#"
+                  title="Expand"
+                  @click.prevent="toggleExpanded"
+                >
+                  <FAIcon class="button-icon" icon="plus-square" size="lg" />
                 </a>
-                <template v-if="expandable && !isPreview">
-                  <a
-                    href="#"
-                    title="Expand"
-                    @click.prevent="toggleExpanded"
-                  >
-                    <i class="button-icon icon-plus-squared" />
-                  </a>
-                </template>
                 <a
                   v-if="unmuted"
                   href="#"
                   @click.prevent="toggleMute"
-                ><i class="button-icon icon-eye-off" /></a>
+                >
+                  <FAIcon icon="eye-slash" class="button-icon" size="lg" />
+                </a>
               </span>
             </div>
 
@@ -220,7 +225,12 @@
                     :aria-label="$t('tool_tip.reply')"
                     @click.prevent="gotoOriginal(status.in_reply_to_status_id)"
                   >
-                    <i class="button-icon reply-button icon-reply" />
+                    <FAIcon
+                      class="button-icon"
+                      icon="reply"
+                      size="lg"
+                      flip="horizontal"
+                      />
                     <span
                       class="faint-link reply-to-text"
                     >
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index 2be75b06..991c600d 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -1,5 +1,23 @@
 import Popover from '../popover/popover.vue'
 import { mapState } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faUsers,
+  faGlobeEurope,
+  faBookmark,
+  faEnvelope,
+  faHome,
+  faChevronDown
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faUsers,
+  faGlobeEurope,
+  faBookmark,
+  faEnvelope,
+  faHome,
+  faChevronDown
+)
 
 // Route -> i18n key mapping, exported andnot in the computed
 // because nav panel benefits from the same information.
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index b7e5f2da..590752d3 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -1,7 +1,7 @@
 <template>
   <Popover
     trigger="click"
-    class="timeline-menu"
+    class="TimelineMenu"
     :class="{ 'open': isOpen }"
     :margin="{ left: -15, right: -200 }"
     :bound-to="{ x: 'container' }"
@@ -16,27 +16,27 @@
       <ul>
         <li v-if="currentUser">
           <router-link :to="{ name: 'friends' }">
-            <i class="button-icon icon-home-2" />{{ $t("nav.timeline") }}
+            <FAIcon fixed-width size="lg" class="button-icon " icon="home" />{{ $t("nav.timeline") }}
           </router-link>
         </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'bookmarks'}">
-            <i class="button-icon icon-bookmark" />{{ $t("nav.bookmarks") }}
+            <FAIcon fixed-width size="lg" class="button-icon " icon="bookmark" />{{ $t("nav.bookmarks") }}
           </router-link>
         </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-mail-alt" />{{ $t("nav.dms") }}
+            <FAIcon fixed-width size="lg" class="button-icon " icon="envelope" />{{ $t("nav.dms") }}
           </router-link>
         </li>
         <li v-if="currentUser || !privateMode">
           <router-link :to="{ name: 'public-timeline' }">
-            <i class="button-icon icon-users" />{{ $t("nav.public_tl") }}
+            <FAIcon fixed-width size="lg" class="button-icon " icon="users" />{{ $t("nav.public_tl") }}
           </router-link>
         </li>
         <li v-if="federating && (currentUser || !privateMode)">
           <router-link :to="{ name: 'public-external-timeline' }">
-            <i class="button-icon icon-globe" />{{ $t("nav.twkn") }}
+            <FAIcon fixed-width size="lg" class="button-icon " icon="globe-europe" />{{ $t("nav.twkn") }}
           </router-link>
         </li>
       </ul>
@@ -46,7 +46,7 @@
       class="title timeline-menu-title"
     >
       <span>{{ timelineName() }}</span>
-      <i class="icon-down-open" />
+      <FAIcon size="sm" icon="chevron-down" />
     </div>
   </Popover>
 </template>
@@ -56,17 +56,19 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.timeline-menu {
+.TimelineMenu {
   flex-shrink: 1;
   margin-right: auto;
   min-width: 0;
   width: 24rem;
+
   .timeline-menu-popover-wrap {
     overflow: hidden;
     // Match panel heading padding to line up menu with bottom of heading
     margin-top: 0.6rem;
     padding: 0 15px 15px 15px;
   }
+
   .timeline-menu-popover {
     width: 24rem;
     max-width: 100vw;
@@ -77,10 +79,12 @@
     transform: translateY(-100%);
     transition: transform 100ms;
   }
+
   .panel::after {
     border-top-right-radius: 0;
     border-top-left-radius: 0;
   }
+
   &.open .timeline-menu-popover {
     transform: translateY(0);
   }
@@ -88,7 +92,6 @@
   .timeline-menu-title {
     margin: 0;
     cursor: pointer;
-    display: flex;
     user-select: none;
     width: 100%;
 
@@ -98,15 +101,13 @@
       white-space: nowrap;
     }
 
-    i {
+    svg {
       margin-left: 0.6em;
-      flex-shrink: 0;
-      font-size: 1rem;
       transition: transform 100ms;
     }
   }
 
-  &.open .timeline-menu-title i {
+  &.open .timeline-menu-title svg {
     color: $fallback--text;
     color: var(--panelText, $fallback--text);
     transform: rotate(180deg);
@@ -171,8 +172,9 @@
       }
     }
 
-    i {
-      margin-right: 0.5em;
+    svg {
+      margin-right: 0.4em;
+      margin-left: -0.2em;
     }
   }
 }
diff --git a/src/main.js b/src/main.js
index 0a898022..42b6bcb2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -33,6 +33,8 @@ import VueClickOutside from 'v-click-outside'
 import PortalVue from 'portal-vue'
 import VBodyScrollLock from './directives/body_scroll_lock'
 
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+
 import afterStoreSetup from './boot/after_store.js'
 
 const currentLocale = (window.navigator.language || 'en').split('-')[0]
@@ -45,6 +47,8 @@ Vue.use(VueClickOutside)
 Vue.use(PortalVue)
 Vue.use(VBodyScrollLock)
 
+Vue.component('FAIcon', FontAwesomeIcon)
+
 const i18n = new VueI18n({
   // By default, use the browser locale, we will update it if neccessary
   locale: 'en',
diff --git a/yarn.lock b/yarn.lock
index 14be84a6..e7ba92e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -884,6 +884,37 @@
   dependencies:
     qrcode "^1.3.0"
 
+"@fortawesome/fontawesome-common-types@^0.2.32":
+  version "0.2.32"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz#3436795d5684f22742989bfa08f46f50f516f259"
+  integrity sha512-ux2EDjKMpcdHBVLi/eWZynnPxs0BtFVXJkgHIxXRl+9ZFaHPvYamAfCzeeQFqHRjuJtX90wVnMRaMQAAlctz3w==
+
+"@fortawesome/fontawesome-svg-core@^1.2.32":
+  version "1.2.32"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz#da092bfc7266aa274be8604de610d7115f9ba6cf"
+  integrity sha512-XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "^0.2.32"
+
+"@fortawesome/free-regular-svg-icons@^5.15.1":
+  version "5.15.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.1.tgz#a8897d0ce325352dbba0e943101323e0175ee2b2"
+  integrity sha512-eD9NWFy89e7SVVtrLedJUxIpCBGhd4x7s7dhesokjyo1Tw62daqN5UcuAGu1NrepLLq1IeAYUVfWwnOjZ/j3HA==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "^0.2.32"
+
+"@fortawesome/free-solid-svg-icons@^5.15.1":
+  version "5.15.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz#e1432676ddd43108b41197fee9f86d910ad458ef"
+  integrity sha512-EFMuKtzRMNbvjab/SvJBaOOpaqJfdSap/Nl6hst7CgrJxwfORR1drdTV6q1Ib/JVzq4xObdTDcT6sqTaXMqfdg==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "^0.2.32"
+
+"@fortawesome/vue-fontawesome@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.0.tgz#63da3e459147cebb0a8d58eed81d6071db9f5973"
+  integrity sha512-N3VKw7KzRfOm8hShUVldpinlm13HpvLBQgT63QS+aCrIRLwjoEUXY5Rcmttbfb6HkzZaeqjLqd/aZCQ53UjQpg==
+
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"

From 8b3a7ae8c0fec5f79971745f64aeb3c5ac470894 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 19 Oct 2020 22:35:46 +0300
Subject: [PATCH 004/389] more FA5 stuff with small related refactoring

---
 src/App.scss                                  | 10 +++---
 src/components/chat_panel/chat_panel.js       |  6 ++++
 src/components/chat_panel/chat_panel.vue      |  2 +-
 src/components/exporter/exporter.js           |  7 ++++
 src/components/exporter/exporter.vue          |  4 +--
 src/components/extra_buttons/extra_buttons.js | 20 ++++++++++--
 .../extra_buttons/extra_buttons.vue           | 32 ++++++++++---------
 src/components/media_upload/media_upload.vue  |  3 +-
 src/components/notification/notification.js   | 22 +++++++++++++
 src/components/notification/notification.scss | 32 +++++++++++++++++++
 src/components/notification/notification.vue  | 32 ++++++++++---------
 src/components/notifications/notifications.js |  6 ++++
 .../notifications/notifications.scss          | 31 ------------------
 .../notifications/notifications.vue           |  2 +-
 .../panel_loading/panel_loading.vue           | 14 ++++++--
 src/components/popover/popover.vue            |  6 ++--
 .../scope_selector/scope_selector.js          |  4 +--
 .../scope_selector/scope_selector.vue         |  2 +-
 src/components/search/search.js               |  6 ++++
 src/components/search/search.vue              |  2 +-
 src/components/status/status.js               | 10 ++----
 .../status_popover/status_popover.js          |  6 ++++
 .../status_popover/status_popover.vue         |  2 +-
 src/components/timeline/timeline.js           |  6 ++++
 src/components/timeline/timeline.vue          |  2 +-
 src/components/user_card/user_card.js         | 16 ++++++++++
 src/components/user_card/user_card.vue        | 26 ++++++++++-----
 .../user_list_popover/user_list_popover.js    |  6 ++++
 .../user_list_popover/user_list_popover.vue   |  2 +-
 src/main.js                                   |  3 +-
 30 files changed, 221 insertions(+), 101 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index d34698e2..10969abb 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -106,7 +106,8 @@ button {
     color: var(--btnPressedText, $fallback--text);
     background-color: $fallback--fg;
     background-color: var(--btnPressed, $fallback--fg);
-    i {
+
+    svg, i {
       color: $fallback--text;
       color: var(--btnPressedText, $fallback--text);
     }
@@ -118,7 +119,8 @@ button {
     color: var(--btnDisabledText, $fallback--text);
     background-color: $fallback--fg;
     background-color: var(--btnDisabled, $fallback--fg);
-    i {
+
+    svg, i {
       color: $fallback--text;
       color: var(--btnDisabledText, $fallback--text);
     }
@@ -131,7 +133,8 @@ button {
     background-color: var(--btnToggled, $fallback--fg);
     box-shadow: 0px 0px 4px 0px rgba(255, 255, 255, 0.3), 0px 1px 0px 0px rgba(0, 0, 0, 0.2) inset, 0px -1px 0px 0px rgba(255, 255, 255, 0.2) inset;
     box-shadow: var(--buttonPressedShadow);
-    i {
+
+    svg, i {
       color: $fallback--text;
       color: var(--btnToggledText, $fallback--text);
     }
@@ -808,7 +811,6 @@ nav {
 }
 
 .button-icon {
-  &i,
   &.svg-inline--fa.fa-lg {
     display: inline-block;
     padding: 0 0.3em;
diff --git a/src/components/chat_panel/chat_panel.js b/src/components/chat_panel/chat_panel.js
index f2e3adf0..3dfec6df 100644
--- a/src/components/chat_panel/chat_panel.js
+++ b/src/components/chat_panel/chat_panel.js
@@ -1,4 +1,10 @@
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faBullhorn } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faBullhorn
+)
 
 const chatPanel = {
   props: [ 'floating' ],
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index 570435e7..b64535b0 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -63,7 +63,7 @@
         @click.stop.prevent="togglePanel"
       >
         <div class="title">
-          <i class="icon-megaphone" />
+          <FAIcon icon="bullhorn" />
           {{ $t('shoutbox.title') }}
         </div>
       </div>
diff --git a/src/components/exporter/exporter.js b/src/components/exporter/exporter.js
index 8f507416..51912ac3 100644
--- a/src/components/exporter/exporter.js
+++ b/src/components/exporter/exporter.js
@@ -1,3 +1,10 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch
+)
+
 const Exporter = {
   props: {
     getContent: {
diff --git a/src/components/exporter/exporter.vue b/src/components/exporter/exporter.vue
index f5126dc1..156db9a3 100644
--- a/src/components/exporter/exporter.vue
+++ b/src/components/exporter/exporter.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="exporter">
     <div v-if="processing">
-      <i class="icon-spin4 animate-spin exporter-processing" />
+      <FAIcon icon="circle-notch" size="lg" spin />
+
       <span>{{ processingMessage }}</span>
     </div>
     <button
@@ -19,7 +20,6 @@
 <style lang="scss">
 .exporter {
   &-processing {
-    font-size: 1.5em;
     margin: 0.25em;
   }
 }
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 6892dabc..f325b2b4 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -1,8 +1,24 @@
 import Popover from '../popover/popover.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faEllipsisH } from '@fortawesome/free-solid-svg-icons'
+import {
+  faEllipsisH,
+  faBookmark,
+  faEyeSlash,
+  faThumbtack,
+  faShareAlt
+} from '@fortawesome/free-solid-svg-icons'
+import {
+  faBookmark as faBookmarkReg,
+} from '@fortawesome/free-regular-svg-icons'
 
-library.add(faEllipsisH)
+library.add(
+  faEllipsisH,
+  faBookmark,
+  faBookmarkReg,
+  faEyeSlash,
+  faThumbtack,
+  faShareAlt
+)
 
 const ExtraButtons = {
   props: [ 'status' ],
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 0af264a5..1889eaed 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -15,14 +15,14 @@
           class="dropdown-item dropdown-item-icon"
           @click.prevent="muteConversation"
         >
-          <i class="icon-eye-off" /><span>{{ $t("status.mute_conversation") }}</span>
+          <FAIcon size="md" fixed-width icon="eye-slash" /><span>{{ $t("status.mute_conversation") }}</span>
         </button>
         <button
           v-if="canMute && status.thread_muted"
           class="dropdown-item dropdown-item-icon"
           @click.prevent="unmuteConversation"
         >
-          <i class="icon-eye-off" /><span>{{ $t("status.unmute_conversation") }}</span>
+          <FAIcon size="md" fixed-width icon="eye-slash" /><span>{{ $t("status.unmute_conversation") }}</span>
         </button>
         <button
           v-if="!status.pinned && canPin"
@@ -30,7 +30,7 @@
           @click.prevent="pinStatus"
           @click="close"
         >
-          <i class="icon-pin" /><span>{{ $t("status.pin") }}</span>
+          <FAIcon size="md" fixed-width icon="thumbtack" /><span>{{ $t("status.pin") }}</span>
         </button>
         <button
           v-if="status.pinned && canPin"
@@ -38,7 +38,7 @@
           @click.prevent="unpinStatus"
           @click="close"
         >
-          <i class="icon-pin" /><span>{{ $t("status.unpin") }}</span>
+          <FAIcon size="md" fixed-width icon="thumbtack" /><span>{{ $t("status.unpin") }}</span>
         </button>
         <button
           v-if="!status.bookmarked"
@@ -46,7 +46,7 @@
           @click.prevent="bookmarkStatus"
           @click="close"
         >
-          <i class="icon-bookmark-empty" /><span>{{ $t("status.bookmark") }}</span>
+          <FAIcon size="md" fixed-width :icon="['far', 'bookmark']" /><span>{{ $t("status.bookmark") }}</span>
         </button>
         <button
           v-if="status.bookmarked"
@@ -54,7 +54,7 @@
           @click.prevent="unbookmarkStatus"
           @click="close"
         >
-          <i class="icon-bookmark" /><span>{{ $t("status.unbookmark") }}</span>
+          <FAIcon size="md" fixed-width icon="bookmark" /><span>{{ $t("status.unbookmark") }}</span>
         </button>
         <button
           v-if="canDelete"
@@ -62,23 +62,24 @@
           @click.prevent="deleteStatus"
           @click="close"
         >
-          <i class="icon-cancel" /><span>{{ $t("status.delete") }}</span>
+          <FAIcon size="md" fixed-width icon="times" /><span>{{ $t("status.delete") }}</span>
         </button>
         <button
           class="dropdown-item dropdown-item-icon"
           @click.prevent="copyLink"
           @click="close"
         >
-          <i class="icon-share" /><span>{{ $t("status.copy_link") }}</span>
+          <FAIcon size="md" fixed-width icon="share-alt" /><span>{{ $t("status.copy_link") }}</span>
         </button>
       </div>
     </div>
-    <FAIcon
-      slot="trigger"
-      class="button-icon"
-      icon="ellipsis-h"
-      size="lg"
-    />
+    <span slot="trigger">
+      <FAIcon
+        class="ExtraButtons button-icon"
+        icon="ellipsis-h"
+        size="md"
+      />
+    </span>
   </Popover>
 </template>
 
@@ -87,8 +88,9 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.icon-ellipsis {
+.ExtraButtons {
   cursor: pointer;
+  position: static;
 
   &:hover,
   .extra-button-popover.open & {
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index 38e00702..15b2b8e4 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -9,8 +9,9 @@
     >
       <FAIcon
         v-if="uploading"
-        class="progress-icon animate-spin"
+        class="progress-icon"
         icon="circle-notch"
+        spin
       />
       <FAIcon
         v-if="!uploading"
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index bb906b50..4aa9affd 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -7,6 +7,28 @@ import Timeago from '../timeago/timeago.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faCheck,
+  faTimes,
+  faStar,
+  faRetweet,
+  faUserPlus,
+  faEyeSlash,
+  faUser,
+  faSuitcaseRolling
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCheck,
+  faTimes,
+  faStar,
+  faRetweet,
+  faUserPlus,
+  faUser,
+  faEyeSlash,
+  faSuitcaseRolling
+)
 
 const Notification = {
   data () {
diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss
index d0e63d81..f5905560 100644
--- a/src/components/notification/notification.scss
+++ b/src/components/notification/notification.scss
@@ -1,3 +1,5 @@
+@import '../../_variables.scss';
+
 // TODO Copypaste from Status, should unify it somehow
 .Notification {
   &.-muted {
@@ -49,4 +51,34 @@
       display: block;
     }
   }
+
+  .type-icon {
+    margin: 0 0.1em;
+  }
+
+  &.-type--repeat .type-icon {
+    color: $fallback--cGreen;
+    color: var(--cGreen, $fallback--cGreen);
+  }
+
+  &.-type--follow .type-icon {
+    color: $fallback--cBlue;
+    color: var(--cBlue, $fallback--cBlue);
+  }
+
+  &.-type--follow-request .type-icon {
+    color: $fallback--cBlue;
+    color: var(--cBlue, $fallback--cBlue);
+  }
+
+  &.-type--like .type-icon {
+    color: orange;
+    color: $fallback--cOrange;
+    color: var(--cOrange, $fallback--cOrange);
+  }
+
+  &.-type--move .type-icon {
+    color: $fallback--cBlue;
+    color: var(--cBlue, $fallback--cBlue);
+  }
 }
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 7fac3840..857727a4 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -1,5 +1,5 @@
 <template>
-  <status
+  <Status
     v-if="notification.type === 'mention'"
     :compact="true"
     :statusoid="notification.status"
@@ -18,12 +18,12 @@
         href="#"
         class="unmute"
         @click.prevent="toggleMute"
-      ><i class="button-icon icon-eye-off" /></a>
+      ><FAIcon class="button-icon" icon="eye-slash" /></a>
     </div>
     <div
       v-else
-      class="non-mention"
-      :class="[userClass, { highlighted: userStyle }]"
+      class="Notification non-mention"
+      :class="[userClass, { highlighted: userStyle }, '-type--' + notification.type]"
       :style="[ userStyle ]"
     >
       <a
@@ -60,26 +60,26 @@
               :title="'@'+notification.from_profile.screen_name"
             >{{ notification.from_profile.name }}</span>
             <span v-if="notification.type === 'like'">
-              <i class="fa icon-star lit" />
+              <FAIcon class="type-icon" icon="star" />
               <small>{{ $t('notifications.favorited_you') }}</small>
             </span>
             <span v-if="notification.type === 'repeat'">
-              <i
-                class="fa icon-retweet lit"
+              <FAIcon
+                class="type-icon" icon="retweet"
                 :title="$t('tool_tip.repeat')"
               />
               <small>{{ $t('notifications.repeated_you') }}</small>
             </span>
             <span v-if="notification.type === 'follow'">
-              <i class="fa icon-user-plus lit" />
+              <FAIcon class="type-icon" icon="user-plus" />
               <small>{{ $t('notifications.followed_you') }}</small>
             </span>
             <span v-if="notification.type === 'follow_request'">
-              <i class="fa icon-user lit" />
+              <FAIcon class="type-icon" icon="user" />
               <small>{{ $t('notifications.follow_request') }}</small>
             </span>
             <span v-if="notification.type === 'move'">
-              <i class="fa icon-arrow-curved lit" />
+              <FAIcon class="type-icon" icon="suitcase-rolling" />
               <small>{{ $t('notifications.migrated_to') }}</small>
             </span>
             <span v-if="notification.type === 'pleroma:emoji_reaction'">
@@ -120,7 +120,7 @@
             v-if="needMute"
             href="#"
             @click.prevent="toggleMute"
-          ><i class="button-icon icon-eye-off" /></a>
+          ><FAIcon class="button-icon" icon="eye-slash" /></a>
         </span>
         <div
           v-if="notification.type === 'follow' || notification.type === 'follow_request'"
@@ -136,13 +136,15 @@
             v-if="notification.type === 'follow_request'"
             style="white-space: nowrap;"
           >
-            <i
-              class="icon-ok button-icon follow-request-accept"
+            <FAIcon
+              icon="check"
+              class="button-icon follow-request-accept"
               :title="$t('tool_tip.accept_follow_request')"
               @click="approveUser()"
             />
-            <i
-              class="icon-cancel button-icon follow-request-reject"
+            <FAIcon
+              icon="times"
+              class="button-icon follow-request-reject"
               :title="$t('tool_tip.reject_follow_request')"
               @click="denyUser()"
             />
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index d951e2a8..4b479e13 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -6,6 +6,12 @@ import {
   filteredNotificationsFromStore,
   unseenNotificationsFromStore
 } from '../../services/notification_utils/notification_utils.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch
+)
 
 const DEFAULT_SEEN_TO_DISPLAY_COUNT = 30
 
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index c6b2a5b5..682ae127 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -158,37 +158,6 @@
       margin-right: .2em;
     }
 
-    .icon-retweet.lit {
-      color: $fallback--cGreen;
-      color: var(--cGreen, $fallback--cGreen);
-    }
-
-    .icon-user.lit {
-      color: $fallback--cBlue;
-      color: var(--cBlue, $fallback--cBlue);
-    }
-
-    .icon-user-plus.lit {
-      color: $fallback--cBlue;
-      color: var(--cBlue, $fallback--cBlue);
-    }
-
-    .icon-reply.lit {
-      color: $fallback--cBlue;
-      color: var(--cBlue, $fallback--cBlue);
-    }
-
-    .icon-star.lit {
-      color: orange;
-      color: $fallback--cOrange;
-      color: var(--cOrange, $fallback--cOrange);
-    }
-
-    .icon-arrow-curved.lit {
-      color: $fallback--cBlue;
-      color: var(--cBlue, $fallback--cBlue);
-    }
-
     .status-content {
       margin: 0;
       max-height: 300px;
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index d477a41b..57972854 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -61,7 +61,7 @@
           v-else
           class="new-status-notification text-center panel-footer"
         >
-          <i class="icon-spin3 animate-spin" />
+          <FAIcon icon="circle-notch" spin size="lg"/>
         </div>
       </div>
     </div>
diff --git a/src/components/panel_loading/panel_loading.vue b/src/components/panel_loading/panel_loading.vue
index 4efebb3c..9bf3ab32 100644
--- a/src/components/panel_loading/panel_loading.vue
+++ b/src/components/panel_loading/panel_loading.vue
@@ -1,12 +1,21 @@
 <template>
   <div class="panel-loading">
     <span class="loading-text">
-      <i class="icon-spin4 animate-spin" />
+      <FAIcon icon="circle-notch" spin size="3x"/>
       {{ $t('general.loading') }}
     </span>
   </div>
 </template>
 
+<script>
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch
+)
+</script>
+
 <style lang="scss">
 @import 'src/_variables.scss';
 
@@ -18,8 +27,7 @@
   font-size: 2em;
   color: $fallback--text;
   color: var(--text, $fallback--text);
-  .loading-text i {
-    font-size: 3em;
+  .loading-text svg {
     line-height: 0;
     vertical-align: middle;
     color: $fallback--text;
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 5c99c509..9b8680e5 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -27,7 +27,7 @@
 
 <script src="./popover.js" />
 
-<style lang=scss>
+<style lang="scss">
 @import '../../_variables.scss';
 
 .popover {
@@ -96,7 +96,7 @@
     &-icon {
       padding-left: 0.5rem;
 
-      i {
+      svg {
         margin-right: 0.25rem;
         color: var(--menuPopoverIcon, $fallback--icon)
       }
@@ -111,7 +111,7 @@
       --faintLink: var(--selectedMenuPopoverFaintLink, $fallback--faint);
       --lightText: var(--selectedMenuPopoverLightText, $fallback--lightText);
       --icon: var(--selectedMenuPopoverIcon, $fallback--icon);
-      i {
+      svg {
         color: var(--selectedMenuPopoverIcon, $fallback--icon);
       }
     }
diff --git a/src/components/scope_selector/scope_selector.js b/src/components/scope_selector/scope_selector.js
index 34efdc00..ddb20ff2 100644
--- a/src/components/scope_selector/scope_selector.js
+++ b/src/components/scope_selector/scope_selector.js
@@ -2,7 +2,7 @@ import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faEnvelope,
   faLock,
-  faLockOpen,
+  faUnlock,
   faGlobeEurope
 } from '@fortawesome/free-solid-svg-icons'
 
@@ -10,7 +10,7 @@ library.add(
   faEnvelope,
   faGlobeEurope,
   faLock,
-  faLockOpen
+  faUnlock
 )
 
 const ScopeSelector = {
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index 5b9abd64..ddd89422 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -28,7 +28,7 @@
       :title="$t('post_status.scope.unlisted')"
       @click="changeVis('unlisted')"
       >
-      <FAIcon icon="lock-open" class="button-icon" size="lg" />
+      <FAIcon icon="unlock" class="button-icon" size="lg" />
     </span>
     <span
       v-if="showPublic"
diff --git a/src/components/search/search.js b/src/components/search/search.js
index 8e903052..3eb92fc1 100644
--- a/src/components/search/search.js
+++ b/src/components/search/search.js
@@ -2,6 +2,12 @@ import FollowCard from '../follow_card/follow_card.vue'
 import Conversation from '../conversation/conversation.vue'
 import Status from '../status/status.vue'
 import map from 'lodash/map'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch
+)
 
 const Search = {
   components: {
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index 746bbaa2..a6677e4b 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -24,7 +24,7 @@
       v-if="loading"
       class="text-center loading-icon"
     >
-      <i class="icon-spin3 animate-spin" />
+      <FAIcon icon="circle-notch" spin size="lg"/>
     </div>
     <div v-else-if="loaded">
       <div class="search-nav-heading">
diff --git a/src/components/status/status.js b/src/components/status/status.js
index f7a0ff83..5b93054f 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -21,7 +21,7 @@ import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faEnvelope,
   faLock,
-  faLockOpen,
+  faUnlock,
   faGlobeEurope,
   faTimes,
   faRetweet,
@@ -35,22 +35,18 @@ import {
   faEye,
   faThumbtack
 } from '@fortawesome/free-solid-svg-icons'
-import {
-  faStar as faStarRegular
-} from '@fortawesome/free-regular-svg-icons'
 
 library.add(
   faEnvelope,
   faGlobeEurope,
   faLock,
-  faLockOpen,
+  faUnlock,
   faTimes,
   faRetweet,
   faReply,
   faExternalLinkSquareAlt,
   faPlusSquare,
   faStar,
-  faStarRegular,
   faSmileBeam,
   faEllipsisH,
   faEyeSlash,
@@ -270,7 +266,7 @@ const Status = {
         case 'private':
           return 'lock'
         case 'unlisted':
-          return 'lock-open'
+          return 'unlock'
         case 'direct':
           return 'envelope'
         default:
diff --git a/src/components/status_popover/status_popover.js b/src/components/status_popover/status_popover.js
index 51e7680c..c47f5631 100644
--- a/src/components/status_popover/status_popover.js
+++ b/src/components/status_popover/status_popover.js
@@ -1,4 +1,10 @@
 import { find } from 'lodash'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch
+)
 
 const StatusPopover = {
   name: 'StatusPopover',
diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index 162eb210..f6432687 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -27,7 +27,7 @@
         v-else
         class="status-preview-no-content"
       >
-        <i class="icon-spin4 animate-spin" />
+        <FAIcon icon="circle-notch" spin size="2x"/>
       </div>
     </div>
   </Popover>
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 17680542..a443340f 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -3,6 +3,12 @@ import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.se
 import Conversation from '../conversation/conversation.vue'
 import TimelineMenu from '../timeline_menu/timeline_menu.vue'
 import { throttle, keyBy } from 'lodash'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch
+)
 
 export const getExcludedStatusIdsByPinning = (statuses, pinnedStatusIds) => {
   const ids = []
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index c1e2f44b..ab17cbbc 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -92,7 +92,7 @@
         v-else
         class="new-status-notification text-center panel-footer"
       >
-        <i class="icon-spin3 animate-spin" />
+        <FAIcon icon="circle-notch" spin size="lg"/>
       </div>
     </div>
   </div>
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 8e6b9d7f..3a8efafc 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -6,6 +6,22 @@ import ModerationTools from '../moderation_tools/moderation_tools.vue'
 import AccountActions from '../account_actions/account_actions.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { mapGetters } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faBell,
+  faRss,
+  faChevronDown,
+  faSearchPlus,
+  faExternalLinkAlt
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faRss,
+  faBell,
+  faChevronDown,
+  faSearchPlus,
+  faExternalLinkAlt
+)
 
 export default {
   props: [
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 041bb80f..cfdeaa17 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -21,7 +21,7 @@
               :user="user"
             />
             <div class="user-info-avatar-link-overlay">
-              <i class="button-icon icon-zoom-in" />
+              <FAIcon class="button-icon" icon="search-plus" size="lg" />
             </div>
           </a>
           <router-link
@@ -55,7 +55,7 @@
                 :href="user.statusnet_profile_url"
                 target="_blank"
               >
-                <i class="icon-link-ext usersettings" />
+                <FAIcon class="usersettings" icon="external-link-alt" />
               </a>
               <AccountActions
                 v-if="isOtherUser && loggedIn"
@@ -85,7 +85,9 @@
                   bot
                 </span>
               </template>
-              <span v-if="user.locked"><i class="icon icon-lock" /></span>
+              <span v-if="user.locked">
+               <FAIcon class="lock-icon" icon="lock" size="sm"/>
+              </span>
               <span
                 v-if="!mergedConfig.hideUserStats && !hideBio"
                 class="dailyAvg"
@@ -133,7 +135,7 @@
                 <option value="striped">Striped bg</option>
                 <option value="side">Side stripe</option>
               </select>
-              <i class="icon-down-open" />
+              <FAIcon class="icon-down-open" icon="chevron-down" />
             </label>
           </div>
         </div>
@@ -150,7 +152,7 @@
                 :click="subscribeUser"
                 :title="$t('user_card.subscribe')"
               >
-                <i class="icon-bell-alt" />
+                <FAIcon icon="bell" />
               </ProgressButton>
               <ProgressButton
                 v-else
@@ -158,7 +160,11 @@
                 :click="unsubscribeUser"
                 :title="$t('user_card.unsubscribe')"
               >
-                <i class="icon-bell-ringing-o" />
+                <FALayers>
+                  <FAIcon icon="rss" transform="left-5 shrink-6 up-3 rotate-20" flip="horizontal"/>
+                  <FAIcon icon="rss" transform="right-5 shrink-6 up-3 rotate-20"/>
+                  <FAIcon icon="bell" />
+                </FALayers>
               </ProgressButton>
             </template>
           </div>
@@ -388,7 +394,7 @@
       opacity: 0;
       transition: opacity .2s ease;
 
-      i {
+      svg {
         color: #FFF;
       }
     }
@@ -447,6 +453,10 @@
     font-weight: light;
     font-size: 15px;
 
+    .lock-icon {
+      margin-left: 0.5em;
+    }
+
     .user-screen-name {
       min-width: 1px;
       flex: 0 1 auto;
@@ -508,7 +518,7 @@
         padding-bottom: 0;
         flex: 1 0 auto;
       }
-      .userHighlightSel.select i {
+      .userHighlightSel.select svg {
         line-height: 22px;
       }
 
diff --git a/src/components/user_list_popover/user_list_popover.js b/src/components/user_list_popover/user_list_popover.js
index b60f2c4c..32ca2b8d 100644
--- a/src/components/user_list_popover/user_list_popover.js
+++ b/src/components/user_list_popover/user_list_popover.js
@@ -1,3 +1,9 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch
+)
 
 const UserListPopover = {
   name: 'UserListPopover',
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index 185c73ca..dd6977d2 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -31,7 +31,7 @@
         </div>
       </div>
       <div v-else>
-        <i class="icon-spin4 animate-spin" />
+        <FAIcon icon="circle-notch" spin size="3x"/>
       </div>
     </div>
   </Popover>
diff --git a/src/main.js b/src/main.js
index 42b6bcb2..90ee2887 100644
--- a/src/main.js
+++ b/src/main.js
@@ -33,7 +33,7 @@ import VueClickOutside from 'v-click-outside'
 import PortalVue from 'portal-vue'
 import VBodyScrollLock from './directives/body_scroll_lock'
 
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import { FontAwesomeIcon, FontAwesomeLayers } from '@fortawesome/vue-fontawesome'
 
 import afterStoreSetup from './boot/after_store.js'
 
@@ -48,6 +48,7 @@ Vue.use(PortalVue)
 Vue.use(VBodyScrollLock)
 
 Vue.component('FAIcon', FontAwesomeIcon)
+Vue.component('FALayers', FontAwesomeLayers)
 
 const i18n = new VueI18n({
   // By default, use the browser locale, we will update it if neccessary

From e8650d3409aa34a0195629d2077bad68bcade439 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 20 Oct 2020 21:03:46 +0300
Subject: [PATCH 005/389] chevrons-downs, settings

---
 src/components/chat/chat.js                   |  8 ++++++
 src/components/chat/chat.vue                  |  5 ++--
 .../contrast_ratio/contrast_ratio.vue         | 26 ++++++++++++++-----
 src/components/font_control/font_control.js   |  8 ++++++
 src/components/font_control/font_control.vue  |  2 +-
 .../interface_language_switcher.vue           | 10 ++++++-
 .../settings_modal/tabs/filtering_tab.js      |  8 ++++++
 .../settings_modal/tabs/filtering_tab.vue     |  2 +-
 .../settings_modal/tabs/general_tab.js        |  8 ++++++
 .../settings_modal/tabs/general_tab.vue       |  4 +--
 .../tabs/theme_tab/theme_tab.js               |  8 ++++++
 .../tabs/theme_tab/theme_tab.vue              |  4 +--
 .../shadow_control/shadow_control.js          | 14 ++++++++++
 .../shadow_control/shadow_control.vue         | 10 +++----
 14 files changed, 97 insertions(+), 20 deletions(-)

diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 34e723d0..1630ba80 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -7,6 +7,14 @@ import ChatTitle from '../chat_title/chat_title.vue'
 import chatService from '../../services/chat_service/chat_service.js'
 import { promiseInterval } from '../../services/promise_interval/promise_interval.js'
 import { getScrollPosition, getNewTopPosition, isBottomedOut, scrollableContainerHeight } from './chat_layout_utils.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faChevronDown
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faChevronDown
+)
 
 const BOTTOMED_OUT_OFFSET = 10
 const JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET = 150
diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
index 2e4538c8..0d44c920 100644
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@@ -58,14 +58,15 @@
               :class="{ 'visible': jumpToBottomButtonVisible }"
               @click="scrollDown({ behavior: 'smooth' })"
             >
-              <i class="icon-down-open">
+              <span>
+                <FAIcon icon="chevron-down" />
                 <div
                   v-if="newMessageCount"
                   class="badge badge-notification unread-chat-count unread-message-count"
                 >
                   {{ newMessageCount }}
                 </div>
-              </i>
+              </span>
             </div>
             <PostStatusForm
               :disable-subject="true"
diff --git a/src/components/contrast_ratio/contrast_ratio.vue b/src/components/contrast_ratio/contrast_ratio.vue
index 9dc871b6..374cb9ba 100644
--- a/src/components/contrast_ratio/contrast_ratio.vue
+++ b/src/components/contrast_ratio/contrast_ratio.vue
@@ -8,13 +8,13 @@
       class="rating"
     >
       <span v-if="contrast.aaa">
-        <i class="icon-thumbs-up-alt" />
+        <FAIcon icon="thumbs-up" />
       </span>
       <span v-if="!contrast.aaa && contrast.aa">
-        <i class="icon-adjust" />
+        <FAIcon icon="adjust" />
       </span>
       <span v-if="!contrast.aaa && !contrast.aa">
-        <i class="icon-attention" />
+        <FAIcon icon="exclamation-triangle" />
       </span>
     </span>
     <span
@@ -23,19 +23,32 @@
       :title="hint_18pt"
     >
       <span v-if="contrast.laaa">
-        <i class="icon-thumbs-up-alt" />
+        <FAIcon icon="thumbs-up" />
       </span>
       <span v-if="!contrast.laaa && contrast.laa">
-        <i class="icon-adjust" />
+        <FAIcon icon="adjust" />
       </span>
       <span v-if="!contrast.laaa && !contrast.laa">
-        <i class="icon-attention" />
+        <FAIcon icon="exclamation-triangle" />
       </span>
     </span>
   </span>
 </template>
 
 <script>
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faAdjust,
+  faExclamationTriangle,
+  faThumbsUp
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faAdjust,
+  faExclamationTriangle,
+  faThumbsUp
+)
+
 export default {
   props: {
     large: {
@@ -85,6 +98,7 @@ export default {
   .rating {
     display: inline-block;
     text-align: center;
+    margin-left: 0.5em;
   }
 }
 </style>
diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js
index 8e2b0e45..6274780b 100644
--- a/src/components/font_control/font_control.js
+++ b/src/components/font_control/font_control.js
@@ -1,4 +1,12 @@
 import { set } from 'vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faChevronDown
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faChevronDown
+)
 
 export default {
   props: [
diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
index 61f0384b..40aed190 100644
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@@ -41,7 +41,7 @@
           {{ option === 'custom' ? $t('settings.style.fonts.custom') : option }}
         </option>
       </select>
-      <i class="icon-down-open" />
+      <FAIcon class="icon-down-open" icon="chevron-down" />
     </label>
     <input
       v-if="isCustom"
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index dd6800a3..2a3d4cbb 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -19,7 +19,7 @@
           {{ languageNames[i] }}
         </option>
       </select>
-      <i class="icon-down-open" />
+      <FAIcon class="icon-down-open" icon="chevron-down" />
     </label>
   </div>
 </template>
@@ -28,6 +28,14 @@
 import languagesObject from '../../i18n/messages'
 import ISO6391 from 'iso-639-1'
 import _ from 'lodash'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faChevronDown
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faChevronDown
+)
 
 export default {
   computed: {
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 3b2df556..5f38a5ae 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -2,6 +2,14 @@ import { filter, trim } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faChevronDown
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faChevronDown
+)
 
 const FilteringTab = {
   data () {
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index eea41514..786f3618 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -53,7 +53,7 @@
             <option value="following">{{ $t('settings.reply_visibility_following') }}</option>
             <option value="self">{{ $t('settings.reply_visibility_self') }}</option>
           </select>
-          <i class="icon-down-open" />
+          <FAIcon class="icon-down-open" icon="chevron-down" />
         </label>
       </div>
       <div>
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 0eb37e44..a39d7071 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -2,6 +2,14 @@ import Checkbox from 'src/components/checkbox/checkbox.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faChevronDown
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faChevronDown
+)
 
 const GeneralTab = {
   data () {
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 13482de7..9fc1470e 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -103,7 +103,7 @@
                   {{ subjectLineBehaviorDefaultValue == 'noop' ? $t('settings.instance_default_simple') : '' }}
                 </option>
               </select>
-              <i class="icon-down-open" />
+              <FAIcon class="icon-down-open" icon="chevron-down" />
             </label>
           </div>
         </li>
@@ -127,7 +127,7 @@
                   {{ postContentTypeDefaultValue === postFormat ? $t('settings.instance_default_simple') : '' }}
                 </option>
               </select>
-              <i class="icon-down-open" />
+              <FAIcon class="icon-down-open" icon="chevron-down" />
             </label>
           </div>
         </li>
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.js b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
index e3c5e80a..6cf75fe7 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.js
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
@@ -35,6 +35,14 @@ import ExportImport from 'src/components/export_import/export_import.vue'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 
 import Preview from './preview.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faChevronDown
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faChevronDown
+)
 
 // List of color values used in v1
 const v1OnlyNames = [
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index 5328c350..fb8b16ae 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -80,7 +80,7 @@
                     {{ style[0] || style.name }}
                   </option>
                 </select>
-                <i class="icon-down-open" />
+                <FAIcon class="icon-down-open" icon="chevron-down" />
               </label>
             </div>
           </template>
@@ -907,7 +907,7 @@
                     {{ $t('settings.style.shadows.components.' + shadow) }}
                   </option>
                 </select>
-                <i class="icon-down-open" />
+                <FAIcon class="icon-down-open" icon="chevron-down" />
               </label>
             </div>
             <div class="override">
diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js
index f9e7b985..800c39d5 100644
--- a/src/components/shadow_control/shadow_control.js
+++ b/src/components/shadow_control/shadow_control.js
@@ -2,6 +2,20 @@ import ColorInput from '../color_input/color_input.vue'
 import OpacityInput from '../opacity_input/opacity_input.vue'
 import { getCssShadow } from '../../services/style_setter/style_setter.js'
 import { hex2rgb } from '../../services/color_convert/color_convert.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes,
+  faChevronDown,
+  faChevronUp,
+  faPlus
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faChevronDown,
+  faChevronUp,
+  faTimes,
+  faPlus
+)
 
 const toModel = (object = {}) => ({
   x: 0,
diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index 815a9e59..1f63f3f2 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -78,35 +78,35 @@
               {{ $t('settings.style.shadows.shadow_id', { value: index }) }}
             </option>
           </select>
-          <i class="icon-down-open" />
+          <FAIcon icon="chevron-down" class="icon-down-open" />
         </label>
         <button
           class="btn btn-default"
           :disabled="!ready || !present"
           @click="del"
         >
-          <i class="icon-cancel" />
+          <FAIcon fixed-width icon="times" />
         </button>
         <button
           class="btn btn-default"
           :disabled="!moveUpValid"
           @click="moveUp"
         >
-          <i class="icon-up-open" />
+          <FAIcon fixed-width icon="chevron-up" />
         </button>
         <button
           class="btn btn-default"
           :disabled="!moveDnValid"
           @click="moveDn"
         >
-          <i class="icon-down-open" />
+          <FAIcon fixed-width icon="chevron-down" />
         </button>
         <button
           class="btn btn-default"
           :disabled="usingFallback"
           @click="add"
         >
-          <i class="icon-plus" />
+          <FAIcon fixed-width icon="plus" />
         </button>
       </div>
       <div

From 046c60cb61bd585e2fb2850320d229ab0487d9ba Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 20 Oct 2020 21:18:23 +0300
Subject: [PATCH 006/389] cancel -> times

---
 src/components/chat_message/chat_message.js         |  8 ++++++++
 src/components/chat_message/chat_message.vue        |  2 +-
 src/components/chat_panel/chat_panel.js             |  8 ++++++--
 src/components/chat_panel/chat_panel.vue            |  2 +-
 .../global_notice_list/global_notice_list.js        |  8 ++++++++
 .../global_notice_list/global_notice_list.vue       |  2 +-
 src/components/image_cropper/image_cropper.js       |  8 ++++++++
 src/components/image_cropper/image_cropper.vue      |  4 ++--
 src/components/login_form/login_form.js             |  8 ++++++++
 src/components/login_form/login_form.vue            |  2 +-
 src/components/mfa_form/recovery_form.js            |  8 ++++++++
 src/components/mfa_form/recovery_form.vue           |  2 +-
 src/components/mfa_form/totp_form.js                |  9 +++++++++
 src/components/mfa_form/totp_form.vue               |  2 +-
 src/components/mobile_nav/mobile_nav.js             |  8 ++++++++
 src/components/mobile_nav/mobile_nav.vue            |  2 +-
 src/components/password_reset/password_reset.js     |  8 ++++++++
 src/components/password_reset/password_reset.vue    |  2 +-
 src/components/post_status_form/post_status_form.js |  6 ++++--
 .../post_status_form/post_status_form.vue           | 10 +++++-----
 src/components/search_bar/search_bar.js             |  9 +++++++++
 src/components/search_bar/search_bar.vue            |  4 ++--
 src/components/settings_modal/tabs/profile_tab.js   |  8 ++++++++
 src/components/settings_modal/tabs/profile_tab.vue  | 12 ++++++------
 .../settings_modal/tabs/theme_tab/preview.vue       | 13 ++++++++++++-
 25 files changed, 127 insertions(+), 28 deletions(-)

diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index be4a7c89..4ad993e3 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -7,6 +7,14 @@ import LinkPreview from '../link-preview/link-preview.vue'
 import StatusContent from '../status_content/status_content.vue'
 import ChatMessageDate from '../chat_message_date/chat_message_date.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
 
 const ChatMessage = {
   name: 'ChatMessage',
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index e923d694..7973e5ef 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -56,7 +56,7 @@
                       class="dropdown-item dropdown-item-icon"
                       @click="deleteMessage"
                     >
-                      <i class="icon-cancel" /> {{ $t("chats.delete") }}
+                      <FAIcon icon="times" /> {{ $t("chats.delete") }}
                     </button>
                   </div>
                 </div>
diff --git a/src/components/chat_panel/chat_panel.js b/src/components/chat_panel/chat_panel.js
index 3dfec6df..c3887098 100644
--- a/src/components/chat_panel/chat_panel.js
+++ b/src/components/chat_panel/chat_panel.js
@@ -1,9 +1,13 @@
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faBullhorn } from '@fortawesome/free-solid-svg-icons'
+import {
+  faBullhorn,
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faBullhorn
+  faBullhorn,
+  faTimes
 )
 
 const chatPanel = {
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index b64535b0..fc06f542 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -13,7 +13,7 @@
           <span>{{ $t('shoutbox.title') }}</span>
           <i
             v-if="floating"
-            class="icon-cancel"
+            icon="times"
           />
         </div>
       </div>
diff --git a/src/components/global_notice_list/global_notice_list.js b/src/components/global_notice_list/global_notice_list.js
index 3af29c23..e93fba75 100644
--- a/src/components/global_notice_list/global_notice_list.js
+++ b/src/components/global_notice_list/global_notice_list.js
@@ -1,3 +1,11 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
 
 const GlobalNoticeList = {
   computed: {
diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
index 0e4285cc..2965cd0d 100644
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -10,7 +10,7 @@
         {{ $t(notice.messageKey, notice.messageArgs) }}
       </div>
       <i
-        class="button-icon icon-cancel"
+        class="button-icon" icon="times"
         @click="closeNotice(notice)"
       />
     </div>
diff --git a/src/components/image_cropper/image_cropper.js b/src/components/image_cropper/image_cropper.js
index 01361e25..9027b6eb 100644
--- a/src/components/image_cropper/image_cropper.js
+++ b/src/components/image_cropper/image_cropper.js
@@ -1,5 +1,13 @@
 import Cropper from 'cropperjs'
 import 'cropperjs/dist/cropper.css'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
 
 const ImageCropper = {
   props: {
diff --git a/src/components/image_cropper/image_cropper.vue b/src/components/image_cropper/image_cropper.vue
index 4e1b5927..389b06b9 100644
--- a/src/components/image_cropper/image_cropper.vue
+++ b/src/components/image_cropper/image_cropper.vue
@@ -41,8 +41,8 @@
         class="alert error"
       >
         {{ submitErrorMsg }}
-        <i
-          class="button-icon icon-cancel"
+        <FAIcon
+          class="button-icon" icon="times"
           @click="clearError"
         />
       </div>
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index 0d8f1da6..638bd812 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -1,5 +1,13 @@
 import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
 import oauthApi from '../../services/new_api/oauth.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
 
 const LoginForm = {
   data: () => ({
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index b4fdcefb..34f49576 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -77,7 +77,7 @@
       <div class="alert error">
         {{ error }}
         <i
-          class="button-icon icon-cancel"
+          class="button-icon" icon="times"
           @click="clearError"
         />
       </div>
diff --git a/src/components/mfa_form/recovery_form.js b/src/components/mfa_form/recovery_form.js
index b25c65dd..01a62a50 100644
--- a/src/components/mfa_form/recovery_form.js
+++ b/src/components/mfa_form/recovery_form.js
@@ -1,5 +1,13 @@
 import mfaApi from '../../services/new_api/mfa.js'
 import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
 
 export default {
   data: () => ({
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index 57294630..8e98054e 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -55,7 +55,7 @@
       <div class="alert error">
         {{ error }}
         <i
-          class="button-icon icon-cancel"
+          class="button-icon" icon="times"
           @click="clearError"
         />
       </div>
diff --git a/src/components/mfa_form/totp_form.js b/src/components/mfa_form/totp_form.js
index b774f2d0..6ee823ed 100644
--- a/src/components/mfa_form/totp_form.js
+++ b/src/components/mfa_form/totp_form.js
@@ -1,5 +1,14 @@
 import mfaApi from '../../services/new_api/mfa.js'
 import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
+
 export default {
   data: () => ({
     code: null,
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index a344b395..bad2286f 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -57,7 +57,7 @@
       <div class="alert error">
         {{ error }}
         <i
-          class="button-icon icon-cancel"
+          class="button-icon" icon="times"
           @click="clearError"
         />
       </div>
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index b2b5d264..bd32b266 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -3,6 +3,14 @@ import Notifications from '../notifications/notifications.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
 import { mapGetters } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
 
 const MobileNav = {
   components: {
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index abd95f09..e5664dc5 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -59,7 +59,7 @@
           class="mobile-nav-button"
           @click.stop.prevent="closeMobileNotifications()"
         >
-          <i class="button-icon icon-cancel" />
+          <FAIcon class="button-icon" icon="times" />
         </a>
       </div>
       <div
diff --git a/src/components/password_reset/password_reset.js b/src/components/password_reset/password_reset.js
index 5d21d720..3d94f5e7 100644
--- a/src/components/password_reset/password_reset.js
+++ b/src/components/password_reset/password_reset.js
@@ -1,5 +1,13 @@
 import { mapState } from 'vuex'
 import passwordResetApi from '../../services/new_api/password_reset.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
 
 const passwordReset = {
   data: () => ({
diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue
index 713c9dce..8e8225ed 100644
--- a/src/components/password_reset/password_reset.vue
+++ b/src/components/password_reset/password_reset.vue
@@ -66,7 +66,7 @@
               class="button-icon dismiss"
               @click.prevent="dismissError()"
             >
-              <i class="icon-cancel" />
+              <FAIcon icon="times" />
             </a>
           </p>
         </div>
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 1267225d..e763baa8 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -18,7 +18,8 @@ import {
   faSmileBeam,
   faPollH,
   faUpload,
-  faBan
+  faBan,
+  faTimes
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -26,7 +27,8 @@ library.add(
   faSmileBeam,
   faPollH,
   faUpload,
-  faBan
+  faBan,
+  faTimes
 )
 
 const buildMentionsString = ({ user, attentions = [] }, currentUser) => {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 9a5be689..7f7ac72f 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -40,7 +40,7 @@
             class="button-icon dismiss"
             @click.prevent="dismissScopeNotice()"
           >
-            <i class="icon-cancel" />
+            <FAIcon icon="times" />
           </a>
         </p>
         <p
@@ -52,7 +52,7 @@
             class="button-icon dismiss"
             @click.prevent="dismissScopeNotice()"
           >
-            <i class="icon-cancel" />
+            <FAIcon icon="times" />
           </a>
         </p>
         <p
@@ -64,7 +64,7 @@
             class="button-icon dismiss"
             @click.prevent="dismissScopeNotice()"
           >
-            <i class="icon-cancel" />
+            <FAIcon icon="times" />
           </a>
         </p>
         <p
@@ -285,7 +285,7 @@
       >
         Error: {{ error }}
         <i
-          class="button-icon icon-cancel"
+          class="button-icon" icon="times"
           @click="clearError"
         />
       </div>
@@ -296,7 +296,7 @@
           class="media-upload-wrapper"
         >
           <i
-            class="fa button-icon icon-cancel"
+            class="button-icon" icon="times"
             @click="removeMediaFile(file)"
           />
           <attachment
diff --git a/src/components/search_bar/search_bar.js b/src/components/search_bar/search_bar.js
index d7d85676..3699e262 100644
--- a/src/components/search_bar/search_bar.js
+++ b/src/components/search_bar/search_bar.js
@@ -1,3 +1,12 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
+
 const SearchBar = {
   data: () => ({
     searchTerm: undefined,
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 4d5a1aec..6a08ebe5 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -29,8 +29,8 @@
         >
           <i class="icon-search" />
         </button>
-        <i
-          class="button-icon icon-cancel"
+        <FAIcon
+          class="button-icon" icon="times"
           @click.prevent.stop="toggleHidden"
         />
       </template>
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index bd6bef6a..37e829bb 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -8,6 +8,14 @@ import EmojiInput from 'src/components/emoji_input/emoji_input.vue'
 import suggestor from 'src/components/emoji_input/suggestor.js'
 import Autosuggest from 'src/components/autosuggest/autosuggest.vue'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
 
 const ProfileTab = {
   data () {
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index cf88c4e4..df54551c 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -129,7 +129,7 @@
           >
             <i
               v-show="newFields.length > 1"
-              class="icon-cancel"
+              icon="times"
               @click="deleteField(i)"
             />
           </div>
@@ -169,7 +169,7 @@
         <i
           v-if="!isDefaultAvatar && pickAvatarBtnVisible"
           :title="$t('settings.reset_avatar')"
-          class="reset-button icon-cancel"
+          class="reset-button" icon="times"
           type="button"
           @click="resetAvatar"
         />
@@ -197,7 +197,7 @@
         <i
           v-if="!isDefaultBanner"
           :title="$t('settings.reset_profile_banner')"
-          class="reset-button icon-cancel"
+          class="reset-button" icon="times"
           type="button"
           @click="resetBanner"
         />
@@ -231,7 +231,7 @@
       >
         Error: {{ bannerUploadError }}
         <i
-          class="button-icon icon-cancel"
+          class="button-icon" icon="times"
           @click="clearUploadError('banner')"
         />
       </div>
@@ -243,7 +243,7 @@
         <i
           v-if="!isDefaultBackground"
           :title="$t('settings.reset_profile_background')"
-          class="reset-button icon-cancel"
+          class="reset-button" icon="times"
           type="button"
           @click="resetBackground"
         />
@@ -277,7 +277,7 @@
       >
         Error: {{ backgroundUploadError }}
         <i
-          class="button-icon icon-cancel"
+          class="button-icon" icon="times"
           @click="clearUploadError('background')"
         />
       </div>
diff --git a/src/components/settings_modal/tabs/theme_tab/preview.vue b/src/components/settings_modal/tabs/theme_tab/preview.vue
index 9d984659..c8cb2665 100644
--- a/src/components/settings_modal/tabs/theme_tab/preview.vue
+++ b/src/components/settings_modal/tabs/theme_tab/preview.vue
@@ -53,7 +53,7 @@
               />
               <i
                 style="color: var(--cRed)"
-                class="button-icon icon-cancel"
+                class="button-icon" icon="times"
               />
             </div>
           </div>
@@ -103,6 +103,17 @@
   </div>
 </template>
 
+<script>
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faTimes
+)
+</script>
+
 <style lang="scss">
 .preview-container {
   position: relative;

From b19c2eb0fb45aca4f4a59c4afacaffddf695987d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 20 Oct 2020 22:13:19 +0300
Subject: [PATCH 007/389] More stuff. Buttons in user card's corner now have
 MUCH bigger hitboxes

---
 src/App.scss                                  |  6 ++--
 .../account_actions/account_actions.js        |  8 +++++
 .../account_actions/account_actions.vue       | 32 +++++++++----------
 src/components/chat/chat.js                   |  6 ++--
 src/components/chat/chat.scss                 |  8 ++---
 src/components/chat/chat.vue                  |  2 +-
 src/components/chat_message/chat_message.js   |  6 ++--
 src/components/chat_message/chat_message.scss |  2 +-
 src/components/chat_message/chat_message.vue  |  3 +-
 src/components/chat_new/chat_new.js           | 10 ++++++
 src/components/chat_new/chat_new.scss         |  6 ++--
 src/components/chat_new/chat_new.vue          |  4 +--
 src/components/media_modal/media_modal.js     | 10 ++++++
 src/components/media_modal/media_modal.vue    |  4 +--
 src/components/mobile_nav/mobile_nav.js       |  8 +++--
 src/components/mobile_nav/mobile_nav.vue      | 11 +++----
 .../mobile_post_status_button.js              |  8 +++++
 .../mobile_post_status_button.vue             |  4 +--
 src/components/search/search.js               |  8 +++--
 src/components/search/search.vue              |  2 +-
 src/components/search_bar/search_bar.js       |  6 ++--
 src/components/search_bar/search_bar.vue      |  2 +-
 .../settings_modal_content.scss               |  2 +-
 .../settings_modal/tabs/general_tab.js        |  6 ++--
 .../settings_modal/tabs/general_tab.vue       |  2 +-
 .../settings_modal/tabs/profile_tab.js        |  6 ++--
 .../settings_modal/tabs/profile_tab.vue       |  2 +-
 src/components/side_drawer/side_drawer.js     | 28 ++++++++++++++++
 src/components/side_drawer/side_drawer.vue    | 24 +++++++-------
 src/components/user_card/user_card.vue        | 20 ++++++++----
 src/hocs/with_load_more/with_load_more.js     | 12 ++++++-
 .../with_subscription/with_subscription.js    | 12 ++++++-
 32 files changed, 188 insertions(+), 82 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 10969abb..126a3297 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -85,7 +85,7 @@ button {
   font-family: sans-serif;
   font-family: var(--interfaceFont, sans-serif);
 
-  i[class*=icon-] {
+  i[class*=icon-], .svg-inline--fa {
     color: $fallback--text;
     color: var(--btnText, $fallback--text);
   }
@@ -389,7 +389,7 @@ i[class*=icon-], .svg-inline--fa  {
   box-sizing: border-box;
 
   button {
-    &, i[class*=icon-] {
+    &, i[class*=icon-], svg {
       color: $fallback--text;
       color: var(--btnTopBarText, $fallback--text);
     }
@@ -463,7 +463,7 @@ i[class*=icon-], .svg-inline--fa  {
     flex-basis: 970px;
     height: 50px;
 
-    a, a i {
+    a, a i, a svg {
       color: $fallback--link;
       color: var(--topBarLink, $fallback--link);
     }
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index 6d345bc7..395d6685 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -1,6 +1,14 @@
 import { mapState } from 'vuex'
 import ProgressButton from '../progress_button/progress_button.vue'
 import Popover from '../popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faEllipsisV
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faEllipsisV
+)
 
 const AccountActions = {
   props: [
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 987e94b7..61099d4f 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="account-actions">
+  <div class="AccountActions">
     <Popover
       trigger="click"
       placement="bottom"
@@ -63,7 +63,7 @@
         slot="trigger"
         class="btn btn-default ellipsis-button"
       >
-        <i class="icon-ellipsis trigger-button" />
+        <FAIcon class="icon" icon="ellipsis-v" />
       </div>
     </Popover>
   </div>
@@ -73,22 +73,22 @@
 
 <style lang="scss">
 @import '../../_variables.scss';
-.account-actions {
-  margin: 0 .8em;
-}
+.AccountActions {
+  button.dropdown-item {
+    margin-left: 0;
+  }
 
-.account-actions button.dropdown-item {
-  margin-left: 0;
-}
+  .ellipsis-button {
+    cursor: pointer;
+    width: 2.5em;
+    margin: -0.5em 0;
+    padding: 0.5em 0;
+    text-align: center;
 
-.account-actions .trigger-button {
-  color: $fallback--lightText;
-  color: var(--lightText, $fallback--lightText);
-  opacity: .8;
-  cursor: pointer;
-  &:hover {
-    color: $fallback--text;
-    color: var(--text, $fallback--text);
+    &:not(:hover) .icon {
+      color: $fallback--lightText;
+      color: var(--lightText, $fallback--lightText);
+    }
   }
 }
 </style>
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 1630ba80..083f850f 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -9,11 +9,13 @@ import { promiseInterval } from '../../services/promise_interval/promise_interva
 import { getScrollPosition, getNewTopPosition, isBottomedOut, scrollableContainerHeight } from './chat_layout_utils.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faChevronDown
+  faChevronDown,
+  faChevronLeft
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faChevronDown
+  faChevronDown,
+  faChevronLeft
 )
 
 const BOTTOMED_OUT_OFFSET = 10
diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index 012a1b1d..b7b0d377 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -58,12 +58,8 @@
 
   .go-back-button {
     cursor: pointer;
-    margin-right: 1.4em;
-
-    i {
-      display: flex;
-      align-items: center;
-    }
+    margin-right: 1.7em;
+    margin-left: 0.3em;
   }
 
   .jump-to-bottom-button {
diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
index 0d44c920..0670f1ac 100644
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@@ -14,7 +14,7 @@
             class="go-back-button"
             @click="goBack"
           >
-            <i class="button-icon icon-left-open" />
+            <FAIcon size="lg" icon="chevron-left" />
           </a>
           <div class="title text-center">
             <ChatTitle
diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index 4ad993e3..bb380f87 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -9,11 +9,13 @@ import ChatMessageDate from '../chat_message_date/chat_message_date.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faTimes
+  faTimes,
+  faEllipsisH
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faTimes
+  faTimes,
+  faEllipsisH
 )
 
 const ChatMessage = {
diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss
index 7d4ff60c..53ca7cce 100644
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@@ -24,7 +24,7 @@
     }
   }
 
-  .icon-ellipsis {
+  .menu-icon {
     cursor: pointer;
 
     &:hover, .extra-button-popover.open & {
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index 7973e5ef..d5b8bb9e 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -62,9 +62,10 @@
                 </div>
                 <button
                   slot="trigger"
+                  class="menu-icon"
                   :title="$t('chats.more')"
                 >
-                  <i class="icon-ellipsis" />
+                  <FAIcon icon="ellipsis-h" />
                 </button>
               </Popover>
             </div>
diff --git a/src/components/chat_new/chat_new.js b/src/components/chat_new/chat_new.js
index d023efc0..71585995 100644
--- a/src/components/chat_new/chat_new.js
+++ b/src/components/chat_new/chat_new.js
@@ -1,6 +1,16 @@
 import { mapState, mapGetters } from 'vuex'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faSearch,
+  faChevronLeft
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faSearch,
+  faChevronLeft
+)
 
 const chatNew = {
   components: {
diff --git a/src/components/chat_new/chat_new.scss b/src/components/chat_new/chat_new.scss
index 11305444..716172b0 100644
--- a/src/components/chat_new/chat_new.scss
+++ b/src/components/chat_new/chat_new.scss
@@ -8,9 +8,7 @@
     }
   }
 
-  .icon-search {
-    font-size: 1.5em;
-    float: right;
+  .search-icon {
     margin-right: 0.3em;
   }
 
@@ -25,5 +23,7 @@
 
   .go-back-button {
     cursor: pointer;
+    margin-right: 1.7em;
+    margin-left: 0.3em;
   }
 }
diff --git a/src/components/chat_new/chat_new.vue b/src/components/chat_new/chat_new.vue
index 3333dbf9..95eebe6b 100644
--- a/src/components/chat_new/chat_new.vue
+++ b/src/components/chat_new/chat_new.vue
@@ -11,12 +11,12 @@
         class="go-back-button"
         @click="goBack"
       >
-        <i class="button-icon icon-left-open" />
+        <FAIcon size="lg" icon="chevron-left" />
       </a>
     </div>
     <div class="input-wrap">
       <div class="input-search">
-        <i class="button-icon icon-search" />
+        <FAIcon size="lg" class="search-icon button-icon" icon="search" />
       </div>
       <input
         ref="search"
diff --git a/src/components/media_modal/media_modal.js b/src/components/media_modal/media_modal.js
index 24764e80..e7384c93 100644
--- a/src/components/media_modal/media_modal.js
+++ b/src/components/media_modal/media_modal.js
@@ -3,6 +3,16 @@ import VideoAttachment from '../video_attachment/video_attachment.vue'
 import Modal from '../modal/modal.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import GestureService from '../../services/gesture_service/gesture_service'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faChevronLeft,
+  faChevronRight
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faChevronLeft,
+  faChevronRight
+)
 
 const MediaModal = {
   components: {
diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index 46931667..cbcfc6d2 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -34,7 +34,7 @@
       class="modal-view-button-arrow modal-view-button-arrow--prev"
       @click.stop.prevent="goPrev"
     >
-      <i class="icon-left-open arrow-icon" />
+      <FAIcon class="arrow-icon" icon="chevron-left" />
     </button>
     <button
       v-if="canNavigate"
@@ -42,7 +42,7 @@
       class="modal-view-button-arrow modal-view-button-arrow--next"
       @click.stop.prevent="goNext"
     >
-      <i class="icon-right-open arrow-icon" />
+      <FAIcon class="arrow-icon" icon="chevron-right" />
     </button>
   </Modal>
 </template>
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index bd32b266..9e736cfb 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -5,11 +5,15 @@ import GestureService from '../../services/gesture_service/gesture_service'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faTimes
+  faTimes,
+  faBell,
+  faBars
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faTimes
+  faTimes,
+  faBell,
+  faBars
 )
 
 const MobileNav = {
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index e5664dc5..4d91af77 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -15,7 +15,7 @@
             class="mobile-nav-button"
             @click.stop.prevent="toggleMobileSidebar()"
           >
-            <i class="button-icon icon-menu" />
+            <FAIcon size="lg" class="button-icon" icon="bars" />
             <div
               v-if="unreadChatCount"
               class="alert-dot"
@@ -37,7 +37,7 @@
             href="#"
             @click.stop.prevent="openMobileNotifications()"
           >
-            <i class="button-icon icon-bell-alt" />
+            <FAIcon size="lg" class="button-icon" icon="bell" />
             <div
               v-if="unseenNotificationsCount"
               class="alert-dot"
@@ -59,7 +59,7 @@
           class="mobile-nav-button"
           @click.stop.prevent="closeMobileNotifications()"
         >
-          <FAIcon class="button-icon" icon="times" />
+          <FAIcon size="lg" class="button-icon" icon="times" />
         </a>
       </div>
       <div
@@ -91,9 +91,8 @@
 }
 
 .mobile-nav-button {
-  display: flex;
-  justify-content: center;
-  width: 50px;
+  text-align: center;
+  margin: 0 1em;
   position: relative;
   cursor: pointer;
 }
diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js
index 6348277b..366ea89c 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.js
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.js
@@ -1,4 +1,12 @@
 import { debounce } from 'lodash'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faPen
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faPen
+)
 
 const HIDDEN_FOR_PAGES = new Set([
   'chats',
diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.vue b/src/components/mobile_post_status_button/mobile_post_status_button.vue
index 9cf45de3..50529878 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.vue
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.vue
@@ -5,7 +5,7 @@
       :class="{ 'hidden': isHidden }"
       @click="openPostForm"
     >
-      <i class="icon-edit" />
+      <FAIcon icon="pen" />
     </button>
   </div>
 </template>
@@ -39,7 +39,7 @@
     transform: translateY(150%);
   }
 
-  i {
+  svg {
     font-size: 1.5em;
     color: $fallback--text;
     color: var(--text, $fallback--text);
diff --git a/src/components/search/search.js b/src/components/search/search.js
index 3eb92fc1..b62bc2c5 100644
--- a/src/components/search/search.js
+++ b/src/components/search/search.js
@@ -3,10 +3,14 @@ import Conversation from '../conversation/conversation.vue'
 import Status from '../status/status.vue'
 import map from 'lodash/map'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+import {
+  faCircleNotch,
+  faSearch
+} from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faCircleNotch
+  faCircleNotch,
+  faSearch
 )
 
 const Search = {
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index a6677e4b..d32f48d9 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -17,7 +17,7 @@
         class="btn search-button"
         @click="newQuery(searchTerm)"
       >
-        <i class="icon-search" />
+        <FAIcon icon="search" />
       </button>
     </div>
     <div
diff --git a/src/components/search_bar/search_bar.js b/src/components/search_bar/search_bar.js
index 3699e262..7ae8b21b 100644
--- a/src/components/search_bar/search_bar.js
+++ b/src/components/search_bar/search_bar.js
@@ -1,10 +1,12 @@
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faTimes
+  faTimes,
+  faSearch
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faTimes
+  faTimes,
+  faSearch
 )
 
 const SearchBar = {
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 6a08ebe5..ecc0febf 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -27,7 +27,7 @@
           class="btn search-button"
           @click="find(searchTerm)"
         >
-          <i class="icon-search" />
+          <FAIcon icon="search" />
         </button>
         <FAIcon
           class="button-icon" icon="times"
diff --git a/src/components/settings_modal/settings_modal_content.scss b/src/components/settings_modal/settings_modal_content.scss
index a3fef1cf..f066234c 100644
--- a/src/components/settings_modal/settings_modal_content.scss
+++ b/src/components/settings_modal/settings_modal_content.scss
@@ -31,7 +31,7 @@
     }
 
     .unavailable,
-    .unavailable i {
+    .unavailable svg {
       color: var(--cRed, $fallback--cRed);
       color: $fallback--cRed;
     }
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index a39d7071..df592a10 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -4,11 +4,13 @@ import InterfaceLanguageSwitcher from 'src/components/interface_language_switche
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faChevronDown
+  faChevronDown,
+  faGlobe
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faChevronDown
+  faChevronDown,
+  faGlobe
 )
 
 const GeneralTab = {
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 9fc1470e..2ab6b314 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -222,7 +222,7 @@
                 v-if="!loopSilentAvailable"
                 class="unavailable"
               >
-                <i class="icon-globe" />! {{ $t('settings.limited_availability') }}
+                <FAIcon icon="globe" />! {{ $t('settings.limited_availability') }}
               </div>
             </li>
           </ul>
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 37e829bb..22037218 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -10,11 +10,13 @@ import Autosuggest from 'src/components/autosuggest/autosuggest.vue'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faTimes
+  faTimes,
+  faPlus
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faTimes
+  faTimes,
+  faPlus
 )
 
 const ProfileTab = {
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index df54551c..7013b65d 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -139,7 +139,7 @@
           class="add-field faint"
           @click="addField"
         >
-          <i class="icon-plus" />
+          <FAIcon icon="plus" />
           {{ $t("settings.profile_fields.add_field") }}
         </a>
       </div>
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index 281052e5..fe736168 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -2,6 +2,34 @@ import { mapState, mapGetters } from 'vuex'
 import UserCard from '../user_card/user_card.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faSignInAlt,
+  faSignOutAlt,
+  faHome,
+  faComments,
+  faBell,
+  faUserPlus,
+  faBullhorn,
+  faSearch,
+  faTachometerAlt,
+  faCog,
+  faInfoCircle
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faSignInAlt,
+  faSignOutAlt,
+  faHome,
+  faComments,
+  faBell,
+  faUserPlus,
+  faBullhorn,
+  faSearch,
+  faTachometerAlt,
+  faCog,
+  faInfoCircle
+)
 
 const SideDrawer = {
   props: [ 'logout' ],
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index eda5a68c..fbdb2441 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -36,7 +36,7 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'login' }">
-            <i class="button-icon icon-login" /> {{ $t("login.login") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="sign-in-alt" /> {{ $t("login.login") }}
           </router-link>
         </li>
         <li
@@ -44,7 +44,7 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: timelinesRoute }">
-            <i class="button-icon icon-home-2" /> {{ $t("nav.timelines") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="home" /> {{ $t("nav.timelines") }}
           </router-link>
         </li>
         <li
@@ -55,7 +55,7 @@
             :to="{ name: 'chats', params: { username: currentUser.screen_name } }"
             style="position: relative"
           >
-            <i class="button-icon icon-chat" /> {{ $t("nav.chats") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="comments" /> {{ $t("nav.chats") }}
             <span
               v-if="unreadChatCount"
               class="badge badge-notification unread-chat-count"
@@ -68,7 +68,7 @@
       <ul v-if="currentUser">
         <li @click="toggleDrawer">
           <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="bell" /> {{ $t("nav.interactions") }}
           </router-link>
         </li>
         <li
@@ -76,7 +76,7 @@
           @click="toggleDrawer"
         >
           <router-link to="/friend-requests">
-            <i class="button-icon icon-user-plus" /> {{ $t("nav.friend_requests") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="user-plus" /> {{ $t("nav.friend_requests") }}
             <span
               v-if="followRequestCount > 0"
               class="badge follow-request-count"
@@ -90,7 +90,7 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'chat' }">
-            <i class="button-icon icon-megaphone" /> {{ $t("shoutbox.title") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="bullhorn" /> {{ $t("shoutbox.title") }}
           </router-link>
         </li>
       </ul>
@@ -100,7 +100,7 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'search' }">
-            <i class="button-icon icon-search" /> {{ $t("nav.search") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="search" /> {{ $t("nav.search") }}
           </router-link>
         </li>
         <li
@@ -108,7 +108,7 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'who-to-follow' }">
-            <i class="button-icon icon-user-plus" /> {{ $t("nav.who_to_follow") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="user-plus" /> {{ $t("nav.who_to_follow") }}
           </router-link>
         </li>
         <li @click="toggleDrawer">
@@ -116,12 +116,12 @@
             href="#"
             @click="openSettingsModal"
           >
-            <i class="button-icon icon-cog" /> {{ $t("settings.settings") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="cog" /> {{ $t("settings.settings") }}
           </a>
         </li>
         <li @click="toggleDrawer">
           <router-link :to="{ name: 'about'}">
-            <i class="button-icon icon-info-circled" /> {{ $t("nav.about") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="info-circle" /> {{ $t("nav.about") }}
           </router-link>
         </li>
         <li
@@ -132,7 +132,7 @@
             href="/pleroma/admin/#/login-pleroma"
             target="_blank"
           >
-            <i class="button-icon icon-gauge" /> {{ $t("nav.administration") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="tachometer-alt" /> {{ $t("nav.administration") }}
           </a>
         </li>
         <li
@@ -143,7 +143,7 @@
             href="#"
             @click="doLogout"
           >
-            <i class="button-icon icon-logout" /> {{ $t("login.logout") }}
+            <FAIcon size="lg" fixed-width class="button-icon" icon="sign-out-alt" /> {{ $t("login.logout") }}
           </a>
         </li>
       </ul>
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index cfdeaa17..4f7df789 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -54,8 +54,9 @@
                 v-if="isOtherUser && !user.is_local"
                 :href="user.statusnet_profile_url"
                 target="_blank"
+                class="external-link-button"
               >
-                <FAIcon class="usersettings" icon="external-link-alt" />
+                <FAIcon class="icon" icon="external-link-alt" />
               </a>
               <AccountActions
                 v-if="isOtherUser && loggedIn"
@@ -289,7 +290,7 @@
     mask: linear-gradient(to top, white, transparent) bottom no-repeat,
           linear-gradient(to top, white, white);
     // Autoprefixed seem to ignore this one, and also syntax is different
-    -webkit-mask-composite: xor;
+                                                 -webkit-mask-composite: xor;
     mask-composite: exclude;
     background-size: cover;
     mask-size: 100% 60%;
@@ -404,10 +405,17 @@
     }
   }
 
-  .usersettings {
-    color: $fallback--lightText;
-    color: var(--lightText, $fallback--lightText);
-    opacity: .8;
+  .external-link-button {
+    cursor: pointer;
+    width: 2.5em;
+    text-align: center;
+    margin: -0.5em 0;
+    padding: 0.5em 0;
+
+    &:not(:hover) .icon {
+      color: $fallback--lightText;
+      color: var(--lightText, $fallback--lightText);
+    }
   }
 
   .user-summary {
diff --git a/src/hocs/with_load_more/with_load_more.js b/src/hocs/with_load_more/with_load_more.js
index 6142f513..afb51a0f 100644
--- a/src/hocs/with_load_more/with_load_more.js
+++ b/src/hocs/with_load_more/with_load_more.js
@@ -3,6 +3,16 @@ import isEmpty from 'lodash/isEmpty'
 import { getComponentProps } from '../../services/component_utils/component_utils'
 import './with_load_more.scss'
 
+import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faCircleNotch
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch
+)
+
 const withLoadMore = ({
   fetch, // function to fetch entries and return a promise
   select, // function to select data from store
@@ -82,7 +92,7 @@ const withLoadMore = ({
           </WrappedComponent>
           <div class="with-load-more-footer">
             {this.error && <a onClick={this.fetchEntries} class="alert error">{this.$t('general.generic_error')}</a>}
-            {!this.error && this.loading && <i class="icon-spin3 animate-spin"/>}
+            {!this.error && this.loading && <FAIcon spin icon="circle-notch"/>}
             {!this.error && !this.loading && !this.bottomedOut && <a onClick={this.fetchEntries}>{this.$t('general.more')}</a>}
           </div>
         </div>
diff --git a/src/hocs/with_subscription/with_subscription.js b/src/hocs/with_subscription/with_subscription.js
index 1775adcb..b1244276 100644
--- a/src/hocs/with_subscription/with_subscription.js
+++ b/src/hocs/with_subscription/with_subscription.js
@@ -3,6 +3,16 @@ import isEmpty from 'lodash/isEmpty'
 import { getComponentProps } from '../../services/component_utils/component_utils'
 import './with_subscription.scss'
 
+import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faCircleNotch
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch
+)
+
 const withSubscription = ({
   fetch, // function to fetch entries and return a promise
   select, // function to select data from store
@@ -72,7 +82,7 @@ const withSubscription = ({
           <div class="with-subscription-loading">
             {this.error
               ? <a onClick={this.fetchData} class="alert error">{this.$t('general.generic_error')}</a>
-              : <i class="icon-spin3 animate-spin"/>
+              : <FAIcon spin icon="circle-notch"/>
             }
           </div>
         )

From 3cbaa0044943341fa4af4e4eb880649fc7eecda4 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 20 Oct 2020 22:54:43 +0300
Subject: [PATCH 008/389] more replacements + small renames

---
 src/App.scss                                  |  6 ++-
 src/App.vue                                   | 26 +++++++-----
 src/components/font_control/font_control.vue  |  2 +-
 .../interface_language_switcher.vue           |  2 +-
 src/components/poll/poll_form.vue             |  4 +-
 .../post_status_form/post_status_form.vue     |  2 +-
 src/components/search_bar/search_bar.js       |  3 +-
 src/components/search_bar/search_bar.vue      | 41 +++++++++++--------
 .../settings_modal/settings_modal_content.js  | 23 +++++++++++
 .../settings_modal/settings_modal_content.vue |  8 ++--
 .../settings_modal/tabs/filtering_tab.vue     |  2 +-
 .../settings_modal/tabs/general_tab.vue       |  4 +-
 .../settings_modal/tabs/theme_tab/preview.vue | 28 +++++++++----
 .../tabs/theme_tab/theme_tab.vue              |  4 +-
 .../shadow_control/shadow_control.vue         |  2 +-
 src/components/tab_switcher/tab_switcher.js   |  3 +-
 src/components/tab_switcher/tab_switcher.scss |  3 +-
 src/components/user_card/user_card.vue        |  2 +-
 18 files changed, 106 insertions(+), 59 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 126a3297..06915e16 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -188,7 +188,7 @@ input, textarea, .select, .input {
     opacity: 0.5;
   }
 
-  .icon-down-open {
+  .select-down-icon {
     position: absolute;
     top: 0;
     bottom: 0;
@@ -368,7 +368,9 @@ i[class*=icon-], .svg-inline--fa  {
   flex-wrap: wrap;
 
   .nav-icon {
-    margin-left: 0.4em;
+    margin-left: 0.2em;
+    width: 2em;
+    text-align: center;
   }
 
   &.right {
diff --git a/src/App.vue b/src/App.vue
index 0276c6a6..5efaf717 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,36 +42,42 @@
         <div class="item right">
           <search-bar
             v-if="currentUser || !privateMode"
-            class="nav-icon mobile-hidden"
+            class="mobile-hidden"
             @toggled="onSearchBarToggled"
             @click.stop.native
           />
           <a
             href="#"
-            class="mobile-hidden"
+            class="mobile-hidden nav-icon"
             @click.stop="openSettingsModal"
           >
-            <i
-              class="button-icon icon-cog nav-icon"
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon" icon="cog"
               :title="$t('nav.preferences')"
             />
           </a>
           <a
             v-if="currentUser && currentUser.role === 'admin'"
             href="/pleroma/admin/#/login-pleroma"
-            class="mobile-hidden"
+            class="mobile-hidden nav-icon"
             target="_blank"
-          ><i
-            class="button-icon icon-gauge nav-icon"
+          ><FAIcon
+             fixed-width
+              size="lg"
+             class="button-icon" icon="tachometer-alt"
             :title="$t('nav.administration')"
           /></a>
           <a
             v-if="currentUser"
             href="#"
-            class="mobile-hidden"
+            class="mobile-hidden nav-icon"
             @click.prevent="logout"
-          ><i
-            class="button-icon icon-logout nav-icon"
+          ><FAIcon
+             fixed-width
+              size="lg"
+             class="button-icon" icon="sign-out-alt"
             :title="$t('login.logout')"
           /></a>
         </div>
diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
index 40aed190..6070ab22 100644
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@@ -41,7 +41,7 @@
           {{ option === 'custom' ? $t('settings.style.fonts.custom') : option }}
         </option>
       </select>
-      <FAIcon class="icon-down-open" icon="chevron-down" />
+      <FAIcon class="select-down-icon" icon="chevron-down" />
     </label>
     <input
       v-if="isCustom"
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index 2a3d4cbb..76bdcdfe 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -19,7 +19,7 @@
           {{ languageNames[i] }}
         </option>
       </select>
-      <FAIcon class="icon-down-open" icon="chevron-down" />
+      <FAIcon class="select-down-icon" icon="chevron-down" />
     </label>
   </div>
 </template>
diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index 3a8a2f42..8c4ada89 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -56,7 +56,7 @@
             <option value="single">{{ $t('polls.single_choice') }}</option>
             <option value="multiple">{{ $t('polls.multiple_choices') }}</option>
           </select>
-          <FAIcon class="icon-down-open" icon="chevron-down"/>
+          <FAIcon class="select-down-icon" icon="chevron-down"/>
         </label>
       </div>
       <div
@@ -84,7 +84,7 @@
               {{ $t(`time.${unit}_short`, ['']) }}
             </option>
           </select>
-          <FAIcon class="icon-down-open" icon="chevron-down"/>
+          <FAIcon class="select-down-icon" icon="chevron-down"/>
         </label>
       </div>
     </div>
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 7f7ac72f..817b2fa0 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -199,7 +199,7 @@
                   {{ $t(`post_status.content_type["${postFormat}"]`) }}
                 </option>
               </select>
-              <FAIcon class="icon-down-open" icon="chevron-down"/>
+              <FAIcon class="select-down-icon" icon="chevron-down"/>
             </label>
           </div>
           <div
diff --git a/src/components/search_bar/search_bar.js b/src/components/search_bar/search_bar.js
index 7ae8b21b..551649c7 100644
--- a/src/components/search_bar/search_bar.js
+++ b/src/components/search_bar/search_bar.js
@@ -13,8 +13,7 @@ const SearchBar = {
   data: () => ({
     searchTerm: undefined,
     hidden: true,
-    error: false,
-    loading: false
+    error: false
   }),
   watch: {
     '$route': function (route) {
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index ecc0febf..fbbbbfe0 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -1,17 +1,17 @@
 <template>
   <div>
     <div class="search-bar-container">
-      <i
-        v-if="loading"
-        class="icon-spin4 finder-icon animate-spin-slow"
-      />
       <a
         v-if="hidden"
         href="#"
+        class="nav-icon"
         :title="$t('nav.search')"
-      ><i
-        class="button-icon icon-search"
-        @click.prevent.stop="toggleHidden"
+      ><FAIcon
+         fixed-width
+         size="lg"
+         class="button-icon"
+         icon="search"
+         @click.prevent.stop="toggleHidden"
       /></a>
       <template v-else>
         <input
@@ -27,12 +27,20 @@
           class="btn search-button"
           @click="find(searchTerm)"
         >
-          <FAIcon icon="search" />
+          <FAIcon
+            fixed-width
+            icon="search"
+            />
         </button>
-        <FAIcon
-          class="button-icon" icon="times"
-          @click.prevent.stop="toggleHidden"
-        />
+        <span>
+          <FAIcon
+            size="lg"
+            fixed-width
+            icon="times"
+            class="cancel-icon"
+            @click.prevent.stop="toggleHidden"
+          />
+        </span>
       </template>
     </div>
   </div>
@@ -60,13 +68,10 @@
     max-width: calc(100% - 30px - 30px - 20px);
   }
 
-  .search-button {
-    margin-left: .5em;
-    margin-right: .5em;
-  }
-
-  .icon-cancel {
+  .cancel-icon {
     cursor: pointer;
+    color: $fallback--text;
+    color: var(--btnTopBarText, $fallback--text);
   }
 }
 
diff --git a/src/components/settings_modal/settings_modal_content.js b/src/components/settings_modal/settings_modal_content.js
index ef1a5ffa..9dcf1b5a 100644
--- a/src/components/settings_modal/settings_modal_content.js
+++ b/src/components/settings_modal/settings_modal_content.js
@@ -10,6 +10,29 @@ import GeneralTab from './tabs/general_tab.vue'
 import VersionTab from './tabs/version_tab.vue'
 import ThemeTab from './tabs/theme_tab/theme_tab.vue'
 
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faWrench,
+  faUser,
+  faFilter,
+  faPaintBrush,
+  faBell,
+  faDownload,
+  faEyeSlash,
+  faInfo
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faWrench,
+  faUser,
+  faFilter,
+  faPaintBrush,
+  faBell,
+  faDownload,
+  faEyeSlash,
+  faInfo
+)
+
 const SettingsModalContent = {
   components: {
     TabSwitcher,
diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
index bc30a0ff..c9ed2a38 100644
--- a/src/components/settings_modal/settings_modal_content.vue
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -37,7 +37,7 @@
     </div>
     <div
       :label="$t('settings.theme')"
-      icon="brush"
+      icon="paint-brush"
       data-tab-name="theme"
     >
       <ThemeTab />
@@ -45,7 +45,7 @@
     <div
       v-if="isLoggedIn"
       :label="$t('settings.notifications')"
-      icon="bell-ringing-o"
+      icon="bell"
       data-tab-name="notifications"
     >
       <NotificationsTab />
@@ -62,14 +62,14 @@
       v-if="isLoggedIn"
       :label="$t('settings.mutes_and_blocks')"
       :fullHeight="true"
-      icon="eye-off"
+      icon="eye-slash"
       data-tab-name="mutesAndBlocks"
     >
       <MutesAndBlocksTab />
     </div>
     <div
       :label="$t('settings.version.title')"
-      icon="info-circled"
+      icon="info"
       data-tab-name="version"
     >
       <VersionTab />
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 786f3618..ff1a129b 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -53,7 +53,7 @@
             <option value="following">{{ $t('settings.reply_visibility_following') }}</option>
             <option value="self">{{ $t('settings.reply_visibility_self') }}</option>
           </select>
-          <FAIcon class="icon-down-open" icon="chevron-down" />
+          <FAIcon class="select-down-icon" icon="chevron-down" />
         </label>
       </div>
       <div>
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 2ab6b314..99d3a0dc 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -103,7 +103,7 @@
                   {{ subjectLineBehaviorDefaultValue == 'noop' ? $t('settings.instance_default_simple') : '' }}
                 </option>
               </select>
-              <FAIcon class="icon-down-open" icon="chevron-down" />
+              <FAIcon class="select-down-icon" icon="chevron-down" />
             </label>
           </div>
         </li>
@@ -127,7 +127,7 @@
                   {{ postContentTypeDefaultValue === postFormat ? $t('settings.instance_default_simple') : '' }}
                 </option>
               </select>
-              <FAIcon class="icon-down-open" icon="chevron-down" />
+              <FAIcon class="select-down-icon" icon="chevron-down" />
             </label>
           </div>
         </li>
diff --git a/src/components/settings_modal/tabs/theme_tab/preview.vue b/src/components/settings_modal/tabs/theme_tab/preview.vue
index c8cb2665..65863c54 100644
--- a/src/components/settings_modal/tabs/theme_tab/preview.vue
+++ b/src/components/settings_modal/tabs/theme_tab/preview.vue
@@ -39,19 +39,23 @@
             </i18n>
 
             <div class="icons">
-              <i
+              <FAIcon
+                fixed-width
                 style="color: var(--cBlue)"
-                class="button-icon icon-reply"
+                class="button-icon" icon="reply"
               />
-              <i
+              <FAIcon
+                fixed-width
                 style="color: var(--cGreen)"
-                class="button-icon icon-retweet"
+                class="button-icon" icon="retweet"
               />
-              <i
+              <FAIcon
+                fixed-width
                 style="color: var(--cOrange)"
-                class="button-icon icon-star"
+                class="button-icon" icon="star"
               />
-              <i
+              <FAIcon
+                fixed-width
                 style="color: var(--cRed)"
                 class="button-icon" icon="times"
               />
@@ -106,11 +110,17 @@
 <script>
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faTimes
+  faTimes,
+  faStar,
+  faRetweet,
+  faReply
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faTimes
+  faTimes,
+  faStar,
+  faRetweet,
+  faReply
 )
 </script>
 
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index fb8b16ae..9cc1c392 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -80,7 +80,7 @@
                     {{ style[0] || style.name }}
                   </option>
                 </select>
-                <FAIcon class="icon-down-open" icon="chevron-down" />
+                <FAIcon class="select-down-icon" icon="chevron-down" />
               </label>
             </div>
           </template>
@@ -907,7 +907,7 @@
                     {{ $t('settings.style.shadows.components.' + shadow) }}
                   </option>
                 </select>
-                <FAIcon class="icon-down-open" icon="chevron-down" />
+                <FAIcon class="select-down-icon" icon="chevron-down" />
               </label>
             </div>
             <div class="override">
diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index 1f63f3f2..32220ae8 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -78,7 +78,7 @@
               {{ $t('settings.style.shadows.shadow_id', { value: index }) }}
             </option>
           </select>
-          <FAIcon icon="chevron-down" class="icon-down-open" />
+          <FAIcon icon="chevron-down" class="select-down-icon" />
         </label>
         <button
           class="btn btn-default"
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 9c1da354..6e6e8193 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import { mapState } from 'vuex'
+import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
 
 import './tab_switcher.scss'
 
@@ -107,7 +108,7 @@ export default Vue.component('tab-switcher', {
               class={classesTab.join(' ')}
               type="button"
             >
-              {!slot.data.attrs.icon ? '' : (<i class={'tab-icon icon-' + slot.data.attrs.icon}/>)}
+              {!slot.data.attrs.icon ? '' : (<FAIcon class="tab-icon" size="2x" fixed-width icon={slot.data.attrs.icon}/>)}
               <span class="text">
                 {slot.data.attrs.label}
               </span>
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index d2ef4857..cd8fff6f 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -4,7 +4,8 @@
   display: flex;
 
   .tab-icon {
-    font-size: 2em;
+    width: 100%;
+    margin: 0.2em 0;
     display: block;
   }
 
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 4f7df789..6c35c781 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -136,7 +136,7 @@
                 <option value="striped">Striped bg</option>
                 <option value="side">Side stripe</option>
               </select>
-              <FAIcon class="icon-down-open" icon="chevron-down" />
+              <FAIcon class="select-down-icon" icon="chevron-down" />
             </label>
           </div>
         </div>

From a50cd7e37dce6e95f2c3d6cc63c382af71a2926e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 21 Oct 2020 00:01:28 +0300
Subject: [PATCH 009/389] remaining changes...

---
 src/components/attachment/attachment.js       | 22 +++++++--
 src/components/attachment/attachment.vue      | 14 ++++--
 src/components/chat_panel/chat_panel.vue      |  7 +--
 .../global_notice_list/global_notice_list.vue |  2 +-
 src/components/image_cropper/image_cropper.js |  6 ++-
 .../image_cropper/image_cropper.vue           |  5 +-
 src/components/importer/importer.js           | 11 +++++
 src/components/importer/importer.vue          | 14 +++---
 src/components/login_form/login_form.vue      |  2 +-
 src/components/mfa_form/recovery_form.vue     |  2 +-
 src/components/mfa_form/totp_form.vue         |  6 ++-
 .../password_reset/password_reset.vue         |  2 +-
 src/components/poll/poll_form.vue             |  9 ++++
 .../post_status_form/post_status_form.js      |  6 ++-
 .../post_status_form/post_status_form.vue     | 46 ++++++-------------
 .../settings_modal/tabs/profile_tab.js        |  6 ++-
 .../settings_modal/tabs/profile_tab.scss      |  6 +--
 .../settings_modal/tabs/profile_tab.vue       | 28 ++++++-----
 src/components/status/status.scss             |  5 --
 .../status_content/status_content.js          | 18 ++++++++
 .../status_content/status_content.vue         | 28 ++++++-----
 src/components/user_profile/user_profile.js   |  8 ++++
 src/components/user_profile/user_profile.vue  |  6 ++-
 23 files changed, 162 insertions(+), 97 deletions(-)

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index cb31020d..e23fcb1b 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -3,6 +3,20 @@ import VideoAttachment from '../video_attachment/video_attachment.vue'
 import nsfwImage from '../../assets/nsfw.png'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { mapGetters } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faFile,
+  faMusic,
+  faImage,
+  faVideo
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faFile,
+  faMusic,
+  faImage,
+  faVideo
+)
 
 const Attachment = {
   props: [
@@ -39,10 +53,10 @@ const Attachment = {
       return this.attachment.description
     },
     placeholderIconClass () {
-      if (this.type === 'image') return 'icon-picture'
-      if (this.type === 'video') return 'icon-video'
-      if (this.type === 'audio') return 'icon-music'
-      return 'icon-doc'
+      if (this.type === 'image') return 'image'
+      if (this.type === 'video') return 'video'
+      if (this.type === 'audio') return 'music'
+      return 'file'
     },
     referrerpolicy () {
       return this.$store.state.instance.mediaProxyAvailable ? '' : 'no-referrer'
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 19c713d5..0b7a3f9c 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -12,7 +12,7 @@
       :alt="attachment.description"
       :title="attachment.description"
     >
-      <span :class="placeholderIconClass" />
+      <FAIcon :icon="placeholderIconClass" />
       <b>{{ nsfw ? "NSFW / " : "" }}</b>{{ placeholderName }}
     </a>
   </div>
@@ -36,9 +36,9 @@
         :src="nsfwImage"
         :class="{'small': isSmall}"
       >
-      <i
+      <FAIcon
         v-if="type === 'video'"
-        class="play-icon icon-play-circled"
+        class="play-icon" icon="play-circle"
       />
     </a>
     <div
@@ -83,9 +83,9 @@
         @play="$emit('play')"
         @pause="$emit('pause')"
       />
-      <i
+      <FAIcon
         v-if="!allowPlay"
-        class="play-icon icon-play-circled"
+        class="play-icon" icon="play-circle"
       />
     </a>
 
@@ -142,6 +142,10 @@
     white-space: nowrap;
     text-overflow: ellipsis;
     max-width: 100%;
+
+    svg {
+      color: inherit;
+    }
   }
 
   .nsfw-placeholder {
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index fc06f542..51b99563 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -11,7 +11,7 @@
       >
         <div class="title">
           <span>{{ $t('shoutbox.title') }}</span>
-          <i
+          <FAIcon
             v-if="floating"
             icon="times"
           />
@@ -63,7 +63,7 @@
         @click.stop.prevent="togglePanel"
       >
         <div class="title">
-          <FAIcon icon="bullhorn" />
+          <FAIcon class="icon" icon="bullhorn" />
           {{ $t('shoutbox.title') }}
         </div>
       </div>
@@ -87,7 +87,8 @@
 .chat-panel {
   .chat-heading {
     cursor: pointer;
-    .icon-comment-empty {
+
+    .icon {
       color: $fallback--text;
       color: var(--text, $fallback--text);
     }
diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
index 2965cd0d..3a7139f4 100644
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -9,7 +9,7 @@
       <div class="notice-message">
         {{ $t(notice.messageKey, notice.messageArgs) }}
       </div>
-      <i
+      <FAIcon
         class="button-icon" icon="times"
         @click="closeNotice(notice)"
       />
diff --git a/src/components/image_cropper/image_cropper.js b/src/components/image_cropper/image_cropper.js
index 9027b6eb..59e4d07e 100644
--- a/src/components/image_cropper/image_cropper.js
+++ b/src/components/image_cropper/image_cropper.js
@@ -2,11 +2,13 @@ import Cropper from 'cropperjs'
 import 'cropperjs/dist/cropper.css'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faTimes
+  faTimes,
+  faCircleNotch
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faTimes
+  faTimes,
+  faCircleNotch
 )
 
 const ImageCropper = {
diff --git a/src/components/image_cropper/image_cropper.vue b/src/components/image_cropper/image_cropper.vue
index 389b06b9..e69cbd0b 100644
--- a/src/components/image_cropper/image_cropper.vue
+++ b/src/components/image_cropper/image_cropper.vue
@@ -31,9 +31,10 @@
           @click="submit(false)"
           v-text="saveWithoutCroppingText"
         />
-        <i
+        <FAIcon
           v-if="submitting"
-          class="icon-spin4 animate-spin"
+          spin
+          icon="circle-notch"
         />
       </div>
       <div
diff --git a/src/components/importer/importer.js b/src/components/importer/importer.js
index c5f9e4d2..59f9beb1 100644
--- a/src/components/importer/importer.js
+++ b/src/components/importer/importer.js
@@ -1,3 +1,14 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faCircleNotch,
+  faTimes
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch,
+  faTimes
+)
+
 const Importer = {
   props: {
     submitHandler: {
diff --git a/src/components/importer/importer.vue b/src/components/importer/importer.vue
index ed923d59..c4fe5b00 100644
--- a/src/components/importer/importer.vue
+++ b/src/components/importer/importer.vue
@@ -7,9 +7,11 @@
         @change="change"
       >
     </form>
-    <i
+    <FAIcon
       v-if="submitting"
-      class="icon-spin4 animate-spin importer-uploading"
+      class="importer-uploading"
+      spin
+      icon="circle-notch"
     />
     <button
       v-else
@@ -19,15 +21,15 @@
       {{ submitButtonLabel }}
     </button>
     <div v-if="success">
-      <i
-        class="icon-cross"
+      <FAIcon
+        icon="times"
         @click="dismiss"
       />
       <p>{{ successMessage }}</p>
     </div>
     <div v-else-if="error">
-      <i
-        class="icon-cross"
+      <FAIcon
+        icon="times"
         @click="dismiss"
       />
       <p>{{ errorMessage }}</p>
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index 34f49576..f6b767a2 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -76,7 +76,7 @@
     >
       <div class="alert error">
         {{ error }}
-        <i
+        <FAIcon
           class="button-icon" icon="times"
           @click="clearError"
         />
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index 8e98054e..61dbda24 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -54,7 +54,7 @@
     >
       <div class="alert error">
         {{ error }}
-        <i
+        <FAIcon
           class="button-icon" icon="times"
           @click="clearError"
         />
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index bad2286f..0c6412ea 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -56,8 +56,10 @@
     >
       <div class="alert error">
         {{ error }}
-        <i
-          class="button-icon" icon="times"
+        <FAIcon
+          size="lg"
+          class="button-icon"
+          icon="times"
           @click="clearError"
         />
       </div>
diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue
index 8e8225ed..3fe42b84 100644
--- a/src/components/password_reset/password_reset.vue
+++ b/src/components/password_reset/password_reset.vue
@@ -122,7 +122,7 @@
     padding-right: 2rem;
   }
 
-  .icon-cancel {
+  .dismiss {
     cursor: pointer;
   }
 }
diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index 8c4ada89..f3e7a716 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -26,6 +26,7 @@
       >
         <FAIcon
           icon="times"
+          class="delete"
           @click="deleteOption(index)"
         />
       </div>
@@ -129,6 +130,14 @@
     width: 1.5em;
     margin-left: -1.5em;
     z-index: 1;
+
+    .delete {
+      cursor: pointer;
+
+      &:hover {
+        color: inherit;
+      }
+    }
   }
 
   .poll-type-expiry {
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index e763baa8..1bdf9833 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -19,7 +19,8 @@ import {
   faPollH,
   faUpload,
   faBan,
-  faTimes
+  faTimes,
+  faCircleNotch
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -28,7 +29,8 @@ library.add(
   faPollH,
   faUpload,
   faBan,
-  faTimes
+  faTimes,
+  faCircleNotch
 )
 
 const buildMentionsString = ({ user, attentions = [] }, currentUser) => {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 817b2fa0..428b8560 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -85,9 +85,10 @@
             {{ $t('post_status.preview') }}
             <i :class="showPreview ? 'icon-left-open' : 'icon-right-open'" />
           </a>
-          <i
+          <FAIcon
             v-show="previewLoading"
-            class="icon-spin3 animate-spin"
+            spin
+            icon="circle-notch"
           />
         </div>
         <div
@@ -284,8 +285,10 @@
         class="alert error"
       >
         Error: {{ error }}
-        <i
-          class="button-icon" icon="times"
+        <FAIcon
+          class="button-icon"
+          size="lg"
+          icon="times"
           @click="clearError"
         />
       </div>
@@ -295,7 +298,7 @@
           :key="file.url"
           class="media-upload-wrapper"
         >
-          <i
+          <FAIcon
             class="button-icon" icon="times"
             @click="removeMediaFile(file)"
           />
@@ -379,10 +382,6 @@
     padding-left: 0.5em;
     display: flex;
     width: 100%;
-
-    .icon-spin3 {
-      margin-left: auto;
-    }
   }
 
   .preview-toggle {
@@ -477,7 +476,7 @@
     text-align: right;
   }
 
-  .icon-chart-bar {
+  .poll-icon {
     cursor: pointer;
   }
 
@@ -490,19 +489,6 @@
     margin-bottom: .5em;
     width: 18em;
 
-    .icon-cancel {
-      display: inline-block;
-      position: static;
-      margin: 0;
-      padding-bottom: 0;
-      margin-left: $fallback--attachmentRadius;
-      margin-left: var(--attachmentRadius, $fallback--attachmentRadius);
-      background-color: $fallback--fg;
-      background-color: var(--btn, $fallback--fg);
-      border-bottom-left-radius: 0;
-      border-bottom-right-radius: 0;
-    }
-
     img, video {
       object-fit: contain;
       max-height: 10em;
@@ -525,7 +511,7 @@
     flex-direction: column;
   }
 
-  .media-upload-wrapper .attachments {
+   .attachments .media-upload-wrapper{
     padding: 0 0.5em;
 
     .attachment {
@@ -534,11 +520,14 @@
       position: relative;
     }
 
-    i {
+    .button-icon {
       position: absolute;
       margin: 10px;
-      padding: 5px;
+      margin: .75em;
+      padding: .5em;
       background: rgba(230,230,230,0.6);
+      z-index: 2;
+      color: black;
       border-radius: $fallback--attachmentRadius;
       border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
       font-weight: bold;
@@ -615,11 +604,6 @@
     cursor: not-allowed;
   }
 
-  .icon-cancel {
-    cursor: pointer;
-    z-index: 4;
-  }
-
   @keyframes fade-in {
     from { opacity: 0; }
     to   { opacity: 0.6; }
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 22037218..a3e4feaf 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -11,12 +11,14 @@ import Checkbox from 'src/components/checkbox/checkbox.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faTimes,
-  faPlus
+  faPlus,
+  faCircleNotch
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
   faTimes,
-  faPlus
+  faPlus,
+  faCircleNotch
 )
 
 const ProfileTab = {
diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index e14cf054..e821f952 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -119,10 +119,8 @@
 
     &>.icon-container {
       width: 20px;
-
-      &>.icon-cancel {
-        vertical-align: sub;
-      }
+      align-self: center;
+      margin: 0 .2em .5em;
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 7013b65d..773c77de 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -127,7 +127,7 @@
           <div
             class="icon-container"
           >
-            <i
+            <FAIcon
               v-show="newFields.length > 1"
               icon="times"
               @click="deleteField(i)"
@@ -166,7 +166,7 @@
           :src="user.profile_image_url_original"
           class="current-avatar"
         >
-        <i
+        <FAIcon
           v-if="!isDefaultAvatar && pickAvatarBtnVisible"
           :title="$t('settings.reset_avatar')"
           class="reset-button" icon="times"
@@ -194,7 +194,7 @@
       <h2>{{ $t('settings.profile_banner') }}</h2>
       <div class="banner-background-preview">
         <img :src="user.cover_photo">
-        <i
+        <FAIcon
           v-if="!isDefaultBanner"
           :title="$t('settings.reset_profile_banner')"
           class="reset-button" icon="times"
@@ -214,9 +214,11 @@
           @change="uploadFile('banner', $event)"
         >
       </div>
-      <i
+      <FAIcon
         v-if="bannerUploading"
-        class=" icon-spin4 animate-spin uploading"
+        class="uploading"
+        spin
+        icon="circle-notch"
       />
       <button
         v-else-if="bannerPreview"
@@ -230,7 +232,7 @@
         class="alert error"
       >
         Error: {{ bannerUploadError }}
-        <i
+        <FAIcon
           class="button-icon" icon="times"
           @click="clearUploadError('banner')"
         />
@@ -240,7 +242,7 @@
       <h2>{{ $t('settings.profile_background') }}</h2>
       <div class="banner-background-preview">
         <img :src="user.background_image">
-        <i
+        <FAIcon
           v-if="!isDefaultBackground"
           :title="$t('settings.reset_profile_background')"
           class="reset-button" icon="times"
@@ -260,9 +262,11 @@
           @change="uploadFile('background', $event)"
         >
       </div>
-      <i
+      <FAIcon
         v-if="backgroundUploading"
-        class=" icon-spin4 animate-spin uploading"
+        class="uploading"
+        spin
+        icon="circle-notch"
       />
       <button
         v-else-if="backgroundPreview"
@@ -276,8 +280,10 @@
         class="alert error"
       >
         Error: {{ backgroundUploadError }}
-        <i
-          class="button-icon" icon="times"
+        <FAIcon
+          size="lg"
+          class="button-icon"
+          icon="times"
           @click="clearUploadError('background')"
         />
       </div>
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index cd5366ed..ea9e538d 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -156,11 +156,6 @@ $status-margin: 0.75em;
       text-overflow: ellipsis;
       overflow-x: hidden;
     }
-
-    .icon-reply {
-      // mirror the icon
-      transform: scaleX(-1);
-    }
   }
 
   & .reply-to-popover,
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index df095de3..a6f79d76 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -7,6 +7,24 @@ import fileType from 'src/services/file_type/file_type.service'
 import { processHtml } from 'src/services/tiny_post_html_processor/tiny_post_html_processor.service.js'
 import { mentionMatchesUrl, extractTagFromUrl } from 'src/services/matcher/matcher.service.js'
 import { mapGetters, mapState } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faCircleNotch,
+  faFile,
+  faMusic,
+  faImage,
+  faLink,
+  faPollH
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch,
+  faFile,
+  faMusic,
+  faImage,
+  faLink,
+  faPollH
+)
 
 const StatusContent = {
   name: 'StatusContent',
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index f7fb5ee2..321cd477 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -55,29 +55,29 @@
         @click.prevent="toggleShowMore"
       >
         {{ $t("status.show_content") }}
-        <span
+        <FAIcon
           v-if="attachmentTypes.includes('image')"
-          class="icon-picture"
+          icon="image"
         />
-        <span
+        <FAIcon
           v-if="attachmentTypes.includes('video')"
-          class="icon-video"
+          icon="video"
         />
-        <span
+        <FAIcon
           v-if="attachmentTypes.includes('audio')"
-          class="icon-music"
+          icon="music"
         />
-        <span
+        <FAIcon
           v-if="attachmentTypes.includes('unknown')"
-          class="icon-doc"
+          icon="file"
         />
-        <span
+        <FAIcon
           v-if="status.poll && status.poll.options"
-          class="icon-chart-bar"
+          icon="poll-h"
         />
-        <span
+        <FAIcon
           v-if="status.card"
-          class="icon-link"
+          icon="link"
         />
       </a>
       <a
@@ -182,6 +182,10 @@ $status-margin: 0.75em;
     text-align: center;
     display: inline-block;
     word-break: break-all;
+
+    svg {
+      color: inherit;
+    }
   }
 
   img, video {
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 201727d4..c0b55a6c 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -6,6 +6,14 @@ import Conversation from '../conversation/conversation.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js'
 import List from '../list/list.vue'
 import withLoadMore from '../../hocs/with_load_more/with_load_more'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faCircleNotch
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faCircleNotch
+)
 
 const FollowerList = withLoadMore({
   fetch: (props, $store) => $store.dispatch('fetchFollowers', props.userId),
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index b26499b4..f1f51840 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -122,9 +122,10 @@
       </div>
       <div class="panel-body">
         <span v-if="error">{{ error }}</span>
-        <i
+        <FAIcon
           v-else
-          class="icon-spin3 animate-spin"
+          spin
+          icon="circle-notch"
         />
       </div>
     </div>
@@ -142,6 +143,7 @@
 
   .user-profile-fields {
     margin: 0 0.5em;
+
     img {
       object-fit: contain;
       vertical-align: middle;

From 7495c6b698e0afe169c1138baabc29f70d4b44a2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 21 Oct 2020 00:02:58 +0300
Subject: [PATCH 010/389] fix attachment remove pointer

---
 src/components/post_status_form/post_status_form.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 428b8560..3cd9e7a5 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -511,7 +511,7 @@
     flex-direction: column;
   }
 
-   .attachments .media-upload-wrapper{
+   .attachments .media-upload-wrapper {
     padding: 0 0.5em;
 
     .attachment {
@@ -531,6 +531,7 @@
       border-radius: $fallback--attachmentRadius;
       border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
       font-weight: bold;
+      cursor: pointer;
     }
   }
 

From 6aa7445ea7f8f76adbc31d018ebb3228294aef41 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 21 Oct 2020 00:25:59 +0300
Subject: [PATCH 011/389] come on and slam

---
 src/components/nav_panel/nav_panel.js            | 4 ++--
 src/components/scope_selector/scope_selector.js  | 4 ++--
 src/components/scope_selector/scope_selector.vue | 2 +-
 src/components/status/status.js                  | 6 +++---
 src/components/timeline_menu/timeline_menu.js    | 4 ++--
 src/components/timeline_menu/timeline_menu.vue   | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 87e54133..81d49cc2 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -4,7 +4,7 @@ import { mapState, mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faUsers,
-  faGlobeEurope,
+  faGlobe,
   faBookmark,
   faEnvelope,
   faHome,
@@ -15,7 +15,7 @@ import {
 
 library.add(
   faUsers,
-  faGlobeEurope,
+  faGlobe,
   faBookmark,
   faEnvelope,
   faHome,
diff --git a/src/components/scope_selector/scope_selector.js b/src/components/scope_selector/scope_selector.js
index ddb20ff2..2c9d06e0 100644
--- a/src/components/scope_selector/scope_selector.js
+++ b/src/components/scope_selector/scope_selector.js
@@ -3,12 +3,12 @@ import {
   faEnvelope,
   faLock,
   faUnlock,
-  faGlobeEurope
+  faGlobe
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
   faEnvelope,
-  faGlobeEurope,
+  faGlobe,
   faLock,
   faUnlock
 )
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index ddd89422..c098783d 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -37,7 +37,7 @@
       :title="$t('post_status.scope.public')"
       @click="changeVis('public')"
       >
-      <FAIcon icon="globe-europe" class="button-icon" size="lg" />
+      <FAIcon icon="globe" class="button-icon" size="lg" />
     </span>
   </div>
 </template>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 5b93054f..46fa3b76 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -22,7 +22,7 @@ import {
   faEnvelope,
   faLock,
   faUnlock,
-  faGlobeEurope,
+  faGlobe,
   faTimes,
   faRetweet,
   faReply,
@@ -38,7 +38,7 @@ import {
 
 library.add(
   faEnvelope,
-  faGlobeEurope,
+  faGlobe,
   faLock,
   faUnlock,
   faTimes,
@@ -270,7 +270,7 @@ const Status = {
         case 'direct':
           return 'envelope'
         default:
-          return 'globe-europe'
+          return 'globe'
       }
     },
     showError (error) {
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index 991c600d..4ccd52b4 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -3,7 +3,7 @@ import { mapState } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faUsers,
-  faGlobeEurope,
+  faGlobe,
   faBookmark,
   faEnvelope,
   faHome,
@@ -12,7 +12,7 @@ import {
 
 library.add(
   faUsers,
-  faGlobeEurope,
+  faGlobe,
   faBookmark,
   faEnvelope,
   faHome,
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index 590752d3..1e546fae 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -36,7 +36,7 @@
         </li>
         <li v-if="federating && (currentUser || !privateMode)">
           <router-link :to="{ name: 'public-external-timeline' }">
-            <FAIcon fixed-width size="lg" class="button-icon " icon="globe-europe" />{{ $t("nav.twkn") }}
+            <FAIcon fixed-width size="lg" class="button-icon " icon="globe" />{{ $t("nav.twkn") }}
           </router-link>
         </li>
       </ul>

From 1ec41302f729ac9100c3ec0cede5e4f79dd626a3 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 21 Oct 2020 00:28:24 +0300
Subject: [PATCH 012/389] rotate the shackle of the lock for better
 accessibility

---
 src/components/scope_selector/scope_selector.js  | 4 ++--
 src/components/scope_selector/scope_selector.vue | 2 +-
 src/components/status/status.js                  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/scope_selector/scope_selector.js b/src/components/scope_selector/scope_selector.js
index 2c9d06e0..74bf7284 100644
--- a/src/components/scope_selector/scope_selector.js
+++ b/src/components/scope_selector/scope_selector.js
@@ -2,7 +2,7 @@ import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faEnvelope,
   faLock,
-  faUnlock,
+  faLockOpen,
   faGlobe
 } from '@fortawesome/free-solid-svg-icons'
 
@@ -10,7 +10,7 @@ library.add(
   faEnvelope,
   faGlobe,
   faLock,
-  faUnlock
+  faLockOpen
 )
 
 const ScopeSelector = {
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index c098783d..d490f8ee 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -28,7 +28,7 @@
       :title="$t('post_status.scope.unlisted')"
       @click="changeVis('unlisted')"
       >
-      <FAIcon icon="unlock" class="button-icon" size="lg" />
+      <FAIcon icon="lock-open" class="button-icon" size="lg" />
     </span>
     <span
       v-if="showPublic"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 46fa3b76..142e1fc6 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -21,7 +21,7 @@ import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faEnvelope,
   faLock,
-  faUnlock,
+  faLockOpen,
   faGlobe,
   faTimes,
   faRetweet,
@@ -40,7 +40,7 @@ library.add(
   faEnvelope,
   faGlobe,
   faLock,
-  faUnlock,
+  faLockOpen,
   faTimes,
   faRetweet,
   faReply,
@@ -266,7 +266,7 @@ const Status = {
         case 'private':
           return 'lock'
         case 'unlisted':
-          return 'unlock'
+          return 'lock-open'
         case 'direct':
           return 'envelope'
         default:

From f561e755530063b2e8e0db210264b1d244543bd0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 21 Oct 2020 00:31:16 +0300
Subject: [PATCH 013/389] lint

---
 src/App.vue                                   | 17 ++--
 .../account_actions/account_actions.vue       |  5 +-
 src/components/attachment/attachment.vue      |  6 +-
 src/components/chat/chat.vue                  |  5 +-
 src/components/chat_new/chat_new.vue          | 11 ++-
 src/components/chat_panel/chat_panel.vue      |  5 +-
 src/components/emoji_picker/emoji_picker.vue  | 10 ++-
 src/components/exporter/exporter.vue          |  6 +-
 src/components/extra_buttons/extra_buttons.js |  2 +-
 .../extra_buttons/extra_buttons.vue           | 48 +++++++++--
 src/components/font_control/font_control.vue  |  5 +-
 .../global_notice_list/global_notice_list.vue |  3 +-
 .../image_cropper/image_cropper.vue           |  3 +-
 .../interface_language_switcher.vue           |  5 +-
 src/components/login_form/login_form.vue      |  3 +-
 src/components/media_modal/media_modal.vue    | 10 ++-
 src/components/mfa_form/recovery_form.vue     |  3 +-
 src/components/mobile_nav/mobile_nav.vue      | 18 +++-
 src/components/nav_panel/nav_panel.vue        | 35 ++++++--
 src/components/notification/notification.vue  | 33 ++++++--
 .../notifications/notifications.vue           |  6 +-
 .../panel_loading/panel_loading.vue           |  6 +-
 src/components/poll/poll_form.vue             | 15 +++-
 .../post_status_form/post_status_form.vue     | 12 ++-
 .../retweet_button/retweet_button.vue         | 18 ++--
 .../scope_selector/scope_selector.vue         | 36 +++++---
 src/components/search/search.vue              |  6 +-
 src/components/search_bar/search_bar.vue      | 12 +--
 .../settings_modal/tabs/filtering_tab.vue     |  5 +-
 .../settings_modal/tabs/general_tab.vue       | 10 ++-
 .../settings_modal/tabs/profile_tab.vue       | 12 ++-
 .../settings_modal/tabs/theme_tab/preview.vue | 12 ++-
 .../tabs/theme_tab/theme_tab.vue              | 10 ++-
 .../shadow_control/shadow_control.vue         | 25 ++++--
 src/components/side_drawer/side_drawer.vue    | 84 ++++++++++++++++---
 src/components/status/status.vue              | 44 +++++++---
 .../status_popover/status_popover.vue         |  6 +-
 src/components/timeline/timeline.vue          |  6 +-
 .../timeline_menu/timeline_menu.vue           | 40 +++++++--
 src/components/user_card/user_card.vue        | 33 ++++++--
 .../user_list_popover/user_list_popover.vue   |  6 +-
 41 files changed, 497 insertions(+), 140 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5efaf717..c27f51bf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -54,7 +54,8 @@
             <FAIcon
               fixed-width
               size="lg"
-              class="button-icon" icon="cog"
+              class="button-icon"
+              icon="cog"
               :title="$t('nav.preferences')"
             />
           </a>
@@ -64,9 +65,10 @@
             class="mobile-hidden nav-icon"
             target="_blank"
           ><FAIcon
-             fixed-width
-              size="lg"
-             class="button-icon" icon="tachometer-alt"
+            fixed-width
+            size="lg"
+            class="button-icon"
+            icon="tachometer-alt"
             :title="$t('nav.administration')"
           /></a>
           <a
@@ -75,9 +77,10 @@
             class="mobile-hidden nav-icon"
             @click.prevent="logout"
           ><FAIcon
-             fixed-width
-              size="lg"
-             class="button-icon" icon="sign-out-alt"
+            fixed-width
+            size="lg"
+            class="button-icon"
+            icon="sign-out-alt"
             :title="$t('login.logout')"
           /></a>
         </div>
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 61099d4f..e3ae376e 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -63,7 +63,10 @@
         slot="trigger"
         class="btn btn-default ellipsis-button"
       >
-        <FAIcon class="icon" icon="ellipsis-v" />
+        <FAIcon
+          class="icon"
+          icon="ellipsis-v"
+        />
       </div>
     </Popover>
   </div>
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 0b7a3f9c..f1fac2c8 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -38,7 +38,8 @@
       >
       <FAIcon
         v-if="type === 'video'"
-        class="play-icon" icon="play-circle"
+        class="play-icon"
+        icon="play-circle"
       />
     </a>
     <div
@@ -85,7 +86,8 @@
       />
       <FAIcon
         v-if="!allowPlay"
-        class="play-icon" icon="play-circle"
+        class="play-icon"
+        icon="play-circle"
       />
     </a>
 
diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
index 0670f1ac..5f58b9a6 100644
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@@ -14,7 +14,10 @@
             class="go-back-button"
             @click="goBack"
           >
-            <FAIcon size="lg" icon="chevron-left" />
+            <FAIcon
+              size="lg"
+              icon="chevron-left"
+            />
           </a>
           <div class="title text-center">
             <ChatTitle
diff --git a/src/components/chat_new/chat_new.vue b/src/components/chat_new/chat_new.vue
index 95eebe6b..8f02a699 100644
--- a/src/components/chat_new/chat_new.vue
+++ b/src/components/chat_new/chat_new.vue
@@ -11,12 +11,19 @@
         class="go-back-button"
         @click="goBack"
       >
-        <FAIcon size="lg" icon="chevron-left" />
+        <FAIcon
+          size="lg"
+          icon="chevron-left"
+        />
       </a>
     </div>
     <div class="input-wrap">
       <div class="input-search">
-        <FAIcon size="lg" class="search-icon button-icon" icon="search" />
+        <FAIcon
+          size="lg"
+          class="search-icon button-icon"
+          icon="search"
+        />
       </div>
       <input
         ref="search"
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index 51b99563..7993c94d 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -63,7 +63,10 @@
         @click.stop.prevent="togglePanel"
       >
         <div class="title">
-          <FAIcon class="icon" icon="bullhorn" />
+          <FAIcon
+            class="icon"
+            icon="bullhorn"
+          />
           {{ $t('shoutbox.title') }}
         </div>
       </div>
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index bd093c99..3262a3d9 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -13,7 +13,10 @@
           :title="group.text"
           @click.prevent="highlight(group.id)"
         >
-          <FAIcon :icon="group.icon" fixed-width/>
+          <FAIcon
+            :icon="group.icon"
+            fixed-width
+          />
         </span>
       </span>
       <span
@@ -26,7 +29,10 @@
           :title="$t('emoji.stickers')"
           @click.prevent="toggleStickers"
         >
-          <FAIcon icon="sticky-note" fixed-width/>
+          <FAIcon
+            icon="sticky-note"
+            fixed-width
+          />
         </span>
       </span>
     </div>
diff --git a/src/components/exporter/exporter.vue b/src/components/exporter/exporter.vue
index 156db9a3..ecd71bf1 100644
--- a/src/components/exporter/exporter.vue
+++ b/src/components/exporter/exporter.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="exporter">
     <div v-if="processing">
-      <FAIcon icon="circle-notch" size="lg" spin />
+      <FAIcon
+        icon="circle-notch"
+        size="lg"
+        spin
+      />
 
       <span>{{ processingMessage }}</span>
     </div>
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index f325b2b4..1a8eef72 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -8,7 +8,7 @@ import {
   faShareAlt
 } from '@fortawesome/free-solid-svg-icons'
 import {
-  faBookmark as faBookmarkReg,
+  faBookmark as faBookmarkReg
 } from '@fortawesome/free-regular-svg-icons'
 
 library.add(
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 1889eaed..4bf1e62a 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -15,14 +15,22 @@
           class="dropdown-item dropdown-item-icon"
           @click.prevent="muteConversation"
         >
-          <FAIcon size="md" fixed-width icon="eye-slash" /><span>{{ $t("status.mute_conversation") }}</span>
+          <FAIcon
+            size="md"
+            fixed-width
+            icon="eye-slash"
+          /><span>{{ $t("status.mute_conversation") }}</span>
         </button>
         <button
           v-if="canMute && status.thread_muted"
           class="dropdown-item dropdown-item-icon"
           @click.prevent="unmuteConversation"
         >
-          <FAIcon size="md" fixed-width icon="eye-slash" /><span>{{ $t("status.unmute_conversation") }}</span>
+          <FAIcon
+            size="md"
+            fixed-width
+            icon="eye-slash"
+          /><span>{{ $t("status.unmute_conversation") }}</span>
         </button>
         <button
           v-if="!status.pinned && canPin"
@@ -30,7 +38,11 @@
           @click.prevent="pinStatus"
           @click="close"
         >
-          <FAIcon size="md" fixed-width icon="thumbtack" /><span>{{ $t("status.pin") }}</span>
+          <FAIcon
+            size="md"
+            fixed-width
+            icon="thumbtack"
+          /><span>{{ $t("status.pin") }}</span>
         </button>
         <button
           v-if="status.pinned && canPin"
@@ -38,7 +50,11 @@
           @click.prevent="unpinStatus"
           @click="close"
         >
-          <FAIcon size="md" fixed-width icon="thumbtack" /><span>{{ $t("status.unpin") }}</span>
+          <FAIcon
+            size="md"
+            fixed-width
+            icon="thumbtack"
+          /><span>{{ $t("status.unpin") }}</span>
         </button>
         <button
           v-if="!status.bookmarked"
@@ -46,7 +62,11 @@
           @click.prevent="bookmarkStatus"
           @click="close"
         >
-          <FAIcon size="md" fixed-width :icon="['far', 'bookmark']" /><span>{{ $t("status.bookmark") }}</span>
+          <FAIcon
+            size="md"
+            fixed-width
+            :icon="['far', 'bookmark']"
+          /><span>{{ $t("status.bookmark") }}</span>
         </button>
         <button
           v-if="status.bookmarked"
@@ -54,7 +74,11 @@
           @click.prevent="unbookmarkStatus"
           @click="close"
         >
-          <FAIcon size="md" fixed-width icon="bookmark" /><span>{{ $t("status.unbookmark") }}</span>
+          <FAIcon
+            size="md"
+            fixed-width
+            icon="bookmark"
+          /><span>{{ $t("status.unbookmark") }}</span>
         </button>
         <button
           v-if="canDelete"
@@ -62,14 +86,22 @@
           @click.prevent="deleteStatus"
           @click="close"
         >
-          <FAIcon size="md" fixed-width icon="times" /><span>{{ $t("status.delete") }}</span>
+          <FAIcon
+            size="md"
+            fixed-width
+            icon="times"
+          /><span>{{ $t("status.delete") }}</span>
         </button>
         <button
           class="dropdown-item dropdown-item-icon"
           @click.prevent="copyLink"
           @click="close"
         >
-          <FAIcon size="md" fixed-width icon="share-alt" /><span>{{ $t("status.copy_link") }}</span>
+          <FAIcon
+            size="md"
+            fixed-width
+            icon="share-alt"
+          /><span>{{ $t("status.copy_link") }}</span>
         </button>
       </div>
     </div>
diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
index 6070ab22..dd117ec0 100644
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@@ -41,7 +41,10 @@
           {{ option === 'custom' ? $t('settings.style.fonts.custom') : option }}
         </option>
       </select>
-      <FAIcon class="select-down-icon" icon="chevron-down" />
+      <FAIcon
+        class="select-down-icon"
+        icon="chevron-down"
+      />
     </label>
     <input
       v-if="isCustom"
diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
index 3a7139f4..06b6af9c 100644
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -10,7 +10,8 @@
         {{ $t(notice.messageKey, notice.messageArgs) }}
       </div>
       <FAIcon
-        class="button-icon" icon="times"
+        class="button-icon"
+        icon="times"
         @click="closeNotice(notice)"
       />
     </div>
diff --git a/src/components/image_cropper/image_cropper.vue b/src/components/image_cropper/image_cropper.vue
index e69cbd0b..605f7427 100644
--- a/src/components/image_cropper/image_cropper.vue
+++ b/src/components/image_cropper/image_cropper.vue
@@ -43,7 +43,8 @@
       >
         {{ submitErrorMsg }}
         <FAIcon
-          class="button-icon" icon="times"
+          class="button-icon"
+          icon="times"
           @click="clearError"
         />
       </div>
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index 76bdcdfe..d039e86b 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -19,7 +19,10 @@
           {{ languageNames[i] }}
         </option>
       </select>
-      <FAIcon class="select-down-icon" icon="chevron-down" />
+      <FAIcon
+        class="select-down-icon"
+        icon="chevron-down"
+      />
     </label>
   </div>
 </template>
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index f6b767a2..4ab5d192 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -77,7 +77,8 @@
       <div class="alert error">
         {{ error }}
         <FAIcon
-          class="button-icon" icon="times"
+          class="button-icon"
+          icon="times"
           @click="clearError"
         />
       </div>
diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index cbcfc6d2..ea7f7a7f 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -34,7 +34,10 @@
       class="modal-view-button-arrow modal-view-button-arrow--prev"
       @click.stop.prevent="goPrev"
     >
-      <FAIcon class="arrow-icon" icon="chevron-left" />
+      <FAIcon
+        class="arrow-icon"
+        icon="chevron-left"
+      />
     </button>
     <button
       v-if="canNavigate"
@@ -42,7 +45,10 @@
       class="modal-view-button-arrow modal-view-button-arrow--next"
       @click.stop.prevent="goNext"
     >
-      <FAIcon class="arrow-icon" icon="chevron-right" />
+      <FAIcon
+        class="arrow-icon"
+        icon="chevron-right"
+      />
     </button>
   </Modal>
 </template>
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index 61dbda24..f6526d2a 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -55,7 +55,8 @@
       <div class="alert error">
         {{ error }}
         <FAIcon
-          class="button-icon" icon="times"
+          class="button-icon"
+          icon="times"
           @click="clearError"
         />
       </div>
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 4d91af77..db9b0ba0 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -15,7 +15,11 @@
             class="mobile-nav-button"
             @click.stop.prevent="toggleMobileSidebar()"
           >
-            <FAIcon size="lg" class="button-icon" icon="bars" />
+            <FAIcon
+              size="lg"
+              class="button-icon"
+              icon="bars"
+            />
             <div
               v-if="unreadChatCount"
               class="alert-dot"
@@ -37,7 +41,11 @@
             href="#"
             @click.stop.prevent="openMobileNotifications()"
           >
-            <FAIcon size="lg" class="button-icon" icon="bell" />
+            <FAIcon
+              size="lg"
+              class="button-icon"
+              icon="bell"
+            />
             <div
               v-if="unseenNotificationsCount"
               class="alert-dot"
@@ -59,7 +67,11 @@
           class="mobile-nav-button"
           @click.stop.prevent="closeMobileNotifications()"
         >
-          <FAIcon size="lg" class="button-icon" icon="times" />
+          <FAIcon
+            size="lg"
+            class="button-icon"
+            icon="times"
+          />
         </a>
       </div>
       <div
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index f3e131ff..4755d7b7 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -7,13 +7,23 @@
             :to="{ name: timelinesRoute }"
             :class="onTimelineRoute && 'router-link-active'"
           >
-            <FAIcon fixed-width size="lg" class="button-icon" icon="home" />
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon"
+              icon="home"
+            />
             {{ $t("nav.timelines") }}
           </router-link>
         </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
-            <FAIcon fixed-width size="lg" class="button-icon" icon="bell" />
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon"
+              icon="bell"
+            />
             {{ $t("nav.interactions") }}
           </router-link>
         </li>
@@ -25,13 +35,23 @@
             >
               {{ unreadChatCount }}
             </div>
-            <FAIcon fixed-width size="lg" class="button-icon" icon="comments" />
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon"
+              icon="comments"
+            />
             {{ $t("nav.chats") }}
           </router-link>
         </li>
         <li v-if="currentUser && currentUser.locked">
           <router-link :to="{ name: 'friend-requests' }">
-            <FAIcon fixed-width size="lg" class="button-icon" icon="user-plus" />
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon"
+              icon="user-plus"
+            />
             {{ $t("nav.friend_requests") }}
             <span
               v-if="followRequestCount > 0"
@@ -43,7 +63,12 @@
         </li>
         <li>
           <router-link :to="{ name: 'about' }">
-            <FAIcon fixed-width size="lg" class="button-icon" icon="info-circle" />{{ $t("nav.about") }}
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon"
+              icon="info-circle"
+            />{{ $t("nav.about") }}
           </router-link>
         </li>
       </ul>
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 857727a4..b609ae04 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -18,7 +18,10 @@
         href="#"
         class="unmute"
         @click.prevent="toggleMute"
-      ><FAIcon class="button-icon" icon="eye-slash" /></a>
+      ><FAIcon
+        class="button-icon"
+        icon="eye-slash"
+      /></a>
     </div>
     <div
       v-else
@@ -60,26 +63,39 @@
               :title="'@'+notification.from_profile.screen_name"
             >{{ notification.from_profile.name }}</span>
             <span v-if="notification.type === 'like'">
-              <FAIcon class="type-icon" icon="star" />
+              <FAIcon
+                class="type-icon"
+                icon="star"
+              />
               <small>{{ $t('notifications.favorited_you') }}</small>
             </span>
             <span v-if="notification.type === 'repeat'">
               <FAIcon
-                class="type-icon" icon="retweet"
+                class="type-icon"
+                icon="retweet"
                 :title="$t('tool_tip.repeat')"
               />
               <small>{{ $t('notifications.repeated_you') }}</small>
             </span>
             <span v-if="notification.type === 'follow'">
-              <FAIcon class="type-icon" icon="user-plus" />
+              <FAIcon
+                class="type-icon"
+                icon="user-plus"
+              />
               <small>{{ $t('notifications.followed_you') }}</small>
             </span>
             <span v-if="notification.type === 'follow_request'">
-              <FAIcon class="type-icon" icon="user" />
+              <FAIcon
+                class="type-icon"
+                icon="user"
+              />
               <small>{{ $t('notifications.follow_request') }}</small>
             </span>
             <span v-if="notification.type === 'move'">
-              <FAIcon class="type-icon" icon="suitcase-rolling" />
+              <FAIcon
+                class="type-icon"
+                icon="suitcase-rolling"
+              />
               <small>{{ $t('notifications.migrated_to') }}</small>
             </span>
             <span v-if="notification.type === 'pleroma:emoji_reaction'">
@@ -120,7 +136,10 @@
             v-if="needMute"
             href="#"
             @click.prevent="toggleMute"
-          ><FAIcon class="button-icon" icon="eye-slash" /></a>
+          ><FAIcon
+            class="button-icon"
+            icon="eye-slash"
+          /></a>
         </span>
         <div
           v-if="notification.type === 'follow' || notification.type === 'follow_request'"
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 57972854..bd875cca 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -61,7 +61,11 @@
           v-else
           class="new-status-notification text-center panel-footer"
         >
-          <FAIcon icon="circle-notch" spin size="lg"/>
+          <FAIcon
+            icon="circle-notch"
+            spin
+            size="lg"
+          />
         </div>
       </div>
     </div>
diff --git a/src/components/panel_loading/panel_loading.vue b/src/components/panel_loading/panel_loading.vue
index 9bf3ab32..b15e7d38 100644
--- a/src/components/panel_loading/panel_loading.vue
+++ b/src/components/panel_loading/panel_loading.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="panel-loading">
     <span class="loading-text">
-      <FAIcon icon="circle-notch" spin size="3x"/>
+      <FAIcon
+        icon="circle-notch"
+        spin
+        size="3x"
+      />
       {{ $t('general.loading') }}
     </span>
   </div>
diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index f3e7a716..e598cf3b 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -36,7 +36,10 @@
       class="add-option faint"
       @click="addOption"
     >
-      <FAIcon icon="plus" size="sm"/>
+      <FAIcon
+        icon="plus"
+        size="sm"
+      />
 
       {{ $t("polls.add_option") }}
     </a>
@@ -57,7 +60,10 @@
             <option value="single">{{ $t('polls.single_choice') }}</option>
             <option value="multiple">{{ $t('polls.multiple_choices') }}</option>
           </select>
-          <FAIcon class="select-down-icon" icon="chevron-down"/>
+          <FAIcon
+            class="select-down-icon"
+            icon="chevron-down"
+          />
         </label>
       </div>
       <div
@@ -85,7 +91,10 @@
               {{ $t(`time.${unit}_short`, ['']) }}
             </option>
           </select>
-          <FAIcon class="select-down-icon" icon="chevron-down"/>
+          <FAIcon
+            class="select-down-icon"
+            icon="chevron-down"
+          />
         </label>
       </div>
     </div>
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 3cd9e7a5..9cf38a9a 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -15,7 +15,7 @@
         @dragleave="fileDragStop"
         @drop.stop="fileDrop"
       >
-        <FAIcon :icon="uploadFileLimitReached ? 'ban' : 'upload'"/>
+        <FAIcon :icon="uploadFileLimitReached ? 'ban' : 'upload'" />
       </div>
       <div class="form-group">
         <i18n
@@ -200,7 +200,10 @@
                   {{ $t(`post_status.content_type["${postFormat}"]`) }}
                 </option>
               </select>
-              <FAIcon class="select-down-icon" icon="chevron-down"/>
+              <FAIcon
+                class="select-down-icon"
+                icon="chevron-down"
+              />
             </label>
           </div>
           <div
@@ -242,7 +245,7 @@
               class="btn btn-default"
               @click="showEmojiPicker"
             >
-              <FAIcon icon="smile-beam"/>
+              <FAIcon icon="smile-beam" />
             </div>
           </div>
           <div
@@ -299,7 +302,8 @@
           class="media-upload-wrapper"
         >
           <FAIcon
-            class="button-icon" icon="times"
+            class="button-icon"
+            icon="times"
             @click="removeMediaFile(file)"
           />
           <attachment
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 3e15f30b..706c6b81 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -1,15 +1,15 @@
 <template>
   <div v-if="loggedIn">
     <template v-if="visibility !== 'private' && visibility !== 'direct'">
-    <FAIcon
-      :class="classes"
-      class="RetweetButton button-icon -interactive"
-      icon="retweet"
-      size="lg"
-      :spin="animated"
-      :title="$t('tool_tip.repeat')"
-      @click.prevent="retweet()"
-    />
+      <FAIcon
+        :class="classes"
+        class="RetweetButton button-icon -interactive"
+        icon="retweet"
+        size="lg"
+        :spin="animated"
+        :title="$t('tool_tip.repeat')"
+        @click.prevent="retweet()"
+      />
       <span v-if="!mergedConfig.hidePostStats && status.repeat_num > 0">{{ status.repeat_num }}</span>
     </template>
     <template v-else>
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index d490f8ee..a43af23b 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -2,24 +2,32 @@
   <div
     v-if="!showNothing"
     class="ScopeSelector"
-    >
+  >
     <span
       v-if="showDirect"
       class="scope"
       :class="css.direct"
       :title="$t('post_status.scope.direct')"
       @click="changeVis('direct')"
-      >
-      <FAIcon icon="envelope" class="button-icon" size="lg" />
+    >
+      <FAIcon
+        icon="envelope"
+        class="button-icon"
+        size="lg"
+      />
     </span>
     <span
-      class="scope"
       v-if="showPrivate"
+      class="scope"
       :class="css.private"
       :title="$t('post_status.scope.private')"
       @click="changeVis('private')"
-      >
-      <FAIcon icon="lock" class="button-icon" size="lg" />
+    >
+      <FAIcon
+        icon="lock"
+        class="button-icon"
+        size="lg"
+      />
     </span>
     <span
       v-if="showUnlisted"
@@ -27,8 +35,12 @@
       :class="css.unlisted"
       :title="$t('post_status.scope.unlisted')"
       @click="changeVis('unlisted')"
-      >
-      <FAIcon icon="lock-open" class="button-icon" size="lg" />
+    >
+      <FAIcon
+        icon="lock-open"
+        class="button-icon"
+        size="lg"
+      />
     </span>
     <span
       v-if="showPublic"
@@ -36,8 +48,12 @@
       :class="css.public"
       :title="$t('post_status.scope.public')"
       @click="changeVis('public')"
-      >
-      <FAIcon icon="globe" class="button-icon" size="lg" />
+    >
+      <FAIcon
+        icon="globe"
+        class="button-icon"
+        size="lg"
+      />
     </span>
   </div>
 </template>
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index d32f48d9..665390f9 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -24,7 +24,11 @@
       v-if="loading"
       class="text-center loading-icon"
     >
-      <FAIcon icon="circle-notch" spin size="lg"/>
+      <FAIcon
+        icon="circle-notch"
+        spin
+        size="lg"
+      />
     </div>
     <div v-else-if="loaded">
       <div class="search-nav-heading">
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index fbbbbfe0..442e91b2 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -7,11 +7,11 @@
         class="nav-icon"
         :title="$t('nav.search')"
       ><FAIcon
-         fixed-width
-         size="lg"
-         class="button-icon"
-         icon="search"
-         @click.prevent.stop="toggleHidden"
+        fixed-width
+        size="lg"
+        class="button-icon"
+        icon="search"
+        @click.prevent.stop="toggleHidden"
       /></a>
       <template v-else>
         <input
@@ -30,7 +30,7 @@
           <FAIcon
             fixed-width
             icon="search"
-            />
+          />
         </button>
         <span>
           <FAIcon
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index ff1a129b..813dc4cd 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -53,7 +53,10 @@
             <option value="following">{{ $t('settings.reply_visibility_following') }}</option>
             <option value="self">{{ $t('settings.reply_visibility_self') }}</option>
           </select>
-          <FAIcon class="select-down-icon" icon="chevron-down" />
+          <FAIcon
+            class="select-down-icon"
+            icon="chevron-down"
+          />
         </label>
       </div>
       <div>
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 99d3a0dc..c1d0d0ec 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -103,7 +103,10 @@
                   {{ subjectLineBehaviorDefaultValue == 'noop' ? $t('settings.instance_default_simple') : '' }}
                 </option>
               </select>
-              <FAIcon class="select-down-icon" icon="chevron-down" />
+              <FAIcon
+                class="select-down-icon"
+                icon="chevron-down"
+              />
             </label>
           </div>
         </li>
@@ -127,7 +130,10 @@
                   {{ postContentTypeDefaultValue === postFormat ? $t('settings.instance_default_simple') : '' }}
                 </option>
               </select>
-              <FAIcon class="select-down-icon" icon="chevron-down" />
+              <FAIcon
+                class="select-down-icon"
+                icon="chevron-down"
+              />
             </label>
           </div>
         </li>
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 773c77de..5a659fc8 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -169,7 +169,8 @@
         <FAIcon
           v-if="!isDefaultAvatar && pickAvatarBtnVisible"
           :title="$t('settings.reset_avatar')"
-          class="reset-button" icon="times"
+          class="reset-button"
+          icon="times"
           type="button"
           @click="resetAvatar"
         />
@@ -197,7 +198,8 @@
         <FAIcon
           v-if="!isDefaultBanner"
           :title="$t('settings.reset_profile_banner')"
-          class="reset-button" icon="times"
+          class="reset-button"
+          icon="times"
           type="button"
           @click="resetBanner"
         />
@@ -233,7 +235,8 @@
       >
         Error: {{ bannerUploadError }}
         <FAIcon
-          class="button-icon" icon="times"
+          class="button-icon"
+          icon="times"
           @click="clearUploadError('banner')"
         />
       </div>
@@ -245,7 +248,8 @@
         <FAIcon
           v-if="!isDefaultBackground"
           :title="$t('settings.reset_profile_background')"
-          class="reset-button" icon="times"
+          class="reset-button"
+          icon="times"
           type="button"
           @click="resetBackground"
         />
diff --git a/src/components/settings_modal/tabs/theme_tab/preview.vue b/src/components/settings_modal/tabs/theme_tab/preview.vue
index 65863c54..20201e18 100644
--- a/src/components/settings_modal/tabs/theme_tab/preview.vue
+++ b/src/components/settings_modal/tabs/theme_tab/preview.vue
@@ -42,22 +42,26 @@
               <FAIcon
                 fixed-width
                 style="color: var(--cBlue)"
-                class="button-icon" icon="reply"
+                class="button-icon"
+                icon="reply"
               />
               <FAIcon
                 fixed-width
                 style="color: var(--cGreen)"
-                class="button-icon" icon="retweet"
+                class="button-icon"
+                icon="retweet"
               />
               <FAIcon
                 fixed-width
                 style="color: var(--cOrange)"
-                class="button-icon" icon="star"
+                class="button-icon"
+                icon="star"
               />
               <FAIcon
                 fixed-width
                 style="color: var(--cRed)"
-                class="button-icon" icon="times"
+                class="button-icon"
+                icon="times"
               />
             </div>
           </div>
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index 9cc1c392..280e1955 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -80,7 +80,10 @@
                     {{ style[0] || style.name }}
                   </option>
                 </select>
-                <FAIcon class="select-down-icon" icon="chevron-down" />
+                <FAIcon
+                  class="select-down-icon"
+                  icon="chevron-down"
+                />
               </label>
             </div>
           </template>
@@ -907,7 +910,10 @@
                     {{ $t('settings.style.shadows.components.' + shadow) }}
                   </option>
                 </select>
-                <FAIcon class="select-down-icon" icon="chevron-down" />
+                <FAIcon
+                  class="select-down-icon"
+                  icon="chevron-down"
+                />
               </label>
             </div>
             <div class="override">
diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index 32220ae8..78f0e544 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -78,35 +78,50 @@
               {{ $t('settings.style.shadows.shadow_id', { value: index }) }}
             </option>
           </select>
-          <FAIcon icon="chevron-down" class="select-down-icon" />
+          <FAIcon
+            icon="chevron-down"
+            class="select-down-icon"
+          />
         </label>
         <button
           class="btn btn-default"
           :disabled="!ready || !present"
           @click="del"
         >
-          <FAIcon fixed-width icon="times" />
+          <FAIcon
+            fixed-width
+            icon="times"
+          />
         </button>
         <button
           class="btn btn-default"
           :disabled="!moveUpValid"
           @click="moveUp"
         >
-          <FAIcon fixed-width icon="chevron-up" />
+          <FAIcon
+            fixed-width
+            icon="chevron-up"
+          />
         </button>
         <button
           class="btn btn-default"
           :disabled="!moveDnValid"
           @click="moveDn"
         >
-          <FAIcon fixed-width icon="chevron-down" />
+          <FAIcon
+            fixed-width
+            icon="chevron-down"
+          />
         </button>
         <button
           class="btn btn-default"
           :disabled="usingFallback"
           @click="add"
         >
-          <FAIcon fixed-width icon="plus" />
+          <FAIcon
+            fixed-width
+            icon="plus"
+          />
         </button>
       </div>
       <div
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index fbdb2441..2a4d794a 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -36,7 +36,12 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'login' }">
-            <FAIcon size="lg" fixed-width class="button-icon" icon="sign-in-alt" /> {{ $t("login.login") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="sign-in-alt"
+            /> {{ $t("login.login") }}
           </router-link>
         </li>
         <li
@@ -44,7 +49,12 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: timelinesRoute }">
-            <FAIcon size="lg" fixed-width class="button-icon" icon="home" /> {{ $t("nav.timelines") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="home"
+            /> {{ $t("nav.timelines") }}
           </router-link>
         </li>
         <li
@@ -55,7 +65,12 @@
             :to="{ name: 'chats', params: { username: currentUser.screen_name } }"
             style="position: relative"
           >
-            <FAIcon size="lg" fixed-width class="button-icon" icon="comments" /> {{ $t("nav.chats") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="comments"
+            /> {{ $t("nav.chats") }}
             <span
               v-if="unreadChatCount"
               class="badge badge-notification unread-chat-count"
@@ -68,7 +83,12 @@
       <ul v-if="currentUser">
         <li @click="toggleDrawer">
           <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
-            <FAIcon size="lg" fixed-width class="button-icon" icon="bell" /> {{ $t("nav.interactions") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="bell"
+            /> {{ $t("nav.interactions") }}
           </router-link>
         </li>
         <li
@@ -76,7 +96,12 @@
           @click="toggleDrawer"
         >
           <router-link to="/friend-requests">
-            <FAIcon size="lg" fixed-width class="button-icon" icon="user-plus" /> {{ $t("nav.friend_requests") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="user-plus"
+            /> {{ $t("nav.friend_requests") }}
             <span
               v-if="followRequestCount > 0"
               class="badge follow-request-count"
@@ -90,7 +115,12 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'chat' }">
-            <FAIcon size="lg" fixed-width class="button-icon" icon="bullhorn" /> {{ $t("shoutbox.title") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="bullhorn"
+            /> {{ $t("shoutbox.title") }}
           </router-link>
         </li>
       </ul>
@@ -100,7 +130,12 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'search' }">
-            <FAIcon size="lg" fixed-width class="button-icon" icon="search" /> {{ $t("nav.search") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="search"
+            /> {{ $t("nav.search") }}
           </router-link>
         </li>
         <li
@@ -108,7 +143,12 @@
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'who-to-follow' }">
-            <FAIcon size="lg" fixed-width class="button-icon" icon="user-plus" /> {{ $t("nav.who_to_follow") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="user-plus"
+            /> {{ $t("nav.who_to_follow") }}
           </router-link>
         </li>
         <li @click="toggleDrawer">
@@ -116,12 +156,22 @@
             href="#"
             @click="openSettingsModal"
           >
-            <FAIcon size="lg" fixed-width class="button-icon" icon="cog" /> {{ $t("settings.settings") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="cog"
+            /> {{ $t("settings.settings") }}
           </a>
         </li>
         <li @click="toggleDrawer">
           <router-link :to="{ name: 'about'}">
-            <FAIcon size="lg" fixed-width class="button-icon" icon="info-circle" /> {{ $t("nav.about") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="info-circle"
+            /> {{ $t("nav.about") }}
           </router-link>
         </li>
         <li
@@ -132,7 +182,12 @@
             href="/pleroma/admin/#/login-pleroma"
             target="_blank"
           >
-            <FAIcon size="lg" fixed-width class="button-icon" icon="tachometer-alt" /> {{ $t("nav.administration") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="tachometer-alt"
+            /> {{ $t("nav.administration") }}
           </a>
         </li>
         <li
@@ -143,7 +198,12 @@
             href="#"
             @click="doLogout"
           >
-            <FAIcon size="lg" fixed-width class="button-icon" icon="sign-out-alt" /> {{ $t("login.logout") }}
+            <FAIcon
+              size="lg"
+              fixed-width
+              class="button-icon"
+              icon="sign-out-alt"
+            /> {{ $t("login.logout") }}
           </a>
         </li>
       </ul>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index b9b967cc..c94862d4 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -13,7 +13,7 @@
       <span
         class="button-icon"
         @click="clearError"
-        >
+      >
         <FAIcon icon="times" />
       </span>
     </div>
@@ -51,8 +51,12 @@
           href="#"
           class="unmute button-icon"
           @click.prevent="toggleMute"
-          >
-          <FAIcon icon="eye-slash" class="button-icon" size="lg" />
+        >
+          <FAIcon
+            icon="eye-slash"
+            class="button-icon"
+            size="lg"
+          />
         </a>
       </div>
     </template>
@@ -61,7 +65,10 @@
         v-if="showPinned"
         class="pin"
       >
-        <FAIcon icon="thumbtack" class="faint" />
+        <FAIcon
+          icon="thumbtack"
+          class="faint"
+        />
         <span class="faint">{{ $t('status.pinned') }}</span>
       </div>
       <div
@@ -177,8 +184,12 @@
                   v-if="status.visibility"
                   class="visibility-icon"
                   :title="status.visibility | capitalize"
-                  >
-                  <FAIcon class="button-icon" :icon="visibilityIcon(status.visibility)" size="lg" />
+                >
+                  <FAIcon
+                    class="button-icon"
+                    :icon="visibilityIcon(status.visibility)"
+                    size="lg"
+                  />
                 </span>
                 <a
                   v-if="!status.is_local && !isPreview"
@@ -187,7 +198,11 @@
                   class="source_url"
                   title="Source"
                 >
-                  <FAIcon class="button-icon" icon="external-link-square-alt" size="lg" />
+                  <FAIcon
+                    class="button-icon"
+                    icon="external-link-square-alt"
+                    size="lg"
+                  />
                 </a>
                 <a
                   v-if="expandable && !isPreview"
@@ -195,14 +210,22 @@
                   title="Expand"
                   @click.prevent="toggleExpanded"
                 >
-                  <FAIcon class="button-icon" icon="plus-square" size="lg" />
+                  <FAIcon
+                    class="button-icon"
+                    icon="plus-square"
+                    size="lg"
+                  />
                 </a>
                 <a
                   v-if="unmuted"
                   href="#"
                   @click.prevent="toggleMute"
                 >
-                  <FAIcon icon="eye-slash" class="button-icon" size="lg" />
+                  <FAIcon
+                    icon="eye-slash"
+                    class="button-icon"
+                    size="lg"
+                  />
                 </a>
               </span>
             </div>
@@ -230,7 +253,7 @@
                       icon="reply"
                       size="lg"
                       flip="horizontal"
-                      />
+                    />
                     <span
                       class="faint-link reply-to-text"
                     >
@@ -358,7 +381,6 @@
               @onSuccess="clearError"
             />
           </div>
-
         </div>
       </div>
       <div
diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index f6432687..8237ce00 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -27,7 +27,11 @@
         v-else
         class="status-preview-no-content"
       >
-        <FAIcon icon="circle-notch" spin size="2x"/>
+        <FAIcon
+          icon="circle-notch"
+          spin
+          size="2x"
+        />
       </div>
     </div>
   </Popover>
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index ab17cbbc..aaf0349c 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -92,7 +92,11 @@
         v-else
         class="new-status-notification text-center panel-footer"
       >
-        <FAIcon icon="circle-notch" spin size="lg"/>
+        <FAIcon
+          icon="circle-notch"
+          spin
+          size="lg"
+        />
       </div>
     </div>
   </div>
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index 1e546fae..8099ddd5 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -16,27 +16,52 @@
       <ul>
         <li v-if="currentUser">
           <router-link :to="{ name: 'friends' }">
-            <FAIcon fixed-width size="lg" class="button-icon " icon="home" />{{ $t("nav.timeline") }}
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon "
+              icon="home"
+            />{{ $t("nav.timeline") }}
           </router-link>
         </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'bookmarks'}">
-            <FAIcon fixed-width size="lg" class="button-icon " icon="bookmark" />{{ $t("nav.bookmarks") }}
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon "
+              icon="bookmark"
+            />{{ $t("nav.bookmarks") }}
           </router-link>
         </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
-            <FAIcon fixed-width size="lg" class="button-icon " icon="envelope" />{{ $t("nav.dms") }}
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon "
+              icon="envelope"
+            />{{ $t("nav.dms") }}
           </router-link>
         </li>
         <li v-if="currentUser || !privateMode">
           <router-link :to="{ name: 'public-timeline' }">
-            <FAIcon fixed-width size="lg" class="button-icon " icon="users" />{{ $t("nav.public_tl") }}
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon "
+              icon="users"
+            />{{ $t("nav.public_tl") }}
           </router-link>
         </li>
         <li v-if="federating && (currentUser || !privateMode)">
           <router-link :to="{ name: 'public-external-timeline' }">
-            <FAIcon fixed-width size="lg" class="button-icon " icon="globe" />{{ $t("nav.twkn") }}
+            <FAIcon
+              fixed-width
+              size="lg"
+              class="button-icon "
+              icon="globe"
+            />{{ $t("nav.twkn") }}
           </router-link>
         </li>
       </ul>
@@ -46,7 +71,10 @@
       class="title timeline-menu-title"
     >
       <span>{{ timelineName() }}</span>
-      <FAIcon size="sm" icon="chevron-down" />
+      <FAIcon
+        size="sm"
+        icon="chevron-down"
+      />
     </div>
   </Popover>
 </template>
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 6c35c781..c5f10b75 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -21,7 +21,11 @@
               :user="user"
             />
             <div class="user-info-avatar-link-overlay">
-              <FAIcon class="button-icon" icon="search-plus" size="lg" />
+              <FAIcon
+                class="button-icon"
+                icon="search-plus"
+                size="lg"
+              />
             </div>
           </a>
           <router-link
@@ -56,7 +60,10 @@
                 target="_blank"
                 class="external-link-button"
               >
-                <FAIcon class="icon" icon="external-link-alt" />
+                <FAIcon
+                  class="icon"
+                  icon="external-link-alt"
+                />
               </a>
               <AccountActions
                 v-if="isOtherUser && loggedIn"
@@ -87,7 +94,11 @@
                 </span>
               </template>
               <span v-if="user.locked">
-               <FAIcon class="lock-icon" icon="lock" size="sm"/>
+                <FAIcon
+                  class="lock-icon"
+                  icon="lock"
+                  size="sm"
+                />
               </span>
               <span
                 v-if="!mergedConfig.hideUserStats && !hideBio"
@@ -136,7 +147,10 @@
                 <option value="striped">Striped bg</option>
                 <option value="side">Side stripe</option>
               </select>
-              <FAIcon class="select-down-icon" icon="chevron-down" />
+              <FAIcon
+                class="select-down-icon"
+                icon="chevron-down"
+              />
             </label>
           </div>
         </div>
@@ -162,8 +176,15 @@
                 :title="$t('user_card.unsubscribe')"
               >
                 <FALayers>
-                  <FAIcon icon="rss" transform="left-5 shrink-6 up-3 rotate-20" flip="horizontal"/>
-                  <FAIcon icon="rss" transform="right-5 shrink-6 up-3 rotate-20"/>
+                  <FAIcon
+                    icon="rss"
+                    transform="left-5 shrink-6 up-3 rotate-20"
+                    flip="horizontal"
+                  />
+                  <FAIcon
+                    icon="rss"
+                    transform="right-5 shrink-6 up-3 rotate-20"
+                  />
                   <FAIcon icon="bell" />
                 </FALayers>
               </ProgressButton>
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index dd6977d2..95673733 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -31,7 +31,11 @@
         </div>
       </div>
       <div v-else>
-        <FAIcon icon="circle-notch" spin size="3x"/>
+        <FAIcon
+          icon="circle-notch"
+          spin
+          size="3x"
+        />
       </div>
     </div>
   </Popover>

From 1b50d700aa496fdf9e7e774cd7d6b8835b91d13f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 21 Oct 2020 00:34:42 +0300
Subject: [PATCH 014/389] bye bye fontello

---
 build/webpack.base.conf.js                   |  10 -
 package.json                                 |   1 -
 src/components/media_upload/media_upload.vue |  10 -
 static/fontello.json                         | 416 -------------------
 4 files changed, 437 deletions(-)
 delete mode 100644 static/fontello.json

diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index ef40333c..d987eff1 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -3,7 +3,6 @@ var config = require('../config')
 var utils = require('./utils')
 var projectRoot = path.resolve(__dirname, '../')
 var ServiceWorkerWebpackPlugin = require('serviceworker-webpack-plugin')
-var FontelloPlugin = require("fontello-webpack-plugin")
 
 var env = process.env.NODE_ENV
 // check env & config/index.js to decide weither to enable CSS Sourcemaps for the
@@ -94,15 +93,6 @@ module.exports = {
     new ServiceWorkerWebpackPlugin({
       entry: path.join(__dirname, '..', 'src/sw.js'),
       filename: 'sw-pleroma.js'
-    }),
-    new FontelloPlugin({
-      config: require('../static/fontello.json'),
-      host: 'https://fontello.com',
-      name: 'fontello',
-      output: {
-        css: 'static/[name].' + now + '.css',  // [hash] is not supported. Use the current timestamp instead for versioning.
-        font: 'static/font/[name].' + now + '.[ext]'
-      }
     })
   ]
 }
diff --git a/package.json b/package.json
index 6bc285c8..14738c3e 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,6 @@
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.13.3",
     "file-loader": "^3.0.1",
-    "fontello-webpack-plugin": "https://github.com/w3geo/fontello-webpack-plugin.git#6149eac8f2672ab6da089e8802fbfcac98487186",
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^3.0.0",
     "http-proxy-middleware": "^0.17.2",
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index 15b2b8e4..88251a26 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -43,15 +43,5 @@
   .new-icon {
     cursor: pointer;
   }
-
-  .progress-icon {
-    display: inline-block;
-    line-height: 0;
-    &::before {
-      /* Overriding fontello to achieve the perfect speeeen */
-      margin: 0;
-      line-height: 0;
-    }
-  }
 }
  </style>
diff --git a/static/fontello.json b/static/fontello.json
deleted file mode 100644
index b0136fd9..00000000
--- a/static/fontello.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
-  "name": "",
-  "css_prefix_text": "icon-",
-  "css_use_suffix": false,
-  "hinting": true,
-  "units_per_em": 1000,
-  "ascent": 857,
-  "glyphs": [
-    {
-      "uid": "9bd60140934a1eb9236fd7a8ab1ff6ba",
-      "css": "spin4",
-      "code": 59444,
-      "src": "fontelico"
-    },
-    {
-      "uid": "5211af474d3a9848f67f945e2ccaf143",
-      "css": "cancel",
-      "code": 59392,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "eeec3208c90b7b48e804919d0d2d4a41",
-      "css": "upload",
-      "code": 59393,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "2a6740fc2f9d0edea54205963f662594",
-      "css": "spin3",
-      "code": 59442,
-      "src": "fontelico"
-    },
-    {
-      "uid": "c6be5a58ee4e63a5ec399c2b0d15cf2c",
-      "css": "reply",
-      "code": 61714,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "474656633f79ea2f1dad59ff63f6bf07",
-      "css": "star",
-      "code": 59394,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "d17030afaecc1e1c22349b99f3c4992a",
-      "css": "star-empty",
-      "code": 59395,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "09feb4465d9bd1364f4e301c9ddbaa92",
-      "css": "retweet",
-      "code": 59396,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "7fd683b2c518ceb9e5fa6757f2276faa",
-      "css": "eye-off",
-      "code": 59397,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "73ffeb70554099177620847206c12457",
-      "css": "binoculars",
-      "code": 61925,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "e99461abfef3923546da8d745372c995",
-      "css": "cog",
-      "code": 59399,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "1bafeeb1808a5fe24484c7890096901a",
-      "css": "user-plus",
-      "code": 62004,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "559647a6f430b3aeadbecd67194451dd",
-      "css": "menu",
-      "code": 61641,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "0d20938846444af8deb1920dc85a29fb",
-      "css": "logout",
-      "code": 59400,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "ccddff8e8670dcd130e3cb55fdfc2fd0",
-      "css": "down-open",
-      "code": 59401,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "44b9e75612c5fad5505edd70d071651f",
-      "css": "attach",
-      "code": 59402,
-      "src": "entypo"
-    },
-    {
-      "uid": "e15f0d620a7897e2035c18c80142f6d9",
-      "css": "link-ext",
-      "code": 61582,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "e35de5ea31cd56970498e33efbcb8e36",
-      "css": "link-ext-alt",
-      "code": 61583,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "381da2c2f7fd51f8de877c044d7f439d",
-      "css": "picture",
-      "code": 59403,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "872d9516df93eb6b776cc4d94bd97dac",
-      "css": "video",
-      "code": 59404,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "399ef63b1e23ab1b761dfbb5591fa4da",
-      "css": "right-open",
-      "code": 59405,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "d870630ff8f81e6de3958ecaeac532f2",
-      "css": "left-open",
-      "code": 59406,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "fe6697b391355dec12f3d86d6d490397",
-      "css": "up-open",
-      "code": 59407,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "9c1376672bb4f1ed616fdd78a23667e9",
-      "css": "comment-empty",
-      "code": 61669,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "ccc2329632396dc096bb638d4b46fb98",
-      "css": "mail-alt",
-      "code": 61664,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "c1f1975c885aa9f3dad7810c53b82074",
-      "css": "lock",
-      "code": 59409,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "05376be04a27d5a46e855a233d6e8508",
-      "css": "lock-open-alt",
-      "code": 61758,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "197375a3cea8cb90b02d06e4ddf1433d",
-      "css": "globe",
-      "code": 59410,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "b3a9e2dab4d19ea3b2f628242c926bfe",
-      "css": "brush",
-      "code": 59411,
-      "src": "iconic"
-    },
-    {
-      "uid": "9dd9e835aebe1060ba7190ad2b2ed951",
-      "css": "search",
-      "code": 59398,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "ca90da02d2c6a3183f2458e4dc416285",
-      "css": "adjust",
-      "code": 59414,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "5e2ab018e3044337bcef5f7e94098ea1",
-      "css": "thumbs-up-alt",
-      "code": 61796,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "c76b7947c957c9b78b11741173c8349b",
-      "css": "attention",
-      "code": 59412,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "1a5cfa186647e8c929c2b17b9fc4dac1",
-      "css": "plus-squared",
-      "code": 61694,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "44e04715aecbca7f266a17d5a7863c68",
-      "css": "plus",
-      "code": 59413,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "41087bc74d4b20b55059c60a33bf4008",
-      "css": "edit",
-      "code": 59415,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "5717236f6134afe2d2a278a5c9b3927a",
-      "css": "play-circled",
-      "code": 61764,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "d35a1d35efeb784d1dc9ac18b9b6c2b6",
-      "css": "pencil",
-      "code": 59416,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "266d5d9adf15a61800477a5acf9a4462",
-      "css": "chart-bar",
-      "code": 59419,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "d862a10e1448589215be19702f98f2c1",
-      "css": "smile",
-      "code": 61720,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "671f29fa10dda08074a4c6a341bb4f39",
-      "css": "bell-alt",
-      "code": 61683,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "5bb103cd29de77e0e06a52638527b575",
-      "css": "wrench",
-      "code": 59418,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "5b0772e9484a1a11646793a82edd622a",
-      "css": "pin",
-      "code": 59417,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "22411a88489225a018f68db737de3c77",
-      "css": "ellipsis",
-      "code": 61761,
-      "src": "custom_icons",
-      "selected": true,
-      "svg": {
-        "path": "M214 411V518Q214 540 199 556T161 571H54Q31 571 16 556T0 518V411Q0 388 16 373T54 357H161Q183 357 199 373T214 411ZM500 411V518Q500 540 484 556T446 571H339Q317 571 301 556T286 518V411Q286 388 301 373T339 357H446Q469 357 484 373T500 411ZM786 411V518Q786 540 770 556T732 571H625Q603 571 587 556T571 518V411Q571 388 587 373T625 357H732Q755 357 770 373T786 411Z",
-        "width": 785.7
-      },
-      "search": [
-        "ellipsis"
-      ]
-    },
-    {
-      "uid": "0bef873af785ead27781fdf98b3ae740",
-      "css": "bell-ringing-o",
-      "code": 59408,
-      "src": "custom_icons",
-      "selected": true,
-      "svg": {
-        "path": "M497.8 0C468.3 0 444.4 23.9 444.4 53.3 444.4 61.1 446.1 68.3 448.9 75 301.7 96.7 213.3 213.3 213.3 320 213.3 588.3 117.8 712.8 35.6 782.2 35.6 821.1 67.8 853.3 106.7 853.3H355.6C355.6 931.7 419.4 995.6 497.8 995.6S640 931.7 640 853.3H888.9C927.8 853.3 960 821.1 960 782.2 877.8 712.8 782.2 588.3 782.2 320 782.2 213.3 693.9 96.7 546.7 75 549.4 68.3 551.1 61.1 551.1 53.3 551.1 23.9 527.2 0 497.8 0ZM189.4 44.8C108.4 118.6 70.5 215.1 71.1 320.2L142.2 319.8C141.7 231.2 170.4 158.3 237.3 97.4L189.4 44.8ZM806.2 44.8L758.3 97.4C825.2 158.3 853.9 231.2 853.3 319.8L924.4 320.2C925.1 215.1 887.2 118.6 806.2 44.8ZM408.9 844.4C413.9 844.4 417.8 848.3 417.8 853.3 417.8 897.2 453.9 933.3 497.8 933.3 502.8 933.3 506.7 937.2 506.7 942.2S502.8 951.1 497.8 951.1C443.9 951.1 400 907.2 400 853.3 400 848.3 403.9 844.4 408.9 844.4Z",
-        "width": 1000
-      },
-      "search": [
-        "bell-ringing-o"
-      ]
-    },
-    {
-      "uid": "0b2b66e526028a6972d51a6f10281b4b",
-      "css": "zoom-in",
-      "code": 59420,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "0bda4bc779d4c32623dec2e43bd67ee8",
-      "css": "gauge",
-      "code": 61668,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "31972e4e9d080eaa796290349ae6c1fd",
-      "css": "users",
-      "code": 59421,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "e82cedfa1d5f15b00c5a81c9bd731ea2",
-      "css": "info-circled",
-      "code": 59423,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "w3nzesrlbezu6f30q7ytyq919p6gdlb6",
-      "css": "home-2",
-      "code": 59425,
-      "src": "typicons"
-    },
-    {
-      "uid": "dcedf50ab1ede3283d7a6c70e2fe32f3",
-      "css": "chat",
-      "code": 59422,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "3a00327e61b997b58518bd43ed83c3df",
-      "css": "login",
-      "code": 59424,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "f3ebd6751c15a280af5cc5f4a764187d",
-      "css": "arrow-curved",
-      "code": 59426,
-      "src": "iconic"
-    },
-    {
-      "uid": "0ddd3e8201ccc7d41f7b7c9d27eca6c1",
-      "css": "link",
-      "code": 59427,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "4aad6bb50b02c18508aae9cbe14e784e",
-      "css": "share",
-      "code": 61920,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "8b80d36d4ef43889db10bc1f0dc9a862",
-      "css": "user",
-      "code": 59428,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "12f4ece88e46abd864e40b35e05b11cd",
-      "css": "ok",
-      "code": 59431,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "4109c474ff99cad28fd5a2c38af2ec6f",
-      "css": "filter",
-      "code": 61616,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "9a76bc135eac17d2c8b8ad4a5774fc87",
-      "css": "download",
-      "code": 59429,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "f04a5d24e9e659145b966739c4fde82a",
-      "css": "bookmark",
-      "code": 59430,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "2f5ef6f6b7aaebc56458ab4e865beff5",
-      "css": "bookmark-empty",
-      "code": 61591,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "9ea0a737ccc45d6c510dcbae56058849",
-      "css": "music",
-      "code": 59432,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "1b5a5d7b7e3c71437f5a26befdd045ed",
-      "css": "doc",
-      "code": 59433,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "98d9c83c1ee7c2c25af784b518c522c5",
-      "css": "block",
-      "code": 59434,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "3e674995cacc2b09692c096ea7eb6165",
-      "css": "megaphone",
-      "code": 59435,
-      "src": "fontawesome"
-    }
-  ]
-}
\ No newline at end of file

From eb04ed865e1afd7cede44017deb13298a8aa76dd Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 21 Oct 2020 01:56:21 +0300
Subject: [PATCH 015/389] fontello aftermath

---
 yarn.lock | 180 +++---------------------------------------------------
 1 file changed, 7 insertions(+), 173 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e7ba92e4..86cd420f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1182,13 +1182,6 @@ agent-base@2:
     extend "~3.0.0"
     semver "~5.0.1"
 
-agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
@@ -1694,11 +1687,6 @@ better-assert@~1.0.0:
   dependencies:
     callsite "1.0.0"
 
-big-integer@^1.6.17:
-  version "1.6.48"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
-  integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==
-
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
@@ -1711,14 +1699,6 @@ binary-extensions@^1.0.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
 
-binary@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"
-  integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=
-  dependencies:
-    buffers "~0.1.1"
-    chainsaw "~0.1.0"
-
 blob@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
@@ -1731,11 +1711,6 @@ bluebird@^3.5.3:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
 
-bluebird@~3.4.1:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
-  integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=
-
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -1913,11 +1888,6 @@ buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
 
-buffer-indexof-polyfill@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz#a9fb806ce8145d5428510ce72f278bb363a638bf"
-  integrity sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8=
-
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -1930,11 +1900,6 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffers@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
-  integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s=
-
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -2101,13 +2066,6 @@ chai@^3.5.0:
     deep-eql "^0.1.3"
     type-detect "^1.0.0"
 
-chainsaw@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98"
-  integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=
-  dependencies:
-    traverse ">=0.3.0 <0.4"
-
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -3043,13 +3001,6 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-duplexer2@~0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
-  dependencies:
-    readable-stream "^2.0.2"
-
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
@@ -3117,13 +3068,6 @@ encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
 
-encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
-  dependencies:
-    iconv-lite "~0.4.13"
-
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
@@ -3214,18 +3158,6 @@ es-to-primitive@^1.2.0:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
 escalade@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
@@ -3831,18 +3763,6 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "=3.1.0"
 
-"fontello-webpack-plugin@https://github.com/w3geo/fontello-webpack-plugin.git#6149eac8f2672ab6da089e8802fbfcac98487186":
-  version "0.4.8"
-  resolved "https://github.com/w3geo/fontello-webpack-plugin.git#6149eac8f2672ab6da089e8802fbfcac98487186"
-  dependencies:
-    form-data "^2.1.2"
-    html-webpack-plugin "^3.2.0"
-    https-proxy-agent "^2.1.1"
-    lodash "^4.17.4"
-    node-fetch "^1.6.3"
-    unzipper "^0.10.5"
-    webpack-sources "^0.2.0"
-
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -3857,15 +3777,6 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@^2.1.2:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
-  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -3927,16 +3838,6 @@ fsevents@^1.2.7:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
-fstream@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
-  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
@@ -4153,11 +4054,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
 
-graceful-fs@^4.2.2:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
-
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -4341,7 +4237,7 @@ html-tags@^3.1.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
   integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-html-webpack-plugin@^3.0.0, html-webpack-plugin@^3.2.0:
+html-webpack-plugin@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
   dependencies:
@@ -4428,21 +4324,13 @@ https-proxy-agent@1:
     debug "2"
     extend "3"
 
-https-proxy-agent@^2.1.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
 iconv-lite@0.4.23, iconv-lite@^0.4.4:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.24, iconv-lite@~0.4.13:
+iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   dependencies:
@@ -4565,7 +4453,7 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-inherits@^2.0.0, inherits@~2.0.0:
+inherits@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4883,7 +4771,7 @@ is-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d"
   integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
 
-is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
@@ -5281,11 +5169,6 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
-listenercount@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"
-  integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=
-
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -6005,7 +5888,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -6152,14 +6035,6 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
-node-fetch@^1.6.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
-  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
-
 node-libs-browser@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
@@ -7838,13 +7713,6 @@ rfdc@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
 
-rimraf@2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -8018,7 +7886,7 @@ set-value@^2.0.0:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-setimmediate@^1.0.4, setimmediate@~1.0.4:
+setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
@@ -8190,11 +8058,6 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
-  integrity sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=
-
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -8234,7 +8097,7 @@ source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.3:
+source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -8791,11 +8654,6 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
-"traverse@>=0.3.0 <0.4":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
-  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
-
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -9034,22 +8892,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-unzipper@^0.10.5:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.10.5.tgz#4d189ae6f8af634b26efe1a1817c399e0dd4a1a0"
-  integrity sha512-i5ufkXNjWZYxU/0nKKf6LkvW8kn9YzRvfwuPWjXP+JTFce/8bqeR0gEfbiN2IDdJa6ZU6/2IzFRLK0z1v0uptw==
-  dependencies:
-    big-integer "^1.6.17"
-    binary "~0.3.0"
-    bluebird "~3.4.1"
-    buffer-indexof-polyfill "~1.0.0"
-    duplexer2 "~0.1.4"
-    fstream "^1.0.12"
-    graceful-fs "^4.2.2"
-    listenercount "~1.0.1"
-    readable-stream "~2.3.6"
-    setimmediate "~1.0.4"
-
 upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
@@ -9314,14 +9156,6 @@ webpack-merge@^0.14.1:
     lodash.isplainobject "^3.2.0"
     lodash.merge "^3.3.2"
 
-webpack-sources@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
-  integrity sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=
-  dependencies:
-    source-list-map "^1.1.1"
-    source-map "~0.5.3"
-
 webpack-sources@^1.1.0, webpack-sources@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"

From 2c441c79225e1f4412eee4300820f57c4ef5f4fc Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 27 Oct 2020 10:03:04 +0200
Subject: [PATCH 016/389] fix back button size, fix missing chat notifications
 being marked as read too eagerly, fix promiseinterval erroring when not
 getting a promise

---
 src/components/chat/chat.js                       | 14 ++++++++++----
 src/components/chat/chat.scss                     | 11 ++++++-----
 src/services/chat_utils/chat_utils.js             |  2 +-
 src/services/promise_interval/promise_interval.js |  9 ++++++++-
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 34e723d0..681ba08f 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -11,6 +11,7 @@ import { getScrollPosition, getNewTopPosition, isBottomedOut, scrollableContaine
 const BOTTOMED_OUT_OFFSET = 10
 const JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET = 150
 const SAFE_RESIZE_TIME_OFFSET = 100
+const MARK_AS_READ_DELAY = 1500
 
 const Chat = {
   components: {
@@ -94,7 +95,7 @@ const Chat = {
       const bottomedOutBeforeUpdate = this.bottomedOut(BOTTOMED_OUT_OFFSET)
       this.$nextTick(() => {
         if (bottomedOutBeforeUpdate) {
-          this.scrollDown({ forceRead: !document.hidden })
+          this.scrollDown()
         }
       })
     },
@@ -200,7 +201,7 @@ const Chat = {
       this.$nextTick(() => {
         scrollable.scrollTo({ top: scrollable.scrollHeight, left: 0, behavior })
       })
-      if (forceRead || this.newMessageCount > 0) {
+      if (forceRead) {
         this.readChat()
       }
     },
@@ -225,12 +226,17 @@ const Chat = {
       } else if (this.bottomedOut(JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET)) {
         this.jumpToBottomButtonVisible = false
         if (this.newMessageCount > 0) {
-          this.readChat()
+          // Use a delay before marking as read to prevent situation where new messages
+          // arrive just as you're leaving the view and messages that you didn't actually
+          // get to see get marked as read.
+          window.setTimeout(() => {
+            if (this.$el) this.readChat()
+          }, MARK_AS_READ_DELAY)
         }
       } else {
         this.jumpToBottomButtonVisible = true
       }
-    }, 100),
+    }, 200),
     handleScrollUp (positionBeforeLoading) {
       const positionAfterLoading = getScrollPosition(this.$refs.scrollable)
       this.$refs.scrollable.scrollTo({
diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index 012a1b1d..f91de618 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -25,7 +25,7 @@
     min-height: 100%;
     margin: 0 0 0 0;
     border-radius: 10px 10px 0 0;
-    border-radius: var(--panelRadius, 10px) var(--panelRadius, 10px) 0 0 ;
+    border-radius: var(--panelRadius, 10px) var(--panelRadius, 10px) 0 0;
 
     &::after {
       border-radius: 0;
@@ -58,11 +58,12 @@
 
   .go-back-button {
     cursor: pointer;
-    margin-right: 1.4em;
+    padding: 0.6em;
+    margin: -0.6em 0.8em -0.6em -0.6em;
+    height: 100%;
 
     i {
-      display: flex;
-      align-items: center;
+      vertical-align: middle;
     }
   }
 
@@ -78,7 +79,7 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.3), 0px 2px 4px rgba(0, 0, 0, 0.3);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3), 0 2px 4px rgba(0, 0, 0, 0.3);
     z-index: 10;
     transition: 0.35s all;
     transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
diff --git a/src/services/chat_utils/chat_utils.js b/src/services/chat_utils/chat_utils.js
index 583438f7..86fe1af9 100644
--- a/src/services/chat_utils/chat_utils.js
+++ b/src/services/chat_utils/chat_utils.js
@@ -3,7 +3,7 @@ import { showDesktopNotification } from '../desktop_notification_utils/desktop_n
 export const maybeShowChatNotification = (store, chat) => {
   if (!chat.lastMessage) return
   if (store.rootState.chats.currentChatId === chat.id && !document.hidden) return
-  if (store.rootState.users.currentUser.id === chat.lastMessage.account.id) return
+  if (store.rootState.users.currentUser.id === chat.lastMessage.account_id) return
 
   const opts = {
     tag: chat.lastMessage.id,
diff --git a/src/services/promise_interval/promise_interval.js b/src/services/promise_interval/promise_interval.js
index cf17970d..0c0a66a0 100644
--- a/src/services/promise_interval/promise_interval.js
+++ b/src/services/promise_interval/promise_interval.js
@@ -10,7 +10,14 @@ export const promiseInterval = (promiseCall, interval) => {
   let timeout = null
 
   const func = () => {
-    promiseCall().finally(() => {
+    const promise = promiseCall()
+    // something unexpected happened and promiseCall did not
+    // return a promise, abort the loop.
+    if (!(promise && promise.finally)) {
+      console.warn('promiseInterval: promise call did not return a promise, stopping interval.')
+      return
+    }
+    promise.finally(() => {
       if (stopped) return
       timeout = window.setTimeout(func, interval)
     })

From 1403f20f9feda44206b35f5b303652facd5e2011 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 27 Oct 2020 12:59:50 +0200
Subject: [PATCH 017/389] block clicks for a second when timeline moves

---
 src/components/timeline/timeline.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 17680542..25fa3e41 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -2,7 +2,7 @@ import Status from '../status/status.vue'
 import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js'
 import Conversation from '../conversation/conversation.vue'
 import TimelineMenu from '../timeline_menu/timeline_menu.vue'
-import { throttle, keyBy } from 'lodash'
+import { debounce, throttle, keyBy } from 'lodash'
 
 export const getExcludedStatusIdsByPinning = (statuses, pinnedStatusIds) => {
   const ids = []
@@ -34,7 +34,8 @@ const Timeline = {
       paused: false,
       unfocused: false,
       bottomedOut: false,
-      virtualScrollIndex: 0
+      virtualScrollIndex: 0,
+      blockingClicks: false
     }
   },
   components: {
@@ -124,6 +125,21 @@ const Timeline = {
     this.$store.commit('setLoading', { timeline: this.timelineName, value: false })
   },
   methods: {
+    blockClickEvent (e) {
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    stopBlockingClicks: debounce(function () {
+      this.blockingClicks = false
+      this.$el && this.$el.removeEventListener('click', this.blockClickEvent, true)
+    }, 1000),
+    blockClicksTemporarily () {
+      if (!this.blockingClicks) {
+        this.$el.addEventListener('click', this.blockClickEvent, true)
+        this.blockingClicks = true
+      }
+      this.stopBlockingClicks()
+    },
     handleShortKey (e) {
       // Ignore when input fields are focused
       if (['textarea', 'input'].includes(e.target.tagName.toLowerCase())) return
@@ -135,6 +151,7 @@ const Timeline = {
         this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
         this.fetchOlderStatuses()
       } else {
+        this.blockClicksTemporarily()
         this.$store.commit('showNewStatuses', { timeline: this.timelineName })
         this.paused = false
       }

From 85dc4002a1c96bbaf3c2fc3614c55cb57c574072 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 27 Oct 2020 13:17:49 +0200
Subject: [PATCH 018/389] update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99f601a5..1a7cf9a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed chat messages sometimes getting lost when you receive a message at the same time
 - Fixed clicking NSFW hider through status popover
 
+### Changed
+- Clicking immediately when timeline shifts is now blocked to prevent misclicks
+
 ### Added
 - Import/export a muted users
 - Proper handling of deletes when using websocket streaming

From 24d85ce6dc77c2e18759bdb67c8005fcd697a0c5 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 27 Oct 2020 13:24:05 +0200
Subject: [PATCH 019/389] update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99f601a5..b7846c5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed chats list not updating its order when new messages come in
 - Fixed chat messages sometimes getting lost when you receive a message at the same time
 - Fixed clicking NSFW hider through status popover
+- Fixed chat-view back button being hard to click
+- Fixed fresh chat notifications being cleared immediately while leaving the chat view and not having time to actually see the messages
 
 ### Added
 - Import/export a muted users

From 7007659e05842dc06eb2c13eddaba6ab657df5ea Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 28 Oct 2020 08:53:23 +0200
Subject: [PATCH 020/389] change input blocking to use css

---
 src/components/timeline/timeline.js  | 10 +++-------
 src/components/timeline/timeline.vue |  9 +++++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 25fa3e41..ea290fde 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -65,8 +65,10 @@ const Timeline = {
       }
     },
     classes () {
+      let rootClasses = !this.embedded ? ['panel', 'panel-default'] : []
+      if (this.blockingClicks) rootClasses = rootClasses.concat(['-blocked'])
       return {
-        root: ['timeline'].concat(!this.embedded ? ['panel', 'panel-default'] : []),
+        root: rootClasses,
         header: ['timeline-heading'].concat(!this.embedded ? ['panel-heading'] : []),
         body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : []),
         footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : [])
@@ -125,17 +127,11 @@ const Timeline = {
     this.$store.commit('setLoading', { timeline: this.timelineName, value: false })
   },
   methods: {
-    blockClickEvent (e) {
-      e.stopPropagation()
-      e.preventDefault()
-    },
     stopBlockingClicks: debounce(function () {
       this.blockingClicks = false
-      this.$el && this.$el.removeEventListener('click', this.blockClickEvent, true)
     }, 1000),
     blockClicksTemporarily () {
       if (!this.blockingClicks) {
-        this.$el.addEventListener('click', this.blockClickEvent, true)
         this.blockingClicks = true
       }
       this.stopBlockingClicks()
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index c1e2f44b..234ca2d2 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="[classes.root, 'timeline']">
+  <div :class="[classes.root, 'Timeline']">
     <div :class="classes.header">
       <TimelineMenu v-if="!embedded" />
       <div
@@ -103,10 +103,15 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.timeline {
+.Timeline {
   .loadmore-text {
     opacity: 1;
   }
+
+  &.-blocked {
+    pointer-events: none;
+    cursor: wait;
+  }
 }
 
 .timeline-heading {

From 6d7ecd7d800450ab07cb2895d4af96ab13849ded Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Wed, 28 Oct 2020 10:02:51 +0000
Subject: [PATCH 021/389] Apply 1 suggestion(s) to 1 file(s)

---
 src/components/timeline/timeline.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 234ca2d2..e4404daf 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -110,7 +110,6 @@
 
   &.-blocked {
     pointer-events: none;
-    cursor: wait;
   }
 }
 

From b6cf2bcefd5ddd20c11ee4b0d0f94e29e8f59c40 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 28 Oct 2020 21:31:16 +0200
Subject: [PATCH 022/389] improved the semantics for our icon scale, fixed
 preview, fixed navbar desktop

---
 src/App.scss                                  | 12 ++++--
 src/App.vue                                   |  9 ++--
 src/components/chat_new/chat_new.vue          |  3 +-
 .../extra_buttons/extra_buttons.vue           |  2 +-
 .../favorite_button/favorite_button.vue       |  6 +--
 .../global_notice_list/global_notice_list.vue |  2 +-
 .../image_cropper/image_cropper.vue           |  2 +-
 src/components/login_form/login_form.vue      |  2 +-
 src/components/mfa_form/recovery_form.vue     |  2 +-
 src/components/mfa_form/totp_form.vue         |  2 +-
 src/components/mobile_nav/mobile_nav.vue      |  9 ++--
 src/components/nav_panel/nav_panel.vue        | 41 +++++++------------
 src/components/notification/notification.vue  |  8 ++--
 .../password_reset/password_reset.vue         |  2 +-
 .../post_status_form/post_status_form.vue     | 16 ++++----
 src/components/react_button/react_button.vue  |  3 +-
 src/components/reply_button/reply_button.vue  |  6 +--
 .../retweet_button/retweet_button.vue         |  9 ++--
 .../scope_selector/scope_selector.vue         | 12 ++----
 src/components/search_bar/search_bar.vue      |  6 +--
 .../settings_modal/tabs/profile_tab.vue       |  4 +-
 .../settings_modal/tabs/theme_tab/preview.vue |  8 ++--
 src/components/side_drawer/side_drawer.vue    | 38 ++++++-----------
 src/components/status/status.vue              | 24 ++++-------
 .../timeline_menu/timeline_menu.vue           | 15 +++----
 src/components/user_card/user_card.vue        |  3 +-
 26 files changed, 95 insertions(+), 151 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 06915e16..6884f314 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -812,14 +812,18 @@ nav {
   }
 }
 
-.button-icon {
-  &.svg-inline--fa.fa-lg {
-    display: inline-block;
-    padding: 0 0.3em;
+.fa-scale-110 {
+  &.svg-inline--fa {
     font-size: 1.1em;
   }
 }
 
+.fa-old-padding {
+  &.svg-inline--fa {
+    padding: 0 0.3em;
+  }
+}
+
 @keyframes shakeError {
   0% {
     transform: translateX(0);
diff --git a/src/App.vue b/src/App.vue
index c27f51bf..6e44c7e9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -53,8 +53,7 @@
           >
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="cog"
               :title="$t('nav.preferences')"
             />
@@ -66,8 +65,7 @@
             target="_blank"
           ><FAIcon
             fixed-width
-            size="lg"
-            class="button-icon"
+            class="fa-scale-110 fa-old-padding"
             icon="tachometer-alt"
             :title="$t('nav.administration')"
           /></a>
@@ -78,8 +76,7 @@
             @click.prevent="logout"
           ><FAIcon
             fixed-width
-            size="lg"
-            class="button-icon"
+            class="fa-scale-110 fa-old-padding"
             icon="sign-out-alt"
             :title="$t('login.logout')"
           /></a>
diff --git a/src/components/chat_new/chat_new.vue b/src/components/chat_new/chat_new.vue
index 8f02a699..f3894a3a 100644
--- a/src/components/chat_new/chat_new.vue
+++ b/src/components/chat_new/chat_new.vue
@@ -20,8 +20,7 @@
     <div class="input-wrap">
       <div class="input-search">
         <FAIcon
-          size="lg"
-          class="search-icon button-icon"
+          class="search-icon fa-scale-110 fa-old-padding"
           icon="search"
         />
       </div>
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 4bf1e62a..f32ea02d 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -107,7 +107,7 @@
     </div>
     <span slot="trigger">
       <FAIcon
-        class="ExtraButtons button-icon"
+        class="ExtraButtons fa-scale-110 fa-old-padding"
         icon="ellipsis-h"
         size="md"
       />
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index 6c7bfdab..dfe12f86 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -2,11 +2,10 @@
   <div v-if="loggedIn">
     <FAIcon
       :class="classes"
-      class="FavoriteButton button-icon -interactive"
+      class="FavoriteButton fa-scale-110 fa-old-padding -interactive"
       :title="$t('tool_tip.favorite')"
       :icon="[status.favorited ? 'fas' : 'far', 'star']"
       :spin="animated"
-      size="lg"
       @click.prevent="favorite()"
     />
     <span v-if="!mergedConfig.hidePostStats && status.fave_num > 0">{{ status.fave_num }}</span>
@@ -14,10 +13,9 @@
   <div v-else>
     <FAIcon
       :class="classes"
-      class="FavoriteButton button-icon"
+      class="FavoriteButton fa-scale-110 fa-old-padding"
       :title="$t('tool_tip.favorite')"
       :icon="['far', 'star']"
-      size="lg"
     />
     <span v-if="!mergedConfig.hidePostStats && status.fave_num > 0">{{ status.fave_num }}</span>
   </div>
diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
index 06b6af9c..8a33b9eb 100644
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -10,7 +10,7 @@
         {{ $t(notice.messageKey, notice.messageArgs) }}
       </div>
       <FAIcon
-        class="button-icon"
+        class="fa-scale-110 fa-old-padding"
         icon="times"
         @click="closeNotice(notice)"
       />
diff --git a/src/components/image_cropper/image_cropper.vue b/src/components/image_cropper/image_cropper.vue
index 605f7427..75def612 100644
--- a/src/components/image_cropper/image_cropper.vue
+++ b/src/components/image_cropper/image_cropper.vue
@@ -43,7 +43,7 @@
       >
         {{ submitErrorMsg }}
         <FAIcon
-          class="button-icon"
+          class="fa-scale-110 fa-old-padding"
           icon="times"
           @click="clearError"
         />
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index 4ab5d192..a1f77210 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -77,7 +77,7 @@
       <div class="alert error">
         {{ error }}
         <FAIcon
-          class="button-icon"
+          class="fa-scale-110 fa-old-padding"
           icon="times"
           @click="clearError"
         />
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index f6526d2a..78953649 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -55,7 +55,7 @@
       <div class="alert error">
         {{ error }}
         <FAIcon
-          class="button-icon"
+          class="fa-scale-110 fa-old-padding"
           icon="times"
           @click="clearError"
         />
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index 0c6412ea..9401cad5 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -58,7 +58,7 @@
         {{ error }}
         <FAIcon
           size="lg"
-          class="button-icon"
+          class="fa-scale-110 fa-old-padding"
           icon="times"
           @click="clearError"
         />
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index db9b0ba0..d2bc65ab 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -16,8 +16,7 @@
             @click.stop.prevent="toggleMobileSidebar()"
           >
             <FAIcon
-              size="lg"
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="bars"
             />
             <div
@@ -42,8 +41,7 @@
             @click.stop.prevent="openMobileNotifications()"
           >
             <FAIcon
-              size="lg"
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="bell"
             />
             <div
@@ -68,8 +66,7 @@
           @click.stop.prevent="closeMobileNotifications()"
         >
           <FAIcon
-            size="lg"
-            class="button-icon"
+            class="fa-scale-110 fa-old-padding"
             icon="times"
           />
         </a>
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 4755d7b7..e7301328 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -9,22 +9,18 @@
           >
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon"
+              class="fa-scale-110"
               icon="home"
-            />
-            {{ $t("nav.timelines") }}
+            />{{ $t("nav.timelines") }}
           </router-link>
         </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon"
+              class="fa-scale-110"
               icon="bell"
-            />
-            {{ $t("nav.interactions") }}
+            />{{ $t("nav.interactions") }}
           </router-link>
         </li>
         <li v-if="currentUser && pleromaChatMessagesAvailable">
@@ -37,22 +33,18 @@
             </div>
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon"
+              class="fa-scale-110"
               icon="comments"
-            />
-            {{ $t("nav.chats") }}
+            />{{ $t("nav.chats") }}
           </router-link>
         </li>
         <li v-if="currentUser && currentUser.locked">
           <router-link :to="{ name: 'friend-requests' }">
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon"
+              class="fa-scale-110"
               icon="user-plus"
-            />
-            {{ $t("nav.friend_requests") }}
+            />{{ $t("nav.friend_requests") }}
             <span
               v-if="followRequestCount > 0"
               class="badge follow-request-count"
@@ -65,8 +57,7 @@
           <router-link :to="{ name: 'about' }">
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon"
+              class="fa-scale-110"
               icon="info-circle"
             />{{ $t("nav.about") }}
           </router-link>
@@ -94,7 +85,7 @@
   }
 
   .follow-request-count {
-    margin: -6px 10px;
+    vertical-align: bottom;
     background-color: $fallback--bg;
     background-color: var(--input, $fallback--faint);
   }
@@ -126,7 +117,8 @@
 
   a {
     display: block;
-    padding: 0.8em 0.85em;
+    align-items: stretch;
+    padding: 0.9em 1em;
 
     &:hover {
       background-color: $fallback--lightBg;
@@ -156,13 +148,8 @@
     }
   }
 
-  .button-icon {
-    margin-left: -0.1em;
-    margin-right: 0.2em;
-  }
-
-  .button-icon:before {
-    width: 1.1em;
+  .fa-scale-110 {
+    margin-right: 0.8em;
   }
 }
 </style>
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index b609ae04..2bbde108 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -19,7 +19,7 @@
         class="unmute"
         @click.prevent="toggleMute"
       ><FAIcon
-        class="button-icon"
+        class="fa-scale-110 fa-old-padding"
         icon="eye-slash"
       /></a>
     </div>
@@ -137,7 +137,7 @@
             href="#"
             @click.prevent="toggleMute"
           ><FAIcon
-            class="button-icon"
+            class="fa-scale-110 fa-old-padding"
             icon="eye-slash"
           /></a>
         </span>
@@ -157,13 +157,13 @@
           >
             <FAIcon
               icon="check"
-              class="button-icon follow-request-accept"
+              class="fa-scale-110 fa-old-padding follow-request-accept"
               :title="$t('tool_tip.accept_follow_request')"
               @click="approveUser()"
             />
             <FAIcon
               icon="times"
-              class="button-icon follow-request-reject"
+              class="fa-scale-110 fa-old-padding follow-request-reject"
               :title="$t('tool_tip.reject_follow_request')"
               @click="denyUser()"
             />
diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue
index 3fe42b84..0deb9ccf 100644
--- a/src/components/password_reset/password_reset.vue
+++ b/src/components/password_reset/password_reset.vue
@@ -63,7 +63,7 @@
           >
             <span>{{ error }}</span>
             <a
-              class="button-icon dismiss"
+              class="fa-scale-110 fa-old-padding dismiss"
               @click.prevent="dismissError()"
             >
               <FAIcon icon="times" />
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 9cf38a9a..a427bb98 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -37,7 +37,7 @@
         >
           <span>{{ $t('post_status.scope_notice.public') }}</span>
           <a
-            class="button-icon dismiss"
+            class="fa-scale-110 fa-old-padding dismiss"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
@@ -49,7 +49,7 @@
         >
           <span>{{ $t('post_status.scope_notice.unlisted') }}</span>
           <a
-            class="button-icon dismiss"
+            class="fa-scale-110 fa-old-padding dismiss"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
@@ -61,7 +61,7 @@
         >
           <span>{{ $t('post_status.scope_notice.private') }}</span>
           <a
-            class="button-icon dismiss"
+            class="fa-scale-110 fa-old-padding dismiss"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
@@ -83,7 +83,7 @@
             @click.stop.prevent="togglePreview"
           >
             {{ $t('post_status.preview') }}
-            <i :class="showPreview ? 'icon-left-open' : 'icon-right-open'" />
+            <FAIcon :icon="showPreview ? 'chevron-left' : 'chevron-right'" />
           </a>
           <FAIcon
             v-show="previewLoading"
@@ -289,8 +289,7 @@
       >
         Error: {{ error }}
         <FAIcon
-          class="button-icon"
-          size="lg"
+          class="fa-scale-110 fa-old-padding"
           icon="times"
           @click="clearError"
         />
@@ -302,7 +301,7 @@
           class="media-upload-wrapper"
         >
           <FAIcon
-            class="button-icon"
+            class="fa-scale-110 fa-old-padding"
             icon="times"
             @click="removeMediaFile(file)"
           />
@@ -389,7 +388,6 @@
   }
 
   .preview-toggle {
-    display: flex;
     cursor: pointer;
     user-select: none;
 
@@ -524,7 +522,7 @@
       position: relative;
     }
 
-    .button-icon {
+    .fa-scale-110 fa-old-padding {
       position: absolute;
       margin: 10px;
       margin: .75em;
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 8395d5e3..694e6470 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -38,9 +38,8 @@
     </div>
     <FAIcon
       slot="trigger"
-      class="button-icon add-reaction-button"
+      class="fa-scale-110 fa-old-padding add-reaction-button"
       :icon="['far', 'smile-beam']"
-      size="lg"
       :title="$t('tool_tip.add_reaction')"
     />
   </Popover>
diff --git a/src/components/reply_button/reply_button.vue b/src/components/reply_button/reply_button.vue
index ae7b0e26..a0ac8941 100644
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@@ -2,9 +2,8 @@
   <div>
     <FAIcon
       v-if="loggedIn"
-      class="ReplyButton button-icon -interactive"
+      class="ReplyButton fa-scale-110 fa-old-padding -interactive"
       icon="reply"
-      size="lg"
       :title="$t('tool_tip.reply')"
       :class="{'-active': replying}"
       @click.prevent="$emit('toggle')"
@@ -12,8 +11,7 @@
     <FAIcon
       v-else
       icon="reply"
-      size="lg"
-      class="ReplyButton button-icon"
+      class="ReplyButton fa-scale-110 fa-old-padding"
       :title="$t('tool_tip.reply')"
     />
     <span v-if="status.replies_count > 0">
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 706c6b81..b234f3d9 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -3,9 +3,8 @@
     <template v-if="visibility !== 'private' && visibility !== 'direct'">
       <FAIcon
         :class="classes"
-        class="RetweetButton button-icon -interactive"
+        class="RetweetButton fa-scale-110 fa-old-padding -interactive"
         icon="retweet"
-        size="lg"
         :spin="animated"
         :title="$t('tool_tip.repeat')"
         @click.prevent="retweet()"
@@ -15,9 +14,8 @@
     <template v-else>
       <FAIcon
         :class="classes"
-        class="RetweetButton button-icon"
+        class="RetweetButton fa-scale-110 fa-old-padding"
         icon="lock"
-        size="lg"
         :title="$t('timeline.no_retweet_hint')"
       />
     </template>
@@ -25,9 +23,8 @@
   <div v-else-if="!loggedIn">
     <FAIcon
       :class="classes"
-      class="button-icon"
+      class="fa-scale-110 fa-old-padding"
       icon="retweet"
-      size="lg"
       :title="$t('tool_tip.repeat')"
     />
     <span v-if="!mergedConfig.hidePostStats && status.repeat_num > 0">{{ status.repeat_num }}</span>
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index a43af23b..a22a4fda 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -12,8 +12,7 @@
     >
       <FAIcon
         icon="envelope"
-        class="button-icon"
-        size="lg"
+        class="fa-scale-110 fa-old-padding"
       />
     </span>
     <span
@@ -25,8 +24,7 @@
     >
       <FAIcon
         icon="lock"
-        class="button-icon"
-        size="lg"
+        class="fa-scale-110 fa-old-padding"
       />
     </span>
     <span
@@ -38,8 +36,7 @@
     >
       <FAIcon
         icon="lock-open"
-        class="button-icon"
-        size="lg"
+        class="fa-scale-110 fa-old-padding"
       />
     </span>
     <span
@@ -51,8 +48,7 @@
     >
       <FAIcon
         icon="globe"
-        class="button-icon"
-        size="lg"
+        class="fa-scale-110 fa-old-padding"
       />
     </span>
   </div>
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 442e91b2..f1c3fd7a 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -8,8 +8,7 @@
         :title="$t('nav.search')"
       ><FAIcon
         fixed-width
-        size="lg"
-        class="button-icon"
+        class="fa-scale-110 fa-old-padding"
         icon="search"
         @click.prevent.stop="toggleHidden"
       /></a>
@@ -34,10 +33,9 @@
         </button>
         <span>
           <FAIcon
-            size="lg"
             fixed-width
             icon="times"
-            class="cancel-icon"
+            class="cancel-icon fa-scale-110 fa-old-padding"
             @click.prevent.stop="toggleHidden"
           />
         </span>
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 5a659fc8..d62bc392 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -235,7 +235,7 @@
       >
         Error: {{ bannerUploadError }}
         <FAIcon
-          class="button-icon"
+          class="fa-scale-110 fa-old-padding"
           icon="times"
           @click="clearUploadError('banner')"
         />
@@ -286,7 +286,7 @@
         Error: {{ backgroundUploadError }}
         <FAIcon
           size="lg"
-          class="button-icon"
+          class="fa-scale-110 fa-old-padding"
           icon="times"
           @click="clearUploadError('background')"
         />
diff --git a/src/components/settings_modal/tabs/theme_tab/preview.vue b/src/components/settings_modal/tabs/theme_tab/preview.vue
index 20201e18..3174fd7c 100644
--- a/src/components/settings_modal/tabs/theme_tab/preview.vue
+++ b/src/components/settings_modal/tabs/theme_tab/preview.vue
@@ -42,25 +42,25 @@
               <FAIcon
                 fixed-width
                 style="color: var(--cBlue)"
-                class="button-icon"
+                class="fa-scale-110 fa-old-padding"
                 icon="reply"
               />
               <FAIcon
                 fixed-width
                 style="color: var(--cGreen)"
-                class="button-icon"
+                class="fa-scale-110 fa-old-padding"
                 icon="retweet"
               />
               <FAIcon
                 fixed-width
                 style="color: var(--cOrange)"
-                class="button-icon"
+                class="fa-scale-110 fa-old-padding"
                 icon="star"
               />
               <FAIcon
                 fixed-width
                 style="color: var(--cRed)"
-                class="button-icon"
+                class="fa-scale-110 fa-old-padding"
                 icon="times"
               />
             </div>
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 2a4d794a..eac0ddb2 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -37,9 +37,8 @@
         >
           <router-link :to="{ name: 'login' }">
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="sign-in-alt"
             /> {{ $t("login.login") }}
           </router-link>
@@ -50,9 +49,8 @@
         >
           <router-link :to="{ name: timelinesRoute }">
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="home"
             /> {{ $t("nav.timelines") }}
           </router-link>
@@ -66,9 +64,8 @@
             style="position: relative"
           >
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="comments"
             /> {{ $t("nav.chats") }}
             <span
@@ -84,9 +81,8 @@
         <li @click="toggleDrawer">
           <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="bell"
             /> {{ $t("nav.interactions") }}
           </router-link>
@@ -97,9 +93,8 @@
         >
           <router-link to="/friend-requests">
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="user-plus"
             /> {{ $t("nav.friend_requests") }}
             <span
@@ -116,9 +111,8 @@
         >
           <router-link :to="{ name: 'chat' }">
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="bullhorn"
             /> {{ $t("shoutbox.title") }}
           </router-link>
@@ -131,9 +125,8 @@
         >
           <router-link :to="{ name: 'search' }">
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="search"
             /> {{ $t("nav.search") }}
           </router-link>
@@ -144,9 +137,8 @@
         >
           <router-link :to="{ name: 'who-to-follow' }">
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="user-plus"
             /> {{ $t("nav.who_to_follow") }}
           </router-link>
@@ -157,9 +149,8 @@
             @click="openSettingsModal"
           >
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="cog"
             /> {{ $t("settings.settings") }}
           </a>
@@ -167,9 +158,8 @@
         <li @click="toggleDrawer">
           <router-link :to="{ name: 'about'}">
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="info-circle"
             /> {{ $t("nav.about") }}
           </router-link>
@@ -183,9 +173,8 @@
             target="_blank"
           >
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="tachometer-alt"
             /> {{ $t("nav.administration") }}
           </a>
@@ -199,9 +188,8 @@
             @click="doLogout"
           >
             <FAIcon
-              size="lg"
               fixed-width
-              class="button-icon"
+              class="fa-scale-110 fa-old-padding"
               icon="sign-out-alt"
             /> {{ $t("login.logout") }}
           </a>
@@ -284,7 +272,7 @@
   --lightText: var(--popoverLightText, $fallback--lightText);
   --icon: var(--popoverIcon, $fallback--icon);
 
-  .button-icon:before {
+  .fa-scale-110 fa-old-padding:before {
     width: 1.1em;
   }
 }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index c94862d4..21412faa 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -11,7 +11,7 @@
     >
       {{ error }}
       <span
-        class="button-icon"
+        class="fa-scale-110 fa-old-padding"
         @click="clearError"
       >
         <FAIcon icon="times" />
@@ -22,7 +22,7 @@
         <small class="status-username">
           <FAIcon
             v-if="muted && retweet"
-            class="button-icon repeat-icon"
+            class="fa-scale-110 fa-old-padding repeat-icon"
             icon="retweet"
           />
           <router-link :to="userProfileLink">
@@ -49,13 +49,12 @@
         </small>
         <a
           href="#"
-          class="unmute button-icon"
+          class="unmute fa-scale-110 fa-old-padding"
           @click.prevent="toggleMute"
         >
           <FAIcon
             icon="eye-slash"
-            class="button-icon"
-            size="lg"
+            class="fa-scale-110 fa-old-padding"
           />
         </a>
       </div>
@@ -186,9 +185,8 @@
                   :title="status.visibility | capitalize"
                 >
                   <FAIcon
-                    class="button-icon"
+                    class="fa-scale-110 fa-old-padding"
                     :icon="visibilityIcon(status.visibility)"
-                    size="lg"
                   />
                 </span>
                 <a
@@ -199,9 +197,8 @@
                   title="Source"
                 >
                   <FAIcon
-                    class="button-icon"
+                    class="fa-scale-110 fa-old-padding"
                     icon="external-link-square-alt"
-                    size="lg"
                   />
                 </a>
                 <a
@@ -211,9 +208,8 @@
                   @click.prevent="toggleExpanded"
                 >
                   <FAIcon
-                    class="button-icon"
+                    class="fa-scale-110 fa-old-padding"
                     icon="plus-square"
-                    size="lg"
                   />
                 </a>
                 <a
@@ -223,8 +219,7 @@
                 >
                   <FAIcon
                     icon="eye-slash"
-                    class="button-icon"
-                    size="lg"
+                    class="fa-scale-110 fa-old-padding"
                   />
                 </a>
               </span>
@@ -249,9 +244,8 @@
                     @click.prevent="gotoOriginal(status.in_reply_to_status_id)"
                   >
                     <FAIcon
-                      class="button-icon"
+                      class="fa-scale-110 fa-old-padding"
                       icon="reply"
-                      size="lg"
                       flip="horizontal"
                     />
                     <span
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index 8099ddd5..c46531be 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -18,8 +18,7 @@
           <router-link :to="{ name: 'friends' }">
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon "
+              class="fa-scale-110 fa-old-padding "
               icon="home"
             />{{ $t("nav.timeline") }}
           </router-link>
@@ -28,8 +27,7 @@
           <router-link :to="{ name: 'bookmarks'}">
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon "
+              class="fa-scale-110 fa-old-padding "
               icon="bookmark"
             />{{ $t("nav.bookmarks") }}
           </router-link>
@@ -38,8 +36,7 @@
           <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon "
+              class="fa-scale-110 fa-old-padding "
               icon="envelope"
             />{{ $t("nav.dms") }}
           </router-link>
@@ -48,8 +45,7 @@
           <router-link :to="{ name: 'public-timeline' }">
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon "
+              class="fa-scale-110 fa-old-padding "
               icon="users"
             />{{ $t("nav.public_tl") }}
           </router-link>
@@ -58,8 +54,7 @@
           <router-link :to="{ name: 'public-external-timeline' }">
             <FAIcon
               fixed-width
-              size="lg"
-              class="button-icon "
+              class="fa-scale-110 fa-old-padding "
               icon="globe"
             />{{ $t("nav.twkn") }}
           </router-link>
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index c5f10b75..55e231d2 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -22,9 +22,8 @@
             />
             <div class="user-info-avatar-link-overlay">
               <FAIcon
-                class="button-icon"
+                class="fa-scale-110 fa-old-padding"
                 icon="search-plus"
-                size="lg"
               />
             </div>
           </a>

From 7c4af4ce3fe140d8dbe3ff6da55dfd0edcef7778 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 28 Oct 2020 21:41:42 +0200
Subject: [PATCH 023/389] improved side-drawer alignments

---
 src/components/side_drawer/side_drawer.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index eac0ddb2..c3370a9d 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -320,7 +320,6 @@
   border-bottom: 1px solid;
   border-color: $fallback--border;
   border-color: var(--border, $fallback--border);
-  margin: 0.2em 0;
 }
 
 .side-drawer ul:last-child {
@@ -331,8 +330,11 @@
   padding: 0;
 
   a {
+    box-sizing: border-box;
     display: block;
-    padding: 0.5em 0.85em;
+    height: 3em;
+    line-height: 2em;
+    padding: 0.5em 0.7em;
 
     &:hover {
       background-color: $fallback--lightBg;

From fc7dfb3b9ecb92d2971ddc7007f708dc664e69f0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 28 Oct 2020 21:47:42 +0200
Subject: [PATCH 024/389] update & unify the navbars heights

---
 src/components/nav_panel/nav_panel.vue     | 5 ++++-
 src/components/side_drawer/side_drawer.vue | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index e7301328..7308fb1e 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -117,8 +117,11 @@
 
   a {
     display: block;
+    box-sizing: border-box;
     align-items: stretch;
-    padding: 0.9em 1em;
+    height: 3.5em;
+    line-height: 3.5em;
+    padding: 0 1em;
 
     &:hover {
       background-color: $fallback--lightBg;
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index c3370a9d..707c6c3d 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -333,8 +333,8 @@
     box-sizing: border-box;
     display: block;
     height: 3em;
-    line-height: 2em;
-    padding: 0.5em 0.7em;
+    line-height: 3em;
+    padding: 0 0.7em;
 
     &:hover {
       background-color: $fallback--lightBg;

From 0ac9d81788a2cb92cec54ae08264b52ea4c93b1c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 28 Oct 2020 21:55:08 +0200
Subject: [PATCH 025/389] fix settings tabs on mobile, update follow request
 badge

---
 src/components/nav_panel/nav_panel.vue        | 2 +-
 src/components/side_drawer/side_drawer.vue    | 7 +++++--
 src/components/tab_switcher/tab_switcher.scss | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 7308fb1e..8b299bf2 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -85,7 +85,7 @@
   }
 
   .follow-request-count {
-    vertical-align: bottom;
+    vertical-align: baseline;
     background-color: $fallback--bg;
     background-color: var(--input, $fallback--faint);
   }
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 707c6c3d..ed1ccb7d 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -272,9 +272,12 @@
   --lightText: var(--popoverLightText, $fallback--lightText);
   --icon: var(--popoverIcon, $fallback--icon);
 
-  .fa-scale-110 fa-old-padding:before {
-    width: 1.1em;
+  .follow-request-count {
+    vertical-align: baseline;
+    background-color: $fallback--bg;
+    background-color: var(--input, $fallback--faint);
   }
+
 }
 
 .side-drawer-logo-wrapper {
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index cd8fff6f..1e963516 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -92,7 +92,7 @@
         flex-direction: column;
 
         @media all and (max-width: 800px) {
-          min-width: 1em;
+          min-width: 4em;
         }
 
         &:not(.active)::after {

From 2e6c51dfd4e59370c104abb3e2602ec5a70bd030 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 28 Oct 2020 22:49:53 +0200
Subject: [PATCH 026/389] better icon for picker

---
 src/components/emoji_picker/emoji_picker.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index b1671566..0d51c7e5 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -1,13 +1,13 @@
 import Checkbox from '../checkbox/checkbox.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faUnderline,
+  faIcons,
   faStickyNote,
   faSmileBeam
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faUnderline,
+  faIcons,
   faStickyNote,
   faSmileBeam
 )
@@ -195,7 +195,7 @@ const EmojiPicker = {
         {
           id: 'standard',
           text: this.$t('emoji.unicode'),
-          icon: 'underline',
+          icon: 'icons',
           emojis: filterByKeyword(standardEmojis, this.keyword)
         }
       ]

From ef36ca44f613c3d7d2ea11a9ad4f7fe828f7ae83 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 28 Oct 2020 22:52:20 +0200
Subject: [PATCH 027/389] >boxes

---
 src/components/emoji_picker/emoji_picker.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 0d51c7e5..2716d93f 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -1,13 +1,13 @@
 import Checkbox from '../checkbox/checkbox.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faIcons,
+  faBoxOpen,
   faStickyNote,
   faSmileBeam
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faIcons,
+  faBoxOpen,
   faStickyNote,
   faSmileBeam
 )
@@ -195,7 +195,7 @@ const EmojiPicker = {
         {
           id: 'standard',
           text: this.$t('emoji.unicode'),
-          icon: 'icons',
+          icon: 'box-open',
           emojis: filterByKeyword(standardEmojis, this.keyword)
         }
       ]

From 3ead79ddb42967e2e5e7ccc6d832543b066c7c9b Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 29 Oct 2020 12:45:44 +0200
Subject: [PATCH 028/389] document thie this. check

---
 src/components/chat/chat.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index e60fe09d..c0c9ad6c 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -240,6 +240,7 @@ const Chat = {
           // arrive just as you're leaving the view and messages that you didn't actually
           // get to see get marked as read.
           window.setTimeout(() => {
+            // Don't mark as read if the element doesn't exist, user has left chat view
             if (this.$el) this.readChat()
           }, MARK_AS_READ_DELAY)
         }

From 8225717a7c5391e21dba00a28aebb642ffcc8cef Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 29 Oct 2020 20:03:53 +0200
Subject: [PATCH 029/389] Update and fix avatar shadow in user card

---
 src/components/user_avatar/user_avatar.vue | 9 ++++++---
 src/components/user_card/user_card.vue     | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index eb3d375e..43947282 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -20,11 +20,14 @@
 @import '../../_variables.scss';
 
 .Avatar {
+  --_avatarShadowBox: var(--avatarStatusShadow);
+  --_avatarShadowFilter: var(--avatarStatusShadowFilter);
+  --_avatarShadowInset: var(--avatarStatusShadowInset);
   --still-image-label-visibility: hidden;
 
   width: 48px;
   height: 48px;
-  box-shadow: var(--avatarStatusShadow);
+  box-shadow: var(--_avatarShadowBox);
   border-radius: $fallback--avatarRadius;
   border-radius: var(--avatarRadius, $fallback--avatarRadius);
 
@@ -34,8 +37,8 @@
   }
 
   &.better-shadow {
-    box-shadow: var(--avatarStatusShadowInset);
-    filter: var(--avatarStatusShadowFilter)
+    box-shadow: var(--_avatarShadowInset);
+    filter: var(--_avatarShadowFilter);
   }
 
   &.animated::before {
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 55e231d2..52a54fa7 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -382,11 +382,13 @@
     max-height: 56px;
 
     .Avatar {
+      --_avatarShadowBox: var(--avatarShadow);
+      --_avatarShadowFilter: var(--avatarShadowFilter);
+      --_avatarShadowInset: var(--avatarShadowInset);
+
       flex: 1 0 100%;
       width: 56px;
       height: 56px;
-      box-shadow: 0px 1px 8px rgba(0,0,0,0.75);
-      box-shadow: var(--avatarShadow);
       object-fit: cover;
     }
   }

From 0f8a7037eae6c1237b759430bacb8381604e74b7 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 29 Oct 2020 20:06:13 +0200
Subject: [PATCH 030/389] fix lain's issue in reaction picker

---
 src/components/react_button/react_button.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 694e6470..fa862484 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -11,6 +11,7 @@
     >
       <div class="reaction-picker-filter">
         <input
+          size="1"
           v-model="filterWord"
           :placeholder="$t('emoji.search_emoji')"
         >

From 633349ddff2fd96298ce26ac2d3c404edb1ebbf3 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 29 Oct 2020 21:13:31 +0200
Subject: [PATCH 031/389] Refactor desktop navbar into a component, change
 layout to grid for better compatibility with search field and simpler CSS

---
 src/App.js                                  |  49 +---
 src/App.scss                                | 119 ---------
 src/App.vue                                 |  75 +-----
 src/boot/after_store.js                     |   1 +
 src/components/desktop_nav/desktop_nav.js   |  89 +++++++
 src/components/desktop_nav/desktop_nav.scss | 112 ++++++++
 src/components/desktop_nav/desktop_nav.vue  |  79 ++++++
 src/components/mobile_nav/mobile_nav.vue    | 273 ++++++++++----------
 src/components/search_bar/search_bar.vue    |  77 +++---
 src/modules/instance.js                     |   1 +
 static/config.json                          |   1 +
 11 files changed, 468 insertions(+), 408 deletions(-)
 create mode 100644 src/components/desktop_nav/desktop_nav.js
 create mode 100644 src/components/desktop_nav/desktop_nav.scss
 create mode 100644 src/components/desktop_nav/desktop_nav.vue

diff --git a/src/App.js b/src/App.js
index ded772fa..4871b4ac 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,7 +1,6 @@
 import UserPanel from './components/user_panel/user_panel.vue'
 import NavPanel from './components/nav_panel/nav_panel.vue'
 import Notifications from './components/notifications/notifications.vue'
-import SearchBar from './components/search_bar/search_bar.vue'
 import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue'
 import FeaturesPanel from './components/features_panel/features_panel.vue'
 import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue'
@@ -11,6 +10,7 @@ import MediaModal from './components/media_modal/media_modal.vue'
 import SideDrawer from './components/side_drawer/side_drawer.vue'
 import MobilePostStatusButton from './components/mobile_post_status_button/mobile_post_status_button.vue'
 import MobileNav from './components/mobile_nav/mobile_nav.vue'
+import DesktopNav from './components/desktop_nav/desktop_nav.vue'
 import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
 import PostStatusModal from './components/post_status_modal/post_status_modal.vue'
 import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue'
@@ -22,7 +22,6 @@ export default {
     UserPanel,
     NavPanel,
     Notifications,
-    SearchBar,
     InstanceSpecificPanel,
     FeaturesPanel,
     WhoToFollowPanel,
@@ -31,6 +30,7 @@ export default {
     SideDrawer,
     MobilePostStatusButton,
     MobileNav,
+    DesktopNav,
     SettingsModal,
     UserReportingModal,
     PostStatusModal,
@@ -38,14 +38,6 @@ export default {
   },
   data: () => ({
     mobileActivePanel: 'timeline',
-    searchBarHidden: true,
-    supportsMask: window.CSS && window.CSS.supports && (
-      window.CSS.supports('mask-size', 'contain') ||
-        window.CSS.supports('-webkit-mask-size', 'contain') ||
-        window.CSS.supports('-moz-mask-size', 'contain') ||
-        window.CSS.supports('-ms-mask-size', 'contain') ||
-        window.CSS.supports('-o-mask-size', 'contain')
-    )
   }),
   created () {
     // Load the locale from the storage
@@ -61,28 +53,6 @@ export default {
     background () {
       return this.currentUser.background_image || this.$store.state.instance.background
     },
-    enableMask () { return this.supportsMask && this.$store.state.instance.logoMask },
-    logoStyle () {
-      return {
-        'visibility': this.enableMask ? 'hidden' : 'visible'
-      }
-    },
-    logoMaskStyle () {
-      return this.enableMask ? {
-        'mask-image': `url(${this.$store.state.instance.logo})`
-      } : {
-        'background-color': this.enableMask ? '' : 'transparent'
-      }
-    },
-    logoBgStyle () {
-      return Object.assign({
-        'margin': `${this.$store.state.instance.logoMargin} 0`,
-        opacity: this.searchBarHidden ? 1 : 0
-      }, this.enableMask ? {} : {
-        'background-color': this.enableMask ? '' : 'transparent'
-      })
-    },
-    logo () { return this.$store.state.instance.logo },
     bgStyle () {
       return {
         'background-image': `url(${this.background})`
@@ -93,9 +63,7 @@ export default {
         '--body-background-image': `url(${this.background})`
       }
     },
-    sitename () { return this.$store.state.instance.name },
     chat () { return this.$store.state.chat.channel.state === 'joined' },
-    hideSitename () { return this.$store.state.instance.hideSitename },
     suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled },
     showInstanceSpecificPanel () {
       return this.$store.state.instance.showInstanceSpecificPanel &&
@@ -112,19 +80,6 @@ export default {
     }
   },
   methods: {
-    scrollToTop () {
-      window.scrollTo(0, 0)
-    },
-    logout () {
-      this.$router.replace('/main/public')
-      this.$store.dispatch('logout')
-    },
-    onSearchBarToggled (hidden) {
-      this.searchBarHidden = hidden
-    },
-    openSettingsModal () {
-      this.$store.dispatch('openSettingsModal')
-    },
     updateMobileState () {
       const mobileLayout = windowWidth() <= 800
       const layoutHeight = windowHeight()
diff --git a/src/App.scss b/src/App.scss
index 6884f314..05e73b4b 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -359,119 +359,10 @@ i[class*=icon-], .svg-inline--fa  {
   padding: 0 10px 0 10px;
 }
 
-.item {
-  flex: 1;
-  line-height: 50px;
-  height: 50px;
-  overflow: hidden;
-  display: flex;
-  flex-wrap: wrap;
-
-  .nav-icon {
-    margin-left: 0.2em;
-    width: 2em;
-    text-align: center;
-  }
-
-  &.right {
-    justify-content: flex-end;
-  }
-}
-
 .auto-size {
   flex: 1
 }
 
-.nav-bar {
-  padding: 0;
-  width: 100%;
-  align-items: center;
-  position: fixed;
-  height: 50px;
-  box-sizing: border-box;
-
-  button {
-    &, i[class*=icon-], svg {
-      color: $fallback--text;
-      color: var(--btnTopBarText, $fallback--text);
-    }
-
-    &:active {
-      background-color: $fallback--fg;
-      background-color: var(--btnPressedTopBar, $fallback--fg);
-      color: $fallback--text;
-      color: var(--btnPressedTopBarText, $fallback--text);
-    }
-
-    &:disabled {
-      color: $fallback--text;
-      color: var(--btnDisabledTopBarText, $fallback--text);
-    }
-
-    &.toggled {
-      color: $fallback--text;
-      color: var(--btnToggledTopBarText, $fallback--text);
-      background-color: $fallback--fg;
-      background-color: var(--btnToggledTopBar, $fallback--fg)
-    }
-  }
-
-
-  .logo {
-    display: flex;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-
-    align-items: stretch;
-    justify-content: center;
-    flex: 0 0 auto;
-    z-index: -1;
-    transition: opacity;
-    transition-timing-function: ease-out;
-    transition-duration: 100ms;
-
-    .mask {
-      mask-repeat: no-repeat;
-      mask-position: center;
-      mask-size: contain;
-      background-color: $fallback--fg;
-      background-color: var(--topBarText, $fallback--fg);
-      position: absolute;
-      top: 0;
-      bottom: 0;
-      left: 0;
-      right: 0;
-    }
-
-    img {
-      height: 100%;
-      object-fit: contain;
-      display: block;
-      flex: 0;
-    }
-  }
-
-  .inner-nav {
-    position: relative;
-    margin: auto;
-    box-sizing: border-box;
-    padding-left: 10px;
-    padding-right: 10px;
-    display: flex;
-    align-items: center;
-    flex-basis: 970px;
-    height: 50px;
-
-    a, a i, a svg {
-      color: $fallback--link;
-      color: var(--topBarLink, $fallback--link);
-    }
-  }
-}
-
 main-router {
   flex: 1;
 }
@@ -781,16 +672,6 @@ nav {
   }
 }
 
-@media all and (min-width: 800px) {
-  .logo {
-    opacity: 1 !important;
-  }
-}
-
-.item.right {
-  text-align: right;
-}
-
 .visibility-notice {
   padding: .5em;
   border: 1px solid $fallback--faint;
diff --git a/src/App.vue b/src/App.vue
index 6e44c7e9..b4eb0524 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,80 +9,7 @@
       :style="bgStyle"
     />
     <MobileNav v-if="isMobileLayout" />
-    <nav
-      v-else
-      id="nav"
-      class="nav-bar container"
-      @click="scrollToTop()"
-    >
-      <div class="inner-nav">
-        <div
-          class="logo"
-          :style="logoBgStyle"
-        >
-          <div
-            class="mask"
-            :style="logoMaskStyle"
-          />
-          <img
-            :src="logo"
-            :style="logoStyle"
-          >
-        </div>
-        <div class="item">
-          <router-link
-            v-if="!hideSitename"
-            class="site-name"
-            :to="{ name: 'root' }"
-            active-class="home"
-          >
-            {{ sitename }}
-          </router-link>
-        </div>
-        <div class="item right">
-          <search-bar
-            v-if="currentUser || !privateMode"
-            class="mobile-hidden"
-            @toggled="onSearchBarToggled"
-            @click.stop.native
-          />
-          <a
-            href="#"
-            class="mobile-hidden nav-icon"
-            @click.stop="openSettingsModal"
-          >
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding"
-              icon="cog"
-              :title="$t('nav.preferences')"
-            />
-          </a>
-          <a
-            v-if="currentUser && currentUser.role === 'admin'"
-            href="/pleroma/admin/#/login-pleroma"
-            class="mobile-hidden nav-icon"
-            target="_blank"
-          ><FAIcon
-            fixed-width
-            class="fa-scale-110 fa-old-padding"
-            icon="tachometer-alt"
-            :title="$t('nav.administration')"
-          /></a>
-          <a
-            v-if="currentUser"
-            href="#"
-            class="mobile-hidden nav-icon"
-            @click.prevent="logout"
-          ><FAIcon
-            fixed-width
-            class="fa-scale-110 fa-old-padding"
-            icon="sign-out-alt"
-            :title="$t('login.logout')"
-          /></a>
-        </div>
-      </div>
-    </nav>
+    <DesktopNav v-else />
     <div class="app-bg-wrapper app-container-wrapper" />
     <div
       id="content"
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 00ca74a2..3cbbf020 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -130,6 +130,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
       ? 0
       : config.logoMargin
   })
+  copyInstanceOption('logoLeft')
   store.commit('authFlow/setInitialStrategy', config.loginMethod)
 
   copyInstanceOption('redirectRootNoLogin')
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
new file mode 100644
index 00000000..ee99ec10
--- /dev/null
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -0,0 +1,89 @@
+import SearchBar from 'components/search_bar/search_bar.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faSignInAlt,
+  faSignOutAlt,
+  faHome,
+  faComments,
+  faBell,
+  faUserPlus,
+  faBullhorn,
+  faSearch,
+  faTachometerAlt,
+  faCog,
+  faInfoCircle
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faSignInAlt,
+  faSignOutAlt,
+  faHome,
+  faComments,
+  faBell,
+  faUserPlus,
+  faBullhorn,
+  faSearch,
+  faTachometerAlt,
+  faCog,
+  faInfoCircle
+)
+
+export default {
+  components: {
+    SearchBar
+  },
+  data: () => ({
+    searchBarHidden: true,
+    supportsMask: window.CSS && window.CSS.supports && (
+      window.CSS.supports('mask-size', 'contain') ||
+        window.CSS.supports('-webkit-mask-size', 'contain') ||
+        window.CSS.supports('-moz-mask-size', 'contain') ||
+        window.CSS.supports('-ms-mask-size', 'contain') ||
+        window.CSS.supports('-o-mask-size', 'contain')
+    )
+  }),
+  computed: {
+    enableMask () { return this.supportsMask && this.$store.state.instance.logoMask },
+    logoStyle () {
+      return {
+        'visibility': this.enableMask ? 'hidden' : 'visible'
+      }
+    },
+    logoMaskStyle () {
+      return this.enableMask ? {
+        'mask-image': `url(${this.$store.state.instance.logo})`
+      } : {
+        'background-color': this.enableMask ? '' : 'transparent'
+      }
+    },
+    logoBgStyle () {
+      return Object.assign({
+        'margin': `${this.$store.state.instance.logoMargin} 0`,
+        opacity: this.searchBarHidden ? 1 : 0
+      }, this.enableMask ? {} : {
+        'background-color': this.enableMask ? '' : 'transparent'
+      })
+    },
+    logo () { return this.$store.state.instance.logo },
+    sitename () { return this.$store.state.instance.name },
+    hideSitename () { return this.$store.state.instance.hideSitename },
+    logoLeft () { return this.$store.state.instance.logoLeft },
+    currentUser () { return this.$store.state.users.currentUser },
+    privateMode () { return this.$store.state.instance.private },
+  },
+  methods: {
+    scrollToTop () {
+      window.scrollTo(0, 0)
+    },
+    logout () {
+      this.$router.replace('/main/public')
+      this.$store.dispatch('logout')
+    },
+    onSearchBarToggled (hidden) {
+      this.searchBarHidden = hidden
+    },
+    openSettingsModal () {
+      this.$store.dispatch('openSettingsModal')
+    },
+  }
+}
diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
new file mode 100644
index 00000000..028692a9
--- /dev/null
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -0,0 +1,112 @@
+@import '../../_variables.scss';
+
+.DesktopNav {
+  height: 50px;
+  width: 100%;
+  position: fixed;
+
+  .inner-nav {
+    display: grid;
+    grid-template-rows: 50px;
+    grid-template-columns: 2fr auto 2fr;
+    grid-template-areas: "sitename logo actions";
+    box-sizing: border-box;
+    padding: 0 1.2em;
+    margin: auto;
+    max-width: 980px;
+  }
+
+  &.-logoLeft {
+    grid-template-columns: auto 2fr 2fr;
+    grid-template-areas: "logo sitename actions";
+  }
+
+  button {
+    &, svg {
+      color: $fallback--text;
+      color: var(--btnTopBarText, $fallback--text);
+    }
+
+    &:active {
+      background-color: $fallback--fg;
+      background-color: var(--btnPressedTopBar, $fallback--fg);
+      color: $fallback--text;
+      color: var(--btnPressedTopBarText, $fallback--text);
+    }
+
+    &:disabled {
+      color: $fallback--text;
+      color: var(--btnDisabledTopBarText, $fallback--text);
+    }
+
+    &.toggled {
+      color: $fallback--text;
+      color: var(--btnToggledTopBarText, $fallback--text);
+      background-color: $fallback--fg;
+      background-color: var(--btnToggledTopBar, $fallback--fg)
+    }
+  }
+
+  .logo {
+    grid-area: logo;
+    position: relative;
+    transition: opacity;
+    transition-timing-function: ease-out;
+    transition-duration: 100ms;
+
+    @media all and (min-width: 800px) {
+      opacity: 1 !important;
+    }
+
+    .mask {
+      mask-repeat: no-repeat;
+      mask-position: center;
+      mask-size: contain;
+      background-color: $fallback--fg;
+      background-color: var(--topBarText, $fallback--fg);
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+    }
+
+    img {
+      display: inline-block;
+      height: 50px;
+    }
+  }
+
+  .nav-icon {
+    margin-left: 0.2em;
+    width: 2em;
+    text-align: center;
+  }
+
+  a, a svg {
+    color: $fallback--link;
+    color: var(--topBarLink, $fallback--link);
+  }
+
+  .sitename {
+    grid-area: sitename;
+  }
+
+  .actions {
+    grid-area: actions;
+  }
+
+  .item {
+    flex: 1;
+    line-height: 50px;
+    height: 50px;
+    overflow: hidden;
+    display: flex;
+    flex-wrap: wrap;
+
+    &.right {
+      justify-content: flex-end;
+      text-align: right;
+    }
+  }
+}
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
new file mode 100644
index 00000000..d166be08
--- /dev/null
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -0,0 +1,79 @@
+<template>
+  <nav
+    id="nav"
+    class="DesktopNav"
+    :class="{ '-logoLeft': logoLeft }"
+    @click="scrollToTop()"
+    >
+    <div class="inner-nav">
+      <div class="item sitename">
+        <router-link
+          v-if="!hideSitename"
+          class="site-name"
+          :to="{ name: 'root' }"
+          active-class="home"
+          >
+          {{ sitename }}
+        </router-link>
+      </div>
+      <router-link
+        class="logo"
+        :to="{ name: 'root' }"
+        :style="logoBgStyle"
+        >
+        <div
+          class="mask"
+          :style="logoMaskStyle"
+          />
+        <img
+          :src="logo"
+          :style="logoStyle"
+          >
+      </router-link>
+      <div class="item right actions">
+        <search-bar
+          v-if="currentUser || !privateMode"
+          @toggled="onSearchBarToggled"
+          @click.stop.native
+          />
+        <a
+          href="#"
+          class="nav-icon"
+          @click.stop="openSettingsModal"
+          >
+          <FAIcon
+            fixed-width
+            class="fa-scale-110 fa-old-padding"
+            icon="cog"
+            :title="$t('nav.preferences')"
+            />
+        </a>
+        <a
+          v-if="currentUser && currentUser.role === 'admin'"
+          href="/pleroma/admin/#/login-pleroma"
+          class="nav-icon"
+          target="_blank"
+          ><FAIcon
+            fixed-width
+            class="fa-scale-110 fa-old-padding"
+            icon="tachometer-alt"
+            :title="$t('nav.administration')"
+            /></a>
+        <a
+          v-if="currentUser"
+          href="#"
+          class="nav-icon"
+          @click.prevent="logout"
+          ><FAIcon
+            fixed-width
+            class="fa-scale-110 fa-old-padding"
+            icon="sign-out-alt"
+            :title="$t('login.logout')"
+            /></a>
+      </div>
+      </div>
+  </nav>
+</template>
+<script src="./desktop_nav.js"></script>
+
+<style src="./desktop_nav.scss" lang="scss"></style>
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index d2bc65ab..30b15149 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -1,55 +1,53 @@
 <template>
-  <div>
+  <div
+    class="MobileNav"
+    >
     <nav
       id="nav"
-      class="nav-bar container"
+      class="mobile-nav"
       :class="{ 'mobile-hidden': isChat }"
+      @click="scrollToTop()"
     >
-      <div
-        class="mobile-inner-nav"
-        @click="scrollToTop()"
-      >
-        <div class="item">
-          <a
-            href="#"
-            class="mobile-nav-button"
-            @click.stop.prevent="toggleMobileSidebar()"
-          >
-            <FAIcon
-              class="fa-scale-110 fa-old-padding"
-              icon="bars"
-            />
-            <div
-              v-if="unreadChatCount"
-              class="alert-dot"
-            />
-          </a>
-          <router-link
-            v-if="!hideSitename"
-            class="site-name"
-            :to="{ name: 'root' }"
-            active-class="home"
-          >
-            {{ sitename }}
-          </router-link>
-        </div>
-        <div class="item right">
-          <a
-            v-if="currentUser"
-            class="mobile-nav-button"
-            href="#"
-            @click.stop.prevent="openMobileNotifications()"
-          >
-            <FAIcon
-              class="fa-scale-110 fa-old-padding"
-              icon="bell"
-            />
-            <div
-              v-if="unseenNotificationsCount"
-              class="alert-dot"
-            />
-          </a>
-        </div>
+      <div class="item">
+        <a
+          href="#"
+          class="mobile-nav-button"
+          @click.stop.prevent="toggleMobileSidebar()"
+        >
+          <FAIcon
+            class="fa-scale-110 fa-old-padding"
+            icon="bars"
+          />
+          <div
+            v-if="unreadChatCount"
+            class="alert-dot"
+          />
+        </a>
+        <router-link
+          v-if="!hideSitename"
+          class="site-name"
+          :to="{ name: 'root' }"
+          active-class="home"
+        >
+          {{ sitename }}
+        </router-link>
+      </div>
+      <div class="item right">
+        <a
+          v-if="currentUser"
+          class="mobile-nav-button"
+          href="#"
+          @click.stop.prevent="openMobileNotifications()"
+        >
+          <FAIcon
+            class="fa-scale-110 fa-old-padding"
+            icon="bell"
+          />
+          <div
+            v-if="unseenNotificationsCount"
+            class="alert-dot"
+          />
+        </a>
       </div>
     </nav>
     <div
@@ -93,100 +91,113 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.mobile-inner-nav {
-  width: 100%;
-  display: flex;
-  align-items: center;
-}
-
-.mobile-nav-button {
-  text-align: center;
-  margin: 0 1em;
-  position: relative;
-  cursor: pointer;
-}
-
-.alert-dot {
-  border-radius: 100%;
-  height: 8px;
-  width: 8px;
-  position: absolute;
-  left: calc(50% - 4px);
-  top: calc(50% - 4px);
-  margin-left: 6px;
-  margin-top: -6px;
-  background-color: $fallback--cRed;
-  background-color: var(--badgeNotification, $fallback--cRed);
-}
-
-.mobile-notifications-drawer {
-  width: 100%;
-  height: 100vh;
-  overflow-x: hidden;
-  position: fixed;
-  top: 0;
-  left: 0;
-  box-shadow: 1px 1px 4px rgba(0,0,0,.6);
-  box-shadow: var(--panelShadow);
-  transition-property: transform;
-  transition-duration: 0.25s;
-  transform: translateX(0);
-  z-index: 1001;
-  -webkit-overflow-scrolling: touch;
-
-  &.closed {
-    transform: translateX(100%);
+.MobileNav {
+  .mobile-nav {
+    display: grid;
+    line-height: 50px;
+    height: 50px;
+    grid-template-rows: 50px;
+    grid-template-columns: 2fr auto;
+    width: 100%;
+    position: fixed;
+    box-sizing: border-box;
   }
-}
 
-.mobile-notifications-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  z-index: 1;
-  width: 100%;
-  height: 50px;
-  line-height: 50px;
-  position: absolute;
-  color: var(--topBarText);
-  background-color: $fallback--fg;
-  background-color: var(--topBar, $fallback--fg);
-  box-shadow: 0px 0px 4px rgba(0,0,0,.6);
-  box-shadow: var(--topBarShadow);
-
-  .title {
-    font-size: 1.3em;
-    margin-left: 0.6em;
+  .mobile-inner-nav {
+    width: 100%;
+    display: flex;
+    align-items: center;
   }
-}
 
-.mobile-notifications {
-  margin-top: 50px;
-  width: 100vw;
-  height: calc(100vh - 50px);
-  overflow-x: hidden;
-  overflow-y: scroll;
+  .mobile-nav-button {
+    text-align: center;
+    margin: 0 1em;
+    position: relative;
+    cursor: pointer;
+  }
 
-  color: $fallback--text;
-  color: var(--text, $fallback--text);
-  background-color: $fallback--bg;
-  background-color: var(--bg, $fallback--bg);
+  .alert-dot {
+    border-radius: 100%;
+    height: 8px;
+    width: 8px;
+    position: absolute;
+    left: calc(50% - 4px);
+    top: calc(50% - 4px);
+    margin-left: 6px;
+    margin-top: -6px;
+    background-color: $fallback--cRed;
+    background-color: var(--badgeNotification, $fallback--cRed);
+  }
 
-  .notifications {
-    padding: 0;
-    border-radius: 0;
-    box-shadow: none;
-    .panel {
-      border-radius: 0;
-      margin: 0;
-      box-shadow: none;
+  .mobile-notifications-drawer {
+    width: 100%;
+    height: 100vh;
+    overflow-x: hidden;
+    position: fixed;
+    top: 0;
+    left: 0;
+    box-shadow: 1px 1px 4px rgba(0,0,0,.6);
+    box-shadow: var(--panelShadow);
+    transition-property: transform;
+    transition-duration: 0.25s;
+    transform: translateX(0);
+    z-index: 1001;
+    -webkit-overflow-scrolling: touch;
+
+    &.closed {
+      transform: translateX(100%);
     }
-    .panel:after {
-      border-radius: 0;
+  }
+
+  .mobile-notifications-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    z-index: 1;
+    width: 100%;
+    height: 50px;
+    line-height: 50px;
+    position: absolute;
+    color: var(--topBarText);
+    background-color: $fallback--fg;
+    background-color: var(--topBar, $fallback--fg);
+    box-shadow: 0px 0px 4px rgba(0,0,0,.6);
+    box-shadow: var(--topBarShadow);
+
+    .title {
+      font-size: 1.3em;
+      margin-left: 0.6em;
     }
-    .panel .panel-heading {
+  }
+
+  .mobile-notifications {
+    margin-top: 50px;
+    width: 100vw;
+    height: calc(100vh - 50px);
+    overflow-x: hidden;
+    overflow-y: scroll;
+
+    color: $fallback--text;
+    color: var(--text, $fallback--text);
+    background-color: $fallback--bg;
+    background-color: var(--bg, $fallback--bg);
+
+    .notifications {
+      padding: 0;
       border-radius: 0;
       box-shadow: none;
+      .panel {
+        border-radius: 0;
+        margin: 0;
+        box-shadow: none;
+      }
+      .panel:after {
+        border-radius: 0;
+      }
+      .panel .panel-heading {
+        border-radius: 0;
+        box-shadow: none;
+      }
     }
   }
 }
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index f1c3fd7a..8d971287 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -1,46 +1,47 @@
 <template>
-  <div>
-    <div class="search-bar-container">
-      <a
-        v-if="hidden"
-        href="#"
-        class="nav-icon"
-        :title="$t('nav.search')"
+<div
+  class="SearchBar"
+  :class="{ '-expanded': !hidden }"
+  >
+    <a
+      v-if="hidden"
+      href="#"
+      class="nav-icon"
+      :title="$t('nav.search')"
       ><FAIcon
         fixed-width
         class="fa-scale-110 fa-old-padding"
         icon="search"
         @click.prevent.stop="toggleHidden"
-      /></a>
-      <template v-else>
-        <input
-          id="search-bar-input"
-          ref="searchInput"
-          v-model="searchTerm"
-          class="search-bar-input"
-          :placeholder="$t('nav.search')"
-          type="text"
-          @keyup.enter="find(searchTerm)"
+        /></a>
+    <template v-else>
+      <input
+        id="search-bar-input"
+        ref="searchInput"
+        v-model="searchTerm"
+        class="search-bar-input"
+        :placeholder="$t('nav.search')"
+        type="text"
+        @keyup.enter="find(searchTerm)"
         >
-        <button
-          class="btn search-button"
-          @click="find(searchTerm)"
+      <button
+        class="btn search-button"
+        @click="find(searchTerm)"
         >
-          <FAIcon
-            fixed-width
-            icon="search"
+        <FAIcon
+          fixed-width
+          icon="search"
           />
-        </button>
-        <span>
-          <FAIcon
-            fixed-width
-            icon="times"
-            class="cancel-icon fa-scale-110 fa-old-padding"
-            @click.prevent.stop="toggleHidden"
+      </button>
+      <span>
+        <FAIcon
+          fixed-width
+          icon="times"
+          class="cancel-icon fa-scale-110 fa-old-padding"
+          @click.prevent.stop="toggleHidden"
           />
-        </span>
-      </template>
-    </div>
+      </span>
+    </template>
   </div>
 </template>
 
@@ -49,21 +50,23 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.search-bar-container {
-  max-width: 100%;
+.SearchBar {
   display: inline-flex;
   align-items: baseline;
   vertical-align: baseline;
   justify-content: flex-end;
 
+  &.-expanded {
+    width: 100%;
+  }
+
   .search-bar-input,
   .search-button {
     height: 29px;
   }
 
   .search-bar-input {
-    // TODO: do this properly without a rough guesstimate of 2 icons + paddings
-    max-width: calc(100% - 30px - 30px - 20px);
+    flex: 1 0 auto;
   }
 
   .cancel-icon {
diff --git a/src/modules/instance.js b/src/modules/instance.js
index b3cbffc6..0c35f5d6 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -30,6 +30,7 @@ const defaultState = {
   logo: '/static/logo.png',
   logoMargin: '.2em',
   logoMask: true,
+  logoLeft: false,
   minimalScopesMode: false,
   nsfwCensorImage: undefined,
   postContentType: 'text/plain',
diff --git a/static/config.json b/static/config.json
index 0030f78f..4b70aea5 100644
--- a/static/config.json
+++ b/static/config.json
@@ -13,6 +13,7 @@
   "logo": "/static/logo.png",
   "logoMargin": ".1em",
   "logoMask": true,
+  "logoLeft": false,
   "minimalScopesMode": false,
   "nsfwCensorImage": "",
   "postContentType": "text/plain",

From 4e1f2aeabc2fa985ae0196744885ca62e717ec0a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 29 Oct 2020 21:39:11 +0200
Subject: [PATCH 032/389] fix preview spinner

---
 .../post_status_form/post_status_form.vue        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 284ce8df..55cd706e 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -85,11 +85,15 @@
             {{ $t('post_status.preview') }}
             <FAIcon :icon="showPreview ? 'chevron-left' : 'chevron-right'" />
           </a>
-          <FAIcon
+          <div
             v-show="previewLoading"
-            spin
-            icon="circle-notch"
-          />
+            class="preview-spinner">
+            <FAIcon
+              class="fa-old-padding"
+              spin
+              icon="circle-notch"
+            />
+          </div>
         </div>
         <div
           v-if="showPreview"
@@ -383,12 +387,12 @@
   }
 
   .preview-heading {
-    padding-left: 0.5em;
     display: flex;
-    width: 100%;
+    padding-left: 0.5em;
   }
 
   .preview-toggle {
+    flex: 1;
     cursor: pointer;
     user-select: none;
 

From 0653f189946ddbd65a2455e6929927c3d721ec82 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 29 Oct 2020 21:39:36 +0200
Subject: [PATCH 033/389] fix play-on-hover gifs issues

---
 src/components/status/status.scss          |  5 +++--
 src/components/still-image/still-image.vue | 11 +++++++----
 src/components/user_avatar/user_avatar.vue |  2 +-
 src/components/user_card/user_card.vue     | 10 +++++-----
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index ea9e538d..0a395086 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -7,8 +7,9 @@ $status-margin: 0.75em;
   min-width: 0;
 
   &:hover {
-    --still-image-img: visible;
-    --still-image-canvas: hidden;
+    --_still-image-img-visibility: visible;
+    --_still-image-canvas-visibility: hidden;
+    --_still-image-label-visibility: hidden;
   }
 
   &.-focused {
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index ad82210d..d3eb5925 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -42,7 +42,7 @@
     width: 100%;
     height: 100%;
     object-fit: contain;
-    visibility: var(--still-image-canvas, visible);
+    visibility: var(--_still-image-canvas-visibility, visible);
   }
 
   img {
@@ -66,16 +66,19 @@
       border-radius: $fallback--tooltipRadius;
       border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
       z-index: 2;
-      visibility: var(--still-image-label-visibility, visible);
+      visibility: var(--_still-image-label-visibility, visible);
     }
 
     &:hover canvas {
       display: none;
     }
 
-    &:hover::before,
+    &:hover::before {
+      visibility: var(--_still-image-label-visibility, hidden);
+    }
+
     img {
-      visibility: var(--still-image-img, hidden);
+      visibility: var(--_still-image-img-visibility, hidden);
     }
 
     &:hover img {
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index 43947282..0f7c584b 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -23,7 +23,7 @@
   --_avatarShadowBox: var(--avatarStatusShadow);
   --_avatarShadowFilter: var(--avatarStatusShadowFilter);
   --_avatarShadowInset: var(--avatarStatusShadowInset);
-  --still-image-label-visibility: hidden;
+  --_still-image-label-visibility: hidden;
 
   width: 48px;
   height: 48px;
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 52a54fa7..f916af9d 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -282,6 +282,11 @@
 .user-card {
   position: relative;
 
+  &:hover .Avatar {
+    --_still-image-img-visibility: visible;
+    --_still-image-canvas-visibility: hidden;
+  }
+
   .panel-heading {
     padding: .5em 0;
     text-align: center;
@@ -393,11 +398,6 @@
     }
   }
 
-  &:hover .Avatar {
-    --still-image-img: visible;
-    --still-image-canvas: hidden;
-  }
-
   &-avatar-link {
     position: relative;
     cursor: pointer;

From fb00f8459cc44217492ab388b08686942639a384 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 31 Oct 2020 13:59:58 +0200
Subject: [PATCH 034/389] fix chat count

---
 src/App.scss                           | 16 ----------------
 src/components/nav_panel/nav_panel.vue | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 05e73b4b..1800d816 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -824,22 +824,6 @@ nav {
   background-color: var(--panel, $fallback--fg);
 }
 
-.unread-chat-count {
-  font-size: 0.9em;
-  font-weight: bolder;
-  font-style: normal;
-  position: absolute;
-  right: 0.6rem;
-  padding: 0 0.3em;
-  min-width: 1.3rem;
-  min-height: 1.3rem;
-  max-height: 1.3rem;
-  line-height: 1.3rem;
-  max-width: 10em;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
 .chat-layout {
   // Needed for smoother chat navigation in the desktop Safari (otherwise the chat layout "jumps" as the chat opens).
   overflow: hidden;
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 8b299bf2..0f02a681 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -91,6 +91,7 @@
   }
 
   li {
+    position: relative;
     border-bottom: 1px solid;
     border-color: $fallback--border;
     border-color: var(--border, $fallback--border);
@@ -154,5 +155,22 @@
   .fa-scale-110 {
     margin-right: 0.8em;
   }
+
+  .unread-chat-count {
+    font-size: 0.9em;
+    font-weight: bolder;
+    font-style: normal;
+    position: absolute;
+    right: 0.6rem;
+    top: 1.25em;
+    padding: 0 0.3em;
+    min-width: 1.3rem;
+    min-height: 1.3rem;
+    max-height: 1.3rem;
+    line-height: 1.3rem;
+    max-width: 10em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }
 </style>

From 8c5586dda450e1bf38355927368fc7bce6fcc399 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 1 Nov 2020 11:53:20 +0200
Subject: [PATCH 035/389] remove 'md' size that doesn't exist

---
 src/components/extra_buttons/extra_buttons.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index f32ea02d..a33f6e87 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -16,7 +16,6 @@
           @click.prevent="muteConversation"
         >
           <FAIcon
-            size="md"
             fixed-width
             icon="eye-slash"
           /><span>{{ $t("status.mute_conversation") }}</span>
@@ -27,7 +26,6 @@
           @click.prevent="unmuteConversation"
         >
           <FAIcon
-            size="md"
             fixed-width
             icon="eye-slash"
           /><span>{{ $t("status.unmute_conversation") }}</span>
@@ -39,7 +37,6 @@
           @click="close"
         >
           <FAIcon
-            size="md"
             fixed-width
             icon="thumbtack"
           /><span>{{ $t("status.pin") }}</span>
@@ -51,7 +48,6 @@
           @click="close"
         >
           <FAIcon
-            size="md"
             fixed-width
             icon="thumbtack"
           /><span>{{ $t("status.unpin") }}</span>
@@ -63,7 +59,6 @@
           @click="close"
         >
           <FAIcon
-            size="md"
             fixed-width
             :icon="['far', 'bookmark']"
           /><span>{{ $t("status.bookmark") }}</span>
@@ -75,7 +70,6 @@
           @click="close"
         >
           <FAIcon
-            size="md"
             fixed-width
             icon="bookmark"
           /><span>{{ $t("status.unbookmark") }}</span>
@@ -87,7 +81,6 @@
           @click="close"
         >
           <FAIcon
-            size="md"
             fixed-width
             icon="times"
           /><span>{{ $t("status.delete") }}</span>
@@ -98,7 +91,6 @@
           @click="close"
         >
           <FAIcon
-            size="md"
             fixed-width
             icon="share-alt"
           /><span>{{ $t("status.copy_link") }}</span>
@@ -109,7 +101,6 @@
       <FAIcon
         class="ExtraButtons fa-scale-110 fa-old-padding"
         icon="ellipsis-h"
-        size="md"
       />
     </span>
   </Popover>

From 9d1d6956279ca1d9723ea50cb8eb49e08c4f4b79 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Fri, 23 Oct 2020 16:56:16 +0000
Subject: [PATCH 036/389] Translated using Weblate (Esperanto)

Currently translated at 97.7% (654 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index e73ac2f8..42059b7e 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -33,7 +33,8 @@
     "show_more": "Montri plion",
     "retry": "Reprovi",
     "error_retry": "Bonvolu reprovi",
-    "loading": "Enlegante…"
+    "loading": "Enlegante…",
+    "peek": "Antaŭmontri"
   },
   "image_cropper": {
     "crop_picture": "Tondi bildon",
@@ -297,7 +298,9 @@
           "older_version_imported": "La enportita dosiero estis farita per pli malnova versio de PleromaFE.",
           "future_version_imported": "La enportita dosiero estis farita per pli nova versio de PleromaFE.",
           "v2_imported": "La dosiero, kiun vi enportis, estis farita por malnova versio de PleromaFE. Ni provas maksimumigi interkonformecon, sed tamen eble montriĝos misoj.",
-          "upgraded_from_v2": "PleromaFE estis ĝisdatigita; la haŭto eble aspektos malsame ol kiel vi ĝin memoras."
+          "upgraded_from_v2": "PleromaFE estis ĝisdatigita; la haŭto eble aspektos malsame ol kiel vi ĝin memoras.",
+          "snapshot_missing": "Neniu momentokopio de haŭto estis en la dosiero, ĝi povas aspekti iom malsame ol oni intencis.",
+          "snapshot_present": "Ĉiuj valoroj estas transpasataj, ĉar momentokopio de haŭto estas enlegita. Vi povas enlegi anstataŭe la aktualajn datumojn de haŭto."
         },
         "use_source": "Nova versio",
         "use_snapshot": "Malnova versio",
@@ -495,7 +498,14 @@
       "backend_version": "Versio de internaĵo",
       "title": "Versio"
     },
-    "accent": "Emfazo"
+    "accent": "Emfazo",
+    "virtual_scrolling": "Optimumigi bildigon de tempolinio",
+    "import_mutes_from_a_csv_file": "Enporti silentigojn el CSV-dosiero",
+    "mutes_imported": "Silentigoj enportiĝis! Traktado daŭros iom da tempo.",
+    "mute_import_error": "Eraris enporto de silentigoj",
+    "mute_import": "Enporto de silentigoj",
+    "mute_export_button": "Elportu viajn silentigojn al CSV-dosiero",
+    "mute_export": "Elporto de silentigoj"
   },
   "timeline": {
     "collapse": "Maletendi",
@@ -791,5 +801,8 @@
     "additional_comments": "Aldonaj komentoj",
     "add_comment_description": "Ĉi tiu raporto sendiĝos al reguligistoj de via nodo. Vi povas komprenigi kial vi raportas ĉi tiun konton sube:",
     "title": "Raportante {0}"
+  },
+  "shoutbox": {
+    "title": "Kriujo"
   }
 }

From 6040c1ebfc06767ac01c9c130dee920094c1bd51 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Fri, 23 Oct 2020 19:04:32 +0000
Subject: [PATCH 037/389] Translated using Weblate (Esperanto)

Currently translated at 98.2% (657 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 42059b7e..a032f765 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -300,7 +300,8 @@
           "v2_imported": "La dosiero, kiun vi enportis, estis farita por malnova versio de PleromaFE. Ni provas maksimumigi interkonformecon, sed tamen eble montriĝos misoj.",
           "upgraded_from_v2": "PleromaFE estis ĝisdatigita; la haŭto eble aspektos malsame ol kiel vi ĝin memoras.",
           "snapshot_missing": "Neniu momentokopio de haŭto estis en la dosiero, ĝi povas aspekti iom malsame ol oni intencis.",
-          "snapshot_present": "Ĉiuj valoroj estas transpasataj, ĉar momentokopio de haŭto estas enlegita. Vi povas enlegi anstataŭe la aktualajn datumojn de haŭto."
+          "snapshot_present": "Ĉiuj valoroj estas transpasataj, ĉar momentokopio de haŭto estas enlegita. Vi povas enlegi anstataŭe la aktualajn datumojn de haŭto.",
+          "snapshot_source_mismatch": "Versioj konfliktas: plej probable la fasado estis reirigita kaj ree ĝisdatigita; se vi ŝanĝis la haŭton per pli malnova versio de la fasado, vi probable volas uzi la malnovan version. Alie uzu la novan."
         },
         "use_source": "Nova versio",
         "use_snapshot": "Malnova versio",
@@ -717,7 +718,8 @@
     "pin": "Fiksi al profilo",
     "delete": "Forigi staton",
     "repeats": "Ripetoj",
-    "favorites": "Ŝatataj"
+    "favorites": "Ŝatataj",
+    "status_deleted": "Ĉi tiu afiŝo foriĝis"
   },
   "time": {
     "years_short": "{0}j",
@@ -779,7 +781,8 @@
     "new": "Nova babilo",
     "chats": "Babiloj",
     "delete": "Forigi",
-    "you": "Vi:"
+    "you": "Vi:",
+    "message_user": "Mesaĝi al {nickname}"
   },
   "password_reset": {
     "password_reset_required_but_mailer_is_disabled": "Vi devas restarigi vian pasvorton, sed restarigado de pasvortoj estas malŝaltita. Bonvolu kontakti la administranton de via nodo.",

From 891593169ff042911c84fb60b24253e8b357bc53 Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Sat, 24 Oct 2020 15:37:58 +0000
Subject: [PATCH 038/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (668 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 60204aa1..afb0242b 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -165,7 +165,7 @@
   "registration": {
     "bio": "简介",
     "email": "电子邮箱",
-    "fullname": "全名",
+    "fullname": "显示名称",
     "password_confirm": "确认密码",
     "registration": "注册",
     "token": "邀请码",

From ea300a7a1c39e862259c63d4bddddbb48c71c1b9 Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Sat, 24 Oct 2020 15:42:41 +0000
Subject: [PATCH 039/389] Translated using Weblate (Chinese (Traditional))

Currently translated at 99.8% (668 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index 79a992fc..f2625116 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -680,7 +680,7 @@
     "fullname": "顯示名稱",
     "bio_placeholder": "例如：\n你好，我是玲音。\n我是一個住在日本郊區的動畫少女。你可能在 Wired 見過我。",
     "fullname_placeholder": "例如：岩倉玲音",
-    "username_placeholder": "例如：玲音",
+    "username_placeholder": "例如：lain",
     "new_captcha": "點擊圖片獲取新的驗證碼",
     "captcha": "CAPTCHA",
     "token": "邀請碼",

From 66d07b6d0817c72d0dddef48c7d9a595d0743979 Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Mon, 26 Oct 2020 13:57:58 +0000
Subject: [PATCH 040/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (668 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index afb0242b..b15f88ae 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -322,7 +322,7 @@
     "search_user_to_mute": "搜索你想要隐藏的用户",
     "security_tab": "安全",
     "scope_copy": "回复时的复制范围（私信是总是复制的）",
-    "minimal_scopes_mode": "最小发文范围",
+    "minimal_scopes_mode": "使发文可见范围的选项最少化",
     "set_new_avatar": "设置新头像",
     "set_new_profile_background": "设置新的个人资料背景",
     "set_new_profile_banner": "设置新的横幅图片",

From 599256a6be1a30ece181f33dfd827d2d012c4567 Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Thu, 29 Oct 2020 10:16:47 +0000
Subject: [PATCH 041/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (668 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index b15f88ae..09e2ab0d 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -103,7 +103,7 @@
     "repeated_you": "转发了你的状态",
     "no_more_notifications": "没有更多的通知",
     "reacted_with": "作出了 {0} 的反应",
-    "migrated_to": "迁移到",
+    "migrated_to": "迁移到了",
     "follow_request": "想要关注你"
   },
   "polls": {

From 1c7ec321d925b6f8a2c7d331c25fed711f8091a3 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Fri, 30 Oct 2020 11:31:36 +0000
Subject: [PATCH 042/389] Translated using Weblate (Esperanto)

Currently translated at 98.9% (662 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index a032f765..4a55f49a 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -73,7 +73,7 @@
     "dms": "Rektaj mesaĝoj",
     "public_tl": "Publika tempolinio",
     "timeline": "Tempolinio",
-    "twkn": "La tuta konata reto",
+    "twkn": "Konata reto",
     "user_search": "Serĉi uzantojn",
     "who_to_follow": "Kiun aboni",
     "preferences": "Agordoj",
@@ -81,7 +81,8 @@
     "search": "Serĉi",
     "interactions": "Interagoj",
     "administration": "Administrado",
-    "bookmarks": "Legosignoj"
+    "bookmarks": "Legosignoj",
+    "timelines": "Historioj"
   },
   "notifications": {
     "broken_favorite": "Nekonata stato, serĉante ĝin…",
@@ -452,7 +453,9 @@
       "warning_of_generate_new_codes": "Kiam vi estigos novajn rehavajn kodojn, viaj malnovaj ne plu funkcios.",
       "generate_new_recovery_codes": "Estigi novajn rehavajn kodojn",
       "title": "Duobla aŭtentikigo",
-      "otp": "OTP"
+      "otp": "OTP",
+      "wait_pre_setup_otp": "antaŭagordante OTP",
+      "setup_otp": "Agordi OTP"
     },
     "enter_current_password_to_confirm": "Enigu vian pasvorton por konfirmi vian identecon",
     "security": "Sekureco",

From 5095143c472cdb97fe307fc3c8147dec286b22ff Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Fri, 30 Oct 2020 12:13:08 +0000
Subject: [PATCH 043/389] Translated using Weblate (Esperanto)

Currently translated at 99.1% (663 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 4a55f49a..dcfaa132 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -455,7 +455,8 @@
       "title": "Duobla aŭtentikigo",
       "otp": "OTP",
       "wait_pre_setup_otp": "antaŭagordante OTP",
-      "setup_otp": "Agordi OTP"
+      "setup_otp": "Agordi OTP",
+      "confirm_and_enable": "Konfirmi kaj ŝalti OTP"
     },
     "enter_current_password_to_confirm": "Enigu vian pasvorton por konfirmi vian identecon",
     "security": "Sekureco",

From 4cf4de8d28a45832e7bd33d1f59b2727ea276dc8 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 31 Oct 2020 10:45:56 +0000
Subject: [PATCH 044/389] Translated using Weblate (Esperanto)

Currently translated at 100.0% (669 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 49 ++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index dcfaa132..1247d50d 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -5,7 +5,7 @@
   "features_panel": {
     "chat": "Babilejo",
     "gopher": "Gopher",
-    "media_proxy": "Vidaŭdaĵa prokurilo",
+    "media_proxy": "Vidaŭdaĵa retperilo",
     "scope_options": "Agordoj de amplekso",
     "text_limit": "Limo de teksto",
     "title": "Funkcioj",
@@ -71,8 +71,8 @@
     "friend_requests": "Petoj pri abono",
     "mentions": "Mencioj",
     "dms": "Rektaj mesaĝoj",
-    "public_tl": "Publika tempolinio",
-    "timeline": "Tempolinio",
+    "public_tl": "Publika historio",
+    "timeline": "Historio",
     "twkn": "Konata reto",
     "user_search": "Serĉi uzantojn",
     "who_to_follow": "Kiun aboni",
@@ -109,14 +109,14 @@
       "text/html": "HTML"
     },
     "content_warning": "Temo (malnepra)",
-    "default": "Ĵus alvenis al la Universala Kongreso!",
+    "default": "Ĵus alvenis Esperantujon!",
     "direct_warning": "Ĉi tiu afiŝo estos videbla nur por ĉiuj menciitaj uzantoj.",
     "posting": "Afiŝante",
     "scope": {
       "direct": "Rekta – Afiŝi nur al menciitaj uzantoj",
       "private": "Nur abonantoj – Afiŝi nur al abonantoj",
-      "public": "Publika – Afiŝi al publikaj tempolinioj",
-      "unlisted": "Nelistigita – Ne afiŝi al publikaj tempolinioj"
+      "public": "Publika – Afiŝi al publikaj historioj",
+      "unlisted": "Nelistigita – Ne afiŝi al publikaj historioj"
     },
     "scope_notice": {
       "unlisted": "Ĉi tiu afiŝo ne estos videbla en la Publika historio kaj La tuta konata reto",
@@ -195,7 +195,7 @@
     "foreground": "Malfono",
     "general": "Ĝenerala",
     "hide_attachments_in_convo": "Kaŝi kunsendaĵojn en interparoloj",
-    "hide_attachments_in_tl": "Kaŝi kunsendaĵojn en tempolinio",
+    "hide_attachments_in_tl": "Kaŝi kunsendaĵojn en historioj",
     "max_thumbnails": "Maksimuma nombro da bildetoj en afiŝo",
     "hide_isp": "Kaŝi breton propran al nodo",
     "preload_images": "Antaŭ-enlegi bildojn",
@@ -248,7 +248,7 @@
     "profile_banner": "Rubando de profilo",
     "profile_tab": "Profilo",
     "radii_help": "Agordi fasadan rondigon de randoj (bildere)",
-    "replies_in_timeline": "Respondoj en tempolinio",
+    "replies_in_timeline": "Respondoj en historioj",
     "reply_visibility_all": "Montri ĉiujn respondojn",
     "reply_visibility_following": "Montri nur respondojn por mi aŭ miaj abonatoj",
     "reply_visibility_self": "Montri nur respondojn por mi",
@@ -302,7 +302,9 @@
           "upgraded_from_v2": "PleromaFE estis ĝisdatigita; la haŭto eble aspektos malsame ol kiel vi ĝin memoras.",
           "snapshot_missing": "Neniu momentokopio de haŭto estis en la dosiero, ĝi povas aspekti iom malsame ol oni intencis.",
           "snapshot_present": "Ĉiuj valoroj estas transpasataj, ĉar momentokopio de haŭto estas enlegita. Vi povas enlegi anstataŭe la aktualajn datumojn de haŭto.",
-          "snapshot_source_mismatch": "Versioj konfliktas: plej probable la fasado estis reirigita kaj ree ĝisdatigita; se vi ŝanĝis la haŭton per pli malnova versio de la fasado, vi probable volas uzi la malnovan version. Alie uzu la novan."
+          "snapshot_source_mismatch": "Versioj konfliktas: plej probable la fasado estis reirigita kaj ree ĝisdatigita; se vi ŝanĝis la haŭton per pli malnova versio de la fasado, vi probable volas uzi la malnovan version. Alie uzu la novan.",
+          "migration_napshot_gone": "Ial mankis momentokopio; io povus aspekti malsame ol en via memoro.",
+          "migration_snapshot_ok": "Certige, momentokopio de la haŭto enlegiĝis. Vi povas provi enlegi datumojn de la haŭto."
         },
         "use_source": "Nova versio",
         "use_snapshot": "Malnova versio",
@@ -357,10 +359,11 @@
         "icons": "Bildsimboloj",
         "poll": "Grafo de enketo",
         "underlay": "Subtavolo",
-        "popover": "Ŝpruchelpiloj, menuoj",
+        "popover": "Ŝprucaĵoj, menuoj",
         "post": "Afiŝoj/Priskriboj de uzantoj",
         "alert_neutral": "Neŭtrala",
-        "alert_warning": "Averto"
+        "alert_warning": "Averto",
+        "toggled": "Ŝaltita"
       },
       "radii": {
         "_tab_label": "Rondeco"
@@ -393,7 +396,8 @@
           "buttonPressed": "Butono (premita)",
           "buttonPressedHover": "Butono (premita kaj je ŝvebo)",
           "input": "Eniga kampo"
-        }
+        },
+        "hintV3": "Kolorojn de ombroj vi ankaŭ povas skribi per la sistemo {0}."
       },
       "fonts": {
         "_tab_label": "Tiparoj",
@@ -416,7 +420,7 @@
         "button": "Butono",
         "text": "Kelko da pliaj {0} kaj {1}",
         "mono": "enhavo",
-        "input": "Ĵus alvenis al la Universala Kongreso!",
+        "input": "Ĵus alvenis Esperantujon!",
         "faint_link": "helpan manlibron",
         "fine_print": "Legu nian {0} por nenion utilan ekscii!",
         "header_faint": "Tio estas en ordo",
@@ -425,7 +429,7 @@
       }
     },
     "discoverable": "Permesi trovon de ĉi tiu konto en serĉrezultoj kaj aliaj servoj",
-    "mutes_and_blocks": "Silentigitoj kaj blokitoj",
+    "mutes_and_blocks": "Blokado kaj silentigoj",
     "chatMessageRadius": "Babileja mesaĝo",
     "changed_email": "Retpoŝtadreso sukcese ŝanĝiĝis!",
     "change_email_error": "Eraris ŝanĝo de via retpoŝtadreso.",
@@ -488,11 +492,11 @@
     },
     "import_blocks_from_a_csv_file": "Enporti blokitojn el CSV-dosiero",
     "hide_muted_posts": "Kaŝi afiŝojn de silentigitaj uzantoj",
-    "emoji_reactions_on_timeline": "Montri bildosignajn reagojn en la tempolinio",
+    "emoji_reactions_on_timeline": "Montri bildosignajn reagojn en historioj",
     "pad_emoji": "Meti spacetojn ĉirkaŭ bildosigno post ties elekto",
     "domain_mutes": "Retnomoj",
     "notification_blocks": "Blokinte uzanton vi malabonos ĝin kaj haltigos ĉiujn sciigojn.",
-    "notification_mutes": "Por ne plu ricevi sciigojn de certa uzanto, silentigu.",
+    "notification_mutes": "Por ne plu ricevi sciigojn de certa uzanto, silentigu ĝin.",
     "notification_setting_hide_notification_contents": "Kaŝi la sendinton kaj la enhavojn de pasivaj sciigoj",
     "notification_setting_privacy": "Privateco",
     "notification_setting_block_from_strangers": "Bloki sciigojn de uzantoj, kiujn vi ne abonas",
@@ -504,7 +508,7 @@
       "title": "Versio"
     },
     "accent": "Emfazo",
-    "virtual_scrolling": "Optimumigi bildigon de tempolinio",
+    "virtual_scrolling": "Optimumigi bildigon de historioj",
     "import_mutes_from_a_csv_file": "Enporti silentigojn el CSV-dosiero",
     "mutes_imported": "Silentigoj enportiĝis! Traktado daŭros iom da tempo.",
     "mute_import_error": "Eraris enporto de silentigoj",
@@ -518,7 +522,7 @@
     "error_fetching": "Eraris ĝisdatigo",
     "load_older": "Montri pli malnovajn statojn",
     "no_retweet_hint": "Afiŝo estas markita kiel rekta aŭ nur por abonantoj, kaj ne eblas ĝin ripeti",
-    "repeated": "ripetita",
+    "repeated": "ripetis",
     "show_new": "Montri novajn",
     "up_to_date": "Ĝisdata",
     "no_more_statuses": "Neniuj pliaj statoj",
@@ -663,21 +667,22 @@
         "media_nsfw": "Devige marki vidaŭdaĵojn konsternaj",
         "media_removal_desc": "Ĉi tiu nodo forigas vidaŭdaĵojn de afiŝoj el la jenaj nodoj:",
         "media_removal": "Forigo de vidaŭdaĵoj",
-        "ftl_removal": "Forigo de la historio de «La tuta konata reto»",
+        "ftl_removal": "Forigo el la historio de «La tuta konata reto»",
         "quarantine_desc": "Ĉi tiu nodo sendos nur publikajn afiŝojn al la jenaj nodoj:",
         "quarantine": "Kvaranteno",
         "reject_desc": "Ĉi tiu nodo ne akceptos mesaĝojn de la jenaj nodoj:",
         "reject": "Rifuzi",
         "accept_desc": "Ĉi tiu nodo nur akceptas mesaĝojn de la jenaj nodoj:",
         "accept": "Akcepti",
-        "simple_policies": "Specialaj politikoj de la nodo"
+        "simple_policies": "Specialaj politikoj de la nodo",
+        "ftl_removal_desc": "Ĉi tiu nodo forigas la jenajn nodojn el la historio de «La tuta konata reto»:"
       },
       "mrf_policies": "Ŝaltis politikon de Mesaĝa ŝanĝilaro (MRF)",
       "keyword": {
         "is_replaced_by": "→",
         "replace": "Anstataŭigi",
         "reject": "Rifuzi",
-        "ftl_removal": "Forigo de la historio de «La tuta konata reto»",
+        "ftl_removal": "Forigo el la historio de «La tuta konata reto»",
         "keyword_policies": "Politiko pri ŝlosilvortoj"
       },
       "federation": "Federado",
@@ -722,7 +727,7 @@
     "pin": "Fiksi al profilo",
     "delete": "Forigi staton",
     "repeats": "Ripetoj",
-    "favorites": "Ŝatataj",
+    "favorites": "Ŝatoj",
     "status_deleted": "Ĉi tiu afiŝo foriĝis"
   },
   "time": {

From 02bb015c4fb4bd5279a7434ea18ab01bdc316d07 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 1 Nov 2020 16:40:23 +0200
Subject: [PATCH 045/389] fix #992

---
 src/components/tab_switcher/tab_switcher.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index 1e963516..0ed614b7 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -4,8 +4,7 @@
   display: flex;
 
   .tab-icon {
-    width: 100%;
-    margin: 0.2em 0;
+    margin: 0.2em auto;
     display: block;
   }
 

From 8b1213ea1e75a2d0f824cc71992d4867a4ea0bb5 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 1 Nov 2020 16:44:57 +0200
Subject: [PATCH 046/389] lint

---
 src/App.js                                    |  2 +-
 src/components/desktop_nav/desktop_nav.js     |  4 +-
 src/components/desktop_nav/desktop_nav.vue    | 42 +++++++++----------
 src/components/mobile_nav/mobile_nav.vue      |  2 +-
 .../post_status_form/post_status_form.vue     |  3 +-
 src/components/react_button/react_button.vue  |  2 +-
 src/components/search_bar/search_bar.vue      | 26 ++++++------
 7 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/src/App.js b/src/App.js
index 4871b4ac..52700319 100644
--- a/src/App.js
+++ b/src/App.js
@@ -37,7 +37,7 @@ export default {
     GlobalNoticeList
   },
   data: () => ({
-    mobileActivePanel: 'timeline',
+    mobileActivePanel: 'timeline'
   }),
   created () {
     // Load the locale from the storage
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index ee99ec10..e048f53d 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -69,7 +69,7 @@ export default {
     hideSitename () { return this.$store.state.instance.hideSitename },
     logoLeft () { return this.$store.state.instance.logoLeft },
     currentUser () { return this.$store.state.users.currentUser },
-    privateMode () { return this.$store.state.instance.private },
+    privateMode () { return this.$store.state.instance.private }
   },
   methods: {
     scrollToTop () {
@@ -84,6 +84,6 @@ export default {
     },
     openSettingsModal () {
       this.$store.dispatch('openSettingsModal')
-    },
+    }
   }
 }
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index d166be08..3a6e4033 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -4,7 +4,7 @@
     class="DesktopNav"
     :class="{ '-logoLeft': logoLeft }"
     @click="scrollToTop()"
-    >
+  >
     <div class="inner-nav">
       <div class="item sitename">
         <router-link
@@ -12,7 +12,7 @@
           class="site-name"
           :to="{ name: 'root' }"
           active-class="home"
-          >
+        >
           {{ sitename }}
         </router-link>
       </div>
@@ -20,58 +20,58 @@
         class="logo"
         :to="{ name: 'root' }"
         :style="logoBgStyle"
-        >
+      >
         <div
           class="mask"
           :style="logoMaskStyle"
-          />
+        />
         <img
           :src="logo"
           :style="logoStyle"
-          >
+        >
       </router-link>
       <div class="item right actions">
         <search-bar
           v-if="currentUser || !privateMode"
           @toggled="onSearchBarToggled"
           @click.stop.native
-          />
+        />
         <a
           href="#"
           class="nav-icon"
           @click.stop="openSettingsModal"
-          >
+        >
           <FAIcon
             fixed-width
             class="fa-scale-110 fa-old-padding"
             icon="cog"
             :title="$t('nav.preferences')"
-            />
+          />
         </a>
         <a
           v-if="currentUser && currentUser.role === 'admin'"
           href="/pleroma/admin/#/login-pleroma"
           class="nav-icon"
           target="_blank"
-          ><FAIcon
-            fixed-width
-            class="fa-scale-110 fa-old-padding"
-            icon="tachometer-alt"
-            :title="$t('nav.administration')"
-            /></a>
+        ><FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding"
+          icon="tachometer-alt"
+          :title="$t('nav.administration')"
+        /></a>
         <a
           v-if="currentUser"
           href="#"
           class="nav-icon"
           @click.prevent="logout"
-          ><FAIcon
-            fixed-width
-            class="fa-scale-110 fa-old-padding"
-            icon="sign-out-alt"
-            :title="$t('login.logout')"
-            /></a>
-      </div>
+        ><FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding"
+          icon="sign-out-alt"
+          :title="$t('login.logout')"
+        /></a>
       </div>
+    </div>
   </nav>
 </template>
 <script src="./desktop_nav.js"></script>
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 30b15149..6651fc8e 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     class="MobileNav"
-    >
+  >
     <nav
       id="nav"
       class="mobile-nav"
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 55cd706e..2b57ea19 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -87,7 +87,8 @@
           </a>
           <div
             v-show="previewLoading"
-            class="preview-spinner">
+            class="preview-spinner"
+          >
             <FAIcon
               class="fa-old-padding"
               spin
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index fa862484..95d95b11 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -11,8 +11,8 @@
     >
       <div class="reaction-picker-filter">
         <input
-          size="1"
           v-model="filterWord"
+          size="1"
           :placeholder="$t('emoji.search_emoji')"
         >
       </div>
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 8d971287..89a601c8 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -1,19 +1,19 @@
 <template>
-<div
-  class="SearchBar"
-  :class="{ '-expanded': !hidden }"
+  <div
+    class="SearchBar"
+    :class="{ '-expanded': !hidden }"
   >
     <a
       v-if="hidden"
       href="#"
       class="nav-icon"
       :title="$t('nav.search')"
-      ><FAIcon
-        fixed-width
-        class="fa-scale-110 fa-old-padding"
-        icon="search"
-        @click.prevent.stop="toggleHidden"
-        /></a>
+    ><FAIcon
+      fixed-width
+      class="fa-scale-110 fa-old-padding"
+      icon="search"
+      @click.prevent.stop="toggleHidden"
+    /></a>
     <template v-else>
       <input
         id="search-bar-input"
@@ -23,15 +23,15 @@
         :placeholder="$t('nav.search')"
         type="text"
         @keyup.enter="find(searchTerm)"
-        >
+      >
       <button
         class="btn search-button"
         @click="find(searchTerm)"
-        >
+      >
         <FAIcon
           fixed-width
           icon="search"
-          />
+        />
       </button>
       <span>
         <FAIcon
@@ -39,7 +39,7 @@
           icon="times"
           class="cancel-icon fa-scale-110 fa-old-padding"
           @click.prevent.stop="toggleHidden"
-          />
+        />
       </span>
     </template>
   </div>

From 64da9a8e69fa8b26f627da4505c4efba1b025df1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 1 Nov 2020 16:47:17 +0200
Subject: [PATCH 047/389] fix build warnings

---
 src/components/panel_loading/panel_loading.vue           | 2 ++
 src/components/settings_modal/tabs/theme_tab/preview.vue | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/components/panel_loading/panel_loading.vue b/src/components/panel_loading/panel_loading.vue
index b15e7d38..d916d8a6 100644
--- a/src/components/panel_loading/panel_loading.vue
+++ b/src/components/panel_loading/panel_loading.vue
@@ -18,6 +18,8 @@ import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
 library.add(
   faCircleNotch
 )
+
+export default {}
 </script>
 
 <style lang="scss">
diff --git a/src/components/settings_modal/tabs/theme_tab/preview.vue b/src/components/settings_modal/tabs/theme_tab/preview.vue
index 3174fd7c..02fea0b6 100644
--- a/src/components/settings_modal/tabs/theme_tab/preview.vue
+++ b/src/components/settings_modal/tabs/theme_tab/preview.vue
@@ -126,6 +126,8 @@ library.add(
   faRetweet,
   faReply
 )
+
+export default {}
 </script>
 
 <style lang="scss">

From e798e9a4177f025dda2b40d109fa40c2ebfd814e Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Thu, 29 Oct 2020 13:33:06 +0300
Subject: [PATCH 048/389] Optimistic message sending for chat

---
 src/components/chat/chat.js                   | 76 ++++++++++++++-----
 src/components/chat/chat.vue                  |  1 +
 src/components/chat_message/chat_message.scss | 13 ++++
 src/components/chat_message/chat_message.vue  |  2 +-
 .../post_status_form/post_status_form.js      |  7 +-
 .../post_status_form/post_status_form.vue     |  4 +-
 src/modules/api.js                            | 18 +++--
 src/modules/chats.js                          | 22 +++++-
 src/services/api/api.service.js               | 17 ++++-
 src/services/chat_service/chat_service.js     | 63 +++++++++++++--
 src/services/chat_utils/chat_utils.js         | 21 +++++
 .../entity_normalizer.service.js              |  3 +
 .../chat_service/chat_service.spec.js         |  3 +
 13 files changed, 206 insertions(+), 44 deletions(-)

diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index c0c9ad6c..2887afb5 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -12,6 +12,7 @@ import {
   faChevronDown,
   faChevronLeft
 } from '@fortawesome/free-solid-svg-icons'
+import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js'
 
 library.add(
   faChevronDown,
@@ -22,6 +23,7 @@ const BOTTOMED_OUT_OFFSET = 10
 const JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET = 150
 const SAFE_RESIZE_TIME_OFFSET = 100
 const MARK_AS_READ_DELAY = 1500
+const MAX_RETRIES = 10
 
 const Chat = {
   components: {
@@ -35,7 +37,8 @@ const Chat = {
       hoveredMessageChainId: undefined,
       lastScrollPosition: {},
       scrollableContainerHeight: '100%',
-      errorLoadingChat: false
+      errorLoadingChat: false,
+      messageRetriers: {}
     }
   },
   created () {
@@ -219,7 +222,10 @@ const Chat = {
       if (!(this.currentChatMessageService && this.currentChatMessageService.maxId)) { return }
       if (document.hidden) { return }
       const lastReadId = this.currentChatMessageService.maxId
-      this.$store.dispatch('readChat', { id: this.currentChat.id, lastReadId })
+      this.$store.dispatch('readChat', {
+        id: this.currentChat.id,
+        lastReadId
+      })
     },
     bottomedOut (offset) {
       return isBottomedOut(this.$refs.scrollable, offset)
@@ -309,42 +315,74 @@ const Chat = {
       })
       this.fetchChat({ isFirstFetch: true })
     },
-    sendMessage ({ status, media }) {
+    handleAttachmentPosting () {
+      this.$nextTick(() => {
+        this.handleResize()
+        // When the posting form size changes because of a media attachment, we need an extra resize
+        // to account for the potential delay in the DOM update.
+        setTimeout(() => {
+          this.updateScrollableContainerHeight()
+        }, SAFE_RESIZE_TIME_OFFSET)
+        this.scrollDown({ forceRead: true })
+      })
+    },
+    sendMessage ({ status, media, idempotencyKey }) {
       const params = {
         id: this.currentChat.id,
-        content: status
+        content: status,
+        idempotencyKey
       }
 
       if (media[0]) {
         params.mediaId = media[0].id
       }
 
-      return this.backendInteractor.sendChatMessage(params)
+      const fakeMessage = buildFakeMessage({
+        attachments: media,
+        chatId: this.currentChat.id,
+        content: status,
+        userId: this.currentUser.id,
+        idempotencyKey
+      })
+
+      this.$store.dispatch('addChatMessages', {
+        chatId: this.currentChat.id,
+        messages: [fakeMessage]
+      }).then(() => {
+        this.handleAttachmentPosting()
+      })
+
+      return this.doSendMessage({ params, fakeMessage, retriesLeft: MAX_RETRIES })
+    },
+    doSendMessage ({ params, fakeMessage, retriesLeft = MAX_RETRIES }) {
+      if (retriesLeft <= 0) return
+
+      this.backendInteractor.sendChatMessage(params)
         .then(data => {
           this.$store.dispatch('addChatMessages', {
             chatId: this.currentChat.id,
-            messages: [data],
-            updateMaxId: false
-          }).then(() => {
-            this.$nextTick(() => {
-              this.handleResize()
-              // When the posting form size changes because of a media attachment, we need an extra resize
-              // to account for the potential delay in the DOM update.
-              setTimeout(() => {
-                this.updateScrollableContainerHeight()
-              }, SAFE_RESIZE_TIME_OFFSET)
-              this.scrollDown({ forceRead: true })
-            })
+            updateMaxId: false,
+            messages: [{ ...data, fakeId: fakeMessage.id }]
           })
 
           return data
         })
         .catch(error => {
           console.error('Error sending message', error)
-          return {
-            error: this.$t('chats.error_sending_message')
+          this.$store.dispatch('handleMessageError', {
+            chatId: this.currentChat.id,
+            fakeId: fakeMessage.id,
+            isRetry: retriesLeft !== MAX_RETRIES
+          })
+          if ((error.statusCode >= 500 && error.statusCode < 600) || error.message === 'Failed to fetch') {
+            this.messageRetriers[fakeMessage.id] = setTimeout(() => {
+              this.doSendMessage({ params, fakeMessage, retriesLeft: retriesLeft - 1 })
+            }, 1000 * (2 ** (MAX_RETRIES - retriesLeft)))
           }
+          return {}
         })
+
+      return Promise.resolve(fakeMessage)
     },
     goBack () {
       this.$router.push({ name: 'chats', params: { username: this.currentUser.screen_name } })
diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
index 5f58b9a6..94a0097c 100644
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@@ -80,6 +80,7 @@
               :disable-sensitivity-checkbox="true"
               :disable-submit="errorLoadingChat || !currentChat"
               :disable-preview="true"
+              :optimistic-posting="true"
               :post-handler="sendMessage"
               :submit-on-enter="!mobileLayout"
               :preserve-focus="!mobileLayout"
diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss
index 53ca7cce..5af744a3 100644
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@@ -101,6 +101,19 @@
     }
   }
 
+  .pending {
+    .status-content.media-body, .created-at {
+      color: var(--faint);
+    }
+  }
+
+  .error {
+    .status-content.media-body, .created-at {
+      color: $fallback--cRed;
+      color: var(--badgeNotification, $fallback--cRed);
+    }
+  }
+
   .incoming {
     a {
       color: var(--chatMessageIncomingLink, $fallback--link);
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index d5b8bb9e..3849ab6e 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -32,7 +32,7 @@
         >
           <div
             class="media status"
-            :class="{ 'without-attachment': !hasAttachment }"
+            :class="{ 'without-attachment': !hasAttachment, 'pending': chatViewItem.data.pending, 'error': chatViewItem.data.error }"
             style="position: relative"
             @mouseenter="hovered = true"
             @mouseleave="hovered = false"
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 1bdf9833..de583269 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -75,7 +75,8 @@ const PostStatusForm = {
     'autoFocus',
     'fileLimit',
     'submitOnEnter',
-    'emojiPickerPlacement'
+    'emojiPickerPlacement',
+    'optimisticPosting'
   ],
   components: {
     MediaUpload,
@@ -272,7 +273,7 @@ const PostStatusForm = {
       if (this.preview) this.previewStatus()
     },
     async postStatus (event, newStatus, opts = {}) {
-      if (this.posting) { return }
+      if (this.posting && !this.optimisticPosting) { return }
       if (this.disableSubmit) { return }
       if (this.emojiInputShown) { return }
       if (this.submitOnEnter) {
@@ -280,6 +281,8 @@ const PostStatusForm = {
         event.preventDefault()
       }
 
+      if (this.optimisticPosting && (this.emptyStatus || this.isOverLengthLimit)) { return }
+
       if (this.emptyStatus) {
         this.error = this.$t('post_status.empty_status_error')
         return
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 284ce8df..83b60bc7 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -124,7 +124,7 @@
             v-model="newStatus.spoilerText"
             type="text"
             :placeholder="$t('post_status.content_warning')"
-            :disabled="posting"
+            :disabled="posting && !optimisticPosting"
             size="1"
             class="form-post-subject"
           >
@@ -150,7 +150,7 @@
             :placeholder="placeholder || $t('post_status.default')"
             rows="1"
             cols="1"
-            :disabled="posting"
+            :disabled="posting && !optimisticPosting"
             class="form-post-body"
             :class="{ 'scrollable-form': !!maxHeight }"
             @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
diff --git a/src/modules/api.js b/src/modules/api.js
index 0a354c3f..08485a30 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -75,12 +75,18 @@ const api = {
               } else if (message.event === 'delete') {
                 dispatch('deleteStatusById', message.id)
               } else if (message.event === 'pleroma:chat_update') {
-                dispatch('addChatMessages', {
-                  chatId: message.chatUpdate.id,
-                  messages: [message.chatUpdate.lastMessage]
-                })
-                dispatch('updateChat', { chat: message.chatUpdate })
-                maybeShowChatNotification(store, message.chatUpdate)
+                // The setTimeout wrapper is a temporary band-aid to avoid duplicates for the user's own messages when doing optimistic sending.
+                // The cause of the duplicates is the WS event arriving earlier than the HTTP response.
+                // This setTimeout wrapper can be removed once the commit `8e41baff` is in the stable Pleroma release.
+                // (`8e41baff` adds the idempotency key to the chat message entity, which PleromaFE uses when it's available, and it makes this artificial delay unnecessary).
+                setTimeout(() => {
+                  dispatch('addChatMessages', {
+                    chatId: message.chatUpdate.id,
+                    messages: [message.chatUpdate.lastMessage]
+                  })
+                  dispatch('updateChat', { chat: message.chatUpdate })
+                  maybeShowChatNotification(store, message.chatUpdate)
+                }, 100)
               }
             }
           )
diff --git a/src/modules/chats.js b/src/modules/chats.js
index 21e30933..0a373d88 100644
--- a/src/modules/chats.js
+++ b/src/modules/chats.js
@@ -16,7 +16,8 @@ const defaultState = {
   openedChats: {},
   openedChatMessageServices: {},
   fetcher: undefined,
-  currentChatId: null
+  currentChatId: null,
+  lastReadMessageId: null
 }
 
 const getChatById = (state, id) => {
@@ -92,9 +93,14 @@ const chats = {
       commit('setCurrentChatFetcher', { fetcher: undefined })
     },
     readChat ({ rootState, commit, dispatch }, { id, lastReadId }) {
+      const isNewMessage = rootState.chats.lastReadMessageId !== lastReadId
+
       dispatch('resetChatNewMessageCount')
-      commit('readChat', { id })
-      rootState.api.backendInteractor.readChat({ id, lastReadId })
+      commit('readChat', { id, lastReadId })
+
+      if (isNewMessage) {
+        rootState.api.backendInteractor.readChat({ id, lastReadId })
+      }
     },
     deleteChatMessage ({ rootState, commit }, value) {
       rootState.api.backendInteractor.deleteChatMessage(value)
@@ -106,6 +112,9 @@ const chats = {
     },
     clearOpenedChats ({ rootState, commit, dispatch, rootGetters }) {
       commit('clearOpenedChats', { commit })
+    },
+    handleMessageError ({ commit }, value) {
+      commit('handleMessageError', { commit, ...value })
     }
   },
   mutations: {
@@ -208,11 +217,16 @@ const chats = {
         }
       }
     },
-    readChat (state, { id }) {
+    readChat (state, { id, lastReadId }) {
+      state.lastReadMessageId = lastReadId
       const chat = getChatById(state, id)
       if (chat) {
         chat.unread = 0
       }
+    },
+    handleMessageError (state, { chatId, fakeId, isRetry }) {
+      const chatMessageService = state.openedChatMessageServices[chatId]
+      chatService.handleMessageError(chatMessageService, fakeId, isRetry)
     }
   }
 }
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 1a3495d4..22b5e8ba 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -129,7 +129,11 @@ const promisedRequest = ({ method, url, params, payload, credentials, headers =
             return reject(new StatusCodeError(response.status, json, { url, options }, response))
           }
           return resolve(json)
-        }))
+        })
+        .catch((error) => {
+          return reject(new StatusCodeError(response.status, error, { url, options }, response))
+        })
+      )
     })
 }
 
@@ -1210,7 +1214,7 @@ const chatMessages = ({ id, credentials, maxId, sinceId, limit = 20 }) => {
   })
 }
 
-const sendChatMessage = ({ id, content, mediaId = null, credentials }) => {
+const sendChatMessage = ({ id, content, mediaId = null, idempotencyKey, credentials }) => {
   const payload = {
     'content': content
   }
@@ -1219,11 +1223,18 @@ const sendChatMessage = ({ id, content, mediaId = null, credentials }) => {
     payload['media_id'] = mediaId
   }
 
+  const headers = {}
+
+  if (idempotencyKey) {
+    headers['idempotency-key'] = idempotencyKey
+  }
+
   return promisedRequest({
     url: PLEROMA_CHAT_MESSAGES_URL(id),
     method: 'POST',
     payload: payload,
-    credentials
+    credentials,
+    headers
   })
 }
 
diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js
index 95c69482..815af82e 100644
--- a/src/services/chat_service/chat_service.js
+++ b/src/services/chat_service/chat_service.js
@@ -3,6 +3,7 @@ import _ from 'lodash'
 const empty = (chatId) => {
   return {
     idIndex: {},
+    idempotencyKeyIndex: {},
     messages: [],
     newMessageCount: 0,
     lastSeenTimestamp: 0,
@@ -13,8 +14,18 @@ const empty = (chatId) => {
 }
 
 const clear = (storage) => {
-  storage.idIndex = {}
-  storage.messages.splice(0, storage.messages.length)
+  const failedMessageIds = []
+
+  for (const message of storage.messages) {
+    if (message.error) {
+      failedMessageIds.push(message.id)
+    } else {
+      delete storage.idIndex[message.id]
+      delete storage.idempotencyKeyIndex[message.id]
+    }
+  }
+
+  storage.messages = storage.messages.filter(m => failedMessageIds.includes(m.id))
   storage.newMessageCount = 0
   storage.lastSeenTimestamp = 0
   storage.minId = undefined
@@ -37,6 +48,25 @@ const deleteMessage = (storage, messageId) => {
   }
 }
 
+const handleMessageError = (storage, fakeId, isRetry) => {
+  if (!storage) { return }
+  const fakeMessage = storage.idIndex[fakeId]
+  if (fakeMessage) {
+    fakeMessage.error = true
+    fakeMessage.pending = false
+    if (!isRetry) {
+      // Ensure the failed message doesn't stay at the bottom of the list.
+      const lastPersistedMessage = _.orderBy(storage.messages, ['pending', 'id'], ['asc', 'desc'])[0]
+      if (lastPersistedMessage) {
+        const oldId = fakeMessage.id
+        fakeMessage.id = `${lastPersistedMessage.id}-${new Date().getTime()}`
+        storage.idIndex[fakeMessage.id] = fakeMessage
+        delete storage.idIndex[oldId]
+      }
+    }
+  }
+}
+
 const add = (storage, { messages: newMessages, updateMaxId = true }) => {
   if (!storage) { return }
   for (let i = 0; i < newMessages.length; i++) {
@@ -45,7 +75,19 @@ const add = (storage, { messages: newMessages, updateMaxId = true }) => {
     // sanity check
     if (message.chat_id !== storage.chatId) { return }
 
-    if (!storage.minId || message.id < storage.minId) {
+    if (message.fakeId) {
+      const fakeMessage = storage.idIndex[message.fakeId]
+      if (fakeMessage) {
+        Object.assign(fakeMessage, message, { error: false })
+        delete fakeMessage['fakeId']
+        storage.idIndex[fakeMessage.id] = fakeMessage
+        delete storage.idIndex[message.fakeId]
+
+        return
+      }
+    }
+
+    if (!storage.minId || (!message.pending && message.id < storage.minId)) {
       storage.minId = message.id
     }
 
@@ -55,16 +97,22 @@ const add = (storage, { messages: newMessages, updateMaxId = true }) => {
       }
     }
 
-    if (!storage.idIndex[message.id]) {
+    if (!storage.idIndex[message.id] && !isConfirmation(storage, message)) {
       if (storage.lastSeenTimestamp < message.created_at) {
         storage.newMessageCount++
       }
-      storage.messages.push(message)
       storage.idIndex[message.id] = message
+      storage.messages.push(storage.idIndex[message.id])
+      storage.idempotencyKeyIndex[message.idempotency_key] = true
     }
   }
 }
 
+const isConfirmation = (storage, message) => {
+  if (!message.idempotency_key) return
+  return storage.idempotencyKeyIndex[message.idempotency_key]
+}
+
 const resetNewMessageCount = (storage) => {
   if (!storage) { return }
   storage.newMessageCount = 0
@@ -76,7 +124,7 @@ const getView = (storage) => {
   if (!storage) { return [] }
 
   const result = []
-  const messages = _.sortBy(storage.messages, ['id', 'desc'])
+  const messages = _.orderBy(storage.messages, ['pending', 'id'], ['asc', 'asc'])
   const firstMessage = messages[0]
   let previousMessage = messages[messages.length - 1]
   let currentMessageChainId
@@ -148,7 +196,8 @@ const ChatService = {
   getView,
   deleteMessage,
   resetNewMessageCount,
-  clear
+  clear,
+  handleMessageError
 }
 
 export default ChatService
diff --git a/src/services/chat_utils/chat_utils.js b/src/services/chat_utils/chat_utils.js
index 86fe1af9..de6e0625 100644
--- a/src/services/chat_utils/chat_utils.js
+++ b/src/services/chat_utils/chat_utils.js
@@ -18,3 +18,24 @@ export const maybeShowChatNotification = (store, chat) => {
 
   showDesktopNotification(store.rootState, opts)
 }
+
+export const buildFakeMessage = ({ content, chatId, attachments, userId, idempotencyKey }) => {
+  const fakeMessage = {
+    content,
+    chat_id: chatId,
+    created_at: new Date(),
+    id: `${new Date().getTime()}`,
+    attachments: attachments,
+    account_id: userId,
+    idempotency_key: idempotencyKey,
+    emojis: [],
+    pending: true,
+    isNormalized: true
+  }
+
+  if (attachments[0]) {
+    fakeMessage.attachment = attachments[0]
+  }
+
+  return fakeMessage
+}
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 1884478a..9d09b8d0 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -429,6 +429,9 @@ export const parseChatMessage = (message) => {
   } else {
     output.attachments = []
   }
+  output.pending = !!message.pending
+  output.error = false
+  output.idempotency_key = message.idempotency_key
   output.isNormalized = true
   return output
 }
diff --git a/test/unit/specs/services/chat_service/chat_service.spec.js b/test/unit/specs/services/chat_service/chat_service.spec.js
index 2eb89a2d..15e64bb5 100644
--- a/test/unit/specs/services/chat_service/chat_service.spec.js
+++ b/test/unit/specs/services/chat_service/chat_service.spec.js
@@ -2,17 +2,20 @@ import chatService from '../../../../../src/services/chat_service/chat_service.j
 
 const message1 = {
   id: '9wLkdcmQXD21Oy8lEX',
+  idempotency_key: '1',
   created_at: (new Date('2020-06-22T18:45:53.000Z'))
 }
 
 const message2 = {
   id: '9wLkdp6ihaOVdNj8Wu',
+  idempotency_key: '2',
   account_id: '9vmRb29zLQReckr5ay',
   created_at: (new Date('2020-06-22T18:45:56.000Z'))
 }
 
 const message3 = {
   id: '9wLke9zL4Dy4OZR2RM',
+  idempotency_key: '3',
   account_id: '9vmRb29zLQReckr5ay',
   created_at: (new Date('2020-07-22T18:45:59.000Z'))
 }

From 78e5a639228ba846e38ae722590aec1310275c79 Mon Sep 17 00:00:00 2001
From: Eugenij <eugenijm@protonmail.com>
Date: Sun, 1 Nov 2020 14:25:02 +0000
Subject: [PATCH 049/389] Apply 1 suggestion(s) to 1 file(s)

---
 src/services/chat_service/chat_service.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js
index 815af82e..b0905dc1 100644
--- a/src/services/chat_service/chat_service.js
+++ b/src/services/chat_service/chat_service.js
@@ -78,6 +78,12 @@ const add = (storage, { messages: newMessages, updateMaxId = true }) => {
     if (message.fakeId) {
       const fakeMessage = storage.idIndex[message.fakeId]
       if (fakeMessage) {
+        // In case the same id exists (chat update before POST response)
+        // make sure to remove the older duplicate message.
+        if (storage.idIndex[message.id]) {
+          delete storage.idIndex[message.id]
+          storage.messages = storage.messages.filter(msg => msg.id !== message.id)
+        }
         Object.assign(fakeMessage, message, { error: false })
         delete fakeMessage['fakeId']
         storage.idIndex[fakeMessage.id] = fakeMessage

From 5e8db7ed938021854cec8864462879f29d159eea Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 2 Nov 2020 09:15:13 +0200
Subject: [PATCH 050/389] move from using timestamps to ids when tracking last
 seen in chats

---
 src/services/chat_service/chat_service.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js
index b0905dc1..1fc4e390 100644
--- a/src/services/chat_service/chat_service.js
+++ b/src/services/chat_service/chat_service.js
@@ -6,7 +6,7 @@ const empty = (chatId) => {
     idempotencyKeyIndex: {},
     messages: [],
     newMessageCount: 0,
-    lastSeenTimestamp: 0,
+    lastSeenMessageId: '0',
     chatId: chatId,
     minId: undefined,
     maxId: undefined
@@ -27,7 +27,7 @@ const clear = (storage) => {
 
   storage.messages = storage.messages.filter(m => failedMessageIds.includes(m.id))
   storage.newMessageCount = 0
-  storage.lastSeenTimestamp = 0
+  storage.lastSeenMessageId = '0'
   storage.minId = undefined
   storage.maxId = undefined
 }
@@ -104,7 +104,7 @@ const add = (storage, { messages: newMessages, updateMaxId = true }) => {
     }
 
     if (!storage.idIndex[message.id] && !isConfirmation(storage, message)) {
-      if (storage.lastSeenTimestamp < message.created_at) {
+      if (storage.lastSeenMessageId < message.id) {
         storage.newMessageCount++
       }
       storage.idIndex[message.id] = message
@@ -122,7 +122,7 @@ const isConfirmation = (storage, message) => {
 const resetNewMessageCount = (storage) => {
   if (!storage) { return }
   storage.newMessageCount = 0
-  storage.lastSeenTimestamp = new Date()
+  storage.lastSeenMessageId = storage.maxId
 }
 
 // Inserts date separators and marks the head and tail if it's the chain of messages made by the same user

From 757706425a1c865a0e64e9c530b3aa1e7d9e2494 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 2 Nov 2020 09:42:09 +0200
Subject: [PATCH 051/389] fix test

---
 test/unit/specs/services/chat_service/chat_service.spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unit/specs/services/chat_service/chat_service.spec.js b/test/unit/specs/services/chat_service/chat_service.spec.js
index 15e64bb5..0251cae7 100644
--- a/test/unit/specs/services/chat_service/chat_service.spec.js
+++ b/test/unit/specs/services/chat_service/chat_service.spec.js
@@ -47,10 +47,10 @@ describe('chatService', () => {
 
       chatService.resetNewMessageCount(chat)
       expect(chat.newMessageCount).to.eql(0)
+      expect(chat.lastSeenMessageId).to.eql(message2.id)
 
-      const createdAt = new Date()
-      createdAt.setSeconds(createdAt.getSeconds() + 10)
-      chatService.add(chat, { messages: [ { message3, created_at: createdAt } ] })
+      // Add message with higher id
+      chatService.add(chat, { messages: [ message3 ] })
       expect(chat.newMessageCount).to.eql(1)
     })
   })

From 279205ade562f2231da13dadc70a7cd1a071ca72 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 2 Nov 2020 10:42:38 +0200
Subject: [PATCH 052/389] update changelog for optimistic chat posting

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1257cd75..91996216 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Import/export a muted users
 - Proper handling of deletes when using websocket streaming
+- Added optimistic chat message sending, so you can start writing next message before the previous one has been sent
 
 ## [2.1.1] - 2020-09-08
 ### Changed

From a1e7852c10ecd2a99711f8e0330afcc93ef1439d Mon Sep 17 00:00:00 2001
From: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Mon, 2 Nov 2020 09:36:23 +0000
Subject: [PATCH 053/389] Update CHANGELOG.md

---
 CHANGELOG.md | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91996216..68cab40c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,22 +6,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Added
 - New option to optimize timeline rendering to make the site more responsive (enabled by default)
+- New instance option `logoLeft` to move logo to the left side in desktop nav bar
+- Import/export a muted users
+- Proper handling of deletes when using websocket streaming
+- Added optimistic chat message sending, so you can start writing next message before the previous one has been sent
 
-## [Unreleased patch]
 ### Fixed
 - Fixed chats list not updating its order when new messages come in
 - Fixed chat messages sometimes getting lost when you receive a message at the same time
 - Fixed clicking NSFW hider through status popover
 - Fixed chat-view back button being hard to click
 - Fixed fresh chat notifications being cleared immediately while leaving the chat view and not having time to actually see the messages
+- Fixed multiple regressions in CSS styles
+- Fixed multiple issues with input fields when using CJK font as default
+- Fixed search field in navbar infringing into logo in some cases
 
 ### Changed
 - Clicking immediately when timeline shifts is now blocked to prevent misclicks
-
-### Added
-- Import/export a muted users
-- Proper handling of deletes when using websocket streaming
-- Added optimistic chat message sending, so you can start writing next message before the previous one has been sent
+- Icons changed from fontello (FontAwesome 4 + others) to FontAwesome 5 due to problems with fontello.
+- Some icons changed for better accessibility (lock, globe)
+- Logo is now clickable
 
 ## [2.1.1] - 2020-09-08
 ### Changed

From 350eb489c22e6bac20de92284193a87af63c52a9 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 2 Nov 2020 15:46:49 +0200
Subject: [PATCH 054/389] add favicon badge for unread notifs

---
 CHANGELOG.md                                  |   1 +
 index.html                                    |   2 +-
 src/boot/after_store.js                       |   3 +
 src/components/notifications/notifications.js |   3 +
 .../favicon_service/favicon_service.js        |  56 ++++++++++++++++++
 static/dev_favicon.png                        | Bin 0 -> 7528 bytes
 6 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 src/services/favicon_service/favicon_service.js
 create mode 100644 static/dev_favicon.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68cab40c..997889fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Import/export a muted users
 - Proper handling of deletes when using websocket streaming
 - Added optimistic chat message sending, so you can start writing next message before the previous one has been sent
+- Added a small red badge to the favicon when there's unread notifications
 
 ### Fixed
 - Fixed chats list not updating its order when new messages come in
diff --git a/index.html b/index.html
index 1ff944d9..9ac0cfe9 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
     <title>Pleroma</title>
     <!--server-generated-meta-->
-    <link rel="icon" type="image/png" href="/favicon.png">
+    <link rel="icon" type="image/png" href="/static/dev_favicon.png">
   </head>
   <body class="hidden">
     <noscript>To use Pleroma, please enable JavaScript.</noscript>
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 3cbbf020..b472fcf6 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -7,6 +7,7 @@ import { getOrCreateApp, getClientToken } from '../services/new_api/oauth.js'
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { applyTheme } from '../services/style_setter/style_setter.js'
+import FaviconService from '../services/favicon_service/favicon_service.js'
 
 let staticInitialResults = null
 
@@ -326,6 +327,8 @@ const afterStoreSetup = async ({ store, i18n }) => {
   const width = windowWidth()
   store.dispatch('setMobileLayout', width <= 800)
 
+  FaviconService.initFaviconService()
+
   const overrides = window.___pleromafe_dev_overrides || {}
   const server = (typeof overrides.target !== 'undefined') ? overrides.target : window.location.origin
   store.dispatch('setInstanceOption', { name: 'server', value: server })
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 4b479e13..49258563 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -6,6 +6,7 @@ import {
   filteredNotificationsFromStore,
   unseenNotificationsFromStore
 } from '../../services/notification_utils/notification_utils.js'
+import FaviconService from '../../services/favicon_service/favicon_service.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
 
@@ -75,8 +76,10 @@ const Notifications = {
   watch: {
     unseenCountTitle (count) {
       if (count > 0) {
+        FaviconService.drawFaviconBadge()
         this.$store.dispatch('setPageTitle', `(${count})`)
       } else {
+        FaviconService.clearFaviconBadge()
         this.$store.dispatch('setPageTitle', '')
       }
     }
diff --git a/src/services/favicon_service/favicon_service.js b/src/services/favicon_service/favicon_service.js
new file mode 100644
index 00000000..8e3f1170
--- /dev/null
+++ b/src/services/favicon_service/favicon_service.js
@@ -0,0 +1,56 @@
+import { find } from 'lodash'
+
+const createFaviconService = () => {
+  let favimg, favcanvas, favcontext, favicon
+  const faviconWidth = 48
+  const faviconHeight = 48
+  const strokeColor = 'rgb(200, 0, 0)'
+  const fillColor = 'rgb(255, 90, 90)'
+  const badgeRadius = 12
+
+  const initFaviconService = () => {
+    const nodes = document.getElementsByTagName('link')
+    favicon = find(nodes, node => node.rel === 'icon')
+    if (favicon) {
+      favcanvas = document.createElement('canvas')
+      favcanvas.width = faviconWidth
+      favcanvas.height = faviconHeight
+      favimg = new Image()
+      favimg.src = favicon.href
+      favcontext = favcanvas.getContext('2d')
+    }
+  }
+
+  const clearFaviconBadge = () => {
+    if (!favimg || !favcontext || !favicon) return
+
+    favcontext.clearRect(0, 0, faviconWidth, faviconHeight)
+    favcontext.drawImage(favimg, 0, 0, favimg.width, favimg.height, 0, 0, faviconWidth, faviconHeight)
+    favicon.href = favcanvas.toDataURL('image/png')
+  }
+
+  const drawFaviconBadge = () => {
+    if (!favimg || !favcontext || !favcontext) return
+
+    clearFaviconBadge()
+
+    favcontext.drawImage(favimg, 0, 0, favimg.width, favimg.height, 0, 0, faviconWidth, faviconHeight)
+    favcontext.fillStyle = fillColor
+    favcontext.strokeStyle = strokeColor
+    favcontext.beginPath()
+    favcontext.arc(faviconWidth - badgeRadius, faviconHeight - badgeRadius, badgeRadius, 0, 2 * Math.PI, false)
+    favcontext.fill()
+    favcontext.stroke()
+    favicon.href = favcanvas.toDataURL('image/png')
+  }
+
+  return {
+    initFaviconService,
+    clearFaviconBadge,
+    drawFaviconBadge
+  }
+}
+
+const FaviconService = createFaviconService()
+
+export default FaviconService
diff --git a/static/dev_favicon.png b/static/dev_favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b53d74622460511095714ec2893eda11b2c0063
GIT binary patch
literal 7528
zcmeHMXIN8Nw+_-fB1MW4f;5pNBmqJUh%`Z}fKo&x6(W#?6q<;16d9Td3P=%96a+;?
zq^k&G8BtUirHeE{6e&u*C+IlLy>q|s&hy;w-z3jT&fe!;?^@^GYwfeoIVT<L_J|6}
z3xPl&Q7cO`N8lgM*#!82UzZKv;z1yxgQ3o@EJs`rn9iV)DSjj{D}+u0lY%K^5GeS~
zHMfI-@2bU?TDOx0w^>RIF}`9)KK4V83!U*(4{x@cuiTjq*#|zcLC8FIcy;ymsM69Y
zBc%EB?7e%%R`Dlewd^W(uAE(-Jk;H{co<C^n5T7)g+>Qxc3T`VY<2O-c*~t(5Vjb8
zVLBxK3uUw}KxeZbxuxyv__ney0X?l94(D5~w!1afy!ncrWA+EWU(%dBr<P5a2wDhL
z-hL6qvx#?DE{y(lm>w#Tl$-EjYo8w9N?i4`jRo>1)xl8_VF!EPk9K#0jtNh{PyASL
z+^|;IsPju`^(hjD5OeynejQePMeOrD3vD<!r7ux7dp-M$_qEi{%+~QEHYa>A$Vbmr
zF>@k(dNJ6ER!O4-rMq`N+TT^L9mjx`%4*~6=N}*)+=dF28W!G<7zOqX;D_20RG1^z
z%irgDRL66xhb`enRTEPpNh4NqZv7>&@Mj0-!g{=)V6kx(@jA(SJi|vXXElCnckeM7
zI@Hi26n>*fqZ>Xnp-=!iaaf&N!5#K3`%^9KTeLH8RK@-58%^VHa2HQDzCX}~=1<(D
zm@GM6_zo2zfulwuH6lk3P45nywmbjoXtNG?p3pM`GpcdZsZSB76-_N|9-a56Vhh5P
zNdwJ+a@{=OZH0MFmtusj<E4g@TM`woN^VQAlss$WSa>M~pLQlqP36wj-31A1`=7d3
z4yO>(vnz(Pt;=GqLHv8I%&nnCFCRJU?2EmY@LAeL{&qY5bb4l0_ui5%V;zKyoSM0A
z>+<M5oAXYl#wB4N6?b&-I6Xm=E?q%BLwqnPyLNpr?QD8k-J`26FYTO_j2exf<`#dp
zc+@f`t?Qxs>Xaaj1&NcBcsCkZEx*CiNAHQpoKA(Z_qjXwG=y+y%{Wm}+6k_EXv4?T
zE)&#;$6^$$Rs{6J;}zvttGo=J(X9bTquyLM>eR>Yk#@H^WIQ{t^5iVq#rMeUSisEt
zO!Acyw%o0mbO$c1yURx}OzD;PXL#lxW)vGM5IiniyEaDfyfd0v<G#c9)+^V}ie7gY
zMe-f~QV~CyCzViRg)@Aud=|}EKSejG8|iQ_BdN~_iRr;2Wh-xY!jm%T0n-3`xBC}U
zb!<mWz;0FF7TmA!?7T1aJgFn)rcP@LwR0|o0HQwjkdHLH=yv6DMT~Eq>x$ET*3F5h
z^!fPT${wP`pLV36eG~$zlIEW0FWzta+M7kt8yd;6KlrslBJ|cuvTd$#zB<=}%FP*+
z@qK%!R>{jMgiz&3&2T1iR*LzH>Yl(C?phR9YMnDSKk&#AjrpQrACa5Sb`-c4B!@p!
zD3U!dwu`jjeAN7v{m|Q&2*#E15~0|%uOQy-CC`M7XvtM6yp$?(Vm-U5&!eRhc^i9h
zzMJoLKNy1<Hyg-cZwuznkst4vlh_y=UF_W+dk%L_b?)ZKvM~A!_TpA7UVs<j=x>S`
zKU%Xt-sg~X>J$>K<qI_^AKvt<0B(moIiz?=di+t7cdN~wSGrOMp3L7H-kBi3<TNLL
zEML?!v6!`!`}2g#fqRxldW|(=JF3~Gyw(;%m9Jt$j=prqUf@=`bN_K}lEOYQS+l$F
zxKYf;TM^O=^2>3f$AudVyaWXd>YC!VEZt+njwx$7ElDOtE6ciXPS3vY2e~;{UuRv)
zHa4+GWpF2Kz59I9@?7tugpk9RV0R*CUgYR0$S4g9_*UsQ6cJsy?OF)eYR|kr$x|PN
zw<+a)&(*s{nD<?B*j?m`(ZRXYkFbe?svF=4vA*Domu-ArZs|_Qi57Tp6g0{eDW<+d
zRZ%9h-hi7wIc2Eum#I^{$Ly}-D-z1tZmSIzwNE!_$}o00SSgY-RA`rG_P;w86=Ni*
z{M*O;N@GNznr}LD<8ztF1>=m;)=<$?Q<mB2cF_|&IIaaDaC+t9=3?)oF_)pg)_*Kw
z)zh^XCwrh_pN62zhY%VoPs(w5o8krc(DkGC(&cU`eb{(rYrD1*9-(}On%LfS90h&u
z8DIjNVdZh1ye|2&{JmJ_j`2Aot0m`$R~VY1p)Rwo<@o`32aN|e@)u3yDPSuMHotp-
zB)oWa%ib-cLB_~z1bPg;*i=`p93ksV3N>kLs3Z0%sCR#X8LIZ*UOHN`VEw$qX@lp7
zdkyT){*Mq@snWWwzh&gKPfc~r4|!ttDwTOYoR2&@rQEf&*wio+6Mp!{RC2eq_|RhF
z(cIUIx4K7OLY>K=bcc7A4js`#`ED52?(D>#Uy@VmCR9t*-o@tR#WzY=C+SAk-)n9W
zmn2uTt+bD;e$uu7cBp^McW71Z)6Au*V~W8w77b4m9#*}#(CX2(7>DJSun+k~2QnXm
z{fa|*jt}TXHS*QPs`O*;iHRrP=y#N5TfQDJ-Q-t$giC&|n){-mmzJE`31Kc*w(RFe
zq8&C9N?=K8j6#=nrD43HZClB!$@H^bs{;y-_BfF+vB%V{45_S|r#zSsN$35Olm$~^
zh&Y0_&Zj23$KwsYpIkZ>y3%T8lf)hf@NVxa%%(*2*r?b{;)PoHuAWPiK4vg-(wAS{
zIcW+bprkrIzopqRVdaz<UNj~rP-5POwiH&V&u#QtbtW3IbQYSQ1^;H5QCI4*P~F_8
zaVS)cy=pf0g0^>szsR>(4&GYzYrfTQm&%fuPO=~M9*lstm53VfbseY>o)$;|Rp7yb
z!Ux!IVn6J{273qf71o}Q|22D7{K<=C;ZXR&j`4kSYSNO5lSUJ=I&E6KJuqD&-8)a_
z>Pg0DfyQI(l4{R`wk?V(!_xR{ckAq^)%pu3UqNmx#%$|l@*J~}oHB?qQaL%l{dCTw
zC#K$=0}i~(vmg6yZa=N9fAiw{*%T#e<DOQ>c0<Yf$q6N)kcC=_K8Ve6*};P`V^bz!
zr{MLD(~Z*8Gke=s4?OJ1npam64hbz9I<7S|=0bA}mzZ|W8_JjQ8Vm_uRIU3ZLwrxP
zWFF)SYS;C%8D!e7-M8dD+Ki4S<4+`+`pOJSP1t@GE%;SMO3>|2^m6p_71Ib&%l9_S
zs5;GWvNn=ZnYMSSt#99qJy()HlICu*iKvOSwuOoweP_f!BGTFYQgb&MF;MDiV*_qU
zEBv-SU#3jLL{rxJO2Ax{7iusT5fjtxm8&oh9Tfi@Bw{Q#sT@4K`Gu{25e|{fr?y@6
zVbQqv+1bnFu~Uaq>br7%S08HB)913DE6pW2WXa!iTTZ82j-9AsWWHh?PSl)J;!lxc
zo^6vuop;zIaZB{|HT@u`?G6tLw!$R9wa<rA@d(2G(z$qUxZt!v<Abz38-+{pdgbJ|
zy~FASGG8QL*2q?!NhI#ucQ90GUVC7E`P#)~efQ0v8{#9Ko&j0f0#!S{iY^FG%f`t}
zgJv^Qh|<nm9q<OVQl$&e^TC9{cD2M|`L~Iq)m`?2ReaD^5H%(*DG$?>EB`Ff^Qyz^
zE}3SJIIpS5EpM}X?^^LxyA(1B*R}M5y1ewSHw1YkRLbu@_f4uGML)NJ9UM~Fs7v>L
zXtGmiS-9|CK1+{ayb7!~$$z=bq|jLe&N9<5!B8y1K_EKFZeU}C-il&;-AMm%|1yDe
zT{I^ALD`~QRb{n&pqjYd<s~g-oVwnH*qGy|H$}D|7!NEqd~hNvi_YcMs4E%9H6tWz
zhfk!#Kp=553b3$swY9+zX#P+fk%lKhgZ=41C?F7aS1=t%@FlUpc#=1TY6zLCZG?a+
zL_>&+t}Wb_Zc6f@ScWo4PN8<rgiv3C0THsxNC+E@0SNp_EF3u4-;c_~1RFxucrm~}
zryB+VuR&P8h7ea<2e2uPK?0+oC@5UpJeU%QfEWpZu?!*^<7j5_g92z7LVQ>(ItB&{
z3JQV-A)z#eH%!OCzyJnEzz_&+0HMtcp|Wtn+Ek_rhvGYj8Hq_?0QymAR4|7Vho`Yw
zh7bsF9Q=cvqpo={(D}mwr@cncWD#LjKm!Gw4*-B6;Bd4y9HEUcfUUO&j@sJ(w5BqD
zs0io@3&zo5I#4*w-~Ue*OqO}zAO8N*g6Rz0U%(tmOd6X(Aeje}s4SKBPU(JZ=6auO
zCW+Iv7PlXf3<H8%^Ss_>kCm;%PaBSm-V}fOngs{F9!Vtp#L?Ldzcmbz03-R4{DDB2
z0JF}Y@PPeKgTFkTHS#r~FlICYo5NydW(eT~fFaTd6e4DAS63H7Mxya(Z9H6utc^k<
z^|a9_B3v6q#3K+$9G;BB;nz`FQJE|pl|bT90pw5$z=OvTb@WMOoHj`xPtZo`>%p}R
z&^SF{(9mQuoT!J=Me3}huxC(!)W-R(kBUP@1gOY3H~~&3Ahn4|96&`R0&$`7`r0};
z9EzZi&_yFr`fF4iVKKWMtPCLtDEyBe2R|H(Ok?;PLTo5hcJLnuoGJb!Cl-z)nvNbE
zh15Z#kSIMpec<~C=m3eq1hSUHsRM^1zVi|Z7z=<A2V@V$ALmVi(W%~RCP2&>Qw9mg
zqA{FlG(STKCnhk*bgdS^*dJMrv7r%goN8DDlZc!``B5q+IB(cm6ASxS;Qzto<U<Rh
z{@-~1fc|9J&0q!57{2xld;Ad+f%UI>{tEn)$q|^Om@Gz!)xSBZ|AxbUPfJU{mc|HK
z=iiAG@V)hYCh?=JNd*S4RWAld;HYQ_Vd4Tw#I+#+bo_pZ;De)jlYnXRM~(d6Px*^<
z)yM1M5hz`RHX4oA)drFirHx0Dk=h1GJzazz8i^wt=>D0VNh7m@a17FJZ=i^PaRy3g
zZJfaxYgwlGXLOJc2?$aPj=;d-knh6_#=<x=;qRx1<;)efwwUz-U^#OM#)^|+PHZ~e
zk3wSnS(x7w<$uAgv;UEl|IU0p?7OuojUECNrw_|Mi25(x{{`?ngAIj1qB3d!D)jY`
z@3O4BU;r_H?*lGGz;zAw^TPHcEjX3)AN>4CxBs9AfchUNe@owg<oZXhzoo$60{@d;
z|H$>X6!=@<f3oZUO)jB7ZjDJ)V4)WT-1w$tv86#Et{94`se_fN>F+O!Kp>6OW2rkW
z?;9(&G+x?U<ZSi?{6N{1UC}Qb@N&CUzDcpPI~$(dkY{C@HaMtJEu$E=<G>b=Y&M%N
z&2yLk#OZ?57f+q}+E~~QX^DOp9v0Ns+7kroEY`?;rOW42<A3S2pmNqhX_ImRm4xt5
zn=_;ypWF06Dy+5BaD!j{shc}ina7hnb!nQ$#^9X&A{}bI;GEt{(U!&LI>$8ULFVAT
z(@@K$hpgY;>9?3?7^Jslou9$#*zb_q>H5*Dh<K#gsaa=#hi2~M&{9M%zI6YQy&rNW
zVpHoHDxR=1O)c>ottFI=EksGqUMhAab_ublN#KRfzD`)0wVI2Zkb#UtEMMDf^zz*)
z>a}}AF&R=;pdMJ#7aft9z({gWKtuAD%OM+hawE0sC(HFB&fCBE;IAFXGvm)K+v#uH
z%MA^RxT|i8P<0V{F(ky>zns{h$uH8qVL-S1_G=?Mr3exB*%~e}vB*>iseG}n_VUf!
z$DdU$EOKQDGHxrKmZJa<F$C$BZcGq}UyrkK1yooc0Xq3vR<`E+L&6(GKoH}L6;NQ@
z?5xaoJNxt!yfzO;q$=931|Il?Tw3h8+td`iH4A&%``M1tg{q9gjRYg;au-OrEve6Q
zA$OqfFdrYETG%5xIwC+V^|iz#m)Z-(!ybDQF}t^l$?i?#)m%7liOjr`Y8gwBQkz7{
zhj@L8+$WwG>h+SlVC&}Dreb~zL-_dbUG%)uSi;kk*`~?Mw2!-1XBKy9hPsZ*_vG{>
zMqw381hy}&!tfd+k@ZuJD+~G>gowz<$bsbyC0s#K`%fkjdE?H|{=Ou~ix!v9V{1D2
zz0K!xM|Z!SQN9qv6M~Lg8m)YMqOEz&J^f2lZsTgWI7R%#9-AKH`<Y*lFZ6y9*Ekp1
zTz1&;Tn246KPyPxA3HC%edZU}O;$Nq)UP@vUH)L1817heVF;y4-gj;<eJlg#MeO>v
k@+Emhq`*t6T^t1R?$|#U;`aI~=Q)y<xt&>=iC5Hr0X@A2ssI20

literal 0
HcmV?d00001


From 1fa046126eb8a048440ff97be8febe3a8c6e6e58 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 2 Nov 2020 16:45:15 +0200
Subject: [PATCH 055/389] make badge just a ball, make it use theming

---
 .../favicon_service/favicon_service.js        |  13 ++++++-------
 static/dev_favicon.png                        | Bin 7528 -> 13331 bytes
 static/favicon.png                            | Bin 0 -> 12920 bytes
 3 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 static/favicon.png

diff --git a/src/services/favicon_service/favicon_service.js b/src/services/favicon_service/favicon_service.js
index 8e3f1170..5fa8e5c3 100644
--- a/src/services/favicon_service/favicon_service.js
+++ b/src/services/favicon_service/favicon_service.js
@@ -4,9 +4,7 @@ const createFaviconService = () => {
   let favimg, favcanvas, favcontext, favicon
   const faviconWidth = 48
   const faviconHeight = 48
-  const strokeColor = 'rgb(200, 0, 0)'
-  const fillColor = 'rgb(255, 90, 90)'
-  const badgeRadius = 12
+  const badgeRadius = 14
 
   const initFaviconService = () => {
     const nodes = document.getElementsByTagName('link')
@@ -34,13 +32,14 @@ const createFaviconService = () => {
 
     clearFaviconBadge()
 
+    const style = getComputedStyle(document.body)
+    const badgeColor = `${style.getPropertyValue('--badgeNotification') || 'rgb(240, 100, 100)'}`
+
     favcontext.drawImage(favimg, 0, 0, favimg.width, favimg.height, 0, 0, faviconWidth, faviconHeight)
-    favcontext.fillStyle = fillColor
-    favcontext.strokeStyle = strokeColor
+    favcontext.fillStyle = badgeColor
     favcontext.beginPath()
-    favcontext.arc(faviconWidth - badgeRadius, faviconHeight - badgeRadius, badgeRadius, 0, 2 * Math.PI, false)
+    favcontext.arc(faviconWidth - badgeRadius, badgeRadius, badgeRadius, 0, 2 * Math.PI, false)
     favcontext.fill()
-    favcontext.stroke()
     favicon.href = favcanvas.toDataURL('image/png')
   }
 
diff --git a/static/dev_favicon.png b/static/dev_favicon.png
index 8b53d74622460511095714ec2893eda11b2c0063..4223d5ca8c14fe460e3b92c5bf78309aa98639e0 100644
GIT binary patch
delta 9186
zcmV<8BOTo6I+JLSBYzvsdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+O3;cb|g8F
zZ2z%}Spu|J4&*s+2XFav4UuF~l<Mwjb}^HYApjTVW)7s;|Ns9T^FRDos`n<QQgh4M
z@?UJR`Oceapa0tZ?QFci?|<R-5r2O=Zr(re911_qEd6zU=YM$malzX&-1vOl)Ym7z
zzHapT;O&M%Pxic79|y^C{~UMmb)&YQH@VgFaj3&Tuk&@{9m?xp8_#3H>m2=UJ|2h#
zE3L$Xg7-VPVEOICYXsr>*E#O^t#cS}$h;4sndi`JBpBq=^xj^r{b-<1Mt*x|zFPnN
z-52Bg{yHAM*ncv=Y{Z+Ne&Ev2jekx2IUHUi@}ECQ)va&SdHp+Q)pPbUyB;$Z&98{E
z=FK{~h7$)S5BIXnPvKwUeYro4pK80ExO~}Z2S3v_=kdxhF1qEqJ8s|C=_W&re*40!
z_tS@atcK#7pFw_#`f<mX(83B8UrxUbu8YCHkHy{RwtxG)=_*fNj#ItkW{yjK`D1?f
z;XnB?=S-Q%+4^oP#^n`R3`3sNZ_dIY?!5e#u7TfvUhcOa;)hVhgXx;NGQn=gbBmGO
zkJt*=&w=w2uTKg&Q`YMSn22X5215!&XR`~*WoL``#X0O)aZqREK14t8fJ@0Q2I*r6
z*_-04*MGCQrnq~qPd<Ac2Agn1BAW`nX`$n+7!&bRVkL%p3Mr<Paw@5s)KbqO$DDG`
zB@5(w2_=?Paw(;jR(cIJ)>LyXwboX9^DTgZspVE$ZLRh0P3J+Kdv(t592tIu5l0$%
zlu<_;eG)!1&NTBZv(7gA@+&N0V&zp<U2XO4%zp+ccHC*_U3T4V_d~3maN<cPpK|JH
zr@wpc<<)OL|G;bR<u!jjrSr<W*EniQdAo%ZoFw@SkNN2Ec##JPXfL1H>SFZroP1`R
zCn=I=kV(EV%gJN7FmC75aqqtS;km!^n@RPr{O14UIV0EoUwF>oy6=AbiPx6u+`Jxp
zvVTxEwSny8^If~~wX3N0U%l=zK&nzxXDn%LZy6)bY<c@odl-pA=0-6YQ>_WS;=WR6
zaQ(!^gJPK>9Y(hLC}&-e<>_^;5>lEeg`WIQ4LFR)u4H_VrF9PvNG@%rBB<!Uz72@-
z{;{U^c7ovy4sb>;7=?^IEA~$PZP1Ich<`^yhewt(&&hr1>~eC@>y~d{Cz$69s*uik
z&bXg13}4HSn>y~B+axIURyF^54j%aZjs7qataK+(-ezF_=@fqTVDohf|MsTlcXlZ~
zll$q^l5kX&uWpQz%AqVDhfj;j7t;*gxU_n5^JM*+-H$o@=((j-SFDF5ou1rm{C{8k
ztWT&?XXlsTHNTE(Zg=cHgl!539@LIcd$o9Sb2F2)%HFoBo1z6ob|ChrAGo&JFtXjH
zW2trs_hD;KM^QEaA5wAc9VjDbmp1X-sigRBE9`7Qmh1q9-oj3~^s*Ew>2TTj7&P~l
z%x83D)JeS`0ooZg?2*zogB!XNDu0%kFoR;x%6+U<Ibpjab2zTsZ}+!6siu2pIMDOz
zc1h;AhR<R=BObv8brQ^Q#lydSypErEXsnHAZvbEd%%pee?EBjNj;53701B`p%am%*
zb`F3FAW;WZ-*O{=o#vNU^L`)>MlC?=r;JmB(j10V7V${rQBHOpb&u)1J%0nkw+j}Q
zDAa_^7<X{z0TAW{iV?o&5Pt{@jjMG3SZMpUr~PW6<3XfDT?5cw_GOCOVqZe~bRvE3
zVEdpdEkgR`Cq`4t9&j>c!g!`Wr!yyhn|*1k%zQ`KT-e~{9%o%clMT$sHe!H+{IbH$
zH*;i$UStM-V}|Bs28@EmxqoPFV3286;PEgwcV|RimCsRNKFs#p>^+fJ=6N~aPLiGJ
zm-2G`dAUBw^M<%ny}9rK`#eXp*%vUF&qZqHLplUeZ08m=LnCACk9}|kiYuDG&VfIq
zfcfhjxGBImUrBI7CcZ+3G%z<0K4-yO4m=s4`2UOWH$RVmrd{^j*MH?c*~9<58#YDV
z8t$n;W46$mYDZ~4QP=9u;A3qm4!2+>=^!RC=*V8hP*D-bn9UQat;1as(OCRAzTz;R
zAeA@F`Z^Zdj?1VE*I_V3re7JX+--z}pMsFQ1^$>L_`a7V{oonN#5Q-TCHGy*w1nSW
z<c1sFM}jURGocS7M1K$)0Rzv0L<#0oV$=}1U3|}DWwVxzWOZnJv<*%|fzY~hdCL{;
zN(gy%y9Zd~hPAZ>b*NcnYHm!K0D04LBsB1h3&aIRMA$;JLRd2r9}0=tOKoFDauhpL
zbJox-^PZKNp{1IOh~wsC-7|vt1RFWIAhSu-1mZVH@k5#|Dt{70E-&v2;?LU>J3&g;
zwuFIJ-rKzD6Zp{YJNxzui=rNELT8CrHfZq>Kn0~A7zD#hnaox}-8sV8j!mL<xoqev
z`Q-bE-V?|hCGS-!Go=!}I7NjHT4u-Oy9*V6I?_k++DxLN?fJrHT-SV#r`GIYtGrn$
zB55atj?9M5HGiNcWbEajcY7+;l#gK<3qT!8IJadgX@okIG=0|q5WKEz4VNv#;A{l$
zQ#k^c01X7wHHERj2>ArRj8I*M#1Lnx8D}!99Q;H`c*-vpE}WajcqMZIZ;;oD1C+Hn
z3rvSpM=X&rT_vpI>_EkiBiKCwqOJZ;(G;C~0C<T&Gk>}lxFKrI%_Xp12e`2p=mJUL
zk|15|mTFVtz*8jhElRTroVeh^9>Z5AQ$^B>awn+M*L%VhU$E$Md6I4<?1Cv_R(=oH
z<vR#P8mT+5zr?+Y*|Y6UsE}Q;V)LNZLPs<<jc@`~DmSO>5Le83g%D-Invz2~k~vm=
zr#ekuIe)BL3DPiKkvampK)s#u1!9D|=Iz=b=BRUIF;fIiRTz;*x28zBWP=L32>>~u
zGVZk&pevds*i4EY_)@Oo^j2U^9uboWnKiRl6b(ftq6U{W?$FUFL=&`$2?C`-&)Yc%
zQXGjC17wkyE@ej#O0@;-$_)Vz;GUsQ1b|-AOMjcV0h4y11~uG%9i8@kxPc3)AS?yy
z%=b(jh|Hs?st#lKX*%cyuB$MNkw8$0t!gtKLYMVz$K*nn3nj>gtkA;92y5^p#N*fK
z3*wl}h+IIl0-W3KjpM~&*PyD5q4Z}Ew@6_+bPSas&l`)$DW+D-0L8MwfPKIz5KWb`
z#D4=PU2aXFWoj$hbHYZk14K1lx-jHgB59F`wTl1~)8#+k2>b^NXEDfeSD@myB3Es0
z0f|l(M6Zs?qqc-?BIMDoc{Y-&FAPCC0)eg)GXehtN(Pv4K5zZalhT+VdG<475$Yez
zJe2FVn&JY#sL}-LaimWm5Mh91H*k%O$bUZq6}+L+BnNNmJim!&RnC8S3ATqcKwmmC
z1B54yVHl^igDMT7&%O<H(@~qll=cR^;+lg*1xeK0vo!*IWC9g&ZOo9kSpd^KnNZfA
zVy}4BqmC$+Bx=RDjS8^EQOVn;H|YI=z6+yU2oj=ai>`Db$MV^Ze%wry-GRYOrGMN*
zg{8kFb{C>H%cGd_RZaGW)MlIO<~pq5q^&P1WJ1~wUjfo)C~)zRf%qM0INXCO%&}M*
zCblj-6!3=-oB(7rB#^jmR~x4?hOO`{eWFF+K@kT!kjCX&XNNrIXv3>)K*$0jj-0C7
z&(?5z%uQV`l?WhD{Y%90-$Lm-l7HTOx#0Z?x{U%{VfF^y{QViaDV^g7$$zxzEdXR6
zkL8h<<(g=r`4p!^yw%ExD6;E@AmHU6kb$vLpLHX3eNsu3AS_0-foZtY*_I7PfDsZ1
z#2l`s1|71AllFmtj1nA7LF_bB2Ow#fP9e-CN!6Me3wnH}WUt=TqC$Byaeu5@AW@Z+
z0%>3}z0R4S)?_2>6BHu+AuF)0m?1o{3?%jm1L3#j$dc_tdGocvvaOE+kr}PPuKW|`
z#6LJWE{JMj<HG0zqR4eH6zz(Sp;movV31dwy&jb)QkV#CJSJ#etAnv8s=Y&|fT~AC
zQ|gGC&$L=}<DCMROM%m+z<(dk{e0@{L=|jKMM2`GUum*d*LO`&V60RC-%vA@qqLk#
zX*OHc`3TGR#v)*3UT~zbDXW6J`ZDr}5K(|!It#J^OerdRWspU<XGkYXg}^BAOn25!
z2f}r_oR6L)8Vkh@xPmBBrM<_g!<9TAwlgQiAHHKWbg&{;3Oq4En14b{N6^4$3|w3l
ziPZ0aY`h59H9cwz1wFQr)YquP8t<0|&qywMkeG0FAS$NOU=5R)t}rNu(IB1R2=%H;
zt7zN>svgRAD>ag~kXy1YbQsOLsDRfe?ec_LT@7(OsRlQx`(}IqW*Cna%`zOeOagKf
z>DRdgEa#{g9SAj=xqmVxND7)q@wCX#DmpX>cARs-7jW{$Z;qP255d7a9zujthQa^=
zQ949jSBh2u!YjB7gxhCjVgSyfl>Du}mUHG;obaDgLi0x;`$P$6d+IEd{fsBB5tSE@
z7SFrwFqt1L;+f-Is|bRXjwD}c?aE3D2=`CkBFWvP8Wq>6Ab%<#2Gt-$(geY6#z>@4
zWhqr)&fHb}ljJ&TV^#d2Cc}b!?QWs|8x?d!_lgSSKn*QVHpAG~lFoo_Qd|0MZ{VmR
zcT#_ROvx&3YNJ+PmOr0@?wwgxm2e4oqt6{(h7IBoFCccs)ZzN>Mr=ZyzF+v|I=~;X
zw-QWbFznLfSAR<PjnTm#X2LX~FgVp(*aG*4jU+1QDo8eRF2FGej#aZIZU|u*8N`^B
zA8<J`6?UMecg=1AeM5vznboS{!H$qa`ro#WBhSvc9ArMd;oN(YBh`y2Ui`3!+w46}
zHRHw^FlKtb?2XjKs3={c5FUkZ07;PsGIif>YKxK3Pk&wqPP@$v*isj6L(HmahXkjh
zA&DtjOuyxk!7Viv@DiN7#~F!(nTA)MqSv7iw;8+oBBvP^w>FSG#4zl%5RivE0EK-O
zhkk2Xd9Axupp){!_{21rCU7?5c=)6ui#bQbd_vHo2{ApiT5=FDJxbed9GKN)TT-~O
z4lP2(vVX)#AcQ_P_(;bA0aP_Gih(pIK{_-|eG3>jf?Rz}*chPi2k1-+HOItH$yB+b
zjHFf|AGSh<WHMCzd_yI2CSVCO0&AUau|brho-jp;dY$bi20%Gg-yU-SR>XafGP_eC
z3pNt(ZT=x#l25wVyp;$hK#@>IxIJXlI}}bmWPi1Pwwjhm7^1xx0J}Qsv_;N`;5cEc
zt2u=~s98}zJo;jR69-`s#<S45nB=D30!D+GYM^?2zKhz5QEf#Cd^{lcAatynLr}W;
zaD#li!D(sJMEWR}&3{G4H()gX6&c@v(fkcEGG$?$s<bf9e#JOk?xfcsd6TOtW6%aq
z_<t9W(o>bZ%QxW0L8z+EKpfGfM4dh2YAD=5bruaxCPMQ_OF%<#z&lOk@Yv;Fi;@UL
zAX8mH-Rr4w9+i7B?j7OG!$}2lll;fCmdGGN_;5a?G=@m>{f601C6;k=f);r<=)cn^
zG?aAx2$m-^UF(}|h_Qh33my!}q$PC?+<!oAtKa9L7HTw**_4-DJ-87Eb%3f0QVuMK
zw6O~olmnqcs>lw*s}%>)Qd-`qnIYy<Z)ET=B8@bBCSLbl=u=y^?aRIKDN6Ms1$HFd
zhY{z9I|Ale?KGk;D5Bfc(({We&L3P6xwnLAiSw+wD;JpIWViOCgNGDeQ+^=BQGbH4
z%6$n0QXljN{2_HvwVZNFjJLHx(NS(riq+XoBbpE06tRe<S`I^ikkoBw0&=yu)D%#|
zq=W%l!$MYiTF}!&vMXAJx~5TrB%}9=2h>TY6qNi>9FmAwrkFMKvif8Z;#ZOAw=rC$
zTnKF9hPuY^NlT%^!Yfr&6<7r<E`R*Bm@Ww-<k09jE-jH*3GzL(hB|i}*|rdY5l3l`
zosXkX_=Zye8^Jh=*{BHs$6v=O@c{vkn7+_MmPwt)44#d`h!8Z=su7q)E>dV_SZ=^y
z83m!JI+85b+7|syiG^3RG#D_@q;{E*E(e2$FP)7`Fo@2P>BrT3i0`cy3V(==BO%-w
zA(f%Rc)nA#=D5A7QFX4tyN^{>A{#UUC-F?i5iuBZ8snNv=a4erkns%|&3{G4H()gX
z6&c@v(fke>7Yxus&eawM9HI6e2*A`q&8wr$3{Pu?05!WShN+T4eV7%J3LI2`Qilx$
zjhwNyWkD+p#LbrYb<>pz7=OCjApa^ckO&kPVg^Qn-u11MZ8%xY>fkZ83ieZqN`uS7
zv$&3Nkm|&yB7_HHT~qq7FNWBD$q?}z^*YsUR|5PJsR9+ov6qoV)b=o+k@pAi$~Z$^
zQ{WE0{sBC>^e6CXy4Izfq>dKOo@U6&mtWe3%zr2$?B?0b0Gp7yLx0(RIo+JMv!8P{
z9?n&ozSdTMvY<*HQ)Z&qdbB#cFxhEjcL0P;A_POw`YD*gOabCWJU|L4W=$Jmusz)C
z+?6^IR`CIYdPST;p+S!v$WMW3Ey#PD3W!K{+oGyFvDa_UsD(oLyi?@wK{D(K53&Bt
zsf`05P3i90XFw7{_kTCit#{n&n#2OMNpfS&E;1RZ-0pU)d#D-Eh*nJpqsH7wy9_FU
z_NNeS<d;*!JD{Y?)}k-9@>$t^Ujc0CQ~Hr>PX?;F^PYp+^mj|bO~RXkime|VsGmti
z^SiwN)Po96WsdWpl%5hwg$$DQ4uRpbGh|)}cjqH?p*rMKrhoQeXHu^O{MXTJz|5Mf
zHjkvP2V33zr<5G(FrprvW2`pY#I7|qCOZ&6>#44gRjoTyL@4BWQOgvyz(UiSqn6Ry
zq<~du4kNF|Gx<D`H4!&m%IV?D_>yx{r)+ukc_?cIpbT966z|ts5b^`|%$sUpycvFp
zx#GI(n0Bh+p?}r}qek_^G-}Hys7E*eeaH?Gh>O$KCQYy#t?#0=$X(1h7ss^pjqU_+
zmX_#}Iu59S0rK6IOClX3&bw}T!1op@d=%s44A~I|wj6g6uT*Z+w3ka;Jk{^<eEz%k
z+0n{UZNn4+CUr^c1mTy86>H*$$n!ed=~MUY)jKl}!hd{hpTYg&r}o+JT4JYHfSE!^
zT_c$tc<S@Iim1bUdLxr>jf26Zyhq-5Dbrs=K{_yp2;jBUxeIotYVVk0TWNCDtvhe(
z_O2vcF85NmH}h*o_>h1{w%2;XHHWcp^7d+F|F3UqKHl~FO|`H&2%t8!P(!vQ!2{%G
zKP9ISVSnk0dg@w?l&rfR>_hHeGlyv$4C%(*K2!?Xlrw?2N4U$A<OyH_>#bIjfJ~X@
zKr-Bu-(?}FbvL!_?{Wecl%AjE1p8$<p{sWWXi{A~eAwubOFK{qilObmnS!o$v;l`i
z^m*tK8e#_<8)|%0dPTJFlCH*!fR8ZoU>byme1GCFF{+g|%2?5wY!BcJz_8KMH({?1
zZfZXt@kQcNb(q=3hSW75I{P<V)z^FP><?GpmNkU0slC;V?;OeeU#Lgnv-zWXbSjiU
zAM~fG4#6@8A8v^i+xu`bQfWr4PDC+g_-5u7a1TBLswh4|Eujtr?tUFFFq-Pp!ZK^4
z=6}JIfg;EVHPBF45aD%=?HOh19(hR#Ti6^51wSZuXz4a)IH~#@+698}!vkv0^wgK4
zYZ^6I&>QFuOqxA)6KXV(^W?v}!m={5L}3G30$WKt&J(fIawyvJk5pio2JfL4ib{Ga
zh^HCI2#Oh;MNK+?w>qd=-$jUV%f4hS%zu$Wqejm>eMe{wqF{pf3q=7Vzx`~G48=@z
z_8OvOkaj_crgs=fob|neSYfnUITi5dcG_7{Q4#sTLLm%q%e7xu8nn=W{`kpq?_Kh_
z%e{!Af?C^44C~MQjEM74&<`6j%$J=RN%={xm#Qo)*xrpW#fSo7<$_jsUAbGA;eRA*
z1@S>&=>CT;;6Uw7J58O%05&JYR+p=BJc+iV>R7prO%HXU9CvMFhHv`{vr5M_Z8|$a
z9R@yxs|UR7hxP|ike1r{Uf<`a>Nt_ML7Qo*l6`0!t-j=OOXAUYYM=_U*Q&(`9KGXR
zl+py#R(aJ@Nqb;cGW2~>D!vw_CV$HC6c`&P?z`6c!*~I|;O$8qZlYqK{vnW4T<e-2
zw7Fy{P1vQ@G}AH!w7%JaPz9&8PpoNyJp<LQ5Mo+S1M{@ciD*G-K^PI4<XOd}{ldb=
zFx#~J6v&#j*U2UP#;n!t=Hxl$avT)W@An>B+>czOdKX=duCdx)jf!z|RDW${^;Qcr
zBS)2S48pH6teVuDq(dXU?STW>B)h?x8_A3C|F8*;$+Q7K86AfZIElc_;58awU)4}s
z`EIDtMy6vc5&&4(=a&=$5;PO`C7~(zlY|Cm=9RR&*NYgcBH03}&;GeCwN~MXbAsG>
zEohTRZ(lYn|7_c^`I`;P+JE&|Ha1HiwgJa+`w~Md&p@2Hd#GO9rO{!@dEr3|3;czA
z-2HY3T>_WO>Km(|K7HfySd((B#<%%$#`C$V2>0`+A7Ba1(Nl^LF*5Jj$GTEU&vuab
z)F5Z%yqzDxN0P3iU5z`!_?k8hW8dWjn-Hp2hQ85J4w#Ad)~W`?0e@S^iWbp&*}1#t
zLGeW_@8D~_JEo}qV3>9!IBljQ(_#PzI)e+Ddax4QwmQmhbk@Wi@`gc@G%Hh#3OAtY
zaD&}44DRl(u0<NC76cK@CPY`6^~^gT?vk}aQ?XH72(rC|V?$f+cDh^3e3zEA^TfN5
zU(^iAuPyjf`^`BcBY&s#B^m9}`q^IVU%s~dv%R_Ft{guxbDo{K)yKcwZo1v=;MIMb
z0xk;JE(VR6kO1Fy*WtboyLRDEKlYO{<$AOy^I0L*DulL{{@75e)gIy}-`QNgQ@>4J
zTQ#&V_q97&B;EXCU+&RnQ!LN(zi*)irPJ3fq~_mjq5jzpYJUSy)_U~O9+evR24TRV
zpp9LZ?+wzK`clig8`RetQ=6_h3Pun)%R3`Qw5S$n8?Ca#8SMLZI%tZA{~?vMsH?s1
z-FFxY*tYJs<^tKdr0uv7B@`UVuika>NqS0ZrfLt8r-<K_M%3S2e`{I+bV`2oF*6}M
zlX<pF@7K<Z<9|dUj<&uP(F3og(6{IOc#8Wx8r5^NwY%xVoxk1q;@+o$T{Oy1Z$JZ6
zq0*Ns{{E@Id#L#*PrVPd>!;hL4S-AyLdpN(8w1?*w_`Sc9`s+0x#-I|TCj&1|2J!y
zf9Ip;q2we3&_+mGArVPm`)cUAqwfRG6F?%;1WPpmjej;CW;o^27ORp_SRk^X%5{l8
zQff`etSKTZT1G%4!dsn-$Z3kNc4!=N@+k#&vfA5HVc~K)jb_wAkyz<|lb7s=Lubi+
zP=9HgNfGme0QRPh{pfX`=<RG1XoGtNn2EktQec<~Y0TwXJzpm3i!(5ki-{2LzlHCw
zujb!g_z%Y$;pJxj7tO@jQes~)laq)FBTq3BfItWXdtTuafH0>#=Z3Sev+)08q%aHt
zvdDEmC0i?o;0TY5rNR2;Zl#W$>x4tU_638{c{MH4li9!o1j#|vZyh1!1@#*jWy&rI
z)U)~ukOCxRH)CTkVm3G}He_QnEi^Y`H!V3~VmB=|FgP<YG-hToVK6z9t_>d}W;tRs
zVKHMiEi*ASHZ3$}Wic%|GB#l?V>UN7GC4D1GBz@k@C_&=GB{x|G%+}0Ei-00W-T;j
zW-={dW;HP_F*rFhF)}wXV>vT0lROSZ3o<u3G%_<eHZn0evy2Y#0VFs$G%z(`VK^-`
zH8nRaG-G06EjTzgIW1#iHDokoWoBbCIbpM)5T*$P^pi(Gvq~DV0e=oB0-}xd?EnA<
zhe<?1RA}DqnQd%a)fvZs*NNl2II*3?PFm-sX_9Vfw?u^ziI!3*>eN<UD{YNhHUwy5
zmBv;HsZ9kPU@Ama6$BE9lpsDJQE6f$G#@Z#ZC4s~$~swbS!y{7ATKF#!sOX;Yp;zH
z``&$+<NEsA&UF*sM1LOXO1{s_xzGQc=jEJZSf+25gxfI^|MH{(aqc(>mov#V+h2M!
zqn+c>el_D~v(H3@c{}gumJs8BCaaD~UpzD&nHfss-3daknr~#X&k8ml=iP5S^07+Q
zpQ+^KW4|~6CVlbdwT+hhzHK>>&kEfCZA@Yf-*H+7unge)4u7B!K$4_afG5&q)4-R&
z-+<GV<t4dW`n^v<sR@8!_=F9x<<gf1UWS`rBD6mWE7!_oe>(lswOhAtmFr8=dcc)7
z%&WOpzy!1bzX3k<elhhZ`o<-nLFxLGf>&d)RAx|Z%D{7JfL8_w2cKBzLq?;qQRw_N
zRIFCWy5Bs<e}8Vo^K$&*w=Q$)+!daF=e$BT7mGar>`7s*x7+P~>3W9`AAURQ3WUR9
zBuSDpi%JkX_JO8Im6NepEb9ZXs@6z<e?Ouq%IvDDssLJ2XWwG6D8}yV>&u?RCr+H8
ztE-FA(NP({pv=h4#_bC_AB{%QYPDIPQ>RX`qDqg)<A1^L_se6~WCCbTVXaPpN|N92
z$Lsaxu0nl%eH=J&fN(f0k6UX8aY?xCxNmPTu)fJebww#_YRmBXd@^}?c{!b(ovo<=
z5}=YaF);x!vrriwID7UiZns;;EYs^5iLFuNYbbH%5KQ{wqoSi5(b3H(z55yJc??6D
zj$dqQV}ERHOkU9hflZq>B|l)bTAM2>Dr7oduNPo=Apkbu3zy5K5L_=`MS6<d)@rP_
zaOKJsWyxu3ss(faJ9g}7DJUqA$%luBlT|1eMS%AQ2L}~`>J@d2|2wp308O<f>~_1N
zU|6kI0ayiST3TA_Wrr$Jq`$u(U`S0TK9^W7MSrF6PAwilow*#R(@7u@knwA4Yv(JG
zwZ6Vyo1VZPj|ae|=1A$fbm<bJD5BBa!mHEi_-r!Bmi4PL8tHU8BuO#?@~NGRBK`H5
z<g3M4Mx9BA&*!7My86}%|NnP05UHuDkqwbZ`Z>T|s4@|WMx&IJl*k<X+!xGy#^=!7
zsDJ5t?Zs5ywg1lkc5H0S($Ue8<W*Ky&I1UW&1TsciKKS}vuXg`0OkZi(5A<s|Jseb
z0mNdl(&@;|?|@XVnmiuQ!@GCyPBIJz16HfG#pm-~OI;aYKIvWg>_$U6oleoHCj8g)
z?!@tU#w~}-;c&<sW<dcvckcW_dJm8!34goYo&=!kT4nR*&4q#>C;;fR1vxu$adENQ
zg>hZHc#&W*I3GFyw6?Z3?Ay2RTIx7~Kme!H2{5D@Ky!0*MLN&#_p`F9JnzjX5KTO(
zbQzE)Cntqe0QL3t+GsSoCPM<pfnl{Fq~EY%gJP<$UcHLhP^!8UCmsz@0@P*bH-Ddw
zkB=)#X+uMUK0^YJ05{bFsA_L-S1_GUCu{1emhx!e8W|apG0bK&R;yLUo3H<>kCaD_
z9C={fx^?oS+VnIwn~l{gO-l;k{Q2{WW|`gt&YU?T1CTQZdV6~-ckSBsY-y=HR0akH
z0BBia01k(PP$-1aXq-PpQCN7(#eZNh$b}0R)B!kj=nw{j;iL3b^85W9Ja~}Dcl<bK
z66<t2W@l#&TCFymMddL;5Z+BoWTvL3k^qW|iey!3a&mIM5PY&A0E5Ax2(d^cg3V^b
z>-F-`?|-@AlxnqF0nleGNB_FCU;L<hODb>A(f6*8kB?WhwY6m&FOlS*0)JsuA(URe
zjvYJ3$&)AP{`nnr{&3}@;^p1J&$j$1;@`5a@m53LepfT2qoZuwwk@MgBFSB<?uBBp
z7@<%Ix7$r`Z!c|aZS?f?@Zi0zJoVs4G=i`w0JCukQIzlVTCA1H{K`a$BzGz9g*I;7
zsOqE7KXf;b@BRr!y|TlmZ-2Pd&_8<~k-gWOD>!}nEri^YqXdwH;(#CcxU{HH^M_yE
zv-hjKWm{3HSEDBTTT68unDoWZ1^#@%rbf4_>$RiPk(uX~(ti1JcNu_6ii=|OI}O0H
z_x0nzj9UG?{wMy&$ixSWaW0#^*`zo34}R`^;g5e008B?_j;kFrpED|SXX58VckJT{
sCx%qo>k~F52so$1GXa)qnZ7>yA6$c8OyFh}(f|Me07*qoM6N<$f?Gzn@c;k-

delta 3341
zcmV+o4f67nXy`hSBYz58dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+O1hzcH_7X
z{KqP02_#4m<Z}2t=kDMxe+rarCw|0E_q02fB2gfS0t!Wi=Kue<=pX!xJ~KtpoJvX#
z|6+-SD^9XI{+0dhUEJUMUpQ~!_ixwfdV_H(+(v3W$5&jJ+kXR>Iehzmo$`5y^J(b3
zaWNQdX2!|*>Ljl7aoxw$P?^U`Dp|j}+W0v3bKrL6{3-32CY)pJclvrEDxx$569wiO
zd~o>YaC#7qpNi`q-!=yRhPclWqZ&fEc!Gd@Ti)g9+}8ko3-aZR?xTM_y9++o^Ln_8
zWjbSolczVlJbw@V4)OPNI6dO;HxRD%u$=Q}t&!K7$LeZKh-f-9%F!h{_6!C#ggorW
z5<ZF_!MW~F!6&=wIv^jeyM|Bq#WPS@<f9+H`sL?7cHiM*<jIO7bLX(H<)B=+hXW^k
z{9+9yjF5q4=ShZH;Hxiw&s+9<-Dk`^JchD|F^@-Het+nvo4@(cTHQkAUB1Q&ezBz}
z+%V+q8>0Y-Ung#|1AO_M@VhVhgH#2AvcsIQ!0OszqKUudR@gWPj1wG>67r<uG=LCc
zZh<o>f#_ZGL45K~nbmv5F$16q&pAYHK){RefRh|UNKDF^ZEifHevf70#C93n1Rx}&
zpunbt3V*O-6y%S_j2x;GB#KB9l}u8krjTNil#(VRxvD{<iY8UfTD0bnW0st<=A28e
zg-ZYjN=ZdaE~V7UR54M7t%~s#R~om_Vw0Adw%kgq9qH3!m!7)z+)J;6M;M@qk%o>u
z%Ba)R1XIj7Wu~b!&ob*muC1`*l9iUOyvnLq)PGJ?A3nc8&7Y|8M#{$N6*XKX)r$#l
zbRvcs5aZ~9xEcaTXg17T_A#;{XPCLdC<<XXDTWOVZ-@cHI6ceqSL|-ceS{lH{s=dI
zha4Gn{{?ac=pJ!<g4(b?*EeEE6<SPPK=tAN%#}D-YijlBarEVyW~r-n8MXA5Pyswz
zSAXtcI;^SXlmz$4m#9D+V_coBt?6T4x#*g@S}bd|)mYcE-da~2X1NEf3~Uz6v@Sp!
zlm^EJM#Ma999a~xmM~yG6!9_;^5Uf-NoQJP%&ryTLvc@8!=jNfP3J-&S+@E5TB!s(
z!xYhu(~z?<$B=H<_K;%$Zp&O6fjy#Gseh-kgloK5{!_zrv+T`q_lMc8$TSbl(~vl5
z8+L9IMP8Yr!^!yGn`1WQ=blen_`VQ&wf>Jyp9`TU0s14e^fW-jPcAE~)V4ATwCB3!
znltqjbB!fOcG6laX>^giR6L<}YHBF=rFduzv(GG}Sfh`A&l{x|nGQc?`c!*G)qhXq
z+tf00sp_i=g_8IH1uCo03qEg;wvYvBwq}gIb->?T#<VlHJX`nN2G-ypIy&k^;g@wJ
zcn6*u>eKcR5ru=OXV8V1VVEWMv*-N_IP*NB9z0?Q1u{}?Lo(`nx>bj0T@{h<GdL@2
zE;+B}6V3=>EE;BcsQeY`%D`vGOn*n!H569N_rm5oiW>Y=_8NVm4PK0>bUOp_>?2mf
zNIo{dx(+P3b*u$TMhdjmg?W3_T0ETtAGyQJpN<<*4i`khFox(l5w(C7`WpR)=zj~o
zIbaD0IlRDz9sI&|FMS~^Q~VN+gCQ4M7?zyFY$CJvy}V1TbwEN-G?xR49)H2n?MRs3
z%8GekrZ2gH^wOR-8x|kt2y3=AzNKVX15U<ct-F-gi3GiZVoa<B<pJIu3kBnke8DsR
zK3n#Y?l0`4wy_|94&Qj9r%Y(n9o&kZg9ycY0O$dM4ks)n92T0rIRgiekmRI|?~4U}
zPOxIKim!E9|Gq}M%>pSFa(_QiNgQUEBX6ekRpWhvggyx&+3umVKr(hFYnF2n(H4RF
zK$on?dJT*3NSrv(4TuC`0s0CcmbCjAsAqeGr!LOD?xl3Sa4q}o-7b9a<SzYPGARDc
zuVJ7QhY3e;H-buV8MPnl5tJU#EgxbsA(U>6(7=B*F410bLND}mpnn00uoBd-<qn!G
z>h?ZK{8Y%Paw&RxSM^x0p>e_DK;jVxrR<;^JhC|$<Ha*$($%$3S(m;RK1Am(eK`BT
zyssgE7i(pDLchMeWZxSn-19FzCE&OGd#n0O(bH1`UhBfXb=TnTA{P{_ydK$?p3v{_
z*!SdKI!Yg|UdZ=>dw=gC*!=szzVw8CU$O6x+)EGS`;2>^*88>G=hQA#W&oB@<491`
zg9@QpI&?vtjNOfoki6_At0v=xo}h=n5KE3VfxW`S#t#x^vdR9?>Lu_sPx)Qo>1*Ww
zCh+v8?|mG2x<<auipaL*Ml0PlM(Qu0t94y$gLZSsAZ)051b=_wHiEwfyoDp+Ji-nS
zjIrQS7j;P1;X@N_yJ`U%_P7J0Jzy&tCWs3GSalci$_>*@>>nT!6*?Q(OSC<Q98Jlq
z)$Nv**#F@hQcqzFd=ATQ9&!|$y3GVS>yDXijv)z=FEWN>Eiv%GPRr`PYw%as8`zS&
z7mg0a2n8zGq<@@gfZa?ZOzmO{#s;dGk`;Y9=ZR|v4^)otItU*n^7kFYQi}eI4q^?2
zo^}xTOmF;rq&EXT)+O|VGW?Y;p_?%INSC~<T>7}g-zZ&rCUyTr>C$gX{s*ONs2MQF
zw$7nR*`}_Jb5j@YHpS-vB&!WM2G~}z3-Snx0J35r34aS#b=rmNKRkG6ci*JDnTO7t
z^$*O_j|+M*Thr=M_9hh)9PK{r7ct2z1>G+-WN>Go7OIJI@d&?tb*s2uTTR9sBjy!i
zoLWnqg8#jpiPa*p`-CLka|C@x67M;JJ|l_uDwCed%tL3_;ZOx3_3q$Ix6Qk~+S0I<
zkRNWpM}Nms&^;2p?d%^4dHTB$-y%$Z7vful>F+{(i!i-X^1l`G^h(M9R>;$v_a`3<
zd3vSfe=FqaS8q~&5b{)@<e?T|;(2)cCA^K74@ZL%pdzU>Kd_aTW^X@1wHjQ>K6{U1
zh>k;R7UC4_P4Nw*&Lb2FS-FG#gZ-&PfDK6HOn-BNyeat?OcE5DO~G!*+uG^T9~x?s
zT0#?KDLhL}E)9F*J_qLv*WA=8L1r@HtXND;AjXoU`6{6nt`I^g7gVWn_JUwE;)ODV
zgxp}C8}}~a5Ak;lKpE{Jc;*<=O>L!NGMok`Dh<e`>SvYpr)KGkU68%lpKJffD7|p@
zn}5+C_Kr}S8p2uqmT*Yvh`Mr`)pB2qDfS-+kQ8&3$r&`6P!kZf4c4tUcT*}*#iJfC
z5FoqJ<dI@BW5cZWhXXJP@(91hlAuf*riV7KX4~H8C!-eg64bgEwv>!yQBhlZANMWc
z_x-J+k2hKv0I?6}*Isd(EeN(O_zn6C@_!eG7V-e~myl!?R31=bIlC0B`q7~vW8%;z
zjOH5KjOe)7PYJdLF2?|FgrJU~I>4VA&x~HGP}bNM#9W48?|~iLoZi7n1h`kEb7Qb8
zHh0)yH?Y2UT#B?BL74dzqmVbBzIAwcq`x(AXUIZ33jGVD!l86FV?h4^003rsRFWJW
zPdyHRPzZx}PT>)NHvSxkyyxKN;QeD|unmNM#jg7qwzRk!b|w!_r~E53h9@?ig@k{T
z6M@iH>UO9-#fXBNZ~<VyH4=OQ^a>YFVvKMvvuqrY0wgsxGG;S4VmK{gFfnE=G&3_c
zEjTn}FfBA>Vlpx_VPa-sVPcaYA0H!PVPr8kWoBV5WjA7DEi^YaFfBPaVKyx?IXGr!
zFl06~H8Yc9A1EYdVK8GbW@9rgWHVu7Ei`0gI4xp0VmB=@VPQ05H!?LiGc-4ot{+7U
zF*r0cG&VLjHa9l2{vYrGBsXF<Vlp%}GA%ebI5jOaH8V6VVl!qlEjcqbH8M6hGht>q
zHM0^TrU?X+n{^elyeqK*e+&R3K%%lP0003_Nkl<ZXx?LB7~+7D98LdrR`4_Y``y97
zz<3^;Jd<b7EUfyrm!uJ6J}&*(01L^E-(LEk;on~d1_ma4%5XS<aVC-05bXgb(i~r0
zM~pf_9u5~uk_9RHnMgC5sgX#9X%r^yG#Yte@PSbejCx?y1EU@ofAzqq2Sz<G>VZ)Y
zjCx?y18|^|JY&s}^}y|?Z|*<;^!q<4dRXWh-Jacyf;=3n2rB&lFJdU?fxYj){`xm4
zV}OByf#Lm^A7P`V(5MGSJuvElQ4b6nK-YTU-;PqEMyHuPy3+?|MfRWQLEH2porDB=
zIEMV_w9AOe#G@V<Z}q@%^T40K|9%f?4~R!h-9W>d_<#D|^A9MPfyAy~Qka)-^`V=0
zCv80U87lORSQAN}sVAyaj;HHLjDAwOo#ZqnW>J_*aOsy}U}V_&{_~IL45MHa&<_9r
XXVX>od0Ez~00000NkvXXu0mjfYYRhH

diff --git a/static/favicon.png b/static/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1206dc51c3d859fcbac4cc50e62991632147d24
GIT binary patch
literal 12920
zcmeHtXH-;Mwr-K5Bng7VB1<lEk#mlc5u~appvX|<pddjIMUV`VK?IbXvt$q@gG2$z
zNY43z=k#g&y?%Xfk8$t6t}%AiUTb~xn{$7A&b7m;aBWScJGfN1007{Qin6@!%`flm
zhK+giZHRjM900h_<fCWgrVH_;cXoBMLfFIU-MpRQ^l&eP6#(Eh`6b2JgIe^B!gc8j
z^Jg&3_@LdllQKNb+d;nCObVdfg0of27sR;7&iGbGm;lhm)9cDF*E^3j`I3l`DuTHY
z*Rpp;1!rS7u8PyXAK|VXpY}^7oSZ-J|1yQqrF1o(S}SoZEcv>*X~(wh=yiI^-XoVK
z?*Ziep>%OPjnneE=3Z^RRQ0^Kw%Kutp4yY|qgz|!yVG8Edl&haj-67+tJ}+$SPcAX
z{6kTmj@}zQPsFYdTE0J}N;iG7L3_5rxSj18O5sUsxs7wm+c3W2-k6?27<1ucE!lrH
zRj(DZJ-J_dEs(I5#5n8c{i(B<^;&(m%gxJYQPO;MEb@Ek{>6lEeB-!89XSbqa@xzf
zK0A*C8pogNwNj7OE-bI)XIJ(gp0XR(V=|<V*MOzk3^u}gg@nE#Qf53-$01l|_>Q%G
zg~+zkedFB;ec^@$(gRra=ccnYyiZh)l-sA@8V@_tJT?$c-()`zyB5M)1b#MM^GTUq
zq|lXDFON+YHhdwwbnWG=%j{kg_9P~%Pp|3V|5TjLdNE#q!Jr>*AwK-*o<;rHWf<*d
z@$??+*R*qBu_umk%*sCCU04-kY9{)#Mv@7qn8q^XgvoL#QHElFDq+!Gl>6B!ZbKN`
zG5ix`c~z&HRV(HcX0B)V?14mstm)wzhp#L`h<ehgaYaY6UNdwiLL)ocsZ96S0j}&z
zOi^|dD^V~_(UmuLjvWcwP!;9`U0cMcJ|SjjvTafB*km&Qt5B+b+v)EoIrUq<tEG8q
zzH61$GG{M&7nB)agVt?^HKYQ=ldRI<V-xX$csWLpjyMBz_~@umZPg`#*jB|pcm388
zc_nK>^W}xY$j`fip1|DmJ=2ksk;Mz2V6wOJ9WTRbEyBGF(3NfS63se7=SW36eilS#
zg+*#Ac66#2h7q@xe2AE8>ew<|ykc`?iI;kja-P>s8M4((EGoD9<n<JVPRc^93(&(b
zbNOITk8a!$(HY00YxljeXjZ1+5j2~}h1+vb>6!7cYm>ltMtLh=q450VwyzO8OP~e^
zF?A|j?~|If344icZ|V54&u=HXM1Y*6GcU+Q@XwP6Ysg(4xG5+c9^or!4>mo;58LxF
zmh+vls0kvhVT7}UyqMvyz`QnCR7hWB%$JMte%<&mrA};n@vx3`Y6TPd9R+VK?K~3c
z587qE_IbZln@{jY*Qw*wQ%rtt1?y5yD>0Wp;DRdfbc(@myyR3o_~~)xa-Me&m(ICM
z0yU1F&Iip%-Cjv8in@rq%Xls)R`zeXCQD<UyjniH_pw?J#>pS65lx`vU~tv%7%Qef
zKe5a1{c2X5fK?5uxX4=~v25U)<C8_Axff-omc3v$Q(4@24n%t9Kgf4LH+kvt<{{(0
zhwd`$j^jbzsFXvy-}sB~%~U0i#nXKI+XVN0YEF0DJXwv3J;gF)CjE<N*2Y}(e+ni!
zOWRt9L=&BDdC*Nge)n<m`Syk?KT+1i-uv3TRn}L=&JQwGTExQM3?&P;+%X?sdQ?L$
z@v*S8vTOpd?_6Ysj=$XrFh{rE$im&|l~z{eChnp3_((od)&eVh(h+N#R*+O9fgI7g
zln0Q##0cI%CtT}OmU;2w=yCyX#5<Rr&THZAqTcgi3?r&4_jhbD99mLrEpXo5aCG)s
zQr2-Tk+T>6uSYf=VUHqe?+2_cM8^OqJD94fe%P`Oj4Rr=F-cD0=fhbXob)EYN#y`y
zZ0nwOd?E?bDf?KyT$_RUrv9XI^;6#pik65Jdd#=F_F(>rb=iPEO$ybgK68je6~>>z
zH0a!0kHQHBR|Up=7Y|ln&iou7xcgREPBk^u6{A;<Ne5~UT?(YadJ1aIm<TiOcD5{x
zc0;|u7-R8Jy9X^1ZG&s8hxQewz;mB)<$7+@WYIe?MJ2r(T#tO>u+!Z7wlPK=M-VlW
zJBbvxnYNuhQ*`-_aaQ4lzoT$qQjqMfd_W(yuqv00N^w<Esi9PwwdeN?4%6i-Rw|BQ
zYw&#6KG?zIo@UqMJwO!L<uR>t68HVdgck=DwHuXMm>s3EQ-;rF879dGlOn`|?O~@X
zRqC!6%V_=1iC(L0hqFNMFd{dkGUkV1M|buY=`d~ouOpPTCr1y|NfL2+xl@u~u=2-F
zYtR_?d1016{&r~bqRe}CpXHHpe9^4<s<6>HhuJ3+Ih@TmW0Mh@VnbJky-bIVOX-;*
zd$U5hP@iP%k7GRq-#i79W6_EPNn;J#*H{MH4o5g^BSF%&1I|Zf5)Q%W<U0daxH6dG
zS%!GgN38uD(L^m958k~^o_lGTiiZCqvd|{25w5sVgDKh_o05Vy7e#sZ(|Y+ssL?`a
z1+LtOZ?>l*;q~t2MKY%u-~oR!h1K^=)osdFo%b71ge!6r!(?_sCK`!I`ZJ=Q-LE&x
zs;D~Q?5vVO6+lo1DeAamehSvZCpM1w#)#WNOdSiHsAYmua`t*`D>_@8Z5L7Q>=i|8
zs4MMxq<(r9p&T4hEoniltg9HL#3Y%(Tu5Zd3Q^=<?CKlbaX>NnP!d3QrAJgXl3(ie
zm<dGl0Z7L4)+H_yDlcJ{J0FG8%`xtfjNwk<L*%5-sVx-jw0PynjLx!di%uE$O=2m;
z(U~?!<Ew|Bj9aGHfLq45mYx=vvMQ}9ay7@!m9>RQyrkAari+n+F%YXh(t%Z>XWbvQ
zL&Bfb0^MeRfraGrLZBFl|JokqA_0~Vl?u*>mnrmmCpjn<G0`SOGRbo~)QMtcaoXxE
z+hArHd?z;1lUhC&_3MEAAp9XS|04qo9p}oF+R2=06#QO?XQpw8t%GFazTNo9Y`s0P
ztU!)|P_L|L?vYZ~nm*#J-u7Je>B7M{{T+0?WoJDcXEm!ha@@T><_D1v-o5t?wlJ^;
zQ&QG^@q-0^9Ml_YFnPu{XiVnT3L4o&#M8bi>*kbx41a%Sig!I|GD7cokpn`mV~!dG
z%FfX>5YuidyX#d?#}^dOmuZh$IFC#*qm5qBVEVNWZ8C`y^eP{J07<jnH<RPFTw)Aq
zes{sx`20|roNM9R=tcWm`waF;*#eDv;7On*=;Vur3d>s>QM8_@*Vtd}^42&<Mo|3#
zf?o;=)eP!Uj3NUqLiG0r_CMWk2<uJM^MF!e+&O&65$~e#9NA`@m0MQudIa+1K0qQ5
zY5H^2w^M7GWA5>tcNT&u774EAHFcT}r0+tNX*t>wS$nF0OM#EFkoOp6jR0UK?N+8h
z4HgV7&K}GM0l2vzXY@c~(nO0ts>i7xE`*`IxBg79oI~9$PWf?Blo-Q$%>6D*Y!rQ0
zM-w(k;o7&BPm_x!IbDE^vx|vRamM%-Gsvd4gE&DS54&GF7p8(xHZ6U&BV<eK&07i}
zy`x+?x600|cv|m1#oP?19MEEnu+hd6C}f7jQSxr0rA3mUx~Hz_WPZ}6?*n*m3dpIG
zVQeWq+)I_-L=lZmV5T-2asFg(NwsH$>(`z#_E-?3sm;_%)LtCM$fsX?LTDrm>Q_3_
zyQk1lI#}xR(rX2!z3F|m@^?ypeF{~9=xU%yEU$Mi1Q1Hk{!EZ1kBP(_2vs#>A{q|<
zj8z#xRUu5$_Fci=!$g_-v=G=6#*HEz_+^cF(`JS@=(#i=iNO5Cd|@4~4|mWt8oMs5
zK7;tA^|Sm=^NpmbmyY*V!Fv5kQ@kyy-_9kf6KE9d!BIu;$w#nk9VR9;w84*~kPBh}
z0mNg|7L-Tsdd_6jtr+rNHmdJcsRPDZo)rr*Q2Avi7^_i{ev^a872!SwELGVP7Acp}
zW?;d!7DNLG7v&`qj3GH7o*kX>oy(;j^OL%k7)!~aoQGE_?bJeWCCA=asC@i2x((aZ
z{oOt^@A_Fl!sQ+3KBD}u;$iWFN%S_-_Gj3&(+<|nm1Sss#@&AR+Zi$qTzJ_RrP^~a
z6c$P@#g&Iw6`yYw>nIgmIy={i8adIIl?Ma}9b0s_ii|LK_<NxxI*~I7QPpVbM&E-2
zzdmw;+0NkOET1!UwciOg!@<$$Dmi)b!K-vJiV5(h@AEJ(`Kz4Go?+HWo1~n>bj$Es
zcbur*AlusFcixt2r>a#a&~E<|Cp42EW8dhMlYQ)ix2$7<*a6p&ee``oH*_HJy;3F0
z%T^j?F22juob5hN?574?XZ-1IfO!}YW58+~O@Bx+BC+3<*aY_#)}t^wr8iJy1|`0&
zw$xrQX8C5EjZqrzjBFGW*&ZrNx|s}}kR?b<3{WeZwM~nRc$I<wnbI#Vbxyy9OHdtI
zVWsVOSCZq{5Hy_3DBwC1fqR<t>V;lrGrfea3JXVeHA2ON*&<ix$}K@Os4oYGTV84j
zf6H{Otj56?03&r#bPsU@UzKjUX=l@V$PV0Vi8!V9im0I&BH%<{*go56Sx`j-0P&J0
zLha=u$a~6^P3b*N7~7h2sg%a%`RRjF1Oihxi#QSNVr0aNWt!x#$tp=cRx-qrL<5wT
z%!%+Uu7u1#$Kt%}GD1B$D*9R65InS46Yf0SUg3wW&}s>_L=G$uP*?WT<bUPK#oG<d
zD*0NXgs3*?NdFP1yY*Q=s76}LbdF}-oI+s~w+X_}fDILPQV=bvU!^>!r>OY}PfDCB
zjPPnivz<rkWTCI1GR>=yIPd7V;M8w%s_rnMkvzYb!D=3?=+kT_*!(y$PpFHUHKBy-
zbpb>FTyp<LE7QE7+(zhuxY+YN>iJ#HXtaZmEiIa-;QQD+>$#FWIDHO1vkPLcAPue?
zgE<?HJg2%sNE6$R_d(tv7y2h%ql4^*gWTT+diewcZ0GB-v(}4oxpW?PiUML^-ermM
zA0UfG*CO2%AAMCn;~9cJ^ZZ?;ptX03%EBDupi_)xHzpV@f~eT$`MWzR2@3CO&y<OD
z>?jaeSTc8PO#6fZl=HIppjl9iQ^TF6Btb{UlF*lcS)I>jm#v4i2boGIxJ)BHoE_rv
zttvE|s03!F5va5G&n5^Di#fe!M=0V7H!&p5N=!(>E)*z<1EkCWCWMU$I$t`LSiJy*
zix~$?>u6PwSx092URB>y?aK|5FE$&QU!PhjTnx1Jq$ln&C^D{&0>d8w!g}P#zi0wv
zRcH@W%{ihJ>|Er0@x+NAwFPHu#Xlg4B?P39<D8tW8&@w_M2N)GlI5^Iq_LsgmDe60
zG5G2i%?9@lMDosZ4^tc9dveY1u*ds$p)3vlc%NyTg~Hm<95skSqKeE|FwhqWVL(h|
zP!pX`r-~0B>7?2%O*EohZm(Zny0_hd8q}a%WiQMR_>Src@njV1J~w31#a_|dpO9v8
zl65h$tc#>>Lj^M$MGsW=sOT#@1wAvl50)$C>*l}f!!>~yYamf14Cv|;NyBE~KLaU5
z#91^`<KENyP#KH%<qc_fY*L9Yo9@R5;N{nK_t(~D2X*5LKT@efCl!6CIpeo-T?%tu
z!Y1ntV&p=C9%t(E-j(fY{6uZau{bdQNREZ-gYbw3CQ#c@Spr40FOCi3_F){TF+1>O
z8Wb5MkStBx1BZ~TN4f^C(_qd}b;_ma$D?LujB-4ydyRcefgeh0lr1ZDk;#1Wqq7t6
zA<7m*mTj_67$;Mw!qB_eFT(>XHDSF~XV;_d2;FBUP?4lKz`dyh2U--bnTJ1^me^S%
z_Hq@KlmszF{vL+)f>cI5|NEo7xYwETQ1ed9x{<v1rB)xu=v`>C$?_2HJJ1q}0Ml+F
zuFHpAHqki`DTY9k{s;8Msk9}`U6$S2rUS%O0@40@@vlu}_DY<;^|6vXU@8f<4Cz3n
zlKg^Brmau!F5CRd<Jn-6*DyOp*{J!~&nK<cLzhbGZz{_cFH2LplB4m!^<@F&1<>wb
z2B=)<;FbEmphP5f2ccgENRm%7Y#-uHtae|b8=d9tVY_A1g7@5|0cJI4jY1%(#wOcF
zPJ{rG%_-^Cj9RxArc=wm`yn8kogfF6Y;u&}*IU4WsSYf_(VSB|Y?XaBrj)E}5kcTS
zOph+*`xC`1qd-$y(YaYY-k|u!F^=F5LqHe2!r7Do?LwXW>Ry82?&T(i_wa*qzFM?e
ziYT!_XuQ`0V>@r6H}#A8(BUS+EHpc1vzj;|?kU&9)_Z8D>K@H(-uHLm<sjbq%n$5e
z%R1gvUTqV%1JuV*U8t3S+G10b_f->Q*$4%*31_*V)EQWlMqW2p5!EtnYD5W)89~xK
zu2IIz{VU#ra<o%7Fuj(I?ARkLeRy50FlA!9;Z&`|O9XJV{o|vMk@rFm2M>1F#A6>+
z{Ivd*F3z1?E?%ej+Fe9UDnbAHnTqtaUg;;n$xn2;d5kjtZlqr{$h>w<t1H!0qoptK
zRJ%2IyigyGC>M{?6QDkmgpT11G1ZLp8{2QRY}uxwkL{^eWdtx6I4AEZC=r$D<UF6_
zx+^FU?SZiZRLzd24R<9FXUqkr8gfE;(PG)~H;M=Q<JCrO(aRs0aPCkT=#kRGy0~+e
zK9--QXp$Ucp#h~6@;F?30y=#+LI|c4ty;`GW;6zA>Ei-0t+?;cw45e{le@{(xGyVD
z4k2<=jXPplQ~k;kEX?cuYeVP0py$6vfq^Ox#1v3@5E|7g?Z-O@1aD`>$WN~bPl6fb
zS(aXuh*cf5Zm^a<tBegJc-gMfDncW@rf%d{!@h9d=pf@uKVf&AFMSlAw_cK>sQ`@x
z@Da0xKW|+ny{MRU@2c)CjN*_O#D0hAAfyVopi~q&BKGJnBXP9lsgX+``baibI%OL1
zS>8iU3{_oj_HLYYQ8iS`YX0Li9qTy(epAC%BvY1EpB;RErqzl;-ao5nZOpCV^+8FL
z2>Y4{?ZllfhS2ybr*}eFkyME3$L9ABkL*Xji(Tj^Ke8Cd)rvZ_a?2T0Jys+)Dlh|g
z*RBIpi9jkBwx(XwDaWW~savUu=awzQlfz>ZEmQrNvoj_jYdoo+*)E-utmqfnPdm$d
z^0v=5w;xiSMC@bxI>js$R<<M)6CXe~eWy(Cdud~gKHJ<tqoeqdOO{g?wv(ubZxpHA
zPodk!O>Htf3vAi|UG_juN=PkYJ))wSZM}6cviL2_#3+VU!L$)^{5~THvst=y`V`pL
zF_q&iMlPhZY0S+X5DJ3e^w~hd8|Ov-mb8^Ow&*;M3Rp+N_|yiu_Z?Gr%$fbhuo(nu
zEei!(pA-|%S}mH>R;cnaY5wf;(f5;5pNCJMd(2DrX5YzNe}Yt)dX>d&yXp9aAgOq;
zl63I}!C>OOwxDlSUBd3Zdp)zK=n>KcHbuI_lh!NltVGY)wchtXiNw{*7B$*iP^vf|
zd7Nc7I0m7Tc&Qpsy7n<$(e7%RRBpIQu4XFS_b8tq>v-9zLwb^ffulQNtks@zp<jio
z*D&tMR{+BaM?Qwk(R(uabRxg|K`!=aE;9F8kmRSRHZ0Rr7E)<2@<}r0&x;Ux`7%Oc
z>u#x(3RSe2p-eAwC;Q={LyP6cf?k3OF>lq`M~lYsR&Tjs{R6<*fT@Z56d+kPZU9<(
z<9nsUDkFTEqvw(bf@Ld1n5!n$<FlR+tT61gcxTl_7<$5}RkVgp3RCS=qLS+zy!rv!
zIV5wRGiX8K1&HZ@vjS(*ZAdnl6<$R&64Uky!Rnr~V^i+va8iF{RCl@fYC>xgo60fl
z!KU`*aX!%{pUR=6V*ADMG$i^QJ4SQL&t~4~KCfz3!$W26^lbSn@#}3mr>6d;blT!C
zxu%VXk7gS*?+~93x+rCYqgDqv0D=|LY-(uS->wd@)ma(f)!<$nFtWR&AUgx0x5VnR
zF_r?ZTy(R-@C}G{XHXsJ{YEUyV#aZ%sCK47j=}iTTIS;qD2<2E5hq7o+LxYia`g3i
zkCsFirGTmpe3>Gf<FqeR_E*?U+ltpO&3q@HNX1o4@a}OlkHy@*)>KVwent5JcgDuO
z*GW`iK~?}LSovv)nE>dcZXF(f#Ak1Fz;9lDoJ+>VnMUn9Y!Eh@&&N}pr_V!yCn@{+
z`P>CwLC~c$V86{y`!$nGWoT)H)DNOU_0%wFj^S+CjB}SuvqIAq^mPa)&HeTM(##9$
z`(;LtPLG~_P(kfJYC&(n49ej6T1Pdx?p;|Xz$ygZ7?y4TLfB4GKHIzTYOic}3>1VI
z4qvSWZ_zbL5*Dm!VHsFRWz`e9%6=!|1!r2+ux_DcyubT~+Od&vEnYC~@CP7A60bXY
zvAGLPRI1qgJq}G{=gi0NPF+8vYT0_D52ADnBQIs_hc_|?KEVapD+|AbSyvALR+siq
zwf59V0VNBVVuPY`?n5uwl<oOL45Vl6%t*q)2$w1MJA3Aw7O^Xpwa96X2Abn_N?~-j
z4Cn}U@7d;#6WB%QG1K?Qtl6%E7s79JYHhB9EHCDKzNBp4$@<Y>Z<UT2Zr)-xn`izp
z!H;xpmJ@a30XDY8#D+E1R)?!b&;{YQqPUnyCTeiv0rh%PKSC^+`jOML|ClE0b7JOn
z%+r}d_a8`~l$h_QIG0aki-QaT@rMJ?kdjny$4OcffKcVf+_23LU|SUQSnDTYiq~9N
z6;apRhcTgE22ZjK%vgb_5~tj|S})C66^dmbyp;We#?XVQIj-3SYF~k;9$PN?xFz?N
z{NJaE9NuNkmd@4K!e1etJof&q?P$Ab+Dx%9Uc8J(9$n4b7q1YLn({Rp79Ha*&Jm(%
zEqhcsi%RTYPFYIxrIP2TZ#q|1fcaF_#)oIaQpzoHd^qi>--8Fi5wJwlh*}K3148lE
zUhv21pZ)`4x!&6+qPFT0>R?GOh9-km@OAA+f+w>@MPEI>wg`U;?p<|pTsD58VzYBj
z$NT{)?@7B-NzLrvs@-WcIfMu9Kd((iz91vN{HSDB_*zQ*;scNWYBH(m6Yp<D9hAk)
z<=a!2O~(74n@@&0IUS$C!E24jc+c400HIGkfoDYRc!8XbX!!?)<I7rgm#mFKk3D@i
zg5!^AdrqG7TV2H{H#$xFg~diPZ!l4lqIs-+Csz>mRb)I>V$=ck#Y?@9*>(OlDTyUJ
zV)Gi`7~PeN?rk;p;B18I#8lBkCCawupkW4klMMO00*jsO(#1>9i=Gw@tE-VTYcvkF
znvb`d*S9WRh_cc03Is;wQhlZR7#TW<+R6Z@!UrD?SFG8nYJy=zV+2nG2Js2liPy89
zQV-ApcaPF7rXM{GJHD>OQX$Z4cy}uG<2r*2-oA`=vutMlPuI&3&Tg>V^)iVU^~5c_
z*mAz_y0MK~Phb8hH_K6rzT^QZv}dBNO<Xq2RO$Wf<R>!3C;Y;b;f6(+`YNNi!vYe$
z@wuunwfDjOLL6f@lFwl!ga;KArYM6_O#lF)JmO}F&PYQY40CeehFCg5;oM#h&Ns0D
z0OC?!&JdU#+>IUzw?;Th0JrO#f%FJV380~%2Cs&*9NY$>?Bfc5=%c9z^Ra`8S^}jc
zamBsBHv|rFHwe9#gS{gX>?HyG#S6aKzwPD$(*J_E*+~G6G_>jEoLu4b0^9=Jyj%)i
z2oDfY5|>`w)zS*AE3fz`#Z5~BXyfMQ4CdkS^z`KR<mYyBwdUay6&2;-1@VADTsH_V
zq_?9R#EZ)j$#_fg2ZuZy33I&>5aHxVf6EDhI=Q<^0D(8-^na4y%B$dY)A^@^+x9Pd
zq?;v=%1uMy=6G%ZJRn|P5iVX37f6)ncl(=B4UNC79g%;kc%vte7sQ!|kDHgr!Qme)
zkZuYdfA{xKEs%OQE2TWTaHNyFD-5pS0e5s`{N1Uuy*u)EpYBNbZP%~3?Jcc%Zi4#d
z`F9&76%FmbY;I+=MmRYCvbaV6j<kgRg>!aywf}{&gz>=b;SM)}Aa9uY{sDhu|Chl(
zJ)B?Uzk~wIJHgy<SybdDfVTmFEuCNpOYpB<At4Y9#Ajv6B?7gCa0yt#M7c!x_(i$+
zghT~|EMWq|5IFQVDiueh8^jR?zooh%=SJM{2tXh(OCbR(E;ygC@C^lsmrDf1d&2`2
z6od(a1g!W4A-_>*xgu^-8)E-^RJT-?H&jp|s3=@Sl$Q%;2@>EE5D<iNK}Df3E`b{g
z0ho}GkSGlHi|STbu#C2f1Q5i{`}ZDgdx)ErldFRSP#xju?)CQpJ%j`Np&R5@G(I6-
z0e+Amp8!ZyNJvnC@9!W3xGVA|Yi~LEc)3A;@LIyaiZ_gqo9sb2K&;_B&W_f<Om1QZ
z%elfKZceUxPEPg`z}uMUZ%u#I0=@X3Sq@frf<bPp;TITgd0QxdmWnLIn&($joabMG
z{~xA@Hcp<7|2>|+L;qrtadq=_a<$WP)q>i>VQ&AL=bwT9V$!{tq>yf|-YWmaLH%Di
z@jud1`Nr1C)%!R958*C<wEmb$>=D1DqNo2=y<iCJRz(RQ65;{3{B;U$bo^roW&?4w
zhTlw+f7Zy~`Vs#mU7>Kes0c&^$|VAaSaJzKU_x9_VL<^dhzP$RKR-X{X7rC7`->gv
zWaZ`wafQoR-xSf!dA=#3U+0;g?N^qu|6?qkHt?GuIe0-}US8lIr<Y!w=XNIi+u@1d
z&J`LO;NJxhznx3KDz_Q-(B0YD9szg#M`8Y!DE}YaZ}xvC<$q=VJM0f@IVWfDo8q)_
z)ADrum+t=w@DB!c1Ptzoboy7J{|@;>mftQIH!=UwcXJ`Sxvug2bz%E6Ep994fARBY
zy8SPDxS{@!lYdL!|H$<px&AE${w?r-vg<!`{aXtBTj2j>*Z-JYxPN~%hCANe=y~2e
z_<mg}i3R{rf)R3Z+A4B#fBVZT0KgXQA1$WbCQaSh{7yAjPri@7gF(){Y!1(5<N;}>
z?0Yg3ciz`c87gvb78clQ$f^A}4QL*{b$53rL;r*o7Ly&56%l*VoHGFI4EpiJ&+~iN
zj3;3HJzMgqAf`>7!@C$9h7?mW*<x(Q7f*KXC6InjyxT$Q*EKGIYTp=9&UuY|8fh-*
z#4asOpQevL%rZ-#Hd}G0^Sr%5_l@2HazQ7CTlu2fZQ_S;r$T~gd{0W!fjFNQC#jgx
zmPM|mZTrJ^KK)_#^v^yYK(o*f`nIYYX+J}v8=A`c+>+&#p~PxL4AP2s;CdE}nuVG#
zLIgHh{VsIIdETh87*gVjl52-x_8bOXe%f~Y*t!^;K&k?m;fdVm!w>cdw3=~gdQFq(
zjf$Qg$kDi2EEJHWHMHTt<$-?SfJQOypfQWa?HTZiRSv{#h&!~1i!pckvWXoFe;RdO
zu(*0mQj;zK-#xAlg@7P18VD~wZ>Y~JuYTHJadwW9g5z3E7ek4-d5MAJtZa+~0I-B^
zHx!pLHQSp`EH@Pm1*}Cp)H?#?Q&-<j0RW6x6?qvwo7v4oQ+rZ4Y1dQ!^7@&f+|41p
zMs0RQh5&|qvhZ+~!IJ<g5*!L*^_MscK{|c`=za))8&ny&g^;lD&>SilN+GdngFL5B
z*obbs?NZjWK(2u;$NCu$9=DbKOn5zi`S90R42Crop$XCbRHv`kek*66NH3e2G!&ID
zee7u0D>v!gb9{NEt~$>VOC~~26=lsyeqh&c22Jn?X$?Tx8dY)E3@yIWlzW41)REDt
zBG~(3iAU_V-*#;qc>;HJcR6GF6?*#v50v8d6B+b`=o4a_H%G$@hc$NOeca~BV}zzn
zXx|fsG2(UbMr;ig=7UlJVb;Pj@px<F+$T#JR&ic?-fdS<W_{(i1Et^J9F?m`-pyi}
zVF&Wjd7;>l7oI@ua_ffraAm$rRZTndl3>k^<Yvs9ZF{E&dUE$=`^+BC^i|(Q6HHm|
zq_f~f6`i2`OkcD|vN~ogW`WME#yPa_r(>c4v!ExC?fU$tN2gf=zn~;%x`g-IEbrn4
zu+1Y<yQL)I?$+q`<%Dq)NFvZIuhz9!OXu>kd*8L|<i)k;2of)9*&wpej}v8!CF{(q
zF!_f&prXhVMLTgjQ<(eV+guikTE@oE%d)q9s{UKySwbPJ0uq5;s^9!F5{4XT1PI&R
z;~ma>dQq_H#ST{vYc{4loihB7F~uhs0i?#j#N5GG_Lb?j!Y@Ku`4|r;=&~v9rLny-
zcUXtatP!D6HNQG*`JPZJ5=NG=@u1McINv0yLY~GoG6s<>{dy2yNpSG^rA7DU<<rM~
z_W;)3;eno>npr@c9l{5eDpP!Jgs$zb3}STi0hv_iew1iYhC24j_d>XJd@iq-P-sW|
zOr_P1l>w%x8SQ)`joH_>odD7=J9Dq?OhLtJq%1JaT$2^atjrXG&y52dPlqmtWTSHR
zv@>1cWu#1{s!re71cZQN9|o!9qH#n%vs?CYAyXG~M*=YF@JRs+9zL0wi3R<iOI3`;
zCZDqV(^JGD(vYb@$_j2ujjsglq7L;*G4Adf*n-&-jk@pdEUsz3&2p5lMi2<B);+J_
zcEAZx8?*{cEKn~XVU<7IWvqt2BaaFuy?#{>aHWQAF$IhjQdbBPhK+h1%=&4#Y88+a
z7w5YP<QPAGB$6skZB?VoNn;i670Nr_>2}aXTz{SWWen#L_A4V`+*xdcivB|AN3Gmq
z3<8X1-GX^$i&Ce6j$}aO0HM5nYQR)D1T$>0zwgBUJ{RZnIU~D*ZqAnk{5g1Y<yA_m
zIQUj-eGfj10BRf1b-{>)zPDbe8mu17t$e0{c3j*A5<<Js1QF8Nhm!2fcm~avbrbch
z4Q>09Casf}XnDMM2Xg9v7}`|fOMl1^VHlo!Goa4Pns15t<Tlld)izkSJNuNn^IVh6
zZeIyav`eN4_{u#u@ZQgw79BM}JZTA9QX}qURTV4l#A|VZ%(Cn_FAM7CY5L6{4<$O&
z?ggE4y8_;V${w;H^3(1y@NOju;jx3@tFeTHa<DNVd4Kg!N!s$q&mV8Zv->x#In#vg
zj^`BXbKm)7$9nHkbrq)Z8%Gg~kgp;=id<P=c9Z9sI$b^kLiJZ8WUT3ailQA0-n_YZ
zz0v0P`uv^wU5`)^%cCtzDK5lz$g;m2hjy;h+`U>J5ds0!$6jQ$WA^)J?bNgO>m}KC
zleKQ96wj;OlX|IZGwXGVyUbR;AG>}WbraPY>oK~VBghk@4ftX3L|vkyV`#IY!G0y8
zng&qZ)kytGF~W`zvu%*aNtmLbiPA3bnHO#gX#hJQDL1&FbIS(Mq19YZgKr2*Vz-p?
zG!yq?>`m&S@Rm?Wr;`{rxbES*UOlOuSx@t*8{FuCAITf4WUE$~#vZ@ywPYM5rw%(y
f%3`l`KcFiKT2iZ=QaQbS8?B<CDPJUO@$CNq+bw<m

literal 0
HcmV?d00001


From 3db218dec1f0abc14b00569f605dc9cf8225d26f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 2 Nov 2020 19:37:01 +0200
Subject: [PATCH 056/389] change logo to svg

---
 CHANGELOG.md                 |   1 +
 src/modules/instance.js      |   2 +-
 static/config.json           |   2 +-
 static/logo.png              | Bin 1304 -> 0 bytes
 static/logo.svg              |  71 +++++++++++++++++++++++++++++++++++
 static/terms-of-service.html |   2 +-
 6 files changed, 75 insertions(+), 3 deletions(-)
 delete mode 100644 static/logo.png
 create mode 100644 static/logo.svg

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68cab40c..3c338de8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Icons changed from fontello (FontAwesome 4 + others) to FontAwesome 5 due to problems with fontello.
 - Some icons changed for better accessibility (lock, globe)
 - Logo is now clickable
+- Changed default logo to SVG version
 
 ## [2.1.1] - 2020-09-08
 ### Changed
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 0c35f5d6..5f7bf0ec 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -27,7 +27,7 @@ const defaultState = {
   hideSitename: false,
   hideUserStats: false,
   loginMethod: 'password',
-  logo: '/static/logo.png',
+  logo: '/static/logo.svg',
   logoMargin: '.2em',
   logoMask: true,
   logoLeft: false,
diff --git a/static/config.json b/static/config.json
index 4b70aea5..f59e645a 100644
--- a/static/config.json
+++ b/static/config.json
@@ -10,7 +10,7 @@
   "hideSitename": false,
   "hideUserStats": false,
   "loginMethod": "password",
-  "logo": "/static/logo.png",
+  "logo": "/static/logo.svg",
   "logoMargin": ".1em",
   "logoMask": true,
   "logoLeft": false,
diff --git a/static/logo.png b/static/logo.png
deleted file mode 100644
index 7744b1acc313c5a146410cc5a56d99629022c637..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1304
zcmeAS@N?(olHy`uVBq!ia0vp^zd)FS4M=vpiLwP!EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zu$zG}W8o(6ETEudiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb2>Idb&7<
zRLpsMcYk+GsKoJy-_NK;GHVO+WTgrkn%&CUJL3$`#<JiW+Gb5_TU}>~G}Sk<I0hVX
zy4=z$EV;#J@q$)+p)CR|iAQxjAI{i${Fs9ZW9Q6|G4Focyw&?&6ZviPcfH*O%0S1E
z3ECEKk(+Qf$ILn?yS8d)kGgl~bERE>dwYB5?_T#i+135d93Qpk@18S>>&My13c81F
zc|PxI)c#q1%cn=rwRd5U;y;mOHrsdF>0edXufFZDFp;|Z>x9Oxb;r2spWW-|_|3KV
zTG6s87W)?2eqS@C$V{napOaJk=ASinB^x95TrVw+va!F|apC%lOG~|vi*?(l3qFl_
zt^366*LVMi`z`AK{b@d(`rXr|W6radeQL93x1V=AV!XE8q2<E$M~7O^&(lzi%iGJG
zC-_UM$L;iVrAG;`Wed75TwgGyV&PY|9dkjfOK<Wo6qq~3Z~R&F&tdJ?h1aYflmU6K
zudn|->yq_8O-06q&P-12EG>MT9I`?JRw@c59u6-iG+dyE#LLC*QT!583ol!5J(j%I
zoTvA~%eg^GtG~7_6tuDp(c2zpVB)mAJgYZ9Dj%$BY00}6+GPvAGW=Nn>28YAzinT;
z78bfMPv5mYN?$^$yrgRJwI4<G|8MPHTh24l+NyTr^-^j5cW>V4MDt53ExgQb-{+S4
z`^w7a>$k}ng*Yu=n!5JmxrNT`^KC0XJ-NR2IM2-c7k}Dc4LY@c>osk`((O||Jp@{^
z@aqbmmUFVpE`JPOYrY{$?k<f(=D_cZI}g8mw>;fTvwxe_{wcex<@)XOO8*IP&fRS(
z8`!_yYR|PB-5d+oPjD|ME2_Q(Sl+2Rc!6W?y_KeN`Fj&HTKxF0Dz6m>1^>cL*TGV9
zt3F@jZgYF_<-!ZE*R0OUCBL5C`u8tCev6zTFiOI`I{C}W%EW-d4Ae7OI`;b9OxvW6
z7Qg;0*Oy&>slPUyXX1sI%~FB)X8?0g6u+dFe&mv^dxIWb{aEoS@U^0|T8Y%k@NC`p
z`FV0R)z#I%zhBF4^LwGaZR^&p5jtY)P39DQuG0_jsx?*$`<B0=et-7ghaEcv1?Ts>
rEuQZ;$KvDPRqOc4%<v2h4tn*BIkz`;JV`U22r|Ue)z4*}Q$iB}mOBPn

diff --git a/static/logo.svg b/static/logo.svg
new file mode 100644
index 00000000..68e647e6
--- /dev/null
+++ b/static/logo.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg4485"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="logo.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4489" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1274"
+     inkscape:window-height="1410"
+     id="namedview4487"
+     showgrid="false"
+     inkscape:zoom="1.2636719"
+     inkscape:cx="305.99333"
+     inkscape:cy="304.30809"
+     inkscape:window-x="1280"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g4612"
+     inkscape:document-rotation="0" />
+  <g
+     id="g4612">
+    <g
+       id="g850"
+       transform="matrix(0.99659595,0,0,0.99659595,0.37313949,0.87143746)">
+      <path
+         style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.175879"
+         d="m 194.75841,124.65165 a 20.449443,20.449443 0 0 0 -20.44944,20.44945 v 242.24725 h 65.28091 v -262.6967 z"
+         id="path4497" />
+      <path
+         style="fill:#fba457;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 272.6236,124.65165 V 256 h 45.61799 a 20.449443,20.449443 0 0 0 20.44944,-20.44945 v -110.8989 z"
+         id="path4516" />
+      <path
+         style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 272.6236,322.06744 v 65.28091 h 45.61799 a 20.449443,20.449443 0 0 0 20.44944,-20.44945 v -44.83146 z"
+         id="path4516-5" />
+    </g>
+  </g>
+</svg>
diff --git a/static/terms-of-service.html b/static/terms-of-service.html
index 3b6bbb36..2b7bf769 100644
--- a/static/terms-of-service.html
+++ b/static/terms-of-service.html
@@ -6,4 +6,4 @@
    Pleroma install containing the real ToS for your instance.</p>
 <p>See the <a href='https://docs.pleroma.social/backend/configuration/static_dir/'>Pleroma documentation</a> for more information.</p>
 <br>
-<img src="/static/logo.png" style="display: block; margin: auto; max-width: 100%; height: 50px; object-fit: contain;" />
+<img src="/static/logo.svg" style="display: block; margin: auto; max-width: 100%; height: 50px; object-fit: contain;" />

From 08e6e6664218d20cf3dd1b00823720505fb08fe7 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 2 Nov 2020 20:51:38 +0200
Subject: [PATCH 057/389] fix chat badge and unify styles across all badges
 including follow request count.

---
 src/App.scss                                  | 21 ++++++++++-------
 .../chat_list_item/chat_list_item.vue         | 12 +++++-----
 src/components/nav_panel/nav_panel.vue        | 23 +++----------------
 src/components/side_drawer/side_drawer.vue    | 11 ++-------
 4 files changed, 24 insertions(+), 43 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 1800d816..ca7d33cd 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -603,19 +603,24 @@ nav {
     flex-grow: 0;
   }
 }
+
 .badge {
+  box-sizing: border-box;
   display: inline-block;
   border-radius: 99px;
-  min-width: 22px;
-  max-width: 22px;
-  min-height: 22px;
-  max-height: 22px;
-  font-size: 15px;
-  line-height: 22px;
-  text-align: center;
+  max-width: 10em;
+  min-width: 1.7em;
+  height: 1.3em;
+  padding: 0.15em 0.15em;
   vertical-align: middle;
+  font-weight: normal;
+  font-style: normal;
+  font-size: 0.9em;
+  line-height: 1;
+  text-align: center;
   white-space: nowrap;
-  padding: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
 
   &.badge-notification {
     background-color: $fallback--cRed;
diff --git a/src/components/chat_list_item/chat_list_item.vue b/src/components/chat_list_item/chat_list_item.vue
index 1f8ecdf6..cd3f436e 100644
--- a/src/components/chat_list_item/chat_list_item.vue
+++ b/src/components/chat_list_item/chat_list_item.vue
@@ -21,6 +21,12 @@
           />
         </span>
         <span class="heading-right" />
+        <div class="time-wrapper">
+          <Timeago
+            :time="chat.updated_at"
+            :auto-update="60"
+          />
+        </div>
       </div>
       <div class="chat-preview">
         <StatusContent
@@ -35,12 +41,6 @@
         </div>
       </div>
     </div>
-    <div class="time-wrapper">
-      <Timeago
-        :time="chat.updated_at"
-        :auto-update="60"
-      />
-    </div>
   </div>
 </template>
 
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 0f02a681..0c83d0fe 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -27,7 +27,7 @@
           <router-link :to="{ name: 'chats', params: { username: currentUser.screen_name } }">
             <div
               v-if="unreadChatCount"
-              class="badge badge-notification unread-chat-count"
+              class="badge badge-notification"
             >
               {{ unreadChatCount }}
             </div>
@@ -47,7 +47,7 @@
             />{{ $t("nav.friend_requests") }}
             <span
               v-if="followRequestCount > 0"
-              class="badge follow-request-count"
+              class="badge badge-notification"
             >
               {{ followRequestCount }}
             </span>
@@ -84,12 +84,6 @@
     padding: 0;
   }
 
-  .follow-request-count {
-    vertical-align: baseline;
-    background-color: $fallback--bg;
-    background-color: var(--input, $fallback--faint);
-  }
-
   li {
     position: relative;
     border-bottom: 1px solid;
@@ -156,21 +150,10 @@
     margin-right: 0.8em;
   }
 
-  .unread-chat-count {
-    font-size: 0.9em;
-    font-weight: bolder;
-    font-style: normal;
+  .badge {
     position: absolute;
     right: 0.6rem;
     top: 1.25em;
-    padding: 0 0.3em;
-    min-width: 1.3rem;
-    min-height: 1.3rem;
-    max-height: 1.3rem;
-    line-height: 1.3rem;
-    max-width: 10em;
-    overflow: hidden;
-    text-overflow: ellipsis;
   }
 }
 </style>
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index ed1ccb7d..149f11cb 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -70,7 +70,7 @@
             /> {{ $t("nav.chats") }}
             <span
               v-if="unreadChatCount"
-              class="badge badge-notification unread-chat-count"
+              class="badge badge-notification"
             >
               {{ unreadChatCount }}
             </span>
@@ -99,7 +99,7 @@
             /> {{ $t("nav.friend_requests") }}
             <span
               v-if="followRequestCount > 0"
-              class="badge follow-request-count"
+              class="badge badge-notification"
             >
               {{ followRequestCount }}
             </span>
@@ -271,13 +271,6 @@
   --faintLink: var(--popoverFaintLink, $fallback--faint);
   --lightText: var(--popoverLightText, $fallback--lightText);
   --icon: var(--popoverIcon, $fallback--icon);
-
-  .follow-request-count {
-    vertical-align: baseline;
-    background-color: $fallback--bg;
-    background-color: var(--input, $fallback--faint);
-  }
-
 }
 
 .side-drawer-logo-wrapper {

From bdf2f36f11a0768dd21c28ba149de4d5e4cc2ad5 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 2 Nov 2020 20:57:56 +0200
Subject: [PATCH 058/389] fix chat heading not being aligned and using wrong
 styles

---
 src/components/chat/chat.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index 787514c8..4abd94a1 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -138,11 +138,15 @@
     }
 
     .chat-view-heading {
+      box-sizing: border-box;
       position: static;
       z-index: 9999;
       top: 0;
       margin-top: 0;
       border-radius: 0;
+      background: linear-gradient(to top, var(--panel), var(--panel)),
+                  linear-gradient(to top, var(--bg), var(--bg));
+      height: 50px;
     }
 
     .scrollable-message-list {

From b6a8ca44ef84b6fb78958a2af3bffd467804a061 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 2 Nov 2020 21:08:22 +0200
Subject: [PATCH 059/389] added comment

---
 src/components/chat/chat.scss | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index 4abd94a1..aef58495 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -144,8 +144,14 @@
       top: 0;
       margin-top: 0;
       border-radius: 0;
-      background: linear-gradient(to top, var(--panel), var(--panel)),
-                  linear-gradient(to top, var(--bg), var(--bg));
+
+      /* This practically overlays the panel heading color over panel background
+       * color. This is needed because we allow transparent panel background and
+       * it doesn't work well in this "disjointed panel header" case
+       */
+      background:
+        linear-gradient(to top, var(--panel), var(--panel)),
+        linear-gradient(to top, var(--bg), var(--bg));
       height: 50px;
     }
 

From e351665bb31745e2639abef3e47bf4f9df616d6b Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 2 Nov 2020 23:43:32 +0200
Subject: [PATCH 060/389] Instead of blocking all interaction, only block
 interaction in places that matter

---
 src/components/extra_buttons/extra_buttons.vue     |  4 ++++
 src/components/favorite_button/favorite_button.vue |  4 ++++
 src/components/react_button/react_button.vue       |  4 ++++
 src/components/reply_button/reply_button.vue       |  4 ++++
 src/components/retweet_button/retweet_button.vue   |  4 ++++
 src/components/status/status.scss                  | 14 ++++++++++++++
 src/components/status/status.vue                   |  1 +
 src/components/status_content/status_content.vue   |  4 ++++
 src/components/timeline/timeline.js                |  2 +-
 src/components/timeline/timeline.vue               |  2 +-
 src/components/user_card/user_card.vue             |  4 ++++
 11 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index a33f6e87..984b0483 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -120,5 +120,9 @@
     color: $fallback--text;
     color: var(--text, $fallback--text);
   }
+
+  ._misclick-prevention & {
+    pointer-events: none !important;
+  }
 }
 </style>
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index dfe12f86..55872133 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -35,6 +35,10 @@
       color: $fallback--cOrange;
       color: var(--cOrange, $fallback--cOrange);
     }
+
+    ._misclick-prevention & {
+      pointer-events: none !important;
+    }
   }
 
   &.-favorited {
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 95d95b11..bb4472d7 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -107,6 +107,10 @@
     color: $fallback--text;
     color: var(--text, $fallback--text);
   }
+
+  ._misclick-prevention & {
+    pointer-events: none !important;
+  }
 }
 
 </style>
diff --git a/src/components/reply_button/reply_button.vue b/src/components/reply_button/reply_button.vue
index a0ac8941..4ca37d5e 100644
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@@ -34,6 +34,10 @@
       color: $fallback--cBlue;
       color: var(--cBlue, $fallback--cBlue);
     }
+
+    ._misclick-prevention & {
+      pointer-events: none !important;
+    }
   }
 }
 </style>
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index b234f3d9..b79fcd75 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -45,6 +45,10 @@
       color: $fallback--cGreen;
       color: var(--cGreen, $fallback--cGreen);
     }
+
+    ._misclick-prevention & {
+      pointer-events: none !important;
+    }
   }
 
   &.-repeated {
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 0a395086..769f7ef4 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -59,6 +59,12 @@ $status-margin: 0.75em;
     justify-content: flex-end;
   }
 
+  .user-avatar {
+    ._misclick-prevention & {
+      pointer-events: none !important;
+    }
+  }
+
   .left-side {
     margin-right: $status-margin;
   }
@@ -108,6 +114,10 @@ $status-margin: 0.75em;
     a {
       display: inline-block;
       word-break: break-all;
+
+      ._misclick-prevention & {
+        pointer-events: none !important;
+      }
     }
   }
 
@@ -250,6 +260,10 @@ $status-margin: 0.75em;
       vertical-align: middle;
       object-fit: contain;
     }
+
+    ._misclick-prevention & a {
+      pointer-events: none !important;
+    }
   }
 
   .status-fadein {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 21412faa..eb54befc 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -119,6 +119,7 @@
         >
           <router-link
             :to="userProfileLink"
+            class="user-avatar"
             @click.stop.prevent.capture.native="toggleUserExpanded"
           >
             <UserAvatar
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 321cd477..e3875498 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -240,6 +240,10 @@ $status-margin: 0.75em;
     word-wrap: break-word;
     word-break: break-word;
 
+    ._misclick-prevention & :not(.attachments) a {
+      pointer-events: none !important;
+    }
+
     blockquote {
       margin: 0.2em 0 0.2em 2em;
       font-style: italic;
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 368ee81b..cba46daf 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -72,7 +72,7 @@ const Timeline = {
     },
     classes () {
       let rootClasses = !this.embedded ? ['panel', 'panel-default'] : []
-      if (this.blockingClicks) rootClasses = rootClasses.concat(['-blocked'])
+      if (this.blockingClicks) rootClasses = rootClasses.concat(['-blocked', '_misclick-prevention'])
       return {
         root: rootClasses,
         header: ['timeline-heading'].concat(!this.embedded ? ['panel-heading'] : []),
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 373b946f..04859852 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -113,7 +113,7 @@
   }
 
   &.-blocked {
-    pointer-events: none;
+    cursor: progress;
   }
 }
 
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index f916af9d..d1cfe654 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -282,6 +282,10 @@
 .user-card {
   position: relative;
 
+  ._misclick-prevention & {
+    pointer-events: none !important;
+  }
+
   &:hover .Avatar {
     --_still-image-img-visibility: visible;
     --_still-image-canvas-visibility: hidden;

From 19fd1d4a1ed5d895970d0fe161742f4f089e3ddf Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 3 Nov 2020 10:29:03 +0200
Subject: [PATCH 061/389] remove the favicon changes

---
 index.html             |   2 +-
 static/dev_favicon.png | Bin 13331 -> 0 bytes
 static/favicon.png     | Bin 12920 -> 0 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 static/dev_favicon.png
 delete mode 100644 static/favicon.png

diff --git a/index.html b/index.html
index 9ac0cfe9..1ff944d9 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
     <title>Pleroma</title>
     <!--server-generated-meta-->
-    <link rel="icon" type="image/png" href="/static/dev_favicon.png">
+    <link rel="icon" type="image/png" href="/favicon.png">
   </head>
   <body class="hidden">
     <noscript>To use Pleroma, please enable JavaScript.</noscript>
diff --git a/static/dev_favicon.png b/static/dev_favicon.png
deleted file mode 100644
index 4223d5ca8c14fe460e3b92c5bf78309aa98639e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13331
zcmeHtWmH?;)^2d8K%s>~A-EL?4#8cDLxDn(00BaQ;O;KP-CEqGxVsmMQ%Zs2ZpFP^
z+V?%@yyxC?zwe$g?)UFxj3j%l{mf_1_3Sy<+Sx0iDoQdqn9nc)0054htfbn*H|W<J
z9rfW;3-Kx#03iMBrlIYi25|=3*uhO<mQbLBs|^$gb%B`z050Fk(zKjt_@gcFE5lwR
z)@b9d@x#&JSN1qDCaUo}2QVl0xEM;n(+yMH+}Zp4`{ySjw_3#)bopxbL$k*QmX%i{
zX%-*uzuoOywzMC5FQ4IidxNdNi~JzN6d8GO=jgTRa&6l=$2ouLF+Vj!-_~Y*dcCwC
zB&K}c@|pr|(Dt6p`N%P+?gMY*^s#MWw@Af_<I3|-y9T7A#$CH)cUHpWAt=mcJ^p?d
z0u6>&``vGmm#=2{4=&5>iQxk+kFruW$KKKquT7qQ*Dt#>&s3K7ayM(!xxZU@x_a{y
zOy2gDqusJ6?St3S#At-K;w?X!KK1bj5!vZ7_@wKdfZ4SDIcGCD=abJBAypfn!A(Jr
z(dZssR1GUH8?1OXibQ;{XwGQxn1!K<Omc4?ePU;AT5l4tUYyyclX&NK(^YaY8SGvf
zw37Bg%q#5Lwm)gC3zNt|sU4?0yt6&3cVV;cre&K+SwB*}b=5TTrPr0Q*Tu5P75k<_
z%E0WkHFMuO(Q9mp_ml9EF3N+J+r)C;MKAq>dWw}`m0tht)JBd@>wf$2nE9x$m@}ik
zCj=GBnEdKrc2Sc<%;-@iFeS~Zu?C@L;TOI9d)l@tW^2NdB0qdy4zi(c8>7#rt(44E
zH|96Emn#dqKSxcok)%q)Y=dR3mJ&ZcQa7Rva>HcIkGEqgN}W<0rR-0)8==KobHkub
z)UadBOVo73;r^mw&r<tE)BS|S$G2!*Q^%_8>_Bl-EW_P#<dBTSD*#{SnQOeN45=r9
zFy{!@$&2a{o||Ll7luabuQc_n&i02<8J*@~n|e+QRu>Yb88$0&^dIbYU<K{&`|Hzi
zk^7Ff2kYG4LU|{jnrHYd<XxKsAE(n?VMkqU{cwpvLpNvpFuP-PdYtZInnuqUYZfin
z#y&J?+yJuPoU}b`yIF2*KTeZ7tGL~`U*o5qxifGXS!z1;x(S_0+?j77cdt_6srB7k
zJ<)4Esx2uzGiW_v7cEv(H+uoIf|F2>Si0V*xD$tpZ%DI~sFz{1thA|_+1&N?`WvNC
zK9{b$W-!x>Uf*^sBT!3a419m9gv0l)zud$lD$nuJBUx6fe5%5&_BNc5<DZrJ=T3gh
z*tj;*ti*xugqY8j?ySbbD??<&gJlvqM+ZH(_w4M(b`#+S^vRpp#nB_KBMl$eunmTy
z(!d94b2JQRn%wuUxa6025kEl$r4IBe-%SmFZWDT)8J;*|-k;}hI6E;4#ocUA#oA~j
zR9L@@{gm~BB3L>6)6+@pg@zh8yAzYU)P*Sio2|w?4Xx5(nvD1JmbV7CrOJhBW}8V%
z-0hJT*3Nsv0alo3<WrH#?zJv<_MCAwpT5@>r)8r^IswlMC>rW!K~)QR#zju(7m&Bg
zGO9cP3N_pP=M2<lNjyjMMY)&O%zKuiiF<&+?_Elbr&WZE+cvY8#9S8%!)6X9Q*x~o
z2;WG!_hKe^{7IW0GbJX2{EbFGd6sJMLz=1W`O4?u7xjWg`R-<XV<$UKavKdnqeg<%
z<eeyv1j9DH-R+(&ksn;lOC!wS07Jy#T<7h*n{RiK`EgqS%#YMV@fM>_xIUObRkT-&
zcGTV(8%bIxUO-%F7SY{;ck2EVWI-BFj%3$Vm7JbCMs2qUA$8YdJxOGk3K%AKw%J6$
z+dvM(Z`;K4M#qXMak$quzo{#@v&dW(%azbW8q+_AhRqonh+jKUc^(+vWHPacU$4_k
zs}GUea6r3U@`VdH>AliCVI{*JGGE_(U0NqM)02q986My<^6|T^>iW!UZxW<$g6d@)
zv;jqZ=hxe4Ze<t^(_A_N@j9DH>L-k<8VV1e&+Q4tXl=OiFDk`mY$qMt-MKaj51a%w
zsJAx$K)4Z<sh)ibN*<N6*pL7tt6FY8;g+B_-iz|IK@DS0Z6EO!$@RI~C2L^p;4_f3
zk)Uf658?vxJ`y(T)WsDf$-KM||G_H~<(;p0K0mWAJllQWLdqkx@a&*S)VOXe)j|d)
ztU9wZvSe(<h+A(+yA7mc-x|>GRZ+$7PyYP4xU5@`U|jo_uWbeN9+<#8d<}jw7dcdj
zH3I=j<{OZd&RYcpeDI5ILHU_Xec6^od$&X~*u&#oOnagCsU~3Y%~}xYf{Y(4HD}f%
zYDqj&1f)@4NsJA3qba;bJ&#diXmw(QiKDrD4UUqy?^u()>k!etJi4o6Gn)2lP;D);
zW8rHP3u}cGfa|0k4cCu%SUo7xl3&HE#kDyJC@@23Us@SU+Yt(=+kY8*aq>PPB`YsA
zJY;plc!AUJ5}B005m+rZg}lNmdnA#{!bBj+%65pkGCD^fASVB%F2Gmw`&`S;<IAx_
zftz#8@N9BRakEe@9`hqSQItFiV&v|ZDZ`p#3;bPQBNek98!fk(uGVfszCRuyr9FJb
z$eBmb$|n_wt7F=~){I5u4W5uW`lgVby?@nZ`ew!>vf#@eq@?9FBNdE3AaXe9Gj}GP
z$=-UVvpdstd=!KPOZ2%sUp<rw766Xt@|*$SwUk@pB(ZcYSt1{(^CKn!aF8dt11mew
zuaMi{sptju;F%SXm~oVl-Ac;3d}4dTnx59@LTirzkDdubim&CzQV7<Nc@YEBqb*(8
z6YY(p{wjo!UG`IHoG`;3;1Vjz+4Qu5(&F=H+K+l@4V6!~5apI)fqHw17V0Y<>NLkJ
z^3|B>4NG0*-CA_&QWIfz^o5f%?p;I%AGhpWW36fS{1_pcUXNzh1<<9Q6$yN7?`aL2
zt=?BGjMl3(I?4PZF2ltWVS}i_#9Oe3r#0*vhzIRVjg{b!<=6Bq04wVAm+D|lfb?R(
zh)trc8Am8a0nHox-+&v1_9pD=$V#t>W2EczWgAWWF`F>}{FxjFwNEmcQ)#~{ggw7h
zD_=R)G*l$Vk3&!4uGS*Nk)q2+P2xTn8)uMwToa0cm?t(m$B(8)7D|X@5|hjdm3bsz
zi?a6#2jS7u`z$47AN}!{X$=T*PMN6O^Ip$0&OI7@v5J5%P<Dnd6v#q`a|(-bjW1x}
zEtK*S(7PB>m5?$EPIB?2GpqhJ@gywTfuPc{t^xG7KWKVZXST3bl7~ayh}Iyc&mBap
z_8QJ)7Qf3nHN&fyg@7Hf6M&<n;e(9%nnQrzs!kuz4n{o1gsL7SdOd5!OsEC(H~TK>
zN+d~cy(Z9_4izjWq&6Jzcye825&aeo%Zz=%Rx5L*j!MhQ8X;7PNU|bwFsClSifV1V
z+?6M`m<?MDjObfVz=?2=B#)YGBMiU$95;~+bUo)Z#^0eB7L4DmPhCN5FPuQ$vCUNm
z;z4{&cx@sg21F2vTCyf+(BM0Q?V)C`M!a1x>VmmM4Zs{o0rU|N;(}U#CY-F%HXO%E
z)wJ&TbJUiVRDVenxvBYTZbT0gL?T<O;pm3ffJwm=l`rp&DqN;>A{i2CEP5LvFhBOH
z4$kHCZr%B|Vddze6J(o(mpf4QAJ0a5%`3z&_;xDf%}WI4wbM8~&E^@(Nj`d|cpfxm
znzp+EE?v$oV`DNA|AuRTFk#AIa}@1+`P`gu-k)i>Qk#UXj#ZHGM=)MGz=Vq?y1`0|
zw16Y1?8ghwY^fzNd^B)$-@1-ju;7MycZsFw03uandhy)o7aR9sMLpI8bfEIx%bue}
z@oj<F?;edycNk3(h;Jb0s0+7uBu$JNt7wDXHQOuz6N;$yn56Yo^Q<ev0*RLCPazCd
zyFtLEb&6=;O4SdJ)Q+BNa`C_y(lx%YhRNAP9BChX0`wlT@_f|iRiSa`zCP~=$P~o(
zxYW^ruw*65VOqKAR1z#Vk9?Dg?^D_0uAH`|IzZKgctn^XN9#yR<`)y{y~l)9x0K8u
z%aSPtKVs9IV<0WpuMfoTOSqoYc2t!`A;gfBb(G&e-slnG<7W-AfUI_HA!QFZf(ZA+
zqOvqStqr5K(p$+B7}S!{tp(}K^-BCJ>5E$>@_mYBB-M99Qb%ia99A<BlV18x=5<hv
z+<ENmN)lNrNr|oG8^EeGXPgyP3`;ctiz=M)IW_6>Fdp6MEA*j@J}N^KeVg1$#uC5g
zYmVa(JXN1JV5}+x1x6-!XtY#=nJm40U<bnw1?MkHXkCs?=~3@#o?-RkH25*7<+b(~
zbtec?)N#`HQnVR!Ieetj#1v!~OBPp<8S5~^e)EPXbn4K@vITvHTgU<nMW`-jYNoLJ
z*<ljus4S~nbh3>jkSTxM5GO9V9K;Yb4$N3WKP#3mF`q{%CjaEb%pF@7ty{(FK>WF>
z&}W8z|2RNL564!p2$i?!#?%8~N*wj%GY46n0;1jH?U_d87n_B|&(XObZk1_eF;iuZ
zY6eD`z+C7~>GmB@ZH{~4k*RHuIy(i)#RJrWx&R2OU`ai#Fik)ga|2euoEg*zFp?dA
zTh^9nzoC`><Aa*`i45>Y62r`W=SBS8JNk0`gr`wYMw|CRDHJbOQdZxTp!+36(ip(@
zKgnaFUnqa48eGVIMl@3dWCEg210^SrJFWU;b5)>>uM9`#U){#7fh~+*-Dc5s`+4kJ
zXZ<84a*(_T!(0=^VNvGk{`w_$#K%fa_u2}+R7mBl=Ix;{$Yf=aqiK*R^1<&Q<Mpcq
z8w{76(dT+WI4k&UK&RfR<?91!OY!tJgUfYr2SsH)fr1HWZ(>zT{vu+$liak6D+|Oo
zt@9P}A}E4}X^Tmg$Bwmw9X;|@HLW!|gqWl!IiA9XpM%ILGvE2MHG-!^fMUvY@p5Nm
zw8ZsdT_pABNF$kvaO?8Cdo1;IID`J}$KZ#17DevWJ`#|rTiag5R8Jv;UN#<iARHhU
zgUaE!Xl)T5Gp4MMrquiy`>WbhYl-1vSTJ%yHf1Q|YlZgpm`)aMq8|k5E&U{+{wYCP
z@3UvJ@ajpLuc-=1p49V13-*BaYVe|i1ptAbM8RHfbzIAuUuDJ}cV6~zCDYmPthij}
zQib!&bbE-8Wn-`l)#%vafrRAetjUt6O?1^7DsfrFd#ie6fdRrim$Ll`2pZg=Fkdcu
zF)){+Cl)cU-y2Vbuf&;$Xj=-H-2FYugBp$5?{YPP6m{Z3CL9{K9ul;6bcPt5h;K8j
zE5+h--h-q<-7@y+P(}G)Et1;<G<!UwIhxghSUd!WRzE4<#40z<v?QR@iN>f%H3*qZ
z2@om?nbdmMr6$S}XSWgqn!!6YQX|1je2|h7{y>q!*Qz3d*G9gN(I9wz)nkpxYx&<1
zrTtSZGTl7d!oP*7T1laM2m&vF4yCCQDos~5{vOSpFxaHzHACWOZ>c_BL#}%wl0~2K
zTO1A!C?vhO1~lT;%lGCWcLwMhSHfsKhN^t|G<rfkp=F47sZXr1ctn(JJWn!1XvKnI
zUexgkjv}4-iR?>J37ZZ9#kC(_*A2pB(ItWEdZG)vMYiM#?(7H8mxsIMQ0(Gv`>PWN
zfZ~@n!ns^Qvd4Epvx>Bdwsw9`TzR+JC+WH39q!N*={faw)2u=&eU7onu?KQ#9dYJG
ztx6U*vz}ORMbE}3y%B1_M|1Qk##F<75nNM=^&}oCOT2ghx4VQ0ZCp*~dtnOYh8o=D
z2Z$<y%Y#n;LT^i5w{Cx^^@vgaj0(kxW<D5yGeiJ!<MlpQHY-E++|<NLIP(a_8~n!l
z09fcrX%q9)<Yklk^Bn(RLVa~FV7IE@$4{OZ$Z8a)sJE1kDz)i$^6%<v#l}^wmBOZH
z6{%AnEf7|Q<muo__(V@xnIYQMHcSz!bms;j=yZ!~y6KEfN>nlH1UBWX`qAWEgrQBz
z6%fYXs*uHoXy+$$pH^L);IC-KY}K>B$$Nutxf0aW_e1VwR#zAED-9xTlozbGwaKg)
zRBK~f{H!c7+8D<|H9=r!(%CvZUwj!@WJXku%4Lu`fV7h@Y_<>s&~MPsc!YoumE1Na
zktmnZhy6aHD+G^gq8L9}idD_rRNK14fCMG05FGpB%eN<YilKp8HC)7?v0SH=XjU};
zV782im!Oc5nC<>)_mIP~Czv4-)RglilnGf~E^X>H8x5^Rs*dHI%~7vjQIT>X(jO`G
z;j<IlKU+<Gxf#u|7=468{Lg8HOY#(ZOnhYe2`X9EIXQaAl-TEzoX^<GZvz3`&CEeX
zv0|RdM6sA;8a`^lILHy{m9<bYX6&BNiI<L(2^hpp-+=c_?9u3iPmNHe{l1@-#aZ#a
z{=BoqUW<9I9wzTU)K%ROX&b%MlTQ_ZW~`@v{gEx`tJfgj5!o4d+DZ%YmY@icsIM|9
zMsn&L^daT~?Z+oR2|e{C+}586f{my2KVVH?^3ro7pNzaW9T-e9_!czm%|N-gF*^)M
zi*Ayb_2OShudn`K&rLq^Dz)v4rgv4QJh{4Q_KaH%xCJx|GjRq4C{Q6wj9oJ(cPSvO
zNC}E!GMFloLOu%3@6IQH@idPR{N1F|#j?br$Oe>sVJrjgX_z6hPIKAC0+loH(ZWFS
zs}}XOLotp$j7OC}hl?VRfQs7(vu2_M;upLVWzO?EsXd4_a(2d_Svg3G<`0}o-3v*^
zLNpc8a{A_Fo3WXE&kOLZ){@k_1u}DozGSo29>1RTG(fQ2R=<vUtBhLQc=F!=+o|)*
zF2$}izpyfj=Y=2Sq)wV!?x*}Qm7tL)nep!l<O8u|&v1R0t2s^d(VaJ`9kRe{>iOq}
zW@;74w=?6G9mA<5JW;vjXu1ox1@UA%pltFC<5Hfvo^oy;IsrV9-J<g7S7id~k_>CE
zszZde9paOzIf>)na(!Nz<5E}jab5|=aO3mpecE0gx{S3~E3kAub7gpol8OE1mhf;!
z2k#i^d^pX*u!Y1cv~i_rH`%FpIqM5*j`UeKm&Fi$p$s3ua{w1VBz*D<o#IE*vcv3}
z0li_qr~Ngj5eLXNiHTdWVBA6<gyV&TmsHQGN1Cl&J1(9udJwLzVb9{D){!~mS7=yI
z)+D{u6`Vdi^7z?&K0E$N&8nLafzDBG7kN1;jOgu3@W2W9+qU|}-n0Pcqb?8251n@_
z1?RJeIz|OrJ}KfddekY;U3N~I!V0@R+^FN=5&oTdEi&Jo87B=S#K53n^rhOVMl7d%
zi^F6iU6|c;nE-s}yqx9@>xEi9@5x)~%V-~&x*4}F?%+!J@wo-`z5;F`{Qc}kvGyZB
zdL~beibNf4C(@d!2yFo#WIN1lN9SF9X*2nr#DP9%FpLa)yKg~Q19LW>)3-sUVJL15
z!w_M&Of%L;A!S39V?J&XN?GX0Tf28?hxj!9{fBkr8z_HPi8HFXnx3G?*R7bB0xIZX
zS^FI+e&voe2*Hx4u3H4pjL=9)Ej-lSq-qXh%lpE8qCiK6&jNxxRzU2<2|S;)$5SmI
zEn#<j9G~EYRNz`$h)^6!t*ALB&-MmQaZ`YAc;8IVxF7C4(ppU94yY(<oql&nHh61L
zD6?FBmE-2X6fa6~T2O@B$$?5?9ZEEJW5b~alP*<~WH-Gu-FRa2NEor0L0F6>3m56Y
z>p2@Jb!VcB<897HXS^@f06O=WiZ<S|W5hlQber5&4ny}V877JdgOm9-k11c#HR(4L
zzaQO579*!qN!f3oachl{Zs97V3OPQu;EFj}Yj5hR;;52@An73L$_b1-uAH=E_;wtn
zVVI11nDsPF-i;}wfMftYj3ix35$s(LF4S3+3b7q(GhrEy5zmnx74(!b$H_MIyTp=0
zpl-jjjK=O&a5#UKZ4&Jy7LxBwESrAT>Zc8<(cvfhvFY^fwW=!qRfjkwHhieoK<in}
zn9tA4LAyh}<Hn)ZkZeDlxtG|xqqpxuPE^Jok#Y<tWst~S$(1J+zhM6QJp$Alf(Tjn
z({$Er)J<BZu|PQzGuZkW%(^7HuPC6H(F@?A@6k*uu@wxh%ihs$j8J^!m__DnWgG;*
z!K{|==duC|h&@LY4k$ru*$X~LQ;kmicBQ|#S-8U&Qzw=ND~k0rCoOARvwgWT?rf2X
zSv^zSi%!<Msuw?jJgMnAttRJgsL65asmj#$B#-XX4?<#6`h(^#SKTfM?MwS|WY*b6
znLjC`)!*!<Qq(k>Fe-k{`@%KJfn3uz>#KrNP^(-D^A$pxF2^&{QARqc84WcTgNYI2
zr>wp1&AsdD>I2Qy+!79?*3Jyl-u9JF?{BQ}uiKFkP8?p4>&!>J$#r|G7g1jMO+O;c
z)?UL3dZvlRNiCCLi``YhQJOlHmMcNsy6=nhm8Q8fg>*3d$Nfi)$iW%}5t8S@czmH9
z!%N)H3=F1Kbg!%n$E5R(nF#>eUpJEo5ec{+pVMYBUc?2Unr$T1G|z++7gNn57LWdH
zWUbX)4zc%}cVRJ)lYtxXytucV`*@XxGxY6Di-+eWMIA!F?G1qh^QdTgqkEzLT;4cj
z&~;f13+pz}WB$$wO%E|?Xos{UQ`mF$NITB1w6FfkuJ5F=82#d;fWi>t^SF8#9y`b3
zY=4uQ+^AFZ<rL6tttEq^Qzo`NM=wI4>oS!G+jwyuISsE^GpKD`6*oEb{7W%v4}xxg
z*pqR$*~aEgu_LJ$hf8l;1@a4j8YVl@@LA<kPZ|Nx!2Vb%ZXXHe>%gDj4qtl6j)TNv
zxtP`8Ve)3~*!VASU>_WmmrFe>e1eQWOed+8ayBeLaS&T8u3o9Ci(b_lU@W0~;MAl$
z<dKwEbJEisZ7_vBSiy3se)E~1n!4bWmSlhYdRBkepsnt<y0vk&oJ@q>{(VN{bbtH2
zb<@KB(zIt9A}i)sR@8`;XuzV=%yQeKW~XIkk@Gl?b+;P&lh>4Am;&k&e|}Xdo+e+R
zUz~l@rrxfor^{W#c2O(vnr7kF$lzeyRQ<*1Njp3XHE(i;C3j=dGVA9ot_70v7q`=K
z@`Ps>sF04V%m}@tL!60}Yqg<f(y5te>S^VCn9_LsLju%NHHA+eQo5>}WbeiaY#tVT
zPnl3tSkij1;7pA9weFyP197%7cfSFjmXK_);=ALKoSVEwzQv>1f{?{{>8Zsx-fwjf
z9OS)D**Pf%;#})q9?p!sTa~1YtZO40N2<shtKYnJ3A+(|Hf>*B+q~VK(Y|oG^1Z-U
zkL!~%Tog$?Ya)s1=g*>c_rfcB<<>{Fy9IN3I6ewE;)D0gq)79p^~OBj<fjG^jax(f
zIv;~c?s?y)cyH!xX06d6jY-SuQsT=Q+*oWi<s2f7JQk&zKz_-M5Wz!k%C|o8q$E~F
z8(5Y3$uU$|%|daYl#z;AM_QD+OE)8Y02Wr^WKL##%!uMt^=(cKvTVm6VLBxiqrL4F
zm$VlwVK(TY;tfla!#@cCoaaZ}Z8^T*+P8dc?(dG09NMO-W|)it8(!BDGN9WD=LE%v
zhvFT!2Od^bY%J<u_LDBJoBn+Ix#z2zkpU>~VSmr`UvBKdY#fY#ZR`n!u@m@+q9eKM
zFF*DH6$owyRe!Ahac`Up!bYeXa1^1{We!?Gk9wEadA)9(7n!jeAklt~;y>=n%`y=;
z+kuQcC^iLuPPvY9M*0-`i4|iC0C*$`d)P|UR#X5R!>w2$CU7GttBaM*Lnr`%poohN
z#P}`L0cZp@gINnv9X7X90bwRWR9f7MAVnJqs5wm5%?_&Wrleu)_STr+gi1shQ_uzc
zKwt%RfB;>rEUoRqE<#kldBG3Izq;9|fWILQZ-uC|6;*%|a62fFi<OHN#3JPabK;;9
z#smu5nV5prB&GkPcxVYxnL9YxfZ5obot;^oIa%R$W^C;I{QPVn4mJ)BmInljy{okY
z#D&G$p86NX9~_cUdt<u?{a|ow;4e;y5!}&1h>GgrJn&EQU+PM^Jaqo);8*)My}g48
zo7_W#>tQ?(05%Q~h>r!t!NS4M_E-Cdvx<s;x3;$bQ^f~8*<2ttZ0xKcHY=-tvaolM
za{7nAe`#T_@vx)IrUtc#JK7mTrJSJF4%B~jYGdhW|5u-m_RwElzvH$vF=cxQ>bK{=
z+Q`T$s{GyNmyBjGE1TaIztDe0ni&5bXX9vR`5R+m%m%fDT0I0}|G>=tPxuG>zZ?9^
z;ru55EfiQ1ZtVDrMNU$P>Q?|@6Sy(V1pLP#udy-6h=-4b$HbVEg^SmSmxUkl@WBJ(
z<7DSDHD!l@`2RvBXKn8Qu{MVOqIw`_g+1_?@*8nM*o}EuIN7;*Sh!4~>@55oJP;OR
z9$p>}eoi9}9uD@uP$=8M9#R`(`PZm^QJFkYaqvOdx!C!PSU64jO<B00rW`B~Q*L$^
zc0PVib`D;4V}4H1Z>nFyg2hzigs3=J|I(vk32`um+gS-wDZs29UH$>pfLTG+9U#9%
zW9I>JadPnTb8&F;KScJ&=zjBQLhbAyvi27zJBXFz4_*^vu=E2X<RN=tRuD5Nn~k;E
z-$nzLu!BMz;C32txTO%)FAm@@)8DlK6#O&G!3uC=$ggVn4ThThDwID<MI2(r_PZ&_
z_FsYj4<>bUxU=>D8_z$We`gW1b8v>+y;ZhTHnM;kJN(x?{|fwfCbfr2%HF}wRqnqT
z)c=MP{39)8A8g@vu7B~b4z>NG^~X$N3HvP-5cs=#!4TtLDhg5AL!6){zc0aqj(?mo
zHiuZ7K_8~cKWpS~{jh(Lu6%r4AZ`eRkA;hyo0o;l*a*VH$H&XhVr;~1!es(AHRj-l
z{4={f+|<DtVh0s7dnlrZ>-<nczppcp;dhoX{xjOy9QqI>Gl&BW0#W^Od4Ym#zh=U}
z4NvgbT%o84{;L3jzvdFK+^-B%ceJswghB28S(v{i%KruT7yCbx^1n0xE9?(z3Al~x
zLvflrC_7vKm+t=s@DBzBm@(Aa9{yj2{#VE!vixPic!>FrzK4bAVO?YU`@;5TTKuY<
z|H0Rv>GnV9;eq-;PW~-@|0CCb<odT1__x6S$*%v%^=~QgZ-M`lUH{+Y!u-ciW2p7R
zjh^$v58u-`8BqWLApj;Jp&}<C@wdO`0sss#o-qQl-J)cD?fLR~8j{1nUP=kaswFJj
zDJH@!@j@aUM^IE-rkq6V$_hin6Ecq%n$O>)J387BA$OvM#O1_ghsR&G=Z;bJ`LB9;
zI4|}uI0I%18B(XYQO%pI^5ZZl({zc%E6}OKynYZT5e_9k?j`i-pAkZ|Yz?n|ac}P(
zsm~2(6cq)&e}z3s_Z|5Ddks$CO;3wjtj3D{ifSCI?CpTV>?&`cR1$yUU|PzlAiMGl
zLILdq!#op<9`zpfSCfn%hTKXyz8jUkvXI|>zZV$O(pEL>kSZZ-g#QwcQdAlTs$od2
zRH76X$hA-JajQDR7W<M;iv*MZiAo^q;F<qj=b?33*IGalp&Vd=E%JmNJHW};biuYQ
z>Un`HBJu}c=GOfR9-kEDiCrreC*)Hrq^C1hir<k~oqam#B{*ocFelb9QI_uBwK1Y$
z&m%5#SJZzIR-*91c1&nOz{T~Ap@LT2v@{n~*L#oFT;Cw1Vc6AE#F4-r9%5kF$iB7*
z0MK}Ty%B7yURpeKqB+PZN};V`A>z^_W=EXv0|2POa*|>i=HK^ItSoh>N&3BKLRVY(
zDl>YNbT;!~vDUD9$w2(jL^Xz;DNQ|Qs|Xz)WOJj0K23}wMU>};Op>pNkO@NKfx<vl
zm=QG>1<2G&>zU&x@N3)G7W|k%Hb&d7wOQM@6%mhbzI!IGUSEG3aeVw;l6+gfZFHz{
z^gexaJ>6J4AD$R6$4+p6oQq(4z=xj1ImkU{;KrGgu{!3(y=qoHDjDc1aJZF-x9USz
z5-DdO$n`vhM1FMvL%bptZc;Uh$wRTZ02e&2l%M`kw6<>C&Ih3LJld#@NW5vY;*TE1
zoWHkHFv3~1)j|D;y>x?{i6<JHtK~yKVKUi~)UoI@nXpdVsC(V2ELMc!V|W>W^KpG5
z2~|HR&48*#1e1B@lZiL@Zn9Rl-a29T<%C;D0?%+sqh<$k4MIDD@TnL38N+oS?FX^#
z>v%sc<4O%v6{}Aj_AnnUR5Y{?+FKIRIhCqgx7-?~ngdOXg8kmsJtuaz%k`}GJM%>E
zy*69Kd7g#~0run|W%YCWp4)E0k0`tZb}<9GAvAKaoZ<3#0_VQ@vI%jO+AnsIJ{EtG
z_4XFYX85#MTwDy$Q8QaKs$}Rp*xem^-$SpIo>@{7K0dBW(w;dy@VRdv3rrCqJ#JC^
z`h$9bQf0P$RR3z{;l+^gj0vK-5~NJYM?QA(uz&Y#qg>q6)02$P#>a;5MU?JaG+Vib
z{RTK3^s#MF(ou@>t;NufD-RA=S6BXwjEu4(06}If7dtxws9J^OIiLIa3+sB_z890b
zB%x)ht8W=>H}Dj$S8}p*NXN%N)3@G`?6_h}q(mB6S{PeeD(H_R`zogK(25w=>ZCC<
zF`0n%E1nv<Py%?Cu#$%I@ZPW)NV$d0f3Ya7vswQ{1RaD~6r(r*1f2HF85tO&2ZMuy
z<6bd5mGZejLqj9-+aYp%cP~(54p6M6+jDBpHq<WDM9@Yt*U{10fd(_F=C-#}7|JTr
z3nyu_O6C1fVj&mJXe29`lmp^LAH9A1c9S`#wyjM+?R^J%6k12#hU|8e!!|)SL-zQ5
zSIOk|r6tEe;#mpDvuy`3jT{H!aZyG%)!kXjT1l_AbcS5;=w?n+)Abk3`+H|jyrQC_
z7@Qc{YyJ+sLJs^;>74lZ_yMxp`KQC~eVb$Rh1+iXy&B(Z??-+*Sy~QHjE~2xz0%Yi
zK|)XaY&uIEn(K^IZ2_1EY#@t`<@aaZe~V~A=rO9C*d7=@^wFqD6(k?+ZgxIY;=o2l
z(k!X%-8|8IsYhZcysdY&CoKWaP#Q0!yPY{X=s9xfV+kHwwizHb6+;kkKDZTgdlXHB
z(Y){;Idew`db063&=1G}*s4L{7qGRpt^5{ftJmTZV+i7-00V03>Uj3%>JN2x_<ThH
z1(O({+-IWp_V!ZX(Zh@Cs$#*z&-8eTf<+D_(RB3mff|6bv$JpJTupQmi2c5hTFTtT
zj}U*O;tKtTKU}I5H$A2&$5BC?f^PACh>VJ2mVa0&{DmbDqX4|qh=mq#xE3fwiT>?Q
zapJN0(lZj081`XPPR){6eQ6c<#ZmDxkz}rh3r&v4Ip0pXc+w)KnH67RF5O<8gqfy%
zM;b}zr$&nAM00a@XLjEIc4i4H64XFNMFp6@HUi)V`>QYnjGL#6NUCbP4D}j<1_H63
zP9g9)Y~i8$FXx=TI=;Ch6Lg90cfRE_BiMBSo0^&7=#=rKORcku;eA(pX_B9x9}5Tz
z3p05Iv$L~n!}F*D0{lBO(JN(X{63p@@17lx9eOt|#aq<sAdH#4khyQFF}N*sf5`+N
z9lt1#ii*;zsjY>QvBj)?K!m)ajMs0Ad@j&87)QVT^Xj?7Pn-4ZmGy<r(YjlPmBp&^
zBTb3#URs<vIXRYdbu2lGRD*iO2Z2VF#91on^>d1F_`?%btJBldA4{!ef@e$8Tz(%J
z0M)h_s_};>I;9DNx1S_KX`C4k0(q?G3wLrxMI3me4u4`uw^nuM!yBf?MBK?^T4&Oj
z`8=;#0_Nj#kfZ%qd?+p(Y6?|Of(;g`FG^aVx~fH5IdnI=FCEE}PkTpEetLA|OV=0g
z*5*vcq--WmcwN~!llaJog&Um;;B-`7oUL}e)46N;N&mBdpa(77mNl()HkbF}k=KF8
za+LQYfP#!^WXW^R4@?ebE1TlZd#f1qK^ot7AM?<n^A&V+A|%36+Jvtu-uUY)ESVBb
RJgiaxIVmN{a&bey{{^#(WbXg~

diff --git a/static/favicon.png b/static/favicon.png
deleted file mode 100644
index d1206dc51c3d859fcbac4cc50e62991632147d24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12920
zcmeHtXH-;Mwr-K5Bng7VB1<lEk#mlc5u~appvX|<pddjIMUV`VK?IbXvt$q@gG2$z
zNY43z=k#g&y?%Xfk8$t6t}%AiUTb~xn{$7A&b7m;aBWScJGfN1007{Qin6@!%`flm
zhK+giZHRjM900h_<fCWgrVH_;cXoBMLfFIU-MpRQ^l&eP6#(Eh`6b2JgIe^B!gc8j
z^Jg&3_@LdllQKNb+d;nCObVdfg0of27sR;7&iGbGm;lhm)9cDF*E^3j`I3l`DuTHY
z*Rpp;1!rS7u8PyXAK|VXpY}^7oSZ-J|1yQqrF1o(S}SoZEcv>*X~(wh=yiI^-XoVK
z?*Ziep>%OPjnneE=3Z^RRQ0^Kw%Kutp4yY|qgz|!yVG8Edl&haj-67+tJ}+$SPcAX
z{6kTmj@}zQPsFYdTE0J}N;iG7L3_5rxSj18O5sUsxs7wm+c3W2-k6?27<1ucE!lrH
zRj(DZJ-J_dEs(I5#5n8c{i(B<^;&(m%gxJYQPO;MEb@Ek{>6lEeB-!89XSbqa@xzf
zK0A*C8pogNwNj7OE-bI)XIJ(gp0XR(V=|<V*MOzk3^u}gg@nE#Qf53-$01l|_>Q%G
zg~+zkedFB;ec^@$(gRra=ccnYyiZh)l-sA@8V@_tJT?$c-()`zyB5M)1b#MM^GTUq
zq|lXDFON+YHhdwwbnWG=%j{kg_9P~%Pp|3V|5TjLdNE#q!Jr>*AwK-*o<;rHWf<*d
z@$??+*R*qBu_umk%*sCCU04-kY9{)#Mv@7qn8q^XgvoL#QHElFDq+!Gl>6B!ZbKN`
zG5ix`c~z&HRV(HcX0B)V?14mstm)wzhp#L`h<ehgaYaY6UNdwiLL)ocsZ96S0j}&z
zOi^|dD^V~_(UmuLjvWcwP!;9`U0cMcJ|SjjvTafB*km&Qt5B+b+v)EoIrUq<tEG8q
zzH61$GG{M&7nB)agVt?^HKYQ=ldRI<V-xX$csWLpjyMBz_~@umZPg`#*jB|pcm388
zc_nK>^W}xY$j`fip1|DmJ=2ksk;Mz2V6wOJ9WTRbEyBGF(3NfS63se7=SW36eilS#
zg+*#Ac66#2h7q@xe2AE8>ew<|ykc`?iI;kja-P>s8M4((EGoD9<n<JVPRc^93(&(b
zbNOITk8a!$(HY00YxljeXjZ1+5j2~}h1+vb>6!7cYm>ltMtLh=q450VwyzO8OP~e^
zF?A|j?~|If344icZ|V54&u=HXM1Y*6GcU+Q@XwP6Ysg(4xG5+c9^or!4>mo;58LxF
zmh+vls0kvhVT7}UyqMvyz`QnCR7hWB%$JMte%<&mrA};n@vx3`Y6TPd9R+VK?K~3c
z587qE_IbZln@{jY*Qw*wQ%rtt1?y5yD>0Wp;DRdfbc(@myyR3o_~~)xa-Me&m(ICM
z0yU1F&Iip%-Cjv8in@rq%Xls)R`zeXCQD<UyjniH_pw?J#>pS65lx`vU~tv%7%Qef
zKe5a1{c2X5fK?5uxX4=~v25U)<C8_Axff-omc3v$Q(4@24n%t9Kgf4LH+kvt<{{(0
zhwd`$j^jbzsFXvy-}sB~%~U0i#nXKI+XVN0YEF0DJXwv3J;gF)CjE<N*2Y}(e+ni!
zOWRt9L=&BDdC*Nge)n<m`Syk?KT+1i-uv3TRn}L=&JQwGTExQM3?&P;+%X?sdQ?L$
z@v*S8vTOpd?_6Ysj=$XrFh{rE$im&|l~z{eChnp3_((od)&eVh(h+N#R*+O9fgI7g
zln0Q##0cI%CtT}OmU;2w=yCyX#5<Rr&THZAqTcgi3?r&4_jhbD99mLrEpXo5aCG)s
zQr2-Tk+T>6uSYf=VUHqe?+2_cM8^OqJD94fe%P`Oj4Rr=F-cD0=fhbXob)EYN#y`y
zZ0nwOd?E?bDf?KyT$_RUrv9XI^;6#pik65Jdd#=F_F(>rb=iPEO$ybgK68je6~>>z
zH0a!0kHQHBR|Up=7Y|ln&iou7xcgREPBk^u6{A;<Ne5~UT?(YadJ1aIm<TiOcD5{x
zc0;|u7-R8Jy9X^1ZG&s8hxQewz;mB)<$7+@WYIe?MJ2r(T#tO>u+!Z7wlPK=M-VlW
zJBbvxnYNuhQ*`-_aaQ4lzoT$qQjqMfd_W(yuqv00N^w<Esi9PwwdeN?4%6i-Rw|BQ
zYw&#6KG?zIo@UqMJwO!L<uR>t68HVdgck=DwHuXMm>s3EQ-;rF879dGlOn`|?O~@X
zRqC!6%V_=1iC(L0hqFNMFd{dkGUkV1M|buY=`d~ouOpPTCr1y|NfL2+xl@u~u=2-F
zYtR_?d1016{&r~bqRe}CpXHHpe9^4<s<6>HhuJ3+Ih@TmW0Mh@VnbJky-bIVOX-;*
zd$U5hP@iP%k7GRq-#i79W6_EPNn;J#*H{MH4o5g^BSF%&1I|Zf5)Q%W<U0daxH6dG
zS%!GgN38uD(L^m958k~^o_lGTiiZCqvd|{25w5sVgDKh_o05Vy7e#sZ(|Y+ssL?`a
z1+LtOZ?>l*;q~t2MKY%u-~oR!h1K^=)osdFo%b71ge!6r!(?_sCK`!I`ZJ=Q-LE&x
zs;D~Q?5vVO6+lo1DeAamehSvZCpM1w#)#WNOdSiHsAYmua`t*`D>_@8Z5L7Q>=i|8
zs4MMxq<(r9p&T4hEoniltg9HL#3Y%(Tu5Zd3Q^=<?CKlbaX>NnP!d3QrAJgXl3(ie
zm<dGl0Z7L4)+H_yDlcJ{J0FG8%`xtfjNwk<L*%5-sVx-jw0PynjLx!di%uE$O=2m;
z(U~?!<Ew|Bj9aGHfLq45mYx=vvMQ}9ay7@!m9>RQyrkAari+n+F%YXh(t%Z>XWbvQ
zL&Bfb0^MeRfraGrLZBFl|JokqA_0~Vl?u*>mnrmmCpjn<G0`SOGRbo~)QMtcaoXxE
z+hArHd?z;1lUhC&_3MEAAp9XS|04qo9p}oF+R2=06#QO?XQpw8t%GFazTNo9Y`s0P
ztU!)|P_L|L?vYZ~nm*#J-u7Je>B7M{{T+0?WoJDcXEm!ha@@T><_D1v-o5t?wlJ^;
zQ&QG^@q-0^9Ml_YFnPu{XiVnT3L4o&#M8bi>*kbx41a%Sig!I|GD7cokpn`mV~!dG
z%FfX>5YuidyX#d?#}^dOmuZh$IFC#*qm5qBVEVNWZ8C`y^eP{J07<jnH<RPFTw)Aq
zes{sx`20|roNM9R=tcWm`waF;*#eDv;7On*=;Vur3d>s>QM8_@*Vtd}^42&<Mo|3#
zf?o;=)eP!Uj3NUqLiG0r_CMWk2<uJM^MF!e+&O&65$~e#9NA`@m0MQudIa+1K0qQ5
zY5H^2w^M7GWA5>tcNT&u774EAHFcT}r0+tNX*t>wS$nF0OM#EFkoOp6jR0UK?N+8h
z4HgV7&K}GM0l2vzXY@c~(nO0ts>i7xE`*`IxBg79oI~9$PWf?Blo-Q$%>6D*Y!rQ0
zM-w(k;o7&BPm_x!IbDE^vx|vRamM%-Gsvd4gE&DS54&GF7p8(xHZ6U&BV<eK&07i}
zy`x+?x600|cv|m1#oP?19MEEnu+hd6C}f7jQSxr0rA3mUx~Hz_WPZ}6?*n*m3dpIG
zVQeWq+)I_-L=lZmV5T-2asFg(NwsH$>(`z#_E-?3sm;_%)LtCM$fsX?LTDrm>Q_3_
zyQk1lI#}xR(rX2!z3F|m@^?ypeF{~9=xU%yEU$Mi1Q1Hk{!EZ1kBP(_2vs#>A{q|<
zj8z#xRUu5$_Fci=!$g_-v=G=6#*HEz_+^cF(`JS@=(#i=iNO5Cd|@4~4|mWt8oMs5
zK7;tA^|Sm=^NpmbmyY*V!Fv5kQ@kyy-_9kf6KE9d!BIu;$w#nk9VR9;w84*~kPBh}
z0mNg|7L-Tsdd_6jtr+rNHmdJcsRPDZo)rr*Q2Avi7^_i{ev^a872!SwELGVP7Acp}
zW?;d!7DNLG7v&`qj3GH7o*kX>oy(;j^OL%k7)!~aoQGE_?bJeWCCA=asC@i2x((aZ
z{oOt^@A_Fl!sQ+3KBD}u;$iWFN%S_-_Gj3&(+<|nm1Sss#@&AR+Zi$qTzJ_RrP^~a
z6c$P@#g&Iw6`yYw>nIgmIy={i8adIIl?Ma}9b0s_ii|LK_<NxxI*~I7QPpVbM&E-2
zzdmw;+0NkOET1!UwciOg!@<$$Dmi)b!K-vJiV5(h@AEJ(`Kz4Go?+HWo1~n>bj$Es
zcbur*AlusFcixt2r>a#a&~E<|Cp42EW8dhMlYQ)ix2$7<*a6p&ee``oH*_HJy;3F0
z%T^j?F22juob5hN?574?XZ-1IfO!}YW58+~O@Bx+BC+3<*aY_#)}t^wr8iJy1|`0&
zw$xrQX8C5EjZqrzjBFGW*&ZrNx|s}}kR?b<3{WeZwM~nRc$I<wnbI#Vbxyy9OHdtI
zVWsVOSCZq{5Hy_3DBwC1fqR<t>V;lrGrfea3JXVeHA2ON*&<ix$}K@Os4oYGTV84j
zf6H{Otj56?03&r#bPsU@UzKjUX=l@V$PV0Vi8!V9im0I&BH%<{*go56Sx`j-0P&J0
zLha=u$a~6^P3b*N7~7h2sg%a%`RRjF1Oihxi#QSNVr0aNWt!x#$tp=cRx-qrL<5wT
z%!%+Uu7u1#$Kt%}GD1B$D*9R65InS46Yf0SUg3wW&}s>_L=G$uP*?WT<bUPK#oG<d
zD*0NXgs3*?NdFP1yY*Q=s76}LbdF}-oI+s~w+X_}fDILPQV=bvU!^>!r>OY}PfDCB
zjPPnivz<rkWTCI1GR>=yIPd7V;M8w%s_rnMkvzYb!D=3?=+kT_*!(y$PpFHUHKBy-
zbpb>FTyp<LE7QE7+(zhuxY+YN>iJ#HXtaZmEiIa-;QQD+>$#FWIDHO1vkPLcAPue?
zgE<?HJg2%sNE6$R_d(tv7y2h%ql4^*gWTT+diewcZ0GB-v(}4oxpW?PiUML^-ermM
zA0UfG*CO2%AAMCn;~9cJ^ZZ?;ptX03%EBDupi_)xHzpV@f~eT$`MWzR2@3CO&y<OD
z>?jaeSTc8PO#6fZl=HIppjl9iQ^TF6Btb{UlF*lcS)I>jm#v4i2boGIxJ)BHoE_rv
zttvE|s03!F5va5G&n5^Di#fe!M=0V7H!&p5N=!(>E)*z<1EkCWCWMU$I$t`LSiJy*
zix~$?>u6PwSx092URB>y?aK|5FE$&QU!PhjTnx1Jq$ln&C^D{&0>d8w!g}P#zi0wv
zRcH@W%{ihJ>|Er0@x+NAwFPHu#Xlg4B?P39<D8tW8&@w_M2N)GlI5^Iq_LsgmDe60
zG5G2i%?9@lMDosZ4^tc9dveY1u*ds$p)3vlc%NyTg~Hm<95skSqKeE|FwhqWVL(h|
zP!pX`r-~0B>7?2%O*EohZm(Zny0_hd8q}a%WiQMR_>Src@njV1J~w31#a_|dpO9v8
zl65h$tc#>>Lj^M$MGsW=sOT#@1wAvl50)$C>*l}f!!>~yYamf14Cv|;NyBE~KLaU5
z#91^`<KENyP#KH%<qc_fY*L9Yo9@R5;N{nK_t(~D2X*5LKT@efCl!6CIpeo-T?%tu
z!Y1ntV&p=C9%t(E-j(fY{6uZau{bdQNREZ-gYbw3CQ#c@Spr40FOCi3_F){TF+1>O
z8Wb5MkStBx1BZ~TN4f^C(_qd}b;_ma$D?LujB-4ydyRcefgeh0lr1ZDk;#1Wqq7t6
zA<7m*mTj_67$;Mw!qB_eFT(>XHDSF~XV;_d2;FBUP?4lKz`dyh2U--bnTJ1^me^S%
z_Hq@KlmszF{vL+)f>cI5|NEo7xYwETQ1ed9x{<v1rB)xu=v`>C$?_2HJJ1q}0Ml+F
zuFHpAHqki`DTY9k{s;8Msk9}`U6$S2rUS%O0@40@@vlu}_DY<;^|6vXU@8f<4Cz3n
zlKg^Brmau!F5CRd<Jn-6*DyOp*{J!~&nK<cLzhbGZz{_cFH2LplB4m!^<@F&1<>wb
z2B=)<;FbEmphP5f2ccgENRm%7Y#-uHtae|b8=d9tVY_A1g7@5|0cJI4jY1%(#wOcF
zPJ{rG%_-^Cj9RxArc=wm`yn8kogfF6Y;u&}*IU4WsSYf_(VSB|Y?XaBrj)E}5kcTS
zOph+*`xC`1qd-$y(YaYY-k|u!F^=F5LqHe2!r7Do?LwXW>Ry82?&T(i_wa*qzFM?e
ziYT!_XuQ`0V>@r6H}#A8(BUS+EHpc1vzj;|?kU&9)_Z8D>K@H(-uHLm<sjbq%n$5e
z%R1gvUTqV%1JuV*U8t3S+G10b_f->Q*$4%*31_*V)EQWlMqW2p5!EtnYD5W)89~xK
zu2IIz{VU#ra<o%7Fuj(I?ARkLeRy50FlA!9;Z&`|O9XJV{o|vMk@rFm2M>1F#A6>+
z{Ivd*F3z1?E?%ej+Fe9UDnbAHnTqtaUg;;n$xn2;d5kjtZlqr{$h>w<t1H!0qoptK
zRJ%2IyigyGC>M{?6QDkmgpT11G1ZLp8{2QRY}uxwkL{^eWdtx6I4AEZC=r$D<UF6_
zx+^FU?SZiZRLzd24R<9FXUqkr8gfE;(PG)~H;M=Q<JCrO(aRs0aPCkT=#kRGy0~+e
zK9--QXp$Ucp#h~6@;F?30y=#+LI|c4ty;`GW;6zA>Ei-0t+?;cw45e{le@{(xGyVD
z4k2<=jXPplQ~k;kEX?cuYeVP0py$6vfq^Ox#1v3@5E|7g?Z-O@1aD`>$WN~bPl6fb
zS(aXuh*cf5Zm^a<tBegJc-gMfDncW@rf%d{!@h9d=pf@uKVf&AFMSlAw_cK>sQ`@x
z@Da0xKW|+ny{MRU@2c)CjN*_O#D0hAAfyVopi~q&BKGJnBXP9lsgX+``baibI%OL1
zS>8iU3{_oj_HLYYQ8iS`YX0Li9qTy(epAC%BvY1EpB;RErqzl;-ao5nZOpCV^+8FL
z2>Y4{?ZllfhS2ybr*}eFkyME3$L9ABkL*Xji(Tj^Ke8Cd)rvZ_a?2T0Jys+)Dlh|g
z*RBIpi9jkBwx(XwDaWW~savUu=awzQlfz>ZEmQrNvoj_jYdoo+*)E-utmqfnPdm$d
z^0v=5w;xiSMC@bxI>js$R<<M)6CXe~eWy(Cdud~gKHJ<tqoeqdOO{g?wv(ubZxpHA
zPodk!O>Htf3vAi|UG_juN=PkYJ))wSZM}6cviL2_#3+VU!L$)^{5~THvst=y`V`pL
zF_q&iMlPhZY0S+X5DJ3e^w~hd8|Ov-mb8^Ow&*;M3Rp+N_|yiu_Z?Gr%$fbhuo(nu
zEei!(pA-|%S}mH>R;cnaY5wf;(f5;5pNCJMd(2DrX5YzNe}Yt)dX>d&yXp9aAgOq;
zl63I}!C>OOwxDlSUBd3Zdp)zK=n>KcHbuI_lh!NltVGY)wchtXiNw{*7B$*iP^vf|
zd7Nc7I0m7Tc&Qpsy7n<$(e7%RRBpIQu4XFS_b8tq>v-9zLwb^ffulQNtks@zp<jio
z*D&tMR{+BaM?Qwk(R(uabRxg|K`!=aE;9F8kmRSRHZ0Rr7E)<2@<}r0&x;Ux`7%Oc
z>u#x(3RSe2p-eAwC;Q={LyP6cf?k3OF>lq`M~lYsR&Tjs{R6<*fT@Z56d+kPZU9<(
z<9nsUDkFTEqvw(bf@Ld1n5!n$<FlR+tT61gcxTl_7<$5}RkVgp3RCS=qLS+zy!rv!
zIV5wRGiX8K1&HZ@vjS(*ZAdnl6<$R&64Uky!Rnr~V^i+va8iF{RCl@fYC>xgo60fl
z!KU`*aX!%{pUR=6V*ADMG$i^QJ4SQL&t~4~KCfz3!$W26^lbSn@#}3mr>6d;blT!C
zxu%VXk7gS*?+~93x+rCYqgDqv0D=|LY-(uS->wd@)ma(f)!<$nFtWR&AUgx0x5VnR
zF_r?ZTy(R-@C}G{XHXsJ{YEUyV#aZ%sCK47j=}iTTIS;qD2<2E5hq7o+LxYia`g3i
zkCsFirGTmpe3>Gf<FqeR_E*?U+ltpO&3q@HNX1o4@a}OlkHy@*)>KVwent5JcgDuO
z*GW`iK~?}LSovv)nE>dcZXF(f#Ak1Fz;9lDoJ+>VnMUn9Y!Eh@&&N}pr_V!yCn@{+
z`P>CwLC~c$V86{y`!$nGWoT)H)DNOU_0%wFj^S+CjB}SuvqIAq^mPa)&HeTM(##9$
z`(;LtPLG~_P(kfJYC&(n49ej6T1Pdx?p;|Xz$ygZ7?y4TLfB4GKHIzTYOic}3>1VI
z4qvSWZ_zbL5*Dm!VHsFRWz`e9%6=!|1!r2+ux_DcyubT~+Od&vEnYC~@CP7A60bXY
zvAGLPRI1qgJq}G{=gi0NPF+8vYT0_D52ADnBQIs_hc_|?KEVapD+|AbSyvALR+siq
zwf59V0VNBVVuPY`?n5uwl<oOL45Vl6%t*q)2$w1MJA3Aw7O^Xpwa96X2Abn_N?~-j
z4Cn}U@7d;#6WB%QG1K?Qtl6%E7s79JYHhB9EHCDKzNBp4$@<Y>Z<UT2Zr)-xn`izp
z!H;xpmJ@a30XDY8#D+E1R)?!b&;{YQqPUnyCTeiv0rh%PKSC^+`jOML|ClE0b7JOn
z%+r}d_a8`~l$h_QIG0aki-QaT@rMJ?kdjny$4OcffKcVf+_23LU|SUQSnDTYiq~9N
z6;apRhcTgE22ZjK%vgb_5~tj|S})C66^dmbyp;We#?XVQIj-3SYF~k;9$PN?xFz?N
z{NJaE9NuNkmd@4K!e1etJof&q?P$Ab+Dx%9Uc8J(9$n4b7q1YLn({Rp79Ha*&Jm(%
zEqhcsi%RTYPFYIxrIP2TZ#q|1fcaF_#)oIaQpzoHd^qi>--8Fi5wJwlh*}K3148lE
zUhv21pZ)`4x!&6+qPFT0>R?GOh9-km@OAA+f+w>@MPEI>wg`U;?p<|pTsD58VzYBj
z$NT{)?@7B-NzLrvs@-WcIfMu9Kd((iz91vN{HSDB_*zQ*;scNWYBH(m6Yp<D9hAk)
z<=a!2O~(74n@@&0IUS$C!E24jc+c400HIGkfoDYRc!8XbX!!?)<I7rgm#mFKk3D@i
zg5!^AdrqG7TV2H{H#$xFg~diPZ!l4lqIs-+Csz>mRb)I>V$=ck#Y?@9*>(OlDTyUJ
zV)Gi`7~PeN?rk;p;B18I#8lBkCCawupkW4klMMO00*jsO(#1>9i=Gw@tE-VTYcvkF
znvb`d*S9WRh_cc03Is;wQhlZR7#TW<+R6Z@!UrD?SFG8nYJy=zV+2nG2Js2liPy89
zQV-ApcaPF7rXM{GJHD>OQX$Z4cy}uG<2r*2-oA`=vutMlPuI&3&Tg>V^)iVU^~5c_
z*mAz_y0MK~Phb8hH_K6rzT^QZv}dBNO<Xq2RO$Wf<R>!3C;Y;b;f6(+`YNNi!vYe$
z@wuunwfDjOLL6f@lFwl!ga;KArYM6_O#lF)JmO}F&PYQY40CeehFCg5;oM#h&Ns0D
z0OC?!&JdU#+>IUzw?;Th0JrO#f%FJV380~%2Cs&*9NY$>?Bfc5=%c9z^Ra`8S^}jc
zamBsBHv|rFHwe9#gS{gX>?HyG#S6aKzwPD$(*J_E*+~G6G_>jEoLu4b0^9=Jyj%)i
z2oDfY5|>`w)zS*AE3fz`#Z5~BXyfMQ4CdkS^z`KR<mYyBwdUay6&2;-1@VADTsH_V
zq_?9R#EZ)j$#_fg2ZuZy33I&>5aHxVf6EDhI=Q<^0D(8-^na4y%B$dY)A^@^+x9Pd
zq?;v=%1uMy=6G%ZJRn|P5iVX37f6)ncl(=B4UNC79g%;kc%vte7sQ!|kDHgr!Qme)
zkZuYdfA{xKEs%OQE2TWTaHNyFD-5pS0e5s`{N1Uuy*u)EpYBNbZP%~3?Jcc%Zi4#d
z`F9&76%FmbY;I+=MmRYCvbaV6j<kgRg>!aywf}{&gz>=b;SM)}Aa9uY{sDhu|Chl(
zJ)B?Uzk~wIJHgy<SybdDfVTmFEuCNpOYpB<At4Y9#Ajv6B?7gCa0yt#M7c!x_(i$+
zghT~|EMWq|5IFQVDiueh8^jR?zooh%=SJM{2tXh(OCbR(E;ygC@C^lsmrDf1d&2`2
z6od(a1g!W4A-_>*xgu^-8)E-^RJT-?H&jp|s3=@Sl$Q%;2@>EE5D<iNK}Df3E`b{g
z0ho}GkSGlHi|STbu#C2f1Q5i{`}ZDgdx)ErldFRSP#xju?)CQpJ%j`Np&R5@G(I6-
z0e+Amp8!ZyNJvnC@9!W3xGVA|Yi~LEc)3A;@LIyaiZ_gqo9sb2K&;_B&W_f<Om1QZ
z%elfKZceUxPEPg`z}uMUZ%u#I0=@X3Sq@frf<bPp;TITgd0QxdmWnLIn&($joabMG
z{~xA@Hcp<7|2>|+L;qrtadq=_a<$WP)q>i>VQ&AL=bwT9V$!{tq>yf|-YWmaLH%Di
z@jud1`Nr1C)%!R958*C<wEmb$>=D1DqNo2=y<iCJRz(RQ65;{3{B;U$bo^roW&?4w
zhTlw+f7Zy~`Vs#mU7>Kes0c&^$|VAaSaJzKU_x9_VL<^dhzP$RKR-X{X7rC7`->gv
zWaZ`wafQoR-xSf!dA=#3U+0;g?N^qu|6?qkHt?GuIe0-}US8lIr<Y!w=XNIi+u@1d
z&J`LO;NJxhznx3KDz_Q-(B0YD9szg#M`8Y!DE}YaZ}xvC<$q=VJM0f@IVWfDo8q)_
z)ADrum+t=w@DB!c1Ptzoboy7J{|@;>mftQIH!=UwcXJ`Sxvug2bz%E6Ep994fARBY
zy8SPDxS{@!lYdL!|H$<px&AE${w?r-vg<!`{aXtBTj2j>*Z-JYxPN~%hCANe=y~2e
z_<mg}i3R{rf)R3Z+A4B#fBVZT0KgXQA1$WbCQaSh{7yAjPri@7gF(){Y!1(5<N;}>
z?0Yg3ciz`c87gvb78clQ$f^A}4QL*{b$53rL;r*o7Ly&56%l*VoHGFI4EpiJ&+~iN
zj3;3HJzMgqAf`>7!@C$9h7?mW*<x(Q7f*KXC6InjyxT$Q*EKGIYTp=9&UuY|8fh-*
z#4asOpQevL%rZ-#Hd}G0^Sr%5_l@2HazQ7CTlu2fZQ_S;r$T~gd{0W!fjFNQC#jgx
zmPM|mZTrJ^KK)_#^v^yYK(o*f`nIYYX+J}v8=A`c+>+&#p~PxL4AP2s;CdE}nuVG#
zLIgHh{VsIIdETh87*gVjl52-x_8bOXe%f~Y*t!^;K&k?m;fdVm!w>cdw3=~gdQFq(
zjf$Qg$kDi2EEJHWHMHTt<$-?SfJQOypfQWa?HTZiRSv{#h&!~1i!pckvWXoFe;RdO
zu(*0mQj;zK-#xAlg@7P18VD~wZ>Y~JuYTHJadwW9g5z3E7ek4-d5MAJtZa+~0I-B^
zHx!pLHQSp`EH@Pm1*}Cp)H?#?Q&-<j0RW6x6?qvwo7v4oQ+rZ4Y1dQ!^7@&f+|41p
zMs0RQh5&|qvhZ+~!IJ<g5*!L*^_MscK{|c`=za))8&ny&g^;lD&>SilN+GdngFL5B
z*obbs?NZjWK(2u;$NCu$9=DbKOn5zi`S90R42Crop$XCbRHv`kek*66NH3e2G!&ID
zee7u0D>v!gb9{NEt~$>VOC~~26=lsyeqh&c22Jn?X$?Tx8dY)E3@yIWlzW41)REDt
zBG~(3iAU_V-*#;qc>;HJcR6GF6?*#v50v8d6B+b`=o4a_H%G$@hc$NOeca~BV}zzn
zXx|fsG2(UbMr;ig=7UlJVb;Pj@px<F+$T#JR&ic?-fdS<W_{(i1Et^J9F?m`-pyi}
zVF&Wjd7;>l7oI@ua_ffraAm$rRZTndl3>k^<Yvs9ZF{E&dUE$=`^+BC^i|(Q6HHm|
zq_f~f6`i2`OkcD|vN~ogW`WME#yPa_r(>c4v!ExC?fU$tN2gf=zn~;%x`g-IEbrn4
zu+1Y<yQL)I?$+q`<%Dq)NFvZIuhz9!OXu>kd*8L|<i)k;2of)9*&wpej}v8!CF{(q
zF!_f&prXhVMLTgjQ<(eV+guikTE@oE%d)q9s{UKySwbPJ0uq5;s^9!F5{4XT1PI&R
z;~ma>dQq_H#ST{vYc{4loihB7F~uhs0i?#j#N5GG_Lb?j!Y@Ku`4|r;=&~v9rLny-
zcUXtatP!D6HNQG*`JPZJ5=NG=@u1McINv0yLY~GoG6s<>{dy2yNpSG^rA7DU<<rM~
z_W;)3;eno>npr@c9l{5eDpP!Jgs$zb3}STi0hv_iew1iYhC24j_d>XJd@iq-P-sW|
zOr_P1l>w%x8SQ)`joH_>odD7=J9Dq?OhLtJq%1JaT$2^atjrXG&y52dPlqmtWTSHR
zv@>1cWu#1{s!re71cZQN9|o!9qH#n%vs?CYAyXG~M*=YF@JRs+9zL0wi3R<iOI3`;
zCZDqV(^JGD(vYb@$_j2ujjsglq7L;*G4Adf*n-&-jk@pdEUsz3&2p5lMi2<B);+J_
zcEAZx8?*{cEKn~XVU<7IWvqt2BaaFuy?#{>aHWQAF$IhjQdbBPhK+h1%=&4#Y88+a
z7w5YP<QPAGB$6skZB?VoNn;i670Nr_>2}aXTz{SWWen#L_A4V`+*xdcivB|AN3Gmq
z3<8X1-GX^$i&Ce6j$}aO0HM5nYQR)D1T$>0zwgBUJ{RZnIU~D*ZqAnk{5g1Y<yA_m
zIQUj-eGfj10BRf1b-{>)zPDbe8mu17t$e0{c3j*A5<<Js1QF8Nhm!2fcm~avbrbch
z4Q>09Casf}XnDMM2Xg9v7}`|fOMl1^VHlo!Goa4Pns15t<Tlld)izkSJNuNn^IVh6
zZeIyav`eN4_{u#u@ZQgw79BM}JZTA9QX}qURTV4l#A|VZ%(Cn_FAM7CY5L6{4<$O&
z?ggE4y8_;V${w;H^3(1y@NOju;jx3@tFeTHa<DNVd4Kg!N!s$q&mV8Zv->x#In#vg
zj^`BXbKm)7$9nHkbrq)Z8%Gg~kgp;=id<P=c9Z9sI$b^kLiJZ8WUT3ailQA0-n_YZ
zz0v0P`uv^wU5`)^%cCtzDK5lz$g;m2hjy;h+`U>J5ds0!$6jQ$WA^)J?bNgO>m}KC
zleKQ96wj;OlX|IZGwXGVyUbR;AG>}WbraPY>oK~VBghk@4ftX3L|vkyV`#IY!G0y8
zng&qZ)kytGF~W`zvu%*aNtmLbiPA3bnHO#gX#hJQDL1&FbIS(Mq19YZgKr2*Vz-p?
zG!yq?>`m&S@Rm?Wr;`{rxbES*UOlOuSx@t*8{FuCAITf4WUE$~#vZ@ywPYM5rw%(y
f%3`l`KcFiKT2iZ=QaQbS8?B<CDPJUO@$CNq+bw<m


From 979efb301a4bfdd1c120b2a764430f7388503fc0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 3 Nov 2020 11:35:55 +0200
Subject: [PATCH 062/389] fix mobile navbar hitboxes

---
 src/components/mobile_nav/mobile_nav.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 6651fc8e..5304a500 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -110,12 +110,23 @@
   }
 
   .mobile-nav-button {
+    display: inline-block;
     text-align: center;
-    margin: 0 1em;
+    padding: 0 1em;
     position: relative;
     cursor: pointer;
   }
 
+  .site-name {
+    padding: 0 .3em;
+    display: inline-block;
+  }
+
+  .item {
+    /* moslty just to get rid of extra whitespaces */
+    display: flex;
+  }
+
   .alert-dot {
     border-radius: 100%;
     height: 8px;

From 0206b2bcc5cceae937bdad1922c57f8c84621d26 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 3 Nov 2020 11:55:29 +0200
Subject: [PATCH 063/389] change favicon dimensions for high res, add handling
 when favicon isn't available

---
 src/services/favicon_service/favicon_service.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/services/favicon_service/favicon_service.js b/src/services/favicon_service/favicon_service.js
index 5fa8e5c3..d1ddee41 100644
--- a/src/services/favicon_service/favicon_service.js
+++ b/src/services/favicon_service/favicon_service.js
@@ -2,9 +2,9 @@ import { find } from 'lodash'
 
 const createFaviconService = () => {
   let favimg, favcanvas, favcontext, favicon
-  const faviconWidth = 48
-  const faviconHeight = 48
-  const badgeRadius = 14
+  const faviconWidth = 128
+  const faviconHeight = 128
+  const badgeRadius = 32
 
   const initFaviconService = () => {
     const nodes = document.getElementsByTagName('link')
@@ -19,11 +19,15 @@ const createFaviconService = () => {
     }
   }
 
+  const isImageLoaded = (img) => img.complete && img.naturalHeight !== 0
+
   const clearFaviconBadge = () => {
     if (!favimg || !favcontext || !favicon) return
 
     favcontext.clearRect(0, 0, faviconWidth, faviconHeight)
-    favcontext.drawImage(favimg, 0, 0, favimg.width, favimg.height, 0, 0, faviconWidth, faviconHeight)
+    if (isImageLoaded(favimg)) {
+      favcontext.drawImage(favimg, 0, 0, favimg.width, favimg.height, 0, 0, faviconWidth, faviconHeight)
+    }
     favicon.href = favcanvas.toDataURL('image/png')
   }
 
@@ -35,7 +39,9 @@ const createFaviconService = () => {
     const style = getComputedStyle(document.body)
     const badgeColor = `${style.getPropertyValue('--badgeNotification') || 'rgb(240, 100, 100)'}`
 
-    favcontext.drawImage(favimg, 0, 0, favimg.width, favimg.height, 0, 0, faviconWidth, faviconHeight)
+    if (isImageLoaded(favimg)) {
+      favcontext.drawImage(favimg, 0, 0, favimg.width, favimg.height, 0, 0, faviconWidth, faviconHeight)
+    }
     favcontext.fillStyle = badgeColor
     favcontext.beginPath()
     favcontext.arc(faviconWidth - badgeRadius, badgeRadius, badgeRadius, 0, 2 * Math.PI, false)

From d126eddfcac6e54f337e5aa3b9744a46f01e7ba9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 3 Nov 2020 18:39:46 +0200
Subject: [PATCH 064/389] change approach to disable all, enable some

---
 src/components/extra_buttons/extra_buttons.vue  |  4 ----
 .../favorite_button/favorite_button.vue         |  4 ----
 src/components/react_button/react_button.vue    |  4 ----
 src/components/reply_button/reply_button.vue    |  4 ----
 .../retweet_button/retweet_button.vue           |  4 ----
 src/components/status/status.scss               | 17 ++++++-----------
 src/components/status/status.vue                |  1 -
 .../status_content/status_content.vue           |  4 ----
 src/components/user_card/user_card.vue          |  4 ----
 9 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 984b0483..a33f6e87 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -120,9 +120,5 @@
     color: $fallback--text;
     color: var(--text, $fallback--text);
   }
-
-  ._misclick-prevention & {
-    pointer-events: none !important;
-  }
 }
 </style>
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index 55872133..dfe12f86 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -35,10 +35,6 @@
       color: $fallback--cOrange;
       color: var(--cOrange, $fallback--cOrange);
     }
-
-    ._misclick-prevention & {
-      pointer-events: none !important;
-    }
   }
 
   &.-favorited {
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index bb4472d7..95d95b11 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -107,10 +107,6 @@
     color: $fallback--text;
     color: var(--text, $fallback--text);
   }
-
-  ._misclick-prevention & {
-    pointer-events: none !important;
-  }
 }
 
 </style>
diff --git a/src/components/reply_button/reply_button.vue b/src/components/reply_button/reply_button.vue
index 4ca37d5e..a0ac8941 100644
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@@ -34,10 +34,6 @@
       color: $fallback--cBlue;
       color: var(--cBlue, $fallback--cBlue);
     }
-
-    ._misclick-prevention & {
-      pointer-events: none !important;
-    }
   }
 }
 </style>
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index b79fcd75..b234f3d9 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -45,10 +45,6 @@
       color: $fallback--cGreen;
       color: var(--cGreen, $fallback--cGreen);
     }
-
-    ._misclick-prevention & {
-      pointer-events: none !important;
-    }
   }
 
   &.-repeated {
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 769f7ef4..0a94de32 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -59,9 +59,12 @@ $status-margin: 0.75em;
     justify-content: flex-end;
   }
 
-  .user-avatar {
-    ._misclick-prevention & {
-      pointer-events: none !important;
+  ._misclick-prevention & {
+    pointer-events: none;
+
+    .attachments {
+      pointer-events: initial;
+      cursor: initial;
     }
   }
 
@@ -114,10 +117,6 @@ $status-margin: 0.75em;
     a {
       display: inline-block;
       word-break: break-all;
-
-      ._misclick-prevention & {
-        pointer-events: none !important;
-      }
     }
   }
 
@@ -260,10 +259,6 @@ $status-margin: 0.75em;
       vertical-align: middle;
       object-fit: contain;
     }
-
-    ._misclick-prevention & a {
-      pointer-events: none !important;
-    }
   }
 
   .status-fadein {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index eb54befc..21412faa 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -119,7 +119,6 @@
         >
           <router-link
             :to="userProfileLink"
-            class="user-avatar"
             @click.stop.prevent.capture.native="toggleUserExpanded"
           >
             <UserAvatar
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index e3875498..321cd477 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -240,10 +240,6 @@ $status-margin: 0.75em;
     word-wrap: break-word;
     word-break: break-word;
 
-    ._misclick-prevention & :not(.attachments) a {
-      pointer-events: none !important;
-    }
-
     blockquote {
       margin: 0.2em 0 0.2em 2em;
       font-style: italic;
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index d1cfe654..f916af9d 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -282,10 +282,6 @@
 .user-card {
   position: relative;
 
-  ._misclick-prevention & {
-    pointer-events: none !important;
-  }
-
   &:hover .Avatar {
     --_still-image-img-visibility: visible;
     --_still-image-canvas-visibility: hidden;

From 4e4b258c547fd4dba2be02aa66a1fd3aa2bb58ef Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 3 Nov 2020 18:45:23 +0200
Subject: [PATCH 065/389] fix mobile badge alignment

---
 src/components/side_drawer/side_drawer.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 149f11cb..28c888fe 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -271,6 +271,12 @@
   --faintLink: var(--popoverFaintLink, $fallback--faint);
   --lightText: var(--popoverLightText, $fallback--lightText);
   --icon: var(--popoverIcon, $fallback--icon);
+
+  .badge {
+    position: absolute;
+    right: 0.7rem;
+    top: 1em;
+  }
 }
 
 .side-drawer-logo-wrapper {

From 15ea9d8c917d6d0408a9c48f38976d19f9936054 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Fri, 6 Nov 2020 01:20:08 +0300
Subject: [PATCH 066/389] Fix the chat scroll behavior for vertical screens.

Fetch the messages until the scrollbar becomes visible, so that the user
always has the ability to scroll up and load new messages.
---
 CHANGELOG.md                             |  1 +
 src/components/chat/chat.js              | 10 +++++++++-
 src/components/chat/chat_layout_utils.js |  7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c338de8..056a0881 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed multiple regressions in CSS styles
 - Fixed multiple issues with input fields when using CJK font as default
 - Fixed search field in navbar infringing into logo in some cases
+- Fixed not being able to load the chat history in vertical screens when the message list doesn't take the full height of the scrollable container on the first fetch.
 
 ### Changed
 - Clicking immediately when timeline shifts is now blocked to prevent misclicks
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 2887afb5..e57fcb91 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -6,7 +6,7 @@ import PostStatusForm from '../post_status_form/post_status_form.vue'
 import ChatTitle from '../chat_title/chat_title.vue'
 import chatService from '../../services/chat_service/chat_service.js'
 import { promiseInterval } from '../../services/promise_interval/promise_interval.js'
-import { getScrollPosition, getNewTopPosition, isBottomedOut, scrollableContainerHeight } from './chat_layout_utils.js'
+import { getScrollPosition, getNewTopPosition, isBottomedOut, scrollableContainerHeight, isScrollable } from './chat_layout_utils.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faChevronDown,
@@ -287,6 +287,14 @@ const Chat = {
               if (isFirstFetch) {
                 this.updateScrollableContainerHeight()
               }
+
+              // In vertical screens, the first batch of fetched messages may not always take the
+              // full height of the scrollable container.
+              // If this is the case, we want to fetch the messages until the scrollable container
+              // is fully populated so that the user has the ability to scroll up and load the history.
+              if (!isScrollable(this.$refs.scrollable) && messages.length > 0) {
+                this.fetchChat({ maxId: this.currentChatMessageService.minId })
+              }
             })
           })
         })
diff --git a/src/components/chat/chat_layout_utils.js b/src/components/chat/chat_layout_utils.js
index 609dc0c9..50a933ac 100644
--- a/src/components/chat/chat_layout_utils.js
+++ b/src/components/chat/chat_layout_utils.js
@@ -24,3 +24,10 @@ export const isBottomedOut = (el, offset = 0) => {
 export const scrollableContainerHeight = (inner, header, footer) => {
   return inner.offsetHeight - header.clientHeight - footer.clientHeight
 }
+
+// Returns whether or not the scrollbar is visible.
+export const isScrollable = (el) => {
+  if (!el) return
+
+  return el.scrollHeight > el.clientHeight
+}

From 82f17961d1c8f092453adb0b6c42b38157a63677 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Fri, 6 Nov 2020 17:36:43 +0000
Subject: [PATCH 067/389] Update CHANGELOG.md to match master

---
 CHANGELOG.md | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 056a0881..5feafcaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased]
+
+## [2.2.0] - 2020-11-06
 ### Added
 - New option to optimize timeline rendering to make the site more responsive (enabled by default)
 - New instance option `logoLeft` to move logo to the left side in desktop nav bar
@@ -12,8 +13,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added optimistic chat message sending, so you can start writing next message before the previous one has been sent
 
 ### Fixed
-- Fixed chats list not updating its order when new messages come in
-- Fixed chat messages sometimes getting lost when you receive a message at the same time
 - Fixed clicking NSFW hider through status popover
 - Fixed chat-view back button being hard to click
 - Fixed fresh chat notifications being cleared immediately while leaving the chat view and not having time to actually see the messages
@@ -29,6 +28,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Logo is now clickable
 - Changed default logo to SVG version
 
+
+## [2.1.2] - 2020-09-17
+### Fixed
+- Fixed chats list not updating its order when new messages come in
+- Fixed chat messages sometimes getting lost when you receive a message at the same time 
+
+
 ## [2.1.1] - 2020-09-08
 ### Changed
 - Polls will be hidden with status content if "Collapse posts with subjects" is enabled and the post is collapsed.
@@ -154,8 +160,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Ability to change user's email
 - About page
 - Added remote user redirect
-- Bookmarks
+
 ### Changed
 - changed the way fading effects for user profile/long statuses works, now uses css-mask instead of gradient background hacks which weren't exactly compatible with semi-transparent themes
+
 ### Fixed
 - improved hotkey behavior on autocomplete popup

From 9f96b592d4c1e0d68910307a296cf5536cb373a4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 9 Nov 2020 09:40:20 +0200
Subject: [PATCH 068/389] wrap react button icon to a span to fix popover
 overflow

---
 src/components/react_button/react_button.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 95d95b11..e508a3e9 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -4,6 +4,7 @@
     placement="top"
     :offset="{ y: 5 }"
     class="react-button-popover"
+    :bound-to="{ x: 'container' }"
   >
     <div
       slot="content"
@@ -37,12 +38,13 @@
         <div class="reaction-bottom-fader" />
       </div>
     </div>
-    <FAIcon
-      slot="trigger"
-      class="fa-scale-110 fa-old-padding add-reaction-button"
-      :icon="['far', 'smile-beam']"
-      :title="$t('tool_tip.add_reaction')"
-    />
+    <span slot="trigger">
+      <FAIcon
+        class="fa-scale-110 fa-old-padding add-reaction-button"
+        :icon="['far', 'smile-beam']"
+        :title="$t('tool_tip.add_reaction')"
+      />
+    </span>
   </Popover>
 </template>
 

From 9ff48b88bfc652b031786a9dea0f22b4f347c01b Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Mon, 9 Nov 2020 09:01:16 +0000
Subject: [PATCH 069/389] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5feafcaa..3bf8fa84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## [Unreleased]
+### Fixed
+- Fixed regression in react popup alignment and overflowing
+
+
 ## [2.2.0] - 2020-11-06
 ### Added
 - New option to optimize timeline rendering to make the site more responsive (enabled by default)

From 553155fc490d289242a0e57efab8de2834278959 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 9 Nov 2020 14:42:16 +0200
Subject: [PATCH 070/389] prevent call to scroll if the value doesn't change
 because firefox is stupid

---
 src/components/post_status_form/post_status_form.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index de583269..6a4efc2c 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -533,10 +533,12 @@ const PostStatusForm = {
       const totalDelta = shouldScrollToBottom ? bottomChangeDelta : 0
       const targetScroll = currentScroll + totalDelta
 
-      if (scrollerRef === window) {
-        scrollerRef.scroll(0, targetScroll)
-      } else {
-        scrollerRef.scrollTop = targetScroll
+      if (totalDelta >= 1) {
+        if (scrollerRef === window) {
+          scrollerRef.scroll(0, targetScroll)
+        } else {
+          scrollerRef.scrollTop = targetScroll
+        }
       }
 
       this.$refs['emoji-input'].resize()

From fb80dbbc77f25cdae818994a6d4828fa0d237504 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 9 Nov 2020 14:47:42 +0200
Subject: [PATCH 071/389] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bf8fa84..8f14bc59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Fixed
 - Fixed regression in react popup alignment and overflowing
+- Fixed the occasional bug where screen would scroll 1px when typing into a reply form
 
 
 ## [2.2.0] - 2020-11-06

From c1c207788a3599602888a9c5cadedd99561266af Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 9 Nov 2020 15:02:48 +0200
Subject: [PATCH 072/389] change method of fix to rounding

---
 src/components/post_status_form/post_status_form.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 6a4efc2c..3ff4a3c8 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -531,14 +531,12 @@ const PostStatusForm = {
             !(isFormBiggerThanScroller &&
               this.$refs.textarea.selectionStart !== this.$refs.textarea.value.length)
       const totalDelta = shouldScrollToBottom ? bottomChangeDelta : 0
-      const targetScroll = currentScroll + totalDelta
+      const targetScroll = Math.round(currentScroll + totalDelta)
 
-      if (totalDelta >= 1) {
-        if (scrollerRef === window) {
-          scrollerRef.scroll(0, targetScroll)
-        } else {
-          scrollerRef.scrollTop = targetScroll
-        }
+      if (scrollerRef === window) {
+        scrollerRef.scroll(0, targetScroll)
+      } else {
+        scrollerRef.scrollTop = targetScroll
       }
 
       this.$refs['emoji-input'].resize()

From d150dae5d156416351312f25b06de0013ee0a95d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 10 Nov 2020 12:52:54 +0200
Subject: [PATCH 073/389] fixes to timeline error handling

---
 src/components/timeline/timeline.js           | 12 +++-------
 src/components/timeline/timeline.vue          | 24 ++-----------------
 src/components/timeline_menu/timeline_menu.js |  5 ++--
 src/i18n/en.json                              |  2 +-
 src/modules/statuses.js                       |  2 --
 src/services/api/api.service.js               |  2 +-
 .../timeline_fetcher.service.js               | 15 ++++++++----
 7 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index cba46daf..665d195e 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -50,17 +50,10 @@ const Timeline = {
     TimelineMenu
   },
   computed: {
-    timelineError () {
-      return this.$store.state.statuses.error
-    },
-    errorData () {
-      return this.$store.state.statuses.errorData
-    },
     newStatusCount () {
       return this.timeline.newStatusCount
     },
     showLoadButton () {
-      if (this.timelineError || this.errorData) return false
       return this.timeline.newStatusCount > 0 || this.timeline.flushMarker !== 0
     },
     loadButtonString () {
@@ -171,11 +164,12 @@ const Timeline = {
         userId: this.userId,
         tag: this.tag
       }).then(({ statuses }) => {
-        store.commit('setLoading', { timeline: this.timelineName, value: false })
         if (statuses && statuses.length === 0) {
           this.bottomedOut = true
         }
-      })
+      }).finally(() =>
+        store.commit('setLoading', { timeline: this.timelineName, value: false })
+      )
     }, 1000, this),
     determineVisibleStatuses () {
       if (!this.$refs.timeline) return
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 04859852..d4da2a87 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -2,22 +2,8 @@
   <div :class="[classes.root, 'Timeline']">
     <div :class="classes.header">
       <TimelineMenu v-if="!embedded" />
-      <div
-        v-if="timelineError"
-        class="loadmore-error alert error"
-        @click.prevent
-      >
-        {{ $t('timeline.error_fetching') }}
-      </div>
-      <div
-        v-else-if="errorData"
-        class="loadmore-error alert error"
-        @click.prevent
-      >
-        {{ errorData.statusText }}
-      </div>
       <button
-        v-else-if="showLoadButton"
+        v-if="showLoadButton"
         class="loadmore-button"
         @click.prevent="showNewStatuses"
       >
@@ -76,18 +62,12 @@
         {{ $t('timeline.no_more_statuses') }}
       </div>
       <a
-        v-else-if="!timeline.loading && !errorData"
+        v-else-if="!timeline.loading"
         href="#"
         @click.prevent="fetchOlderStatuses()"
       >
         <div class="new-status-notification text-center panel-footer">{{ $t('timeline.load_older') }}</div>
       </a>
-      <a
-        v-else-if="errorData"
-        href="#"
-      >
-        <div class="new-status-notification text-center panel-footer">{{ errorData.error }}</div>
-      </a>
       <div
         v-else
         class="new-status-notification text-center panel-footer"
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index 4ccd52b4..ef8a5813 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -19,7 +19,7 @@ library.add(
   faChevronDown
 )
 
-// Route -> i18n key mapping, exported andnot in the computed
+// Route -> i18n key mapping, exported and not in the computed
 // because nav panel benefits from the same information.
 export const timelineNames = () => {
   return {
@@ -27,8 +27,7 @@ export const timelineNames = () => {
     'bookmarks': 'nav.bookmarks',
     'dms': 'nav.dms',
     'public-timeline': 'nav.public_tl',
-    'public-external-timeline': 'nav.twkn',
-    'tag-timeline': 'tag'
+    'public-external-timeline': 'nav.twkn'
   }
 }
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d3d57562..d5c5db28 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -634,7 +634,7 @@
   "timeline": {
     "collapse": "Collapse",
     "conversation": "Conversation",
-    "error_fetching": "Error fetching updates",
+    "error": "Error fetching timeline: {0}",
     "load_older": "Load older statuses",
     "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
     "repeated": "repeated",
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index e673141d..5296f611 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -50,8 +50,6 @@ export const defaultState = () => ({
   maxId: 0,
   notifications: emptyNotifications(),
   favorites: new Set(),
-  error: false,
-  errorData: null,
   timelines: {
     mentions: emptyTl(),
     public: emptyTl(),
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 22b5e8ba..8da933c4 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -560,7 +560,7 @@ const fetchTimeline = ({
     })
     .then((data) => data.json())
     .then((data) => {
-      if (!data.error) {
+      if (!data.errors) {
         return { data: data.map(isNotifications ? parseNotification : parseStatus), pagination }
       } else {
         data.status = status
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 72ea4890..0fdc579d 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -52,9 +52,8 @@ const fetchAndUpdate = ({
 
   return apiService.fetchTimeline(args)
     .then(response => {
-      if (response.error) {
-        store.dispatch('setErrorData', { value: response })
-        return
+      if (response.errors) {
+        throw new Error(`${response.status} ${response.statusText}`)
       }
 
       const { data: statuses, pagination } = response
@@ -63,7 +62,15 @@ const fetchAndUpdate = ({
       }
       update({ store, statuses, timeline, showImmediately, userId, pagination })
       return { statuses, pagination }
-    }, () => store.dispatch('setError', { value: true }))
+    })
+    .catch((error) => {
+      store.dispatch('pushGlobalNotice', {
+        level: 'error',
+        messageKey: 'timeline.error',
+        messageArgs: [error.message],
+        timeout: 5000
+      })
+    })
 }
 
 const startFetching = ({ timeline = 'friends', credentials, store, userId = false, tag = false }) => {

From 1d2ba946b6b81dc225d0eec21548a737ca2fac5e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 10 Nov 2020 14:28:10 +0200
Subject: [PATCH 074/389] make notifications also use the popup errors, remove
 all error from status/notif state

---
 CHANGELOG.md                                  |  4 ++++
 .../notifications/notifications.vue           |  7 -------
 src/i18n/en.json                              |  1 +
 src/modules/statuses.js                       | 21 +------------------
 .../notifications_fetcher.service.js          | 18 ++++++++++++----
 .../timeline_fetcher.service.js               |  3 ---
 .../specs/components/user_profile.spec.js     |  3 +--
 7 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f14bc59..a6b62bfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Fixed regression in react popup alignment and overflowing
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
+- Fixed timeline errors locking timelines
+
+### Changed
+- Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
 
 
 ## [2.2.0] - 2020-11-06
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index bd875cca..b976026e 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -15,13 +15,6 @@
             class="badge badge-notification unseen-count"
           >{{ unseenCount }}</span>
         </div>
-        <div
-          v-if="error"
-          class="loadmore-error alert error"
-          @click.prevent
-        >
-          {{ $t('timeline.error_fetching') }}
-        </div>
         <button
           v-if="unseenCount"
           class="read-button"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d5c5db28..3f6ae372 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -130,6 +130,7 @@
   },
   "notifications": {
     "broken_favorite": "Unknown status, searching for it…",
+    "error": "Error fetching notifications: {0}",
     "favorited_you": "favorited your status",
     "followed_you": "followed you",
     "follow_request": "wants to follow you",
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 5296f611..33c68c57 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -39,8 +39,7 @@ const emptyNotifications = () => ({
   minId: Number.POSITIVE_INFINITY,
   data: [],
   idStore: {},
-  loading: false,
-  error: false
+  loading: false
 })
 
 export const defaultState = () => ({
@@ -460,18 +459,9 @@ export const mutations = {
     const newStatus = state.allStatusesObject[id]
     newStatus.nsfw = nsfw
   },
-  setError (state, { value }) {
-    state.error = value
-  },
-  setErrorData (state, { value }) {
-    state.errorData = value
-  },
   setNotificationsLoading (state, { value }) {
     state.notifications.loading = value
   },
-  setNotificationsError (state, { value }) {
-    state.notifications.error = value
-  },
   setNotificationsSilence (state, { value }) {
     state.notifications.desktopNotificationSilence = value
   },
@@ -586,18 +576,9 @@ const statuses = {
       }
       commit('addNewNotifications', { dispatch, notifications, older, rootGetters, newNotificationSideEffects })
     },
-    setError ({ rootState, commit }, { value }) {
-      commit('setError', { value })
-    },
-    setErrorData ({ rootState, commit }, { value }) {
-      commit('setErrorData', { value })
-    },
     setNotificationsLoading ({ rootState, commit }, { value }) {
       commit('setNotificationsLoading', { value })
     },
-    setNotificationsError ({ rootState, commit }, { value }) {
-      commit('setNotificationsError', { value })
-    },
     setNotificationsSilence ({ rootState, commit }, { value }) {
       commit('setNotificationsSilence', { value })
     },
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index c908b644..beeb167c 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -2,7 +2,6 @@ import apiService from '../api/api.service.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
 const update = ({ store, notifications, older }) => {
-  store.dispatch('setNotificationsError', { value: false })
   store.dispatch('addNewNotifications', { notifications, older })
 }
 
@@ -47,11 +46,22 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
 
 const fetchNotifications = ({ store, args, older }) => {
   return apiService.fetchTimeline(args)
-    .then(({ data: notifications }) => {
+    .then((response) => {
+      if (response.errors) {
+        throw new Error(`${response.status} ${response.statusText}`)
+      }
+      const notifications = response.data
       update({ store, notifications, older })
       return notifications
-    }, () => store.dispatch('setNotificationsError', { value: true }))
-    .catch(() => store.dispatch('setNotificationsError', { value: true }))
+    })
+    .catch((error) => {
+      store.dispatch('pushGlobalNotice', {
+        level: 'error',
+        messageKey: 'notifications.error',
+        messageArgs: [error.message],
+        timeout: 5000
+      })
+    })
 }
 
 const startFetching = ({ credentials, store }) => {
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 0fdc579d..921df3ed 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -6,9 +6,6 @@ import { promiseInterval } from '../promise_interval/promise_interval.js'
 const update = ({ store, statuses, timeline, showImmediately, userId, pagination }) => {
   const ccTimeline = camelCase(timeline)
 
-  store.dispatch('setError', { value: false })
-  store.dispatch('setErrorData', { value: null })
-
   store.dispatch('addNewStatuses', {
     timeline: ccTimeline,
     userId,
diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
index dcf066f9..80092b41 100644
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -8,8 +8,7 @@ const localVue = createLocalVue()
 localVue.use(Vuex)
 
 const mutations = {
-  clearTimeline: () => {},
-  setError: () => {}
+  clearTimeline: () => {}
 }
 
 const actions = {

From 41dbdc2b28d4a5187db7c393cee5e99cdbb28fb3 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 11 Nov 2020 10:40:26 +0200
Subject: [PATCH 075/389] fix emoji not working in profile field names

---
 src/components/user_profile/user_profile.vue               | 7 +++----
 .../entity_normalizer/entity_normalizer.service.js         | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index f1f51840..745e795d 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -20,14 +20,13 @@
           :key="index"
           class="user-profile-field"
         >
+          <!-- eslint-disable vue/no-v-html -->
           <dt
             :title="user.fields_text[index].name"
             class="user-profile-field-name"
             @click.prevent="linkClicked"
-          >
-            {{ field.name }}
-          </dt>
-          <!-- eslint-disable vue/no-v-html -->
+            v-html="field.name"
+          />
           <dd
             :title="user.fields_text[index].value"
             class="user-profile-field-value"
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 9d09b8d0..a4c1a1bf 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -53,7 +53,7 @@ export const parseUser = (data) => {
     output.fields = data.fields
     output.fields_html = data.fields.map(field => {
       return {
-        name: addEmojis(field.name, data.emojis),
+        name: addEmojis(escape(field.name), data.emojis),
         value: addEmojis(field.value, data.emojis)
       }
     })

From b536c6e3c59c9e43beca288c4e581534230afadb Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 11 Nov 2020 10:42:13 +0200
Subject: [PATCH 076/389] changelog mention

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f14bc59..bf9898a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Fixed regression in react popup alignment and overflowing
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
+- Fixed custom emoji not working in profile field names
 
 
 ## [2.2.0] - 2020-11-06

From 476154d0ee696f49d262408a4a5aecb1dd792992 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Wed, 11 Nov 2020 11:57:42 -0700
Subject: [PATCH 077/389] Remove title from index.html, title is now from
 server generated meta

---
 index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/index.html b/index.html
index 1ff944d9..ba072eda 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,6 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
-    <title>Pleroma</title>
     <!--server-generated-meta-->
     <link rel="icon" type="image/png" href="/favicon.png">
   </head>

From 6cdf347ed16547e09807b61d611ad35e640db95d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 11 Nov 2020 23:04:07 +0200
Subject: [PATCH 078/389] update changelog

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf9898a2..6e4bf822 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ### Fixed
-- Fixed regression in react popup alignment and overflowing
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
 - Fixed custom emoji not working in profile field names
 
 
+## [2.2.1] - 2020-11-11
+### Fixed
+- Fixed regression in react popup alignment and overflowing
+
+
 ## [2.2.0] - 2020-11-06
 ### Added
 - New option to optimize timeline rendering to make the site more responsive (enabled by default)

From 49f7c84e3f4c17415fb5b4f17fd789d76fff05f4 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 17 Nov 2020 15:25:38 +0200
Subject: [PATCH 079/389] Fix pinned statuses and perhaps some other stuff

---
 src/modules/users.js                                 |  6 ++++--
 .../entity_normalizer/entity_normalizer.service.js   | 12 +++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/modules/users.js b/src/modules/users.js
index 9245db5c..655db4c7 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -137,11 +137,11 @@ export const mutations = {
   },
   saveFriendIds (state, { id, friendIds }) {
     const user = state.usersObject[id]
-    user.friendIds = uniq(concat(user.friendIds, friendIds))
+    user.friendIds = uniq(concat(user.friendIds || [], friendIds))
   },
   saveFollowerIds (state, { id, followerIds }) {
     const user = state.usersObject[id]
-    user.followerIds = uniq(concat(user.followerIds, followerIds))
+    user.followerIds = uniq(concat(user.followerIds || [], followerIds))
   },
   // Because frontend doesn't have a reason to keep these stuff in memory
   // outside of viewing someones user profile.
@@ -202,7 +202,9 @@ export const mutations = {
   },
   setPinnedToUser (state, status) {
     const user = state.usersObject[status.user.id]
+    user.pinnedStatusIds = user.pinnedStatusIds || []
     const index = user.pinnedStatusIds.indexOf(status.id)
+
     if (status.pinned && index === -1) {
       user.pinnedStatusIds.push(status.id)
     } else if (!status.pinned && index !== -1) {
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index a4c1a1bf..e3a52489 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -2,6 +2,15 @@ import escape from 'escape-html'
 import parseLinkHeader from 'parse-link-header'
 import { isStatusNotification } from '../notification_utils/notification_utils.js'
 
+/** NOTICE! **
+ * Do not initialize UI-generated data here.
+ * It will override existing data.
+ *
+ * i.e. user.pinnedStatusIds was set to [] here
+ * UI code would update it with data but upon next user fetch
+ * it would be reverted back to []
+ */
+
 const qvitterStatusType = (status) => {
   if (status.is_post_verb) {
     return 'status'
@@ -173,9 +182,6 @@ export const parseUser = (data) => {
   output.locked = data.locked
   output.followers_count = data.followers_count
   output.statuses_count = data.statuses_count
-  output.friendIds = []
-  output.followerIds = []
-  output.pinnedStatusIds = []
 
   if (data.pleroma) {
     output.follow_request_count = data.pleroma.follow_request_count

From dd3c8631bf0ec21735d97c41e9e64d0d05643dbc Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 17 Nov 2020 17:46:26 +0200
Subject: [PATCH 080/389] store failed experiment

---
 src/components/emoji_input/emoji_input.js     |  37 ++---
 src/components/emoji_input/suggestor.js       | 130 ++++++++++--------
 .../post_status_form/post_status_form.js      |   3 +-
 src/modules/users.js                          |   4 +-
 4 files changed, 97 insertions(+), 77 deletions(-)

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 87303d08..7fe25ff4 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -114,7 +114,8 @@ const EmojiInput = {
       showPicker: false,
       temporarilyHideSuggestions: false,
       keepOpen: false,
-      disableClickOutside: false
+      disableClickOutside: false,
+      suggestions: []
     }
   },
   components: {
@@ -124,21 +125,6 @@ const EmojiInput = {
     padEmoji () {
       return this.$store.getters.mergedConfig.padEmoji
     },
-    suggestions () {
-      const firstchar = this.textAtCaret.charAt(0)
-      if (this.textAtCaret === firstchar) { return [] }
-      const matchedSuggestions = this.suggest(this.textAtCaret)
-      if (matchedSuggestions.length <= 0) {
-        return []
-      }
-      return take(matchedSuggestions, 5)
-        .map(({ imageUrl, ...rest }, index) => ({
-          ...rest,
-          // eslint-disable-next-line camelcase
-          img: imageUrl || '',
-          highlighted: index === this.highlighted
-        }))
-    },
     showSuggestions () {
       return this.focused &&
         this.suggestions &&
@@ -187,7 +173,25 @@ const EmojiInput = {
   },
   watch: {
     showSuggestions: function (newValue) {
+      console.log('showSuggestions watch', newValue, this.suggestions)
       this.$emit('shown', newValue)
+    },
+    textAtCaret: async function (textAtCaret) {
+      const firstchar = textAtCaret.charAt(0)
+      this.suggestions = []
+      if (textAtCaret === firstchar) return
+      const matchedSuggestions = await this.suggest(textAtCaret)
+      // Async, cancel if textAtCaret has been updated while waiting
+      if (this.textAtCaret !== textAtCaret) return
+      if (matchedSuggestions.length <= 0) return
+      this.suggestions = take(matchedSuggestions, 10)
+        .map(({ imageUrl, ...rest }, index) => ({
+          ...rest,
+          // eslint-disable-next-line camelcase
+          img: imageUrl || '',
+          highlighted: index === this.highlighted
+        }))
+      this.scrollIntoView()
     }
   },
   methods: {
@@ -341,6 +345,7 @@ const EmojiInput = {
         const { offsetHeight } = this.input.elm
         const { picker } = this.$refs
         const pickerBottom = picker.$el.getBoundingClientRect().bottom
+        console.log('setting bottom', pickerBottom > window.innerHeight)
         if (pickerBottom > window.innerHeight) {
           picker.$el.style.top = 'auto'
           picker.$el.style.bottom = offsetHeight + 'px'
diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 8330345b..9bf53183 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -1,4 +1,3 @@
-import { debounce } from 'lodash'
 /**
  * suggest - generates a suggestor function to be used by emoji-input
  * data: object providing source information for specific types of suggestions:
@@ -11,19 +10,19 @@ import { debounce } from 'lodash'
  * doesn't support user linking you can just provide only emoji.
  */
 
-const debounceUserSearch = debounce((data, input) => {
-  data.updateUsersList(input)
-}, 500)
-
-export default data => input => {
-  const firstChar = input[0]
-  if (firstChar === ':' && data.emoji) {
-    return suggestEmoji(data.emoji)(input)
+export default data => {
+  const emojiCurry = suggestEmoji(data.emoji)
+  const usersCurry = suggestUsers(data.dispatch)
+  return input => {
+    const firstChar = input[0]
+    if (firstChar === ':' && data.emoji) {
+      return emojiCurry(input)
+    }
+    if (firstChar === '@' && data.dispatch) {
+      return usersCurry(input)
+    }
+    return []
   }
-  if (firstChar === '@' && data.users) {
-    return suggestUsers(data)(input)
-  }
-  return []
 }
 
 export const suggestEmoji = emojis => input => {
@@ -57,50 +56,67 @@ export const suggestEmoji = emojis => input => {
     })
 }
 
-export const suggestUsers = data => input => {
-  const noPrefix = input.toLowerCase().substr(1)
-  const users = data.users
+export const suggestUsers = (dispatch) => {
+  let suggestions = []
+  let previousQuery = ''
+  let timeout = null
 
-  const newUsers = users.filter(
-    user =>
-      user.screen_name.toLowerCase().startsWith(noPrefix) ||
-      user.name.toLowerCase().startsWith(noPrefix)
-
-    /* taking only 20 results so that sorting is a bit cheaper, we display
-     * only 5 anyway. could be inaccurate, but we ideally we should query
-     * backend anyway
-     */
-  ).slice(0, 20).sort((a, b) => {
-    let aScore = 0
-    let bScore = 0
-
-    // Matches on screen name (i.e. user@instance) makes a priority
-    aScore += a.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0
-    bScore += b.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0
-
-    // Matches on name takes second priority
-    aScore += a.name.toLowerCase().startsWith(noPrefix) ? 1 : 0
-    bScore += b.name.toLowerCase().startsWith(noPrefix) ? 1 : 0
-
-    const diff = (bScore - aScore) * 10
-
-    // Then sort alphabetically
-    const nameAlphabetically = a.name > b.name ? 1 : -1
-    const screenNameAlphabetically = a.screen_name > b.screen_name ? 1 : -1
-
-    return diff + nameAlphabetically + screenNameAlphabetically
-    /* eslint-disable camelcase */
-  }).map(({ screen_name, name, profile_image_url_original }) => ({
-    displayText: screen_name,
-    detailText: name,
-    imageUrl: profile_image_url_original,
-    replacement: '@' + screen_name + ' '
-  }))
-
-  // BE search users to get more comprehensive results
-  if (data.updateUsersList) {
-    debounceUserSearch(data, noPrefix)
+  const userSearch = (query) => dispatch('searchUsers', { query, saveUsers: false })
+  const debounceUserSearch = (query) => {
+    return new Promise((resolve, reject) => {
+      clearTimeout(timeout)
+      timeout = setTimeout(() => {
+        userSearch(query).then(resolve).catch(reject)
+      }, 300)
+    })
+  }
+
+  return async input => {
+    const noPrefix = input.toLowerCase().substr(1)
+    if (previousQuery === noPrefix) return suggestions
+
+    suggestions = []
+    previousQuery = noPrefix
+    const users = await debounceUserSearch(noPrefix)
+
+    const newUsers = users.filter(
+      user =>
+        user.screen_name.toLowerCase().startsWith(noPrefix) ||
+        user.name.toLowerCase().startsWith(noPrefix)
+
+      /* taking only 20 results so that sorting is a bit cheaper, we display
+       * only 5 anyway. could be inaccurate, but we ideally we should query
+       * backend anyway
+       */
+    ).slice(0, 20).sort((a, b) => {
+      let aScore = 0
+      let bScore = 0
+
+      // Matches on screen name (i.e. user@instance) makes a priority
+      aScore += a.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0
+      bScore += b.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0
+
+      // Matches on name takes second priority
+      aScore += a.name.toLowerCase().startsWith(noPrefix) ? 1 : 0
+      bScore += b.name.toLowerCase().startsWith(noPrefix) ? 1 : 0
+
+      const diff = (bScore - aScore) * 10
+
+      // Then sort alphabetically
+      const nameAlphabetically = a.name > b.name ? 1 : -1
+      const screenNameAlphabetically = a.screen_name > b.screen_name ? 1 : -1
+
+      return diff + nameAlphabetically + screenNameAlphabetically
+      /* eslint-disable camelcase */
+    }).map(({ screen_name, name, profile_image_url_original }) => ({
+      displayText: screen_name,
+      detailText: name,
+      imageUrl: profile_image_url_original,
+      replacement: '@' + screen_name + ' '
+    }))
+
+    suggestions = newUsers || []
+    return suggestions
+    /* eslint-enable camelcase */
   }
-  return newUsers
-  /* eslint-enable camelcase */
 }
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 3ff4a3c8..e38f1c0c 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -159,8 +159,7 @@ const PostStatusForm = {
           ...this.$store.state.instance.emoji,
           ...this.$store.state.instance.customEmoji
         ],
-        users: this.$store.state.users.users,
-        updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
+        dispatch: this.$store.dispatch
       })
     },
     emojiSuggestor () {
diff --git a/src/modules/users.js b/src/modules/users.js
index 9245db5c..13df9df4 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -440,10 +440,10 @@ const users = {
         store.commit('setUserForNotification', notification)
       })
     },
-    searchUsers ({ rootState, commit }, { query }) {
+    searchUsers ({ rootState, commit }, { query, saveUsers = true }) {
       return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
-          commit('addNewUsers', users)
+          if (saveUsers) commit('addNewUsers', users)
           return users
         })
     },

From 5c47aeeccf9f087a60de1280fa03486ccdf05fa5 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 17 Nov 2020 20:32:39 +0200
Subject: [PATCH 081/389] changelong

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e4bf822..bb55d3e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
 - Fixed custom emoji not working in profile field names
+- Fixed pinned statuses not appearing in user profiles
 
 
 ## [2.2.1] - 2020-11-11

From 0f386ccbc7115fd1d74615377beca9982dec00bf Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 18 Nov 2020 18:43:24 +0200
Subject: [PATCH 082/389] use users state + fetching with delay

---
 src/components/emoji_input/emoji_input.js     |  8 ++---
 src/components/emoji_input/suggestor.js       | 30 +++++++++++++------
 .../post_status_form/post_status_form.js      |  2 +-
 .../settings_modal/tabs/profile_tab.js        |  8 ++---
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 7fe25ff4..16243a56 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -173,7 +173,6 @@ const EmojiInput = {
   },
   watch: {
     showSuggestions: function (newValue) {
-      console.log('showSuggestions watch', newValue, this.suggestions)
       this.$emit('shown', newValue)
     },
     textAtCaret: async function (textAtCaret) {
@@ -184,14 +183,16 @@ const EmojiInput = {
       // Async, cancel if textAtCaret has been updated while waiting
       if (this.textAtCaret !== textAtCaret) return
       if (matchedSuggestions.length <= 0) return
-      this.suggestions = take(matchedSuggestions, 10)
+      this.suggestions = take(matchedSuggestions, 5)
         .map(({ imageUrl, ...rest }, index) => ({
           ...rest,
           // eslint-disable-next-line camelcase
           img: imageUrl || '',
           highlighted: index === this.highlighted
         }))
-      this.scrollIntoView()
+    },
+    suggestions (newValue) {
+      this.$nextTick(this.resize)
     }
   },
   methods: {
@@ -345,7 +346,6 @@ const EmojiInput = {
         const { offsetHeight } = this.input.elm
         const { picker } = this.$refs
         const pickerBottom = picker.$el.getBoundingClientRect().bottom
-        console.log('setting bottom', pickerBottom > window.innerHeight)
         if (pickerBottom > window.innerHeight) {
           picker.$el.style.top = 'auto'
           picker.$el.style.bottom = offsetHeight + 'px'
diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 9bf53183..0d268f85 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -12,13 +12,13 @@
 
 export default data => {
   const emojiCurry = suggestEmoji(data.emoji)
-  const usersCurry = suggestUsers(data.dispatch)
+  const usersCurry = data.store && suggestUsers(data.store)
   return input => {
     const firstChar = input[0]
     if (firstChar === ':' && data.emoji) {
       return emojiCurry(input)
     }
-    if (firstChar === '@' && data.dispatch) {
+    if (firstChar === '@' && usersCurry) {
       return usersCurry(input)
     }
     return []
@@ -56,18 +56,24 @@ export const suggestEmoji = emojis => input => {
     })
 }
 
-export const suggestUsers = (dispatch) => {
+export const suggestUsers = ({ dispatch, state }) => {
   let suggestions = []
   let previousQuery = ''
   let timeout = null
+  let cancelUserSearch = null
 
-  const userSearch = (query) => dispatch('searchUsers', { query, saveUsers: false })
+  const userSearch = (query) => dispatch('searchUsers', { query })
   const debounceUserSearch = (query) => {
+    cancelUserSearch && cancelUserSearch()
     return new Promise((resolve, reject) => {
       clearTimeout(timeout)
       timeout = setTimeout(() => {
         userSearch(query).then(resolve).catch(reject)
       }, 300)
+      cancelUserSearch = () => {
+        clearTimeout(timeout)
+        resolve([])
+      }
     })
   }
 
@@ -77,9 +83,15 @@ export const suggestUsers = (dispatch) => {
 
     suggestions = []
     previousQuery = noPrefix
-    const users = await debounceUserSearch(noPrefix)
+    // Fetch more and wait, don't fetch if there's the 2nd @ because
+    // the backend user search can't deal with it.
+    // Reference semantics make it so that we get the updated data after
+    // the await.
+    if (!noPrefix.includes('@')) {
+      await debounceUserSearch(noPrefix)
+    }
 
-    const newUsers = users.filter(
+    const newSuggestions = state.users.users.filter(
       user =>
         user.screen_name.toLowerCase().startsWith(noPrefix) ||
         user.name.toLowerCase().startsWith(noPrefix)
@@ -114,9 +126,9 @@ export const suggestUsers = (dispatch) => {
       imageUrl: profile_image_url_original,
       replacement: '@' + screen_name + ' '
     }))
-
-    suggestions = newUsers || []
-    return suggestions
     /* eslint-enable camelcase */
+
+    suggestions = newSuggestions || []
+    return suggestions
   }
 }
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index e38f1c0c..4148381c 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -159,7 +159,7 @@ const PostStatusForm = {
           ...this.$store.state.instance.emoji,
           ...this.$store.state.instance.customEmoji
         ],
-        dispatch: this.$store.dispatch
+        store: this.$store
       })
     },
     emojiSuggestor () {
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index a3e4feaf..a4fed629 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -68,8 +68,7 @@ const ProfileTab = {
           ...this.$store.state.instance.emoji,
           ...this.$store.state.instance.customEmoji
         ],
-        users: this.$store.state.users.users,
-        updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
+        store: this.$store
       })
     },
     emojiSuggestor () {
@@ -79,10 +78,7 @@ const ProfileTab = {
       ] })
     },
     userSuggestor () {
-      return suggestor({
-        users: this.$store.state.users.users,
-        updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
-      })
+      return suggestor({ store: this.$store })
     },
     fieldsLimits () {
       return this.$store.state.instance.fieldsLimits

From 1495db084ae49cc5133678d61e19d90333cbe31d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 19 Nov 2020 11:37:06 +0200
Subject: [PATCH 083/389] fix keyboard highlight

---
 src/components/emoji_input/emoji_input.js  | 5 ++---
 src/components/emoji_input/emoji_input.vue | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 16243a56..d32e19bf 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -184,11 +184,10 @@ const EmojiInput = {
       if (this.textAtCaret !== textAtCaret) return
       if (matchedSuggestions.length <= 0) return
       this.suggestions = take(matchedSuggestions, 5)
-        .map(({ imageUrl, ...rest }, index) => ({
+        .map(({ imageUrl, ...rest }) => ({
           ...rest,
           // eslint-disable-next-line camelcase
-          img: imageUrl || '',
-          highlighted: index === this.highlighted
+          img: imageUrl || ''
         }))
     },
     suggestions (newValue) {
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 224e72cf..107e16c1 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -37,7 +37,7 @@
           v-for="(suggestion, index) in suggestions"
           :key="index"
           class="autocomplete-item"
-          :class="{ highlighted: suggestion.highlighted }"
+          :class="{ highlighted: index === highlighted }"
           @click.stop.prevent="onClick($event, suggestion)"
         >
           <span class="image">

From 1cd222d85ce578fbbefb51f9d0b6df569a33bf4e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 19 Nov 2020 11:42:30 +0200
Subject: [PATCH 084/389] changelog mention

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e4bf822..17fb1de8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
 - Fixed custom emoji not working in profile field names
+- Fixed username autocomplete being jumpy
 
 
 ## [2.2.1] - 2020-11-11

From 419df9d44673bf1abe3cda7ba6cafee9dd6eaba4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 19 Nov 2020 12:35:21 +0200
Subject: [PATCH 085/389] update some documentation

---
 src/components/emoji_input/emoji_input.js | 12 ++++++------
 src/components/emoji_input/suggestor.js   |  8 ++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index d32e19bf..3deeb6c8 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -175,13 +175,13 @@ const EmojiInput = {
     showSuggestions: function (newValue) {
       this.$emit('shown', newValue)
     },
-    textAtCaret: async function (textAtCaret) {
-      const firstchar = textAtCaret.charAt(0)
+    textAtCaret: async function (newWord) {
+      const firstchar = newWord.charAt(0)
       this.suggestions = []
-      if (textAtCaret === firstchar) return
-      const matchedSuggestions = await this.suggest(textAtCaret)
-      // Async, cancel if textAtCaret has been updated while waiting
-      if (this.textAtCaret !== textAtCaret) return
+      if (newWord === firstchar) return
+      const matchedSuggestions = await this.suggest(newWord)
+      // Async: cancel if textAtCaret has changed during wait
+      if (this.textAtCaret !== newWord) return
       if (matchedSuggestions.length <= 0) return
       this.suggestions = take(matchedSuggestions, 5)
         .map(({ imageUrl, ...rest }) => ({
diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 0d268f85..14a2b41e 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -57,6 +57,8 @@ export const suggestEmoji = emojis => input => {
 }
 
 export const suggestUsers = ({ dispatch, state }) => {
+  // Keep some persistent values in closure, most importantly for the
+  // custom debounce to work. Lodash debounce does not return a promise.
   let suggestions = []
   let previousQuery = ''
   let timeout = null
@@ -66,7 +68,6 @@ export const suggestUsers = ({ dispatch, state }) => {
   const debounceUserSearch = (query) => {
     cancelUserSearch && cancelUserSearch()
     return new Promise((resolve, reject) => {
-      clearTimeout(timeout)
       timeout = setTimeout(() => {
         userSearch(query).then(resolve).catch(reject)
       }, 300)
@@ -95,11 +96,6 @@ export const suggestUsers = ({ dispatch, state }) => {
       user =>
         user.screen_name.toLowerCase().startsWith(noPrefix) ||
         user.name.toLowerCase().startsWith(noPrefix)
-
-      /* taking only 20 results so that sorting is a bit cheaper, we display
-       * only 5 anyway. could be inaccurate, but we ideally we should query
-       * backend anyway
-       */
     ).slice(0, 20).sort((a, b) => {
       let aScore = 0
       let bScore = 0

From 4001c075d4921082adcc9485adee14442e81600e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 19 Nov 2020 14:19:03 +0200
Subject: [PATCH 086/389] add missing play-circle icon

---
 src/components/attachment/attachment.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index e23fcb1b..3877b67f 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -8,14 +8,16 @@ import {
   faFile,
   faMusic,
   faImage,
-  faVideo
+  faVideo,
+  faPlayCircle
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
   faFile,
   faMusic,
   faImage,
-  faVideo
+  faVideo,
+  faPlayCircle
 )
 
 const Attachment = {

From 0089d1e8d1aace0ab801f0cff701fed61106cfee Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Thu, 19 Nov 2020 17:45:15 +0100
Subject: [PATCH 087/389] video_attachment: Only preload metadata

This hints browsers that only the metadata and maybe the first few frames are
needed. Which avoids downloading the entire video, which isn't really needed
in our case.
---
 src/components/video_attachment/video_attachment.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/video_attachment/video_attachment.vue b/src/components/video_attachment/video_attachment.vue
index a4bf01e8..8a3ea1e3 100644
--- a/src/components/video_attachment/video_attachment.vue
+++ b/src/components/video_attachment/video_attachment.vue
@@ -1,6 +1,7 @@
 <template>
   <video
     class="video"
+    preload="metadata"
     :src="attachment.url"
     :loop="loopVideo"
     :controls="controls"

From 45180d406927185ea287049cf4a1fe3aa395bffb Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Thu, 12 Nov 2020 06:16:41 +0300
Subject: [PATCH 088/389] Added the NSFW alert to the link preview.

---
 CHANGELOG.md                                 |  3 ++-
 src/components/link-preview/link-preview.js  | 15 +++++++++++++--
 src/components/link-preview/link-preview.vue | 17 +++++++++++------
 src/i18n/en.json                             |  5 +++--
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87123ddc..3242d860 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Proper handling of deletes when using websocket streaming
 - Added optimistic chat message sending, so you can start writing next message before the previous one has been sent
 - Added a small red badge to the favicon when there's unread notifications
+- Added the NSFW alert to link previews
 
 ### Fixed
 - Fixed clicking NSFW hider through status popover
@@ -45,7 +46,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [2.1.2] - 2020-09-17
 ### Fixed
 - Fixed chats list not updating its order when new messages come in
-- Fixed chat messages sometimes getting lost when you receive a message at the same time 
+- Fixed chat messages sometimes getting lost when you receive a message at the same time
 
 
 ## [2.1.1] - 2020-09-08
diff --git a/src/components/link-preview/link-preview.js b/src/components/link-preview/link-preview.js
index 444aafbe..add7c563 100644
--- a/src/components/link-preview/link-preview.js
+++ b/src/components/link-preview/link-preview.js
@@ -1,3 +1,5 @@
+import { mapGetters } from 'vuex'
+
 const LinkPreview = {
   name: 'LinkPreview',
   props: [
@@ -15,11 +17,20 @@ const LinkPreview = {
       // Currently BE shoudn't give cards if tagged NSFW, this is a bit paranoid
       // as it makes sure to hide the image if somehow NSFW tagged preview can
       // exist.
-      return this.card.image && !this.nsfw && this.size !== 'hide'
+      return this.card.image && !this.censored && this.size !== 'hide'
+    },
+    censored () {
+      return this.nsfw && this.hideNsfwConfig
     },
     useDescription () {
       return this.card.description && /\S/.test(this.card.description)
-    }
+    },
+    hideNsfwConfig () {
+      return this.mergedConfig.hideNsfw
+    },
+    ...mapGetters([
+      'mergedConfig'
+    ])
   },
   created () {
     if (this.useImage) {
diff --git a/src/components/link-preview/link-preview.vue b/src/components/link-preview/link-preview.vue
index 69171977..d3ca39b8 100644
--- a/src/components/link-preview/link-preview.vue
+++ b/src/components/link-preview/link-preview.vue
@@ -9,12 +9,17 @@
       <div
         v-if="useImage && imageLoaded"
         class="card-image"
-        :class="{ 'small-image': size === 'small' }"
       >
         <img :src="card.image">
       </div>
       <div class="card-content">
-        <span class="card-host faint">{{ card.provider_name }}</span>
+        <span class="card-host faint">
+          <span
+            v-if="censored"
+            class="nsfw-alert alert warning"
+          >{{ $t('status.nsfw') }}</span>
+          {{ card.provider_name }}
+        </span>
         <h4 class="card-title">{{ card.title }}</h4>
         <p
           v-if="useDescription"
@@ -50,10 +55,6 @@
     }
   }
 
-  .small-image {
-    width: 80px;
-  }
-
   .card-content {
     max-height: 100%;
     margin: 0.5em;
@@ -76,6 +77,10 @@
     max-height: calc(1.2em * 3 - 1px);
   }
 
+  .nsfw-alert {
+    margin: 2em 0;
+  }
+
   color: $fallback--text;
   color: var(--text, $fallback--text);
   border-style: solid;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d3d57562..c5387ae5 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -376,7 +376,7 @@
     "hide_followers_count_description": "Don't show follower count",
     "show_admin_badge": "Show Admin badge in my profile",
     "show_moderator_badge": "Show Moderator badge in my profile",
-    "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
+    "nsfw_clickthrough": "Enable clickthrough attachment and link preview image hiding for NSFW statuses",
     "oauth_tokens": "OAuth tokens",
     "token": "Token",
     "refresh_token": "Refresh Token",
@@ -666,7 +666,8 @@
     "hide_full_subject": "Hide full subject",
     "show_content": "Show content",
     "hide_content": "Hide content",
-    "status_deleted": "This post was deleted"
+    "status_deleted": "This post was deleted",
+    "nsfw": "NSFW"
   },
   "user_card": {
     "approve": "Approve",

From f5186e1a33e17152c923e5e407ec238e3c040299 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 20 Nov 2020 16:02:47 +0200
Subject: [PATCH 089/389] add back red line

---
 CHANGELOG.md                                 | 1 +
 src/components/conversation/conversation.vue | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f21dc4c..123e5347 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
 - Fixed timeline errors locking timelines
+- Fixed missing highlighted border in expanded conversations
 
 ### Changed
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index e0b9fcc5..89ac6bdc 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -58,6 +58,8 @@
 
   &.-expanded {
     .conversation-status {
+      border-left-style: solid;
+      border-left-width: 4px;
       border-color: $fallback--border;
       border-color: var(--border, $fallback--border);
       border-left-color: $fallback--cRed;

From 11f7b818b4f07c0281ba85ed694a6d862401f7e2 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 20 Nov 2020 16:20:08 +0200
Subject: [PATCH 090/389] try another approach

---
 src/components/conversation/conversation.vue | 9 ---------
 src/components/status/status.scss            | 2 ++
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 89ac6bdc..fd0dfa8f 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -57,15 +57,6 @@
   }
 
   &.-expanded {
-    .conversation-status {
-      border-left-style: solid;
-      border-left-width: 4px;
-      border-color: $fallback--border;
-      border-color: var(--border, $fallback--border);
-      border-left-color: $fallback--cRed;
-      border-left-color: var(--cRed, $fallback--cRed);
-    }
-
     .conversation-status:last-child {
       border-bottom: none;
       border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 0a94de32..70c6d03d 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -29,6 +29,8 @@ $status-margin: 0.75em;
   &.-conversation {
     border-left-width: 4px;
     border-left-style: solid;
+    border-left-color: $fallback--cRed;
+    border-left-color: var(--cRed, $fallback--cRed);
   }
 
   .gravestone {

From 7b99d98c553f40ec4d633d0d4fdf65f275c80e77 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 24 Nov 2020 12:32:42 +0200
Subject: [PATCH 091/389] Replace all use of <a> + href='#' with proper buttons

---
 src/App.scss                                  | 32 +++++++++--
 .../account_actions/account_actions.vue       | 14 ++---
 .../async_component_error.vue                 |  2 +-
 src/components/attachment/attachment.js       |  6 ++-
 src/components/attachment/attachment.vue      | 28 ++++++----
 src/components/block_card/block_card.vue      |  4 +-
 src/components/chat_list/chat_list.vue        |  5 +-
 src/components/chat_message/chat_message.scss |  3 --
 src/components/chat_message/chat_message.vue  |  4 +-
 src/components/conversation/conversation.vue  | 13 ++---
 src/components/desktop_nav/desktop_nav.scss   | 10 ++--
 src/components/desktop_nav/desktop_nav.vue    | 40 +++++++-------
 .../domain_mute_card/domain_mute_card.vue     |  4 +-
 .../emoji_reactions/emoji_reactions.vue       |  2 +-
 .../export_import/export_import.vue           |  4 +-
 src/components/exporter/exporter.vue          |  2 +-
 .../extra_buttons/extra_buttons.vue           | 28 +++++-----
 .../favorite_button/favorite_button.js        |  5 --
 .../favorite_button/favorite_button.vue       | 38 ++++++-------
 .../follow_button/follow_button.vue           |  2 +-
 .../follow_request_card.vue                   |  4 +-
 .../image_cropper/image_cropper.vue           |  6 +--
 src/components/importer/importer.vue          |  2 +-
 src/components/login_form/login_form.vue      |  2 +-
 src/components/media_upload/media_upload.vue  | 54 ++++++++-----------
 src/components/mfa_form/recovery_form.vue     | 14 ++---
 src/components/mfa_form/totp_form.vue         | 14 ++---
 src/components/mobile_nav/mobile_nav.vue      | 14 +++--
 .../mobile_post_status_button.vue             |  2 +-
 .../moderation_tools/moderation_tools.vue     |  6 +--
 src/components/mute_card/mute_card.vue        |  4 +-
 src/components/notification/notification.vue  | 13 +++--
 .../notifications/notifications.vue           |  8 +--
 .../password_reset/password_reset.vue         |  2 +-
 src/components/poll/poll.vue                  |  2 +-
 .../post_status_form/post_status_form.vue     | 34 ++++++------
 src/components/react_button/react_button.vue  | 13 +++--
 src/components/registration/registration.vue  |  2 +-
 src/components/reply_button/reply_button.vue  | 19 ++++---
 .../retweet_button/retweet_button.js          |  5 --
 .../retweet_button/retweet_button.vue         | 48 ++++++++---------
 src/components/search_bar/search_bar.vue      | 32 ++++++-----
 .../settings_modal/settings_modal.vue         |  4 +-
 .../tabs/mutes_and_blocks_tab.vue             | 10 ++--
 .../settings_modal/tabs/notifications_tab.vue |  2 +-
 .../settings_modal/tabs/profile_tab.vue       |  8 +--
 .../tabs/security_tab/confirm.vue             |  4 +-
 .../settings_modal/tabs/security_tab/mfa.vue  | 10 ++--
 .../tabs/security_tab/mfa_totp.vue            |  4 +-
 .../tabs/security_tab/security_tab.vue        | 10 ++--
 .../settings_modal/tabs/theme_tab/preview.vue |  4 +-
 .../tabs/theme_tab/theme_tab.vue              | 28 +++++-----
 .../shadow_control/shadow_control.vue         |  8 +--
 src/components/side_drawer/side_drawer.vue    | 15 +++---
 src/components/status/status.vue              | 35 ++++++------
 .../status_content/status_content.vue         | 37 ++++++-------
 src/components/tab_switcher/tab_switcher.js   |  2 +-
 src/components/timeline/timeline.vue          |  8 +--
 src/components/user_card/user_card.vue        | 10 ++--
 .../user_reporting_modal.vue                  |  2 +-
 60 files changed, 384 insertions(+), 363 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index ca7d33cd..ef2a13b1 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -33,6 +33,7 @@ h4 {
   max-width: 980px;
   align-content: flex-start;
 }
+
 .underlay {
   background-color: rgba(0,0,0,0.15);
   background-color: var(--underlay, rgba(0,0,0,0.15));
@@ -69,7 +70,7 @@ a {
   color: var(--link, $fallback--link);
 }
 
-button {
+.button-default {
   user-select: none;
   color: $fallback--text;
   color: var(--btnText, $fallback--text);
@@ -85,7 +86,9 @@ button {
   font-family: sans-serif;
   font-family: var(--interfaceFont, sans-serif);
 
-  i[class*=icon-], .svg-inline--fa {
+  i[class*=icon-],
+  :not(&.-icon),
+  .svg-inline--fa {
     color: $fallback--text;
     color: var(--btnText, $fallback--text);
   }
@@ -149,6 +152,29 @@ button {
   }
 }
 
+.button-unstyled {
+  background: none;
+  border: none;
+  outline: none;
+  display: inline;
+  text-align: initial;
+  font-size: 100%;
+  font-family: inherit;
+  padding: 0;
+  line-height: unset;
+  cursor: pointer;
+
+  &.-link {
+    color: $fallback--link;
+    color: var(--link, $fallback--link);
+  }
+
+  &.-padded {
+    padding: 5px;
+    margin: -5px;
+  }
+}
+
 input, textarea, .select, .input {
 
   &.unstyled {
@@ -797,7 +823,7 @@ nav {
   }
 }
 
-.btn.btn-default {
+.btn.button-default {
   min-height: 28px;
 }
 
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index e3ae376e..c10b09b8 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -13,14 +13,14 @@
           <template v-if="relationship.following">
             <button
               v-if="relationship.showing_reblogs"
-              class="btn btn-default dropdown-item"
+              class="btn button-default dropdown-item"
               @click="hideRepeats"
             >
               {{ $t('user_card.hide_repeats') }}
             </button>
             <button
               v-if="!relationship.showing_reblogs"
-              class="btn btn-default dropdown-item"
+              class="btn button-default dropdown-item"
               @click="showRepeats"
             >
               {{ $t('user_card.show_repeats') }}
@@ -32,27 +32,27 @@
           </template>
           <button
             v-if="relationship.blocking"
-            class="btn btn-default btn-block dropdown-item"
+            class="btn button-default btn-block dropdown-item"
             @click="unblockUser"
           >
             {{ $t('user_card.unblock') }}
           </button>
           <button
             v-else
-            class="btn btn-default btn-block dropdown-item"
+            class="btn button-default btn-block dropdown-item"
             @click="blockUser"
           >
             {{ $t('user_card.block') }}
           </button>
           <button
-            class="btn btn-default btn-block dropdown-item"
+            class="btn button-default btn-block dropdown-item"
             @click="reportUser"
           >
             {{ $t('user_card.report') }}
           </button>
           <button
             v-if="pleromaChatMessagesAvailable"
-            class="btn btn-default btn-block dropdown-item"
+            class="btn button-default btn-block dropdown-item"
             @click="openChat"
           >
             {{ $t('user_card.message') }}
@@ -61,7 +61,7 @@
       </div>
       <div
         slot="trigger"
-        class="btn btn-default ellipsis-button"
+        class="ellipsis-button"
       >
         <FAIcon
           class="icon"
diff --git a/src/components/async_component_error/async_component_error.vue b/src/components/async_component_error/async_component_error.vue
index b68b98f9..b1b59638 100644
--- a/src/components/async_component_error/async_component_error.vue
+++ b/src/components/async_component_error/async_component_error.vue
@@ -8,7 +8,7 @@
         {{ $t('general.error_retry') }}
       </p>
       <button
-        class="btn"
+        class="btn button-default"
         @click="retry"
       >
         {{ $t('general.retry') }}
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 3877b67f..5f5779a0 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -9,7 +9,8 @@ import {
   faMusic,
   faImage,
   faVideo,
-  faPlayCircle
+  faPlayCircle,
+  faTimes
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -17,7 +18,8 @@ library.add(
   faMusic,
   faImage,
   faVideo,
-  faPlayCircle
+  faPlayCircle,
+  faTimes
 )
 
 const Attachment = {
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index f1fac2c8..b072b170 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -42,15 +42,13 @@
         icon="play-circle"
       />
     </a>
-    <div
+    <button
       v-if="nsfw && hideNsfwLocal && !hidden"
-      class="hider"
+      class="button-unstyled -padded hider"
+      @click.prevent="toggleHidden"
     >
-      <a
-        href="#"
-        @click.prevent="toggleHidden"
-      >Hide</a>
-    </div>
+      <FAIcon icon="times" />
+    </button>
 
     <a
       v-if="type === 'image' && (!hidden || preloadImage)"
@@ -234,15 +232,23 @@
   .hider {
     position: absolute;
     right: 0;
-    white-space: nowrap;
     margin: 10px;
     padding: 5px;
-    background: rgba(230,230,230,0.6);
-    font-weight: bold;
     z-index: 4;
-    line-height: 1;
     border-radius: $fallback--tooltipRadius;
     border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+    text-align: center;
+    width: 2em;
+    height: 2em;
+    font-size: 1.25em;
+    // TODO: theming? hard to theme with unknown background image color
+    background: rgba(230, 230, 230, 0.7);
+    .svg-inline--fa {
+      color: rgba(0, 0, 0, 0.6);
+    }
+    &:hover .svg-inline--fa {
+      color: rgba(0, 0, 0, 0.9);
+    }
   }
 
   video {
diff --git a/src/components/block_card/block_card.vue b/src/components/block_card/block_card.vue
index 5b00b738..2fe66d4c 100644
--- a/src/components/block_card/block_card.vue
+++ b/src/components/block_card/block_card.vue
@@ -3,7 +3,7 @@
     <div class="block-card-content-container">
       <button
         v-if="blocked"
-        class="btn btn-default"
+        class="btn button-default"
         :disabled="progress"
         @click="unblockUser"
       >
@@ -16,7 +16,7 @@
       </button>
       <button
         v-else
-        class="btn btn-default"
+        class="btn button-default"
         :disabled="progress"
         @click="blockUser"
       >
diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue
index 17e2f795..e23eec13 100644
--- a/src/components/chat_list/chat_list.vue
+++ b/src/components/chat_list/chat_list.vue
@@ -10,7 +10,10 @@
       <span class="title">
         {{ $t("chats.chats") }}
       </span>
-      <button @click="newChat">
+      <button
+        class="button-default"
+        @click="newChat"
+      >
         {{ $t("chats.new") }}
       </button>
     </div>
diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss
index 5af744a3..e4351d3b 100644
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@@ -31,9 +31,6 @@
       color: $fallback--text;
       color: var(--text, $fallback--text);
     }
-
-    border-radius: $fallback--chatMessageRadius;
-    border-radius: var(--chatMessageRadius, $fallback--chatMessageRadius);
   }
 
   .popover {
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index 3849ab6e..0777f880 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -53,7 +53,7 @@
                 <div slot="content">
                   <div class="dropdown-menu">
                     <button
-                      class="dropdown-item dropdown-item-icon"
+                      class="button-default dropdown-item dropdown-item-icon"
                       @click="deleteMessage"
                     >
                       <FAIcon icon="times" /> {{ $t("chats.delete") }}
@@ -62,7 +62,7 @@
                 </div>
                 <button
                   slot="trigger"
-                  class="menu-icon"
+                  class="button-default menu-icon"
                   :title="$t('chats.more')"
                 >
                   <FAIcon icon="ellipsis-h" />
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index fd0dfa8f..353859b8 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -10,12 +10,13 @@
       class="panel-heading conversation-heading"
     >
       <span class="title"> {{ $t('timeline.conversation') }} </span>
-      <span v-if="collapsable">
-        <a
-          href="#"
-          @click.prevent="toggleExpanded"
-        >{{ $t('timeline.collapse') }}</a>
-      </span>
+      <button
+        v-if="collapsable"
+        class="button-unstyled -link"
+        @click.prevent="toggleExpanded"
+      >
+        {{ $t('timeline.collapse') }}
+      </button>
     </div>
     <status
       v-for="status in conversation"
diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index 028692a9..7ec0caf7 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -80,12 +80,14 @@
   .nav-icon {
     margin-left: 0.2em;
     width: 2em;
+    height: 100%;
     text-align: center;
-  }
+    cursor: pointer;
 
-  a, a svg {
-    color: $fallback--link;
-    color: var(--topBarLink, $fallback--link);
+    .svg-inline--fa {
+      color: $fallback--link;
+      color: var(--topBarLink, $fallback--link);
+    }
   }
 
   .sitename {
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 3a6e4033..762aa610 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -36,9 +36,8 @@
           @toggled="onSearchBarToggled"
           @click.stop.native
         />
-        <a
-          href="#"
-          class="nav-icon"
+        <button
+          class="button-unstyled nav-icon"
           @click.stop="openSettingsModal"
         >
           <FAIcon
@@ -47,29 +46,32 @@
             icon="cog"
             :title="$t('nav.preferences')"
           />
-        </a>
+        </button>
         <a
           v-if="currentUser && currentUser.role === 'admin'"
           href="/pleroma/admin/#/login-pleroma"
           class="nav-icon"
           target="_blank"
-        ><FAIcon
-          fixed-width
-          class="fa-scale-110 fa-old-padding"
-          icon="tachometer-alt"
-          :title="$t('nav.administration')"
-        /></a>
-        <a
+        >
+          <FAIcon
+            fixed-width
+            class="fa-scale-110 fa-old-padding"
+            icon="tachometer-alt"
+            :title="$t('nav.administration')"
+          />
+        </a>
+        <button
           v-if="currentUser"
-          href="#"
-          class="nav-icon"
+          class="button-unstyled nav-icon"
           @click.prevent="logout"
-        ><FAIcon
-          fixed-width
-          class="fa-scale-110 fa-old-padding"
-          icon="sign-out-alt"
-          :title="$t('login.logout')"
-        /></a>
+        >
+          <FAIcon
+            fixed-width
+            class="fa-scale-110 fa-old-padding"
+            icon="sign-out-alt"
+            :title="$t('login.logout')"
+          />
+        </button>
       </div>
     </div>
   </nav>
diff --git a/src/components/domain_mute_card/domain_mute_card.vue b/src/components/domain_mute_card/domain_mute_card.vue
index 97aee243..3b5aec14 100644
--- a/src/components/domain_mute_card/domain_mute_card.vue
+++ b/src/components/domain_mute_card/domain_mute_card.vue
@@ -6,7 +6,7 @@
     <ProgressButton
       v-if="muted"
       :click="unmuteDomain"
-      class="btn btn-default"
+      class="btn button-default"
     >
       {{ $t('domain_mute_card.unmute') }}
       <template slot="progress">
@@ -16,7 +16,7 @@
     <ProgressButton
       v-else
       :click="muteDomain"
-      class="btn btn-default"
+      class="btn button-default"
     >
       {{ $t('domain_mute_card.mute') }}
       <template slot="progress">
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 2f14b5b2..51d50359 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -6,7 +6,7 @@
       :users="accountsForEmoji[reaction.name]"
     >
       <button
-        class="emoji-reaction btn btn-default"
+        class="emoji-reaction btn button-default"
         :class="{ 'picked-reaction': reactedWith(reaction.name), 'not-clickable': !loggedIn }"
         @click="emojiOnClick(reaction.name, $event)"
         @mouseenter="fetchEmojiReactionsByIfMissing()"
diff --git a/src/components/export_import/export_import.vue b/src/components/export_import/export_import.vue
index ae00487f..8ffe34f8 100644
--- a/src/components/export_import/export_import.vue
+++ b/src/components/export_import/export_import.vue
@@ -2,13 +2,13 @@
   <div class="import-export-container">
     <slot name="before" />
     <button
-      class="btn"
+      class="btn button-default"
       @click="exportData"
     >
       {{ exportLabel }}
     </button>
     <button
-      class="btn"
+      class="btn button-default"
       @click="importData"
     >
       {{ importLabel }}
diff --git a/src/components/exporter/exporter.vue b/src/components/exporter/exporter.vue
index ecd71bf1..d6a03088 100644
--- a/src/components/exporter/exporter.vue
+++ b/src/components/exporter/exporter.vue
@@ -11,7 +11,7 @@
     </div>
     <button
       v-else
-      class="btn btn-default"
+      class="btn button-default"
       @click="process"
     >
       {{ exportButtonLabel }}
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index a33f6e87..5c9e1963 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -12,7 +12,7 @@
       <div class="dropdown-menu">
         <button
           v-if="canMute && !status.thread_muted"
-          class="dropdown-item dropdown-item-icon"
+          class="button-default dropdown-item dropdown-item-icon"
           @click.prevent="muteConversation"
         >
           <FAIcon
@@ -22,7 +22,7 @@
         </button>
         <button
           v-if="canMute && status.thread_muted"
-          class="dropdown-item dropdown-item-icon"
+          class="button-default dropdown-item dropdown-item-icon"
           @click.prevent="unmuteConversation"
         >
           <FAIcon
@@ -32,7 +32,7 @@
         </button>
         <button
           v-if="!status.pinned && canPin"
-          class="dropdown-item dropdown-item-icon"
+          class="button-default dropdown-item dropdown-item-icon"
           @click.prevent="pinStatus"
           @click="close"
         >
@@ -43,7 +43,7 @@
         </button>
         <button
           v-if="status.pinned && canPin"
-          class="dropdown-item dropdown-item-icon"
+          class="button-default dropdown-item dropdown-item-icon"
           @click.prevent="unpinStatus"
           @click="close"
         >
@@ -54,7 +54,7 @@
         </button>
         <button
           v-if="!status.bookmarked"
-          class="dropdown-item dropdown-item-icon"
+          class="button-default dropdown-item dropdown-item-icon"
           @click.prevent="bookmarkStatus"
           @click="close"
         >
@@ -65,7 +65,7 @@
         </button>
         <button
           v-if="status.bookmarked"
-          class="dropdown-item dropdown-item-icon"
+          class="button-default dropdown-item dropdown-item-icon"
           @click.prevent="unbookmarkStatus"
           @click="close"
         >
@@ -76,7 +76,7 @@
         </button>
         <button
           v-if="canDelete"
-          class="dropdown-item dropdown-item-icon"
+          class="button-default dropdown-item dropdown-item-icon"
           @click.prevent="deleteStatus"
           @click="close"
         >
@@ -86,7 +86,7 @@
           /><span>{{ $t("status.delete") }}</span>
         </button>
         <button
-          class="dropdown-item dropdown-item-icon"
+          class="button-default dropdown-item dropdown-item-icon"
           @click.prevent="copyLink"
           @click="close"
         >
@@ -97,12 +97,15 @@
         </button>
       </div>
     </div>
-    <span slot="trigger">
+    <button
+      slot="trigger"
+      class="ExtraButtons button-unstyled -padded"
+    >
       <FAIcon
-        class="ExtraButtons fa-scale-110 fa-old-padding"
+        class="fa-scale-110 fa-old-padding"
         icon="ellipsis-h"
       />
-    </span>
+    </button>
   </Popover>
 </template>
 
@@ -115,8 +118,7 @@
   cursor: pointer;
   position: static;
 
-  &:hover,
-  .extra-button-popover.open & {
+  &:hover .svg-inline--fa {
     color: $fallback--text;
     color: var(--text, $fallback--text);
   }
diff --git a/src/components/favorite_button/favorite_button.js b/src/components/favorite_button/favorite_button.js
index 2a2ee84a..5cd05f73 100644
--- a/src/components/favorite_button/favorite_button.js
+++ b/src/components/favorite_button/favorite_button.js
@@ -31,11 +31,6 @@ const FavoriteButton = {
     }
   },
   computed: {
-    classes () {
-      return {
-        '-favorited': this.status.favorited
-      }
-    },
     ...mapGetters(['mergedConfig'])
   }
 }
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index dfe12f86..d54ae78c 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -1,18 +1,20 @@
 <template>
-  <div v-if="loggedIn">
-    <FAIcon
-      :class="classes"
-      class="FavoriteButton fa-scale-110 fa-old-padding -interactive"
+  <div>
+    <button
+      v-if="loggedIn"
+      class="FavoriteButton -interactive button-unstyled -padded"
+      :class="status.favorited && '-favorited'"
       :title="$t('tool_tip.favorite')"
-      :icon="[status.favorited ? 'fas' : 'far', 'star']"
-      :spin="animated"
       @click.prevent="favorite()"
-    />
-    <span v-if="!mergedConfig.hidePostStats && status.fave_num > 0">{{ status.fave_num }}</span>
-  </div>
-  <div v-else>
+    >
+      <FAIcon
+        class="fa-scale-110 fa-old-padding"
+        :icon="[status.favorited ? 'fas' : 'far', 'star']"
+        :spin="animated"
+      />
+    </button>
     <FAIcon
-      :class="classes"
+      v-else
       class="FavoriteButton fa-scale-110 fa-old-padding"
       :title="$t('tool_tip.favorite')"
       :icon="['far', 'star']"
@@ -28,18 +30,16 @@
 
 .FavoriteButton {
   &.-interactive {
-    cursor: pointer;
-    animation-duration: 0.6s;
 
-    &:hover {
+    .svg-inline--fa {
+      animation-duration: 0.6s;
+    }
+
+    &:hover .svg-inline--fa,
+    &.-favorited .svg-inline--fa {
       color: $fallback--cOrange;
       color: var(--cOrange, $fallback--cOrange);
     }
   }
-
-  &.-favorited {
-    color: $fallback--cOrange;
-    color: var(--cOrange, $fallback--cOrange);
-  }
 }
 </style>
diff --git a/src/components/follow_button/follow_button.vue b/src/components/follow_button/follow_button.vue
index bfdc137b..7f85f1d7 100644
--- a/src/components/follow_button/follow_button.vue
+++ b/src/components/follow_button/follow_button.vue
@@ -1,6 +1,6 @@
 <template>
   <button
-    class="btn btn-default follow-button"
+    class="btn button-default follow-button"
     :class="{ toggled: isPressed }"
     :disabled="inProgress"
     :title="title"
diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue
index b217b8ed..1b12ba4b 100644
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@@ -2,13 +2,13 @@
   <basic-user-card :user="user">
     <div class="follow-request-card-content-container">
       <button
-        class="btn btn-default"
+        class="btn button-default"
         @click="approveUser"
       >
         {{ $t('user_card.approve') }}
       </button>
       <button
-        class="btn btn-default"
+        class="btn button-default"
         @click="denyUser"
       >
         {{ $t('user_card.deny') }}
diff --git a/src/components/image_cropper/image_cropper.vue b/src/components/image_cropper/image_cropper.vue
index 75def612..448461b4 100644
--- a/src/components/image_cropper/image_cropper.vue
+++ b/src/components/image_cropper/image_cropper.vue
@@ -11,21 +11,21 @@
       </div>
       <div class="image-cropper-buttons-wrapper">
         <button
-          class="btn"
+          class="button-default btn"
           type="button"
           :disabled="submitting"
           @click="submit()"
           v-text="saveText"
         />
         <button
-          class="btn"
+          class="button-default btn"
           type="button"
           :disabled="submitting"
           @click="destroy"
           v-text="cancelText"
         />
         <button
-          class="btn"
+          class="button-default btn"
           type="button"
           :disabled="submitting"
           @click="submit(false)"
diff --git a/src/components/importer/importer.vue b/src/components/importer/importer.vue
index c4fe5b00..210823f5 100644
--- a/src/components/importer/importer.vue
+++ b/src/components/importer/importer.vue
@@ -15,7 +15,7 @@
     />
     <button
       v-else
-      class="btn btn-default"
+      class="btn button-default"
       @click="submit"
     >
       {{ submitButtonLabel }}
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index a1f77210..bfabb946 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -61,7 +61,7 @@
             <button
               :disabled="loggingIn"
               type="submit"
-              class="btn btn-default"
+              class="btn button-default"
             >
               {{ $t('login.login') }}
             </button>
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index 88251a26..e955aa72 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -1,33 +1,29 @@
 <template>
-  <div
+  <label
     class="media-upload"
     :class="{ disabled: disabled }"
+    :title="$t('tool_tip.media_upload')"
   >
-    <label
-      class="label"
-      :title="$t('tool_tip.media_upload')"
+    <FAIcon
+      v-if="uploading"
+      class="progress-icon"
+      icon="circle-notch"
+      spin
+    />
+    <FAIcon
+      v-if="!uploading"
+      class="new-icon"
+      icon="upload"
+    />
+    <input
+      v-if="uploadReady"
+      :disabled="disabled"
+      type="file"
+      style="position: fixed; top: -100em"
+      multiple="true"
+      @change="change"
     >
-      <FAIcon
-        v-if="uploading"
-        class="progress-icon"
-        icon="circle-notch"
-        spin
-      />
-      <FAIcon
-        v-if="!uploading"
-        class="new-icon"
-        icon="upload"
-      />
-      <input
-        v-if="uploadReady"
-        :disabled="disabled"
-        type="file"
-        style="position: fixed; top: -100em"
-        multiple="true"
-        @change="change"
-      >
-    </label>
-  </div>
+  </label>
 </template>
 
 <script src="./media_upload.js" ></script>
@@ -36,12 +32,6 @@
 @import '../../_variables.scss';
 
 .media-upload {
-  .label {
-    display: inline-block;
-  }
-
-  .new-icon {
-    cursor: pointer;
-  }
+  cursor: pointer;
 }
  </style>
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index 78953649..0bf68e27 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -23,23 +23,23 @@
         <div class="form-group">
           <div class="login-bottom">
             <div>
-              <a
-                href="#"
+              <button
+                class="button-unstyled -link"
                 @click.prevent="requireTOTP"
               >
                 {{ $t('login.enter_two_factor_code') }}
-              </a>
+              </button>
               <br>
-              <a
-                href="#"
+              <button
+                class="button-unstyled -link"
                 @click.prevent="abortMFA"
               >
                 {{ $t('general.cancel') }}
-              </a>
+              </button>
             </div>
             <button
               type="submit"
-              class="btn btn-default"
+              class="btn button-default"
             >
               {{ $t('general.verify') }}
             </button>
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index 9401cad5..79230148 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -25,23 +25,23 @@
         <div class="form-group">
           <div class="login-bottom">
             <div>
-              <a
-                href="#"
+              <button
+                class="button-unstyled -link"
                 @click.prevent="requireRecovery"
               >
                 {{ $t('login.enter_recovery_code') }}
-              </a>
+              </button>
               <br>
-              <a
-                href="#"
+              <button
+                class="button-unstyled -link"
                 @click.prevent="abortMFA"
               >
                 {{ $t('general.cancel') }}
-              </a>
+              </button>
             </div>
             <button
               type="submit"
-              class="btn btn-default"
+              class="btn button-default"
             >
               {{ $t('general.verify') }}
             </button>
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 5304a500..0f0ea457 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -9,9 +9,8 @@
       @click="scrollToTop()"
     >
       <div class="item">
-        <a
-          href="#"
-          class="mobile-nav-button"
+        <button
+          class="button-unstyled mobile-nav-button"
           @click.stop.prevent="toggleMobileSidebar()"
         >
           <FAIcon
@@ -22,7 +21,7 @@
             v-if="unreadChatCount"
             class="alert-dot"
           />
-        </a>
+        </button>
         <router-link
           v-if="!hideSitename"
           class="site-name"
@@ -33,10 +32,9 @@
         </router-link>
       </div>
       <div class="item right">
-        <a
+        <button
           v-if="currentUser"
-          class="mobile-nav-button"
-          href="#"
+          class="button-unstyled mobile-nav-button"
           @click.stop.prevent="openMobileNotifications()"
         >
           <FAIcon
@@ -47,7 +45,7 @@
             v-if="unseenNotificationsCount"
             class="alert-dot"
           />
-        </a>
+        </button>
       </div>
     </nav>
     <div
diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.vue b/src/components/mobile_post_status_button/mobile_post_status_button.vue
index 50529878..767f8244 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.vue
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="isLoggedIn">
     <button
-      class="new-status-button"
+      class="button-default new-status-button"
       :class="{ 'hidden': isHidden }"
       @click="openPostForm"
     >
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index 60fa6ceb..0ae9246b 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -124,7 +124,7 @@
       </div>
       <button
         slot="trigger"
-        class="btn btn-default btn-block"
+        class="btn button-default btn-block"
         :class="{ toggled }"
       >
         {{ $t('user_card.admin_menu.moderation') }}
@@ -141,13 +141,13 @@
         <p>{{ $t('user_card.admin_menu.delete_user_confirmation') }}</p>
         <template slot="footer">
           <button
-            class="btn btn-default"
+            class="btn button-default"
             @click="deleteUserDialog(false)"
           >
             {{ $t('general.cancel') }}
           </button>
           <button
-            class="btn btn-default danger"
+            class="btn button-default danger"
             @click="deleteUser()"
           >
             {{ $t('user_card.admin_menu.delete_user') }}
diff --git a/src/components/mute_card/mute_card.vue b/src/components/mute_card/mute_card.vue
index 9611fb82..ca33c6c5 100644
--- a/src/components/mute_card/mute_card.vue
+++ b/src/components/mute_card/mute_card.vue
@@ -3,7 +3,7 @@
     <div class="mute-card-content-container">
       <button
         v-if="muted"
-        class="btn btn-default"
+        class="btn button-default"
         :disabled="progress"
         @click="unmuteUser"
       >
@@ -16,7 +16,7 @@
       </button>
       <button
         v-else
-        class="btn btn-default"
+        class="btn button-default"
         :disabled="progress"
         @click="muteUser"
       >
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 2bbde108..ba3648fd 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -14,14 +14,13 @@
           {{ notification.from_profile.screen_name }}
         </router-link>
       </small>
-      <a
-        href="#"
-        class="unmute"
+      <button
+        class="button-unstyled unmute"
         @click.prevent="toggleMute"
       ><FAIcon
         class="fa-scale-110 fa-old-padding"
         icon="eye-slash"
-      /></a>
+      /></button>
     </div>
     <div
       v-else
@@ -132,14 +131,14 @@
               />
             </span>
           </div>
-          <a
+          <button
             v-if="needMute"
-            href="#"
+            class="button-unstyled"
             @click.prevent="toggleMute"
           ><FAIcon
             class="fa-scale-110 fa-old-padding"
             icon="eye-slash"
-          /></a>
+          /></button>
         </span>
         <div
           v-if="notification.type === 'follow' || notification.type === 'follow_request'"
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index b976026e..663f623b 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -17,7 +17,7 @@
         </div>
         <button
           v-if="unseenCount"
-          class="read-button"
+          class="button-default read-button"
           @click.prevent="markAsSeen"
         >
           {{ $t('notifications.read') }}
@@ -41,15 +41,15 @@
         >
           {{ $t('notifications.no_more_notifications') }}
         </div>
-        <a
+        <button
           v-else-if="!loading"
-          href="#"
+          class="button-unstyled -link"
           @click.prevent="fetchOlderNotifications()"
         >
           <div class="new-status-notification text-center panel-footer">
             {{ minimalMode ? $t('interactions.load_older') : $t('notifications.load_older') }}
           </div>
-        </a>
+        </button>
         <div
           v-else
           class="new-status-notification text-center panel-footer"
diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue
index 0deb9ccf..a931cb5a 100644
--- a/src/components/password_reset/password_reset.vue
+++ b/src/components/password_reset/password_reset.vue
@@ -51,7 +51,7 @@
               <button
                 :disabled="isPending"
                 type="submit"
-                class="btn btn-default btn-block"
+                class="btn button-default btn-block"
               >
                 {{ $t('general.submit') }}
               </button>
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 5f54b416..264a5f03 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -49,7 +49,7 @@
     <div class="footer faint">
       <button
         v-if="!showResults"
-        class="btn btn-default poll-vote-button"
+        class="btn button-default poll-vote-button"
         type="button"
         :disabled="isDisabled"
         @click="vote"
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 42d3152b..ed830f57 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -24,12 +24,12 @@
           tag="p"
           class="visibility-notice"
         >
-          <a
-            href="#"
+          <button
+            class="button-unstyled -link"
             @click="openProfileTab"
           >
             {{ $t('post_status.account_not_locked_warning_link') }}
-          </a>
+          </button>
         </i18n>
         <p
           v-if="!hideScopeNotice && newStatus.visibility === 'public'"
@@ -243,38 +243,34 @@
             @upload-failed="uploadFailed"
             @all-uploaded="finishedUploadingFiles"
           />
-          <div
-            class="emoji-icon"
+          <button
+            class="emoji-icon button-unstyled"
+            :title="$t('emoji.add_emoji')"
+            @click="showEmojiPicker"
           >
-            <div
-              :title="$t('emoji.add_emoji')"
-              class="btn btn-default"
-              @click="showEmojiPicker"
-            >
-              <FAIcon icon="smile-beam" />
-            </div>
-          </div>
-          <div
+            <FAIcon icon="smile-beam" />
+          </button>
+          <button
             v-if="pollsAvailable"
-            class="poll-icon"
+            class="poll-icon button-unstyled"
             :class="{ selected: pollFormVisible }"
             :title="$t('polls.add_poll')"
             @click="togglePollForm"
           >
             <FAIcon icon="poll-h" />
-          </div>
+          </button>
         </div>
         <button
           v-if="posting"
           disabled
-          class="btn btn-default"
+          class="btn button-default"
         >
           {{ $t('post_status.posting') }}
         </button>
         <button
           v-else-if="isOverLengthLimit"
           disabled
-          class="btn btn-default"
+          class="btn button-default"
         >
           {{ $t('general.submit') }}
         </button>
@@ -282,7 +278,7 @@
         <button
           v-else
           :disabled="uploadingFiles || disableSubmit"
-          class="btn btn-default"
+          class="btn button-default"
           @touchstart.stop.prevent="postStatus($event, newStatus)"
           @click.stop.prevent="postStatus($event, newStatus)"
         >
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index e508a3e9..ea4a8a9b 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -38,13 +38,16 @@
         <div class="reaction-bottom-fader" />
       </div>
     </div>
-    <span slot="trigger">
+    <button
+      slot="trigger"
+      class="add-reaction-button button-unstyled -padded"
+      :title="$t('tool_tip.add_reaction')"
+    >
       <FAIcon
-        class="fa-scale-110 fa-old-padding add-reaction-button"
+        class="fa-scale-110 fa-old-padding"
         :icon="['far', 'smile-beam']"
-        :title="$t('tool_tip.add_reaction')"
       />
-    </span>
+    </button>
   </Popover>
 </template>
 
@@ -105,7 +108,7 @@
 .add-reaction-button {
   cursor: pointer;
 
-  &:hover {
+  &:hover .svg-inline--fa {
     color: $fallback--text;
     color: var(--text, $fallback--text);
   }
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index a83ca1e5..100df0d6 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -211,7 +211,7 @@
               <button
                 :disabled="isPending"
                 type="submit"
-                class="btn btn-default"
+                class="btn button-default"
               >
                 {{ $t('general.submit') }}
               </button>
diff --git a/src/components/reply_button/reply_button.vue b/src/components/reply_button/reply_button.vue
index a0ac8941..1b02881a 100644
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@@ -1,13 +1,17 @@
 <template>
   <div>
-    <FAIcon
+    <button
       v-if="loggedIn"
-      class="ReplyButton fa-scale-110 fa-old-padding -interactive"
-      icon="reply"
-      :title="$t('tool_tip.reply')"
+      class="button-unstyled ReplyButton -padded -interactive"
       :class="{'-active': replying}"
+      :title="$t('tool_tip.reply')"
       @click.prevent="$emit('toggle')"
-    />
+    >
+      <FAIcon
+        class="fa-scale-110 fa-old-padding"
+        icon="reply"
+      />
+    </button>
     <FAIcon
       v-else
       icon="reply"
@@ -27,10 +31,9 @@
 
 .ReplyButton {
   &.-interactive {
-    cursor: pointer;
 
-    &:hover,
-    &.-active {
+    &:hover .svg-inline--fa,
+    &.-active .svg-inline--fa {
       color: $fallback--cBlue;
       color: var(--cBlue, $fallback--cBlue);
     }
diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js
index 5ee4179a..2103fd0b 100644
--- a/src/components/retweet_button/retweet_button.js
+++ b/src/components/retweet_button/retweet_button.js
@@ -24,11 +24,6 @@ const RetweetButton = {
     }
   },
   computed: {
-    classes () {
-      return {
-        '-repeated': this.status.repeated
-      }
-    },
     mergedConfig () {
       return this.$store.getters.mergedConfig
     }
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index b234f3d9..5d4915aa 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -1,29 +1,29 @@
 <template>
-  <div v-if="loggedIn">
-    <template v-if="visibility !== 'private' && visibility !== 'direct'">
+  <div>
+    <button
+      v-if="visibility !== 'private' && visibility !== 'direct' && loggedIn"
+      class="button-unstyled -padded RetweetButton -interactive"
+      :class="status.repeated && '-repeated'"
+    >
       <FAIcon
-        :class="classes"
-        class="RetweetButton fa-scale-110 fa-old-padding -interactive"
+        class="fa-scale-110 fa-old-padding"
         icon="retweet"
         :spin="animated"
         :title="$t('tool_tip.repeat')"
         @click.prevent="retweet()"
       />
-      <span v-if="!mergedConfig.hidePostStats && status.repeat_num > 0">{{ status.repeat_num }}</span>
-    </template>
-    <template v-else>
-      <FAIcon
-        :class="classes"
-        class="RetweetButton fa-scale-110 fa-old-padding"
-        icon="lock"
-        :title="$t('timeline.no_retweet_hint')"
-      />
-    </template>
-  </div>
-  <div v-else-if="!loggedIn">
+    </button>
     <FAIcon
+      v-else-if="loggedIn"
       :class="classes"
-      class="fa-scale-110 fa-old-padding"
+      class="RetweetButton fa-scale-110 fa-old-padding"
+      icon="lock"
+      :title="$t('timeline.no_retweet_hint')"
+    />
+    <FAIcon
+      v-else
+      :class="classes"
+      class="RetweetButton fa-scale-110 fa-old-padding"
       icon="retweet"
       :title="$t('tool_tip.repeat')"
     />
@@ -38,18 +38,16 @@
 
 .RetweetButton {
   &.-interactive {
-    cursor: pointer;
-    animation-duration: 0.6s;
 
-    &:hover {
+    .svg-inline--fa {
+      animation-duration: 0.6s;
+    }
+
+    &:hover .svg-inline--fa,
+    &.-repeated .svg-inline--fa {
       color: $fallback--cGreen;
       color: var(--cGreen, $fallback--cGreen);
     }
   }
-
-  &.-repeated {
-    color: $fallback--cGreen;
-    color: var(--cGreen, $fallback--cGreen);
-  }
 }
 </style>
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 89a601c8..6cf9179e 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -3,17 +3,18 @@
     class="SearchBar"
     :class="{ '-expanded': !hidden }"
   >
-    <a
+    <button
       v-if="hidden"
-      href="#"
-      class="nav-icon"
+      class="button-unstyled nav-icon"
       :title="$t('nav.search')"
-    ><FAIcon
-      fixed-width
-      class="fa-scale-110 fa-old-padding"
-      icon="search"
       @click.prevent.stop="toggleHidden"
-    /></a>
+    >
+      <FAIcon
+        fixed-width
+        class="fa-scale-110 fa-old-padding"
+        icon="search"
+      />
+    </button>
     <template v-else>
       <input
         id="search-bar-input"
@@ -25,7 +26,7 @@
         @keyup.enter="find(searchTerm)"
       >
       <button
-        class="btn search-button"
+        class="button-default search-button"
         @click="find(searchTerm)"
       >
         <FAIcon
@@ -33,14 +34,16 @@
           icon="search"
         />
       </button>
-      <span>
+      <button
+        class="button-unstyled cancel-search"
+        @click.prevent.stop="toggleHidden"
+      >
         <FAIcon
           fixed-width
           icon="times"
           class="cancel-icon fa-scale-110 fa-old-padding"
-          @click.prevent.stop="toggleHidden"
         />
-      </span>
+      </button>
     </template>
   </div>
 </template>
@@ -69,8 +72,11 @@
     flex: 1 0 auto;
   }
 
+  .cancel-search {
+    height: 50px;
+  }
+
   .cancel-icon {
-    cursor: pointer;
     color: $fallback--text;
     color: var(--btnTopBarText, $fallback--text);
   }
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index 6bc64ed0..552ca41f 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -30,13 +30,13 @@
           </template>
         </transition>
         <button
-          class="btn"
+          class="btn button-default"
           @click="peekModal"
         >
           {{ $t('general.peek') }}
         </button>
         <button
-          class="btn"
+          class="btn button-default"
           @click="closeModal"
         >
           {{ $t('general.close') }}
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
index 5a1cf2c0..63d36bf9 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
@@ -27,7 +27,7 @@
           <div class="bulk-actions">
             <ProgressButton
               v-if="selected.length > 0"
-              class="btn btn-default bulk-action-button"
+              class="btn button-default bulk-action-button"
               :click="() => blockUsers(selected)"
             >
               {{ $t('user_card.block') }}
@@ -37,7 +37,7 @@
             </ProgressButton>
             <ProgressButton
               v-if="selected.length > 0"
-              class="btn btn-default"
+              class="btn button-default"
               :click="() => unblockUsers(selected)"
             >
               {{ $t('user_card.unblock') }}
@@ -85,7 +85,7 @@
               <div class="bulk-actions">
                 <ProgressButton
                   v-if="selected.length > 0"
-                  class="btn btn-default"
+                  class="btn button-default"
                   :click="() => muteUsers(selected)"
                 >
                   {{ $t('user_card.mute') }}
@@ -95,7 +95,7 @@
                 </ProgressButton>
                 <ProgressButton
                   v-if="selected.length > 0"
-                  class="btn btn-default"
+                  class="btn button-default"
                   :click="() => unmuteUsers(selected)"
                 >
                   {{ $t('user_card.unmute') }}
@@ -141,7 +141,7 @@
               <div class="bulk-actions">
                 <ProgressButton
                   v-if="selected.length > 0"
-                  class="btn btn-default"
+                  class="btn button-default"
                   :click="() => unmuteDomains(selected)"
                 >
                   {{ $t('domain_mute_card.unmute') }}
diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index 86eed3f5..8f8fe48e 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -21,7 +21,7 @@
       <p>{{ $t('settings.notification_mutes') }}</p>
       <p>{{ $t('settings.notification_blocks') }}</p>
       <button
-        class="btn btn-default"
+        class="btn button-default"
         @click="updateNotificationSettings"
       >
         {{ $t('general.submit') }}
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index d62bc392..50d3ee63 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -150,7 +150,7 @@
       </p>
       <button
         :disabled="newName && newName.length === 0"
-        class="btn btn-default"
+        class="btn button-default"
         @click="updateProfile"
       >
         {{ $t('general.submit') }}
@@ -179,7 +179,7 @@
       <button
         v-show="pickAvatarBtnVisible"
         id="pick-avatar"
-        class="btn"
+        class="button-default btn"
         type="button"
       >
         {{ $t('settings.upload_a_photo') }}
@@ -224,7 +224,7 @@
       />
       <button
         v-else-if="bannerPreview"
-        class="btn btn-default"
+        class="btn button-default"
         @click="submitBanner(banner)"
       >
         {{ $t('general.submit') }}
@@ -274,7 +274,7 @@
       />
       <button
         v-else-if="backgroundPreview"
-        class="btn btn-default"
+        class="btn button-default"
         @click="submitBackground(background)"
       >
         {{ $t('general.submit') }}
diff --git a/src/components/settings_modal/tabs/security_tab/confirm.vue b/src/components/settings_modal/tabs/security_tab/confirm.vue
index 69b3811b..38c2a610 100644
--- a/src/components/settings_modal/tabs/security_tab/confirm.vue
+++ b/src/components/settings_modal/tabs/security_tab/confirm.vue
@@ -2,14 +2,14 @@
   <div>
     <slot />
     <button
-      class="btn btn-default"
+      class="btn button-default"
       :disabled="disabled"
       @click="confirm"
     >
       {{ $t('general.confirm') }}
     </button>
     <button
-      class="btn btn-default"
+      class="btn button-default"
       :disabled="disabled"
       @click="cancel"
     >
diff --git a/src/components/settings_modal/tabs/security_tab/mfa.vue b/src/components/settings_modal/tabs/security_tab/mfa.vue
index 7aca3c8d..455d17b6 100644
--- a/src/components/settings_modal/tabs/security_tab/mfa.vue
+++ b/src/components/settings_modal/tabs/security_tab/mfa.vue
@@ -29,7 +29,7 @@
           />
           <button
             v-if="!confirmNewBackupCodes"
-            class="btn btn-default"
+            class="btn button-default"
             @click="getBackupCodes"
           >
             {{ $t('settings.mfa.generate_new_recovery_codes') }}
@@ -61,7 +61,7 @@
 
         <button
           v-if="canSetupOTP"
-          class="btn btn-default"
+          class="btn button-default"
           @click="cancelSetup"
         >
           {{ $t('general.cancel') }}
@@ -69,7 +69,7 @@
 
         <button
           v-if="canSetupOTP"
-          class="btn btn-default"
+          class="btn button-default"
           @click="setupOTP"
         >
           {{ $t('settings.mfa.setup_otp') }}
@@ -108,13 +108,13 @@
                 >
                 <div class="confirm-otp-actions">
                   <button
-                    class="btn btn-default"
+                    class="btn button-default"
                     @click="doConfirmOTP"
                   >
                     {{ $t('settings.mfa.confirm_and_enable') }}
                   </button>
                   <button
-                    class="btn btn-default"
+                    class="btn button-default"
                     @click="cancelSetup"
                   >
                     {{ $t('general.cancel') }}
diff --git a/src/components/settings_modal/tabs/security_tab/mfa_totp.vue b/src/components/settings_modal/tabs/security_tab/mfa_totp.vue
index c6f2cc7b..8e767bd0 100644
--- a/src/components/settings_modal/tabs/security_tab/mfa_totp.vue
+++ b/src/components/settings_modal/tabs/security_tab/mfa_totp.vue
@@ -4,7 +4,7 @@
       <strong>{{ $t('settings.mfa.otp') }}</strong>
       <button
         v-if="!isActivated"
-        class="btn btn-default"
+        class="btn button-default"
         @click="doActivate"
       >
         {{ $t('general.enable') }}
@@ -12,7 +12,7 @@
 
       <button
         v-if="isActivated"
-        class="btn btn-default"
+        class="btn button-default"
         :disabled="deactivate"
         @click="doDeactivate"
       >
diff --git a/src/components/settings_modal/tabs/security_tab/security_tab.vue b/src/components/settings_modal/tabs/security_tab/security_tab.vue
index 3d32d73d..56bea1f4 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.vue
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.vue
@@ -19,7 +19,7 @@
         >
       </div>
       <button
-        class="btn btn-default"
+        class="btn button-default"
         @click="changeEmail"
       >
         {{ $t('general.submit') }}
@@ -57,7 +57,7 @@
         >
       </div>
       <button
-        class="btn btn-default"
+        class="btn button-default"
         @click="changePassword"
       >
         {{ $t('general.submit') }}
@@ -92,7 +92,7 @@
             <td>{{ oauthToken.validUntil }}</td>
             <td class="actions">
               <button
-                class="btn btn-default"
+                class="btn button-default"
                 @click="revokeToken(oauthToken.id)"
               >
                 {{ $t('settings.revoke_token') }}
@@ -116,7 +116,7 @@
           type="password"
         >
         <button
-          class="btn btn-default"
+          class="btn button-default"
           @click="deleteAccount"
         >
           {{ $t('settings.delete_account') }}
@@ -130,7 +130,7 @@
       </p>
       <button
         v-if="!deletingAccount"
-        class="btn btn-default"
+        class="btn button-default"
         @click="confirmDelete"
       >
         {{ $t('general.submit') }}
diff --git a/src/components/settings_modal/tabs/theme_tab/preview.vue b/src/components/settings_modal/tabs/theme_tab/preview.vue
index 02fea0b6..7ac7b9d3 100644
--- a/src/components/settings_modal/tabs/theme_tab/preview.vue
+++ b/src/components/settings_modal/tabs/theme_tab/preview.vue
@@ -15,7 +15,7 @@
         <span class="alert error">
           {{ $t('settings.style.preview.error') }}
         </span>
-        <button class="btn">
+        <button class="btn button-default">
           {{ $t('settings.style.preview.button') }}
         </button>
       </div>
@@ -102,7 +102,7 @@
             >
             <label for="preview_checkbox">{{ $t('settings.style.preview.checkbox') }}</label>
           </span>
-          <button class="btn">
+          <button class="btn button-default">
             {{ $t('settings.style.preview.button') }}
           </button>
         </div>
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index 280e1955..4ab793d6 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -12,13 +12,13 @@
           <div class="buttons">
             <template v-if="themeWarning.type === 'snapshot_source_mismatch'">
               <button
-                class="btn"
+                class="btn button-default"
                 @click="forceLoad"
               >
                 {{ $t('settings.style.switcher.use_source') }}
               </button>
               <button
-                class="btn"
+                class="btn button-default"
                 @click="forceSnapshot"
               >
                 {{ $t('settings.style.switcher.use_snapshot') }}
@@ -26,7 +26,7 @@
             </template>
             <template v-else-if="themeWarning.noActionsPossible">
               <button
-                class="btn"
+                class="btn button-default"
                 @click="dismissWarning"
               >
                 {{ $t('general.dismiss') }}
@@ -34,13 +34,13 @@
             </template>
             <template v-else>
               <button
-                class="btn"
+                class="btn button-default"
                 @click="forceLoad"
               >
                 {{ $t('settings.style.switcher.load_theme') }}
               </button>
               <button
-                class="btn"
+                class="btn button-default"
                 @click="dismissWarning"
               >
                 {{ $t('settings.style.switcher.keep_as_is') }}
@@ -131,13 +131,13 @@
             <p>{{ $t('settings.theme_help') }}</p>
             <div class="tab-header-buttons">
               <button
-                class="btn"
+                class="btn button-default"
                 @click="clearOpacity"
               >
                 {{ $t('settings.style.switcher.clear_opacity') }}
               </button>
               <button
-                class="btn"
+                class="btn button-default"
                 @click="clearV1"
               >
                 {{ $t('settings.style.switcher.clear_all') }}
@@ -238,13 +238,13 @@
           <div class="tab-header">
             <p>{{ $t('settings.theme_help') }}</p>
             <button
-              class="btn"
+              class="btn button-default"
               @click="clearOpacity"
             >
               {{ $t('settings.style.switcher.clear_opacity') }}
             </button>
             <button
-              class="btn"
+              class="btn button-default"
               @click="clearV1"
             >
               {{ $t('settings.style.switcher.clear_all') }}
@@ -806,7 +806,7 @@
           <div class="tab-header">
             <p>{{ $t('settings.radii_help') }}</p>
             <button
-              class="btn"
+              class="btn button-default"
               @click="clearRoundness"
             >
               {{ $t('settings.style.switcher.clear_all') }}
@@ -936,7 +936,7 @@
               />
             </div>
             <button
-              class="btn"
+              class="btn button-default"
               @click="clearShadows"
             >
               {{ $t('settings.style.switcher.clear_all') }}
@@ -980,7 +980,7 @@
           <div class="tab-header">
             <p>{{ $t('settings.style.fonts.help') }}</p>
             <button
-              class="btn"
+              class="btn button-default"
               @click="clearFonts"
             >
               {{ $t('settings.style.switcher.clear_all') }}
@@ -1017,14 +1017,14 @@
 
     <div class="apply-container">
       <button
-        class="btn submit"
+        class="btn button-default submit"
         :disabled="!themeValid"
         @click="setCustomTheme"
       >
         {{ $t('general.apply') }}
       </button>
       <button
-        class="btn"
+        class="btn button-default"
         @click="clearAll"
       >
         {{ $t('settings.style.switcher.reset') }}
diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index 78f0e544..37d491f0 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -84,7 +84,7 @@
           />
         </label>
         <button
-          class="btn btn-default"
+          class="btn button-default"
           :disabled="!ready || !present"
           @click="del"
         >
@@ -94,7 +94,7 @@
           />
         </button>
         <button
-          class="btn btn-default"
+          class="btn button-default"
           :disabled="!moveUpValid"
           @click="moveUp"
         >
@@ -104,7 +104,7 @@
           />
         </button>
         <button
-          class="btn btn-default"
+          class="btn button-default"
           :disabled="!moveDnValid"
           @click="moveDn"
         >
@@ -114,7 +114,7 @@
           />
         </button>
         <button
-          class="btn btn-default"
+          class="btn button-default"
           :disabled="usingFallback"
           @click="add"
         >
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 28c888fe..1c14c1ab 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -144,8 +144,8 @@
           </router-link>
         </li>
         <li @click="toggleDrawer">
-          <a
-            href="#"
+          <button
+            class="button-unstyled -link"
             @click="openSettingsModal"
           >
             <FAIcon
@@ -153,7 +153,7 @@
               class="fa-scale-110 fa-old-padding"
               icon="cog"
             /> {{ $t("settings.settings") }}
-          </a>
+          </button>
         </li>
         <li @click="toggleDrawer">
           <router-link :to="{ name: 'about'}">
@@ -183,8 +183,8 @@
           v-if="currentUser"
           @click="toggleDrawer"
         >
-          <a
-            href="#"
+          <button
+            class="button-unstyled -link"
             @click="doLogout"
           >
             <FAIcon
@@ -192,7 +192,7 @@
               class="fa-scale-110 fa-old-padding"
               icon="sign-out-alt"
             /> {{ $t("login.logout") }}
-          </a>
+          </button>
         </li>
       </ul>
     </div>
@@ -331,12 +331,13 @@
 .side-drawer li {
   padding: 0;
 
-  a {
+  a, button {
     box-sizing: border-box;
     display: block;
     height: 3em;
     line-height: 3em;
     padding: 0 0.7em;
+    width: 100%;
 
     &:hover {
       background-color: $fallback--lightBg;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 21412faa..896635ee 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -47,16 +47,15 @@
         >
           {{ muteWordHits.join(', ') }}
         </small>
-        <a
-          href="#"
-          class="unmute fa-scale-110 fa-old-padding"
+        <button
+          class="unmute button-unstyled"
           @click.prevent="toggleMute"
         >
           <FAIcon
             icon="eye-slash"
             class="fa-scale-110 fa-old-padding"
           />
-        </a>
+        </button>
       </div>
     </template>
     <template v-else>
@@ -201,9 +200,9 @@
                     icon="external-link-square-alt"
                   />
                 </a>
-                <a
+                <button
                   v-if="expandable && !isPreview"
-                  href="#"
+                  class="button-unstyled"
                   title="Expand"
                   @click.prevent="toggleExpanded"
                 >
@@ -211,17 +210,17 @@
                     class="fa-scale-110 fa-old-padding"
                     icon="plus-square"
                   />
-                </a>
-                <a
+                </button>
+                <button
                   v-if="unmuted"
-                  href="#"
+                  class="button-unstyled"
                   @click.prevent="toggleMute"
                 >
                   <FAIcon
                     icon="eye-slash"
                     class="fa-scale-110 fa-old-padding"
                   />
-                </a>
+                </button>
               </span>
             </div>
 
@@ -237,9 +236,8 @@
                   style="min-width: 0"
                   :class="{ '-strikethrough': !status.parent_visible }"
                 >
-                  <a
-                    class="reply-to"
-                    href="#"
+                  <button
+                    class="button-unstyled reply-to"
                     :aria-label="$t('tool_tip.reply')"
                     @click.prevent="gotoOriginal(status.in_reply_to_status_id)"
                   >
@@ -253,7 +251,7 @@
                     >
                       {{ $t('status.reply_to') }}
                     </span>
-                  </a>
+                  </button>
                 </StatusPopover>
 
                 <span
@@ -286,11 +284,12 @@
                   :key="reply.id"
                   :status-id="reply.id"
                 >
-                  <a
-                    href="#"
-                    class="reply-link"
+                  <button
+                    class="button-unstyled -link reply-link"
                     @click.prevent="gotoOriginal(reply.id)"
-                  >{{ reply.name }}</a>
+                  >
+                    {{ reply.name }}
+                  </button>
                 </StatusPopover>
               </div>
             </div>
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 321cd477..90bfaf40 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -12,35 +12,34 @@
         @click.prevent="linkClicked"
         v-html="status.summary_html"
       />
-      <a
+      <button
         v-if="longSubject && showingLongSubject"
-        href="#"
-        class="tall-subject-hider"
+        class="button-unstyled -link tall-subject-hider"
         @click.prevent="showingLongSubject=false"
-      >{{ $t("status.hide_full_subject") }}</a>
-      <a
+      >
+        {{ $t("status.hide_full_subject") }}
+      </button>
+      <button
         v-else-if="longSubject"
-        class="tall-subject-hider"
+        class="button-unstyled -link tall-subject-hider"
         :class="{ 'tall-subject-hider_focused': focused }"
-        href="#"
         @click.prevent="showingLongSubject=true"
       >
         {{ $t("status.show_full_subject") }}
-      </a>
+      </button>
     </div>
     <div
       :class="{'tall-status': hideTallStatus}"
       class="status-content-wrapper"
     >
-      <a
+      <button
         v-if="hideTallStatus"
-        class="tall-status-hider"
+        class="button-unstyled -link tall-status-hider"
         :class="{ 'tall-status-hider_focused': focused }"
-        href="#"
         @click.prevent="toggleShowMore"
       >
         {{ $t("general.show_more") }}
-      </a>
+      </button>
       <div
         v-if="!hideSubjectStatus"
         :class="{ 'single-line': singleLine }"
@@ -48,10 +47,9 @@
         @click.prevent="linkClicked"
         v-html="postBodyHtml"
       />
-      <a
+      <button
         v-if="hideSubjectStatus"
-        href="#"
-        class="cw-status-hider"
+        class="button-unstyled -link cw-status-hider"
         @click.prevent="toggleShowMore"
       >
         {{ $t("status.show_content") }}
@@ -79,15 +77,14 @@
           v-if="status.card"
           icon="link"
         />
-      </a>
-      <a
+      </button>
+      <button
         v-if="showingMore && !fullContent"
-        href="#"
-        class="status-unhider"
+        class="button-unstyled -link status-unhider"
         @click.prevent="toggleShowMore"
       >
         {{ tallStatus ? $t("general.show_less") : $t("status.hide_content") }}
-      </a>
+      </button>
     </div>
 
     <div v-if="status.poll && status.poll.options && !hideSubjectStatus">
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 6e6e8193..76e7ef03 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -81,7 +81,7 @@ export default Vue.component('tab-switcher', {
     const tabs = this.$slots.default
       .map((slot, index) => {
         if (!slot.tag) return
-        const classesTab = ['tab']
+        const classesTab = ['tab', 'button-default']
         const classesWrapper = ['tab-wrapper']
         if (this.activeIndex === index) {
           classesTab.push('active')
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index d4da2a87..8ffa4499 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -4,7 +4,7 @@
       <TimelineMenu v-if="!embedded" />
       <button
         v-if="showLoadButton"
-        class="loadmore-button"
+        class="button-default loadmore-button"
         @click.prevent="showNewStatuses"
       >
         {{ loadButtonString }}
@@ -61,13 +61,13 @@
       >
         {{ $t('timeline.no_more_statuses') }}
       </div>
-      <a
+      <button
         v-else-if="!timeline.loading"
-        href="#"
+        class="button-unstyled -link"
         @click.prevent="fetchOlderStatuses()"
       >
         <div class="new-status-notification text-center panel-footer">{{ $t('timeline.load_older') }}</div>
-      </a>
+      </button>
       <div
         v-else
         class="new-status-notification text-center panel-footer"
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index f916af9d..16dd5249 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -162,7 +162,7 @@
             <template v-if="relationship.following">
               <ProgressButton
                 v-if="!relationship.subscribing"
-                class="btn btn-default"
+                class="btn button-default"
                 :click="subscribeUser"
                 :title="$t('user_card.subscribe')"
               >
@@ -170,7 +170,7 @@
               </ProgressButton>
               <ProgressButton
                 v-else
-                class="btn btn-default toggled"
+                class="btn button-default toggled"
                 :click="unsubscribeUser"
                 :title="$t('user_card.unsubscribe')"
               >
@@ -192,14 +192,14 @@
           <div>
             <button
               v-if="relationship.muting"
-              class="btn btn-default btn-block toggled"
+              class="btn button-default btn-block toggled"
               @click="unmuteUser"
             >
               {{ $t('user_card.muted') }}
             </button>
             <button
               v-else
-              class="btn btn-default btn-block"
+              class="btn button-default btn-block"
               @click="muteUser"
             >
               {{ $t('user_card.mute') }}
@@ -207,7 +207,7 @@
           </div>
           <div>
             <button
-              class="btn btn-default btn-block"
+              class="btn button-default btn-block"
               @click="mentionUser"
             >
               {{ $t('user_card.mention') }}
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 2a8d8d48..fb43094f 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -29,7 +29,7 @@
           </div>
           <div>
             <button
-              class="btn btn-default"
+              class="btn button-default"
               :disabled="processing"
               @click="reportUser"
             >

From 8b775f94a99b4cdda2c8581d1803a0599c8b0e3a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 24 Nov 2020 14:52:01 +0200
Subject: [PATCH 092/389] more fixes, add fullwidth

---
 src/App.scss                                  | 34 ++++++++++++-------
 src/components/emoji_input/emoji_input.vue    |  6 ++--
 .../extra_buttons/extra_buttons.vue           | 10 +++---
 .../notifications/notifications.vue           |  2 +-
 src/components/popover/popover.js             |  2 +-
 src/components/popover/popover.vue            |  5 +--
 src/components/react_button/react_button.vue  | 13 +++----
 .../scope_selector/scope_selector.vue         | 24 ++++++-------
 src/components/side_drawer/side_drawer.vue    |  5 ++-
 src/components/timeline/timeline.vue          |  2 +-
 .../timeline_menu/timeline_menu.vue           |  1 +
 src/hocs/with_load_more/with_load_more.js     |  6 +++-
 12 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index ef2a13b1..1d0abb51 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -163,6 +163,8 @@ a {
   padding: 0;
   line-height: unset;
   cursor: pointer;
+  box-sizing: content-box;
+  color: inherit;
 
   &.-link {
     color: $fallback--link;
@@ -170,8 +172,12 @@ a {
   }
 
   &.-padded {
-    padding: 5px;
-    margin: -5px;
+    padding: 10px;
+    margin: -10px;
+  }
+
+  &.-fullwidth {
+    width: 100%;
   }
 }
 
@@ -468,6 +474,7 @@ main-router {
     color: $fallback--faint;
     color: var(--panelFaint, $fallback--faint);
   }
+
   .faint-link {
     color: $fallback--faint;
     color: var(--faintLink, $fallback--faint);
@@ -479,11 +486,8 @@ main-router {
     overflow-x: hidden;
   }
 
-  button {
-    flex-shrink: 0;
-  }
-
-  button, .alert {
+  .button-default,
+  .alert {
     // height: 100%;
     line-height: 21px;
     min-height: 0;
@@ -494,8 +498,11 @@ main-router {
     align-self: stretch;
   }
 
-  button {
-    &, i[class*=icon-] {
+  .button-default {
+    flex-shrink: 0;
+
+    &,
+    i[class*=icon-] {
       color: $fallback--text;
       color: var(--btnPanelText, $fallback--text);
     }
@@ -518,7 +525,8 @@ main-router {
     }
   }
 
-  a {
+  a,
+  .-link {
     color: $fallback--link;
     color: var(--panelLink, $fallback--link)
   }
@@ -533,15 +541,15 @@ main-router {
   border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
   border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
 
-
   .faint {
     color: $fallback--faint;
     color: var(--panelFaint, $fallback--faint);
   }
 
-  a {
+  a,
+  .-link {
     color: $fallback--link;
-    color: var(--panelLink, $fallback--link)
+    color: var(--panelLink, $fallback--link);
   }
 }
 
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 224e72cf..d308bf86 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -6,13 +6,13 @@
   >
     <slot />
     <template v-if="enableEmojiPicker">
-      <div
+      <button
         v-if="!hideEmojiButton"
-        class="emoji-picker-icon"
+        class="button-unstyled emoji-picker-icon"
         @click.prevent="togglePicker"
       >
         <FAIcon :icon="['far', 'smile-beam']" />
-      </div>
+      </button>
       <EmojiPicker
         v-if="enableEmojiPicker"
         ref="picker"
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 5c9e1963..1578267c 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -2,7 +2,7 @@
   <Popover
     trigger="click"
     placement="top"
-    class="extra-button-popover"
+    :offset="{ y: -5 }"
     :bound-to="{ x: 'container' }"
   >
     <div
@@ -97,15 +97,15 @@
         </button>
       </div>
     </div>
-    <button
+    <span
       slot="trigger"
-      class="ExtraButtons button-unstyled -padded"
+      class="ExtraButtons"
     >
       <FAIcon
         class="fa-scale-110 fa-old-padding"
         icon="ellipsis-h"
       />
-    </button>
+    </span>
   </Popover>
 </template>
 
@@ -117,6 +117,8 @@
 .ExtraButtons {
   cursor: pointer;
   position: static;
+  padding: 10px;
+  margin: -10px;
 
   &:hover .svg-inline--fa {
     color: $fallback--text;
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 663f623b..725d1ad4 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -43,7 +43,7 @@
         </div>
         <button
           v-else-if="!loading"
-          class="button-unstyled -link"
+          class="button-unstyled -link -fullwidth"
           @click.prevent="fetchOlderNotifications()"
         >
           <div class="new-status-notification text-center panel-footer">
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 695f73b9..db4a768b 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -99,7 +99,7 @@ const Popover = {
       const yOffset = (this.offset && this.offset.y) || 0
       const translateY = usingTop
         ? -anchorEl.offsetHeight - yOffset - content.offsetHeight
-        : yOffset
+        : -yOffset
 
       const xOffset = (this.offset && this.offset.x) || 0
       const translateX = (anchorEl.offsetWidth * 0.5) - content.offsetWidth * 0.5 + horizOffset + xOffset
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 9b8680e5..3868ec96 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -3,12 +3,13 @@
     @mouseenter="onMouseenter"
     @mouseleave="onMouseleave"
   >
-    <div
+    <button
       ref="trigger"
+      class="button-unstyled -fullwidth"
       @click="onClick"
     >
       <slot name="trigger" />
-    </div>
+    </button>
     <div
       v-if="!hidden"
       ref="content"
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index ea4a8a9b..2e3cedd1 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -2,8 +2,7 @@
   <Popover
     trigger="click"
     placement="top"
-    :offset="{ y: 5 }"
-    class="react-button-popover"
+    :offset="{ y: -5 }"
     :bound-to="{ x: 'container' }"
   >
     <div
@@ -38,16 +37,16 @@
         <div class="reaction-bottom-fader" />
       </div>
     </div>
-    <button
+    <span
       slot="trigger"
-      class="add-reaction-button button-unstyled -padded"
+      class="AddReaction"
       :title="$t('tool_tip.add_reaction')"
     >
       <FAIcon
         class="fa-scale-110 fa-old-padding"
         :icon="['far', 'smile-beam']"
       />
-    </button>
+    </span>
   </Popover>
 </template>
 
@@ -105,8 +104,10 @@
   }
 }
 
-.add-reaction-button {
+.AddReaction {
   cursor: pointer;
+  padding: 10px;
+  margin: -10px;
 
   &:hover .svg-inline--fa {
     color: $fallback--text;
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index a22a4fda..66ac612e 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -3,9 +3,9 @@
     v-if="!showNothing"
     class="ScopeSelector"
   >
-    <span
+    <button
       v-if="showDirect"
-      class="scope"
+      class="button-unstyled scope"
       :class="css.direct"
       :title="$t('post_status.scope.direct')"
       @click="changeVis('direct')"
@@ -14,10 +14,10 @@
         icon="envelope"
         class="fa-scale-110 fa-old-padding"
       />
-    </span>
-    <span
+    </button>
+    <button
       v-if="showPrivate"
-      class="scope"
+      class="button-unstyled scope"
       :class="css.private"
       :title="$t('post_status.scope.private')"
       @click="changeVis('private')"
@@ -26,10 +26,10 @@
         icon="lock"
         class="fa-scale-110 fa-old-padding"
       />
-    </span>
-    <span
+    </button>
+    <button
       v-if="showUnlisted"
-      class="scope"
+      class="button-unstyled scope"
       :class="css.unlisted"
       :title="$t('post_status.scope.unlisted')"
       @click="changeVis('unlisted')"
@@ -38,10 +38,10 @@
         icon="lock-open"
         class="fa-scale-110 fa-old-padding"
       />
-    </span>
-    <span
+    </button>
+    <button
       v-if="showPublic"
-      class="scope"
+      class="button-unstyled scope"
       :class="css.public"
       :title="$t('post_status.scope.public')"
       @click="changeVis('public')"
@@ -50,7 +50,7 @@
         icon="globe"
         class="fa-scale-110 fa-old-padding"
       />
-    </span>
+    </button>
   </div>
 </template>
 
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 1c14c1ab..695ae03b 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -145,7 +145,7 @@
         </li>
         <li @click="toggleDrawer">
           <button
-            class="button-unstyled -link"
+            class="button-unstyled -link -fullwidth"
             @click="openSettingsModal"
           >
             <FAIcon
@@ -184,7 +184,7 @@
           @click="toggleDrawer"
         >
           <button
-            class="button-unstyled -link"
+            class="button-unstyled -link -fullwidth"
             @click="doLogout"
           >
             <FAIcon
@@ -337,7 +337,6 @@
     height: 3em;
     line-height: 3em;
     padding: 0 0.7em;
-    width: 100%;
 
     &:hover {
       background-color: $fallback--lightBg;
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 8ffa4499..52fd674e 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -63,7 +63,7 @@
       </div>
       <button
         v-else-if="!timeline.loading"
-        class="button-unstyled -link"
+        class="button-unstyled -link -fullwidth"
         @click.prevent="fetchOlderStatuses()"
       >
         <div class="new-status-notification text-center panel-footer">{{ $t('timeline.load_older') }}</div>
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index c46531be..f8f79be9 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -84,6 +84,7 @@
   margin-right: auto;
   min-width: 0;
   width: 24rem;
+  height: 28px;
 
   .timeline-menu-popover-wrap {
     overflow: hidden;
diff --git a/src/hocs/with_load_more/with_load_more.js b/src/hocs/with_load_more/with_load_more.js
index afb51a0f..7df9dbb2 100644
--- a/src/hocs/with_load_more/with_load_more.js
+++ b/src/hocs/with_load_more/with_load_more.js
@@ -91,7 +91,11 @@ const withLoadMore = ({
             {children}
           </WrappedComponent>
           <div class="with-load-more-footer">
-            {this.error && <a onClick={this.fetchEntries} class="alert error">{this.$t('general.generic_error')}</a>}
+            {this.error &&
+              <button onClick={this.fetchEntries} class="button-unstyled -link -fullwidth alert error">
+                {this.$t('general.generic_error')}
+              </button>
+            }
             {!this.error && this.loading && <FAIcon spin icon="circle-notch"/>}
             {!this.error && !this.loading && !this.bottomedOut && <a onClick={this.fetchEntries}>{this.$t('general.more')}</a>}
           </div>

From 38c32c7f7aea23a798d0dc267082050d15009134 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 24 Nov 2020 15:22:01 +0200
Subject: [PATCH 093/389] renames and removals of cursor: pointer

---
 src/components/desktop_nav/desktop_nav.scss    | 1 -
 src/components/extra_buttons/extra_buttons.vue | 1 -
 src/components/react_button/react_button.vue   | 5 ++---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index 7ec0caf7..ed567d33 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -82,7 +82,6 @@
     width: 2em;
     height: 100%;
     text-align: center;
-    cursor: pointer;
 
     .svg-inline--fa {
       color: $fallback--link;
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 1578267c..b84229c2 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -115,7 +115,6 @@
 @import '../../_variables.scss';
 
 .ExtraButtons {
-  cursor: pointer;
   position: static;
   padding: 10px;
   margin: -10px;
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 2e3cedd1..9f437535 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -39,7 +39,7 @@
     </div>
     <span
       slot="trigger"
-      class="AddReaction"
+      class="ReactButton"
       :title="$t('tool_tip.add_reaction')"
     >
       <FAIcon
@@ -104,8 +104,7 @@
   }
 }
 
-.AddReaction {
-  cursor: pointer;
+.ReactButton {
   padding: 10px;
   margin: -10px;
 

From a6e495e4138e80888ea77e144f0330cd83d4a986 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 24 Nov 2020 16:10:03 +0200
Subject: [PATCH 094/389] fix warnings

---
 src/App.scss                                 |  2 +-
 src/components/notification/notification.vue | 10 ++++++----
 src/components/timeline/timeline.vue         |  4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 1d0abb51..76a5e797 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -71,7 +71,6 @@ a {
 }
 
 .button-default {
-  user-select: none;
   color: $fallback--text;
   color: var(--btnText, $fallback--text);
   background-color: $fallback--fg;
@@ -85,6 +84,7 @@ a {
   font-size: 14px;
   font-family: sans-serif;
   font-family: var(--interfaceFont, sans-serif);
+  user-select: none;
 
   i[class*=icon-],
   :not(&.-icon),
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index ba3648fd..08eb80c9 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -135,10 +135,12 @@
             v-if="needMute"
             class="button-unstyled"
             @click.prevent="toggleMute"
-          ><FAIcon
-            class="fa-scale-110 fa-old-padding"
-            icon="eye-slash"
-          /></button>
+          >
+            <FAIcon
+              class="fa-scale-110 fa-old-padding"
+              icon="eye-slash"
+            />
+          </button>
         </span>
         <div
           v-if="notification.type === 'follow' || notification.type === 'follow_request'"
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 52fd674e..0326342b 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -66,7 +66,9 @@
         class="button-unstyled -link -fullwidth"
         @click.prevent="fetchOlderStatuses()"
       >
-        <div class="new-status-notification text-center panel-footer">{{ $t('timeline.load_older') }}</div>
+        <div class="new-status-notification text-center panel-footer">
+          {{ $t('timeline.load_older') }}
+        </div>
       </button>
       <div
         v-else

From 04af772c1e8851bb8e4ce9b46e8146c0755309ed Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 24 Nov 2020 17:47:37 +0200
Subject: [PATCH 095/389] address missing button style, fix remaining warning

---
 src/App.scss                                 | 12 +++++++-----
 src/components/notification/notification.vue | 10 ++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 76a5e797..b2c7be13 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -71,6 +71,7 @@ a {
 }
 
 .button-default {
+  user-select: none;
   color: $fallback--text;
   color: var(--btnText, $fallback--text);
   background-color: $fallback--fg;
@@ -84,10 +85,8 @@ a {
   font-size: 14px;
   font-family: sans-serif;
   font-family: var(--interfaceFont, sans-serif);
-  user-select: none;
 
   i[class*=icon-],
-  :not(&.-icon),
   .svg-inline--fa {
     color: $fallback--text;
     color: var(--btnText, $fallback--text);
@@ -110,7 +109,8 @@ a {
     background-color: $fallback--fg;
     background-color: var(--btnPressed, $fallback--fg);
 
-    svg, i {
+    svg,
+    i {
       color: $fallback--text;
       color: var(--btnPressedText, $fallback--text);
     }
@@ -123,7 +123,8 @@ a {
     background-color: $fallback--fg;
     background-color: var(--btnDisabled, $fallback--fg);
 
-    svg, i {
+    svg,
+    i {
       color: $fallback--text;
       color: var(--btnDisabledText, $fallback--text);
     }
@@ -137,7 +138,8 @@ a {
     box-shadow: 0px 0px 4px 0px rgba(255, 255, 255, 0.3), 0px 1px 0px 0px rgba(0, 0, 0, 0.2) inset, 0px -1px 0px 0px rgba(255, 255, 255, 0.2) inset;
     box-shadow: var(--buttonPressedShadow);
 
-    svg, i {
+    svg,
+    i {
       color: $fallback--text;
       color: var(--btnToggledText, $fallback--text);
     }
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 08eb80c9..f56aa977 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -17,10 +17,12 @@
       <button
         class="button-unstyled unmute"
         @click.prevent="toggleMute"
-      ><FAIcon
-        class="fa-scale-110 fa-old-padding"
-        icon="eye-slash"
-      /></button>
+      >
+        <FAIcon
+          class="fa-scale-110 fa-old-padding"
+          icon="eye-slash"
+        />
+      </button>
     </div>
     <div
       v-else

From 1d178b7341d9848b64d5f2eb27338ac26f046a2a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 24 Nov 2020 21:35:14 +0200
Subject: [PATCH 096/389] fix too big hide button, fix weird 28px hack

---
 src/components/attachment/attachment.vue       | 4 ++--
 src/components/popover/popover.vue             | 6 +++++-
 src/components/timeline_menu/timeline_menu.vue | 1 -
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index b072b170..2c1c1682 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -44,7 +44,7 @@
     </a>
     <button
       v-if="nsfw && hideNsfwLocal && !hidden"
-      class="button-unstyled -padded hider"
+      class="button-unstyled hider"
       @click.prevent="toggleHidden"
     >
       <FAIcon icon="times" />
@@ -233,7 +233,7 @@
     position: absolute;
     right: 0;
     margin: 10px;
-    padding: 5px;
+    padding: 0;
     z-index: 4;
     border-radius: $fallback--tooltipRadius;
     border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 3868ec96..020eab05 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -5,7 +5,7 @@
   >
     <button
       ref="trigger"
-      class="button-unstyled -fullwidth"
+      class="button-unstyled -fullwidth popover-trigger-button"
       @click="onClick"
     >
       <slot name="trigger" />
@@ -31,6 +31,10 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
+.popover-trigger-button {
+  display: block;
+}
+
 .popover {
   z-index: 8;
   position: absolute;
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index f8f79be9..c46531be 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -84,7 +84,6 @@
   margin-right: auto;
   min-width: 0;
   width: 24rem;
-  height: 28px;
 
   .timeline-menu-popover-wrap {
     overflow: hidden;

From e771fd8f135e5f1b02be0330fd02bb85cd4d44df Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 25 Nov 2020 10:36:14 +0200
Subject: [PATCH 097/389] fix missing button style

---
 src/components/search/search.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index 665390f9..a6503c9f 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -14,7 +14,7 @@
         @keyup.enter="newQuery(searchTerm)"
       >
       <button
-        class="btn search-button"
+        class="btn button-default search-button"
         @click="newQuery(searchTerm)"
       >
         <FAIcon icon="search" />

From 2137d6395acf3c9a2b440af2fa9bcfe8a4de04d4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 25 Nov 2020 18:33:08 +0200
Subject: [PATCH 098/389] fix wrong button style, add new option for popover to
 better deal with different layouts

---
 .../account_actions/account_actions.vue       |  1 +
 .../extra_buttons/extra_buttons.vue           |  3 ++-
 .../moderation_tools/moderation_tools.vue     | 22 +++++++++----------
 src/components/popover/popover.js             | 15 ++++++++++---
 src/components/react_button/react_button.vue  |  3 ++-
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index c10b09b8..ab5d1d29 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -4,6 +4,7 @@
       trigger="click"
       placement="bottom"
       :bound-to="{ x: 'container' }"
+      remove-padding
     >
       <div
         slot="content"
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index b84229c2..e687d487 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -2,8 +2,9 @@
   <Popover
     trigger="click"
     placement="top"
-    :offset="{ y: -5 }"
+    :offset="{ y: 5 }"
     :bound-to="{ x: 'container' }"
+    remove-padding
   >
     <div
       slot="content"
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index 0ae9246b..5c7b82ec 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -12,13 +12,13 @@
         <div class="dropdown-menu">
           <span v-if="user.is_local">
             <button
-              class="dropdown-item"
+              class="button-default dropdown-item"
               @click="toggleRight(&quot;admin&quot;)"
             >
               {{ $t(!!user.rights.admin ? 'user_card.admin_menu.revoke_admin' : 'user_card.admin_menu.grant_admin') }}
             </button>
             <button
-              class="dropdown-item"
+              class="button-default dropdown-item"
               @click="toggleRight(&quot;moderator&quot;)"
             >
               {{ $t(!!user.rights.moderator ? 'user_card.admin_menu.revoke_moderator' : 'user_card.admin_menu.grant_moderator') }}
@@ -29,13 +29,13 @@
             />
           </span>
           <button
-            class="dropdown-item"
+            class="button-default dropdown-item"
             @click="toggleActivationStatus()"
           >
             {{ $t(!!user.deactivated ? 'user_card.admin_menu.activate_account' : 'user_card.admin_menu.deactivate_account') }}
           </button>
           <button
-            class="dropdown-item"
+            class="button-default dropdown-item"
             @click="deleteUserDialog(true)"
           >
             {{ $t('user_card.admin_menu.delete_account') }}
@@ -47,7 +47,7 @@
           />
           <span v-if="hasTagPolicy">
             <button
-              class="dropdown-item"
+              class="button-default dropdown-item"
               @click="toggleTag(tags.FORCE_NSFW)"
             >
               {{ $t('user_card.admin_menu.force_nsfw') }}
@@ -57,7 +57,7 @@
               />
             </button>
             <button
-              class="dropdown-item"
+              class="button-default dropdown-item"
               @click="toggleTag(tags.STRIP_MEDIA)"
             >
               {{ $t('user_card.admin_menu.strip_media') }}
@@ -67,7 +67,7 @@
               />
             </button>
             <button
-              class="dropdown-item"
+              class="button-default dropdown-item"
               @click="toggleTag(tags.FORCE_UNLISTED)"
             >
               {{ $t('user_card.admin_menu.force_unlisted') }}
@@ -77,7 +77,7 @@
               />
             </button>
             <button
-              class="dropdown-item"
+              class="button-default dropdown-item"
               @click="toggleTag(tags.SANDBOX)"
             >
               {{ $t('user_card.admin_menu.sandbox') }}
@@ -88,7 +88,7 @@
             </button>
             <button
               v-if="user.is_local"
-              class="dropdown-item"
+              class="button-default dropdown-item"
               @click="toggleTag(tags.DISABLE_REMOTE_SUBSCRIPTION)"
             >
               {{ $t('user_card.admin_menu.disable_remote_subscription') }}
@@ -99,7 +99,7 @@
             </button>
             <button
               v-if="user.is_local"
-              class="dropdown-item"
+              class="button-default dropdown-item"
               @click="toggleTag(tags.DISABLE_ANY_SUBSCRIPTION)"
             >
               {{ $t('user_card.admin_menu.disable_any_subscription') }}
@@ -110,7 +110,7 @@
             </button>
             <button
               v-if="user.is_local"
-              class="dropdown-item"
+              class="button-default dropdown-item"
               @click="toggleTag(tags.QUARANTINE)"
             >
               {{ $t('user_card.admin_menu.quarantine') }}
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index db4a768b..5e417fa0 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -21,7 +21,10 @@ const Popover = {
     // Replaces the classes you may want for the popover container.
     // Use 'popover-default' in addition to get the default popover
     // styles with your custom class.
-    popoverClass: String
+    popoverClass: String,
+    // If true, subtract padding when calculating position for the popover,
+    // use it when popover offset looks to be different on top vs bottom.
+    removePadding: Boolean
   },
   data () {
     return {
@@ -96,10 +99,16 @@ const Popover = {
       if (origin.y + content.offsetHeight > yBounds.max) usingTop = true
       if (origin.y - content.offsetHeight < yBounds.min) usingTop = false
 
+      let vPadding = 0
+      if (this.removePadding && usingTop) {
+        const anchorStyle = getComputedStyle(anchorEl)
+        vPadding = parseFloat(anchorStyle.paddingTop) + parseFloat(anchorStyle.paddingBottom)
+      }
+
       const yOffset = (this.offset && this.offset.y) || 0
       const translateY = usingTop
-        ? -anchorEl.offsetHeight - yOffset - content.offsetHeight
-        : -yOffset
+        ? -anchorEl.offsetHeight + vPadding - yOffset - content.offsetHeight
+        : yOffset
 
       const xOffset = (this.offset && this.offset.x) || 0
       const translateX = (anchorEl.offsetWidth * 0.5) - content.offsetWidth * 0.5 + horizOffset + xOffset
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 9f437535..a5d53254 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -2,8 +2,9 @@
   <Popover
     trigger="click"
     placement="top"
-    :offset="{ y: -5 }"
+    :offset="{ y: 5 }"
     :bound-to="{ x: 'container' }"
+    remove-padding
   >
     <div
       slot="content"

From ebe3b38a90d99da4af1a9c99bdb592472f2d8892 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 26 Nov 2020 17:05:38 +0200
Subject: [PATCH 099/389] fix nav bar button active style

---
 src/components/desktop_nav/desktop_nav.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index ed567d33..8fd8e620 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -21,7 +21,7 @@
     grid-template-areas: "logo sitename actions";
   }
 
-  button {
+  .button-default {
     &, svg {
       color: $fallback--text;
       color: var(--btnTopBarText, $fallback--text);

From bee77ffdb284601720b9a13a19ca029af258d617 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 26 Nov 2020 18:23:53 +0200
Subject: [PATCH 100/389] fix retweet event handler, fix text being selectable
 for status action counters

---
 src/App.scss                                  |  5 ---
 .../favorite_button/favorite_button.vue       | 24 ++++++++++---
 .../notifications/notifications.vue           |  2 +-
 src/components/reply_button/reply_button.vue  | 25 +++++++++++---
 .../retweet_button/retweet_button.vue         | 34 +++++++++++++------
 5 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index b2c7be13..cdc3209c 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -173,11 +173,6 @@ a {
     color: var(--link, $fallback--link);
   }
 
-  &.-padded {
-    padding: 10px;
-    margin: -10px;
-  }
-
   &.-fullwidth {
     width: 100%;
   }
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index d54ae78c..9fc4f9d8 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -1,8 +1,8 @@
 <template>
-  <div>
+  <div class="FavoriteButton">
     <button
       v-if="loggedIn"
-      class="FavoriteButton -interactive button-unstyled -padded"
+      class="button-unstyled interactive"
       :class="status.favorited && '-favorited'"
       :title="$t('tool_tip.favorite')"
       @click.prevent="favorite()"
@@ -19,7 +19,12 @@
       :title="$t('tool_tip.favorite')"
       :icon="['far', 'star']"
     />
-    <span v-if="!mergedConfig.hidePostStats && status.fave_num > 0">{{ status.fave_num }}</span>
+    <span
+      v-if="!mergedConfig.hidePostStats && status.fave_num > 0"
+      class="action-counter"
+    >
+      {{ status.fave_num }}
+    </span>
   </div>
 </template>
 
@@ -29,8 +34,19 @@
 @import '../../_variables.scss';
 
 .FavoriteButton {
-  &.-interactive {
+  display: flex;
 
+  > :first-child {
+    padding: 10px;
+    margin: -10px -5px -10px -10px;
+  }
+
+  .action-counter {
+    pointer-events: none;
+    user-select: none;
+  }
+
+  .interactive {
     .svg-inline--fa {
       animation-duration: 0.6s;
     }
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 725d1ad4..4cdb436c 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -43,7 +43,7 @@
         </div>
         <button
           v-else-if="!loading"
-          class="button-unstyled -link -fullwidth"
+          class="button-unstyled -link -block"
           @click.prevent="fetchOlderNotifications()"
         >
           <div class="new-status-notification text-center panel-footer">
diff --git a/src/components/reply_button/reply_button.vue b/src/components/reply_button/reply_button.vue
index 1b02881a..fb010278 100644
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@@ -1,8 +1,8 @@
 <template>
-  <div>
+  <div class="ReplyButton">
     <button
       v-if="loggedIn"
-      class="button-unstyled ReplyButton -padded -interactive"
+      class="button-unstyled interactive"
       :class="{'-active': replying}"
       :title="$t('tool_tip.reply')"
       @click.prevent="$emit('toggle')"
@@ -15,10 +15,13 @@
     <FAIcon
       v-else
       icon="reply"
-      class="ReplyButton fa-scale-110 fa-old-padding"
+      class="fa-scale-110 fa-old-padding"
       :title="$t('tool_tip.reply')"
     />
-    <span v-if="status.replies_count > 0">
+    <span
+      v-if="status.replies_count > 0"
+      class="action-counter"
+    >
       {{ status.replies_count }}
     </span>
   </div>
@@ -30,13 +33,25 @@
 @import '../../_variables.scss';
 
 .ReplyButton {
-  &.-interactive {
+  display: flex;
 
+  > :first-child {
+    padding: 10px;
+    margin: -10px -5px -10px -10px;
+  }
+
+  .action-counter {
+    pointer-events: none;
+    user-select: none;
+  }
+
+  .interactive {
     &:hover .svg-inline--fa,
     &.-active .svg-inline--fa {
       color: $fallback--cBlue;
       color: var(--cBlue, $fallback--cBlue);
     }
   }
+
 }
 </style>
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 5d4915aa..2a7301ce 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -1,33 +1,36 @@
 <template>
-  <div>
+  <div class="RetweetButton">
     <button
       v-if="visibility !== 'private' && visibility !== 'direct' && loggedIn"
-      class="button-unstyled -padded RetweetButton -interactive"
+      class="button-unstyled interactive"
       :class="status.repeated && '-repeated'"
+      :title="$t('tool_tip.repeat')"
+      @click.prevent="retweet()"
     >
       <FAIcon
         class="fa-scale-110 fa-old-padding"
         icon="retweet"
         :spin="animated"
-        :title="$t('tool_tip.repeat')"
-        @click.prevent="retweet()"
       />
     </button>
     <FAIcon
       v-else-if="loggedIn"
-      :class="classes"
-      class="RetweetButton fa-scale-110 fa-old-padding"
+      class="fa-scale-110 fa-old-padding"
       icon="lock"
       :title="$t('timeline.no_retweet_hint')"
     />
     <FAIcon
       v-else
-      :class="classes"
-      class="RetweetButton fa-scale-110 fa-old-padding"
+      class="fa-scale-110 fa-old-padding"
       icon="retweet"
       :title="$t('tool_tip.repeat')"
     />
-    <span v-if="!mergedConfig.hidePostStats && status.repeat_num > 0">{{ status.repeat_num }}</span>
+    <span
+      v-if="!mergedConfig.hidePostStats && status.repeat_num > 0"
+      class="no-event"
+    >
+      {{ status.repeat_num }}
+    </span>
   </div>
 </template>
 
@@ -37,8 +40,19 @@
 @import '../../_variables.scss';
 
 .RetweetButton {
-  &.-interactive {
+  display: flex;
 
+  > :first-child {
+    padding: 10px;
+    margin: -10px -5px -10px -10px;
+  }
+
+  .action-counter {
+    pointer-events: none;
+    user-select: none;
+  }
+
+  .interactive {
     .svg-inline--fa {
       animation-duration: 0.6s;
     }

From aea172a6f7544143754294251263b42b35bfe66c Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 26 Nov 2020 18:25:21 +0200
Subject: [PATCH 101/389] forgot to save a file

---
 src/components/notifications/notifications.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 4cdb436c..725d1ad4 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -43,7 +43,7 @@
         </div>
         <button
           v-else-if="!loading"
-          class="button-unstyled -link -block"
+          class="button-unstyled -link -fullwidth"
           @click.prevent="fetchOlderNotifications()"
         >
           <div class="new-status-notification text-center panel-footer">

From 1172feaa72f344ff9b726fccefabcfc8c4bbd478 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 26 Nov 2020 18:38:36 +0200
Subject: [PATCH 102/389] Add changelog mention for changed button sizes

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 123e5347..37470502 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
 - Fixed custom emoji not working in profile field names
 - Fixed pinned statuses not appearing in user profiles
+- Made reply/fav/repeat etc buttons easier to hit
 
 
 ## [2.2.1] - 2020-11-11

From 5dfcf2acac7845a8bfcd5f74831566b30675bbd9 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 26 Nov 2020 18:40:39 +0200
Subject: [PATCH 103/389] updated changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37470502..5b9fb3dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
 - Fixed timeline errors locking timelines
 - Fixed missing highlighted border in expanded conversations
+- Fixed custom emoji not working in profile field names
+- Fixed pinned statuses not appearing in user profiles
+- Fixed some elements not being keyboard navigation friendly
 
 ### Changed
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
-- Fixed custom emoji not working in profile field names
-- Fixed pinned statuses not appearing in user profiles
 - Made reply/fav/repeat etc buttons easier to hit
 
 

From 276ef31145c4f485c0b899f5243c49e2cbf80cc1 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 26 Nov 2020 23:01:16 +0200
Subject: [PATCH 104/389] fix alternative icons having wrong offsets

---
 .../favorite_button/favorite_button.vue       | 15 +++++-----
 src/components/reply_button/reply_button.vue  | 15 +++++-----
 .../retweet_button/retweet_button.vue         | 28 ++++++++++---------
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index 9fc4f9d8..dce25e24 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -13,12 +13,13 @@
         :spin="animated"
       />
     </button>
-    <FAIcon
-      v-else
-      class="FavoriteButton fa-scale-110 fa-old-padding"
-      :title="$t('tool_tip.favorite')"
-      :icon="['far', 'star']"
-    />
+    <span v-else>
+      <FAIcon
+        class="fa-scale-110 fa-old-padding"
+        :title="$t('tool_tip.favorite')"
+        :icon="['far', 'star']"
+      />
+    </span>
     <span
       v-if="!mergedConfig.hidePostStats && status.fave_num > 0"
       class="action-counter"
@@ -38,7 +39,7 @@
 
   > :first-child {
     padding: 10px;
-    margin: -10px -5px -10px -10px;
+    margin: -10px -8px -10px -10px;
   }
 
   .action-counter {
diff --git a/src/components/reply_button/reply_button.vue b/src/components/reply_button/reply_button.vue
index fb010278..c17041da 100644
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@@ -12,12 +12,13 @@
         icon="reply"
       />
     </button>
-    <FAIcon
-      v-else
-      icon="reply"
-      class="fa-scale-110 fa-old-padding"
-      :title="$t('tool_tip.reply')"
-    />
+    <span v-else>
+      <FAIcon
+        icon="reply"
+        class="fa-scale-110 fa-old-padding"
+        :title="$t('tool_tip.reply')"
+      />
+    </span>
     <span
       v-if="status.replies_count > 0"
       class="action-counter"
@@ -37,7 +38,7 @@
 
   > :first-child {
     padding: 10px;
-    margin: -10px -5px -10px -10px;
+    margin: -10px -8px -10px -10px;
   }
 
   .action-counter {
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 2a7301ce..859ce499 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -13,18 +13,20 @@
         :spin="animated"
       />
     </button>
-    <FAIcon
-      v-else-if="loggedIn"
-      class="fa-scale-110 fa-old-padding"
-      icon="lock"
-      :title="$t('timeline.no_retweet_hint')"
-    />
-    <FAIcon
-      v-else
-      class="fa-scale-110 fa-old-padding"
-      icon="retweet"
-      :title="$t('tool_tip.repeat')"
-    />
+    <span v-else-if="loggedIn">
+      <FAIcon
+        class="fa-scale-110 fa-old-padding"
+        icon="lock"
+        :title="$t('timeline.no_retweet_hint')"
+      />
+    </span>
+    <span v-else>
+      <FAIcon
+        class="fa-scale-110 fa-old-padding"
+        icon="retweet"
+        :title="$t('tool_tip.repeat')"
+      />
+    </span>
     <span
       v-if="!mergedConfig.hidePostStats && status.repeat_num > 0"
       class="no-event"
@@ -44,7 +46,7 @@
 
   > :first-child {
     padding: 10px;
-    margin: -10px -5px -10px -10px;
+    margin: -10px -8px -10px -10px;
   }
 
   .action-counter {

From e6e3b752d65fe2038a1b42ef9ddae8c21bf1cad2 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 27 Nov 2020 15:51:58 +0200
Subject: [PATCH 105/389] review fixes

---
 src/components/emoji_input/emoji_input.js | 1 -
 src/modules/users.js                      | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 3deeb6c8..2068a598 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -186,7 +186,6 @@ const EmojiInput = {
       this.suggestions = take(matchedSuggestions, 5)
         .map(({ imageUrl, ...rest }) => ({
           ...rest,
-          // eslint-disable-next-line camelcase
           img: imageUrl || ''
         }))
     },
diff --git a/src/modules/users.js b/src/modules/users.js
index 4bdf3360..655db4c7 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -442,10 +442,10 @@ const users = {
         store.commit('setUserForNotification', notification)
       })
     },
-    searchUsers ({ rootState, commit }, { query, saveUsers = true }) {
+    searchUsers ({ rootState, commit }, { query }) {
       return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
-          if (saveUsers) commit('addNewUsers', users)
+          commit('addNewUsers', users)
           return users
         })
     },

From 4ac2bc1c4458a3a1fd9b4683fb2e507f86e7d7e6 Mon Sep 17 00:00:00 2001
From: tarteka <info@tarteka.net>
Date: Sun, 1 Nov 2020 18:40:34 +0000
Subject: [PATCH 106/389] Translated using Weblate (Spanish)

Currently translated at 100.0% (669 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
---
 src/i18n/es.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index 6889df9a..71688461 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -628,7 +628,8 @@
     "copy_link": "Copiar el enlace al estado",
     "status_unavailable": "Estado no disponible",
     "bookmark": "Marcar",
-    "unbookmark": "Desmarcar"
+    "unbookmark": "Desmarcar",
+    "status_deleted": "Esta entrada ha sido eliminada"
   },
   "user_card": {
     "approve": "Aprobar",

From a68899b4a9499718f51a50f17649f53fa7ad2d07 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 4 Nov 2020 15:42:01 +0000
Subject: [PATCH 107/389] Translated using Weblate (Esperanto)

Currently translated at 100.0% (669 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 1247d50d..b0a15cfe 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -134,14 +134,14 @@
   "registration": {
     "bio": "Priskribo",
     "email": "Retpoŝtadreso",
-    "fullname": "Vidiga nomo",
+    "fullname": "Prezenta nomo",
     "password_confirm": "Konfirmo de pasvorto",
     "registration": "Registriĝo",
     "token": "Invita ĵetono",
     "captcha": "TESTO DE HOMECO",
     "new_captcha": "Klaku la bildon por akiri novan teston",
     "username_placeholder": "ekz. lain",
-    "fullname_placeholder": "ekz. Lain Iwakura",
+    "fullname_placeholder": "ekz. Lain Ivakura",
     "bio_placeholder": "ekz.\nSaluton, mi estas Lain.\nMi estas animea knabino vivanta en Japanujo. Eble vi konas min pro la retejo « Wired ».",
     "validations": {
       "username_required": "ne povas resti malplena",
@@ -164,7 +164,7 @@
     "blocks_tab": "Blokitoj",
     "btnRadius": "Butonoj",
     "cBlue": "Blua (respondi, aboni)",
-    "cGreen": "Verda (kunhavigi)",
+    "cGreen": "Verda (diskonigi)",
     "cOrange": "Oranĝa (ŝati)",
     "cRed": "Ruĝa (nuligi)",
     "change_password": "Ŝanĝi pasvorton",
@@ -207,8 +207,8 @@
     "import_theme": "Enlegi antaŭagordojn",
     "inputRadius": "Enigaj kampoj",
     "checkboxRadius": "Markbutonoj",
-    "instance_default": "(implicita: {value})",
-    "instance_default_simple": "(implicita)",
+    "instance_default": "(originale: {value})",
+    "instance_default_simple": "(originale)",
     "interface": "Fasado",
     "interfaceLanguage": "Lingvo de fasado",
     "invalid_theme_imported": "La elektita dosiero ne estas subtenata haŭto de Pleromo. Neniuj ŝanĝoj al via haŭto okazis.",
@@ -219,7 +219,7 @@
     "loop_video_silent_only": "Ripetadi nur filmojn sen sono (ekz. la «GIF-ojn» de Mastodon)",
     "mutes_tab": "Silentigoj",
     "play_videos_in_modal": "Ludi filmojn en ŝpruca kadro",
-    "use_contain_fit": "Ne tondi la kunsendaĵon en bildetoj",
+    "use_contain_fit": "Ne pritondi bildetojn de kunsendaĵoj",
     "name": "Nomo",
     "name_bio": "Nomo kaj priskribo",
     "new_password": "Nova pasvorto",
@@ -265,7 +265,7 @@
     "subject_line_email": "Kiel retpoŝto: «re: temo»",
     "subject_line_mastodon": "Kiel Mastodon: kopii senŝanĝe",
     "subject_line_noop": "Ne kopii",
-    "post_status_content_type": "Afiŝi specon de la enhavo de la stato",
+    "post_status_content_type": "Speco de enhavo de afiŝo",
     "stop_gifs": "Movi GIF-bildojn dum ŝvebo de muso",
     "streaming": "Ŝalti memagan fluigon de novaj afiŝoj kiam vi vidas la supron de la paĝo",
     "text": "Teksto",
@@ -379,7 +379,7 @@
         "hint": "Por ombroj vi ankaŭ povas uzi --variable kiel koloran valoron, por uzi variantojn de CSS3. Bonvolu rimarki, ke tiuokaze agordoj de maltravidebleco ne funkcios.",
         "filter_hint": {
           "always_drop_shadow": "Averto: ĉi tiu ombro ĉiam uzas {0} kiam la foliumilo tion subtenas.",
-          "drop_shadow_syntax": "{0} ne subtenas parametron {1} kaj ŝlosilvorton {2}.",
+          "drop_shadow_syntax": "{0} ne subtenas parametron {1} kaj ĉefvorton {2}.",
           "avatar_inset": "Bonvolu rimarki, ke agordi ambaŭ internajn kaj eksterajn ombrojn por profilbildoj povas redoni neatenditajn rezultojn ĉe profilbildoj travideblaj.",
           "spread_zero": "Ombroj kun vastigo > 0 aperos kvazaŭ ĝi estus fakte nulo",
           "inset_classic": "Internaj ombroj uzos {0}"
@@ -394,7 +394,7 @@
           "button": "Butono",
           "buttonHover": "Butono (je ŝvebo)",
           "buttonPressed": "Butono (premita)",
-          "buttonPressedHover": "Butono (premita kaj je ŝvebo)",
+          "buttonPressedHover": "Butono (je premo kaj ŝvebo)",
           "input": "Eniga kampo"
         },
         "hintV3": "Kolorojn de ombroj vi ankaŭ povas skribi per la sistemo {0}."
@@ -683,7 +683,7 @@
         "replace": "Anstataŭigi",
         "reject": "Rifuzi",
         "ftl_removal": "Forigo el la historio de «La tuta konata reto»",
-        "keyword_policies": "Politiko pri ŝlosilvortoj"
+        "keyword_policies": "Politiko pri ĉefvortoj"
       },
       "federation": "Federado",
       "mrf_policies_desc": "Politikoj de Mesaĝa ŝanĝilaro (MRF) efikas sur federa konduto de la nodo.  La sekvaj politikoj estas ŝaltitaj:"
@@ -739,8 +739,8 @@
     "week_short": "{0}s",
     "weeks": "{0} semajnoj",
     "week": "{0} semajno",
-    "seconds_short": "{0}s",
-    "second_short": "{0}s",
+    "seconds_short": "{0}sek",
+    "second_short": "{0}sek",
     "seconds": "{0} sekundoj",
     "second": "{0} sekundo",
     "now_short": "nun",
@@ -749,14 +749,14 @@
     "month_short": "{0}m",
     "months": "{0} monatoj",
     "month": "{0} monato",
-    "minutes_short": "{0}m",
-    "minute_short": "{0}m",
+    "minutes_short": "{0}min",
+    "minute_short": "{0}min",
     "minutes": "{0} minutoj",
     "minute": "{0} minuto",
     "in_past": "antaŭ {0}",
     "in_future": "post {0}",
-    "hours_short": "{0}h",
-    "hour_short": "{0}h",
+    "hours_short": "{0}hor",
+    "hour_short": "{0}hor",
     "hours": "{0} horoj",
     "hour": "{0} horo",
     "days_short": "{0}t",

From 83319904c72db32f30f11563679f0f6d789f5698 Mon Sep 17 00:00:00 2001
From: Guy Sheffer <guysoft@gmail.com>
Date: Tue, 10 Nov 2020 13:37:53 +0000
Subject: [PATCH 108/389] Translated using Weblate (Hebrew)

Currently translated at 48.1% (322 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/he/
---
 src/i18n/he.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/i18n/he.json b/src/i18n/he.json
index 7f2bf58f..4b920536 100644
--- a/src/i18n/he.json
+++ b/src/i18n/he.json
@@ -390,5 +390,13 @@
       "GiB": "GiB",
       "TiB": "TiB"
     }
+  },
+  "about": {
+    "mrf": {
+      "keyword": {
+        "keyword_policies": "פוליסת מילות מפתח"
+      },
+      "federation": "פדרציה"
+    }
   }
 }

From 6fbd6ee9eaddcc0066a861590b55b0b01ded1f51 Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Tue, 17 Nov 2020 15:29:55 +0000
Subject: [PATCH 109/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (668 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 09e2ab0d..47e0cf2c 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -22,7 +22,7 @@
   },
   "general": {
     "apply": "应用",
-    "submit": "提交",
+    "submit": "发送",
     "more": "更多",
     "generic_error": "发生了一个错误",
     "optional": "可选",

From aec6dc7858469120be1172d3db5dd444d893e062 Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Wed, 18 Nov 2020 11:32:29 +0000
Subject: [PATCH 110/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (668 of 669 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 47e0cf2c..7f8e5593 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -297,7 +297,7 @@
     "hide_follows_description": "不要显示我所关注的人",
     "hide_followers_description": "不要显示关注我的人",
     "show_admin_badge": "显示管理徽章",
-    "show_moderator_badge": "显示版主徽章",
+    "show_moderator_badge": "在我的个人资料中显示监察员标志",
     "nsfw_clickthrough": "将不和谐附件隐藏，点击才能打开",
     "oauth_tokens": "OAuth令牌",
     "token": "令牌",
@@ -655,8 +655,8 @@
       "moderation": "权限",
       "grant_admin": "赋予管理权限",
       "revoke_admin": "撤销管理权限",
-      "grant_moderator": "赋予版主权限",
-      "revoke_moderator": "撤销版主权限",
+      "grant_moderator": "赋予监察员权限",
+      "revoke_moderator": "撤销监察员权限",
       "activate_account": "激活账号",
       "deactivate_account": "关闭账号",
       "delete_account": "删除账号",
@@ -683,7 +683,7 @@
   },
   "user_reporting": {
     "title": "报告 {0}",
-    "add_comment_description": "此报告会发送给您的实例管理员。您可以在下面提供更多详细信息解释报告的缘由：",
+    "add_comment_description": "此报告会发送给您的实例监察员。您可以在下面提供更多详细信息解释报告的缘由：",
     "additional_comments": "其它信息",
     "forward_description": "这个账号是从另外一个服务器。同时发送一个副本到那里？",
     "forward_to": "转发 {0}",

From 95ad9efff3845e5e4ff21eca6918e218fc8de5a8 Mon Sep 17 00:00:00 2001
From: tarteka <info@tarteka.net>
Date: Fri, 20 Nov 2020 19:39:39 +0000
Subject: [PATCH 111/389] Translated using Weblate (Spanish)

Currently translated at 100.0% (671 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
---
 src/i18n/es.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index 71688461..0c2cc3e9 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -104,7 +104,8 @@
     "no_more_notifications": "No hay más notificaciones",
     "reacted_with": "reaccionó con {0}",
     "migrated_to": "migrado a",
-    "follow_request": "quiere seguirte"
+    "follow_request": "quiere seguirte",
+    "error": "Error obteniendo notificaciones:{0}"
   },
   "polls": {
     "add_poll": "Añadir encuesta",
@@ -313,7 +314,7 @@
     "hide_followers_count_description": "No mostrar el número de cuentas que me siguen",
     "show_admin_badge": "Mostrar la insignia de Administrador en mi perfil",
     "show_moderator_badge": "Mostrar la insignia de Moderador en mi perfil",
-    "nsfw_clickthrough": "Activar el clic para ocultar los adjuntos NSFW",
+    "nsfw_clickthrough": "Habilitar la ocultación de la imagen de vista previa del enlace y el adjunto para los estados NSFW por defecto",
     "oauth_tokens": "Tokens de OAuth",
     "token": "Token",
     "refresh_token": "Actualizar el token",
@@ -605,7 +606,8 @@
     "up_to_date": "Actualizado",
     "no_more_statuses": "No hay más estados",
     "no_statuses": "Sin estados",
-    "reload": "Recargar"
+    "reload": "Recargar",
+    "error": "Error obteniendo la linea de tiempo:{0}"
   },
   "status": {
     "favorites": "Favoritos",
@@ -629,7 +631,8 @@
     "status_unavailable": "Estado no disponible",
     "bookmark": "Marcar",
     "unbookmark": "Desmarcar",
-    "status_deleted": "Esta entrada ha sido eliminada"
+    "status_deleted": "Esta entrada ha sido eliminada",
+    "nsfw": "NSFW (No apropiado para el trabajo)"
   },
   "user_card": {
     "approve": "Aprobar",

From 00b93c09476b6f9502fd0924521c9e9fe4e5b100 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Wed, 25 Nov 2020 09:52:04 +0000
Subject: [PATCH 112/389] Translated using Weblate (Italian)

Currently translated at 100.0% (671 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 67e92b32..58dafca5 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -50,7 +50,8 @@
     "follow_request": "vuole seguirti",
     "no_more_notifications": "Fine delle notifiche",
     "migrated_to": "è migrato verso",
-    "reacted_with": "ha reagito con {0}"
+    "reacted_with": "ha reagito con {0}",
+    "error": "Errore nel caricare le notifiche: {0}"
   },
   "settings": {
     "attachments": "Allegati",
@@ -427,7 +428,8 @@
     "repeated": "condiviso",
     "no_statuses": "Nessun messaggio",
     "no_more_statuses": "Fine dei messaggi",
-    "reload": "Ricarica"
+    "reload": "Ricarica",
+    "error": "Errore nel caricare la sequenza: {0}"
   },
   "user_card": {
     "follow": "Segui",
@@ -703,7 +705,8 @@
     "delete_confirm": "Vuoi veramente eliminare questo messaggio?",
     "unbookmark": "Rimuovi segnalibro",
     "bookmark": "Aggiungi segnalibro",
-    "status_deleted": "Questo messagio è stato cancellato"
+    "status_deleted": "Questo messagio è stato cancellato",
+    "nsfw": "Pruriginoso"
   },
   "time": {
     "years_short": "{0}a",

From 8f118c01a44b4d30204812b2f60dd9a5d1ef27f5 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sat, 28 Nov 2020 15:27:58 +0200
Subject: [PATCH 113/389] add titles in react picker, support filtering by
 emoji itself

---
 src/components/react_button/react_button.js  | 10 +++++++++-
 src/components/react_button/react_button.vue |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index de0df70c..5e7b7580 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -27,13 +27,21 @@ const ReactButton = {
   },
   computed: {
     commonEmojis () {
-      return ['👍', '😠', '👀', '😂', '🔥']
+      return [
+        { displayText: 'thumbsup', replacement: '👍' },
+        { displayText: 'angry', replacement: '😠' },
+        { displayText: 'eyes', replacement: '👀' },
+        { displayText: 'joy', replacement: '😂' },
+        { displayText: 'fire', replacement: '🔥' }
+      ]
     },
     emojis () {
       if (this.filterWord !== '') {
         const filterWordLowercase = this.filterWord.toLowerCase()
         let orderedEmojiList = []
         for (const emoji of this.$store.state.instance.emoji) {
+          if (emoji.replacement === this.filterWord) return [emoji]
+
           const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf(filterWordLowercase)
           if (indexOfFilterWord > -1) {
             if (!Array.isArray(orderedEmojiList[indexOfFilterWord])) {
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index e508a3e9..b5eb4524 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -22,15 +22,17 @@
           v-for="emoji in commonEmojis"
           :key="emoji"
           class="emoji-button"
+          :title="emoji.displayText"
           @click="addReaction($event, emoji, close)"
         >
-          {{ emoji }}
+          {{ emoji.replacement }}
         </span>
         <div class="reaction-picker-divider" />
         <span
           v-for="(emoji, key) in emojis"
           :key="key"
           class="emoji-button"
+          :title="emoji.displayText"
           @click="addReaction($event, emoji.replacement, close)"
         >
           {{ emoji.replacement }}

From a4e76067db7d9dd7d30607e4766e899e32ec4f87 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sat, 28 Nov 2020 15:36:48 +0200
Subject: [PATCH 114/389] changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 475edc61..24e29f34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
 ## [Unreleased]
+### Added
+- Mouseover titles for emojis in reaction picker
+- Support to input emoji into the search box in reaction picker
+
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
 - Fixed timeline errors locking timelines

From 767db567ad04f0c7f1140cdf650fca9a58becda5 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 30 Nov 2020 14:43:39 +0200
Subject: [PATCH 115/389] update emoji.json, add script that merges new emoji
 from another source

---
 static/emoji.json     | 2398 ++++++++++++++----------
 tools/emoji_merger.js |   67 +
 tools/emojis.json     | 4036 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 5533 insertions(+), 968 deletions(-)
 create mode 100644 tools/emoji_merger.js
 create mode 100644 tools/emojis.json

diff --git a/static/emoji.json b/static/emoji.json
index ae93d17e..12b91b3f 100644
--- a/static/emoji.json
+++ b/static/emoji.json
@@ -1,969 +1,1431 @@
 {
-  "womans_clothes": "\ud83d\udc5a",
-  "cookie": "\ud83c\udf6a",
-  "woman_with_headscarf": "\ud83e\uddd5",
-  "no_smoking": "\ud83d\udead",
-  "e-mail": "\ud83d\udce7",
-  "regional_indicator_d": "\ud83c\udde9",
-  "oncoming_bus": "\ud83d\ude8d",
-  "knife": "\ud83d\udd2a",
-  "person_getting_haircut": "\ud83d\udc87",
-  "grimacing": "\ud83d\ude2c",
-  "ophiuchus": "\u26ce",
-  "regional_indicator_q": "\ud83c\uddf6",
-  "thinking": "\ud83e\udd14",
-  "signal_strength": "\ud83d\udcf6",
-  "cactus": "\ud83c\udf35",
-  "bullettrain_front": "\ud83d\ude85",
-  "floppy_disk": "\ud83d\udcbe",
-  "doughnut": "\ud83c\udf69",
-  "tv": "\ud83d\udcfa",
-  "1234": "\ud83d\udd22",
-  "anguished": "\ud83d\ude27",
-  "clock1030": "\ud83d\udd65",
-  "u7533": "\ud83c\ude38",
-  "speak_no_evil": "\ud83d\ude4a",
-  "chart_with_upwards_trend": "\ud83d\udcc8",
-  "trophy": "\ud83c\udfc6",
-  "musical_score": "\ud83c\udfbc",
-  "chestnut": "\ud83c\udf30",
-  "clock1130": "\ud83d\udd66",
-  "abcd": "\ud83d\udd21",
-  "syringe": "\ud83d\udc89",
-  "shrimp": "\ud83e\udd90",
-  "pisces": "\u2653",
-  "left_facing_fist": "\ud83e\udd1b",
-  "bar_chart": "\ud83d\udcca",
-  "eagle": "\ud83e\udd85",
-  "woman": "\ud83d\udc69",
-  "keycap_ten": "\ud83d\udd1f",
-  "yellow_heart": "\ud83d\udc9b",
-  "croissant": "\ud83e\udd50",
-  "mosque": "\ud83d\udd4c",
-  "rice_ball": "\ud83c\udf59",
-  "volcano": "\ud83c\udf0b",
-  "baggage_claim": "\ud83d\udec4",
-  "family": "\ud83d\udc6a",
-  "beetle": "\ud83d\udc1e",
-  "older_adult": "\ud83e\uddd3",
-  "clock830": "\ud83d\udd63",
-  "bacon": "\ud83e\udd53",
-  "sound": "\ud83d\udd09",
-  "no_bicycles": "\ud83d\udeb3",
-  "rewind": "\u23ea",
-  "adult": "\ud83e\uddd1",
-  "scream_cat": "\ud83d\ude40",
-  "person_playing_water_polo": "\ud83e\udd3d",
-  "blue_car": "\ud83d\ude99",
-  "smiley": "\ud83d\ude03",
-  "kaaba": "\ud83d\udd4b",
-  "twisted_rightwards_arrows": "\ud83d\udd00",
-  "last_quarter_moon": "\ud83c\udf17",
-  "first_place": "\ud83e\udd47",
-  "joy_cat": "\ud83d\ude39",
-  "sleeping": "\ud83d\ude34",
-  "basketball": "\ud83c\udfc0",
-  "pray": "\ud83d\ude4f",
-  "trumpet": "\ud83c\udfba",
-  "purple_heart": "\ud83d\udc9c",
-  "broken_heart": "\ud83d\udc94",
-  "astonished": "\ud83d\ude32",
-  "soccer": "\u26bd",
-  "princess": "\ud83d\udc78",
-  "ant": "\ud83d\udc1c",
-  "pig": "\ud83d\udc37",
-  "vhs": "\ud83d\udcfc",
-  "scream": "\ud83d\ude31",
-  "mouse": "\ud83d\udc2d",
-  "field_hockey": "\ud83c\udfd1",
-  "ab": "\ud83c\udd8e",
-  "tokyo_tower": "\ud83d\uddfc",
-  "girl": "\ud83d\udc67",
-  "u55b6": "\ud83c\ude3a",
-  "guard": "\ud83d\udc82",
-  "regional_indicator_s": "\ud83c\uddf8",
-  "tulip": "\ud83c\udf37",
-  "capital_abcd": "\ud83d\udd20",
-  "beginner": "\ud83d\udd30",
-  "couplekiss": "\ud83d\udc8f",
-  "u5408": "\ud83c\ude34",
-  "black_medium_small_square": "\u25fe",
-  "paperclip": "\ud83d\udcce",
-  "hedgehog": "\ud83e\udd94",
-  "musical_note": "\ud83c\udfb5",
-  "pill": "\ud83d\udc8a",
-  "blue_heart": "\ud83d\udc99",
-  "mens": "\ud83d\udeb9",
-  "third_place": "\ud83e\udd49",
-  "stew": "\ud83c\udf72",
-  "prince": "\ud83e\udd34",
-  "mortar_board": "\ud83c\udf93",
-  "clock6": "\ud83d\udd55",
-  "beer": "\ud83c\udf7a",
-  "person_tipping_hand": "\ud83d\udc81",
-  "triangular_ruler": "\ud83d\udcd0",
-  "regional_indicator_y": "\ud83c\uddfe",
-  "person_facepalming": "\ud83e\udd26",
-  "steam_locomotive": "\ud83d\ude82",
-  "fire_engine": "\ud83d\ude92",
-  "horse": "\ud83d\udc34",
-  "ribbon": "\ud83c\udf80",
-  "white_large_square": "\u2b1c",
-  "smirk": "\ud83d\ude0f",
-  "genie": "\ud83e\uddde",
-  "tangerine": "\ud83c\udf4a",
-  "cl": "\ud83c\udd91",
-  "japanese_goblin": "\ud83d\udc7a",
-  "regional_indicator_u": "\ud83c\uddfa",
-  "ring": "\ud83d\udc8d",
-  "roller_coaster": "\ud83c\udfa2",
-  "100": "\ud83d\udcaf",
-  "clock12": "\ud83d\udd5b",
-  "two_hearts": "\ud83d\udc95",
-  "anger": "\ud83d\udca2",
-  "black_circle": "\u26ab",
-  "revolving_hearts": "\ud83d\udc9e",
-  "space_invader": "\ud83d\udc7e",
-  "bell": "\ud83d\udd14",
-  "point_up_2": "\ud83d\udc46",
-  "person_mountain_biking": "\ud83d\udeb5",
-  "flags": "\ud83c\udf8f",
-  "pushpin": "\ud83d\udccc",
-  "large_blue_diamond": "\ud83d\udd37",
-  "fairy": "\ud83e\uddda",
-  "european_post_office": "\ud83c\udfe4",
-  "statue_of_liberty": "\ud83d\uddfd",
-  "man": "\ud83d\udc68",
-  "microphone": "\ud83c\udfa4",
-  "inbox_tray": "\ud83d\udce5",
-  "bath": "\ud83d\udec0",
-  "person_gesturing_ok": "\ud83d\ude46",
-  "clap": "\ud83d\udc4f",
-  "confused": "\ud83d\ude15",
-  "fortune_cookie": "\ud83e\udd60",
-  "kissing_closed_eyes": "\ud83d\ude1a",
-  "kissing_heart": "\ud83d\ude18",
-  "tropical_fish": "\ud83d\udc20",
-  "taco": "\ud83c\udf2e",
-  "kimono": "\ud83d\udc58",
-  "u7a7a": "\ud83c\ude33",
-  "rat": "\ud83d\udc00",
-  "taurus": "\u2649",
-  "shopping_cart": "\ud83d\uded2",
-  "womans_hat": "\ud83d\udc52",
-  "blossom": "\ud83c\udf3c",
-  "moyai": "\ud83d\uddff",
-  "clock130": "\ud83d\udd5c",
-  "telescope": "\ud83d\udd2d",
-  "running_shirt_with_sash": "\ud83c\udfbd",
-  "person_running": "\ud83c\udfc3",
-  "dizzy": "\ud83d\udcab",
-  "crescent_moon": "\ud83c\udf19",
-  "boom": "\ud83d\udca5",
-  "restroom": "\ud83d\udebb",
-  "fist": "\u270a",
-  "white_flower": "\ud83d\udcae",
-  "clown": "\ud83e\udd21",
-  "neutral_face": "\ud83d\ude10",
-  "id": "\ud83c\udd94",
-  "carrot": "\ud83e\udd55",
-  "rice_scene": "\ud83c\udf91",
-  "foggy": "\ud83c\udf01",
-  "turtle": "\ud83d\udc22",
-  "mailbox_with_mail": "\ud83d\udcec",
-  "baseball": "\u26be",
-  "grin": "\ud83d\ude01",
-  "bathtub": "\ud83d\udec1",
-  "feet": "\ud83d\udc3e",
-  "small_red_triangle": "\ud83d\udd3a",
-  "camel": "\ud83d\udc2b",
-  "aquarius": "\u2652",
-  "face_with_symbols_over_mouth": "\ud83e\udd2c",
-  "handbag": "\ud83d\udc5c",
-  "date": "\ud83d\udcc5",
-  "nail_care": "\ud83d\udc85",
-  "satellite": "\ud83d\udce1",
-  "candy": "\ud83c\udf6c",
-  "white_medium_small_square": "\u25fd",
-  "clock930": "\ud83d\udd64",
-  "fearful": "\ud83d\ude28",
-  "fork_and_knife": "\ud83c\udf74",
-  "person_wearing_turban": "\ud83d\udc73",
-  "confounded": "\ud83d\ude16",
-  "helicopter": "\ud83d\ude81",
-  "arrow_double_down": "\u23ec",
-  "convenience_store": "\ud83c\udfea",
-  "ghost": "\ud83d\udc7b",
-  "bus": "\ud83d\ude8c",
-  "waning_gibbous_moon": "\ud83c\udf16",
-  "bank": "\ud83c\udfe6",
-  "department_store": "\ud83c\udfec",
-  "hockey": "\ud83c\udfd2",
-  "fingers_crossed": "\ud83e\udd1e",
-  "blond_haired_person": "\ud83d\udc71",
-  "mag": "\ud83d\udd0d",
-  "cut_of_meat": "\ud83e\udd69",
-  "wink": "\ud83d\ude09",
-  "railway_car": "\ud83d\ude83",
-  "face_vomiting": "\ud83e\udd2e",
-  "star_struck": "\ud83e\udd29",
-  "first_quarter_moon_with_face": "\ud83c\udf1b",
-  "octagonal_sign": "\ud83d\uded1",
-  "hospital": "\ud83c\udfe5",
-  "monkey": "\ud83d\udc12",
-  "curly_loop": "\u27b0",
-  "avocado": "\ud83e\udd51",
-  "earth_americas": "\ud83c\udf0e",
-  "flashlight": "\ud83d\udd26",
-  "8ball": "\ud83c\udfb1",
-  "clock630": "\ud83d\udd61",
-  "boar": "\ud83d\udc17",
-  "birthday": "\ud83c\udf82",
-  "crocodile": "\ud83d\udc0a",
-  "confetti_ball": "\ud83c\udf8a",
-  "door": "\ud83d\udeaa",
-  "school_satchel": "\ud83c\udf92",
-  "peanuts": "\ud83e\udd5c",
-  "regional_indicator_m": "\ud83c\uddf2",
-  "bust_in_silhouette": "\ud83d\udc64",
-  "sweat_drops": "\ud83d\udca6",
-  "tongue": "\ud83d\udc45",
-  "mag_right": "\ud83d\udd0e",
-  "t_rex": "\ud83e\udd96",
-  "post_office": "\ud83c\udfe3",
-  "shell": "\ud83d\udc1a",
-  "disappointed_relieved": "\ud83d\ude25",
-  "card_index": "\ud83d\udcc7",
-  "oncoming_automobile": "\ud83d\ude98",
-  "passport_control": "\ud83d\udec2",
-  "cherry_blossom": "\ud83c\udf38",
-  "shallow_pan_of_food": "\ud83e\udd58",
-  "heart": "\u2764\ufe0f",
-  "heartbeat": "\ud83d\udc93",
-  "crazy_face": "\ud83e\udd2a",
-  "grapes": "\ud83c\udf47",
-  "symbols": "\ud83d\udd23",
-  "gift": "\ud83c\udf81",
-  "scorpion": "\ud83e\udd82",
-  "wedding": "\ud83d\udc92",
-  "last_quarter_moon_with_face": "\ud83c\udf1c",
-  "love_letter": "\ud83d\udc8c",
-  "postal_horn": "\ud83d\udcef",
-  "stuffed_flatbread": "\ud83e\udd59",
-  "heavy_dollar_sign": "\ud83d\udcb2",
-  "love_hotel": "\ud83c\udfe9",
-  "yen": "\ud83d\udcb4",
-  "person_in_steamy_room": "\ud83e\uddd6",
-  "palm_tree": "\ud83c\udf34",
-  "name_badge": "\ud83d\udcdb",
-  "clock430": "\ud83d\udd5f",
-  "bike": "\ud83d\udeb2",
-  "snail": "\ud83d\udc0c",
-  "bowling": "\ud83c\udfb3",
-  "umbrella": "\u2614",
-  "sleeping_accommodation": "\ud83d\udecc",
-  "fireworks": "\ud83c\udf86",
-  "closed_book": "\ud83d\udcd5",
-  "city_sunset": "\ud83c\udf07",
-  "persevere": "\ud83d\ude23",
-  "bento": "\ud83c\udf71",
-  "nut_and_bolt": "\ud83d\udd29",
-  "page_facing_up": "\ud83d\udcc4",
-  "snowman": "\u26c4",
-  "two_women_holding_hands": "\ud83d\udc6d",
-  "regional_indicator_o": "\ud83c\uddf4",
-  "calling": "\ud83d\udcf2",
-  "person_shrugging": "\ud83e\udd37",
-  "sneezing_face": "\ud83e\udd27",
-  "arrows_clockwise": "\ud83d\udd03",
-  "no_pedestrians": "\ud83d\udeb7",
-  "potato": "\ud83e\udd54",
-  "cheese": "\ud83e\uddc0",
-  "full_moon": "\ud83c\udf15",
-  "mount_fuji": "\ud83d\uddfb",
-  "sob": "\ud83d\ude2d",
-  "construction": "\ud83d\udea7",
-  "head_bandage": "\ud83e\udd15",
-  "sailboat": "\u26f5",
-  "slight_frown": "\ud83d\ude41",
-  "ping_pong": "\ud83c\udfd3",
-  "hatched_chick": "\ud83d\udc25",
-  "sun_with_face": "\ud83c\udf1e",
-  "seedling": "\ud83c\udf31",
-  "repeat_one": "\ud83d\udd02",
-  "muscle": "\ud83d\udcaa",
-  "bridge_at_night": "\ud83c\udf09",
-  "raised_hands": "\ud83d\ude4c",
-  "house": "\ud83c\udfe0",
-  "nerd": "\ud83e\udd13",
-  "penguin": "\ud83d\udc27",
-  "peach": "\ud83c\udf51",
-  "dumpling": "\ud83e\udd5f",
-  "watch": "\u231a",
-  "womens": "\ud83d\udeba",
-  "round_pushpin": "\ud83d\udccd",
-  "alarm_clock": "\u23f0",
-  "relieved": "\ud83d\ude0c",
-  "sagittarius": "\u2650",
-  "busstop": "\ud83d\ude8f",
-  "regional_indicator_a": "\ud83c\udde6",
-  "sandal": "\ud83d\udc61",
-  "whale2": "\ud83d\udc0b",
-  "book": "\ud83d\udcd6",
-  "sweat": "\ud83d\ude13",
-  "movie_camera": "\ud83c\udfa5",
-  "clock230": "\ud83d\udd5d",
-  "tiger": "\ud83d\udc2f",
-  "tractor": "\ud83d\ude9c",
-  "smile": "\ud83d\ude04",
-  "vertical_traffic_light": "\ud83d\udea6",
-  "exploding_head": "\ud83e\udd2f",
-  "raised_hand": "\u270b",
-  "smoking": "\ud83d\udeac",
-  "page_with_curl": "\ud83d\udcc3",
-  "exclamation": "\u2757",
-  "fish": "\ud83d\udc1f",
-  "mans_shoe": "\ud83d\udc5e",
-  "sos": "\ud83c\udd98",
-  "unlock": "\ud83d\udd13",
-  "dolls": "\ud83c\udf8e",
-  "ear_of_rice": "\ud83c\udf3e",
-  "cat2": "\ud83d\udc08",
-  "u7121": "\ud83c\ude1a",
-  "repeat": "\ud83d\udd01",
-  "cool": "\ud83c\udd92",
-  "minibus": "\ud83d\ude90",
-  "aerial_tramway": "\ud83d\udea1",
-  "key": "\ud83d\udd11",
-  "child": "\ud83e\uddd2",
-  "camera": "\ud83d\udcf7",
-  "sunflower": "\ud83c\udf3b",
-  "white_check_mark": "\u2705",
-  "white_square_button": "\ud83d\udd33",
-  "banana": "\ud83c\udf4c",
-  "milky_way": "\ud83c\udf0c",
-  "person_gesturing_no": "\ud83d\ude45",
-  "sushi": "\ud83c\udf63",
-  "heart_eyes_cat": "\ud83d\ude3b",
-  "guitar": "\ud83c\udfb8",
-  "pie": "\ud83e\udd67",
-  "calendar": "\ud83d\udcc6",
-  "bear": "\ud83d\udc3b",
-  "person_in_lotus_position": "\ud83e\uddd8",
-  "clock10": "\ud83d\udd59",
-  "top": "\ud83d\udd1d",
-  "fuelpump": "\u26fd",
-  "rainbow": "\ud83c\udf08",
-  "snowboarder": "\ud83c\udfc2",
-  "drum": "\ud83e\udd41",
-  "leaves": "\ud83c\udf43",
-  "first_quarter_moon": "\ud83c\udf13",
-  "spoon": "\ud83e\udd44",
-  "pouting_cat": "\ud83d\ude3e",
-  "shaved_ice": "\ud83c\udf67",
-  "unamused": "\ud83d\ude12",
-  "train2": "\ud83d\ude86",
-  "clock1230": "\ud83d\udd67",
-  "regional_indicator_r": "\ud83c\uddf7",
-  "fast_forward": "\u23e9",
-  "accept": "\ud83c\ude51",
-  "hammer": "\ud83d\udd28",
-  "panda_face": "\ud83d\udc3c",
-  "briefcase": "\ud83d\udcbc",
-  "package": "\ud83d\udce6",
-  "flag_black": "\ud83c\udff4",
-  "smiling_imp": "\ud83d\ude08",
-  "sunrise_over_mountains": "\ud83c\udf04",
-  "airplane_departure": "\ud83d\udeeb",
-  "tiger2": "\ud83d\udc05",
-  "non-potable_water": "\ud83d\udeb1",
-  "bird": "\ud83d\udc26",
-  "barber": "\ud83d\udc88",
-  "cry": "\ud83d\ude22",
-  "billed_cap": "\ud83e\udde2",
-  "pouch": "\ud83d\udc5d",
-  "link": "\ud83d\udd17",
-  "zebra": "\ud83e\udd93",
-  "kiss": "\ud83d\udc8b",
-  "scorpius": "\u264f",
-  "prayer_beads": "\ud83d\udcff",
-  "high_brightness": "\ud83d\udd06",
-  "kissing_smiling_eyes": "\ud83d\ude19",
-  "rhino": "\ud83e\udd8f",
-  "left_luggage": "\ud83d\udec5",
-  "o": "\u2b55",
-  "crying_cat_face": "\ud83d\ude3f",
-  "clock8": "\ud83d\udd57",
-  "dress": "\ud83d\udc57",
-  "clock7": "\ud83d\udd56",
-  "bowl_with_spoon": "\ud83e\udd63",
-  "rolling_eyes": "\ud83d\ude44",
-  "fax": "\ud83d\udce0",
-  "worried": "\ud83d\ude1f",
-  "grey_question": "\u2754",
-  "saxophone": "\ud83c\udfb7",
-  "burrito": "\ud83c\udf2f",
-  "salad": "\ud83e\udd57",
-  "regional_indicator_z": "\ud83c\uddff",
-  "bikini": "\ud83d\udc59",
-  "milk": "\ud83e\udd5b",
-  "stars": "\ud83c\udf20",
-  "lips": "\ud83d\udc44",
-  "cd": "\ud83d\udcbf",
-  "weary": "\ud83d\ude29",
-  "face_with_raised_eyebrow": "\ud83e\udd28",
-  "lizard": "\ud83e\udd8e",
-  "tone1": "\ud83c\udffb",
-  "bullettrain_side": "\ud83d\ude84",
-  "nose": "\ud83d\udc43",
-  "innocent": "\ud83d\ude07",
-  "wilted_rose": "\ud83e\udd40",
-  "mahjong": "\ud83c\udc04",
-  "factory": "\ud83c\udfed",
-  "people_wrestling": "\ud83e\udd3c",
-  "mailbox": "\ud83d\udceb",
-  "rage": "\ud83d\ude21",
-  "wheelchair": "\u267f",
-  "x": "\u274c",
-  "flower_playing_cards": "\ud83c\udfb4",
-  "nauseated_face": "\ud83e\udd22",
-  "underage": "\ud83d\udd1e",
-  "ideograph_advantage": "\ud83c\ude50",
-  "high_heel": "\ud83d\udc60",
-  "dizzy_face": "\ud83d\ude35",
-  "stuck_out_tongue": "\ud83d\ude1b",
-  "mailbox_with_no_mail": "\ud83d\udced",
-  "orange_heart": "\ud83e\udde1",
-  "raised_back_of_hand": "\ud83e\udd1a",
-  "footprints": "\ud83d\udc63",
-  "notebook_with_decorative_cover": "\ud83d\udcd4",
-  "mask": "\ud83d\ude37",
-  "sunglasses": "\ud83d\ude0e",
-  "pancakes": "\ud83e\udd5e",
-  "regional_indicator_f": "\ud83c\uddeb",
-  "dog": "\ud83d\udc36",
-  "pig2": "\ud83d\udc16",
-  "ng": "\ud83c\udd96",
-  "unicorn": "\ud83e\udd84",
-  "triumph": "\ud83d\ude24",
-  "eggplant": "\ud83c\udf46",
-  "egg": "\ud83e\udd5a",
-  "office": "\ud83c\udfe2",
-  "goat": "\ud83d\udc10",
-  "handshake": "\ud83e\udd1d",
-  "star": "\u2b50",
-  "rugby_football": "\ud83c\udfc9",
-  "call_me": "\ud83e\udd19",
-  "rice_cracker": "\ud83c\udf58",
-  "droplet": "\ud83d\udca7",
-  "badminton": "\ud83c\udff8",
-  "waxing_crescent_moon": "\ud83c\udf12",
-  "ocean": "\ud83c\udf0a",
-  "slot_machine": "\ud83c\udfb0",
-  "wine_glass": "\ud83c\udf77",
-  "elephant": "\ud83d\udc18",
-  "blowfish": "\ud83d\udc21",
-  "ledger": "\ud83d\udcd2",
-  "money_mouth": "\ud83e\udd11",
-  "heart_decoration": "\ud83d\udc9f",
-  "arrow_down_small": "\ud83d\udd3d",
-  "station": "\ud83d\ude89",
-  "man_with_chinese_cap": "\ud83d\udc72",
-  "vampire": "\ud83e\udddb",
-  "pencil": "\ud83d\udcdd",
-  "cyclone": "\ud83c\udf00",
-  "mushroom": "\ud83c\udf44",
-  "sandwich": "\ud83e\udd6a",
-  "champagne": "\ud83c\udf7e",
-  "expressionless": "\ud83d\ude11",
-  "cold_sweat": "\ud83d\ude30",
-  "maple_leaf": "\ud83c\udf41",
-  "dromedary_camel": "\ud83d\udc2a",
-  "vs": "\ud83c\udd9a",
-  "person_fencing": "\ud83e\udd3a",
-  "straight_ruler": "\ud83d\udccf",
-  "baby_bottle": "\ud83c\udf7c",
-  "currency_exchange": "\ud83d\udcb1",
-  "regional_indicator_h": "\ud83c\udded",
-  "stuck_out_tongue_closed_eyes": "\ud83d\ude1d",
-  "closed_lock_with_key": "\ud83d\udd10",
-  "eyes": "\ud83d\udc40",
-  "water_buffalo": "\ud83d\udc03",
-  "lock_with_ink_pen": "\ud83d\udd0f",
-  "heavy_plus_sign": "\u2795",
-  "bookmark": "\ud83d\udd16",
-  "soon": "\ud83d\udd1c",
-  "orange_book": "\ud83d\udcd9",
-  "pineapple": "\ud83c\udf4d",
-  "clock9": "\ud83d\udd58",
-  "small_blue_diamond": "\ud83d\udd39",
-  "black_large_square": "\u2b1b",
-  "person_surfing": "\ud83c\udfc4",
-  "leo": "\u264c",
-  "merperson": "\ud83e\udddc",
-  "canoe": "\ud83d\udef6",
-  "rooster": "\ud83d\udc13",
-  "hear_no_evil": "\ud83d\ude49",
-  "corn": "\ud83c\udf3d",
-  "takeout_box": "\ud83e\udd61",
-  "oncoming_taxi": "\ud83d\ude96",
-  "taxi": "\ud83d\ude95",
-  "chart": "\ud83d\udcb9",
-  "goal": "\ud83e\udd45",
-  "melon": "\ud83c\udf48",
-  "notes": "\ud83c\udfb6",
-  "sparkler": "\ud83c\udf87",
-  "dolphin": "\ud83d\udc2c",
-  "speedboat": "\ud83d\udea4",
-  "cancer": "\u264b",
-  "sled": "\ud83d\udef7",
-  "tanabata_tree": "\ud83c\udf8b",
-  "train": "\ud83d\ude8b",
-  "christmas_tree": "\ud83c\udf84",
-  "two_men_holding_hands": "\ud83d\udc6c",
-  "back": "\ud83d\udd19",
-  "balloon": "\ud83c\udf88",
-  "checkered_flag": "\ud83c\udfc1",
-  "loop": "\u27bf",
-  "wc": "\ud83d\udebe",
-  "jeans": "\ud83d\udc56",
-  "green_apple": "\ud83c\udf4f",
-  "crown": "\ud83d\udc51",
-  "cowboy": "\ud83e\udd20",
-  "postbox": "\ud83d\udcee",
-  "volleyball": "\ud83c\udfd0",
-  "upside_down": "\ud83d\ude43",
-  "cricket": "\ud83e\udd97",
-  "custard": "\ud83c\udf6e",
-  "rose": "\ud83c\udf39",
-  "eyeglasses": "\ud83d\udc53",
-  "oncoming_police_car": "\ud83d\ude94",
-  "atm": "\ud83c\udfe7",
-  "flying_saucer": "\ud83d\udef8",
-  "alien": "\ud83d\udc7d",
-  "hamster": "\ud83d\udc39",
-  "trident": "\ud83d\udd31",
-  "disappointed": "\ud83d\ude1e",
-  "cow": "\ud83d\udc2e",
-  "police_officer": "\ud83d\udc6e",
-  "popcorn": "\ud83c\udf7f",
-  "baby_chick": "\ud83d\udc24",
-  "video_camera": "\ud83d\udcf9",
-  "zzz": "\ud83d\udca4",
-  "person_climbing": "\ud83e\uddd7",
-  "star2": "\ud83c\udf1f",
-  "ok": "\ud83c\udd97",
-  "capricorn": "\u2651",
-  "chicken": "\ud83d\udc14",
-  "arrow_double_up": "\u23eb",
-  "zombie": "\ud83e\udddf",
-  "closed_umbrella": "\ud83c\udf02",
-  "person_walking": "\ud83d\udeb6",
-  "lemon": "\ud83c\udf4b",
-  "heartpulse": "\ud83d\udc97",
-  "regional_indicator_i": "\ud83c\uddee",
-  "sauropod": "\ud83e\udd95",
-  "u7981": "\ud83c\ude32",
-  "regional_indicator_w": "\ud83c\uddfc",
-  "evergreen_tree": "\ud83c\udf32",
-  "mobile_phone_off": "\ud83d\udcf4",
-  "koko": "\ud83c\ude01",
-  "poop": "\ud83d\udca9",
-  "cup_with_straw": "\ud83e\udd64",
-  "leopard": "\ud83d\udc06",
-  "radio_button": "\ud83d\udd18",
-  "mega": "\ud83d\udce3",
-  "metal": "\ud83e\udd18",
-  "shushing_face": "\ud83e\udd2b",
-  "stuck_out_tongue_winking_eye": "\ud83d\ude1c",
-  "octopus": "\ud83d\udc19",
-  "boxing_glove": "\ud83e\udd4a",
-  "person_juggling": "\ud83e\udd39",
-  "money_with_wings": "\ud83d\udcb8",
-  "dollar": "\ud83d\udcb5",
-  "bride_with_veil": "\ud83d\udc70",
-  "second_place": "\ud83e\udd48",
-  "spaghetti": "\ud83c\udf5d",
-  "waning_crescent_moon": "\ud83c\udf18",
-  "football": "\ud83c\udfc8",
-  "white_circle": "\u26aa",
-  "full_moon_with_face": "\ud83c\udf1d",
-  "selfie": "\ud83e\udd33",
-  "tone3": "\ud83c\udffd",
-  "rabbit": "\ud83d\udc30",
-  "computer": "\ud83d\udcbb",
-  "clock11": "\ud83d\udd5a",
-  "heavy_minus_sign": "\u2796",
-  "synagogue": "\ud83d\udd4d",
-  "hourglass": "\u231b",
-  "gem": "\ud83d\udc8e",
-  "person_doing_cartwheel": "\ud83e\udd38",
-  "new_moon_with_face": "\ud83c\udf1a",
-  "sunrise": "\ud83c\udf05",
-  "regional_indicator_x": "\ud83c\uddfd",
-  "open_file_folder": "\ud83d\udcc2",
-  "gift_heart": "\ud83d\udc9d",
-  "tada": "\ud83c\udf89",
-  "green_heart": "\ud83d\udc9a",
-  "battery": "\ud83d\udd0b",
-  "regional_indicator_t": "\ud83c\uddf9",
-  "wrench": "\ud83d\udd27",
-  "aries": "\u2648",
-  "man_in_tuxedo": "\ud83e\udd35",
-  "regional_indicator_e": "\ud83c\uddea",
-  "regional_indicator_l": "\ud83c\uddf1",
-  "cake": "\ud83c\udf70",
-  "clapper": "\ud83c\udfac",
-  "japanese_castle": "\ud83c\udfef",
-  "crystal_ball": "\ud83d\udd2e",
-  "golf": "\u26f3",
-  "no_mobile_phones": "\ud83d\udcf5",
-  "person_biking": "\ud83d\udeb4",
-  "icecream": "\ud83c\udf66",
-  "mage": "\ud83e\uddd9",
-  "bookmark_tabs": "\ud83d\udcd1",
-  "tone4": "\ud83c\udffe",
-  "mountain_cableway": "\ud83d\udea0",
-  "person_playing_handball": "\ud83e\udd3e",
-  "bulb": "\ud83d\udca1",
-  "clock330": "\ud83d\udd5e",
-  "metro": "\ud83d\ude87",
-  "wave": "\ud83d\udc4b",
-  "whale": "\ud83d\udc33",
-  "strawberry": "\ud83c\udf53",
-  "hatching_chick": "\ud83d\udc23",
-  "trolleybus": "\ud83d\ude8e",
-  "lollipop": "\ud83c\udf6d",
-  "clipboard": "\ud83d\udccb",
-  "point_right": "\ud83d\udc49",
-  "u6307": "\ud83c\ude2f",
-  "santa": "\ud83c\udf85",
-  "hibiscus": "\ud83c\udf3a",
-  "green_book": "\ud83d\udcd7",
-  "skull": "\ud83d\udc80",
-  "tumbler_glass": "\ud83e\udd43",
-  "clock2": "\ud83d\udd51",
-  "open_mouth": "\ud83d\ude2e",
-  "bouquet": "\ud83d\udc90",
-  "champagne_glass": "\ud83e\udd42",
-  "poodle": "\ud83d\udc29",
-  "hushed": "\ud83d\ude2f",
-  "earth_asia": "\ud83c\udf0f",
-  "face_with_monocle": "\ud83e\uddd0",
-  "libra": "\u264e",
-  "clock5": "\ud83d\udd54",
-  "ambulance": "\ud83d\ude91",
-  "u5272": "\ud83c\ude39",
-  "lipstick": "\ud83d\udc84",
-  "apple": "\ud83c\udf4e",
-  "headphones": "\ud83c\udfa7",
-  "turkey": "\ud83e\udd83",
-  "pretzel": "\ud83e\udd68",
-  "bug": "\ud83d\udc1b",
-  "school": "\ud83c\udfeb",
-  "speaker": "\ud83d\udd08",
-  "boot": "\ud83d\udc62",
-  "cat": "\ud83d\udc31",
-  "dancer": "\ud83d\udc83",
-  "no_entry": "\u26d4",
-  "kissing_cat": "\ud83d\ude3d",
-  "art": "\ud83c\udfa8",
-  "coat": "\ud83e\udde5",
-  "credit_card": "\ud83d\udcb3",
-  "customs": "\ud83d\udec3",
-  "broccoli": "\ud83e\udd66",
-  "point_left": "\ud83d\udc48",
-  "canned_food": "\ud83e\udd6b",
-  "sheep": "\ud83d\udc11",
-  "person_bowing": "\ud83d\ude47",
-  "scroll": "\ud83d\udcdc",
-  "martial_arts_uniform": "\ud83e\udd4b",
-  "amphora": "\ud83c\udffa",
-  "thought_balloon": "\ud83d\udcad",
-  "no_bell": "\ud83d\udd15",
-  "musical_keyboard": "\ud83c\udfb9",
-  "people_with_bunny_ears_partying": "\ud83d\udc6f",
-  "european_castle": "\ud83c\udff0",
-  "punch": "\ud83d\udc4a",
-  "camera_with_flash": "\ud83d\udcf8",
-  "regional_indicator_p": "\ud83c\uddf5",
-  "red_car": "\ud83d\ude97",
-  "regional_indicator_j": "\ud83c\uddef",
-  "owl": "\ud83e\udd89",
-  "chart_with_downwards_trend": "\ud83d\udcc9",
-  "older_woman": "\ud83d\udc75",
-  "gemini": "\u264a",
-  "incoming_envelope": "\ud83d\udce8",
-  "waxing_gibbous_moon": "\ud83c\udf14",
-  "toilet": "\ud83d\udebd",
-  "dragon_face": "\ud83d\udc32",
-  "koala": "\ud83d\udc28",
-  "tone5": "\ud83c\udfff",
-  "kiwi": "\ud83e\udd5d",
-  "dash": "\ud83d\udca8",
-  "imp": "\ud83d\udc7f",
-  "tent": "\u26fa",
-  "regional_indicator_b": "\ud83c\udde7",
-  "monorail": "\ud83d\ude9d",
-  "ox": "\ud83d\udc02",
-  "giraffe": "\ud83e\udd92",
-  "new": "\ud83c\udd95",
-  "person_raising_hand": "\ud83d\ude4b",
-  "japan": "\ud83d\uddfe",
-  "rice": "\ud83c\udf5a",
-  "ticket": "\ud83c\udfab",
-  "rotating_light": "\ud83d\udea8",
-  "loudspeaker": "\ud83d\udce2",
-  "person_getting_massage": "\ud83d\udc86",
-  "loud_sound": "\ud83d\udd0a",
-  "hugging": "\ud83e\udd17",
-  "herb": "\ud83c\udf3f",
-  "baby": "\ud83d\udc76",
-  "angel": "\ud83d\udc7c",
-  "athletic_shoe": "\ud83d\udc5f",
-  "euro": "\ud83d\udcb6",
-  "ram": "\ud83d\udc0f",
-  "large_orange_diamond": "\ud83d\udd36",
-  "red_circle": "\ud83d\udd34",
-  "ferris_wheel": "\ud83c\udfa1",
-  "drooling_face": "\ud83e\udd24",
-  "microscope": "\ud83d\udd2c",
-  "middle_finger": "\ud83d\udd95",
-  "pager": "\ud83d\udcdf",
-  "pensive": "\ud83d\ude14",
-  "potable_water": "\ud83d\udeb0",
-  "abc": "\ud83d\udd24",
-  "four_leaf_clover": "\ud83c\udf40",
-  "vulcan": "\ud83d\udd96",
-  "french_bread": "\ud83e\udd56",
-  "motor_scooter": "\ud83d\udef5",
-  "moneybag": "\ud83d\udcb0",
-  "sparkles": "\u2728",
-  "gloves": "\ud83e\udde4",
-  "envelope_with_arrow": "\ud83d\udce9",
-  "thumbsdown": "\ud83d\udc4e",
-  "regional_indicator_g": "\ud83c\uddec",
-  "video_game": "\ud83c\udfae",
-  "on": "\ud83d\udd1b",
-  "open_hands": "\ud83d\udc50",
-  "monkey_face": "\ud83d\udc35",
-  "mountain_railway": "\ud83d\ude9e",
-  "bee": "\ud83d\udc1d",
-  "scooter": "\ud83d\udef4",
-  "fishing_pole_and_fish": "\ud83c\udfa3",
-  "smiley_cat": "\ud83d\ude3a",
-  "heart_eyes": "\ud83d\ude0d",
-  "horse_racing": "\ud83c\udfc7",
-  "ear": "\ud83d\udc42",
-  "blue_circle": "\ud83d\udd35",
-  "crossed_flags": "\ud83c\udf8c",
-  "black_joker": "\ud83c\udccf",
-  "six_pointed_star": "\ud83d\udd2f",
-  "fountain": "\u26f2",
-  "free": "\ud83c\udd93",
-  "tennis": "\ud83c\udfbe",
-  "yum": "\ud83d\ude0b",
-  "fried_shrimp": "\ud83c\udf64",
-  "dragon": "\ud83d\udc09",
-  "purse": "\ud83d\udc5b",
-  "clock1": "\ud83d\udd50",
-  "airplane_arriving": "\ud83d\udeec",
-  "cucumber": "\ud83e\udd52",
-  "man_dancing": "\ud83d\udd7a",
-  "clock730": "\ud83d\udd62",
-  "deer": "\ud83e\udd8c",
-  "meat_on_bone": "\ud83c\udf56",
-  "bomb": "\ud83d\udca3",
-  "night_with_stars": "\ud83c\udf03",
-  "snake": "\ud83d\udc0d",
-  "ramen": "\ud83c\udf5c",
-  "end": "\ud83d\udd1a",
-  "do_not_litter": "\ud83d\udeaf",
-  "joy": "\ud83d\ude02",
-  "light_rail": "\ud83d\ude88",
-  "game_die": "\ud83c\udfb2",
-  "violin": "\ud83c\udfbb",
-  "tone2": "\ud83c\udffc",
-  "tropical_drink": "\ud83c\udf79",
-  "love_you_gesture": "\ud83e\udd1f",
-  "cherries": "\ud83c\udf52",
-  "traffic_light": "\ud83d\udea5",
-  "iphone": "\ud83d\udcf1",
-  "socks": "\ud83e\udde6",
-  "wind_chime": "\ud83c\udf90",
-  "no_entry_sign": "\ud83d\udeab",
-  "elf": "\ud83e\udddd",
-  "squid": "\ud83e\udd91",
-  "person_pouting": "\ud83d\ude4e",
-  "smile_cat": "\ud83d\ude38",
-  "beers": "\ud83c\udf7b",
-  "minidisc": "\ud83d\udcbd",
-  "clock4": "\ud83d\udd53",
-  "ice_cream": "\ud83c\udf68",
-  "cocktail": "\ud83c\udf78",
-  "clock3": "\ud83d\udd52",
-  "frowning": "\ud83d\ude26",
-  "hamburger": "\ud83c\udf54",
-  "brain": "\ud83e\udde0",
-  "heavy_division_sign": "\u2797",
-  "tophat": "\ud83c\udfa9",
-  "no_mouth": "\ud83d\ude36",
-  "ski": "\ud83c\udfbf",
-  "right_facing_fist": "\ud83e\udd1c",
-  "mailbox_closed": "\ud83d\udcea",
-  "chocolate_bar": "\ud83c\udf6b",
-  "rabbit2": "\ud83d\udc07",
-  "honey_pot": "\ud83c\udf6f",
-  "izakaya_lantern": "\ud83c\udfee",
-  "articulated_lorry": "\ud83d\ude9b",
-  "face_with_hand_over_mouth": "\ud83e\udd2d",
-  "japanese_ogre": "\ud83d\udc79",
-  "zap": "\u26a1",
-  "rocket": "\ud83d\ude80",
-  "pizza": "\ud83c\udf55",
-  "pound": "\ud83d\udcb7",
-  "person_swimming": "\ud83c\udfca",
-  "anchor": "\u2693",
-  "coconut": "\ud83e\udd65",
-  "sparkling_heart": "\ud83d\udc96",
-  "older_man": "\ud83d\udc74",
-  "mouse2": "\ud83d\udc01",
-  "angry": "\ud83d\ude20",
-  "up": "\ud83c\udd99",
-  "gorilla": "\ud83e\udd8d",
-  "children_crossing": "\ud83d\udeb8",
-  "smirk_cat": "\ud83d\ude3c",
-  "pregnant_woman": "\ud83e\udd30",
-  "electric_plug": "\ud83d\udd0c",
-  "dog2": "\ud83d\udc15",
-  "question": "\u2753",
-  "carousel_horse": "\ud83c\udfa0",
-  "church": "\u26ea",
-  "outbox_tray": "\ud83d\udce4",
-  "cinema": "\ud83c\udfa6",
-  "flushed": "\ud83d\ude33",
-  "blush": "\ud83d\ude0a",
-  "medal": "\ud83c\udfc5",
-  "coffee": "\u2615",
-  "gun": "\ud83d\udd2b",
-  "city_dusk": "\ud83c\udf06",
-  "watermelon": "\ud83c\udf49",
-  "cricket_game": "\ud83c\udfcf",
-  "shower": "\ud83d\udebf",
-  "mute": "\ud83d\udd07",
-  "breast_feeding": "\ud83e\udd31",
-  "sweat_smile": "\ud83d\ude05",
-  "construction_worker": "\ud83d\udc77",
-  "cow2": "\ud83d\udc04",
-  "arrows_counterclockwise": "\ud83d\udd04",
-  "u6e80": "\ud83c\ude35",
-  "grinning": "\ud83d\ude00",
-  "globe_with_meridians": "\ud83c\udf10",
-  "diamond_shape_with_a_dot_inside": "\ud83d\udca0",
-  "deciduous_tree": "\ud83c\udf33",
-  "shark": "\ud83e\udd88",
-  "tram": "\ud83d\ude8a",
-  "person_rowing_boat": "\ud83d\udea3",
-  "chopsticks": "\ud83e\udd62",
-  "black_heart": "\ud83d\udda4",
-  "seat": "\ud83d\udcba",
-  "kissing": "\ud83d\ude17",
-  "laughing": "\ud83d\ude06",
-  "slight_smile": "\ud83d\ude42",
-  "radio": "\ud83d\udcfb",
-  "arrow_up_small": "\ud83d\udd3c",
-  "dango": "\ud83c\udf61",
-  "rofl": "\ud83e\udd23",
-  "see_no_evil": "\ud83d\ude48",
-  "thermometer_face": "\ud83e\udd12",
-  "hotdog": "\ud83c\udf2d",
-  "virgo": "\u264d",
-  "poultry_leg": "\ud83c\udf57",
-  "hotel": "\ud83c\udfe8",
-  "wolf": "\ud83d\udc3a",
-  "curry": "\ud83c\udf5b",
-  "regional_indicator_v": "\ud83c\uddfb",
-  "crab": "\ud83e\udd80",
-  "tired_face": "\ud83d\ude2b",
-  "place_of_worship": "\ud83d\uded0",
-  "ok_hand": "\ud83d\udc4c",
-  "speech_balloon": "\ud83d\udcac",
-  "sleepy": "\ud83d\ude2a",
-  "earth_africa": "\ud83c\udf0d",
-  "police_car": "\ud83d\ude93",
-  "small_red_triangle_down": "\ud83d\udd3b",
-  "bearded_person": "\ud83e\uddd4",
-  "curling_stone": "\ud83e\udd4c",
-  "scarf": "\ud83e\udde3",
-  "fire": "\ud83d\udd25",
-  "file_folder": "\ud83d\udcc1",
-  "zipper_mouth": "\ud83e\udd10",
-  "new_moon": "\ud83c\udf11",
-  "regional_indicator_n": "\ud83c\uddf3",
-  "negative_squared_cross_mark": "\u274e",
-  "newspaper": "\ud83d\udcf0",
-  "dvd": "\ud83d\udcc0",
-  "pear": "\ud83c\udf50",
-  "partly_sunny": "\u26c5",
-  "black_square_button": "\ud83d\udd32",
-  "low_brightness": "\ud83d\udd05",
-  "sake": "\ud83c\udf76",
-  "bow_and_arrow": "\ud83c\udff9",
-  "cooking": "\ud83c\udf73",
-  "fish_cake": "\ud83c\udf65",
-  "tomato": "\ud83c\udf45",
-  "couple_with_heart": "\ud83d\udc91",
-  "telephone_receiver": "\ud83d\udcde",
-  "triangular_flag_on_post": "\ud83d\udea9",
-  "jack_o_lantern": "\ud83c\udf83",
-  "blue_book": "\ud83d\udcd8",
-  "clock530": "\ud83d\udd60",
-  "u6709": "\ud83c\ude36",
-  "palms_up_together": "\ud83e\udd32",
-  "lion_face": "\ud83e\udd81",
-  "lock": "\ud83d\udd12",
-  "duck": "\ud83e\udd86",
-  "truck": "\ud83d\ude9a",
-  "oden": "\ud83c\udf62",
-  "busts_in_silhouette": "\ud83d\udc65",
-  "hourglass_flowing_sand": "\u23f3",
-  "frog": "\ud83d\udc38",
-  "fox": "\ud83e\udd8a",
-  "bread": "\ud83c\udf5e",
-  "put_litter_in_its_place": "\ud83d\udeae",
-  "couple": "\ud83d\udc6b",
-  "bamboo": "\ud83c\udf8d",
-  "regional_indicator_c": "\ud83c\udde8",
-  "menorah": "\ud83d\udd4e",
-  "circus_tent": "\ud83c\udfaa",
-  "lying_face": "\ud83e\udd25",
-  "small_orange_diamond": "\ud83d\udd38",
-  "ship": "\ud83d\udea2",
-  "person_frowning": "\ud83d\ude4d",
-  "racehorse": "\ud83d\udc0e",
-  "thumbsup": "\ud83d\udc4d",
-  "cupid": "\ud83d\udc98",
-  "robot": "\ud83e\udd16",
-  "fallen_leaf": "\ud83c\udf42",
-  "pig_nose": "\ud83d\udc3d",
-  "vibration_mode": "\ud83d\udcf3",
-  "necktie": "\ud83d\udc54",
-  "boy": "\ud83d\udc66",
-  "house_with_garden": "\ud83c\udfe1",
-  "point_down": "\ud83d\udc47",
-  "grey_exclamation": "\u2755",
-  "books": "\ud83d\udcda",
-  "regional_indicator_k": "\ud83c\uddf0",
-  "shirt": "\ud83d\udc55",
-  "fries": "\ud83c\udf5f",
-  "dart": "\ud83c\udfaf",
-  "tea": "\ud83c\udf75",
-  "mrs_claus": "\ud83e\udd36",
-  "suspension_railway": "\ud83d\ude9f",
-  "baby_symbol": "\ud83d\udebc",
-  "sweet_potato": "\ud83c\udf60",
-  "butterfly": "\ud83e\udd8b",
-  "performing_arts": "\ud83c\udfad",
-  "notebook": "\ud83d\udcd3",
-  "bat": "\ud83e\udd87"
-}
+  "100": "💯",
+  "1234": "🔢",
+  "1st_place_medal": "🥇",
+  "2nd_place_medal": "🥈",
+  "3rd_place_medal": "🥉",
+  "8ball": "🎱",
+  "a_button_blood_type": "🅰",
+  "ab": "🆎",
+  "abacus": "🧮",
+  "abc": "🔤",
+  "abcd": "🔡",
+  "accept": "🉑",
+  "adhesive_bandage": "🩹",
+  "admission_tickets": "🎟",
+  "adult": "🧑",
+  "aerial_tramway": "🚡",
+  "airplane": "✈",
+  "airplane_arriving": "🛬",
+  "airplane_departure": "🛫",
+  "alarm_clock": "⏰",
+  "alembic": "⚗️",
+  "alien": "👽",
+  "ambulance": "🚑",
+  "amphora": "🏺",
+  "anchor": "⚓",
+  "angel": "👼",
+  "anger": "💢",
+  "anger_right": "🗯",
+  "angry": "😠",
+  "anguished": "😧",
+  "ant": "🐜",
+  "apple": "🍎",
+  "aquarius": "♒",
+  "aries": "♈",
+  "arrow_backward": "◀️",
+  "arrow_double_down": "⏬",
+  "arrow_double_up": "⏫",
+  "arrow_down": "⬇️",
+  "arrow_down_small": "🔽",
+  "arrow_forward": "▶️",
+  "arrow_heading_down": "⤵️",
+  "arrow_heading_up": "⤴️",
+  "arrow_left": "⬅️",
+  "arrow_lower_left": "↙️",
+  "arrow_lower_right": "↘️",
+  "arrow_right": "➡",
+  "arrow_right_hook": "↪️",
+  "arrow_up": "⬆️",
+  "arrow_up_down": "↕",
+  "arrow_up_small": "🔼",
+  "arrow_upper_left": "↖",
+  "arrow_upper_right": "↗️",
+  "arrows_clockwise": "🔃",
+  "arrows_counterclockwise": "🔄",
+  "art": "🎨",
+  "articulated_lorry": "🚛",
+  "artist_palette": "🎨",
+  "asterisk": "*⃣",
+  "astonished": "😲",
+  "athletic_shoe": "👟",
+  "atm": "🏧",
+  "atom": "⚛",
+  "atom_symbol": "⚛️",
+  "auto_rickshaw": "🛺",
+  "automobile": "🚗",
+  "avocado": "🥑",
+  "axe": "🪓",
+  "b_button_blood_type": "🅱",
+  "baby": "👶",
+  "baby_bottle": "🍼",
+  "baby_chick": "🐤",
+  "baby_symbol": "🚼",
+  "back": "🔙",
+  "bacon": "🥓",
+  "badger": "🦡",
+  "badminton": "🏸",
+  "bagel": "🥯",
+  "baggage_claim": "🛄",
+  "baguette_bread": "🥖",
+  "balance_scale": "⚖️",
+  "bald": "🦲",
+  "ballet_shoes": "🩰",
+  "balloon": "🎈",
+  "ballot_box": "🗳",
+  "ballot_box_with_check": "☑️",
+  "bamboo": "🎍",
+  "banana": "🍌",
+  "bangbang": "‼️",
+  "banjo": "🪕",
+  "bank": "🏦",
+  "bar_chart": "📊",
+  "barber": "💈",
+  "baseball": "⚾",
+  "basket": "🧺",
+  "basketball": "🏀",
+  "basketballer": "⛹",
+  "bat": "🦇",
+  "bath": "🛀",
+  "bathtub": "🛁",
+  "battery": "🔋",
+  "beach_umbrella": "⛱",
+  "beach_with_umbrella": "🏖",
+  "bear": "🐻",
+  "beard": "🧔",
+  "bearded_person": "🧔",
+  "bed": "🛏",
+  "bee": "🐝",
+  "beer": "🍺",
+  "beers": "🍻",
+  "beetle": "🐞",
+  "beginner": "🔰",
+  "bell": "🔔",
+  "bellhop_bell": "🛎",
+  "bento": "🍱",
+  "beverage_box": "🧃",
+  "bicyclist": "🚴",
+  "bike": "🚲",
+  "bikini": "👙",
+  "billed_cap": "🧢",
+  "biohazard": "☣️",
+  "bird": "🐦",
+  "birthday": "🎂",
+  "black_circle": "⚫",
+  "black_heart": "🖤",
+  "black_joker": "🃏",
+  "black_large_square": "⬛",
+  "black_medium_small_square": "◾",
+  "black_medium_square": "◼",
+  "black_nib": "✒️",
+  "black_small_square": "▪",
+  "black_square_button": "🔲",
+  "blond_haired_person": "👱",
+  "blossom": "🌼",
+  "blowfish": "🐡",
+  "blue_book": "📘",
+  "blue_car": "🚙",
+  "blue_circle": "🔵",
+  "blue_heart": "💙",
+  "blue_square": "🟦",
+  "blush": "😊",
+  "boar": "🐗",
+  "bomb": "💣",
+  "bone": "🦴",
+  "book": "📖",
+  "bookmark": "🔖",
+  "bookmark_tabs": "📑",
+  "books": "📚",
+  "boom": "💥",
+  "boot": "👢",
+  "bouquet": "💐",
+  "bow": "🙇",
+  "bow_and_arrow": "🏹",
+  "bowl_with_spoon": "🥣",
+  "bowling": "🎳",
+  "boxing_glove": "🥊",
+  "boy": "👦",
+  "brain": "🧠",
+  "bread": "🍞",
+  "breast_feeding": "🤱",
+  "breastfeeding": "🤱",
+  "brick": "🧱",
+  "bride_with_veil": "👰",
+  "bridge_at_night": "🌉",
+  "briefcase": "💼",
+  "briefs": "🩲",
+  "broccoli": "🥦",
+  "broken_heart": "💔",
+  "broom": "🧹",
+  "brown_circle": "🟤",
+  "brown_heart": "🤎",
+  "bug": "🐛",
+  "building_construction": "🏗",
+  "bulb": "💡",
+  "bullettrain_front": "🚅",
+  "bullettrain_side": "🚄",
+  "burrito": "🌯",
+  "bus": "🚌",
+  "busstop": "🚏",
+  "bust_in_silhouette": "👤",
+  "busts_in_silhouette": "👥",
+  "butter": "🧈",
+  "butterfly": "🦋",
+  "cactus": "🌵",
+  "cake": "🍰",
+  "calendar": "📆",
+  "call_me": "🤙",
+  "call_me_hand": "🤙",
+  "calling": "📲",
+  "camel": "🐫",
+  "camera": "📷",
+  "camera_with_flash": "📸",
+  "camping": "🏕",
+  "cancer": "♋",
+  "candle": "🕯",
+  "candy": "🍬",
+  "canned_food": "🥫",
+  "canoe": "🛶",
+  "capital_abcd": "🔠",
+  "capricorn": "♑",
+  "card_file_box": "🗃",
+  "card_index": "📇",
+  "card_index_dividers": "🗂",
+  "carousel_horse": "🎠",
+  "carrot": "🥕",
+  "cat": "🐱",
+  "cat2": "🐈",
+  "cd": "💿",
+  "chains": "⛓️",
+  "chair": "🪑",
+  "champagne": "🍾",
+  "champagne_glass": "🥂",
+  "chart": "💹",
+  "chart_with_downwards_trend": "📉",
+  "chart_with_upwards_trend": "📈",
+  "check_box_with_check": "☑",
+  "check_mark": "✔",
+  "checkered_flag": "🏁",
+  "cheese": "🧀",
+  "cheese_wedge": "🧀",
+  "cherries": "🍒",
+  "cherry_blossom": "🌸",
+  "chess_pawn": "♟",
+  "chestnut": "🌰",
+  "chicken": "🐔",
+  "child": "🧒",
+  "children_crossing": "🚸",
+  "chipmunk": "🐿",
+  "chocolate_bar": "🍫",
+  "chopsticks": "🥢",
+  "christmas_tree": "🎄",
+  "church": "⛪",
+  "cinema": "🎦",
+  "circled_m": "Ⓜ",
+  "circus_tent": "🎪",
+  "city_dusk": "🌆",
+  "city_sunset": "🌇",
+  "cityscape": "🏙",
+  "cityscape_at_dusk": "🌆",
+  "cl": "🆑",
+  "clap": "👏",
+  "clapper": "🎬",
+  "classical_building": "🏛",
+  "clinking_glasses": "🥂",
+  "clipboard": "📋",
+  "clock1": "🕐",
+  "clock10": "🕙",
+  "clock1030": "🕥",
+  "clock11": "🕚",
+  "clock1130": "🕦",
+  "clock12": "🕛",
+  "clock1230": "🕧",
+  "clock130": "🕜",
+  "clock2": "🕑",
+  "clock230": "🕝",
+  "clock3": "🕒",
+  "clock330": "🕞",
+  "clock4": "🕓",
+  "clock430": "🕟",
+  "clock5": "🕔",
+  "clock530": "🕠",
+  "clock6": "🕕",
+  "clock630": "🕡",
+  "clock7": "🕖",
+  "clock730": "🕢",
+  "clock8": "🕗",
+  "clock830": "🕣",
+  "clock9": "🕘",
+  "clock930": "🕤",
+  "closed_book": "📕",
+  "closed_lock_with_key": "🔐",
+  "closed_umbrella": "🌂",
+  "cloud": "☁️",
+  "cloud_with_lightning": "🌩",
+  "cloud_with_lightning_and_rain": "⛈️",
+  "cloud_with_rain": "🌧",
+  "cloud_with_snow": "🌨",
+  "clown": "🤡",
+  "clown_face": "🤡",
+  "club_suit": "♣️",
+  "clubs": "♣",
+  "coat": "🧥",
+  "cocktail": "🍸",
+  "coconut": "🥥",
+  "coffee": "☕",
+  "coffin": "⚰️",
+  "cold_face": "🥶",
+  "cold_sweat": "😰",
+  "comet": "☄️",
+  "compass": "🧭",
+  "compression": "🗜",
+  "computer": "💻",
+  "computer_mouse": "🖱",
+  "confetti_ball": "🎊",
+  "confounded": "😖",
+  "confused": "😕",
+  "congratulations": "㊗",
+  "construction": "🚧",
+  "construction_worker": "👷",
+  "control_knobs": "🎛",
+  "convenience_store": "🏪",
+  "cookie": "🍪",
+  "cooking": "🍳",
+  "cool": "🆒",
+  "cop": "👮",
+  "copyright": "©",
+  "corn": "🌽",
+  "couch_and_lamp": "🛋",
+  "couple": "👫",
+  "couple_with_heart": "💑",
+  "couplekiss": "💏",
+  "cow": "🐮",
+  "cow2": "🐄",
+  "cowboy": "🤠",
+  "cowboy_hat_face": "🤠",
+  "crab": "🦀",
+  "crayon": "🖍",
+  "crazy_face": "🤪",
+  "credit_card": "💳",
+  "crescent_moon": "🌙",
+  "cricket": "🦗",
+  "cricket_game": "🏏",
+  "crocodile": "🐊",
+  "croissant": "🥐",
+  "cross": "✝️",
+  "crossed_fingers": "🤞",
+  "crossed_flags": "🎌",
+  "crossed_swords": "⚔️",
+  "crown": "👑",
+  "cry": "😢",
+  "crying_cat_face": "😿",
+  "crystal_ball": "🔮",
+  "cucumber": "🥒",
+  "cup_with_straw": "🥤",
+  "cupcake": "🧁",
+  "cupid": "💘",
+  "curling_stone": "🥌",
+  "curly_hair": "🦱",
+  "curly_loop": "➰",
+  "currency_exchange": "💱",
+  "curry": "🍛",
+  "custard": "🍮",
+  "customs": "🛃",
+  "cut_of_meat": "🥩",
+  "cyclone": "🌀",
+  "dagger": "🗡",
+  "dancer": "💃",
+  "dancers": "👯",
+  "dango": "🍡",
+  "dark_skin_tone": "🏿",
+  "dark_sunglasses": "🕶",
+  "dart": "🎯",
+  "dash": "💨",
+  "date": "📅",
+  "deaf_person": "🧏",
+  "deciduous_tree": "🌳",
+  "deer": "🦌",
+  "department_store": "🏬",
+  "derelict_house": "🏚",
+  "desert": "🏜",
+  "desert_island": "🏝",
+  "desktop_computer": "🖥",
+  "detective": "🕵",
+  "diamond_shape_with_a_dot_inside": "💠",
+  "diamond_suit": "♦️",
+  "diamonds": "♦",
+  "disappointed": "😞",
+  "disappointed_relieved": "😥",
+  "diving_mask": "🤿",
+  "diya_lamp": "🪔",
+  "dizzy": "💫",
+  "dizzy_face": "😵",
+  "dna": "🧬",
+  "do_not_litter": "🚯",
+  "dog": "🐶",
+  "dog2": "🐕",
+  "dollar": "💵",
+  "dolls": "🎎",
+  "dolphin": "🐬",
+  "door": "🚪",
+  "double_exclamation_mark": "‼",
+  "doughnut": "🍩",
+  "dove": "🕊",
+  "down_arrow": "⬇",
+  "downleft_arrow": "↙",
+  "downright_arrow": "↘",
+  "dragon": "🐉",
+  "dragon_face": "🐲",
+  "dress": "👗",
+  "dromedary_camel": "🐪",
+  "drooling_face": "🤤",
+  "drop_of_blood": "🩸",
+  "droplet": "💧",
+  "drum": "🥁",
+  "duck": "🦆",
+  "dumpling": "🥟",
+  "dvd": "📀",
+  "e-mail": "📧",
+  "eagle": "🦅",
+  "ear": "👂",
+  "ear_of_rice": "🌾",
+  "ear_with_hearing_aid": "🦻",
+  "earth_africa": "🌍",
+  "earth_americas": "🌎",
+  "earth_asia": "🌏",
+  "egg": "🥚",
+  "eggplant": "🍆",
+  "eight": "8⃣",
+  "eight_pointed_black_star": "✴️",
+  "eight_spoked_asterisk": "✳️",
+  "eightpointed_star": "✴",
+  "eightspoked_asterisk": "✳",
+  "eject_button": "⏏",
+  "electric_plug": "🔌",
+  "elephant": "🐘",
+  "elf": "🧝",
+  "end": "🔚",
+  "envelope": "✉",
+  "envelope_with_arrow": "📩",
+  "euro": "💶",
+  "european_castle": "🏰",
+  "european_post_office": "🏤",
+  "evergreen_tree": "🌲",
+  "exclamation": "❗",
+  "exclamation_question_mark": "⁉",
+  "exploding_head": "🤯",
+  "expressionless": "😑",
+  "eye": "👁",
+  "eyeglasses": "👓",
+  "eyes": "👀",
+  "face_vomiting": "🤮",
+  "face_with_hand_over_mouth": "🤭",
+  "face_with_headbandage": "🤕",
+  "face_with_monocle": "🧐",
+  "face_with_raised_eyebrow": "🤨",
+  "face_with_symbols_on_mouth": "🤬",
+  "face_with_symbols_over_mouth": "🤬",
+  "face_with_thermometer": "🤒",
+  "factory": "🏭",
+  "fairy": "🧚",
+  "falafel": "🧆",
+  "fallen_leaf": "🍂",
+  "family": "👪",
+  "fast_forward": "⏩",
+  "fax": "📠",
+  "fearful": "😨",
+  "feet": "🐾",
+  "female_sign": "♀",
+  "ferris_wheel": "🎡",
+  "ferry": "⛴️",
+  "field_hockey": "🏑",
+  "file_cabinet": "🗄",
+  "file_folder": "📁",
+  "film_frames": "🎞",
+  "film_projector": "📽",
+  "fingers_crossed": "🤞",
+  "fire": "🔥",
+  "fire_engine": "🚒",
+  "fire_extinguisher": "🧯",
+  "firecracker": "🧨",
+  "fireworks": "🎆",
+  "first_place": "🥇",
+  "first_quarter_moon": "🌓",
+  "first_quarter_moon_with_face": "🌛",
+  "fish": "🐟",
+  "fish_cake": "🍥",
+  "fishing_pole_and_fish": "🎣",
+  "fist": "✊",
+  "five": "5⃣",
+  "flag_black": "🏴",
+  "flag_white": "🏳",
+  "flags": "🎏",
+  "flamingo": "🦩",
+  "flashlight": "🔦",
+  "flat_shoe": "🥿",
+  "fleur-de-lis": "⚜",
+  "fleurde-lis": "⚜️",
+  "floppy_disk": "💾",
+  "flower_playing_cards": "🎴",
+  "flushed": "😳",
+  "flying_disc": "🥏",
+  "flying_saucer": "🛸",
+  "fog": "🌫",
+  "foggy": "🌁",
+  "foot": "🦶",
+  "football": "🏈",
+  "footprints": "👣",
+  "fork_and_knife": "🍴",
+  "fork_and_knife_with_plate": "🍽",
+  "fortune_cookie": "🥠",
+  "fountain": "⛲",
+  "fountain_pen": "🖋",
+  "four": "4⃣",
+  "four_leaf_clover": "🍀",
+  "fox": "🦊",
+  "framed_picture": "🖼",
+  "free": "🆓",
+  "french_bread": "🥖",
+  "fried_shrimp": "🍤",
+  "fries": "🍟",
+  "frog": "🐸",
+  "frowning": "😦",
+  "frowning_face": "☹️",
+  "fuelpump": "⛽",
+  "full_moon": "🌕",
+  "full_moon_with_face": "🌝",
+  "funeral_urn": "⚱️",
+  "game_die": "🎲",
+  "garlic": "🧄",
+  "gear": "⚙️",
+  "gem": "💎",
+  "gemini": "♊",
+  "genie": "🧞",
+  "ghost": "👻",
+  "gift": "🎁",
+  "gift_heart": "💝",
+  "giraffe": "🦒",
+  "girl": "👧",
+  "glass_of_milk": "🥛",
+  "globe_with_meridians": "🌐",
+  "gloves": "🧤",
+  "goal": "🥅",
+  "goal_net": "🥅",
+  "goat": "🐐",
+  "goggles": "🥽",
+  "golf": "⛳",
+  "golfer": "🏌",
+  "gorilla": "🦍",
+  "grapes": "🍇",
+  "green_apple": "🍏",
+  "green_book": "📗",
+  "green_circle": "🟢",
+  "green_heart": "💚",
+  "green_salad": "🥗",
+  "green_square": "🟩",
+  "grey_exclamation": "❕",
+  "grey_question": "❔",
+  "grimacing": "😬",
+  "grin": "😁",
+  "grinning": "😀",
+  "guard": "💂",
+  "guardsman": "💂",
+  "guide_dog": "🦮",
+  "guitar": "🎸",
+  "gun": "🔫",
+  "haircut": "💇",
+  "hamburger": "🍔",
+  "hammer": "🔨",
+  "hammer_and_pick": "⚒️",
+  "hammer_and_wrench": "🛠",
+  "hamster": "🐹",
+  "hand_with_fingers_splayed": "🖐",
+  "handbag": "👜",
+  "handshake": "🤝",
+  "hash": "#⃣",
+  "hatched_chick": "🐥",
+  "hatching_chick": "🐣",
+  "head_bandage": "🤕",
+  "headphones": "🎧",
+  "hear_no_evil": "🙉",
+  "heart": "❤️",
+  "heart_decoration": "💟",
+  "heart_exclamation": "❣",
+  "heart_eyes": "😍",
+  "heart_eyes_cat": "😻",
+  "heart_suit": "♥️",
+  "heartbeat": "💓",
+  "heartpulse": "💗",
+  "hearts": "♥",
+  "heavy_check_mark": "✔️",
+  "heavy_division_sign": "➗",
+  "heavy_dollar_sign": "💲",
+  "heavy_minus_sign": "➖",
+  "heavy_multiplication_x": "✖️",
+  "heavy_plus_sign": "➕",
+  "hedgehog": "🦔",
+  "helicopter": "🚁",
+  "herb": "🌿",
+  "hibiscus": "🌺",
+  "high_brightness": "🔆",
+  "high_heel": "👠",
+  "hiking_boot": "🥾",
+  "hindu_temple": "🛕",
+  "hippopotamus": "🦛",
+  "hockey": "🏒",
+  "hole": "🕳",
+  "honey_pot": "🍯",
+  "horse": "🐴",
+  "horse_racing": "🏇",
+  "hospital": "🏥",
+  "hot_face": "🥵",
+  "hot_pepper": "🌶",
+  "hot_springs": "♨",
+  "hotdog": "🌭",
+  "hotel": "🏨",
+  "hotsprings": "♨️",
+  "hourglass": "⌛",
+  "hourglass_flowing_sand": "⏳",
+  "house": "🏠",
+  "house_with_garden": "🏡",
+  "houses": "🏘",
+  "hugging": "🤗",
+  "hundred_points": "💯",
+  "hushed": "😯",
+  "ice": "🧊",
+  "ice_cream": "🍨",
+  "ice_hockey": "🏒",
+  "ice_skate": "⛸️",
+  "icecream": "🍦",
+  "id": "🆔",
+  "ideograph_advantage": "🉐",
+  "imp": "👿",
+  "inbox_tray": "📥",
+  "incoming_envelope": "📨",
+  "index_pointing_up": "☝",
+  "infinity": "♾",
+  "information": "ℹ️",
+  "information_desk_person": "💁",
+  "information_source": "ℹ",
+  "innocent": "😇",
+  "input_numbers": "🔢",
+  "interrobang": "⁉️",
+  "iphone": "📱",
+  "izakaya_lantern": "🏮",
+  "jack_o_lantern": "🎃",
+  "japan": "🗾",
+  "japanese_castle": "🏯",
+  "japanese_congratulations_button": "㊗️",
+  "japanese_free_of_charge_button": "🈚",
+  "japanese_goblin": "👺",
+  "japanese_ogre": "👹",
+  "japanese_reserved_button": "🈯",
+  "japanese_secret_button": "㊙️",
+  "japanese_service_charge_button": "🈂",
+  "jeans": "👖",
+  "joy": "😂",
+  "joy_cat": "😹",
+  "joystick": "🕹",
+  "kaaba": "🕋",
+  "kangaroo": "🦘",
+  "key": "🔑",
+  "keyboard": "⌨️",
+  "keycap_ten": "🔟",
+  "kick_scooter": "🛴",
+  "kimono": "👘",
+  "kiss": "💋",
+  "kissing": "😗",
+  "kissing_cat": "😽",
+  "kissing_closed_eyes": "😚",
+  "kissing_heart": "😘",
+  "kissing_smiling_eyes": "😙",
+  "kitchen_knife": "🔪",
+  "kite": "🪁",
+  "kiwi": "🥝",
+  "kiwi_fruit": "🥝",
+  "knife": "🔪",
+  "koala": "🐨",
+  "koko": "🈁",
+  "lab_coat": "🥼",
+  "label": "🏷",
+  "lacrosse": "🥍",
+  "large_blue_diamond": "🔷",
+  "large_orange_diamond": "🔶",
+  "last_quarter_moon": "🌗",
+  "last_quarter_moon_with_face": "🌜",
+  "last_track_button": "⏮️",
+  "latin_cross": "✝",
+  "laughing": "😆",
+  "leafy_green": "🥬",
+  "leaves": "🍃",
+  "ledger": "📒",
+  "left_arrow": "⬅",
+  "left_arrow_curving_right": "↪",
+  "left_facing_fist": "🤛",
+  "left_luggage": "🛅",
+  "left_right_arrow": "↔",
+  "leftfacing_fist": "🤛",
+  "leftright_arrow": "↔️",
+  "leftwards_arrow_with_hook": "↩️",
+  "leg": "🦵",
+  "lemon": "🍋",
+  "leo": "♌",
+  "leopard": "🐆",
+  "level_slider": "🎚",
+  "libra": "♎",
+  "light_rail": "🚈",
+  "light_skin_tone": "🏻",
+  "link": "🔗",
+  "linked_paperclips": "🖇",
+  "lion_face": "🦁",
+  "lips": "👄",
+  "lipstick": "💄",
+  "lizard": "🦎",
+  "llama": "🦙",
+  "lobster": "🦞",
+  "lock": "🔒",
+  "lock_with_ink_pen": "🔏",
+  "lollipop": "🍭",
+  "loop": "➿",
+  "lotion_bottle": "🧴",
+  "loud_sound": "🔊",
+  "loudspeaker": "📢",
+  "love_hotel": "🏩",
+  "love_letter": "💌",
+  "love_you_gesture": "🤟",
+  "loveyou_gesture": "🤟",
+  "low_brightness": "🔅",
+  "luggage": "🧳",
+  "lying_face": "🤥",
+  "m": "Ⓜ️",
+  "mag": "🔍",
+  "mag_right": "🔎",
+  "mage": "🧙",
+  "magnet": "🧲",
+  "mahjong": "🀄",
+  "mailbox": "📫",
+  "mailbox_closed": "📪",
+  "mailbox_with_mail": "📬",
+  "mailbox_with_no_mail": "📭",
+  "male_sign": "♂",
+  "man": "👨",
+  "man_dancing": "🕺",
+  "man_in_suit": "🕴",
+  "man_in_tuxedo": "🤵",
+  "man_with_chinese_cap": "👲",
+  "man_with_gua_pi_mao": "👲",
+  "man_with_turban": "👳",
+  "mango": "🥭",
+  "mans_shoe": "👞",
+  "mantelpiece_clock": "🕰",
+  "manual_wheelchair": "🦽",
+  "maple_leaf": "🍁",
+  "martial_arts_uniform": "🥋",
+  "mask": "😷",
+  "massage": "💆",
+  "mate": "🧉",
+  "meat_on_bone": "🍖",
+  "mechanical_arm": "🦾",
+  "mechanical_leg": "🦿",
+  "medal": "🏅",
+  "medical_symbol": "⚕",
+  "medium_skin_tone": "🏽",
+  "mediumdark_skin_tone": "🏾",
+  "mediumlight_skin_tone": "🏼",
+  "mega": "📣",
+  "melon": "🍈",
+  "memo": "📝",
+  "menorah": "🕎",
+  "mens": "🚹",
+  "merperson": "🧜",
+  "metal": "🤘",
+  "metro": "🚇",
+  "microbe": "🦠",
+  "microphone": "🎤",
+  "microscope": "🔬",
+  "middle_finger": "🖕",
+  "military_medal": "🎖",
+  "milk": "🥛",
+  "milky_way": "🌌",
+  "minibus": "🚐",
+  "minidisc": "💽",
+  "mobile_phone_off": "📴",
+  "money_mouth": "🤑",
+  "money_with_wings": "💸",
+  "moneybag": "💰",
+  "moneymouth_face": "🤑",
+  "monkey": "🐒",
+  "monkey_face": "🐵",
+  "monorail": "🚝",
+  "moon_cake": "🥮",
+  "mortar_board": "🎓",
+  "mosque": "🕌",
+  "mosquito": "🦟",
+  "motor_boat": "🛥",
+  "motor_scooter": "🛵",
+  "motorcycle": "🏍",
+  "motorized_wheelchair": "🦼",
+  "motorway": "🛣",
+  "mount_fuji": "🗻",
+  "mountain": "⛰️",
+  "mountain_bicyclist": "🚵",
+  "mountain_cableway": "🚠",
+  "mountain_railway": "🚞",
+  "mouse": "🐭",
+  "mouse2": "🐁",
+  "movie_camera": "🎥",
+  "moyai": "🗿",
+  "mrs_claus": "🤶",
+  "multiplication_sign": "✖",
+  "muscle": "💪",
+  "mushroom": "🍄",
+  "musical_keyboard": "🎹",
+  "musical_note": "🎵",
+  "musical_score": "🎼",
+  "mute": "🔇",
+  "nail_care": "💅",
+  "name_badge": "📛",
+  "national_park": "🏞",
+  "nauseated_face": "🤢",
+  "nazar_amulet": "🧿",
+  "necktie": "👔",
+  "negative_squared_cross_mark": "❎",
+  "nerd": "🤓",
+  "neutral_face": "😐",
+  "new": "🆕",
+  "new_moon": "🌑",
+  "new_moon_with_face": "🌚",
+  "newspaper": "📰",
+  "next_track_button": "⏭️",
+  "ng": "🆖",
+  "night_with_stars": "🌃",
+  "nine": "9⃣",
+  "no_bell": "🔕",
+  "no_bicycles": "🚳",
+  "no_entry": "⛔",
+  "no_entry_sign": "🚫",
+  "no_good": "🙅",
+  "no_mobile_phones": "📵",
+  "no_mouth": "😶",
+  "no_pedestrians": "🚷",
+  "no_smoking": "🚭",
+  "non-potable_water": "🚱",
+  "nose": "👃",
+  "notebook": "📓",
+  "notebook_with_decorative_cover": "📔",
+  "notes": "🎶",
+  "nut_and_bolt": "🔩",
+  "o": "⭕",
+  "o_button_blood_type": "🅾",
+  "ocean": "🌊",
+  "octagonal_sign": "🛑",
+  "octopus": "🐙",
+  "oden": "🍢",
+  "office": "🏢",
+  "oil_drum": "🛢",
+  "ok": "🆗",
+  "ok_hand": "👌",
+  "ok_woman": "🙆",
+  "old_key": "🗝",
+  "older_adult": "🧓",
+  "older_man": "👴",
+  "older_person": "🧓",
+  "older_woman": "👵",
+  "om_symbol": "🕉",
+  "on": "🔛",
+  "oncoming_automobile": "🚘",
+  "oncoming_bus": "🚍",
+  "oncoming_fist": "👊",
+  "oncoming_police_car": "🚔",
+  "oncoming_taxi": "🚖",
+  "one": "1⃣",
+  "onepiece_swimsuit": "🩱",
+  "onion": "🧅",
+  "open_file_folder": "📂",
+  "open_hands": "👐",
+  "open_mouth": "😮",
+  "ophiuchus": "⛎",
+  "orange_book": "📙",
+  "orange_circle": "🟠",
+  "orange_heart": "🧡",
+  "orange_square": "🟧",
+  "orangutan": "🦧",
+  "orthodox_cross": "☦️",
+  "otter": "🦦",
+  "outbox_tray": "📤",
+  "owl": "🦉",
+  "ox": "🐂",
+  "oyster": "🦪",
+  "p_button": "🅿",
+  "package": "📦",
+  "page_facing_up": "📄",
+  "page_with_curl": "📃",
+  "pager": "📟",
+  "paintbrush": "🖌",
+  "palm_tree": "🌴",
+  "palms_up_together": "🤲",
+  "pancakes": "🥞",
+  "panda_face": "🐼",
+  "paperclip": "📎",
+  "parachute": "🪂",
+  "parrot": "🦜",
+  "part_alternation_mark": "〽",
+  "partly_sunny": "⛅",
+  "partying_face": "🥳",
+  "passenger_ship": "🛳",
+  "passport_control": "🛂",
+  "pause_button": "⏸️",
+  "peace": "☮",
+  "peace_symbol": "☮️",
+  "peach": "🍑",
+  "peacock": "🦚",
+  "peanuts": "🥜",
+  "pear": "🍐",
+  "pen": "🖊",
+  "pencil": "📝",
+  "pencil2": "✏",
+  "penguin": "🐧",
+  "pensive": "😔",
+  "people_with_bunny_ears_partying": "👯",
+  "people_wrestling": "🤼",
+  "performing_arts": "🎭",
+  "persevere": "😣",
+  "person": "🧑",
+  "person_biking": "🚴",
+  "person_bouncing_ball": "⛹️",
+  "person_bowing": "🙇",
+  "person_cartwheeling": "🤸",
+  "person_climbing": "🧗",
+  "person_doing_cartwheel": "🤸",
+  "person_facepalming": "🤦",
+  "person_fencing": "🤺",
+  "person_frowning": "🙍",
+  "person_gesturing_no": "🙅",
+  "person_gesturing_ok": "🙆",
+  "person_getting_haircut": "💇",
+  "person_getting_massage": "💆",
+  "person_in_lotus_position": "🧘",
+  "person_in_steamy_room": "🧖",
+  "person_juggling": "🤹",
+  "person_kneeling": "🧎",
+  "person_mountain_biking": "🚵",
+  "person_playing_handball": "🤾",
+  "person_playing_water_polo": "🤽",
+  "person_pouting": "🙎",
+  "person_raising_hand": "🙋",
+  "person_rowing_boat": "🚣",
+  "person_running": "🏃",
+  "person_shrugging": "🤷",
+  "person_standing": "🧍",
+  "person_surfing": "🏄",
+  "person_swimming": "🏊",
+  "person_tipping_hand": "💁",
+  "person_walking": "🚶",
+  "person_wearing_turban": "👳",
+  "person_with_blond_hair": "👱",
+  "person_with_pouting_face": "🙎",
+  "petri_dish": "🧫",
+  "pick": "⛏️",
+  "pie": "🥧",
+  "pig": "🐷",
+  "pig2": "🐖",
+  "pig_nose": "🐽",
+  "pill": "💊",
+  "pinching_hand": "🤏",
+  "pineapple": "🍍",
+  "ping_pong": "🏓",
+  "pisces": "♓",
+  "pizza": "🍕",
+  "place_of_worship": "🛐",
+  "play_button": "▶",
+  "play_or_pause_button": "⏯️",
+  "play_pause": "⏯",
+  "pleading_face": "🥺",
+  "point_down": "👇",
+  "point_left": "👈",
+  "point_right": "👉",
+  "point_up": "☝️",
+  "point_up_2": "👆",
+  "police_car": "🚓",
+  "police_officer": "👮",
+  "poodle": "🐩",
+  "poop": "💩",
+  "popcorn": "🍿",
+  "post_office": "🏣",
+  "postal_horn": "📯",
+  "postbox": "📮",
+  "potable_water": "🚰",
+  "potato": "🥔",
+  "pouch": "👝",
+  "poultry_leg": "🍗",
+  "pound": "💷",
+  "pouting_cat": "😾",
+  "pray": "🙏",
+  "prayer_beads": "📿",
+  "pregnant_woman": "🤰",
+  "pretzel": "🥨",
+  "prince": "🤴",
+  "princess": "👸",
+  "printer": "🖨",
+  "probing_cane": "🦯",
+  "punch": "👊",
+  "purple_circle": "🟣",
+  "purple_heart": "💜",
+  "purse": "👛",
+  "pushpin": "📌",
+  "put_litter_in_its_place": "🚮",
+  "puzzle_piece": "🧩",
+  "question": "❓",
+  "rabbit": "🐰",
+  "rabbit2": "🐇",
+  "raccoon": "🦝",
+  "racehorse": "🐎",
+  "racing_car": "🏎",
+  "radio": "📻",
+  "radio_button": "🔘",
+  "radioactive": "☢️",
+  "rage": "😡",
+  "railway_car": "🚃",
+  "railway_track": "🛤",
+  "rainbow": "🌈",
+  "raised_back_of_hand": "🤚",
+  "raised_hand": "✋",
+  "raised_hands": "🙌",
+  "raising_hand": "🙋",
+  "ram": "🐏",
+  "ramen": "🍜",
+  "rat": "🐀",
+  "razor": "🪒",
+  "receipt": "🧾",
+  "record_button": "⏺️",
+  "recycle": "♻",
+  "recycling_symbol": "♻️",
+  "red_car": "🚗",
+  "red_circle": "🔴",
+  "red_envelope": "🧧",
+  "red_hair": "🦰",
+  "red_heart": "❤",
+  "red_square": "🟥",
+  "regional_indicator_a": "🇦",
+  "regional_indicator_b": "🇧",
+  "regional_indicator_c": "🇨",
+  "regional_indicator_d": "🇩",
+  "regional_indicator_e": "🇪",
+  "regional_indicator_f": "🇫",
+  "regional_indicator_g": "🇬",
+  "regional_indicator_h": "🇭",
+  "regional_indicator_i": "🇮",
+  "regional_indicator_j": "🇯",
+  "regional_indicator_k": "🇰",
+  "regional_indicator_l": "🇱",
+  "regional_indicator_m": "🇲",
+  "regional_indicator_n": "🇳",
+  "regional_indicator_o": "🇴",
+  "regional_indicator_p": "🇵",
+  "regional_indicator_q": "🇶",
+  "regional_indicator_r": "🇷",
+  "regional_indicator_s": "🇸",
+  "regional_indicator_t": "🇹",
+  "regional_indicator_u": "🇺",
+  "regional_indicator_v": "🇻",
+  "regional_indicator_w": "🇼",
+  "regional_indicator_x": "🇽",
+  "regional_indicator_y": "🇾",
+  "regional_indicator_z": "🇿",
+  "registered": "®",
+  "relieved": "😌",
+  "reminder_ribbon": "🎗",
+  "repeat": "🔁",
+  "repeat_one": "🔂",
+  "rescue_worker’s_helmet": "⛑️",
+  "restroom": "🚻",
+  "reverse_button": "◀",
+  "revolving_hearts": "💞",
+  "rewind": "⏪",
+  "rhino": "🦏",
+  "rhinoceros": "🦏",
+  "ribbon": "🎀",
+  "rice": "🍚",
+  "rice_ball": "🍙",
+  "rice_cracker": "🍘",
+  "rice_scene": "🎑",
+  "right_arrow": "➡️",
+  "right_arrow_curving_down": "⤵",
+  "right_arrow_curving_left": "↩",
+  "right_arrow_curving_up": "⤴",
+  "right_facing_fist": "🤜",
+  "rightfacing_fist": "🤜",
+  "ring": "💍",
+  "ringed_planet": "🪐",
+  "robot": "🤖",
+  "rocket": "🚀",
+  "rofl": "🤣",
+  "roll_of_paper": "🧻",
+  "rolledup_newspaper": "🗞",
+  "roller_coaster": "🎢",
+  "rolling_eyes": "🙄",
+  "rolling_on_the_floor_laughing": "🤣",
+  "rooster": "🐓",
+  "rose": "🌹",
+  "rosette": "🏵",
+  "rotating_light": "🚨",
+  "round_pushpin": "📍",
+  "rowboat": "🚣",
+  "rugby_football": "🏉",
+  "runner": "🏃",
+  "running_shirt_with_sash": "🎽",
+  "safety_pin": "🧷",
+  "safety_vest": "🦺",
+  "sagittarius": "♐",
+  "sailboat": "⛵",
+  "sake": "🍶",
+  "salad": "🥗",
+  "salt": "🧂",
+  "sandal": "👡",
+  "sandwich": "🥪",
+  "santa": "🎅",
+  "sari": "🥻",
+  "satellite": "📡",
+  "sauropod": "🦕",
+  "saxophone": "🎷",
+  "scales": "⚖",
+  "scarf": "🧣",
+  "school": "🏫",
+  "school_satchel": "🎒",
+  "scissors": "✂",
+  "scooter": "🛴",
+  "scorpion": "🦂",
+  "scorpius": "♏",
+  "scream": "😱",
+  "scream_cat": "🙀",
+  "scroll": "📜",
+  "seat": "💺",
+  "second_place": "🥈",
+  "secret": "㊙",
+  "see_no_evil": "🙈",
+  "seedling": "🌱",
+  "selfie": "🤳",
+  "seven": "7⃣",
+  "shallow_pan_of_food": "🥘",
+  "shamrock": "☘️",
+  "shark": "🦈",
+  "shaved_ice": "🍧",
+  "sheep": "🐑",
+  "shell": "🐚",
+  "shield": "🛡",
+  "shinto_shrine": "⛩️",
+  "ship": "🚢",
+  "shirt": "👕",
+  "shopping_bags": "🛍",
+  "shopping_cart": "🛒",
+  "shorts": "🩳",
+  "shower": "🚿",
+  "shrimp": "🦐",
+  "shushing_face": "🤫",
+  "sign_of_the_horns": "🤘",
+  "signal_strength": "📶",
+  "six": "6⃣",
+  "six_pointed_star": "🔯",
+  "skateboard": "🛹",
+  "ski": "🎿",
+  "skier": "⛷️",
+  "skull": "💀",
+  "skull_and_crossbones": "☠️",
+  "skull_crossbones": "☠",
+  "skunk": "🦨",
+  "sled": "🛷",
+  "sleeping": "😴",
+  "sleeping_accommodation": "🛌",
+  "sleepy": "😪",
+  "slight_frown": "🙁",
+  "slight_smile": "🙂",
+  "slightly_frowning_face": "🙁",
+  "slot_machine": "🎰",
+  "sloth": "🦥",
+  "small_airplane": "🛩",
+  "small_blue_diamond": "🔹",
+  "small_orange_diamond": "🔸",
+  "small_red_triangle": "🔺",
+  "small_red_triangle_down": "🔻",
+  "smile": "😄",
+  "smile_cat": "😸",
+  "smiley": "😃",
+  "smiley_cat": "😺",
+  "smiling": "☺️",
+  "smiling_face": "☺",
+  "smiling_face_with_hearts": "🥰",
+  "smiling_imp": "😈",
+  "smirk": "😏",
+  "smirk_cat": "😼",
+  "smoking": "🚬",
+  "snail": "🐌",
+  "snake": "🐍",
+  "sneezing_face": "🤧",
+  "snowboarder": "🏂",
+  "snowcapped_mountain": "🏔",
+  "snowflake": "❄",
+  "snowman": "⛄",
+  "soap": "🧼",
+  "sob": "😭",
+  "soccer": "⚽",
+  "socks": "🧦",
+  "softball": "🥎",
+  "soon": "🔜",
+  "sos": "🆘",
+  "sound": "🔉",
+  "space_invader": "👾",
+  "spade_suit": "♠️",
+  "spades": "♠",
+  "spaghetti": "🍝",
+  "sparkle": "❇",
+  "sparkler": "🎇",
+  "sparkles": "✨",
+  "sparkling_heart": "💖",
+  "speak_no_evil": "🙊",
+  "speaker": "🔈",
+  "speaking_head": "🗣",
+  "speech_balloon": "💬",
+  "speech_left": "🗨",
+  "speedboat": "🚤",
+  "spider": "🕷",
+  "spider_web": "🕸",
+  "spiral_calendar": "🗓",
+  "spiral_notepad": "🗒",
+  "sponge": "🧽",
+  "spoon": "🥄",
+  "squid": "🦑",
+  "stadium": "🏟",
+  "star": "⭐",
+  "star2": "🌟",
+  "star_and_crescent": "☪️",
+  "star_of_david": "✡",
+  "star_struck": "🤩",
+  "stars": "🌠",
+  "starstruck": "🤩",
+  "station": "🚉",
+  "statue_of_liberty": "🗽",
+  "steam_locomotive": "🚂",
+  "stethoscope": "🩺",
+  "stew": "🍲",
+  "stop_button": "⏹️",
+  "stopwatch": "⏱️",
+  "straight_ruler": "📏",
+  "strawberry": "🍓",
+  "stuck_out_tongue": "😛",
+  "stuck_out_tongue_closed_eyes": "😝",
+  "stuck_out_tongue_winking_eye": "😜",
+  "studio_microphone": "🎙",
+  "stuffed_flatbread": "🥙",
+  "sun": "☀",
+  "sun_behind_large_cloud": "🌥",
+  "sun_behind_rain_cloud": "🌦",
+  "sun_behind_small_cloud": "🌤",
+  "sun_with_face": "🌞",
+  "sunflower": "🌻",
+  "sunglasses": "😎",
+  "sunny": "☀️",
+  "sunrise": "🌅",
+  "sunrise_over_mountains": "🌄",
+  "superhero": "🦸",
+  "supervillain": "🦹",
+  "surfer": "🏄",
+  "sushi": "🍣",
+  "suspension_railway": "🚟",
+  "swan": "🦢",
+  "sweat": "😓",
+  "sweat_drops": "💦",
+  "sweat_smile": "😅",
+  "sweet_potato": "🍠",
+  "swimmer": "🏊",
+  "symbols": "🔣",
+  "synagogue": "🕍",
+  "syringe": "💉",
+  "t_rex": "🦖",
+  "taco": "🌮",
+  "tada": "🎉",
+  "takeout_box": "🥡",
+  "tanabata_tree": "🎋",
+  "tangerine": "🍊",
+  "taurus": "♉",
+  "taxi": "🚕",
+  "tea": "🍵",
+  "teddy_bear": "🧸",
+  "telephone": "☎",
+  "telephone_receiver": "📞",
+  "telescope": "🔭",
+  "tennis": "🎾",
+  "tent": "⛺",
+  "test_tube": "🧪",
+  "thermometer": "🌡",
+  "thermometer_face": "🤒",
+  "thinking": "🤔",
+  "third_place": "🥉",
+  "thought_balloon": "💭",
+  "thread": "🧵",
+  "three": "3⃣",
+  "thumbsdown": "👎",
+  "thumbsup": "👍",
+  "ticket": "🎫",
+  "tiger": "🐯",
+  "tiger2": "🐅",
+  "timer_clock": "⏲️",
+  "tired_face": "😫",
+  "tm": "™",
+  "toilet": "🚽",
+  "tokyo_tower": "🗼",
+  "tomato": "🍅",
+  "tone1": "🏻",
+  "tone2": "🏼",
+  "tone3": "🏽",
+  "tone4": "🏾",
+  "tone5": "🏿",
+  "tongue": "👅",
+  "toolbox": "🧰",
+  "tooth": "🦷",
+  "top": "🔝",
+  "tophat": "🎩",
+  "tornado": "🌪",
+  "track_next": "⏭",
+  "track_previous": "⏮",
+  "trackball": "🖲",
+  "tractor": "🚜",
+  "trade_mark": "™️",
+  "traffic_light": "🚥",
+  "train": "🚋",
+  "train2": "🚆",
+  "tram": "🚊",
+  "trex": "🦖",
+  "triangular_flag_on_post": "🚩",
+  "triangular_ruler": "📐",
+  "trident": "🔱",
+  "triumph": "😤",
+  "trolleybus": "🚎",
+  "trophy": "🏆",
+  "tropical_drink": "🍹",
+  "tropical_fish": "🐠",
+  "truck": "🚚",
+  "trumpet": "🎺",
+  "tulip": "🌷",
+  "tumbler_glass": "🥃",
+  "turkey": "🦃",
+  "turtle": "🐢",
+  "tv": "📺",
+  "twisted_rightwards_arrows": "🔀",
+  "two": "2⃣",
+  "two_hearts": "💕",
+  "two_men_holding_hands": "👬",
+  "two_women_holding_hands": "👭",
+  "u5272": "🈹",
+  "u5408": "🈴",
+  "u55b6": "🈺",
+  "u6307": "🈯",
+  "u6708": "🈷",
+  "u6709": "🈶",
+  "u6e80": "🈵",
+  "u7121": "🈚",
+  "u7533": "🈸",
+  "u7981": "🈲",
+  "u7a7a": "🈳",
+  "umbrella": "☔",
+  "umbrella_on_ground": "⛱️",
+  "unamused": "😒",
+  "underage": "🔞",
+  "unicorn": "🦄",
+  "unlock": "🔓",
+  "up": "🆙",
+  "up_arrow": "⬆",
+  "updown_arrow": "↕️",
+  "upleft_arrow": "↖️",
+  "upright_arrow": "↗",
+  "upside_down": "🙃",
+  "v": "✌️",
+  "vampire": "🧛",
+  "vertical_traffic_light": "🚦",
+  "vhs": "📼",
+  "vibration_mode": "📳",
+  "victory_hand": "✌",
+  "video_camera": "📹",
+  "video_game": "🎮",
+  "violin": "🎻",
+  "virgo": "♍",
+  "volcano": "🌋",
+  "volleyball": "🏐",
+  "vs": "🆚",
+  "vulcan": "🖖",
+  "vulcan_salute": "🖖",
+  "waffle": "🧇",
+  "walking": "🚶",
+  "waning_crescent_moon": "🌘",
+  "waning_gibbous_moon": "🌖",
+  "warning": "⚠",
+  "wastebasket": "🗑",
+  "watch": "⌚",
+  "water_buffalo": "🐃",
+  "watermelon": "🍉",
+  "wave": "👋",
+  "wavy_dash": "〰️",
+  "waxing_crescent_moon": "🌒",
+  "waxing_gibbous_moon": "🌔",
+  "wc": "🚾",
+  "weary": "😩",
+  "wedding": "💒",
+  "weightlifter": "🏋",
+  "whale": "🐳",
+  "whale2": "🐋",
+  "wheel_of_dharma": "☸️",
+  "wheelchair": "♿",
+  "white_check_mark": "✅",
+  "white_circle": "⚪",
+  "white_flower": "💮",
+  "white_hair": "🦳",
+  "white_heart": "🤍",
+  "white_large_square": "⬜",
+  "white_medium_small_square": "◽",
+  "white_medium_square": "◻️",
+  "white_small_square": "▫️",
+  "white_square_button": "🔳",
+  "wilted_flower": "🥀",
+  "wilted_rose": "🥀",
+  "wind_blowing_face": "🌬",
+  "wind_chime": "🎐",
+  "wine_glass": "🍷",
+  "wink": "😉",
+  "wolf": "🐺",
+  "woman": "👩",
+  "woman_with_headscarf": "🧕",
+  "womans_clothes": "👚",
+  "womans_hat": "👒",
+  "womens": "🚺",
+  "woozy_face": "🥴",
+  "world_map": "🗺",
+  "worried": "😟",
+  "wrench": "🔧",
+  "writing_hand": "✍️",
+  "x": "❌",
+  "yarn": "🧶",
+  "yawning_face": "🥱",
+  "yellow_circle": "🟡",
+  "yellow_heart": "💛",
+  "yellow_square": "🟨",
+  "yen": "💴",
+  "yin_yang": "☯️",
+  "yoyo": "🪀",
+  "yum": "😋",
+  "zany_face": "🤪",
+  "zap": "⚡",
+  "zebra": "🦓",
+  "zero": "0⃣",
+  "zipper_mouth": "🤐",
+  "zombie": "🧟",
+  "zzz": "💤"
+}
\ No newline at end of file
diff --git a/tools/emoji_merger.js b/tools/emoji_merger.js
new file mode 100644
index 00000000..a74e847e
--- /dev/null
+++ b/tools/emoji_merger.js
@@ -0,0 +1,67 @@
+/*
+  Emoji merger script, quick hack of a tool to:
+  - update some missing emoji from an external source
+  - sort the emoji
+  - remove all multipart emoji (reactions don't allow them)
+
+  Merges emoji from here: https://gist.github.com/oliveratgithub/0bf11a9aff0d6da7b46f1490f86a71eb
+  to the simpler format we're using.
+*/
+
+// Existing emojis we have
+const oldEmojiFilename = '../static/emoji.json'
+
+// The file downloaded from https://gist.github.com/oliveratgithub/0bf11a9aff0d6da7b46f1490f86a71eb
+const newEmojiFilename = 'emojis.json'
+
+// Output, replace the static/emoji.json with this file if it looks correct
+const outputFilename = 'output.json'
+
+const run = () => {
+  const fs = require('fs')
+
+  let newEmojisObject = {}
+  let emojisObject = {}
+
+  let data = fs.readFileSync(newEmojiFilename, 'utf8')
+
+  // First filter out anything that's more than one codepoint
+  const newEmojis = JSON.parse(data).emojis.filter(e => e.emoji.length <= 2)
+
+  // Create a table with format { shortname: emoji }, remove the :
+  newEmojis.forEach(e => {
+    const name = e.shortname.slice(1, e.shortname.length - 1).toLowerCase()
+    if (name.length > 0) {
+      newEmojisObject[name] = e.emoji
+    }
+  })
+
+  data = fs.readFileSync(oldEmojiFilename, 'utf8')
+
+  emojisObject = JSON.parse(data)
+
+  // Get rid of longer emojis that don't play nice with reactions
+  Object.keys(emojisObject).forEach(e => {
+    if (emojisObject[e].length > 2) emojisObject[e] = undefined
+  })
+
+  // Add new emojis from the new tables to the old table
+  Object.keys(newEmojisObject).forEach(e => {
+    if (!emojisObject[e] && newEmojisObject[e].length <= 2) {
+      emojisObject[e] = newEmojisObject[e]
+    }
+  })
+
+  // Sort by key
+  const sorted = Object.keys(emojisObject).sort().reduce((acc, key) => {
+    if (key.length === 0) return acc
+    acc[key] = emojisObject[key]
+    return acc
+  }, {})
+
+  fs.writeFile(outputFilename, JSON.stringify(sorted, null, 2), 'utf8', (err) => {
+    if (err) console.log('Error writing file', err)
+  })
+}
+
+run()
diff --git a/tools/emojis.json b/tools/emojis.json
new file mode 100644
index 00000000..62f25070
--- /dev/null
+++ b/tools/emojis.json
@@ -0,0 +1,4036 @@
+{
+	"emojis": [
+		{"emoji": "👩‍👩‍👧‍👧", "name": "family: woman, woman, girl, girl", "shortname": ":woman_woman_girl_girl:", "unicode": "1F469 200D 1F469 200D 1F467 200D 1F467", "html": "&#128105;&zwj;&#128105;&zwj;&#128103;&zwj;&#128103;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍👩‍👧‍👦", "name": "family: woman, woman, girl, boy", "shortname": ":woman_woman_girl_boy:", "unicode": "1F469 200D 1F469 200D 1F467 200D 1F466", "html": "&#128105;&zwj;&#128105;&zwj;&#128103;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍👩‍👦‍👦", "name": "family: woman, woman, boy, boy", "shortname": ":woman_woman_boy_boy:", "unicode": "1F469 200D 1F469 200D 1F466 200D 1F466", "html": "&#128105;&zwj;&#128105;&zwj;&#128102;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👩‍👧‍👧", "name": "family: man, woman, girl, girl", "shortname": ":man_woman_girl_girl:", "unicode": "1F468 200D 1F469 200D 1F467 200D 1F467", "html": "&#128104;&zwj;&#128105;&zwj;&#128103;&zwj;&#128103;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👩‍👧‍👦", "name": "family: man, woman, girl, boy", "shortname": ":man_woman_girl_boy:", "unicode": "1F468 200D 1F469 200D 1F467 200D 1F466", "html": "&#128104;&zwj;&#128105;&zwj;&#128103;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👩‍👦‍👦", "name": "family: man, woman, boy, boy", "shortname": ":man_woman_boy_boy:", "unicode": "1F468 200D 1F469 200D 1F466 200D 1F466", "html": "&#128104;&zwj;&#128105;&zwj;&#128102;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👨‍👧‍👧", "name": "family: man, man, girl, girl", "shortname": ":man_man_girl_girl:", "unicode": "1F468 200D 1F468 200D 1F467 200D 1F467", "html": "&#128104;&zwj;&#128104;&zwj;&#128103;&zwj;&#128103;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👨‍👧‍👦", "name": "family: man, man, girl, boy", "shortname": ":man_man_girl_boy:", "unicode": "1F468 200D 1F468 200D 1F467 200D 1F466", "html": "&#128104;&zwj;&#128104;&zwj;&#128103;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👨‍👦‍👦", "name": "family: man, man, boy, boy", "shortname": ":man_man_boy_boy:", "unicode": "1F468 200D 1F468 200D 1F466 200D 1F466", "html": "&#128104;&zwj;&#128104;&zwj;&#128102;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍👩‍👧", "name": "family: woman, woman, girl", "shortname": ":woman_woman_girl:", "unicode": "1F469 200D 1F469 200D 1F467", "html": "&#128105;&zwj;&#128105;&zwj;&#128103;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍👩‍👦", "name": "family: woman, woman, boy", "shortname": ":woman_woman_boy:", "unicode": "1F469 200D 1F469 200D 1F466", "html": "&#128105;&zwj;&#128105;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍👧‍👧", "name": "family: woman, girl, girl", "shortname": ":woman_girl_girl:", "unicode": "1F469 200D 1F467 200D 1F467", "html": "&#128105;&zwj;&#128103;&zwj;&#128103;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍👧‍👦", "name": "family: woman, girl, boy", "shortname": ":woman_girl_boy:", "unicode": "1F469 200D 1F467 200D 1F466", "html": "&#128105;&zwj;&#128103;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍👦‍👦", "name": "family: woman, boy, boy", "shortname": ":woman_boy_boy:", "unicode": "1F469 200D 1F466 200D 1F466", "html": "&#128105;&zwj;&#128102;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👩‍👧", "name": "family: man, woman, girl", "shortname": ":man_woman_girl:", "unicode": "1F468 200D 1F469 200D 1F467", "html": "&#128104;&zwj;&#128105;&zwj;&#128103;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👨‍👧", "name": "family: man, man, girl", "shortname": ":man_man_girl:", "unicode": "1F468 200D 1F468 200D 1F467", "html": "&#128104;&zwj;&#128104;&zwj;&#128103;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👨‍👦", "name": "family: man, man, boy", "shortname": ":man_man_boy:", "unicode": "1F468 200D 1F468 200D 1F466", "html": "&#128104;&zwj;&#128104;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👧‍👧", "name": "family: man, girl, girl", "shortname": ":man_girl_girl:", "unicode": "1F468 200D 1F467 200D 1F467", "html": "&#128104;&zwj;&#128103;&zwj;&#128103;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👧‍👦", "name": "family: man, girl, boy", "shortname": ":man_girl_boy:", "unicode": "1F468 200D 1F467 200D 1F466", "html": "&#128104;&zwj;&#128103;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👦‍👦", "name": "family: man, boy, boy", "shortname": ":man_boy_boy:", "unicode": "1F468 200D 1F466 200D 1F466", "html": "&#128104;&zwj;&#128102;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍👧", "name": "family: woman, girl", "shortname": ":woman_girl:", "unicode": "1F469 200D 1F467", "html": "&#128105;&zwj;&#128103;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍👦", "name": "family: woman, boy", "shortname": ":woman_boy:", "unicode": "1F469 200D 1F466", "html": "&#128105;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👧", "name": "family: man, girl", "shortname": ":man_girl:", "unicode": "1F468 200D 1F467", "html": "&#128104;&zwj;&#128103;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👦", "name": "family: man, boy", "shortname": ":man_boy:", "unicode": "1F468 200D 1F466", "html": "&#128104;&zwj;&#128102;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "😂", "name": "face with tears of joy", "shortname": ":joy:", "unicode": "1f602", "html": "&#128514;", "category": "Smileys & Emotion (face-smiling)", "order": "3"},
+		{"emoji": "❤️", "name": "red heart", "shortname": ":heart:", "unicode": "2764", "html": "&#10084;", "category": "Smileys & Emotion (emotion)", "order": "1286"},
+		{"emoji": "♥️", "name": "heart suit", "shortname": ":heart_suit:", "unicode": "2665 FE0F", "html": "&hearts;️", "category": "Activities (game)", "order": ""},
+		{"emoji": "😍", "name": "smiling face with heart-eyes", "shortname": ":heart_eyes:", "unicode": "1f60d", "html": "&#128525;", "category": "Smileys & Emotion (face-affection)", "order": "13"},
+		{"emoji": "😭", "name": "loudly crying face", "shortname": ":sob:", "unicode": "1f62d", "html": "&#128557;", "category": "Smileys & Emotion (face-concerned)", "order": "55"},
+		{"emoji": "😊", "name": "smiling face with smiling eyes", "shortname": ":blush:", "unicode": "1f60a", "html": "&#128522;", "category": "Smileys & Emotion (face-smiling)", "order": "10"},
+		{"emoji": "😒", "name": "unamused face", "shortname": ":unamused:", "unicode": "1f612", "html": "&#128530;", "category": "Smileys & Emotion (face-neutral-skeptical)", "order": "41"},
+		{"emoji": "😘", "name": "face blowing a kiss", "shortname": ":kissing_heart:", "unicode": "1f618", "html": "&#128536;", "category": "Smileys & Emotion (face-affection)", "order": "14"},
+		{"emoji": "💕", "name": "two hearts", "shortname": ":two_hearts:", "unicode": "1f495", "html": "&#128149;", "category": "Smileys & Emotion (emotion)", "order": "1289"},
+		{"emoji": "☺️", "name": "smiling face", "shortname": ":smiling:", "unicode": "263A FE0F", "html": "&#9786;", "category": "Smileys & Emotion (face-affection)", "order": ""},
+		{"emoji": "😩", "name": "weary face", "shortname": ":weary:", "unicode": "1f629", "html": "&#128553;", "category": "Smileys & Emotion (face-concerned)", "order": "59"},
+		{"emoji": "👌🏿", "name": "OK hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F44C 1F3FF", "html": "&#128076;&#127999;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "👌🏾", "name": "OK hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F44C 1F3FE", "html": "&#128076;&#127998;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "👌🏽", "name": "OK hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F44C 1F3FD", "html": "&#128076;&#127997;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "👌🏼", "name": "OK hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F44C 1F3FC", "html": "&#128076;&#127996;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "👌🏻", "name": "OK hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F44C 1F3FB", "html": "&#128076;&#127995;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "👌", "name": "OK hand", "shortname": ":ok_hand:", "unicode": "1f44c", "html": "&#128076;", "category": "People & Body (hand-fingers-partial)", "order": "1170"},
+		{"emoji": "😔", "name": "pensive face", "shortname": ":pensive:", "unicode": "1f614", "html": "&#128532;", "category": "Smileys & Emotion (face-sleepy)", "order": "43"},
+		{"emoji": "😏", "name": "smirking face", "shortname": ":smirk:", "unicode": "1f60f", "html": "&#128527;", "category": "Smileys & Emotion (face-neutral-skeptical)", "order": "26"},
+		{"emoji": "😁", "name": "beaming face with smiling eyes", "shortname": ":grin:", "unicode": "1f601", "html": "&#128513;", "category": "Smileys & Emotion (face-smiling)", "order": "2"},
+		{"emoji": "♻", "name": "recycling symbol", "shortname": ":recycle:", "unicode": "267b", "html": "&#9851;", "category": "Symbols (other-symbol)", "order": "2072"},
+		{"emoji": "😉", "name": "winking face", "shortname": ":wink:", "unicode": "1f609", "html": "&#128521;", "category": "Smileys & Emotion (face-smiling)", "order": "9"},
+		{"emoji": "👍🏿", "name": "thumbs up: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F44D 1F3FF", "html": "&#128077;&#127999;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👍🏾", "name": "thumbs up: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F44D 1F3FE", "html": "&#128077;&#127998;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👍🏽", "name": "thumbs up: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F44D 1F3FD", "html": "&#128077;&#127997;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👍🏼", "name": "thumbs up: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F44D 1F3FC", "html": "&#128077;&#127996;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👍🏻", "name": "thumbs up: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F44D 1F3FB", "html": "&#128077;&#127995;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👍", "name": "thumbs up", "shortname": ":thumbsup:", "unicode": "1f44d", "html": "&#128077;", "category": "People & Body (hand-fingers-closed)", "order": "1176"},
+		{"emoji": "🙏🏿", "name": "folded hands: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64F 1F3FF", "html": "&#128591;&#127999;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🙏🏾", "name": "folded hands: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64F 1F3FE", "html": "&#128591;&#127998;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🙏🏽", "name": "folded hands: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64F 1F3FD", "html": "&#128591;&#127997;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🙏🏼", "name": "folded hands: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64F 1F3FC", "html": "&#128591;&#127996;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🙏🏻", "name": "folded hands: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64F 1F3FB", "html": "&#128591;&#127995;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🙏", "name": "folded hands", "shortname": ":pray:", "unicode": "1f64f", "html": "&#128591;", "category": "People & Body (hands)", "order": "1248"},
+		{"emoji": "😌", "name": "relieved face", "shortname": ":relieved:", "unicode": "1f60c", "html": "&#128524;", "category": "Smileys & Emotion (face-sleepy)", "order": "35"},
+		{"emoji": "🎶", "name": "musical notes", "shortname": ":notes:", "unicode": "1f3b6", "html": "&#127926;", "category": "Objects (music)", "order": "1825"},
+		{"emoji": "😳", "name": "flushed face", "shortname": ":flushed:", "unicode": "1f633", "html": "&#128563;", "category": "Smileys & Emotion (face-concerned)", "order": "63"},
+		{"emoji": "🙌🏿", "name": "raising hands: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64C 1F3FF", "html": "&#128588;&#127999;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🙌🏾", "name": "raising hands: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64C 1F3FE", "html": "&#128588;&#127998;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🙌🏽", "name": "raising hands: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64C 1F3FD", "html": "&#128588;&#127997;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🙌🏼", "name": "raising hands: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64C 1F3FC", "html": "&#128588;&#127996;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🙌🏻", "name": "raising hands: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64C 1F3FB", "html": "&#128588;&#127995;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🙌", "name": "raising hands", "shortname": ":raised_hands:", "unicode": "1f64c", "html": "&#128588;", "category": "People & Body (hands)", "order": "1242"},
+		{"emoji": "🙈", "name": "see-no-evil monkey", "shortname": ":see_no_evil:", "unicode": "1f648", "html": "&#128584;", "category": "Smileys & Emotion (monkey-face)", "order": "96"},
+		{"emoji": "😢", "name": "crying face", "shortname": ":cry:", "unicode": "1f622", "html": "&#128546;", "category": "Smileys & Emotion (face-concerned)", "order": "54"},
+		{"emoji": "😎", "name": "smiling face with sunglasses", "shortname": ":sunglasses:", "unicode": "1f60e", "html": "&#128526;", "category": "Smileys & Emotion (face-glasses)", "order": "12"},
+		{"emoji": "✌🏿", "name": "victory hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "270C 1F3FF", "html": "&#9996;&#127999;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "✌🏾", "name": "victory hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "270C 1F3FE", "html": "&#9996;&#127998;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "✌🏽", "name": "victory hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "270C 1F3FD", "html": "&#9996;&#127997;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "✌🏼", "name": "victory hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "270C 1F3FC", "html": "&#9996;&#127996;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "✌🏻", "name": "victory hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "270C 1F3FB", "html": "&#9996;&#127995;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "✌️", "name": "victory hand", "shortname": ":v:", "unicode": "270c", "html": "&#9996;", "category": "People & Body (hand-fingers-partial)", "order": "1128"},
+		{"emoji": "👀", "name": "eyes", "shortname": ":eyes:", "unicode": "1f440", "html": "&#128064;", "category": "People & Body (body-parts)", "order": "1279"},
+		{"emoji": "😅", "name": "grinning face with sweat", "shortname": ":sweat_smile:", "unicode": "1f605", "html": "&#128517;", "category": "Smileys & Emotion (face-smiling)", "order": "7"},
+		{"emoji": "✨", "name": "sparkles", "shortname": ":sparkles:", "unicode": "2728", "html": "&#10024;", "category": "Activities (event)", "order": "1760"},
+		{"emoji": "😴", "name": "sleeping face", "shortname": ":sleeping:", "unicode": "1f634", "html": "&#128564;", "category": "Smileys & Emotion (face-sleepy)", "order": "34"},
+		{"emoji": "😄", "name": "grinning face with smiling eyes", "shortname": ":smile:", "unicode": "1f604", "html": "&#128516;", "category": "Smileys & Emotion (face-smiling)", "order": "6"},
+		{"emoji": "💜", "name": "purple heart", "shortname": ":purple_heart:", "unicode": "1f49c", "html": "&#128156;", "category": "Smileys & Emotion (emotion)", "order": "1295"},
+		{"emoji": "💔", "name": "broken heart", "shortname": ":broken_heart:", "unicode": "1f494", "html": "&#128148;", "category": "Smileys & Emotion (emotion)", "order": "1288"},
+		{"emoji": "💯", "name": "hundred points", "shortname": ":hundred_points:", "unicode": "1F4AF", "html": "&#128175;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "😑", "name": "expressionless face", "shortname": ":expressionless:", "unicode": "1f611", "html": "&#128529;", "category": "Smileys & Emotion (face-neutral-skeptical)", "order": "23"},
+		{"emoji": "💖", "name": "sparkling heart", "shortname": ":sparkling_heart:", "unicode": "1f496", "html": "&#128150;", "category": "Smileys & Emotion (emotion)", "order": "1290"},
+		{"emoji": "💙", "name": "blue heart", "shortname": ":blue_heart:", "unicode": "1f499", "html": "&#128153;", "category": "Smileys & Emotion (emotion)", "order": "1292"},
+		{"emoji": "😕", "name": "confused face", "shortname": ":confused:", "unicode": "1f615", "html": "&#128533;", "category": "Smileys & Emotion (face-concerned)", "order": "44"},
+		{"emoji": "💁🏿‍♂", "name": "man tipping hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F481 1F3FF 200D 2642", "html": "&#128129;&#127999;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏾‍♂", "name": "man tipping hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F481 1F3FE 200D 2642", "html": "&#128129;&#127998;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏽‍♂", "name": "man tipping hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F481 1F3FD 200D 2642", "html": "&#128129;&#127997;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏼‍♂", "name": "man tipping hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F481 1F3FC 200D 2642", "html": "&#128129;&#127996;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏻‍♂", "name": "man tipping hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F481 1F3FB 200D 2642", "html": "&#128129;&#127995;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁‍♂", "name": "man tipping hand", "shortname": ":man_tipping_hand:", "unicode": "1F481 200D 2642", "html": "&#128129;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏿", "name": "person tipping hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F481 1F3FF", "html": "&#128129;&#127999;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏾", "name": "person tipping hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F481 1F3FE", "html": "&#128129;&#127998;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏽", "name": "person tipping hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F481 1F3FD", "html": "&#128129;&#127997;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏼", "name": "person tipping hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F481 1F3FC", "html": "&#128129;&#127996;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏻", "name": "person tipping hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F481 1F3FB", "html": "&#128129;&#127995;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁", "name": "person tipping hand", "shortname": ":information_desk_person:", "unicode": "1f481", "html": "&#128129;", "category": "People & Body (person-gesture)", "order": "567"},
+		{"emoji": "😜", "name": "winking face with tongue", "shortname": ":stuck_out_tongue_winking_eye:", "unicode": "1f61c", "html": "&#128540;", "category": "Smileys & Emotion (face-tongue)", "order": "38"},
+		{"emoji": "😞", "name": "disappointed face", "shortname": ":disappointed:", "unicode": "1f61e", "html": "&#128542;", "category": "Smileys & Emotion (face-concerned)", "order": "51"},
+		{"emoji": "😋", "name": "face savoring food", "shortname": ":yum:", "unicode": "1f60b", "html": "&#128523;", "category": "Smileys & Emotion (face-tongue)", "order": "11"},
+		{"emoji": "😐", "name": "neutral face", "shortname": ":neutral_face:", "unicode": "1f610", "html": "&#128528;", "category": "Smileys & Emotion (face-neutral-skeptical)", "order": "22"},
+		{"emoji": "😪", "name": "sleepy face", "shortname": ":sleepy:", "unicode": "1f62a", "html": "&#128554;", "category": "Smileys & Emotion (face-sleepy)", "order": "32"},
+		{"emoji": "👏🏿", "name": "clapping hands: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F44F 1F3FF", "html": "&#128079;&#127999;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "👏🏾", "name": "clapping hands: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F44F 1F3FE", "html": "&#128079;&#127998;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "👏🏽", "name": "clapping hands: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F44F 1F3FD", "html": "&#128079;&#127997;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "👏🏼", "name": "clapping hands: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F44F 1F3FC", "html": "&#128079;&#127996;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "👏🏻", "name": "clapping hands: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F44F 1F3FB", "html": "&#128079;&#127995;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "👏", "name": "clapping hands", "shortname": ":clap:", "unicode": "1f44f", "html": "&#128079;", "category": "People & Body (hands)", "order": "1224"},
+		{"emoji": "💘", "name": "heart with arrow", "shortname": ":cupid:", "unicode": "1f498", "html": "&#128152;", "category": "Smileys & Emotion (emotion)", "order": "1285"},
+		{"emoji": "💗", "name": "growing heart", "shortname": ":heartpulse:", "unicode": "1f497", "html": "&#128151;", "category": "Smileys & Emotion (emotion)", "order": "1291"},
+		{"emoji": "💞", "name": "revolving hearts", "shortname": ":revolving_hearts:", "unicode": "1f49e", "html": "&#128158;", "category": "Smileys & Emotion (emotion)", "order": "1298"},
+		{"emoji": "⬅️", "name": "left arrow", "shortname": ":arrow_left:", "unicode": "2b05", "html": "&#11013;", "category": "Symbols (arrow)", "order": "2008"},
+		{"emoji": "🙊", "name": "speak-no-evil monkey", "shortname": ":speak_no_evil:", "unicode": "1f64a", "html": "&#128586;", "category": "Smileys & Emotion (monkey-face)", "order": "98"},
+		{"emoji": "✋🏿", "name": "raised hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "270B 1F3FF", "html": "&#9995;&#127999;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "✋🏾", "name": "raised hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "270B 1F3FE", "html": "&#9995;&#127998;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "✋🏽", "name": "raised hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "270B 1F3FD", "html": "&#9995;&#127997;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "✋🏼", "name": "raised hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "270B 1F3FC", "html": "&#9995;&#127996;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "✋🏻", "name": "raised hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "270B 1F3FB", "html": "&#9995;&#127995;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "✋", "name": "raised hand", "shortname": ":raised_hand:", "unicode": "270B", "html": "&#9995;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "💋", "name": "kiss mark", "shortname": ":kiss:", "unicode": "1f48b", "html": "&#128139;", "category": "Smileys & Emotion (emotion)", "order": "1284"},
+		{"emoji": "👉🏿", "name": "backhand index pointing right: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F449 1F3FF", "html": "&#128073;&#127999;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👉🏾", "name": "backhand index pointing right: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F449 1F3FE", "html": "&#128073;&#127998;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👉🏽", "name": "backhand index pointing right: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F449 1F3FD", "html": "&#128073;&#127997;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👉🏼", "name": "backhand index pointing right: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F449 1F3FC", "html": "&#128073;&#127996;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👉🏻", "name": "backhand index pointing right: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F449 1F3FB", "html": "&#128073;&#127995;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👉", "name": "backhand index pointing right", "shortname": ":point_right:", "unicode": "1f449", "html": "&#128073;", "category": "People & Body (hand-single-finger)", "order": "1098"},
+		{"emoji": "🌸", "name": "cherry blossom", "shortname": ":cherry_blossom:", "unicode": "1f338", "html": "&#127800;", "category": "Animals & Nature (plant-flower)", "order": "1428"},
+		{"emoji": "😱", "name": "face screaming in fear", "shortname": ":scream:", "unicode": "1f631", "html": "&#128561;", "category": "Smileys & Emotion (face-concerned)", "order": "62"},
+		{"emoji": "🔥", "name": "fire", "shortname": ":fire:", "unicode": "1f525", "html": "&#128293;", "category": "Travel & Places (sky & weather)", "order": "1753"},
+		{"emoji": "😡", "name": "pouting face", "shortname": ":rage:", "unicode": "1f621", "html": "&#128545;", "category": "Smileys & Emotion (face-negative)", "order": "65"},
+		{"emoji": "😃", "name": "grinning face with big eyes", "shortname": ":smiley:", "unicode": "1f603", "html": "&#128515;", "category": "Smileys & Emotion (face-smiling)", "order": "5"},
+		{"emoji": "🎉", "name": "party popper", "shortname": ":tada:", "unicode": "1f389", "html": "&#127881;", "category": "Activities (event)", "order": "1762"},
+		{"emoji": "👊🏿", "name": "oncoming fist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F44A 1F3FF", "html": "&#128074;&#127999;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👊🏾", "name": "oncoming fist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F44A 1F3FE", "html": "&#128074;&#127998;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👊🏽", "name": "oncoming fist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F44A 1F3FD", "html": "&#128074;&#127997;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👊🏼", "name": "oncoming fist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F44A 1F3FC", "html": "&#128074;&#127996;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👊🏻", "name": "oncoming fist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F44A 1F3FB", "html": "&#128074;&#127995;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👊", "name": "oncoming fist", "shortname": ":oncoming_fist:", "unicode": "1F44A", "html": "&#128074;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "😫", "name": "tired face", "shortname": ":tired_face:", "unicode": "1f62b", "html": "&#128555;", "category": "Smileys & Emotion (face-concerned)", "order": "33"},
+		{"emoji": "📷", "name": "camera", "shortname": ":camera:", "unicode": "1f4f7", "html": "&#128247;", "category": "Objects (light & video)", "order": "1861"},
+		{"emoji": "🌹", "name": "rose", "shortname": ":rose:", "unicode": "1f339", "html": "&#127801;", "category": "Animals & Nature (plant-flower)", "order": "1431"},
+		{"emoji": "😝", "name": "squinting face with tongue", "shortname": ":stuck_out_tongue_closed_eyes:", "unicode": "1f61d", "html": "&#128541;", "category": "Smileys & Emotion (face-tongue)", "order": "39"},
+		{"emoji": "💪🏿", "name": "flexed biceps: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F4AA 1F3FF", "html": "&#128170;&#127999;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "💪🏾", "name": "flexed biceps: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F4AA 1F3FE", "html": "&#128170;&#127998;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "💪🏽", "name": "flexed biceps: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F4AA 1F3FD", "html": "&#128170;&#127997;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "💪🏼", "name": "flexed biceps: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F4AA 1F3FC", "html": "&#128170;&#127996;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "💪🏻", "name": "flexed biceps: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F4AA 1F3FB", "html": "&#128170;&#127995;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "💪", "name": "flexed biceps", "shortname": ":muscle:", "unicode": "1f4aa", "html": "&#128170;", "category": "People & Body (body-parts)", "order": "1080"},
+		{"emoji": "💀", "name": "skull", "shortname": ":skull:", "unicode": "1f480", "html": "&#128128;", "category": "Smileys & Emotion (face-negative)", "order": "80"},
+		{"emoji": "☀️", "name": "sun", "shortname": ":sunny:", "unicode": "2600", "html": "&#9728;", "category": "Travel & Places (sky & weather)", "order": "1724"},
+		{"emoji": "💛", "name": "yellow heart", "shortname": ":yellow_heart:", "unicode": "1f49b", "html": "&#128155;", "category": "Smileys & Emotion (emotion)", "order": "1294"},
+		{"emoji": "😤", "name": "face with steam from nose", "shortname": ":triumph:", "unicode": "1f624", "html": "&#128548;", "category": "Smileys & Emotion (face-negative)", "order": "53"},
+		{"emoji": "🌚", "name": "new moon face", "shortname": ":new_moon_with_face:", "unicode": "1f31a", "html": "&#127770;", "category": "Travel & Places (sky & weather)", "order": "1720"},
+		{"emoji": "😆", "name": "grinning squinting face", "shortname": ":laughing:", "unicode": "1f606", "html": "&#128518;", "category": "Smileys & Emotion (face-smiling)", "order": "8"},
+		{"emoji": "😓", "name": "downcast face with sweat", "shortname": ":sweat:", "unicode": "1f613", "html": "&#128531;", "category": "Smileys & Emotion (face-concerned)", "order": "42"},
+		{"emoji": "👈🏿", "name": "backhand index pointing left: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F448 1F3FF", "html": "&#128072;&#127999;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👈🏾", "name": "backhand index pointing left: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F448 1F3FE", "html": "&#128072;&#127998;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👈🏽", "name": "backhand index pointing left: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F448 1F3FD", "html": "&#128072;&#127997;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👈🏼", "name": "backhand index pointing left: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F448 1F3FC", "html": "&#128072;&#127996;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👈🏻", "name": "backhand index pointing left: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F448 1F3FB", "html": "&#128072;&#127995;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👈", "name": "backhand index pointing left", "shortname": ":point_left:", "unicode": "1f448", "html": "&#128072;", "category": "People & Body (hand-single-finger)", "order": "1092"},
+		{"emoji": "✔️", "name": "check mark", "shortname": ":heavy_check_mark:", "unicode": "2714", "html": "&#10004;", "category": "Symbols (other-symbol)", "order": "2080"},
+		{"emoji": "😻", "name": "smiling cat with heart-eyes", "shortname": ":heart_eyes_cat:", "unicode": "1f63b", "html": "&#128571;", "category": "Smileys & Emotion (cat-face)", "order": "90"},
+		{"emoji": "😀", "name": "grinning face", "shortname": ":grinning:", "unicode": "1f600", "html": "&#128512;", "category": "Smileys & Emotion (face-smiling)", "order": "1"},
+		{"emoji": "😷", "name": "face with medical mask", "shortname": ":mask:", "unicode": "1f637", "html": "&#128567;", "category": "Smileys & Emotion (face-unwell)", "order": "71"},
+		{"emoji": "💚", "name": "green heart", "shortname": ":green_heart:", "unicode": "1f49a", "html": "&#128154;", "category": "Smileys & Emotion (emotion)", "order": "1293"},
+		{"emoji": "👋🏿", "name": "waving hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F44B 1F3FF", "html": "&#128075;&#127999;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "👋🏾", "name": "waving hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F44B 1F3FE", "html": "&#128075;&#127998;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "👋🏽", "name": "waving hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F44B 1F3FD", "html": "&#128075;&#127997;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "👋🏼", "name": "waving hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F44B 1F3FC", "html": "&#128075;&#127996;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "👋🏻", "name": "waving hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F44B 1F3FB", "html": "&#128075;&#127995;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "👋", "name": "waving hand", "shortname": ":wave:", "unicode": "1f44b", "html": "&#128075;", "category": "People & Body (hand-fingers-open)", "order": "1218"},
+		{"emoji": "😣", "name": "persevering face", "shortname": ":persevere:", "unicode": "1f623", "html": "&#128547;", "category": "Smileys & Emotion (face-concerned)", "order": "27"},
+		{"emoji": "💓", "name": "beating heart", "shortname": ":heartbeat:", "unicode": "1f493", "html": "&#128147;", "category": "Smileys & Emotion (emotion)", "order": "1287"},
+		{"emoji": "▶️", "name": "play button", "shortname": ":arrow_forward:", "unicode": "25b6", "html": "&#9654;", "category": "Symbols (av-symbol)", "order": "2051"},
+		{"emoji": "◀️", "name": "reverse button", "shortname": ":arrow_backward:", "unicode": "25c0", "html": "&#9664;", "category": "Symbols (av-symbol)", "order": "2055"},
+		{"emoji": "↪️", "name": "left arrow curving right", "shortname": ":arrow_right_hook:", "unicode": "21aa", "html": "&#8618;", "category": "Symbols (arrow)", "order": "2013"},
+		{"emoji": "↩️", "name": "right arrow curving left", "shortname": ":leftwards_arrow_with_hook:", "unicode": "21a9", "html": "&#8617;", "category": "Symbols (arrow)", "order": "2012"},
+		{"emoji": "👑", "name": "crown", "shortname": ":crown:", "unicode": "1f451", "html": "&#128081;", "category": "Objects (clothing)", "order": "1333"},
+		{"emoji": "😚", "name": "kissing face with closed eyes", "shortname": ":kissing_closed_eyes:", "unicode": "1f61a", "html": "&#128538;", "category": "Smileys & Emotion (face-affection)", "order": "17"},
+		{"emoji": "😛", "name": "face with tongue", "shortname": ":stuck_out_tongue:", "unicode": "1f61b", "html": "&#128539;", "category": "Smileys & Emotion (face-tongue)", "order": "37"},
+		{"emoji": "😥", "name": "sad but relieved face", "shortname": ":disappointed_relieved:", "unicode": "1f625", "html": "&#128549;", "category": "Smileys & Emotion (face-concerned)", "order": "28"},
+		{"emoji": "😇", "name": "smiling face with halo", "shortname": ":innocent:", "unicode": "1f607", "html": "&#128519;", "category": "Smileys & Emotion (face-smiling)", "order": "67"},
+		{"emoji": "🎧", "name": "headphone", "shortname": ":headphones:", "unicode": "1f3a7", "html": "&#127911;", "category": "Objects (music)", "order": "1830"},
+		{"emoji": "✅", "name": "check mark button", "shortname": ":white_check_mark:", "unicode": "2705", "html": "&#9989;", "category": "Symbols (other-symbol)", "order": "2078"},
+		{"emoji": "😖", "name": "confounded face", "shortname": ":confounded:", "unicode": "1f616", "html": "&#128534;", "category": "Smileys & Emotion (face-concerned)", "order": "50"},
+		{"emoji": "➡", "name": "right arrow", "shortname": ":arrow_right:", "unicode": "27a1", "html": "&#10145;", "category": "Symbols (arrow)", "order": "2004"},
+		{"emoji": "😠", "name": "angry face", "shortname": ":angry:", "unicode": "1f620", "html": "&#128544;", "category": "Smileys & Emotion (face-negative)", "order": "66"},
+		{"emoji": "😬", "name": "grimacing face", "shortname": ":grimacing:", "unicode": "1f62c", "html": "&#128556;", "category": "Smileys & Emotion (face-neutral-skeptical)", "order": "60"},
+		{"emoji": "🌟", "name": "glowing star", "shortname": ":star2:", "unicode": "1f31f", "html": "&#127775;", "category": "Travel & Places (sky & weather)", "order": "1728"},
+		{"emoji": "🔫", "name": "pistol", "shortname": ":gun:", "unicode": "1f52b", "html": "&#128299;", "category": "Objects (tool)", "order": "1956"},
+		{"emoji": "🙋🏿‍♂", "name": "man raising hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64B 1F3FF 200D 2642", "html": "&#128587;&#127999;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏾‍♂", "name": "man raising hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64B 1F3FE 200D 2642", "html": "&#128587;&#127998;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏽‍♂", "name": "man raising hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64B 1F3FD 200D 2642", "html": "&#128587;&#127997;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏼‍♂", "name": "man raising hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64B 1F3FC 200D 2642", "html": "&#128587;&#127996;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏻‍♂", "name": "man raising hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64B 1F3FB 200D 2642", "html": "&#128587;&#127995;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋‍♂", "name": "man raising hand", "shortname": ":man_raising_hand:", "unicode": "1F64B 200D 2642", "html": "&#128587;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏿", "name": "person raising hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64B 1F3FF", "html": "&#128587;&#127999;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏾", "name": "person raising hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64B 1F3FE", "html": "&#128587;&#127998;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏽", "name": "person raising hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64B 1F3FD", "html": "&#128587;&#127997;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏼", "name": "person raising hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64B 1F3FC", "html": "&#128587;&#127996;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏻", "name": "person raising hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64B 1F3FB", "html": "&#128587;&#127995;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋", "name": "person raising hand", "shortname": ":raising_hand:", "unicode": "1f64b", "html": "&#128587;", "category": "People & Body (person-gesture)", "order": "585"},
+		{"emoji": "👎🏿", "name": "thumbs down: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F44E 1F3FF", "html": "&#128078;&#127999;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👎🏾", "name": "thumbs down: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F44E 1F3FE", "html": "&#128078;&#127998;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👎🏽", "name": "thumbs down: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F44E 1F3FD", "html": "&#128078;&#127997;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👎🏼", "name": "thumbs down: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F44E 1F3FC", "html": "&#128078;&#127996;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👎🏻", "name": "thumbs down: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F44E 1F3FB", "html": "&#128078;&#127995;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "👎", "name": "thumbs down", "shortname": ":thumbsdown:", "unicode": "1f44e", "html": "&#128078;", "category": "People & Body (hand-fingers-closed)", "order": "1182"},
+		{"emoji": "💃🏿", "name": "woman dancing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F483 1F3FF", "html": "&#128131;&#127999;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💃🏾", "name": "woman dancing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F483 1F3FE", "html": "&#128131;&#127998;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💃🏽", "name": "woman dancing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F483 1F3FD", "html": "&#128131;&#127997;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💃🏼", "name": "woman dancing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F483 1F3FC", "html": "&#128131;&#127996;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💃🏻", "name": "woman dancing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F483 1F3FB", "html": "&#128131;&#127995;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💃", "name": "woman dancing", "shortname": ":dancer:", "unicode": "1f483", "html": "&#128131;", "category": "People & Body (person-activity)", "order": "729"},
+		{"emoji": "🎵", "name": "musical note", "shortname": ":musical_note:", "unicode": "1f3b5", "html": "&#127925;", "category": "Objects (music)", "order": "1824"},
+		{"emoji": "😶", "name": "face without mouth", "shortname": ":no_mouth:", "unicode": "1f636", "html": "&#128566;", "category": "Smileys & Emotion (face-neutral-skeptical)", "order": "24"},
+		{"emoji": "💫", "name": "dizzy", "shortname": ":dizzy:", "unicode": "1f4ab", "html": "&#128171;", "category": "Smileys & Emotion (emotion)", "order": "1308"},
+		{"emoji": "✊🏿", "name": "raised fist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "270A 1F3FF", "html": "&#9994;&#127999;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "✊🏾", "name": "raised fist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "270A 1F3FE", "html": "&#9994;&#127998;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "✊🏽", "name": "raised fist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "270A 1F3FD", "html": "&#9994;&#127997;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "✊🏼", "name": "raised fist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "270A 1F3FC", "html": "&#9994;&#127996;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "✊🏻", "name": "raised fist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "270A 1F3FB", "html": "&#9994;&#127995;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "✊", "name": "raised fist", "shortname": ":fist:", "unicode": "270a", "html": "&#9994;", "category": "People & Body (hand-fingers-closed)", "order": "1188"},
+		{"emoji": "👇🏿", "name": "backhand index pointing down: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F447 1F3FF", "html": "&#128071;&#127999;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👇🏾", "name": "backhand index pointing down: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F447 1F3FE", "html": "&#128071;&#127998;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👇🏽", "name": "backhand index pointing down: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F447 1F3FD", "html": "&#128071;&#127997;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👇🏼", "name": "backhand index pointing down: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F447 1F3FC", "html": "&#128071;&#127996;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👇🏻", "name": "backhand index pointing down: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F447 1F3FB", "html": "&#128071;&#127995;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👇", "name": "backhand index pointing down", "shortname": ":point_down:", "unicode": "1f447", "html": "&#128071;", "category": "People & Body (hand-single-finger)", "order": "1122"},
+		{"emoji": "🔴", "name": "red circle", "shortname": ":red_circle:", "unicode": "1f534", "html": "&#128308;", "category": "Symbols (geometric)", "order": "2179"},
+		{"emoji": "🙅🏿‍♂", "name": "man gesturing NO: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F645 1F3FF 200D 2642", "html": "&#128581;&#127999;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏾‍♂", "name": "man gesturing NO: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F645 1F3FE 200D 2642", "html": "&#128581;&#127998;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏽‍♂", "name": "man gesturing NO: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F645 1F3FD 200D 2642", "html": "&#128581;&#127997;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏼‍♂", "name": "man gesturing NO: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F645 1F3FC 200D 2642", "html": "&#128581;&#127996;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏻‍♂", "name": "man gesturing NO: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F645 1F3FB 200D 2642", "html": "&#128581;&#127995;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅‍♂", "name": "man gesturing NO", "shortname": ":man_gesturing_NO:", "unicode": "1F645 200D 2642", "html": "&#128581;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏿", "name": "person gesturing NO: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F645 1F3FF", "html": "&#128581;&#127999;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏾", "name": "person gesturing NO: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F645 1F3FE", "html": "&#128581;&#127998;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏽", "name": "person gesturing NO: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F645 1F3FD", "html": "&#128581;&#127997;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏼", "name": "person gesturing NO: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F645 1F3FC", "html": "&#128581;&#127996;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏻", "name": "person gesturing NO: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F645 1F3FB", "html": "&#128581;&#127995;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅", "name": "person gesturing NO", "shortname": ":no_good:", "unicode": "1f645", "html": "&#128581;", "category": "People & Body (person-gesture)", "order": "531"},
+		{"emoji": "💥", "name": "collision", "shortname": ":boom:", "unicode": "1f4a5", "html": "&#128165;", "category": "Smileys & Emotion (emotion)", "order": "1305"},
+		{"emoji": "©️", "name": "copyright", "shortname": ":copyright:", "unicode": "00A9 FE0F", "html": "&copy;️", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "💭", "name": "thought balloon", "shortname": ":thought_balloon:", "unicode": "1f4ad", "html": "&#128173;", "category": "Smileys & Emotion (emotion)", "order": "1312"},
+		{"emoji": "👅", "name": "tongue", "shortname": ":tongue:", "unicode": "1f445", "html": "&#128069;", "category": "People & Body (body-parts)", "order": "1282"},
+		{"emoji": "💩", "name": "pile of poo", "shortname": ":poop:", "unicode": "1f4a9", "html": "&#128169;", "category": "Smileys & Emotion (face-costume)", "order": "85"},
+		{"emoji": "😰", "name": "anxious face with sweat", "shortname": ":cold_sweat:", "unicode": "1f630", "html": "&#128560;", "category": "Smileys & Emotion (face-concerned)", "order": "61"},
+		{"emoji": "💎", "name": "gem stone", "shortname": ":gem:", "unicode": "1f48e", "html": "&#128142;", "category": "Objects (clothing)", "order": "1341"},
+		{"emoji": "🙆🏿‍♂", "name": "man gesturing OK: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F646 1F3FF 200D 2642", "html": "&#128582;&#127999;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏾‍♂", "name": "man gesturing OK: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F646 1F3FE 200D 2642", "html": "&#128582;&#127998;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏽‍♂", "name": "man gesturing OK: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F646 1F3FD 200D 2642", "html": "&#128582;&#127997;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏼‍♂", "name": "man gesturing OK: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F646 1F3FC 200D 2642", "html": "&#128582;&#127996;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏻‍♂", "name": "man gesturing OK: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F646 1F3FB 200D 2642", "html": "&#128582;&#127995;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆‍♂", "name": "man gesturing OK", "shortname": ":man_gesturing_OK:", "unicode": "1F646 200D 2642", "html": "&#128582;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏿", "name": "person gesturing OK: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F646 1F3FF", "html": "&#128582;&#127999;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏾", "name": "person gesturing OK: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F646 1F3FE", "html": "&#128582;&#127998;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏽", "name": "person gesturing OK: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F646 1F3FD", "html": "&#128582;&#127997;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏼", "name": "person gesturing OK: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F646 1F3FC", "html": "&#128582;&#127996;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏻", "name": "person gesturing OK: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F646 1F3FB", "html": "&#128582;&#127995;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆", "name": "person gesturing OK", "shortname": ":ok_woman:", "unicode": "1f646", "html": "&#128582;", "category": "People & Body (person-gesture)", "order": "549"},
+		{"emoji": "🍕", "name": "pizza", "shortname": ":pizza:", "unicode": "1f355", "html": "&#127829;", "category": "Food & Drink (food-prepared)", "order": "1484"},
+		{"emoji": "😹", "name": "cat with tears of joy", "shortname": ":joy_cat:", "unicode": "1f639", "html": "&#128569;", "category": "Smileys & Emotion (cat-face)", "order": "89"},
+		{"emoji": "🌞", "name": "sun with face", "shortname": ":sun_with_face:", "unicode": "1f31e", "html": "&#127774;", "category": "Travel & Places (sky & weather)", "order": "1726"},
+		{"emoji": "🍃", "name": "leaf fluttering in wind", "shortname": ":leaves:", "unicode": "1f343", "html": "&#127811;", "category": "Animals & Nature (plant-other)", "order": "1448"},
+		{"emoji": "💦", "name": "sweat droplets", "shortname": ":sweat_drops:", "unicode": "1f4a6", "html": "&#128166;", "category": "Smileys & Emotion (emotion)", "order": "1306"},
+		{"emoji": "🐧", "name": "penguin", "shortname": ":penguin:", "unicode": "1f427", "html": "&#128039;", "category": "Animals & Nature (animal-bird)", "order": "1394"},
+		{"emoji": "💤", "name": "zzz", "shortname": ":zzz:", "unicode": "1f4a4", "html": "&#128164;", "category": "Smileys & Emotion (emotion)", "order": "1302"},
+		{"emoji": "🚶🏿‍♀", "name": "woman walking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B6 1F3FF 200D 2640", "html": "&#128694;&#127999;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏾‍♀", "name": "woman walking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B6 1F3FE 200D 2640", "html": "&#128694;&#127998;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏽‍♀", "name": "woman walking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B6 1F3FD 200D 2640", "html": "&#128694;&#127997;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏼‍♀", "name": "woman walking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B6 1F3FC 200D 2640", "html": "&#128694;&#127996;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏻‍♀", "name": "woman walking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B6 1F3FB 200D 2640", "html": "&#128694;&#127995;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶‍♀", "name": "woman walking", "shortname": ":woman_walking:", "unicode": "1F6B6 200D 2640", "html": "&#128694;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏿", "name": "person walking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B6 1F3FF", "html": "&#128694;&#127999;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏾", "name": "person walking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B6 1F3FE", "html": "&#128694;&#127998;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏽", "name": "person walking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B6 1F3FD", "html": "&#128694;&#127997;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏼", "name": "person walking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B6 1F3FC", "html": "&#128694;&#127996;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏻", "name": "person walking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B6 1F3FB", "html": "&#128694;&#127995;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶", "name": "person walking", "shortname": ":walking:", "unicode": "1f6b6", "html": "&#128694;", "category": "People & Body (person-activity)", "order": "693"},
+		{"emoji": "✈️", "name": "airplane", "shortname": ":airplane:", "unicode": "2708", "html": "&#9992;", "category": "Travel & Places (transport-air)", "order": "1650"},
+		{"emoji": "🎈", "name": "balloon", "shortname": ":balloon:", "unicode": "1f388", "html": "&#127880;", "category": "Activities (event)", "order": "1761"},
+		{"emoji": "⭐", "name": "star", "shortname": ":star:", "unicode": "2b50", "html": "&#11088;", "category": "Travel & Places (sky & weather)", "order": "1727"},
+		{"emoji": "🎀", "name": "ribbon", "shortname": ":ribbon:", "unicode": "1f380", "html": "&#127872;", "category": "Activities (event)", "order": "1770"},
+		{"emoji": "☑️", "name": "check box with check", "shortname": ":ballot_box_with_check:", "unicode": "2611", "html": "&#9745;", "category": "Symbols (other-symbol)", "order": "2079"},
+		{"emoji": "😟", "name": "worried face", "shortname": ":worried:", "unicode": "1f61f", "html": "&#128543;", "category": "Smileys & Emotion (face-concerned)", "order": "52"},
+		{"emoji": "🔞", "name": "no one under eighteen", "shortname": ":underage:", "unicode": "1f51e", "html": "&#128286;", "category": "Symbols (warning)", "order": "1999"},
+		{"emoji": "😨", "name": "fearful face", "shortname": ":fearful:", "unicode": "1f628", "html": "&#128552;", "category": "Smileys & Emotion (face-concerned)", "order": "58"},
+		{"emoji": "🍀", "name": "four leaf clover", "shortname": ":four_leaf_clover:", "unicode": "1f340", "html": "&#127808;", "category": "Animals & Nature (plant-other)", "order": "1445"},
+		{"emoji": "🌺", "name": "hibiscus", "shortname": ":hibiscus:", "unicode": "1f33a", "html": "&#127802;", "category": "Animals & Nature (plant-flower)", "order": "1433"},
+		{"emoji": "🎤", "name": "microphone", "shortname": ":microphone:", "unicode": "1f3a4", "html": "&#127908;", "category": "Objects (music)", "order": "1829"},
+		{"emoji": "👐🏿", "name": "open hands: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F450 1F3FF", "html": "&#128080;&#127999;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "👐🏾", "name": "open hands: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F450 1F3FE", "html": "&#128080;&#127998;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "👐🏽", "name": "open hands: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F450 1F3FD", "html": "&#128080;&#127997;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "👐🏼", "name": "open hands: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F450 1F3FC", "html": "&#128080;&#127996;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "👐🏻", "name": "open hands: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F450 1F3FB", "html": "&#128080;&#127995;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "👐", "name": "open hands", "shortname": ":open_hands:", "unicode": "1f450", "html": "&#128080;", "category": "People & Body (hands)", "order": "1236"},
+		{"emoji": "👻", "name": "ghost", "shortname": ":ghost:", "unicode": "1f47b", "html": "&#128123;", "category": "Smileys & Emotion (face-costume)", "order": "82"},
+		{"emoji": "🌴", "name": "palm tree", "shortname": ":palm_tree:", "unicode": "1f334", "html": "&#127796;", "category": "Animals & Nature (plant-other)", "order": "1440"},
+		{"emoji": "‼️", "name": "double exclamation mark", "shortname": ":bangbang:", "unicode": "203c", "html": "&#8252;", "category": "Symbols (other-symbol)", "order": "2096"},
+		{"emoji": "💅🏿", "name": "nail polish: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F485 1F3FF", "html": "&#128133;&#127999;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "💅🏾", "name": "nail polish: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F485 1F3FE", "html": "&#128133;&#127998;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "💅🏽", "name": "nail polish: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F485 1F3FD", "html": "&#128133;&#127997;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "💅🏼", "name": "nail polish: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F485 1F3FC", "html": "&#128133;&#127996;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "💅🏻", "name": "nail polish: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F485 1F3FB", "html": "&#128133;&#127995;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "💅", "name": "nail polish", "shortname": ":nail_care:", "unicode": "1f485", "html": "&#128133;", "category": "People & Body (hand-prop)", "order": "1260"},
+		{"emoji": "❌", "name": "cross mark", "shortname": ":x:", "unicode": "274c", "html": "&#10060;", "category": "Symbols (other-symbol)", "order": "2082"},
+		{"emoji": "👽", "name": "alien", "shortname": ":alien:", "unicode": "1f47d", "html": "&#128125;", "category": "Smileys & Emotion (face-costume)", "order": "83"},
+		{"emoji": "🙇🏿‍♀", "name": "woman bowing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F647 1F3FF 200D 2640", "html": "&#128583;&#127999;&zwj;&#9792;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏾‍♀", "name": "woman bowing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F647 1F3FE 200D 2640", "html": "&#128583;&#127998;&zwj;&#9792;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏽‍♀", "name": "woman bowing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F647 1F3FD 200D 2640", "html": "&#128583;&#127997;&zwj;&#9792;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏼‍♀", "name": "woman bowing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F647 1F3FC 200D 2640", "html": "&#128583;&#127996;&zwj;&#9792;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏻‍♀", "name": "woman bowing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F647 1F3FB 200D 2640", "html": "&#128583;&#127995;&zwj;&#9792;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇‍♀", "name": "woman bowing", "shortname": ":woman_bowing:", "unicode": "1F647 200D 2640", "html": "&#128583;&zwj;&#9792;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏿", "name": "person bowing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F647 1F3FF", "html": "&#128583;&#127999;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏾", "name": "person bowing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F647 1F3FE", "html": "&#128583;&#127998;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏽", "name": "person bowing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F647 1F3FD", "html": "&#128583;&#127997;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏼", "name": "person bowing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F647 1F3FC", "html": "&#128583;&#127996;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏻", "name": "person bowing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F647 1F3FB", "html": "&#128583;&#127995;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇", "name": "person bowing", "shortname": ":bow:", "unicode": "1f647", "html": "&#128583;", "category": "People & Body (person-gesture)", "order": "603"},
+		{"emoji": "☁", "name": "cloud", "shortname": ":cloud:", "unicode": "2601", "html": "&#9729;", "category": "Travel & Places (sky & weather)", "order": "1730"},
+		{"emoji": "⚽", "name": "soccer ball", "shortname": ":soccer:", "unicode": "26bd", "html": "&#9917;", "category": "Activities (sport)", "order": "1781"},
+		{"emoji": "👼🏿", "name": "baby angel: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F47C 1F3FF", "html": "&#128124;&#127999;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "👼🏾", "name": "baby angel: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F47C 1F3FE", "html": "&#128124;&#127998;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "👼🏽", "name": "baby angel: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F47C 1F3FD", "html": "&#128124;&#127997;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "👼🏼", "name": "baby angel: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F47C 1F3FC", "html": "&#128124;&#127996;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "👼🏻", "name": "baby angel: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F47C 1F3FB", "html": "&#128124;&#127995;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "👼", "name": "baby angel", "shortname": ":angel:", "unicode": "1f47c", "html": "&#128124;", "category": "People & Body (person-fantasy)", "order": "141"},
+		{"emoji": "👯‍♂", "name": "men with bunny ears", "shortname": ":men_with_bunny_ears:", "unicode": "1F46F 200D 2642", "html": "&#128111;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👯", "name": "people with bunny ears", "shortname": ":dancers:", "unicode": "1f46f", "html": "&#128111;", "category": "People & Body (person-activity)", "order": "741"},
+		{"emoji": "❗", "name": "exclamation mark", "shortname": ":exclamation:", "unicode": "2757", "html": "&#10071;", "category": "Symbols (other-symbol)", "order": "2101"},
+		{"emoji": "❄️", "name": "snowflake", "shortname": ":snowflake:", "unicode": "2744", "html": "&#10052;", "category": "Travel & Places (sky & weather)", "order": "1749"},
+		{"emoji": "☝🏿", "name": "index pointing up: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "261D 1F3FF", "html": "&#9757;&#127999;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "☝🏾", "name": "index pointing up: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "261D 1F3FE", "html": "&#9757;&#127998;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "☝🏽", "name": "index pointing up: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "261D 1F3FD", "html": "&#9757;&#127997;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "☝🏼", "name": "index pointing up: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "261D 1F3FC", "html": "&#9757;&#127996;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "☝🏻", "name": "index pointing up: light skin tone", "shortname": ":light_skin_tone:", "unicode": "261D 1F3FB", "html": "&#9757;&#127995;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "☝️", "name": "index pointing up", "shortname": ":point_up:", "unicode": "261d", "html": "&#9757;", "category": "People & Body (hand-single-finger)", "order": "1104"},
+		{"emoji": "😙", "name": "kissing face with smiling eyes", "shortname": ":kissing_smiling_eyes:", "unicode": "1f619", "html": "&#128537;", "category": "Smileys & Emotion (face-affection)", "order": "16"},
+		{"emoji": "🌈", "name": "rainbow", "shortname": ":rainbow:", "unicode": "1f308", "html": "&#127752;", "category": "Travel & Places (sky & weather)", "order": "1743"},
+		{"emoji": "🌙", "name": "crescent moon", "shortname": ":crescent_moon:", "unicode": "1f319", "html": "&#127769;", "category": "Travel & Places (sky & weather)", "order": "1719"},
+		{"emoji": "💟", "name": "heart decoration", "shortname": ":heart_decoration:", "unicode": "1f49f", "html": "&#128159;", "category": "Smileys & Emotion (emotion)", "order": "1299"},
+		{"emoji": "💝", "name": "heart with ribbon", "shortname": ":gift_heart:", "unicode": "1f49d", "html": "&#128157;", "category": "Smileys & Emotion (emotion)", "order": "1297"},
+		{"emoji": "🎁", "name": "wrapped gift", "shortname": ":gift:", "unicode": "1f381", "html": "&#127873;", "category": "Activities (event)", "order": "1771"},
+		{"emoji": "🍻", "name": "clinking beer mugs", "shortname": ":beers:", "unicode": "1f37b", "html": "&#127867;", "category": "Food & Drink (drink)", "order": "1530"},
+		{"emoji": "😧", "name": "anguished face", "shortname": ":anguished:", "unicode": "1f627", "html": "&#128551;", "category": "Smileys & Emotion (face-concerned)", "order": "57"},
+		{"emoji": "🌍", "name": "globe showing Europe-Africa", "shortname": ":earth_africa:", "unicode": "1f30d", "html": "&#127757;", "category": "Travel & Places (place-map)", "order": "1538"},
+		{"emoji": "🎥", "name": "movie camera", "shortname": ":movie_camera:", "unicode": "1f3a5", "html": "&#127909;", "category": "Objects (light & video)", "order": "1856"},
+		{"emoji": "⚓", "name": "anchor", "shortname": ":anchor:", "unicode": "2693", "html": "&#9875;", "category": "Travel & Places (transport-water)", "order": "1642"},
+		{"emoji": "⚡", "name": "high voltage", "shortname": ":zap:", "unicode": "26a1", "html": "&#9889;", "category": "Travel & Places (sky & weather)", "order": "1748"},
+		{"emoji": "♣️", "name": "club suit", "shortname": ":club_suit:", "unicode": "2663 FE0F", "html": "&clubs;️", "category": "Activities (game)", "order": ""},
+		{"emoji": "✖️", "name": "multiplication sign", "shortname": ":heavy_multiplication_x:", "unicode": "2716", "html": "&#10006;", "category": "Symbols (other-symbol)", "order": "2081"},
+		{"emoji": "🏃🏿‍♀", "name": "woman running: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C3 1F3FF 200D 2640", "html": "&#127939;&#127999;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏾‍♀", "name": "woman running: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C3 1F3FE 200D 2640", "html": "&#127939;&#127998;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏽‍♀", "name": "woman running: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C3 1F3FD 200D 2640", "html": "&#127939;&#127997;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏼‍♀", "name": "woman running: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C3 1F3FC 200D 2640", "html": "&#127939;&#127996;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏻‍♀", "name": "woman running: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C3 1F3FB 200D 2640", "html": "&#127939;&#127995;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃‍♀", "name": "woman running", "shortname": ":woman_running:", "unicode": "1F3C3 200D 2640", "html": "&#127939;&zwj;&#9792;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏿", "name": "person running: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C3 1F3FF", "html": "&#127939;&#127999;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏾", "name": "person running: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C3 1F3FE", "html": "&#127939;&#127998;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏽", "name": "person running: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C3 1F3FD", "html": "&#127939;&#127997;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏼", "name": "person running: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C3 1F3FC", "html": "&#127939;&#127996;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏻", "name": "person running: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C3 1F3FB", "html": "&#127939;&#127995;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃", "name": "person running", "shortname": ":runner:", "unicode": "1f3c3", "html": "&#127939;", "category": "People & Body (person-activity)", "order": "711"},
+		{"emoji": "🌻", "name": "sunflower", "shortname": ":sunflower:", "unicode": "1f33b", "html": "&#127803;", "category": "Animals & Nature (plant-flower)", "order": "1434"},
+		{"emoji": "🌎", "name": "globe showing Americas", "shortname": ":earth_americas:", "unicode": "1f30e", "html": "&#127758;", "category": "Travel & Places (place-map)", "order": "1539"},
+		{"emoji": "💐", "name": "bouquet", "shortname": ":bouquet:", "unicode": "1f490", "html": "&#128144;", "category": "Animals & Nature (plant-flower)", "order": "1427"},
+		{"emoji": "🐶", "name": "dog face", "shortname": ":dog:", "unicode": "1f436", "html": "&#128054;", "category": "Animals & Nature (animal-mammal)", "order": "1345"},
+		{"emoji": "💰", "name": "money bag", "shortname": ":moneybag:", "unicode": "1f4b0", "html": "&#128176;", "category": "Objects (money)", "order": "1891"},
+		{"emoji": "🌿", "name": "herb", "shortname": ":herb:", "unicode": "1f33f", "html": "&#127807;", "category": "Animals & Nature (plant-other)", "order": "1443"},
+		{"emoji": "👫", "name": "woman and man holding hands", "shortname": ":couple:", "unicode": "1f46b", "html": "&#128107;", "category": "People & Body (family)", "order": "1018"},
+		{"emoji": "🍂", "name": "fallen leaf", "shortname": ":fallen_leaf:", "unicode": "1f342", "html": "&#127810;", "category": "Animals & Nature (plant-other)", "order": "1447"},
+		{"emoji": "🌷", "name": "tulip", "shortname": ":tulip:", "unicode": "1f337", "html": "&#127799;", "category": "Animals & Nature (plant-flower)", "order": "1436"},
+		{"emoji": "🎂", "name": "birthday cake", "shortname": ":birthday:", "unicode": "1f382", "html": "&#127874;", "category": "Food & Drink (food-sweet)", "order": "1513"},
+		{"emoji": "🐱", "name": "cat face", "shortname": ":cat:", "unicode": "1f431", "html": "&#128049;", "category": "Animals & Nature (animal-mammal)", "order": "1350"},
+		{"emoji": "☕", "name": "hot beverage", "shortname": ":coffee:", "unicode": "2615", "html": "&#9749;", "category": "Food & Drink (drink)", "order": "1522"},
+		{"emoji": "😵", "name": "dizzy face", "shortname": ":dizzy_face:", "unicode": "1f635", "html": "&#128565;", "category": "Smileys & Emotion (face-unwell)", "order": "64"},
+		{"emoji": "👆🏿", "name": "backhand index pointing up: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F446 1F3FF", "html": "&#128070;&#127999;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👆🏾", "name": "backhand index pointing up: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F446 1F3FE", "html": "&#128070;&#127998;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👆🏽", "name": "backhand index pointing up: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F446 1F3FD", "html": "&#128070;&#127997;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👆🏼", "name": "backhand index pointing up: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F446 1F3FC", "html": "&#128070;&#127996;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👆🏻", "name": "backhand index pointing up: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F446 1F3FB", "html": "&#128070;&#127995;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "👆", "name": "backhand index pointing up", "shortname": ":point_up_2:", "unicode": "1f446", "html": "&#128070;", "category": "People & Body (hand-single-finger)", "order": "1110"},
+		{"emoji": "😮", "name": "face with open mouth", "shortname": ":open_mouth:", "unicode": "1f62e", "html": "&#128558;", "category": "Smileys & Emotion (face-concerned)", "order": "29"},
+		{"emoji": "😯", "name": "hushed face", "shortname": ":hushed:", "unicode": "1f62f", "html": "&#128559;", "category": "Smileys & Emotion (face-concerned)", "order": "31"},
+		{"emoji": "🏀", "name": "basketball", "shortname": ":basketball:", "unicode": "1f3c0", "html": "&#127936;", "category": "Activities (sport)", "order": "1783"},
+		{"emoji": "🎄", "name": "Christmas tree", "shortname": ":christmas_tree:", "unicode": "1f384", "html": "&#127876;", "category": "Activities (event)", "order": "1757"},
+		{"emoji": "💍", "name": "ring", "shortname": ":ring:", "unicode": "1f48d", "html": "&#128141;", "category": "Objects (clothing)", "order": "1340"},
+		{"emoji": "🌝", "name": "full moon face", "shortname": ":full_moon_with_face:", "unicode": "1f31d", "html": "&#127773;", "category": "Travel & Places (sky & weather)", "order": "1725"},
+		{"emoji": "😲", "name": "astonished face", "shortname": ":astonished:", "unicode": "1f632", "html": "&#128562;", "category": "Smileys & Emotion (face-concerned)", "order": "47"},
+		{"emoji": "👭", "name": "women holding hands", "shortname": ":two_women_holding_hands:", "unicode": "1f46d", "html": "&#128109;", "category": "People & Body (family)", "order": "1030"},
+		{"emoji": "💸", "name": "money with wings", "shortname": ":money_with_wings:", "unicode": "1f4b8", "html": "&#128184;", "category": "Objects (money)", "order": "1896"},
+		{"emoji": "😿", "name": "crying cat", "shortname": ":crying_cat_face:", "unicode": "1f63f", "html": "&#128575;", "category": "Smileys & Emotion (cat-face)", "order": "94"},
+		{"emoji": "🙉", "name": "hear-no-evil monkey", "shortname": ":hear_no_evil:", "unicode": "1f649", "html": "&#128585;", "category": "Smileys & Emotion (monkey-face)", "order": "97"},
+		{"emoji": "💨", "name": "dashing away", "shortname": ":dash:", "unicode": "1f4a8", "html": "&#128168;", "category": "Smileys & Emotion (emotion)", "order": "1307"},
+		{"emoji": "🌵", "name": "cactus", "shortname": ":cactus:", "unicode": "1f335", "html": "&#127797;", "category": "Animals & Nature (plant-other)", "order": "1441"},
+		{"emoji": "♨️", "name": "hot springs", "shortname": ":hotsprings:", "unicode": "2668", "html": "&#9832;", "category": "Travel & Places (place-other)", "order": "1591"},
+		{"emoji": "☎️", "name": "telephone", "shortname": ":telephone:", "unicode": "260e", "html": "&#9742;", "category": "Objects (phone)", "order": "1840"},
+		{"emoji": "🍁", "name": "maple leaf", "shortname": ":maple_leaf:", "unicode": "1f341", "html": "&#127809;", "category": "Animals & Nature (plant-other)", "order": "1446"},
+		{"emoji": "👸🏿", "name": "princess: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F478 1F3FF", "html": "&#128120;&#127999;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👸🏾", "name": "princess: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F478 1F3FE", "html": "&#128120;&#127998;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👸🏽", "name": "princess: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F478 1F3FD", "html": "&#128120;&#127997;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👸🏼", "name": "princess: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F478 1F3FC", "html": "&#128120;&#127996;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👸🏻", "name": "princess: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F478 1F3FB", "html": "&#128120;&#127995;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👸", "name": "princess", "shortname": ":princess:", "unicode": "1f478", "html": "&#128120;", "category": "People & Body (person-role)", "order": "459"},
+		{"emoji": "💆🏿‍♂", "name": "man getting massage: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F486 1F3FF 200D 2642", "html": "&#128134;&#127999;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏾‍♂", "name": "man getting massage: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F486 1F3FE 200D 2642", "html": "&#128134;&#127998;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏽‍♂", "name": "man getting massage: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F486 1F3FD 200D 2642", "html": "&#128134;&#127997;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏼‍♂", "name": "man getting massage: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F486 1F3FC 200D 2642", "html": "&#128134;&#127996;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏻‍♂", "name": "man getting massage: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F486 1F3FB 200D 2642", "html": "&#128134;&#127995;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆‍♂", "name": "man getting massage", "shortname": ":man_getting_massage:", "unicode": "1F486 200D 2642", "html": "&#128134;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏿", "name": "person getting massage: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F486 1F3FF", "html": "&#128134;&#127999;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏾", "name": "person getting massage: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F486 1F3FE", "html": "&#128134;&#127998;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏽", "name": "person getting massage: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F486 1F3FD", "html": "&#128134;&#127997;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏼", "name": "person getting massage: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F486 1F3FC", "html": "&#128134;&#127996;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏻", "name": "person getting massage: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F486 1F3FB", "html": "&#128134;&#127995;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆", "name": "person getting massage", "shortname": ":massage:", "unicode": "1f486", "html": "&#128134;", "category": "People & Body (person-activity)", "order": "657"},
+		{"emoji": "💌", "name": "love letter", "shortname": ":love_letter:", "unicode": "1f48c", "html": "&#128140;", "category": "Smileys & Emotion (emotion)", "order": "1301"},
+		{"emoji": "🏆", "name": "trophy", "shortname": ":trophy:", "unicode": "1f3c6", "html": "&#127942;", "category": "Activities (award-medal)", "order": "1776"},
+		{"emoji": "🙍🏿‍♂", "name": "man frowning: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64D 1F3FF 200D 2642", "html": "&#128589;&#127999;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏾‍♂", "name": "man frowning: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64D 1F3FE 200D 2642", "html": "&#128589;&#127998;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏽‍♂", "name": "man frowning: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64D 1F3FD 200D 2642", "html": "&#128589;&#127997;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏼‍♂", "name": "man frowning: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64D 1F3FC 200D 2642", "html": "&#128589;&#127996;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏻‍♂", "name": "man frowning: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64D 1F3FB 200D 2642", "html": "&#128589;&#127995;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍‍♂", "name": "man frowning", "shortname": ":man_frowning:", "unicode": "1F64D 200D 2642", "html": "&#128589;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏿", "name": "person frowning: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64D 1F3FF", "html": "&#128589;&#127999;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏾", "name": "person frowning: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64D 1F3FE", "html": "&#128589;&#127998;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏽", "name": "person frowning: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64D 1F3FD", "html": "&#128589;&#127997;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏼", "name": "person frowning: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64D 1F3FC", "html": "&#128589;&#127996;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏻", "name": "person frowning: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64D 1F3FB", "html": "&#128589;&#127995;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍", "name": "person frowning", "shortname": ":person_frowning:", "unicode": "1f64d", "html": "&#128589;", "category": "People & Body (person-gesture)", "order": "495"},
+		{"emoji": "🇺🇸", "name": "flag: United States", "shortname": ":us:", "unicode": "1f1fa", "html": "&#127482;", "category": "Flags (country-flag)", "order": ""},
+		{"emoji": "🎊", "name": "confetti ball", "shortname": ":confetti_ball:", "unicode": "1f38a", "html": "&#127882;", "category": "Activities (event)", "order": "1763"},
+		{"emoji": "🌼", "name": "blossom", "shortname": ":blossom:", "unicode": "1f33c", "html": "&#127804;", "category": "Animals & Nature (plant-flower)", "order": "1435"},
+		{"emoji": "🔪", "name": "kitchen knife", "shortname": ":kitchen_knife:", "unicode": "1F52A", "html": "&#128298;", "category": "Food & Drink (dishware)", "order": ""},
+		{"emoji": "👄", "name": "mouth", "shortname": ":lips:", "unicode": "1f444", "html": "&#128068;", "category": "People & Body (body-parts)", "order": "1283"},
+		{"emoji": "🍟", "name": "french fries", "shortname": ":fries:", "unicode": "1f35f", "html": "&#127839;", "category": "Food & Drink (food-prepared)", "order": "1483"},
+		{"emoji": "🍩", "name": "doughnut", "shortname": ":doughnut:", "unicode": "1f369", "html": "&#127849;", "category": "Food & Drink (food-sweet)", "order": "1511"},
+		{"emoji": "😦", "name": "frowning face with open mouth", "shortname": ":frowning:", "unicode": "1f626", "html": "&#128550;", "category": "Smileys & Emotion (face-concerned)", "order": "56"},
+		{"emoji": "🌊", "name": "water wave", "shortname": ":ocean:", "unicode": "1f30a", "html": "&#127754;", "category": "Travel & Places (sky & weather)", "order": "1755"},
+		{"emoji": "💣", "name": "bomb", "shortname": ":bomb:", "unicode": "1f4a3", "html": "&#128163;", "category": "Smileys & Emotion (emotion)", "order": "1304"},
+		{"emoji": "🆗", "name": "OK button", "shortname": ":ok:", "unicode": "1f197", "html": "&#127383;", "category": "Symbols (alphanum)", "order": "2137"},
+		{"emoji": "🌀", "name": "cyclone", "shortname": ":cyclone:", "unicode": "1f300", "html": "&#127744;", "category": "Travel & Places (sky & weather)", "order": "1742"},
+		{"emoji": "🚀", "name": "rocket", "shortname": ":rocket:", "unicode": "1f680", "html": "&#128640;", "category": "Travel & Places (transport-air)", "order": "1659"},
+		{"emoji": "☔", "name": "umbrella with rain drops", "shortname": ":umbrella:", "unicode": "2614", "html": "&#9748;", "category": "Travel & Places (sky & weather)", "order": "1746"},
+		{"emoji": "💏", "name": "kiss", "shortname": ":couplekiss:", "unicode": "1f48f", "html": "&#128143;", "category": "People & Body (family)", "order": "1036"},
+		{"emoji": "👩‍❤️‍💋‍👩", "name": "kiss: woman, woman", "shortname": ":couple_woman_kiss:", "unicode": "1F469 200D 2764 FE0F 200D 1F48B 200D 1F469", "html": "&#128105;&zwj;&#10084;&zwj;&#128139;&zwj;&#128105;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍❤️‍💋‍👨", "name": "kiss: man, man", "shortname": ":couple_man_kiss:", "unicode": "1F468 200D 2764 FE0F 200D 1F48B 200D 1F468", "html": "&#128104;&zwj;&#10084;&zwj;&#128139;&zwj;&#128104;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "💑", "name": "couple with heart", "shortname": ":couple_with_heart:", "unicode": "1f491", "html": "&#128145;", "category": "People & Body (family)", "order": "1040"},
+		{"emoji": "👩‍❤️‍👩", "name": "couple with heart: woman, woman", "shortname": ":woman_woman:", "unicode": "1F469 200D 2764 FE0F 200D 1F469", "html": "&#128105;&zwj;&#10084;&zwj;&#128105;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍❤️‍👨", "name": "couple with heart: man, man", "shortname": ":man_man_love:", "unicode": "1F468 200D 2764 FE0F 200D 1F468", "html": "&#128104;&zwj;&#10084;&zwj;&#128104;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🍭", "name": "lollipop", "shortname": ":lollipop:", "unicode": "1f36d", "html": "&#127853;", "category": "Food & Drink (food-sweet)", "order": "1517"},
+		{"emoji": "🎬", "name": "clapper board", "shortname": ":clapper:", "unicode": "1f3ac", "html": "&#127916;", "category": "Objects (light & video)", "order": "1859"},
+		{"emoji": "🐷", "name": "pig face", "shortname": ":pig:", "unicode": "1f437", "html": "&#128055;", "category": "Animals & Nature (animal-mammal)", "order": "1364"},
+		{"emoji": "😈", "name": "smiling face with horns", "shortname": ":smiling_imp:", "unicode": "1f608", "html": "&#128520;", "category": "Smileys & Emotion (face-negative)", "order": "76"},
+		{"emoji": "👿", "name": "angry face with horns", "shortname": ":imp:", "unicode": "1f47f", "html": "&#128127;", "category": "Smileys & Emotion (face-negative)", "order": "77"},
+		{"emoji": "🐝", "name": "honeybee", "shortname": ":bee:", "unicode": "1f41d", "html": "&#128029;", "category": "Animals & Nature (animal-bug)", "order": "1422"},
+		{"emoji": "😽", "name": "kissing cat", "shortname": ":kissing_cat:", "unicode": "1f63d", "html": "&#128573;", "category": "Smileys & Emotion (cat-face)", "order": "92"},
+		{"emoji": "💢", "name": "anger symbol", "shortname": ":anger:", "unicode": "1f4a2", "html": "&#128162;", "category": "Smileys & Emotion (emotion)", "order": "1303"},
+		{"emoji": "🎼", "name": "musical score", "shortname": ":musical_score:", "unicode": "1f3bc", "html": "&#127932;", "category": "Objects (music)", "order": "1823"},
+		{"emoji": "🎅🏿", "name": "Santa Claus: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F385 1F3FF", "html": "&#127877;&#127999;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🎅🏾", "name": "Santa Claus: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F385 1F3FE", "html": "&#127877;&#127998;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🎅🏽", "name": "Santa Claus: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F385 1F3FD", "html": "&#127877;&#127997;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🎅🏼", "name": "Santa Claus: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F385 1F3FC", "html": "&#127877;&#127996;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🎅🏻", "name": "Santa Claus: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F385 1F3FB", "html": "&#127877;&#127995;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🎅", "name": "Santa Claus", "shortname": ":santa:", "unicode": "1f385", "html": "&#127877;", "category": "People & Body (person-fantasy)", "order": "447"},
+		{"emoji": "🌏", "name": "globe showing Asia-Australia", "shortname": ":earth_asia:", "unicode": "1f30f", "html": "&#127759;", "category": "Travel & Places (place-map)", "order": "1540"},
+		{"emoji": "🏈", "name": "american football", "shortname": ":football:", "unicode": "1f3c8", "html": "&#127944;", "category": "Activities (sport)", "order": "1785"},
+		{"emoji": "🎸", "name": "guitar", "shortname": ":guitar:", "unicode": "1f3b8", "html": "&#127928;", "category": "Objects (musical-instrument)", "order": "1833"},
+		{"emoji": "♦️", "name": "diamond suit", "shortname": ":diamond_suit:", "unicode": "2666 FE0F", "html": "&diams;️", "category": "Activities (game)", "order": ""},
+		{"emoji": "🐼", "name": "panda", "shortname": ":panda_face:", "unicode": "1f43c", "html": "&#128060;", "category": "Animals & Nature (animal-mammal)", "order": "1385"},
+		{"emoji": "💬", "name": "speech balloon", "shortname": ":speech_balloon:", "unicode": "1f4ac", "html": "&#128172;", "category": "Smileys & Emotion (emotion)", "order": "1309"},
+		{"emoji": "🍓", "name": "strawberry", "shortname": ":strawberry:", "unicode": "1f353", "html": "&#127827;", "category": "Food & Drink (food-fruit)", "order": "1461"},
+		{"emoji": "😼", "name": "cat with wry smile", "shortname": ":smirk_cat:", "unicode": "1f63c", "html": "&#128572;", "category": "Smileys & Emotion (cat-face)", "order": "91"},
+		{"emoji": "🍌", "name": "banana", "shortname": ":banana:", "unicode": "1f34c", "html": "&#127820;", "category": "Food & Drink (food-fruit)", "order": "1454"},
+		{"emoji": "🍉", "name": "watermelon", "shortname": ":watermelon:", "unicode": "1f349", "html": "&#127817;", "category": "Food & Drink (food-fruit)", "order": "1451"},
+		{"emoji": "⛄", "name": "snowman without snow", "shortname": ":snowman:", "unicode": "26c4", "html": "&#9924;", "category": "Travel & Places (sky & weather)", "order": "1751"},
+		{"emoji": "😸", "name": "grinning cat with smiling eyes", "shortname": ":smile_cat:", "unicode": "1f638", "html": "&#128568;", "category": "Smileys & Emotion (cat-face)", "order": "88"},
+		{"emoji": "♠️", "name": "spade suit", "shortname": ":spade_suit:", "unicode": "2660 FE0F", "html": "&spades;️", "category": "Activities (game)", "order": ""},
+		{"emoji": "🔝", "name": "TOP arrow", "shortname": ":top:", "unicode": "1f51d", "html": "&#128285;", "category": "Symbols (arrow)", "order": "2022"},
+		{"emoji": "🍆", "name": "eggplant", "shortname": ":eggplant:", "unicode": "1f346", "html": "&#127814;", "category": "Food & Drink (food-vegetable)", "order": "1465"},
+		{"emoji": "🔮", "name": "crystal ball", "shortname": ":crystal_ball:", "unicode": "1f52e", "html": "&#128302;", "category": "Activities (game)", "order": "1974"},
+		{"emoji": "🍴", "name": "fork and knife", "shortname": ":fork_and_knife:", "unicode": "1f374", "html": "&#127860;", "category": "Food & Drink (dishware)", "order": "1534"},
+		{"emoji": "📲", "name": "mobile phone with arrow", "shortname": ":calling:", "unicode": "1f4f2", "html": "&#128242;", "category": "Objects (phone)", "order": "1839"},
+		{"emoji": "📱", "name": "mobile phone", "shortname": ":iphone:", "unicode": "1f4f1", "html": "&#128241;", "category": "Objects (phone)", "order": "1838"},
+		{"emoji": "⛅", "name": "sun behind cloud", "shortname": ":partly_sunny:", "unicode": "26c5", "html": "&#9925;", "category": "Travel & Places (sky & weather)", "order": "1731"},
+		{"emoji": "⚠️", "name": "warning", "shortname": ":warning:", "unicode": "26a0", "html": "&#9888;", "category": "Symbols (warning)", "order": "1989"},
+		{"emoji": "🙀", "name": "weary cat", "shortname": ":scream_cat:", "unicode": "1f640", "html": "&#128576;", "category": "Smileys & Emotion (cat-face)", "order": "93"},
+		{"emoji": "🔸", "name": "small orange diamond", "shortname": ":small_orange_diamond:", "unicode": "1f538", "html": "&#128312;", "category": "Symbols (geometric)", "order": "2169"},
+		{"emoji": "👶🏿", "name": "baby: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F476 1F3FF", "html": "&#128118;&#127999;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👶🏾", "name": "baby: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F476 1F3FE", "html": "&#128118;&#127998;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👶🏽", "name": "baby: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F476 1F3FD", "html": "&#128118;&#127997;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👶🏼", "name": "baby: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F476 1F3FC", "html": "&#128118;&#127996;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👶🏻", "name": "baby: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F476 1F3FB", "html": "&#128118;&#127995;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👶", "name": "baby", "shortname": ":baby:", "unicode": "1f476", "html": "&#128118;", "category": "People & Body (person)", "order": "135"},
+		{"emoji": "🐾", "name": "paw prints", "shortname": ":feet:", "unicode": "1f43e", "html": "&#128062;", "category": "Animals & Nature (animal-mammal)", "order": "1386"},
+		{"emoji": "👣", "name": "footprints", "shortname": ":footprints:", "unicode": "1f463", "html": "&#128099;", "category": "People & Body (person-symbol)", "order": "1278"},
+		{"emoji": "🍺", "name": "beer mug", "shortname": ":beer:", "unicode": "1f37a", "html": "&#127866;", "category": "Food & Drink (drink)", "order": "1529"},
+		{"emoji": "🍷", "name": "wine glass", "shortname": ":wine_glass:", "unicode": "1f377", "html": "&#127863;", "category": "Food & Drink (drink)", "order": "1526"},
+		{"emoji": "⭕", "name": "hollow red circle", "shortname": ":o:", "unicode": "2b55", "html": "&#11093;", "category": "Symbols (other-symbol)", "order": "2077"},
+		{"emoji": "📹", "name": "video camera", "shortname": ":video_camera:", "unicode": "1f4f9", "html": "&#128249;", "category": "Objects (light & video)", "order": "1863"},
+		{"emoji": "🐰", "name": "rabbit face", "shortname": ":rabbit:", "unicode": "1f430", "html": "&#128048;", "category": "Animals & Nature (animal-mammal)", "order": "1379"},
+		{"emoji": "🍹", "name": "tropical drink", "shortname": ":tropical_drink:", "unicode": "1f379", "html": "&#127865;", "category": "Food & Drink (drink)", "order": "1528"},
+		{"emoji": "🚬", "name": "cigarette", "shortname": ":smoking:", "unicode": "1f6ac", "html": "&#128684;", "category": "Objects (other-object)", "order": "1969"},
+		{"emoji": "👾", "name": "alien monster", "shortname": ":space_invader:", "unicode": "1f47e", "html": "&#128126;", "category": "Smileys & Emotion (face-costume)", "order": "84"},
+		{"emoji": "🍑", "name": "peach", "shortname": ":peach:", "unicode": "1f351", "html": "&#127825;", "category": "Food & Drink (food-fruit)", "order": "1459"},
+		{"emoji": "🐍", "name": "snake", "shortname": ":snake:", "unicode": "1f40d", "html": "&#128013;", "category": "Animals & Nature (animal-reptile)", "order": "1403"},
+		{"emoji": "🐢", "name": "turtle", "shortname": ":turtle:", "unicode": "1f422", "html": "&#128034;", "category": "Animals & Nature (animal-reptile)", "order": "1401"},
+		{"emoji": "🍒", "name": "cherries", "shortname": ":cherries:", "unicode": "1f352", "html": "&#127826;", "category": "Food & Drink (food-fruit)", "order": "1460"},
+		{"emoji": "😗", "name": "kissing face", "shortname": ":kissing:", "unicode": "1f617", "html": "&#128535;", "category": "Smileys & Emotion (face-affection)", "order": "15"},
+		{"emoji": "🐸", "name": "frog", "shortname": ":frog:", "unicode": "1f438", "html": "&#128056;", "category": "Animals & Nature (animal-amphibian)", "order": "1399"},
+		{"emoji": "🌌", "name": "milky way", "shortname": ":milky_way:", "unicode": "1f30c", "html": "&#127756;", "category": "Travel & Places (sky & weather)", "order": "1592"},
+		{"emoji": "🚨", "name": "police car light", "shortname": ":rotating_light:", "unicode": "1f6a8", "html": "&#128680;", "category": "Travel & Places (transport-ground)", "order": "1637"},
+		{"emoji": "🐣", "name": "hatching chick", "shortname": ":hatching_chick:", "unicode": "1f423", "html": "&#128035;", "category": "Animals & Nature (animal-bird)", "order": "1390"},
+		{"emoji": "📕", "name": "closed book", "shortname": ":closed_book:", "unicode": "1f4d5", "html": "&#128213;", "category": "Objects (book-paper)", "order": "1875"},
+		{"emoji": "🍬", "name": "candy", "shortname": ":candy:", "unicode": "1f36c", "html": "&#127852;", "category": "Food & Drink (food-sweet)", "order": "1516"},
+		{"emoji": "🍔", "name": "hamburger", "shortname": ":hamburger:", "unicode": "1f354", "html": "&#127828;", "category": "Food & Drink (food-prepared)", "order": "1482"},
+		{"emoji": "🐻", "name": "bear", "shortname": ":bear:", "unicode": "1f43b", "html": "&#128059;", "category": "Animals & Nature (animal-mammal)", "order": "1383"},
+		{"emoji": "🐯", "name": "tiger face", "shortname": ":tiger:", "unicode": "1f42f", "html": "&#128047;", "category": "Animals & Nature (animal-mammal)", "order": "1353"},
+		{"emoji": "🚗", "name": "automobile", "shortname": ":automobile:", "unicode": "1F697", "html": "&#128663;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "⏩", "name": "fast-forward button", "shortname": ":fast_forward:", "unicode": "2.3E+10", "html": "&#9193;", "category": "Symbols (av-symbol)", "order": "2052"},
+		{"emoji": "🍦", "name": "soft ice cream", "shortname": ":icecream:", "unicode": "1f366", "html": "&#127846;", "category": "Food & Drink (food-sweet)", "order": "1508"},
+		{"emoji": "🍍", "name": "pineapple", "shortname": ":pineapple:", "unicode": "1f34d", "html": "&#127821;", "category": "Food & Drink (food-fruit)", "order": "1455"},
+		{"emoji": "🌾", "name": "sheaf of rice", "shortname": ":ear_of_rice:", "unicode": "1f33e", "html": "&#127806;", "category": "Animals & Nature (plant-other)", "order": "1442"},
+		{"emoji": "💉", "name": "syringe", "shortname": ":syringe:", "unicode": "1f489", "html": "&#128137;", "category": "Objects (medical)", "order": "1967"},
+		{"emoji": "🚮", "name": "litter in bin sign", "shortname": ":put_litter_in_its_place:", "unicode": "1f6ae", "html": "&#128686;", "category": "Symbols (transport-sign)", "order": "1977"},
+		{"emoji": "🍫", "name": "chocolate bar", "shortname": ":chocolate_bar:", "unicode": "1f36b", "html": "&#127851;", "category": "Food & Drink (food-sweet)", "order": "1515"},
+		{"emoji": "▪️", "name": "black small square", "shortname": ":black_small_square:", "unicode": "25aa", "html": "&#9642;", "category": "Symbols (geometric)", "order": "2159"},
+		{"emoji": "📺", "name": "television", "shortname": ":tv:", "unicode": "1f4fa", "html": "&#128250;", "category": "Objects (light & video)", "order": "1860"},
+		{"emoji": "💊", "name": "pill", "shortname": ":pill:", "unicode": "1f48a", "html": "&#128138;", "category": "Objects (medical)", "order": "1968"},
+		{"emoji": "🐙", "name": "octopus", "shortname": ":octopus:", "unicode": "1f419", "html": "&#128025;", "category": "Animals & Nature (animal-marine)", "order": "1413"},
+		{"emoji": "🎃", "name": "jack-o-lantern", "shortname": ":jack_o_lantern:", "unicode": "1f383", "html": "&#127875;", "category": "Activities (event)", "order": "1756"},
+		{"emoji": "🍇", "name": "grapes", "shortname": ":grapes:", "unicode": "1f347", "html": "&#127815;", "category": "Food & Drink (food-fruit)", "order": "1449"},
+		{"emoji": "😺", "name": "grinning cat", "shortname": ":smiley_cat:", "unicode": "1f63a", "html": "&#128570;", "category": "Smileys & Emotion (cat-face)", "order": "87"},
+		{"emoji": "💿", "name": "optical disk", "shortname": ":cd:", "unicode": "1f4bf", "html": "&#128191;", "category": "Objects (computer)", "order": "1854"},
+		{"emoji": "🍸", "name": "cocktail glass", "shortname": ":cocktail:", "unicode": "1f378", "html": "&#127864;", "category": "Food & Drink (drink)", "order": "1527"},
+		{"emoji": "🍰", "name": "shortcake", "shortname": ":cake:", "unicode": "1f370", "html": "&#127856;", "category": "Food & Drink (food-sweet)", "order": "1514"},
+		{"emoji": "🎮", "name": "video game", "shortname": ":video_game:", "unicode": "1f3ae", "html": "&#127918;", "category": "Activities (game)", "order": "1804"},
+		{"emoji": "™️", "name": "trade mark", "shortname": ":trade_mark:", "unicode": "2122 FE0F", "html": "&trade;️", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "⬇️", "name": "down arrow", "shortname": ":arrow_down:", "unicode": "2b07", "html": "&#11015;", "category": "Symbols (arrow)", "order": "2006"},
+		{"emoji": "🚫", "name": "prohibited", "shortname": ":no_entry_sign:", "unicode": "1f6ab", "html": "&#128683;", "category": "Symbols (warning)", "order": "1992"},
+		{"emoji": "💄", "name": "lipstick", "shortname": ":lipstick:", "unicode": "1f484", "html": "&#128132;", "category": "Objects (clothing)", "order": "1339"},
+		{"emoji": "🐳", "name": "spouting whale", "shortname": ":whale:", "unicode": "1f433", "html": "&#128051;", "category": "Animals & Nature (animal-marine)", "order": "1406"},
+		{"emoji": "📝", "name": "memo", "shortname": ":memo:", "unicode": "1F4DD", "html": "&#128221;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "®️", "name": "registered", "shortname": ":registered:", "unicode": "00AE FE0F", "html": "&reg;️", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "🍪", "name": "cookie", "shortname": ":cookie:", "unicode": "1f36a", "html": "&#127850;", "category": "Food & Drink (food-sweet)", "order": "1512"},
+		{"emoji": "🐬", "name": "dolphin", "shortname": ":dolphin:", "unicode": "1f42c", "html": "&#128044;", "category": "Animals & Nature (animal-marine)", "order": "1408"},
+		{"emoji": "🔊", "name": "speaker high volume", "shortname": ":loud_sound:", "unicode": "1f50a", "html": "&#128266;", "category": "Objects (sound)", "order": "1817"},
+		{"emoji": "👨🏿", "name": "man: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF", "html": "&#128104;&#127999;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏾", "name": "man: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE", "html": "&#128104;&#127998;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏽", "name": "man: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD", "html": "&#128104;&#127997;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏼", "name": "man: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC", "html": "&#128104;&#127996;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏻", "name": "man: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB", "html": "&#128104;&#127995;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨", "name": "man", "shortname": ":man:", "unicode": "1f468", "html": "&#128104;", "category": "People & Body (person)", "order": "111"},
+		{"emoji": "🐥", "name": "front-facing baby chick", "shortname": ":hatched_chick:", "unicode": "1f425", "html": "&#128037;", "category": "Animals & Nature (animal-bird)", "order": "1392"},
+		{"emoji": "🐒", "name": "monkey", "shortname": ":monkey:", "unicode": "1f412", "html": "&#128018;", "category": "Animals & Nature (animal-mammal)", "order": "1343"},
+		{"emoji": "📚", "name": "books", "shortname": ":books:", "unicode": "1f4da", "html": "&#128218;", "category": "Objects (book-paper)", "order": "1880"},
+		{"emoji": "👹", "name": "ogre", "shortname": ":japanese_ogre:", "unicode": "1f479", "html": "&#128121;", "category": "Smileys & Emotion (face-costume)", "order": "78"},
+		{"emoji": "💂🏿‍♀", "name": "woman guard: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F482 1F3FF 200D 2640", "html": "&#128130;&#127999;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏾‍♀", "name": "woman guard: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F482 1F3FE 200D 2640", "html": "&#128130;&#127998;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏽‍♀", "name": "woman guard: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F482 1F3FD 200D 2640", "html": "&#128130;&#127997;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏼‍♀", "name": "woman guard: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F482 1F3FC 200D 2640", "html": "&#128130;&#127996;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏻‍♀", "name": "woman guard: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F482 1F3FB 200D 2640", "html": "&#128130;&#127995;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂‍♀", "name": "woman guard", "shortname": ":woman_guard:", "unicode": "1F482 200D 2640", "html": "&#128130;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏿", "name": "guard: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F482 1F3FF", "html": "&#128130;&#127999;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏾", "name": "guard: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F482 1F3FE", "html": "&#128130;&#127998;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏽", "name": "guard: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F482 1F3FD", "html": "&#128130;&#127997;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏼", "name": "guard: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F482 1F3FC", "html": "&#128130;&#127996;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏻", "name": "guard: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F482 1F3FB", "html": "&#128130;&#127995;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂", "name": "guard", "shortname": ":guardsman:", "unicode": "1f482", "html": "&#128130;", "category": "People & Body (person-role)", "order": "375"},
+		{"emoji": "📢", "name": "loudspeaker", "shortname": ":loudspeaker:", "unicode": "1f4e2", "html": "&#128226;", "category": "Objects (sound)", "order": "1818"},
+		{"emoji": "✂️", "name": "scissors", "shortname": ":scissors:", "unicode": "2702", "html": "&#9986;", "category": "Objects (office)", "order": "1940"},
+		{"emoji": "👧🏿", "name": "girl: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F467 1F3FF", "html": "&#128103;&#127999;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👧🏾", "name": "girl: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F467 1F3FE", "html": "&#128103;&#127998;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👧🏽", "name": "girl: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F467 1F3FD", "html": "&#128103;&#127997;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👧🏼", "name": "girl: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F467 1F3FC", "html": "&#128103;&#127996;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👧🏻", "name": "girl: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F467 1F3FB", "html": "&#128103;&#127995;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👧", "name": "girl", "shortname": ":girl:", "unicode": "1f467", "html": "&#128103;", "category": "People & Body (person)", "order": "105"},
+		{"emoji": "🎓", "name": "graduation cap", "shortname": ":mortar_board:", "unicode": "1f393", "html": "&#127891;", "category": "Objects (clothing)", "order": "1336"},
+		{"emoji": "🇫🇷", "name": "flag: France", "shortname": ":fr:", "unicode": "1f1eb", "html": "&#127467;", "category": "Flags (country-flag)", "order": ""},
+		{"emoji": "⚾️", "name": "", "shortname": ":baseball:", "unicode": "26be", "html": "&#9918;", "category": "", "order": "1782"},
+		{"emoji": "🚦", "name": "vertical traffic light", "shortname": ":vertical_traffic_light:", "unicode": "1f6a6", "html": "&#128678;", "category": "Travel & Places (transport-ground)", "order": "1639"},
+		{"emoji": "👩🏿", "name": "woman: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF", "html": "&#128105;&#127999;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏾", "name": "woman: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE", "html": "&#128105;&#127998;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏽", "name": "woman: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD", "html": "&#128105;&#127997;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏼", "name": "woman: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC", "html": "&#128105;&#127996;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏻", "name": "woman: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB", "html": "&#128105;&#127995;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩", "name": "woman", "shortname": ":woman:", "unicode": "1f469", "html": "&#128105;", "category": "People & Body (person)", "order": "117"},
+		{"emoji": "🎆", "name": "fireworks", "shortname": ":fireworks:", "unicode": "1f386", "html": "&#127878;", "category": "Activities (event)", "order": "1758"},
+		{"emoji": "🌠", "name": "shooting star", "shortname": ":stars:", "unicode": "1f320", "html": "&#127776;", "category": "Travel & Places (sky & weather)", "order": "1729"},
+		{"emoji": "🆘", "name": "SOS button", "shortname": ":sos:", "unicode": "1f198", "html": "&#127384;", "category": "Symbols (alphanum)", "order": "2139"},
+		{"emoji": "🍄", "name": "mushroom", "shortname": ":mushroom:", "unicode": "1f344", "html": "&#127812;", "category": "Food & Drink (food-vegetable)", "order": "1471"},
+		{"emoji": "😾", "name": "pouting cat", "shortname": ":pouting_cat:", "unicode": "1f63e", "html": "&#128574;", "category": "Smileys & Emotion (cat-face)", "order": "95"},
+		{"emoji": "🛅", "name": "left luggage", "shortname": ":left_luggage:", "unicode": "1f6c5", "html": "&#128709;", "category": "Symbols (transport-sign)", "order": "1988"},
+		{"emoji": "👠", "name": "high-heeled shoe", "shortname": ":high_heel:", "unicode": "1f460", "html": "&#128096;", "category": "Objects (clothing)", "order": "1330"},
+		{"emoji": "🎯", "name": "direct hit", "shortname": ":dart:", "unicode": "1f3af", "html": "&#127919;", "category": "Activities (game)", "order": "1798"},
+		{"emoji": "🏊🏿‍♀", "name": "woman swimming: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CA 1F3FF 200D 2640", "html": "&#127946;&#127999;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏾‍♀", "name": "woman swimming: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CA 1F3FE 200D 2640", "html": "&#127946;&#127998;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏽‍♀", "name": "woman swimming: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CA 1F3FD 200D 2640", "html": "&#127946;&#127997;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏼‍♀", "name": "woman swimming: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CA 1F3FC 200D 2640", "html": "&#127946;&#127996;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏻‍♀", "name": "woman swimming: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CA 1F3FB 200D 2640", "html": "&#127946;&#127995;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊‍♀", "name": "woman swimming", "shortname": ":woman_swimming:", "unicode": "1F3CA 200D 2640", "html": "&#127946;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏿", "name": "person swimming: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CA 1F3FF", "html": "&#127946;&#127999;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏾", "name": "person swimming: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CA 1F3FE", "html": "&#127946;&#127998;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏽", "name": "person swimming: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CA 1F3FD", "html": "&#127946;&#127997;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏼", "name": "person swimming: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CA 1F3FC", "html": "&#127946;&#127996;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏻", "name": "person swimming: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CA 1F3FB", "html": "&#127946;&#127995;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊", "name": "person swimming", "shortname": ":swimmer:", "unicode": "1f3ca", "html": "&#127946;", "category": "People & Body (person-sport)", "order": "836"},
+		{"emoji": "🔑", "name": "key", "shortname": ":key:", "unicode": "1f511", "html": "&#128273;", "category": "Objects (lock)", "order": "1948"},
+		{"emoji": "👙", "name": "bikini", "shortname": ":bikini:", "unicode": "1f459", "html": "&#128089;", "category": "Objects (clothing)", "order": "1321"},
+		{"emoji": "👪", "name": "family", "shortname": ":family:", "unicode": "1f46a", "html": "&#128106;", "category": "People & Body (family)", "order": "1044"},
+		{"emoji": "✏", "name": "pencil", "shortname": ":pencil2:", "unicode": "270f", "html": "&#9999;", "category": "Objects (writing)", "order": "1914"},
+		{"emoji": "🐘", "name": "elephant", "shortname": ":elephant:", "unicode": "1f418", "html": "&#128024;", "category": "Animals & Nature (animal-mammal)", "order": "1373"},
+		{"emoji": "💧", "name": "droplet", "shortname": ":droplet:", "unicode": "1f4a7", "html": "&#128167;", "category": "Travel & Places (sky & weather)", "order": "1754"},
+		{"emoji": "🌱", "name": "seedling", "shortname": ":seedling:", "unicode": "1f331", "html": "&#127793;", "category": "Animals & Nature (plant-other)", "order": "1437"},
+		{"emoji": "🍎", "name": "red apple", "shortname": ":apple:", "unicode": "1f34e", "html": "&#127822;", "category": "Food & Drink (food-fruit)", "order": "1456"},
+		{"emoji": "🆒", "name": "COOL button", "shortname": ":cool:", "unicode": "1f192", "html": "&#127378;", "category": "Symbols (alphanum)", "order": "2129"},
+		{"emoji": "📞", "name": "telephone receiver", "shortname": ":telephone_receiver:", "unicode": "1f4de", "html": "&#128222;", "category": "Objects (phone)", "order": "1841"},
+		{"emoji": "💵", "name": "dollar banknote", "shortname": ":dollar:", "unicode": "1f4b5", "html": "&#128181;", "category": "Objects (money)", "order": "1893"},
+		{"emoji": "🏡", "name": "house with garden", "shortname": ":house_with_garden:", "unicode": "1f3e1", "html": "&#127969;", "category": "Travel & Places (place-building)", "order": "1560"},
+		{"emoji": "📖", "name": "open book", "shortname": ":book:", "unicode": "1f4d6", "html": "&#128214;", "category": "Objects (book-paper)", "order": "1876"},
+		{"emoji": "💇🏿‍♂", "name": "man getting haircut: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F487 1F3FF 200D 2642", "html": "&#128135;&#127999;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏾‍♂", "name": "man getting haircut: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F487 1F3FE 200D 2642", "html": "&#128135;&#127998;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏽‍♂", "name": "man getting haircut: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F487 1F3FD 200D 2642", "html": "&#128135;&#127997;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏼‍♂", "name": "man getting haircut: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F487 1F3FC 200D 2642", "html": "&#128135;&#127996;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏻‍♂", "name": "man getting haircut: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F487 1F3FB 200D 2642", "html": "&#128135;&#127995;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇‍♂", "name": "man getting haircut", "shortname": ":man_getting_haircut:", "unicode": "1F487 200D 2642", "html": "&#128135;&zwj;&#9794;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏿", "name": "person getting haircut: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F487 1F3FF", "html": "&#128135;&#127999;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏾", "name": "person getting haircut: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F487 1F3FE", "html": "&#128135;&#127998;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏽", "name": "person getting haircut: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F487 1F3FD", "html": "&#128135;&#127997;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏼", "name": "person getting haircut: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F487 1F3FC", "html": "&#128135;&#127996;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏻", "name": "person getting haircut: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F487 1F3FB", "html": "&#128135;&#127995;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇", "name": "person getting haircut", "shortname": ":haircut:", "unicode": "1f487", "html": "&#128135;", "category": "People & Body (person-activity)", "order": "675"},
+		{"emoji": "💻", "name": "laptop", "shortname": ":computer:", "unicode": "1f4bb", "html": "&#128187;", "category": "Objects (computer)", "order": "1846"},
+		{"emoji": "💡", "name": "light bulb", "shortname": ":bulb:", "unicode": "1f4a1", "html": "&#128161;", "category": "Objects (light & video)", "order": "1871"},
+		{"emoji": "❓", "name": "question mark", "shortname": ":question:", "unicode": "2753", "html": "&#10067;", "category": "Symbols (other-symbol)", "order": "2098"},
+		{"emoji": "🔙", "name": "BACK arrow", "shortname": ":back:", "unicode": "1f519", "html": "&#128281;", "category": "Symbols (arrow)", "order": "2018"},
+		{"emoji": "👦🏿", "name": "boy: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F466 1F3FF", "html": "&#128102;&#127999;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👦🏾", "name": "boy: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F466 1F3FE", "html": "&#128102;&#127998;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👦🏽", "name": "boy: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F466 1F3FD", "html": "&#128102;&#127997;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👦🏼", "name": "boy: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F466 1F3FC", "html": "&#128102;&#127996;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👦🏻", "name": "boy: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F466 1F3FB", "html": "&#128102;&#127995;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👦", "name": "boy", "shortname": ":boy:", "unicode": "1f466", "html": "&#128102;", "category": "People & Body (person)", "order": "99"},
+		{"emoji": "🔐", "name": "locked with key", "shortname": ":closed_lock_with_key:", "unicode": "1f510", "html": "&#128272;", "category": "Objects (lock)", "order": "1947"},
+		{"emoji": "🙎🏿‍♂", "name": "man pouting: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64E 1F3FF 200D 2642", "html": "&#128590;&#127999;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏾‍♂", "name": "man pouting: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64E 1F3FE 200D 2642", "html": "&#128590;&#127998;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏽‍♂", "name": "man pouting: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64E 1F3FD 200D 2642", "html": "&#128590;&#127997;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏼‍♂", "name": "man pouting: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64E 1F3FC 200D 2642", "html": "&#128590;&#127996;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏻‍♂", "name": "man pouting: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64E 1F3FB 200D 2642", "html": "&#128590;&#127995;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎‍♂", "name": "man pouting", "shortname": ":man_pouting:", "unicode": "1F64E 200D 2642", "html": "&#128590;&zwj;&#9794;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏿", "name": "person pouting: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64E 1F3FF", "html": "&#128590;&#127999;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏾", "name": "person pouting: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64E 1F3FE", "html": "&#128590;&#127998;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏽", "name": "person pouting: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64E 1F3FD", "html": "&#128590;&#127997;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏼", "name": "person pouting: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64E 1F3FC", "html": "&#128590;&#127996;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏻", "name": "person pouting: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64E 1F3FB", "html": "&#128590;&#127995;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎", "name": "person pouting", "shortname": ":person_with_pouting_face:", "unicode": "1f64e", "html": "&#128590;", "category": "People & Body (person-gesture)", "order": "513"},
+		{"emoji": "🍊", "name": "tangerine", "shortname": ":tangerine:", "unicode": "1f34a", "html": "&#127818;", "category": "Food & Drink (food-fruit)", "order": "1452"},
+		{"emoji": "↔️", "name": "left-right arrow", "shortname": ":leftright_arrow:", "unicode": "2194 FE0F", "html": "&harr;️", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "🌅", "name": "sunrise", "shortname": ":sunrise:", "unicode": "1f305", "html": "&#127749;", "category": "Travel & Places (place-other)", "order": "1587"},
+		{"emoji": "🍗", "name": "poultry leg", "shortname": ":poultry_leg:", "unicode": "1f357", "html": "&#127831;", "category": "Food & Drink (food-prepared)", "order": "1480"},
+		{"emoji": "🔵", "name": "blue circle", "shortname": ":blue_circle:", "unicode": "1f535", "html": "&#128309;", "category": "Symbols (geometric)", "order": "2180"},
+		{"emoji": "🚘", "name": "oncoming automobile", "shortname": ":oncoming_automobile:", "unicode": "1f698", "html": "&#128664;", "category": "Travel & Places (transport-ground)", "order": "1625"},
+		{"emoji": "🍧", "name": "shaved ice", "shortname": ":shaved_ice:", "unicode": "1f367", "html": "&#127847;", "category": "Food & Drink (food-sweet)", "order": "1509"},
+		{"emoji": "🇮🇹", "name": "flag: Italy", "shortname": ":it:", "unicode": "1F1EE 1F1F9", "html": "&#127470;", "category": "Flags (country-flag)", "order": ""},
+		{"emoji": "🐦", "name": "bird", "shortname": ":bird:", "unicode": "1f426", "html": "&#128038;", "category": "Animals & Nature (animal-bird)", "order": "1393"},
+		{"emoji": "🇬🇧", "name": "flag: United Kingdom", "shortname": ":gb:", "unicode": "1F1EC 1F1E7", "html": "&#127468;", "category": "Flags (country-flag)", "order": ""},
+		{"emoji": "🌛", "name": "first quarter moon face", "shortname": ":first_quarter_moon_with_face:", "unicode": "1f31b", "html": "&#127771;", "category": "Travel & Places (sky & weather)", "order": "1721"},
+		{"emoji": "👓", "name": "glasses", "shortname": ":eyeglasses:", "unicode": "1f453", "html": "&#128083;", "category": "Objects (clothing)", "order": "1314"},
+		{"emoji": "🐐", "name": "goat", "shortname": ":goat:", "unicode": "1f410", "html": "&#128016;", "category": "Animals & Nature (animal-mammal)", "order": "1370"},
+		{"emoji": "🌃", "name": "night with stars", "shortname": ":night_with_stars:", "unicode": "1f303", "html": "&#127747;", "category": "Travel & Places (place-other)", "order": "1585"},
+		{"emoji": "👵🏿", "name": "old woman: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F475 1F3FF", "html": "&#128117;&#127999;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👵🏾", "name": "old woman: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F475 1F3FE", "html": "&#128117;&#127998;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👵🏽", "name": "old woman: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F475 1F3FD", "html": "&#128117;&#127997;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👵🏼", "name": "old woman: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F475 1F3FC", "html": "&#128117;&#127996;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👵🏻", "name": "old woman: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F475 1F3FB", "html": "&#128117;&#127995;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👵", "name": "old woman", "shortname": ":older_woman:", "unicode": "1f475", "html": "&#128117;", "category": "People & Body (person)", "order": "129"},
+		{"emoji": "⚫", "name": "black circle", "shortname": ":black_circle:", "unicode": "26ab", "html": "&#9899;", "category": "Symbols (geometric)", "order": "2178"},
+		{"emoji": "🌑", "name": "new moon", "shortname": ":new_moon:", "unicode": "1f311", "html": "&#127761;", "category": "Travel & Places (sky & weather)", "order": "1711"},
+		{"emoji": "👬", "name": "men holding hands", "shortname": ":two_men_holding_hands:", "unicode": "1f46c", "html": "&#128108;", "category": "People & Body (family)", "order": "1024"},
+		{"emoji": "⚪", "name": "white circle", "shortname": ":white_circle:", "unicode": "26aa", "html": "&#9898;", "category": "Symbols (geometric)", "order": "2177"},
+		{"emoji": "🛃", "name": "customs", "shortname": ":customs:", "unicode": "1f6c3", "html": "&#128707;", "category": "Symbols (transport-sign)", "order": "1986"},
+		{"emoji": "🐠", "name": "tropical fish", "shortname": ":tropical_fish:", "unicode": "1f420", "html": "&#128032;", "category": "Animals & Nature (animal-marine)", "order": "1410"},
+		{"emoji": "🏠", "name": "house", "shortname": ":house:", "unicode": "1f3e0", "html": "&#127968;", "category": "Travel & Places (place-building)", "order": "1559"},
+		{"emoji": "🔃", "name": "clockwise vertical arrows", "shortname": ":arrows_clockwise:", "unicode": "1f503", "html": "&#128259;", "category": "Symbols (arrow)", "order": "2016"},
+		{"emoji": "🌜", "name": "last quarter moon face", "shortname": ":last_quarter_moon_with_face:", "unicode": "1f31c", "html": "&#127772;", "category": "Travel & Places (sky & weather)", "order": "1722"},
+		{"emoji": "📍", "name": "round pushpin", "shortname": ":round_pushpin:", "unicode": "1f4cd", "html": "&#128205;", "category": "Objects (office)", "order": "1935"},
+		{"emoji": "🌕", "name": "full moon", "shortname": ":full_moon:", "unicode": "1f315", "html": "&#127765;", "category": "Travel & Places (sky & weather)", "order": "1715"},
+		{"emoji": "👟", "name": "running shoe", "shortname": ":athletic_shoe:", "unicode": "1f45f", "html": "&#128095;", "category": "Objects (clothing)", "order": "1329"},
+		{"emoji": "🍋", "name": "lemon", "shortname": ":lemon:", "unicode": "1f34b", "html": "&#127819;", "category": "Food & Drink (food-fruit)", "order": "1453"},
+		{"emoji": "🍼", "name": "baby bottle", "shortname": ":baby_bottle:", "unicode": "1f37c", "html": "&#127868;", "category": "Food & Drink (drink)", "order": "1520"},
+		{"emoji": "🎨", "name": "artist palette", "shortname": ":artist_palette:", "unicode": "1F3A8", "html": "&#127912;", "category": "Activities (arts & crafts)", "order": ""},
+		{"emoji": "✉️", "name": "envelope", "shortname": ":envelope:", "unicode": "2709 FE0F", "html": "&#9993;", "category": "Objects (mail)", "order": ""},
+		{"emoji": "🍝", "name": "spaghetti", "shortname": ":spaghetti:", "unicode": "1f35d", "html": "&#127837;", "category": "Food & Drink (food-asian)", "order": "1501"},
+		{"emoji": "🎐", "name": "wind chime", "shortname": ":wind_chime:", "unicode": "1f390", "html": "&#127888;", "category": "Activities (event)", "order": "1768"},
+		{"emoji": "🍥", "name": "fish cake with swirl", "shortname": ":fish_cake:", "unicode": "1f365", "html": "&#127845;", "category": "Food & Drink (food-asian)", "order": "1506"},
+		{"emoji": "🌲", "name": "evergreen tree", "shortname": ":evergreen_tree:", "unicode": "1f332", "html": "&#127794;", "category": "Animals & Nature (plant-other)", "order": "1438"},
+		{"emoji": "🆙", "name": "UP! button", "shortname": ":up:", "unicode": "1f199", "html": "&#127385;", "category": "Symbols (alphanum)", "order": "2140"},
+		{"emoji": "⬆️", "name": "up arrow", "shortname": ":arrow_up:", "unicode": "2b06", "html": "&#11014;", "category": "Symbols (arrow)", "order": "2002"},
+		{"emoji": "↗️", "name": "up-right arrow", "shortname": ":arrow_upper_right:", "unicode": "2197", "html": "&#8599;", "category": "Symbols (arrow)", "order": "2003"},
+		{"emoji": "↘️", "name": "down-right arrow", "shortname": ":arrow_lower_right:", "unicode": "2198", "html": "&#8600;", "category": "Symbols (arrow)", "order": "2005"},
+		{"emoji": "↙️", "name": "down-left arrow", "shortname": ":arrow_lower_left:", "unicode": "2199", "html": "&#8601;", "category": "Symbols (arrow)", "order": "2007"},
+		{"emoji": "🎭", "name": "performing arts", "shortname": ":performing_arts:", "unicode": "1f3ad", "html": "&#127917;", "category": "Activities (arts & crafts)", "order": "1598"},
+		{"emoji": "👃🏿", "name": "nose: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F443 1F3FF", "html": "&#128067;&#127999;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👃🏾", "name": "nose: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F443 1F3FE", "html": "&#128067;&#127998;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👃🏽", "name": "nose: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F443 1F3FD", "html": "&#128067;&#127997;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👃🏼", "name": "nose: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F443 1F3FC", "html": "&#128067;&#127996;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👃🏻", "name": "nose: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F443 1F3FB", "html": "&#128067;&#127995;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👃", "name": "nose", "shortname": ":nose:", "unicode": "1f443", "html": "&#128067;", "category": "People & Body (body-parts)", "order": "1272"},
+		{"emoji": "🐽", "name": "pig nose", "shortname": ":pig_nose:", "unicode": "1f43d", "html": "&#128061;", "category": "Animals & Nature (animal-mammal)", "order": "1367"},
+		{"emoji": "🐟", "name": "fish", "shortname": ":fish:", "unicode": "1f41f", "html": "&#128031;", "category": "Animals & Nature (animal-marine)", "order": "1409"},
+		{"emoji": "👳🏿‍♀", "name": "woman wearing turban: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F473 1F3FF 200D 2640", "html": "&#128115;&#127999;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏾‍♀", "name": "woman wearing turban: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F473 1F3FE 200D 2640", "html": "&#128115;&#127998;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏽‍♀", "name": "woman wearing turban: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F473 1F3FD 200D 2640", "html": "&#128115;&#127997;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏼‍♀", "name": "woman wearing turban: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F473 1F3FC 200D 2640", "html": "&#128115;&#127996;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏻‍♀", "name": "woman wearing turban: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F473 1F3FB 200D 2640", "html": "&#128115;&#127995;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳‍♀", "name": "woman wearing turban", "shortname": ":woman_wearing_turban:", "unicode": "1F473 200D 2640", "html": "&#128115;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏿", "name": "person wearing turban: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F473 1F3FF", "html": "&#128115;&#127999;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏾", "name": "person wearing turban: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F473 1F3FE", "html": "&#128115;&#127998;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏽", "name": "person wearing turban: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F473 1F3FD", "html": "&#128115;&#127997;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏼", "name": "person wearing turban: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F473 1F3FC", "html": "&#128115;&#127996;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏻", "name": "person wearing turban: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F473 1F3FB", "html": "&#128115;&#127995;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳", "name": "person wearing turban", "shortname": ":man_with_turban:", "unicode": "1f473", "html": "&#128115;", "category": "People & Body (person-role)", "order": "411"},
+		{"emoji": "🐨", "name": "koala", "shortname": ":koala:", "unicode": "1f428", "html": "&#128040;", "category": "Animals & Nature (animal-mammal)", "order": "1384"},
+		{"emoji": "👂🏿", "name": "ear: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F442 1F3FF", "html": "&#128066;&#127999;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👂🏾", "name": "ear: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F442 1F3FE", "html": "&#128066;&#127998;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👂🏽", "name": "ear: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F442 1F3FD", "html": "&#128066;&#127997;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👂🏼", "name": "ear: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F442 1F3FC", "html": "&#128066;&#127996;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👂🏻", "name": "ear: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F442 1F3FB", "html": "&#128066;&#127995;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👂", "name": "ear", "shortname": ":ear:", "unicode": "1f442", "html": "&#128066;", "category": "People & Body (body-parts)", "order": "1266"},
+		{"emoji": "✳️", "name": "eight-spoked asterisk", "shortname": ":eight_spoked_asterisk:", "unicode": "2733", "html": "&#10035;", "category": "Symbols (other-symbol)", "order": "2093"},
+		{"emoji": "🔹", "name": "small blue diamond", "shortname": ":small_blue_diamond:", "unicode": "1f539", "html": "&#128313;", "category": "Symbols (geometric)", "order": "2170"},
+		{"emoji": "🚿", "name": "shower", "shortname": ":shower:", "unicode": "1f6bf", "html": "&#128703;", "category": "Objects (household)", "order": "1672"},
+		{"emoji": "🐛", "name": "bug", "shortname": ":bug:", "unicode": "1f41b", "html": "&#128027;", "category": "Animals & Nature (animal-bug)", "order": "1420"},
+		{"emoji": "🍜", "name": "steaming bowl", "shortname": ":ramen:", "unicode": "1f35c", "html": "&#127836;", "category": "Food & Drink (food-asian)", "order": "1500"},
+		{"emoji": "🎩", "name": "top hat", "shortname": ":tophat:", "unicode": "1f3a9", "html": "&#127913;", "category": "Objects (clothing)", "order": "1335"},
+		{"emoji": "👰🏿", "name": "bride with veil: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F470 1F3FF", "html": "&#128112;&#127999;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👰🏾", "name": "bride with veil: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F470 1F3FE", "html": "&#128112;&#127998;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👰🏽", "name": "bride with veil: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F470 1F3FD", "html": "&#128112;&#127997;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👰🏼", "name": "bride with veil: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F470 1F3FC", "html": "&#128112;&#127996;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👰🏻", "name": "bride with veil: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F470 1F3FB", "html": "&#128112;&#127995;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👰", "name": "bride with veil", "shortname": ":bride_with_veil:", "unicode": "1f470", "html": "&#128112;", "category": "People & Body (person-role)", "order": "471"},
+		{"emoji": "⛽", "name": "fuel pump", "shortname": ":fuelpump:", "unicode": "26fd", "html": "&#9981;", "category": "Travel & Places (transport-ground)", "order": "1636"},
+		{"emoji": "🏁", "name": "chequered flag", "shortname": ":checkered_flag:", "unicode": "1f3c1", "html": "&#127937;", "category": "Flags (flag)", "order": "2181"},
+		{"emoji": "🐴", "name": "horse face", "shortname": ":horse:", "unicode": "1f434", "html": "&#128052;", "category": "Animals & Nature (animal-mammal)", "order": "1356"},
+		{"emoji": "⌚", "name": "watch", "shortname": ":watch:", "unicode": "231a", "html": "&#8986;", "category": "Travel & Places (time)", "order": "1682"},
+		{"emoji": "🐵", "name": "monkey face", "shortname": ":monkey_face:", "unicode": "1f435", "html": "&#128053;", "category": "Animals & Nature (animal-mammal)", "order": "1342"},
+		{"emoji": "🚼", "name": "baby symbol", "shortname": ":baby_symbol:", "unicode": "1f6bc", "html": "&#128700;", "category": "Symbols (transport-sign)", "order": "1983"},
+		{"emoji": "🆕", "name": "NEW button", "shortname": ":new:", "unicode": "1f195", "html": "&#127381;", "category": "Symbols (alphanum)", "order": "2134"},
+		{"emoji": "🆓", "name": "FREE button", "shortname": ":free:", "unicode": "1f193", "html": "&#127379;", "category": "Symbols (alphanum)", "order": "2130"},
+		{"emoji": "🎇", "name": "sparkler", "shortname": ":sparkler:", "unicode": "1f387", "html": "&#127879;", "category": "Activities (event)", "order": "1759"},
+		{"emoji": "🌽", "name": "ear of corn", "shortname": ":corn:", "unicode": "1f33d", "html": "&#127805;", "category": "Food & Drink (food-vegetable)", "order": "1468"},
+		{"emoji": "🎾", "name": "tennis", "shortname": ":tennis:", "unicode": "1f3be", "html": "&#127934;", "category": "Activities (sport)", "order": "1787"},
+		{"emoji": "⏰", "name": "alarm clock", "shortname": ":alarm_clock:", "unicode": "23f0", "html": "&#9200;", "category": "Travel & Places (time)", "order": "1683"},
+		{"emoji": "🔋", "name": "battery", "shortname": ":battery:", "unicode": "1f50b", "html": "&#128267;", "category": "Objects (computer)", "order": "1844"},
+		{"emoji": "❕", "name": "white exclamation mark", "shortname": ":grey_exclamation:", "unicode": "2755", "html": "&#10069;", "category": "Symbols (other-symbol)", "order": "2100"},
+		{"emoji": "🐺", "name": "wolf", "shortname": ":wolf:", "unicode": "1f43a", "html": "&#128058;", "category": "Animals & Nature (animal-mammal)", "order": "1348"},
+		{"emoji": "🗿", "name": "moai", "shortname": ":moyai:", "unicode": "1f5ff", "html": "&#128511;", "category": "Objects (other-object)", "order": "1972"},
+		{"emoji": "🐮", "name": "cow face", "shortname": ":cow:", "unicode": "1f42e", "html": "&#128046;", "category": "Animals & Nature (animal-mammal)", "order": "1360"},
+		{"emoji": "📣", "name": "megaphone", "shortname": ":mega:", "unicode": "1f4e3", "html": "&#128227;", "category": "Objects (sound)", "order": "1819"},
+		{"emoji": "👴🏿", "name": "old man: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F474 1F3FF", "html": "&#128116;&#127999;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👴🏾", "name": "old man: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F474 1F3FE", "html": "&#128116;&#127998;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👴🏽", "name": "old man: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F474 1F3FD", "html": "&#128116;&#127997;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👴🏼", "name": "old man: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F474 1F3FC", "html": "&#128116;&#127996;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👴🏻", "name": "old man: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F474 1F3FB", "html": "&#128116;&#127995;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👴", "name": "old man", "shortname": ":older_man:", "unicode": "1f474", "html": "&#128116;", "category": "People & Body (person)", "order": "123"},
+		{"emoji": "👗", "name": "dress", "shortname": ":dress:", "unicode": "1f457", "html": "&#128087;", "category": "Objects (clothing)", "order": "1319"},
+		{"emoji": "🔗", "name": "link", "shortname": ":link:", "unicode": "1f517", "html": "&#128279;", "category": "Objects (tool)", "order": "1965"},
+		{"emoji": "🐔", "name": "chicken", "shortname": ":chicken:", "unicode": "1f414", "html": "&#128020;", "category": "Animals & Nature (animal-bird)", "order": "1388"},
+		{"emoji": "🍳", "name": "cooking", "shortname": ":cooking:", "unicode": "1F373", "html": "&#127859;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🐋", "name": "whale", "shortname": ":whale2:", "unicode": "1f40b", "html": "&#128011;", "category": "Animals & Nature (animal-marine)", "order": "1407"},
+		{"emoji": "↖", "name": "up-left arrow", "shortname": ":arrow_upper_left:", "unicode": "2196", "html": "&#8598;", "category": "Symbols (arrow)", "order": "2009"},
+		{"emoji": "🌳", "name": "deciduous tree", "shortname": ":deciduous_tree:", "unicode": "1f333", "html": "&#127795;", "category": "Animals & Nature (plant-other)", "order": "1439"},
+		{"emoji": "🍱", "name": "bento box", "shortname": ":bento:", "unicode": "1f371", "html": "&#127857;", "category": "Food & Drink (food-asian)", "order": "1495"},
+		{"emoji": "📌", "name": "pushpin", "shortname": ":pushpin:", "unicode": "1f4cc", "html": "&#128204;", "category": "Objects (office)", "order": "1934"},
+		{"emoji": "🔜", "name": "SOON arrow", "shortname": ":soon:", "unicode": "1f51c", "html": "&#128284;", "category": "Symbols (arrow)", "order": "2021"},
+		{"emoji": "🔁", "name": "repeat button", "shortname": ":repeat:", "unicode": "1f501", "html": "&#128257;", "category": "Symbols (av-symbol)", "order": "2049"},
+		{"emoji": "🐉", "name": "dragon", "shortname": ":dragon:", "unicode": "1f409", "html": "&#128009;", "category": "Animals & Nature (animal-reptile)", "order": "1405"},
+		{"emoji": "🐹", "name": "hamster", "shortname": ":hamster:", "unicode": "1f439", "html": "&#128057;", "category": "Animals & Nature (animal-mammal)", "order": "1378"},
+		{"emoji": "⛳", "name": "flag in hole", "shortname": ":golf:", "unicode": "26f3", "html": "&#9971;", "category": "Activities (sport)", "order": "1799"},
+		{"emoji": "🏄🏿‍♀", "name": "woman surfing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C4 1F3FF 200D 2640", "html": "&#127940;&#127999;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏾‍♀", "name": "woman surfing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C4 1F3FE 200D 2640", "html": "&#127940;&#127998;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏽‍♀", "name": "woman surfing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C4 1F3FD 200D 2640", "html": "&#127940;&#127997;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏼‍♀", "name": "woman surfing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C4 1F3FC 200D 2640", "html": "&#127940;&#127996;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏻‍♀", "name": "woman surfing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C4 1F3FB 200D 2640", "html": "&#127940;&#127995;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄‍♀", "name": "woman surfing", "shortname": ":woman_surfing:", "unicode": "1F3C4 200D 2640", "html": "&#127940;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏿", "name": "person surfing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C4 1F3FF", "html": "&#127940;&#127999;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏾", "name": "person surfing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C4 1F3FE", "html": "&#127940;&#127998;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏽", "name": "person surfing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C4 1F3FD", "html": "&#127940;&#127997;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏼", "name": "person surfing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C4 1F3FC", "html": "&#127940;&#127996;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏻", "name": "person surfing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C4 1F3FB", "html": "&#127940;&#127995;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄", "name": "person surfing", "shortname": ":surfer:", "unicode": "1f3c4", "html": "&#127940;", "category": "People & Body (person-sport)", "order": "800"},
+		{"emoji": "🐭", "name": "mouse face", "shortname": ":mouse:", "unicode": "1f42d", "html": "&#128045;", "category": "Animals & Nature (animal-mammal)", "order": "1375"},
+		{"emoji": "🌒", "name": "waxing crescent moon", "shortname": ":waxing_crescent_moon:", "unicode": "1f312", "html": "&#127762;", "category": "Travel & Places (sky & weather)", "order": "1712"},
+		{"emoji": "🚙", "name": "sport utility vehicle", "shortname": ":blue_car:", "unicode": "1f699", "html": "&#128665;", "category": "Travel & Places (transport-ground)", "order": "1626"},
+		{"emoji": "🅰️", "name": "A button (blood type)", "shortname": ":a:", "unicode": "1f170", "html": "&#127344;", "category": "Symbols (alphanum)", "order": "2125"},
+		{"emoji": "⁉️", "name": "exclamation question mark", "shortname": ":interrobang:", "unicode": "2049", "html": "&#8265;", "category": "Symbols (other-symbol)", "order": "2097"},
+		{"emoji": "🈹", "name": "Japanese discount button", "shortname": ":u5272:", "unicode": "1f239", "html": "&#127545;", "category": "Symbols (alphanum)", "order": "2148"},
+		{"emoji": "🔌", "name": "electric plug", "shortname": ":electric_plug:", "unicode": "1f50c", "html": "&#128268;", "category": "Objects (computer)", "order": "1845"},
+		{"emoji": "🌓", "name": "first quarter moon", "shortname": ":first_quarter_moon:", "unicode": "1f313", "html": "&#127763;", "category": "Travel & Places (sky & weather)", "order": "1713"},
+		{"emoji": "♋", "name": "Cancer", "shortname": ":cancer:", "unicode": "264b", "html": "&#9803;", "category": "Symbols (zodiac)", "order": "2038"},
+		{"emoji": "🔱", "name": "trident emblem", "shortname": ":trident:", "unicode": "1f531", "html": "&#128305;", "category": "Symbols (other-symbol)", "order": "2076"},
+		{"emoji": "🍞", "name": "bread", "shortname": ":bread:", "unicode": "1f35e", "html": "&#127838;", "category": "Food & Drink (food-prepared)", "order": "1474"},
+		{"emoji": "👮🏿‍♀", "name": "woman police officer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F46E 1F3FF 200D 2640", "html": "&#128110;&#127999;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏾‍♀", "name": "woman police officer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F46E 1F3FE 200D 2640", "html": "&#128110;&#127998;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏽‍♀", "name": "woman police officer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F46E 1F3FD 200D 2640", "html": "&#128110;&#127997;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏼‍♀", "name": "woman police officer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F46E 1F3FC 200D 2640", "html": "&#128110;&#127996;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏻‍♀", "name": "woman police officer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F46E 1F3FB 200D 2640", "html": "&#128110;&#127995;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮‍♀", "name": "woman police officer", "shortname": ":woman_police_officer:", "unicode": "1F46E 200D 2640", "html": "&#128110;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏿", "name": "police officer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F46E 1F3FF", "html": "&#128110;&#127999;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏾", "name": "police officer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F46E 1F3FE", "html": "&#128110;&#127998;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏽", "name": "police officer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F46E 1F3FD", "html": "&#128110;&#127997;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏼", "name": "police officer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F46E 1F3FC", "html": "&#128110;&#127996;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏻", "name": "police officer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F46E 1F3FB", "html": "&#128110;&#127995;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮", "name": "police officer", "shortname": ":cop:", "unicode": "1f46e", "html": "&#128110;", "category": "People & Body (person-role)", "order": "339"},
+		{"emoji": "🍵", "name": "teacup without handle", "shortname": ":tea:", "unicode": "1f375", "html": "&#127861;", "category": "Food & Drink (drink)", "order": "1523"},
+		{"emoji": "🎣", "name": "fishing pole", "shortname": ":fishing_pole_and_fish:", "unicode": "1f3a3", "html": "&#127907;", "category": "Activities (sport)", "order": "1801"},
+		{"emoji": "🌔", "name": "waxing gibbous moon", "shortname": ":waxing_gibbous_moon:", "unicode": "1F314", "html": "&#127764;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🚲", "name": "bicycle", "shortname": ":bike:", "unicode": "1f6b2", "html": "&#128690;", "category": "Travel & Places (transport-ground)", "order": "1630"},
+		{"emoji": "👤", "name": "bust in silhouette", "shortname": ":bust_in_silhouette:", "unicode": "1F464", "html": "&#128100;", "category": "People & Body (person-symbol)", "order": ""},
+		{"emoji": "🍚", "name": "cooked rice", "shortname": ":rice:", "unicode": "1f35a", "html": "&#127834;", "category": "Food & Drink (food-asian)", "order": "1498"},
+		{"emoji": "📻", "name": "radio", "shortname": ":radio:", "unicode": "1f4fb", "html": "&#128251;", "category": "Objects (music)", "order": "1831"},
+		{"emoji": "🐤", "name": "baby chick", "shortname": ":baby_chick:", "unicode": "1f424", "html": "&#128036;", "category": "Animals & Nature (animal-bird)", "order": "1391"},
+		{"emoji": "⤵️", "name": "right arrow curving down", "shortname": ":arrow_heading_down:", "unicode": "2935", "html": "&#10549;", "category": "Symbols (arrow)", "order": "2015"},
+		{"emoji": "🌘", "name": "waning crescent moon", "shortname": ":waning_crescent_moon:", "unicode": "1f318", "html": "&#127768;", "category": "Travel & Places (sky & weather)", "order": "1718"},
+		{"emoji": "↕", "name": "up-down arrow", "shortname": ":arrow_up_down:", "unicode": "2195", "html": "&#8597;", "category": "Symbols (arrow)", "order": "2010"},
+		{"emoji": "🇪", "name": "", "shortname": "", "unicode": "", "html": "&#127466;", "category": "", "order": ""},
+		{"emoji": "🌗", "name": "last quarter moon", "shortname": ":last_quarter_moon:", "unicode": "1f317", "html": "&#127767;", "category": "Travel & Places (sky & weather)", "order": "1717"},
+		{"emoji": "🔘", "name": "radio button", "shortname": ":radio_button:", "unicode": "1f518", "html": "&#128280;", "category": "Symbols (geometric)", "order": "2174"},
+		{"emoji": "🐑", "name": "ewe", "shortname": ":sheep:", "unicode": "1f411", "html": "&#128017;", "category": "Animals & Nature (animal-mammal)", "order": "1369"},
+		{"emoji": "👱🏿‍♀", "name": "woman: dark skin tone, blond hair", "shortname": ":dark_skin_tone_blond_hair:", "unicode": "1F471 1F3FF 200D 2640", "html": "&#128113;&#127999;&zwj;&#9792;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏾‍♀", "name": "woman: medium-dark skin tone, blond hair", "shortname": ":mediumdark_skin_tone_blond_hair:", "unicode": "1F471 1F3FE 200D 2640", "html": "&#128113;&#127998;&zwj;&#9792;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏽‍♀", "name": "woman: medium skin tone, blond hair", "shortname": ":medium_skin_tone_blond_hair:", "unicode": "1F471 1F3FD 200D 2640", "html": "&#128113;&#127997;&zwj;&#9792;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏼‍♀", "name": "woman: medium-light skin tone, blond hair", "shortname": ":mediumlight_skin_tone_blond_hair:", "unicode": "1F471 1F3FC 200D 2640", "html": "&#128113;&#127996;&zwj;&#9792;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏻‍♀", "name": "woman: light skin tone, blond hair", "shortname": ":light_skin_tone_blond_hair:", "unicode": "1F471 1F3FB 200D 2640", "html": "&#128113;&#127995;&zwj;&#9792;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱‍♀", "name": "woman: blond hair", "shortname": ":blond_hair:", "unicode": "1F471 200D 2640", "html": "&#128113;&zwj;&#9792;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏿", "name": "person: dark skin tone, blond hair", "shortname": ":dark_skin_tone_blond_hair:", "unicode": "1F471 1F3FF", "html": "&#128113;&#127999;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏾", "name": "person: medium-dark skin tone, blond hair", "shortname": ":mediumdark_skin_tone_blond_hair:", "unicode": "1F471 1F3FE", "html": "&#128113;&#127998;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏽", "name": "person: medium skin tone, blond hair", "shortname": ":medium_skin_tone_blond_hair:", "unicode": "1F471 1F3FD", "html": "&#128113;&#127997;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏼", "name": "person: medium-light skin tone, blond hair", "shortname": ":mediumlight_skin_tone_blond_hair:", "unicode": "1F471 1F3FC", "html": "&#128113;&#127996;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏻", "name": "person: light skin tone, blond hair", "shortname": ":light_skin_tone_blond_hair:", "unicode": "1F471 1F3FB", "html": "&#128113;&#127995;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱", "name": "person: blond hair", "shortname": ":person_with_blond_hair:", "unicode": "1f471", "html": "&#128113;", "category": "People & Body (person)", "order": "429"},
+		{"emoji": "🌖", "name": "waning gibbous moon", "shortname": ":waning_gibbous_moon:", "unicode": "1f316", "html": "&#127766;", "category": "Travel & Places (sky & weather)", "order": "1716"},
+		{"emoji": "🔒", "name": "locked", "shortname": ":lock:", "unicode": "1f512", "html": "&#128274;", "category": "Objects (lock)", "order": "1944"},
+		{"emoji": "🍏", "name": "green apple", "shortname": ":green_apple:", "unicode": "1f34f", "html": "&#127823;", "category": "Food & Drink (food-fruit)", "order": "1457"},
+		{"emoji": "👺", "name": "goblin", "shortname": ":japanese_goblin:", "unicode": "1f47a", "html": "&#128122;", "category": "Smileys & Emotion (face-costume)", "order": "79"},
+		{"emoji": "➰", "name": "curly loop", "shortname": ":curly_loop:", "unicode": "27b0", "html": "&#10160;", "category": "Symbols (other-symbol)", "order": "2090"},
+		{"emoji": "🚩", "name": "triangular flag", "shortname": ":triangular_flag_on_post:", "unicode": "1f6a9", "html": "&#128681;", "category": "Flags (flag)", "order": "2182"},
+		{"emoji": "🔄", "name": "counterclockwise arrows button", "shortname": ":arrows_counterclockwise:", "unicode": "1f504", "html": "&#128260;", "category": "Symbols (arrow)", "order": "2017"},
+		{"emoji": "🐎", "name": "horse", "shortname": ":racehorse:", "unicode": "1f40e", "html": "&#128014;", "category": "Animals & Nature (animal-mammal)", "order": "1357"},
+		{"emoji": "🍤", "name": "fried shrimp", "shortname": ":fried_shrimp:", "unicode": "1f364", "html": "&#127844;", "category": "Food & Drink (food-asian)", "order": "1505"},
+		{"emoji": "🌄", "name": "sunrise over mountains", "shortname": ":sunrise_over_mountains:", "unicode": "1f304", "html": "&#127748;", "category": "Travel & Places (place-other)", "order": "1586"},
+		{"emoji": "🌋", "name": "volcano", "shortname": ":volcano:", "unicode": "1f30b", "html": "&#127755;", "category": "Travel & Places (place-geographic)", "order": "1546"},
+		{"emoji": "🐓", "name": "rooster", "shortname": ":rooster:", "unicode": "1f413", "html": "&#128019;", "category": "Animals & Nature (animal-bird)", "order": "1389"},
+		{"emoji": "📥", "name": "inbox tray", "shortname": ":inbox_tray:", "unicode": "1f4e5", "html": "&#128229;", "category": "Objects (mail)", "order": "1906"},
+		{"emoji": "💒", "name": "wedding", "shortname": ":wedding:", "unicode": "1f492", "html": "&#128146;", "category": "Travel & Places (place-building)", "order": "1574"},
+		{"emoji": "🍣", "name": "sushi", "shortname": ":sushi:", "unicode": "1f363", "html": "&#127843;", "category": "Food & Drink (food-asian)", "order": "1504"},
+		{"emoji": "〰", "name": "wavy dash", "shortname": ":wavy_dash:", "unicode": "3030", "html": "&#12336;", "category": "Symbols (other-symbol)", "order": "2102"},
+		{"emoji": "🍨", "name": "ice cream", "shortname": ":ice_cream:", "unicode": "1f368", "html": "&#127848;", "category": "Food & Drink (food-sweet)", "order": "1510"},
+		{"emoji": "⏪", "name": "fast reverse button", "shortname": ":rewind:", "unicode": "23ea", "html": "&#9194;", "category": "Symbols (av-symbol)", "order": "2056"},
+		{"emoji": "🍅", "name": "tomato", "shortname": ":tomato:", "unicode": "1f345", "html": "&#127813;", "category": "Food & Drink (food-fruit)", "order": "1463"},
+		{"emoji": "🐇", "name": "rabbit", "shortname": ":rabbit2:", "unicode": "1f407", "html": "&#128007;", "category": "Animals & Nature (animal-mammal)", "order": "1380"},
+		{"emoji": "✴️", "name": "eight-pointed star", "shortname": ":eight_pointed_black_star:", "unicode": "2734", "html": "&#10036;", "category": "Symbols (other-symbol)", "order": "2094"},
+		{"emoji": "🔺", "name": "red triangle pointed up", "shortname": ":small_red_triangle:", "unicode": "1f53a", "html": "&#128314;", "category": "Symbols (geometric)", "order": "2171"},
+		{"emoji": "🔆", "name": "bright button", "shortname": ":high_brightness:", "unicode": "1f506", "html": "&#128262;", "category": "Symbols (av-symbol)", "order": "2068"},
+		{"emoji": "➕", "name": "plus sign", "shortname": ":heavy_plus_sign:", "unicode": "2795", "html": "&#10133;", "category": "Symbols (other-symbol)", "order": "2084"},
+		{"emoji": "👲🏿", "name": "man with skullcap: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F472 1F3FF", "html": "&#128114;&#127999;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👲🏾", "name": "man with skullcap: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F472 1F3FE", "html": "&#128114;&#127998;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👲🏽", "name": "man with skullcap: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F472 1F3FD", "html": "&#128114;&#127997;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👲🏼", "name": "man with skullcap: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F472 1F3FC", "html": "&#128114;&#127996;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👲🏻", "name": "man with skullcap: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F472 1F3FB", "html": "&#128114;&#127995;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👲", "name": "man with skullcap", "shortname": ":man_with_gua_pi_mao:", "unicode": "1f472", "html": "&#128114;", "category": "People & Body (person-role)", "order": "489"},
+		{"emoji": "🏪", "name": "convenience store", "shortname": ":convenience_store:", "unicode": "1f3ea", "html": "&#127978;", "category": "Travel & Places (place-building)", "order": "1568"},
+		{"emoji": "👥", "name": "busts in silhouette", "shortname": ":busts_in_silhouette:", "unicode": "1f465", "html": "&#128101;", "category": "People & Body (person-symbol)", "order": "767"},
+		{"emoji": "🐞", "name": "lady beetle", "shortname": ":beetle:", "unicode": "1f41e", "html": "&#128030;", "category": "Animals & Nature (animal-bug)", "order": "1423"},
+		{"emoji": "🔻", "name": "red triangle pointed down", "shortname": ":small_red_triangle_down:", "unicode": "1f53b", "html": "&#128315;", "category": "Symbols (geometric)", "order": "2172"},
+		{"emoji": "🇩🇪", "name": "flag: Germany", "shortname": ":ger:", "unicode": "1F1E9 1F1EA", "html": "&#127465;", "category": "Flags (country-flag)", "order": ""},
+		{"emoji": "⤴️", "name": "right arrow curving up", "shortname": ":arrow_heading_up:", "unicode": "2934", "html": "&#10548;", "category": "Symbols (arrow)", "order": "2014"},
+		{"emoji": "📛", "name": "name badge", "shortname": ":name_badge:", "unicode": "1f4db", "html": "&#128219;", "category": "Symbols (other-symbol)", "order": "2073"},
+		{"emoji": "🛀🏿", "name": "person taking bath: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6C0 1F3FF", "html": "&#128704;&#127999;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🛀🏾", "name": "person taking bath: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6C0 1F3FE", "html": "&#128704;&#127998;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🛀🏽", "name": "person taking bath: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6C0 1F3FD", "html": "&#128704;&#127997;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🛀🏼", "name": "person taking bath: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6C0 1F3FC", "html": "&#128704;&#127996;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🛀🏻", "name": "person taking bath: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6C0 1F3FB", "html": "&#128704;&#127995;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🛀", "name": "person taking bath", "shortname": ":bath:", "unicode": "1f6c0", "html": "&#128704;", "category": "People & Body (person-resting)", "order": "1673"},
+		{"emoji": "⛔", "name": "no entry", "shortname": ":no_entry:", "unicode": "26d4", "html": "&#9940;", "category": "Symbols (warning)", "order": "1991"},
+		{"emoji": "🐊", "name": "crocodile", "shortname": ":crocodile:", "unicode": "1f40a", "html": "&#128010;", "category": "Animals & Nature (animal-reptile)", "order": "1400"},
+		{"emoji": "🌰", "name": "chestnut", "shortname": ":chestnut:", "unicode": "1F330", "html": "&#127792;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🐕", "name": "dog", "shortname": ":dog2:", "unicode": "1f415", "html": "&#128021;", "category": "Animals & Nature (animal-mammal)", "order": "1346"},
+		{"emoji": "🐈", "name": "cat", "shortname": ":cat2:", "unicode": "1f408", "html": "&#128008;", "category": "Animals & Nature (animal-mammal)", "order": "1351"},
+		{"emoji": "🔨", "name": "hammer", "shortname": ":hammer:", "unicode": "1f528", "html": "&#128296;", "category": "Objects (tool)", "order": "1950"},
+		{"emoji": "🍖", "name": "meat on bone", "shortname": ":meat_on_bone:", "unicode": "1f356", "html": "&#127830;", "category": "Food & Drink (food-prepared)", "order": "1479"},
+		{"emoji": "🐚", "name": "spiral shell", "shortname": ":shell:", "unicode": "1f41a", "html": "&#128026;", "category": "Animals & Nature (animal-marine)", "order": "1414"},
+		{"emoji": "❇️", "name": "sparkle", "shortname": ":sparkle:", "unicode": "2747", "html": "&#10055;", "category": "Symbols (other-symbol)", "order": "2095"},
+		{"emoji": "⛵", "name": "sailboat", "shortname": ":sailboat:", "unicode": "26F5", "html": "&#9973;", "category": "Travel & Places (transport-water)", "order": ""},
+		{"emoji": "🅱️", "name": "B button (blood type)", "shortname": ":b:", "unicode": "1f171", "html": "&#127345;", "category": "Symbols (alphanum)", "order": "2127"},
+		{"emoji": "Ⓜ️", "name": "circled M", "shortname": ":m:", "unicode": "24c2", "html": "&#9410;", "category": "Symbols (alphanum)", "order": "2133"},
+		{"emoji": "🐩", "name": "poodle", "shortname": ":poodle:", "unicode": "1f429", "html": "&#128041;", "category": "Animals & Nature (animal-mammal)", "order": "1347"},
+		{"emoji": "♒", "name": "Aquarius", "shortname": ":aquarius:", "unicode": "2652", "html": "&#9810;", "category": "Symbols (zodiac)", "order": "2045"},
+		{"emoji": "🍲", "name": "pot of food", "shortname": ":stew:", "unicode": "1f372", "html": "&#127858;", "category": "Food & Drink (food-prepared)", "order": "1492"},
+		{"emoji": "👖", "name": "jeans", "shortname": ":jeans:", "unicode": "1f456", "html": "&#128086;", "category": "Objects (clothing)", "order": "1318"},
+		{"emoji": "🍯", "name": "honey pot", "shortname": ":honey_pot:", "unicode": "1f36f", "html": "&#127855;", "category": "Food & Drink (food-sweet)", "order": "1519"},
+		{"emoji": "🎹", "name": "musical keyboard", "shortname": ":musical_keyboard:", "unicode": "1f3b9", "html": "&#127929;", "category": "Objects (musical-instrument)", "order": "1834"},
+		{"emoji": "🔓", "name": "unlocked", "shortname": ":unlock:", "unicode": "1f513", "html": "&#128275;", "category": "Objects (lock)", "order": "1945"},
+		{"emoji": "✒", "name": "black nib", "shortname": ":black_nib:", "unicode": "2712", "html": "&#10002;", "category": "Objects (writing)", "order": "1915"},
+		{"emoji": "🗽", "name": "Statue of Liberty", "shortname": ":statue_of_liberty:", "unicode": "1f5fd", "html": "&#128509;", "category": "Travel & Places (place-building)", "order": "1576"},
+		{"emoji": "💲", "name": "heavy dollar sign", "shortname": ":heavy_dollar_sign:", "unicode": "1f4b2", "html": "&#128178;", "category": "Objects (money)", "order": "1900"},
+		{"emoji": "🏂", "name": "snowboarder", "shortname": ":snowboarder:", "unicode": "1f3c2", "html": "&#127938;", "category": "People & Body (person-sport)", "order": "776"},
+		{"emoji": "💮", "name": "white flower", "shortname": ":white_flower:", "unicode": "1f4ae", "html": "&#128174;", "category": "Animals & Nature (plant-flower)", "order": "1429"},
+		{"emoji": "👔", "name": "necktie", "shortname": ":necktie:", "unicode": "1f454", "html": "&#128084;", "category": "Objects (clothing)", "order": "1316"},
+		{"emoji": "💠", "name": "diamond with a dot", "shortname": ":diamond_shape_with_a_dot_inside:", "unicode": "1f4a0", "html": "&#128160;", "category": "Symbols (geometric)", "order": "2173"},
+		{"emoji": "♈", "name": "Aries", "shortname": ":aries:", "unicode": "2648", "html": "&#9800;", "category": "Symbols (zodiac)", "order": "2035"},
+		{"emoji": "🚺", "name": "women’s room", "shortname": ":womens:", "unicode": "1f6ba", "html": "&#128698;", "category": "Symbols (transport-sign)", "order": "1981"},
+		{"emoji": "🐜", "name": "ant", "shortname": ":ant:", "unicode": "1f41c", "html": "&#128028;", "category": "Animals & Nature (animal-bug)", "order": "1421"},
+		{"emoji": "♏", "name": "Scorpio", "shortname": ":scorpius:", "unicode": "264f", "html": "&#9807;", "category": "Symbols (zodiac)", "order": "2042"},
+		{"emoji": "🌇", "name": "sunset", "shortname": ":city_sunset:", "unicode": "1f307", "html": "&#127751;", "category": "Travel & Places (place-other)", "order": "1589"},
+		{"emoji": "⏳", "name": "hourglass not done", "shortname": ":hourglass_flowing_sand:", "unicode": "23f3", "html": "&#9203;", "category": "Travel & Places (time)", "order": "1681"},
+		{"emoji": "🅾️", "name": "O button (blood type)", "shortname": ":o2:", "unicode": "1f17e", "html": "&#127358;", "category": "Symbols (alphanum)", "order": "2136"},
+		{"emoji": "🐲", "name": "dragon face", "shortname": ":dragon_face:", "unicode": "1f432", "html": "&#128050;", "category": "Animals & Nature (animal-reptile)", "order": "1404"},
+		{"emoji": "🐌", "name": "snail", "shortname": ":snail:", "unicode": "1f40c", "html": "&#128012;", "category": "Animals & Nature (animal-bug)", "order": "1419"},
+		{"emoji": "📀", "name": "dvd", "shortname": ":dvd:", "unicode": "1f4c0", "html": "&#128192;", "category": "Objects (computer)", "order": "1855"},
+		{"emoji": "👕", "name": "t-shirt", "shortname": ":shirt:", "unicode": "1f455", "html": "&#128085;", "category": "Objects (clothing)", "order": "1317"},
+		{"emoji": "🎲", "name": "game die", "shortname": ":game_die:", "unicode": "1f3b2", "html": "&#127922;", "category": "Activities (game)", "order": "1806"},
+		{"emoji": "➖", "name": "minus sign", "shortname": ":heavy_minus_sign:", "unicode": "2796", "html": "&#10134;", "category": "Symbols (other-symbol)", "order": "2088"},
+		{"emoji": "🎎", "name": "Japanese dolls", "shortname": ":dolls:", "unicode": "1f38e", "html": "&#127886;", "category": "Activities (event)", "order": "1766"},
+		{"emoji": "♐", "name": "Sagittarius", "shortname": ":sagittarius:", "unicode": "2650", "html": "&#9808;", "category": "Symbols (zodiac)", "order": "2043"},
+		{"emoji": "🎱", "name": "pool 8 ball", "shortname": ":8ball:", "unicode": "1f3b1", "html": "&#127921;", "category": "Activities (game)", "order": "1788"},
+		{"emoji": "🚌", "name": "bus", "shortname": ":bus:", "unicode": "1f68c", "html": "&#128652;", "category": "Travel & Places (transport-ground)", "order": "1614"},
+		{"emoji": "🍮", "name": "custard", "shortname": ":custard:", "unicode": "1f36e", "html": "&#127854;", "category": "Food & Drink (food-sweet)", "order": "1518"},
+		{"emoji": "🎌", "name": "crossed flags", "shortname": ":crossed_flags:", "unicode": "1f38c", "html": "&#127884;", "category": "Flags (flag)", "order": "2183"},
+		{"emoji": "〽️", "name": "part alternation mark", "shortname": ":part_alternation_mark:", "unicode": "303d", "html": "&#12349;", "category": "Symbols (other-symbol)", "order": "2092"},
+		{"emoji": "🐫", "name": "two-hump camel", "shortname": ":camel:", "unicode": "1f42b", "html": "&#128043;", "category": "Animals & Nature (animal-mammal)", "order": "1372"},
+		{"emoji": "🍛", "name": "curry rice", "shortname": ":curry:", "unicode": "1f35b", "html": "&#127835;", "category": "Food & Drink (food-asian)", "order": "1499"},
+		{"emoji": "🚂", "name": "locomotive", "shortname": ":steam_locomotive:", "unicode": "1f682", "html": "&#128642;", "category": "Travel & Places (transport-ground)", "order": "1602"},
+		{"emoji": "🏥", "name": "hospital", "shortname": ":hospital:", "unicode": "1f3e5", "html": "&#127973;", "category": "Travel & Places (place-building)", "order": "1564"},
+		{"emoji": "🇯🇵", "name": "flag: Japan", "shortname": ":jp:", "unicode": "1F1EF 1F1F5", "html": "&#127471;", "category": "Flags (country-flag)", "order": ""},
+		{"emoji": "🔷", "name": "large blue diamond", "shortname": ":large_blue_diamond:", "unicode": "1f537", "html": "&#128311;", "category": "Symbols (geometric)", "order": "2168"},
+		{"emoji": "🎋", "name": "tanabata tree", "shortname": ":tanabata_tree:", "unicode": "1f38b", "html": "&#127883;", "category": "Activities (event)", "order": "1764"},
+		{"emoji": "🔔", "name": "bell", "shortname": ":bell:", "unicode": "1f514", "html": "&#128276;", "category": "Objects (sound)", "order": "1821"},
+		{"emoji": "♌", "name": "Leo", "shortname": ":leo:", "unicode": "264c", "html": "&#9804;", "category": "Symbols (zodiac)", "order": "2039"},
+		{"emoji": "♊", "name": "Gemini", "shortname": ":gemini:", "unicode": "264a", "html": "&#9802;", "category": "Symbols (zodiac)", "order": "2037"},
+		{"emoji": "🍐", "name": "pear", "shortname": ":pear:", "unicode": "1f350", "html": "&#127824;", "category": "Food & Drink (food-fruit)", "order": "1458"},
+		{"emoji": "🔶", "name": "large orange diamond", "shortname": ":large_orange_diamond:", "unicode": "1f536", "html": "&#128310;", "category": "Symbols (geometric)", "order": "2167"},
+		{"emoji": "♉", "name": "Taurus", "shortname": ":taurus:", "unicode": "2649", "html": "&#9801;", "category": "Symbols (zodiac)", "order": "2036"},
+		{"emoji": "🌐", "name": "globe with meridians", "shortname": ":globe_with_meridians:", "unicode": "1f310", "html": "&#127760;", "category": "Travel & Places (place-map)", "order": "1541"},
+		{"emoji": "🚪", "name": "door", "shortname": ":door:", "unicode": "1f6aa", "html": "&#128682;", "category": "Objects (household)", "order": "1662"},
+		{"emoji": "🕕", "name": "six o’clock", "shortname": ":clock6:", "unicode": "1f555", "html": "&#128341;", "category": "Travel & Places (time)", "order": "1699"},
+		{"emoji": "🚔", "name": "oncoming police car", "shortname": ":oncoming_police_car:", "unicode": "1f694", "html": "&#128660;", "category": "Travel & Places (transport-ground)", "order": "1621"},
+		{"emoji": "📩", "name": "envelope with arrow", "shortname": ":envelope_with_arrow:", "unicode": "1f4e9", "html": "&#128233;", "category": "Objects (mail)", "order": "1904"},
+		{"emoji": "🌂", "name": "closed umbrella", "shortname": ":closed_umbrella:", "unicode": "1f302", "html": "&#127746;", "category": "Travel & Places (sky & weather)", "order": "1744"},
+		{"emoji": "🎷", "name": "saxophone", "shortname": ":saxophone:", "unicode": "1f3b7", "html": "&#127927;", "category": "Objects (musical-instrument)", "order": "1832"},
+		{"emoji": "⛪", "name": "church", "shortname": ":church:", "unicode": "26ea", "html": "&#9962;", "category": "Travel & Places (place-religious)", "order": "1577"},
+		{"emoji": "🚴🏿‍♀", "name": "woman biking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B4 1F3FF 200D 2640", "html": "&#128692;&#127999;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏾‍♀", "name": "woman biking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B4 1F3FE 200D 2640", "html": "&#128692;&#127998;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏽‍♀", "name": "woman biking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B4 1F3FD 200D 2640", "html": "&#128692;&#127997;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏼‍♀", "name": "woman biking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B4 1F3FC 200D 2640", "html": "&#128692;&#127996;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏻‍♀", "name": "woman biking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B4 1F3FB 200D 2640", "html": "&#128692;&#127995;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴‍♀", "name": "woman biking", "shortname": ":woman_biking:", "unicode": "1F6B4 200D 2640", "html": "&#128692;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏿", "name": "person biking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B4 1F3FF", "html": "&#128692;&#127999;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏾", "name": "person biking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B4 1F3FE", "html": "&#128692;&#127998;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏽", "name": "person biking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B4 1F3FD", "html": "&#128692;&#127997;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏼", "name": "person biking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B4 1F3FC", "html": "&#128692;&#127996;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏻", "name": "person biking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B4 1F3FB", "html": "&#128692;&#127995;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴", "name": "person biking", "shortname": ":bicyclist:", "unicode": "1f6b4", "html": "&#128692;", "category": "People & Body (person-sport)", "order": "890"},
+		{"emoji": "♓", "name": "Pisces", "shortname": ":pisces:", "unicode": "2653", "html": "&#9811;", "category": "Symbols (zodiac)", "order": "2046"},
+		{"emoji": "🍡", "name": "dango", "shortname": ":dango:", "unicode": "1f361", "html": "&#127841;", "category": "Food & Drink (food-asian)", "order": "1507"},
+		{"emoji": "♑", "name": "Capricorn", "shortname": ":capricorn:", "unicode": "2651", "html": "&#9809;", "category": "Symbols (zodiac)", "order": "2044"},
+		{"emoji": "🏢", "name": "office building", "shortname": ":office:", "unicode": "1f3e2", "html": "&#127970;", "category": "Travel & Places (place-building)", "order": "1561"},
+		{"emoji": "🚣🏿‍♀", "name": "woman rowing boat: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6A3 1F3FF 200D 2640", "html": "&#128675;&#127999;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏾‍♀", "name": "woman rowing boat: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6A3 1F3FE 200D 2640", "html": "&#128675;&#127998;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏽‍♀", "name": "woman rowing boat: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6A3 1F3FD 200D 2640", "html": "&#128675;&#127997;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏼‍♀", "name": "woman rowing boat: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6A3 1F3FC 200D 2640", "html": "&#128675;&#127996;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏻‍♀", "name": "woman rowing boat: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6A3 1F3FB 200D 2640", "html": "&#128675;&#127995;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣‍♀", "name": "woman rowing boat", "shortname": ":woman_rowing_boat:", "unicode": "1F6A3 200D 2640", "html": "&#128675;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏿", "name": "person rowing boat: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6A3 1F3FF", "html": "&#128675;&#127999;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏾", "name": "person rowing boat: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6A3 1F3FE", "html": "&#128675;&#127998;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏽", "name": "person rowing boat: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6A3 1F3FD", "html": "&#128675;&#127997;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏼", "name": "person rowing boat: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6A3 1F3FC", "html": "&#128675;&#127996;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏻", "name": "person rowing boat: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6A3 1F3FB", "html": "&#128675;&#127995;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣", "name": "person rowing boat", "shortname": ":rowboat:", "unicode": "1f6a3", "html": "&#128675;", "category": "People & Body (person-sport)", "order": "818"},
+		{"emoji": "👒", "name": "woman’s hat", "shortname": ":womans_hat:", "unicode": "1f452", "html": "&#128082;", "category": "Objects (clothing)", "order": "1334"},
+		{"emoji": "👞", "name": "man’s shoe", "shortname": ":mans_shoe:", "unicode": "1f45e", "html": "&#128094;", "category": "Objects (clothing)", "order": "1328"},
+		{"emoji": "🏩", "name": "love hotel", "shortname": ":love_hotel:", "unicode": "1f3e9", "html": "&#127977;", "category": "Travel & Places (place-building)", "order": "1567"},
+		{"emoji": "🗻", "name": "mount fuji", "shortname": ":mount_fuji:", "unicode": "1f5fb", "html": "&#128507;", "category": "Travel & Places (place-geographic)", "order": "1547"},
+		{"emoji": "🐪", "name": "camel", "shortname": ":dromedary_camel:", "unicode": "1f42a", "html": "&#128042;", "category": "Animals & Nature (animal-mammal)", "order": "1371"},
+		{"emoji": "👜", "name": "handbag", "shortname": ":handbag:", "unicode": "1f45c", "html": "&#128092;", "category": "Objects (clothing)", "order": "1324"},
+		{"emoji": "⌛", "name": "hourglass done", "shortname": ":hourglass:", "unicode": "231b", "html": "&#8987;", "category": "Travel & Places (time)", "order": "1680"},
+		{"emoji": "❎", "name": "cross mark button", "shortname": ":negative_squared_cross_mark:", "unicode": "274e", "html": "&#10062;", "category": "Symbols (other-symbol)", "order": "2083"},
+		{"emoji": "🎺", "name": "trumpet", "shortname": ":trumpet:", "unicode": "1f3ba", "html": "&#127930;", "category": "Objects (musical-instrument)", "order": "1835"},
+		{"emoji": "🏫", "name": "school", "shortname": ":school:", "unicode": "1f3eb", "html": "&#127979;", "category": "Travel & Places (place-building)", "order": "1569"},
+		{"emoji": "🐄", "name": "cow", "shortname": ":cow2:", "unicode": "1f404", "html": "&#128004;", "category": "Animals & Nature (animal-mammal)", "order": "1363"},
+		{"emoji": "🌆", "name": "cityscape at dusk", "shortname": ":cityscape_at_dusk:", "unicode": "1F306", "html": "&#127750;", "category": "Travel & Places (place-other)", "order": ""},
+		{"emoji": "👷🏿‍♀", "name": "woman construction worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F477 1F3FF 200D 2640", "html": "&#128119;&#127999;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏾‍♀", "name": "woman construction worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F477 1F3FE 200D 2640", "html": "&#128119;&#127998;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏽‍♀", "name": "woman construction worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F477 1F3FD 200D 2640", "html": "&#128119;&#127997;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏼‍♀", "name": "woman construction worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F477 1F3FC 200D 2640", "html": "&#128119;&#127996;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏻‍♀", "name": "woman construction worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F477 1F3FB 200D 2640", "html": "&#128119;&#127995;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷‍♀", "name": "woman construction worker", "shortname": ":woman_construction_worker:", "unicode": "1F477 200D 2640", "html": "&#128119;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏿", "name": "construction worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F477 1F3FF", "html": "&#128119;&#127999;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏾", "name": "construction worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F477 1F3FE", "html": "&#128119;&#127998;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏽", "name": "construction worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F477 1F3FD", "html": "&#128119;&#127997;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏼", "name": "construction worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F477 1F3FC", "html": "&#128119;&#127996;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏻", "name": "construction worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F477 1F3FB", "html": "&#128119;&#127995;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷", "name": "construction worker", "shortname": ":construction_worker:", "unicode": "1f477", "html": "&#128119;", "category": "People & Body (person-role)", "order": "393"},
+		{"emoji": "🚽", "name": "toilet", "shortname": ":toilet:", "unicode": "1f6bd", "html": "&#128701;", "category": "Objects (household)", "order": "1671"},
+		{"emoji": "🐖", "name": "pig", "shortname": ":pig2:", "unicode": "1f416", "html": "&#128022;", "category": "Animals & Nature (animal-mammal)", "order": "1365"},
+		{"emoji": "❔", "name": "white question mark", "shortname": ":grey_question:", "unicode": "2754", "html": "&#10068;", "category": "Symbols (other-symbol)", "order": "2099"},
+		{"emoji": "🔰", "name": "Japanese symbol for beginner", "shortname": ":beginner:", "unicode": "1f530", "html": "&#128304;", "category": "Symbols (other-symbol)", "order": "2075"},
+		{"emoji": "🎻", "name": "violin", "shortname": ":violin:", "unicode": "1f3bb", "html": "&#127931;", "category": "Objects (musical-instrument)", "order": "1836"},
+		{"emoji": "🔛", "name": "ON! arrow", "shortname": ":on:", "unicode": "1f51b", "html": "&#128283;", "category": "Symbols (arrow)", "order": "2020"},
+		{"emoji": "💳", "name": "credit card", "shortname": ":credit_card:", "unicode": "1f4b3", "html": "&#128179;", "category": "Objects (money)", "order": "1897"},
+		{"emoji": "🆔", "name": "ID button", "shortname": ":id:", "unicode": "1f194", "html": "&#127380;", "category": "Symbols (alphanum)", "order": "2132"},
+		{"emoji": "㊙", "name": "Japanese secret button", "shortname": ":secret:", "unicode": "3299", "html": "&#12953;", "category": "Symbols (alphanum)", "order": "2156"},
+		{"emoji": "🎡", "name": "ferris wheel", "shortname": ":ferris_wheel:", "unicode": "1f3a1", "html": "&#127905;", "category": "Travel & Places (place-other)", "order": "1594"},
+		{"emoji": "🎳", "name": "bowling", "shortname": ":bowling:", "unicode": "1f3b3", "html": "&#127923;", "category": "Activities (sport)", "order": "1789"},
+		{"emoji": "♎", "name": "Libra", "shortname": ":libra:", "unicode": "264e", "html": "&#9806;", "category": "Symbols (zodiac)", "order": "2041"},
+		{"emoji": "♍", "name": "Virgo", "shortname": ":virgo:", "unicode": "264d", "html": "&#9805;", "category": "Symbols (zodiac)", "order": "2040"},
+		{"emoji": "💈", "name": "barber pole", "shortname": ":barber:", "unicode": "1f488", "html": "&#128136;", "category": "Travel & Places (place-other)", "order": "1596"},
+		{"emoji": "👛", "name": "purse", "shortname": ":purse:", "unicode": "1f45b", "html": "&#128091;", "category": "Objects (clothing)", "order": "1323"},
+		{"emoji": "🎢", "name": "roller coaster", "shortname": ":roller_coaster:", "unicode": "1f3a2", "html": "&#127906;", "category": "Travel & Places (place-other)", "order": "1595"},
+		{"emoji": "🐀", "name": "rat", "shortname": ":rat:", "unicode": "1f400", "html": "&#128000;", "category": "Animals & Nature (animal-mammal)", "order": "1377"},
+		{"emoji": "📅", "name": "calendar", "shortname": ":date:", "unicode": "1f4c5", "html": "&#128197;", "category": "Objects (office)", "order": "1925"},
+		{"emoji": "🏉", "name": "rugby football", "shortname": ":rugby_football:", "unicode": "1f3c9", "html": "&#127945;", "category": "Activities (sport)", "order": "1786"},
+		{"emoji": "🐏", "name": "ram", "shortname": ":ram:", "unicode": "1f40f", "html": "&#128015;", "category": "Animals & Nature (animal-mammal)", "order": "1368"},
+		{"emoji": "🔼", "name": "upwards button", "shortname": ":arrow_up_small:", "unicode": "1f53c", "html": "&#128316;", "category": "Symbols (av-symbol)", "order": "2058"},
+		{"emoji": "🔲", "name": "black square button", "shortname": ":black_square_button:", "unicode": "1f532", "html": "&#128306;", "category": "Symbols (geometric)", "order": "2175"},
+		{"emoji": "📴", "name": "mobile phone off", "shortname": ":mobile_phone_off:", "unicode": "1f4f4", "html": "&#128244;", "category": "Symbols (av-symbol)", "order": "2071"},
+		{"emoji": "🗼", "name": "Tokyo tower", "shortname": ":tokyo_tower:", "unicode": "1f5fc", "html": "&#128508;", "category": "Travel & Places (place-building)", "order": "1575"},
+		{"emoji": "㊗", "name": "Japanese congratulations button", "shortname": ":congratulations:", "unicode": "3297", "html": "&#12951;", "category": "Symbols (alphanum)", "order": "2155"},
+		{"emoji": "👘", "name": "kimono", "shortname": ":kimono:", "unicode": "1f458", "html": "&#128088;", "category": "Objects (clothing)", "order": "1320"},
+		{"emoji": "🇷🇺", "name": "flag: Russia", "shortname": ":ru:", "unicode": "1F1F7 1F1FA", "html": "&#127479;", "category": "Flags (country-flag)", "order": ""},
+		{"emoji": "🚢", "name": "ship", "shortname": ":ship:", "unicode": "1f6a2", "html": "&#128674;", "category": "Travel & Places (transport-water)", "order": "1649"},
+		{"emoji": "🔎", "name": "magnifying glass tilted right", "shortname": ":mag_right:", "unicode": "1f50e", "html": "&#128270;", "category": "Objects (light & video)", "order": "1866"},
+		{"emoji": "🔍", "name": "magnifying glass tilted left", "shortname": ":mag:", "unicode": "1f50d", "html": "&#128269;", "category": "Objects (light & video)", "order": "1865"},
+		{"emoji": "🚒", "name": "fire engine", "shortname": ":fire_engine:", "unicode": "1f692", "html": "&#128658;", "category": "Travel & Places (transport-ground)", "order": "1619"},
+		{"emoji": "🕦", "name": "eleven-thirty", "shortname": ":clock1130:", "unicode": "1f566", "html": "&#128358;", "category": "Travel & Places (time)", "order": "1710"},
+		{"emoji": "🚓", "name": "police car", "shortname": ":police_car:", "unicode": "1f693", "html": "&#128659;", "category": "Travel & Places (transport-ground)", "order": "1620"},
+		{"emoji": "🃏", "name": "joker", "shortname": ":black_joker:", "unicode": "1f0cf", "html": "&#127183;", "category": "Activities (game)", "order": "1811"},
+		{"emoji": "🌉", "name": "bridge at night", "shortname": ":bridge_at_night:", "unicode": "1f309", "html": "&#127753;", "category": "Travel & Places (place-other)", "order": "1590"},
+		{"emoji": "📦", "name": "package", "shortname": ":package:", "unicode": "1f4e6", "html": "&#128230;", "category": "Objects (mail)", "order": "1907"},
+		{"emoji": "🚖", "name": "oncoming taxi", "shortname": ":oncoming_taxi:", "unicode": "1f696", "html": "&#128662;", "category": "Travel & Places (transport-ground)", "order": "1623"},
+		{"emoji": "📆", "name": "tear-off calendar", "shortname": ":calendar:", "unicode": "1f4c6", "html": "&#128198;", "category": "Objects (office)", "order": "1926"},
+		{"emoji": "🏇", "name": "horse racing", "shortname": ":horse_racing:", "unicode": "1f3c7", "html": "&#127943;", "category": "People & Body (person-sport)", "order": "769"},
+		{"emoji": "🐅", "name": "tiger", "shortname": ":tiger2:", "unicode": "1f405", "html": "&#128005;", "category": "Animals & Nature (animal-mammal)", "order": "1354"},
+		{"emoji": "👢", "name": "woman’s boot", "shortname": ":boot:", "unicode": "1f462", "html": "&#128098;", "category": "Objects (clothing)", "order": "1332"},
+		{"emoji": "🚑", "name": "ambulance", "shortname": ":ambulance:", "unicode": "1f691", "html": "&#128657;", "category": "Travel & Places (transport-ground)", "order": "1618"},
+		{"emoji": "🔳", "name": "white square button", "shortname": ":white_square_button:", "unicode": "1f533", "html": "&#128307;", "category": "Symbols (geometric)", "order": "2176"},
+		{"emoji": "🐗", "name": "boar", "shortname": ":boar:", "unicode": "1f417", "html": "&#128023;", "category": "Animals & Nature (animal-mammal)", "order": "1366"},
+		{"emoji": "🎒", "name": "backpack", "shortname": ":school_satchel:", "unicode": "1f392", "html": "&#127890;", "category": "Objects (clothing)", "order": "1327"},
+		{"emoji": "➿", "name": "double curly loop", "shortname": ":loop:", "unicode": "27bf", "html": "&#10175;", "category": "Symbols (other-symbol)", "order": "2091"},
+		{"emoji": "💷", "name": "pound banknote", "shortname": ":pound:", "unicode": "1f4b7", "html": "&#128183;", "category": "Objects (money)", "order": "1895"},
+		{"emoji": "ℹ", "name": "information", "shortname": ":information_source:", "unicode": "2139", "html": "&#8505;", "category": "Symbols (alphanum)", "order": "2131"},
+		{"emoji": "🐂", "name": "ox", "shortname": ":ox:", "unicode": "1f402", "html": "&#128002;", "category": "Animals & Nature (animal-mammal)", "order": "1361"},
+		{"emoji": "🍙", "name": "rice ball", "shortname": ":rice_ball:", "unicode": "1f359", "html": "&#127833;", "category": "Food & Drink (food-asian)", "order": "1497"},
+		{"emoji": "🆚", "name": "VS button", "shortname": ":vs:", "unicode": "1f19a", "html": "&#127386;", "category": "Symbols (alphanum)", "order": "2141"},
+		{"emoji": "🔚", "name": "END arrow", "shortname": ":end:", "unicode": "1f51a", "html": "&#128282;", "category": "Symbols (arrow)", "order": "2019"},
+		{"emoji": "🅿️", "name": "P button", "shortname": ":parking:", "unicode": "1f17f", "html": "&#127359;", "category": "Symbols (alphanum)", "order": "2138"},
+		{"emoji": "👡", "name": "woman’s sandal", "shortname": ":sandal:", "unicode": "1f461", "html": "&#128097;", "category": "Objects (clothing)", "order": "1331"},
+		{"emoji": "⛺", "name": "tent", "shortname": ":tent:", "unicode": "26fa", "html": "&#9978;", "category": "Travel & Places (place-other)", "order": "1583"},
+		{"emoji": "💺", "name": "seat", "shortname": ":seat:", "unicode": "1f4ba", "html": "&#128186;", "category": "Travel & Places (transport-air)", "order": "1654"},
+		{"emoji": "🚕", "name": "taxi", "shortname": ":taxi:", "unicode": "1f695", "html": "&#128661;", "category": "Travel & Places (transport-ground)", "order": "1622"},
+		{"emoji": "◾", "name": "black medium-small square", "shortname": ":black_medium_small_square:", "unicode": "25fe", "html": "&#9726;", "category": "Symbols (geometric)", "order": "2164"},
+		{"emoji": "💼", "name": "briefcase", "shortname": ":briefcase:", "unicode": "1f4bc", "html": "&#128188;", "category": "Objects (office)", "order": "1921"},
+		{"emoji": "📰", "name": "newspaper", "shortname": ":newspaper:", "unicode": "1f4f0", "html": "&#128240;", "category": "Objects (book-paper)", "order": "1886"},
+		{"emoji": "🎪", "name": "circus tent", "shortname": ":circus_tent:", "unicode": "1f3aa", "html": "&#127914;", "category": "Travel & Places (place-other)", "order": "1597"},
+		{"emoji": "🔯", "name": "dotted six-pointed star", "shortname": ":six_pointed_star:", "unicode": "1f52f", "html": "&#128303;", "category": "Symbols (religion)", "order": "2034"},
+		{"emoji": "🚹", "name": "men’s room", "shortname": ":mens:", "unicode": "1f6b9", "html": "&#128697;", "category": "Symbols (transport-sign)", "order": "1980"},
+		{"emoji": "🏰", "name": "castle", "shortname": ":european_castle:", "unicode": "1f3f0", "html": "&#127984;", "category": "Travel & Places (place-building)", "order": "1573"},
+		{"emoji": "🔦", "name": "flashlight", "shortname": ":flashlight:", "unicode": "1f526", "html": "&#128294;", "category": "Objects (light & video)", "order": "1872"},
+		{"emoji": "🌁", "name": "foggy", "shortname": ":foggy:", "unicode": "1f301", "html": "&#127745;", "category": "Travel & Places (place-other)", "order": "1584"},
+		{"emoji": "⏫", "name": "fast up button", "shortname": ":arrow_double_up:", "unicode": "23eb", "html": "&#9195;", "category": "Symbols (av-symbol)", "order": "2059"},
+		{"emoji": "🎍", "name": "pine decoration", "shortname": ":bamboo:", "unicode": "1f38d", "html": "&#127885;", "category": "Activities (event)", "order": "1765"},
+		{"emoji": "🎫", "name": "ticket", "shortname": ":ticket:", "unicode": "1f3ab", "html": "&#127915;", "category": "Activities (event)", "order": "1774"},
+		{"emoji": "🚁", "name": "helicopter", "shortname": ":helicopter:", "unicode": "1f681", "html": "&#128641;", "category": "Travel & Places (transport-air)", "order": "1655"},
+		{"emoji": "💽", "name": "computer disk", "shortname": ":minidisc:", "unicode": "1f4bd", "html": "&#128189;", "category": "Objects (computer)", "order": "1852"},
+		{"emoji": "🚍", "name": "oncoming bus", "shortname": ":oncoming_bus:", "unicode": "1f68d", "html": "&#128653;", "category": "Travel & Places (transport-ground)", "order": "1615"},
+		{"emoji": "🍈", "name": "melon", "shortname": ":melon:", "unicode": "1f348", "html": "&#127816;", "category": "Food & Drink (food-fruit)", "order": "1450"},
+		{"emoji": "▫", "name": "white small square", "shortname": ":white_small_square:", "unicode": "25ab", "html": "&#9643;", "category": "Symbols (geometric)", "order": "2160"},
+		{"emoji": "🏤", "name": "post office", "shortname": ":european_post_office:", "unicode": "1f3e4", "html": "&#127972;", "category": "Travel & Places (place-building)", "order": "1563"},
+		{"emoji": "🔟", "name": "keycap: 10", "shortname": ":keycap_ten:", "unicode": "1f51f", "html": "&#128287;", "category": "Symbols (keycap)", "order": "2118"},
+		{"emoji": "📓", "name": "notebook", "shortname": ":notebook:", "unicode": "1f4d3", "html": "&#128211;", "category": "Objects (book-paper)", "order": "1881"},
+		{"emoji": "🔕", "name": "bell with slash", "shortname": ":no_bell:", "unicode": "1f515", "html": "&#128277;", "category": "Objects (sound)", "order": "1822"},
+		{"emoji": "🍢", "name": "oden", "shortname": ":oden:", "unicode": "1f362", "html": "&#127842;", "category": "Food & Drink (food-asian)", "order": "1503"},
+		{"emoji": "🎏", "name": "carp streamer", "shortname": ":flags:", "unicode": "1f38f", "html": "&#127887;", "category": "Activities (event)", "order": "1767"},
+		{"emoji": "🎠", "name": "carousel horse", "shortname": ":carousel_horse:", "unicode": "1f3a0", "html": "&#127904;", "category": "Travel & Places (place-other)", "order": "1593"},
+		{"emoji": "🐡", "name": "blowfish", "shortname": ":blowfish:", "unicode": "1f421", "html": "&#128033;", "category": "Animals & Nature (animal-marine)", "order": "1411"},
+		{"emoji": "📈", "name": "chart increasing", "shortname": ":chart_with_upwards_trend:", "unicode": "1f4c8", "html": "&#128200;", "category": "Objects (office)", "order": "1930"},
+		{"emoji": "🍠", "name": "roasted sweet potato", "shortname": ":sweet_potato:", "unicode": "1f360", "html": "&#127840;", "category": "Food & Drink (food-asian)", "order": "1502"},
+		{"emoji": "🎿", "name": "skis", "shortname": ":ski:", "unicode": "1f3bf", "html": "&#127935;", "category": "Activities (sport)", "order": "1803"},
+		{"emoji": "🕛", "name": "twelve o’clock", "shortname": ":clock12:", "unicode": "1f55b", "html": "&#128347;", "category": "Travel & Places (time)", "order": "1687"},
+		{"emoji": "📶", "name": "antenna bars", "shortname": ":signal_strength:", "unicode": "1f4f6", "html": "&#128246;", "category": "Symbols (av-symbol)", "order": "2069"},
+		{"emoji": "🚧", "name": "construction", "shortname": ":construction:", "unicode": "1f6a7", "html": "&#128679;", "category": "Travel & Places (transport-ground)", "order": "1640"},
+		{"emoji": "#", "name": "", "shortname": "", "unicode": "", "html": "&#35;", "category": "", "order": ""},
+		{"emoji": "◼", "name": "black medium square", "shortname": ":black_medium_square:", "unicode": "25fc", "html": "&#9724;", "category": "Symbols (geometric)", "order": "2162"},
+		{"emoji": "📡", "name": "satellite antenna", "shortname": ":satellite:", "unicode": "1f4e1", "html": "&#128225;", "category": "Objects (science)", "order": "1869"},
+		{"emoji": "💶", "name": "euro banknote", "shortname": ":euro:", "unicode": "1f4b6", "html": "&#128182;", "category": "Objects (money)", "order": "1894"},
+		{"emoji": "👚", "name": "woman’s clothes", "shortname": ":womans_clothes:", "unicode": "1f45a", "html": "&#128090;", "category": "Objects (clothing)", "order": "1322"},
+		{"emoji": "📒", "name": "ledger", "shortname": ":ledger:", "unicode": "1f4d2", "html": "&#128210;", "category": "Objects (book-paper)", "order": "1882"},
+		{"emoji": "🐆", "name": "leopard", "shortname": ":leopard:", "unicode": "1f406", "html": "&#128006;", "category": "Animals & Nature (animal-mammal)", "order": "1355"},
+		{"emoji": "🔅", "name": "dim button", "shortname": ":low_brightness:", "unicode": "1f505", "html": "&#128261;", "category": "Symbols (av-symbol)", "order": "2067"},
+		{"emoji": "🕒", "name": "three o’clock", "shortname": ":clock3:", "unicode": "1f552", "html": "&#128338;", "category": "Travel & Places (time)", "order": "1693"},
+		{"emoji": "🏬", "name": "department store", "shortname": ":department_store:", "unicode": "1f3ec", "html": "&#127980;", "category": "Travel & Places (place-building)", "order": "1570"},
+		{"emoji": "🚚", "name": "delivery truck", "shortname": ":truck:", "unicode": "1f69a", "html": "&#128666;", "category": "Travel & Places (transport-ground)", "order": "1627"},
+		{"emoji": "🍶", "name": "sake", "shortname": ":sake:", "unicode": "1f376", "html": "&#127862;", "category": "Food & Drink (drink)", "order": "1524"},
+		{"emoji": "🚃", "name": "railway car", "shortname": ":railway_car:", "unicode": "1f683", "html": "&#128643;", "category": "Travel & Places (transport-ground)", "order": "1603"},
+		{"emoji": "🚤", "name": "speedboat", "shortname": ":speedboat:", "unicode": "1f6a4", "html": "&#128676;", "category": "Travel & Places (transport-water)", "order": "1645"},
+		{"emoji": "🇰🇷", "name": "flag: South Korea", "shortname": ":ko:", "unicode": "1F1F0 1F1F7", "html": "&#127472;", "category": "Flags (country-flag)", "order": ""},
+		{"emoji": "📼", "name": "videocassette", "shortname": ":vhs:", "unicode": "1f4fc", "html": "&#128252;", "category": "Objects (light & video)", "order": "1864"},
+		{"emoji": "🕐", "name": "one o’clock", "shortname": ":clock1:", "unicode": "1f550", "html": "&#128336;", "category": "Travel & Places (time)", "order": "1689"},
+		{"emoji": "⏬", "name": "fast down button", "shortname": ":arrow_double_down:", "unicode": "23ec", "html": "&#9196;", "category": "Symbols (av-symbol)", "order": "2061"},
+		{"emoji": "🐃", "name": "water buffalo", "shortname": ":water_buffalo:", "unicode": "1f403", "html": "&#128003;", "category": "Animals & Nature (animal-mammal)", "order": "1362"},
+		{"emoji": "🔽", "name": "downwards button", "shortname": ":arrow_down_small:", "unicode": "1f53d", "html": "&#128317;", "category": "Symbols (av-symbol)", "order": "2060"},
+		{"emoji": "💴", "name": "yen banknote", "shortname": ":yen:", "unicode": "1f4b4", "html": "&#128180;", "category": "Objects (money)", "order": "1892"},
+		{"emoji": "🔇", "name": "muted speaker", "shortname": ":mute:", "unicode": "1f507", "html": "&#128263;", "category": "Objects (sound)", "order": "1814"},
+		{"emoji": "🎽", "name": "running shirt", "shortname": ":running_shirt_with_sash:", "unicode": "1f3bd", "html": "&#127933;", "category": "Activities (sport)", "order": "1802"},
+		{"emoji": "⬜", "name": "white large square", "shortname": ":white_large_square:", "unicode": "2b1c", "html": "&#11036;", "category": "Symbols (geometric)", "order": "2166"},
+		{"emoji": "♿", "name": "wheelchair symbol", "shortname": ":wheelchair:", "unicode": "267f", "html": "&#9855;", "category": "Symbols (transport-sign)", "order": "1979"},
+		{"emoji": "🕑", "name": "two o’clock", "shortname": ":clock2:", "unicode": "1f551", "html": "&#128337;", "category": "Travel & Places (time)", "order": "1691"},
+		{"emoji": "📎", "name": "paperclip", "shortname": ":paperclip:", "unicode": "1f4ce", "html": "&#128206;", "category": "Objects (office)", "order": "1936"},
+		{"emoji": "🏧", "name": "ATM sign", "shortname": ":atm:", "unicode": "1f3e7", "html": "&#127975;", "category": "Symbols (transport-sign)", "order": "1976"},
+		{"emoji": "🎦", "name": "cinema", "shortname": ":cinema:", "unicode": "1f3a6", "html": "&#127910;", "category": "Symbols (av-symbol)", "order": "2066"},
+		{"emoji": "🔭", "name": "telescope", "shortname": ":telescope:", "unicode": "1f52d", "html": "&#128301;", "category": "Objects (science)", "order": "1868"},
+		{"emoji": "🎑", "name": "moon viewing ceremony", "shortname": ":rice_scene:", "unicode": "1f391", "html": "&#127889;", "category": "Activities (event)", "order": "1769"},
+		{"emoji": "📘", "name": "blue book", "shortname": ":blue_book:", "unicode": "1f4d8", "html": "&#128216;", "category": "Objects (book-paper)", "order": "1878"},
+		{"emoji": "◻️", "name": "white medium square", "shortname": ":white_medium_square:", "unicode": "25fb", "html": "&#9723;", "category": "Symbols (geometric)", "order": "2161"},
+		{"emoji": "📮", "name": "postbox", "shortname": ":postbox:", "unicode": "1f4ee", "html": "&#128238;", "category": "Objects (mail)", "order": "1912"},
+		{"emoji": "📧", "name": "e-mail", "shortname": ":e-mail:", "unicode": "1f4e7", "html": "&#128231;", "category": "Objects (mail)", "order": "1902"},
+		{"emoji": "🐁", "name": "mouse", "shortname": ":mouse2:", "unicode": "1f401", "html": "&#128001;", "category": "Animals & Nature (animal-mammal)", "order": "1376"},
+		{"emoji": "🚄", "name": "high-speed train", "shortname": ":bullettrain_side:", "unicode": "1f684", "html": "&#128644;", "category": "Travel & Places (transport-ground)", "order": "1604"},
+		{"emoji": "🉐", "name": "Japanese bargain button", "shortname": ":ideograph_advantage:", "unicode": "1f250", "html": "&#127568;", "category": "Symbols (alphanum)", "order": "2147"},
+		{"emoji": "🔩", "name": "nut and bolt", "shortname": ":nut_and_bolt:", "unicode": "1f529", "html": "&#128297;", "category": "Objects (tool)", "order": "1960"},
+		{"emoji": "🆖", "name": "NG button", "shortname": ":ng:", "unicode": "1f196", "html": "&#127382;", "category": "Symbols (alphanum)", "order": "2135"},
+		{"emoji": "🏨", "name": "hotel", "shortname": ":hotel:", "unicode": "1f3e8", "html": "&#127976;", "category": "Travel & Places (place-building)", "order": "1566"},
+		{"emoji": "🚾", "name": "water closet", "shortname": ":wc:", "unicode": "1f6be", "html": "&#128702;", "category": "Symbols (transport-sign)", "order": "1984"},
+		{"emoji": "🏮", "name": "red paper lantern", "shortname": ":izakaya_lantern:", "unicode": "1f3ee", "html": "&#127982;", "category": "Objects (light & video)", "order": "1873"},
+		{"emoji": "🔂", "name": "repeat single button", "shortname": ":repeat_one:", "unicode": "1f502", "html": "&#128258;", "category": "Symbols (av-symbol)", "order": "2050"},
+		{"emoji": "📬", "name": "open mailbox with raised flag", "shortname": ":mailbox_with_mail:", "unicode": "1f4ec", "html": "&#128236;", "category": "Objects (mail)", "order": "1910"},
+		{"emoji": "📉", "name": "chart decreasing", "shortname": ":chart_with_downwards_trend:", "unicode": "1f4c9", "html": "&#128201;", "category": "Objects (office)", "order": "1931"},
+		{"emoji": "📗", "name": "green book", "shortname": ":green_book:", "unicode": "1f4d7", "html": "&#128215;", "category": "Objects (book-paper)", "order": "1877"},
+		{"emoji": "🚜", "name": "tractor", "shortname": ":tractor:", "unicode": "1f69c", "html": "&#128668;", "category": "Travel & Places (transport-ground)", "order": "1629"},
+		{"emoji": "⛲", "name": "fountain", "shortname": ":fountain:", "unicode": "26f2", "html": "&#9970;", "category": "Travel & Places (place-other)", "order": "1582"},
+		{"emoji": "🚇", "name": "metro", "shortname": ":metro:", "unicode": "1f687", "html": "&#128647;", "category": "Travel & Places (transport-ground)", "order": "1607"},
+		{"emoji": "📋", "name": "clipboard", "shortname": ":clipboard:", "unicode": "1f4cb", "html": "&#128203;", "category": "Objects (office)", "order": "1933"},
+		{"emoji": "📵", "name": "no mobile phones", "shortname": ":no_mobile_phones:", "unicode": "1f4f5", "html": "&#128245;", "category": "Symbols (warning)", "order": "1998"},
+		{"emoji": "🕓", "name": "four o’clock", "shortname": ":clock4:", "unicode": "1f553", "html": "&#128339;", "category": "Travel & Places (time)", "order": "1695"},
+		{"emoji": "🚭", "name": "no smoking", "shortname": ":no_smoking:", "unicode": "1f6ad", "html": "&#128685;", "category": "Symbols (warning)", "order": "1994"},
+		{"emoji": "⬛", "name": "black large square", "shortname": ":black_large_square:", "unicode": "2b1b", "html": "&#11035;", "category": "Symbols (geometric)", "order": "2165"},
+		{"emoji": "🎰", "name": "slot machine", "shortname": ":slot_machine:", "unicode": "1f3b0", "html": "&#127920;", "category": "Activities (game)", "order": "1601"},
+		{"emoji": "🕔", "name": "five o’clock", "shortname": ":clock5:", "unicode": "1f554", "html": "&#128340;", "category": "Travel & Places (time)", "order": "1697"},
+		{"emoji": "🛁", "name": "bathtub", "shortname": ":bathtub:", "unicode": "1f6c1", "html": "&#128705;", "category": "Objects (household)", "order": "1679"},
+		{"emoji": "📜", "name": "scroll", "shortname": ":scroll:", "unicode": "1f4dc", "html": "&#128220;", "category": "Objects (book-paper)", "order": "1884"},
+		{"emoji": "🚉", "name": "station", "shortname": ":station:", "unicode": "1f689", "html": "&#128649;", "category": "Travel & Places (transport-ground)", "order": "1609"},
+		{"emoji": "🍘", "name": "rice cracker", "shortname": ":rice_cracker:", "unicode": "1f358", "html": "&#127832;", "category": "Food & Drink (food-asian)", "order": "1496"},
+		{"emoji": "🏦", "name": "bank", "shortname": ":bank:", "unicode": "1f3e6", "html": "&#127974;", "category": "Travel & Places (place-building)", "order": "1565"},
+		{"emoji": "🔧", "name": "wrench", "shortname": ":wrench:", "unicode": "1f527", "html": "&#128295;", "category": "Objects (tool)", "order": "1959"},
+		{"emoji": "🈯️", "name": "", "shortname": ":u6307:", "unicode": "1f22f", "html": "&#127535;", "category": "", "order": "2146"},
+		{"emoji": "🚛", "name": "articulated lorry", "shortname": ":articulated_lorry:", "unicode": "1f69b", "html": "&#128667;", "category": "Travel & Places (transport-ground)", "order": "1628"},
+		{"emoji": "📄", "name": "page facing up", "shortname": ":page_facing_up:", "unicode": "1f4c4", "html": "&#128196;", "category": "Objects (book-paper)", "order": "1885"},
+		{"emoji": "⛎", "name": "Ophiuchus", "shortname": ":ophiuchus:", "unicode": "26ce", "html": "&#9934;", "category": "Symbols (zodiac)", "order": "2047"},
+		{"emoji": "📊", "name": "bar chart", "shortname": ":bar_chart:", "unicode": "1f4ca", "html": "&#128202;", "category": "Objects (office)", "order": "1932"},
+		{"emoji": "🚷", "name": "no pedestrians", "shortname": ":no_pedestrians:", "unicode": "1f6b7", "html": "&#128695;", "category": "Symbols (warning)", "order": "1997"},
+		{"emoji": "🇨🇳", "name": "flag: China", "shortname": ":cn:", "unicode": "1F1E8 1F1F3", "html": "&#127464;", "category": "Flags (country-flag)", "order": ""},
+		{"emoji": "📳", "name": "vibration mode", "shortname": ":vibration_mode:", "unicode": "1f4f3", "html": "&#128243;", "category": "Symbols (av-symbol)", "order": "2070"},
+		{"emoji": "🕙", "name": "ten o’clock", "shortname": ":clock10:", "unicode": "1f559", "html": "&#128345;", "category": "Travel & Places (time)", "order": "1707"},
+		{"emoji": "🕘", "name": "nine o’clock", "shortname": ":clock9:", "unicode": "1f558", "html": "&#128344;", "category": "Travel & Places (time)", "order": "1705"},
+		{"emoji": "🚅", "name": "bullet train", "shortname": ":bullettrain_front:", "unicode": "1f685", "html": "&#128645;", "category": "Travel & Places (transport-ground)", "order": "1605"},
+		{"emoji": "🚐", "name": "minibus", "shortname": ":minibus:", "unicode": "1f690", "html": "&#128656;", "category": "Travel & Places (transport-ground)", "order": "1617"},
+		{"emoji": "🚊", "name": "tram", "shortname": ":tram:", "unicode": "1f68a", "html": "&#128650;", "category": "Travel & Places (transport-ground)", "order": "1610"},
+		{"emoji": "🕗", "name": "eight o’clock", "shortname": ":clock8:", "unicode": "1f557", "html": "&#128343;", "category": "Travel & Places (time)", "order": "1703"},
+		{"emoji": "🈳", "name": "Japanese vacancy button", "shortname": ":u7a7a:", "unicode": "1f233", "html": "&#127539;", "category": "Symbols (alphanum)", "order": "2154"},
+		{"emoji": "🚥", "name": "horizontal traffic light", "shortname": ":traffic_light:", "unicode": "1f6a5", "html": "&#128677;", "category": "Travel & Places (transport-ground)", "order": "1638"},
+		{"emoji": "🚵🏿‍♀", "name": "woman mountain biking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B5 1F3FF 200D 2640", "html": "&#128693;&#127999;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏾‍♀", "name": "woman mountain biking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B5 1F3FE 200D 2640", "html": "&#128693;&#127998;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏽‍♀", "name": "woman mountain biking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B5 1F3FD 200D 2640", "html": "&#128693;&#127997;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏼‍♀", "name": "woman mountain biking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B5 1F3FC 200D 2640", "html": "&#128693;&#127996;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏻‍♀", "name": "woman mountain biking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B5 1F3FB 200D 2640", "html": "&#128693;&#127995;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵‍♀", "name": "woman mountain biking", "shortname": ":woman_mountain_biking:", "unicode": "1F6B5 200D 2640", "html": "&#128693;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏿", "name": "person mountain biking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B5 1F3FF", "html": "&#128693;&#127999;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏾", "name": "person mountain biking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B5 1F3FE", "html": "&#128693;&#127998;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏽", "name": "person mountain biking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B5 1F3FD", "html": "&#128693;&#127997;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏼", "name": "person mountain biking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B5 1F3FC", "html": "&#128693;&#127996;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏻", "name": "person mountain biking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B5 1F3FB", "html": "&#128693;&#127995;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵", "name": "person mountain biking", "shortname": ":mountain_bicyclist:", "unicode": "1f6b5", "html": "&#128693;", "category": "People & Body (person-sport)", "order": "908"},
+		{"emoji": "🔬", "name": "microscope", "shortname": ":microscope:", "unicode": "1f52c", "html": "&#128300;", "category": "Objects (science)", "order": "1867"},
+		{"emoji": "🏯", "name": "Japanese castle", "shortname": ":japanese_castle:", "unicode": "1f3ef", "html": "&#127983;", "category": "Travel & Places (place-building)", "order": "1572"},
+		{"emoji": "🔖", "name": "bookmark", "shortname": ":bookmark:", "unicode": "1f516", "html": "&#128278;", "category": "Objects (book-paper)", "order": "1889"},
+		{"emoji": "📑", "name": "bookmark tabs", "shortname": ":bookmark_tabs:", "unicode": "1f4d1", "html": "&#128209;", "category": "Objects (book-paper)", "order": "1888"},
+		{"emoji": "👝", "name": "clutch bag", "shortname": ":pouch:", "unicode": "1f45d", "html": "&#128093;", "category": "Objects (clothing)", "order": "1325"},
+		{"emoji": "🆎", "name": "AB button (blood type)", "shortname": ":ab:", "unicode": "1f18e", "html": "&#127374;", "category": "Symbols (alphanum)", "order": "2126"},
+		{"emoji": "📃", "name": "page with curl", "shortname": ":page_with_curl:", "unicode": "1f4c3", "html": "&#128195;", "category": "Objects (book-paper)", "order": "1883"},
+		{"emoji": "🎴", "name": "flower playing cards", "shortname": ":flower_playing_cards:", "unicode": "1f3b4", "html": "&#127924;", "category": "Activities (game)", "order": "1813"},
+		{"emoji": "🕚", "name": "eleven o’clock", "shortname": ":clock11:", "unicode": "1f55a", "html": "&#128346;", "category": "Travel & Places (time)", "order": "1709"},
+		{"emoji": "📠", "name": "fax machine", "shortname": ":fax:", "unicode": "1f4e0", "html": "&#128224;", "category": "Objects (phone)", "order": "1843"},
+		{"emoji": "🕖", "name": "seven o’clock", "shortname": ":clock7:", "unicode": "1f556", "html": "&#128342;", "category": "Travel & Places (time)", "order": "1701"},
+		{"emoji": "◽", "name": "white medium-small square", "shortname": ":white_medium_small_square:", "unicode": "25fd", "html": "&#9725;", "category": "Symbols (geometric)", "order": "2163"},
+		{"emoji": "💱", "name": "currency exchange", "shortname": ":currency_exchange:", "unicode": "1f4b1", "html": "&#128177;", "category": "Objects (money)", "order": "1899"},
+		{"emoji": "🔉", "name": "speaker medium volume", "shortname": ":sound:", "unicode": "1f509", "html": "&#128265;", "category": "Objects (sound)", "order": "1816"},
+		{"emoji": "💹", "name": "chart increasing with yen", "shortname": ":chart:", "unicode": "1f4b9", "html": "&#128185;", "category": "Objects (money)", "order": "1898"},
+		{"emoji": "🆑", "name": "CL button", "shortname": ":cl:", "unicode": "1f191", "html": "&#127377;", "category": "Symbols (alphanum)", "order": "2128"},
+		{"emoji": "💾", "name": "floppy disk", "shortname": ":floppy_disk:", "unicode": "1f4be", "html": "&#128190;", "category": "Objects (computer)", "order": "1853"},
+		{"emoji": "🏣", "name": "Japanese post office", "shortname": ":post_office:", "unicode": "1f3e3", "html": "&#127971;", "category": "Travel & Places (place-building)", "order": "1562"},
+		{"emoji": "🔈", "name": "speaker low volume", "shortname": ":speaker:", "unicode": "1f508", "html": "&#128264;", "category": "Objects (sound)", "order": "1815"},
+		{"emoji": "🗾", "name": "map of Japan", "shortname": ":japan:", "unicode": "1f5fe", "html": "&#128510;", "category": "Travel & Places (place-map)", "order": "1543"},
+		{"emoji": "🈺", "name": "Japanese open for business button", "shortname": ":u55b6:", "unicode": "1f23a", "html": "&#127546;", "category": "Symbols (alphanum)", "order": "2157"},
+		{"emoji": "🀄", "name": "mahjong red dragon", "shortname": ":mahjong:", "unicode": "1f004", "html": "&#126980;", "category": "Activities (game)", "order": "1812"},
+		{"emoji": "📨", "name": "incoming envelope", "shortname": ":incoming_envelope:", "unicode": "1f4e8", "html": "&#128232;", "category": "Objects (mail)", "order": "1903"},
+		{"emoji": "📙", "name": "orange book", "shortname": ":orange_book:", "unicode": "1f4d9", "html": "&#128217;", "category": "Objects (book-paper)", "order": "1879"},
+		{"emoji": "🚻", "name": "restroom", "shortname": ":restroom:", "unicode": "1f6bb", "html": "&#128699;", "category": "Symbols (transport-sign)", "order": "1982"},
+		{"emoji": "🈚️", "name": "", "shortname": ":u7121:", "unicode": "1f21a", "html": "&#127514;", "category": "", "order": "2149"},
+		{"emoji": "🈶", "name": "Japanese not free of charge button", "shortname": ":u6709:", "unicode": "1f236", "html": "&#127542;", "category": "Symbols (alphanum)", "order": "2145"},
+		{"emoji": "📐", "name": "triangular ruler", "shortname": ":triangular_ruler:", "unicode": "1f4d0", "html": "&#128208;", "category": "Objects (office)", "order": "1939"},
+		{"emoji": "🚋", "name": "tram car", "shortname": ":train:", "unicode": "1f68b", "html": "&#128651;", "category": "Travel & Places (transport-ground)", "order": "1613"},
+		{"emoji": "🈸", "name": "Japanese application button", "shortname": ":u7533:", "unicode": "1f238", "html": "&#127544;", "category": "Symbols (alphanum)", "order": "2152"},
+		{"emoji": "🚎", "name": "trolleybus", "shortname": ":trolleybus:", "unicode": "1f68e", "html": "&#128654;", "category": "Travel & Places (transport-ground)", "order": "1616"},
+		{"emoji": "🈷", "name": "Japanese monthly amount button", "shortname": ":u6708:", "unicode": "1f237", "html": "&#127543;", "category": "Symbols (alphanum)", "order": "2144"},
+		{"emoji": "🔢", "name": "input numbers", "shortname": ":input_numbers:", "unicode": "1F522", "html": "&#128290;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "📔", "name": "notebook with decorative cover", "shortname": ":notebook_with_decorative_cover:", "unicode": "1f4d4", "html": "&#128212;", "category": "Objects (book-paper)", "order": "1874"},
+		{"emoji": "🈲", "name": "Japanese prohibited button", "shortname": ":u7981:", "unicode": "1f232", "html": "&#127538;", "category": "Symbols (alphanum)", "order": "2150"},
+		{"emoji": "🈵", "name": "Japanese no vacancy button", "shortname": ":u6e80:", "unicode": "1f235", "html": "&#127541;", "category": "Symbols (alphanum)", "order": "2158"},
+		{"emoji": "📯", "name": "postal horn", "shortname": ":postal_horn:", "unicode": "1f4ef", "html": "&#128239;", "category": "Objects (sound)", "order": "1820"},
+		{"emoji": "🏭", "name": "factory", "shortname": ":factory:", "unicode": "1f3ed", "html": "&#127981;", "category": "Travel & Places (place-building)", "order": "1571"},
+		{"emoji": "🚸", "name": "children crossing", "shortname": ":children_crossing:", "unicode": "1f6b8", "html": "&#128696;", "category": "Symbols (warning)", "order": "1990"},
+		{"emoji": "🚆", "name": "train", "shortname": ":train2:", "unicode": "1f686", "html": "&#128646;", "category": "Travel & Places (transport-ground)", "order": "1606"},
+		{"emoji": "📏", "name": "straight ruler", "shortname": ":straight_ruler:", "unicode": "1f4cf", "html": "&#128207;", "category": "Objects (office)", "order": "1938"},
+		{"emoji": "📟", "name": "pager", "shortname": ":pager:", "unicode": "1f4df", "html": "&#128223;", "category": "Objects (phone)", "order": "1842"},
+		{"emoji": "🉑", "name": "Japanese acceptable button", "shortname": ":accept:", "unicode": "1f251", "html": "&#127569;", "category": "Symbols (alphanum)", "order": "2151"},
+		{"emoji": "🈴", "name": "Japanese passing grade button", "shortname": ":u5408:", "unicode": "1f234", "html": "&#127540;", "category": "Symbols (alphanum)", "order": "2153"},
+		{"emoji": "🔏", "name": "locked with pen", "shortname": ":lock_with_ink_pen:", "unicode": "1f50f", "html": "&#128271;", "category": "Objects (lock)", "order": "1946"},
+		{"emoji": "🕜", "name": "one-thirty", "shortname": ":clock130:", "unicode": "1f55c", "html": "&#128348;", "category": "Travel & Places (time)", "order": "1690"},
+		{"emoji": "🈂️", "name": "Japanese service charge button", "shortname": ":sa:", "unicode": "1f202", "html": "&#127490;", "category": "Symbols (alphanum)", "order": "2143"},
+		{"emoji": "📤", "name": "outbox tray", "shortname": ":outbox_tray:", "unicode": "1f4e4", "html": "&#128228;", "category": "Objects (mail)", "order": "1905"},
+		{"emoji": "🔀", "name": "shuffle tracks button", "shortname": ":twisted_rightwards_arrows:", "unicode": "1f500", "html": "&#128256;", "category": "Symbols (av-symbol)", "order": "2048"},
+		{"emoji": "📫", "name": "closed mailbox with raised flag", "shortname": ":mailbox:", "unicode": "1f4eb", "html": "&#128235;", "category": "Objects (mail)", "order": "1908"},
+		{"emoji": "🚈", "name": "light rail", "shortname": ":light_rail:", "unicode": "1f688", "html": "&#128648;", "category": "Travel & Places (transport-ground)", "order": "1608"},
+		{"emoji": "🕤", "name": "nine-thirty", "shortname": ":clock930:", "unicode": "1f564", "html": "&#128356;", "category": "Travel & Places (time)", "order": "1706"},
+		{"emoji": "🚏", "name": "bus stop", "shortname": ":busstop:", "unicode": "1f68f", "html": "&#128655;", "category": "Travel & Places (transport-ground)", "order": "1633"},
+		{"emoji": "📂", "name": "open file folder", "shortname": ":open_file_folder:", "unicode": "1f4c2", "html": "&#128194;", "category": "Objects (office)", "order": "1923"},
+		{"emoji": "📁", "name": "file folder", "shortname": ":file_folder:", "unicode": "1f4c1", "html": "&#128193;", "category": "Objects (office)", "order": "1922"},
+		{"emoji": "🚰", "name": "potable water", "shortname": ":potable_water:", "unicode": "1f6b0", "html": "&#128688;", "category": "Symbols (transport-sign)", "order": "1978"},
+		{"emoji": "📇", "name": "card index", "shortname": ":card_index:", "unicode": "1f4c7", "html": "&#128199;", "category": "Objects (office)", "order": "1929"},
+		{"emoji": "🕝", "name": "two-thirty", "shortname": ":clock230:", "unicode": "1f55d", "html": "&#128349;", "category": "Travel & Places (time)", "order": "1692"},
+		{"emoji": "🚝", "name": "monorail", "shortname": ":monorail:", "unicode": "1f69d", "html": "&#128669;", "category": "Travel & Places (transport-ground)", "order": "1611"},
+		{"emoji": "🕧", "name": "twelve-thirty", "shortname": ":clock1230:", "unicode": "1f567", "html": "&#128359;", "category": "Travel & Places (time)", "order": "1688"},
+		{"emoji": "🕥", "name": "ten-thirty", "shortname": ":clock1030:", "unicode": "1f565", "html": "&#128357;", "category": "Travel & Places (time)", "order": "1708"},
+		{"emoji": "🔤", "name": "input latin letters", "shortname": ":abc:", "unicode": "1f524", "html": "&#128292;", "category": "Symbols (alphanum)", "order": "2124"},
+		{"emoji": "📪", "name": "closed mailbox with lowered flag", "shortname": ":mailbox_closed:", "unicode": "1f4ea", "html": "&#128234;", "category": "Objects (mail)", "order": "1909"},
+		{"emoji": "🕟", "name": "four-thirty", "shortname": ":clock430:", "unicode": "1f55f", "html": "&#128351;", "category": "Travel & Places (time)", "order": "1696"},
+		{"emoji": "🚞", "name": "mountain railway", "shortname": ":mountain_railway:", "unicode": "1f69e", "html": "&#128670;", "category": "Travel & Places (transport-ground)", "order": "1612"},
+		{"emoji": "🚯", "name": "no littering", "shortname": ":do_not_litter:", "unicode": "1f6af", "html": "&#128687;", "category": "Symbols (warning)", "order": "1995"},
+		{"emoji": "🕞", "name": "three-thirty", "shortname": ":clock330:", "unicode": "1f55e", "html": "&#128350;", "category": "Travel & Places (time)", "order": "1694"},
+		{"emoji": "➗", "name": "division sign", "shortname": ":heavy_division_sign:", "unicode": "2797", "html": "&#10135;", "category": "Symbols (other-symbol)", "order": "2089"},
+		{"emoji": "🕢", "name": "seven-thirty", "shortname": ":clock730:", "unicode": "1f562", "html": "&#128354;", "category": "Travel & Places (time)", "order": "1702"},
+		{"emoji": "🕠", "name": "five-thirty", "shortname": ":clock530:", "unicode": "1f560", "html": "&#128352;", "category": "Travel & Places (time)", "order": "1698"},
+		{"emoji": "🔠", "name": "input latin uppercase", "shortname": ":capital_abcd:", "unicode": "1f520", "html": "&#128288;", "category": "Symbols (alphanum)", "order": "2120"},
+		{"emoji": "📭", "name": "open mailbox with lowered flag", "shortname": ":mailbox_with_no_mail:", "unicode": "1f4ed", "html": "&#128237;", "category": "Objects (mail)", "order": "1911"},
+		{"emoji": "🔣", "name": "input symbols", "shortname": ":symbols:", "unicode": "1f523", "html": "&#128291;", "category": "Symbols (alphanum)", "order": "2123"},
+		{"emoji": "🚡", "name": "aerial tramway", "shortname": ":aerial_tramway:", "unicode": "1f6a1", "html": "&#128673;", "category": "Travel & Places (transport-air)", "order": "1658"},
+		{"emoji": "🕣", "name": "eight-thirty", "shortname": ":clock830:", "unicode": "1f563", "html": "&#128355;", "category": "Travel & Places (time)", "order": "1704"},
+		{"emoji": "🕡", "name": "six-thirty", "shortname": ":clock630:", "unicode": "1f561", "html": "&#128353;", "category": "Travel & Places (time)", "order": "1700"},
+		{"emoji": "🔡", "name": "input latin lowercase", "shortname": ":abcd:", "unicode": "1f521", "html": "&#128289;", "category": "Symbols (alphanum)", "order": "2121"},
+		{"emoji": "🚠", "name": "mountain cableway", "shortname": ":mountain_cableway:", "unicode": "1f6a0", "html": "&#128672;", "category": "Travel & Places (transport-air)", "order": "1657"},
+		{"emoji": "🈁", "name": "Japanese here button", "shortname": ":koko:", "unicode": "1f201", "html": "&#127489;", "category": "Symbols (alphanum)", "order": "2142"},
+		{"emoji": "🛂", "name": "passport control", "shortname": ":passport_control:", "unicode": "1f6c2", "html": "&#128706;", "category": "Symbols (transport-sign)", "order": "1985"},
+		{"emoji": "🚱", "name": "non-potable water", "shortname": ":non-potable_water:", "unicode": "1f6b1", "html": "&#128689;", "category": "Symbols (warning)", "order": "1996"},
+		{"emoji": "🚟", "name": "suspension railway", "shortname": ":suspension_railway:", "unicode": "1f69f", "html": "&#128671;", "category": "Travel & Places (transport-air)", "order": "1656"},
+		{"emoji": "🛄", "name": "baggage claim", "shortname": ":baggage_claim:", "unicode": "1f6c4", "html": "&#128708;", "category": "Symbols (transport-sign)", "order": "1987"},
+		{"emoji": "🚳", "name": "no bicycles", "shortname": ":no_bicycles:", "unicode": "1f6b3", "html": "&#128691;", "category": "Symbols (warning)", "order": "1993"},
+		{"emoji": "🏳‍🌈", "name": "rainbow flag", "shortname": ":rainbow_flag:", "unicode": "1F3F3 200D 1F308", "html": "&#127987;&zwj;&#127752;", "category": "Flags (flag)", "order": ""},
+		{"emoji": "🕵🏿‍♀", "name": "woman detective: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F575 1F3FF 200D 2640", "html": "&#128373;&#127999;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏾‍♀", "name": "woman detective: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F575 1F3FE 200D 2640", "html": "&#128373;&#127998;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏽‍♀", "name": "woman detective: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F575 1F3FD 200D 2640", "html": "&#128373;&#127997;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏼‍♀", "name": "woman detective: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F575 1F3FC 200D 2640", "html": "&#128373;&#127996;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏻‍♀", "name": "woman detective: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F575 1F3FB 200D 2640", "html": "&#128373;&#127995;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵‍♀", "name": "woman detective", "shortname": ":woman_detective:", "unicode": "1F575 200D 2640", "html": "&#128373;&zwj;&#9792;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏿", "name": "detective: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F575 1F3FF", "html": "&#128373;&#127999;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏾", "name": "detective: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F575 1F3FE", "html": "&#128373;&#127998;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏽", "name": "detective: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F575 1F3FD", "html": "&#128373;&#127997;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏼", "name": "detective: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F575 1F3FC", "html": "&#128373;&#127996;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏻", "name": "detective: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F575 1F3FB", "html": "&#128373;&#127995;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵", "name": "detective", "shortname": ":detective:", "unicode": "1F575", "html": "&#128373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "☹", "name": "frowning face", "shortname": ":frowning_face:", "unicode": "2639", "html": "&#9785;", "category": "Smileys & Emotion (face-concerned)", "order": ""},
+		{"emoji": "☠", "name": "skull and crossbones", "shortname": ":skull_crossbones:", "unicode": "2620", "html": "&#9760;", "category": "Smileys & Emotion (face-negative)", "order": "81"},
+		{"emoji": "🤗", "name": "hugging face", "shortname": ":hugging:", "unicode": "1f917", "html": "&#129303;", "category": "Smileys & Emotion (face-hand)", "order": "20"},
+		{"emoji": "🤖", "name": "robot", "shortname": ":robot:", "unicode": "1F916", "html": "&#129302;", "category": "Smileys & Emotion (face-costume)", "order": ""},
+		{"emoji": "🤕", "name": "face with head-bandage", "shortname": ":face_with_headbandage:", "unicode": "1F915", "html": "&#129301;", "category": "Smileys & Emotion (face-unwell)", "order": ""},
+		{"emoji": "🤔", "name": "thinking face", "shortname": ":thinking:", "unicode": "1f914", "html": "&#129300;", "category": "Smileys & Emotion (face-hand)", "order": "21"},
+		{"emoji": "🤓", "name": "nerd face", "shortname": ":nerd:", "unicode": "1f913", "html": "&#129299;", "category": "Smileys & Emotion (face-glasses)", "order": "36"},
+		{"emoji": "🤒", "name": "face with thermometer", "shortname": ":face_with_thermometer:", "unicode": "1F912", "html": "&#129298;", "category": "Smileys & Emotion (face-unwell)", "order": ""},
+		{"emoji": "🤑", "name": "money-mouth face", "shortname": ":moneymouth_face:", "unicode": "1F911", "html": "&#129297;", "category": "Smileys & Emotion (face-tongue)", "order": ""},
+		{"emoji": "🤐", "name": "zipper-mouth face", "shortname": ":zipper_mouth:", "unicode": "1f910", "html": "&#129296;", "category": "Smileys & Emotion (face-neutral-skeptical)", "order": "30"},
+		{"emoji": "🙄", "name": "face with rolling eyes", "shortname": ":rolling_eyes:", "unicode": "1f644", "html": "&#128580;", "category": "Smileys & Emotion (face-neutral-skeptical)", "order": "25"},
+		{"emoji": "🙃", "name": "upside-down face", "shortname": ":upside_down:", "unicode": "1f643", "html": "&#128579;", "category": "Smileys & Emotion (face-smiling)", "order": "45"},
+		{"emoji": "🙂", "name": "slightly smiling face", "shortname": ":slight_smile:", "unicode": "1f642", "html": "&#128578;", "category": "Smileys & Emotion (face-smiling)", "order": "19"},
+		{"emoji": "🙁", "name": "slightly frowning face", "shortname": ":slightly_frowning_face:", "unicode": "1F641", "html": "&#128577;", "category": "Smileys & Emotion (face-concerned)", "order": ""},
+		{"emoji": "🤘🏿", "name": "sign of the horns: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F918 1F3FF", "html": "&#129304;&#127999;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤘🏾", "name": "sign of the horns: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F918 1F3FE", "html": "&#129304;&#127998;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤘🏽", "name": "sign of the horns: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F918 1F3FD", "html": "&#129304;&#127997;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤘🏼", "name": "sign of the horns: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F918 1F3FC", "html": "&#129304;&#127996;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤘🏻", "name": "sign of the horns: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F918 1F3FB", "html": "&#129304;&#127995;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤘", "name": "sign of the horns", "shortname": ":sign_of_the_horns:", "unicode": "1F918", "html": "&#129304;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🖖🏿", "name": "vulcan salute: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F596 1F3FF", "html": "&#128406;&#127999;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖖🏾", "name": "vulcan salute: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F596 1F3FE", "html": "&#128406;&#127998;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖖🏽", "name": "vulcan salute: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F596 1F3FD", "html": "&#128406;&#127997;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖖🏼", "name": "vulcan salute: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F596 1F3FC", "html": "&#128406;&#127996;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖖🏻", "name": "vulcan salute: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F596 1F3FB", "html": "&#128406;&#127995;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖖", "name": "vulcan salute", "shortname": ":vulcan_salute:", "unicode": "1F596", "html": "&#128406;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖕🏿", "name": "middle finger: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F595 1F3FF", "html": "&#128405;&#127999;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "🖕🏾", "name": "middle finger: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F595 1F3FE", "html": "&#128405;&#127998;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "🖕🏽", "name": "middle finger: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F595 1F3FD", "html": "&#128405;&#127997;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "🖕🏼", "name": "middle finger: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F595 1F3FC", "html": "&#128405;&#127996;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "🖕🏻", "name": "middle finger: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F595 1F3FB", "html": "&#128405;&#127995;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "🖕", "name": "middle finger", "shortname": ":middle_finger:", "unicode": "1f595", "html": "&#128405;", "category": "People & Body (hand-single-finger)", "order": "1116"},
+		{"emoji": "🖐🏿", "name": "hand with fingers splayed: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F590 1F3FF", "html": "&#128400;&#127999;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖐🏾", "name": "hand with fingers splayed: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F590 1F3FE", "html": "&#128400;&#127998;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖐🏽", "name": "hand with fingers splayed: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F590 1F3FD", "html": "&#128400;&#127997;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖐🏼", "name": "hand with fingers splayed: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F590 1F3FC", "html": "&#128400;&#127996;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖐🏻", "name": "hand with fingers splayed: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F590 1F3FB", "html": "&#128400;&#127995;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖐", "name": "hand with fingers splayed", "shortname": ":hand_with_fingers_splayed:", "unicode": "1F590", "html": "&#128400;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "✍🏿", "name": "writing hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "270D 1F3FF", "html": "&#9997;&#127999;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "✍🏾", "name": "writing hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "270D 1F3FE", "html": "&#9997;&#127998;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "✍🏽", "name": "writing hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "270D 1F3FD", "html": "&#9997;&#127997;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "✍🏼", "name": "writing hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "270D 1F3FC", "html": "&#9997;&#127996;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "✍🏻", "name": "writing hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "270D 1F3FB", "html": "&#9997;&#127995;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "✍", "name": "writing hand", "shortname": ":writing_hand:", "unicode": "270d", "html": "&#9997;", "category": "People & Body (hand-prop)", "order": "1230"},
+		{"emoji": "🕶", "name": "sunglasses", "shortname": ":dark_sunglasses:", "unicode": "1f576", "html": "&#128374;", "category": "Objects (clothing)", "order": "1315"},
+		{"emoji": "👁‍🗨", "name": "eye in speech bubble", "shortname": ":eye_speachbubble:", "unicode": "1F441 200D 1F5E8", "html": "&#128065;&zwj;&#128488;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "👁", "name": "eye", "shortname": ":eye:", "unicode": "1f441", "html": "&#128065;", "category": "People & Body (body-parts)", "order": "1280"},
+		{"emoji": "🏋🏿‍♀", "name": "woman lifting weights: dark skin tone", "shortname": ":weightlifter_woman_dt:", "unicode": "1F3CB 1F3FF 200D 2640", "html": "&#127947;&#127999;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏾‍♀", "name": "woman lifting weights: medium-dark skin tone", "shortname": ":weightlifter_woman_mdt:", "unicode": "1F3CB 1F3FE 200D 2640", "html": "&#127947;&#127998;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏽‍♀", "name": "woman lifting weights: medium skin tone", "shortname": ":weightlifter_woman_mt:", "unicode": "1F3CB 1F3FD 200D 2640", "html": "&#127947;&#127997;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏼‍♀", "name": "woman lifting weights: medium-light skin tone", "shortname": ":weightlifter_woman_mlt:", "unicode": "1F3CB 1F3FC 200D 2640", "html": "&#127947;&#127996;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏻‍♀", "name": "woman lifting weights: light skin tone", "shortname": ":weightlifter_woman_lt:", "unicode": "1F3CB 1F3FB 200D 2640", "html": "&#127947;&#127995;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋‍♀", "name": "woman lifting weights", "shortname": ":weightlifter_woman:", "unicode": "1F3CB 200D 2640", "html": "&#127947;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏿", "name": "person lifting weights: dark skin tone", "shortname": ":weightlifter_dt:", "unicode": "1F3CB 1F3FF", "html": "&#127947;&#127999;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏾", "name": "person lifting weights: medium-dark skin tone", "shortname": ":weightlifter_mdt:", "unicode": "1F3CB 1F3FE", "html": "&#127947;&#127998;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏽", "name": "person lifting weights: medium skin tone", "shortname": ":weightlifter_mt:", "unicode": "1F3CB 1F3FD", "html": "&#127947;&#127997;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏼", "name": "person lifting weights: medium-light skin tone", "shortname": ":weightlifter_mlt:", "unicode": "1F3CB 1F3FC", "html": "&#127947;&#127996;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏻", "name": "person lifting weights: light skin tone", "shortname": ":weightlifter_lt:", "unicode": "1F3CB 1F3FB", "html": "&#127947;&#127995;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋", "name": "person lifting weights", "shortname": ":weightlifter:", "unicode": "1F3CB", "html": "&#127947;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏿‍♀", "name": "woman bouncing ball: dark skin tone", "shortname": ":basketballer_woman_dt:", "unicode": ":basketballer:", "html": "&#9977;&#127999;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏾‍♀", "name": "woman bouncing ball: medium-dark skin tone", "shortname": ":basketballer_woman_mdt:", "unicode": ":basketballer:", "html": "&#9977;&#127998;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏽‍♀", "name": "woman bouncing ball: medium skin tone", "shortname": ":basketballer_woman_mt:", "unicode": ":basketballer:", "html": "&#9977;&#127997;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏼‍♀", "name": "woman bouncing ball: medium-light skin tone", "shortname": ":basketballer_woman_mlt:", "unicode": ":basketballer:", "html": "&#9977;&#127996;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏻‍♀", "name": "woman bouncing ball: light skin tone", "shortname": ":basketballer_woman_lt:", "unicode": ":basketballer:", "html": "&#9977;&#127995;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹‍♀", "name": "woman bouncing ball", "shortname": ":woman_bouncing_ball:", "unicode": ":basketballer_woman:", "html": "&#9977;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏿", "name": "person bouncing ball: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": ":basketballer_dt:", "html": "&#9977;&#127999;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏾", "name": "person bouncing ball: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": ":basketballer_mdt:", "html": "&#9977;&#127998;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏽", "name": "person bouncing ball: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": ":basketballer_mt:", "html": "&#9977;&#127997;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏼", "name": "person bouncing ball: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": ":basketballer_mlt:", "html": "&#9977;&#127996;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏻", "name": "person bouncing ball: light skin tone", "shortname": ":basketballer_lt:", "unicode": "26F9 1F3FB", "html": "&#9977;&#127995;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹", "name": "person bouncing ball", "shortname": ":basketballer:", "unicode": "26F9", "html": "&#9977;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🕴", "name": "man in suit levitating", "shortname": ":man_in_suit:", "unicode": "1f574", "html": "&#128372;", "category": "People & Body (person-activity)", "order": "784"},
+		{"emoji": "🏌", "name": "person golfing", "shortname": ":golfer:", "unicode": "1f3cc", "html": "&#127948;", "category": "People & Body (person-sport)", "order": "782"},
+		{"emoji": "🏌‍♀", "name": "woman golfing", "shortname": ":golfer_woman:", "unicode": "1F3CC 200D 2640", "html": "&#127948;&zwj;&#9792;", "category": "People & Body (person-sport)", "order": "783"},
+		{"emoji": "*️⃣", "name": "keycap: #", "shortname": "*", "unicode": "0023 FE0F 20E3", "html": "&#42;", "category": "Symbols (keycap)", "order": "2118"},
+		{"emoji": "❣️", "name": "heart exclamation", "shortname": ":heart_exclamation:", "unicode": "2763", "html": "&#10083;", "category": "Smileys & Emotion (emotion)", "order": "1300"},
+		{"emoji": "✡️", "name": "star of David", "shortname": ":star_of_david:", "unicode": "2721", "html": "&#10017;", "category": "Symbols (religion)", "order": "2026"},
+		{"emoji": "✝️", "name": "latin cross", "shortname": ":cross:", "unicode": "271d", "html": "&#10013;", "category": "Symbols (religion)", "order": "2029"},
+		{"emoji": "⚜", "name": "fleur-de-lis", "shortname": ":fleur-de-lis:", "unicode": "269c", "html": "&#9884;", "category": "Symbols (other-symbol)", "order": "2074"},
+		{"emoji": "⚛", "name": "atom symbol", "shortname": ":atom:", "unicode": "269b", "html": "&#9883;", "category": "Symbols (religion)", "order": "2024"},
+		{"emoji": "☸", "name": "wheel of dharma", "shortname": ":wheel_of_dharma:", "unicode": "2638", "html": "&#9784;", "category": "Symbols (religion)", "order": "2027"},
+		{"emoji": "☯", "name": "yin yang", "shortname": ":yin_yang:", "unicode": "262f", "html": "&#9775;", "category": "Symbols (religion)", "order": "2028"},
+		{"emoji": "☮", "name": "peace symbol", "shortname": ":peace:", "unicode": "262e", "html": "&#9774;", "category": "Symbols (religion)", "order": "2032"},
+		{"emoji": "☪", "name": "star and crescent", "shortname": ":star_and_crescent:", "unicode": "262a", "html": "&#9770;", "category": "Symbols (religion)", "order": "2031"},
+		{"emoji": "☦", "name": "orthodox cross", "shortname": ":orthodox_cross:", "unicode": "2626", "html": "&#9766;", "category": "Symbols (religion)", "order": "2030"},
+		{"emoji": "☣", "name": "biohazard", "shortname": ":biohazard:", "unicode": "2623", "html": "&#9763;", "category": "Symbols (warning)", "order": "2001"},
+		{"emoji": "☢", "name": "radioactive", "shortname": ":radioactive:", "unicode": "2622", "html": "&#9762;", "category": "Symbols (warning)", "order": "2000"},
+		{"emoji": "🛐", "name": "place of worship", "shortname": ":place_of_worship:", "unicode": "1f6d0", "html": "&#128720;", "category": "Symbols (religion)", "order": "2023"},
+		{"emoji": "🗯", "name": "right anger bubble", "shortname": ":anger_right:", "unicode": "1f5ef", "html": "&#128495;", "category": "Smileys & Emotion (emotion)", "order": "1311"},
+		{"emoji": "🕎", "name": "menorah", "shortname": ":menorah:", "unicode": "1f54e", "html": "&#128334;", "category": "Symbols (religion)", "order": "2033"},
+		{"emoji": "🕉", "name": "om", "shortname": ":om_symbol:", "unicode": "1f549", "html": "&#128329;", "category": "Symbols (religion)", "order": "2025"},
+		{"emoji": "⚱", "name": "funeral urn", "shortname": ":funeral_urn:", "unicode": "26B1", "html": "&#9905;", "category": "Objects (other-object)", "order": ""},
+		{"emoji": "⚰", "name": "coffin", "shortname": ":coffin:", "unicode": "26b0", "html": "&#9904;", "category": "Objects (other-object)", "order": "1970"},
+		{"emoji": "⚙", "name": "gear", "shortname": ":gear:", "unicode": "2699", "html": "&#9881;", "category": "Objects (tool)", "order": "1961"},
+		{"emoji": "⚗", "name": "alembic", "shortname": ":alembic:", "unicode": "2697", "html": "&#9879;", "category": "Objects (science)", "order": "1963"},
+		{"emoji": "⚖", "name": "balance scale", "shortname": ":scales:", "unicode": "2696", "html": "&#9878;", "category": "Objects (tool)", "order": "1964"},
+		{"emoji": "⚔", "name": "crossed swords", "shortname": ":crossed_swords:", "unicode": "2694", "html": "&#9876;", "category": "Objects (tool)", "order": "1955"},
+		{"emoji": "⌨", "name": "keyboard", "shortname": ":keyboard:", "unicode": "2328", "html": "&#9000;", "category": "Objects (computer)", "order": "1849"},
+		{"emoji": "🛢", "name": "oil drum", "shortname": ":oil_drum:", "unicode": "1F6E2", "html": "&#128738;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🛡", "name": "shield", "shortname": ":shield:", "unicode": "1f6e1", "html": "&#128737;", "category": "Objects (tool)", "order": "1958"},
+		{"emoji": "🛠", "name": "hammer and wrench", "shortname": ":hammer_and_wrench:", "unicode": "1F6E0", "html": "&#128736;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "🛏", "name": "bed", "shortname": ":bed:", "unicode": "1f6cf", "html": "&#128719;", "category": "Objects (household)", "order": "1669"},
+		{"emoji": "🛎", "name": "bellhop bell", "shortname": ":bellhop_bell:", "unicode": "1F6CE", "html": "&#128718;", "category": "Travel & Places (hotel)", "order": ""},
+		{"emoji": "🛍", "name": "shopping bags", "shortname": ":shopping_bags:", "unicode": "1f6cd", "html": "&#128717;", "category": "Objects (clothing)", "order": "1326"},
+		{"emoji": "🛌", "name": "person in bed", "shortname": ":sleeping_accommodation:", "unicode": "1f6cc", "html": "&#128716;", "category": "People & Body (person-resting)", "order": "1663"},
+		{"emoji": "🛋", "name": "couch and lamp", "shortname": ":couch_and_lamp:", "unicode": "1F6CB", "html": "&#128715;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🗳", "name": "ballot box with ballot", "shortname": ":ballot_box:", "unicode": "1f5f3", "html": "&#128499;", "category": "Objects (mail)", "order": "1913"},
+		{"emoji": "🗡", "name": "dagger", "shortname": ":dagger:", "unicode": "1F5E1", "html": "&#128481;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "🗞", "name": "rolled-up newspaper", "shortname": ":rolledup_newspaper:", "unicode": "1F5DE", "html": "&#128478;", "category": "Objects (book-paper)", "order": ""},
+		{"emoji": "🗝", "name": "old key", "shortname": ":old_key:", "unicode": "1F5DD", "html": "&#128477;", "category": "Objects (lock)", "order": ""},
+		{"emoji": "🗜", "name": "clamp", "shortname": ":compression:", "unicode": "1f5dc", "html": "&#128476;", "category": "Objects (tool)", "order": "1962"},
+		{"emoji": "🗓", "name": "spiral calendar", "shortname": ":spiral_calendar:", "unicode": "1F5D3", "html": "&#128467;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🗒", "name": "spiral notepad", "shortname": ":spiral_notepad:", "unicode": "1F5D2", "html": "&#128466;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🗑", "name": "wastebasket", "shortname": ":wastebasket:", "unicode": "1f5d1", "html": "&#128465;", "category": "Objects (office)", "order": "1943"},
+		{"emoji": "🗄", "name": "file cabinet", "shortname": ":file_cabinet:", "unicode": "1f5c4", "html": "&#128452;", "category": "Objects (office)", "order": "1942"},
+		{"emoji": "🗃", "name": "card file box", "shortname": ":card_file_box:", "unicode": "1F5C3", "html": "&#128451;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🗂", "name": "card index dividers", "shortname": ":card_index_dividers:", "unicode": "1F5C2", "html": "&#128450;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🖼", "name": "framed picture", "shortname": ":framed_picture:", "unicode": "1F5BC", "html": "&#128444;", "category": "Activities (arts & crafts)", "order": ""},
+		{"emoji": "🖲", "name": "trackball", "shortname": ":trackball:", "unicode": "1f5b2", "html": "&#128434;", "category": "Objects (computer)", "order": "1851"},
+		{"emoji": "🖱", "name": "computer mouse", "shortname": ":computer_mouse:", "unicode": "1F5B1", "html": "&#128433;", "category": "Objects (computer)", "order": ""},
+		{"emoji": "🖨", "name": "printer", "shortname": ":printer:", "unicode": "1f5a8", "html": "&#128424;", "category": "Objects (computer)", "order": "1848"},
+		{"emoji": "🖥", "name": "desktop computer", "shortname": ":desktop_computer:", "unicode": "1F5A5", "html": "&#128421;", "category": "Objects (computer)", "order": ""},
+		{"emoji": "🖍", "name": "crayon", "shortname": ":crayon:", "unicode": "1F58D", "html": "&#128397;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "🖌", "name": "paintbrush", "shortname": ":paintbrush:", "unicode": "1F58C", "html": "&#128396;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "🖋", "name": "fountain pen", "shortname": ":fountain_pen:", "unicode": "1F58B", "html": "&#128395;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "🖊", "name": "pen", "shortname": ":pen:", "unicode": "1F58A", "html": "&#128394;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "🖇", "name": "linked paperclips", "shortname": ":linked_paperclips:", "unicode": "1F587", "html": "&#128391;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🕹", "name": "joystick", "shortname": ":joystick:", "unicode": "1f579", "html": "&#128377;", "category": "Activities (game)", "order": "1805"},
+		{"emoji": "🕳", "name": "hole", "shortname": ":hole:", "unicode": "1f573", "html": "&#128371;", "category": "Smileys & Emotion (emotion)", "order": "1313"},
+		{"emoji": "🕰", "name": "mantelpiece clock", "shortname": ":mantelpiece_clock:", "unicode": "1F570", "html": "&#128368;", "category": "Travel & Places (time)", "order": ""},
+		{"emoji": "🕯", "name": "candle", "shortname": ":candle:", "unicode": "1f56f", "html": "&#128367;", "category": "Objects (light & video)", "order": "1870"},
+		{"emoji": "📿", "name": "prayer beads", "shortname": ":prayer_beads:", "unicode": "1f4ff", "html": "&#128255;", "category": "Objects (clothing)", "order": "1338"},
+		{"emoji": "📽", "name": "film projector", "shortname": ":film_projector:", "unicode": "1F4FD", "html": "&#128253;", "category": "Objects (light & video)", "order": ""},
+		{"emoji": "📸", "name": "camera with flash", "shortname": ":camera_with_flash:", "unicode": "1f4f8", "html": "&#128248;", "category": "Objects (light & video)", "order": "1862"},
+		{"emoji": "🏺", "name": "amphora", "shortname": ":amphora:", "unicode": "1f3fa", "html": "&#127994;", "category": "Food & Drink (dishware)", "order": "1537"},
+		{"emoji": "🏷", "name": "label", "shortname": ":label:", "unicode": "1f3f7", "html": "&#127991;", "category": "Objects (book-paper)", "order": "1890"},
+		{"emoji": "🏴", "name": "black flag", "shortname": ":flag_black:", "unicode": "1f3f4", "html": "&#127988;", "category": "Flags (flag)", "order": "2184"},
+		{"emoji": "🏳", "name": "white flag", "shortname": ":flag_white:", "unicode": "1f3f3", "html": "&#127987;", "category": "Flags (flag)", "order": "2185"},
+		{"emoji": "🎞", "name": "film frames", "shortname": ":film_frames:", "unicode": "1f39e", "html": "&#127902;", "category": "Objects (light & video)", "order": "1857"},
+		{"emoji": "🎛", "name": "control knobs", "shortname": ":control_knobs:", "unicode": "1f39b", "html": "&#127899;", "category": "Objects (music)", "order": "1828"},
+		{"emoji": "🎚", "name": "level slider", "shortname": ":level_slider:", "unicode": "1f39a", "html": "&#127898;", "category": "Objects (music)", "order": "1827"},
+		{"emoji": "🎙", "name": "studio microphone", "shortname": ":studio_microphone:", "unicode": "1F399", "html": "&#127897;", "category": "Objects (music)", "order": ""},
+		{"emoji": "🌡", "name": "thermometer", "shortname": ":thermometer:", "unicode": "1f321", "html": "&#127777;", "category": "Travel & Places (sky & weather)", "order": "1723"},
+		{"emoji": "🛳", "name": "passenger ship", "shortname": ":passenger_ship:", "unicode": "1F6F3", "html": "&#128755;", "category": "Travel & Places (transport-water)", "order": ""},
+		{"emoji": "🛰", "name": "satellite", "shortname": ":satellite:", "unicode": "1F6F0", "html": "&#128752;", "category": "Travel & Places (transport-air)", "order": ""},
+		{"emoji": "🛬", "name": "airplane arrival", "shortname": ":airplane_arriving:", "unicode": "1f6ec", "html": "&#128748;", "category": "Travel & Places (transport-air)", "order": "1653"},
+		{"emoji": "🛫", "name": "airplane departure", "shortname": ":airplane_departure:", "unicode": "1f6eb", "html": "&#128747;", "category": "Travel & Places (transport-air)", "order": "1652"},
+		{"emoji": "🛩", "name": "small airplane", "shortname": ":small_airplane:", "unicode": "1F6E9", "html": "&#128745;", "category": "Travel & Places (transport-air)", "order": ""},
+		{"emoji": "🛥", "name": "motor boat", "shortname": ":motor_boat:", "unicode": "1F6E5", "html": "&#128741;", "category": "Travel & Places (transport-water)", "order": ""},
+		{"emoji": "🛤", "name": "railway track", "shortname": ":railway_track:", "unicode": "1f6e4", "html": "&#128740;", "category": "Travel & Places (transport-ground)", "order": "1635"},
+		{"emoji": "🛣", "name": "motorway", "shortname": ":motorway:", "unicode": "1f6e3", "html": "&#128739;", "category": "Travel & Places (transport-ground)", "order": "1634"},
+		{"emoji": "🗺", "name": "world map", "shortname": ":world_map:", "unicode": "1F5FA", "html": "&#128506;", "category": "Travel & Places (place-map)", "order": ""},
+		{"emoji": "🕍", "name": "synagogue", "shortname": ":synagogue:", "unicode": "1f54d", "html": "&#128333;", "category": "Travel & Places (place-religious)", "order": "1579"},
+		{"emoji": "🕌", "name": "mosque", "shortname": ":mosque:", "unicode": "1f54c", "html": "&#128332;", "category": "Travel & Places (place-religious)", "order": "1578"},
+		{"emoji": "🕋", "name": "kaaba", "shortname": ":kaaba:", "unicode": "1f54b", "html": "&#128331;", "category": "Travel & Places (place-religious)", "order": "1581"},
+		{"emoji": "🏟", "name": "stadium", "shortname": ":stadium:", "unicode": "1f3df", "html": "&#127967;", "category": "Travel & Places (place-building)", "order": "1553"},
+		{"emoji": "🏞", "name": "national park", "shortname": ":national_park:", "unicode": "1F3DE", "html": "&#127966;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "🏝", "name": "desert island", "shortname": ":desert_island:", "unicode": "1F3DD", "html": "&#127965;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "🏜", "name": "desert", "shortname": ":desert:", "unicode": "1f3dc", "html": "&#127964;", "category": "Travel & Places (place-geographic)", "order": "1550"},
+		{"emoji": "🏛", "name": "classical building", "shortname": ":classical_building:", "unicode": "1f3db", "html": "&#127963;", "category": "Travel & Places (place-building)", "order": "1554"},
+		{"emoji": "🏚", "name": "derelict house", "shortname": ":derelict_house:", "unicode": "1F3DA", "html": "&#127962;", "category": "Travel & Places (place-building)", "order": ""},
+		{"emoji": "🏙", "name": "cityscape", "shortname": ":cityscape:", "unicode": "1f3d9", "html": "&#127961;", "category": "Travel & Places (place-other)", "order": "1557"},
+		{"emoji": "🏘", "name": "houses", "shortname": ":houses:", "unicode": "1F3D8", "html": "&#127960;", "category": "Travel & Places (place-building)", "order": ""},
+		{"emoji": "🏗", "name": "building construction", "shortname": ":building_construction:", "unicode": "1F3D7", "html": "&#127959;", "category": "Travel & Places (place-building)", "order": ""},
+		{"emoji": "🏖", "name": "beach with umbrella", "shortname": ":beach_with_umbrella:", "unicode": "1F3D6", "html": "&#127958;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "🏕", "name": "camping", "shortname": ":camping:", "unicode": "1f3d5", "html": "&#127957;", "category": "Travel & Places (place-geographic)", "order": "1548"},
+		{"emoji": "🏔", "name": "snow-capped mountain", "shortname": ":snowcapped_mountain:", "unicode": "1F3D4", "html": "&#127956;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "🏎", "name": "racing car", "shortname": ":racing_car:", "unicode": "1F3CE", "html": "&#127950;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🏍", "name": "motorcycle", "shortname": ":motorcycle:", "unicode": "1F3CD", "html": "&#127949;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🏹", "name": "bow and arrow", "shortname": ":bow_and_arrow:", "unicode": "1f3f9", "html": "&#127993;", "category": "Objects (tool)", "order": "1957"},
+		{"emoji": "🏸", "name": "badminton", "shortname": ":badminton:", "unicode": "1F3F8", "html": "&#127992;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🏵", "name": "rosette", "shortname": ":rosette:", "unicode": "1f3f5", "html": "&#127989;", "category": "Animals & Nature (plant-flower)", "order": "1430"},
+		{"emoji": "🏓", "name": "ping pong", "shortname": ":ping_pong:", "unicode": "1F3D3", "html": "&#127955;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🏒", "name": "ice hockey", "shortname": ":ice_hockey:", "unicode": "1F3D2", "html": "&#127954;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🏑", "name": "field hockey", "shortname": ":field_hockey:", "unicode": "1F3D1", "html": "&#127953;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🏐", "name": "volleyball", "shortname": ":volleyball:", "unicode": "1f3d0", "html": "&#127952;", "category": "Activities (sport)", "order": "1784"},
+		{"emoji": "🏏", "name": "cricket game", "shortname": ":cricket_game:", "unicode": "1F3CF", "html": "&#127951;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🏅", "name": "sports medal", "shortname": ":medal:", "unicode": "1f3c5", "html": "&#127941;", "category": "Activities (award-medal)", "order": "1777"},
+		{"emoji": "🎟", "name": "admission tickets", "shortname": ":admission_tickets:", "unicode": "1F39F", "html": "&#127903;", "category": "Activities (event)", "order": ""},
+		{"emoji": "🎗", "name": "reminder ribbon", "shortname": ":reminder_ribbon:", "unicode": "1f397", "html": "&#127895;", "category": "Activities (event)", "order": "1772"},
+		{"emoji": "🎖", "name": "military medal", "shortname": ":military_medal:", "unicode": "1F396", "html": "&#127894;", "category": "Activities (award-medal)", "order": ""},
+		{"emoji": "🧀", "name": "cheese wedge", "shortname": ":cheese_wedge:", "unicode": "1F9C0", "html": "&#129472;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🍿", "name": "popcorn", "shortname": ":popcorn:", "unicode": "1f37f", "html": "&#127871;", "category": "Food & Drink (food-prepared)", "order": "1494"},
+		{"emoji": "🍾", "name": "bottle with popping cork", "shortname": ":champagne:", "unicode": "1f37e", "html": "&#127870;", "category": "Food & Drink (drink)", "order": "1525"},
+		{"emoji": "🍽", "name": "fork and knife with plate", "shortname": ":fork_and_knife_with_plate:", "unicode": "1F37D", "html": "&#127869;", "category": "Food & Drink (dishware)", "order": ""},
+		{"emoji": "🌶", "name": "hot pepper", "shortname": ":hot_pepper:", "unicode": "1f336", "html": "&#127798;", "category": "Food & Drink (food-vegetable)", "order": "1469"},
+		{"emoji": "🌯", "name": "burrito", "shortname": ":burrito:", "unicode": "1f32f", "html": "&#127791;", "category": "Food & Drink (food-prepared)", "order": "1487"},
+		{"emoji": "🌮", "name": "taco", "shortname": ":taco:", "unicode": "1f32e", "html": "&#127790;", "category": "Food & Drink (food-prepared)", "order": "1486"},
+		{"emoji": "🌭", "name": "hot dog", "shortname": ":hotdog:", "unicode": "1f32d", "html": "&#127789;", "category": "Food & Drink (food-prepared)", "order": "1485"},
+		{"emoji": "☘", "name": "shamrock", "shortname": ":shamrock:", "unicode": "2618", "html": "&#9752;", "category": "Animals & Nature (plant-other)", "order": "1444"},
+		{"emoji": "☄", "name": "comet", "shortname": ":comet:", "unicode": "2604", "html": "&#9732;", "category": "Travel & Places (sky & weather)", "order": "1752"},
+		{"emoji": "☃️", "name": "snowman", "shortname": ":snowman:", "unicode": "2603 FE0F", "html": "&#9731;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "☂️", "name": "umbrella", "shortname": ":umbrella:", "unicode": "2602 FE0F", "html": "&#9730;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🦄", "name": "unicorn", "shortname": ":unicorn:", "unicode": "1F984", "html": "&#129412;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦃", "name": "turkey", "shortname": ":turkey:", "unicode": "1f983", "html": "&#129411;", "category": "Animals & Nature (animal-bird)", "order": "1387"},
+		{"emoji": "🦂", "name": "scorpion", "shortname": ":scorpion:", "unicode": "1f982", "html": "&#129410;", "category": "Animals & Nature (animal-bug)", "order": "1426"},
+		{"emoji": "🦁", "name": "lion", "shortname": ":lion_face:", "unicode": "1f981", "html": "&#129409;", "category": "Animals & Nature (animal-mammal)", "order": "1352"},
+		{"emoji": "🦀", "name": "crab", "shortname": ":crab:", "unicode": "1f980", "html": "&#129408;", "category": "Food & Drink (food-marine)", "order": "1415"},
+		{"emoji": "🕸", "name": "spider web", "shortname": ":spider_web:", "unicode": "1f578", "html": "&#128376;", "category": "Animals & Nature (animal-bug)", "order": "1425"},
+		{"emoji": "🕷", "name": "spider", "shortname": ":spider:", "unicode": "1f577", "html": "&#128375;", "category": "Animals & Nature (animal-bug)", "order": "1424"},
+		{"emoji": "🕊", "name": "dove", "shortname": ":dove:", "unicode": "1F54A", "html": "&#128330;", "category": "Animals & Nature (animal-bird)", "order": ""},
+		{"emoji": "🐿", "name": "chipmunk", "shortname": ":chipmunk:", "unicode": "1f43f", "html": "&#128063;", "category": "Animals & Nature (animal-mammal)", "order": "1381"},
+		{"emoji": "🌬", "name": "wind face", "shortname": ":wind_blowing_face:", "unicode": "1f32c", "html": "&#127788;", "category": "Travel & Places (sky & weather)", "order": "1741"},
+		{"emoji": "🌫", "name": "fog", "shortname": ":fog:", "unicode": "1f32b", "html": "&#127787;", "category": "Travel & Places (sky & weather)", "order": "1740"},
+		{"emoji": "🌪", "name": "tornado", "shortname": ":tornado:", "unicode": "1F32A", "html": "&#127786;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌩", "name": "cloud with lightning", "shortname": ":cloud_with_lightning:", "unicode": "1F329", "html": "&#127785;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌨", "name": "cloud with snow", "shortname": ":cloud_with_snow:", "unicode": "1F328", "html": "&#127784;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌧", "name": "cloud with rain", "shortname": ":cloud_with_rain:", "unicode": "1F327", "html": "&#127783;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌦", "name": "sun behind rain cloud", "shortname": ":sun_behind_rain_cloud:", "unicode": "1F326", "html": "&#127782;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌥", "name": "sun behind large cloud", "shortname": ":sun_behind_large_cloud:", "unicode": "1F325", "html": "&#127781;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌤", "name": "sun behind small cloud", "shortname": ":sun_behind_small_cloud:", "unicode": "1F324", "html": "&#127780;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🗣", "name": "speaking head", "shortname": ":speaking_head:", "unicode": "1F5E3", "html": "&#128483;", "category": "People & Body (person-symbol)", "order": ""},
+		{"emoji": "⏺", "name": "record button", "shortname": ":record_button:", "unicode": "23FA", "html": "&#9210;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏹", "name": "stop button", "shortname": ":stop_button:", "unicode": "23F9", "html": "&#9209;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏸", "name": "pause button", "shortname": ":pause_button:", "unicode": "23F8", "html": "&#9208;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏯", "name": "play or pause button", "shortname": ":play_pause:", "unicode": "23ef", "html": "&#9199;", "category": "Symbols (av-symbol)", "order": "2054"},
+		{"emoji": "⏮", "name": "last track button", "shortname": ":track_previous:", "unicode": "23ee", "html": "&#9198;", "category": "Symbols (av-symbol)", "order": "2057"},
+		{"emoji": "⏭", "name": "next track button", "shortname": ":track_next:", "unicode": "23ed", "html": "&#9197;", "category": "Symbols (av-symbol)", "order": "2053"},
+		{"emoji": "⛱", "name": "umbrella on ground", "shortname": ":beach_umbrella:", "unicode": "26f1", "html": "&#9969;", "category": "Travel & Places (sky & weather)", "order": "1747"},
+		{"emoji": "⛓", "name": "chains", "shortname": ":chains:", "unicode": "26d3", "html": "&#9939;", "category": "Objects (tool)", "order": "1966"},
+		{"emoji": "⛏", "name": "pick", "shortname": ":pick:", "unicode": "26cf", "html": "&#9935;", "category": "Objects (tool)", "order": "1951"},
+		{"emoji": "⚒", "name": "hammer and pick", "shortname": ":hammer_and_pick:", "unicode": "2692", "html": "&#9874;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "⏲", "name": "timer clock", "shortname": ":timer_clock:", "unicode": "23F2", "html": "&#9202;", "category": "Travel & Places (time)", "order": ""},
+		{"emoji": "⏱", "name": "stopwatch", "shortname": ":stopwatch:", "unicode": "23f1", "html": "&#9201;", "category": "Travel & Places (time)", "order": "1684"},
+		{"emoji": "⛴", "name": "ferry", "shortname": ":ferry:", "unicode": "26f4", "html": "&#9972;", "category": "Travel & Places (transport-water)", "order": "1647"},
+		{"emoji": "⛰", "name": "mountain", "shortname": ":mountain:", "unicode": "26f0", "html": "&#9968;", "category": "Travel & Places (place-geographic)", "order": "1545"},
+		{"emoji": "⛩", "name": "shinto shrine", "shortname": ":shinto_shrine:", "unicode": "2.6E+10", "html": "&#9961;", "category": "Travel & Places (place-religious)", "order": "1580"},
+		{"emoji": "⛸", "name": "ice skate", "shortname": ":ice_skate:", "unicode": "26f8", "html": "&#9976;", "category": "Activities (sport)", "order": "1800"},
+		{"emoji": "⛷", "name": "skier", "shortname": ":skier:", "unicode": "26f7", "html": "&#9975;", "category": "People & Body (person-sport)", "order": "775"},
+		{"emoji": "⛈", "name": "cloud with lightning and rain", "shortname": ":cloud_with_lightning_and_rain:", "unicode": "26C8", "html": "&#9928;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "⛑", "name": "rescue worker’s helmet", "shortname": ":rescue_worker’s_helmet:", "unicode": "26D1", "html": "&#9937;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🇦🇨", "name": "flag: Ascension Island", "shortname": ":flag_ac:", "unicode": "1f1e6-1f1e8", "html": "&#127462;&#127464;", "category": "Flags (country-flag)", "order": "2187"},
+		{"emoji": "🇦🇩", "name": "flag: Andorra", "shortname": ":flag_ad:", "unicode": "1f1e6-1f1e9", "html": "&#127462;&#127465;", "category": "Flags (country-flag)", "order": "2188"},
+		{"emoji": "🇦🇪", "name": "flag: United Arab Emirates", "shortname": ":flag_ae:", "unicode": "1f1e6-1f1ea", "html": "&#127462;&#127466;", "category": "Flags (country-flag)", "order": "2189"},
+		{"emoji": "🇦🇫", "name": "flag: Afghanistan", "shortname": ":flag_af:", "unicode": "1f1e6-1f1eb", "html": "&#127462;&#127467;", "category": "Flags (country-flag)", "order": "2190"},
+		{"emoji": "🇦🇬", "name": "flag: Antigua & Barbuda", "shortname": ":flag_ag:", "unicode": "1f1e6-1f1ec", "html": "&#127462;&#127468;", "category": "Flags (country-flag)", "order": "2191"},
+		{"emoji": "🇦🇮", "name": "flag: Anguilla", "shortname": ":flag_ai:", "unicode": "1f1e6-1f1ee", "html": "&#127462;&#127470;", "category": "Flags (country-flag)", "order": "2192"},
+		{"emoji": "🇦🇱", "name": "flag: Albania", "shortname": ":flag_al:", "unicode": "1f1e6-1f1f1", "html": "&#127462;&#127473;", "category": "Flags (country-flag)", "order": "2193"},
+		{"emoji": "🇦🇲", "name": "flag: Armenia", "shortname": ":flag_am:", "unicode": "1f1e6-1f1f2", "html": "&#127462;&#127474;", "category": "Flags (country-flag)", "order": "2194"},
+		{"emoji": "🇦🇴", "name": "flag: Angola", "shortname": ":flag-ao:", "unicode": "1f1e6-1f1f4", "html": "&#127462;&#127476;", "category": "Flags (country-flag)", "order": "2195"},
+		{"emoji": "🇦🇶", "name": "flag: Antarctica", "shortname": ":flag-aq:", "unicode": "1f1e6-1f1f6", "html": "&#127462;&#127478;", "category": "Flags (country-flag)", "order": "2196"},
+		{"emoji": "🇦🇷", "name": "flag: Argentina", "shortname": ":flag-ar:", "unicode": "1f1e6-1f1f7", "html": "&#127462;&#127479;", "category": "Flags (country-flag)", "order": "2197"},
+		{"emoji": "🇦🇸", "name": "flag: American Samoa", "shortname": ":flag-as:", "unicode": "1f1e6-1f1f8", "html": "&#127462;&#127480;", "category": "Flags (country-flag)", "order": "2198"},
+		{"emoji": "🇦🇹", "name": "flag: Austria", "shortname": ":flag-at:", "unicode": "1f1e6-1f1f9", "html": "&#127462;&#127481;", "category": "Flags (country-flag)", "order": "2199"},
+		{"emoji": "🇦🇺", "name": "flag: Australia", "shortname": ":flag-au:", "unicode": "1f1e6-1f1fa", "html": "&#127462;&#127482;", "category": "Flags (country-flag)", "order": "2200"},
+		{"emoji": "🇦🇼", "name": "flag: Aruba", "shortname": ":flag-aw:", "unicode": "1f1e6-1f1fc", "html": "&#127462;&#127484;", "category": "Flags (country-flag)", "order": "2201"},
+		{"emoji": "🇦🇽", "name": "flag: Åland Islands", "shortname": ":flag-ax:", "unicode": "1f1e6-1f1fd", "html": "&#127462;&#127485;", "category": "Flags (country-flag)", "order": "2202"},
+		{"emoji": "🇦🇿", "name": "flag: Azerbaijan", "shortname": ":flag-az:", "unicode": "1f1e6-1f1ff", "html": "&#127462;&#127487;", "category": "Flags (country-flag)", "order": "2203"},
+		{"emoji": "🇧🇦", "name": "flag: Bosnia & Herzegovina", "shortname": ":flag-ba:", "unicode": "1f1e7-1f1e6", "html": "&#127463;&#127462;", "category": "Flags (country-flag)", "order": "2204"},
+		{"emoji": "🇧🇧", "name": "flag: Barbados", "shortname": ":flag-bb:", "unicode": "1f1e7-1f1e7", "html": "&#127463;&#127463;", "category": "Flags (country-flag)", "order": "2205"},
+		{"emoji": "🇧🇩", "name": "flag: Bangladesh", "shortname": ":flag-bd:", "unicode": "1f1e7-1f1e9", "html": "&#127463;&#127465;", "category": "Flags (country-flag)", "order": "2206"},
+		{"emoji": "🇧🇪", "name": "flag: Belgium", "shortname": ":flag-be:", "unicode": "1f1e7-1f1ea", "html": "&#127463;&#127466;", "category": "Flags (country-flag)", "order": "2207"},
+		{"emoji": "🇧🇫", "name": "flag: Burkina Faso", "shortname": ":flag-bf:", "unicode": "1f1e7-1f1eb", "html": "&#127463;&#127467;", "category": "Flags (country-flag)", "order": "2208"},
+		{"emoji": "🇧🇬", "name": "flag: Bulgaria", "shortname": ":flag-bg:", "unicode": "1f1e7-1f1ec", "html": "&#127463;&#127468;", "category": "Flags (country-flag)", "order": "2209"},
+		{"emoji": "🇧🇭", "name": "flag: Bahrain", "shortname": ":flag-bh:", "unicode": "1f1e7-1f1ed", "html": "&#127463;&#127469;", "category": "Flags (country-flag)", "order": "2210"},
+		{"emoji": "🇧🇮", "name": "flag: Burundi", "shortname": ":flag-bi:", "unicode": "1f1e7-1f1ee", "html": "&#127463;&#127470;", "category": "Flags (country-flag)", "order": "2211"},
+		{"emoji": "🇧🇯", "name": "flag: Benin", "shortname": ":flag-bj:", "unicode": "1f1e7-1f1ef", "html": "&#127463;&#127471;", "category": "Flags (country-flag)", "order": "2212"},
+		{"emoji": "🇧🇱", "name": "flag: St. Barthélemy", "shortname": ":flag-bl:", "unicode": "1f1e7-1f1f1", "html": "&#127463;&#127473;", "category": "Flags (country-flag)", "order": "2213"},
+		{"emoji": "🇧🇲", "name": "flag: Bermuda", "shortname": ":flag-bm:", "unicode": "1f1e7-1f1f2", "html": "&#127463;&#127474;", "category": "Flags (country-flag)", "order": "2214"},
+		{"emoji": "🇧🇳", "name": "flag: Brunei", "shortname": ":flag-bn:", "unicode": "1f1e7-1f1f3", "html": "&#127463;&#127475;", "category": "Flags (country-flag)", "order": "2215"},
+		{"emoji": "🇧🇴", "name": "flag: Bolivia", "shortname": ":flag-bo:", "unicode": "1f1e7-1f1f4", "html": "&#127463;&#127476;", "category": "Flags (country-flag)", "order": "2216"},
+		{"emoji": "🇧🇶", "name": "flag: Caribbean Netherlands", "shortname": ":flag-bq:", "unicode": "1f1e7-1f1f6", "html": "&#127463;&#127478;", "category": "Flags (country-flag)", "order": "2217"},
+		{"emoji": "🇧🇷", "name": "flag: Brazil", "shortname": ":flag-br:", "unicode": "1f1e7-1f1f7", "html": "&#127463;&#127479;", "category": "Flags (country-flag)", "order": "2218"},
+		{"emoji": "🇧🇸", "name": "flag: Bahamas", "shortname": ":flag-bs:", "unicode": "1f1e7-1f1f8", "html": "&#127463;&#127480;", "category": "Flags (country-flag)", "order": "2219"},
+		{"emoji": "🇧🇹", "name": "flag: Bhutan", "shortname": ":flag-bt:", "unicode": "1f1e7-1f1f9", "html": "&#127463;&#127481;", "category": "Flags (country-flag)", "order": "2220"},
+		{"emoji": "🇧🇻", "name": "flag: Bouvet Island", "shortname": ":flag-bv:", "unicode": "1f1e7-1f1fb", "html": "&#127463;&#127483;", "category": "Flags (country-flag)", "order": "2221"},
+		{"emoji": "🇧🇼", "name": "flag: Botswana", "shortname": ":flag-bw:", "unicode": "1f1e7-1f1fc", "html": "&#127463;&#127484;", "category": "Flags (country-flag)", "order": "2222"},
+		{"emoji": "🇧🇾", "name": "flag: Belarus", "shortname": ":flag-by:", "unicode": "1f1e7-1f1fe", "html": "&#127463;&#127486;", "category": "Flags (country-flag)", "order": "2223"},
+		{"emoji": "🇧🇿", "name": "flag: Belize", "shortname": ":flag-bz:", "unicode": "1f1e7-1f1ff", "html": "&#127463;&#127487;", "category": "Flags (country-flag)", "order": "2224"},
+		{"emoji": "🇨🇦", "name": "flag: Canada", "shortname": ":flag-ca:", "unicode": "1f1e8-1f1e6", "html": "&#127464;&#127462;", "category": "Flags (country-flag)", "order": "2225"},
+		{"emoji": "🇨🇨", "name": "flag: Cocos (Keeling) Islands", "shortname": ":flag-cc:", "unicode": "1f1e8-1f1e8", "html": "&#127464;&#127464;", "category": "Flags (country-flag)", "order": "2226"},
+		{"emoji": "🇨🇩", "name": "flag: Congo - Kinshasa", "shortname": ":flag-cd:", "unicode": "1f1e8-1f1e9", "html": "&#127464;&#127465;", "category": "Flags (country-flag)", "order": "2227"},
+		{"emoji": "🇨🇫", "name": "flag: Central African Republic", "shortname": ":flag-cf:", "unicode": "1f1e8-1f1eb", "html": "&#127464;&#127467;", "category": "Flags (country-flag)", "order": "2228"},
+		{"emoji": "🇨🇬", "name": "flag: Congo - Brazzaville", "shortname": ":flag-cg:", "unicode": "1f1e8-1f1ec", "html": "&#127464;&#127468;", "category": "Flags (country-flag)", "order": "2229"},
+		{"emoji": "🇨🇭", "name": "flag: Switzerland", "shortname": ":flag-ch:", "unicode": "1f1e8-1f1ed", "html": "&#127464;&#127469;", "category": "Flags (country-flag)", "order": "2230"},
+		{"emoji": "🇨🇮", "name": "flag: Côte d’Ivoire", "shortname": ":flag-ci:", "unicode": "1f1e8-1f1ee", "html": "&#127464;&#127470;", "category": "Flags (country-flag)", "order": "2231"},
+		{"emoji": "🇨🇰", "name": "flag: Cook Islands", "shortname": ":flag-ck:", "unicode": "1f1e8-1f1f0", "html": "&#127464;&#127472;", "category": "Flags (country-flag)", "order": "2232"},
+		{"emoji": "🇨🇱", "name": "flag: Chile", "shortname": ":flag-cl:", "unicode": "1f1e8-1f1f1", "html": "&#127464;&#127473;", "category": "Flags (country-flag)", "order": "2233"},
+		{"emoji": "🇨🇲", "name": "flag: Cameroon", "shortname": ":flag-cm:", "unicode": "1f1e8-1f1f2", "html": "&#127464;&#127474;", "category": "Flags (country-flag)", "order": "2234"},
+		{"emoji": "🇨🇳", "name": "flag: China", "shortname": ":flag-cn:", "unicode": "1f1e8-1f1f3", "html": "&#127464;&#127475;", "category": "Flags (country-flag)", "order": "2235"},
+		{"emoji": "🇨🇴", "name": "flag: Colombia", "shortname": ":flag-co:", "unicode": "1f1e8-1f1f4", "html": "&#127464;&#127476;", "category": "Flags (country-flag)", "order": "2236"},
+		{"emoji": "🇨🇵", "name": "flag: Clipperton Island", "shortname": ":flag-cp:", "unicode": "1f1e8-1f1f5", "html": "&#127464;&#127477;", "category": "Flags (country-flag)", "order": "2237"},
+		{"emoji": "🇨🇷", "name": "flag: Costa Rica", "shortname": ":flag-cr:", "unicode": "1f1e8-1f1f7", "html": "&#127464;&#127479;", "category": "Flags (country-flag)", "order": "2238"},
+		{"emoji": "🇨🇺", "name": "flag: Cuba", "shortname": ":flag-cu:", "unicode": "1f1e8-1f1fa", "html": "&#127464;&#127482;", "category": "Flags (country-flag)", "order": "2239"},
+		{"emoji": "🇨🇻", "name": "flag: Cape Verde", "shortname": ":flag-cv:", "unicode": "1f1e8-1f1fb", "html": "&#127464;&#127483;", "category": "Flags (country-flag)", "order": "2240"},
+		{"emoji": "🇨🇼", "name": "flag: Curaçao", "shortname": ":flag-cw:", "unicode": "1f1e8-1f1fc", "html": "&#127464;&#127484;", "category": "Flags (country-flag)", "order": "2241"},
+		{"emoji": "🇨🇽", "name": "flag: Christmas Island", "shortname": ":flag-cx:", "unicode": "1f1e8-1f1fd", "html": "&#127464;&#127485;", "category": "Flags (country-flag)", "order": "2242"},
+		{"emoji": "🇨🇾", "name": "flag: Cyprus", "shortname": ":flag-cy:", "unicode": "1f1e8-1f1fe", "html": "&#127464;&#127486;", "category": "Flags (country-flag)", "order": "2243"},
+		{"emoji": "🇨🇿", "name": "flag: Czechia", "shortname": ":flag-cz:", "unicode": "1f1e8-1f1ff", "html": "&#127464;&#127487;", "category": "Flags (country-flag)", "order": "2244"},
+		{"emoji": "🇩🇪", "name": "flag: Germany", "shortname": ":flag-de:", "unicode": "1f1e9-1f1ea", "html": "&#127465;&#127466;", "category": "Flags (country-flag)", "order": "2245"},
+		{"emoji": "🇩🇬", "name": "flag: Diego Garcia", "shortname": ":flag-dg:", "unicode": "1f1e9-1f1ec", "html": "&#127465;&#127468;", "category": "Flags (country-flag)", "order": "2246"},
+		{"emoji": "🇩🇯", "name": "flag: Djibouti", "shortname": ":flag-dj:", "unicode": "1f1e9-1f1ef", "html": "&#127465;&#127471;", "category": "Flags (country-flag)", "order": "2247"},
+		{"emoji": "🇩🇰", "name": "flag: Denmark", "shortname": ":flag-dk:", "unicode": "1f1e9-1f1f0", "html": "&#127465;&#127472;", "category": "Flags (country-flag)", "order": "2248"},
+		{"emoji": "🇩🇲", "name": "flag: Dominica", "shortname": ":flag-dm:", "unicode": "1f1e9-1f1f2", "html": "&#127465;&#127474;", "category": "Flags (country-flag)", "order": "2249"},
+		{"emoji": "🇩🇴", "name": "flag: Dominican Republic", "shortname": ":flag-do:", "unicode": "1f1e9-1f1f4", "html": "&#127465;&#127476;", "category": "Flags (country-flag)", "order": "2250"},
+		{"emoji": "🇩🇿", "name": "flag: Algeria", "shortname": ":flag-dz:", "unicode": "1f1e9-1f1ff", "html": "&#127465;&#127487;", "category": "Flags (country-flag)", "order": "2251"},
+		{"emoji": "🇪🇦", "name": "flag: Ceuta & Melilla", "shortname": ":flag-ea:", "unicode": "1f1ea-1f1e6", "html": "&#127466;&#127462;", "category": "Flags (country-flag)", "order": "2252"},
+		{"emoji": "🇪🇨", "name": "flag: Ecuador", "shortname": ":flag-ec:", "unicode": "1f1ea-1f1e8", "html": "&#127466;&#127464;", "category": "Flags (country-flag)", "order": "2253"},
+		{"emoji": "🇪🇪", "name": "flag: Estonia", "shortname": ":flag-ee:", "unicode": "1f1ea-1f1ea", "html": "&#127466;&#127466;", "category": "Flags (country-flag)", "order": "2254"},
+		{"emoji": "🇪🇬", "name": "flag: Egypt", "shortname": ":flag-eg:", "unicode": "1f1ea-1f1ec", "html": "&#127466;&#127468;", "category": "Flags (country-flag)", "order": "2255"},
+		{"emoji": "🇪🇭", "name": "flag: Western Sahara", "shortname": ":flag-eh:", "unicode": "1f1ea-1f1ed", "html": "&#127466;&#127469;", "category": "Flags (country-flag)", "order": "2256"},
+		{"emoji": "🇪🇷", "name": "flag: Eritrea", "shortname": ":flag-er:", "unicode": "1f1ea-1f1f7", "html": "&#127466;&#127479;", "category": "Flags (country-flag)", "order": "2257"},
+		{"emoji": "🇪🇸", "name": "flag: Spain", "shortname": ":flag-es:", "unicode": "1f1ea-1f1f8", "html": "&#127466;&#127480;", "category": "Flags (country-flag)", "order": "2258"},
+		{"emoji": "🇪🇹", "name": "flag: Ethiopia", "shortname": ":flag-et:", "unicode": "1f1ea-1f1f9", "html": "&#127466;&#127481;", "category": "Flags (country-flag)", "order": "2259"},
+		{"emoji": "🇪🇺", "name": "flag: European Union", "shortname": ":flag-eu:", "unicode": "1f1ea-1f1fa", "html": "&#127466;&#127482;", "category": "Flags (country-flag)", "order": "2260"},
+		{"emoji": "🇫🇮", "name": "flag: Finland", "shortname": ":flag-fi:", "unicode": "1f1eb-1f1ee", "html": "&#127467;&#127470;", "category": "Flags (country-flag)", "order": "2261"},
+		{"emoji": "🇫🇯", "name": "flag: Fiji", "shortname": ":flag-fj:", "unicode": "1f1eb-1f1ef", "html": "&#127467;&#127471;", "category": "Flags (country-flag)", "order": "2262"},
+		{"emoji": "🇫🇰", "name": "flag: Falkland Islands", "shortname": ":flag-fk:", "unicode": "1f1eb-1f1f0", "html": "&#127467;&#127472;", "category": "Flags (country-flag)", "order": "2263"},
+		{"emoji": "🇫🇲", "name": "flag: Micronesia", "shortname": ":flag-fm:", "unicode": "1f1eb-1f1f2", "html": "&#127467;&#127474;", "category": "Flags (country-flag)", "order": "2264"},
+		{"emoji": "🇫🇴", "name": "flag: Faroe Islands", "shortname": ":flag-fo:", "unicode": "1f1eb-1f1f4", "html": "&#127467;&#127476;", "category": "Flags (country-flag)", "order": "2265"},
+		{"emoji": "🇫🇷", "name": "flag: France", "shortname": ":flag-fr:", "unicode": "1f1eb-1f1f7", "html": "&#127467;&#127479;", "category": "Flags (country-flag)", "order": "2266"},
+		{"emoji": "🇬🇦", "name": "flag: Gabon", "shortname": ":flag-ga:", "unicode": "1f1ec-1f1e6", "html": "&#127468;&#127462;", "category": "Flags (country-flag)", "order": "2267"},
+		{"emoji": "🇬🇧", "name": "flag: United Kingdom", "shortname": ":flag-gb:", "unicode": "1f1ec-1f1e7", "html": "&#127468;&#127463;", "category": "Flags (country-flag)", "order": "2268"},
+		{"emoji": "🇬🇩", "name": "flag: Grenada", "shortname": ":flag-gd:", "unicode": "1f1ec-1f1e9", "html": "&#127468;&#127465;", "category": "Flags (country-flag)", "order": "2269"},
+		{"emoji": "🇬🇪", "name": "flag: Georgia", "shortname": ":flag-ge:", "unicode": "1f1ec-1f1ea", "html": "&#127468;&#127466;", "category": "Flags (country-flag)", "order": "2270"},
+		{"emoji": "🇬🇫", "name": "flag: French Guiana", "shortname": ":flag-gf:", "unicode": "1f1ec-1f1eb", "html": "&#127468;&#127467;", "category": "Flags (country-flag)", "order": "2271"},
+		{"emoji": "🇬🇬", "name": "flag: Guernsey", "shortname": ":flag-gg:", "unicode": "1f1ec-1f1ec", "html": "&#127468;&#127468;", "category": "Flags (country-flag)", "order": "2272"},
+		{"emoji": "🇬🇭", "name": "flag: Ghana", "shortname": ":flag-gh:", "unicode": "1f1ec-1f1ed", "html": "&#127468;&#127469;", "category": "Flags (country-flag)", "order": "2273"},
+		{"emoji": "🇬🇮", "name": "flag: Gibraltar", "shortname": ":flag-gi:", "unicode": "1f1ec-1f1ee", "html": "&#127468;&#127470;", "category": "Flags (country-flag)", "order": "2274"},
+		{"emoji": "🇬🇱", "name": "flag: Greenland", "shortname": ":flag-gl:", "unicode": "1f1ec-1f1f1", "html": "&#127468;&#127473;", "category": "Flags (country-flag)", "order": "2275"},
+		{"emoji": "🇬🇲", "name": "flag: Gambia", "shortname": ":flag-gm:", "unicode": "1f1ec-1f1f2", "html": "&#127468;&#127474;", "category": "Flags (country-flag)", "order": "2276"},
+		{"emoji": "🇬🇳", "name": "flag: Guinea", "shortname": ":flag-gn:", "unicode": "1f1ec-1f1f3", "html": "&#127468;&#127475;", "category": "Flags (country-flag)", "order": "2277"},
+		{"emoji": "🇬🇵", "name": "flag: Guadeloupe", "shortname": ":flag-gp:", "unicode": "1f1ec-1f1f5", "html": "&#127468;&#127477;", "category": "Flags (country-flag)", "order": "2278"},
+		{"emoji": "🇬🇶", "name": "flag: Equatorial Guinea", "shortname": ":flag-gq:", "unicode": "1f1ec-1f1f6", "html": "&#127468;&#127478;", "category": "Flags (country-flag)", "order": "2279"},
+		{"emoji": "🇬🇷", "name": "flag: Greece", "shortname": ":flag-gr:", "unicode": "1f1ec-1f1f7", "html": "&#127468;&#127479;", "category": "Flags (country-flag)", "order": "2280"},
+		{"emoji": "🇬🇸", "name": "flag: South Georgia & South Sandwich Islands", "shortname": ":flag-gs:", "unicode": "1f1ec-1f1f8", "html": "&#127468;&#127480;", "category": "Flags (country-flag)", "order": "2281"},
+		{"emoji": "🇬🇹", "name": "flag: Guatemala", "shortname": ":flag-gt:", "unicode": "1f1ec-1f1f9", "html": "&#127468;&#127481;", "category": "Flags (country-flag)", "order": "2282"},
+		{"emoji": "🇬🇺", "name": "flag: Guam", "shortname": ":flag-gu:", "unicode": "1f1ec-1f1fa", "html": "&#127468;&#127482;", "category": "Flags (country-flag)", "order": "2283"},
+		{"emoji": "🇬🇼", "name": "flag: Guinea-Bissau", "shortname": ":flag-gw:", "unicode": "1f1ec-1f1fc", "html": "&#127468;&#127484;", "category": "Flags (country-flag)", "order": "2284"},
+		{"emoji": "🇬🇾", "name": "flag: Guyana", "shortname": ":flag-gy:", "unicode": "1f1ec-1f1fe", "html": "&#127468;&#127486;", "category": "Flags (country-flag)", "order": "2285"},
+		{"emoji": "🇭🇰", "name": "flag: Hong Kong SAR China", "shortname": ":flag-hk:", "unicode": "1f1ed-1f1f0", "html": "&#127469;&#127472;", "category": "Flags (country-flag)", "order": "2286"},
+		{"emoji": "🇭🇲", "name": "flag: Heard & McDonald Islands", "shortname": ":flag-hm:", "unicode": "1f1ed-1f1f2", "html": "&#127469;&#127474;", "category": "Flags (country-flag)", "order": "2287"},
+		{"emoji": "🇭🇳", "name": "flag: Honduras", "shortname": ":flag-hn:", "unicode": "1f1ed-1f1f3", "html": "&#127469;&#127475;", "category": "Flags (country-flag)", "order": "2288"},
+		{"emoji": "🇭🇷", "name": "flag: Croatia", "shortname": ":flag-hr:", "unicode": "1f1ed-1f1f7", "html": "&#127469;&#127479;", "category": "Flags (country-flag)", "order": "2289"},
+		{"emoji": "🇭🇹", "name": "flag: Haiti", "shortname": ":flag-ht:", "unicode": "1f1ed-1f1f9", "html": "&#127469;&#127481;", "category": "Flags (country-flag)", "order": "2290"},
+		{"emoji": "🇭🇺", "name": "flag: Hungary", "shortname": ":flag-hu:", "unicode": "1f1ed-1f1fa", "html": "&#127469;&#127482;", "category": "Flags (country-flag)", "order": "2291"},
+		{"emoji": "🇮🇨", "name": "flag: Canary Islands", "shortname": ":flag-ic:", "unicode": "1f1ee-1f1e8", "html": "&#127470;&#127464;", "category": "Flags (country-flag)", "order": "2292"},
+		{"emoji": "🇮🇩", "name": "flag: Indonesia", "shortname": ":flag-id:", "unicode": "1f1ee-1f1e9", "html": "&#127470;&#127465;", "category": "Flags (country-flag)", "order": "2293"},
+		{"emoji": "🇮🇪", "name": "flag: Ireland", "shortname": ":flag-ie:", "unicode": "1f1ee-1f1ea", "html": "&#127470;&#127466;", "category": "Flags (country-flag)", "order": "2294"},
+		{"emoji": "🇮🇱", "name": "flag: Israel", "shortname": ":flag-il:", "unicode": "1f1ee-1f1f1", "html": "&#127470;&#127473;", "category": "Flags (country-flag)", "order": "2295"},
+		{"emoji": "🇮🇲", "name": "flag: Isle of Man", "shortname": ":flag-im:", "unicode": "1f1ee-1f1f2", "html": "&#127470;&#127474;", "category": "Flags (country-flag)", "order": "2296"},
+		{"emoji": "🇮🇳", "name": "flag: India", "shortname": ":flag-in:", "unicode": "1f1ee-1f1f3", "html": "&#127470;&#127475;", "category": "Flags (country-flag)", "order": "2297"},
+		{"emoji": "🇮🇴", "name": "flag: British Indian Ocean Territory", "shortname": ":flag-io:", "unicode": "1f1ee-1f1f4", "html": "&#127470;&#127476;", "category": "Flags (country-flag)", "order": "2298"},
+		{"emoji": "🇮🇶", "name": "flag: Iraq", "shortname": ":flag-iq:", "unicode": "1f1ee-1f1f6", "html": "&#127470;&#127478;", "category": "Flags (country-flag)", "order": "2299"},
+		{"emoji": "🇮🇷", "name": "flag: Iran", "shortname": ":flag-ir:", "unicode": "1f1ee-1f1f7", "html": "&#127470;&#127479;", "category": "Flags (country-flag)", "order": "2300"},
+		{"emoji": "🇮🇸", "name": "flag: Iceland", "shortname": ":flag-is:", "unicode": "1f1ee-1f1f8", "html": "&#127470;&#127480;", "category": "Flags (country-flag)", "order": "2301"},
+		{"emoji": "🇮🇹", "name": "flag: Italy", "shortname": ":flag-it:", "unicode": "1f1ee-1f1f9", "html": "&#127470;&#127481;", "category": "Flags (country-flag)", "order": "2302"},
+		{"emoji": "🇯🇪", "name": "flag: Jersey", "shortname": ":flag-je:", "unicode": "1f1ef-1f1ea", "html": "&#127471;&#127466;", "category": "Flags (country-flag)", "order": "2303"},
+		{"emoji": "🇯🇲", "name": "flag: Jamaica", "shortname": ":flag-jm:", "unicode": "1f1ef-1f1f2", "html": "&#127471;&#127474;", "category": "Flags (country-flag)", "order": "2304"},
+		{"emoji": "🇯🇴", "name": "flag: Jordan", "shortname": ":flag-jo:", "unicode": "1f1ef-1f1f4", "html": "&#127471;&#127476;", "category": "Flags (country-flag)", "order": "2305"},
+		{"emoji": "🇯🇵", "name": "flag: Japan", "shortname": ":flag-jp:", "unicode": "1f1ef-1f1f5", "html": "&#127471;&#127477;", "category": "Flags (country-flag)", "order": "2306"},
+		{"emoji": "🇰🇪", "name": "flag: Kenya", "shortname": ":flag-ke:", "unicode": "1f1f0-1f1ea", "html": "&#127472;&#127466;", "category": "Flags (country-flag)", "order": "2307"},
+		{"emoji": "🇰🇬", "name": "flag: Kyrgyzstan", "shortname": ":flag-kg:", "unicode": "1f1f0-1f1ec", "html": "&#127472;&#127468;", "category": "Flags (country-flag)", "order": "2308"},
+		{"emoji": "🇰🇭", "name": "flag: Cambodia", "shortname": ":flag-kh:", "unicode": "1f1f0-1f1ed", "html": "&#127472;&#127469;", "category": "Flags (country-flag)", "order": "2309"},
+		{"emoji": "🇰🇮", "name": "flag: Kiribati", "shortname": ":flag-ki:", "unicode": "1f1f0-1f1ee", "html": "&#127472;&#127470;", "category": "Flags (country-flag)", "order": "2310"},
+		{"emoji": "🇰🇲", "name": "flag: Comoros", "shortname": ":flag-km:", "unicode": "1f1f0-1f1f2", "html": "&#127472;&#127474;", "category": "Flags (country-flag)", "order": "2311"},
+		{"emoji": "🇰🇳", "name": "flag: St. Kitts & Nevis", "shortname": ":flag-kn:", "unicode": "1f1f0-1f1f3", "html": "&#127472;&#127475;", "category": "Flags (country-flag)", "order": "2312"},
+		{"emoji": "🇰🇵", "name": "flag: North Korea", "shortname": ":flag-kp:", "unicode": "1f1f0-1f1f5", "html": "&#127472;&#127477;", "category": "Flags (country-flag)", "order": "2313"},
+		{"emoji": "🇰🇷", "name": "flag: South Korea", "shortname": ":flag-kr:", "unicode": "1f1f0-1f1f7", "html": "&#127472;&#127479;", "category": "Flags (country-flag)", "order": "2314"},
+		{"emoji": "🇰🇼", "name": "flag: Kuwait", "shortname": ":flag-kw:", "unicode": "1f1f0-1f1fc", "html": "&#127472;&#127484;", "category": "Flags (country-flag)", "order": "2315"},
+		{"emoji": "🇰🇾", "name": "flag: Cayman Islands", "shortname": ":flag-ky:", "unicode": "1f1f0-1f1fe", "html": "&#127472;&#127486;", "category": "Flags (country-flag)", "order": "2316"},
+		{"emoji": "🇰🇿", "name": "flag: Kazakhstan", "shortname": ":flag-kz:", "unicode": "1f1f0-1f1ff", "html": "&#127472;&#127487;", "category": "Flags (country-flag)", "order": "2317"},
+		{"emoji": "🇱🇦", "name": "flag: Laos", "shortname": ":flag-la:", "unicode": "1f1f1-1f1e6", "html": "&#127473;&#127462;", "category": "Flags (country-flag)", "order": "2318"},
+		{"emoji": "🇱🇧", "name": "flag: Lebanon", "shortname": ":flag-lb:", "unicode": "1f1f1-1f1e7", "html": "&#127473;&#127463;", "category": "Flags (country-flag)", "order": "2319"},
+		{"emoji": "🇱🇨", "name": "flag: St. Lucia", "shortname": ":flag-lc:", "unicode": "1f1f1-1f1e8", "html": "&#127473;&#127464;", "category": "Flags (country-flag)", "order": "2320"},
+		{"emoji": "🇱🇮", "name": "flag: Liechtenstein", "shortname": ":flag-li:", "unicode": "1f1f1-1f1ee", "html": "&#127473;&#127470;", "category": "Flags (country-flag)", "order": "2321"},
+		{"emoji": "🇱🇰", "name": "flag: Sri Lanka", "shortname": ":flag-lk:", "unicode": "1f1f1-1f1f0", "html": "&#127473;&#127472;", "category": "Flags (country-flag)", "order": "2322"},
+		{"emoji": "🇱🇷", "name": "flag: Liberia", "shortname": ":flag-lr:", "unicode": "1f1f1-1f1f7", "html": "&#127473;&#127479;", "category": "Flags (country-flag)", "order": "2323"},
+		{"emoji": "🇱🇸", "name": "flag: Lesotho", "shortname": ":flag-ls:", "unicode": "1f1f1-1f1f8", "html": "&#127473;&#127480;", "category": "Flags (country-flag)", "order": "2324"},
+		{"emoji": "🇱🇹", "name": "flag: Lithuania", "shortname": ":flag-lt:", "unicode": "1f1f1-1f1f9", "html": "&#127473;&#127481;", "category": "Flags (country-flag)", "order": "2325"},
+		{"emoji": "🇱🇺", "name": "flag: Luxembourg", "shortname": ":flag-lu:", "unicode": "1f1f1-1f1fa", "html": "&#127473;&#127482;", "category": "Flags (country-flag)", "order": "2326"},
+		{"emoji": "🇱🇻", "name": "flag: Latvia", "shortname": ":flag-lv:", "unicode": "1f1f1-1f1fb", "html": "&#127473;&#127483;", "category": "Flags (country-flag)", "order": "2327"},
+		{"emoji": "🇱🇾", "name": "flag: Libya", "shortname": ":flag-ly:", "unicode": "1f1f1-1f1fe", "html": "&#127473;&#127486;", "category": "Flags (country-flag)", "order": "2328"},
+		{"emoji": "🇲🇦", "name": "flag: Morocco", "shortname": ":flag-ma:", "unicode": "1f1f2-1f1e6", "html": "&#127474;&#127462;", "category": "Flags (country-flag)", "order": "2329"},
+		{"emoji": "🇲🇨", "name": "flag: Monaco", "shortname": ":flag-mc:", "unicode": "1f1f2-1f1e8", "html": "&#127474;&#127464;", "category": "Flags (country-flag)", "order": "2330"},
+		{"emoji": "🇲🇩", "name": "flag: Moldova", "shortname": ":flag-md:", "unicode": "1f1f2-1f1e9", "html": "&#127474;&#127465;", "category": "Flags (country-flag)", "order": "2331"},
+		{"emoji": "🇲🇪", "name": "flag: Montenegro", "shortname": ":flag-me:", "unicode": "1f1f2-1f1ea", "html": "&#127474;&#127466;", "category": "Flags (country-flag)", "order": "2332"},
+		{"emoji": "🇲🇫", "name": "flag: St. Martin", "shortname": ":flag-mf:", "unicode": "1f1f2-1f1eb", "html": "&#127474;&#127467;", "category": "Flags (country-flag)", "order": "2333"},
+		{"emoji": "🇲🇬", "name": "flag: Madagascar", "shortname": ":flag-mg:", "unicode": "1f1f2-1f1ec", "html": "&#127474;&#127468;", "category": "Flags (country-flag)", "order": "2334"},
+		{"emoji": "🇲🇭", "name": "flag: Marshall Islands", "shortname": ":flag-mh:", "unicode": "1f1f2-1f1ed", "html": "&#127474;&#127469;", "category": "Flags (country-flag)", "order": "2335"},
+		{"emoji": "🇲🇰", "name": "flag: North Macedonia", "shortname": ":flag-mk:", "unicode": "1f1f2-1f1f0", "html": "&#127474;&#127472;", "category": "Flags (country-flag)", "order": "2336"},
+		{"emoji": "🇲🇱", "name": "flag: Mali", "shortname": ":flag-ml:", "unicode": "1f1f2-1f1f1", "html": "&#127474;&#127473;", "category": "Flags (country-flag)", "order": "2337"},
+		{"emoji": "🇲🇲", "name": "flag: Myanmar (Burma)", "shortname": ":flag-mm:", "unicode": "1f1f2-1f1f2", "html": "&#127474;&#127474;", "category": "Flags (country-flag)", "order": "2338"},
+		{"emoji": "🇲🇳", "name": "flag: Mongolia", "shortname": ":flag-mn:", "unicode": "1f1f2-1f1f3", "html": "&#127474;&#127475;", "category": "Flags (country-flag)", "order": "2339"},
+		{"emoji": "🇲🇴", "name": "flag: Macao SAR China", "shortname": ":flag-mo:", "unicode": "1f1f2-1f1f4", "html": "&#127474;&#127476;", "category": "Flags (country-flag)", "order": "2340"},
+		{"emoji": "🇲🇵", "name": "flag: Northern Mariana Islands", "shortname": ":flag-mp:", "unicode": "1f1f2-1f1f5", "html": "&#127474;&#127477;", "category": "Flags (country-flag)", "order": "2341"},
+		{"emoji": "🇲🇶", "name": "flag: Martinique", "shortname": ":flag-mq:", "unicode": "1f1f2-1f1f6", "html": "&#127474;&#127478;", "category": "Flags (country-flag)", "order": "2342"},
+		{"emoji": "🇲🇷", "name": "flag: Mauritania", "shortname": ":flag-mr:", "unicode": "1f1f2-1f1f7", "html": "&#127474;&#127479;", "category": "Flags (country-flag)", "order": "2343"},
+		{"emoji": "🇲🇸", "name": "flag: Montserrat", "shortname": ":flag-ms:", "unicode": "1f1f2-1f1f8", "html": "&#127474;&#127480;", "category": "Flags (country-flag)", "order": "2344"},
+		{"emoji": "🇲🇹", "name": "flag: Malta", "shortname": ":flag-mt:", "unicode": "1f1f2-1f1f9", "html": "&#127474;&#127481;", "category": "Flags (country-flag)", "order": "2345"},
+		{"emoji": "🇲🇺", "name": "flag: Mauritius", "shortname": ":flag-mu:", "unicode": "1f1f2-1f1fa", "html": "&#127474;&#127482;", "category": "Flags (country-flag)", "order": "2346"},
+		{"emoji": "🇲🇻", "name": "flag: Maldives", "shortname": ":flag-mv:", "unicode": "1f1f2-1f1fb", "html": "&#127474;&#127483;", "category": "Flags (country-flag)", "order": "2347"},
+		{"emoji": "🇲🇼", "name": "flag: Malawi", "shortname": ":flag-mw:", "unicode": "1f1f2-1f1fc", "html": "&#127474;&#127484;", "category": "Flags (country-flag)", "order": "2348"},
+		{"emoji": "🇲🇽", "name": "flag: Mexico", "shortname": ":flag-mx:", "unicode": "1f1f2-1f1fd", "html": "&#127474;&#127485;", "category": "Flags (country-flag)", "order": "2349"},
+		{"emoji": "🇲🇾", "name": "flag: Malaysia", "shortname": ":flag-my:", "unicode": "1f1f2-1f1fe", "html": "&#127474;&#127486;", "category": "Flags (country-flag)", "order": "2350"},
+		{"emoji": "🇲🇿", "name": "flag: Mozambique", "shortname": ":flag-mz:", "unicode": "1f1f2-1f1ff", "html": "&#127474;&#127487;", "category": "Flags (country-flag)", "order": "2351"},
+		{"emoji": "🇳🇦", "name": "flag: Namibia", "shortname": ":flag-na:", "unicode": "1f1f3-1f1e6", "html": "&#127475;&#127462;", "category": "Flags (country-flag)", "order": "2352"},
+		{"emoji": "🇳🇨", "name": "flag: New Caledonia", "shortname": ":flag-nc:", "unicode": "1f1f3-1f1e8", "html": "&#127475;&#127464;", "category": "Flags (country-flag)", "order": "2353"},
+		{"emoji": "🇳🇪", "name": "flag: Niger", "shortname": ":flag-ne:", "unicode": "1f1f3-1f1ea", "html": "&#127475;&#127466;", "category": "Flags (country-flag)", "order": "2354"},
+		{"emoji": "🇳🇫", "name": "flag: Norfolk Island", "shortname": ":flag-nf:", "unicode": "1f1f3-1f1eb", "html": "&#127475;&#127467;", "category": "Flags (country-flag)", "order": "2355"},
+		{"emoji": "🇳🇬", "name": "flag: Nigeria", "shortname": ":flag-ng:", "unicode": "1f1f3-1f1ec", "html": "&#127475;&#127468;", "category": "Flags (country-flag)", "order": "2356"},
+		{"emoji": "🇳🇮", "name": "flag: Nicaragua", "shortname": ":flag-ni:", "unicode": "1f1f3-1f1ee", "html": "&#127475;&#127470;", "category": "Flags (country-flag)", "order": "2357"},
+		{"emoji": "🇳🇱", "name": "flag: Netherlands", "shortname": ":flag-nl:", "unicode": "1f1f3-1f1f1", "html": "&#127475;&#127473;", "category": "Flags (country-flag)", "order": "2358"},
+		{"emoji": "🇳🇴", "name": "flag: Norway", "shortname": ":flag-no:", "unicode": "1f1f3-1f1f4", "html": "&#127475;&#127476;", "category": "Flags (country-flag)", "order": "2359"},
+		{"emoji": "🇳🇵", "name": "flag: Nepal", "shortname": ":flag-np:", "unicode": "1f1f3-1f1f5", "html": "&#127475;&#127477;", "category": "Flags (country-flag)", "order": "2360"},
+		{"emoji": "🇳🇷", "name": "flag: Nauru", "shortname": ":flag-nr:", "unicode": "1f1f3-1f1f7", "html": "&#127475;&#127479;", "category": "Flags (country-flag)", "order": "2361"},
+		{"emoji": "🇳🇺", "name": "flag: Niue", "shortname": ":flag-nu:", "unicode": "1f1f3-1f1fa", "html": "&#127475;&#127482;", "category": "Flags (country-flag)", "order": "2362"},
+		{"emoji": "🇳🇿", "name": "flag: New Zealand", "shortname": ":flag-nz:", "unicode": "1f1f3-1f1ff", "html": "&#127475;&#127487;", "category": "Flags (country-flag)", "order": "2363"},
+		{"emoji": "🇴🇲", "name": "flag: Oman", "shortname": ":flag-om:", "unicode": "1f1f4-1f1f2", "html": "&#127476;&#127474;", "category": "Flags (country-flag)", "order": "2364"},
+		{"emoji": "🇵🇦", "name": "flag: Panama", "shortname": ":flag-pa:", "unicode": "1f1f5-1f1e6", "html": "&#127477;&#127462;", "category": "Flags (country-flag)", "order": "2365"},
+		{"emoji": "🇵🇪", "name": "flag: Peru", "shortname": ":flag-pe:", "unicode": "1f1f5-1f1ea", "html": "&#127477;&#127466;", "category": "Flags (country-flag)", "order": "2366"},
+		{"emoji": "🇵🇫", "name": "flag: French Polynesia", "shortname": ":flag-pf:", "unicode": "1f1f5-1f1eb", "html": "&#127477;&#127467;", "category": "Flags (country-flag)", "order": "2367"},
+		{"emoji": "🇵🇬", "name": "flag: Papua New Guinea", "shortname": ":flag-pg:", "unicode": "1f1f5-1f1ec", "html": "&#127477;&#127468;", "category": "Flags (country-flag)", "order": "2368"},
+		{"emoji": "🇵🇭", "name": "flag: Philippines", "shortname": ":flag-ph:", "unicode": "1f1f5-1f1ed", "html": "&#127477;&#127469;", "category": "Flags (country-flag)", "order": "2369"},
+		{"emoji": "🇵🇰", "name": "flag: Pakistan", "shortname": ":flag-pk:", "unicode": "1f1f5-1f1f0", "html": "&#127477;&#127472;", "category": "Flags (country-flag)", "order": "2370"},
+		{"emoji": "🇵🇱", "name": "flag: Poland", "shortname": ":flag-pl:", "unicode": "1f1f5-1f1f1", "html": "&#127477;&#127473;", "category": "Flags (country-flag)", "order": "2371"},
+		{"emoji": "🇵🇲", "name": "flag: St. Pierre & Miquelon", "shortname": ":flag-pm:", "unicode": "1f1f5-1f1f2", "html": "&#127477;&#127474;", "category": "Flags (country-flag)", "order": "2372"},
+		{"emoji": "🇵🇳", "name": "flag: Pitcairn Islands", "shortname": ":flag-pn:", "unicode": "1f1f5-1f1f3", "html": "&#127477;&#127475;", "category": "Flags (country-flag)", "order": "2373"},
+		{"emoji": "🇵🇷", "name": "flag: Puerto Rico", "shortname": ":flag-pr:", "unicode": "1f1f5-1f1f7", "html": "&#127477;&#127479;", "category": "Flags (country-flag)", "order": "2374"},
+		{"emoji": "🇵🇸", "name": "flag: Palestinian Territories", "shortname": ":flag-ps:", "unicode": "1f1f5-1f1f8", "html": "&#127477;&#127480;", "category": "Flags (country-flag)", "order": "2375"},
+		{"emoji": "🇵🇹", "name": "flag: Portugal", "shortname": ":flag-pt:", "unicode": "1f1f5-1f1f9", "html": "&#127477;&#127481;", "category": "Flags (country-flag)", "order": "2376"},
+		{"emoji": "🇵🇼", "name": "flag: Palau", "shortname": ":flag-pw:", "unicode": "1f1f5-1f1fc", "html": "&#127477;&#127484;", "category": "Flags (country-flag)", "order": "2377"},
+		{"emoji": "🇵🇾", "name": "flag: Paraguay", "shortname": ":flag-py:", "unicode": "1f1f5-1f1fe", "html": "&#127477;&#127486;", "category": "Flags (country-flag)", "order": "2378"},
+		{"emoji": "🇶🇦", "name": "flag: Qatar", "shortname": ":flag-qa:", "unicode": "1f1f6-1f1e6", "html": "&#127478;&#127462;", "category": "Flags (country-flag)", "order": "2379"},
+		{"emoji": "🇷🇪", "name": "flag: Réunion", "shortname": ":flag-re:", "unicode": "1f1f7-1f1ea", "html": "&#127479;&#127466;", "category": "Flags (country-flag)", "order": "2380"},
+		{"emoji": "🇷🇴", "name": "flag: Romania", "shortname": ":flag-ro:", "unicode": "1f1f7-1f1f4", "html": "&#127479;&#127476;", "category": "Flags (country-flag)", "order": "2381"},
+		{"emoji": "🇷🇸", "name": "flag: Serbia", "shortname": ":flag-rs:", "unicode": "1f1f7-1f1f8", "html": "&#127479;&#127480;", "category": "Flags (country-flag)", "order": "2382"},
+		{"emoji": "🇷🇺", "name": "flag: Russia", "shortname": ":flag-ru:", "unicode": "1f1f7-1f1fa", "html": "&#127479;&#127482;", "category": "Flags (country-flag)", "order": "2383"},
+		{"emoji": "🇷🇼", "name": "flag: Rwanda", "shortname": ":flag-rw:", "unicode": "1f1f7-1f1fc", "html": "&#127479;&#127484;", "category": "Flags (country-flag)", "order": "2384"},
+		{"emoji": "🇸🇦", "name": "flag: Saudi Arabia", "shortname": ":flag-sa:", "unicode": "1f1f8-1f1e6", "html": "&#127480;&#127462;", "category": "Flags (country-flag)", "order": "2385"},
+		{"emoji": "🇸🇧", "name": "flag: Solomon Islands", "shortname": ":flag-sb:", "unicode": "1f1f8-1f1e7", "html": "&#127480;&#127463;", "category": "Flags (country-flag)", "order": "2386"},
+		{"emoji": "🇸🇨", "name": "flag: Seychelles", "shortname": ":flag-sc:", "unicode": "1f1f8-1f1e8", "html": "&#127480;&#127464;", "category": "Flags (country-flag)", "order": "2387"},
+		{"emoji": "🇸🇩", "name": "flag: Sudan", "shortname": ":flag-sd:", "unicode": "1f1f8-1f1e9", "html": "&#127480;&#127465;", "category": "Flags (country-flag)", "order": "2388"},
+		{"emoji": "🇸🇪", "name": "flag: Sweden", "shortname": ":flag-se:", "unicode": "1f1f8-1f1ea", "html": "&#127480;&#127466;", "category": "Flags (country-flag)", "order": "2389"},
+		{"emoji": "🇸🇬", "name": "flag: Singapore", "shortname": ":flag-sg:", "unicode": "1f1f8-1f1ec", "html": "&#127480;&#127468;", "category": "Flags (country-flag)", "order": "2390"},
+		{"emoji": "🇸🇭", "name": "flag: St. Helena", "shortname": ":flag-sh:", "unicode": "1f1f8-1f1ed", "html": "&#127480;&#127469;", "category": "Flags (country-flag)", "order": "2391"},
+		{"emoji": "🇸🇮", "name": "flag: Slovenia", "shortname": ":flag-si:", "unicode": "1f1f8-1f1ee", "html": "&#127480;&#127470;", "category": "Flags (country-flag)", "order": "2392"},
+		{"emoji": "🇸🇯", "name": "flag: Svalbard & Jan Mayen", "shortname": ":flag-sj:", "unicode": "1f1f8-1f1ef", "html": "&#127480;&#127471;", "category": "Flags (country-flag)", "order": "2393"},
+		{"emoji": "🇸🇰", "name": "flag: Slovakia", "shortname": ":flag-sk:", "unicode": "1f1f8-1f1f0", "html": "&#127480;&#127472;", "category": "Flags (country-flag)", "order": "2394"},
+		{"emoji": "🇸🇱", "name": "flag: Sierra Leone", "shortname": ":flag-sl:", "unicode": "1f1f8-1f1f1", "html": "&#127480;&#127473;", "category": "Flags (country-flag)", "order": "2395"},
+		{"emoji": "🇸🇲", "name": "flag: San Marino", "shortname": ":flag-sm:", "unicode": "1f1f8-1f1f2", "html": "&#127480;&#127474;", "category": "Flags (country-flag)", "order": "2396"},
+		{"emoji": "🇸🇳", "name": "flag: Senegal", "shortname": ":flag-sn:", "unicode": "1f1f8-1f1f3", "html": "&#127480;&#127475;", "category": "Flags (country-flag)", "order": "2397"},
+		{"emoji": "🇸🇴", "name": "flag: Somalia", "shortname": ":flag-so:", "unicode": "1f1f8-1f1f4", "html": "&#127480;&#127476;", "category": "Flags (country-flag)", "order": "2398"},
+		{"emoji": "🇸🇷", "name": "flag: Suriname", "shortname": ":flag-sr:", "unicode": "1f1f8-1f1f7", "html": "&#127480;&#127479;", "category": "Flags (country-flag)", "order": "2399"},
+		{"emoji": "🇸🇸", "name": "flag: South Sudan", "shortname": ":flag-ss:", "unicode": "1f1f8-1f1f8", "html": "&#127480;&#127480;", "category": "Flags (country-flag)", "order": "2400"},
+		{"emoji": "🇸🇹", "name": "flag: São Tomé & Príncipe", "shortname": ":flag-st:", "unicode": "1f1f8-1f1f9", "html": "&#127480;&#127481;", "category": "Flags (country-flag)", "order": "2401"},
+		{"emoji": "🇸🇻", "name": "flag: El Salvador", "shortname": ":flag-sv:", "unicode": "1f1f8-1f1fb", "html": "&#127480;&#127483;", "category": "Flags (country-flag)", "order": "2402"},
+		{"emoji": "🇸🇽", "name": "flag: Sint Maarten", "shortname": ":flag-sx:", "unicode": "1f1f8-1f1fd", "html": "&#127480;&#127485;", "category": "Flags (country-flag)", "order": "2403"},
+		{"emoji": "🇸🇾", "name": "flag: Syria", "shortname": ":flag-sy:", "unicode": "1f1f8-1f1fe", "html": "&#127480;&#127486;", "category": "Flags (country-flag)", "order": "2404"},
+		{"emoji": "🇸🇿", "name": "flag: Eswatini", "shortname": ":flag-sz:", "unicode": "1f1f8-1f1ff", "html": "&#127480;&#127487;", "category": "Flags (country-flag)", "order": "2405"},
+		{"emoji": "🇹🇦", "name": "flag: Tristan da Cunha", "shortname": ":flag-ta:", "unicode": "1f1f9-1f1e6", "html": "&#127481;&#127462;", "category": "Flags (country-flag)", "order": "2406"},
+		{"emoji": "🇹🇨", "name": "flag: Turks & Caicos Islands", "shortname": ":flag-tc:", "unicode": "1f1f9-1f1e8", "html": "&#127481;&#127464;", "category": "Flags (country-flag)", "order": "2407"},
+		{"emoji": "🇹🇩", "name": "flag: Chad", "shortname": ":flag-td:", "unicode": "1f1f9-1f1e9", "html": "&#127481;&#127465;", "category": "Flags (country-flag)", "order": "2408"},
+		{"emoji": "🇹🇫", "name": "flag: French Southern Territories", "shortname": ":flag-tf:", "unicode": "1f1f9-1f1eb", "html": "&#127481;&#127467;", "category": "Flags (country-flag)", "order": "2409"},
+		{"emoji": "🇹🇬", "name": "flag: Togo", "shortname": ":flag-tg:", "unicode": "1f1f9-1f1ec", "html": "&#127481;&#127468;", "category": "Flags (country-flag)", "order": "2410"},
+		{"emoji": "🇹🇭", "name": "flag: Thailand", "shortname": ":flag-th:", "unicode": "1f1f9-1f1ed", "html": "&#127481;&#127469;", "category": "Flags (country-flag)", "order": "2411"},
+		{"emoji": "🇹🇯", "name": "flag: Tajikistan", "shortname": ":flag-tj:", "unicode": "1f1f9-1f1ef", "html": "&#127481;&#127471;", "category": "Flags (country-flag)", "order": "2412"},
+		{"emoji": "🇹🇰", "name": "flag: Tokelau", "shortname": ":flag-tk:", "unicode": "1f1f9-1f1f0", "html": "&#127481;&#127472;", "category": "Flags (country-flag)", "order": "2413"},
+		{"emoji": "🇹🇱", "name": "flag: Timor-Leste", "shortname": ":flag-tl:", "unicode": "1f1f9-1f1f1", "html": "&#127481;&#127473;", "category": "Flags (country-flag)", "order": "2414"},
+		{"emoji": "🇹🇲", "name": "flag: Turkmenistan", "shortname": ":flag-tm:", "unicode": "1f1f9-1f1f2", "html": "&#127481;&#127474;", "category": "Flags (country-flag)", "order": "2415"},
+		{"emoji": "🇹🇳", "name": "flag: Tunisia", "shortname": ":flag-tn:", "unicode": "1f1f9-1f1f3", "html": "&#127481;&#127475;", "category": "Flags (country-flag)", "order": "2416"},
+		{"emoji": "🇹🇴", "name": "flag: Tonga", "shortname": ":flag-to:", "unicode": "1f1f9-1f1f4", "html": "&#127481;&#127476;", "category": "Flags (country-flag)", "order": "2417"},
+		{"emoji": "🇹🇷", "name": "flag: Turkey", "shortname": ":flag-tr:", "unicode": "1f1f9-1f1f7", "html": "&#127481;&#127479;", "category": "Flags (country-flag)", "order": "2418"},
+		{"emoji": "🇹🇹", "name": "flag: Trinidad & Tobago", "shortname": ":flag-tt:", "unicode": "1f1f9-1f1f9", "html": "&#127481;&#127481;", "category": "Flags (country-flag)", "order": "2419"},
+		{"emoji": "🇹🇻", "name": "flag: Tuvalu", "shortname": ":flag-tv:", "unicode": "1f1f9-1f1fb", "html": "&#127481;&#127483;", "category": "Flags (country-flag)", "order": "2420"},
+		{"emoji": "🇹🇼", "name": "flag: Taiwan", "shortname": ":flag-tw:", "unicode": "1f1f9-1f1fc", "html": "&#127481;&#127484;", "category": "Flags (country-flag)", "order": "2421"},
+		{"emoji": "🇹🇿", "name": "flag: Tanzania", "shortname": ":flag-tz:", "unicode": "1f1f9-1f1ff", "html": "&#127481;&#127487;", "category": "Flags (country-flag)", "order": "2422"},
+		{"emoji": "🇺🇦", "name": "flag: Ukraine", "shortname": ":flag-ua:", "unicode": "1f1fa-1f1e6", "html": "&#127482;&#127462;", "category": "Flags (country-flag)", "order": "2423"},
+		{"emoji": "🇺🇬", "name": "flag: Uganda", "shortname": ":flag-ug:", "unicode": "1f1fa-1f1ec", "html": "&#127482;&#127468;", "category": "Flags (country-flag)", "order": "2424"},
+		{"emoji": "🇺🇲", "name": "flag: U.S. Outlying Islands", "shortname": ":flag-um:", "unicode": "1f1fa-1f1f2", "html": "&#127482;&#127474;", "category": "Flags (country-flag)", "order": "2425"},
+		{"emoji": "🇺🇸", "name": "flag: United States", "shortname": ":flag-us:", "unicode": "1f1fa-1f1f8", "html": "&#127482;&#127480;", "category": "Flags (country-flag)", "order": "2427"},
+		{"emoji": "🇺🇾", "name": "flag: Uruguay", "shortname": ":flag-uy:", "unicode": "1f1fa-1f1fe", "html": "&#127482;&#127486;", "category": "Flags (country-flag)", "order": "2428"},
+		{"emoji": "🇺🇿", "name": "flag: Uzbekistan", "shortname": ":flag-uz:", "unicode": "1f1fa-1f1ff", "html": "&#127482;&#127487;", "category": "Flags (country-flag)", "order": "2429"},
+		{"emoji": "🇻🇦", "name": "flag: Vatican City", "shortname": ":flag-va:", "unicode": "1f1fb-1f1e6", "html": "&#127483;&#127462;", "category": "Flags (country-flag)", "order": "2430"},
+		{"emoji": "🇻🇨", "name": "flag: St. Vincent & Grenadines", "shortname": ":flag-vc:", "unicode": "1f1fb-1f1e8", "html": "&#127483;&#127464;", "category": "Flags (country-flag)", "order": "2431"},
+		{"emoji": "🇻🇪", "name": "flag: Venezuela", "shortname": ":flag-ve:", "unicode": "1f1fb-1f1ea", "html": "&#127483;&#127466;", "category": "Flags (country-flag)", "order": "2432"},
+		{"emoji": "🇻🇬", "name": "flag: British Virgin Islands", "shortname": ":flag-vg:", "unicode": "1f1fb-1f1ec", "html": "&#127483;&#127468;", "category": "Flags (country-flag)", "order": "2433"},
+		{"emoji": "🇻🇮", "name": "flag: U.S. Virgin Islands", "shortname": ":flag-vi:", "unicode": "1f1fb-1f1ee", "html": "&#127483;&#127470;", "category": "Flags (country-flag)", "order": "2434"},
+		{"emoji": "🇻🇳", "name": "flag: Vietnam", "shortname": ":flag-vn:", "unicode": "1f1fb-1f1f3", "html": "&#127483;&#127475;", "category": "Flags (country-flag)", "order": "2435"},
+		{"emoji": "🇻🇺", "name": "flag: Vanuatu", "shortname": ":flag_vu:", "unicode": "1f1fb-1f1fa", "html": "&#127483;&#127482;", "category": "Flags (country-flag)", "order": "2436"},
+		{"emoji": "🇼🇫", "name": "flag: Wallis & Futuna", "shortname": ":flag_wf:", "unicode": "1f1fc-1f1eb", "html": "&#127484;&#127467;", "category": "Flags (country-flag)", "order": "2437"},
+		{"emoji": "🇼🇸", "name": "flag: Samoa", "shortname": ":flag_ws:", "unicode": "1f1fc-1f1f8", "html": "&#127484;&#127480;", "category": "Flags (country-flag)", "order": "2438"},
+		{"emoji": "🇽🇰", "name": "flag: Kosovo", "shortname": ":flag_xk:", "unicode": "1f1fd-1f1f0", "html": "&#127485;&#127472;", "category": "Flags (country-flag)", "order": "2439"},
+		{"emoji": "🇾🇪", "name": "flag: Yemen", "shortname": ":flag_ye:", "unicode": "1f1fe-1f1ea", "html": "&#127486;&#127466;", "category": "Flags (country-flag)", "order": "2440"},
+		{"emoji": "🇾🇹", "name": "flag: Mayotte", "shortname": ":flag_yt:", "unicode": "1f1fe-1f1f9", "html": "&#127486;&#127481;", "category": "Flags (country-flag)", "order": "2441"},
+		{"emoji": "🇿🇦", "name": "flag: South Africa", "shortname": ":flag_za:", "unicode": "1f1ff-1f1e6", "html": "&#127487;&#127462;", "category": "Flags (country-flag)", "order": "2442"},
+		{"emoji": "🇿🇲", "name": "flag: Zambia", "shortname": ":flag_zm:", "unicode": "1f1ff-1f1f2", "html": "&#127487;&#127474;", "category": "Flags (country-flag)", "order": "2443"},
+		{"emoji": "🇿🇼", "name": "flag: Zimbabwe", "shortname": ":flag_zw:", "unicode": "1f1ff-1f1fc", "html": "&#127487;&#127484;", "category": "Flags (country-flag)", "order": "2444"},
+		{"emoji": "🖤", "name": "black heart", "shortname": ":black_heart:", "unicode": "1f5a4", "html": "&#128420;", "category": "Smileys & Emotion (emotion)", "order": "1296"},
+		{"emoji": "🗨", "name": "left speech bubble", "shortname": ":speech_left:", "unicode": "1f5e8", "html": "&#128488;", "category": "Smileys & Emotion (emotion)", "order": "1310"},
+		{"emoji": "🥚", "name": "egg", "shortname": ":egg:", "unicode": "1f95a", "html": "&#129370;", "category": "Food & Drink (food-prepared)", "order": "1489"},
+		{"emoji": "🛑", "name": "stop sign", "shortname": ":octagonal_sign:", "unicode": "1f6d1", "html": "&#128721;", "category": "Travel & Places (transport-ground)", "order": "1641"},
+		{"emoji": "♠", "name": "spade suit", "shortname": ":spades:", "unicode": "2660", "html": "&spades;", "category": "Activities (game)", "order": "1807"},
+		{"emoji": "♥", "name": "heart suit", "shortname": ":hearts:", "unicode": "2665", "html": "&hearts;", "category": "Activities (game)", "order": "1808"},
+		{"emoji": "♦", "name": "diamond suit", "shortname": ":diamonds:", "unicode": "2666", "html": "&diams;", "category": "Activities (game)", "order": "1809"},
+		{"emoji": "♣", "name": "club suit", "shortname": ":clubs:", "unicode": "2663", "html": "&clubs;", "category": "Activities (game)", "order": "1810"},
+		{"emoji": "🥁", "name": "drum", "shortname": ":drum:", "unicode": "1f941", "html": "&#129345;", "category": "Objects (musical-instrument)", "order": "1837"},
+		{"emoji": "↔", "name": "left-right arrow", "shortname": ":left_right_arrow:", "unicode": "2194", "html": "&harr;", "category": "Symbols (arrow)", "order": "2011"},
+		{"emoji": "©", "name": "copyright", "shortname": ":copyright:", "unicode": "00a9", "html": "&copy;", "category": "Symbols (other-symbol)", "order": "2103"},
+		{"emoji": "®", "name": "registered", "shortname": ":registered:", "unicode": "00ae", "html": "&reg;", "category": "Symbols (other-symbol)", "order": "2104"},
+		{"emoji": "™", "name": "trade mark", "shortname": ":tm:", "unicode": "2122", "html": "&trade;", "category": "Symbols (other-symbol)", "order": "2105"},
+		{"emoji": "0️⃣", "name": "keycap: 0", "shortname": ":0:", "unicode": "0030 FE0F 20E3", "html": "&#48;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "1️⃣", "name": "keycap: 1", "shortname": ":1:", "unicode": "0031 FE0F 20E3", "html": "&#49;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "2️⃣", "name": "keycap: 2", "shortname": ":2:", "unicode": "0032 FE0F 20E3", "html": "&#50;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "3️⃣", "name": "keycap: 3", "shortname": ":3:", "unicode": "0033 FE0F 20E3", "html": "&#51;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "4️⃣", "name": "keycap: 4", "shortname": ":4:", "unicode": "0034 FE0F 20E3", "html": "&#52;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "5️⃣", "name": "keycap: 5", "shortname": ":5:", "unicode": "0035 FE0F 20E3", "html": "&#53;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "6️⃣", "name": "keycap: 6", "shortname": ":6:", "unicode": "0036 FE0F 20E3", "html": "&#54;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "7️⃣", "name": "keycap: 7", "shortname": ":7:", "unicode": "0037 FE0F 20E3", "html": "&#55;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "8️⃣", "name": "keycap: 8", "shortname": ":8:", "unicode": "0038 FE0F 20E3", "html": "&#56;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "9️⃣", "name": "keycap: 9", "shortname": ":9:", "unicode": "0039 FE0F 20E3", "html": "&#57;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "#⃣", "name": "keycap: #", "shortname": ":hash:", "unicode": "0023-20e3", "html": "#&#8419;", "category": "Symbols (keycap)", "order": "2106"},
+		{"emoji": "*⃣", "name": "keycap: #", "shortname": ":asterisk:", "unicode": "002a-20e3", "html": "*&#8419;", "category": "Symbols (keycap)", "order": "2107"},
+		{"emoji": "0⃣", "name": "keycap: 0", "shortname": ":zero:", "unicode": "0030-20e3", "html": "0&#8419;", "category": "Symbols (keycap)", "order": "2108"},
+		{"emoji": "1⃣", "name": "keycap: 1", "shortname": ":one:", "unicode": "0031-20e3", "html": "1&#8419;", "category": "Symbols (keycap)", "order": "2109"},
+		{"emoji": "2⃣", "name": "keycap: 2", "shortname": ":two:", "unicode": "0032-20e3", "html": "2&#8419;", "category": "Symbols (keycap)", "order": "2110"},
+		{"emoji": "3⃣", "name": "keycap: 3", "shortname": ":three:", "unicode": "0033-20e3", "html": "3&#8419;", "category": "Symbols (keycap)", "order": "2111"},
+		{"emoji": "4⃣", "name": "keycap: 4", "shortname": ":four:", "unicode": "0034-20e3", "html": "4&#8419;", "category": "Symbols (keycap)", "order": "2112"},
+		{"emoji": "5⃣", "name": "keycap: 5", "shortname": ":five:", "unicode": "0035-20e3", "html": "5&#8419;", "category": "Symbols (keycap)", "order": "2113"},
+		{"emoji": "6⃣", "name": "keycap: 6", "shortname": ":six:", "unicode": "0036-20e3", "html": "6&#8419;", "category": "Symbols (keycap)", "order": "2114"},
+		{"emoji": "7⃣", "name": "keycap: 7", "shortname": ":seven:", "unicode": "0037-20e3", "html": "7&#8419;", "category": "Symbols (keycap)", "order": "2115"},
+		{"emoji": "8⃣", "name": "keycap: 8", "shortname": ":eight:", "unicode": "0038-20e3", "html": "8&#8419;", "category": "Symbols (keycap)", "order": "2116"},
+		{"emoji": "9⃣", "name": "keycap: 9", "shortname": ":nine:", "unicode": "0039-20e3", "html": "9&#8419;", "category": "Symbols (keycap)", "order": "2117"},
+		{"emoji": "🤣", "name": "rolling on the floor laughing", "shortname": ":rolling_on_the_floor_laughing:", "unicode": "1F923", "html": "&#x1F923;", "category": "Smileys & Emotion (face-smiling)", "order": ""},
+		{"emoji": "🥰", "name": "smiling face with hearts", "shortname": ":smiling_face_with_hearts:", "unicode": "1F970", "html": "&#x1F970;", "category": "Smileys & Emotion (face-affection)", "order": ""},
+		{"emoji": "🤩", "name": "star-struck", "shortname": ":starstruck:", "unicode": "1F929", "html": "&#x1F929;", "category": "Smileys & Emotion (face-affection)", "order": ""},
+		{"emoji": "☺", "name": "smiling face", "shortname": ":smiling_face:", "unicode": "263A", "html": "&#x263A;", "category": "Smileys & Emotion (face-affection)", "order": ""},
+		{"emoji": "🤪", "name": "zany face", "shortname": ":zany_face:", "unicode": "1F92A", "html": "&#x1F92A;", "category": "Smileys & Emotion (face-tongue)", "order": ""},
+		{"emoji": "🤭", "name": "face with hand over mouth", "shortname": ":face_with_hand_over_mouth:", "unicode": "1F92D", "html": "&#x1F92D;", "category": "Smileys & Emotion (face-hand)", "order": ""},
+		{"emoji": "🤫", "name": "shushing face", "shortname": ":shushing_face:", "unicode": "1F92B", "html": "&#x1F92B;", "category": "Smileys & Emotion (face-hand)", "order": ""},
+		{"emoji": "🤨", "name": "face with raised eyebrow", "shortname": ":face_with_raised_eyebrow:", "unicode": "1F928", "html": "&#x1F928;", "category": "Smileys & Emotion (face-neutral-skeptical)", "order": ""},
+		{"emoji": "🤥", "name": "lying face", "shortname": ":lying_face:", "unicode": "1F925", "html": "&#x1F925;", "category": "Smileys & Emotion (face-neutral-skeptical)", "order": ""},
+		{"emoji": "🤤", "name": "drooling face", "shortname": ":drooling_face:", "unicode": "1F924", "html": "&#x1F924;", "category": "Smileys & Emotion (face-sleepy)", "order": ""},
+		{"emoji": "🤢", "name": "nauseated face", "shortname": ":nauseated_face:", "unicode": "1F922", "html": "&#x1F922;", "category": "Smileys & Emotion (face-unwell)", "order": ""},
+		{"emoji": "🤮", "name": "face vomiting", "shortname": ":face_vomiting:", "unicode": "1F92E", "html": "&#x1F92E;", "category": "Smileys & Emotion (face-unwell)", "order": ""},
+		{"emoji": "🤧", "name": "sneezing face", "shortname": ":sneezing_face:", "unicode": "1F927", "html": "&#x1F927;", "category": "Smileys & Emotion (face-unwell)", "order": ""},
+		{"emoji": "🥵", "name": "hot face", "shortname": ":hot_face:", "unicode": "1F975", "html": "&#x1F975;", "category": "Smileys & Emotion (face-unwell)", "order": ""},
+		{"emoji": "🥶", "name": "cold face", "shortname": ":cold_face:", "unicode": "1F976", "html": "&#x1F976;", "category": "Smileys & Emotion (face-unwell)", "order": ""},
+		{"emoji": "🥴", "name": "woozy face", "shortname": ":woozy_face:", "unicode": "1F974", "html": "&#x1F974;", "category": "Smileys & Emotion (face-unwell)", "order": ""},
+		{"emoji": "🤯", "name": "exploding head", "shortname": ":exploding_head:", "unicode": "1F92F", "html": "&#x1F92F;", "category": "Smileys & Emotion (face-unwell)", "order": ""},
+		{"emoji": "🤠", "name": "cowboy hat face", "shortname": ":cowboy_hat_face:", "unicode": "1F920", "html": "&#x1F920;", "category": "Smileys & Emotion (face-hat)", "order": ""},
+		{"emoji": "🥳", "name": "partying face", "shortname": ":partying_face:", "unicode": "1F973", "html": "&#x1F973;", "category": "Smileys & Emotion (face-hat)", "order": ""},
+		{"emoji": "🧐", "name": "face with monocle", "shortname": ":face_with_monocle:", "unicode": "1F9D0", "html": "&#x1F9D0;", "category": "Smileys & Emotion (face-glasses)", "order": ""},
+		{"emoji": "☹️", "name": "frowning face", "shortname": ":frowning_face:", "unicode": "2639 FE0F", "html": "&#x2639;&#xFE0F;", "category": "Smileys & Emotion (face-concerned)", "order": ""},
+		{"emoji": "🥺", "name": "pleading face", "shortname": ":pleading_face:", "unicode": "1F97A", "html": "&#x1F97A;", "category": "Smileys & Emotion (face-concerned)", "order": ""},
+		{"emoji": "🥱", "name": "yawning face", "shortname": ":yawning_face:", "unicode": "1F971", "html": "&#x1F971;", "category": "Smileys & Emotion (face-concerned)", "order": ""},
+		{"emoji": "🤬", "name": "face with symbols on mouth", "shortname": ":face_with_symbols_on_mouth:", "unicode": "1F92C", "html": "&#x1F92C;", "category": "Smileys & Emotion (face-negative)", "order": ""},
+		{"emoji": "☠️", "name": "skull and crossbones", "shortname": ":skull_and_crossbones:", "unicode": "2620 FE0F", "html": "&#x2620;&#xFE0F;", "category": "Smileys & Emotion (face-negative)", "order": ""},
+		{"emoji": "🤡", "name": "clown face", "shortname": ":clown_face:", "unicode": "1F921", "html": "&#x1F921;", "category": "Smileys & Emotion (face-costume)", "order": ""},
+		{"emoji": "❣", "name": "heart exclamation", "shortname": ":heart_exclamation:", "unicode": "2763", "html": "&#x2763;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "❤", "name": "red heart", "shortname": ":red_heart:", "unicode": "2764", "html": "&#x2764;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "🧡", "name": "orange heart", "shortname": ":orange_heart:", "unicode": "1F9E1", "html": "&#x1F9E1;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "🤎", "name": "brown heart", "shortname": ":brown_heart:", "unicode": "1F90E", "html": "&#x1F90E;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "🤍", "name": "white heart", "shortname": ":white_heart:", "unicode": "1F90D", "html": "&#x1F90D;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "🕳️", "name": "hole", "shortname": ":hole:", "unicode": "1F573 FE0F", "html": "&#x1F573;&#xFE0F;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "👁️‍🗨️", "name": "eye in speech bubble", "shortname": ":eye_in_speech_bubble:", "unicode": "1F441 FE0F 200D 1F5E8 FE0F", "html": "&#x1F441;&#xFE0F;&#x200D;&#x1F5E8;&#xFE0F;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "👁‍🗨️", "name": "eye in speech bubble", "shortname": ":eye_in_speech_bubble:", "unicode": "1F441 200D 1F5E8 FE0F", "html": "&#x1F441;&#x200D;&#x1F5E8;&#xFE0F;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "👁️‍🗨", "name": "eye in speech bubble", "shortname": ":eye_in_speech_bubble:", "unicode": "1F441 FE0F 200D 1F5E8", "html": "&#x1F441;&#xFE0F;&#x200D;&#x1F5E8;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "🗨️", "name": "left speech bubble", "shortname": ":left_speech_bubble:", "unicode": "1F5E8 FE0F", "html": "&#x1F5E8;&#xFE0F;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "🗯️", "name": "right anger bubble", "shortname": ":right_anger_bubble:", "unicode": "1F5EF FE0F", "html": "&#x1F5EF;&#xFE0F;", "category": "Smileys & Emotion (emotion)", "order": ""},
+		{"emoji": "🤚", "name": "raised back of hand", "shortname": ":raised_back_of_hand:", "unicode": "1F91A", "html": "&#x1F91A;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🤚🏻", "name": "raised back of hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F91A 1F3FB", "html": "&#x1F91A;&#x1F3FB;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🤚🏼", "name": "raised back of hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F91A 1F3FC", "html": "&#x1F91A;&#x1F3FC;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🤚🏽", "name": "raised back of hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F91A 1F3FD", "html": "&#x1F91A;&#x1F3FD;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🤚🏾", "name": "raised back of hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F91A 1F3FE", "html": "&#x1F91A;&#x1F3FE;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🤚🏿", "name": "raised back of hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F91A 1F3FF", "html": "&#x1F91A;&#x1F3FF;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🖐️", "name": "hand with fingers splayed", "shortname": ":hand_with_fingers_splayed:", "unicode": "1F590 FE0F", "html": "&#x1F590;&#xFE0F;", "category": "People & Body (hand-fingers-open)", "order": ""},
+		{"emoji": "🤏", "name": "pinching hand", "shortname": ":pinching_hand:", "unicode": "1F90F", "html": "&#x1F90F;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤏🏻", "name": "pinching hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F90F 1F3FB", "html": "&#x1F90F;&#x1F3FB;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤏🏼", "name": "pinching hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F90F 1F3FC", "html": "&#x1F90F;&#x1F3FC;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤏🏽", "name": "pinching hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F90F 1F3FD", "html": "&#x1F90F;&#x1F3FD;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤏🏾", "name": "pinching hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F90F 1F3FE", "html": "&#x1F90F;&#x1F3FE;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤏🏿", "name": "pinching hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F90F 1F3FF", "html": "&#x1F90F;&#x1F3FF;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "✌", "name": "victory hand", "shortname": ":victory_hand:", "unicode": "270C", "html": "&#x270C;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤞", "name": "crossed fingers", "shortname": ":crossed_fingers:", "unicode": "1F91E", "html": "&#x1F91E;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤞🏻", "name": "crossed fingers: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F91E 1F3FB", "html": "&#x1F91E;&#x1F3FB;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤞🏼", "name": "crossed fingers: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F91E 1F3FC", "html": "&#x1F91E;&#x1F3FC;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤞🏽", "name": "crossed fingers: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F91E 1F3FD", "html": "&#x1F91E;&#x1F3FD;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤞🏾", "name": "crossed fingers: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F91E 1F3FE", "html": "&#x1F91E;&#x1F3FE;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤞🏿", "name": "crossed fingers: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F91E 1F3FF", "html": "&#x1F91E;&#x1F3FF;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤟", "name": "love-you gesture", "shortname": ":loveyou_gesture:", "unicode": "1F91F", "html": "&#x1F91F;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤟🏻", "name": "love-you gesture: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F91F 1F3FB", "html": "&#x1F91F;&#x1F3FB;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤟🏼", "name": "love-you gesture: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F91F 1F3FC", "html": "&#x1F91F;&#x1F3FC;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤟🏽", "name": "love-you gesture: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F91F 1F3FD", "html": "&#x1F91F;&#x1F3FD;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤟🏾", "name": "love-you gesture: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F91F 1F3FE", "html": "&#x1F91F;&#x1F3FE;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤟🏿", "name": "love-you gesture: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F91F 1F3FF", "html": "&#x1F91F;&#x1F3FF;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤙", "name": "call me hand", "shortname": ":call_me_hand:", "unicode": "1F919", "html": "&#x1F919;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤙🏻", "name": "call me hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F919 1F3FB", "html": "&#x1F919;&#x1F3FB;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤙🏼", "name": "call me hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F919 1F3FC", "html": "&#x1F919;&#x1F3FC;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤙🏽", "name": "call me hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F919 1F3FD", "html": "&#x1F919;&#x1F3FD;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤙🏾", "name": "call me hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F919 1F3FE", "html": "&#x1F919;&#x1F3FE;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "🤙🏿", "name": "call me hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F919 1F3FF", "html": "&#x1F919;&#x1F3FF;", "category": "People & Body (hand-fingers-partial)", "order": ""},
+		{"emoji": "☝", "name": "index pointing up", "shortname": ":index_pointing_up:", "unicode": "261D", "html": "&#x261D;", "category": "People & Body (hand-single-finger)", "order": ""},
+		{"emoji": "🤛", "name": "left-facing fist", "shortname": ":leftfacing_fist:", "unicode": "1F91B", "html": "&#x1F91B;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤛🏻", "name": "left-facing fist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F91B 1F3FB", "html": "&#x1F91B;&#x1F3FB;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤛🏼", "name": "left-facing fist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F91B 1F3FC", "html": "&#x1F91B;&#x1F3FC;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤛🏽", "name": "left-facing fist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F91B 1F3FD", "html": "&#x1F91B;&#x1F3FD;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤛🏾", "name": "left-facing fist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F91B 1F3FE", "html": "&#x1F91B;&#x1F3FE;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤛🏿", "name": "left-facing fist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F91B 1F3FF", "html": "&#x1F91B;&#x1F3FF;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤜", "name": "right-facing fist", "shortname": ":rightfacing_fist:", "unicode": "1F91C", "html": "&#x1F91C;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤜🏻", "name": "right-facing fist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F91C 1F3FB", "html": "&#x1F91C;&#x1F3FB;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤜🏼", "name": "right-facing fist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F91C 1F3FC", "html": "&#x1F91C;&#x1F3FC;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤜🏽", "name": "right-facing fist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F91C 1F3FD", "html": "&#x1F91C;&#x1F3FD;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤜🏾", "name": "right-facing fist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F91C 1F3FE", "html": "&#x1F91C;&#x1F3FE;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤜🏿", "name": "right-facing fist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F91C 1F3FF", "html": "&#x1F91C;&#x1F3FF;", "category": "People & Body (hand-fingers-closed)", "order": ""},
+		{"emoji": "🤲", "name": "palms up together", "shortname": ":palms_up_together:", "unicode": "1F932", "html": "&#x1F932;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🤲🏻", "name": "palms up together: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F932 1F3FB", "html": "&#x1F932;&#x1F3FB;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🤲🏼", "name": "palms up together: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F932 1F3FC", "html": "&#x1F932;&#x1F3FC;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🤲🏽", "name": "palms up together: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F932 1F3FD", "html": "&#x1F932;&#x1F3FD;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🤲🏾", "name": "palms up together: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F932 1F3FE", "html": "&#x1F932;&#x1F3FE;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🤲🏿", "name": "palms up together: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F932 1F3FF", "html": "&#x1F932;&#x1F3FF;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "🤝", "name": "handshake", "shortname": ":handshake:", "unicode": "1F91D", "html": "&#x1F91D;", "category": "People & Body (hands)", "order": ""},
+		{"emoji": "✍️", "name": "writing hand", "shortname": ":writing_hand:", "unicode": "270D FE0F", "html": "&#x270D;&#xFE0F;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "🤳", "name": "selfie", "shortname": ":selfie:", "unicode": "1F933", "html": "&#x1F933;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "🤳🏻", "name": "selfie: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F933 1F3FB", "html": "&#x1F933;&#x1F3FB;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "🤳🏼", "name": "selfie: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F933 1F3FC", "html": "&#x1F933;&#x1F3FC;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "🤳🏽", "name": "selfie: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F933 1F3FD", "html": "&#x1F933;&#x1F3FD;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "🤳🏾", "name": "selfie: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F933 1F3FE", "html": "&#x1F933;&#x1F3FE;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "🤳🏿", "name": "selfie: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F933 1F3FF", "html": "&#x1F933;&#x1F3FF;", "category": "People & Body (hand-prop)", "order": ""},
+		{"emoji": "🦾", "name": "mechanical arm", "shortname": ":mechanical_arm:", "unicode": "1F9BE", "html": "&#x1F9BE;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦿", "name": "mechanical leg", "shortname": ":mechanical_leg:", "unicode": "1F9BF", "html": "&#x1F9BF;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦵", "name": "leg", "shortname": ":leg:", "unicode": "1F9B5", "html": "&#x1F9B5;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦵🏻", "name": "leg: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B5 1F3FB", "html": "&#x1F9B5;&#x1F3FB;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦵🏼", "name": "leg: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B5 1F3FC", "html": "&#x1F9B5;&#x1F3FC;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦵🏽", "name": "leg: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B5 1F3FD", "html": "&#x1F9B5;&#x1F3FD;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦵🏾", "name": "leg: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B5 1F3FE", "html": "&#x1F9B5;&#x1F3FE;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦵🏿", "name": "leg: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B5 1F3FF", "html": "&#x1F9B5;&#x1F3FF;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦶", "name": "foot", "shortname": ":foot:", "unicode": "1F9B6", "html": "&#x1F9B6;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦶🏻", "name": "foot: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B6 1F3FB", "html": "&#x1F9B6;&#x1F3FB;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦶🏼", "name": "foot: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B6 1F3FC", "html": "&#x1F9B6;&#x1F3FC;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦶🏽", "name": "foot: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B6 1F3FD", "html": "&#x1F9B6;&#x1F3FD;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦶🏾", "name": "foot: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B6 1F3FE", "html": "&#x1F9B6;&#x1F3FE;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦶🏿", "name": "foot: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B6 1F3FF", "html": "&#x1F9B6;&#x1F3FF;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦻", "name": "ear with hearing aid", "shortname": ":ear_with_hearing_aid:", "unicode": "1F9BB", "html": "&#x1F9BB;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦻🏻", "name": "ear with hearing aid: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9BB 1F3FB", "html": "&#x1F9BB;&#x1F3FB;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦻🏼", "name": "ear with hearing aid: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9BB 1F3FC", "html": "&#x1F9BB;&#x1F3FC;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦻🏽", "name": "ear with hearing aid: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9BB 1F3FD", "html": "&#x1F9BB;&#x1F3FD;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦻🏾", "name": "ear with hearing aid: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9BB 1F3FE", "html": "&#x1F9BB;&#x1F3FE;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦻🏿", "name": "ear with hearing aid: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9BB 1F3FF", "html": "&#x1F9BB;&#x1F3FF;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🧠", "name": "brain", "shortname": ":brain:", "unicode": "1F9E0", "html": "&#x1F9E0;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦷", "name": "tooth", "shortname": ":tooth:", "unicode": "1F9B7", "html": "&#x1F9B7;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🦴", "name": "bone", "shortname": ":bone:", "unicode": "1F9B4", "html": "&#x1F9B4;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "👁️", "name": "eye", "shortname": ":eye:", "unicode": "1F441 FE0F", "html": "&#x1F441;&#xFE0F;", "category": "People & Body (body-parts)", "order": ""},
+		{"emoji": "🧒", "name": "child", "shortname": ":child:", "unicode": "1F9D2", "html": "&#x1F9D2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧒🏻", "name": "child: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D2 1F3FB", "html": "&#x1F9D2;&#x1F3FB;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧒🏼", "name": "child: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D2 1F3FC", "html": "&#x1F9D2;&#x1F3FC;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧒🏽", "name": "child: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D2 1F3FD", "html": "&#x1F9D2;&#x1F3FD;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧒🏾", "name": "child: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D2 1F3FE", "html": "&#x1F9D2;&#x1F3FE;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧒🏿", "name": "child: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D2 1F3FF", "html": "&#x1F9D2;&#x1F3FF;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑", "name": "person", "shortname": ":person:", "unicode": "1F9D1", "html": "&#x1F9D1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏻", "name": "person: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB", "html": "&#x1F9D1;&#x1F3FB;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏼", "name": "person: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC", "html": "&#x1F9D1;&#x1F3FC;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏽", "name": "person: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD", "html": "&#x1F9D1;&#x1F3FD;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏾", "name": "person: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE", "html": "&#x1F9D1;&#x1F3FE;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏿", "name": "person: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF", "html": "&#x1F9D1;&#x1F3FF;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧔", "name": "man: beard", "shortname": ":beard:", "unicode": "1F9D4", "html": "&#x1F9D4;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧔🏻", "name": "man: light skin tone, beard", "shortname": ":light_skin_tone_beard:", "unicode": "1F9D4 1F3FB", "html": "&#x1F9D4;&#x1F3FB;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧔🏼", "name": "man: medium-light skin tone, beard", "shortname": ":mediumlight_skin_tone_beard:", "unicode": "1F9D4 1F3FC", "html": "&#x1F9D4;&#x1F3FC;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧔🏽", "name": "man: medium skin tone, beard", "shortname": ":medium_skin_tone_beard:", "unicode": "1F9D4 1F3FD", "html": "&#x1F9D4;&#x1F3FD;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧔🏾", "name": "man: medium-dark skin tone, beard", "shortname": ":mediumdark_skin_tone_beard:", "unicode": "1F9D4 1F3FE", "html": "&#x1F9D4;&#x1F3FE;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧔🏿", "name": "man: dark skin tone, beard", "shortname": ":dark_skin_tone_beard:", "unicode": "1F9D4 1F3FF", "html": "&#x1F9D4;&#x1F3FF;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨‍🦰", "name": "man: red hair", "shortname": ":red_hair:", "unicode": "1F468 200D 1F9B0", "html": "&#x1F468;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏻‍🦰", "name": "man: light skin tone, red hair", "shortname": ":light_skin_tone_red_hair:", "unicode": "1F468 1F3FB 200D 1F9B0", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏼‍🦰", "name": "man: medium-light skin tone, red hair", "shortname": ":mediumlight_skin_tone_red_hair:", "unicode": "1F468 1F3FC 200D 1F9B0", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏽‍🦰", "name": "man: medium skin tone, red hair", "shortname": ":medium_skin_tone_red_hair:", "unicode": "1F468 1F3FD 200D 1F9B0", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏾‍🦰", "name": "man: medium-dark skin tone, red hair", "shortname": ":mediumdark_skin_tone_red_hair:", "unicode": "1F468 1F3FE 200D 1F9B0", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏿‍🦰", "name": "man: dark skin tone, red hair", "shortname": ":dark_skin_tone_red_hair:", "unicode": "1F468 1F3FF 200D 1F9B0", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨‍🦱", "name": "man: curly hair", "shortname": ":curly_hair:", "unicode": "1F468 200D 1F9B1", "html": "&#x1F468;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏻‍🦱", "name": "man: light skin tone, curly hair", "shortname": ":light_skin_tone_curly_hair:", "unicode": "1F468 1F3FB 200D 1F9B1", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏼‍🦱", "name": "man: medium-light skin tone, curly hair", "shortname": ":mediumlight_skin_tone_curly_hair:", "unicode": "1F468 1F3FC 200D 1F9B1", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏽‍🦱", "name": "man: medium skin tone, curly hair", "shortname": ":medium_skin_tone_curly_hair:", "unicode": "1F468 1F3FD 200D 1F9B1", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏾‍🦱", "name": "man: medium-dark skin tone, curly hair", "shortname": ":mediumdark_skin_tone_curly_hair:", "unicode": "1F468 1F3FE 200D 1F9B1", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏿‍🦱", "name": "man: dark skin tone, curly hair", "shortname": ":dark_skin_tone_curly_hair:", "unicode": "1F468 1F3FF 200D 1F9B1", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨‍🦳", "name": "man: white hair", "shortname": ":white_hair:", "unicode": "1F468 200D 1F9B3", "html": "&#x1F468;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏻‍🦳", "name": "man: light skin tone, white hair", "shortname": ":light_skin_tone_white_hair:", "unicode": "1F468 1F3FB 200D 1F9B3", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏼‍🦳", "name": "man: medium-light skin tone, white hair", "shortname": ":mediumlight_skin_tone_white_hair:", "unicode": "1F468 1F3FC 200D 1F9B3", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏽‍🦳", "name": "man: medium skin tone, white hair", "shortname": ":medium_skin_tone_white_hair:", "unicode": "1F468 1F3FD 200D 1F9B3", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏾‍🦳", "name": "man: medium-dark skin tone, white hair", "shortname": ":mediumdark_skin_tone_white_hair:", "unicode": "1F468 1F3FE 200D 1F9B3", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏿‍🦳", "name": "man: dark skin tone, white hair", "shortname": ":dark_skin_tone_white_hair:", "unicode": "1F468 1F3FF 200D 1F9B3", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨‍🦲", "name": "man: bald", "shortname": ":bald:", "unicode": "1F468 200D 1F9B2", "html": "&#x1F468;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏻‍🦲", "name": "man: light skin tone, bald", "shortname": ":light_skin_tone_bald:", "unicode": "1F468 1F3FB 200D 1F9B2", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏼‍🦲", "name": "man: medium-light skin tone, bald", "shortname": ":mediumlight_skin_tone_bald:", "unicode": "1F468 1F3FC 200D 1F9B2", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏽‍🦲", "name": "man: medium skin tone, bald", "shortname": ":medium_skin_tone_bald:", "unicode": "1F468 1F3FD 200D 1F9B2", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏾‍🦲", "name": "man: medium-dark skin tone, bald", "shortname": ":mediumdark_skin_tone_bald:", "unicode": "1F468 1F3FE 200D 1F9B2", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👨🏿‍🦲", "name": "man: dark skin tone, bald", "shortname": ":dark_skin_tone_bald:", "unicode": "1F468 1F3FF 200D 1F9B2", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩‍🦰", "name": "woman: red hair", "shortname": ":red_hair:", "unicode": "1F469 200D 1F9B0", "html": "&#x1F469;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏻‍🦰", "name": "woman: light skin tone, red hair", "shortname": ":light_skin_tone_red_hair:", "unicode": "1F469 1F3FB 200D 1F9B0", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏼‍🦰", "name": "woman: medium-light skin tone, red hair", "shortname": ":mediumlight_skin_tone_red_hair:", "unicode": "1F469 1F3FC 200D 1F9B0", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏽‍🦰", "name": "woman: medium skin tone, red hair", "shortname": ":medium_skin_tone_red_hair:", "unicode": "1F469 1F3FD 200D 1F9B0", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏾‍🦰", "name": "woman: medium-dark skin tone, red hair", "shortname": ":mediumdark_skin_tone_red_hair:", "unicode": "1F469 1F3FE 200D 1F9B0", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏿‍🦰", "name": "woman: dark skin tone, red hair", "shortname": ":dark_skin_tone_red_hair:", "unicode": "1F469 1F3FF 200D 1F9B0", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑‍🦰", "name": "person: red hair", "shortname": ":red_hair:", "unicode": "1F9D1 200D 1F9B0", "html": "&#x1F9D1;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏻‍🦰", "name": "person: light skin tone, red hair", "shortname": ":light_skin_tone_red_hair:", "unicode": "1F9D1 1F3FB 200D 1F9B0", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏼‍🦰", "name": "person: medium-light skin tone, red hair", "shortname": ":mediumlight_skin_tone_red_hair:", "unicode": "1F9D1 1F3FC 200D 1F9B0", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏽‍🦰", "name": "person: medium skin tone, red hair", "shortname": ":medium_skin_tone_red_hair:", "unicode": "1F9D1 1F3FD 200D 1F9B0", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏾‍🦰", "name": "person: medium-dark skin tone, red hair", "shortname": ":mediumdark_skin_tone_red_hair:", "unicode": "1F9D1 1F3FE 200D 1F9B0", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏿‍🦰", "name": "person: dark skin tone, red hair", "shortname": ":dark_skin_tone_red_hair:", "unicode": "1F9D1 1F3FF 200D 1F9B0", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F9B0;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩‍🦱", "name": "woman: curly hair", "shortname": ":curly_hair:", "unicode": "1F469 200D 1F9B1", "html": "&#x1F469;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏻‍🦱", "name": "woman: light skin tone, curly hair", "shortname": ":light_skin_tone_curly_hair:", "unicode": "1F469 1F3FB 200D 1F9B1", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏼‍🦱", "name": "woman: medium-light skin tone, curly hair", "shortname": ":mediumlight_skin_tone_curly_hair:", "unicode": "1F469 1F3FC 200D 1F9B1", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏽‍🦱", "name": "woman: medium skin tone, curly hair", "shortname": ":medium_skin_tone_curly_hair:", "unicode": "1F469 1F3FD 200D 1F9B1", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏾‍🦱", "name": "woman: medium-dark skin tone, curly hair", "shortname": ":mediumdark_skin_tone_curly_hair:", "unicode": "1F469 1F3FE 200D 1F9B1", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏿‍🦱", "name": "woman: dark skin tone, curly hair", "shortname": ":dark_skin_tone_curly_hair:", "unicode": "1F469 1F3FF 200D 1F9B1", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑‍🦱", "name": "person: curly hair", "shortname": ":curly_hair:", "unicode": "1F9D1 200D 1F9B1", "html": "&#x1F9D1;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏻‍🦱", "name": "person: light skin tone, curly hair", "shortname": ":light_skin_tone_curly_hair:", "unicode": "1F9D1 1F3FB 200D 1F9B1", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏼‍🦱", "name": "person: medium-light skin tone, curly hair", "shortname": ":mediumlight_skin_tone_curly_hair:", "unicode": "1F9D1 1F3FC 200D 1F9B1", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏽‍🦱", "name": "person: medium skin tone, curly hair", "shortname": ":medium_skin_tone_curly_hair:", "unicode": "1F9D1 1F3FD 200D 1F9B1", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏾‍🦱", "name": "person: medium-dark skin tone, curly hair", "shortname": ":mediumdark_skin_tone_curly_hair:", "unicode": "1F9D1 1F3FE 200D 1F9B1", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏿‍🦱", "name": "person: dark skin tone, curly hair", "shortname": ":dark_skin_tone_curly_hair:", "unicode": "1F9D1 1F3FF 200D 1F9B1", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F9B1;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩‍🦳", "name": "woman: white hair", "shortname": ":white_hair:", "unicode": "1F469 200D 1F9B3", "html": "&#x1F469;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏻‍🦳", "name": "woman: light skin tone, white hair", "shortname": ":light_skin_tone_white_hair:", "unicode": "1F469 1F3FB 200D 1F9B3", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏼‍🦳", "name": "woman: medium-light skin tone, white hair", "shortname": ":mediumlight_skin_tone_white_hair:", "unicode": "1F469 1F3FC 200D 1F9B3", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏽‍🦳", "name": "woman: medium skin tone, white hair", "shortname": ":medium_skin_tone_white_hair:", "unicode": "1F469 1F3FD 200D 1F9B3", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏾‍🦳", "name": "woman: medium-dark skin tone, white hair", "shortname": ":mediumdark_skin_tone_white_hair:", "unicode": "1F469 1F3FE 200D 1F9B3", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏿‍🦳", "name": "woman: dark skin tone, white hair", "shortname": ":dark_skin_tone_white_hair:", "unicode": "1F469 1F3FF 200D 1F9B3", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑‍🦳", "name": "person: white hair", "shortname": ":white_hair:", "unicode": "1F9D1 200D 1F9B3", "html": "&#x1F9D1;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏻‍🦳", "name": "person: light skin tone, white hair", "shortname": ":light_skin_tone_white_hair:", "unicode": "1F9D1 1F3FB 200D 1F9B3", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏼‍🦳", "name": "person: medium-light skin tone, white hair", "shortname": ":mediumlight_skin_tone_white_hair:", "unicode": "1F9D1 1F3FC 200D 1F9B3", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏽‍🦳", "name": "person: medium skin tone, white hair", "shortname": ":medium_skin_tone_white_hair:", "unicode": "1F9D1 1F3FD 200D 1F9B3", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏾‍🦳", "name": "person: medium-dark skin tone, white hair", "shortname": ":mediumdark_skin_tone_white_hair:", "unicode": "1F9D1 1F3FE 200D 1F9B3", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏿‍🦳", "name": "person: dark skin tone, white hair", "shortname": ":dark_skin_tone_white_hair:", "unicode": "1F9D1 1F3FF 200D 1F9B3", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F9B3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩‍🦲", "name": "woman: bald", "shortname": ":bald:", "unicode": "1F469 200D 1F9B2", "html": "&#x1F469;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏻‍🦲", "name": "woman: light skin tone, bald", "shortname": ":light_skin_tone_bald:", "unicode": "1F469 1F3FB 200D 1F9B2", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏼‍🦲", "name": "woman: medium-light skin tone, bald", "shortname": ":mediumlight_skin_tone_bald:", "unicode": "1F469 1F3FC 200D 1F9B2", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏽‍🦲", "name": "woman: medium skin tone, bald", "shortname": ":medium_skin_tone_bald:", "unicode": "1F469 1F3FD 200D 1F9B2", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏾‍🦲", "name": "woman: medium-dark skin tone, bald", "shortname": ":mediumdark_skin_tone_bald:", "unicode": "1F469 1F3FE 200D 1F9B2", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👩🏿‍🦲", "name": "woman: dark skin tone, bald", "shortname": ":dark_skin_tone_bald:", "unicode": "1F469 1F3FF 200D 1F9B2", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑‍🦲", "name": "person: bald", "shortname": ":bald:", "unicode": "1F9D1 200D 1F9B2", "html": "&#x1F9D1;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏻‍🦲", "name": "person: light skin tone, bald", "shortname": ":light_skin_tone_bald:", "unicode": "1F9D1 1F3FB 200D 1F9B2", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏼‍🦲", "name": "person: medium-light skin tone, bald", "shortname": ":mediumlight_skin_tone_bald:", "unicode": "1F9D1 1F3FC 200D 1F9B2", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏽‍🦲", "name": "person: medium skin tone, bald", "shortname": ":medium_skin_tone_bald:", "unicode": "1F9D1 1F3FD 200D 1F9B2", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏾‍🦲", "name": "person: medium-dark skin tone, bald", "shortname": ":mediumdark_skin_tone_bald:", "unicode": "1F9D1 1F3FE 200D 1F9B2", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧑🏿‍🦲", "name": "person: dark skin tone, bald", "shortname": ":dark_skin_tone_bald:", "unicode": "1F9D1 1F3FF 200D 1F9B2", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F9B2;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱‍♀️", "name": "woman: blond hair", "shortname": ":blond_hair:", "unicode": "1F471 200D 2640 FE0F", "html": "&#x1F471;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏻‍♀️", "name": "woman: light skin tone, blond hair", "shortname": ":light_skin_tone_blond_hair:", "unicode": "1F471 1F3FB 200D 2640 FE0F", "html": "&#x1F471;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏼‍♀️", "name": "woman: medium-light skin tone, blond hair", "shortname": ":mediumlight_skin_tone_blond_hair:", "unicode": "1F471 1F3FC 200D 2640 FE0F", "html": "&#x1F471;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏽‍♀️", "name": "woman: medium skin tone, blond hair", "shortname": ":medium_skin_tone_blond_hair:", "unicode": "1F471 1F3FD 200D 2640 FE0F", "html": "&#x1F471;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏾‍♀️", "name": "woman: medium-dark skin tone, blond hair", "shortname": ":mediumdark_skin_tone_blond_hair:", "unicode": "1F471 1F3FE 200D 2640 FE0F", "html": "&#x1F471;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏿‍♀️", "name": "woman: dark skin tone, blond hair", "shortname": ":dark_skin_tone_blond_hair:", "unicode": "1F471 1F3FF 200D 2640 FE0F", "html": "&#x1F471;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱‍♂️", "name": "man: blond hair", "shortname": ":blond_hair:", "unicode": "1F471 200D 2642 FE0F", "html": "&#x1F471;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱‍♂", "name": "man: blond hair", "shortname": ":blond_hair:", "unicode": "1F471 200D 2642", "html": "&#x1F471;&#x200D;&#x2642;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏻‍♂️", "name": "man: light skin tone, blond hair", "shortname": ":light_skin_tone_blond_hair:", "unicode": "1F471 1F3FB 200D 2642 FE0F", "html": "&#x1F471;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏻‍♂", "name": "man: light skin tone, blond hair", "shortname": ":light_skin_tone_blond_hair:", "unicode": "1F471 1F3FB 200D 2642", "html": "&#x1F471;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏼‍♂️", "name": "man: medium-light skin tone, blond hair", "shortname": ":mediumlight_skin_tone_blond_hair:", "unicode": "1F471 1F3FC 200D 2642 FE0F", "html": "&#x1F471;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏼‍♂", "name": "man: medium-light skin tone, blond hair", "shortname": ":mediumlight_skin_tone_blond_hair:", "unicode": "1F471 1F3FC 200D 2642", "html": "&#x1F471;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏽‍♂️", "name": "man: medium skin tone, blond hair", "shortname": ":medium_skin_tone_blond_hair:", "unicode": "1F471 1F3FD 200D 2642 FE0F", "html": "&#x1F471;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏽‍♂", "name": "man: medium skin tone, blond hair", "shortname": ":medium_skin_tone_blond_hair:", "unicode": "1F471 1F3FD 200D 2642", "html": "&#x1F471;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏾‍♂️", "name": "man: medium-dark skin tone, blond hair", "shortname": ":mediumdark_skin_tone_blond_hair:", "unicode": "1F471 1F3FE 200D 2642 FE0F", "html": "&#x1F471;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏾‍♂", "name": "man: medium-dark skin tone, blond hair", "shortname": ":mediumdark_skin_tone_blond_hair:", "unicode": "1F471 1F3FE 200D 2642", "html": "&#x1F471;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏿‍♂️", "name": "man: dark skin tone, blond hair", "shortname": ":dark_skin_tone_blond_hair:", "unicode": "1F471 1F3FF 200D 2642 FE0F", "html": "&#x1F471;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "👱🏿‍♂", "name": "man: dark skin tone, blond hair", "shortname": ":dark_skin_tone_blond_hair:", "unicode": "1F471 1F3FF 200D 2642", "html": "&#x1F471;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧓", "name": "older person", "shortname": ":older_person:", "unicode": "1F9D3", "html": "&#x1F9D3;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧓🏻", "name": "older person: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D3 1F3FB", "html": "&#x1F9D3;&#x1F3FB;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧓🏼", "name": "older person: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D3 1F3FC", "html": "&#x1F9D3;&#x1F3FC;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧓🏽", "name": "older person: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D3 1F3FD", "html": "&#x1F9D3;&#x1F3FD;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧓🏾", "name": "older person: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D3 1F3FE", "html": "&#x1F9D3;&#x1F3FE;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🧓🏿", "name": "older person: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D3 1F3FF", "html": "&#x1F9D3;&#x1F3FF;", "category": "People & Body (person)", "order": ""},
+		{"emoji": "🙍‍♂️", "name": "man frowning", "shortname": ":man_frowning:", "unicode": "1F64D 200D 2642 FE0F", "html": "&#x1F64D;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏻‍♂️", "name": "man frowning: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64D 1F3FB 200D 2642 FE0F", "html": "&#x1F64D;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏼‍♂️", "name": "man frowning: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64D 1F3FC 200D 2642 FE0F", "html": "&#x1F64D;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏽‍♂️", "name": "man frowning: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64D 1F3FD 200D 2642 FE0F", "html": "&#x1F64D;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏾‍♂️", "name": "man frowning: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64D 1F3FE 200D 2642 FE0F", "html": "&#x1F64D;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏿‍♂️", "name": "man frowning: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64D 1F3FF 200D 2642 FE0F", "html": "&#x1F64D;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍‍♀️", "name": "woman frowning", "shortname": ":woman_frowning:", "unicode": "1F64D 200D 2640 FE0F", "html": "&#x1F64D;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍‍♀", "name": "woman frowning", "shortname": ":woman_frowning:", "unicode": "1F64D 200D 2640", "html": "&#x1F64D;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏻‍♀️", "name": "woman frowning: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64D 1F3FB 200D 2640 FE0F", "html": "&#x1F64D;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏻‍♀", "name": "woman frowning: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64D 1F3FB 200D 2640", "html": "&#x1F64D;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏼‍♀️", "name": "woman frowning: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64D 1F3FC 200D 2640 FE0F", "html": "&#x1F64D;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏼‍♀", "name": "woman frowning: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64D 1F3FC 200D 2640", "html": "&#x1F64D;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏽‍♀️", "name": "woman frowning: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64D 1F3FD 200D 2640 FE0F", "html": "&#x1F64D;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏽‍♀", "name": "woman frowning: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64D 1F3FD 200D 2640", "html": "&#x1F64D;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏾‍♀️", "name": "woman frowning: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64D 1F3FE 200D 2640 FE0F", "html": "&#x1F64D;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏾‍♀", "name": "woman frowning: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64D 1F3FE 200D 2640", "html": "&#x1F64D;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏿‍♀️", "name": "woman frowning: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64D 1F3FF 200D 2640 FE0F", "html": "&#x1F64D;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙍🏿‍♀", "name": "woman frowning: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64D 1F3FF 200D 2640", "html": "&#x1F64D;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎‍♂️", "name": "man pouting", "shortname": ":man_pouting:", "unicode": "1F64E 200D 2642 FE0F", "html": "&#x1F64E;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏻‍♂️", "name": "man pouting: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64E 1F3FB 200D 2642 FE0F", "html": "&#x1F64E;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏼‍♂️", "name": "man pouting: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64E 1F3FC 200D 2642 FE0F", "html": "&#x1F64E;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏽‍♂️", "name": "man pouting: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64E 1F3FD 200D 2642 FE0F", "html": "&#x1F64E;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏾‍♂️", "name": "man pouting: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64E 1F3FE 200D 2642 FE0F", "html": "&#x1F64E;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏿‍♂️", "name": "man pouting: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64E 1F3FF 200D 2642 FE0F", "html": "&#x1F64E;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎‍♀️", "name": "woman pouting", "shortname": ":woman_pouting:", "unicode": "1F64E 200D 2640 FE0F", "html": "&#x1F64E;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎‍♀", "name": "woman pouting", "shortname": ":woman_pouting:", "unicode": "1F64E 200D 2640", "html": "&#x1F64E;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏻‍♀️", "name": "woman pouting: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64E 1F3FB 200D 2640 FE0F", "html": "&#x1F64E;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏻‍♀", "name": "woman pouting: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64E 1F3FB 200D 2640", "html": "&#x1F64E;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏼‍♀️", "name": "woman pouting: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64E 1F3FC 200D 2640 FE0F", "html": "&#x1F64E;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏼‍♀", "name": "woman pouting: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64E 1F3FC 200D 2640", "html": "&#x1F64E;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏽‍♀️", "name": "woman pouting: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64E 1F3FD 200D 2640 FE0F", "html": "&#x1F64E;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏽‍♀", "name": "woman pouting: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64E 1F3FD 200D 2640", "html": "&#x1F64E;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏾‍♀️", "name": "woman pouting: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64E 1F3FE 200D 2640 FE0F", "html": "&#x1F64E;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏾‍♀", "name": "woman pouting: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64E 1F3FE 200D 2640", "html": "&#x1F64E;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏿‍♀️", "name": "woman pouting: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64E 1F3FF 200D 2640 FE0F", "html": "&#x1F64E;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙎🏿‍♀", "name": "woman pouting: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64E 1F3FF 200D 2640", "html": "&#x1F64E;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅‍♂️", "name": "man gesturing NO", "shortname": ":man_gesturing_NO:", "unicode": "1F645 200D 2642 FE0F", "html": "&#x1F645;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏻‍♂️", "name": "man gesturing NO: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F645 1F3FB 200D 2642 FE0F", "html": "&#x1F645;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏼‍♂️", "name": "man gesturing NO: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F645 1F3FC 200D 2642 FE0F", "html": "&#x1F645;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏽‍♂️", "name": "man gesturing NO: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F645 1F3FD 200D 2642 FE0F", "html": "&#x1F645;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏾‍♂️", "name": "man gesturing NO: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F645 1F3FE 200D 2642 FE0F", "html": "&#x1F645;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏿‍♂️", "name": "man gesturing NO: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F645 1F3FF 200D 2642 FE0F", "html": "&#x1F645;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅‍♀️", "name": "woman gesturing NO", "shortname": ":woman_gesturing_NO:", "unicode": "1F645 200D 2640 FE0F", "html": "&#x1F645;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅‍♀", "name": "woman gesturing NO", "shortname": ":woman_gesturing_NO:", "unicode": "1F645 200D 2640", "html": "&#x1F645;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏻‍♀️", "name": "woman gesturing NO: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F645 1F3FB 200D 2640 FE0F", "html": "&#x1F645;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏻‍♀", "name": "woman gesturing NO: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F645 1F3FB 200D 2640", "html": "&#x1F645;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏼‍♀️", "name": "woman gesturing NO: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F645 1F3FC 200D 2640 FE0F", "html": "&#x1F645;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏼‍♀", "name": "woman gesturing NO: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F645 1F3FC 200D 2640", "html": "&#x1F645;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏽‍♀️", "name": "woman gesturing NO: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F645 1F3FD 200D 2640 FE0F", "html": "&#x1F645;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏽‍♀", "name": "woman gesturing NO: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F645 1F3FD 200D 2640", "html": "&#x1F645;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏾‍♀️", "name": "woman gesturing NO: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F645 1F3FE 200D 2640 FE0F", "html": "&#x1F645;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏾‍♀", "name": "woman gesturing NO: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F645 1F3FE 200D 2640", "html": "&#x1F645;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏿‍♀️", "name": "woman gesturing NO: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F645 1F3FF 200D 2640 FE0F", "html": "&#x1F645;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙅🏿‍♀", "name": "woman gesturing NO: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F645 1F3FF 200D 2640", "html": "&#x1F645;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆‍♂️", "name": "man gesturing OK", "shortname": ":man_gesturing_OK:", "unicode": "1F646 200D 2642 FE0F", "html": "&#x1F646;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏻‍♂️", "name": "man gesturing OK: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F646 1F3FB 200D 2642 FE0F", "html": "&#x1F646;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏼‍♂️", "name": "man gesturing OK: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F646 1F3FC 200D 2642 FE0F", "html": "&#x1F646;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏽‍♂️", "name": "man gesturing OK: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F646 1F3FD 200D 2642 FE0F", "html": "&#x1F646;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏾‍♂️", "name": "man gesturing OK: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F646 1F3FE 200D 2642 FE0F", "html": "&#x1F646;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏿‍♂️", "name": "man gesturing OK: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F646 1F3FF 200D 2642 FE0F", "html": "&#x1F646;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆‍♀️", "name": "woman gesturing OK", "shortname": ":woman_gesturing_OK:", "unicode": "1F646 200D 2640 FE0F", "html": "&#x1F646;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆‍♀", "name": "woman gesturing OK", "shortname": ":woman_gesturing_OK:", "unicode": "1F646 200D 2640", "html": "&#x1F646;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏻‍♀️", "name": "woman gesturing OK: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F646 1F3FB 200D 2640 FE0F", "html": "&#x1F646;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏻‍♀", "name": "woman gesturing OK: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F646 1F3FB 200D 2640", "html": "&#x1F646;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏼‍♀️", "name": "woman gesturing OK: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F646 1F3FC 200D 2640 FE0F", "html": "&#x1F646;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏼‍♀", "name": "woman gesturing OK: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F646 1F3FC 200D 2640", "html": "&#x1F646;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏽‍♀️", "name": "woman gesturing OK: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F646 1F3FD 200D 2640 FE0F", "html": "&#x1F646;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏽‍♀", "name": "woman gesturing OK: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F646 1F3FD 200D 2640", "html": "&#x1F646;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏾‍♀️", "name": "woman gesturing OK: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F646 1F3FE 200D 2640 FE0F", "html": "&#x1F646;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏾‍♀", "name": "woman gesturing OK: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F646 1F3FE 200D 2640", "html": "&#x1F646;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏿‍♀️", "name": "woman gesturing OK: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F646 1F3FF 200D 2640 FE0F", "html": "&#x1F646;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙆🏿‍♀", "name": "woman gesturing OK: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F646 1F3FF 200D 2640", "html": "&#x1F646;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁‍♂️", "name": "man tipping hand", "shortname": ":man_tipping_hand:", "unicode": "1F481 200D 2642 FE0F", "html": "&#x1F481;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏻‍♂️", "name": "man tipping hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F481 1F3FB 200D 2642 FE0F", "html": "&#x1F481;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏼‍♂️", "name": "man tipping hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F481 1F3FC 200D 2642 FE0F", "html": "&#x1F481;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏽‍♂️", "name": "man tipping hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F481 1F3FD 200D 2642 FE0F", "html": "&#x1F481;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏾‍♂️", "name": "man tipping hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F481 1F3FE 200D 2642 FE0F", "html": "&#x1F481;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏿‍♂️", "name": "man tipping hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F481 1F3FF 200D 2642 FE0F", "html": "&#x1F481;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁‍♀️", "name": "woman tipping hand", "shortname": ":woman_tipping_hand:", "unicode": "1F481 200D 2640 FE0F", "html": "&#x1F481;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁‍♀", "name": "woman tipping hand", "shortname": ":woman_tipping_hand:", "unicode": "1F481 200D 2640", "html": "&#x1F481;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏻‍♀️", "name": "woman tipping hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F481 1F3FB 200D 2640 FE0F", "html": "&#x1F481;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏻‍♀", "name": "woman tipping hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F481 1F3FB 200D 2640", "html": "&#x1F481;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏼‍♀️", "name": "woman tipping hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F481 1F3FC 200D 2640 FE0F", "html": "&#x1F481;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏼‍♀", "name": "woman tipping hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F481 1F3FC 200D 2640", "html": "&#x1F481;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏽‍♀️", "name": "woman tipping hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F481 1F3FD 200D 2640 FE0F", "html": "&#x1F481;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏽‍♀", "name": "woman tipping hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F481 1F3FD 200D 2640", "html": "&#x1F481;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏾‍♀️", "name": "woman tipping hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F481 1F3FE 200D 2640 FE0F", "html": "&#x1F481;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏾‍♀", "name": "woman tipping hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F481 1F3FE 200D 2640", "html": "&#x1F481;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏿‍♀️", "name": "woman tipping hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F481 1F3FF 200D 2640 FE0F", "html": "&#x1F481;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "💁🏿‍♀", "name": "woman tipping hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F481 1F3FF 200D 2640", "html": "&#x1F481;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋‍♂️", "name": "man raising hand", "shortname": ":man_raising_hand:", "unicode": "1F64B 200D 2642 FE0F", "html": "&#x1F64B;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏻‍♂️", "name": "man raising hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64B 1F3FB 200D 2642 FE0F", "html": "&#x1F64B;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏼‍♂️", "name": "man raising hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64B 1F3FC 200D 2642 FE0F", "html": "&#x1F64B;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏽‍♂️", "name": "man raising hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64B 1F3FD 200D 2642 FE0F", "html": "&#x1F64B;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏾‍♂️", "name": "man raising hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64B 1F3FE 200D 2642 FE0F", "html": "&#x1F64B;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏿‍♂️", "name": "man raising hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64B 1F3FF 200D 2642 FE0F", "html": "&#x1F64B;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋‍♀️", "name": "woman raising hand", "shortname": ":woman_raising_hand:", "unicode": "1F64B 200D 2640 FE0F", "html": "&#x1F64B;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋‍♀", "name": "woman raising hand", "shortname": ":woman_raising_hand:", "unicode": "1F64B 200D 2640", "html": "&#x1F64B;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏻‍♀️", "name": "woman raising hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64B 1F3FB 200D 2640 FE0F", "html": "&#x1F64B;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏻‍♀", "name": "woman raising hand: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F64B 1F3FB 200D 2640", "html": "&#x1F64B;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏼‍♀️", "name": "woman raising hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64B 1F3FC 200D 2640 FE0F", "html": "&#x1F64B;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏼‍♀", "name": "woman raising hand: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F64B 1F3FC 200D 2640", "html": "&#x1F64B;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏽‍♀️", "name": "woman raising hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64B 1F3FD 200D 2640 FE0F", "html": "&#x1F64B;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏽‍♀", "name": "woman raising hand: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F64B 1F3FD 200D 2640", "html": "&#x1F64B;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏾‍♀️", "name": "woman raising hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64B 1F3FE 200D 2640 FE0F", "html": "&#x1F64B;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏾‍♀", "name": "woman raising hand: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F64B 1F3FE 200D 2640", "html": "&#x1F64B;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏿‍♀️", "name": "woman raising hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64B 1F3FF 200D 2640 FE0F", "html": "&#x1F64B;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙋🏿‍♀", "name": "woman raising hand: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F64B 1F3FF 200D 2640", "html": "&#x1F64B;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏", "name": "deaf person", "shortname": ":deaf_person:", "unicode": "1F9CF", "html": "&#x1F9CF;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏻", "name": "deaf person: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CF 1F3FB", "html": "&#x1F9CF;&#x1F3FB;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏼", "name": "deaf person: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CF 1F3FC", "html": "&#x1F9CF;&#x1F3FC;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏽", "name": "deaf person: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CF 1F3FD", "html": "&#x1F9CF;&#x1F3FD;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏾", "name": "deaf person: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CF 1F3FE", "html": "&#x1F9CF;&#x1F3FE;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏿", "name": "deaf person: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CF 1F3FF", "html": "&#x1F9CF;&#x1F3FF;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏‍♂️", "name": "deaf man", "shortname": ":deaf_man:", "unicode": "1F9CF 200D 2642 FE0F", "html": "&#x1F9CF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏‍♂", "name": "deaf man", "shortname": ":deaf_man:", "unicode": "1F9CF 200D 2642", "html": "&#x1F9CF;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏻‍♂️", "name": "deaf man: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CF 1F3FB 200D 2642 FE0F", "html": "&#x1F9CF;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏻‍♂", "name": "deaf man: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CF 1F3FB 200D 2642", "html": "&#x1F9CF;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏼‍♂️", "name": "deaf man: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CF 1F3FC 200D 2642 FE0F", "html": "&#x1F9CF;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏼‍♂", "name": "deaf man: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CF 1F3FC 200D 2642", "html": "&#x1F9CF;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏽‍♂️", "name": "deaf man: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CF 1F3FD 200D 2642 FE0F", "html": "&#x1F9CF;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏽‍♂", "name": "deaf man: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CF 1F3FD 200D 2642", "html": "&#x1F9CF;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏾‍♂️", "name": "deaf man: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CF 1F3FE 200D 2642 FE0F", "html": "&#x1F9CF;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏾‍♂", "name": "deaf man: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CF 1F3FE 200D 2642", "html": "&#x1F9CF;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏿‍♂️", "name": "deaf man: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CF 1F3FF 200D 2642 FE0F", "html": "&#x1F9CF;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏿‍♂", "name": "deaf man: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CF 1F3FF 200D 2642", "html": "&#x1F9CF;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏‍♀️", "name": "deaf woman", "shortname": ":deaf_woman:", "unicode": "1F9CF 200D 2640 FE0F", "html": "&#x1F9CF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏‍♀", "name": "deaf woman", "shortname": ":deaf_woman:", "unicode": "1F9CF 200D 2640", "html": "&#x1F9CF;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏻‍♀️", "name": "deaf woman: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CF 1F3FB 200D 2640 FE0F", "html": "&#x1F9CF;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏻‍♀", "name": "deaf woman: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CF 1F3FB 200D 2640", "html": "&#x1F9CF;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏼‍♀️", "name": "deaf woman: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CF 1F3FC 200D 2640 FE0F", "html": "&#x1F9CF;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏼‍♀", "name": "deaf woman: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CF 1F3FC 200D 2640", "html": "&#x1F9CF;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏽‍♀️", "name": "deaf woman: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CF 1F3FD 200D 2640 FE0F", "html": "&#x1F9CF;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏽‍♀", "name": "deaf woman: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CF 1F3FD 200D 2640", "html": "&#x1F9CF;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏾‍♀️", "name": "deaf woman: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CF 1F3FE 200D 2640 FE0F", "html": "&#x1F9CF;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏾‍♀", "name": "deaf woman: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CF 1F3FE 200D 2640", "html": "&#x1F9CF;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏿‍♀️", "name": "deaf woman: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CF 1F3FF 200D 2640 FE0F", "html": "&#x1F9CF;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧏🏿‍♀", "name": "deaf woman: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CF 1F3FF 200D 2640", "html": "&#x1F9CF;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇‍♂️", "name": "man bowing", "shortname": ":man_bowing:", "unicode": "1F647 200D 2642 FE0F", "html": "&#x1F647;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇‍♂", "name": "man bowing", "shortname": ":man_bowing:", "unicode": "1F647 200D 2642", "html": "&#x1F647;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏻‍♂️", "name": "man bowing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F647 1F3FB 200D 2642 FE0F", "html": "&#x1F647;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏻‍♂", "name": "man bowing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F647 1F3FB 200D 2642", "html": "&#x1F647;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏼‍♂️", "name": "man bowing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F647 1F3FC 200D 2642 FE0F", "html": "&#x1F647;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏼‍♂", "name": "man bowing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F647 1F3FC 200D 2642", "html": "&#x1F647;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏽‍♂️", "name": "man bowing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F647 1F3FD 200D 2642 FE0F", "html": "&#x1F647;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏽‍♂", "name": "man bowing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F647 1F3FD 200D 2642", "html": "&#x1F647;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏾‍♂️", "name": "man bowing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F647 1F3FE 200D 2642 FE0F", "html": "&#x1F647;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏾‍♂", "name": "man bowing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F647 1F3FE 200D 2642", "html": "&#x1F647;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏿‍♂️", "name": "man bowing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F647 1F3FF 200D 2642 FE0F", "html": "&#x1F647;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏿‍♂", "name": "man bowing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F647 1F3FF 200D 2642", "html": "&#x1F647;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇‍♀️", "name": "woman bowing", "shortname": ":woman_bowing:", "unicode": "1F647 200D 2640 FE0F", "html": "&#x1F647;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏻‍♀️", "name": "woman bowing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F647 1F3FB 200D 2640 FE0F", "html": "&#x1F647;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏼‍♀️", "name": "woman bowing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F647 1F3FC 200D 2640 FE0F", "html": "&#x1F647;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏽‍♀️", "name": "woman bowing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F647 1F3FD 200D 2640 FE0F", "html": "&#x1F647;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏾‍♀️", "name": "woman bowing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F647 1F3FE 200D 2640 FE0F", "html": "&#x1F647;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🙇🏿‍♀️", "name": "woman bowing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F647 1F3FF 200D 2640 FE0F", "html": "&#x1F647;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦", "name": "person facepalming", "shortname": ":person_facepalming:", "unicode": "1F926", "html": "&#x1F926;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏻", "name": "person facepalming: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F926 1F3FB", "html": "&#x1F926;&#x1F3FB;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏼", "name": "person facepalming: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F926 1F3FC", "html": "&#x1F926;&#x1F3FC;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏽", "name": "person facepalming: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F926 1F3FD", "html": "&#x1F926;&#x1F3FD;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏾", "name": "person facepalming: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F926 1F3FE", "html": "&#x1F926;&#x1F3FE;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏿", "name": "person facepalming: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F926 1F3FF", "html": "&#x1F926;&#x1F3FF;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦‍♂️", "name": "man facepalming", "shortname": ":man_facepalming:", "unicode": "1F926 200D 2642 FE0F", "html": "&#x1F926;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦‍♂", "name": "man facepalming", "shortname": ":man_facepalming:", "unicode": "1F926 200D 2642", "html": "&#x1F926;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏻‍♂️", "name": "man facepalming: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F926 1F3FB 200D 2642 FE0F", "html": "&#x1F926;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏻‍♂", "name": "man facepalming: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F926 1F3FB 200D 2642", "html": "&#x1F926;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏼‍♂️", "name": "man facepalming: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F926 1F3FC 200D 2642 FE0F", "html": "&#x1F926;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏼‍♂", "name": "man facepalming: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F926 1F3FC 200D 2642", "html": "&#x1F926;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏽‍♂️", "name": "man facepalming: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F926 1F3FD 200D 2642 FE0F", "html": "&#x1F926;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏽‍♂", "name": "man facepalming: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F926 1F3FD 200D 2642", "html": "&#x1F926;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏾‍♂️", "name": "man facepalming: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F926 1F3FE 200D 2642 FE0F", "html": "&#x1F926;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏾‍♂", "name": "man facepalming: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F926 1F3FE 200D 2642", "html": "&#x1F926;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏿‍♂️", "name": "man facepalming: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F926 1F3FF 200D 2642 FE0F", "html": "&#x1F926;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏿‍♂", "name": "man facepalming: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F926 1F3FF 200D 2642", "html": "&#x1F926;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦‍♀️", "name": "woman facepalming", "shortname": ":woman_facepalming:", "unicode": "1F926 200D 2640 FE0F", "html": "&#x1F926;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦‍♀", "name": "woman facepalming", "shortname": ":woman_facepalming:", "unicode": "1F926 200D 2640", "html": "&#x1F926;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏻‍♀️", "name": "woman facepalming: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F926 1F3FB 200D 2640 FE0F", "html": "&#x1F926;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏻‍♀", "name": "woman facepalming: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F926 1F3FB 200D 2640", "html": "&#x1F926;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏼‍♀️", "name": "woman facepalming: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F926 1F3FC 200D 2640 FE0F", "html": "&#x1F926;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏼‍♀", "name": "woman facepalming: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F926 1F3FC 200D 2640", "html": "&#x1F926;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏽‍♀️", "name": "woman facepalming: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F926 1F3FD 200D 2640 FE0F", "html": "&#x1F926;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏽‍♀", "name": "woman facepalming: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F926 1F3FD 200D 2640", "html": "&#x1F926;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏾‍♀️", "name": "woman facepalming: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F926 1F3FE 200D 2640 FE0F", "html": "&#x1F926;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏾‍♀", "name": "woman facepalming: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F926 1F3FE 200D 2640", "html": "&#x1F926;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏿‍♀️", "name": "woman facepalming: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F926 1F3FF 200D 2640 FE0F", "html": "&#x1F926;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤦🏿‍♀", "name": "woman facepalming: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F926 1F3FF 200D 2640", "html": "&#x1F926;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷", "name": "person shrugging", "shortname": ":person_shrugging:", "unicode": "1F937", "html": "&#x1F937;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏻", "name": "person shrugging: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F937 1F3FB", "html": "&#x1F937;&#x1F3FB;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏼", "name": "person shrugging: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F937 1F3FC", "html": "&#x1F937;&#x1F3FC;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏽", "name": "person shrugging: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F937 1F3FD", "html": "&#x1F937;&#x1F3FD;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏾", "name": "person shrugging: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F937 1F3FE", "html": "&#x1F937;&#x1F3FE;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏿", "name": "person shrugging: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F937 1F3FF", "html": "&#x1F937;&#x1F3FF;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷‍♂️", "name": "man shrugging", "shortname": ":man_shrugging:", "unicode": "1F937 200D 2642 FE0F", "html": "&#x1F937;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷‍♂", "name": "man shrugging", "shortname": ":man_shrugging:", "unicode": "1F937 200D 2642", "html": "&#x1F937;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏻‍♂️", "name": "man shrugging: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F937 1F3FB 200D 2642 FE0F", "html": "&#x1F937;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏻‍♂", "name": "man shrugging: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F937 1F3FB 200D 2642", "html": "&#x1F937;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏼‍♂️", "name": "man shrugging: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F937 1F3FC 200D 2642 FE0F", "html": "&#x1F937;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏼‍♂", "name": "man shrugging: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F937 1F3FC 200D 2642", "html": "&#x1F937;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏽‍♂️", "name": "man shrugging: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F937 1F3FD 200D 2642 FE0F", "html": "&#x1F937;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏽‍♂", "name": "man shrugging: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F937 1F3FD 200D 2642", "html": "&#x1F937;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏾‍♂️", "name": "man shrugging: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F937 1F3FE 200D 2642 FE0F", "html": "&#x1F937;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏾‍♂", "name": "man shrugging: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F937 1F3FE 200D 2642", "html": "&#x1F937;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏿‍♂️", "name": "man shrugging: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F937 1F3FF 200D 2642 FE0F", "html": "&#x1F937;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏿‍♂", "name": "man shrugging: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F937 1F3FF 200D 2642", "html": "&#x1F937;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷‍♀️", "name": "woman shrugging", "shortname": ":woman_shrugging:", "unicode": "1F937 200D 2640 FE0F", "html": "&#x1F937;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷‍♀", "name": "woman shrugging", "shortname": ":woman_shrugging:", "unicode": "1F937 200D 2640", "html": "&#x1F937;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏻‍♀️", "name": "woman shrugging: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F937 1F3FB 200D 2640 FE0F", "html": "&#x1F937;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏻‍♀", "name": "woman shrugging: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F937 1F3FB 200D 2640", "html": "&#x1F937;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏼‍♀️", "name": "woman shrugging: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F937 1F3FC 200D 2640 FE0F", "html": "&#x1F937;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏼‍♀", "name": "woman shrugging: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F937 1F3FC 200D 2640", "html": "&#x1F937;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏽‍♀️", "name": "woman shrugging: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F937 1F3FD 200D 2640 FE0F", "html": "&#x1F937;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏽‍♀", "name": "woman shrugging: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F937 1F3FD 200D 2640", "html": "&#x1F937;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏾‍♀️", "name": "woman shrugging: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F937 1F3FE 200D 2640 FE0F", "html": "&#x1F937;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏾‍♀", "name": "woman shrugging: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F937 1F3FE 200D 2640", "html": "&#x1F937;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏿‍♀️", "name": "woman shrugging: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F937 1F3FF 200D 2640 FE0F", "html": "&#x1F937;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🤷🏿‍♀", "name": "woman shrugging: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F937 1F3FF 200D 2640", "html": "&#x1F937;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-gesture)", "order": ""},
+		{"emoji": "🧑‍⚕️", "name": "health worker", "shortname": ":health_worker:", "unicode": "1F9D1 200D 2695 FE0F", "html": "&#x1F9D1;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍⚕", "name": "health worker", "shortname": ":health_worker:", "unicode": "1F9D1 200D 2695", "html": "&#x1F9D1;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍⚕️", "name": "health worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 2695 FE0F", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍⚕", "name": "health worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 2695", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍⚕️", "name": "health worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 2695 FE0F", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍⚕", "name": "health worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 2695", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍⚕️", "name": "health worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 2695 FE0F", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍⚕", "name": "health worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 2695", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍⚕️", "name": "health worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 2695 FE0F", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍⚕", "name": "health worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 2695", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍⚕️", "name": "health worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 2695 FE0F", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍⚕", "name": "health worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 2695", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍⚕️", "name": "man health worker", "shortname": ":man_health_worker:", "unicode": "1F468 200D 2695 FE0F", "html": "&#x1F468;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍⚕", "name": "man health worker", "shortname": ":man_health_worker:", "unicode": "1F468 200D 2695", "html": "&#x1F468;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍⚕️", "name": "man health worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 2695 FE0F", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍⚕", "name": "man health worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 2695", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍⚕️", "name": "man health worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 2695 FE0F", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍⚕", "name": "man health worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 2695", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍⚕️", "name": "man health worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 2695 FE0F", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍⚕", "name": "man health worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 2695", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍⚕️", "name": "man health worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 2695 FE0F", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍⚕", "name": "man health worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 2695", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍⚕️", "name": "man health worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 2695 FE0F", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍⚕", "name": "man health worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 2695", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍⚕️", "name": "woman health worker", "shortname": ":woman_health_worker:", "unicode": "1F469 200D 2695 FE0F", "html": "&#x1F469;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍⚕", "name": "woman health worker", "shortname": ":woman_health_worker:", "unicode": "1F469 200D 2695", "html": "&#x1F469;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍⚕️", "name": "woman health worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 2695 FE0F", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍⚕", "name": "woman health worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 2695", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍⚕️", "name": "woman health worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 2695 FE0F", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍⚕", "name": "woman health worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 2695", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍⚕️", "name": "woman health worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 2695 FE0F", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍⚕", "name": "woman health worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 2695", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍⚕️", "name": "woman health worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 2695 FE0F", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍⚕", "name": "woman health worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 2695", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍⚕️", "name": "woman health worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 2695 FE0F", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x2695;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍⚕", "name": "woman health worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 2695", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x2695;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🎓", "name": "student", "shortname": ":student:", "unicode": "1F9D1 200D 1F393", "html": "&#x1F9D1;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🎓", "name": "student: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F393", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🎓", "name": "student: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F393", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🎓", "name": "student: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F393", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🎓", "name": "student: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F393", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🎓", "name": "student: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F393", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🎓", "name": "man student", "shortname": ":man_student:", "unicode": "1F468 200D 1F393", "html": "&#x1F468;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🎓", "name": "man student: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F393", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🎓", "name": "man student: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F393", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🎓", "name": "man student: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F393", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🎓", "name": "man student: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F393", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🎓", "name": "man student: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F393", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🎓", "name": "woman student", "shortname": ":woman_student:", "unicode": "1F469 200D 1F393", "html": "&#x1F469;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🎓", "name": "woman student: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F393", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🎓", "name": "woman student: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F393", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🎓", "name": "woman student: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F393", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🎓", "name": "woman student: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F393", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🎓", "name": "woman student: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F393", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F393;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🏫", "name": "teacher", "shortname": ":teacher:", "unicode": "1F9D1 200D 1F3EB", "html": "&#x1F9D1;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🏫", "name": "teacher: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F3EB", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🏫", "name": "teacher: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F3EB", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🏫", "name": "teacher: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F3EB", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🏫", "name": "teacher: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F3EB", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🏫", "name": "teacher: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F3EB", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🏫", "name": "man teacher", "shortname": ":man_teacher:", "unicode": "1F468 200D 1F3EB", "html": "&#x1F468;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🏫", "name": "man teacher: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F3EB", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🏫", "name": "man teacher: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F3EB", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🏫", "name": "man teacher: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F3EB", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🏫", "name": "man teacher: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F3EB", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🏫", "name": "man teacher: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F3EB", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🏫", "name": "woman teacher", "shortname": ":woman_teacher:", "unicode": "1F469 200D 1F3EB", "html": "&#x1F469;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🏫", "name": "woman teacher: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F3EB", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🏫", "name": "woman teacher: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F3EB", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🏫", "name": "woman teacher: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F3EB", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🏫", "name": "woman teacher: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F3EB", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🏫", "name": "woman teacher: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F3EB", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F3EB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍⚖️", "name": "judge", "shortname": ":judge:", "unicode": "1F9D1 200D 2696 FE0F", "html": "&#x1F9D1;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍⚖", "name": "judge", "shortname": ":judge:", "unicode": "1F9D1 200D 2696", "html": "&#x1F9D1;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍⚖️", "name": "judge: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 2696 FE0F", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍⚖", "name": "judge: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 2696", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍⚖️", "name": "judge: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 2696 FE0F", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍⚖", "name": "judge: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 2696", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍⚖️", "name": "judge: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 2696 FE0F", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍⚖", "name": "judge: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 2696", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍⚖️", "name": "judge: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 2696 FE0F", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍⚖", "name": "judge: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 2696", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍⚖️", "name": "judge: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 2696 FE0F", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍⚖", "name": "judge: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 2696", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍⚖️", "name": "man judge", "shortname": ":man_judge:", "unicode": "1F468 200D 2696 FE0F", "html": "&#x1F468;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍⚖", "name": "man judge", "shortname": ":man_judge:", "unicode": "1F468 200D 2696", "html": "&#x1F468;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍⚖️", "name": "man judge: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 2696 FE0F", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍⚖", "name": "man judge: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 2696", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍⚖️", "name": "man judge: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 2696 FE0F", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍⚖", "name": "man judge: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 2696", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍⚖️", "name": "man judge: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 2696 FE0F", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍⚖", "name": "man judge: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 2696", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍⚖️", "name": "man judge: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 2696 FE0F", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍⚖", "name": "man judge: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 2696", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍⚖️", "name": "man judge: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 2696 FE0F", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍⚖", "name": "man judge: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 2696", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍⚖️", "name": "woman judge", "shortname": ":woman_judge:", "unicode": "1F469 200D 2696 FE0F", "html": "&#x1F469;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍⚖", "name": "woman judge", "shortname": ":woman_judge:", "unicode": "1F469 200D 2696", "html": "&#x1F469;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍⚖️", "name": "woman judge: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 2696 FE0F", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍⚖", "name": "woman judge: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 2696", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍⚖️", "name": "woman judge: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 2696 FE0F", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍⚖", "name": "woman judge: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 2696", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍⚖️", "name": "woman judge: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 2696 FE0F", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍⚖", "name": "woman judge: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 2696", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍⚖️", "name": "woman judge: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 2696 FE0F", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍⚖", "name": "woman judge: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 2696", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍⚖️", "name": "woman judge: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 2696 FE0F", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x2696;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍⚖", "name": "woman judge: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 2696", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x2696;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🌾", "name": "farmer", "shortname": ":farmer:", "unicode": "1F9D1 200D 1F33E", "html": "&#x1F9D1;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🌾", "name": "farmer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F33E", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🌾", "name": "farmer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F33E", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🌾", "name": "farmer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F33E", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🌾", "name": "farmer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F33E", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🌾", "name": "farmer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F33E", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🌾", "name": "man farmer", "shortname": ":man_farmer:", "unicode": "1F468 200D 1F33E", "html": "&#x1F468;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🌾", "name": "man farmer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F33E", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🌾", "name": "man farmer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F33E", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🌾", "name": "man farmer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F33E", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🌾", "name": "man farmer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F33E", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🌾", "name": "man farmer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F33E", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🌾", "name": "woman farmer", "shortname": ":woman_farmer:", "unicode": "1F469 200D 1F33E", "html": "&#x1F469;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🌾", "name": "woman farmer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F33E", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🌾", "name": "woman farmer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F33E", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🌾", "name": "woman farmer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F33E", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🌾", "name": "woman farmer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F33E", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🌾", "name": "woman farmer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F33E", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F33E;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🍳", "name": "cook", "shortname": ":cook:", "unicode": "1F9D1 200D 1F373", "html": "&#x1F9D1;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🍳", "name": "cook: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F373", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🍳", "name": "cook: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F373", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🍳", "name": "cook: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F373", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🍳", "name": "cook: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F373", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🍳", "name": "cook: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F373", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🍳", "name": "man cook", "shortname": ":man_cook:", "unicode": "1F468 200D 1F373", "html": "&#x1F468;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🍳", "name": "man cook: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F373", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🍳", "name": "man cook: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F373", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🍳", "name": "man cook: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F373", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🍳", "name": "man cook: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F373", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🍳", "name": "man cook: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F373", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🍳", "name": "woman cook", "shortname": ":woman_cook:", "unicode": "1F469 200D 1F373", "html": "&#x1F469;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🍳", "name": "woman cook: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F373", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🍳", "name": "woman cook: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F373", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🍳", "name": "woman cook: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F373", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🍳", "name": "woman cook: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F373", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🍳", "name": "woman cook: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F373", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F373;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🔧", "name": "mechanic", "shortname": ":mechanic:", "unicode": "1F9D1 200D 1F527", "html": "&#x1F9D1;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🔧", "name": "mechanic: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F527", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🔧", "name": "mechanic: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F527", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🔧", "name": "mechanic: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F527", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🔧", "name": "mechanic: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F527", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🔧", "name": "mechanic: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F527", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🔧", "name": "man mechanic", "shortname": ":man_mechanic:", "unicode": "1F468 200D 1F527", "html": "&#x1F468;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🔧", "name": "man mechanic: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F527", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🔧", "name": "man mechanic: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F527", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🔧", "name": "man mechanic: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F527", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🔧", "name": "man mechanic: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F527", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🔧", "name": "man mechanic: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F527", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🔧", "name": "woman mechanic", "shortname": ":woman_mechanic:", "unicode": "1F469 200D 1F527", "html": "&#x1F469;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🔧", "name": "woman mechanic: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F527", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🔧", "name": "woman mechanic: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F527", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🔧", "name": "woman mechanic: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F527", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🔧", "name": "woman mechanic: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F527", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🔧", "name": "woman mechanic: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F527", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F527;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🏭", "name": "factory worker", "shortname": ":factory_worker:", "unicode": "1F9D1 200D 1F3ED", "html": "&#x1F9D1;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🏭", "name": "factory worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F3ED", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🏭", "name": "factory worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F3ED", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🏭", "name": "factory worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F3ED", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🏭", "name": "factory worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F3ED", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🏭", "name": "factory worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F3ED", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🏭", "name": "man factory worker", "shortname": ":man_factory_worker:", "unicode": "1F468 200D 1F3ED", "html": "&#x1F468;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🏭", "name": "man factory worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F3ED", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🏭", "name": "man factory worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F3ED", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🏭", "name": "man factory worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F3ED", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🏭", "name": "man factory worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F3ED", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🏭", "name": "man factory worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F3ED", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🏭", "name": "woman factory worker", "shortname": ":woman_factory_worker:", "unicode": "1F469 200D 1F3ED", "html": "&#x1F469;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🏭", "name": "woman factory worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F3ED", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🏭", "name": "woman factory worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F3ED", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🏭", "name": "woman factory worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F3ED", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🏭", "name": "woman factory worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F3ED", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🏭", "name": "woman factory worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F3ED", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F3ED;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍💼", "name": "office worker", "shortname": ":office_worker:", "unicode": "1F9D1 200D 1F4BC", "html": "&#x1F9D1;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍💼", "name": "office worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F4BC", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍💼", "name": "office worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F4BC", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍💼", "name": "office worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F4BC", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍💼", "name": "office worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F4BC", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍💼", "name": "office worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F4BC", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍💼", "name": "man office worker", "shortname": ":man_office_worker:", "unicode": "1F468 200D 1F4BC", "html": "&#x1F468;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍💼", "name": "man office worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F4BC", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍💼", "name": "man office worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F4BC", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍💼", "name": "man office worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F4BC", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍💼", "name": "man office worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F4BC", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍💼", "name": "man office worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F4BC", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍💼", "name": "woman office worker", "shortname": ":woman_office_worker:", "unicode": "1F469 200D 1F4BC", "html": "&#x1F469;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍💼", "name": "woman office worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F4BC", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍💼", "name": "woman office worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F4BC", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍💼", "name": "woman office worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F4BC", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍💼", "name": "woman office worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F4BC", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍💼", "name": "woman office worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F4BC", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F4BC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🔬", "name": "scientist", "shortname": ":scientist:", "unicode": "1F9D1 200D 1F52C", "html": "&#x1F9D1;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🔬", "name": "scientist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F52C", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🔬", "name": "scientist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F52C", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🔬", "name": "scientist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F52C", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🔬", "name": "scientist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F52C", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🔬", "name": "scientist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F52C", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🔬", "name": "man scientist", "shortname": ":man_scientist:", "unicode": "1F468 200D 1F52C", "html": "&#x1F468;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🔬", "name": "man scientist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F52C", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🔬", "name": "man scientist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F52C", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🔬", "name": "man scientist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F52C", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🔬", "name": "man scientist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F52C", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🔬", "name": "man scientist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F52C", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🔬", "name": "woman scientist", "shortname": ":woman_scientist:", "unicode": "1F469 200D 1F52C", "html": "&#x1F469;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🔬", "name": "woman scientist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F52C", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🔬", "name": "woman scientist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F52C", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🔬", "name": "woman scientist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F52C", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🔬", "name": "woman scientist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F52C", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🔬", "name": "woman scientist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F52C", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F52C;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍💻", "name": "technologist", "shortname": ":technologist:", "unicode": "1F9D1 200D 1F4BB", "html": "&#x1F9D1;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍💻", "name": "technologist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F4BB", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍💻", "name": "technologist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F4BB", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍💻", "name": "technologist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F4BB", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍💻", "name": "technologist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F4BB", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍💻", "name": "technologist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F4BB", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍💻", "name": "man technologist", "shortname": ":man_technologist:", "unicode": "1F468 200D 1F4BB", "html": "&#x1F468;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍💻", "name": "man technologist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F4BB", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍💻", "name": "man technologist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F4BB", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍💻", "name": "man technologist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F4BB", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍💻", "name": "man technologist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F4BB", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍💻", "name": "man technologist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F4BB", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍💻", "name": "woman technologist", "shortname": ":woman_technologist:", "unicode": "1F469 200D 1F4BB", "html": "&#x1F469;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍💻", "name": "woman technologist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F4BB", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍💻", "name": "woman technologist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F4BB", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍💻", "name": "woman technologist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F4BB", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍💻", "name": "woman technologist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F4BB", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍💻", "name": "woman technologist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F4BB", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F4BB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🎤", "name": "singer", "shortname": ":singer:", "unicode": "1F9D1 200D 1F3A4", "html": "&#x1F9D1;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🎤", "name": "singer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F3A4", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🎤", "name": "singer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F3A4", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🎤", "name": "singer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F3A4", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🎤", "name": "singer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F3A4", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🎤", "name": "singer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F3A4", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🎤", "name": "man singer", "shortname": ":man_singer:", "unicode": "1F468 200D 1F3A4", "html": "&#x1F468;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🎤", "name": "man singer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F3A4", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🎤", "name": "man singer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F3A4", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🎤", "name": "man singer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F3A4", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🎤", "name": "man singer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F3A4", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🎤", "name": "man singer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F3A4", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🎤", "name": "woman singer", "shortname": ":woman_singer:", "unicode": "1F469 200D 1F3A4", "html": "&#x1F469;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🎤", "name": "woman singer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F3A4", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🎤", "name": "woman singer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F3A4", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🎤", "name": "woman singer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F3A4", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🎤", "name": "woman singer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F3A4", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🎤", "name": "woman singer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F3A4", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F3A4;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🎨", "name": "artist", "shortname": ":artist:", "unicode": "1F9D1 200D 1F3A8", "html": "&#x1F9D1;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🎨", "name": "artist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F3A8", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🎨", "name": "artist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F3A8", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🎨", "name": "artist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F3A8", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🎨", "name": "artist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F3A8", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🎨", "name": "artist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F3A8", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🎨", "name": "man artist", "shortname": ":man_artist:", "unicode": "1F468 200D 1F3A8", "html": "&#x1F468;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🎨", "name": "man artist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F3A8", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🎨", "name": "man artist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F3A8", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🎨", "name": "man artist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F3A8", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🎨", "name": "man artist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F3A8", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🎨", "name": "man artist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F3A8", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🎨", "name": "woman artist", "shortname": ":woman_artist:", "unicode": "1F469 200D 1F3A8", "html": "&#x1F469;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🎨", "name": "woman artist: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F3A8", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🎨", "name": "woman artist: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F3A8", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🎨", "name": "woman artist: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F3A8", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🎨", "name": "woman artist: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F3A8", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🎨", "name": "woman artist: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F3A8", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F3A8;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍✈️", "name": "pilot", "shortname": ":pilot:", "unicode": "1F9D1 200D 2708 FE0F", "html": "&#x1F9D1;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍✈", "name": "pilot", "shortname": ":pilot:", "unicode": "1F9D1 200D 2708", "html": "&#x1F9D1;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍✈️", "name": "pilot: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 2708 FE0F", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍✈", "name": "pilot: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 2708", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍✈️", "name": "pilot: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 2708 FE0F", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍✈", "name": "pilot: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 2708", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍✈️", "name": "pilot: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 2708 FE0F", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍✈", "name": "pilot: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 2708", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍✈️", "name": "pilot: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 2708 FE0F", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍✈", "name": "pilot: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 2708", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍✈️", "name": "pilot: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 2708 FE0F", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍✈", "name": "pilot: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 2708", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍✈️", "name": "man pilot", "shortname": ":man_pilot:", "unicode": "1F468 200D 2708 FE0F", "html": "&#x1F468;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍✈", "name": "man pilot", "shortname": ":man_pilot:", "unicode": "1F468 200D 2708", "html": "&#x1F468;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍✈️", "name": "man pilot: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 2708 FE0F", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍✈", "name": "man pilot: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 2708", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍✈️", "name": "man pilot: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 2708 FE0F", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍✈", "name": "man pilot: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 2708", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍✈️", "name": "man pilot: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 2708 FE0F", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍✈", "name": "man pilot: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 2708", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍✈️", "name": "man pilot: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 2708 FE0F", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍✈", "name": "man pilot: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 2708", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍✈️", "name": "man pilot: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 2708 FE0F", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍✈", "name": "man pilot: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 2708", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍✈️", "name": "woman pilot", "shortname": ":woman_pilot:", "unicode": "1F469 200D 2708 FE0F", "html": "&#x1F469;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍✈", "name": "woman pilot", "shortname": ":woman_pilot:", "unicode": "1F469 200D 2708", "html": "&#x1F469;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍✈️", "name": "woman pilot: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 2708 FE0F", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍✈", "name": "woman pilot: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 2708", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍✈️", "name": "woman pilot: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 2708 FE0F", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍✈", "name": "woman pilot: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 2708", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍✈️", "name": "woman pilot: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 2708 FE0F", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍✈", "name": "woman pilot: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 2708", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍✈️", "name": "woman pilot: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 2708 FE0F", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍✈", "name": "woman pilot: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 2708", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍✈️", "name": "woman pilot: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 2708 FE0F", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x2708;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍✈", "name": "woman pilot: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 2708", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x2708;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🚀", "name": "astronaut", "shortname": ":astronaut:", "unicode": "1F9D1 200D 1F680", "html": "&#x1F9D1;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🚀", "name": "astronaut: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F680", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🚀", "name": "astronaut: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F680", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🚀", "name": "astronaut: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F680", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🚀", "name": "astronaut: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F680", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🚀", "name": "astronaut: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F680", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🚀", "name": "man astronaut", "shortname": ":man_astronaut:", "unicode": "1F468 200D 1F680", "html": "&#x1F468;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🚀", "name": "man astronaut: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F680", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🚀", "name": "man astronaut: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F680", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🚀", "name": "man astronaut: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F680", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🚀", "name": "man astronaut: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F680", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🚀", "name": "man astronaut: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F680", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🚀", "name": "woman astronaut", "shortname": ":woman_astronaut:", "unicode": "1F469 200D 1F680", "html": "&#x1F469;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🚀", "name": "woman astronaut: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F680", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🚀", "name": "woman astronaut: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F680", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🚀", "name": "woman astronaut: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F680", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🚀", "name": "woman astronaut: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F680", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🚀", "name": "woman astronaut: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F680", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F680;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑‍🚒", "name": "firefighter", "shortname": ":firefighter:", "unicode": "1F9D1 200D 1F692", "html": "&#x1F9D1;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏻‍🚒", "name": "firefighter: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F692", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏼‍🚒", "name": "firefighter: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F692", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏽‍🚒", "name": "firefighter: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F692", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏾‍🚒", "name": "firefighter: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F692", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧑🏿‍🚒", "name": "firefighter: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F692", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨‍🚒", "name": "man firefighter", "shortname": ":man_firefighter:", "unicode": "1F468 200D 1F692", "html": "&#x1F468;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏻‍🚒", "name": "man firefighter: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F692", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏼‍🚒", "name": "man firefighter: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F692", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏽‍🚒", "name": "man firefighter: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F692", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏾‍🚒", "name": "man firefighter: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F692", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👨🏿‍🚒", "name": "man firefighter: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F692", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩‍🚒", "name": "woman firefighter", "shortname": ":woman_firefighter:", "unicode": "1F469 200D 1F692", "html": "&#x1F469;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏻‍🚒", "name": "woman firefighter: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F692", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏼‍🚒", "name": "woman firefighter: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F692", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏽‍🚒", "name": "woman firefighter: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F692", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏾‍🚒", "name": "woman firefighter: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F692", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👩🏿‍🚒", "name": "woman firefighter: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F692", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F692;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮‍♂️", "name": "man police officer", "shortname": ":man_police_officer:", "unicode": "1F46E 200D 2642 FE0F", "html": "&#x1F46E;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮‍♂", "name": "man police officer", "shortname": ":man_police_officer:", "unicode": "1F46E 200D 2642", "html": "&#x1F46E;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏻‍♂️", "name": "man police officer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F46E 1F3FB 200D 2642 FE0F", "html": "&#x1F46E;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏻‍♂", "name": "man police officer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F46E 1F3FB 200D 2642", "html": "&#x1F46E;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏼‍♂️", "name": "man police officer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F46E 1F3FC 200D 2642 FE0F", "html": "&#x1F46E;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏼‍♂", "name": "man police officer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F46E 1F3FC 200D 2642", "html": "&#x1F46E;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏽‍♂️", "name": "man police officer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F46E 1F3FD 200D 2642 FE0F", "html": "&#x1F46E;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏽‍♂", "name": "man police officer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F46E 1F3FD 200D 2642", "html": "&#x1F46E;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏾‍♂️", "name": "man police officer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F46E 1F3FE 200D 2642 FE0F", "html": "&#x1F46E;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏾‍♂", "name": "man police officer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F46E 1F3FE 200D 2642", "html": "&#x1F46E;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏿‍♂️", "name": "man police officer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F46E 1F3FF 200D 2642 FE0F", "html": "&#x1F46E;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏿‍♂", "name": "man police officer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F46E 1F3FF 200D 2642", "html": "&#x1F46E;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮‍♀️", "name": "woman police officer", "shortname": ":woman_police_officer:", "unicode": "1F46E 200D 2640 FE0F", "html": "&#x1F46E;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏻‍♀️", "name": "woman police officer: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F46E 1F3FB 200D 2640 FE0F", "html": "&#x1F46E;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏼‍♀️", "name": "woman police officer: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F46E 1F3FC 200D 2640 FE0F", "html": "&#x1F46E;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏽‍♀️", "name": "woman police officer: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F46E 1F3FD 200D 2640 FE0F", "html": "&#x1F46E;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏾‍♀️", "name": "woman police officer: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F46E 1F3FE 200D 2640 FE0F", "html": "&#x1F46E;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👮🏿‍♀️", "name": "woman police officer: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F46E 1F3FF 200D 2640 FE0F", "html": "&#x1F46E;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵️", "name": "detective", "shortname": ":detective:", "unicode": "1F575 FE0F", "html": "&#x1F575;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵️‍♂️", "name": "man detective", "shortname": ":man_detective:", "unicode": "1F575 FE0F 200D 2642 FE0F", "html": "&#x1F575;&#xFE0F;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵‍♂️", "name": "man detective", "shortname": ":man_detective:", "unicode": "1F575 200D 2642 FE0F", "html": "&#x1F575;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵️‍♂", "name": "man detective", "shortname": ":man_detective:", "unicode": "1F575 FE0F 200D 2642", "html": "&#x1F575;&#xFE0F;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵‍♂", "name": "man detective", "shortname": ":man_detective:", "unicode": "1F575 200D 2642", "html": "&#x1F575;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏻‍♂️", "name": "man detective: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F575 1F3FB 200D 2642 FE0F", "html": "&#x1F575;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏻‍♂", "name": "man detective: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F575 1F3FB 200D 2642", "html": "&#x1F575;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏼‍♂️", "name": "man detective: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F575 1F3FC 200D 2642 FE0F", "html": "&#x1F575;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏼‍♂", "name": "man detective: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F575 1F3FC 200D 2642", "html": "&#x1F575;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏽‍♂️", "name": "man detective: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F575 1F3FD 200D 2642 FE0F", "html": "&#x1F575;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏽‍♂", "name": "man detective: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F575 1F3FD 200D 2642", "html": "&#x1F575;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏾‍♂️", "name": "man detective: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F575 1F3FE 200D 2642 FE0F", "html": "&#x1F575;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏾‍♂", "name": "man detective: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F575 1F3FE 200D 2642", "html": "&#x1F575;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏿‍♂️", "name": "man detective: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F575 1F3FF 200D 2642 FE0F", "html": "&#x1F575;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏿‍♂", "name": "man detective: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F575 1F3FF 200D 2642", "html": "&#x1F575;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵️‍♀️", "name": "woman detective", "shortname": ":woman_detective:", "unicode": "1F575 FE0F 200D 2640 FE0F", "html": "&#x1F575;&#xFE0F;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵‍♀️", "name": "woman detective", "shortname": ":woman_detective:", "unicode": "1F575 200D 2640 FE0F", "html": "&#x1F575;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵️‍♀", "name": "woman detective", "shortname": ":woman_detective:", "unicode": "1F575 FE0F 200D 2640", "html": "&#x1F575;&#xFE0F;&#x200D;&#x2640;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏻‍♀️", "name": "woman detective: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F575 1F3FB 200D 2640 FE0F", "html": "&#x1F575;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏼‍♀️", "name": "woman detective: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F575 1F3FC 200D 2640 FE0F", "html": "&#x1F575;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏽‍♀️", "name": "woman detective: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F575 1F3FD 200D 2640 FE0F", "html": "&#x1F575;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏾‍♀️", "name": "woman detective: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F575 1F3FE 200D 2640 FE0F", "html": "&#x1F575;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🕵🏿‍♀️", "name": "woman detective: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F575 1F3FF 200D 2640 FE0F", "html": "&#x1F575;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂‍♂️", "name": "man guard", "shortname": ":man_guard:", "unicode": "1F482 200D 2642 FE0F", "html": "&#x1F482;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂‍♂", "name": "man guard", "shortname": ":man_guard:", "unicode": "1F482 200D 2642", "html": "&#x1F482;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏻‍♂️", "name": "man guard: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F482 1F3FB 200D 2642 FE0F", "html": "&#x1F482;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏻‍♂", "name": "man guard: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F482 1F3FB 200D 2642", "html": "&#x1F482;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏼‍♂️", "name": "man guard: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F482 1F3FC 200D 2642 FE0F", "html": "&#x1F482;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏼‍♂", "name": "man guard: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F482 1F3FC 200D 2642", "html": "&#x1F482;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏽‍♂️", "name": "man guard: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F482 1F3FD 200D 2642 FE0F", "html": "&#x1F482;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏽‍♂", "name": "man guard: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F482 1F3FD 200D 2642", "html": "&#x1F482;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏾‍♂️", "name": "man guard: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F482 1F3FE 200D 2642 FE0F", "html": "&#x1F482;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏾‍♂", "name": "man guard: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F482 1F3FE 200D 2642", "html": "&#x1F482;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏿‍♂️", "name": "man guard: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F482 1F3FF 200D 2642 FE0F", "html": "&#x1F482;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏿‍♂", "name": "man guard: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F482 1F3FF 200D 2642", "html": "&#x1F482;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂‍♀️", "name": "woman guard", "shortname": ":woman_guard:", "unicode": "1F482 200D 2640 FE0F", "html": "&#x1F482;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏻‍♀️", "name": "woman guard: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F482 1F3FB 200D 2640 FE0F", "html": "&#x1F482;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏼‍♀️", "name": "woman guard: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F482 1F3FC 200D 2640 FE0F", "html": "&#x1F482;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏽‍♀️", "name": "woman guard: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F482 1F3FD 200D 2640 FE0F", "html": "&#x1F482;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏾‍♀️", "name": "woman guard: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F482 1F3FE 200D 2640 FE0F", "html": "&#x1F482;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "💂🏿‍♀️", "name": "woman guard: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F482 1F3FF 200D 2640 FE0F", "html": "&#x1F482;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷‍♂️", "name": "man construction worker", "shortname": ":man_construction_worker:", "unicode": "1F477 200D 2642 FE0F", "html": "&#x1F477;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷‍♂", "name": "man construction worker", "shortname": ":man_construction_worker:", "unicode": "1F477 200D 2642", "html": "&#x1F477;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏻‍♂️", "name": "man construction worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F477 1F3FB 200D 2642 FE0F", "html": "&#x1F477;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏻‍♂", "name": "man construction worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F477 1F3FB 200D 2642", "html": "&#x1F477;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏼‍♂️", "name": "man construction worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F477 1F3FC 200D 2642 FE0F", "html": "&#x1F477;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏼‍♂", "name": "man construction worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F477 1F3FC 200D 2642", "html": "&#x1F477;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏽‍♂️", "name": "man construction worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F477 1F3FD 200D 2642 FE0F", "html": "&#x1F477;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏽‍♂", "name": "man construction worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F477 1F3FD 200D 2642", "html": "&#x1F477;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏾‍♂️", "name": "man construction worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F477 1F3FE 200D 2642 FE0F", "html": "&#x1F477;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏾‍♂", "name": "man construction worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F477 1F3FE 200D 2642", "html": "&#x1F477;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏿‍♂️", "name": "man construction worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F477 1F3FF 200D 2642 FE0F", "html": "&#x1F477;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏿‍♂", "name": "man construction worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F477 1F3FF 200D 2642", "html": "&#x1F477;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷‍♀️", "name": "woman construction worker", "shortname": ":woman_construction_worker:", "unicode": "1F477 200D 2640 FE0F", "html": "&#x1F477;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏻‍♀️", "name": "woman construction worker: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F477 1F3FB 200D 2640 FE0F", "html": "&#x1F477;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏼‍♀️", "name": "woman construction worker: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F477 1F3FC 200D 2640 FE0F", "html": "&#x1F477;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏽‍♀️", "name": "woman construction worker: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F477 1F3FD 200D 2640 FE0F", "html": "&#x1F477;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏾‍♀️", "name": "woman construction worker: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F477 1F3FE 200D 2640 FE0F", "html": "&#x1F477;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👷🏿‍♀️", "name": "woman construction worker: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F477 1F3FF 200D 2640 FE0F", "html": "&#x1F477;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤴", "name": "prince", "shortname": ":prince:", "unicode": "1F934", "html": "&#x1F934;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤴🏻", "name": "prince: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F934 1F3FB", "html": "&#x1F934;&#x1F3FB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤴🏼", "name": "prince: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F934 1F3FC", "html": "&#x1F934;&#x1F3FC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤴🏽", "name": "prince: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F934 1F3FD", "html": "&#x1F934;&#x1F3FD;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤴🏾", "name": "prince: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F934 1F3FE", "html": "&#x1F934;&#x1F3FE;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤴🏿", "name": "prince: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F934 1F3FF", "html": "&#x1F934;&#x1F3FF;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳‍♂️", "name": "man wearing turban", "shortname": ":man_wearing_turban:", "unicode": "1F473 200D 2642 FE0F", "html": "&#x1F473;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳‍♂", "name": "man wearing turban", "shortname": ":man_wearing_turban:", "unicode": "1F473 200D 2642", "html": "&#x1F473;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏻‍♂️", "name": "man wearing turban: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F473 1F3FB 200D 2642 FE0F", "html": "&#x1F473;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏻‍♂", "name": "man wearing turban: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F473 1F3FB 200D 2642", "html": "&#x1F473;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏼‍♂️", "name": "man wearing turban: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F473 1F3FC 200D 2642 FE0F", "html": "&#x1F473;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏼‍♂", "name": "man wearing turban: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F473 1F3FC 200D 2642", "html": "&#x1F473;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏽‍♂️", "name": "man wearing turban: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F473 1F3FD 200D 2642 FE0F", "html": "&#x1F473;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏽‍♂", "name": "man wearing turban: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F473 1F3FD 200D 2642", "html": "&#x1F473;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏾‍♂️", "name": "man wearing turban: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F473 1F3FE 200D 2642 FE0F", "html": "&#x1F473;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏾‍♂", "name": "man wearing turban: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F473 1F3FE 200D 2642", "html": "&#x1F473;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏿‍♂️", "name": "man wearing turban: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F473 1F3FF 200D 2642 FE0F", "html": "&#x1F473;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏿‍♂", "name": "man wearing turban: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F473 1F3FF 200D 2642", "html": "&#x1F473;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳‍♀️", "name": "woman wearing turban", "shortname": ":woman_wearing_turban:", "unicode": "1F473 200D 2640 FE0F", "html": "&#x1F473;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏻‍♀️", "name": "woman wearing turban: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F473 1F3FB 200D 2640 FE0F", "html": "&#x1F473;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏼‍♀️", "name": "woman wearing turban: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F473 1F3FC 200D 2640 FE0F", "html": "&#x1F473;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏽‍♀️", "name": "woman wearing turban: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F473 1F3FD 200D 2640 FE0F", "html": "&#x1F473;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏾‍♀️", "name": "woman wearing turban: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F473 1F3FE 200D 2640 FE0F", "html": "&#x1F473;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "👳🏿‍♀️", "name": "woman wearing turban: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F473 1F3FF 200D 2640 FE0F", "html": "&#x1F473;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧕", "name": "woman with headscarf", "shortname": ":woman_with_headscarf:", "unicode": "1F9D5", "html": "&#x1F9D5;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧕🏻", "name": "woman with headscarf: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D5 1F3FB", "html": "&#x1F9D5;&#x1F3FB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧕🏼", "name": "woman with headscarf: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D5 1F3FC", "html": "&#x1F9D5;&#x1F3FC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧕🏽", "name": "woman with headscarf: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D5 1F3FD", "html": "&#x1F9D5;&#x1F3FD;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧕🏾", "name": "woman with headscarf: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D5 1F3FE", "html": "&#x1F9D5;&#x1F3FE;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🧕🏿", "name": "woman with headscarf: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D5 1F3FF", "html": "&#x1F9D5;&#x1F3FF;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤵", "name": "man in tuxedo", "shortname": ":man_in_tuxedo:", "unicode": "1F935", "html": "&#x1F935;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤵🏻", "name": "man in tuxedo: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F935 1F3FB", "html": "&#x1F935;&#x1F3FB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤵🏼", "name": "man in tuxedo: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F935 1F3FC", "html": "&#x1F935;&#x1F3FC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤵🏽", "name": "man in tuxedo: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F935 1F3FD", "html": "&#x1F935;&#x1F3FD;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤵🏾", "name": "man in tuxedo: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F935 1F3FE", "html": "&#x1F935;&#x1F3FE;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤵🏿", "name": "man in tuxedo: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F935 1F3FF", "html": "&#x1F935;&#x1F3FF;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤰", "name": "pregnant woman", "shortname": ":pregnant_woman:", "unicode": "1F930", "html": "&#x1F930;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤰🏻", "name": "pregnant woman: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F930 1F3FB", "html": "&#x1F930;&#x1F3FB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤰🏼", "name": "pregnant woman: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F930 1F3FC", "html": "&#x1F930;&#x1F3FC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤰🏽", "name": "pregnant woman: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F930 1F3FD", "html": "&#x1F930;&#x1F3FD;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤰🏾", "name": "pregnant woman: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F930 1F3FE", "html": "&#x1F930;&#x1F3FE;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤰🏿", "name": "pregnant woman: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F930 1F3FF", "html": "&#x1F930;&#x1F3FF;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤱", "name": "breast-feeding", "shortname": ":breastfeeding:", "unicode": "1F931", "html": "&#x1F931;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤱🏻", "name": "breast-feeding: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F931 1F3FB", "html": "&#x1F931;&#x1F3FB;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤱🏼", "name": "breast-feeding: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F931 1F3FC", "html": "&#x1F931;&#x1F3FC;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤱🏽", "name": "breast-feeding: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F931 1F3FD", "html": "&#x1F931;&#x1F3FD;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤱🏾", "name": "breast-feeding: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F931 1F3FE", "html": "&#x1F931;&#x1F3FE;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤱🏿", "name": "breast-feeding: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F931 1F3FF", "html": "&#x1F931;&#x1F3FF;", "category": "People & Body (person-role)", "order": ""},
+		{"emoji": "🤶", "name": "Mrs. Claus", "shortname": ":Mrs_Claus:", "unicode": "1F936", "html": "&#x1F936;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🤶🏻", "name": "Mrs. Claus: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F936 1F3FB", "html": "&#x1F936;&#x1F3FB;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🤶🏼", "name": "Mrs. Claus: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F936 1F3FC", "html": "&#x1F936;&#x1F3FC;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🤶🏽", "name": "Mrs. Claus: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F936 1F3FD", "html": "&#x1F936;&#x1F3FD;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🤶🏾", "name": "Mrs. Claus: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F936 1F3FE", "html": "&#x1F936;&#x1F3FE;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🤶🏿", "name": "Mrs. Claus: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F936 1F3FF", "html": "&#x1F936;&#x1F3FF;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸", "name": "superhero", "shortname": ":superhero:", "unicode": "1F9B8", "html": "&#x1F9B8;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏻", "name": "superhero: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B8 1F3FB", "html": "&#x1F9B8;&#x1F3FB;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏼", "name": "superhero: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B8 1F3FC", "html": "&#x1F9B8;&#x1F3FC;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏽", "name": "superhero: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B8 1F3FD", "html": "&#x1F9B8;&#x1F3FD;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏾", "name": "superhero: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B8 1F3FE", "html": "&#x1F9B8;&#x1F3FE;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏿", "name": "superhero: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B8 1F3FF", "html": "&#x1F9B8;&#x1F3FF;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸‍♂️", "name": "man superhero", "shortname": ":man_superhero:", "unicode": "1F9B8 200D 2642 FE0F", "html": "&#x1F9B8;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸‍♂", "name": "man superhero", "shortname": ":man_superhero:", "unicode": "1F9B8 200D 2642", "html": "&#x1F9B8;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏻‍♂️", "name": "man superhero: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B8 1F3FB 200D 2642 FE0F", "html": "&#x1F9B8;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏻‍♂", "name": "man superhero: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B8 1F3FB 200D 2642", "html": "&#x1F9B8;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏼‍♂️", "name": "man superhero: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B8 1F3FC 200D 2642 FE0F", "html": "&#x1F9B8;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏼‍♂", "name": "man superhero: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B8 1F3FC 200D 2642", "html": "&#x1F9B8;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏽‍♂️", "name": "man superhero: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B8 1F3FD 200D 2642 FE0F", "html": "&#x1F9B8;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏽‍♂", "name": "man superhero: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B8 1F3FD 200D 2642", "html": "&#x1F9B8;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏾‍♂️", "name": "man superhero: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B8 1F3FE 200D 2642 FE0F", "html": "&#x1F9B8;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏾‍♂", "name": "man superhero: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B8 1F3FE 200D 2642", "html": "&#x1F9B8;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏿‍♂️", "name": "man superhero: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B8 1F3FF 200D 2642 FE0F", "html": "&#x1F9B8;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏿‍♂", "name": "man superhero: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B8 1F3FF 200D 2642", "html": "&#x1F9B8;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸‍♀️", "name": "woman superhero", "shortname": ":woman_superhero:", "unicode": "1F9B8 200D 2640 FE0F", "html": "&#x1F9B8;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸‍♀", "name": "woman superhero", "shortname": ":woman_superhero:", "unicode": "1F9B8 200D 2640", "html": "&#x1F9B8;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏻‍♀️", "name": "woman superhero: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B8 1F3FB 200D 2640 FE0F", "html": "&#x1F9B8;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏻‍♀", "name": "woman superhero: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B8 1F3FB 200D 2640", "html": "&#x1F9B8;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏼‍♀️", "name": "woman superhero: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B8 1F3FC 200D 2640 FE0F", "html": "&#x1F9B8;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏼‍♀", "name": "woman superhero: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B8 1F3FC 200D 2640", "html": "&#x1F9B8;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏽‍♀️", "name": "woman superhero: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B8 1F3FD 200D 2640 FE0F", "html": "&#x1F9B8;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏽‍♀", "name": "woman superhero: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B8 1F3FD 200D 2640", "html": "&#x1F9B8;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏾‍♀️", "name": "woman superhero: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B8 1F3FE 200D 2640 FE0F", "html": "&#x1F9B8;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏾‍♀", "name": "woman superhero: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B8 1F3FE 200D 2640", "html": "&#x1F9B8;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏿‍♀️", "name": "woman superhero: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B8 1F3FF 200D 2640 FE0F", "html": "&#x1F9B8;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦸🏿‍♀", "name": "woman superhero: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B8 1F3FF 200D 2640", "html": "&#x1F9B8;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹", "name": "supervillain", "shortname": ":supervillain:", "unicode": "1F9B9", "html": "&#x1F9B9;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏻", "name": "supervillain: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B9 1F3FB", "html": "&#x1F9B9;&#x1F3FB;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏼", "name": "supervillain: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B9 1F3FC", "html": "&#x1F9B9;&#x1F3FC;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏽", "name": "supervillain: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B9 1F3FD", "html": "&#x1F9B9;&#x1F3FD;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏾", "name": "supervillain: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B9 1F3FE", "html": "&#x1F9B9;&#x1F3FE;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏿", "name": "supervillain: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B9 1F3FF", "html": "&#x1F9B9;&#x1F3FF;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹‍♂️", "name": "man supervillain", "shortname": ":man_supervillain:", "unicode": "1F9B9 200D 2642 FE0F", "html": "&#x1F9B9;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹‍♂", "name": "man supervillain", "shortname": ":man_supervillain:", "unicode": "1F9B9 200D 2642", "html": "&#x1F9B9;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏻‍♂️", "name": "man supervillain: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B9 1F3FB 200D 2642 FE0F", "html": "&#x1F9B9;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏻‍♂", "name": "man supervillain: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B9 1F3FB 200D 2642", "html": "&#x1F9B9;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏼‍♂️", "name": "man supervillain: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B9 1F3FC 200D 2642 FE0F", "html": "&#x1F9B9;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏼‍♂", "name": "man supervillain: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B9 1F3FC 200D 2642", "html": "&#x1F9B9;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏽‍♂️", "name": "man supervillain: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B9 1F3FD 200D 2642 FE0F", "html": "&#x1F9B9;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏽‍♂", "name": "man supervillain: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B9 1F3FD 200D 2642", "html": "&#x1F9B9;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏾‍♂️", "name": "man supervillain: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B9 1F3FE 200D 2642 FE0F", "html": "&#x1F9B9;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏾‍♂", "name": "man supervillain: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B9 1F3FE 200D 2642", "html": "&#x1F9B9;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏿‍♂️", "name": "man supervillain: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B9 1F3FF 200D 2642 FE0F", "html": "&#x1F9B9;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏿‍♂", "name": "man supervillain: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B9 1F3FF 200D 2642", "html": "&#x1F9B9;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹‍♀️", "name": "woman supervillain", "shortname": ":woman_supervillain:", "unicode": "1F9B9 200D 2640 FE0F", "html": "&#x1F9B9;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹‍♀", "name": "woman supervillain", "shortname": ":woman_supervillain:", "unicode": "1F9B9 200D 2640", "html": "&#x1F9B9;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏻‍♀️", "name": "woman supervillain: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B9 1F3FB 200D 2640 FE0F", "html": "&#x1F9B9;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏻‍♀", "name": "woman supervillain: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9B9 1F3FB 200D 2640", "html": "&#x1F9B9;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏼‍♀️", "name": "woman supervillain: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B9 1F3FC 200D 2640 FE0F", "html": "&#x1F9B9;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏼‍♀", "name": "woman supervillain: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9B9 1F3FC 200D 2640", "html": "&#x1F9B9;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏽‍♀️", "name": "woman supervillain: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B9 1F3FD 200D 2640 FE0F", "html": "&#x1F9B9;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏽‍♀", "name": "woman supervillain: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9B9 1F3FD 200D 2640", "html": "&#x1F9B9;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏾‍♀️", "name": "woman supervillain: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B9 1F3FE 200D 2640 FE0F", "html": "&#x1F9B9;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏾‍♀", "name": "woman supervillain: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9B9 1F3FE 200D 2640", "html": "&#x1F9B9;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏿‍♀️", "name": "woman supervillain: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B9 1F3FF 200D 2640 FE0F", "html": "&#x1F9B9;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🦹🏿‍♀", "name": "woman supervillain: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9B9 1F3FF 200D 2640", "html": "&#x1F9B9;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙", "name": "mage", "shortname": ":mage:", "unicode": "1F9D9", "html": "&#x1F9D9;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏻", "name": "mage: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D9 1F3FB", "html": "&#x1F9D9;&#x1F3FB;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏼", "name": "mage: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D9 1F3FC", "html": "&#x1F9D9;&#x1F3FC;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏽", "name": "mage: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D9 1F3FD", "html": "&#x1F9D9;&#x1F3FD;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏾", "name": "mage: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D9 1F3FE", "html": "&#x1F9D9;&#x1F3FE;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏿", "name": "mage: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D9 1F3FF", "html": "&#x1F9D9;&#x1F3FF;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙‍♂️", "name": "man mage", "shortname": ":man_mage:", "unicode": "1F9D9 200D 2642 FE0F", "html": "&#x1F9D9;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙‍♂", "name": "man mage", "shortname": ":man_mage:", "unicode": "1F9D9 200D 2642", "html": "&#x1F9D9;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏻‍♂️", "name": "man mage: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D9 1F3FB 200D 2642 FE0F", "html": "&#x1F9D9;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏻‍♂", "name": "man mage: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D9 1F3FB 200D 2642", "html": "&#x1F9D9;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏼‍♂️", "name": "man mage: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D9 1F3FC 200D 2642 FE0F", "html": "&#x1F9D9;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏼‍♂", "name": "man mage: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D9 1F3FC 200D 2642", "html": "&#x1F9D9;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏽‍♂️", "name": "man mage: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D9 1F3FD 200D 2642 FE0F", "html": "&#x1F9D9;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏽‍♂", "name": "man mage: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D9 1F3FD 200D 2642", "html": "&#x1F9D9;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏾‍♂️", "name": "man mage: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D9 1F3FE 200D 2642 FE0F", "html": "&#x1F9D9;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏾‍♂", "name": "man mage: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D9 1F3FE 200D 2642", "html": "&#x1F9D9;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏿‍♂️", "name": "man mage: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D9 1F3FF 200D 2642 FE0F", "html": "&#x1F9D9;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏿‍♂", "name": "man mage: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D9 1F3FF 200D 2642", "html": "&#x1F9D9;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙‍♀️", "name": "woman mage", "shortname": ":woman_mage:", "unicode": "1F9D9 200D 2640 FE0F", "html": "&#x1F9D9;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙‍♀", "name": "woman mage", "shortname": ":woman_mage:", "unicode": "1F9D9 200D 2640", "html": "&#x1F9D9;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏻‍♀️", "name": "woman mage: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D9 1F3FB 200D 2640 FE0F", "html": "&#x1F9D9;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏻‍♀", "name": "woman mage: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D9 1F3FB 200D 2640", "html": "&#x1F9D9;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏼‍♀️", "name": "woman mage: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D9 1F3FC 200D 2640 FE0F", "html": "&#x1F9D9;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏼‍♀", "name": "woman mage: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D9 1F3FC 200D 2640", "html": "&#x1F9D9;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏽‍♀️", "name": "woman mage: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D9 1F3FD 200D 2640 FE0F", "html": "&#x1F9D9;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏽‍♀", "name": "woman mage: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D9 1F3FD 200D 2640", "html": "&#x1F9D9;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏾‍♀️", "name": "woman mage: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D9 1F3FE 200D 2640 FE0F", "html": "&#x1F9D9;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏾‍♀", "name": "woman mage: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D9 1F3FE 200D 2640", "html": "&#x1F9D9;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏿‍♀️", "name": "woman mage: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D9 1F3FF 200D 2640 FE0F", "html": "&#x1F9D9;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧙🏿‍♀", "name": "woman mage: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D9 1F3FF 200D 2640", "html": "&#x1F9D9;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚", "name": "fairy", "shortname": ":fairy:", "unicode": "1F9DA", "html": "&#x1F9DA;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏻", "name": "fairy: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DA 1F3FB", "html": "&#x1F9DA;&#x1F3FB;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏼", "name": "fairy: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DA 1F3FC", "html": "&#x1F9DA;&#x1F3FC;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏽", "name": "fairy: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DA 1F3FD", "html": "&#x1F9DA;&#x1F3FD;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏾", "name": "fairy: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DA 1F3FE", "html": "&#x1F9DA;&#x1F3FE;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏿", "name": "fairy: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DA 1F3FF", "html": "&#x1F9DA;&#x1F3FF;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚‍♂️", "name": "man fairy", "shortname": ":man_fairy:", "unicode": "1F9DA 200D 2642 FE0F", "html": "&#x1F9DA;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚‍♂", "name": "man fairy", "shortname": ":man_fairy:", "unicode": "1F9DA 200D 2642", "html": "&#x1F9DA;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏻‍♂️", "name": "man fairy: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DA 1F3FB 200D 2642 FE0F", "html": "&#x1F9DA;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏻‍♂", "name": "man fairy: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DA 1F3FB 200D 2642", "html": "&#x1F9DA;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏼‍♂️", "name": "man fairy: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DA 1F3FC 200D 2642 FE0F", "html": "&#x1F9DA;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏼‍♂", "name": "man fairy: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DA 1F3FC 200D 2642", "html": "&#x1F9DA;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏽‍♂️", "name": "man fairy: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DA 1F3FD 200D 2642 FE0F", "html": "&#x1F9DA;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏽‍♂", "name": "man fairy: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DA 1F3FD 200D 2642", "html": "&#x1F9DA;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏾‍♂️", "name": "man fairy: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DA 1F3FE 200D 2642 FE0F", "html": "&#x1F9DA;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏾‍♂", "name": "man fairy: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DA 1F3FE 200D 2642", "html": "&#x1F9DA;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏿‍♂️", "name": "man fairy: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DA 1F3FF 200D 2642 FE0F", "html": "&#x1F9DA;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏿‍♂", "name": "man fairy: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DA 1F3FF 200D 2642", "html": "&#x1F9DA;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚‍♀️", "name": "woman fairy", "shortname": ":woman_fairy:", "unicode": "1F9DA 200D 2640 FE0F", "html": "&#x1F9DA;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚‍♀", "name": "woman fairy", "shortname": ":woman_fairy:", "unicode": "1F9DA 200D 2640", "html": "&#x1F9DA;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏻‍♀️", "name": "woman fairy: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DA 1F3FB 200D 2640 FE0F", "html": "&#x1F9DA;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏻‍♀", "name": "woman fairy: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DA 1F3FB 200D 2640", "html": "&#x1F9DA;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏼‍♀️", "name": "woman fairy: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DA 1F3FC 200D 2640 FE0F", "html": "&#x1F9DA;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏼‍♀", "name": "woman fairy: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DA 1F3FC 200D 2640", "html": "&#x1F9DA;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏽‍♀️", "name": "woman fairy: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DA 1F3FD 200D 2640 FE0F", "html": "&#x1F9DA;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏽‍♀", "name": "woman fairy: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DA 1F3FD 200D 2640", "html": "&#x1F9DA;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏾‍♀️", "name": "woman fairy: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DA 1F3FE 200D 2640 FE0F", "html": "&#x1F9DA;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏾‍♀", "name": "woman fairy: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DA 1F3FE 200D 2640", "html": "&#x1F9DA;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏿‍♀️", "name": "woman fairy: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DA 1F3FF 200D 2640 FE0F", "html": "&#x1F9DA;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧚🏿‍♀", "name": "woman fairy: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DA 1F3FF 200D 2640", "html": "&#x1F9DA;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛", "name": "vampire", "shortname": ":vampire:", "unicode": "1F9DB", "html": "&#x1F9DB;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏻", "name": "vampire: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DB 1F3FB", "html": "&#x1F9DB;&#x1F3FB;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏼", "name": "vampire: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DB 1F3FC", "html": "&#x1F9DB;&#x1F3FC;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏽", "name": "vampire: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DB 1F3FD", "html": "&#x1F9DB;&#x1F3FD;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏾", "name": "vampire: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DB 1F3FE", "html": "&#x1F9DB;&#x1F3FE;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏿", "name": "vampire: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DB 1F3FF", "html": "&#x1F9DB;&#x1F3FF;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛‍♂️", "name": "man vampire", "shortname": ":man_vampire:", "unicode": "1F9DB 200D 2642 FE0F", "html": "&#x1F9DB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛‍♂", "name": "man vampire", "shortname": ":man_vampire:", "unicode": "1F9DB 200D 2642", "html": "&#x1F9DB;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏻‍♂️", "name": "man vampire: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DB 1F3FB 200D 2642 FE0F", "html": "&#x1F9DB;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏻‍♂", "name": "man vampire: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DB 1F3FB 200D 2642", "html": "&#x1F9DB;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏼‍♂️", "name": "man vampire: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DB 1F3FC 200D 2642 FE0F", "html": "&#x1F9DB;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏼‍♂", "name": "man vampire: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DB 1F3FC 200D 2642", "html": "&#x1F9DB;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏽‍♂️", "name": "man vampire: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DB 1F3FD 200D 2642 FE0F", "html": "&#x1F9DB;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏽‍♂", "name": "man vampire: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DB 1F3FD 200D 2642", "html": "&#x1F9DB;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏾‍♂️", "name": "man vampire: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DB 1F3FE 200D 2642 FE0F", "html": "&#x1F9DB;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏾‍♂", "name": "man vampire: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DB 1F3FE 200D 2642", "html": "&#x1F9DB;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏿‍♂️", "name": "man vampire: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DB 1F3FF 200D 2642 FE0F", "html": "&#x1F9DB;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏿‍♂", "name": "man vampire: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DB 1F3FF 200D 2642", "html": "&#x1F9DB;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛‍♀️", "name": "woman vampire", "shortname": ":woman_vampire:", "unicode": "1F9DB 200D 2640 FE0F", "html": "&#x1F9DB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛‍♀", "name": "woman vampire", "shortname": ":woman_vampire:", "unicode": "1F9DB 200D 2640", "html": "&#x1F9DB;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏻‍♀️", "name": "woman vampire: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DB 1F3FB 200D 2640 FE0F", "html": "&#x1F9DB;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏻‍♀", "name": "woman vampire: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DB 1F3FB 200D 2640", "html": "&#x1F9DB;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏼‍♀️", "name": "woman vampire: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DB 1F3FC 200D 2640 FE0F", "html": "&#x1F9DB;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏼‍♀", "name": "woman vampire: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DB 1F3FC 200D 2640", "html": "&#x1F9DB;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏽‍♀️", "name": "woman vampire: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DB 1F3FD 200D 2640 FE0F", "html": "&#x1F9DB;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏽‍♀", "name": "woman vampire: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DB 1F3FD 200D 2640", "html": "&#x1F9DB;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏾‍♀️", "name": "woman vampire: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DB 1F3FE 200D 2640 FE0F", "html": "&#x1F9DB;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏾‍♀", "name": "woman vampire: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DB 1F3FE 200D 2640", "html": "&#x1F9DB;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏿‍♀️", "name": "woman vampire: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DB 1F3FF 200D 2640 FE0F", "html": "&#x1F9DB;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧛🏿‍♀", "name": "woman vampire: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DB 1F3FF 200D 2640", "html": "&#x1F9DB;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜", "name": "merperson", "shortname": ":merperson:", "unicode": "1F9DC", "html": "&#x1F9DC;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏻", "name": "merperson: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DC 1F3FB", "html": "&#x1F9DC;&#x1F3FB;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏼", "name": "merperson: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DC 1F3FC", "html": "&#x1F9DC;&#x1F3FC;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏽", "name": "merperson: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DC 1F3FD", "html": "&#x1F9DC;&#x1F3FD;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏾", "name": "merperson: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DC 1F3FE", "html": "&#x1F9DC;&#x1F3FE;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏿", "name": "merperson: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DC 1F3FF", "html": "&#x1F9DC;&#x1F3FF;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜‍♂️", "name": "merman", "shortname": ":merman:", "unicode": "1F9DC 200D 2642 FE0F", "html": "&#x1F9DC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜‍♂", "name": "merman", "shortname": ":merman:", "unicode": "1F9DC 200D 2642", "html": "&#x1F9DC;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏻‍♂️", "name": "merman: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DC 1F3FB 200D 2642 FE0F", "html": "&#x1F9DC;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏻‍♂", "name": "merman: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DC 1F3FB 200D 2642", "html": "&#x1F9DC;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏼‍♂️", "name": "merman: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DC 1F3FC 200D 2642 FE0F", "html": "&#x1F9DC;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏼‍♂", "name": "merman: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DC 1F3FC 200D 2642", "html": "&#x1F9DC;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏽‍♂️", "name": "merman: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DC 1F3FD 200D 2642 FE0F", "html": "&#x1F9DC;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏽‍♂", "name": "merman: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DC 1F3FD 200D 2642", "html": "&#x1F9DC;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏾‍♂️", "name": "merman: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DC 1F3FE 200D 2642 FE0F", "html": "&#x1F9DC;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏾‍♂", "name": "merman: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DC 1F3FE 200D 2642", "html": "&#x1F9DC;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏿‍♂️", "name": "merman: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DC 1F3FF 200D 2642 FE0F", "html": "&#x1F9DC;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏿‍♂", "name": "merman: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DC 1F3FF 200D 2642", "html": "&#x1F9DC;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜‍♀️", "name": "mermaid", "shortname": ":mermaid:", "unicode": "1F9DC 200D 2640 FE0F", "html": "&#x1F9DC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜‍♀", "name": "mermaid", "shortname": ":mermaid:", "unicode": "1F9DC 200D 2640", "html": "&#x1F9DC;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏻‍♀️", "name": "mermaid: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DC 1F3FB 200D 2640 FE0F", "html": "&#x1F9DC;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏻‍♀", "name": "mermaid: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DC 1F3FB 200D 2640", "html": "&#x1F9DC;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏼‍♀️", "name": "mermaid: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DC 1F3FC 200D 2640 FE0F", "html": "&#x1F9DC;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏼‍♀", "name": "mermaid: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DC 1F3FC 200D 2640", "html": "&#x1F9DC;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏽‍♀️", "name": "mermaid: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DC 1F3FD 200D 2640 FE0F", "html": "&#x1F9DC;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏽‍♀", "name": "mermaid: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DC 1F3FD 200D 2640", "html": "&#x1F9DC;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏾‍♀️", "name": "mermaid: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DC 1F3FE 200D 2640 FE0F", "html": "&#x1F9DC;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏾‍♀", "name": "mermaid: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DC 1F3FE 200D 2640", "html": "&#x1F9DC;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏿‍♀️", "name": "mermaid: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DC 1F3FF 200D 2640 FE0F", "html": "&#x1F9DC;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧜🏿‍♀", "name": "mermaid: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DC 1F3FF 200D 2640", "html": "&#x1F9DC;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝", "name": "elf", "shortname": ":elf:", "unicode": "1F9DD", "html": "&#x1F9DD;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏻", "name": "elf: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DD 1F3FB", "html": "&#x1F9DD;&#x1F3FB;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏼", "name": "elf: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DD 1F3FC", "html": "&#x1F9DD;&#x1F3FC;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏽", "name": "elf: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DD 1F3FD", "html": "&#x1F9DD;&#x1F3FD;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏾", "name": "elf: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DD 1F3FE", "html": "&#x1F9DD;&#x1F3FE;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏿", "name": "elf: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DD 1F3FF", "html": "&#x1F9DD;&#x1F3FF;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝‍♂️", "name": "man elf", "shortname": ":man_elf:", "unicode": "1F9DD 200D 2642 FE0F", "html": "&#x1F9DD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝‍♂", "name": "man elf", "shortname": ":man_elf:", "unicode": "1F9DD 200D 2642", "html": "&#x1F9DD;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏻‍♂️", "name": "man elf: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DD 1F3FB 200D 2642 FE0F", "html": "&#x1F9DD;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏻‍♂", "name": "man elf: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DD 1F3FB 200D 2642", "html": "&#x1F9DD;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏼‍♂️", "name": "man elf: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DD 1F3FC 200D 2642 FE0F", "html": "&#x1F9DD;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏼‍♂", "name": "man elf: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DD 1F3FC 200D 2642", "html": "&#x1F9DD;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏽‍♂️", "name": "man elf: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DD 1F3FD 200D 2642 FE0F", "html": "&#x1F9DD;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏽‍♂", "name": "man elf: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DD 1F3FD 200D 2642", "html": "&#x1F9DD;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏾‍♂️", "name": "man elf: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DD 1F3FE 200D 2642 FE0F", "html": "&#x1F9DD;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏾‍♂", "name": "man elf: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DD 1F3FE 200D 2642", "html": "&#x1F9DD;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏿‍♂️", "name": "man elf: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DD 1F3FF 200D 2642 FE0F", "html": "&#x1F9DD;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏿‍♂", "name": "man elf: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DD 1F3FF 200D 2642", "html": "&#x1F9DD;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝‍♀️", "name": "woman elf", "shortname": ":woman_elf:", "unicode": "1F9DD 200D 2640 FE0F", "html": "&#x1F9DD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝‍♀", "name": "woman elf", "shortname": ":woman_elf:", "unicode": "1F9DD 200D 2640", "html": "&#x1F9DD;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏻‍♀️", "name": "woman elf: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DD 1F3FB 200D 2640 FE0F", "html": "&#x1F9DD;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏻‍♀", "name": "woman elf: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9DD 1F3FB 200D 2640", "html": "&#x1F9DD;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏼‍♀️", "name": "woman elf: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DD 1F3FC 200D 2640 FE0F", "html": "&#x1F9DD;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏼‍♀", "name": "woman elf: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9DD 1F3FC 200D 2640", "html": "&#x1F9DD;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏽‍♀️", "name": "woman elf: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DD 1F3FD 200D 2640 FE0F", "html": "&#x1F9DD;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏽‍♀", "name": "woman elf: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9DD 1F3FD 200D 2640", "html": "&#x1F9DD;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏾‍♀️", "name": "woman elf: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DD 1F3FE 200D 2640 FE0F", "html": "&#x1F9DD;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏾‍♀", "name": "woman elf: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9DD 1F3FE 200D 2640", "html": "&#x1F9DD;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏿‍♀️", "name": "woman elf: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DD 1F3FF 200D 2640 FE0F", "html": "&#x1F9DD;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧝🏿‍♀", "name": "woman elf: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9DD 1F3FF 200D 2640", "html": "&#x1F9DD;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧞", "name": "genie", "shortname": ":genie:", "unicode": "1F9DE", "html": "&#x1F9DE;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧞‍♂️", "name": "man genie", "shortname": ":man_genie:", "unicode": "1F9DE 200D 2642 FE0F", "html": "&#x1F9DE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧞‍♂", "name": "man genie", "shortname": ":man_genie:", "unicode": "1F9DE 200D 2642", "html": "&#x1F9DE;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧞‍♀️", "name": "woman genie", "shortname": ":woman_genie:", "unicode": "1F9DE 200D 2640 FE0F", "html": "&#x1F9DE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧞‍♀", "name": "woman genie", "shortname": ":woman_genie:", "unicode": "1F9DE 200D 2640", "html": "&#x1F9DE;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧟", "name": "zombie", "shortname": ":zombie:", "unicode": "1F9DF", "html": "&#x1F9DF;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧟‍♂️", "name": "man zombie", "shortname": ":man_zombie:", "unicode": "1F9DF 200D 2642 FE0F", "html": "&#x1F9DF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧟‍♂", "name": "man zombie", "shortname": ":man_zombie:", "unicode": "1F9DF 200D 2642", "html": "&#x1F9DF;&#x200D;&#x2642;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧟‍♀️", "name": "woman zombie", "shortname": ":woman_zombie:", "unicode": "1F9DF 200D 2640 FE0F", "html": "&#x1F9DF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "🧟‍♀", "name": "woman zombie", "shortname": ":woman_zombie:", "unicode": "1F9DF 200D 2640", "html": "&#x1F9DF;&#x200D;&#x2640;", "category": "People & Body (person-fantasy)", "order": ""},
+		{"emoji": "💆‍♂️", "name": "man getting massage", "shortname": ":man_getting_massage:", "unicode": "1F486 200D 2642 FE0F", "html": "&#x1F486;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏻‍♂️", "name": "man getting massage: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F486 1F3FB 200D 2642 FE0F", "html": "&#x1F486;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏼‍♂️", "name": "man getting massage: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F486 1F3FC 200D 2642 FE0F", "html": "&#x1F486;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏽‍♂️", "name": "man getting massage: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F486 1F3FD 200D 2642 FE0F", "html": "&#x1F486;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏾‍♂️", "name": "man getting massage: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F486 1F3FE 200D 2642 FE0F", "html": "&#x1F486;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏿‍♂️", "name": "man getting massage: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F486 1F3FF 200D 2642 FE0F", "html": "&#x1F486;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆‍♀️", "name": "woman getting massage", "shortname": ":woman_getting_massage:", "unicode": "1F486 200D 2640 FE0F", "html": "&#x1F486;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆‍♀", "name": "woman getting massage", "shortname": ":woman_getting_massage:", "unicode": "1F486 200D 2640", "html": "&#x1F486;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏻‍♀️", "name": "woman getting massage: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F486 1F3FB 200D 2640 FE0F", "html": "&#x1F486;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏻‍♀", "name": "woman getting massage: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F486 1F3FB 200D 2640", "html": "&#x1F486;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏼‍♀️", "name": "woman getting massage: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F486 1F3FC 200D 2640 FE0F", "html": "&#x1F486;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏼‍♀", "name": "woman getting massage: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F486 1F3FC 200D 2640", "html": "&#x1F486;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏽‍♀️", "name": "woman getting massage: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F486 1F3FD 200D 2640 FE0F", "html": "&#x1F486;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏽‍♀", "name": "woman getting massage: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F486 1F3FD 200D 2640", "html": "&#x1F486;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏾‍♀️", "name": "woman getting massage: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F486 1F3FE 200D 2640 FE0F", "html": "&#x1F486;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏾‍♀", "name": "woman getting massage: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F486 1F3FE 200D 2640", "html": "&#x1F486;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏿‍♀️", "name": "woman getting massage: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F486 1F3FF 200D 2640 FE0F", "html": "&#x1F486;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💆🏿‍♀", "name": "woman getting massage: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F486 1F3FF 200D 2640", "html": "&#x1F486;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇‍♂️", "name": "man getting haircut", "shortname": ":man_getting_haircut:", "unicode": "1F487 200D 2642 FE0F", "html": "&#x1F487;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏻‍♂️", "name": "man getting haircut: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F487 1F3FB 200D 2642 FE0F", "html": "&#x1F487;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏼‍♂️", "name": "man getting haircut: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F487 1F3FC 200D 2642 FE0F", "html": "&#x1F487;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏽‍♂️", "name": "man getting haircut: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F487 1F3FD 200D 2642 FE0F", "html": "&#x1F487;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏾‍♂️", "name": "man getting haircut: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F487 1F3FE 200D 2642 FE0F", "html": "&#x1F487;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏿‍♂️", "name": "man getting haircut: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F487 1F3FF 200D 2642 FE0F", "html": "&#x1F487;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇‍♀️", "name": "woman getting haircut", "shortname": ":woman_getting_haircut:", "unicode": "1F487 200D 2640 FE0F", "html": "&#x1F487;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇‍♀", "name": "woman getting haircut", "shortname": ":woman_getting_haircut:", "unicode": "1F487 200D 2640", "html": "&#x1F487;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏻‍♀️", "name": "woman getting haircut: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F487 1F3FB 200D 2640 FE0F", "html": "&#x1F487;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏻‍♀", "name": "woman getting haircut: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F487 1F3FB 200D 2640", "html": "&#x1F487;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏼‍♀️", "name": "woman getting haircut: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F487 1F3FC 200D 2640 FE0F", "html": "&#x1F487;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏼‍♀", "name": "woman getting haircut: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F487 1F3FC 200D 2640", "html": "&#x1F487;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏽‍♀️", "name": "woman getting haircut: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F487 1F3FD 200D 2640 FE0F", "html": "&#x1F487;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏽‍♀", "name": "woman getting haircut: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F487 1F3FD 200D 2640", "html": "&#x1F487;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏾‍♀️", "name": "woman getting haircut: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F487 1F3FE 200D 2640 FE0F", "html": "&#x1F487;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏾‍♀", "name": "woman getting haircut: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F487 1F3FE 200D 2640", "html": "&#x1F487;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏿‍♀️", "name": "woman getting haircut: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F487 1F3FF 200D 2640 FE0F", "html": "&#x1F487;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "💇🏿‍♀", "name": "woman getting haircut: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F487 1F3FF 200D 2640", "html": "&#x1F487;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶‍♂️", "name": "man walking", "shortname": ":man_walking:", "unicode": "1F6B6 200D 2642 FE0F", "html": "&#x1F6B6;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶‍♂", "name": "man walking", "shortname": ":man_walking:", "unicode": "1F6B6 200D 2642", "html": "&#x1F6B6;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏻‍♂️", "name": "man walking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B6 1F3FB 200D 2642 FE0F", "html": "&#x1F6B6;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏻‍♂", "name": "man walking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B6 1F3FB 200D 2642", "html": "&#x1F6B6;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏼‍♂️", "name": "man walking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B6 1F3FC 200D 2642 FE0F", "html": "&#x1F6B6;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏼‍♂", "name": "man walking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B6 1F3FC 200D 2642", "html": "&#x1F6B6;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏽‍♂️", "name": "man walking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B6 1F3FD 200D 2642 FE0F", "html": "&#x1F6B6;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏽‍♂", "name": "man walking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B6 1F3FD 200D 2642", "html": "&#x1F6B6;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏾‍♂️", "name": "man walking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B6 1F3FE 200D 2642 FE0F", "html": "&#x1F6B6;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏾‍♂", "name": "man walking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B6 1F3FE 200D 2642", "html": "&#x1F6B6;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏿‍♂️", "name": "man walking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B6 1F3FF 200D 2642 FE0F", "html": "&#x1F6B6;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏿‍♂", "name": "man walking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B6 1F3FF 200D 2642", "html": "&#x1F6B6;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶‍♀️", "name": "woman walking", "shortname": ":woman_walking:", "unicode": "1F6B6 200D 2640 FE0F", "html": "&#x1F6B6;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏻‍♀️", "name": "woman walking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B6 1F3FB 200D 2640 FE0F", "html": "&#x1F6B6;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏼‍♀️", "name": "woman walking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B6 1F3FC 200D 2640 FE0F", "html": "&#x1F6B6;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏽‍♀️", "name": "woman walking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B6 1F3FD 200D 2640 FE0F", "html": "&#x1F6B6;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏾‍♀️", "name": "woman walking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B6 1F3FE 200D 2640 FE0F", "html": "&#x1F6B6;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🚶🏿‍♀️", "name": "woman walking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B6 1F3FF 200D 2640 FE0F", "html": "&#x1F6B6;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍", "name": "person standing", "shortname": ":person_standing:", "unicode": "1F9CD", "html": "&#x1F9CD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏻", "name": "person standing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CD 1F3FB", "html": "&#x1F9CD;&#x1F3FB;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏼", "name": "person standing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CD 1F3FC", "html": "&#x1F9CD;&#x1F3FC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏽", "name": "person standing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CD 1F3FD", "html": "&#x1F9CD;&#x1F3FD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏾", "name": "person standing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CD 1F3FE", "html": "&#x1F9CD;&#x1F3FE;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏿", "name": "person standing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CD 1F3FF", "html": "&#x1F9CD;&#x1F3FF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍‍♂️", "name": "man standing", "shortname": ":man_standing:", "unicode": "1F9CD 200D 2642 FE0F", "html": "&#x1F9CD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍‍♂", "name": "man standing", "shortname": ":man_standing:", "unicode": "1F9CD 200D 2642", "html": "&#x1F9CD;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏻‍♂️", "name": "man standing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CD 1F3FB 200D 2642 FE0F", "html": "&#x1F9CD;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏻‍♂", "name": "man standing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CD 1F3FB 200D 2642", "html": "&#x1F9CD;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏼‍♂️", "name": "man standing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CD 1F3FC 200D 2642 FE0F", "html": "&#x1F9CD;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏼‍♂", "name": "man standing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CD 1F3FC 200D 2642", "html": "&#x1F9CD;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏽‍♂️", "name": "man standing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CD 1F3FD 200D 2642 FE0F", "html": "&#x1F9CD;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏽‍♂", "name": "man standing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CD 1F3FD 200D 2642", "html": "&#x1F9CD;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏾‍♂️", "name": "man standing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CD 1F3FE 200D 2642 FE0F", "html": "&#x1F9CD;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏾‍♂", "name": "man standing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CD 1F3FE 200D 2642", "html": "&#x1F9CD;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏿‍♂️", "name": "man standing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CD 1F3FF 200D 2642 FE0F", "html": "&#x1F9CD;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏿‍♂", "name": "man standing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CD 1F3FF 200D 2642", "html": "&#x1F9CD;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍‍♀️", "name": "woman standing", "shortname": ":woman_standing:", "unicode": "1F9CD 200D 2640 FE0F", "html": "&#x1F9CD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍‍♀", "name": "woman standing", "shortname": ":woman_standing:", "unicode": "1F9CD 200D 2640", "html": "&#x1F9CD;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏻‍♀️", "name": "woman standing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CD 1F3FB 200D 2640 FE0F", "html": "&#x1F9CD;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏻‍♀", "name": "woman standing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CD 1F3FB 200D 2640", "html": "&#x1F9CD;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏼‍♀️", "name": "woman standing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CD 1F3FC 200D 2640 FE0F", "html": "&#x1F9CD;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏼‍♀", "name": "woman standing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CD 1F3FC 200D 2640", "html": "&#x1F9CD;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏽‍♀️", "name": "woman standing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CD 1F3FD 200D 2640 FE0F", "html": "&#x1F9CD;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏽‍♀", "name": "woman standing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CD 1F3FD 200D 2640", "html": "&#x1F9CD;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏾‍♀️", "name": "woman standing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CD 1F3FE 200D 2640 FE0F", "html": "&#x1F9CD;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏾‍♀", "name": "woman standing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CD 1F3FE 200D 2640", "html": "&#x1F9CD;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏿‍♀️", "name": "woman standing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CD 1F3FF 200D 2640 FE0F", "html": "&#x1F9CD;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧍🏿‍♀", "name": "woman standing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CD 1F3FF 200D 2640", "html": "&#x1F9CD;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎", "name": "person kneeling", "shortname": ":person_kneeling:", "unicode": "1F9CE", "html": "&#x1F9CE;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏻", "name": "person kneeling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CE 1F3FB", "html": "&#x1F9CE;&#x1F3FB;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏼", "name": "person kneeling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CE 1F3FC", "html": "&#x1F9CE;&#x1F3FC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏽", "name": "person kneeling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CE 1F3FD", "html": "&#x1F9CE;&#x1F3FD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏾", "name": "person kneeling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CE 1F3FE", "html": "&#x1F9CE;&#x1F3FE;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏿", "name": "person kneeling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CE 1F3FF", "html": "&#x1F9CE;&#x1F3FF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎‍♂️", "name": "man kneeling", "shortname": ":man_kneeling:", "unicode": "1F9CE 200D 2642 FE0F", "html": "&#x1F9CE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎‍♂", "name": "man kneeling", "shortname": ":man_kneeling:", "unicode": "1F9CE 200D 2642", "html": "&#x1F9CE;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏻‍♂️", "name": "man kneeling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CE 1F3FB 200D 2642 FE0F", "html": "&#x1F9CE;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏻‍♂", "name": "man kneeling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CE 1F3FB 200D 2642", "html": "&#x1F9CE;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏼‍♂️", "name": "man kneeling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CE 1F3FC 200D 2642 FE0F", "html": "&#x1F9CE;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏼‍♂", "name": "man kneeling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CE 1F3FC 200D 2642", "html": "&#x1F9CE;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏽‍♂️", "name": "man kneeling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CE 1F3FD 200D 2642 FE0F", "html": "&#x1F9CE;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏽‍♂", "name": "man kneeling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CE 1F3FD 200D 2642", "html": "&#x1F9CE;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏾‍♂️", "name": "man kneeling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CE 1F3FE 200D 2642 FE0F", "html": "&#x1F9CE;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏾‍♂", "name": "man kneeling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CE 1F3FE 200D 2642", "html": "&#x1F9CE;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏿‍♂️", "name": "man kneeling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CE 1F3FF 200D 2642 FE0F", "html": "&#x1F9CE;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏿‍♂", "name": "man kneeling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CE 1F3FF 200D 2642", "html": "&#x1F9CE;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎‍♀️", "name": "woman kneeling", "shortname": ":woman_kneeling:", "unicode": "1F9CE 200D 2640 FE0F", "html": "&#x1F9CE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎‍♀", "name": "woman kneeling", "shortname": ":woman_kneeling:", "unicode": "1F9CE 200D 2640", "html": "&#x1F9CE;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏻‍♀️", "name": "woman kneeling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CE 1F3FB 200D 2640 FE0F", "html": "&#x1F9CE;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏻‍♀", "name": "woman kneeling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9CE 1F3FB 200D 2640", "html": "&#x1F9CE;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏼‍♀️", "name": "woman kneeling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CE 1F3FC 200D 2640 FE0F", "html": "&#x1F9CE;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏼‍♀", "name": "woman kneeling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9CE 1F3FC 200D 2640", "html": "&#x1F9CE;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏽‍♀️", "name": "woman kneeling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CE 1F3FD 200D 2640 FE0F", "html": "&#x1F9CE;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏽‍♀", "name": "woman kneeling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9CE 1F3FD 200D 2640", "html": "&#x1F9CE;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏾‍♀️", "name": "woman kneeling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CE 1F3FE 200D 2640 FE0F", "html": "&#x1F9CE;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏾‍♀", "name": "woman kneeling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9CE 1F3FE 200D 2640", "html": "&#x1F9CE;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏿‍♀️", "name": "woman kneeling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CE 1F3FF 200D 2640 FE0F", "html": "&#x1F9CE;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧎🏿‍♀", "name": "woman kneeling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9CE 1F3FF 200D 2640", "html": "&#x1F9CE;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑‍🦯", "name": "person with probing cane", "shortname": ":person_with_probing_cane:", "unicode": "1F9D1 200D 1F9AF", "html": "&#x1F9D1;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏻‍🦯", "name": "person with probing cane: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F9AF", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏼‍🦯", "name": "person with probing cane: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F9AF", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏽‍🦯", "name": "person with probing cane: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F9AF", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏾‍🦯", "name": "person with probing cane: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F9AF", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏿‍🦯", "name": "person with probing cane: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F9AF", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨‍🦯", "name": "man with probing cane", "shortname": ":man_with_probing_cane:", "unicode": "1F468 200D 1F9AF", "html": "&#x1F468;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏻‍🦯", "name": "man with probing cane: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F9AF", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏼‍🦯", "name": "man with probing cane: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F9AF", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏽‍🦯", "name": "man with probing cane: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F9AF", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏾‍🦯", "name": "man with probing cane: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F9AF", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏿‍🦯", "name": "man with probing cane: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F9AF", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩‍🦯", "name": "woman with probing cane", "shortname": ":woman_with_probing_cane:", "unicode": "1F469 200D 1F9AF", "html": "&#x1F469;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏻‍🦯", "name": "woman with probing cane: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F9AF", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏼‍🦯", "name": "woman with probing cane: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F9AF", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏽‍🦯", "name": "woman with probing cane: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F9AF", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏾‍🦯", "name": "woman with probing cane: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F9AF", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏿‍🦯", "name": "woman with probing cane: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F9AF", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F9AF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑‍🦼", "name": "person in motorized wheelchair", "shortname": ":person_in_motorized_wheelchair:", "unicode": "1F9D1 200D 1F9BC", "html": "&#x1F9D1;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏻‍🦼", "name": "person in motorized wheelchair: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F9BC", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏼‍🦼", "name": "person in motorized wheelchair: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F9BC", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏽‍🦼", "name": "person in motorized wheelchair: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F9BC", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏾‍🦼", "name": "person in motorized wheelchair: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F9BC", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏿‍🦼", "name": "person in motorized wheelchair: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F9BC", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨‍🦼", "name": "man in motorized wheelchair", "shortname": ":man_in_motorized_wheelchair:", "unicode": "1F468 200D 1F9BC", "html": "&#x1F468;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏻‍🦼", "name": "man in motorized wheelchair: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F9BC", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏼‍🦼", "name": "man in motorized wheelchair: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F9BC", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏽‍🦼", "name": "man in motorized wheelchair: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F9BC", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏾‍🦼", "name": "man in motorized wheelchair: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F9BC", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏿‍🦼", "name": "man in motorized wheelchair: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F9BC", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩‍🦼", "name": "woman in motorized wheelchair", "shortname": ":woman_in_motorized_wheelchair:", "unicode": "1F469 200D 1F9BC", "html": "&#x1F469;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏻‍🦼", "name": "woman in motorized wheelchair: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F9BC", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏼‍🦼", "name": "woman in motorized wheelchair: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F9BC", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏽‍🦼", "name": "woman in motorized wheelchair: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F9BC", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏾‍🦼", "name": "woman in motorized wheelchair: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F9BC", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏿‍🦼", "name": "woman in motorized wheelchair: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F9BC", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F9BC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑‍🦽", "name": "person in manual wheelchair", "shortname": ":person_in_manual_wheelchair:", "unicode": "1F9D1 200D 1F9BD", "html": "&#x1F9D1;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏻‍🦽", "name": "person in manual wheelchair: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F9BD", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏼‍🦽", "name": "person in manual wheelchair: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F9BD", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏽‍🦽", "name": "person in manual wheelchair: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F9BD", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏾‍🦽", "name": "person in manual wheelchair: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F9BD", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧑🏿‍🦽", "name": "person in manual wheelchair: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F9BD", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨‍🦽", "name": "man in manual wheelchair", "shortname": ":man_in_manual_wheelchair:", "unicode": "1F468 200D 1F9BD", "html": "&#x1F468;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏻‍🦽", "name": "man in manual wheelchair: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F468 1F3FB 200D 1F9BD", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏼‍🦽", "name": "man in manual wheelchair: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F468 1F3FC 200D 1F9BD", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏽‍🦽", "name": "man in manual wheelchair: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F468 1F3FD 200D 1F9BD", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏾‍🦽", "name": "man in manual wheelchair: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F9BD", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👨🏿‍🦽", "name": "man in manual wheelchair: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F9BD", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩‍🦽", "name": "woman in manual wheelchair", "shortname": ":woman_in_manual_wheelchair:", "unicode": "1F469 200D 1F9BD", "html": "&#x1F469;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏻‍🦽", "name": "woman in manual wheelchair: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F469 1F3FB 200D 1F9BD", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏼‍🦽", "name": "woman in manual wheelchair: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F469 1F3FC 200D 1F9BD", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏽‍🦽", "name": "woman in manual wheelchair: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F469 1F3FD 200D 1F9BD", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏾‍🦽", "name": "woman in manual wheelchair: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F9BD", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👩🏿‍🦽", "name": "woman in manual wheelchair: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F9BD", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F9BD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃‍♂️", "name": "man running", "shortname": ":man_running:", "unicode": "1F3C3 200D 2642 FE0F", "html": "&#x1F3C3;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃‍♂", "name": "man running", "shortname": ":man_running:", "unicode": "1F3C3 200D 2642", "html": "&#x1F3C3;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏻‍♂️", "name": "man running: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C3 1F3FB 200D 2642 FE0F", "html": "&#x1F3C3;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏻‍♂", "name": "man running: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C3 1F3FB 200D 2642", "html": "&#x1F3C3;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏼‍♂️", "name": "man running: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C3 1F3FC 200D 2642 FE0F", "html": "&#x1F3C3;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏼‍♂", "name": "man running: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C3 1F3FC 200D 2642", "html": "&#x1F3C3;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏽‍♂️", "name": "man running: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C3 1F3FD 200D 2642 FE0F", "html": "&#x1F3C3;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏽‍♂", "name": "man running: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C3 1F3FD 200D 2642", "html": "&#x1F3C3;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏾‍♂️", "name": "man running: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C3 1F3FE 200D 2642 FE0F", "html": "&#x1F3C3;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏾‍♂", "name": "man running: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C3 1F3FE 200D 2642", "html": "&#x1F3C3;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏿‍♂️", "name": "man running: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C3 1F3FF 200D 2642 FE0F", "html": "&#x1F3C3;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏿‍♂", "name": "man running: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C3 1F3FF 200D 2642", "html": "&#x1F3C3;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃‍♀️", "name": "woman running", "shortname": ":woman_running:", "unicode": "1F3C3 200D 2640 FE0F", "html": "&#x1F3C3;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏻‍♀️", "name": "woman running: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C3 1F3FB 200D 2640 FE0F", "html": "&#x1F3C3;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏼‍♀️", "name": "woman running: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C3 1F3FC 200D 2640 FE0F", "html": "&#x1F3C3;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏽‍♀️", "name": "woman running: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C3 1F3FD 200D 2640 FE0F", "html": "&#x1F3C3;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏾‍♀️", "name": "woman running: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C3 1F3FE 200D 2640 FE0F", "html": "&#x1F3C3;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🏃🏿‍♀️", "name": "woman running: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C3 1F3FF 200D 2640 FE0F", "html": "&#x1F3C3;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕺", "name": "man dancing", "shortname": ":man_dancing:", "unicode": "1F57A", "html": "&#x1F57A;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕺🏻", "name": "man dancing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F57A 1F3FB", "html": "&#x1F57A;&#x1F3FB;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕺🏼", "name": "man dancing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F57A 1F3FC", "html": "&#x1F57A;&#x1F3FC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕺🏽", "name": "man dancing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F57A 1F3FD", "html": "&#x1F57A;&#x1F3FD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕺🏾", "name": "man dancing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F57A 1F3FE", "html": "&#x1F57A;&#x1F3FE;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕺🏿", "name": "man dancing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F57A 1F3FF", "html": "&#x1F57A;&#x1F3FF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕴️", "name": "man in suit levitating", "shortname": ":man_in_suit_levitating:", "unicode": "1F574 FE0F", "html": "&#x1F574;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕴🏻", "name": "man in suit levitating: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F574 1F3FB", "html": "&#x1F574;&#x1F3FB;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕴🏼", "name": "man in suit levitating: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F574 1F3FC", "html": "&#x1F574;&#x1F3FC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕴🏽", "name": "man in suit levitating: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F574 1F3FD", "html": "&#x1F574;&#x1F3FD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕴🏾", "name": "man in suit levitating: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F574 1F3FE", "html": "&#x1F574;&#x1F3FE;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🕴🏿", "name": "man in suit levitating: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F574 1F3FF", "html": "&#x1F574;&#x1F3FF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👯‍♂️", "name": "men with bunny ears", "shortname": ":men_with_bunny_ears:", "unicode": "1F46F 200D 2642 FE0F", "html": "&#x1F46F;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👯‍♀️", "name": "women with bunny ears", "shortname": ":women_with_bunny_ears:", "unicode": "1F46F 200D 2640 FE0F", "html": "&#x1F46F;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "👯‍♀", "name": "women with bunny ears", "shortname": ":women_with_bunny_ears:", "unicode": "1F46F 200D 2640", "html": "&#x1F46F;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖", "name": "person in steamy room", "shortname": ":person_in_steamy_room:", "unicode": "1F9D6", "html": "&#x1F9D6;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏻", "name": "person in steamy room: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D6 1F3FB", "html": "&#x1F9D6;&#x1F3FB;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏼", "name": "person in steamy room: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D6 1F3FC", "html": "&#x1F9D6;&#x1F3FC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏽", "name": "person in steamy room: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D6 1F3FD", "html": "&#x1F9D6;&#x1F3FD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏾", "name": "person in steamy room: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D6 1F3FE", "html": "&#x1F9D6;&#x1F3FE;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏿", "name": "person in steamy room: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D6 1F3FF", "html": "&#x1F9D6;&#x1F3FF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖‍♂️", "name": "man in steamy room", "shortname": ":man_in_steamy_room:", "unicode": "1F9D6 200D 2642 FE0F", "html": "&#x1F9D6;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖‍♂", "name": "man in steamy room", "shortname": ":man_in_steamy_room:", "unicode": "1F9D6 200D 2642", "html": "&#x1F9D6;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏻‍♂️", "name": "man in steamy room: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D6 1F3FB 200D 2642 FE0F", "html": "&#x1F9D6;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏻‍♂", "name": "man in steamy room: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D6 1F3FB 200D 2642", "html": "&#x1F9D6;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏼‍♂️", "name": "man in steamy room: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D6 1F3FC 200D 2642 FE0F", "html": "&#x1F9D6;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏼‍♂", "name": "man in steamy room: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D6 1F3FC 200D 2642", "html": "&#x1F9D6;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏽‍♂️", "name": "man in steamy room: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D6 1F3FD 200D 2642 FE0F", "html": "&#x1F9D6;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏽‍♂", "name": "man in steamy room: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D6 1F3FD 200D 2642", "html": "&#x1F9D6;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏾‍♂️", "name": "man in steamy room: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D6 1F3FE 200D 2642 FE0F", "html": "&#x1F9D6;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏾‍♂", "name": "man in steamy room: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D6 1F3FE 200D 2642", "html": "&#x1F9D6;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏿‍♂️", "name": "man in steamy room: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D6 1F3FF 200D 2642 FE0F", "html": "&#x1F9D6;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏿‍♂", "name": "man in steamy room: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D6 1F3FF 200D 2642", "html": "&#x1F9D6;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖‍♀️", "name": "woman in steamy room", "shortname": ":woman_in_steamy_room:", "unicode": "1F9D6 200D 2640 FE0F", "html": "&#x1F9D6;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖‍♀", "name": "woman in steamy room", "shortname": ":woman_in_steamy_room:", "unicode": "1F9D6 200D 2640", "html": "&#x1F9D6;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏻‍♀️", "name": "woman in steamy room: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D6 1F3FB 200D 2640 FE0F", "html": "&#x1F9D6;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏻‍♀", "name": "woman in steamy room: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D6 1F3FB 200D 2640", "html": "&#x1F9D6;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏼‍♀️", "name": "woman in steamy room: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D6 1F3FC 200D 2640 FE0F", "html": "&#x1F9D6;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏼‍♀", "name": "woman in steamy room: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D6 1F3FC 200D 2640", "html": "&#x1F9D6;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏽‍♀️", "name": "woman in steamy room: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D6 1F3FD 200D 2640 FE0F", "html": "&#x1F9D6;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏽‍♀", "name": "woman in steamy room: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D6 1F3FD 200D 2640", "html": "&#x1F9D6;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏾‍♀️", "name": "woman in steamy room: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D6 1F3FE 200D 2640 FE0F", "html": "&#x1F9D6;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏾‍♀", "name": "woman in steamy room: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D6 1F3FE 200D 2640", "html": "&#x1F9D6;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏿‍♀️", "name": "woman in steamy room: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D6 1F3FF 200D 2640 FE0F", "html": "&#x1F9D6;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧖🏿‍♀", "name": "woman in steamy room: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D6 1F3FF 200D 2640", "html": "&#x1F9D6;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗", "name": "person climbing", "shortname": ":person_climbing:", "unicode": "1F9D7", "html": "&#x1F9D7;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏻", "name": "person climbing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D7 1F3FB", "html": "&#x1F9D7;&#x1F3FB;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏼", "name": "person climbing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D7 1F3FC", "html": "&#x1F9D7;&#x1F3FC;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏽", "name": "person climbing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D7 1F3FD", "html": "&#x1F9D7;&#x1F3FD;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏾", "name": "person climbing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D7 1F3FE", "html": "&#x1F9D7;&#x1F3FE;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏿", "name": "person climbing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D7 1F3FF", "html": "&#x1F9D7;&#x1F3FF;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗‍♂️", "name": "man climbing", "shortname": ":man_climbing:", "unicode": "1F9D7 200D 2642 FE0F", "html": "&#x1F9D7;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗‍♂", "name": "man climbing", "shortname": ":man_climbing:", "unicode": "1F9D7 200D 2642", "html": "&#x1F9D7;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏻‍♂️", "name": "man climbing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D7 1F3FB 200D 2642 FE0F", "html": "&#x1F9D7;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏻‍♂", "name": "man climbing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D7 1F3FB 200D 2642", "html": "&#x1F9D7;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏼‍♂️", "name": "man climbing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D7 1F3FC 200D 2642 FE0F", "html": "&#x1F9D7;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏼‍♂", "name": "man climbing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D7 1F3FC 200D 2642", "html": "&#x1F9D7;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏽‍♂️", "name": "man climbing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D7 1F3FD 200D 2642 FE0F", "html": "&#x1F9D7;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏽‍♂", "name": "man climbing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D7 1F3FD 200D 2642", "html": "&#x1F9D7;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏾‍♂️", "name": "man climbing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D7 1F3FE 200D 2642 FE0F", "html": "&#x1F9D7;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏾‍♂", "name": "man climbing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D7 1F3FE 200D 2642", "html": "&#x1F9D7;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏿‍♂️", "name": "man climbing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D7 1F3FF 200D 2642 FE0F", "html": "&#x1F9D7;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏿‍♂", "name": "man climbing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D7 1F3FF 200D 2642", "html": "&#x1F9D7;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗‍♀️", "name": "woman climbing", "shortname": ":woman_climbing:", "unicode": "1F9D7 200D 2640 FE0F", "html": "&#x1F9D7;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗‍♀", "name": "woman climbing", "shortname": ":woman_climbing:", "unicode": "1F9D7 200D 2640", "html": "&#x1F9D7;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏻‍♀️", "name": "woman climbing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D7 1F3FB 200D 2640 FE0F", "html": "&#x1F9D7;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏻‍♀", "name": "woman climbing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D7 1F3FB 200D 2640", "html": "&#x1F9D7;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏼‍♀️", "name": "woman climbing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D7 1F3FC 200D 2640 FE0F", "html": "&#x1F9D7;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏼‍♀", "name": "woman climbing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D7 1F3FC 200D 2640", "html": "&#x1F9D7;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏽‍♀️", "name": "woman climbing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D7 1F3FD 200D 2640 FE0F", "html": "&#x1F9D7;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏽‍♀", "name": "woman climbing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D7 1F3FD 200D 2640", "html": "&#x1F9D7;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏾‍♀️", "name": "woman climbing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D7 1F3FE 200D 2640 FE0F", "html": "&#x1F9D7;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏾‍♀", "name": "woman climbing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D7 1F3FE 200D 2640", "html": "&#x1F9D7;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏿‍♀️", "name": "woman climbing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D7 1F3FF 200D 2640 FE0F", "html": "&#x1F9D7;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🧗🏿‍♀", "name": "woman climbing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D7 1F3FF 200D 2640", "html": "&#x1F9D7;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-activity)", "order": ""},
+		{"emoji": "🤺", "name": "person fencing", "shortname": ":person_fencing:", "unicode": "1F93A", "html": "&#x1F93A;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏇🏻", "name": "horse racing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C7 1F3FB", "html": "&#x1F3C7;&#x1F3FB;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏇🏼", "name": "horse racing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C7 1F3FC", "html": "&#x1F3C7;&#x1F3FC;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏇🏽", "name": "horse racing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C7 1F3FD", "html": "&#x1F3C7;&#x1F3FD;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏇🏾", "name": "horse racing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C7 1F3FE", "html": "&#x1F3C7;&#x1F3FE;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏇🏿", "name": "horse racing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C7 1F3FF", "html": "&#x1F3C7;&#x1F3FF;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛷️", "name": "skier", "shortname": ":skier:", "unicode": "26F7 FE0F", "html": "&#x26F7;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏂🏻", "name": "snowboarder: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C2 1F3FB", "html": "&#x1F3C2;&#x1F3FB;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏂🏼", "name": "snowboarder: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C2 1F3FC", "html": "&#x1F3C2;&#x1F3FC;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏂🏽", "name": "snowboarder: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C2 1F3FD", "html": "&#x1F3C2;&#x1F3FD;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏂🏾", "name": "snowboarder: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C2 1F3FE", "html": "&#x1F3C2;&#x1F3FE;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏂🏿", "name": "snowboarder: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C2 1F3FF", "html": "&#x1F3C2;&#x1F3FF;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌️", "name": "person golfing", "shortname": ":person_golfing:", "unicode": "1F3CC FE0F", "html": "&#x1F3CC;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏻", "name": "person golfing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CC 1F3FB", "html": "&#x1F3CC;&#x1F3FB;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏼", "name": "person golfing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CC 1F3FC", "html": "&#x1F3CC;&#x1F3FC;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏽", "name": "person golfing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CC 1F3FD", "html": "&#x1F3CC;&#x1F3FD;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏾", "name": "person golfing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CC 1F3FE", "html": "&#x1F3CC;&#x1F3FE;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏿", "name": "person golfing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CC 1F3FF", "html": "&#x1F3CC;&#x1F3FF;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌️‍♂️", "name": "man golfing", "shortname": ":man_golfing:", "unicode": "1F3CC FE0F 200D 2642 FE0F", "html": "&#x1F3CC;&#xFE0F;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌‍♂️", "name": "man golfing", "shortname": ":man_golfing:", "unicode": "1F3CC 200D 2642 FE0F", "html": "&#x1F3CC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌️‍♂", "name": "man golfing", "shortname": ":man_golfing:", "unicode": "1F3CC FE0F 200D 2642", "html": "&#x1F3CC;&#xFE0F;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌‍♂", "name": "man golfing", "shortname": ":man_golfing:", "unicode": "1F3CC 200D 2642", "html": "&#x1F3CC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏻‍♂️", "name": "man golfing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CC 1F3FB 200D 2642 FE0F", "html": "&#x1F3CC;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏻‍♂", "name": "man golfing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CC 1F3FB 200D 2642", "html": "&#x1F3CC;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏼‍♂️", "name": "man golfing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CC 1F3FC 200D 2642 FE0F", "html": "&#x1F3CC;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏼‍♂", "name": "man golfing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CC 1F3FC 200D 2642", "html": "&#x1F3CC;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏽‍♂️", "name": "man golfing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CC 1F3FD 200D 2642 FE0F", "html": "&#x1F3CC;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏽‍♂", "name": "man golfing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CC 1F3FD 200D 2642", "html": "&#x1F3CC;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏾‍♂️", "name": "man golfing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CC 1F3FE 200D 2642 FE0F", "html": "&#x1F3CC;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏾‍♂", "name": "man golfing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CC 1F3FE 200D 2642", "html": "&#x1F3CC;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏿‍♂️", "name": "man golfing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CC 1F3FF 200D 2642 FE0F", "html": "&#x1F3CC;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏿‍♂", "name": "man golfing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CC 1F3FF 200D 2642", "html": "&#x1F3CC;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌️‍♀️", "name": "woman golfing", "shortname": ":woman_golfing:", "unicode": "1F3CC FE0F 200D 2640 FE0F", "html": "&#x1F3CC;&#xFE0F;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌‍♀️", "name": "woman golfing", "shortname": ":woman_golfing:", "unicode": "1F3CC 200D 2640 FE0F", "html": "&#x1F3CC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌️‍♀", "name": "woman golfing", "shortname": ":woman_golfing:", "unicode": "1F3CC FE0F 200D 2640", "html": "&#x1F3CC;&#xFE0F;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏻‍♀️", "name": "woman golfing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CC 1F3FB 200D 2640 FE0F", "html": "&#x1F3CC;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏻‍♀", "name": "woman golfing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CC 1F3FB 200D 2640", "html": "&#x1F3CC;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏼‍♀️", "name": "woman golfing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CC 1F3FC 200D 2640 FE0F", "html": "&#x1F3CC;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏼‍♀", "name": "woman golfing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CC 1F3FC 200D 2640", "html": "&#x1F3CC;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏽‍♀️", "name": "woman golfing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CC 1F3FD 200D 2640 FE0F", "html": "&#x1F3CC;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏽‍♀", "name": "woman golfing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CC 1F3FD 200D 2640", "html": "&#x1F3CC;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏾‍♀️", "name": "woman golfing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CC 1F3FE 200D 2640 FE0F", "html": "&#x1F3CC;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏾‍♀", "name": "woman golfing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CC 1F3FE 200D 2640", "html": "&#x1F3CC;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏿‍♀️", "name": "woman golfing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CC 1F3FF 200D 2640 FE0F", "html": "&#x1F3CC;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏌🏿‍♀", "name": "woman golfing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CC 1F3FF 200D 2640", "html": "&#x1F3CC;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄‍♂️", "name": "man surfing", "shortname": ":man_surfing:", "unicode": "1F3C4 200D 2642 FE0F", "html": "&#x1F3C4;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄‍♂", "name": "man surfing", "shortname": ":man_surfing:", "unicode": "1F3C4 200D 2642", "html": "&#x1F3C4;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏻‍♂️", "name": "man surfing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C4 1F3FB 200D 2642 FE0F", "html": "&#x1F3C4;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏻‍♂", "name": "man surfing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C4 1F3FB 200D 2642", "html": "&#x1F3C4;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏼‍♂️", "name": "man surfing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C4 1F3FC 200D 2642 FE0F", "html": "&#x1F3C4;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏼‍♂", "name": "man surfing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C4 1F3FC 200D 2642", "html": "&#x1F3C4;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏽‍♂️", "name": "man surfing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C4 1F3FD 200D 2642 FE0F", "html": "&#x1F3C4;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏽‍♂", "name": "man surfing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C4 1F3FD 200D 2642", "html": "&#x1F3C4;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏾‍♂️", "name": "man surfing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C4 1F3FE 200D 2642 FE0F", "html": "&#x1F3C4;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏾‍♂", "name": "man surfing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C4 1F3FE 200D 2642", "html": "&#x1F3C4;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏿‍♂️", "name": "man surfing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C4 1F3FF 200D 2642 FE0F", "html": "&#x1F3C4;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏿‍♂", "name": "man surfing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C4 1F3FF 200D 2642", "html": "&#x1F3C4;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄‍♀️", "name": "woman surfing", "shortname": ":woman_surfing:", "unicode": "1F3C4 200D 2640 FE0F", "html": "&#x1F3C4;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏻‍♀️", "name": "woman surfing: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3C4 1F3FB 200D 2640 FE0F", "html": "&#x1F3C4;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏼‍♀️", "name": "woman surfing: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3C4 1F3FC 200D 2640 FE0F", "html": "&#x1F3C4;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏽‍♀️", "name": "woman surfing: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3C4 1F3FD 200D 2640 FE0F", "html": "&#x1F3C4;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏾‍♀️", "name": "woman surfing: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3C4 1F3FE 200D 2640 FE0F", "html": "&#x1F3C4;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏄🏿‍♀️", "name": "woman surfing: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3C4 1F3FF 200D 2640 FE0F", "html": "&#x1F3C4;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣‍♂️", "name": "man rowing boat", "shortname": ":man_rowing_boat:", "unicode": "1F6A3 200D 2642 FE0F", "html": "&#x1F6A3;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣‍♂", "name": "man rowing boat", "shortname": ":man_rowing_boat:", "unicode": "1F6A3 200D 2642", "html": "&#x1F6A3;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏻‍♂️", "name": "man rowing boat: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6A3 1F3FB 200D 2642 FE0F", "html": "&#x1F6A3;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏻‍♂", "name": "man rowing boat: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6A3 1F3FB 200D 2642", "html": "&#x1F6A3;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏼‍♂️", "name": "man rowing boat: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6A3 1F3FC 200D 2642 FE0F", "html": "&#x1F6A3;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏼‍♂", "name": "man rowing boat: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6A3 1F3FC 200D 2642", "html": "&#x1F6A3;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏽‍♂️", "name": "man rowing boat: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6A3 1F3FD 200D 2642 FE0F", "html": "&#x1F6A3;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏽‍♂", "name": "man rowing boat: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6A3 1F3FD 200D 2642", "html": "&#x1F6A3;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏾‍♂️", "name": "man rowing boat: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6A3 1F3FE 200D 2642 FE0F", "html": "&#x1F6A3;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏾‍♂", "name": "man rowing boat: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6A3 1F3FE 200D 2642", "html": "&#x1F6A3;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏿‍♂️", "name": "man rowing boat: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6A3 1F3FF 200D 2642 FE0F", "html": "&#x1F6A3;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏿‍♂", "name": "man rowing boat: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6A3 1F3FF 200D 2642", "html": "&#x1F6A3;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣‍♀️", "name": "woman rowing boat", "shortname": ":woman_rowing_boat:", "unicode": "1F6A3 200D 2640 FE0F", "html": "&#x1F6A3;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏻‍♀️", "name": "woman rowing boat: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6A3 1F3FB 200D 2640 FE0F", "html": "&#x1F6A3;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏼‍♀️", "name": "woman rowing boat: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6A3 1F3FC 200D 2640 FE0F", "html": "&#x1F6A3;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏽‍♀️", "name": "woman rowing boat: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6A3 1F3FD 200D 2640 FE0F", "html": "&#x1F6A3;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏾‍♀️", "name": "woman rowing boat: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6A3 1F3FE 200D 2640 FE0F", "html": "&#x1F6A3;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚣🏿‍♀️", "name": "woman rowing boat: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6A3 1F3FF 200D 2640 FE0F", "html": "&#x1F6A3;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊‍♂️", "name": "man swimming", "shortname": ":man_swimming:", "unicode": "1F3CA 200D 2642 FE0F", "html": "&#x1F3CA;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊‍♂", "name": "man swimming", "shortname": ":man_swimming:", "unicode": "1F3CA 200D 2642", "html": "&#x1F3CA;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏻‍♂️", "name": "man swimming: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CA 1F3FB 200D 2642 FE0F", "html": "&#x1F3CA;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏻‍♂", "name": "man swimming: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CA 1F3FB 200D 2642", "html": "&#x1F3CA;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏼‍♂️", "name": "man swimming: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CA 1F3FC 200D 2642 FE0F", "html": "&#x1F3CA;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏼‍♂", "name": "man swimming: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CA 1F3FC 200D 2642", "html": "&#x1F3CA;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏽‍♂️", "name": "man swimming: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CA 1F3FD 200D 2642 FE0F", "html": "&#x1F3CA;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏽‍♂", "name": "man swimming: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CA 1F3FD 200D 2642", "html": "&#x1F3CA;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏾‍♂️", "name": "man swimming: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CA 1F3FE 200D 2642 FE0F", "html": "&#x1F3CA;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏾‍♂", "name": "man swimming: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CA 1F3FE 200D 2642", "html": "&#x1F3CA;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏿‍♂️", "name": "man swimming: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CA 1F3FF 200D 2642 FE0F", "html": "&#x1F3CA;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏿‍♂", "name": "man swimming: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CA 1F3FF 200D 2642", "html": "&#x1F3CA;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊‍♀️", "name": "woman swimming", "shortname": ":woman_swimming:", "unicode": "1F3CA 200D 2640 FE0F", "html": "&#x1F3CA;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏻‍♀️", "name": "woman swimming: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CA 1F3FB 200D 2640 FE0F", "html": "&#x1F3CA;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏼‍♀️", "name": "woman swimming: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CA 1F3FC 200D 2640 FE0F", "html": "&#x1F3CA;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏽‍♀️", "name": "woman swimming: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CA 1F3FD 200D 2640 FE0F", "html": "&#x1F3CA;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏾‍♀️", "name": "woman swimming: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CA 1F3FE 200D 2640 FE0F", "html": "&#x1F3CA;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏊🏿‍♀️", "name": "woman swimming: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CA 1F3FF 200D 2640 FE0F", "html": "&#x1F3CA;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹️", "name": "person bouncing ball", "shortname": ":person_bouncing_ball:", "unicode": "26F9 FE0F", "html": "&#x26F9;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹️‍♂️", "name": "man bouncing ball", "shortname": ":man_bouncing_ball:", "unicode": "26F9 FE0F 200D 2642 FE0F", "html": "&#x26F9;&#xFE0F;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹‍♂️", "name": "man bouncing ball", "shortname": ":man_bouncing_ball:", "unicode": "26F9 200D 2642 FE0F", "html": "&#x26F9;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹️‍♂", "name": "man bouncing ball", "shortname": ":man_bouncing_ball:", "unicode": "26F9 FE0F 200D 2642", "html": "&#x26F9;&#xFE0F;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹‍♂", "name": "man bouncing ball", "shortname": ":man_bouncing_ball:", "unicode": "26F9 200D 2642", "html": "&#x26F9;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏻‍♂️", "name": "man bouncing ball: light skin tone", "shortname": ":light_skin_tone:", "unicode": "26F9 1F3FB 200D 2642 FE0F", "html": "&#x26F9;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏻‍♂", "name": "man bouncing ball: light skin tone", "shortname": ":light_skin_tone:", "unicode": "26F9 1F3FB 200D 2642", "html": "&#x26F9;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏼‍♂️", "name": "man bouncing ball: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "26F9 1F3FC 200D 2642 FE0F", "html": "&#x26F9;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏼‍♂", "name": "man bouncing ball: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "26F9 1F3FC 200D 2642", "html": "&#x26F9;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏽‍♂️", "name": "man bouncing ball: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "26F9 1F3FD 200D 2642 FE0F", "html": "&#x26F9;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏽‍♂", "name": "man bouncing ball: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "26F9 1F3FD 200D 2642", "html": "&#x26F9;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏾‍♂️", "name": "man bouncing ball: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "26F9 1F3FE 200D 2642 FE0F", "html": "&#x26F9;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏾‍♂", "name": "man bouncing ball: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "26F9 1F3FE 200D 2642", "html": "&#x26F9;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏿‍♂️", "name": "man bouncing ball: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "26F9 1F3FF 200D 2642 FE0F", "html": "&#x26F9;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏿‍♂", "name": "man bouncing ball: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "26F9 1F3FF 200D 2642", "html": "&#x26F9;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹️‍♀️", "name": "woman bouncing ball", "shortname": ":woman_bouncing_ball:", "unicode": "26F9 FE0F 200D 2640 FE0F", "html": "&#x26F9;&#xFE0F;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹‍♀️", "name": "woman bouncing ball", "shortname": ":woman_bouncing_ball:", "unicode": "26F9 200D 2640 FE0F", "html": "&#x26F9;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹️‍♀", "name": "woman bouncing ball", "shortname": ":woman_bouncing_ball:", "unicode": "26F9 FE0F 200D 2640", "html": "&#x26F9;&#xFE0F;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏻‍♀️", "name": "woman bouncing ball: light skin tone", "shortname": ":light_skin_tone:", "unicode": "26F9 1F3FB 200D 2640 FE0F", "html": "&#x26F9;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏼‍♀️", "name": "woman bouncing ball: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "26F9 1F3FC 200D 2640 FE0F", "html": "&#x26F9;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏽‍♀️", "name": "woman bouncing ball: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "26F9 1F3FD 200D 2640 FE0F", "html": "&#x26F9;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏾‍♀️", "name": "woman bouncing ball: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "26F9 1F3FE 200D 2640 FE0F", "html": "&#x26F9;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "⛹🏿‍♀️", "name": "woman bouncing ball: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "26F9 1F3FF 200D 2640 FE0F", "html": "&#x26F9;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋️", "name": "person lifting weights", "shortname": ":person_lifting_weights:", "unicode": "1F3CB FE0F", "html": "&#x1F3CB;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋️‍♂️", "name": "man lifting weights", "shortname": ":man_lifting_weights:", "unicode": "1F3CB FE0F 200D 2642 FE0F", "html": "&#x1F3CB;&#xFE0F;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋‍♂️", "name": "man lifting weights", "shortname": ":man_lifting_weights:", "unicode": "1F3CB 200D 2642 FE0F", "html": "&#x1F3CB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋️‍♂", "name": "man lifting weights", "shortname": ":man_lifting_weights:", "unicode": "1F3CB FE0F 200D 2642", "html": "&#x1F3CB;&#xFE0F;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋‍♂", "name": "man lifting weights", "shortname": ":man_lifting_weights:", "unicode": "1F3CB 200D 2642", "html": "&#x1F3CB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏻‍♂️", "name": "man lifting weights: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CB 1F3FB 200D 2642 FE0F", "html": "&#x1F3CB;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏻‍♂", "name": "man lifting weights: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CB 1F3FB 200D 2642", "html": "&#x1F3CB;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏼‍♂️", "name": "man lifting weights: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CB 1F3FC 200D 2642 FE0F", "html": "&#x1F3CB;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏼‍♂", "name": "man lifting weights: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CB 1F3FC 200D 2642", "html": "&#x1F3CB;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏽‍♂️", "name": "man lifting weights: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CB 1F3FD 200D 2642 FE0F", "html": "&#x1F3CB;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏽‍♂", "name": "man lifting weights: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CB 1F3FD 200D 2642", "html": "&#x1F3CB;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏾‍♂️", "name": "man lifting weights: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CB 1F3FE 200D 2642 FE0F", "html": "&#x1F3CB;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏾‍♂", "name": "man lifting weights: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CB 1F3FE 200D 2642", "html": "&#x1F3CB;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏿‍♂️", "name": "man lifting weights: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CB 1F3FF 200D 2642 FE0F", "html": "&#x1F3CB;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏿‍♂", "name": "man lifting weights: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CB 1F3FF 200D 2642", "html": "&#x1F3CB;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋️‍♀️", "name": "woman lifting weights", "shortname": ":woman_lifting_weights:", "unicode": "1F3CB FE0F 200D 2640 FE0F", "html": "&#x1F3CB;&#xFE0F;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋‍♀️", "name": "woman lifting weights", "shortname": ":woman_lifting_weights:", "unicode": "1F3CB 200D 2640 FE0F", "html": "&#x1F3CB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋️‍♀", "name": "woman lifting weights", "shortname": ":woman_lifting_weights:", "unicode": "1F3CB FE0F 200D 2640", "html": "&#x1F3CB;&#xFE0F;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏻‍♀️", "name": "woman lifting weights: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3CB 1F3FB 200D 2640 FE0F", "html": "&#x1F3CB;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏼‍♀️", "name": "woman lifting weights: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3CB 1F3FC 200D 2640 FE0F", "html": "&#x1F3CB;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏽‍♀️", "name": "woman lifting weights: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3CB 1F3FD 200D 2640 FE0F", "html": "&#x1F3CB;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏾‍♀️", "name": "woman lifting weights: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3CB 1F3FE 200D 2640 FE0F", "html": "&#x1F3CB;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🏋🏿‍♀️", "name": "woman lifting weights: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3CB 1F3FF 200D 2640 FE0F", "html": "&#x1F3CB;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴‍♂️", "name": "man biking", "shortname": ":man_biking:", "unicode": "1F6B4 200D 2642 FE0F", "html": "&#x1F6B4;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴‍♂", "name": "man biking", "shortname": ":man_biking:", "unicode": "1F6B4 200D 2642", "html": "&#x1F6B4;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏻‍♂️", "name": "man biking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B4 1F3FB 200D 2642 FE0F", "html": "&#x1F6B4;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏻‍♂", "name": "man biking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B4 1F3FB 200D 2642", "html": "&#x1F6B4;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏼‍♂️", "name": "man biking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B4 1F3FC 200D 2642 FE0F", "html": "&#x1F6B4;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏼‍♂", "name": "man biking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B4 1F3FC 200D 2642", "html": "&#x1F6B4;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏽‍♂️", "name": "man biking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B4 1F3FD 200D 2642 FE0F", "html": "&#x1F6B4;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏽‍♂", "name": "man biking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B4 1F3FD 200D 2642", "html": "&#x1F6B4;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏾‍♂️", "name": "man biking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B4 1F3FE 200D 2642 FE0F", "html": "&#x1F6B4;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏾‍♂", "name": "man biking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B4 1F3FE 200D 2642", "html": "&#x1F6B4;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏿‍♂️", "name": "man biking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B4 1F3FF 200D 2642 FE0F", "html": "&#x1F6B4;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏿‍♂", "name": "man biking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B4 1F3FF 200D 2642", "html": "&#x1F6B4;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴‍♀️", "name": "woman biking", "shortname": ":woman_biking:", "unicode": "1F6B4 200D 2640 FE0F", "html": "&#x1F6B4;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏻‍♀️", "name": "woman biking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B4 1F3FB 200D 2640 FE0F", "html": "&#x1F6B4;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏼‍♀️", "name": "woman biking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B4 1F3FC 200D 2640 FE0F", "html": "&#x1F6B4;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏽‍♀️", "name": "woman biking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B4 1F3FD 200D 2640 FE0F", "html": "&#x1F6B4;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏾‍♀️", "name": "woman biking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B4 1F3FE 200D 2640 FE0F", "html": "&#x1F6B4;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚴🏿‍♀️", "name": "woman biking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B4 1F3FF 200D 2640 FE0F", "html": "&#x1F6B4;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵‍♂️", "name": "man mountain biking", "shortname": ":man_mountain_biking:", "unicode": "1F6B5 200D 2642 FE0F", "html": "&#x1F6B5;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵‍♂", "name": "man mountain biking", "shortname": ":man_mountain_biking:", "unicode": "1F6B5 200D 2642", "html": "&#x1F6B5;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏻‍♂️", "name": "man mountain biking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B5 1F3FB 200D 2642 FE0F", "html": "&#x1F6B5;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏻‍♂", "name": "man mountain biking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B5 1F3FB 200D 2642", "html": "&#x1F6B5;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏼‍♂️", "name": "man mountain biking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B5 1F3FC 200D 2642 FE0F", "html": "&#x1F6B5;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏼‍♂", "name": "man mountain biking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B5 1F3FC 200D 2642", "html": "&#x1F6B5;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏽‍♂️", "name": "man mountain biking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B5 1F3FD 200D 2642 FE0F", "html": "&#x1F6B5;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏽‍♂", "name": "man mountain biking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B5 1F3FD 200D 2642", "html": "&#x1F6B5;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏾‍♂️", "name": "man mountain biking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B5 1F3FE 200D 2642 FE0F", "html": "&#x1F6B5;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏾‍♂", "name": "man mountain biking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B5 1F3FE 200D 2642", "html": "&#x1F6B5;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏿‍♂️", "name": "man mountain biking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B5 1F3FF 200D 2642 FE0F", "html": "&#x1F6B5;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏿‍♂", "name": "man mountain biking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B5 1F3FF 200D 2642", "html": "&#x1F6B5;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵‍♀️", "name": "woman mountain biking", "shortname": ":woman_mountain_biking:", "unicode": "1F6B5 200D 2640 FE0F", "html": "&#x1F6B5;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏻‍♀️", "name": "woman mountain biking: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6B5 1F3FB 200D 2640 FE0F", "html": "&#x1F6B5;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏼‍♀️", "name": "woman mountain biking: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6B5 1F3FC 200D 2640 FE0F", "html": "&#x1F6B5;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏽‍♀️", "name": "woman mountain biking: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6B5 1F3FD 200D 2640 FE0F", "html": "&#x1F6B5;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏾‍♀️", "name": "woman mountain biking: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6B5 1F3FE 200D 2640 FE0F", "html": "&#x1F6B5;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🚵🏿‍♀️", "name": "woman mountain biking: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6B5 1F3FF 200D 2640 FE0F", "html": "&#x1F6B5;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸", "name": "person cartwheeling", "shortname": ":person_cartwheeling:", "unicode": "1F938", "html": "&#x1F938;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏻", "name": "person cartwheeling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F938 1F3FB", "html": "&#x1F938;&#x1F3FB;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏼", "name": "person cartwheeling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F938 1F3FC", "html": "&#x1F938;&#x1F3FC;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏽", "name": "person cartwheeling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F938 1F3FD", "html": "&#x1F938;&#x1F3FD;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏾", "name": "person cartwheeling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F938 1F3FE", "html": "&#x1F938;&#x1F3FE;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏿", "name": "person cartwheeling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F938 1F3FF", "html": "&#x1F938;&#x1F3FF;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸‍♂️", "name": "man cartwheeling", "shortname": ":man_cartwheeling:", "unicode": "1F938 200D 2642 FE0F", "html": "&#x1F938;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸‍♂", "name": "man cartwheeling", "shortname": ":man_cartwheeling:", "unicode": "1F938 200D 2642", "html": "&#x1F938;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏻‍♂️", "name": "man cartwheeling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F938 1F3FB 200D 2642 FE0F", "html": "&#x1F938;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏻‍♂", "name": "man cartwheeling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F938 1F3FB 200D 2642", "html": "&#x1F938;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏼‍♂️", "name": "man cartwheeling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F938 1F3FC 200D 2642 FE0F", "html": "&#x1F938;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏼‍♂", "name": "man cartwheeling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F938 1F3FC 200D 2642", "html": "&#x1F938;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏽‍♂️", "name": "man cartwheeling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F938 1F3FD 200D 2642 FE0F", "html": "&#x1F938;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏽‍♂", "name": "man cartwheeling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F938 1F3FD 200D 2642", "html": "&#x1F938;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏾‍♂️", "name": "man cartwheeling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F938 1F3FE 200D 2642 FE0F", "html": "&#x1F938;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏾‍♂", "name": "man cartwheeling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F938 1F3FE 200D 2642", "html": "&#x1F938;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏿‍♂️", "name": "man cartwheeling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F938 1F3FF 200D 2642 FE0F", "html": "&#x1F938;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏿‍♂", "name": "man cartwheeling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F938 1F3FF 200D 2642", "html": "&#x1F938;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸‍♀️", "name": "woman cartwheeling", "shortname": ":woman_cartwheeling:", "unicode": "1F938 200D 2640 FE0F", "html": "&#x1F938;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸‍♀", "name": "woman cartwheeling", "shortname": ":woman_cartwheeling:", "unicode": "1F938 200D 2640", "html": "&#x1F938;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏻‍♀️", "name": "woman cartwheeling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F938 1F3FB 200D 2640 FE0F", "html": "&#x1F938;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏻‍♀", "name": "woman cartwheeling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F938 1F3FB 200D 2640", "html": "&#x1F938;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏼‍♀️", "name": "woman cartwheeling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F938 1F3FC 200D 2640 FE0F", "html": "&#x1F938;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏼‍♀", "name": "woman cartwheeling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F938 1F3FC 200D 2640", "html": "&#x1F938;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏽‍♀️", "name": "woman cartwheeling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F938 1F3FD 200D 2640 FE0F", "html": "&#x1F938;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏽‍♀", "name": "woman cartwheeling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F938 1F3FD 200D 2640", "html": "&#x1F938;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏾‍♀️", "name": "woman cartwheeling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F938 1F3FE 200D 2640 FE0F", "html": "&#x1F938;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏾‍♀", "name": "woman cartwheeling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F938 1F3FE 200D 2640", "html": "&#x1F938;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏿‍♀️", "name": "woman cartwheeling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F938 1F3FF 200D 2640 FE0F", "html": "&#x1F938;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤸🏿‍♀", "name": "woman cartwheeling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F938 1F3FF 200D 2640", "html": "&#x1F938;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤼", "name": "people wrestling", "shortname": ":people_wrestling:", "unicode": "1F93C", "html": "&#x1F93C;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤼‍♂️", "name": "men wrestling", "shortname": ":men_wrestling:", "unicode": "1F93C 200D 2642 FE0F", "html": "&#x1F93C;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤼‍♂", "name": "men wrestling", "shortname": ":men_wrestling:", "unicode": "1F93C 200D 2642", "html": "&#x1F93C;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤼‍♀️", "name": "women wrestling", "shortname": ":women_wrestling:", "unicode": "1F93C 200D 2640 FE0F", "html": "&#x1F93C;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤼‍♀", "name": "women wrestling", "shortname": ":women_wrestling:", "unicode": "1F93C 200D 2640", "html": "&#x1F93C;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽", "name": "person playing water polo", "shortname": ":person_playing_water_polo:", "unicode": "1F93D", "html": "&#x1F93D;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏻", "name": "person playing water polo: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F93D 1F3FB", "html": "&#x1F93D;&#x1F3FB;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏼", "name": "person playing water polo: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F93D 1F3FC", "html": "&#x1F93D;&#x1F3FC;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏽", "name": "person playing water polo: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F93D 1F3FD", "html": "&#x1F93D;&#x1F3FD;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏾", "name": "person playing water polo: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F93D 1F3FE", "html": "&#x1F93D;&#x1F3FE;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏿", "name": "person playing water polo: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F93D 1F3FF", "html": "&#x1F93D;&#x1F3FF;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽‍♂️", "name": "man playing water polo", "shortname": ":man_playing_water_polo:", "unicode": "1F93D 200D 2642 FE0F", "html": "&#x1F93D;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽‍♂", "name": "man playing water polo", "shortname": ":man_playing_water_polo:", "unicode": "1F93D 200D 2642", "html": "&#x1F93D;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏻‍♂️", "name": "man playing water polo: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F93D 1F3FB 200D 2642 FE0F", "html": "&#x1F93D;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏻‍♂", "name": "man playing water polo: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F93D 1F3FB 200D 2642", "html": "&#x1F93D;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏼‍♂️", "name": "man playing water polo: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F93D 1F3FC 200D 2642 FE0F", "html": "&#x1F93D;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏼‍♂", "name": "man playing water polo: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F93D 1F3FC 200D 2642", "html": "&#x1F93D;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏽‍♂️", "name": "man playing water polo: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F93D 1F3FD 200D 2642 FE0F", "html": "&#x1F93D;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏽‍♂", "name": "man playing water polo: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F93D 1F3FD 200D 2642", "html": "&#x1F93D;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏾‍♂️", "name": "man playing water polo: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F93D 1F3FE 200D 2642 FE0F", "html": "&#x1F93D;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏾‍♂", "name": "man playing water polo: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F93D 1F3FE 200D 2642", "html": "&#x1F93D;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏿‍♂️", "name": "man playing water polo: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F93D 1F3FF 200D 2642 FE0F", "html": "&#x1F93D;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏿‍♂", "name": "man playing water polo: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F93D 1F3FF 200D 2642", "html": "&#x1F93D;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽‍♀️", "name": "woman playing water polo", "shortname": ":woman_playing_water_polo:", "unicode": "1F93D 200D 2640 FE0F", "html": "&#x1F93D;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽‍♀", "name": "woman playing water polo", "shortname": ":woman_playing_water_polo:", "unicode": "1F93D 200D 2640", "html": "&#x1F93D;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏻‍♀️", "name": "woman playing water polo: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F93D 1F3FB 200D 2640 FE0F", "html": "&#x1F93D;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏻‍♀", "name": "woman playing water polo: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F93D 1F3FB 200D 2640", "html": "&#x1F93D;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏼‍♀️", "name": "woman playing water polo: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F93D 1F3FC 200D 2640 FE0F", "html": "&#x1F93D;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏼‍♀", "name": "woman playing water polo: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F93D 1F3FC 200D 2640", "html": "&#x1F93D;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏽‍♀️", "name": "woman playing water polo: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F93D 1F3FD 200D 2640 FE0F", "html": "&#x1F93D;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏽‍♀", "name": "woman playing water polo: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F93D 1F3FD 200D 2640", "html": "&#x1F93D;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏾‍♀️", "name": "woman playing water polo: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F93D 1F3FE 200D 2640 FE0F", "html": "&#x1F93D;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏾‍♀", "name": "woman playing water polo: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F93D 1F3FE 200D 2640", "html": "&#x1F93D;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏿‍♀️", "name": "woman playing water polo: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F93D 1F3FF 200D 2640 FE0F", "html": "&#x1F93D;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤽🏿‍♀", "name": "woman playing water polo: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F93D 1F3FF 200D 2640", "html": "&#x1F93D;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾", "name": "person playing handball", "shortname": ":person_playing_handball:", "unicode": "1F93E", "html": "&#x1F93E;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏻", "name": "person playing handball: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F93E 1F3FB", "html": "&#x1F93E;&#x1F3FB;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏼", "name": "person playing handball: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F93E 1F3FC", "html": "&#x1F93E;&#x1F3FC;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏽", "name": "person playing handball: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F93E 1F3FD", "html": "&#x1F93E;&#x1F3FD;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏾", "name": "person playing handball: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F93E 1F3FE", "html": "&#x1F93E;&#x1F3FE;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏿", "name": "person playing handball: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F93E 1F3FF", "html": "&#x1F93E;&#x1F3FF;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾‍♂️", "name": "man playing handball", "shortname": ":man_playing_handball:", "unicode": "1F93E 200D 2642 FE0F", "html": "&#x1F93E;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾‍♂", "name": "man playing handball", "shortname": ":man_playing_handball:", "unicode": "1F93E 200D 2642", "html": "&#x1F93E;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏻‍♂️", "name": "man playing handball: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F93E 1F3FB 200D 2642 FE0F", "html": "&#x1F93E;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏻‍♂", "name": "man playing handball: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F93E 1F3FB 200D 2642", "html": "&#x1F93E;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏼‍♂️", "name": "man playing handball: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F93E 1F3FC 200D 2642 FE0F", "html": "&#x1F93E;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏼‍♂", "name": "man playing handball: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F93E 1F3FC 200D 2642", "html": "&#x1F93E;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏽‍♂️", "name": "man playing handball: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F93E 1F3FD 200D 2642 FE0F", "html": "&#x1F93E;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏽‍♂", "name": "man playing handball: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F93E 1F3FD 200D 2642", "html": "&#x1F93E;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏾‍♂️", "name": "man playing handball: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F93E 1F3FE 200D 2642 FE0F", "html": "&#x1F93E;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏾‍♂", "name": "man playing handball: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F93E 1F3FE 200D 2642", "html": "&#x1F93E;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏿‍♂️", "name": "man playing handball: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F93E 1F3FF 200D 2642 FE0F", "html": "&#x1F93E;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏿‍♂", "name": "man playing handball: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F93E 1F3FF 200D 2642", "html": "&#x1F93E;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾‍♀️", "name": "woman playing handball", "shortname": ":woman_playing_handball:", "unicode": "1F93E 200D 2640 FE0F", "html": "&#x1F93E;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾‍♀", "name": "woman playing handball", "shortname": ":woman_playing_handball:", "unicode": "1F93E 200D 2640", "html": "&#x1F93E;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏻‍♀️", "name": "woman playing handball: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F93E 1F3FB 200D 2640 FE0F", "html": "&#x1F93E;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏻‍♀", "name": "woman playing handball: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F93E 1F3FB 200D 2640", "html": "&#x1F93E;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏼‍♀️", "name": "woman playing handball: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F93E 1F3FC 200D 2640 FE0F", "html": "&#x1F93E;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏼‍♀", "name": "woman playing handball: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F93E 1F3FC 200D 2640", "html": "&#x1F93E;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏽‍♀️", "name": "woman playing handball: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F93E 1F3FD 200D 2640 FE0F", "html": "&#x1F93E;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏽‍♀", "name": "woman playing handball: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F93E 1F3FD 200D 2640", "html": "&#x1F93E;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏾‍♀️", "name": "woman playing handball: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F93E 1F3FE 200D 2640 FE0F", "html": "&#x1F93E;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏾‍♀", "name": "woman playing handball: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F93E 1F3FE 200D 2640", "html": "&#x1F93E;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏿‍♀️", "name": "woman playing handball: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F93E 1F3FF 200D 2640 FE0F", "html": "&#x1F93E;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤾🏿‍♀", "name": "woman playing handball: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F93E 1F3FF 200D 2640", "html": "&#x1F93E;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹", "name": "person juggling", "shortname": ":person_juggling:", "unicode": "1F939", "html": "&#x1F939;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏻", "name": "person juggling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F939 1F3FB", "html": "&#x1F939;&#x1F3FB;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏼", "name": "person juggling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F939 1F3FC", "html": "&#x1F939;&#x1F3FC;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏽", "name": "person juggling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F939 1F3FD", "html": "&#x1F939;&#x1F3FD;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏾", "name": "person juggling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F939 1F3FE", "html": "&#x1F939;&#x1F3FE;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏿", "name": "person juggling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F939 1F3FF", "html": "&#x1F939;&#x1F3FF;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹‍♂️", "name": "man juggling", "shortname": ":man_juggling:", "unicode": "1F939 200D 2642 FE0F", "html": "&#x1F939;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹‍♂", "name": "man juggling", "shortname": ":man_juggling:", "unicode": "1F939 200D 2642", "html": "&#x1F939;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏻‍♂️", "name": "man juggling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F939 1F3FB 200D 2642 FE0F", "html": "&#x1F939;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏻‍♂", "name": "man juggling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F939 1F3FB 200D 2642", "html": "&#x1F939;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏼‍♂️", "name": "man juggling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F939 1F3FC 200D 2642 FE0F", "html": "&#x1F939;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏼‍♂", "name": "man juggling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F939 1F3FC 200D 2642", "html": "&#x1F939;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏽‍♂️", "name": "man juggling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F939 1F3FD 200D 2642 FE0F", "html": "&#x1F939;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏽‍♂", "name": "man juggling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F939 1F3FD 200D 2642", "html": "&#x1F939;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏾‍♂️", "name": "man juggling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F939 1F3FE 200D 2642 FE0F", "html": "&#x1F939;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏾‍♂", "name": "man juggling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F939 1F3FE 200D 2642", "html": "&#x1F939;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏿‍♂️", "name": "man juggling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F939 1F3FF 200D 2642 FE0F", "html": "&#x1F939;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏿‍♂", "name": "man juggling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F939 1F3FF 200D 2642", "html": "&#x1F939;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹‍♀️", "name": "woman juggling", "shortname": ":woman_juggling:", "unicode": "1F939 200D 2640 FE0F", "html": "&#x1F939;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹‍♀", "name": "woman juggling", "shortname": ":woman_juggling:", "unicode": "1F939 200D 2640", "html": "&#x1F939;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏻‍♀️", "name": "woman juggling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F939 1F3FB 200D 2640 FE0F", "html": "&#x1F939;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏻‍♀", "name": "woman juggling: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F939 1F3FB 200D 2640", "html": "&#x1F939;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏼‍♀️", "name": "woman juggling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F939 1F3FC 200D 2640 FE0F", "html": "&#x1F939;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏼‍♀", "name": "woman juggling: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F939 1F3FC 200D 2640", "html": "&#x1F939;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏽‍♀️", "name": "woman juggling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F939 1F3FD 200D 2640 FE0F", "html": "&#x1F939;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏽‍♀", "name": "woman juggling: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F939 1F3FD 200D 2640", "html": "&#x1F939;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏾‍♀️", "name": "woman juggling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F939 1F3FE 200D 2640 FE0F", "html": "&#x1F939;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏾‍♀", "name": "woman juggling: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F939 1F3FE 200D 2640", "html": "&#x1F939;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏿‍♀️", "name": "woman juggling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F939 1F3FF 200D 2640 FE0F", "html": "&#x1F939;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🤹🏿‍♀", "name": "woman juggling: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F939 1F3FF 200D 2640", "html": "&#x1F939;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-sport)", "order": ""},
+		{"emoji": "🧘", "name": "person in lotus position", "shortname": ":person_in_lotus_position:", "unicode": "1F9D8", "html": "&#x1F9D8;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏻", "name": "person in lotus position: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D8 1F3FB", "html": "&#x1F9D8;&#x1F3FB;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏼", "name": "person in lotus position: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D8 1F3FC", "html": "&#x1F9D8;&#x1F3FC;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏽", "name": "person in lotus position: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D8 1F3FD", "html": "&#x1F9D8;&#x1F3FD;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏾", "name": "person in lotus position: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D8 1F3FE", "html": "&#x1F9D8;&#x1F3FE;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏿", "name": "person in lotus position: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D8 1F3FF", "html": "&#x1F9D8;&#x1F3FF;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘‍♂️", "name": "man in lotus position", "shortname": ":man_in_lotus_position:", "unicode": "1F9D8 200D 2642 FE0F", "html": "&#x1F9D8;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘‍♂", "name": "man in lotus position", "shortname": ":man_in_lotus_position:", "unicode": "1F9D8 200D 2642", "html": "&#x1F9D8;&#x200D;&#x2642;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏻‍♂️", "name": "man in lotus position: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D8 1F3FB 200D 2642 FE0F", "html": "&#x1F9D8;&#x1F3FB;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏻‍♂", "name": "man in lotus position: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D8 1F3FB 200D 2642", "html": "&#x1F9D8;&#x1F3FB;&#x200D;&#x2642;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏼‍♂️", "name": "man in lotus position: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D8 1F3FC 200D 2642 FE0F", "html": "&#x1F9D8;&#x1F3FC;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏼‍♂", "name": "man in lotus position: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D8 1F3FC 200D 2642", "html": "&#x1F9D8;&#x1F3FC;&#x200D;&#x2642;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏽‍♂️", "name": "man in lotus position: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D8 1F3FD 200D 2642 FE0F", "html": "&#x1F9D8;&#x1F3FD;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏽‍♂", "name": "man in lotus position: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D8 1F3FD 200D 2642", "html": "&#x1F9D8;&#x1F3FD;&#x200D;&#x2642;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏾‍♂️", "name": "man in lotus position: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D8 1F3FE 200D 2642 FE0F", "html": "&#x1F9D8;&#x1F3FE;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏾‍♂", "name": "man in lotus position: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D8 1F3FE 200D 2642", "html": "&#x1F9D8;&#x1F3FE;&#x200D;&#x2642;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏿‍♂️", "name": "man in lotus position: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D8 1F3FF 200D 2642 FE0F", "html": "&#x1F9D8;&#x1F3FF;&#x200D;&#x2642;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏿‍♂", "name": "man in lotus position: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D8 1F3FF 200D 2642", "html": "&#x1F9D8;&#x1F3FF;&#x200D;&#x2642;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘‍♀️", "name": "woman in lotus position", "shortname": ":woman_in_lotus_position:", "unicode": "1F9D8 200D 2640 FE0F", "html": "&#x1F9D8;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘‍♀", "name": "woman in lotus position", "shortname": ":woman_in_lotus_position:", "unicode": "1F9D8 200D 2640", "html": "&#x1F9D8;&#x200D;&#x2640;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏻‍♀️", "name": "woman in lotus position: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D8 1F3FB 200D 2640 FE0F", "html": "&#x1F9D8;&#x1F3FB;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏻‍♀", "name": "woman in lotus position: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D8 1F3FB 200D 2640", "html": "&#x1F9D8;&#x1F3FB;&#x200D;&#x2640;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏼‍♀️", "name": "woman in lotus position: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D8 1F3FC 200D 2640 FE0F", "html": "&#x1F9D8;&#x1F3FC;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏼‍♀", "name": "woman in lotus position: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D8 1F3FC 200D 2640", "html": "&#x1F9D8;&#x1F3FC;&#x200D;&#x2640;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏽‍♀️", "name": "woman in lotus position: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D8 1F3FD 200D 2640 FE0F", "html": "&#x1F9D8;&#x1F3FD;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏽‍♀", "name": "woman in lotus position: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D8 1F3FD 200D 2640", "html": "&#x1F9D8;&#x1F3FD;&#x200D;&#x2640;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏾‍♀️", "name": "woman in lotus position: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D8 1F3FE 200D 2640 FE0F", "html": "&#x1F9D8;&#x1F3FE;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏾‍♀", "name": "woman in lotus position: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D8 1F3FE 200D 2640", "html": "&#x1F9D8;&#x1F3FE;&#x200D;&#x2640;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏿‍♀️", "name": "woman in lotus position: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D8 1F3FF 200D 2640 FE0F", "html": "&#x1F9D8;&#x1F3FF;&#x200D;&#x2640;&#xFE0F;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧘🏿‍♀", "name": "woman in lotus position: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D8 1F3FF 200D 2640", "html": "&#x1F9D8;&#x1F3FF;&#x200D;&#x2640;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🛌🏻", "name": "person in bed: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F6CC 1F3FB", "html": "&#x1F6CC;&#x1F3FB;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🛌🏼", "name": "person in bed: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F6CC 1F3FC", "html": "&#x1F6CC;&#x1F3FC;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🛌🏽", "name": "person in bed: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F6CC 1F3FD", "html": "&#x1F6CC;&#x1F3FD;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🛌🏾", "name": "person in bed: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F6CC 1F3FE", "html": "&#x1F6CC;&#x1F3FE;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🛌🏿", "name": "person in bed: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F6CC 1F3FF", "html": "&#x1F6CC;&#x1F3FF;", "category": "People & Body (person-resting)", "order": ""},
+		{"emoji": "🧑‍🤝‍🧑", "name": "people holding hands", "shortname": ":people_holding_hands:", "unicode": "1F9D1 200D 1F91D 200D 1F9D1", "html": "&#x1F9D1;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏻‍🤝‍🧑🏻", "name": "people holding hands: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FB", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏻‍🤝‍🧑🏼", "name": "people holding hands: light skin tone, medium-light skin tone", "shortname": ":light_skin_tone_mediumlight_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FC", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏻‍🤝‍🧑🏽", "name": "people holding hands: light skin tone, medium skin tone", "shortname": ":light_skin_tone_medium_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FD", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏻‍🤝‍🧑🏾", "name": "people holding hands: light skin tone, medium-dark skin tone", "shortname": ":light_skin_tone_mediumdark_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FE", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏻‍🤝‍🧑🏿", "name": "people holding hands: light skin tone, dark skin tone", "shortname": ":light_skin_tone_dark_skin_tone:", "unicode": "1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FF", "html": "&#x1F9D1;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏼‍🤝‍🧑🏻", "name": "people holding hands: medium-light skin tone, light skin tone", "shortname": ":mediumlight_skin_tone_light_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FB", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏼‍🤝‍🧑🏼", "name": "people holding hands: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FC", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏼‍🤝‍🧑🏽", "name": "people holding hands: medium-light skin tone, medium skin tone", "shortname": ":mediumlight_skin_tone_medium_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FD", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏼‍🤝‍🧑🏾", "name": "people holding hands: medium-light skin tone, medium-dark skin tone", "shortname": ":mediumlight_skin_tone_medium-dark_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FE", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏼‍🤝‍🧑🏿", "name": "people holding hands: medium-light skin tone, dark skin tone", "shortname": ":mediumlight_skin_tone_dark_skin_tone:", "unicode": "1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FF", "html": "&#x1F9D1;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏽‍🤝‍🧑🏻", "name": "people holding hands: medium skin tone, light skin tone", "shortname": ":medium_skin_tone_light_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FB", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏽‍🤝‍🧑🏼", "name": "people holding hands: medium skin tone, medium-light skin tone", "shortname": ":medium_skin_tone_mediumlight_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FC", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏽‍🤝‍🧑🏽", "name": "people holding hands: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FD", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏽‍🤝‍🧑🏾", "name": "people holding hands: medium skin tone, medium-dark skin tone", "shortname": ":medium_skin_tone_mediumdark_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FE", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏽‍🤝‍🧑🏿", "name": "people holding hands: medium skin tone, dark skin tone", "shortname": ":medium_skin_tone_dark_skin_tone:", "unicode": "1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FF", "html": "&#x1F9D1;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏾‍🤝‍🧑🏻", "name": "people holding hands: medium-dark skin tone, light skin tone", "shortname": ":mediumdark_skin_tone_light_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FB", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏾‍🤝‍🧑🏼", "name": "people holding hands: medium-dark skin tone, medium-light skin tone", "shortname": ":mediumdark_skin_tone_medium-light_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FC", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏾‍🤝‍🧑🏽", "name": "people holding hands: medium-dark skin tone, medium skin tone", "shortname": ":mediumdark_skin_tone_medium_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FD", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏾‍🤝‍🧑🏾", "name": "people holding hands: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FE", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏾‍🤝‍🧑🏿", "name": "people holding hands: medium-dark skin tone, dark skin tone", "shortname": ":mediumdark_skin_tone_dark_skin_tone:", "unicode": "1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FF", "html": "&#x1F9D1;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏿‍🤝‍🧑🏻", "name": "people holding hands: dark skin tone, light skin tone", "shortname": ":dark_skin_tone_light_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FB", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏿‍🤝‍🧑🏼", "name": "people holding hands: dark skin tone, medium-light skin tone", "shortname": ":dark_skin_tone_mediumlight_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FC", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏿‍🤝‍🧑🏽", "name": "people holding hands: dark skin tone, medium skin tone", "shortname": ":dark_skin_tone_medium_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FD", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏿‍🤝‍🧑🏾", "name": "people holding hands: dark skin tone, medium-dark skin tone", "shortname": ":dark_skin_tone_mediumdark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FE", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🧑🏿‍🤝‍🧑🏿", "name": "people holding hands: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FF", "html": "&#x1F9D1;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👭🏻", "name": "women holding hands: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F46D 1F3FB", "html": "&#x1F46D;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏻‍🤝‍👩🏼", "name": "women holding hands: light skin tone, medium-light skin tone", "shortname": ":light_skin_tone_mediumlight_skin_tone:", "unicode": "1F469 1F3FB 200D 1F91D 200D 1F469 1F3FC", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏻‍🤝‍👩🏽", "name": "women holding hands: light skin tone, medium skin tone", "shortname": ":light_skin_tone_medium_skin_tone:", "unicode": "1F469 1F3FB 200D 1F91D 200D 1F469 1F3FD", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏻‍🤝‍👩🏾", "name": "women holding hands: light skin tone, medium-dark skin tone", "shortname": ":light_skin_tone_mediumdark_skin_tone:", "unicode": "1F469 1F3FB 200D 1F91D 200D 1F469 1F3FE", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏻‍🤝‍👩🏿", "name": "women holding hands: light skin tone, dark skin tone", "shortname": ":light_skin_tone_dark_skin_tone:", "unicode": "1F469 1F3FB 200D 1F91D 200D 1F469 1F3FF", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏼‍🤝‍👩🏻", "name": "women holding hands: medium-light skin tone, light skin tone", "shortname": ":mediumlight_skin_tone_light_skin_tone:", "unicode": "1F469 1F3FC 200D 1F91D 200D 1F469 1F3FB", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👭🏼", "name": "women holding hands: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F46D 1F3FC", "html": "&#x1F46D;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏼‍🤝‍👩🏽", "name": "women holding hands: medium-light skin tone, medium skin tone", "shortname": ":mediumlight_skin_tone_medium_skin_tone:", "unicode": "1F469 1F3FC 200D 1F91D 200D 1F469 1F3FD", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏼‍🤝‍👩🏾", "name": "women holding hands: medium-light skin tone, medium-dark skin tone", "shortname": ":mediumlight_skin_tone_medium-dark_skin_tone:", "unicode": "1F469 1F3FC 200D 1F91D 200D 1F469 1F3FE", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏼‍🤝‍👩🏿", "name": "women holding hands: medium-light skin tone, dark skin tone", "shortname": ":mediumlight_skin_tone_dark_skin_tone:", "unicode": "1F469 1F3FC 200D 1F91D 200D 1F469 1F3FF", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏽‍🤝‍👩🏻", "name": "women holding hands: medium skin tone, light skin tone", "shortname": ":medium_skin_tone_light_skin_tone:", "unicode": "1F469 1F3FD 200D 1F91D 200D 1F469 1F3FB", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏽‍🤝‍👩🏼", "name": "women holding hands: medium skin tone, medium-light skin tone", "shortname": ":medium_skin_tone_mediumlight_skin_tone:", "unicode": "1F469 1F3FD 200D 1F91D 200D 1F469 1F3FC", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👭🏽", "name": "women holding hands: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F46D 1F3FD", "html": "&#x1F46D;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏽‍🤝‍👩🏾", "name": "women holding hands: medium skin tone, medium-dark skin tone", "shortname": ":medium_skin_tone_mediumdark_skin_tone:", "unicode": "1F469 1F3FD 200D 1F91D 200D 1F469 1F3FE", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏽‍🤝‍👩🏿", "name": "women holding hands: medium skin tone, dark skin tone", "shortname": ":medium_skin_tone_dark_skin_tone:", "unicode": "1F469 1F3FD 200D 1F91D 200D 1F469 1F3FF", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏾‍🤝‍👩🏻", "name": "women holding hands: medium-dark skin tone, light skin tone", "shortname": ":mediumdark_skin_tone_light_skin_tone:", "unicode": "1F469 1F3FE 200D 1F91D 200D 1F469 1F3FB", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏾‍🤝‍👩🏼", "name": "women holding hands: medium-dark skin tone, medium-light skin tone", "shortname": ":mediumdark_skin_tone_medium-light_skin_tone:", "unicode": "1F469 1F3FE 200D 1F91D 200D 1F469 1F3FC", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏾‍🤝‍👩🏽", "name": "women holding hands: medium-dark skin tone, medium skin tone", "shortname": ":mediumdark_skin_tone_medium_skin_tone:", "unicode": "1F469 1F3FE 200D 1F91D 200D 1F469 1F3FD", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👭🏾", "name": "women holding hands: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F46D 1F3FE", "html": "&#x1F46D;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏾‍🤝‍👩🏿", "name": "women holding hands: medium-dark skin tone, dark skin tone", "shortname": ":mediumdark_skin_tone_dark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F91D 200D 1F469 1F3FF", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏿‍🤝‍👩🏻", "name": "women holding hands: dark skin tone, light skin tone", "shortname": ":dark_skin_tone_light_skin_tone:", "unicode": "1F469 1F3FF 200D 1F91D 200D 1F469 1F3FB", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏿‍🤝‍👩🏼", "name": "women holding hands: dark skin tone, medium-light skin tone", "shortname": ":dark_skin_tone_mediumlight_skin_tone:", "unicode": "1F469 1F3FF 200D 1F91D 200D 1F469 1F3FC", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏿‍🤝‍👩🏽", "name": "women holding hands: dark skin tone, medium skin tone", "shortname": ":dark_skin_tone_medium_skin_tone:", "unicode": "1F469 1F3FF 200D 1F91D 200D 1F469 1F3FD", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏿‍🤝‍👩🏾", "name": "women holding hands: dark skin tone, medium-dark skin tone", "shortname": ":dark_skin_tone_mediumdark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F91D 200D 1F469 1F3FE", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F469;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👭🏿", "name": "women holding hands: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F46D 1F3FF", "html": "&#x1F46D;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👫🏻", "name": "woman and man holding hands: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F46B 1F3FB", "html": "&#x1F46B;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏻‍🤝‍👨🏼", "name": "woman and man holding hands: light skin tone, medium-light skin tone", "shortname": ":light_skin_tone_mediumlight_skin_tone:", "unicode": "1F469 1F3FB 200D 1F91D 200D 1F468 1F3FC", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏻‍🤝‍👨🏽", "name": "woman and man holding hands: light skin tone, medium skin tone", "shortname": ":light_skin_tone_medium_skin_tone:", "unicode": "1F469 1F3FB 200D 1F91D 200D 1F468 1F3FD", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏻‍🤝‍👨🏾", "name": "woman and man holding hands: light skin tone, medium-dark skin tone", "shortname": ":light_skin_tone_mediumdark_skin_tone:", "unicode": "1F469 1F3FB 200D 1F91D 200D 1F468 1F3FE", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏻‍🤝‍👨🏿", "name": "woman and man holding hands: light skin tone, dark skin tone", "shortname": ":light_skin_tone_dark_skin_tone:", "unicode": "1F469 1F3FB 200D 1F91D 200D 1F468 1F3FF", "html": "&#x1F469;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏼‍🤝‍👨🏻", "name": "woman and man holding hands: medium-light skin tone, light skin tone", "shortname": ":mediumlight_skin_tone_light_skin_tone:", "unicode": "1F469 1F3FC 200D 1F91D 200D 1F468 1F3FB", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👫🏼", "name": "woman and man holding hands: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F46B 1F3FC", "html": "&#x1F46B;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏼‍🤝‍👨🏽", "name": "woman and man holding hands: medium-light skin tone, medium skin tone", "shortname": ":mediumlight_skin_tone_medium_skin_tone:", "unicode": "1F469 1F3FC 200D 1F91D 200D 1F468 1F3FD", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏼‍🤝‍👨🏾", "name": "woman and man holding hands: medium-light skin tone, medium-dark skin tone", "shortname": ":mediumlight_skin_tone_medium-dark_skin_tone:", "unicode": "1F469 1F3FC 200D 1F91D 200D 1F468 1F3FE", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏼‍🤝‍👨🏿", "name": "woman and man holding hands: medium-light skin tone, dark skin tone", "shortname": ":mediumlight_skin_tone_dark_skin_tone:", "unicode": "1F469 1F3FC 200D 1F91D 200D 1F468 1F3FF", "html": "&#x1F469;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏽‍🤝‍👨🏻", "name": "woman and man holding hands: medium skin tone, light skin tone", "shortname": ":medium_skin_tone_light_skin_tone:", "unicode": "1F469 1F3FD 200D 1F91D 200D 1F468 1F3FB", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏽‍🤝‍👨🏼", "name": "woman and man holding hands: medium skin tone, medium-light skin tone", "shortname": ":medium_skin_tone_mediumlight_skin_tone:", "unicode": "1F469 1F3FD 200D 1F91D 200D 1F468 1F3FC", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👫🏽", "name": "woman and man holding hands: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F46B 1F3FD", "html": "&#x1F46B;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏽‍🤝‍👨🏾", "name": "woman and man holding hands: medium skin tone, medium-dark skin tone", "shortname": ":medium_skin_tone_mediumdark_skin_tone:", "unicode": "1F469 1F3FD 200D 1F91D 200D 1F468 1F3FE", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏽‍🤝‍👨🏿", "name": "woman and man holding hands: medium skin tone, dark skin tone", "shortname": ":medium_skin_tone_dark_skin_tone:", "unicode": "1F469 1F3FD 200D 1F91D 200D 1F468 1F3FF", "html": "&#x1F469;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏾‍🤝‍👨🏻", "name": "woman and man holding hands: medium-dark skin tone, light skin tone", "shortname": ":mediumdark_skin_tone_light_skin_tone:", "unicode": "1F469 1F3FE 200D 1F91D 200D 1F468 1F3FB", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏾‍🤝‍👨🏼", "name": "woman and man holding hands: medium-dark skin tone, medium-light skin tone", "shortname": ":mediumdark_skin_tone_medium-light_skin_tone:", "unicode": "1F469 1F3FE 200D 1F91D 200D 1F468 1F3FC", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏾‍🤝‍👨🏽", "name": "woman and man holding hands: medium-dark skin tone, medium skin tone", "shortname": ":mediumdark_skin_tone_medium_skin_tone:", "unicode": "1F469 1F3FE 200D 1F91D 200D 1F468 1F3FD", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👫🏾", "name": "woman and man holding hands: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F46B 1F3FE", "html": "&#x1F46B;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏾‍🤝‍👨🏿", "name": "woman and man holding hands: medium-dark skin tone, dark skin tone", "shortname": ":mediumdark_skin_tone_dark_skin_tone:", "unicode": "1F469 1F3FE 200D 1F91D 200D 1F468 1F3FF", "html": "&#x1F469;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏿‍🤝‍👨🏻", "name": "woman and man holding hands: dark skin tone, light skin tone", "shortname": ":dark_skin_tone_light_skin_tone:", "unicode": "1F469 1F3FF 200D 1F91D 200D 1F468 1F3FB", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏿‍🤝‍👨🏼", "name": "woman and man holding hands: dark skin tone, medium-light skin tone", "shortname": ":dark_skin_tone_mediumlight_skin_tone:", "unicode": "1F469 1F3FF 200D 1F91D 200D 1F468 1F3FC", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏿‍🤝‍👨🏽", "name": "woman and man holding hands: dark skin tone, medium skin tone", "shortname": ":dark_skin_tone_medium_skin_tone:", "unicode": "1F469 1F3FF 200D 1F91D 200D 1F468 1F3FD", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩🏿‍🤝‍👨🏾", "name": "woman and man holding hands: dark skin tone, medium-dark skin tone", "shortname": ":dark_skin_tone_mediumdark_skin_tone:", "unicode": "1F469 1F3FF 200D 1F91D 200D 1F468 1F3FE", "html": "&#x1F469;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👫🏿", "name": "woman and man holding hands: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F46B 1F3FF", "html": "&#x1F46B;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👬🏻", "name": "men holding hands: light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F46C 1F3FB", "html": "&#x1F46C;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏻‍🤝‍👨🏼", "name": "men holding hands: light skin tone, medium-light skin tone", "shortname": ":light_skin_tone_mediumlight_skin_tone:", "unicode": "1F468 1F3FB 200D 1F91D 200D 1F468 1F3FC", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏻‍🤝‍👨🏽", "name": "men holding hands: light skin tone, medium skin tone", "shortname": ":light_skin_tone_medium_skin_tone:", "unicode": "1F468 1F3FB 200D 1F91D 200D 1F468 1F3FD", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏻‍🤝‍👨🏾", "name": "men holding hands: light skin tone, medium-dark skin tone", "shortname": ":light_skin_tone_mediumdark_skin_tone:", "unicode": "1F468 1F3FB 200D 1F91D 200D 1F468 1F3FE", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏻‍🤝‍👨🏿", "name": "men holding hands: light skin tone, dark skin tone", "shortname": ":light_skin_tone_dark_skin_tone:", "unicode": "1F468 1F3FB 200D 1F91D 200D 1F468 1F3FF", "html": "&#x1F468;&#x1F3FB;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏼‍🤝‍👨🏻", "name": "men holding hands: medium-light skin tone, light skin tone", "shortname": ":mediumlight_skin_tone_light_skin_tone:", "unicode": "1F468 1F3FC 200D 1F91D 200D 1F468 1F3FB", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👬🏼", "name": "men holding hands: medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F46C 1F3FC", "html": "&#x1F46C;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏼‍🤝‍👨🏽", "name": "men holding hands: medium-light skin tone, medium skin tone", "shortname": ":mediumlight_skin_tone_medium_skin_tone:", "unicode": "1F468 1F3FC 200D 1F91D 200D 1F468 1F3FD", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏼‍🤝‍👨🏾", "name": "men holding hands: medium-light skin tone, medium-dark skin tone", "shortname": ":mediumlight_skin_tone_medium-dark_skin_tone:", "unicode": "1F468 1F3FC 200D 1F91D 200D 1F468 1F3FE", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏼‍🤝‍👨🏿", "name": "men holding hands: medium-light skin tone, dark skin tone", "shortname": ":mediumlight_skin_tone_dark_skin_tone:", "unicode": "1F468 1F3FC 200D 1F91D 200D 1F468 1F3FF", "html": "&#x1F468;&#x1F3FC;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏽‍🤝‍👨🏻", "name": "men holding hands: medium skin tone, light skin tone", "shortname": ":medium_skin_tone_light_skin_tone:", "unicode": "1F468 1F3FD 200D 1F91D 200D 1F468 1F3FB", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏽‍🤝‍👨🏼", "name": "men holding hands: medium skin tone, medium-light skin tone", "shortname": ":medium_skin_tone_mediumlight_skin_tone:", "unicode": "1F468 1F3FD 200D 1F91D 200D 1F468 1F3FC", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👬🏽", "name": "men holding hands: medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F46C 1F3FD", "html": "&#x1F46C;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏽‍🤝‍👨🏾", "name": "men holding hands: medium skin tone, medium-dark skin tone", "shortname": ":medium_skin_tone_mediumdark_skin_tone:", "unicode": "1F468 1F3FD 200D 1F91D 200D 1F468 1F3FE", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏽‍🤝‍👨🏿", "name": "men holding hands: medium skin tone, dark skin tone", "shortname": ":medium_skin_tone_dark_skin_tone:", "unicode": "1F468 1F3FD 200D 1F91D 200D 1F468 1F3FF", "html": "&#x1F468;&#x1F3FD;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏾‍🤝‍👨🏻", "name": "men holding hands: medium-dark skin tone, light skin tone", "shortname": ":mediumdark_skin_tone_light_skin_tone:", "unicode": "1F468 1F3FE 200D 1F91D 200D 1F468 1F3FB", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏾‍🤝‍👨🏼", "name": "men holding hands: medium-dark skin tone, medium-light skin tone", "shortname": ":mediumdark_skin_tone_medium-light_skin_tone:", "unicode": "1F468 1F3FE 200D 1F91D 200D 1F468 1F3FC", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏾‍🤝‍👨🏽", "name": "men holding hands: medium-dark skin tone, medium skin tone", "shortname": ":mediumdark_skin_tone_medium_skin_tone:", "unicode": "1F468 1F3FE 200D 1F91D 200D 1F468 1F3FD", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👬🏾", "name": "men holding hands: medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F46C 1F3FE", "html": "&#x1F46C;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏾‍🤝‍👨🏿", "name": "men holding hands: medium-dark skin tone, dark skin tone", "shortname": ":mediumdark_skin_tone_dark_skin_tone:", "unicode": "1F468 1F3FE 200D 1F91D 200D 1F468 1F3FF", "html": "&#x1F468;&#x1F3FE;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏿‍🤝‍👨🏻", "name": "men holding hands: dark skin tone, light skin tone", "shortname": ":dark_skin_tone_light_skin_tone:", "unicode": "1F468 1F3FF 200D 1F91D 200D 1F468 1F3FB", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FB;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏿‍🤝‍👨🏼", "name": "men holding hands: dark skin tone, medium-light skin tone", "shortname": ":dark_skin_tone_mediumlight_skin_tone:", "unicode": "1F468 1F3FF 200D 1F91D 200D 1F468 1F3FC", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FC;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏿‍🤝‍👨🏽", "name": "men holding hands: dark skin tone, medium skin tone", "shortname": ":dark_skin_tone_medium_skin_tone:", "unicode": "1F468 1F3FF 200D 1F91D 200D 1F468 1F3FD", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FD;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨🏿‍🤝‍👨🏾", "name": "men holding hands: dark skin tone, medium-dark skin tone", "shortname": ":dark_skin_tone_mediumdark_skin_tone:", "unicode": "1F468 1F3FF 200D 1F91D 200D 1F468 1F3FE", "html": "&#x1F468;&#x1F3FF;&#x200D;&#x1F91D;&#x200D;&#x1F468;&#x1F3FE;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👬🏿", "name": "men holding hands: dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F46C 1F3FF", "html": "&#x1F46C;&#x1F3FF;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍❤️‍💋‍👨", "name": "kiss: woman, man", "shortname": ":woman_man:", "unicode": "1F469 200D 2764 FE0F 200D 1F48B 200D 1F468", "html": "&#x1F469;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F48B;&#x200D;&#x1F468;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍❤‍💋‍👨", "name": "kiss: woman, man", "shortname": ":woman_man:", "unicode": "1F469 200D 2764 200D 1F48B 200D 1F468", "html": "&#x1F469;&#x200D;&#x2764;&#x200D;&#x1F48B;&#x200D;&#x1F468;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍❤‍💋‍👨", "name": "kiss: man, man", "shortname": ":man_man:", "unicode": "1F468 200D 2764 200D 1F48B 200D 1F468", "html": "&#x1F468;&#x200D;&#x2764;&#x200D;&#x1F48B;&#x200D;&#x1F468;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍❤‍💋‍👩", "name": "kiss: woman, woman", "shortname": ":woman_woman:", "unicode": "1F469 200D 2764 200D 1F48B 200D 1F469", "html": "&#x1F469;&#x200D;&#x2764;&#x200D;&#x1F48B;&#x200D;&#x1F469;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍❤️‍👨", "name": "couple with heart: woman, man", "shortname": ":woman_man:", "unicode": "1F469 200D 2764 FE0F 200D 1F468", "html": "&#x1F469;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F468;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍❤‍👨", "name": "couple with heart: woman, man", "shortname": ":woman_man:", "unicode": "1F469 200D 2764 200D 1F468", "html": "&#x1F469;&#x200D;&#x2764;&#x200D;&#x1F468;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍❤‍👨", "name": "couple with heart: man, man", "shortname": ":man_man:", "unicode": "1F468 200D 2764 200D 1F468", "html": "&#x1F468;&#x200D;&#x2764;&#x200D;&#x1F468;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👩‍❤‍👩", "name": "couple with heart: woman, woman", "shortname": ":woman_woman:", "unicode": "1F469 200D 2764 200D 1F469", "html": "&#x1F469;&#x200D;&#x2764;&#x200D;&#x1F469;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "👨‍👩‍👦", "name": "family: man, woman, boy", "shortname": ":man_woman_boy:", "unicode": "1F468 200D 1F469 200D 1F466", "html": "&#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F466;", "category": "People & Body (family)", "order": ""},
+		{"emoji": "🗣️", "name": "speaking head", "shortname": ":speaking_head:", "unicode": "1F5E3 FE0F", "html": "&#x1F5E3;&#xFE0F;", "category": "People & Body (person-symbol)", "order": ""},
+		{"emoji": "🏻", "name": "light skin tone", "shortname": ":light_skin_tone:", "unicode": "1F3FB", "html": "&#x1F3FB;", "category": "Component (skin-tone)", "order": ""},
+		{"emoji": "🏼", "name": "medium-light skin tone", "shortname": ":mediumlight_skin_tone:", "unicode": "1F3FC", "html": "&#x1F3FC;", "category": "Component (skin-tone)", "order": ""},
+		{"emoji": "🏽", "name": "medium skin tone", "shortname": ":medium_skin_tone:", "unicode": "1F3FD", "html": "&#x1F3FD;", "category": "Component (skin-tone)", "order": ""},
+		{"emoji": "🏾", "name": "medium-dark skin tone", "shortname": ":mediumdark_skin_tone:", "unicode": "1F3FE", "html": "&#x1F3FE;", "category": "Component (skin-tone)", "order": ""},
+		{"emoji": "🏿", "name": "dark skin tone", "shortname": ":dark_skin_tone:", "unicode": "1F3FF", "html": "&#x1F3FF;", "category": "Component (skin-tone)", "order": ""},
+		{"emoji": "🦰", "name": "red hair", "shortname": ":red_hair:", "unicode": "1F9B0", "html": "&#x1F9B0;", "category": "Component (hair-style)", "order": ""},
+		{"emoji": "🦱", "name": "curly hair", "shortname": ":curly_hair:", "unicode": "1F9B1", "html": "&#x1F9B1;", "category": "Component (hair-style)", "order": ""},
+		{"emoji": "🦳", "name": "white hair", "shortname": ":white_hair:", "unicode": "1F9B3", "html": "&#x1F9B3;", "category": "Component (hair-style)", "order": ""},
+		{"emoji": "🦲", "name": "bald", "shortname": ":bald:", "unicode": "1F9B2", "html": "&#x1F9B2;", "category": "Component (hair-style)", "order": ""},
+		{"emoji": "🦍", "name": "gorilla", "shortname": ":gorilla:", "unicode": "1F98D", "html": "&#x1F98D;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦧", "name": "orangutan", "shortname": ":orangutan:", "unicode": "1F9A7", "html": "&#x1F9A7;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦮", "name": "guide dog", "shortname": ":guide_dog:", "unicode": "1F9AE", "html": "&#x1F9AE;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🐕‍🦺", "name": "service dog", "shortname": ":service_dog:", "unicode": "1F415 200D 1F9BA", "html": "&#x1F415;&#x200D;&#x1F9BA;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦊", "name": "fox", "shortname": ":fox:", "unicode": "1F98A", "html": "&#x1F98A;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦝", "name": "raccoon", "shortname": ":raccoon:", "unicode": "1F99D", "html": "&#x1F99D;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦓", "name": "zebra", "shortname": ":zebra:", "unicode": "1F993", "html": "&#x1F993;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦌", "name": "deer", "shortname": ":deer:", "unicode": "1F98C", "html": "&#x1F98C;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦙", "name": "llama", "shortname": ":llama:", "unicode": "1F999", "html": "&#x1F999;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦒", "name": "giraffe", "shortname": ":giraffe:", "unicode": "1F992", "html": "&#x1F992;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦏", "name": "rhinoceros", "shortname": ":rhinoceros:", "unicode": "1F98F", "html": "&#x1F98F;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦛", "name": "hippopotamus", "shortname": ":hippopotamus:", "unicode": "1F99B", "html": "&#x1F99B;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🐿️", "name": "chipmunk", "shortname": ":chipmunk:", "unicode": "1F43F FE0F", "html": "&#x1F43F;&#xFE0F;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦔", "name": "hedgehog", "shortname": ":hedgehog:", "unicode": "1F994", "html": "&#x1F994;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦇", "name": "bat", "shortname": ":bat:", "unicode": "1F987", "html": "&#x1F987;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦥", "name": "sloth", "shortname": ":sloth:", "unicode": "1F9A5", "html": "&#x1F9A5;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦦", "name": "otter", "shortname": ":otter:", "unicode": "1F9A6", "html": "&#x1F9A6;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦨", "name": "skunk", "shortname": ":skunk:", "unicode": "1F9A8", "html": "&#x1F9A8;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦘", "name": "kangaroo", "shortname": ":kangaroo:", "unicode": "1F998", "html": "&#x1F998;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🦡", "name": "badger", "shortname": ":badger:", "unicode": "1F9A1", "html": "&#x1F9A1;", "category": "Animals & Nature (animal-mammal)", "order": ""},
+		{"emoji": "🕊️", "name": "dove", "shortname": ":dove:", "unicode": "1F54A FE0F", "html": "&#x1F54A;&#xFE0F;", "category": "Animals & Nature (animal-bird)", "order": ""},
+		{"emoji": "🦅", "name": "eagle", "shortname": ":eagle:", "unicode": "1F985", "html": "&#x1F985;", "category": "Animals & Nature (animal-bird)", "order": ""},
+		{"emoji": "🦆", "name": "duck", "shortname": ":duck:", "unicode": "1F986", "html": "&#x1F986;", "category": "Animals & Nature (animal-bird)", "order": ""},
+		{"emoji": "🦢", "name": "swan", "shortname": ":swan:", "unicode": "1F9A2", "html": "&#x1F9A2;", "category": "Animals & Nature (animal-bird)", "order": ""},
+		{"emoji": "🦉", "name": "owl", "shortname": ":owl:", "unicode": "1F989", "html": "&#x1F989;", "category": "Animals & Nature (animal-bird)", "order": ""},
+		{"emoji": "🦩", "name": "flamingo", "shortname": ":flamingo:", "unicode": "1F9A9", "html": "&#x1F9A9;", "category": "Animals & Nature (animal-bird)", "order": ""},
+		{"emoji": "🦚", "name": "peacock", "shortname": ":peacock:", "unicode": "1F99A", "html": "&#x1F99A;", "category": "Animals & Nature (animal-bird)", "order": ""},
+		{"emoji": "🦜", "name": "parrot", "shortname": ":parrot:", "unicode": "1F99C", "html": "&#x1F99C;", "category": "Animals & Nature (animal-bird)", "order": ""},
+		{"emoji": "🦎", "name": "lizard", "shortname": ":lizard:", "unicode": "1F98E", "html": "&#x1F98E;", "category": "Animals & Nature (animal-reptile)", "order": ""},
+		{"emoji": "🦕", "name": "sauropod", "shortname": ":sauropod:", "unicode": "1F995", "html": "&#x1F995;", "category": "Animals & Nature (animal-reptile)", "order": ""},
+		{"emoji": "🦖", "name": "T-Rex", "shortname": ":TRex:", "unicode": "1F996", "html": "&#x1F996;", "category": "Animals & Nature (animal-reptile)", "order": ""},
+		{"emoji": "🦈", "name": "shark", "shortname": ":shark:", "unicode": "1F988", "html": "&#x1F988;", "category": "Animals & Nature (animal-marine)", "order": ""},
+		{"emoji": "🦋", "name": "butterfly", "shortname": ":butterfly:", "unicode": "1F98B", "html": "&#x1F98B;", "category": "Animals & Nature (animal-bug)", "order": ""},
+		{"emoji": "🦗", "name": "cricket", "shortname": ":cricket:", "unicode": "1F997", "html": "&#x1F997;", "category": "Animals & Nature (animal-bug)", "order": ""},
+		{"emoji": "🕷️", "name": "spider", "shortname": ":spider:", "unicode": "1F577 FE0F", "html": "&#x1F577;&#xFE0F;", "category": "Animals & Nature (animal-bug)", "order": ""},
+		{"emoji": "🕸️", "name": "spider web", "shortname": ":spider_web:", "unicode": "1F578 FE0F", "html": "&#x1F578;&#xFE0F;", "category": "Animals & Nature (animal-bug)", "order": ""},
+		{"emoji": "🦟", "name": "mosquito", "shortname": ":mosquito:", "unicode": "1F99F", "html": "&#x1F99F;", "category": "Animals & Nature (animal-bug)", "order": ""},
+		{"emoji": "🦠", "name": "microbe", "shortname": ":microbe:", "unicode": "1F9A0", "html": "&#x1F9A0;", "category": "Animals & Nature (animal-bug)", "order": ""},
+		{"emoji": "🏵️", "name": "rosette", "shortname": ":rosette:", "unicode": "1F3F5 FE0F", "html": "&#x1F3F5;&#xFE0F;", "category": "Animals & Nature (plant-flower)", "order": ""},
+		{"emoji": "🥀", "name": "wilted flower", "shortname": ":wilted_flower:", "unicode": "1F940", "html": "&#x1F940;", "category": "Animals & Nature (plant-flower)", "order": ""},
+		{"emoji": "☘️", "name": "shamrock", "shortname": ":shamrock:", "unicode": "2618 FE0F", "html": "&#x2618;&#xFE0F;", "category": "Animals & Nature (plant-other)", "order": ""},
+		{"emoji": "🥭", "name": "mango", "shortname": ":mango:", "unicode": "1F96D", "html": "&#x1F96D;", "category": "Food & Drink (food-fruit)", "order": ""},
+		{"emoji": "🥝", "name": "kiwi fruit", "shortname": ":kiwi_fruit:", "unicode": "1F95D", "html": "&#x1F95D;", "category": "Food & Drink (food-fruit)", "order": ""},
+		{"emoji": "🥥", "name": "coconut", "shortname": ":coconut:", "unicode": "1F965", "html": "&#x1F965;", "category": "Food & Drink (food-fruit)", "order": ""},
+		{"emoji": "🥑", "name": "avocado", "shortname": ":avocado:", "unicode": "1F951", "html": "&#x1F951;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🥔", "name": "potato", "shortname": ":potato:", "unicode": "1F954", "html": "&#x1F954;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🥕", "name": "carrot", "shortname": ":carrot:", "unicode": "1F955", "html": "&#x1F955;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🌶️", "name": "hot pepper", "shortname": ":hot_pepper:", "unicode": "1F336 FE0F", "html": "&#x1F336;&#xFE0F;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🥒", "name": "cucumber", "shortname": ":cucumber:", "unicode": "1F952", "html": "&#x1F952;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🥬", "name": "leafy green", "shortname": ":leafy_green:", "unicode": "1F96C", "html": "&#x1F96C;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🥦", "name": "broccoli", "shortname": ":broccoli:", "unicode": "1F966", "html": "&#x1F966;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🧄", "name": "garlic", "shortname": ":garlic:", "unicode": "1F9C4", "html": "&#x1F9C4;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🧅", "name": "onion", "shortname": ":onion:", "unicode": "1F9C5", "html": "&#x1F9C5;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🥜", "name": "peanuts", "shortname": ":peanuts:", "unicode": "1F95C", "html": "&#x1F95C;", "category": "Food & Drink (food-vegetable)", "order": ""},
+		{"emoji": "🥐", "name": "croissant", "shortname": ":croissant:", "unicode": "1F950", "html": "&#x1F950;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥖", "name": "baguette bread", "shortname": ":baguette_bread:", "unicode": "1F956", "html": "&#x1F956;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥨", "name": "pretzel", "shortname": ":pretzel:", "unicode": "1F968", "html": "&#x1F968;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥯", "name": "bagel", "shortname": ":bagel:", "unicode": "1F96F", "html": "&#x1F96F;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥞", "name": "pancakes", "shortname": ":pancakes:", "unicode": "1F95E", "html": "&#x1F95E;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🧇", "name": "waffle", "shortname": ":waffle:", "unicode": "1F9C7", "html": "&#x1F9C7;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥩", "name": "cut of meat", "shortname": ":cut_of_meat:", "unicode": "1F969", "html": "&#x1F969;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥓", "name": "bacon", "shortname": ":bacon:", "unicode": "1F953", "html": "&#x1F953;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥪", "name": "sandwich", "shortname": ":sandwich:", "unicode": "1F96A", "html": "&#x1F96A;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥙", "name": "stuffed flatbread", "shortname": ":stuffed_flatbread:", "unicode": "1F959", "html": "&#x1F959;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🧆", "name": "falafel", "shortname": ":falafel:", "unicode": "1F9C6", "html": "&#x1F9C6;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥘", "name": "shallow pan of food", "shortname": ":shallow_pan_of_food:", "unicode": "1F958", "html": "&#x1F958;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥣", "name": "bowl with spoon", "shortname": ":bowl_with_spoon:", "unicode": "1F963", "html": "&#x1F963;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥗", "name": "green salad", "shortname": ":green_salad:", "unicode": "1F957", "html": "&#x1F957;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🧈", "name": "butter", "shortname": ":butter:", "unicode": "1F9C8", "html": "&#x1F9C8;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🧂", "name": "salt", "shortname": ":salt:", "unicode": "1F9C2", "html": "&#x1F9C2;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥫", "name": "canned food", "shortname": ":canned_food:", "unicode": "1F96B", "html": "&#x1F96B;", "category": "Food & Drink (food-prepared)", "order": ""},
+		{"emoji": "🥮", "name": "moon cake", "shortname": ":moon_cake:", "unicode": "1F96E", "html": "&#x1F96E;", "category": "Food & Drink (food-asian)", "order": ""},
+		{"emoji": "🥟", "name": "dumpling", "shortname": ":dumpling:", "unicode": "1F95F", "html": "&#x1F95F;", "category": "Food & Drink (food-asian)", "order": ""},
+		{"emoji": "🥠", "name": "fortune cookie", "shortname": ":fortune_cookie:", "unicode": "1F960", "html": "&#x1F960;", "category": "Food & Drink (food-asian)", "order": ""},
+		{"emoji": "🥡", "name": "takeout box", "shortname": ":takeout_box:", "unicode": "1F961", "html": "&#x1F961;", "category": "Food & Drink (food-asian)", "order": ""},
+		{"emoji": "🦞", "name": "lobster", "shortname": ":lobster:", "unicode": "1F99E", "html": "&#x1F99E;", "category": "Food & Drink (food-marine)", "order": ""},
+		{"emoji": "🦐", "name": "shrimp", "shortname": ":shrimp:", "unicode": "1F990", "html": "&#x1F990;", "category": "Food & Drink (food-marine)", "order": ""},
+		{"emoji": "🦑", "name": "squid", "shortname": ":squid:", "unicode": "1F991", "html": "&#x1F991;", "category": "Food & Drink (food-marine)", "order": ""},
+		{"emoji": "🦪", "name": "oyster", "shortname": ":oyster:", "unicode": "1F9AA", "html": "&#x1F9AA;", "category": "Food & Drink (food-marine)", "order": ""},
+		{"emoji": "🧁", "name": "cupcake", "shortname": ":cupcake:", "unicode": "1F9C1", "html": "&#x1F9C1;", "category": "Food & Drink (food-sweet)", "order": ""},
+		{"emoji": "🥧", "name": "pie", "shortname": ":pie:", "unicode": "1F967", "html": "&#x1F967;", "category": "Food & Drink (food-sweet)", "order": ""},
+		{"emoji": "🥛", "name": "glass of milk", "shortname": ":glass_of_milk:", "unicode": "1F95B", "html": "&#x1F95B;", "category": "Food & Drink (drink)", "order": ""},
+		{"emoji": "🥂", "name": "clinking glasses", "shortname": ":clinking_glasses:", "unicode": "1F942", "html": "&#x1F942;", "category": "Food & Drink (drink)", "order": ""},
+		{"emoji": "🥃", "name": "tumbler glass", "shortname": ":tumbler_glass:", "unicode": "1F943", "html": "&#x1F943;", "category": "Food & Drink (drink)", "order": ""},
+		{"emoji": "🥤", "name": "cup with straw", "shortname": ":cup_with_straw:", "unicode": "1F964", "html": "&#x1F964;", "category": "Food & Drink (drink)", "order": ""},
+		{"emoji": "🧃", "name": "beverage box", "shortname": ":beverage_box:", "unicode": "1F9C3", "html": "&#x1F9C3;", "category": "Food & Drink (drink)", "order": ""},
+		{"emoji": "🧉", "name": "mate", "shortname": ":mate:", "unicode": "1F9C9", "html": "&#x1F9C9;", "category": "Food & Drink (drink)", "order": ""},
+		{"emoji": "🧊", "name": "ice", "shortname": ":ice:", "unicode": "1F9CA", "html": "&#x1F9CA;", "category": "Food & Drink (drink)", "order": ""},
+		{"emoji": "🥢", "name": "chopsticks", "shortname": ":chopsticks:", "unicode": "1F962", "html": "&#x1F962;", "category": "Food & Drink (dishware)", "order": ""},
+		{"emoji": "🍽️", "name": "fork and knife with plate", "shortname": ":fork_and_knife_with_plate:", "unicode": "1F37D FE0F", "html": "&#x1F37D;&#xFE0F;", "category": "Food & Drink (dishware)", "order": ""},
+		{"emoji": "🥄", "name": "spoon", "shortname": ":spoon:", "unicode": "1F944", "html": "&#x1F944;", "category": "Food & Drink (dishware)", "order": ""},
+		{"emoji": "🗺️", "name": "world map", "shortname": ":world_map:", "unicode": "1F5FA FE0F", "html": "&#x1F5FA;&#xFE0F;", "category": "Travel & Places (place-map)", "order": ""},
+		{"emoji": "🧭", "name": "compass", "shortname": ":compass:", "unicode": "1F9ED", "html": "&#x1F9ED;", "category": "Travel & Places (place-map)", "order": ""},
+		{"emoji": "🏔️", "name": "snow-capped mountain", "shortname": ":snowcapped_mountain:", "unicode": "1F3D4 FE0F", "html": "&#x1F3D4;&#xFE0F;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "⛰️", "name": "mountain", "shortname": ":mountain:", "unicode": "26F0 FE0F", "html": "&#x26F0;&#xFE0F;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "🏕️", "name": "camping", "shortname": ":camping:", "unicode": "1F3D5 FE0F", "html": "&#x1F3D5;&#xFE0F;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "🏖️", "name": "beach with umbrella", "shortname": ":beach_with_umbrella:", "unicode": "1F3D6 FE0F", "html": "&#x1F3D6;&#xFE0F;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "🏜️", "name": "desert", "shortname": ":desert:", "unicode": "1F3DC FE0F", "html": "&#x1F3DC;&#xFE0F;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "🏝️", "name": "desert island", "shortname": ":desert_island:", "unicode": "1F3DD FE0F", "html": "&#x1F3DD;&#xFE0F;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "🏞️", "name": "national park", "shortname": ":national_park:", "unicode": "1F3DE FE0F", "html": "&#x1F3DE;&#xFE0F;", "category": "Travel & Places (place-geographic)", "order": ""},
+		{"emoji": "🏟️", "name": "stadium", "shortname": ":stadium:", "unicode": "1F3DF FE0F", "html": "&#x1F3DF;&#xFE0F;", "category": "Travel & Places (place-building)", "order": ""},
+		{"emoji": "🏛️", "name": "classical building", "shortname": ":classical_building:", "unicode": "1F3DB FE0F", "html": "&#x1F3DB;&#xFE0F;", "category": "Travel & Places (place-building)", "order": ""},
+		{"emoji": "🏗️", "name": "building construction", "shortname": ":building_construction:", "unicode": "1F3D7 FE0F", "html": "&#x1F3D7;&#xFE0F;", "category": "Travel & Places (place-building)", "order": ""},
+		{"emoji": "🧱", "name": "brick", "shortname": ":brick:", "unicode": "1F9F1", "html": "&#x1F9F1;", "category": "Travel & Places (place-building)", "order": ""},
+		{"emoji": "🏘️", "name": "houses", "shortname": ":houses:", "unicode": "1F3D8 FE0F", "html": "&#x1F3D8;&#xFE0F;", "category": "Travel & Places (place-building)", "order": ""},
+		{"emoji": "🏚️", "name": "derelict house", "shortname": ":derelict_house:", "unicode": "1F3DA FE0F", "html": "&#x1F3DA;&#xFE0F;", "category": "Travel & Places (place-building)", "order": ""},
+		{"emoji": "🛕", "name": "hindu temple", "shortname": ":hindu_temple:", "unicode": "1F6D5", "html": "&#x1F6D5;", "category": "Travel & Places (place-religious)", "order": ""},
+		{"emoji": "⛩️", "name": "shinto shrine", "shortname": ":shinto_shrine:", "unicode": "26E9 FE0F", "html": "&#x26E9;&#xFE0F;", "category": "Travel & Places (place-religious)", "order": ""},
+		{"emoji": "🏙️", "name": "cityscape", "shortname": ":cityscape:", "unicode": "1F3D9 FE0F", "html": "&#x1F3D9;&#xFE0F;", "category": "Travel & Places (place-other)", "order": ""},
+		{"emoji": "♨", "name": "hot springs", "shortname": ":hot_springs:", "unicode": "2668", "html": "&#x2668;", "category": "Travel & Places (place-other)", "order": ""},
+		{"emoji": "🏎️", "name": "racing car", "shortname": ":racing_car:", "unicode": "1F3CE FE0F", "html": "&#x1F3CE;&#xFE0F;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🏍️", "name": "motorcycle", "shortname": ":motorcycle:", "unicode": "1F3CD FE0F", "html": "&#x1F3CD;&#xFE0F;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🛵", "name": "motor scooter", "shortname": ":motor_scooter:", "unicode": "1F6F5", "html": "&#x1F6F5;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🦽", "name": "manual wheelchair", "shortname": ":manual_wheelchair:", "unicode": "1F9BD", "html": "&#x1F9BD;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🦼", "name": "motorized wheelchair", "shortname": ":motorized_wheelchair:", "unicode": "1F9BC", "html": "&#x1F9BC;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🛺", "name": "auto rickshaw", "shortname": ":auto_rickshaw:", "unicode": "1F6FA", "html": "&#x1F6FA;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🛴", "name": "kick scooter", "shortname": ":kick_scooter:", "unicode": "1F6F4", "html": "&#x1F6F4;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🛹", "name": "skateboard", "shortname": ":skateboard:", "unicode": "1F6F9", "html": "&#x1F6F9;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🛣️", "name": "motorway", "shortname": ":motorway:", "unicode": "1F6E3 FE0F", "html": "&#x1F6E3;&#xFE0F;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🛤️", "name": "railway track", "shortname": ":railway_track:", "unicode": "1F6E4 FE0F", "html": "&#x1F6E4;&#xFE0F;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🛢️", "name": "oil drum", "shortname": ":oil_drum:", "unicode": "1F6E2 FE0F", "html": "&#x1F6E2;&#xFE0F;", "category": "Travel & Places (transport-ground)", "order": ""},
+		{"emoji": "🛶", "name": "canoe", "shortname": ":canoe:", "unicode": "1F6F6", "html": "&#x1F6F6;", "category": "Travel & Places (transport-water)", "order": ""},
+		{"emoji": "🛳️", "name": "passenger ship", "shortname": ":passenger_ship:", "unicode": "1F6F3 FE0F", "html": "&#x1F6F3;&#xFE0F;", "category": "Travel & Places (transport-water)", "order": ""},
+		{"emoji": "⛴️", "name": "ferry", "shortname": ":ferry:", "unicode": "26F4 FE0F", "html": "&#x26F4;&#xFE0F;", "category": "Travel & Places (transport-water)", "order": ""},
+		{"emoji": "🛥️", "name": "motor boat", "shortname": ":motor_boat:", "unicode": "1F6E5 FE0F", "html": "&#x1F6E5;&#xFE0F;", "category": "Travel & Places (transport-water)", "order": ""},
+		{"emoji": "✈", "name": "airplane", "shortname": ":airplane:", "unicode": "2708", "html": "&#x2708;", "category": "Travel & Places (transport-air)", "order": ""},
+		{"emoji": "🛩️", "name": "small airplane", "shortname": ":small_airplane:", "unicode": "1F6E9 FE0F", "html": "&#x1F6E9;&#xFE0F;", "category": "Travel & Places (transport-air)", "order": ""},
+		{"emoji": "🪂", "name": "parachute", "shortname": ":parachute:", "unicode": "1FA82", "html": "&#x1FA82;", "category": "Travel & Places (transport-air)", "order": ""},
+		{"emoji": "🛰️", "name": "satellite", "shortname": ":satellite:", "unicode": "1F6F0 FE0F", "html": "&#x1F6F0;&#xFE0F;", "category": "Travel & Places (transport-air)", "order": ""},
+		{"emoji": "🛸", "name": "flying saucer", "shortname": ":flying_saucer:", "unicode": "1F6F8", "html": "&#x1F6F8;", "category": "Travel & Places (transport-air)", "order": ""},
+		{"emoji": "🛎️", "name": "bellhop bell", "shortname": ":bellhop_bell:", "unicode": "1F6CE FE0F", "html": "&#x1F6CE;&#xFE0F;", "category": "Travel & Places (hotel)", "order": ""},
+		{"emoji": "🧳", "name": "luggage", "shortname": ":luggage:", "unicode": "1F9F3", "html": "&#x1F9F3;", "category": "Travel & Places (hotel)", "order": ""},
+		{"emoji": "⏱️", "name": "stopwatch", "shortname": ":stopwatch:", "unicode": "23F1 FE0F", "html": "&#x23F1;&#xFE0F;", "category": "Travel & Places (time)", "order": ""},
+		{"emoji": "⏲️", "name": "timer clock", "shortname": ":timer_clock:", "unicode": "23F2 FE0F", "html": "&#x23F2;&#xFE0F;", "category": "Travel & Places (time)", "order": ""},
+		{"emoji": "🕰️", "name": "mantelpiece clock", "shortname": ":mantelpiece_clock:", "unicode": "1F570 FE0F", "html": "&#x1F570;&#xFE0F;", "category": "Travel & Places (time)", "order": ""},
+		{"emoji": "🌡️", "name": "thermometer", "shortname": ":thermometer:", "unicode": "1F321 FE0F", "html": "&#x1F321;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "☀", "name": "sun", "shortname": ":sun:", "unicode": "2600", "html": "&#x2600;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🪐", "name": "ringed planet", "shortname": ":ringed_planet:", "unicode": "1FA90", "html": "&#x1FA90;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "☁️", "name": "cloud", "shortname": ":cloud:", "unicode": "2601 FE0F", "html": "&#x2601;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "⛈️", "name": "cloud with lightning and rain", "shortname": ":cloud_with_lightning_and_rain:", "unicode": "26C8 FE0F", "html": "&#x26C8;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌤️", "name": "sun behind small cloud", "shortname": ":sun_behind_small_cloud:", "unicode": "1F324 FE0F", "html": "&#x1F324;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌥️", "name": "sun behind large cloud", "shortname": ":sun_behind_large_cloud:", "unicode": "1F325 FE0F", "html": "&#x1F325;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌦️", "name": "sun behind rain cloud", "shortname": ":sun_behind_rain_cloud:", "unicode": "1F326 FE0F", "html": "&#x1F326;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌧️", "name": "cloud with rain", "shortname": ":cloud_with_rain:", "unicode": "1F327 FE0F", "html": "&#x1F327;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌨️", "name": "cloud with snow", "shortname": ":cloud_with_snow:", "unicode": "1F328 FE0F", "html": "&#x1F328;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌩️", "name": "cloud with lightning", "shortname": ":cloud_with_lightning:", "unicode": "1F329 FE0F", "html": "&#x1F329;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌪️", "name": "tornado", "shortname": ":tornado:", "unicode": "1F32A FE0F", "html": "&#x1F32A;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌫️", "name": "fog", "shortname": ":fog:", "unicode": "1F32B FE0F", "html": "&#x1F32B;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🌬️", "name": "wind face", "shortname": ":wind_face:", "unicode": "1F32C FE0F", "html": "&#x1F32C;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "☂", "name": "umbrella", "shortname": ":umbrella:", "unicode": "2602", "html": "&#x2602;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "⛱️", "name": "umbrella on ground", "shortname": ":umbrella_on_ground:", "unicode": "26F1 FE0F", "html": "&#x26F1;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "❄", "name": "snowflake", "shortname": ":snowflake:", "unicode": "2744", "html": "&#x2744;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "☃", "name": "snowman", "shortname": ":snowman:", "unicode": "2603", "html": "&#x2603;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "☄️", "name": "comet", "shortname": ":comet:", "unicode": "2604 FE0F", "html": "&#x2604;&#xFE0F;", "category": "Travel & Places (sky & weather)", "order": ""},
+		{"emoji": "🧨", "name": "firecracker", "shortname": ":firecracker:", "unicode": "1F9E8", "html": "&#x1F9E8;", "category": "Activities (event)", "order": ""},
+		{"emoji": "🧧", "name": "red envelope", "shortname": ":red_envelope:", "unicode": "1F9E7", "html": "&#x1F9E7;", "category": "Activities (event)", "order": ""},
+		{"emoji": "🎗️", "name": "reminder ribbon", "shortname": ":reminder_ribbon:", "unicode": "1F397 FE0F", "html": "&#x1F397;&#xFE0F;", "category": "Activities (event)", "order": ""},
+		{"emoji": "🎟️", "name": "admission tickets", "shortname": ":admission_tickets:", "unicode": "1F39F FE0F", "html": "&#x1F39F;&#xFE0F;", "category": "Activities (event)", "order": ""},
+		{"emoji": "🎖️", "name": "military medal", "shortname": ":military_medal:", "unicode": "1F396 FE0F", "html": "&#x1F396;&#xFE0F;", "category": "Activities (award-medal)", "order": ""},
+		{"emoji": "🥇", "name": "1st place medal", "shortname": ":1st_place_medal:", "unicode": "1F947", "html": "&#x1F947;", "category": "Activities (award-medal)", "order": ""},
+		{"emoji": "🥈", "name": "2nd place medal", "shortname": ":2nd_place_medal:", "unicode": "1F948", "html": "&#x1F948;", "category": "Activities (award-medal)", "order": ""},
+		{"emoji": "🥉", "name": "3rd place medal", "shortname": ":3rd_place_medal:", "unicode": "1F949", "html": "&#x1F949;", "category": "Activities (award-medal)", "order": ""},
+		{"emoji": "⚾", "name": "baseball", "shortname": ":baseball:", "unicode": "26BE", "html": "&#x26BE;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🥎", "name": "softball", "shortname": ":softball:", "unicode": "1F94E", "html": "&#x1F94E;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🥏", "name": "flying disc", "shortname": ":flying_disc:", "unicode": "1F94F", "html": "&#x1F94F;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🥍", "name": "lacrosse", "shortname": ":lacrosse:", "unicode": "1F94D", "html": "&#x1F94D;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🥊", "name": "boxing glove", "shortname": ":boxing_glove:", "unicode": "1F94A", "html": "&#x1F94A;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🥋", "name": "martial arts uniform", "shortname": ":martial_arts_uniform:", "unicode": "1F94B", "html": "&#x1F94B;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🥅", "name": "goal net", "shortname": ":goal_net:", "unicode": "1F945", "html": "&#x1F945;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "⛸️", "name": "ice skate", "shortname": ":ice_skate:", "unicode": "26F8 FE0F", "html": "&#x26F8;&#xFE0F;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🤿", "name": "diving mask", "shortname": ":diving_mask:", "unicode": "1F93F", "html": "&#x1F93F;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🛷", "name": "sled", "shortname": ":sled:", "unicode": "1F6F7", "html": "&#x1F6F7;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🥌", "name": "curling stone", "shortname": ":curling_stone:", "unicode": "1F94C", "html": "&#x1F94C;", "category": "Activities (sport)", "order": ""},
+		{"emoji": "🪀", "name": "yo-yo", "shortname": ":yoyo:", "unicode": "1FA80", "html": "&#x1FA80;", "category": "Activities (game)", "order": ""},
+		{"emoji": "🪁", "name": "kite", "shortname": ":kite:", "unicode": "1FA81", "html": "&#x1FA81;", "category": "Activities (game)", "order": ""},
+		{"emoji": "🧿", "name": "nazar amulet", "shortname": ":nazar_amulet:", "unicode": "1F9FF", "html": "&#x1F9FF;", "category": "Activities (game)", "order": ""},
+		{"emoji": "🕹️", "name": "joystick", "shortname": ":joystick:", "unicode": "1F579 FE0F", "html": "&#x1F579;&#xFE0F;", "category": "Activities (game)", "order": ""},
+		{"emoji": "🧩", "name": "puzzle piece", "shortname": ":puzzle_piece:", "unicode": "1F9E9", "html": "&#x1F9E9;", "category": "Activities (game)", "order": ""},
+		{"emoji": "🧸", "name": "teddy bear", "shortname": ":teddy_bear:", "unicode": "1F9F8", "html": "&#x1F9F8;", "category": "Activities (game)", "order": ""},
+		{"emoji": "♟️", "name": "chess pawn", "shortname": ":chess_pawn:", "unicode": "265F FE0F", "html": "&#x265F;&#xFE0F;", "category": "Activities (game)", "order": ""},
+		{"emoji": "♟", "name": "chess pawn", "shortname": ":chess_pawn:", "unicode": "265F", "html": "&#x265F;", "category": "Activities (game)", "order": ""},
+		{"emoji": "🖼️", "name": "framed picture", "shortname": ":framed_picture:", "unicode": "1F5BC FE0F", "html": "&#x1F5BC;&#xFE0F;", "category": "Activities (arts & crafts)", "order": ""},
+		{"emoji": "🧵", "name": "thread", "shortname": ":thread:", "unicode": "1F9F5", "html": "&#x1F9F5;", "category": "Activities (arts & crafts)", "order": ""},
+		{"emoji": "🧶", "name": "yarn", "shortname": ":yarn:", "unicode": "1F9F6", "html": "&#x1F9F6;", "category": "Activities (arts & crafts)", "order": ""},
+		{"emoji": "🕶️", "name": "sunglasses", "shortname": ":sunglasses:", "unicode": "1F576 FE0F", "html": "&#x1F576;&#xFE0F;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🥽", "name": "goggles", "shortname": ":goggles:", "unicode": "1F97D", "html": "&#x1F97D;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🥼", "name": "lab coat", "shortname": ":lab_coat:", "unicode": "1F97C", "html": "&#x1F97C;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🦺", "name": "safety vest", "shortname": ":safety_vest:", "unicode": "1F9BA", "html": "&#x1F9BA;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🧣", "name": "scarf", "shortname": ":scarf:", "unicode": "1F9E3", "html": "&#x1F9E3;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🧤", "name": "gloves", "shortname": ":gloves:", "unicode": "1F9E4", "html": "&#x1F9E4;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🧥", "name": "coat", "shortname": ":coat:", "unicode": "1F9E5", "html": "&#x1F9E5;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🧦", "name": "socks", "shortname": ":socks:", "unicode": "1F9E6", "html": "&#x1F9E6;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🥻", "name": "sari", "shortname": ":sari:", "unicode": "1F97B", "html": "&#x1F97B;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🩱", "name": "one-piece swimsuit", "shortname": ":onepiece_swimsuit:", "unicode": "1FA71", "html": "&#x1FA71;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🩲", "name": "briefs", "shortname": ":briefs:", "unicode": "1FA72", "html": "&#x1FA72;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🩳", "name": "shorts", "shortname": ":shorts:", "unicode": "1FA73", "html": "&#x1FA73;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🛍️", "name": "shopping bags", "shortname": ":shopping_bags:", "unicode": "1F6CD FE0F", "html": "&#x1F6CD;&#xFE0F;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🥾", "name": "hiking boot", "shortname": ":hiking_boot:", "unicode": "1F97E", "html": "&#x1F97E;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🥿", "name": "flat shoe", "shortname": ":flat_shoe:", "unicode": "1F97F", "html": "&#x1F97F;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🩰", "name": "ballet shoes", "shortname": ":ballet_shoes:", "unicode": "1FA70", "html": "&#x1FA70;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🧢", "name": "billed cap", "shortname": ":billed_cap:", "unicode": "1F9E2", "html": "&#x1F9E2;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "⛑️", "name": "rescue worker’s helmet", "shortname": ":rescue_worker’s_helmet:", "unicode": "26D1 FE0F", "html": "&#x26D1;&#xFE0F;", "category": "Objects (clothing)", "order": ""},
+		{"emoji": "🎙️", "name": "studio microphone", "shortname": ":studio_microphone:", "unicode": "1F399 FE0F", "html": "&#x1F399;&#xFE0F;", "category": "Objects (music)", "order": ""},
+		{"emoji": "🎚️", "name": "level slider", "shortname": ":level_slider:", "unicode": "1F39A FE0F", "html": "&#x1F39A;&#xFE0F;", "category": "Objects (music)", "order": ""},
+		{"emoji": "🎛️", "name": "control knobs", "shortname": ":control_knobs:", "unicode": "1F39B FE0F", "html": "&#x1F39B;&#xFE0F;", "category": "Objects (music)", "order": ""},
+		{"emoji": "🪕", "name": "banjo", "shortname": ":banjo:", "unicode": "1FA95", "html": "&#x1FA95;", "category": "Objects (musical-instrument)", "order": ""},
+		{"emoji": "☎", "name": "telephone", "shortname": ":telephone:", "unicode": "260E", "html": "&#x260E;", "category": "Objects (phone)", "order": ""},
+		{"emoji": "🖥️", "name": "desktop computer", "shortname": ":desktop_computer:", "unicode": "1F5A5 FE0F", "html": "&#x1F5A5;&#xFE0F;", "category": "Objects (computer)", "order": ""},
+		{"emoji": "🖨️", "name": "printer", "shortname": ":printer:", "unicode": "1F5A8 FE0F", "html": "&#x1F5A8;&#xFE0F;", "category": "Objects (computer)", "order": ""},
+		{"emoji": "⌨️", "name": "keyboard", "shortname": ":keyboard:", "unicode": "2328 FE0F", "html": "&#x2328;&#xFE0F;", "category": "Objects (computer)", "order": ""},
+		{"emoji": "🖱️", "name": "computer mouse", "shortname": ":computer_mouse:", "unicode": "1F5B1 FE0F", "html": "&#x1F5B1;&#xFE0F;", "category": "Objects (computer)", "order": ""},
+		{"emoji": "🖲️", "name": "trackball", "shortname": ":trackball:", "unicode": "1F5B2 FE0F", "html": "&#x1F5B2;&#xFE0F;", "category": "Objects (computer)", "order": ""},
+		{"emoji": "🧮", "name": "abacus", "shortname": ":abacus:", "unicode": "1F9EE", "html": "&#x1F9EE;", "category": "Objects (computer)", "order": ""},
+		{"emoji": "🎞️", "name": "film frames", "shortname": ":film_frames:", "unicode": "1F39E FE0F", "html": "&#x1F39E;&#xFE0F;", "category": "Objects (light & video)", "order": ""},
+		{"emoji": "📽️", "name": "film projector", "shortname": ":film_projector:", "unicode": "1F4FD FE0F", "html": "&#x1F4FD;&#xFE0F;", "category": "Objects (light & video)", "order": ""},
+		{"emoji": "🕯️", "name": "candle", "shortname": ":candle:", "unicode": "1F56F FE0F", "html": "&#x1F56F;&#xFE0F;", "category": "Objects (light & video)", "order": ""},
+		{"emoji": "🪔", "name": "diya lamp", "shortname": ":diya_lamp:", "unicode": "1FA94", "html": "&#x1FA94;", "category": "Objects (light & video)", "order": ""},
+		{"emoji": "🗞️", "name": "rolled-up newspaper", "shortname": ":rolledup_newspaper:", "unicode": "1F5DE FE0F", "html": "&#x1F5DE;&#xFE0F;", "category": "Objects (book-paper)", "order": ""},
+		{"emoji": "🏷️", "name": "label", "shortname": ":label:", "unicode": "1F3F7 FE0F", "html": "&#x1F3F7;&#xFE0F;", "category": "Objects (book-paper)", "order": ""},
+		{"emoji": "🧾", "name": "receipt", "shortname": ":receipt:", "unicode": "1F9FE", "html": "&#x1F9FE;", "category": "Objects (money)", "order": ""},
+		{"emoji": "✉", "name": "envelope", "shortname": ":envelope:", "unicode": "2709", "html": "&#x2709;", "category": "Objects (mail)", "order": ""},
+		{"emoji": "🗳️", "name": "ballot box with ballot", "shortname": ":ballot_box_with_ballot:", "unicode": "1F5F3 FE0F", "html": "&#x1F5F3;&#xFE0F;", "category": "Objects (mail)", "order": ""},
+		{"emoji": "✏️", "name": "pencil", "shortname": ":pencil:", "unicode": "270F FE0F", "html": "&#x270F;&#xFE0F;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "✒️", "name": "black nib", "shortname": ":black_nib:", "unicode": "2712 FE0F", "html": "&#x2712;&#xFE0F;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "🖋️", "name": "fountain pen", "shortname": ":fountain_pen:", "unicode": "1F58B FE0F", "html": "&#x1F58B;&#xFE0F;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "🖊️", "name": "pen", "shortname": ":pen:", "unicode": "1F58A FE0F", "html": "&#x1F58A;&#xFE0F;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "🖌️", "name": "paintbrush", "shortname": ":paintbrush:", "unicode": "1F58C FE0F", "html": "&#x1F58C;&#xFE0F;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "🖍️", "name": "crayon", "shortname": ":crayon:", "unicode": "1F58D FE0F", "html": "&#x1F58D;&#xFE0F;", "category": "Objects (writing)", "order": ""},
+		{"emoji": "🗂️", "name": "card index dividers", "shortname": ":card_index_dividers:", "unicode": "1F5C2 FE0F", "html": "&#x1F5C2;&#xFE0F;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🗒️", "name": "spiral notepad", "shortname": ":spiral_notepad:", "unicode": "1F5D2 FE0F", "html": "&#x1F5D2;&#xFE0F;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🗓️", "name": "spiral calendar", "shortname": ":spiral_calendar:", "unicode": "1F5D3 FE0F", "html": "&#x1F5D3;&#xFE0F;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🖇️", "name": "linked paperclips", "shortname": ":linked_paperclips:", "unicode": "1F587 FE0F", "html": "&#x1F587;&#xFE0F;", "category": "Objects (office)", "order": ""},
+		{"emoji": "✂", "name": "scissors", "shortname": ":scissors:", "unicode": "2702", "html": "&#x2702;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🗃️", "name": "card file box", "shortname": ":card_file_box:", "unicode": "1F5C3 FE0F", "html": "&#x1F5C3;&#xFE0F;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🗄️", "name": "file cabinet", "shortname": ":file_cabinet:", "unicode": "1F5C4 FE0F", "html": "&#x1F5C4;&#xFE0F;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🗑️", "name": "wastebasket", "shortname": ":wastebasket:", "unicode": "1F5D1 FE0F", "html": "&#x1F5D1;&#xFE0F;", "category": "Objects (office)", "order": ""},
+		{"emoji": "🗝️", "name": "old key", "shortname": ":old_key:", "unicode": "1F5DD FE0F", "html": "&#x1F5DD;&#xFE0F;", "category": "Objects (lock)", "order": ""},
+		{"emoji": "🪓", "name": "axe", "shortname": ":axe:", "unicode": "1FA93", "html": "&#x1FA93;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "⛏️", "name": "pick", "shortname": ":pick:", "unicode": "26CF FE0F", "html": "&#x26CF;&#xFE0F;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "⚒️", "name": "hammer and pick", "shortname": ":hammer_and_pick:", "unicode": "2692 FE0F", "html": "&#x2692;&#xFE0F;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "🛠️", "name": "hammer and wrench", "shortname": ":hammer_and_wrench:", "unicode": "1F6E0 FE0F", "html": "&#x1F6E0;&#xFE0F;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "🗡️", "name": "dagger", "shortname": ":dagger:", "unicode": "1F5E1 FE0F", "html": "&#x1F5E1;&#xFE0F;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "⚔️", "name": "crossed swords", "shortname": ":crossed_swords:", "unicode": "2694 FE0F", "html": "&#x2694;&#xFE0F;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "🛡️", "name": "shield", "shortname": ":shield:", "unicode": "1F6E1 FE0F", "html": "&#x1F6E1;&#xFE0F;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "⚙️", "name": "gear", "shortname": ":gear:", "unicode": "2699 FE0F", "html": "&#x2699;&#xFE0F;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "🗜️", "name": "clamp", "shortname": ":clamp:", "unicode": "1F5DC FE0F", "html": "&#x1F5DC;&#xFE0F;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "⚖️", "name": "balance scale", "shortname": ":balance_scale:", "unicode": "2696 FE0F", "html": "&#x2696;&#xFE0F;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "🦯", "name": "probing cane", "shortname": ":probing_cane:", "unicode": "1F9AF", "html": "&#x1F9AF;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "⛓️", "name": "chains", "shortname": ":chains:", "unicode": "26D3 FE0F", "html": "&#x26D3;&#xFE0F;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "🧰", "name": "toolbox", "shortname": ":toolbox:", "unicode": "1F9F0", "html": "&#x1F9F0;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "🧲", "name": "magnet", "shortname": ":magnet:", "unicode": "1F9F2", "html": "&#x1F9F2;", "category": "Objects (tool)", "order": ""},
+		{"emoji": "⚗️", "name": "alembic", "shortname": ":alembic:", "unicode": "2697 FE0F", "html": "&#x2697;&#xFE0F;", "category": "Objects (science)", "order": ""},
+		{"emoji": "🧪", "name": "test tube", "shortname": ":test_tube:", "unicode": "1F9EA", "html": "&#x1F9EA;", "category": "Objects (science)", "order": ""},
+		{"emoji": "🧫", "name": "petri dish", "shortname": ":petri_dish:", "unicode": "1F9EB", "html": "&#x1F9EB;", "category": "Objects (science)", "order": ""},
+		{"emoji": "🧬", "name": "dna", "shortname": ":dna:", "unicode": "1F9EC", "html": "&#x1F9EC;", "category": "Objects (science)", "order": ""},
+		{"emoji": "🩸", "name": "drop of blood", "shortname": ":drop_of_blood:", "unicode": "1FA78", "html": "&#x1FA78;", "category": "Objects (medical)", "order": ""},
+		{"emoji": "🩹", "name": "adhesive bandage", "shortname": ":adhesive_bandage:", "unicode": "1FA79", "html": "&#x1FA79;", "category": "Objects (medical)", "order": ""},
+		{"emoji": "🩺", "name": "stethoscope", "shortname": ":stethoscope:", "unicode": "1FA7A", "html": "&#x1FA7A;", "category": "Objects (medical)", "order": ""},
+		{"emoji": "🛏️", "name": "bed", "shortname": ":bed:", "unicode": "1F6CF FE0F", "html": "&#x1F6CF;&#xFE0F;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🛋️", "name": "couch and lamp", "shortname": ":couch_and_lamp:", "unicode": "1F6CB FE0F", "html": "&#x1F6CB;&#xFE0F;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🪑", "name": "chair", "shortname": ":chair:", "unicode": "1FA91", "html": "&#x1FA91;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🪒", "name": "razor", "shortname": ":razor:", "unicode": "1FA92", "html": "&#x1FA92;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🧴", "name": "lotion bottle", "shortname": ":lotion_bottle:", "unicode": "1F9F4", "html": "&#x1F9F4;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🧷", "name": "safety pin", "shortname": ":safety_pin:", "unicode": "1F9F7", "html": "&#x1F9F7;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🧹", "name": "broom", "shortname": ":broom:", "unicode": "1F9F9", "html": "&#x1F9F9;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🧺", "name": "basket", "shortname": ":basket:", "unicode": "1F9FA", "html": "&#x1F9FA;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🧻", "name": "roll of paper", "shortname": ":roll_of_paper:", "unicode": "1F9FB", "html": "&#x1F9FB;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🧼", "name": "soap", "shortname": ":soap:", "unicode": "1F9FC", "html": "&#x1F9FC;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🧽", "name": "sponge", "shortname": ":sponge:", "unicode": "1F9FD", "html": "&#x1F9FD;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🧯", "name": "fire extinguisher", "shortname": ":fire_extinguisher:", "unicode": "1F9EF", "html": "&#x1F9EF;", "category": "Objects (household)", "order": ""},
+		{"emoji": "🛒", "name": "shopping cart", "shortname": ":shopping_cart:", "unicode": "1F6D2", "html": "&#x1F6D2;", "category": "Objects (household)", "order": ""},
+		{"emoji": "⚰️", "name": "coffin", "shortname": ":coffin:", "unicode": "26B0 FE0F", "html": "&#x26B0;&#xFE0F;", "category": "Objects (other-object)", "order": ""},
+		{"emoji": "⚱️", "name": "funeral urn", "shortname": ":funeral_urn:", "unicode": "26B1 FE0F", "html": "&#x26B1;&#xFE0F;", "category": "Objects (other-object)", "order": ""},
+		{"emoji": "⚠", "name": "warning", "shortname": ":warning:", "unicode": "26A0", "html": "&#x26A0;", "category": "Symbols (warning)", "order": ""},
+		{"emoji": "☢️", "name": "radioactive", "shortname": ":radioactive:", "unicode": "2622 FE0F", "html": "&#x2622;&#xFE0F;", "category": "Symbols (warning)", "order": ""},
+		{"emoji": "☣️", "name": "biohazard", "shortname": ":biohazard:", "unicode": "2623 FE0F", "html": "&#x2623;&#xFE0F;", "category": "Symbols (warning)", "order": ""},
+		{"emoji": "⬆", "name": "up arrow", "shortname": ":up_arrow:", "unicode": "2B06", "html": "&#x2B06;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "↗", "name": "up-right arrow", "shortname": ":upright_arrow:", "unicode": "2197", "html": "&#x2197;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "➡️", "name": "right arrow", "shortname": ":right_arrow:", "unicode": "27A1 FE0F", "html": "&#x27A1;&#xFE0F;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "↘", "name": "down-right arrow", "shortname": ":downright_arrow:", "unicode": "2198", "html": "&#x2198;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "⬇", "name": "down arrow", "shortname": ":down_arrow:", "unicode": "2B07", "html": "&#x2B07;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "↙", "name": "down-left arrow", "shortname": ":downleft_arrow:", "unicode": "2199", "html": "&#x2199;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "⬅", "name": "left arrow", "shortname": ":left_arrow:", "unicode": "2B05", "html": "&#x2B05;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "↖️", "name": "up-left arrow", "shortname": ":upleft_arrow:", "unicode": "2196 FE0F", "html": "&#x2196;&#xFE0F;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "↕️", "name": "up-down arrow", "shortname": ":updown_arrow:", "unicode": "2195 FE0F", "html": "&#x2195;&#xFE0F;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "↩", "name": "right arrow curving left", "shortname": ":right_arrow_curving_left:", "unicode": "21A9", "html": "&#x21A9;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "↪", "name": "left arrow curving right", "shortname": ":left_arrow_curving_right:", "unicode": "21AA", "html": "&#x21AA;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "⤴", "name": "right arrow curving up", "shortname": ":right_arrow_curving_up:", "unicode": "2934", "html": "&#x2934;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "⤵", "name": "right arrow curving down", "shortname": ":right_arrow_curving_down:", "unicode": "2935", "html": "&#x2935;", "category": "Symbols (arrow)", "order": ""},
+		{"emoji": "⚛️", "name": "atom symbol", "shortname": ":atom_symbol:", "unicode": "269B FE0F", "html": "&#x269B;&#xFE0F;", "category": "Symbols (religion)", "order": ""},
+		{"emoji": "🕉️", "name": "om", "shortname": ":om:", "unicode": "1F549 FE0F", "html": "&#x1F549;&#xFE0F;", "category": "Symbols (religion)", "order": ""},
+		{"emoji": "✡", "name": "star of David", "shortname": ":star_of_David:", "unicode": "2721", "html": "&#x2721;", "category": "Symbols (religion)", "order": ""},
+		{"emoji": "☸️", "name": "wheel of dharma", "shortname": ":wheel_of_dharma:", "unicode": "2638 FE0F", "html": "&#x2638;&#xFE0F;", "category": "Symbols (religion)", "order": ""},
+		{"emoji": "☯️", "name": "yin yang", "shortname": ":yin_yang:", "unicode": "262F FE0F", "html": "&#x262F;&#xFE0F;", "category": "Symbols (religion)", "order": ""},
+		{"emoji": "✝", "name": "latin cross", "shortname": ":latin_cross:", "unicode": "271D", "html": "&#x271D;", "category": "Symbols (religion)", "order": ""},
+		{"emoji": "☦️", "name": "orthodox cross", "shortname": ":orthodox_cross:", "unicode": "2626 FE0F", "html": "&#x2626;&#xFE0F;", "category": "Symbols (religion)", "order": ""},
+		{"emoji": "☪️", "name": "star and crescent", "shortname": ":star_and_crescent:", "unicode": "262A FE0F", "html": "&#x262A;&#xFE0F;", "category": "Symbols (religion)", "order": ""},
+		{"emoji": "☮️", "name": "peace symbol", "shortname": ":peace_symbol:", "unicode": "262E FE0F", "html": "&#x262E;&#xFE0F;", "category": "Symbols (religion)", "order": ""},
+		{"emoji": "▶", "name": "play button", "shortname": ":play_button:", "unicode": "25B6", "html": "&#x25B6;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏭️", "name": "next track button", "shortname": ":next_track_button:", "unicode": "23ED FE0F", "html": "&#x23ED;&#xFE0F;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏯️", "name": "play or pause button", "shortname": ":play_or_pause_button:", "unicode": "23EF FE0F", "html": "&#x23EF;&#xFE0F;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "◀", "name": "reverse button", "shortname": ":reverse_button:", "unicode": "25C0", "html": "&#x25C0;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏮️", "name": "last track button", "shortname": ":last_track_button:", "unicode": "23EE FE0F", "html": "&#x23EE;&#xFE0F;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏸️", "name": "pause button", "shortname": ":pause_button:", "unicode": "23F8 FE0F", "html": "&#x23F8;&#xFE0F;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏹️", "name": "stop button", "shortname": ":stop_button:", "unicode": "23F9 FE0F", "html": "&#x23F9;&#xFE0F;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏺️", "name": "record button", "shortname": ":record_button:", "unicode": "23FA FE0F", "html": "&#x23FA;&#xFE0F;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏏️", "name": "eject button", "shortname": ":eject_button:", "unicode": "23CF FE0F", "html": "&#x23CF;&#xFE0F;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "⏏", "name": "eject button", "shortname": ":eject_button:", "unicode": "23CF", "html": "&#x23CF;", "category": "Symbols (av-symbol)", "order": ""},
+		{"emoji": "♀️", "name": "female sign", "shortname": ":female_sign:", "unicode": "2640 FE0F", "html": "&#x2640;&#xFE0F;", "category": "Symbols (gender)", "order": ""},
+		{"emoji": "♀", "name": "female sign", "shortname": ":female_sign:", "unicode": "2640", "html": "&#x2640;", "category": "Symbols (gender)", "order": ""},
+		{"emoji": "♂️", "name": "male sign", "shortname": ":male_sign:", "unicode": "2642 FE0F", "html": "&#x2642;&#xFE0F;", "category": "Symbols (gender)", "order": ""},
+		{"emoji": "♂", "name": "male sign", "shortname": ":male_sign:", "unicode": "2642", "html": "&#x2642;", "category": "Symbols (gender)", "order": ""},
+		{"emoji": "⚕️", "name": "medical symbol", "shortname": ":medical_symbol:", "unicode": "2695 FE0F", "html": "&#x2695;&#xFE0F;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "⚕", "name": "medical symbol", "shortname": ":medical_symbol:", "unicode": "2695", "html": "&#x2695;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "♾️", "name": "infinity", "shortname": ":infinity:", "unicode": "267E FE0F", "html": "&#x267E;&#xFE0F;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "♾", "name": "infinity", "shortname": ":infinity:", "unicode": "267E", "html": "&#x267E;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "♻️", "name": "recycling symbol", "shortname": ":recycling_symbol:", "unicode": "267B FE0F", "html": "&#x267B;&#xFE0F;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "⚜️", "name": "fleur-de-lis", "shortname": ":fleurde-lis:", "unicode": "269C FE0F", "html": "&#x269C;&#xFE0F;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "☑", "name": "check box with check", "shortname": ":check_box_with_check:", "unicode": "2611", "html": "&#x2611;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "✔", "name": "check mark", "shortname": ":check_mark:", "unicode": "2714", "html": "&#x2714;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "✖", "name": "multiplication sign", "shortname": ":multiplication_sign:", "unicode": "2716", "html": "&#x2716;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "〽", "name": "part alternation mark", "shortname": ":part_alternation_mark:", "unicode": "303D", "html": "&#x303D;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "✳", "name": "eight-spoked asterisk", "shortname": ":eightspoked_asterisk:", "unicode": "2733", "html": "&#x2733;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "✴", "name": "eight-pointed star", "shortname": ":eightpointed_star:", "unicode": "2734", "html": "&#x2734;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "❇", "name": "sparkle", "shortname": ":sparkle:", "unicode": "2747", "html": "&#x2747;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "‼", "name": "double exclamation mark", "shortname": ":double_exclamation_mark:", "unicode": "203C", "html": "&#x203C;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "⁉", "name": "exclamation question mark", "shortname": ":exclamation_question_mark:", "unicode": "2049", "html": "&#x2049;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "〰️", "name": "wavy dash", "shortname": ":wavy_dash:", "unicode": "3030 FE0F", "html": "&#x3030;&#xFE0F;", "category": "Symbols (other-symbol)", "order": ""},
+		{"emoji": "#️⃣", "name": "keycap: #", "shortname": ":#:", "unicode": "0023 FE0F 20E3", "html": "&#x0023;&#xFE0F;&#x20E3;", "category": "Symbols (keycap)", "order": ""},
+		{"emoji": "🅰", "name": "A button (blood type)", "shortname": ":A_button_blood_type:", "unicode": "1F170", "html": "&#x1F170;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "🅱", "name": "B button (blood type)", "shortname": ":B_button_blood_type:", "unicode": "1F171", "html": "&#x1F171;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "ℹ️", "name": "information", "shortname": ":information:", "unicode": "2139 FE0F", "html": "&#x2139;&#xFE0F;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "Ⓜ", "name": "circled M", "shortname": ":circled_M:", "unicode": "24C2", "html": "&#x24C2;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "🅾", "name": "O button (blood type)", "shortname": ":O_button_blood_type:", "unicode": "1F17E", "html": "&#x1F17E;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "🅿", "name": "P button", "shortname": ":P_button:", "unicode": "1F17F", "html": "&#x1F17F;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "🈂", "name": "Japanese service charge button", "shortname": ":Japanese_service_charge_button:", "unicode": "1F202", "html": "&#x1F202;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "🈷️", "name": "Japanese monthly amount button", "shortname": ":Japanese_monthly_amount_button:", "unicode": "1F237 FE0F", "html": "&#x1F237;&#xFE0F;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "🈯", "name": "Japanese reserved button", "shortname": ":Japanese_reserved_button:", "unicode": "1F22F", "html": "&#x1F22F;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "🈚", "name": "Japanese free of charge button", "shortname": ":Japanese_free_of_charge_button:", "unicode": "1F21A", "html": "&#x1F21A;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "㊗️", "name": "Japanese congratulations button", "shortname": ":Japanese_congratulations_button:", "unicode": "3297 FE0F", "html": "&#x3297;&#xFE0F;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "㊙️", "name": "Japanese secret button", "shortname": ":Japanese_secret_button:", "unicode": "3299 FE0F", "html": "&#x3299;&#xFE0F;", "category": "Symbols (alphanum)", "order": ""},
+		{"emoji": "🟠", "name": "orange circle", "shortname": ":orange_circle:", "unicode": "1F7E0", "html": "&#x1F7E0;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "🟡", "name": "yellow circle", "shortname": ":yellow_circle:", "unicode": "1F7E1", "html": "&#x1F7E1;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "🟢", "name": "green circle", "shortname": ":green_circle:", "unicode": "1F7E2", "html": "&#x1F7E2;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "🟣", "name": "purple circle", "shortname": ":purple_circle:", "unicode": "1F7E3", "html": "&#x1F7E3;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "🟤", "name": "brown circle", "shortname": ":brown_circle:", "unicode": "1F7E4", "html": "&#x1F7E4;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "🟥", "name": "red square", "shortname": ":red_square:", "unicode": "1F7E5", "html": "&#x1F7E5;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "🟧", "name": "orange square", "shortname": ":orange_square:", "unicode": "1F7E7", "html": "&#x1F7E7;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "🟨", "name": "yellow square", "shortname": ":yellow_square:", "unicode": "1F7E8", "html": "&#x1F7E8;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "🟩", "name": "green square", "shortname": ":green_square:", "unicode": "1F7E9", "html": "&#x1F7E9;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "🟦", "name": "blue square", "shortname": ":blue_square:", "unicode": "1F7E6", "html": "&#x1F7E6;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "▪", "name": "black small square", "shortname": ":black_small_square:", "unicode": "25AA", "html": "&#x25AA;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "▫️", "name": "white small square", "shortname": ":white_small_square:", "unicode": "25AB FE0F", "html": "&#x25AB;&#xFE0F;", "category": "Symbols (geometric)", "order": ""},
+		{"emoji": "🏳️", "name": "white flag", "shortname": ":white_flag:", "unicode": "1F3F3 FE0F", "html": "&#x1F3F3;&#xFE0F;", "category": "Flags (flag)", "order": ""},
+		{"emoji": "🏳️‍🌈", "name": "rainbow flag", "shortname": ":rainbow_flag:", "unicode": "1F3F3 FE0F 200D 1F308", "html": "&#x1F3F3;&#xFE0F;&#x200D;&#x1F308;", "category": "Flags (flag)", "order": ""},
+		{"emoji": "🏴‍☠️", "name": "pirate flag", "shortname": ":pirate_flag:", "unicode": "1F3F4 200D 2620 FE0F", "html": "&#x1F3F4;&#x200D;&#x2620;&#xFE0F;", "category": "Flags (flag)", "order": ""},
+		{"emoji": "🏴‍☠", "name": "pirate flag", "shortname": ":pirate_flag:", "unicode": "1F3F4 200D 2620", "html": "&#x1F3F4;&#x200D;&#x2620;", "category": "Flags (flag)", "order": ""},
+		{"emoji": "🇺🇳", "name": "flag: United Nations", "shortname": ":United_Nations:", "unicode": "1F1FA 1F1F3", "html": "&#x1F1FA;&#x1F1F3;", "category": "Flags (country-flag)", "order": ""},
+		{"emoji": "🏴󠁧󠁢󠁥󠁮󠁧󠁿", "name": "flag: England", "shortname": ":England:", "unicode": "1F3F4 E0067 E0062 E0065 E006E E0067 E007F", "html": "&#x1F3F4;&#xE0067;&#xE0062;&#xE0065;&#xE006E;&#xE0067;&#xE007F;", "category": "Flags (subdivision-flag)", "order": ""},
+		{"emoji": "🏴󠁧󠁢󠁳󠁣󠁴󠁿", "name": "flag: Scotland", "shortname": ":Scotland:", "unicode": "1F3F4 E0067 E0062 E0073 E0063 E0074 E007F", "html": "&#x1F3F4;&#xE0067;&#xE0062;&#xE0073;&#xE0063;&#xE0074;&#xE007F;", "category": "Flags (subdivision-flag)", "order": ""},
+		{"emoji": "🏴󠁧󠁢󠁷󠁬󠁳󠁿", "name": "Wales", "shortname": ":wales:", "unicode": "1F3F4 E0067 E0062 E0077 E006C E0073 E007F", "html": "&#x1F3F4;&#xE0067;&#xE0062;&#xE0077;&#xE006C;&#xE0073;&#xE007F;", "category": "(subdivision-flag)", "order": ""}
+	]
+}
\ No newline at end of file

From e98e285f50ba54003ad12db7ac2c00ea109efd82 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 30 Nov 2020 14:46:37 +0200
Subject: [PATCH 116/389] changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 475edc61..0c61c86f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
 ## [Unreleased]
+### Added
+- Added some missing unicode emoji
+
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
 - Fixed timeline errors locking timelines

From 2506b2629a4fdb0113d34f0387d558c5adbee845 Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Mon, 30 Nov 2020 17:57:15 +0000
Subject: [PATCH 117/389] Added translation using Weblate (Ukrainian)

---
 src/i18n/uk.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/uk.json

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/src/i18n/uk.json
@@ -0,0 +1 @@
+{}

From c17a0523d5ba0ba241d84ceb217a2a03c0f4d017 Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Mon, 30 Nov 2020 17:57:47 +0000
Subject: [PATCH 118/389] Translated using Weblate (Ukrainian)

Currently translated at 8.3% (56 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 57 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 0967ef42..8e2be708 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -1 +1,56 @@
-{}
+{
+  "general": {
+    "dismiss": "Закрити"
+  },
+  "finder": {
+    "error_fetching_user": "Користувача не знайдено"
+  },
+  "features_panel": {
+    "gopher": "Gopher",
+    "pleroma_chat_messages": "Чат Pleroma",
+    "chat": "Чат"
+  },
+  "exporter": {
+    "processing": "Опрацьовую, скоро ви зможете завантажити файл",
+    "export": "Експорт"
+  },
+  "domain_mute_card": {
+    "unmute_progress": "Вимикаю…",
+    "unmute": "Вимкнути ігнорування",
+    "mute_progress": "Вмикаю…",
+    "mute": "Ігнорувати"
+  },
+  "shoutbox": {
+    "title": "Для воплів"
+  },
+  "about": {
+    "staff": "Адміністрація",
+    "mrf": {
+      "simple": {
+        "media_nsfw_desc": "Даний інстанс примусово позначає вкладення з наступних інстансів як NSFW:",
+        "media_nsfw": "Примусове визначення вкладення як дратівливого",
+        "media_removal_desc": "Поточний інстанс видаляє вкладення на перелічених інстансах:",
+        "media_removal": "Видалення вкладень",
+        "ftl_removal_desc": "Цей інстанс видаляє перелічені інстанси з \"Усієї відомої мережі\":",
+        "ftl_removal": "Видалення з \"Вся відома мережа\"",
+        "quarantine_desc": "Поточний інстанс буде надсилати тільки публічні пости наступним інстансам:",
+        "quarantine": "Карантин",
+        "reject_desc": "Поточний інстанс не прийматиме повідомлення з перелічених інстансів:",
+        "accept": "Прийняти",
+        "reject": "Відхилити",
+        "accept_desc": "Поточний інстанс приймає повідомлення тільки з перелічених інстансів:",
+        "simple_policies": "Правила поточного інстансу"
+      },
+      "mrf_policies_desc": "Правила MRF розповсюджуються на данний  інстанс. Наступні правила активні:",
+      "mrf_policies": "Активні правила MRF (модуль переписування повідомлень)",
+      "keyword": {
+        "is_replaced_by": "→",
+        "replace": "Замінити",
+        "reject": "Відхилити",
+        "ftl_removal": "Прибрати з федеративної стрічки",
+        "keyword_policies": "Політика щодо ключових слів"
+      },
+      "federation": "Федерація"
+    }
+  }
+}

From bd1564765c3738aac5fd4e944febca68f86a016d Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Mon, 30 Nov 2020 18:50:55 +0000
Subject: [PATCH 119/389] Translated using Weblate (Ukrainian)

Currently translated at 8.3% (56 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 8e2be708..1231e4c0 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -1,14 +1,36 @@
 {
   "general": {
-    "dismiss": "Закрити"
+    "dismiss": "Закрити",
+    "close": "Закрити",
+    "verify": "Перевірити",
+    "confirm": "Підтвердити",
+    "enable": "Увімкнути",
+    "disable": "Вимкнути",
+    "cancel": "Скасувати",
+    "show_less": "Показати менше",
+    "show_more": "Показати більше",
+    "optional": "необов'язково",
+    "retry": "Спробуйте ще раз",
+    "error_retry": "Будь ласка, спробуйте ще раз",
+    "generic_error": "Виникла помилка",
+    "loading": "Завантаження…",
+    "more": "Більше",
+    "submit": "Відправити",
+    "apply": "Застосувати"
   },
   "finder": {
-    "error_fetching_user": "Користувача не знайдено"
+    "error_fetching_user": "Користувача не знайдено",
+    "find_user": "Знайти користувача"
   },
   "features_panel": {
     "gopher": "Gopher",
     "pleroma_chat_messages": "Чат Pleroma",
-    "chat": "Чат"
+    "chat": "Чат",
+    "who_to_follow": "Кого відстежувати",
+    "title": "Особливості",
+    "scope_options": "Параметри осягу",
+    "media_proxy": "Посередник медіа-даних",
+    "text_limit": "Ліміт символів"
   },
   "exporter": {
     "processing": "Опрацьовую, скоро ви зможете завантажити файл",

From 848b77acaac4abdccd6275a11f49f649a4019a00 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Mon, 30 Nov 2020 19:15:51 +0000
Subject: [PATCH 120/389] Translated using Weblate (Russian)

Currently translated at 55.8% (375 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 8f421b50..52830c4d 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -18,7 +18,11 @@
     "generic_error": "Произошла ошибка",
     "optional": "не обязательно",
     "show_less": "Показать меньше",
-    "show_more": "Показать больше"
+    "show_more": "Показать больше",
+    "peek": "Взглянуть",
+    "dismiss": "Закрыть",
+    "retry": "Попробуйте еще раз",
+    "error_retry": "Пожалуйста попробуйте еще раз"
   },
   "login": {
     "login": "Войти",
@@ -468,7 +472,9 @@
     "media_proxy": "Прокси для внешних вложений",
     "text_limit": "Лимит символов",
     "title": "Особенности",
-    "gopher": "Gopher"
+    "gopher": "Gopher",
+    "who_to_follow": "Предложения кого читать",
+    "pleroma_chat_messages": "Pleroma Чат"
   },
   "tool_tip": {
     "accept_follow_request": "Принять запрос на чтение",

From cf3ad0632a8dff85483eeb1100ce015c38e3fcea Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Mon, 30 Nov 2020 19:22:17 +0000
Subject: [PATCH 121/389] Translated using Weblate (Russian)

Currently translated at 55.8% (375 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 52830c4d..f636bdf8 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -22,7 +22,9 @@
     "peek": "Взглянуть",
     "dismiss": "Закрыть",
     "retry": "Попробуйте еще раз",
-    "error_retry": "Пожалуйста попробуйте еще раз"
+    "error_retry": "Пожалуйста попробуйте еще раз",
+    "close": "Закрыть",
+    "loading": "Загрузка…"
   },
   "login": {
     "login": "Войти",
@@ -483,6 +485,7 @@
   "image_cropper": {
     "save_without_cropping": "Сохранить не обрезая",
     "save": "Сохранить",
-    "crop_picture": "Обрезать картинку"
+    "crop_picture": "Обрезать картинку",
+    "cancel": "Отмена"
   }
 }

From f1b36f3b1a8f4c5211f290c0d0ff642777cdd567 Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Mon, 30 Nov 2020 19:29:42 +0000
Subject: [PATCH 122/389] Translated using Weblate (Ukrainian)

Currently translated at 10.5% (71 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 1231e4c0..73006e6e 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -16,7 +16,8 @@
     "loading": "Завантаження…",
     "more": "Більше",
     "submit": "Відправити",
-    "apply": "Застосувати"
+    "apply": "Застосувати",
+    "peek": "Глянути"
   },
   "finder": {
     "error_fetching_user": "Користувача не знайдено",
@@ -74,5 +75,25 @@
       },
       "federation": "Федерація"
     }
+  },
+  "login": {
+    "hint": "Увійдіть, щоб доєднатися до дискусії",
+    "username": "Ім'я користувача",
+    "register": "Зареєструватись",
+    "password": "Пароль",
+    "logout": "Вийти",
+    "description": "Увійти за допомогою OAuth",
+    "login": "Увійти"
+  },
+  "importer": {
+    "error": "Під час імпортування файлу сталася помилка.",
+    "success": "Імпортовано успішно.",
+    "submit": "Відправити"
+  },
+  "image_cropper": {
+    "cancel": "Відмінити",
+    "save_without_cropping": "Зберегти не обрізаючи",
+    "crop_picture": "Обрізати малюнок",
+    "save": "Зберегти"
   }
 }

From 4dde9c4d529fb94b23b394aaa91e6a7cafd75777 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 2 Dec 2020 12:46:31 +0200
Subject: [PATCH 123/389] refactor error handling in profile tab

---
 .../global_notice_list/global_notice_list.vue | 12 +++--
 src/components/image_cropper/image_cropper.js | 15 +-----
 .../image_cropper/image_cropper.vue           | 11 -----
 .../settings_modal/tabs/profile_tab.js        | 48 ++++++++++---------
 .../settings_modal/tabs/profile_tab.vue       | 23 ---------
 src/i18n/en.json                              |  1 +
 src/services/api/api.service.js               |  7 ++-
 7 files changed, 41 insertions(+), 76 deletions(-)

diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
index 8a33b9eb..0f5ac86f 100644
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -9,11 +9,15 @@
       <div class="notice-message">
         {{ $t(notice.messageKey, notice.messageArgs) }}
       </div>
-      <FAIcon
-        class="fa-scale-110 fa-old-padding"
-        icon="times"
+      <button
+        class="button-unstyled"
         @click="closeNotice(notice)"
-      />
+      >
+        <FAIcon
+          class="fa-scale-110 fa-old-padding"
+          icon="times"
+        />
+      </button>
     </div>
   </div>
 </template>
diff --git a/src/components/image_cropper/image_cropper.js b/src/components/image_cropper/image_cropper.js
index 59e4d07e..e8d5ec6d 100644
--- a/src/components/image_cropper/image_cropper.js
+++ b/src/components/image_cropper/image_cropper.js
@@ -2,12 +2,10 @@ import Cropper from 'cropperjs'
 import 'cropperjs/dist/cropper.css'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faTimes,
   faCircleNotch
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faTimes,
   faCircleNotch
 )
 
@@ -53,8 +51,7 @@ const ImageCropper = {
       cropper: undefined,
       dataUrl: undefined,
       filename: undefined,
-      submitting: false,
-      submitError: null
+      submitting: false
     }
   },
   computed: {
@@ -66,9 +63,6 @@ const ImageCropper = {
     },
     cancelText () {
       return this.cancelButtonLabel || this.$t('image_cropper.cancel')
-    },
-    submitErrorMsg () {
-      return this.submitError && this.submitError instanceof Error ? this.submitError.toString() : this.submitError
     }
   },
   methods: {
@@ -82,12 +76,8 @@ const ImageCropper = {
     },
     submit (cropping = true) {
       this.submitting = true
-      this.avatarUploadError = null
       this.submitHandler(cropping && this.cropper, this.file)
         .then(() => this.destroy())
-        .catch((err) => {
-          this.submitError = err
-        })
         .finally(() => {
           this.submitting = false
         })
@@ -113,9 +103,6 @@ const ImageCropper = {
         reader.readAsDataURL(this.file)
         this.$emit('changed', this.file, reader)
       }
-    },
-    clearError () {
-      this.submitError = null
     }
   },
   mounted () {
diff --git a/src/components/image_cropper/image_cropper.vue b/src/components/image_cropper/image_cropper.vue
index 75def612..9524ccbc 100644
--- a/src/components/image_cropper/image_cropper.vue
+++ b/src/components/image_cropper/image_cropper.vue
@@ -37,17 +37,6 @@
           icon="circle-notch"
         />
       </div>
-      <div
-        v-if="submitError"
-        class="alert error"
-      >
-        {{ submitErrorMsg }}
-        <FAIcon
-          class="fa-scale-110 fa-old-padding"
-          icon="times"
-          @click="clearError"
-        />
-      </div>
     </div>
     <input
       ref="input"
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index a4fed629..9709424c 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -45,9 +45,7 @@ const ProfileTab = {
       banner: null,
       bannerPreview: null,
       background: null,
-      backgroundPreview: null,
-      bannerUploadError: null,
-      backgroundUploadError: null
+      backgroundPreview: null
     }
   },
   components: {
@@ -162,18 +160,18 @@ const ProfileTab = {
       if (file.size > this.$store.state.instance[slot + 'limit']) {
         const filesize = fileSizeFormatService.fileSizeFormat(file.size)
         const allowedsize = fileSizeFormatService.fileSizeFormat(this.$store.state.instance[slot + 'limit'])
-        this[slot + 'UploadError'] = [
-          this.$t('upload.error.base'),
-          this.$t(
-            'upload.error.file_too_big',
-            {
+        this.$store.dispatch('pushGlobalNotice', {
+          messageKey: 'upload.error.message',
+          messageArgs: [
+            this.$t('upload.error.file_too_big', {
               filesize: filesize.num,
               filesizeunit: filesize.unit,
               allowedsize: allowedsize.num,
               allowedsizeunit: allowedsize.unit
-            }
-          )
-        ].join(' ')
+            })
+          ],
+          level: 'error'
+        })
         return
       }
       // eslint-disable-next-line no-undef
@@ -213,8 +211,9 @@ const ProfileTab = {
               that.$store.commit('setCurrentUser', user)
               resolve()
             })
-            .catch((err) => {
-              reject(new Error(that.$t('upload.error.base') + ' ' + err.message))
+            .catch((error) => {
+              that.displayUploadError(error)
+              reject(error)
             })
         }
 
@@ -235,24 +234,27 @@ const ProfileTab = {
           this.$store.commit('setCurrentUser', user)
           this.bannerPreview = null
         })
-        .catch((err) => {
-          this.bannerUploadError = this.$t('upload.error.base') + ' ' + err.message
-        })
-        .then(() => { this.bannerUploading = false })
+        .catch(this.displayUploadError)
+        .finally(() => { this.bannerUploading = false })
     },
     submitBackground (background) {
       if (!this.backgroundPreview && background !== '') { return }
 
       this.backgroundUploading = true
-      this.$store.state.api.backendInteractor.updateProfileImages({ background }).then((data) => {
-        if (!data.error) {
+      this.$store.state.api.backendInteractor.updateProfileImages({ background })
+        .then((data) => {
           this.$store.commit('addNewUsers', [data])
           this.$store.commit('setCurrentUser', data)
           this.backgroundPreview = null
-        } else {
-          this.backgroundUploadError = this.$t('upload.error.base') + data.error
-        }
-        this.backgroundUploading = false
+        })
+        .catch(this.displayUploadError)
+        .finally(() => { this.backgroundUploading = false })
+    },
+    displayUploadError (error) {
+      this.$store.dispatch('pushGlobalNotice', {
+        messageKey: 'upload.error.message',
+        messageArgs: [error.message],
+        level: 'error'
       })
     }
   }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index d62bc392..7271155e 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -229,17 +229,6 @@
       >
         {{ $t('general.submit') }}
       </button>
-      <div
-        v-if="bannerUploadError"
-        class="alert error"
-      >
-        Error: {{ bannerUploadError }}
-        <FAIcon
-          class="fa-scale-110 fa-old-padding"
-          icon="times"
-          @click="clearUploadError('banner')"
-        />
-      </div>
     </div>
     <div class="setting-item">
       <h2>{{ $t('settings.profile_background') }}</h2>
@@ -279,18 +268,6 @@
       >
         {{ $t('general.submit') }}
       </button>
-      <div
-        v-if="backgroundUploadError"
-        class="alert error"
-      >
-        Error: {{ backgroundUploadError }}
-        <FAIcon
-          size="lg"
-          class="fa-scale-110 fa-old-padding"
-          icon="times"
-          @click="clearUploadError('background')"
-        />
-      </div>
     </div>
   </div>
 </template>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ef23efd6..5798ceb2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -758,6 +758,7 @@
   "upload": {
     "error": {
       "base": "Upload failed.",
+      "message": "Upload failed: {0}",
       "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
       "default": "Try again later"
     },
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 8da933c4..f4483149 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -162,7 +162,12 @@ const updateProfileImages = ({ credentials, avatar = null, banner = null, backgr
     body: form
   })
     .then((data) => data.json())
-    .then((data) => parseUser(data))
+    .then((data) => {
+      if (data.error) {
+        throw new Error(data.error)
+      }
+      return parseUser(data)
+    })
 }
 
 const updateProfile = ({ credentials, params }) => {

From 0d53af786b0e3878a27676752c8864da8e3027c4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 2 Dec 2020 12:55:14 +0200
Subject: [PATCH 124/389] fix the close button on global notices

---
 .../global_notice_list/global_notice_list.vue    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
index 0f5ac86f..34007148 100644
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -10,7 +10,7 @@
         {{ $t(notice.messageKey, notice.messageArgs) }}
       </div>
       <button
-        class="button-unstyled"
+        class="button-unstyled close-notice"
         @click="closeNotice(notice)"
       >
         <FAIcon
@@ -58,7 +58,7 @@
   .global-error {
     background-color: var(--alertPopupError, $fallback--cRed);
     color: var(--alertPopupErrorText, $fallback--text);
-    i {
+    .svg-inline--fa {
       color: var(--alertPopupErrorText, $fallback--text);
     }
   }
@@ -66,7 +66,7 @@
   .global-warning {
     background-color: var(--alertPopupWarning, $fallback--cOrange);
     color: var(--alertPopupWarningText, $fallback--text);
-    i {
+    .svg-inline--fa {
       color: var(--alertPopupWarningText, $fallback--text);
     }
   }
@@ -74,9 +74,17 @@
   .global-info {
     background-color: var(--alertPopupNeutral, $fallback--fg);
     color: var(--alertPopupNeutralText, $fallback--text);
-    i {
+    .svg-inline--fa {
       color: var(--alertPopupNeutralText, $fallback--text);
     }
   }
+
+  .close-notice {
+    padding-right: 0.2em;
+    vertical-align: bottom;
+    .svg-inline--fa:hover {
+      opacity: 0.6;
+    }
+  }
 }
 </style>

From 15ea7350065a0210e74a79b2d1ee1f0ff9b9bcef Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 2 Dec 2020 12:58:13 +0200
Subject: [PATCH 125/389] remove vertical align, update changelog

---
 CHANGELOG.md                                             | 1 +
 src/components/global_notice_list/global_notice_list.vue | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e424a62..57f3134b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed custom emoji not working in profile field names
 - Fixed pinned statuses not appearing in user profiles
 - Fixed some elements not being keyboard navigation friendly
+- Fixed error handling when updating various profile images
 
 ### Changed
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
index 34007148..049e23db 100644
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -81,7 +81,6 @@
 
   .close-notice {
     padding-right: 0.2em;
-    vertical-align: bottom;
     .svg-inline--fa:hover {
       opacity: 0.6;
     }

From f4b18df644907090516bf19c8f6c7b78e0b2bb43 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 2 Dec 2020 16:07:31 +0200
Subject: [PATCH 126/389] block clicks in blank area of timeline menu, fix
 'up-to-date' align

---
 CHANGELOG.md                                  |  1 +
 src/components/timeline/timeline.vue          |  1 +
 .../timeline_menu/timeline_menu.vue           | 22 ++++++++++++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e424a62..c39809ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
 - Made reply/fav/repeat etc buttons easier to hit
+- Adjusted timeline menu clickable area to match the visible button
 
 
 ## [2.2.1] - 2020-11-11
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 0326342b..4c43fe5c 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -102,6 +102,7 @@
 .timeline-heading {
   max-width: 100%;
   flex-wrap: nowrap;
+  align-items: center;
   .loadmore-button {
     flex-shrink: 0;
   }
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index c46531be..dd8dbf34 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -65,11 +65,14 @@
       slot="trigger"
       class="title timeline-menu-title"
     >
-      <span>{{ timelineName() }}</span>
-      <FAIcon
-        size="sm"
-        icon="chevron-down"
-      />
+      <span class="timeline-title">{{ timelineName() }}</span>
+      <span>
+        <FAIcon
+          size="sm"
+          icon="chevron-down"
+        />
+      </span>
+      <span class="click-blocker" />
     </div>
   </Popover>
 </template>
@@ -117,8 +120,9 @@
     cursor: pointer;
     user-select: none;
     width: 100%;
+    display: flex;
 
-    span {
+    .timeline-menu-name {
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
@@ -128,6 +132,12 @@
       margin-left: 0.6em;
       transition: transform 100ms;
     }
+
+    .click-blocker {
+      cursor: default;
+      pointer-events: none;
+      flex-grow: 1;
+    }
   }
 
   &.open .timeline-menu-title svg {

From fa01030641de7be89206787f5e364318086e8524 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 3 Dec 2020 10:07:42 +0200
Subject: [PATCH 127/389] make click blocking actually work

---
 src/components/timeline_menu/timeline_menu.js  | 8 ++++++++
 src/components/timeline_menu/timeline_menu.vue | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index ef8a5813..8d6a58b1 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -59,6 +59,14 @@ const TimelineMenu = {
         this.isOpen = true
       }, 25)
     },
+    blockOpen (event) {
+      // For the blank area inside the button element.
+      // Just setting @click.stop="" makes unintuitive behavior when
+      // menu is open and clicking on the blank area doesn't close it.
+      if (!this.isOpen) {
+        event.stopPropagation()
+      }
+    },
     timelineName () {
       const route = this.$route.name
       if (route === 'tag-timeline') {
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index dd8dbf34..3c86842b 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -72,7 +72,10 @@
           icon="chevron-down"
         />
       </span>
-      <span class="click-blocker" />
+      <span
+        class="click-blocker"
+        @click="blockOpen"
+      />
     </div>
   </Popover>
 </template>
@@ -135,7 +138,6 @@
 
     .click-blocker {
       cursor: default;
-      pointer-events: none;
       flex-grow: 1;
     }
   }

From 46320090e34073d349e1bcf8e9babd3c36657130 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 3 Dec 2020 11:57:17 +0200
Subject: [PATCH 128/389] move external source button to extra buttons, make
 expand button easier to click and highlight on hover

---
 src/components/extra_buttons/extra_buttons.js |  6 ++--
 .../extra_buttons/extra_buttons.vue           | 29 ++++++++++++++-----
 src/components/popover/popover.vue            |  1 +
 src/components/status/status.js               |  2 --
 src/components/status/status.scss             | 14 +++++++++
 src/components/status/status.vue              | 23 +++++----------
 src/i18n/en.json                              |  4 ++-
 7 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 1a8eef72..b5b29e8a 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -5,7 +5,8 @@ import {
   faBookmark,
   faEyeSlash,
   faThumbtack,
-  faShareAlt
+  faShareAlt,
+  faExternalLinkAlt
 } from '@fortawesome/free-solid-svg-icons'
 import {
   faBookmark as faBookmarkReg
@@ -17,7 +18,8 @@ library.add(
   faBookmarkReg,
   faEyeSlash,
   faThumbtack,
-  faShareAlt
+  faShareAlt,
+  faExternalLinkAlt
 )
 
 const ExtraButtons = {
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index e687d487..dc790cad 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -1,5 +1,6 @@
 <template>
   <Popover
+    class="ExtraButtons"
     trigger="click"
     placement="top"
     :offset="{ y: 5 }"
@@ -96,11 +97,23 @@
             icon="share-alt"
           /><span>{{ $t("status.copy_link") }}</span>
         </button>
+        <a
+          v-if="!status.is_local"
+          class="button-default dropdown-item dropdown-item-icon"
+          title="Source"
+          :href="status.external_url"
+          target="_blank"
+        >
+          <FAIcon
+            fixed-width
+            icon="external-link-alt"
+          /><span>{{ $t("status.external_source") }}</span>
+        </a>
       </div>
     </div>
     <span
       slot="trigger"
-      class="ExtraButtons"
+      class="popover-trigger"
     >
       <FAIcon
         class="fa-scale-110 fa-old-padding"
@@ -116,13 +129,15 @@
 @import '../../_variables.scss';
 
 .ExtraButtons {
-  position: static;
-  padding: 10px;
-  margin: -10px;
+  .popover-trigger {
+    position: static;
+    padding: 10px;
+    margin: -10px;
 
-  &:hover .svg-inline--fa {
-    color: $fallback--text;
-    color: var(--text, $fallback--text);
+    &:hover .svg-inline--fa {
+      color: $fallback--text;
+      color: var(--text, $fallback--text);
+    }
   }
 }
 </style>
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 020eab05..2252c68f 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -95,6 +95,7 @@
     box-shadow: none;
     width: 100%;
     height: 100%;
+    box-sizing: border-box;
 
     --btnText: var(--popoverText, $fallback--text);
 
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 142e1fc6..f9c710ab 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -26,7 +26,6 @@ import {
   faTimes,
   faRetweet,
   faReply,
-  faExternalLinkSquareAlt,
   faPlusSquare,
   faSmileBeam,
   faEllipsisH,
@@ -44,7 +43,6 @@ library.add(
   faTimes,
   faRetweet,
   faReply,
-  faExternalLinkSquareAlt,
   faPlusSquare,
   faStar,
   faSmileBeam,
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 70c6d03d..58b55bc8 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -139,6 +139,20 @@ $status-margin: 0.75em;
   .heading-right {
     display: flex;
     flex-shrink: 0;
+
+    .button-unstyled {
+      padding: 5px;
+      margin: -5px;
+
+      &:hover svg {
+        color: $fallback--lightText;
+        color: var(--lightText, $fallback--lightText);
+      }
+    }
+
+    .svg-inline--fa {
+      margin-left: 0.25em;
+    }
   }
 
   .timeago {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 896635ee..6ee8117f 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -184,30 +184,20 @@
                   :title="status.visibility | capitalize"
                 >
                   <FAIcon
-                    class="fa-scale-110 fa-old-padding"
+                    fixed-width
+                    class="fa-scale-110"
                     :icon="visibilityIcon(status.visibility)"
                   />
                 </span>
-                <a
-                  v-if="!status.is_local && !isPreview"
-                  :href="status.external_url"
-                  target="_blank"
-                  class="source_url"
-                  title="Source"
-                >
-                  <FAIcon
-                    class="fa-scale-110 fa-old-padding"
-                    icon="external-link-square-alt"
-                  />
-                </a>
                 <button
                   v-if="expandable && !isPreview"
                   class="button-unstyled"
-                  title="Expand"
+                  :title="$t('status.expand')"
                   @click.prevent="toggleExpanded"
                 >
                   <FAIcon
-                    class="fa-scale-110 fa-old-padding"
+                    fixed-width
+                    class="fa-scale-110"
                     icon="plus-square"
                   />
                 </button>
@@ -217,8 +207,9 @@
                   @click.prevent="toggleMute"
                 >
                   <FAIcon
+                    fixed-width
                     icon="eye-slash"
-                    class="fa-scale-110 fa-old-padding"
+                    class="fa-scale-110"
                   />
                 </button>
               </span>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ef23efd6..64425259 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -661,6 +661,7 @@
     "unmute_conversation": "Unmute conversation",
     "status_unavailable": "Status unavailable",
     "copy_link": "Copy link to status",
+    "external_source": "External source",
     "thread_muted": "Thread muted",
     "thread_muted_and_words": ", has words:",
     "show_full_subject": "Show full subject",
@@ -668,7 +669,8 @@
     "show_content": "Show content",
     "hide_content": "Hide content",
     "status_deleted": "This post was deleted",
-    "nsfw": "NSFW"
+    "nsfw": "NSFW",
+    "expand": "Expand"
   },
   "user_card": {
     "approve": "Approve",

From 5d95376bef43b6c01ceee845cd42a355d74acdf2 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 3 Dec 2020 12:03:23 +0200
Subject: [PATCH 129/389] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e424a62..8ed9b82d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
 - Made reply/fav/repeat etc buttons easier to hit
+- Moved external source link from status heading to the ellipsis menu
 
 
 ## [2.2.1] - 2020-11-11

From 24277571848e4f2a0994310e3a9680eda850fc9a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 3 Dec 2020 16:09:40 +0200
Subject: [PATCH 130/389] fix your own chat messages disappearing

---
 CHANGELOG.md                              | 1 +
 src/services/chat_service/chat_service.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e424a62..dd4a2836 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed custom emoji not working in profile field names
 - Fixed pinned statuses not appearing in user profiles
 - Fixed some elements not being keyboard navigation friendly
+- Fixed your latest chat messages disappearing when closing chat view and opening it again during the same session
 
 ### Changed
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js
index 1fc4e390..e653ebc1 100644
--- a/src/services/chat_service/chat_service.js
+++ b/src/services/chat_service/chat_service.js
@@ -21,7 +21,7 @@ const clear = (storage) => {
       failedMessageIds.push(message.id)
     } else {
       delete storage.idIndex[message.id]
-      delete storage.idempotencyKeyIndex[message.id]
+      delete storage.idempotencyKeyIndex[message.idempotency_key]
     }
   }
 

From 9cb83648e362bce298827ff180687bb136bd882d Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Mon, 30 Nov 2020 19:42:16 +0000
Subject: [PATCH 131/389] Translated using Weblate (Ukrainian)

Currently translated at 21.3% (143 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 73006e6e..f8023189 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -83,7 +83,10 @@
     "password": "Пароль",
     "logout": "Вийти",
     "description": "Увійти за допомогою OAuth",
-    "login": "Увійти"
+    "login": "Увійти",
+    "recovery_code": "Код відновлення",
+    "enter_recovery_code": "Введіть код відновлення",
+    "authentication_code": "Код автентифікації"
   },
   "importer": {
     "error": "Під час імпортування файлу сталася помилка.",

From 1116b2cd32a7ac46d7a57cfc19bcd1012d74a791 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Mon, 30 Nov 2020 19:43:00 +0000
Subject: [PATCH 132/389] Translated using Weblate (Ukrainian)

Currently translated at 21.3% (143 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 91 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 89 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index f8023189..4e5ee1e8 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -64,7 +64,7 @@
         "accept_desc": "Поточний інстанс приймає повідомлення тільки з перелічених інстансів:",
         "simple_policies": "Правила поточного інстансу"
       },
-      "mrf_policies_desc": "Правила MRF розповсюджуються на данний  інстанс. Наступні правила активні:",
+      "mrf_policies_desc": "Правила MRF розповсюджуються на даний  інстанс. Наступні правила активні:",
       "mrf_policies": "Активні правила MRF (модуль переписування повідомлень)",
       "keyword": {
         "is_replaced_by": "→",
@@ -86,7 +86,13 @@
     "login": "Увійти",
     "recovery_code": "Код відновлення",
     "enter_recovery_code": "Введіть код відновлення",
-    "authentication_code": "Код автентифікації"
+    "authentication_code": "Код автентифікації",
+    "heading": {
+      "recovery": "Двофакторне відновлення",
+      "totp": "Двофакторна автентифікація"
+    },
+    "enter_two_factor_code": "Введіть двофакторний код автентифікації",
+    "placeholder": "напр. stepan"
   },
   "importer": {
     "error": "Під час імпортування файлу сталася помилка.",
@@ -98,5 +104,86 @@
     "save_without_cropping": "Зберегти не обрізаючи",
     "crop_picture": "Обрізати малюнок",
     "save": "Зберегти"
+  },
+  "polls": {
+    "expired": "Опитування закінчилось {0} тому",
+    "expires_in": "Опитування закінчується через {0}",
+    "expiry": "Термін опитування",
+    "multiple_choices": "Декілька варіантів",
+    "single_choice": "Один варіант",
+    "add_option": "Додати опцію",
+    "type": "Тип опитування",
+    "vote": "Проголосувати",
+    "votes": "голосів",
+    "option": "Відповідь",
+    "add_poll": "Додати опитування"
+  },
+  "notifications": {
+    "reacted_with": "додав реакцію: {0}",
+    "migrated_to": "мігрував на",
+    "no_more_notifications": "Немає більше сповіщень",
+    "repeated_you": "поширив ваш допис",
+    "read": "Прочитано!",
+    "notifications": "Сповіщення",
+    "load_older": "Завантажити давніші сповіщення",
+    "follow_request": "хоче підписатись на вас",
+    "followed_you": "підписався(-лась) на вас",
+    "favorited_you": "вподобав(-ла) ваш допис",
+    "broken_favorite": "Невідомий допис, шукаю його…"
+  },
+  "nav": {
+    "chats": "Локальні балачки",
+    "timelines": "Стрічки",
+    "twkn": "Уся відома мережа",
+    "about": "Інформація",
+    "preferences": "Налаштування",
+    "friend_requests": "Запити послідовників",
+    "who_to_follow": "Кого відстежувати",
+    "search": "Пошук",
+    "user_search": "Пошук користувача",
+    "bookmarks": "Закладки",
+    "timeline": "Домашня стрічка",
+    "public_tl": "Публічна стрічка",
+    "dms": "Приватні повідомлення",
+    "interactions": "Взаємодії",
+    "mentions": "Згадування",
+    "back": "Назад",
+    "administration": "Адміністрування"
+  },
+  "media_modal": {
+    "next": "Наступна",
+    "previous": "Попередня"
+  },
+  "password_reset": {
+    "instruction": "Введіть свою адресу електронної пошти або ім’я користувача. Ми надішлемо вам посилання для скидання пароля.",
+    "placeholder": "Ваша електронна адреса або ім'я користувача",
+    "check_email": "Перевірте електронну пошту на наявність посилання для скидання пароля.",
+    "return_home": "Повернутися на головну сторінку",
+    "too_many_requests": "Ви досягли ліміту спроб, спробуйте ще раз пізніше.",
+    "password_reset_required_but_mailer_is_disabled": "Ви повинні скинути свій пароль, але скидання пароля вимкнено. Зверніться до адміністратора інстансу.",
+    "password_reset_disabled": "Скидання пароля вимкнено. Зверніться до адміністратора інстансу.",
+    "password_reset_required": "Для входу потрібно скинути пароль."
+  },
+  "chats": {
+    "you": "Ви:",
+    "message_user": "Повідомлення для {nickname}",
+    "delete": "Видалити",
+    "chats": "Чати",
+    "new": "Новий чат",
+    "empty_message_error": "Не вдається опублікувати порожнє повідомлення",
+    "more": "Більше",
+    "delete_confirm": "Ви дійсно хочете видалити це повідомлення?",
+    "error_loading_chat": "Під час завантаження чату сталася помилка.",
+    "error_sending_message": "Під час надсилання повідомлення сталася помилка.",
+    "empty_chat_list_placeholder": "У вас ще немає чатів. Почніть новий чат!"
+  },
+  "file_type": {
+    "audio": "Аудіо",
+    "video": "Відео",
+    "image": "Зображення",
+    "file": "Файл"
+  },
+  "display_date": {
+    "today": "Сьогодні"
   }
 }

From badbd27e27293bb462d90ebde0610df49646c98d Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Mon, 30 Nov 2020 21:55:27 +0000
Subject: [PATCH 133/389] Translated using Weblate (Ukrainian)

Currently translated at 21.4% (144 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 4e5ee1e8..25faae24 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -116,7 +116,8 @@
     "vote": "Проголосувати",
     "votes": "голосів",
     "option": "Відповідь",
-    "add_poll": "Додати опитування"
+    "add_poll": "Додати опитування",
+    "not_enough_options": "Замало унікальних варіантів в опитуванні"
   },
   "notifications": {
     "reacted_with": "додав реакцію: {0}",

From a6c93c5eabdd2dfe7bba29e1c1689a9d8882f9c4 Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Mon, 30 Nov 2020 21:56:51 +0000
Subject: [PATCH 134/389] Translated using Weblate (Ukrainian)

Currently translated at 23.3% (157 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 25faae24..4243b6af 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -186,5 +186,16 @@
   },
   "display_date": {
     "today": "Сьогодні"
+  },
+  "interactions": {
+    "load_older": "Завантажити давніші взаємодії",
+    "follows": "Нові підписки",
+    "favs_repeats": "Повтори і улюблене"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma не змогла отримати доступ до сховища браузеру. Ваша сесія та налаштування не будуть збережені і ви можете стикнутись з непередбачуваними проблемами. Спробуйте увімкнути cookie."
+  },
+  "emoji": {
+    "stickers": "Стікери"
   }
 }

From a7b2c5cdad2d6ea52f3736150301b723cf25789a Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Mon, 30 Nov 2020 22:08:59 +0000
Subject: [PATCH 135/389] Translated using Weblate (Ukrainian)

Currently translated at 23.3% (157 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 4243b6af..899e4fb1 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -197,5 +197,17 @@
   },
   "emoji": {
     "stickers": "Стікери"
+  },
+  "post_status": {
+    "content_type": {
+      "text/bbcode": "BBCode",
+      "text/markdown": "Markdown",
+      "text/html": "HTML",
+      "text/plain": "Простий текст"
+    },
+    "attachments_sensitive": "Позначити вкладення як чутливі",
+    "account_not_locked_warning_link": "замкнена",
+    "account_not_locked_warning": "Ваша обліковка не {0}. Будь-хто може відстежувати вас для перегляду дописів тільки для відстежувачів.",
+    "new_status": "Створити допис"
   }
 }

From 0cccb39710e30a1fad31e757fd30c70d0870679d Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Mon, 30 Nov 2020 22:14:42 +0000
Subject: [PATCH 136/389] Translated using Weblate (Ukrainian)

Currently translated at 23.9% (161 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 899e4fb1..e9aa4ed4 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -208,6 +208,10 @@
     "attachments_sensitive": "Позначити вкладення як чутливі",
     "account_not_locked_warning_link": "замкнена",
     "account_not_locked_warning": "Ваша обліковка не {0}. Будь-хто може відстежувати вас для перегляду дописів тільки для відстежувачів.",
-    "new_status": "Створити допис"
+    "new_status": "Створити допис",
+    "direct_warning_to_first_only": "Цей допис побачать лише користувачі, що були згадані на початку повідомлення.",
+    "direct_warning_to_all": "Цей допис побачать лише згадані користувачі.",
+    "default": "Що нового?",
+    "content_warning": "Тема (необов'язково)"
   }
 }

From 171462b246a75890a7117c09ab96c1bf47b45364 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Mon, 30 Nov 2020 22:15:35 +0000
Subject: [PATCH 137/389] Translated using Weblate (Ukrainian)

Currently translated at 24.2% (163 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index e9aa4ed4..fc38e8d6 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -212,6 +212,8 @@
     "direct_warning_to_first_only": "Цей допис побачать лише користувачі, що були згадані на початку повідомлення.",
     "direct_warning_to_all": "Цей допис побачать лише згадані користувачі.",
     "default": "Що нового?",
-    "content_warning": "Тема (необов'язково)"
+    "content_warning": "Тема (необов'язково)",
+    "preview": "Попередній перегляд",
+    "posting": "Відправляється"
   }
 }

From c789db82df504442170d1c5d671e930d76a1c049 Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Mon, 30 Nov 2020 22:18:59 +0000
Subject: [PATCH 138/389] Translated using Weblate (Ukrainian)

Currently translated at 24.4% (164 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index fc38e8d6..cc53aa39 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -214,6 +214,7 @@
     "default": "Що нового?",
     "content_warning": "Тема (необов'язково)",
     "preview": "Попередній перегляд",
-    "posting": "Відправляється"
+    "posting": "Відправляється",
+    "empty_status_error": "Не можу опублікувати пустий статус  без файлів"
   }
 }

From 431e9369c2ce92819daed97487498e11e9bd72e2 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Mon, 30 Nov 2020 19:28:53 +0000
Subject: [PATCH 139/389] Translated using Weblate (Russian)

Currently translated at 60.8% (408 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 53 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index f636bdf8..828db789 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -39,8 +39,11 @@
     "recovery_code": "Код восстановления",
     "heading": {
       "TotpForm": "Двухфакторная аутентификация",
-      "RecoveryForm": "Two-factor recovery"
-    }
+      "RecoveryForm": "Two-factor recovery",
+      "totp": "Двухфакторная аутентификация"
+    },
+    "hint": "Войдите чтобы присоединиться к дискуссии",
+    "description": "Войти с помощью OAuth"
   },
   "nav": {
     "back": "Назад",
@@ -52,7 +55,14 @@
     "twkn": "Федеративная лента",
     "search": "Поиск",
     "friend_requests": "Запросы на чтение",
-    "bookmarks": "Закладки"
+    "bookmarks": "Закладки",
+    "chats": "Беседы",
+    "timelines": "Ленты",
+    "preferences": "Настройки",
+    "who_to_follow": "Кого читать",
+    "dms": "Личные Сообщения",
+    "administration": "Панель администратора",
+    "about": "О сервере"
   },
   "notifications": {
     "broken_favorite": "Неизвестный статус, ищем...",
@@ -62,12 +72,17 @@
     "notifications": "Уведомления",
     "read": "Прочесть",
     "repeated_you": "повторил(а) ваш статус",
-    "follow_request": "хочет читать вас"
+    "follow_request": "хочет читать вас",
+    "reacted_with": "добавил реакцию: {0}",
+    "migrated_to": "мигрировал на",
+    "no_more_notifications": "Нет дальнейших уведомлений",
+    "error": "Ошибка при обновлении уведомлений: {0}"
   },
   "interactions": {
     "favs_repeats": "Повторы и фавориты",
     "follows": "Новые подписки",
-    "load_older": "Загрузить старые взаимодействия"
+    "load_older": "Загрузить старые взаимодействия",
+    "moves": "Миграции пользователей"
   },
   "post_status": {
     "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может начать читать вас чтобы видеть посты только для подписчиков.",
@@ -486,6 +501,32 @@
     "save_without_cropping": "Сохранить не обрезая",
     "save": "Сохранить",
     "crop_picture": "Обрезать картинку",
-    "cancel": "Отмена"
+    "cancel": "Отменить"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma не смогла получить доступ к хранилищу браузера. Ваша сессия и настройки не будут сохранены, и вы можете столкнуться с непредвиденными проблемами. Попробуйте включить файлы cookie."
+  },
+  "polls": {
+    "not_enough_options": "Недостаточно уникальных вариантов в опросе",
+    "expired": "Опрос закончился {0} назад",
+    "expires_in": "Опрос заканчивается через",
+    "expiry": "Срок опроса",
+    "multiple_choices": "Несколько вариантов",
+    "single_choice": "Один вариант",
+    "type": "Тип опроса",
+    "vote": "Проголосовать",
+    "votes": "голосов",
+    "option": "Вариант",
+    "add_option": "Добавить вариант",
+    "add_poll": "Прикрепить опрос"
+  },
+  "media_modal": {
+    "next": "Следующая",
+    "previous": "Предыдущая"
+  },
+  "importer": {
+    "error": "Произошла ошибка при импорте файла.",
+    "success": "Импорт прошел успешно.",
+    "submit": "Отправить"
   }
 }

From 3f452a546215a8f7f2716458836096ee674c880d Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Mon, 30 Nov 2020 22:21:21 +0000
Subject: [PATCH 140/389] Translated using Weblate (Ukrainian)

Currently translated at 30.2% (203 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 49 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index cc53aa39..560b8427 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -215,6 +215,53 @@
     "content_warning": "Тема (необов'язково)",
     "preview": "Попередній перегляд",
     "posting": "Відправляється",
-    "empty_status_error": "Не можу опублікувати пустий статус  без файлів"
+    "empty_status_error": "Не можу опублікувати пустий статус без файлів",
+    "scope": {
+      "unlisted": "Непублічний - цей допис буде відсутній у публічних стрічках",
+      "public": "Піблічний - цей допис побачать усі",
+      "private": "Для читачів - цей допис побачать лише ваші читачі",
+      "direct": "Приватний - цей допис побачать лише згадані користувачі"
+    },
+    "scope_notice": {
+      "unlisted": "Цей допис побачать в публічній та федеративній стрічці",
+      "private": "Цей допис побачать лише ваші підписники",
+      "public": "Цей допис побачать усі"
+    }
+  },
+  "settings": {
+    "blocks_imported": "Блокування імпортовані! Їх обробка займе деякий час.",
+    "block_import_error": "Помилка імпортування блокувань",
+    "block_import": "Імпорт блокувань",
+    "block_export_button": "Експорт блокувань у файл CSV",
+    "block_export": "Експорт блокувань",
+    "bio": "Про Вас",
+    "background": "Обкладинка",
+    "app_name": "Назва програми"
+  },
+  "selectable_list": {
+    "select_all": "Вибрати все"
+  },
+  "remote_user_resolver": {
+    "error": "Не знайдено."
+  },
+  "registration": {
+    "validations": {
+      "password_confirmation_match": "пароль та підтвердження паролю мають співпадати",
+      "password_confirmation_required": "не може бути порожнім",
+      "password_required": "не може бути порожнім",
+      "email_required": "не може бути порожнім",
+      "fullname_required": "не може бути порожнім",
+      "username_required": "не може бути порожнім"
+    },
+    "bio_placeholder": "e.g.\nНаш народ завжди прагне волі для себе і бажає її для інших народів. Він боровся і бореться за правду і справедливість. Ми хочемо жити у згоді і взаємному шануванні з усіми народами доброї волі. Такі самі права визнаємо за іншими народами, за які боремося для себе.",
+    "fullname_placeholder": "e.g. Stepan Bandera",
+    "username_placeholder": "e.g. stepan",
+    "new_captcha": "Натисніть на зображення, щоб оновити код, якщо він нерозбірливий",
+    "token": "Ключ запрошення",
+    "registration": "Реєстрація",
+    "password_confirm": "Підтвердження паролю",
+    "fullname": "Відображене ім'я",
+    "email": "Ел. пошта",
+    "bio": "Про себе"
   }
 }

From a464135cbddb8e66fe0e87ed376028e8eec71fb5 Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Mon, 30 Nov 2020 22:23:52 +0000
Subject: [PATCH 141/389] Translated using Weblate (Ukrainian)

Currently translated at 30.2% (203 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 560b8427..d55b5c18 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -130,7 +130,8 @@
     "follow_request": "хоче підписатись на вас",
     "followed_you": "підписався(-лась) на вас",
     "favorited_you": "вподобав(-ла) ваш допис",
-    "broken_favorite": "Невідомий допис, шукаю його…"
+    "broken_favorite": "Невідомий допис, шукаю його…",
+    "error": "Помилка при оновленні сповіщень: {0}"
   },
   "nav": {
     "chats": "Локальні балачки",
@@ -196,7 +197,12 @@
     "storage_unavailable": "Pleroma не змогла отримати доступ до сховища браузеру. Ваша сесія та налаштування не будуть збережені і ви можете стикнутись з непередбачуваними проблемами. Спробуйте увімкнути cookie."
   },
   "emoji": {
-    "stickers": "Стікери"
+    "stickers": "Стікери",
+    "custom": "Нестандартні емодзі",
+    "search_emoji": "Пошук емодзі",
+    "keep_open": "Тримати панель відкритою",
+    "add_emoji": "Додати емодзі",
+    "emoji": "Емодзі"
   },
   "post_status": {
     "content_type": {

From 2478b5a306361a241845da70827b39040ff17479 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Tue, 1 Dec 2020 10:51:12 +0000
Subject: [PATCH 142/389] Translated using Weblate (Ukrainian)

Currently translated at 34.5% (232 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index d55b5c18..27667d64 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -242,7 +242,36 @@
     "block_export": "Експорт блокувань",
     "bio": "Про Вас",
     "background": "Обкладинка",
-    "app_name": "Назва програми"
+    "app_name": "Назва програми",
+    "follow_export": "Експортувати відстежуваних",
+    "filtering_explanation": "Усі статуси з цими словами будуть приховані, один на рядок",
+    "filtering": "Фільтрування",
+    "export_theme": "Зберегти переднабір",
+    "avatar_size_instruction": "Рекомендований мінімальний розмір для зображень аватара становить 150x150 пікселів.",
+    "delete_account_instructions": "Введіть ваш пароль в поле нижче, аби підтвердити видалення облікового запису.",
+    "delete_account_error": "Під час видалення вашого облікового запису виникла проблема. Якщо це трапляється постійно, будь ласка, зверніться до адміністратора вашого сервера.",
+    "delete_account_description": "Остаточно видалити ваш обліковий запис та усі ваші повідомлення.",
+    "delete_account": "Видалити обліковий запис",
+    "default_vis": "Обсяг видимості за замовчуванням",
+    "data_import_export_tab": "Імпортування / експортування даних",
+    "current_password": "Поточний пароль",
+    "confirm_new_password": "Підтвердіть новий пароль",
+    "composing": "Складання відповіді",
+    "collapse_subject": "Згорнути дописи з темами",
+    "changed_password": "Пароль успішно змінено!",
+    "change_password_error": "Не вдалося змінити пароль.",
+    "change_password": "Змінити пароль",
+    "cRed": "Червоний (Скасувати)",
+    "cGreen": "Зелений (Поширити)",
+    "cOrange": "Жовтогарячий (Улюблене)",
+    "cBlue": "Блакитний (Відповісти, читати)",
+    "btnRadius": "Кнопки",
+    "blocks_tab": "Блокування",
+    "avatarRadius": "Аватарки",
+    "avatarAltRadius": "Аватарки у сповіщеннях",
+    "avatar": "Аватар",
+    "attachments": "Вкладення",
+    "attachmentRadius": "Вкладення"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 0dc0c816eaad31a4f9d4c86cdbdcbba91c81d6b8 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Tue, 1 Dec 2020 11:01:48 +0000
Subject: [PATCH 143/389] Translated using Weblate (Ukrainian)

Currently translated at 35.4% (238 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 27667d64..fa55a3ae 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -271,7 +271,13 @@
     "avatarAltRadius": "Аватарки у сповіщеннях",
     "avatar": "Аватар",
     "attachments": "Вкладення",
-    "attachmentRadius": "Вкладення"
+    "attachmentRadius": "Вкладення",
+    "general": "Загальні",
+    "foreground": "Передній план",
+    "follows_imported": "Відстежуваних імпортовано! Їхня обробка потребує часу.",
+    "follow_import_error": "Помилка імпортування відстежуваних",
+    "follow_import": "Імпортувати відстежуваних",
+    "follow_export_button": "Експортувати відстежуваних до csv файлу"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 71b0ef8f1b4eff7408d8471e0d67fc1b21526d40 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Tue, 1 Dec 2020 11:03:02 +0000
Subject: [PATCH 144/389] Translated using Weblate (Ukrainian)

Currently translated at 39.3% (264 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index fa55a3ae..31a046dd 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -277,7 +277,33 @@
     "follows_imported": "Відстежуваних імпортовано! Їхня обробка потребує часу.",
     "follow_import_error": "Помилка імпортування відстежуваних",
     "follow_import": "Імпортувати відстежуваних",
-    "follow_export_button": "Експортувати відстежуваних до csv файлу"
+    "follow_export_button": "Експортувати відстежуваних до csv файлу",
+    "lock_account_description": "Обмежте свій обліковий запис лише схваленими читачами",
+    "links": "Посилання",
+    "limited_availability": "Недоступно у вашому браузері",
+    "invalid_theme_imported": "Вибраний файл не є оболонкою Pleroma. Жодних змін не було внесено у вашу тему.",
+    "interfaceLanguage": "Мова оболонки",
+    "interface": "Оболонка",
+    "instance_default_simple": "(за замовчуванням)",
+    "instance_default": "(за замовчуванням: {value})",
+    "checkboxRadius": "Прапорці",
+    "inputRadius": "Поля вводу",
+    "import_theme": "Завантажити переднабір",
+    "import_followers_from_a_csv_file": "Імпортувати відстежуваних з csv файлу",
+    "import_blocks_from_a_csv_file": "Імпортувати блокувань з csv файлу",
+    "hide_filtered_statuses": "Сховати відфільтровані статуси",
+    "hide_user_stats": "Приховувати статистику користувачів (напр. кількість відстежувачів)",
+    "hide_post_stats": "Приховувати статистику дописів (напр. кількість улюблених)",
+    "use_one_click_nsfw": "Відкривати NSFW вкладення одним кліком миші",
+    "preload_images": "Передзавантажувати світлини",
+    "hide_isp": "Сховати панель з особливостями сервера",
+    "max_thumbnails": "Максимальна кількість мініатюр на повідомлення",
+    "hide_muted_posts": "Приховати повідомлення приглушених користувачів",
+    "hide_attachments_in_tl": "Приховувати вкладення у стрічці",
+    "hide_attachments_in_convo": "Приховувати вкладення у розмовах",
+    "mutes_tab": "Заглушені",
+    "loop_video_silent_only": "Зациклити відео без звуку (напр. Mastodon \"gifs\")",
+    "loop_video": "Зациклити відео"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 8140501e371209707a805e37440e7217d74e5636 Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Tue, 1 Dec 2020 14:28:29 +0000
Subject: [PATCH 145/389] Translated using Weblate (Ukrainian)

Currently translated at 45.0% (302 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 74 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 59 insertions(+), 15 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 31a046dd..4ea556db 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -44,7 +44,7 @@
     "mute": "Ігнорувати"
   },
   "shoutbox": {
-    "title": "Для воплів"
+    "title": "Міні-чат"
   },
   "about": {
     "staff": "Адміністрація",
@@ -55,7 +55,7 @@
         "media_removal_desc": "Поточний інстанс видаляє вкладення на перелічених інстансах:",
         "media_removal": "Видалення вкладень",
         "ftl_removal_desc": "Цей інстанс видаляє перелічені інстанси з \"Усієї відомої мережі\":",
-        "ftl_removal": "Видалення з \"Вся відома мережа\"",
+        "ftl_removal": "Видалення з \"Усієї відомої мережі\"",
         "quarantine_desc": "Поточний інстанс буде надсилати тільки публічні пости наступним інстансам:",
         "quarantine": "Карантин",
         "reject_desc": "Поточний інстанс не прийматиме повідомлення з перелічених інстансів:",
@@ -191,18 +191,22 @@
   "interactions": {
     "load_older": "Завантажити давніші взаємодії",
     "follows": "Нові підписки",
-    "favs_repeats": "Повтори і улюблене"
+    "favs_repeats": "Повтори і улюблене",
+    "moves": "Міграції користувачів"
   },
   "errors": {
-    "storage_unavailable": "Pleroma не змогла отримати доступ до сховища браузеру. Ваша сесія та налаштування не будуть збережені і ви можете стикнутись з непередбачуваними проблемами. Спробуйте увімкнути cookie."
+    "storage_unavailable": "Pleroma не змогла отримати доступ до сховища браузеру. Ваша сесія та налаштування не будуть збережені, це може спричинити непередбачувані проблеми. Спробуйте увімкнути cookie."
   },
   "emoji": {
     "stickers": "Стікери",
-    "custom": "Нестандартні емодзі",
+    "custom": "Користувацькі емодзі",
     "search_emoji": "Пошук емодзі",
     "keep_open": "Тримати панель відкритою",
     "add_emoji": "Додати емодзі",
-    "emoji": "Емодзі"
+    "emoji": "Емодзі",
+    "load_all": "Всі {emojiAmount} эмодзі завантажуються",
+    "load_all_hint": "Завантажені перші {saneAmount} емодзі, завантаження всіх емодзі може призвести до проблем з продуктивністю.",
+    "unicode": "Стандартні емодзі"
   },
   "post_status": {
     "content_type": {
@@ -216,12 +220,12 @@
     "account_not_locked_warning": "Ваша обліковка не {0}. Будь-хто може відстежувати вас для перегляду дописів тільки для відстежувачів.",
     "new_status": "Створити допис",
     "direct_warning_to_first_only": "Цей допис побачать лише користувачі, що були згадані на початку повідомлення.",
-    "direct_warning_to_all": "Цей допис побачать лише згадані користувачі.",
+    "direct_warning_to_all": "Цей допис побачать всі згадані користувачі.",
     "default": "Що нового?",
     "content_warning": "Тема (необов'язково)",
     "preview": "Попередній перегляд",
     "posting": "Відправляється",
-    "empty_status_error": "Не можу опублікувати пустий статус без файлів",
+    "empty_status_error": "Не можу опублікувати пустий статус без вкладень",
     "scope": {
       "unlisted": "Непублічний - цей допис буде відсутній у публічних стрічках",
       "public": "Піблічний - цей допис побачать усі",
@@ -229,13 +233,16 @@
       "direct": "Приватний - цей допис побачать лише згадані користувачі"
     },
     "scope_notice": {
-      "unlisted": "Цей допис побачать в публічній та федеративній стрічці",
+      "unlisted": "Цей допис не буде видно в публічній та федеративній стрічці",
       "private": "Цей допис побачать лише ваші підписники",
-      "public": "Цей допис побачать усі"
-    }
+      "public": "Цей допис бачитимуть усі"
+    },
+    "preview_empty": "Пустий",
+    "media_description_error": "Не вдалось оновити вкладення, спробуйте ще раз",
+    "media_description": "Опис вкладення"
   },
   "settings": {
-    "blocks_imported": "Блокування імпортовані! Їх обробка займе деякий час.",
+    "blocks_imported": "Блокування імпортовані! Їх обробка триватиме певний час.",
     "block_import_error": "Помилка імпортування блокувань",
     "block_import": "Імпорт блокувань",
     "block_export_button": "Експорт блокувань у файл CSV",
@@ -253,7 +260,7 @@
     "delete_account_description": "Остаточно видалити ваш обліковий запис та усі ваші повідомлення.",
     "delete_account": "Видалити обліковий запис",
     "default_vis": "Обсяг видимості за замовчуванням",
-    "data_import_export_tab": "Імпортування / експортування даних",
+    "data_import_export_tab": "Імпорт/експорт даних",
     "current_password": "Поточний пароль",
     "confirm_new_password": "Підтвердіть новий пароль",
     "composing": "Складання відповіді",
@@ -303,7 +310,43 @@
     "hide_attachments_in_convo": "Приховувати вкладення у розмовах",
     "mutes_tab": "Заглушені",
     "loop_video_silent_only": "Зациклити відео без звуку (напр. Mastodon \"gifs\")",
-    "loop_video": "Зациклити відео"
+    "loop_video": "Зациклити відео",
+    "mfa": {
+      "verify": {
+        "desc": "Щоб увімкнути двофакторну автентифікацію, введіть код з вашого застосунку для двофакторної автентифікації:"
+      },
+      "scan": {
+        "desc": "Відскануйте цей QR-код за допомогою програми двофакторної автентифікації або введіть текстовий ключ:",
+        "title": "Сканування",
+        "secret_code": "Ключ"
+      },
+      "authentication_methods": "Методи автентифікації",
+      "recovery_codes_warning": "Запишіть ці коди і тримайте в безпечному місці - інакше ви їх ніколи не побачите. Якщо ви втратите доступ до OTP додатку - без резервних кодів ви не зможете отримати доступ до свого облікового запису.",
+      "waiting_a_recovery_codes": "Отримую резервні коди…",
+      "recovery_codes": "Резервні коди.",
+      "warning_of_generate_new_codes": "Після отримання нових резервних кодів, старі перестануть працювати.",
+      "generate_new_recovery_codes": "Згенерувати нові резервні коди",
+      "title": "Двофакторна автентифікація",
+      "confirm_and_enable": "Підтвердити та увімкнути OTP",
+      "wait_pre_setup_otp": "попереднє налаштування OTP",
+      "setup_otp": "Налаштування OTP",
+      "otp": "OTP"
+    },
+    "enter_current_password_to_confirm": "Введіть свій поточний пароль",
+    "security": "Безпека",
+    "domain_mutes": "Домени",
+    "discoverable": "Дозволити виявлення цього облікового запису в результатах пошуку та інших службах",
+    "mutes_and_blocks": "Ігнорування та блокування",
+    "changed_email": "Email успішно змінено!",
+    "change_email_error": "Сталася помилка під час зміни email.",
+    "change_email": "Змінити email",
+    "bot": "Це обліковий запис бота",
+    "import_mutes_from_a_csv_file": "Імпорт ігнорувань з файлу CSV",
+    "mutes_imported": "Ігнорування імпортовані! Їх обробка триватиме певний час.",
+    "mute_export_button": "Експорт ігнорувань у файл CSV",
+    "mute_import_error": "Під час імпорту ігнорувань сталася помилка",
+    "mute_import": "Імпорт ігнорувань",
+    "mute_export": "Експорт ігнорувань"
   },
   "selectable_list": {
     "select_all": "Вибрати все"
@@ -329,6 +372,7 @@
     "password_confirm": "Підтвердження паролю",
     "fullname": "Відображене ім'я",
     "email": "Ел. пошта",
-    "bio": "Про себе"
+    "bio": "Про себе",
+    "captcha": "CAPTCHA"
   }
 }

From ae3ded9185c0bce66906b1d676b918bfeb4fee4f Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Tue, 1 Dec 2020 18:11:24 +0000
Subject: [PATCH 146/389] Translated using Weblate (Ukrainian)

Currently translated at 51.5% (346 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 4ea556db..5bb66b97 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -346,7 +346,27 @@
     "mute_export_button": "Експорт ігнорувань у файл CSV",
     "mute_import_error": "Під час імпорту ігнорувань сталася помилка",
     "mute_import": "Імпорт ігнорувань",
-    "mute_export": "Експорт ігнорувань"
+    "mute_export": "Експорт ігнорувань",
+    "new_password": "Новий пароль",
+    "new_email": "Нова ел. пошта",
+    "name_bio": "Особисті дані",
+    "set_new_profile_banner": "Встановити нову обкладинку",
+    "set_new_avatar": "Встановити новий аватар",
+    "security_tab": "Безпека",
+    "saving_ok": "Налаштування збережені",
+    "saving_err": "Помилка при збереженні налаштувань",
+    "reply_visibility_self": "Показувати лише адресовані мені відповіді",
+    "reply_visibility_following": "Показувати відповіді адресовані лише мені або користувачам, яких я читаю",
+    "reply_visibility_all": "Показати всі відповіді",
+    "replies_in_timeline": "Відповіді в стрічці",
+    "profile_tab": "Профіль",
+    "profile_banner": "Банер профілю",
+    "profile_background": "Обкладинка профілю",
+    "revoke_token": "Відкликати",
+    "oauth_tokens": "OAuth ключі",
+    "token": "Ключ",
+    "refresh_token": "Оновити ключ",
+    "valid_until": "Діє до"
   },
   "selectable_list": {
     "select_all": "Вибрати все"
@@ -374,5 +394,21 @@
     "email": "Ел. пошта",
     "bio": "Про себе",
     "captcha": "CAPTCHA"
+  },
+  "who_to_follow": {
+    "who_to_follow": "На кого підписатися"
+  },
+  "tool_tip": {
+    "repeat": "Поширити",
+    "reply": "Відповісти",
+    "add_reaction": "Додати реакцію",
+    "user_settings": "Налаштування користувача"
+  },
+  "upload": {
+    "error": {
+      "base": "Збій при завантаженні.",
+      "file_too_big": "Файл завеликий [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Спробуйте ще раз пізніше"
+    }
   }
 }

From 55b0b8125251e2a47c8f37f831be28529720d6a9 Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Tue, 1 Dec 2020 19:31:08 +0000
Subject: [PATCH 147/389] Translated using Weblate (Ukrainian)

Currently translated at 51.5% (346 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 5bb66b97..da2c0cdb 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -297,7 +297,7 @@
     "inputRadius": "Поля вводу",
     "import_theme": "Завантажити переднабір",
     "import_followers_from_a_csv_file": "Імпортувати відстежуваних з csv файлу",
-    "import_blocks_from_a_csv_file": "Імпортувати блокувань з csv файлу",
+    "import_blocks_from_a_csv_file": "Імпортувати заблокованих з csv файлу",
     "hide_filtered_statuses": "Сховати відфільтровані статуси",
     "hide_user_stats": "Приховувати статистику користувачів (напр. кількість відстежувачів)",
     "hide_post_stats": "Приховувати статистику дописів (напр. кількість улюблених)",
@@ -336,15 +336,15 @@
     "security": "Безпека",
     "domain_mutes": "Домени",
     "discoverable": "Дозволити виявлення цього облікового запису в результатах пошуку та інших службах",
-    "mutes_and_blocks": "Ігнорування та блокування",
+    "mutes_and_blocks": "Заглушені та блоковані",
     "changed_email": "Email успішно змінено!",
     "change_email_error": "Сталася помилка під час зміни email.",
     "change_email": "Змінити email",
     "bot": "Це обліковий запис бота",
-    "import_mutes_from_a_csv_file": "Імпорт ігнорувань з файлу CSV",
-    "mutes_imported": "Ігнорування імпортовані! Їх обробка триватиме певний час.",
-    "mute_export_button": "Експорт ігнорувань у файл CSV",
-    "mute_import_error": "Під час імпорту ігнорувань сталася помилка",
+    "import_mutes_from_a_csv_file": "Імпорт заглушених з csv файлу",
+    "mutes_imported": "Заглушені імпортовані! Їх обробка триватиме певний час.",
+    "mute_export_button": "Експорт заглушених у csv файл",
+    "mute_import_error": "Під час імпорту заглушених сталася помилка",
     "mute_import": "Імпорт ігнорувань",
     "mute_export": "Експорт ігнорувань",
     "new_password": "Новий пароль",
@@ -366,13 +366,32 @@
     "oauth_tokens": "OAuth ключі",
     "token": "Ключ",
     "refresh_token": "Оновити ключ",
-    "valid_until": "Діє до"
+    "valid_until": "Діє до",
+    "use_contain_fit": "Не обрізати краї мініатюр",
+    "name": "Ім'я",
+    "profile_fields": {
+      "value": "Зміст",
+      "name": "Назва",
+      "add_field": "Додати поле",
+      "label": "Метадані профілю"
+    },
+    "play_videos_in_modal": "Відтворювати відео у спливаючій рамці",
+    "accent": "Акцент",
+    "chatMessageRadius": "Повідомлення в бесіді",
+    "notification_mutes": "Щоб перестати отримувати сповіщення від певного користувача, заглушіть його.",
+    "user_mutes": "Користувачі",
+    "no_mutes": "Нема заглушених",
+    "emoji_reactions_on_timeline": "Показувати реакції емоджі на стрічці",
+    "pad_emoji": "Додавати простір з обидвох сторін емоджі, при додаванні з панелі",
+    "allow_following_move": "Дозволити автостеження при переміщенні на інший інстанс"
   },
   "selectable_list": {
     "select_all": "Вибрати все"
   },
   "remote_user_resolver": {
-    "error": "Не знайдено."
+    "error": "Не знайдено.",
+    "searching_for": "Шукаю",
+    "remote_user_resolver": "Пошукова система для віддалених користувачів"
   },
   "registration": {
     "validations": {

From 9657a5a098b156ad6eb5a5b1a6f88c5b0139ce28 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Tue, 1 Dec 2020 20:45:31 +0000
Subject: [PATCH 148/389] Translated using Weblate (Ukrainian)

Currently translated at 58.4% (392 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 58 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index da2c0cdb..aabfa969 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -191,7 +191,7 @@
   "interactions": {
     "load_older": "Завантажити давніші взаємодії",
     "follows": "Нові підписки",
-    "favs_repeats": "Повтори і улюблене",
+    "favs_repeats": "Повтори та вподобайки",
     "moves": "Міграції користувачів"
   },
   "errors": {
@@ -270,7 +270,7 @@
     "change_password": "Змінити пароль",
     "cRed": "Червоний (Скасувати)",
     "cGreen": "Зелений (Поширити)",
-    "cOrange": "Жовтогарячий (Улюблене)",
+    "cOrange": "Жовтогарячий (Вподобайки)",
     "cBlue": "Блакитний (Відповісти, читати)",
     "btnRadius": "Кнопки",
     "blocks_tab": "Блокування",
@@ -300,7 +300,7 @@
     "import_blocks_from_a_csv_file": "Імпортувати заблокованих з csv файлу",
     "hide_filtered_statuses": "Сховати відфільтровані статуси",
     "hide_user_stats": "Приховувати статистику користувачів (напр. кількість відстежувачів)",
-    "hide_post_stats": "Приховувати статистику дописів (напр. кількість улюблених)",
+    "hide_post_stats": "Приховувати статистику дописів (напр. кількість вподобаних)",
     "use_one_click_nsfw": "Відкривати NSFW вкладення одним кліком миші",
     "preload_images": "Передзавантажувати світлини",
     "hide_isp": "Сховати панель з особливостями сервера",
@@ -350,7 +350,7 @@
     "new_password": "Новий пароль",
     "new_email": "Нова ел. пошта",
     "name_bio": "Особисті дані",
-    "set_new_profile_banner": "Встановити нову обкладинку",
+    "set_new_profile_banner": "Встановити новий банер",
     "set_new_avatar": "Встановити новий аватар",
     "security_tab": "Безпека",
     "saving_ok": "Налаштування збережені",
@@ -383,7 +383,22 @@
     "no_mutes": "Нема заглушених",
     "emoji_reactions_on_timeline": "Показувати реакції емоджі на стрічці",
     "pad_emoji": "Додавати простір з обидвох сторін емоджі, при додаванні з панелі",
-    "allow_following_move": "Дозволити автостеження при переміщенні на інший інстанс"
+    "allow_following_move": "Дозволити автостеження при переміщенні на інший інстанс",
+    "set_new_profile_background": "Встановити нову обкладинку профілю",
+    "radii_help": "Радіус заокруглення кутів інтерфейсу (в пікселях)",
+    "presets": "Переднабір",
+    "show_moderator_badge": "Показувати значок модератора в моєму профілі",
+    "show_admin_badge": "Показувати значок адміністратора в моєму профілі",
+    "hide_followers_description": "Не показувати хто підписаний на мене",
+    "hide_follows_description": "Не показувати на кого я підписаний",
+    "no_rich_text_description": "Видалення всього форматування тексту з усіх дописів",
+    "notification_visibility_emoji_reactions": "Реакції",
+    "notification_visibility_moves": "Міграція користувача",
+    "notification_visibility_repeats": "Поширення допису",
+    "notification_visibility_mentions": "Згадування",
+    "notification_visibility_likes": "Вподобайки",
+    "notification_visibility_follows": "Нові підписки",
+    "notification_visibility": "Отримувати сповіщення про наступні події"
   },
   "selectable_list": {
     "select_all": "Вибрати все"
@@ -429,5 +444,38 @@
       "file_too_big": "Файл завеликий [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
       "default": "Спробуйте ще раз пізніше"
     }
+  },
+  "time": {
+    "weeks_short": "{0}тижд.",
+    "week_short": "{0}тижд.",
+    "years_short": "{0}р",
+    "year_short": "{0}р",
+    "years": "{0} роки",
+    "year": "{0} рік",
+    "weeks": "{0} тижднів",
+    "week": "{0} тиждень",
+    "second_short": "{0}с",
+    "second": "{0} секунда",
+    "now_short": "щойно",
+    "now": "щойно",
+    "months_short": "{0}міс.",
+    "month_short": "{0}міс.",
+    "months": "{0} місяці",
+    "month": "{0} місяць",
+    "minutes_short": "{0}хв",
+    "hours_short": "{0}год",
+    "hour_short": "{0}год",
+    "day_short": "{0}д",
+    "minute_short": "{0}хв",
+    "minutes": "{0} хвилини",
+    "minute": "{0} хвилина",
+    "in_past": "{0} тому",
+    "hours": "{0} години",
+    "hour": "{0} година",
+    "days_short": "{0}д",
+    "days": "{0} дні",
+    "day": "{0} день",
+    "seconds_short": "{0}с",
+    "seconds": "{0} секунди"
   }
 }

From a4a0695c57d3229887c7ce496ff4b1c1d61c3edd Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Tue, 1 Dec 2020 22:00:55 +0000
Subject: [PATCH 149/389] Translated using Weblate (Ukrainian)

Currently translated at 58.4% (392 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index aabfa969..d08ebccb 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -417,9 +417,9 @@
       "fullname_required": "не може бути порожнім",
       "username_required": "не може бути порожнім"
     },
-    "bio_placeholder": "e.g.\nНаш народ завжди прагне волі для себе і бажає її для інших народів. Він боровся і бореться за правду і справедливість. Ми хочемо жити у згоді і взаємному шануванні з усіми народами доброї волі. Такі самі права визнаємо за іншими народами, за які боремося для себе.",
-    "fullname_placeholder": "e.g. Stepan Bandera",
-    "username_placeholder": "e.g. stepan",
+    "bio_placeholder": "напр.\nНаш народ завжди прагне волі для себе і бажає її для інших народів. Він боровся і бореться за правду і справедливість. Ми хочемо жити у згоді і взаємному шануванні з усіми народами доброї волі. Такі самі права визнаємо за іншими народами, за які боремося для себе.",
+    "fullname_placeholder": "напр. Степан Бандера",
+    "username_placeholder": "напр. stepan",
     "new_captcha": "Натисніть на зображення, щоб оновити код, якщо він нерозбірливий",
     "token": "Ключ запрошення",
     "registration": "Реєстрація",

From e713e17e9d7faf0f2a5db41cf8881a353017cc9b Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 1 Dec 2020 13:58:49 +0000
Subject: [PATCH 150/389] Translated using Weblate (Russian)

Currently translated at 68.5% (460 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 74 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 67 insertions(+), 7 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 828db789..8881ccf4 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -80,7 +80,7 @@
   },
   "interactions": {
     "favs_repeats": "Повторы и фавориты",
-    "follows": "Новые подписки",
+    "follows": "Новые читатели",
     "load_older": "Загрузить старые взаимодействия",
     "moves": "Миграции пользователей"
   },
@@ -102,7 +102,21 @@
       "private": "Для подписчиков - этот пост видят только подписчики",
       "public": "Публичный - этот пост виден всем",
       "unlisted": "Непубличный - этот пост не виден на публичных лентах"
-    }
+    },
+    "preview_empty": "Пустой предпросмотр",
+    "media_description_error": "Не удалось обновить вложение, попробуйте еще раз",
+    "empty_status_error": "Нельзя отправить пустой статус без вложений",
+    "preview": "Предпросмотр",
+    "direct_warning_to_first_only": "Это сообщение увидят только пользователи упомянутые в его начале.",
+    "direct_warning_to_all": "Это сообщение увидят все упомянутые пользователи.",
+    "content_type": {
+      "text/bbcode": "BBCode",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/plain": "Простой текст"
+    },
+    "media_description": "Описание вложения",
+    "new_status": "Написать новый статус"
   },
   "registration": {
     "bio": "Описание",
@@ -118,7 +132,12 @@
       "password_required": "не должен быть пустым",
       "password_confirmation_required": "не должно быть пустым",
       "password_confirmation_match": "должно совпадать с паролем"
-    }
+    },
+    "bio_placeholder": "например:\nПривет, я Игорь Печкин.\nРаботаю почтальоном в деревне Простоквашино. С недавних пор велосипедист.",
+    "fullname_placeholder": "например: Почтальон Печкин",
+    "username_placeholder": "например: pechkin",
+    "captcha": "Код подтверждения",
+    "new_captcha": "Нажмите на изображение чтобы получить новый код"
   },
   "settings": {
     "enter_current_password_to_confirm": "Введите свой текущий пароль",
@@ -370,7 +389,26 @@
       }
     },
     "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
-    "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)"
+    "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
+    "discoverable": "Разрешить показ аккаунта в поисковиках и других сервисах",
+    "default_vis": "Видимость постов по умолчанию",
+    "mutes_and_blocks": "Блокировки и игнорируемые",
+    "composing": "Составление постов",
+    "chatMessageRadius": "Сообщения в беседе",
+    "blocks_tab": "Блокировки",
+    "import_mutes_from_a_csv_file": "Импортирует игнорируемых из CSV файла",
+    "mutes_imported": "Игнорируемые импортированы! Обработка может занять некоторое время.",
+    "mute_import_error": "Произошла ошибка при импорте игнорируемых",
+    "mute_import": "Импорт игнорируемых",
+    "block_export_button": "Экспортирует блокировки в CSV файл",
+    "mute_export_button": "Экспортирует игнорируемых пользователей в CSV файл",
+    "mute_export": "Экспорт игнорируемых",
+    "blocks_imported": "Блокировки импортированы! Обработка может занять некоторое время.",
+    "block_import_error": "Произошла ошибка при импорте блокировок",
+    "block_import": "Импорт блокировок",
+    "block_export": "Экспортировать блокировки",
+    "security": "Безопасность",
+    "app_name": "Приложение"
   },
   "timeline": {
     "collapse": "Свернуть",
@@ -384,7 +422,9 @@
   },
   "status": {
     "bookmark": "В закладки",
-    "unbookmark": "Удалить из закладок"
+    "unbookmark": "Удалить из закладок",
+    "status_deleted": "Пост удален",
+    "reply_to": "Ответ"
   },
   "user_card": {
     "block": "Заблокировать",
@@ -422,7 +462,9 @@
       "quarantine": "Не федерировать посты пользователя",
       "delete_user": "Удалить пользователя",
       "delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
-    }
+    },
+    "media": "С вложениями",
+    "mention": "Упомянуть"
   },
   "user_profile": {
     "timeline_title": "Лента пользователя"
@@ -495,7 +537,8 @@
   },
   "tool_tip": {
     "accept_follow_request": "Принять запрос на чтение",
-    "reject_follow_request": "Отклонить запрос на чтение"
+    "reject_follow_request": "Отклонить запрос на чтение",
+    "media_upload": "Прикрепить вложение"
   },
   "image_cropper": {
     "save_without_cropping": "Сохранить не обрезая",
@@ -528,5 +571,22 @@
     "error": "Произошла ошибка при импорте файла.",
     "success": "Импорт прошел успешно.",
     "submit": "Отправить"
+  },
+  "selectable_list": {
+    "select_all": "Выбрать все"
+  },
+  "emoji": {
+    "load_all": "Все {emojiAmount} эмодзи загружаются",
+    "load_all_hint": "Загружены первые {saneAmount} эмодзи, загрузка всех эмодзи может привести к проблемам с производительностью.",
+    "unicode": "Стандартные эмодзи",
+    "custom": "Пользовательские эмодзи",
+    "add_emoji": "Добавить эмодзи",
+    "search_emoji": "Поиск эмодзи",
+    "keep_open": "Оставить окно выбора открытым",
+    "emoji": "Эмодзи",
+    "stickers": "Стикеры"
+  },
+  "shoutbox": {
+    "title": "Болтовня"
   }
 }

From 8fbf91f3e85196797775a51a530784085827c50d Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 2 Dec 2020 15:32:46 +0000
Subject: [PATCH 151/389] Translated using Weblate (Russian)

Currently translated at 68.5% (460 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 8881ccf4..cbee5350 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -19,7 +19,7 @@
     "optional": "не обязательно",
     "show_less": "Показать меньше",
     "show_more": "Показать больше",
-    "peek": "Взглянуть",
+    "peek": "Свернуть",
     "dismiss": "Закрыть",
     "retry": "Попробуйте еще раз",
     "error_retry": "Пожалуйста попробуйте еще раз",

From 60121775f21522547d08ccf8e15c2f6db423624f Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 16:23:21 +0000
Subject: [PATCH 152/389] Translated using Weblate (Ukrainian)

Currently translated at 58.8% (395 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index d08ebccb..13634e0d 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -398,7 +398,9 @@
     "notification_visibility_mentions": "Згадування",
     "notification_visibility_likes": "Вподобайки",
     "notification_visibility_follows": "Нові підписки",
-    "notification_visibility": "Отримувати сповіщення про наступні події"
+    "notification_visibility": "Отримувати сповіщення про наступні події",
+    "settings": "Налаштування",
+    "panelRadius": "Панелі"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From d9b4c87dda3d46b39dd2f33022be308116bbe185 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 2 Dec 2020 16:26:51 +0000
Subject: [PATCH 153/389] Translated using Weblate (Ukrainian)

Currently translated at 58.8% (395 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 13634e0d..41f9df24 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -400,7 +400,8 @@
     "notification_visibility_follows": "Нові підписки",
     "notification_visibility": "Отримувати сповіщення про наступні події",
     "settings": "Налаштування",
-    "panelRadius": "Панелі"
+    "panelRadius": "Панелі",
+    "text": "Текст "
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From c823800a67f30cbbd52028921ec188ae9dec1831 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 16:27:05 +0000
Subject: [PATCH 154/389] Translated using Weblate (Ukrainian)

Currently translated at 59.7% (401 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 41f9df24..c5a75fcb 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -401,7 +401,8 @@
     "notification_visibility": "Отримувати сповіщення про наступні події",
     "settings": "Налаштування",
     "panelRadius": "Панелі",
-    "text": "Текст "
+    "text": "Текст",
+    "tooltipRadius": "Підказки/попередження"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 66ad886e33ce9031ff0768b1cfc942ef17d47e4c Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 2 Dec 2020 16:27:22 +0000
Subject: [PATCH 155/389] Translated using Weblate (Ukrainian)

Currently translated at 59.7% (401 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index c5a75fcb..a53044f4 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -402,7 +402,14 @@
     "settings": "Налаштування",
     "panelRadius": "Панелі",
     "text": "Текст",
-    "tooltipRadius": "Підказки/попередження"
+    "tooltipRadius": "Підказки/попередження",
+    "values": {
+      "true": "так",
+      "false": "ні"
+    },
+    "user_settings": "Користувацькі налаштування",
+    "upload_a_photo": "Завантажити фото ",
+    "theme": "Тема"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 78b052b6fc96e602d93b452c692b87e48dc34133 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 16:31:20 +0000
Subject: [PATCH 156/389] Translated using Weblate (Ukrainian)

Currently translated at 61.6% (414 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index a53044f4..97ce4fe5 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -408,8 +408,20 @@
       "false": "ні"
     },
     "user_settings": "Користувацькі налаштування",
-    "upload_a_photo": "Завантажити фото ",
-    "theme": "Тема"
+    "upload_a_photo": "Завантажити фото",
+    "theme": "Тема",
+    "style": {
+      "switcher": {
+        "keep_fonts": "Залишити шрифти",
+        "keep_roundness": "Залишити скруглення",
+        "keep_opacity": "Залишити прозорості",
+        "keep_shadows": "Залишити тіні",
+        "keep_color": "Залишити кольори"
+      }
+    },
+    "enable_web_push_notifications": "Увімкнути web push-сповіщення",
+    "notifications": "Сповіщення",
+    "fun": "Розваги"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 061a500e0a0bb2948e7640357aa260ca1b47ffe3 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 2 Dec 2020 16:31:43 +0000
Subject: [PATCH 157/389] Translated using Weblate (Ukrainian)

Currently translated at 61.6% (414 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 97ce4fe5..076dc70b 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -416,12 +416,17 @@
         "keep_roundness": "Залишити скруглення",
         "keep_opacity": "Залишити прозорості",
         "keep_shadows": "Залишити тіні",
-        "keep_color": "Залишити кольори"
+        "keep_color": "Залишити кольори",
+        "use_source": "Нова версія",
+        "use_snapshot": "Стара версія",
+        "load_theme": "Завантажити тему "
       }
     },
     "enable_web_push_notifications": "Увімкнути web push-сповіщення",
     "notifications": "Сповіщення",
-    "fun": "Розваги"
+    "fun": "Розваги",
+    "notification_setting_privacy": "Приватність",
+    "notification_setting_filters": "Фільтри"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From ed5c1c0a4ca74cfa12ab685acecac4fd660fa301 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 16:42:31 +0000
Subject: [PATCH 158/389] Translated using Weblate (Ukrainian)

Currently translated at 61.9% (416 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 076dc70b..2fcacedc 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -419,7 +419,10 @@
         "keep_color": "Залишити кольори",
         "use_source": "Нова версія",
         "use_snapshot": "Стара версія",
-        "load_theme": "Завантажити тему "
+        "load_theme": "Завантажити тему"
+      },
+      "common": {
+        "color": "Колір"
       }
     },
     "enable_web_push_notifications": "Увімкнути web push-сповіщення",

From a5b961ed3113a8dac0ac44196a3a829f55f455e4 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 2 Dec 2020 16:47:32 +0000
Subject: [PATCH 159/389] Translated using Weblate (Ukrainian)

Currently translated at 61.9% (416 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 2fcacedc..4a142ed8 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -429,7 +429,8 @@
     "notifications": "Сповіщення",
     "fun": "Розваги",
     "notification_setting_privacy": "Приватність",
-    "notification_setting_filters": "Фільтри"
+    "notification_setting_filters": "Фільтри",
+    "reset_avatar": "Скинути аватар "
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 4f54b0123ad526bfc14726ac8bf5864f711b06d4 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 16:47:53 +0000
Subject: [PATCH 160/389] Translated using Weblate (Ukrainian)

Currently translated at 62.5% (420 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 4a142ed8..86b18cf9 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -430,7 +430,8 @@
     "fun": "Розваги",
     "notification_setting_privacy": "Приватність",
     "notification_setting_filters": "Фільтри",
-    "reset_avatar": "Скинути аватар "
+    "reset_avatar": "Скинути аватар",
+    "reset_profile_background": "Скинути обкладинку профілю"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 6111affc61f877a673c9ade8c6e384a2ef8df97d Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 2 Dec 2020 16:48:55 +0000
Subject: [PATCH 161/389] Translated using Weblate (Ukrainian)

Currently translated at 62.5% (420 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 86b18cf9..4b95488f 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -431,7 +431,9 @@
     "notification_setting_privacy": "Приватність",
     "notification_setting_filters": "Фільтри",
     "reset_avatar": "Скинути аватар",
-    "reset_profile_background": "Скинути обкладинку профілю"
+    "reset_profile_background": "Скинути обкладинку профілю",
+    "reset_avatar_confirm": "Ви дійсно хочете скинути аватар?  ",
+    "reset_profile_banner": "Скинули банер профілю"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From be2e6f39aa7474ed4b15ea050ef690ddb02df361 Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Wed, 2 Dec 2020 16:49:14 +0000
Subject: [PATCH 162/389] Translated using Weblate (Ukrainian)

Currently translated at 62.5% (420 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 4b95488f..2517c736 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -433,7 +433,8 @@
     "reset_avatar": "Скинути аватар",
     "reset_profile_background": "Скинути обкладинку профілю",
     "reset_avatar_confirm": "Ви дійсно хочете скинути аватар?  ",
-    "reset_profile_banner": "Скинули банер профілю"
+    "reset_profile_banner": "Скинули банер профілю",
+    "hide_follows_count_description": "Не показувати кількість підписників"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From a3f6476ae1e203d901fcd9d55911f3ebc6a1a62f Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 16:49:41 +0000
Subject: [PATCH 163/389] Translated using Weblate (Ukrainian)

Currently translated at 62.7% (421 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 2517c736..63881e4b 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -432,7 +432,7 @@
     "notification_setting_filters": "Фільтри",
     "reset_avatar": "Скинути аватар",
     "reset_profile_background": "Скинути обкладинку профілю",
-    "reset_avatar_confirm": "Ви дійсно хочете скинути аватар?  ",
+    "reset_avatar_confirm": "Ви дійсно хочете скинути аватар?",
     "reset_profile_banner": "Скинули банер профілю",
     "hide_follows_count_description": "Не показувати кількість підписників"
   },

From 291d9929f8e56b57c4c53378b58496750fe49319 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 2 Dec 2020 16:49:56 +0000
Subject: [PATCH 164/389] Translated using Weblate (Ukrainian)

Currently translated at 62.7% (421 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 63881e4b..5c4982af 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -434,7 +434,8 @@
     "reset_profile_background": "Скинути обкладинку профілю",
     "reset_avatar_confirm": "Ви дійсно хочете скинути аватар?",
     "reset_profile_banner": "Скинули банер профілю",
-    "hide_follows_count_description": "Не показувати кількість підписників"
+    "hide_follows_count_description": "Не показувати кількість підписників",
+    "reset_banner_confirm": "Ви дійсно хочете скинути банер? "
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 35773e2339cee2fc6131b14aab43dcf1db354747 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 16:50:09 +0000
Subject: [PATCH 165/389] Translated using Weblate (Ukrainian)

Currently translated at 63.0% (423 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 5c4982af..2559f9f8 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -435,7 +435,8 @@
     "reset_avatar_confirm": "Ви дійсно хочете скинути аватар?",
     "reset_profile_banner": "Скинули банер профілю",
     "hide_follows_count_description": "Не показувати кількість підписників",
-    "reset_banner_confirm": "Ви дійсно хочете скинути банер? "
+    "reset_banner_confirm": "Ви дійсно хочете скинути банер?",
+    "reset_background_confirm": "Ви дійсно хочете скинути обкладинку?"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 6923d5f983ae9474e32430af7c740d8b6b3ec9e0 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 2 Dec 2020 16:51:23 +0000
Subject: [PATCH 166/389] Translated using Weblate (Ukrainian)

Currently translated at 63.0% (423 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 2559f9f8..174a576a 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -419,7 +419,8 @@
         "keep_color": "Залишити кольори",
         "use_source": "Нова версія",
         "use_snapshot": "Стара версія",
-        "load_theme": "Завантажити тему"
+        "load_theme": "Завантажити тему",
+        "reset": "Скинути "
       },
       "common": {
         "color": "Колір"

From fdcd4828eddd4e593bcbb2508ea41c1a4f16632a Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 16:51:33 +0000
Subject: [PATCH 167/389] Translated using Weblate (Ukrainian)

Currently translated at 63.1% (424 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 174a576a..c7916202 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -420,7 +420,7 @@
         "use_source": "Нова версія",
         "use_snapshot": "Стара версія",
         "load_theme": "Завантажити тему",
-        "reset": "Скинути "
+        "reset": "Скинути"
       },
       "common": {
         "color": "Колір"

From c20c418e6d427d755944ddb2cba0e994f10ac4ca Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 2 Dec 2020 16:51:49 +0000
Subject: [PATCH 168/389] Translated using Weblate (Ukrainian)

Currently translated at 63.1% (424 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index c7916202..7abd4972 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -420,7 +420,8 @@
         "use_source": "Нова версія",
         "use_snapshot": "Стара версія",
         "load_theme": "Завантажити тему",
-        "reset": "Скинути"
+        "reset": "Скинути",
+        "clear_all": "Очистити все "
       },
       "common": {
         "color": "Колір"

From 8a260f4102c296e40ba33b95d0e70c75992fa897 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 16:51:56 +0000
Subject: [PATCH 169/389] Translated using Weblate (Ukrainian)

Currently translated at 66.4% (446 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 7abd4972..12e53b4b 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -421,10 +421,35 @@
         "use_snapshot": "Стара версія",
         "load_theme": "Завантажити тему",
         "reset": "Скинути",
-        "clear_all": "Очистити все "
+        "clear_all": "Очистити все"
       },
       "common": {
         "color": "Колір"
+      },
+      "preview": {
+        "mono": "змісту",
+        "text": "Трохи більше {0} та {1}",
+        "button": "Кнопка",
+        "error": "Приклад помилки",
+        "content": "Зміст",
+        "header": "Попередній перегляд"
+      },
+      "shadows": {
+        "components": {
+          "button": "Кнопка",
+          "input": "Поле вводу"
+        },
+        "component": "Компонент"
+      },
+      "fonts": {
+        "components": {
+          "input": "Поля вводу",
+          "interface": "Інтерфейс"
+        },
+        "_tab_label": "Шрифти"
+      },
+      "advanced_colors": {
+        "alert_warning": "Попередження"
       }
     },
     "enable_web_push_notifications": "Увімкнути web push-сповіщення",

From 0f2841a98a9be5324a949e6c3edab09b12fdc21b Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Wed, 2 Dec 2020 16:53:24 +0000
Subject: [PATCH 170/389] Translated using Weblate (Ukrainian)

Currently translated at 66.4% (446 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 12e53b4b..4026287e 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -50,9 +50,9 @@
     "staff": "Адміністрація",
     "mrf": {
       "simple": {
-        "media_nsfw_desc": "Даний інстанс примусово позначає вкладення з наступних інстансів як NSFW:",
+        "media_nsfw_desc": "Даний інстанс примусово позначає вкладення в наступних інстансах як NSFW:",
         "media_nsfw": "Примусове визначення вкладення як дратівливого",
-        "media_removal_desc": "Поточний інстанс видаляє вкладення на перелічених інстансах:",
+        "media_removal_desc": "Поточний інстанс видаляє вкладення з дописів на перелічених інстансах:",
         "media_removal": "Видалення вкладень",
         "ftl_removal_desc": "Цей інстанс видаляє перелічені інстанси з \"Усієї відомої мережі\":",
         "ftl_removal": "Видалення з \"Усієї відомої мережі\"",
@@ -461,9 +461,18 @@
     "reset_profile_background": "Скинути обкладинку профілю",
     "reset_avatar_confirm": "Ви дійсно хочете скинути аватар?",
     "reset_profile_banner": "Скинули банер профілю",
-    "hide_follows_count_description": "Не показувати кількість підписників",
+    "hide_follows_count_description": "Не показувати на кого я підписаний",
     "reset_banner_confirm": "Ви дійсно хочете скинути банер?",
-    "reset_background_confirm": "Ви дійсно хочете скинути обкладинку?"
+    "reset_background_confirm": "Ви дійсно хочете скинути обкладинку?",
+    "subject_line_behavior": "Вигляд теми при відповіді",
+    "subject_input_always_show": "Завжди показувати поле для вводу теми",
+    "minimal_scopes_mode": "Мінімізувати набір варіантів осягу для допису",
+    "scope_copy": "Копіювати осяг при відповіді (завжди ввімкнено для особистих повідомлень)",
+    "search_user_to_mute": "Шукайте кого ви хочете заглушити",
+    "search_user_to_block": "Шукайте кого ви хочете заблокувати",
+    "autohide_floating_post_button": "Автоматично ховати кнопку \"Новий допис\" (в мобільній версії)",
+    "pause_on_unfocused": "Призупинити трансляцію, коли вкладка неактивна",
+    "hide_followers_count_description": "Не показувати тих, хто на мене підписаний"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 3dcbc2c294067f74d407e6a41a7530035d3021f2 Mon Sep 17 00:00:00 2001
From: "W.W" <clubemail@ukr.net>
Date: Wed, 2 Dec 2020 17:25:05 +0000
Subject: [PATCH 171/389] Translated using Weblate (Ukrainian)

Currently translated at 74.8% (502 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 4026287e..d904ce68 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -380,7 +380,7 @@
     "chatMessageRadius": "Повідомлення в бесіді",
     "notification_mutes": "Щоб перестати отримувати сповіщення від певного користувача, заглушіть його.",
     "user_mutes": "Користувачі",
-    "no_mutes": "Нема заглушених",
+    "no_mutes": "Заглушені відсутні",
     "emoji_reactions_on_timeline": "Показувати реакції емоджі на стрічці",
     "pad_emoji": "Додавати простір з обидвох сторін емоджі, при додаванні з панелі",
     "allow_following_move": "Дозволити автостеження при переміщенні на інший інстанс",
@@ -421,7 +421,16 @@
         "use_snapshot": "Стара версія",
         "load_theme": "Завантажити тему",
         "reset": "Скинути",
-        "clear_all": "Очистити все"
+        "clear_all": "Очистити все",
+        "help": {
+          "older_version_imported": "Імпортований файл було створено в старішій версії FE.",
+          "future_version_imported": "Імпортований файл було створено в новішій версії FE.",
+          "v2_imported": "Файл, який ви імпортували, був створений для старішої версії інтерфейсу Pleroma. Ми намагаємось покращити сумісність, але все одно можуть бути розбіжності.",
+          "upgraded_from_v2": "PleromaFE було оновлено, тема може дещо відрізнятися від тієї, яку ви пам’ятаєте."
+        },
+        "keep_as_is": "Залишити як є",
+        "clear_opacity": "Очистити прозорість",
+        "save_load_hint": "Параметри \"Зберегти\" зберігають встановлені на даний момент параметри під час вибору або завантаження тем, вони також зберігають зазначені параметри під час експорту теми. Коли всі прапорці знято, експортування теми збереже все."
       },
       "common": {
         "color": "Колір"
@@ -472,7 +481,26 @@
     "search_user_to_block": "Шукайте кого ви хочете заблокувати",
     "autohide_floating_post_button": "Автоматично ховати кнопку \"Новий допис\" (в мобільній версії)",
     "pause_on_unfocused": "Призупинити трансляцію, коли вкладка неактивна",
-    "hide_followers_count_description": "Не показувати тих, хто на мене підписаний"
+    "hide_followers_count_description": "Не показувати кількість читачів",
+    "notification_blocks": "Блокування користувача зупиняє всі сповіщення від нього, а також скасовує його відстеження.",
+    "notification_setting_hide_notification_contents": "Ховати відправника та вміст push-сповіщень",
+    "notification_setting_block_from_strangers": "Блокувати сповіщення від користувачів за якими ви не слідкуєте",
+    "type_domains_to_mute": "Пошук доменів для заглушення",
+    "nsfw_clickthrough": "Увімкнути приховування NSFW медіа",
+    "greentext": "Відображувати \">  такий текст\" зеленим кольором (використовуючи \"зелений\" з оболонки, яка використовується).",
+    "virtual_scrolling": "Оптимізувати оновлення стрчки",
+    "theme_help_v2_2": "Піктограми під деякими записами є показниками контрасту між фоном та текстом. Коли ви наведете на них курсор, ви отримаєте детальну інформацію. Пам'ятайте, якщо ви використовуєте прозорість, індикатори показують найгірший варіант.",
+    "theme_help_v2_1": "Ви також можете замінити кольори та видимість окремих компонентів, перемикаючи прапорці, використовуйте \"Очистити все\", щоб видалити всі заміни.",
+    "theme_help": "Використовувати шістнадцяткові коди кольору (#rrggbb) щоб редагувати оболонку.",
+    "no_blocks": "Блокування відсутні",
+    "subject_line_mastodon": "Як в mastodon: просто скопіювати",
+    "subject_line_email": "Як в email: \"re: тема\"",
+    "useStreamingApiWarning": "(Не рекомендується, експериментально, повідомлення можуть зникати)",
+    "useStreamingApi": "Отримувати повідомлення та сповіщення в режимі реального часу",
+    "streaming": "Ввімкнути автоматичне завантаження нових повідомлень при прокручуванні вгору",
+    "stop_gifs": "Відтворювати GIF анімації тільки при наведенні",
+    "post_status_content_type": "Тип вмісту допису",
+    "subject_line_noop": "Не копіювати"
   },
   "selectable_list": {
     "select_all": "Вибрати все"

From 2ac23d8318ec9605b4f875d0ae91d772b2004faa Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 17:31:41 +0000
Subject: [PATCH 172/389] Translated using Weblate (Ukrainian)

Currently translated at 74.8% (502 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index d904ce68..d4a00772 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -164,7 +164,9 @@
     "too_many_requests": "Ви досягли ліміту спроб, спробуйте ще раз пізніше.",
     "password_reset_required_but_mailer_is_disabled": "Ви повинні скинути свій пароль, але скидання пароля вимкнено. Зверніться до адміністратора інстансу.",
     "password_reset_disabled": "Скидання пароля вимкнено. Зверніться до адміністратора інстансу.",
-    "password_reset_required": "Для входу потрібно скинути пароль."
+    "password_reset_required": "Для входу потрібно скинути пароль.",
+    "password_reset": "Відновити пароль",
+    "forgot_password": "Забули пароль?"
   },
   "chats": {
     "you": "Ви:",
@@ -441,7 +443,10 @@
         "button": "Кнопка",
         "error": "Приклад помилки",
         "content": "Зміст",
-        "header": "Попередній перегляд"
+        "header": "Попередній перегляд",
+        "link": "невеличке посилання",
+        "header_faint": "Це нормально",
+        "input": "Що нового?"
       },
       "shadows": {
         "components": {
@@ -500,7 +505,12 @@
     "streaming": "Ввімкнути автоматичне завантаження нових повідомлень при прокручуванні вгору",
     "stop_gifs": "Відтворювати GIF анімації тільки при наведенні",
     "post_status_content_type": "Тип вмісту допису",
-    "subject_line_noop": "Не копіювати"
+    "subject_line_noop": "Не копіювати",
+    "version": {
+      "frontend_version": "Версія фронтенду",
+      "backend_version": "Версія бекенду",
+      "title": "Версія"
+    }
   },
   "selectable_list": {
     "select_all": "Вибрати все"
@@ -579,5 +589,34 @@
     "day": "{0} день",
     "seconds_short": "{0}с",
     "seconds": "{0} секунди"
+  },
+  "search": {
+    "no_results": "Немає результатів",
+    "hashtags": "Хештеги",
+    "people": "Люди"
+  },
+  "user_card": {
+    "statuses": "Дописи",
+    "message": "Повідомлення",
+    "follow": "Підписатись",
+    "follow_unfollow": "Відписатись",
+    "follow_again": "Відправити запит знову?",
+    "follow_sent": "Запит відправлено!"
+  },
+  "status": {
+    "copy_link": "Скопіювати посилання на допис",
+    "status_unavailable": "Допис недоступний",
+    "replies_list": "Відповіді:",
+    "delete_confirm": "Ви дійсно хочете видалити цей допис?",
+    "delete": "Видалити допис"
+  },
+  "timeline": {
+    "no_more_statuses": "Більше немає дописів",
+    "up_to_date": "Оновлено",
+    "reload": "Оновити",
+    "show_new": "Показати нові",
+    "load_older": "Завантажити давніші дописи",
+    "error": "Помилка завантаження стрічки: {0}",
+    "collapse": "Згорнути"
   }
 }

From 2bbb01e751ecab728cfd9a0792f712e19acf915e Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 18:42:02 +0000
Subject: [PATCH 173/389] Translated using Weblate (Ukrainian)

Currently translated at 79.5% (534 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index d4a00772..ec27b4b5 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -617,6 +617,7 @@
     "show_new": "Показати нові",
     "load_older": "Завантажити давніші дописи",
     "error": "Помилка завантаження стрічки: {0}",
-    "collapse": "Згорнути"
+    "collapse": "Згорнути",
+    "conversation": "Розмова"
   }
 }

From ee0748bff535ed6ea5366edd041035b74881980d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Wed, 2 Dec 2020 18:43:52 +0000
Subject: [PATCH 174/389] Translated using Weblate (Ukrainian)

Currently translated at 79.5% (534 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index ec27b4b5..cb087bee 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -428,14 +428,33 @@
           "older_version_imported": "Імпортований файл було створено в старішій версії FE.",
           "future_version_imported": "Імпортований файл було створено в новішій версії FE.",
           "v2_imported": "Файл, який ви імпортували, був створений для старішої версії інтерфейсу Pleroma. Ми намагаємось покращити сумісність, але все одно можуть бути розбіжності.",
-          "upgraded_from_v2": "PleromaFE було оновлено, тема може дещо відрізнятися від тієї, яку ви пам’ятаєте."
+          "upgraded_from_v2": "PleromaFE було оновлено, тема може дещо відрізнятися від тієї, яку ви пам’ятаєте.",
+          "snapshot_source_mismatch": "Конфлікт версій: Швидше за все, FE повернуто до попередньої версії та оновлено знову, якщо ви змінили тему за допомогою старішої версії FE, швидше за все, ви хочете використовувати стару версію, інакше використовуйте нову версію.",
+          "migration_napshot_gone": "З якоїсь причини знімок зник, деякі речі можуть бути не такими, як ви пам’ятаєте.",
+          "migration_snapshot_ok": "Для безпеки, знімок теми завантажено. Ви можете спробувати завантажити дані теми.",
+          "fe_downgraded": "Версію PleromaFE змінено на старшу.",
+          "fe_upgraded": "Двигун теми PleromaFE оновлено.",
+          "snapshot_missing": "У файлі немає жодного знімка теми, тому він може виглядати інакше, ніж передбачалося спочатку.",
+          "snapshot_present": "Знімок теми завантажено, тому всі значення було перезаписано. Натомість ви можете завантажити правильні дані теми."
         },
         "keep_as_is": "Залишити як є",
         "clear_opacity": "Очистити прозорість",
         "save_load_hint": "Параметри \"Зберегти\" зберігають встановлені на даний момент параметри під час вибору або завантаження тем, вони також зберігають зазначені параметри під час експорту теми. Коли всі прапорці знято, експортування теми збереже все."
       },
       "common": {
-        "color": "Колір"
+        "color": "Колір",
+        "contrast": {
+          "context": {
+            "text": "для тексту",
+            "18pt": "для великого (18pt+) тексту"
+          },
+          "level": {
+            "bad": "Не відповідає жодним вимогам щодо доступності",
+            "aaa": "відповідає вимогам рівня ААA (рекомендований)",
+            "aa": "відповідає вимогам рівня АА (мінімальний)"
+          }
+        },
+        "opacity": "Прозорість"
       },
       "preview": {
         "mono": "змісту",
@@ -463,7 +482,27 @@
         "_tab_label": "Шрифти"
       },
       "advanced_colors": {
-        "alert_warning": "Попередження"
+        "alert_warning": "Попередження",
+        "underlay": "Тло",
+        "inputs": "Поля входу",
+        "buttons": "Кнопки",
+        "borders": "Кордони",
+        "top_bar": "Верхня смужка",
+        "panel_header": "Заголовок панелі",
+        "badge_notification": "Сповіщення",
+        "popover": "Підказки, меню, поповери",
+        "badge": "Тло значків",
+        "post": "Дописи/Дані користувачів",
+        "alert_neutral": "Нейтральний",
+        "alert_error": "Помилки",
+        "alert": "Фон сповіщень",
+        "_tab_label": "Додатково"
+      },
+      "common_colors": {
+        "rgbo": "Піктограми, акценти, значки",
+        "foreground_hint": "Перегляньте вкладку \"Додатково\" для більшого контролю",
+        "main": "Загальні кольори",
+        "_tab_label": "Загальні"
       }
     },
     "enable_web_push_notifications": "Увімкнути web push-сповіщення",

From 00c762474fc5d7d0151849ec85a63c1520626cac Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Wed, 2 Dec 2020 23:31:38 +0000
Subject: [PATCH 175/389] Translated using Weblate (Ukrainian)

Currently translated at 79.8% (536 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index cb087bee..8c85bd50 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -496,7 +496,8 @@
         "alert_neutral": "Нейтральний",
         "alert_error": "Помилки",
         "alert": "Фон сповіщень",
-        "_tab_label": "Додатково"
+        "_tab_label": "Додатково",
+        "selectedPost": "Вибраний допис"
       },
       "common_colors": {
         "rgbo": "Піктограми, акценти, значки",

From 33e3ada7da24dc3fba2aaf31f4443e8516cdd72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Thu, 3 Dec 2020 10:30:24 +0000
Subject: [PATCH 176/389] Translated using Weblate (Ukrainian)

Currently translated at 79.8% (536 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 8c85bd50..1ed50973 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -290,7 +290,7 @@
     "lock_account_description": "Обмежте свій обліковий запис лише схваленими читачами",
     "links": "Посилання",
     "limited_availability": "Недоступно у вашому браузері",
-    "invalid_theme_imported": "Вибраний файл не є оболонкою Pleroma. Жодних змін не було внесено у вашу тему.",
+    "invalid_theme_imported": "Вибраний файл не є темою Pleroma. У вашу тему не внесено жодних змін.",
     "interfaceLanguage": "Мова оболонки",
     "interface": "Оболонка",
     "instance_default_simple": "(за замовчуванням)",
@@ -487,7 +487,7 @@
         "inputs": "Поля входу",
         "buttons": "Кнопки",
         "borders": "Кордони",
-        "top_bar": "Верхня смужка",
+        "top_bar": "Верхня панель",
         "panel_header": "Заголовок панелі",
         "badge_notification": "Сповіщення",
         "popover": "Підказки, меню, поповери",
@@ -532,11 +532,11 @@
     "notification_setting_block_from_strangers": "Блокувати сповіщення від користувачів за якими ви не слідкуєте",
     "type_domains_to_mute": "Пошук доменів для заглушення",
     "nsfw_clickthrough": "Увімкнути приховування NSFW медіа",
-    "greentext": "Відображувати \">  такий текст\" зеленим кольором (використовуючи \"зелений\" з оболонки, яка використовується).",
+    "greentext": "Мемний текст",
     "virtual_scrolling": "Оптимізувати оновлення стрчки",
     "theme_help_v2_2": "Піктограми під деякими записами є показниками контрасту між фоном та текстом. Коли ви наведете на них курсор, ви отримаєте детальну інформацію. Пам'ятайте, якщо ви використовуєте прозорість, індикатори показують найгірший варіант.",
     "theme_help_v2_1": "Ви також можете замінити кольори та видимість окремих компонентів, перемикаючи прапорці, використовуйте \"Очистити все\", щоб видалити всі заміни.",
-    "theme_help": "Використовувати шістнадцяткові коди кольору (#rrggbb) щоб редагувати оболонку.",
+    "theme_help": "Використовувати шістнадцяткові коди кольору (#rrggbb) щоб редагувати тему.",
     "no_blocks": "Блокування відсутні",
     "subject_line_mastodon": "Як в mastodon: просто скопіювати",
     "subject_line_email": "Як в email: \"re: тема\"",

From 037185a4634224e6696399193b7a2d367f813fd2 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Thu, 3 Dec 2020 11:34:40 +0000
Subject: [PATCH 177/389] Translated using Weblate (Ukrainian)

Currently translated at 79.8% (536 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 1ed50973..f9441eef 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -648,7 +648,8 @@
     "status_unavailable": "Допис недоступний",
     "replies_list": "Відповіді:",
     "delete_confirm": "Ви дійсно хочете видалити цей допис?",
-    "delete": "Видалити допис"
+    "delete": "Видалити допис",
+    "pin": "Закріпити в профілі "
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",

From 4667137fffab705999bccb237aae7308fb543b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Thu, 3 Dec 2020 11:34:56 +0000
Subject: [PATCH 178/389] Translated using Weblate (Ukrainian)

Currently translated at 80.0% (537 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index f9441eef..66932828 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -649,7 +649,7 @@
     "replies_list": "Відповіді:",
     "delete_confirm": "Ви дійсно хочете видалити цей допис?",
     "delete": "Видалити допис",
-    "pin": "Закріпити в профілі "
+    "pin": "Закріпити в профілі"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",

From ac45e410d36cf981b957e3d60d269bbb907d0797 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Thu, 3 Dec 2020 11:35:27 +0000
Subject: [PATCH 179/389] Translated using Weblate (Ukrainian)

Currently translated at 80.0% (537 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 66932828..0a0bc201 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -641,7 +641,8 @@
     "follow": "Підписатись",
     "follow_unfollow": "Відписатись",
     "follow_again": "Відправити запит знову?",
-    "follow_sent": "Запит відправлено!"
+    "follow_sent": "Запит відправлено!",
+    "blocked": "Заблоковано! "
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From 06d05b7b8261d9c0beacae1c0df0cfa504a15707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Thu, 3 Dec 2020 11:35:51 +0000
Subject: [PATCH 180/389] Translated using Weblate (Ukrainian)

Currently translated at 80.1% (538 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 0a0bc201..0691a24f 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -642,7 +642,7 @@
     "follow_unfollow": "Відписатись",
     "follow_again": "Відправити запит знову?",
     "follow_sent": "Запит відправлено!",
-    "blocked": "Заблоковано! "
+    "blocked": "Заблоковано!"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From 800964ea6b32343d151231ab8928d75c975df38a Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Thu, 3 Dec 2020 11:36:11 +0000
Subject: [PATCH 181/389] Translated using Weblate (Ukrainian)

Currently translated at 80.1% (538 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 0691a24f..3059b491 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -642,7 +642,10 @@
     "follow_unfollow": "Відписатись",
     "follow_again": "Відправити запит знову?",
     "follow_sent": "Запит відправлено!",
-    "blocked": "Заблоковано!"
+    "blocked": "Заблоковано!",
+    "admin_menu": {
+      "activate_account": "Активувати аккаунт"
+    }
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From 60598f9bda810f9fc9c504e9f316fcd1c8fc7e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Thu, 3 Dec 2020 12:05:29 +0000
Subject: [PATCH 182/389] Translated using Weblate (Ukrainian)

Currently translated at 80.7% (542 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 3059b491..207529e1 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -644,7 +644,8 @@
     "follow_sent": "Запит відправлено!",
     "blocked": "Заблоковано!",
     "admin_menu": {
-      "activate_account": "Активувати аккаунт"
+      "activate_account": "Активувати обліковий запис",
+      "deactivate_account": "Деактивувати обліковий запис"
     }
   },
   "status": {

From 3d8af7256b97152c679bf165ff4cecad61b222d6 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Thu, 3 Dec 2020 13:44:00 +0000
Subject: [PATCH 183/389] Translated using Weblate (Ukrainian)

Currently translated at 80.7% (542 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 207529e1..c16d7362 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -470,7 +470,8 @@
       "shadows": {
         "components": {
           "button": "Кнопка",
-          "input": "Поле вводу"
+          "input": "Поле вводу",
+          "panel": "Панель"
         },
         "component": "Компонент"
       },
@@ -479,7 +480,8 @@
           "input": "Поля вводу",
           "interface": "Інтерфейс"
         },
-        "_tab_label": "Шрифти"
+        "_tab_label": "Шрифти",
+        "size": "Розмір (в пікселях)"
       },
       "advanced_colors": {
         "alert_warning": "Попередження",
@@ -654,7 +656,8 @@
     "replies_list": "Відповіді:",
     "delete_confirm": "Ви дійсно хочете видалити цей допис?",
     "delete": "Видалити допис",
-    "pin": "Закріпити в профілі"
+    "pin": "Закріпити в профілі",
+    "status_deleted": "Цей пост був видалений"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",

From 0f8587463ca1b9ac95f7fe616bb3c1bdbfde563c Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 2 Dec 2020 20:53:30 +0000
Subject: [PATCH 184/389] Translated using Weblate (Russian)

Currently translated at 72.1% (484 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index cbee5350..02cafb85 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -424,7 +424,9 @@
     "bookmark": "В закладки",
     "unbookmark": "Удалить из закладок",
     "status_deleted": "Пост удален",
-    "reply_to": "Ответ"
+    "reply_to": "Ответ",
+    "repeats": "Повторы",
+    "favorites": "Понравилось"
   },
   "user_card": {
     "block": "Заблокировать",
@@ -464,7 +466,9 @@
       "delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
     },
     "media": "С вложениями",
-    "mention": "Упомянуть"
+    "mention": "Упомянуть",
+    "show_repeats": "Показывать повторы",
+    "hide_repeats": "Скрыть повторы"
   },
   "user_profile": {
     "timeline_title": "Лента пользователя"
@@ -552,7 +556,7 @@
   "polls": {
     "not_enough_options": "Недостаточно уникальных вариантов в опросе",
     "expired": "Опрос закончился {0} назад",
-    "expires_in": "Опрос заканчивается через",
+    "expires_in": "Опрос заканчивается через {0}",
     "expiry": "Срок опроса",
     "multiple_choices": "Несколько вариантов",
     "single_choice": "Один вариант",
@@ -588,5 +592,27 @@
   },
   "shoutbox": {
     "title": "Болтовня"
+  },
+  "time": {
+    "days_short": "{0}дн",
+    "years_short": "{0}г",
+    "year_short": "{0}г",
+    "weeks_short": "{0}нед",
+    "week_short": "{0}нед",
+    "seconds_short": "{0}с",
+    "second_short": "{0}с",
+    "now_short": "только что",
+    "now": "только что",
+    "months_short": "{0}мес",
+    "month_short": "{0}мес",
+    "minutes_short": "{0}мин",
+    "minute_short": "{0}мин",
+    "in_past": "{0} назад",
+    "in_future": "через {0}",
+    "hours_short": "{0}ч",
+    "hour_short": "{0}ч",
+    "hour": "{0} час",
+    "day_short": "{0}д",
+    "days": "{0} дней"
   }
 }

From 17abcda2aae91e0597ae4de3b8f1c757ad65e017 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Thu, 3 Dec 2020 13:44:53 +0000
Subject: [PATCH 185/389] Translated using Weblate (Ukrainian)

Currently translated at 81.0% (544 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index c16d7362..0442623c 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -657,7 +657,7 @@
     "delete_confirm": "Ви дійсно хочете видалити цей допис?",
     "delete": "Видалити допис",
     "pin": "Закріпити в профілі",
-    "status_deleted": "Цей пост був видалений"
+    "status_deleted": "Цей допис був видалений"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",

From f30450be124c2f141c691216bde3669e3b3806dc Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Thu, 3 Dec 2020 13:45:31 +0000
Subject: [PATCH 186/389] Translated using Weblate (Ukrainian)

Currently translated at 81.0% (544 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 0442623c..5f28bfe4 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -647,7 +647,9 @@
     "blocked": "Заблоковано!",
     "admin_menu": {
       "activate_account": "Активувати обліковий запис",
-      "deactivate_account": "Деактивувати обліковий запис"
+      "deactivate_account": "Деактивувати аккаунт",
+      "delete_account": "Видалити аккаунт",
+      "moderation": "Модерація "
     }
   },
   "status": {

From 426441b51c804fe2cf18ef97e4c47760568d09c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Thu, 3 Dec 2020 14:44:37 +0000
Subject: [PATCH 187/389] Translated using Weblate (Ukrainian)

Currently translated at 81.3% (546 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 5f28bfe4..f76b76f0 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -499,7 +499,9 @@
         "alert_error": "Помилки",
         "alert": "Фон сповіщень",
         "_tab_label": "Додатково",
-        "selectedPost": "Вибраний допис"
+        "selectedPost": "Вибраний допис",
+        "highlight": "Виділені елементи",
+        "poll": "Діаграма опитування"
       },
       "common_colors": {
         "rgbo": "Піктограми, акценти, значки",

From 215e3753e1d803afa42f71cc07b0b779f794d3ef Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Thu, 3 Dec 2020 15:28:51 +0000
Subject: [PATCH 188/389] Translated using Weblate (Ukrainian)

Currently translated at 84.5% (567 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index f76b76f0..caf0669c 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -452,7 +452,8 @@
             "bad": "Не відповідає жодним вимогам щодо доступності",
             "aaa": "відповідає вимогам рівня ААA (рекомендований)",
             "aa": "відповідає вимогам рівня АА (мінімальний)"
-          }
+          },
+          "hint": "Рівень контрасту: {ratio}, {level} {context}"
         },
         "opacity": "Прозорість"
       },
@@ -501,7 +502,9 @@
         "_tab_label": "Додатково",
         "selectedPost": "Вибраний допис",
         "highlight": "Виділені елементи",
-        "poll": "Діаграма опитування"
+        "poll": "Діаграма опитування",
+        "icons": "Іконки",
+        "faint_text": "Затемнений текст"
       },
       "common_colors": {
         "rgbo": "Піктограми, акценти, значки",

From f1066c393f9f4a22d5107ff01e78fed7caf3c8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Thu, 3 Dec 2020 15:53:01 +0000
Subject: [PATCH 189/389] Translated using Weblate (Ukrainian)

Currently translated at 84.5% (567 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index caf0669c..9043cfb0 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -472,9 +472,22 @@
         "components": {
           "button": "Кнопка",
           "input": "Поле вводу",
-          "panel": "Панель"
+          "panel": "Панель",
+          "panelHeader": "Заголовок панелі"
         },
-        "component": "Компонент"
+        "component": "Компонент",
+        "filter_hint": {
+          "inset_classic": "Тіні спрямовані всередину використовуватимуть {0}",
+          "spread_zero": "Тіні з поширенням > 0 відображатимуться так, ніби було встановлено нуль",
+          "avatar_inset": "Зауважте, що використання як вставних, так і невставних тіней на аватарах може привести до непередбачуваних результатів із прозорими аватарами.",
+          "drop_shadow_syntax": "{0} не підтримує параметр {1} та ключове слово {2}.",
+          "always_drop_shadow": "Увага! Ця тінь завжди використовує {0}, якщо підтримується браузером."
+        },
+        "inset": "Всередину",
+        "blur": "Розмиття",
+        "shadow_id": "Тінь №{value}",
+        "override": "Перевизначити",
+        "_tab_label": "Тінь і підсвічування"
       },
       "fonts": {
         "components": {
@@ -504,13 +517,24 @@
         "highlight": "Виділені елементи",
         "poll": "Діаграма опитування",
         "icons": "Іконки",
-        "faint_text": "Затемнений текст"
+        "faint_text": "Затемнений текст",
+        "chat": {
+          "border": "Кайма",
+          "outgoing": "Вихідні повідомлення",
+          "incoming": "Вхідні повідомлення"
+        },
+        "toggled": "Переключено",
+        "disabled": "Вимкнено",
+        "selectedMenu": "Вибраний пункт меню"
       },
       "common_colors": {
         "rgbo": "Піктограми, акценти, значки",
         "foreground_hint": "Перегляньте вкладку \"Додатково\" для більшого контролю",
         "main": "Загальні кольори",
         "_tab_label": "Загальні"
+      },
+      "radii": {
+        "_tab_label": "Округлість"
       }
     },
     "enable_web_push_notifications": "Увімкнути web push-сповіщення",

From 95b911d7a0cbbe78bc8d352bb100c6a38defb378 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Thu, 3 Dec 2020 17:24:36 +0000
Subject: [PATCH 190/389] Translated using Weblate (Ukrainian)

Currently translated at 84.6% (568 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 9043cfb0..93a775cc 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -525,7 +525,8 @@
         },
         "toggled": "Переключено",
         "disabled": "Вимкнено",
-        "selectedMenu": "Вибраний пункт меню"
+        "selectedMenu": "Вибраний пункт меню",
+        "tabs": "Таби"
       },
       "common_colors": {
         "rgbo": "Піктограми, акценти, значки",

From a8d3ce4671cd51b8098d02ab7b187c79e193e553 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Thu, 3 Dec 2020 17:24:43 +0000
Subject: [PATCH 191/389] Translated using Weblate (Ukrainian)

Currently translated at 85.5% (574 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 93a775cc..8262ddae 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -466,7 +466,10 @@
         "header": "Попередній перегляд",
         "link": "невеличке посилання",
         "header_faint": "Це нормально",
-        "input": "Що нового?"
+        "input": "Що нового?",
+        "checkbox": "Я переглянув умови використання",
+        "fine_print": "Прочитайте наш {0} аби нічого нового не дізнатись!",
+        "faint_link": "корисний підручник"
       },
       "shadows": {
         "components": {
@@ -492,7 +495,9 @@
       "fonts": {
         "components": {
           "input": "Поля вводу",
-          "interface": "Інтерфейс"
+          "interface": "Інтерфейс",
+          "postCode": "Моноширинний текст в дописі (форматований текст)",
+          "post": "Текст допису"
         },
         "_tab_label": "Шрифти",
         "size": "Розмір (в пікселях)"
@@ -526,7 +531,7 @@
         "toggled": "Переключено",
         "disabled": "Вимкнено",
         "selectedMenu": "Вибраний пункт меню",
-        "tabs": "Таби"
+        "tabs": "Вкладки"
       },
       "common_colors": {
         "rgbo": "Піктограми, акценти, значки",

From 6b7f82174c06dbf0cefd216c0922ad2359b6bc54 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Thu, 3 Dec 2020 17:48:54 +0000
Subject: [PATCH 192/389] Translated using Weblate (Ukrainian)

Currently translated at 85.5% (574 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 8262ddae..260c9490 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -694,7 +694,8 @@
     "delete_confirm": "Ви дійсно хочете видалити цей допис?",
     "delete": "Видалити допис",
     "pin": "Закріпити в профілі",
-    "status_deleted": "Цей допис був видалений"
+    "status_deleted": "Цей допис був видалений",
+    "favorites": "Вподобане"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",

From 0c3f62642b8136e89e8a5d868c1d8a231f556645 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Thu, 3 Dec 2020 17:49:01 +0000
Subject: [PATCH 193/389] Translated using Weblate (Ukrainian)

Currently translated at 85.5% (574 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 260c9490..001f4c31 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -695,7 +695,7 @@
     "delete": "Видалити допис",
     "pin": "Закріпити в профілі",
     "status_deleted": "Цей допис був видалений",
-    "favorites": "Вподобане"
+    "favorites": "Вподобати"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",

From dc90db91fd20c50353cb17ed3088942b9c7b01c2 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Thu, 3 Dec 2020 17:52:38 +0000
Subject: [PATCH 194/389] Translated using Weblate (Ukrainian)

Currently translated at 85.6% (575 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 001f4c31..260c9490 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -695,7 +695,7 @@
     "delete": "Видалити допис",
     "pin": "Закріпити в профілі",
     "status_deleted": "Цей допис був видалений",
-    "favorites": "Вподобати"
+    "favorites": "Вподобане"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",

From 99c1fb006815cccbbc28fc57b7ae82cb7b8434b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Thu, 3 Dec 2020 17:58:40 +0000
Subject: [PATCH 195/389] Translated using Weblate (Ukrainian)

Currently translated at 85.6% (575 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 260c9490..5bc382ce 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -490,7 +490,8 @@
         "blur": "Розмиття",
         "shadow_id": "Тінь №{value}",
         "override": "Перевизначити",
-        "_tab_label": "Тінь і підсвічування"
+        "_tab_label": "Тінь і підсвічування",
+        "hintV3": "Для тіней ви також можете використовувати позначення {0} для використання іншого кольорового слота."
       },
       "fonts": {
         "components": {

From ccf357c206be63721d0882a988384d666b6afe72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Thu, 3 Dec 2020 18:13:56 +0000
Subject: [PATCH 196/389] Translated using Weblate (Ukrainian)

Currently translated at 90.1% (605 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 48 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 5bc382ce..3b19cb7a 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -123,7 +123,7 @@
     "reacted_with": "додав реакцію: {0}",
     "migrated_to": "мігрував на",
     "no_more_notifications": "Немає більше сповіщень",
-    "repeated_you": "поширив ваш допис",
+    "repeated_you": "поширив(-ла) ваш допис",
     "read": "Прочитано!",
     "notifications": "Сповіщення",
     "load_older": "Завантажити давніші сповіщення",
@@ -476,7 +476,13 @@
           "button": "Кнопка",
           "input": "Поле вводу",
           "panel": "Панель",
-          "panelHeader": "Заголовок панелі"
+          "panelHeader": "Заголовок панелі",
+          "avatarStatus": "Аватар користувача (в стрічці)",
+          "avatar": "Аватар користувача (профіль)",
+          "buttonPressedHover": "Кнопка (натиснута + наведенний курсор)",
+          "buttonPressed": "Кнопка (натиснута)",
+          "buttonHover": "Кнопка (при наведенні)",
+          "popup": "Спливаючі вікна та підказки"
         },
         "component": "Компонент",
         "filter_hint": {
@@ -501,7 +507,11 @@
           "post": "Текст допису"
         },
         "_tab_label": "Шрифти",
-        "size": "Розмір (в пікселях)"
+        "size": "Розмір (в пікселях)",
+        "custom": "Нестандартний",
+        "weight": "Товщина",
+        "family": "Назва шрифту",
+        "help": "Виберіть шрифт для елементів інтерфейсу. Для \"нестандартного\" потрібно ввести точну назву шрифту, так як вона відображається в системі."
       },
       "advanced_colors": {
         "alert_warning": "Попередження",
@@ -532,7 +542,8 @@
         "toggled": "Переключено",
         "disabled": "Вимкнено",
         "selectedMenu": "Вибраний пункт меню",
-        "tabs": "Вкладки"
+        "tabs": "Вкладки",
+        "pressed": "Натиснуто"
       },
       "common_colors": {
         "rgbo": "Піктограми, акценти, значки",
@@ -666,7 +677,8 @@
     "days": "{0} дні",
     "day": "{0} день",
     "seconds_short": "{0}с",
-    "seconds": "{0} секунди"
+    "seconds": "{0} секунди",
+    "in_future": "через {0}"
   },
   "search": {
     "no_results": "Немає результатів",
@@ -685,8 +697,11 @@
       "activate_account": "Активувати обліковий запис",
       "deactivate_account": "Деактивувати аккаунт",
       "delete_account": "Видалити аккаунт",
-      "moderation": "Модерація "
-    }
+      "moderation": "Модерація"
+    },
+    "deny": "Відмовити",
+    "block": "Заблокувати",
+    "approve": "Схвалити"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",
@@ -696,7 +711,19 @@
     "delete": "Видалити допис",
     "pin": "Закріпити в профілі",
     "status_deleted": "Цей допис був видалений",
-    "favorites": "Вподобане"
+    "favorites": "Вподобане",
+    "hide_content": "Сховати вміст",
+    "show_content": "Показати вміст",
+    "hide_full_subject": "Сховати всю тему",
+    "show_full_subject": "Показати всю тему",
+    "thread_muted_and_words": ", має слова:",
+    "mute_conversation": "Заглушити розмову",
+    "reply_to": "Відповідь",
+    "unbookmark": "Видалити із закладок",
+    "bookmark": "Додати до закладок",
+    "pinned": "Закріплено",
+    "unpin": "Відкріпити від профілю",
+    "repeats": "Повтори"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",
@@ -706,6 +733,9 @@
     "load_older": "Завантажити давніші дописи",
     "error": "Помилка завантаження стрічки: {0}",
     "collapse": "Згорнути",
-    "conversation": "Розмова"
+    "conversation": "Розмова",
+    "no_statuses": "Ніяких статусів",
+    "repeated": "поширив(-ла)",
+    "no_retweet_hint": "Запис, позначено як \"тільки для відстежувачів\" або \"особисте\" і тому не може бути повторений"
   }
 }

From c74ee1153d8d9c3d116498ed0a513d2bddc99330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Thu, 3 Dec 2020 20:34:37 +0000
Subject: [PATCH 197/389] Translated using Weblate (Ukrainian)

Currently translated at 90.4% (607 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 3b19cb7a..bc95be80 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -235,7 +235,7 @@
       "direct": "Приватний - цей допис побачать лише згадані користувачі"
     },
     "scope_notice": {
-      "unlisted": "Цей допис не буде видно в публічній та федеративній стрічці",
+      "unlisted": "Цей допис не буде видно в публічній стрічці та усій відомій мережі",
       "private": "Цей допис побачать лише ваші підписники",
       "public": "Цей допис бачитимуть усі"
     },

From 56927c5a09b8be71196dc265b29a3d67da9dad44 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Thu, 3 Dec 2020 20:45:33 +0000
Subject: [PATCH 198/389] Translated using Weblate (Ukrainian)

Currently translated at 90.4% (607 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index bc95be80..ad0b0d6f 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -637,7 +637,8 @@
     "repeat": "Поширити",
     "reply": "Відповісти",
     "add_reaction": "Додати реакцію",
-    "user_settings": "Налаштування користувача"
+    "user_settings": "Налаштування користувача",
+    "favorite": "Подобається"
   },
   "upload": {
     "error": {
@@ -701,7 +702,8 @@
     },
     "deny": "Відмовити",
     "block": "Заблокувати",
-    "approve": "Схвалити"
+    "approve": "Схвалити",
+    "mention": "Згадати"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From ff93f4346800bf9a5f5f7eb31359bc7c7d6aa711 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Thu, 3 Dec 2020 15:30:31 +0000
Subject: [PATCH 199/389] Translated using Weblate (Russian)

Currently translated at 76.1% (511 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 02cafb85..e7639553 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -236,7 +236,7 @@
     "hide_followers_count_description": "Не показывать число моих подписчиков",
     "show_admin_badge": "Показывать значок администратора в моем профиле",
     "show_moderator_badge": "Показывать значок модератора в моем профиле",
-    "nsfw_clickthrough": "Включить скрытие NSFW вложений",
+    "nsfw_clickthrough": "Включить скрытие NSFW вложений и не показывать изображения в предпросмотре ссылок для NSFW статусов",
     "oauth_tokens": "OAuth токены",
     "token": "Токен",
     "refresh_token": "Рефреш токен",
@@ -396,7 +396,7 @@
     "composing": "Составление постов",
     "chatMessageRadius": "Сообщения в беседе",
     "blocks_tab": "Блокировки",
-    "import_mutes_from_a_csv_file": "Импортирует игнорируемых из CSV файла",
+    "import_mutes_from_a_csv_file": "Импортировать игнорируемых из CSV файла",
     "mutes_imported": "Игнорируемые импортированы! Обработка может занять некоторое время.",
     "mute_import_error": "Произошла ошибка при импорте игнорируемых",
     "mute_import": "Импорт игнорируемых",
@@ -408,7 +408,36 @@
     "block_import": "Импорт блокировок",
     "block_export": "Экспортировать блокировки",
     "security": "Безопасность",
-    "app_name": "Приложение"
+    "app_name": "Приложение",
+    "user_mutes": "Пользователи",
+    "post_status_content_type": "Формат составляемых статусов по умолчанию",
+    "subject_line_noop": "Не копировать",
+    "subject_line_mastodon": "Как в Mastodon: скопировать как есть",
+    "subject_line_email": "Как в e-mail: \"re: тема\"",
+    "subject_line_behavior": "Копировать тему в ответах",
+    "no_mutes": "Нет игнорируемых",
+    "no_blocks": "Нет блокировок",
+    "notification_visibility_emoji_reactions": "Реакции",
+    "notification_visibility_moves": "Миграции пользователей",
+    "use_contain_fit": "Не обрезать вложения в миниатюрах",
+    "profile_fields": {
+      "value": "Значение",
+      "name": "Пункт",
+      "add_field": "Добавить поле",
+      "label": "Таблица метаданных профиля"
+    },
+    "play_videos_in_modal": "Проигрывать видео во всплывающей рамке",
+    "mutes_tab": "Игнорируемые",
+    "invalid_theme_imported": "Выбраный файл не является темой Pleroma. Изменений в тему не было внесено.",
+    "import_blocks_from_a_csv_file": "Импортировать блокировки из CSV файла",
+    "hide_filtered_statuses": "Не показывать отфильтрованные статусы",
+    "hide_muted_posts": "Не показывать статусы игнорируемых пользователей",
+    "hide_post_stats": "Не показывать статистику статусов (например количество отметок «Нравится»)",
+    "use_one_click_nsfw": "Открывать NSFW вложения одним кликом",
+    "preload_images": "Предварительно загружать изображения",
+    "max_thumbnails": "Максимальное число миниатюр показываемых в статусе",
+    "emoji_reactions_on_timeline": "Показывать эмодзи реакции в ленте",
+    "domain_mutes": "Узлы"
   },
   "timeline": {
     "collapse": "Свернуть",
@@ -599,7 +628,7 @@
     "year_short": "{0}г",
     "weeks_short": "{0}нед",
     "week_short": "{0}нед",
-    "seconds_short": "{0}с",
+    "seconds_short": "{0}сек",
     "second_short": "{0}с",
     "now_short": "только что",
     "now": "только что",

From ffd0bbbf16a62291b648db75d237c1e68b6c2e69 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Thu, 3 Dec 2020 23:50:25 +0000
Subject: [PATCH 200/389] Translated using Weblate (Ukrainian)

Currently translated at 93.8% (630 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index ad0b0d6f..95223332 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -631,20 +631,31 @@
     "captcha": "CAPTCHA"
   },
   "who_to_follow": {
-    "who_to_follow": "На кого підписатися"
+    "who_to_follow": "На кого підписатися",
+    "more": "Більше"
   },
   "tool_tip": {
     "repeat": "Поширити",
     "reply": "Відповісти",
     "add_reaction": "Додати реакцію",
     "user_settings": "Налаштування користувача",
-    "favorite": "Подобається"
+    "favorite": "Подобається",
+    "reject_follow_request": "Відхилити запит на підписку",
+    "accept_follow_request": "Прийняти запит на підписку",
+    "media_upload": "Завантажити медіа"
   },
   "upload": {
     "error": {
       "base": "Збій при завантаженні.",
       "file_too_big": "Файл завеликий [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
       "default": "Спробуйте ще раз пізніше"
+    },
+    "file_size_units": {
+      "TiB": "ТіБ",
+      "GiB": "ГіБ",
+      "MiB": "МіБ",
+      "KiB": "КіБ",
+      "B": "Б"
     }
   },
   "time": {
@@ -696,14 +707,21 @@
     "blocked": "Заблоковано!",
     "admin_menu": {
       "activate_account": "Активувати обліковий запис",
-      "deactivate_account": "Деактивувати аккаунт",
+      "deactivate_account": "Деактивувати обліковий запис",
       "delete_account": "Видалити аккаунт",
-      "moderation": "Модерація"
+      "moderation": "Модерація",
+      "delete_user_confirmation": "Ви абсолютно впевнені? Цю дію неможливо буде скасовувати.",
+      "delete_user": "Видалити обліковий запис"
     },
     "deny": "Відмовити",
     "block": "Заблокувати",
     "approve": "Схвалити",
-    "mention": "Згадати"
+    "mention": "Згадати",
+    "unsubscribe": "Відписатись",
+    "subscribe": "Підписатись",
+    "report": "Поскаржитись",
+    "per_day": "на день",
+    "favorites": "Вподобання"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",
@@ -739,5 +757,13 @@
     "no_statuses": "Ніяких статусів",
     "repeated": "поширив(-ла)",
     "no_retweet_hint": "Запис, позначено як \"тільки для відстежувачів\" або \"особисте\" і тому не може бути повторений"
+  },
+  "user_reporting": {
+    "submit": "Відправити",
+    "forward_to": "Переслати до {0}",
+    "forward_description": "Цей обліковий запис належить іншому інстансу. Відправити їм копію скарги?",
+    "additional_comments": "Додаткове пояснення",
+    "add_comment_description": "Скарга буде надіслана модераторам вашого інстансу. Нижче Ви можете додати пояснення чому ви вирішили поскаржитись на цей обліковий запис:",
+    "title": "Поскаржитись на {0}"
   }
 }

From bfeb8ed14b17552f57244f75da1e277bf94e6e26 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Thu, 3 Dec 2020 23:55:24 +0000
Subject: [PATCH 201/389] Translated using Weblate (Ukrainian)

Currently translated at 93.8% (630 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 95223332..5cbe507b 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -721,7 +721,8 @@
     "subscribe": "Підписатись",
     "report": "Поскаржитись",
     "per_day": "на день",
-    "favorites": "Вподобання"
+    "favorites": "Вподобання",
+    "media": "Медіа"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From 506cf0902e2916f98c420ab73c581bb3b6c2b0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Fri, 4 Dec 2020 09:11:55 +0000
Subject: [PATCH 202/389] Translated using Weblate (Ukrainian)

Currently translated at 94.1% (632 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 5cbe507b..3f1d46e5 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -50,13 +50,13 @@
     "staff": "Адміністрація",
     "mrf": {
       "simple": {
-        "media_nsfw_desc": "Даний інстанс примусово позначає вкладення в наступних інстансах як NSFW:",
-        "media_nsfw": "Примусове визначення вкладення як дратівливого",
-        "media_removal_desc": "Поточний інстанс видаляє вкладення з дописів на перелічених інстансах:",
-        "media_removal": "Видалення вкладень",
+        "media_nsfw_desc": "Даний інстанс примусово позначає медіа в наступних інстансах як NSFW:",
+        "media_nsfw": "Примусове визначення медіа як дратівливого",
+        "media_removal_desc": "Поточний інстанс видаляє медіа з дописів на перелічених інстансах:",
+        "media_removal": "Видалення медіа",
         "ftl_removal_desc": "Цей інстанс видаляє перелічені інстанси з \"Усієї відомої мережі\":",
         "ftl_removal": "Видалення з \"Усієї відомої мережі\"",
-        "quarantine_desc": "Поточний інстанс буде надсилати тільки публічні пости наступним інстансам:",
+        "quarantine_desc": "Поточний інстанс буде надсилати тільки публічні дописи наступним інстансам:",
         "quarantine": "Карантин",
         "reject_desc": "Поточний інстанс не прийматиме повідомлення з перелічених інстансів:",
         "accept": "Прийняти",
@@ -240,8 +240,8 @@
       "public": "Цей допис бачитимуть усі"
     },
     "preview_empty": "Пустий",
-    "media_description_error": "Не вдалось оновити вкладення, спробуйте ще раз",
-    "media_description": "Опис вкладення"
+    "media_description_error": "Не вдалось оновити медіа, спробуйте ще раз",
+    "media_description": "Опис медіа"
   },
   "settings": {
     "blocks_imported": "Блокування імпортовані! Їх обробка триватиме певний час.",
@@ -711,7 +711,9 @@
       "delete_account": "Видалити аккаунт",
       "moderation": "Модерація",
       "delete_user_confirmation": "Ви абсолютно впевнені? Цю дію неможливо буде скасовувати.",
-      "delete_user": "Видалити обліковий запис"
+      "delete_user": "Видалити обліковий запис",
+      "strip_media": "Вилучити медіа з дописів користувача",
+      "force_nsfw": "Позначити всі дописи як NSFW"
     },
     "deny": "Відмовити",
     "block": "Заблокувати",

From 3b037218b2be5fb1724fe130f754f728905f0b91 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Fri, 4 Dec 2020 08:36:45 +0000
Subject: [PATCH 203/389] Translated using Weblate (Russian)

Currently translated at 76.9% (516 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index e7639553..3a7c61a9 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -437,7 +437,12 @@
     "preload_images": "Предварительно загружать изображения",
     "max_thumbnails": "Максимальное число миниатюр показываемых в статусе",
     "emoji_reactions_on_timeline": "Показывать эмодзи реакции в ленте",
-    "domain_mutes": "Узлы"
+    "domain_mutes": "Узлы",
+    "notification_setting_privacy": "Приватность",
+    "notification_setting_block_from_strangers": "Не показывать уведомления от пользователей которых вы не читаете",
+    "notification_setting_filters": "Фильтрация",
+    "notifications": "Уведомления",
+    "virtual_scrolling": "Оптимизировать рендеринг ленты"
   },
   "timeline": {
     "collapse": "Свернуть",

From 45e08f83aafbed8ef457fd625faa0214d8875c13 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Fri, 4 Dec 2020 11:33:15 +0000
Subject: [PATCH 204/389] Translated using Weblate (Ukrainian)

Currently translated at 94.6% (635 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 3f1d46e5..f630b2dd 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -767,6 +767,11 @@
     "forward_description": "Цей обліковий запис належить іншому інстансу. Відправити їм копію скарги?",
     "additional_comments": "Додаткове пояснення",
     "add_comment_description": "Скарга буде надіслана модераторам вашого інстансу. Нижче Ви можете додати пояснення чому ви вирішили поскаржитись на цей обліковий запис:",
-    "title": "Поскаржитись на {0}"
+    "title": "Поскаржитись на {0}",
+    "generic_error": "Виникла помилка під час обробки вашого запиту."
+  },
+  "user_profile": {
+    "profile_loading_error": "Вибачте, під час завантаження цього профілю виникла помилка.",
+    "profile_does_not_exist": "Вибачте, цей профіль більше не існує."
   }
 }

From 83bc74de0a58de54aca3228a2c284e27ff6ddfe4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 6 Dec 2020 23:45:34 +0200
Subject: [PATCH 205/389] fix recent mistakes in react button

---
 src/components/react_button/react_button.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index dde67d21..ac940b98 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -20,10 +20,10 @@
       <div class="reaction-picker">
         <span
           v-for="emoji in commonEmojis"
-          :key="emoji"
+          :key="emoji.replacement"
           class="emoji-button"
           :title="emoji.displayText"
-          @click="addReaction($event, emoji, close)"
+          @click="addReaction($event, emoji.replacement, close)"
         >
           {{ emoji.replacement }}
         </span>

From 415119cda949f2c92865f9ea5db3e377b83d1eb0 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 7 Dec 2020 00:11:21 +0200
Subject: [PATCH 206/389] use title html for poll options before vote

---
 CHANGELOG.md                                                | 1 +
 src/components/poll/poll.vue                                | 3 ++-
 src/services/entity_normalizer/entity_normalizer.service.js | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd4a2836..a1506eb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed pinned statuses not appearing in user profiles
 - Fixed some elements not being keyboard navigation friendly
 - Fixed your latest chat messages disappearing when closing chat view and opening it again during the same session
+- Fixed custom emoji not showing in poll options before voting
 
 ### Changed
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 264a5f03..42819c19 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -42,7 +42,8 @@
           :value="index"
         >
         <label class="option-vote">
-          <div>{{ option.title }}</div>
+          <!-- eslint-disable-next-line vue/no-v-html -->
+          <div v-html="option.title_html" />
         </label>
       </div>
     </div>
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index e3a52489..b1e68df5 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -280,7 +280,7 @@ export const parseStatus = (data) => {
     if (output.poll) {
       output.poll.options = (output.poll.options || []).map(field => ({
         ...field,
-        title_html: addEmojis(field.title, data.emojis)
+        title_html: addEmojis(escape(field.title), data.emojis)
       }))
     }
     output.pinned = data.pinned

From 51e6f5e255f908de14a2fcfcca7b7298643017d1 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Fri, 11 Dec 2020 17:11:03 +0300
Subject: [PATCH 207/389] Display upload limit on the Features panel

---
 CHANGELOG.md                                     | 1 +
 src/components/features_panel/features_panel.js  | 5 ++++-
 src/components/features_panel/features_panel.vue | 1 +
 src/i18n/en.json                                 | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd4a2836..3a6eb29e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mouseover titles for emojis in reaction picker
 - Support to input emoji into the search box in reaction picker
 - Added some missing unicode emoji
+- Added the upload limit to the Features panel in the About page
 
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js
index 620a85ea..8b142d08 100644
--- a/src/components/features_panel/features_panel.js
+++ b/src/components/features_panel/features_panel.js
@@ -1,3 +1,5 @@
+import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
+
 const FeaturesPanel = {
   computed: {
     chat: function () { return this.$store.state.instance.chatAvailable },
@@ -6,7 +8,8 @@ const FeaturesPanel = {
     whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled },
     mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable },
     minimalScopesMode: function () { return this.$store.state.instance.minimalScopesMode },
-    textlimit: function () { return this.$store.state.instance.textlimit }
+    textlimit: function () { return this.$store.state.instance.textlimit },
+    uploadlimit: function () { return fileSizeFormatService.fileSizeFormat(this.$store.state.instance.uploadlimit) }
   }
 }
 
diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue
index 608b11c8..9605d09d 100644
--- a/src/components/features_panel/features_panel.vue
+++ b/src/components/features_panel/features_panel.vue
@@ -25,6 +25,7 @@
           </li>
           <li>{{ $t('features_panel.scope_options') }}</li>
           <li>{{ $t('features_panel.text_limit') }} = {{ textlimit }}</li>
+          <li>{{ $t('features_panel.upload_limit') }} = {{ uploadlimit.num }} {{ $t('upload.file_size_units.' + uploadlimit.unit) }}</li>
         </ul>
       </div>
     </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ef23efd6..c42126fc 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -50,7 +50,8 @@
     "scope_options": "Scope options",
     "text_limit": "Text limit",
     "title": "Features",
-    "who_to_follow": "Who to follow"
+    "who_to_follow": "Who to follow",
+    "upload_limit": "Upload limit"
   },
   "finder": {
     "error_fetching_user": "Error fetching user",

From 4451ac9f7cd42e530f1d9c736bb8dbc83c186b0b Mon Sep 17 00:00:00 2001
From: "W. W" <clubemail@ukr.net>
Date: Mon, 14 Dec 2020 19:52:07 +0000
Subject: [PATCH 208/389] Add uk.json in messages.js

---
 src/i18n/messages.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index c3195f10..2624d1d0 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -33,6 +33,7 @@ const loaders = {
   ro: () => import('./ro.json'),
   ru: () => import('./ru.json'),
   te: () => import('./te.json'),
+  uk: () => import('./uk.json'),
   zh: () => import('./zh.json')
 }
 

From 6d9c79fb6d27ddbbb88a6d60ed25d984c7888eae Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Tue, 15 Dec 2020 21:17:50 +0300
Subject: [PATCH 209/389] Disable horizontal textarea resize

---
 CHANGELOG.md                                         | 1 +
 src/App.scss                                         | 4 ++++
 src/components/settings_modal/tabs/filtering_tab.vue | 1 +
 src/components/settings_modal/tabs/profile_tab.vue   | 4 ++--
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a6eb29e..5fdc1f32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
 - Made reply/fav/repeat etc buttons easier to hit
+- Disabled horizontal textarea resize
 
 
 ## [2.2.1] - 2020-11-11
diff --git a/src/App.scss b/src/App.scss
index cdc3209c..48313f57 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -332,6 +332,10 @@ input, textarea, .select, .input {
       box-sizing: border-box;
     }
   }
+
+  &.resize-height {
+    resize: vertical;
+  }
 }
 
 option {
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 813dc4cd..8f850c8b 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -75,6 +75,7 @@
         <p>{{ $t('settings.filtering_explanation') }}</p>
         <textarea
           id="muteWords"
+          class="resize-height"
           v-model="muteWordsString"
         />
       </div>
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 50d3ee63..66275fcc 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -11,7 +11,7 @@
         <input
           id="username"
           v-model="newName"
-          classname="name-changer"
+          class="name-changer"
         >
       </EmojiInput>
       <p>{{ $t('settings.bio') }}</p>
@@ -22,7 +22,7 @@
       >
         <textarea
           v-model="newBio"
-          classname="bio"
+          class="bio resize-height"
         />
       </EmojiInput>
       <p>

From 6a469963b002c33e320f4d19cde2925d2bed3171 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 16 Dec 2020 12:05:13 +0200
Subject: [PATCH 210/389] fix remote follow button style

---
 src/components/remote_follow/remote_follow.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/remote_follow/remote_follow.vue b/src/components/remote_follow/remote_follow.vue
index cb1c2a1b..be827400 100644
--- a/src/components/remote_follow/remote_follow.vue
+++ b/src/components/remote_follow/remote_follow.vue
@@ -16,7 +16,7 @@
       >
       <button
         click="submit"
-        class="remote-button"
+        class="button-default remote-button"
       >
         {{ $t('user_card.remote_follow') }}
       </button>

From c1977567677385bef3f27ba0f8d20e13e07cd9e9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 16 Dec 2020 18:25:07 +0200
Subject: [PATCH 211/389] Basic no-wallpaper support

---
 src/App.js                                      | 17 ++++++++++-------
 src/App.scss                                    |  4 +++-
 src/App.vue                                     |  3 +--
 src/components/desktop_nav/desktop_nav.scss     |  4 ++++
 .../settings_modal/tabs/general_tab.js          |  4 ++++
 .../settings_modal/tabs/general_tab.vue         |  5 +++++
 .../tabs/theme_tab/theme_tab.scss               |  3 ++-
 src/i18n/en.json                                |  1 +
 src/modules/config.js                           |  1 +
 src/services/theme_data/pleromafe.js            |  4 ++++
 static/themes/redmond-xx-se.json                |  1 +
 static/themes/redmond-xx.json                   |  1 +
 static/themes/redmond-xxi.json                  |  1 +
 13 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/App.js b/src/App.js
index 52700319..c79184ab 100644
--- a/src/App.js
+++ b/src/App.js
@@ -54,13 +54,16 @@ export default {
       return this.currentUser.background_image || this.$store.state.instance.background
     },
     bgStyle () {
-      return {
-        'background-image': `url(${this.background})`
-      }
-    },
-    bgAppStyle () {
-      return {
-        '--body-background-image': `url(${this.background})`
+      if (
+        this.currentUser.background_image ||
+          (
+            this.$store.state.instance.background &&
+              !this.$store.getters.mergedConfig.hideInstanceWallpaper
+          )
+      ) {
+        return {
+          '--body-background-image': `url(${this.background})`
+        }
       }
     },
     chat () { return this.$store.state.chat.channel.state === 'joined' },
diff --git a/src/App.scss b/src/App.scss
index cdc3209c..394d6434 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -14,7 +14,9 @@
   right: -20px;
   background-size: cover;
   background-repeat: no-repeat;
-  background-position: 0 50%;
+  background-color: var(--wallpaper);
+  background-image: var(--body-background-image);
+  background-position: 50% 50px;
 }
 
 i[class^='icon-'] {
diff --git a/src/App.vue b/src/App.vue
index b4eb0524..1a166778 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,11 @@
 <template>
   <div
     id="app"
-    :style="bgAppStyle"
+    :style="bgStyle"
   >
     <div
       id="app_bg_wrapper"
       class="app-bg-wrapper"
-      :style="bgStyle"
     />
     <MobileNav v-if="isMobileLayout" />
     <DesktopNav v-else />
diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index 8fd8e620..2d468588 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -5,6 +5,10 @@
   width: 100%;
   position: fixed;
 
+  a {
+    color: var(--topBarLink, $fallback--link);
+  }
+
   .inner-nav {
     display: grid;
     grid-template-rows: 50px;
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index df592a10..029ee7a1 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -34,6 +34,10 @@ const GeneralTab = {
       return this.$store.state.instance.postFormats || []
     },
     instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel },
+    instanceWallpaperUsed () {
+      return this.$store.state.instance.background &&
+        !this.$store.state.users.currentUser.background_image
+    },
     ...SharedComputedObject()
   }
 }
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index c1d0d0ec..a9081793 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -11,6 +11,11 @@
             {{ $t('settings.hide_isp') }}
           </Checkbox>
         </li>
+        <li v-if="instanceWallpaperUsed">
+          <Checkbox v-model="hideInstanceWallpaper">
+            {{ $t('settings.hide_wallpaper') }}
+          </Checkbox>
+        </li>
       </ul>
     </div>
     <div class="setting-item">
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
index 926eceff..1b7d9f31 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
@@ -165,7 +165,8 @@
     border-color: var(--border, $fallback--border);
     margin: 1em 0;
     padding: 1em;
-    background: var(--body-background-image);
+    background-color: var(--wallpaper);
+    background-image: var(--body-background-image);
     background-size: cover;
     background-position: 50% 50%;
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ef23efd6..7c8bfec2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -328,6 +328,7 @@
     "hide_muted_posts": "Hide posts of muted users",
     "max_thumbnails": "Maximum amount of thumbnails per post",
     "hide_isp": "Hide instance-specific panel",
+    "hide_wallpaper": "Hide instance wallpaper",
     "preload_images": "Preload images",
     "use_one_click_nsfw": "Open NSFW attachments with just one click",
     "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
diff --git a/src/modules/config.js b/src/modules/config.js
index 444b8ec7..cd088737 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -20,6 +20,7 @@ export const defaultState = {
   customTheme: undefined,
   customThemeSource: undefined,
   hideISP: false,
+  hideInstanceWallpaper: false,
   // bad name: actually hides posts of muted USERS
   hideMutedPosts: undefined, // instance default
   collapseMessageWithSubject: undefined, // instance default
diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js
index 7ed85797..bec1eebd 100644
--- a/src/services/theme_data/pleromafe.js
+++ b/src/services/theme_data/pleromafe.js
@@ -84,6 +84,10 @@ export const SLOT_INHERITANCE = {
     opacity: 'bg',
     priority: 1
   },
+  wallpaper: {
+    depends: ['bg'],
+    color: (mod, bg) => brightness(-2 * mod, bg).rgb
+  },
   fg: {
     depends: [],
     priority: 1
diff --git a/static/themes/redmond-xx-se.json b/static/themes/redmond-xx-se.json
index 24480d2c..b62769db 100644
--- a/static/themes/redmond-xx-se.json
+++ b/static/themes/redmond-xx-se.json
@@ -267,6 +267,7 @@
     },
     "colors": {
       "bg": "#c0c0c0",
+      "wallpaper": "#008080",
       "text": "#000000",
       "link": "#0000ff",
       "accent": "#000080",
diff --git a/static/themes/redmond-xx.json b/static/themes/redmond-xx.json
index cf9010fe..83b59109 100644
--- a/static/themes/redmond-xx.json
+++ b/static/themes/redmond-xx.json
@@ -258,6 +258,7 @@
     },
     "colors": {
       "bg": "#c0c0c0",
+      "wallpaper": "#008080",
       "text": "#000000",
       "link": "#0000ff",
       "accent": "#000080",
diff --git a/static/themes/redmond-xxi.json b/static/themes/redmond-xxi.json
index 7fdc4a6d..60ceae7c 100644
--- a/static/themes/redmond-xxi.json
+++ b/static/themes/redmond-xxi.json
@@ -240,6 +240,7 @@
     },
     "colors": {
       "bg": "#d6d6ce",
+      "wallpaper": "#396ba5",
       "text": "#000000",
       "link": "#0000ff",
       "accent": "#0a246a",

From 5cb41c7175bd8030f55aee5965d8420929fb9855 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 16 Dec 2020 18:28:10 +0200
Subject: [PATCH 212/389] theme ui

---
 .../settings_modal/tabs/theme_tab/theme_tab.vue          | 9 +++++++++
 src/i18n/en.json                                         | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index 4ab793d6..b8add42f 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -616,6 +616,15 @@
               :disabled="underlayOpacityLocal === 'transparent'"
             />
           </div>
+          <div class="color-item">
+            <h4>{{ $t('settings.style.advanced_colors.wallpaper') }}</h4>
+            <ColorInput
+              v-model="wallpaperColorLocal"
+              name="wallpaper"
+              :label="$t('settings.style.advanced_colors.wallpaper')"
+              :fallback="previewTheme.colors.wallpaper"
+            />
+          </div>
           <div class="color-item">
             <h4>{{ $t('settings.style.advanced_colors.poll') }}</h4>
             <ColorInput
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 7c8bfec2..d1de8f34 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -516,6 +516,7 @@
         "inputs": "Input fields",
         "faint_text": "Faded text",
         "underlay": "Underlay",
+        "wallpaper": "Wallpaper",
         "poll": "Poll graph",
         "icons": "Icons",
         "highlight": "Highlighted elements",

From 81bac9f8ac094df9a71a9c4f4427f11655362537 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 16 Dec 2020 18:33:54 +0200
Subject: [PATCH 213/389] change your log

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd4a2836..d627a146 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mouseover titles for emojis in reaction picker
 - Support to input emoji into the search box in reaction picker
 - Added some missing unicode emoji
+- Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore
 
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
@@ -18,10 +19,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed pinned statuses not appearing in user profiles
 - Fixed some elements not being keyboard navigation friendly
 - Fixed your latest chat messages disappearing when closing chat view and opening it again during the same session
+- Fixed link color not applied to instance name in topbar
 
 ### Changed
 - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
 - Made reply/fav/repeat etc buttons easier to hit
+- Wallpaper is now top-aligned, horizontally centered.
 
 
 ## [2.2.1] - 2020-11-11

From 93af7ee36a6956d4ec3d0ffd57ec733ddc7cd4e9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 18 Dec 2020 01:01:58 +0200
Subject: [PATCH 214/389] simplified code, review

---
 src/App.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/App.js b/src/App.js
index c79184ab..1ca029b6 100644
--- a/src/App.js
+++ b/src/App.js
@@ -15,6 +15,7 @@ import UserReportingModal from './components/user_reporting_modal/user_reporting
 import PostStatusModal from './components/post_status_modal/post_status_modal.vue'
 import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue'
 import { windowWidth, windowHeight } from './services/window_utils/window_utils'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'app',
@@ -50,17 +51,15 @@ export default {
   },
   computed: {
     currentUser () { return this.$store.state.users.currentUser },
-    background () {
-      return this.currentUser.background_image || this.$store.state.instance.background
+    userBackground () { return this.currentUser.background_image },
+    instanceBackground () {
+      return this.mergedConfig.hideInstanceWallpaper
+        ? null
+        : this.$store.state.instance.background
     },
+    background () { return this.userBackground || this.instanceBackground },
     bgStyle () {
-      if (
-        this.currentUser.background_image ||
-          (
-            this.$store.state.instance.background &&
-              !this.$store.getters.mergedConfig.hideInstanceWallpaper
-          )
-      ) {
+      if (this.background) {
         return {
           '--body-background-image': `url(${this.background})`
         }
@@ -80,7 +79,8 @@ export default {
       return {
         'order': this.$store.state.instance.sidebarRight ? 99 : 0
       }
-    }
+    },
+    ...mapGetters(['mergedConfig'])
   },
   methods: {
     updateMobileState () {

From 481c71517e41cdfc097b489b781847e0319f71fa Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Sat, 12 Dec 2020 15:17:42 +0300
Subject: [PATCH 215/389] Group staff members by role in the About page

---
 CHANGELOG.md                               |  1 +
 src/components/staff_panel/staff_panel.js  | 20 +++++++++++++---
 src/components/staff_panel/staff_panel.vue | 27 ++++++++++++++++++----
 src/i18n/en.json                           |  6 ++++-
 4 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83bcee6e..9a78d328 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added some missing unicode emoji
 - Added the upload limit to the Features panel in the About page
 - Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore
+- Group staff members by role in the About page
 
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
diff --git a/src/components/staff_panel/staff_panel.js b/src/components/staff_panel/staff_panel.js
index 8665648a..b9561bf1 100644
--- a/src/components/staff_panel/staff_panel.js
+++ b/src/components/staff_panel/staff_panel.js
@@ -1,4 +1,6 @@
 import map from 'lodash/map'
+import groupBy from 'lodash/groupBy'
+import { mapGetters, mapState } from 'vuex'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
 const StaffPanel = {
@@ -10,9 +12,21 @@ const StaffPanel = {
     BasicUserCard
   },
   computed: {
-    staffAccounts () {
-      return map(this.$store.state.instance.staffAccounts, nickname => this.$store.getters.findUser(nickname)).filter(_ => _)
-    }
+    groupedStaffAccounts () {
+      const staffAccounts = map(this.staffAccounts, this.findUser).filter(_ => _)
+      const groupedStaffAccounts = groupBy(staffAccounts, 'role')
+
+      return [
+        { role: 'admin', users: groupedStaffAccounts['admin'] },
+        { role: 'moderator', users: groupedStaffAccounts['moderator'] }
+      ].filter(group => group.users)
+    },
+    ...mapGetters([
+      'findUser'
+    ]),
+    ...mapState({
+      staffAccounts: state => state.instance.staffAccounts
+    })
   }
 }
 
diff --git a/src/components/staff_panel/staff_panel.vue b/src/components/staff_panel/staff_panel.vue
index 1d13003d..c52ade42 100644
--- a/src/components/staff_panel/staff_panel.vue
+++ b/src/components/staff_panel/staff_panel.vue
@@ -7,11 +7,18 @@
         </div>
       </div>
       <div class="panel-body">
-        <basic-user-card
-          v-for="user in staffAccounts"
-          :key="user.screen_name"
-          :user="user"
-        />
+        <div
+          v-for="group in groupedStaffAccounts"
+          :key="group.role"
+          class="staff-group"
+        >
+          <h4>{{ $t('general.role.' + group.role) }}</h4>
+          <basic-user-card
+            v-for="user in group.users"
+            :key="user.screen_name"
+            :user="user"
+          />
+        </div>
       </div>
     </div>
   </div>
@@ -20,4 +27,14 @@
 <script src="./staff_panel.js" ></script>
 
 <style lang="scss">
+
+.staff-group {
+  padding-left: 1em;
+  padding-top: 1em;
+
+  .basic-user-card {
+    padding-left: 0;
+  }
+}
+
 </style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 26dd6144..cb4c0205 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -75,7 +75,11 @@
     "confirm": "Confirm",
     "verify": "Verify",
     "close": "Close",
-    "peek": "Peek"
+    "peek": "Peek",
+    "role": {
+      "admin": "Admin",
+      "moderator": "Moderator"
+    }
   },
   "image_cropper": {
     "crop_picture": "Crop picture",

From f01dce99df94e5ccf94a1ff3287d347b71d676b4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 28 Dec 2020 11:32:52 +0200
Subject: [PATCH 216/389] update changelog with latest release

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83bcee6e..243435f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
 ## [Unreleased]
+
+## [2.2.2] - 2020-12-22
 ### Added
 - Mouseover titles for emojis in reaction picker
 - Support to input emoji into the search box in reaction picker

From 243383852ba59d5787eaccdca157c6e809f49449 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 28 Dec 2020 17:08:15 +0200
Subject: [PATCH 217/389] make with-load-more not use computeds when they don't
 work for it

---
 CHANGELOG.md                              |  2 ++
 src/hocs/with_load_more/with_load_more.js | 16 ++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 243435f1..9f516b8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
 ## [Unreleased]
+### Fixed
+- Follows/Followers tabs on user profiles now display the content properly.
 
 ## [2.2.2] - 2020-12-22
 ### Added
diff --git a/src/hocs/with_load_more/with_load_more.js b/src/hocs/with_load_more/with_load_more.js
index 7df9dbb2..671b2b6f 100644
--- a/src/hocs/with_load_more/with_load_more.js
+++ b/src/hocs/with_load_more/with_load_more.js
@@ -29,12 +29,8 @@ const withLoadMore = ({
       return {
         loading: false,
         bottomedOut: false,
-        error: false
-      }
-    },
-    computed: {
-      entries () {
-        return select(this.$props, this.$store) || []
+        error: false,
+        entries: []
       }
     },
     created () {
@@ -48,6 +44,11 @@ const withLoadMore = ({
       destroy && destroy(this.$props, this.$store)
     },
     methods: {
+      // Entries is not a computed because computed can't track the dynamic
+      // selector for changes and won't trigger after fetch.
+      updateEntries () {
+        this.entries = select(this.$props, this.$store) || []
+      },
       fetchEntries () {
         if (!this.loading) {
           this.loading = true
@@ -61,6 +62,9 @@ const withLoadMore = ({
               this.loading = false
               this.error = true
             })
+            .finally(() => {
+              this.updateEntries()
+            })
         }
       },
       scrollLoad (e) {

From a36922ae1b349670112287977a171bfa0c60c690 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 28 Dec 2020 13:27:13 -0600
Subject: [PATCH 218/389] Newer chromedriver works on MacOS aarch64

https://github.com/giggio/node-chromedriver/commit/469dd0a6ee23540bfa832b5f09b4cbde3e152010
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 14738c3e..ea1d9a9b 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "babel-plugin-lodash": "^3.3.4",
     "chai": "^3.5.0",
     "chalk": "^1.1.3",
-    "chromedriver": "^2.21.2",
+    "chromedriver": "^87.0.1",
     "connect-history-api-fallback": "^1.1.0",
     "cross-spawn": "^4.0.2",
     "css-loader": "^0.28.0",

From 9bfc3c275c6ff5c2ec001acd06d7d5fe8723f50d Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Fri, 1 Jan 2021 02:53:16 +0000
Subject: [PATCH 219/389] Added Traditional Chinese to language swithcer

---
 .../interface_language_switcher.vue                            | 3 ++-
 src/i18n/messages.js                                           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index d039e86b..524ec5e9 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -63,7 +63,8 @@ export default {
       const specialLanguageNames = {
         'ja': 'Japanese (日本語)',
         'ja_easy': 'Japanese (やさしいにほんご)',
-        'zh': 'Chinese (简体中文)'
+        'zh': 'Simplified Chinese (简体中文)',
+        'zh_Hant': 'Traditional Chinese (繁體中文)'
       }
       return specialLanguageNames[code] || ISO6391.getName(code)
     }
diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index 2624d1d0..2a1161be 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -34,7 +34,8 @@ const loaders = {
   ru: () => import('./ru.json'),
   te: () => import('./te.json'),
   uk: () => import('./uk.json'),
-  zh: () => import('./zh.json')
+  zh: () => import('./zh.json'),
+  zh_Hant: () => import('./zh_Hant.json')
 }
 
 const messages = {

From 4b0308ad1fe148f7349ff82a89094c0abf979564 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 4 Jan 2021 21:09:12 +0200
Subject: [PATCH 220/389] fix #1037 chrome sorting didn't like 0, other sorter
 was just outright broken

---
 src/modules/instance.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/instance.js b/src/modules/instance.js
index 5f7bf0ec..411b1caa 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -127,7 +127,7 @@ const instance = {
               imageUrl: false,
               replacement: values[key]
             }
-          }).sort((a, b) => a.displayText - b.displayText)
+          }).sort((a, b) => a.name > b.name ? 1 : -1)
           commit('setInstanceOption', { name: 'emoji', value: emoji })
         } else {
           throw (res)
@@ -154,7 +154,7 @@ const instance = {
             }
             // Technically could use tags but those are kinda useless right now,
             // should have been "pack" field, that would be more useful
-          }).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : 0)
+          }).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : -1)
           commit('setInstanceOption', { name: 'customEmoji', value: emoji })
         } else {
           throw (res)

From ef6e2087aeff1cf76cd4e5a3f04685e228c169d4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Tue, 5 Jan 2021 08:09:08 +0000
Subject: [PATCH 221/389] fix #1036 convert screen name to unicode with
 punycode

---
 CHANGELOG.md                                  |   1 +
 package.json                                  |   1 +
 .../entity_normalizer.service.js              |  14 +
 .../entity_normalizer.spec.js                 |   6 +
 yarn.lock                                     | 461 +++++++-----------
 5 files changed, 196 insertions(+), 287 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f516b8e..4f270bfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Fixed
 - Follows/Followers tabs on user profiles now display the content properly.
+- Handle punycode in screen names
 
 ## [2.2.2] - 2020-12-22
 ### Added
diff --git a/package.json b/package.json
index ea1d9a9b..e11396bf 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "parse-link-header": "^1.0.1",
     "phoenix": "^1.3.0",
     "portal-vue": "^2.1.4",
+    "punycode.js": "^2.1.0",
     "v-click-outside": "^2.1.1",
     "vue": "^2.6.11",
     "vue-chat-scroll": "^1.2.1",
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index b1e68df5..206e6281 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -1,6 +1,7 @@
 import escape from 'escape-html'
 import parseLinkHeader from 'parse-link-header'
 import { isStatusNotification } from '../notification_utils/notification_utils.js'
+import punycode from 'punycode.js'
 
 /** NOTICE! **
  * Do not initialize UI-generated data here.
@@ -197,6 +198,19 @@ export const parseUser = (data) => {
   output.rights = output.rights || {}
   output.notification_settings = output.notification_settings || {}
 
+  // Convert punycode to unicode
+  if (output.screen_name.includes('@')) {
+    const parts = output.screen_name.split('@')
+    console.log(parts)
+    let unicodeDomain = punycode.toUnicode(parts[1])
+    if (unicodeDomain !== parts[1]) {
+      // Add some identifier so users can potentially spot spoofing attempts:
+      // lain.com and xn--lin-6cd.com would appear identical otherwise.
+      unicodeDomain = '🌏' + unicodeDomain
+      output.screen_name = [parts[0], unicodeDomain].join('@')
+    }
+  }
+
   return output
 }
 
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index e1f7a958..a3f49b2c 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -311,6 +311,12 @@ describe('API Entities normalizer', () => {
       expect(parseUser(user)).to.have.property('hide_followers_count', false)
       expect(parseUser(user)).to.have.property('hide_follows_count', true)
     })
+
+    it('converts IDN to unicode and marks it as internatonal', () => {
+      const user = makeMockUserMasto({ acct: 'lain@xn--lin-6cd.com' })
+
+      expect(parseUser(user)).to.have.property('screen_name').that.equal('lain@🌏lаin.com')
+    })
   })
 
   // We currently use QvitterAPI notifications only, and especially due to MastoAPI lacking is_seen, support for MastoAPI
diff --git a/yarn.lock b/yarn.lock
index 86cd420f..6682841b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -951,6 +951,11 @@
     remark "^12.0.0"
     unist-util-find-all-after "^3.0.1"
 
+"@testim/chrome-version@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@testim/chrome-version/-/chrome-version-1.0.7.tgz#0cd915785ec4190f08a3a6acc9b61fc38fb5f1a9"
+  integrity sha512-8UT/J+xqCYfn3fKtOznAibsHpiuDshCb0fwgWxRazTT19Igp9ovoXMPhXyLD6m3CKQGTMHgqoxaFfMWaL40Rnw==
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -961,6 +966,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
+"@types/node@*":
+  version "14.14.19"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.19.tgz#5135176a8330b88ece4e9ab1fdcfc0a545b4bab4"
+  integrity sha512-4nhBPStMK04rruRVtVc6cDqhu7S9GZai0fpXgPXrFpcPX6Xul8xnrjSdGB4KPBVYG/R5+fXWdCM8qBoiULWGPQ==
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -976,6 +986,13 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
+"@types/yauzl@^2.9.1":
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af"
+  integrity sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==
+  dependencies:
+    "@types/node" "*"
+
 "@ungap/event-target@^0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@ungap/event-target/-/event-target-0.1.0.tgz#88d527d40de86c4b0c99a060ca241d755999915b"
@@ -1182,6 +1199,21 @@ agent-base@2:
     extend "~3.0.0"
     semver "~5.0.1"
 
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
@@ -1209,15 +1241,6 @@ ajv@^6.10.2:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.5.5:
-  version "6.6.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d"
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -1338,21 +1361,11 @@ array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
 
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  dependencies:
-    array-uniq "^1.0.1"
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
@@ -1383,16 +1396,6 @@ asn1.js@^4.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -1443,10 +1446,6 @@ async@^2.5.0:
   dependencies:
     lodash "^4.17.10"
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -1475,13 +1474,12 @@ autoprefixer@^9.8.0:
     postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-
-aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+axios@^0.21.0:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
+  dependencies:
+    follow-redirects "^1.10.0"
 
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
@@ -1675,12 +1673,6 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  dependencies:
-    tweetnacl "^0.14.3"
-
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
@@ -1880,6 +1872,11 @@ buffer-alloc@^1.2.0:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
 
+buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
@@ -2042,10 +2039,6 @@ caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001097:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001107.tgz#809360df7a5b3458f627aa46b0f6ed6d5239da9a"
   integrity sha512-86rCH+G8onCmdN4VZzJet5uPELII59cUzDphko3thQFgAQG1RNa+sVLDoALIhRYmflo5iSIzWY3vu1XTWtNMQQ==
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
 ccount@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
@@ -2156,14 +2149,18 @@ chrome-trace-event@^1.0.0:
   dependencies:
     tslib "^1.9.0"
 
-chromedriver@^2.21.2:
-  version "2.45.0"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-2.45.0.tgz#8c1b158adbbd3e0ca3f7af19d459082245554378"
+chromedriver@^87.0.1:
+  version "87.0.4"
+  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-87.0.4.tgz#749f69e9427880abff19c1838258c35238397e50"
+  integrity sha512-kD4N/L8c0nAzh1eEAiAbEIq6Pn5TvGvckODvP5dPqF90q5tPiAJZCoWWSOUV/mrPxiodjHPfmNeOfGERHugzug==
   dependencies:
-    del "^3.0.0"
-    extract-zip "^1.6.7"
-    mkdirp "^0.5.1"
-    request "^2.88.0"
+    "@testim/chrome-version" "^1.0.7"
+    axios "^0.21.0"
+    del "^6.0.0"
+    extract-zip "^2.0.1"
+    https-proxy-agent "^5.0.0"
+    mkdirp "^1.0.4"
+    proxy-from-env "^1.1.0"
     tcp-port-used "^1.0.1"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
@@ -2198,6 +2195,11 @@ clean-css@4.2.x:
   dependencies:
     source-map "~0.6.0"
 
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
 cli-cursor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
@@ -2338,12 +2340,6 @@ combine-lists@^1.0.0:
   dependencies:
     lodash "^4.5.0"
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  dependencies:
-    delayed-stream "~1.0.0"
-
 commander@2.17.x, commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@@ -2378,7 +2374,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@1.6.2, concat-stream@^1.5.0:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
@@ -2480,7 +2476,7 @@ core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.2.tgz#267988d7268323b349e20b4588211655f0e83944"
 
-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
@@ -2698,12 +2694,6 @@ cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
 data-uri-to-buffer@1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
@@ -2746,6 +2736,13 @@ debug@2.6.8:
   dependencies:
     ms "2.0.0"
 
+debug@4:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
@@ -2837,20 +2834,19 @@ degenerator@~1.0.2:
     escodegen "1.x.x"
     esprima "3.x.x"
 
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+del@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952"
+  integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==
   dependencies:
-    globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+    globby "^11.0.1"
+    graceful-fs "^4.2.4"
+    is-glob "^4.0.1"
+    is-path-cwd "^2.2.0"
+    is-path-inside "^3.0.2"
+    p-map "^4.0.0"
+    rimraf "^3.0.2"
+    slash "^3.0.0"
 
 delegates@^1.0.0:
   version "1.0.0"
@@ -3010,13 +3006,6 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -3520,7 +3509,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.2:
+extend@3, extend@^3.0.0, extend@~3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
@@ -3551,18 +3540,16 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-zip@^1.6.7:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
+extract-zip@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
   dependencies:
-    concat-stream "1.6.2"
-    debug "2.6.9"
-    mkdirp "0.5.1"
-    yauzl "2.4.1"
-
-extsprintf@1.3.0, extsprintf@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+    debug "^4.1.1"
+    get-stream "^5.1.0"
+    yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
@@ -3604,9 +3591,10 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
   dependencies:
     pend "~1.2.0"
 
@@ -3763,6 +3751,11 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "=3.1.0"
 
+follow-redirects@^1.10.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
+  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -3773,18 +3766,6 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 formatio@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb"
@@ -3890,6 +3871,13 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
 get-uri@2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578"
@@ -3905,12 +3893,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  dependencies:
-    assert-plus "^1.0.0"
-
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -3970,7 +3952,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.3:
+glob@^7.0.0, glob@^7.1.1, glob@^7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   dependencies:
@@ -4028,16 +4010,6 @@ globby@^11.0.1:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
@@ -4054,6 +4026,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
 
+graceful-fs@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -4072,17 +4049,6 @@ handlebars@^4.0.1:
   optionalDependencies:
     uglify-js "^3.1.4"
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-
-har-validator@~5.1.0:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-  dependencies:
-    ajv "^6.5.5"
-    har-schema "^2.0.0"
-
 hard-rejection@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
@@ -4304,14 +4270,6 @@ http-proxy@^1.13.0, http-proxy@^1.16.2:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
@@ -4324,6 +4282,14 @@ https-proxy-agent@1:
     debug "2"
     extend "3"
 
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 iconv-lite@0.4.23, iconv-lite@^0.4.4:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -4717,21 +4683,15 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+is-path-cwd@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  dependencies:
-    path-is-inside "^1.0.1"
+is-path-inside@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
+  integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
@@ -4787,7 +4747,7 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.0"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
@@ -4885,10 +4845,6 @@ isparta@4.x.x:
     source-map "^0.5.0"
     which "^1.0.9"
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
 istanbul@0.4.5, istanbul@^0.4.0:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
@@ -4946,10 +4902,6 @@ js-yaml@~3.7.0:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -4975,18 +4927,10 @@ json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
 
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
 
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
 json3@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
@@ -5015,15 +4959,6 @@ json5@^2.1.2:
   dependencies:
     minimist "^1.2.5"
 
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
 karma-coverage@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/karma-coverage/-/karma-coverage-1.1.2.tgz#cc09dceb589a83101aca5fe70c287645ef387689"
@@ -5774,7 +5709,7 @@ mime-db@~1.37.0:
   version "1.37.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
 
-mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19:
+mime-types@~2.1.18:
   version "2.1.21"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
   dependencies:
@@ -5894,6 +5829,11 @@ mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@
   dependencies:
     minimist "0.0.8"
 
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 mkpath@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-1.0.0.tgz#ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"
@@ -5950,6 +5890,11 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
@@ -6202,10 +6147,6 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -6399,9 +6340,12 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
 
 p-try@^1.0.0:
   version "1.0.0"
@@ -6569,7 +6513,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
@@ -6624,10 +6568,6 @@ pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-
 phoenix@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/phoenix/-/phoenix-1.4.0.tgz#9cec8dbd8cbc59ecd2147bc09ca8ceb56b860d75"
@@ -6641,10 +6581,6 @@ pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-
 pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
@@ -7147,6 +7083,11 @@ proxy-agent@2.0.0:
     pac-proxy-agent "1"
     socks-proxy-agent "2"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -7155,10 +7096,6 @@ pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
-psl@^1.1.24:
-  version "1.1.31"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
-
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -7192,11 +7129,16 @@ pumpify@^1.3.3:
     inherits "^2.0.3"
     pump "^2.0.0"
 
+punycode.js@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.1.0.tgz#f3937f7a914152c2dc17e9c280a2cf86a26b7cda"
+  integrity sha512-LvGUJ9QHiESLM4yn8JuJWicstRcJKRmP46psQw1HvCZ9puLFwYMKJWvkAkP3OHBVzNzZGx/D53EYJrIaKd9gZQ==
+
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@^1.2.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
@@ -7222,7 +7164,7 @@ qrcode@^1.3.0:
     pngjs "^3.3.0"
     yargs "^12.0.5"
 
-qs@6.5.2, qs@~6.5.2:
+qs@6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
@@ -7606,31 +7548,6 @@ replace-ext@1.0.0:
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
   integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
 
-request@^2.88.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.0"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -7713,12 +7630,19 @@ rfdc@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
 
-rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2.6.3, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   dependencies:
     glob "^7.1.3"
 
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -7764,7 +7688,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
@@ -8148,20 +8072,6 @@ sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
-sshpk@^1.7.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
 ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -8647,13 +8557,6 @@ toposort@^1.0.0:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -8690,16 +8593,6 @@ tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
@@ -8995,14 +8888,6 @@ vendors@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 vfile-location@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.0.1.tgz#d78677c3546de0f7cd977544c367266764d31bb3"
@@ -9331,11 +9216,13 @@ yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yauzl@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
+yauzl@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
   dependencies:
-    fd-slicer "~1.0.1"
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.1.0"
 
 yeast@0.1.2:
   version "0.1.2"

From 21f624609f6728dc89545536e75fe141e16eadc3 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Fri, 4 Dec 2020 19:39:40 +0000
Subject: [PATCH 222/389] Translated using Weblate (Ukrainian)

Currently translated at 98.0% (658 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index f630b2dd..530c57a0 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -193,7 +193,7 @@
   "interactions": {
     "load_older": "Завантажити давніші взаємодії",
     "follows": "Нові підписки",
-    "favs_repeats": "Повтори та вподобайки",
+    "favs_repeats": "Поширення та вподобайки",
     "moves": "Міграції користувачів"
   },
   "errors": {
@@ -482,7 +482,8 @@
           "buttonPressedHover": "Кнопка (натиснута + наведенний курсор)",
           "buttonPressed": "Кнопка (натиснута)",
           "buttonHover": "Кнопка (при наведенні)",
-          "popup": "Спливаючі вікна та підказки"
+          "popup": "Спливаючі вікна та підказки",
+          "topBar": "Верхня панель"
         },
         "component": "Компонент",
         "filter_hint": {
@@ -497,7 +498,8 @@
         "shadow_id": "Тінь №{value}",
         "override": "Перевизначити",
         "_tab_label": "Тінь і підсвічування",
-        "hintV3": "Для тіней ви також можете використовувати позначення {0} для використання іншого кольорового слота."
+        "hintV3": "Для тіней ви також можете використовувати позначення {0} для використання іншого кольорового слота.",
+        "spread": "Розмах"
       },
       "fonts": {
         "components": {
@@ -695,7 +697,9 @@
   "search": {
     "no_results": "Немає результатів",
     "hashtags": "Хештеги",
-    "people": "Люди"
+    "people": "Люди",
+    "people_talking": "{count} людей говорять про це",
+    "person_talking": "{count} особа говорить про це"
   },
   "user_card": {
     "statuses": "Дописи",
@@ -713,7 +717,15 @@
       "delete_user_confirmation": "Ви абсолютно впевнені? Цю дію неможливо буде скасовувати.",
       "delete_user": "Видалити обліковий запис",
       "strip_media": "Вилучити медіа з дописів користувача",
-      "force_nsfw": "Позначити всі дописи як NSFW"
+      "force_nsfw": "Позначити всі дописи як NSFW",
+      "disable_any_subscription": "Взагалі заборонити підписку на користувача",
+      "disable_remote_subscription": "Заборонити підписуватись на користувачів з віддалених інстансів",
+      "sandbox": "Показувати дописи лише підписникам",
+      "force_unlisted": "Не показувати дописи в стрічці",
+      "revoke_moderator": "Позбавити прав модератора",
+      "grant_moderator": "Надати права модератора",
+      "revoke_admin": "Позбавити прав адміністратора",
+      "grant_admin": "Надати права адміністратора"
     },
     "deny": "Відмовити",
     "block": "Заблокувати",
@@ -724,7 +736,13 @@
     "report": "Поскаржитись",
     "per_day": "на день",
     "favorites": "Вподобання",
-    "media": "Медіа"
+    "media": "Медіа",
+    "show_repeats": "Показати поширення",
+    "hide_repeats": "Приховати поширення",
+    "its_you": "Це ти!",
+    "follows_you": "Підписаний на вас!",
+    "followers": "Підписника",
+    "followees": "Підписаний(-а)"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",
@@ -746,7 +764,10 @@
     "bookmark": "Додати до закладок",
     "pinned": "Закріплено",
     "unpin": "Відкріпити від профілю",
-    "repeats": "Повтори"
+    "repeats": "Поширення",
+    "nsfw": "Дратівливий вміст",
+    "thread_muted": "Нитка заглушена",
+    "unmute_conversation": "Припинити глушити розмову"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",
@@ -759,7 +780,7 @@
     "conversation": "Розмова",
     "no_statuses": "Ніяких статусів",
     "repeated": "поширив(-ла)",
-    "no_retweet_hint": "Запис, позначено як \"тільки для відстежувачів\" або \"особисте\" і тому не може бути повторений"
+    "no_retweet_hint": "Запис, позначено як \"тільки для відстежувачів\" або \"особисте\" і тому не може бути поширений"
   },
   "user_reporting": {
     "submit": "Відправити",
@@ -772,6 +793,7 @@
   },
   "user_profile": {
     "profile_loading_error": "Вибачте, під час завантаження цього профілю виникла помилка.",
-    "profile_does_not_exist": "Вибачте, цей профіль більше не існує."
+    "profile_does_not_exist": "Вибачте, цей профіль більше не існує.",
+    "timeline_title": "Стрічка користувача"
   }
 }

From 9780e1fc111cc58b6c4756c3be7ddcb148fd8d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Fri, 4 Dec 2020 22:42:46 +0000
Subject: [PATCH 223/389] Translated using Weblate (Ukrainian)

Currently translated at 98.0% (658 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 530c57a0..dba90b7d 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -742,7 +742,8 @@
     "its_you": "Це ти!",
     "follows_you": "Підписаний на вас!",
     "followers": "Підписника",
-    "followees": "Підписаний(-а)"
+    "followees": "Підписаний(-а)",
+    "follow_progress": "Запитую…"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From 07b31a7d9c965eeb78648e1b986da17cd4a12b21 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Fri, 4 Dec 2020 22:46:19 +0000
Subject: [PATCH 224/389] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (671 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index dba90b7d..74a0ee0f 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -644,7 +644,8 @@
     "favorite": "Подобається",
     "reject_follow_request": "Відхилити запит на підписку",
     "accept_follow_request": "Прийняти запит на підписку",
-    "media_upload": "Завантажити медіа"
+    "media_upload": "Завантажити медіа",
+    "bookmark": "Додати до закладок"
   },
   "upload": {
     "error": {
@@ -725,7 +726,8 @@
       "revoke_moderator": "Позбавити прав модератора",
       "grant_moderator": "Надати права модератора",
       "revoke_admin": "Позбавити прав адміністратора",
-      "grant_admin": "Надати права адміністратора"
+      "grant_admin": "Надати права адміністратора",
+      "quarantine": "Не розповсюджувати дописи на інших інстансах"
     },
     "deny": "Відмовити",
     "block": "Заблокувати",
@@ -743,7 +745,18 @@
     "follows_you": "Підписаний на вас!",
     "followers": "Підписника",
     "followees": "Підписаний(-а)",
-    "follow_progress": "Запитую…"
+    "follow_progress": "Запитую…",
+    "mute_progress": "Глушимо…",
+    "unmute_progress": "Знімаємо глушення…",
+    "unmute": "Зняти глушення",
+    "hidden": "Приховано",
+    "following": "Підписаний!",
+    "block_progress": "Блокуємо…",
+    "unblock_progress": "Розблоковуємо…",
+    "unblock": "Розблокувати",
+    "remote_follow": "Підписатись",
+    "muted": "Заглушений",
+    "mute": "Заглушити"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From 1847315353fd895880509c703e239531c0ca0322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Fri, 4 Dec 2020 23:15:31 +0000
Subject: [PATCH 225/389] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (671 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 74a0ee0f..e0983ddc 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -39,7 +39,7 @@
   },
   "domain_mute_card": {
     "unmute_progress": "Вимикаю…",
-    "unmute": "Вимкнути ігнорування",
+    "unmute": "Вимкнути заглушення",
     "mute_progress": "Вмикаю…",
     "mute": "Ігнорувати"
   },

From 76809e9d2426bc372d65b2312a26fffff2e650ff Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Fri, 4 Dec 2020 23:16:28 +0000
Subject: [PATCH 226/389] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (671 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index e0983ddc..ed2a62da 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -713,7 +713,7 @@
     "admin_menu": {
       "activate_account": "Активувати обліковий запис",
       "deactivate_account": "Деактивувати обліковий запис",
-      "delete_account": "Видалити аккаунт",
+      "delete_account": "Видалити обліковий запис",
       "moderation": "Модерація",
       "delete_user_confirmation": "Ви абсолютно впевнені? Цю дію неможливо буде скасовувати.",
       "delete_user": "Видалити обліковий запис",
@@ -743,7 +743,7 @@
     "hide_repeats": "Приховати поширення",
     "its_you": "Це ти!",
     "follows_you": "Підписаний на вас!",
-    "followers": "Підписника",
+    "followers": "Підписники",
     "followees": "Підписаний(-а)",
     "follow_progress": "Запитую…",
     "mute_progress": "Глушимо…",

From 837df4f5a544e64bef0e2182f4c2020e5ecb7b7c Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Fri, 4 Dec 2020 23:43:41 +0000
Subject: [PATCH 227/389] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (671 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index ed2a62da..7f37bfa0 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -25,8 +25,8 @@
   },
   "features_panel": {
     "gopher": "Gopher",
-    "pleroma_chat_messages": "Чат Pleroma",
-    "chat": "Чат",
+    "pleroma_chat_messages": "Локальні балачки",
+    "chat": "Міні-чат",
     "who_to_follow": "Кого відстежувати",
     "title": "Особливості",
     "scope_options": "Параметри осягу",

From d1f51d946bf186401146d3bc6f7d903a0b525b3c Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Fri, 4 Dec 2020 21:26:28 +0000
Subject: [PATCH 228/389] Translated using Weblate (Russian)

Currently translated at 77.3% (519 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 3a7c61a9..b14d8629 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -460,7 +460,10 @@
     "status_deleted": "Пост удален",
     "reply_to": "Ответ",
     "repeats": "Повторы",
-    "favorites": "Понравилось"
+    "favorites": "Понравилось",
+    "unmute_conversation": "Прекратить игнорировать разговор",
+    "mute_conversation": "Игнорировать разговор",
+    "thread_muted": "Разговор игнорируется"
   },
   "user_card": {
     "block": "Заблокировать",

From 762204f3bedb3151c99dfba3461ec94f50c49b1d Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Sat, 5 Dec 2020 11:30:10 +0000
Subject: [PATCH 229/389] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (671 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 7f37bfa0..603b2480 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -219,7 +219,7 @@
     },
     "attachments_sensitive": "Позначити вкладення як чутливі",
     "account_not_locked_warning_link": "замкнена",
-    "account_not_locked_warning": "Ваша обліковка не {0}. Будь-хто може відстежувати вас для перегляду дописів тільки для відстежувачів.",
+    "account_not_locked_warning": "Ваша обліковка не {0}. Будь-хто може відстежувати вас для перегляду дописів тільки для підписників.",
     "new_status": "Створити допис",
     "direct_warning_to_first_only": "Цей допис побачать лише користувачі, що були згадані на початку повідомлення.",
     "direct_warning_to_all": "Цей допис побачать всі згадані користувачі.",
@@ -230,7 +230,7 @@
     "empty_status_error": "Не можу опублікувати пустий статус без вкладень",
     "scope": {
       "unlisted": "Непублічний - цей допис буде відсутній у публічних стрічках",
-      "public": "Піблічний - цей допис побачать усі",
+      "public": "Публічний - цей допис побачать усі",
       "private": "Для читачів - цей допис побачать лише ваші читачі",
       "direct": "Приватний - цей допис побачать лише згадані користувачі"
     },
@@ -479,7 +479,7 @@
           "panelHeader": "Заголовок панелі",
           "avatarStatus": "Аватар користувача (в стрічці)",
           "avatar": "Аватар користувача (профіль)",
-          "buttonPressedHover": "Кнопка (натиснута + наведенний курсор)",
+          "buttonPressedHover": "Кнопка (натиснута + наведений курсор)",
           "buttonPressed": "Кнопка (натиснута)",
           "buttonHover": "Кнопка (при наведенні)",
           "popup": "Спливаючі вікна та підказки",
@@ -584,7 +584,7 @@
     "type_domains_to_mute": "Пошук доменів для заглушення",
     "nsfw_clickthrough": "Увімкнути приховування NSFW медіа",
     "greentext": "Мемний текст",
-    "virtual_scrolling": "Оптимізувати оновлення стрчки",
+    "virtual_scrolling": "Оптимізувати оновлення стрічки",
     "theme_help_v2_2": "Піктограми під деякими записами є показниками контрасту між фоном та текстом. Коли ви наведете на них курсор, ви отримаєте детальну інформацію. Пам'ятайте, якщо ви використовуєте прозорість, індикатори показують найгірший варіант.",
     "theme_help_v2_1": "Ви також можете замінити кольори та видимість окремих компонентів, перемикаючи прапорці, використовуйте \"Очистити все\", щоб видалити всі заміни.",
     "theme_help": "Використовувати шістнадцяткові коди кольору (#rrggbb) щоб редагувати тему.",
@@ -613,7 +613,7 @@
   },
   "registration": {
     "validations": {
-      "password_confirmation_match": "пароль та підтвердження паролю мають співпадати",
+      "password_confirmation_match": "пароль та підтвердження паролю мають бути однаковими",
       "password_confirmation_required": "не може бути порожнім",
       "password_required": "не може бути порожнім",
       "email_required": "не може бути порожнім",
@@ -668,7 +668,7 @@
     "year_short": "{0}р",
     "years": "{0} роки",
     "year": "{0} рік",
-    "weeks": "{0} тижднів",
+    "weeks": "{0} тижнів",
     "week": "{0} тиждень",
     "second_short": "{0}с",
     "second": "{0} секунда",
@@ -794,7 +794,7 @@
     "conversation": "Розмова",
     "no_statuses": "Ніяких статусів",
     "repeated": "поширив(-ла)",
-    "no_retweet_hint": "Запис, позначено як \"тільки для відстежувачів\" або \"особисте\" і тому не може бути поширений"
+    "no_retweet_hint": "Запис, позначено як \"тільки для підписників\" або \"особисте\" і тому не може бути поширений"
   },
   "user_reporting": {
     "submit": "Відправити",

From cf796d8f5c1334974d62495c43d2ddca90f9b3d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Sat, 5 Dec 2020 14:00:01 +0000
Subject: [PATCH 230/389] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (671 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 603b2480..524e6252 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -338,7 +338,7 @@
     "security": "Безпека",
     "domain_mutes": "Домени",
     "discoverable": "Дозволити виявлення цього облікового запису в результатах пошуку та інших службах",
-    "mutes_and_blocks": "Заглушені та блоковані",
+    "mutes_and_blocks": "Заглушення та блокування",
     "changed_email": "Email успішно змінено!",
     "change_email_error": "Сталася помилка під час зміни email.",
     "change_email": "Змінити email",
@@ -384,7 +384,7 @@
     "user_mutes": "Користувачі",
     "no_mutes": "Заглушені відсутні",
     "emoji_reactions_on_timeline": "Показувати реакції емоджі на стрічці",
-    "pad_emoji": "Додавати простір з обидвох сторін емоджі, при додаванні з панелі",
+    "pad_emoji": "Автоматично додавати простір з обидвох сторін емоджі",
     "allow_following_move": "Дозволити автостеження при переміщенні на інший інстанс",
     "set_new_profile_background": "Встановити нову обкладинку профілю",
     "radii_help": "Радіус заокруглення кутів інтерфейсу (в пікселях)",
@@ -554,7 +554,7 @@
         "_tab_label": "Загальні"
       },
       "radii": {
-        "_tab_label": "Округлість"
+        "_tab_label": "Скруглення"
       }
     },
     "enable_web_push_notifications": "Увімкнути web push-сповіщення",
@@ -566,7 +566,7 @@
     "reset_profile_background": "Скинути обкладинку профілю",
     "reset_avatar_confirm": "Ви дійсно хочете скинути аватар?",
     "reset_profile_banner": "Скинули банер профілю",
-    "hide_follows_count_description": "Не показувати на кого я підписаний",
+    "hide_follows_count_description": "Не показувати кількість підписників",
     "reset_banner_confirm": "Ви дійсно хочете скинути банер?",
     "reset_background_confirm": "Ви дійсно хочете скинути обкладинку?",
     "subject_line_behavior": "Вигляд теми при відповіді",
@@ -577,7 +577,7 @@
     "search_user_to_block": "Шукайте кого ви хочете заблокувати",
     "autohide_floating_post_button": "Автоматично ховати кнопку \"Новий допис\" (в мобільній версії)",
     "pause_on_unfocused": "Призупинити трансляцію, коли вкладка неактивна",
-    "hide_followers_count_description": "Не показувати кількість читачів",
+    "hide_followers_count_description": "Не показувати кількість моїх підписників",
     "notification_blocks": "Блокування користувача зупиняє всі сповіщення від нього, а також скасовує його відстеження.",
     "notification_setting_hide_notification_contents": "Ховати відправника та вміст push-сповіщень",
     "notification_setting_block_from_strangers": "Блокувати сповіщення від користувачів за якими ви не слідкуєте",

From 2b6b5ff227bb7ef0ad3eb0dc4d1cc7b9e27ebac7 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 9 Dec 2020 21:21:53 +0000
Subject: [PATCH 231/389] Translated using Weblate (Russian)

Currently translated at 77.4% (520 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index b14d8629..b61a043a 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -452,7 +452,8 @@
     "no_retweet_hint": "Пост помечен как \"только для подписчиков\" или \"личное\" и поэтому не может быть повторён",
     "repeated": "повторил(а)",
     "show_new": "Показать новые",
-    "up_to_date": "Обновлено"
+    "up_to_date": "Обновлено",
+    "error": "Ошибка при обновлении ленты: {0}"
   },
   "status": {
     "bookmark": "В закладки",

From 646ff273ee63ac007f734c522ce4b9dbf7c31c1e Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Thu, 10 Dec 2020 05:40:17 +0000
Subject: [PATCH 232/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.7% (669 of 671 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 7f8e5593..d319ced9 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -34,7 +34,7 @@
     "confirm": "确认",
     "verify": "验证",
     "dismiss": "忽略",
-    "peek": "窥探",
+    "peek": "预览",
     "close": "关闭",
     "retry": "重试",
     "error_retry": "请重试",
@@ -104,7 +104,8 @@
     "no_more_notifications": "没有更多的通知",
     "reacted_with": "作出了 {0} 的反应",
     "migrated_to": "迁移到了",
-    "follow_request": "想要关注你"
+    "follow_request": "想要关注你",
+    "error": "取得通知时发生错误：{0}"
   },
   "polls": {
     "add_poll": "增加投票",
@@ -465,7 +466,8 @@
           "buttonPressed": "按钮（按下）",
           "buttonPressedHover": "按钮（按下和悬停）",
           "input": "输入框"
-        }
+        },
+        "hintV3": "对于阴影，您还可以使用 {0} 表示法来使用其它颜色插槽。"
       },
       "fonts": {
         "_tab_label": "字体",
@@ -594,7 +596,8 @@
     "up_to_date": "已是最新",
     "no_more_statuses": "没有更多的状态",
     "no_statuses": "没有状态更新",
-    "reload": "重新载入"
+    "reload": "重新载入",
+    "error": "取得时间轴时发生错误：{0}"
   },
   "status": {
     "favorites": "收藏",
@@ -618,7 +621,8 @@
     "unbookmark": "取消书签",
     "bookmark": "书签",
     "thread_muted_and_words": "，含有过滤词：",
-    "status_deleted": "该状态已被删除"
+    "status_deleted": "该状态已被删除",
+    "nsfw": "NSFW"
   },
   "user_card": {
     "approve": "允许",
@@ -772,7 +776,7 @@
         "ftl_removal": "从“全部已知网络”时间线上移除"
       },
       "mrf_policies_desc": "MRF 策略会影响本实例的互通行为。以下策略已启用：",
-      "mrf_policies": "已启动的 MRF 策略",
+      "mrf_policies": "已启用的 MRF 策略",
       "keyword": {
         "ftl_removal": "从“全部已知网络”时间线上移除",
         "keyword_policies": "关键词策略",

From 467efc4639a088ced40205ccf3655600d6693454 Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Sat, 12 Dec 2020 15:27:09 +0000
Subject: [PATCH 233/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.7% (670 of 672 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 63 ++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index d319ced9..1303bcfe 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -14,7 +14,8 @@
     "text_limit": "文字数量限制",
     "title": "功能",
     "who_to_follow": "推荐关注",
-    "pleroma_chat_messages": "Pleroma 聊天"
+    "pleroma_chat_messages": "Pleroma 聊天",
+    "upload_limit": "上传限制"
   },
   "finder": {
     "error_fetching_user": "获取用户时发生错误",
@@ -125,7 +126,7 @@
     "add_sticker": "添加贴纸"
   },
   "interactions": {
-    "favs_repeats": "转发和收藏",
+    "favs_repeats": "转发和喜欢",
     "follows": "新的关注者",
     "load_older": "加载更早的互动",
     "moves": "用户迁移"
@@ -228,7 +229,7 @@
     "btnRadius": "按钮",
     "cBlue": "蓝色（回复，关注）",
     "cGreen": "绿色（转发）",
-    "cOrange": "橙色（收藏）",
+    "cOrange": "橙色（喜欢）",
     "cRed": "红色（取消）",
     "change_password": "修改密码",
     "change_password_error": "修改密码的时候出了点问题。",
@@ -245,7 +246,7 @@
     "delete_account_description": "永久删除你的帐号和所有数据。",
     "delete_account_error": "删除账户时发生错误，如果一直删除不了，请联系实例管理员。",
     "delete_account_instructions": "在下面输入您的密码来确认删除账户。",
-    "avatar_size_instruction": "推荐的头像图片最小的尺寸是 150x150 像素。",
+    "avatar_size_instruction": "推荐的头像图片最小尺寸为 150x150 像素。",
     "export_theme": "导出预置主题",
     "filtering": "过滤器",
     "filtering_explanation": "所有包含以下词汇的内容都会被隐藏，一行一个",
@@ -259,11 +260,11 @@
     "hide_attachments_in_convo": "在对话中隐藏附件",
     "hide_attachments_in_tl": "在时间线上隐藏附件",
     "hide_muted_posts": "不显示被隐藏的用户的帖子",
-    "max_thumbnails": "最多再每个帖子所能显示的缩略图数量",
+    "max_thumbnails": "每个帖子最多能显示的缩略图数量",
     "hide_isp": "隐藏实例独有的面板",
     "preload_images": "预载图片",
-    "use_one_click_nsfw": "点击一次以打开工作场所不适宜的附件",
-    "hide_post_stats": "隐藏推文相关的统计数据(例如：收藏的次数)",
+    "use_one_click_nsfw": "点击一次以打开工作场所不适宜（NSFW）的附件",
+    "hide_post_stats": "隐藏帖子的统计数据(例如：喜欢的次数)",
     "hide_user_stats": "隐藏用户的统计数据（例如：关注者的数量）",
     "hide_filtered_statuses": "隐藏过滤的状态",
     "import_blocks_from_a_csv_file": "从 csv 文件中导入拉黑名单",
@@ -297,8 +298,8 @@
     "no_mutes": "没有隐藏",
     "hide_follows_description": "不要显示我所关注的人",
     "hide_followers_description": "不要显示关注我的人",
-    "show_admin_badge": "显示管理徽章",
-    "show_moderator_badge": "在我的个人资料中显示监察员标志",
+    "show_admin_badge": "在我的个人资料中显示管理员徽章",
+    "show_moderator_badge": "在我的个人资料中显示监察员徽章",
     "nsfw_clickthrough": "将不和谐附件隐藏，点击才能打开",
     "oauth_tokens": "OAuth令牌",
     "token": "令牌",
@@ -401,7 +402,7 @@
         "_tab_label": "常规",
         "main": "常用颜色",
         "foreground_hint": "点击”高级“ 标签进行细致的控制",
-        "rgbo": "图标，口音，徽章"
+        "rgbo": "图标，强调，徽章"
       },
       "advanced_colors": {
         "_tab_label": "高级",
@@ -421,7 +422,7 @@
           "incoming": "收到的"
         },
         "disabled": "禁用的",
-        "pressed": "按下的",
+        "pressed": "压下的",
         "highlight": "强调元素",
         "selectedMenu": "选中的菜单项",
         "selectedPost": "选中的发布内容",
@@ -433,7 +434,7 @@
         "alert_warning": "警告",
         "tabs": "标签页",
         "underlay": "底衬",
-        "toggled": "勾选的"
+        "toggled": "按下的"
       },
       "radii": {
         "_tab_label": "圆角"
@@ -445,14 +446,14 @@
         "shadow_id": "阴影 #{value}",
         "blur": "模糊",
         "spread": "扩散",
-        "inset": "插入内部",
+        "inset": "内阴影",
         "hint": "对于阴影你还可以使用 --variable 作为颜色值来使用 CSS3 变量。请注意，这种情况下，透明设置将不起作用。",
         "filter_hint": {
           "always_drop_shadow": "警告，此阴影设置会总是使用 {0} ，如果浏览器支持的话。",
           "drop_shadow_syntax": "{0} 不支持参数 {1} 和关键词 {2} 。",
           "avatar_inset": "请注意组合两个内部和非内部的阴影到头像上，在透明头像上可能会有意料之外的效果。",
           "spread_zero": "阴影的扩散 > 0 会同设置成零一样",
-          "inset_classic": "插入内部的阴影会使用 {0}"
+          "inset_classic": "内阴影会使用 {0}"
         },
         "components": {
           "panel": "面板",
@@ -463,8 +464,8 @@
           "popup": "弹窗和工具提示",
           "button": "按钮",
           "buttonHover": "按钮（悬停）",
-          "buttonPressed": "按钮（按下）",
-          "buttonPressedHover": "按钮（按下和悬停）",
+          "buttonPressed": "按钮（压下）",
+          "buttonPressedHover": "按钮（压下和悬停）",
           "input": "输入框"
         },
         "hintV3": "对于阴影，您还可以使用 {0} 表示法来使用其它颜色插槽。"
@@ -480,22 +481,22 @@
         },
         "family": "字体名称",
         "size": "大小 (in px)",
-        "weight": "字重 （粗体）)",
+        "weight": "字重 （粗体）",
         "custom": "自选"
       },
       "preview": {
         "header": "预览",
         "content": "内容",
-        "error": "例子错误",
+        "error": "错误示例",
         "button": "按钮",
         "text": "有堆 {0} 和 {1}",
-        "mono": "内容",
-        "input": "刚刚抵达上海",
-        "faint_link": "帮助菜单",
+        "mono": "monospace 内容",
+        "input": "刚刚抵达上海。",
+        "faint_link": "帮助手册",
         "fine_print": "阅读我们的 {0} ，然而什么也学不到！",
         "header_faint": "这很正常",
-        "checkbox": "我已经浏览了 TOC",
-        "link": "一个很棒的摇滚链接"
+        "checkbox": "我已经浏览了条款及细则",
+        "link": "一个棒棒的小小链接"
       }
     },
     "version": {
@@ -590,7 +591,7 @@
     "conversation": "对话",
     "error_fetching": "获取更新时发生错误",
     "load_older": "加载更早的状态",
-    "no_retweet_hint": "这条内容仅关注者可见，或者是私信，因此不能转发。",
+    "no_retweet_hint": "这条内容仅关注者可见，或者是私信，因此不能转发",
     "repeated": "已转发",
     "show_new": "显示新内容",
     "up_to_date": "已是最新",
@@ -600,7 +601,7 @@
     "error": "取得时间轴时发生错误：{0}"
   },
   "status": {
-    "favorites": "收藏",
+    "favorites": "喜欢",
     "repeats": "转发",
     "delete": "删除状态",
     "pin": "在个人资料置顶",
@@ -625,21 +626,21 @@
     "nsfw": "NSFW"
   },
   "user_card": {
-    "approve": "允许",
+    "approve": "核准",
     "block": "屏蔽",
     "blocked": "已屏蔽！",
     "deny": "拒绝",
-    "favorites": "收藏",
+    "favorites": "喜欢",
     "follow": "关注",
     "follow_sent": "请求已发送！",
-    "follow_progress": "请求中",
+    "follow_progress": "请求中…",
     "follow_again": "再次发送请求？",
     "follow_unfollow": "取消关注",
     "followees": "正在关注",
     "followers": "关注者",
     "following": "正在关注！",
     "follows_you": "关注了你！",
-    "its_you": "就是你！!",
+    "its_you": "就是你！",
     "media": "媒体",
     "mute": "隐藏",
     "muted": "已隐藏",
@@ -656,7 +657,7 @@
     "unmute_progress": "取消隐藏中…",
     "mute_progress": "隐藏中…",
     "admin_menu": {
-      "moderation": "权限",
+      "moderation": "仲裁",
       "grant_admin": "赋予管理权限",
       "revoke_admin": "撤销管理权限",
       "grant_moderator": "赋予监察员权限",
@@ -702,7 +703,7 @@
     "media_upload": "上传多媒体",
     "repeat": "转发",
     "reply": "回复",
-    "favorite": "收藏",
+    "favorite": "喜欢",
     "user_settings": "用户设置",
     "reject_follow_request": "拒绝关注请求",
     "add_reaction": "添加互动",

From a2dff277373631dc51f2ffc05aceb3edf91d586f Mon Sep 17 00:00:00 2001
From: shironeko <shironeko@tesaguri.club>
Date: Sun, 13 Dec 2020 04:34:34 +0000
Subject: [PATCH 234/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.7% (670 of 672 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 1303bcfe..771d1700 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -300,7 +300,7 @@
     "hide_followers_description": "不要显示关注我的人",
     "show_admin_badge": "在我的个人资料中显示管理员徽章",
     "show_moderator_badge": "在我的个人资料中显示监察员徽章",
-    "nsfw_clickthrough": "将不和谐附件隐藏，点击才能打开",
+    "nsfw_clickthrough": "将不和谐附件和链接预览隐藏，点击才会显示",
     "oauth_tokens": "OAuth令牌",
     "token": "令牌",
     "refresh_token": "刷新令牌",

From 271f9e539a4664360e0d148fc924ab0d26575104 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 12 Dec 2020 17:35:30 +0000
Subject: [PATCH 235/389] Translated using Weblate (Esperanto)

Currently translated at 100.0% (672 of 672 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index b0a15cfe..58f8e125 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -10,7 +10,8 @@
     "text_limit": "Limo de teksto",
     "title": "Funkcioj",
     "who_to_follow": "Kiun aboni",
-    "pleroma_chat_messages": "Babilejo de Pleroma"
+    "pleroma_chat_messages": "Babilejo de Pleroma",
+    "upload_limit": "Limo de alŝutoj"
   },
   "finder": {
     "error_fetching_user": "Eraris alporto de uzanto",
@@ -95,7 +96,8 @@
     "no_more_notifications": "Neniuj pliaj sciigoj",
     "reacted_with": "reagis per {0}",
     "migrated_to": "migris al",
-    "follow_request": "volas vin aboni"
+    "follow_request": "volas vin aboni",
+    "error": "Eraris akirado de sciigoj: {0}"
   },
   "post_status": {
     "new_status": "Afiŝi novan staton",
@@ -235,7 +237,7 @@
     "hide_followers_description": "Ne montri kiu min sekvas",
     "show_admin_badge": "Montri la insignon de administranto en mia profilo",
     "show_moderator_badge": "Montri la insignon de reguligisto en mia profilo",
-    "nsfw_clickthrough": "Ŝalti traklakan kaŝadon de konsternaj kunsendaĵoj",
+    "nsfw_clickthrough": "Ŝalti traklakan kaŝadon de kunsendaĵoj kaj antaŭmontroj de ligiloj por konsternaj statoj",
     "oauth_tokens": "Ĵetonoj de OAuth",
     "token": "Ĵetono",
     "refresh_token": "Ĵetono de aktualigo",
@@ -527,7 +529,8 @@
     "up_to_date": "Ĝisdata",
     "no_more_statuses": "Neniuj pliaj statoj",
     "no_statuses": "Neniuj statoj",
-    "reload": "Enlegi ree"
+    "reload": "Enlegi ree",
+    "error": "Eraris akirado de historio: {0}"
   },
   "user_card": {
     "approve": "Aprobi",
@@ -728,7 +731,8 @@
     "delete": "Forigi staton",
     "repeats": "Ripetoj",
     "favorites": "Ŝatoj",
-    "status_deleted": "Ĉi tiu afiŝo foriĝis"
+    "status_deleted": "Ĉi tiu afiŝo foriĝis",
+    "nsfw": "Konsterna"
   },
   "time": {
     "years_short": "{0}j",

From 3987020216d949a67664aaa673d5b41848d4b806 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sun, 13 Dec 2020 22:00:57 +0000
Subject: [PATCH 236/389] Translated using Weblate (Russian)

Currently translated at 78.5% (528 of 672 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index b61a043a..e457202d 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -652,5 +652,15 @@
     "hour": "{0} час",
     "day_short": "{0}д",
     "days": "{0} дней"
+  },
+  "chats": {
+    "empty_chat_list_placeholder": "У вас пока нет бесед. Начните одну!",
+    "delete_confirm": "Вы точно хотите удалить сообщение?",
+    "empty_message_error": "Нельзя отправить пустое сообщение",
+    "new": "Новая беседа",
+    "chats": "Беседы",
+    "delete": "Удалить",
+    "message_user": "Напишите {nickname}",
+    "you": "Вы:"
   }
 }

From b5dca9bbe211378410d08fbedfb5ab1b0a86d032 Mon Sep 17 00:00:00 2001
From: shironeko <shironeko@tesaguri.club>
Date: Sun, 13 Dec 2020 04:36:07 +0000
Subject: [PATCH 237/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (672 of 672 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 771d1700..e46b13da 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -461,7 +461,7 @@
           "topBar": "顶栏",
           "avatar": "用户头像（在个人资料栏）",
           "avatarStatus": "用户头像（在帖子显示栏）",
-          "popup": "弹窗和工具提示",
+          "popup": "弹窗与工具提示",
           "button": "按钮",
           "buttonHover": "按钮（悬停）",
           "buttonPressed": "按钮（压下）",

From d50798e8ce77191952b5535af802e098d66d0a56 Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Sun, 13 Dec 2020 05:25:09 +0000
Subject: [PATCH 238/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (672 of 672 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index e46b13da..f5014327 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -143,7 +143,7 @@
       "text/bbcode": "BBCode"
     },
     "content_warning": "主题（可选）",
-    "default": "刚刚抵达洛杉矶",
+    "default": "刚刚抵达上海。",
     "direct_warning_to_all": "本条内容只有被提及的用户能够看到。",
     "direct_warning_to_first_only": "本条内容只有被在消息开始处提及的用户能够看到。",
     "posting": "发送",
@@ -592,7 +592,7 @@
     "error_fetching": "获取更新时发生错误",
     "load_older": "加载更早的状态",
     "no_retweet_hint": "这条内容仅关注者可见，或者是私信，因此不能转发",
-    "repeated": "已转发",
+    "repeated": "转发了",
     "show_new": "显示新内容",
     "up_to_date": "已是最新",
     "no_more_statuses": "没有更多的状态",

From 2509bfc5e6816b373fd78bfabbc43945717e883a Mon Sep 17 00:00:00 2001
From: shironeko <shironeko@tesaguri.club>
Date: Sun, 13 Dec 2020 05:34:49 +0000
Subject: [PATCH 239/389] Translated using Weblate (Chinese (Traditional))

Currently translated at 99.4% (668 of 672 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index f2625116..cfee9b02 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -35,7 +35,8 @@
     "follow_request": "想要關注你",
     "followed_you": "關注了你",
     "favorited_you": "喜歡了你的發文",
-    "broken_favorite": "未知的狀態，正在搜索中…"
+    "broken_favorite": "未知的狀態，正在搜索中…",
+    "error": "獲取通知錯誤：{0}"
   },
   "nav": {
     "chats": "聊天",
@@ -121,7 +122,8 @@
     "media_proxy": "媒體代理",
     "pleroma_chat_messages": "Pleroma 聊天",
     "chat": "聊天",
-    "gopher": "Gopher"
+    "gopher": "Gopher",
+    "upload_limit": "上傳限制"
   },
   "exporter": {
     "processing": "正在處理，稍後會提示您下載文件",

From fa6cfc823843915f9c7a37ce0b3649b728437382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=82=D0=B5=D1=86=D1=8C?= <clubemail@ukr.net>
Date: Mon, 14 Dec 2020 19:09:26 +0000
Subject: [PATCH 240/389] Translated using Weblate (Ukrainian)

Currently translated at 99.8% (671 of 672 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 524e6252..6d189333 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -215,7 +215,7 @@
       "text/bbcode": "BBCode",
       "text/markdown": "Markdown",
       "text/html": "HTML",
-      "text/plain": "Простий текст"
+      "text/plain": "Текстові дані"
     },
     "attachments_sensitive": "Позначити вкладення як чутливі",
     "account_not_locked_warning_link": "замкнена",
@@ -439,7 +439,7 @@
         },
         "keep_as_is": "Залишити як є",
         "clear_opacity": "Очистити прозорість",
-        "save_load_hint": "Параметри \"Зберегти\" зберігають встановлені на даний момент параметри під час вибору або завантаження тем, вони також зберігають зазначені параметри під час експорту теми. Коли всі прапорці знято, експортування теми збереже все."
+        "save_load_hint": "Параметри \"Зберегти\" зберігають поточні параметри під час вибору або завантаження тем, вони також зберігають зазначені параметри під час експорту теми. Коли всі прапорці знято, експортування теми збереже все."
       },
       "common": {
         "color": "Колір",

From e3b02de6fb1d95dec0a37e815177c4dc5be1c77a Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Mon, 14 Dec 2020 23:55:01 +0000
Subject: [PATCH 241/389] Translated using Weblate (Italian)

Currently translated at 100.0% (672 of 672 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 58dafca5..6b38dcc7 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -498,7 +498,8 @@
     "text_limit": "Lunghezza massima",
     "title": "Caratteristiche",
     "who_to_follow": "Chi seguire",
-    "pleroma_chat_messages": "Chiacchiere"
+    "pleroma_chat_messages": "Chiacchiere",
+    "upload_limit": "Limite allegati"
   },
   "finder": {
     "error_fetching_user": "Errore nel recupero dell'utente",

From 3681d6bbd1acbab784ec33311c61bb1990ada745 Mon Sep 17 00:00:00 2001
From: ZEN <xinit.info@gmail.com>
Date: Thu, 17 Dec 2020 21:03:59 +0000
Subject: [PATCH 242/389] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (675 of 675 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 6d189333..4ead8790 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -31,7 +31,8 @@
     "title": "Особливості",
     "scope_options": "Параметри осягу",
     "media_proxy": "Посередник медіа-даних",
-    "text_limit": "Ліміт символів"
+    "text_limit": "Ліміт символів",
+    "upload_limit": "Обмеження завантажень"
   },
   "exporter": {
     "processing": "Опрацьовую, скоро ви зможете завантажити файл",
@@ -651,7 +652,8 @@
     "error": {
       "base": "Збій при завантаженні.",
       "file_too_big": "Файл завеликий [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Спробуйте ще раз пізніше"
+      "default": "Спробуйте ще раз пізніше",
+      "message": "Помилка завантаження: {0}"
     },
     "file_size_units": {
       "TiB": "ТіБ",
@@ -781,7 +783,9 @@
     "repeats": "Поширення",
     "nsfw": "Дратівливий вміст",
     "thread_muted": "Нитка заглушена",
-    "unmute_conversation": "Припинити глушити розмову"
+    "unmute_conversation": "Припинити глушити розмову",
+    "external_source": "Зовнішнє джерело",
+    "expand": "Розгорнути"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",

From e98c19c7258f6cb0c6bc3d4462f2be916eadc421 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Thu, 17 Dec 2020 08:37:48 +0000
Subject: [PATCH 243/389] Translated using Weblate (Italian)

Currently translated at 100.0% (675 of 675 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 6b38dcc7..0ef86f73 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -382,7 +382,7 @@
     "preload_images": "Precarica immagini",
     "hide_isp": "Nascondi pannello della stanza",
     "max_thumbnails": "Numero massimo di anteprime per messaggio",
-    "hide_muted_posts": "Nascondi messaggi degli utenti zittiti",
+    "hide_muted_posts": "Nascondi messaggi degli utenti zilenziati",
     "accent": "Accento",
     "emoji_reactions_on_timeline": "Mostra emoji di reazione sulle sequenze",
     "pad_emoji": "Affianca spazi agli emoji inseriti tramite selettore",
@@ -696,18 +696,20 @@
     "hide_full_subject": "Nascondi intero oggetto",
     "show_full_subject": "Mostra intero oggetto",
     "thread_muted_and_words": ", contiene:",
-    "thread_muted": "Discussione zittita",
+    "thread_muted": "Discussione silenziata",
     "copy_link": "Copia collegamento",
     "status_unavailable": "Messaggio non disponibile",
     "unmute_conversation": "Riabilita conversazione",
-    "mute_conversation": "Zittisci conversazione",
+    "mute_conversation": "Silenzia conversazione",
     "replies_list": "Risposte:",
     "reply_to": "Rispondi a",
     "delete_confirm": "Vuoi veramente eliminare questo messaggio?",
     "unbookmark": "Rimuovi segnalibro",
     "bookmark": "Aggiungi segnalibro",
     "status_deleted": "Questo messagio è stato cancellato",
-    "nsfw": "Pruriginoso"
+    "nsfw": "Pruriginoso",
+    "external_source": "Vai al sito",
+    "expand": "Espandi"
   },
   "time": {
     "years_short": "{0}a",
@@ -782,7 +784,8 @@
     "error": {
       "default": "Riprova in seguito",
       "file_too_big": "File troppo pesante [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "base": "Caricamento fallito."
+      "base": "Caricamento fallito.",
+      "message": "Caricamento fallito: {0}"
     }
   },
   "tool_tip": {

From 2053b3396abaddd7044313f90710fd50d1abf8da Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Thu, 17 Dec 2020 13:28:16 +0000
Subject: [PATCH 244/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (675 of 675 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index f5014327..e3d6dcd1 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -23,7 +23,7 @@
   },
   "general": {
     "apply": "应用",
-    "submit": "发送",
+    "submit": "提交",
     "more": "更多",
     "generic_error": "发生了一个错误",
     "optional": "可选",
@@ -146,7 +146,7 @@
     "default": "刚刚抵达上海。",
     "direct_warning_to_all": "本条内容只有被提及的用户能够看到。",
     "direct_warning_to_first_only": "本条内容只有被在消息开始处提及的用户能够看到。",
-    "posting": "发送",
+    "posting": "发送中",
     "scope_notice": {
       "public": "本条内容可以被所有人看到",
       "private": "关注你的人才能看到本条内容",
@@ -235,7 +235,7 @@
     "change_password_error": "修改密码的时候出了点问题。",
     "changed_password": "成功修改了密码！",
     "collapse_subject": "折叠带主题的内容",
-    "composing": "正在书写",
+    "composing": "写作",
     "confirm_new_password": "确认新密码",
     "current_avatar": "当前头像",
     "current_password": "当前密码",
@@ -323,7 +323,7 @@
     "search_user_to_block": "搜索你想屏蔽的用户",
     "search_user_to_mute": "搜索你想要隐藏的用户",
     "security_tab": "安全",
-    "scope_copy": "回复时的复制范围（私信是总是复制的）",
+    "scope_copy": "回复时复制可见范围（私信中永远会复制）",
     "minimal_scopes_mode": "使发文可见范围的选项最少化",
     "set_new_avatar": "设置新头像",
     "set_new_profile_background": "设置新的个人资料背景",
@@ -331,12 +331,12 @@
     "settings": "设置",
     "subject_input_always_show": "总是显示主题框",
     "subject_line_behavior": "回复时复制主题",
-    "subject_line_email": "比如电邮： \"re: 主题\"",
-    "subject_line_mastodon": "比如 mastodon: copy as is",
+    "subject_line_email": "类似电子邮件： \"re: 主题\"",
+    "subject_line_mastodon": "类似 mastodon: 与原主题相同",
     "subject_line_noop": "不要复制",
     "post_status_content_type": "发文状态内容类型",
     "stop_gifs": "鼠标悬停时播放GIF",
-    "streaming": "开启滚动到顶部时的自动推送",
+    "streaming": "滚动到顶部时自动推送新内容",
     "text": "文本",
     "theme": "主题",
     "theme_help": "使用十六进制代码（#rrggbb）来设置主题颜色。",
@@ -623,7 +623,9 @@
     "bookmark": "书签",
     "thread_muted_and_words": "，含有过滤词：",
     "status_deleted": "该状态已被删除",
-    "nsfw": "NSFW"
+    "nsfw": "NSFW",
+    "external_source": "外部来源",
+    "expand": "展开"
   },
   "user_card": {
     "approve": "核准",
@@ -690,7 +692,7 @@
     "title": "报告 {0}",
     "add_comment_description": "此报告会发送给您的实例监察员。您可以在下面提供更多详细信息解释报告的缘由：",
     "additional_comments": "其它信息",
-    "forward_description": "这个账号是从另外一个服务器。同时发送一个副本到那里？",
+    "forward_description": "这个账号来自另一个服务器。是否同时发送一份报告副本到那里？",
     "forward_to": "转发 {0}",
     "submit": "提交",
     "generic_error": "当处理您的请求时，发生了一个错误。"
@@ -700,7 +702,7 @@
     "who_to_follow": "推荐关注"
   },
   "tool_tip": {
-    "media_upload": "上传多媒体",
+    "media_upload": "上传媒体",
     "repeat": "转发",
     "reply": "回复",
     "favorite": "喜欢",
@@ -714,7 +716,8 @@
     "error": {
       "base": "上传不成功。",
       "file_too_big": "文件太大了 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "迟些再试"
+      "default": "迟些再试",
+      "message": "上传错误：{0}"
     },
     "file_size_units": {
       "B": "B",

From 12991f915f303da588a36426697e5caae776130d Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Thu, 17 Dec 2020 13:33:08 +0000
Subject: [PATCH 245/389] Translated using Weblate (Chinese (Traditional))

Currently translated at 98.9% (668 of 675 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index cfee9b02..f63acab8 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -353,7 +353,7 @@
     "reset_avatar": "重置頭像",
     "discoverable": "允許通過搜索檢索等服務找到此賬號",
     "delete_account_error": "刪除賬戶時發生錯誤，如果一直刪除不了，請聯繫實例管理員。",
-    "composing": "正在書寫",
+    "composing": "寫作設置",
     "chatMessageRadius": "聊天訊息",
     "mfa": {
       "confirm_and_enable": "確認並啟用OTP",

From bdee1277b1926c48d7d27483331d1301faf988a7 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Fri, 18 Dec 2020 13:54:40 +0000
Subject: [PATCH 246/389] Translated using Weblate (Italian)

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 0ef86f73..2301a4c0 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -263,7 +263,8 @@
           "border": "Bordo",
           "outgoing": "Inviati",
           "incoming": "Ricevuti"
-        }
+        },
+        "wallpaper": "Sfondo"
       },
       "common_colors": {
         "rgbo": "Icone, accenti, medaglie",
@@ -415,7 +416,8 @@
     "mute_import_error": "Errore nell'importazione",
     "mute_import": "Importa silenziati",
     "mute_export_button": "Esporta la tua lista di silenziati in un file CSV",
-    "mute_export": "Esporta silenziati"
+    "mute_export": "Esporta silenziati",
+    "hide_wallpaper": "Nascondi sfondo della stanza"
   },
   "timeline": {
     "error_fetching": "Errore nell'aggiornamento",

From c1de7b60e1a08ff907dacb63586245b81f3afc94 Mon Sep 17 00:00:00 2001
From: tarteka <info@tarteka.net>
Date: Sun, 20 Dec 2020 19:34:38 +0000
Subject: [PATCH 247/389] Translated using Weblate (Spanish)

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
---
 src/i18n/es.json | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index 0c2cc3e9..f4d87eb3 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -14,7 +14,8 @@
     "text_limit": "Límite de caracteres",
     "title": "Características",
     "who_to_follow": "A quién seguir",
-    "pleroma_chat_messages": "Chat de Pleroma"
+    "pleroma_chat_messages": "Chat de Pleroma",
+    "upload_limit": "Límite de subida"
   },
   "finder": {
     "error_fetching_user": "Error al buscar usuario",
@@ -448,7 +449,8 @@
         "underlay": "Subrayado",
         "popover": "Sugerencias, menús, superposiciones",
         "post": "Publicaciones/Biografías de Usuarios",
-        "alert_warning": "Precaución"
+        "alert_warning": "Precaución",
+        "wallpaper": "Fondo de pantalla"
       },
       "radii": {
         "_tab_label": "Redondez"
@@ -559,7 +561,8 @@
     "mute_import_error": "Error al importar los silenciados",
     "mute_import": "Importar silenciados",
     "mute_export_button": "Exportar los silenciados a un archivo csv",
-    "mute_export": "Exportar silenciados"
+    "mute_export": "Exportar silenciados",
+    "hide_wallpaper": "Ocultar el fondo de pantalla de la instancia"
   },
   "time": {
     "day": "{0} día",
@@ -632,7 +635,9 @@
     "bookmark": "Marcar",
     "unbookmark": "Desmarcar",
     "status_deleted": "Esta entrada ha sido eliminada",
-    "nsfw": "NSFW (No apropiado para el trabajo)"
+    "nsfw": "NSFW (No apropiado para el trabajo)",
+    "expand": "Expandir",
+    "external_source": "Fuente externa"
   },
   "user_card": {
     "approve": "Aprobar",
@@ -723,7 +728,8 @@
     "error": {
       "base": "Subida fallida.",
       "file_too_big": "Archivo demasiado grande [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Inténtalo más tarde"
+      "default": "Inténtalo más tarde",
+      "message": "Error de subida: {0}"
     },
     "file_size_units": {
       "B": "B",

From 6670668a7cd4f690d85e6587bec140ec55c73eee Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 22 Dec 2020 12:11:42 +0000
Subject: [PATCH 248/389] Translated using Weblate (Russian)

Currently translated at 77.9% (528 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index e457202d..5e1b3593 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -477,7 +477,7 @@
     "follow_unfollow": "Перестать читать",
     "followees": "Читаемые",
     "followers": "Читатели",
-    "following": "Читаю!",
+    "following": "Читаете!",
     "follows_you": "Читает вас!",
     "mute": "Игнорировать",
     "muted": "Игнорирую",

From 8729c663747f6ba5ce410edeb9e82b069fbb6415 Mon Sep 17 00:00:00 2001
From: Dmitriy Nelovchenko <defleppard4002@gmail.com>
Date: Wed, 30 Dec 2020 08:55:56 +0000
Subject: [PATCH 249/389] Translated using Weblate (Russian)

Currently translated at 78.8% (534 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 5e1b3593..5cc3c08f 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -40,7 +40,8 @@
     "heading": {
       "TotpForm": "Двухфакторная аутентификация",
       "RecoveryForm": "Two-factor recovery",
-      "totp": "Двухфакторная аутентификация"
+      "totp": "Двухфакторная аутентификация",
+      "recovery": "Двухфакторное возвращение аккаунта"
     },
     "hint": "Войдите чтобы присоединиться к дискуссии",
     "description": "Войти с помощью OAuth"
@@ -62,10 +63,11 @@
     "who_to_follow": "Кого читать",
     "dms": "Личные Сообщения",
     "administration": "Панель администратора",
-    "about": "О сервере"
+    "about": "О сервере",
+    "user_search": "Поиск пользователей"
   },
   "notifications": {
-    "broken_favorite": "Неизвестный статус, ищем...",
+    "broken_favorite": "Неизвестный статус, ищем…",
     "favorited_you": "нравится ваш статус",
     "followed_you": "начал(а) читать вас",
     "load_older": "Загрузить старые уведомления",
@@ -150,7 +152,7 @@
       "generate_new_recovery_codes": "Получить новые коды востановления",
       "warning_of_generate_new_codes": "После получения новых кодов восстановления, старые больше не будут работать.",
       "recovery_codes": "Коды восстановления.",
-      "waiting_a_recovery_codes": "Получение кодов восстановления ...",
+      "waiting_a_recovery_codes": "Получение кодов восстановления…",
       "recovery_codes_warning": "Запишите эти коды и держите в безопасном месте - иначе вы их больше не увидите. Если вы потеряете доступ к OTP приложению - без резервных кодов вы больше не сможете залогиниться.",
       "authentication_methods": "Методы аутентификации",
       "scan": {
@@ -442,7 +444,9 @@
     "notification_setting_block_from_strangers": "Не показывать уведомления от пользователей которых вы не читаете",
     "notification_setting_filters": "Фильтрация",
     "notifications": "Уведомления",
-    "virtual_scrolling": "Оптимизировать рендеринг ленты"
+    "virtual_scrolling": "Оптимизировать рендеринг ленты",
+    "hide_wallpaper": "Скрыть обои узла",
+    "accent": "Акцент"
   },
   "timeline": {
     "collapse": "Свернуть",
@@ -662,5 +666,8 @@
     "delete": "Удалить",
     "message_user": "Напишите {nickname}",
     "you": "Вы:"
+  },
+  "remote_user_resolver": {
+    "error": "Не найдено."
   }
 }

From 4f69c41fa596ed4000c6239fbb4ef55c25e16f95 Mon Sep 17 00:00:00 2001
From: Dmitriy Nelovchenko <defleppard4002@gmail.com>
Date: Wed, 30 Dec 2020 09:01:50 +0000
Subject: [PATCH 250/389] Translated using Weblate (Russian)

Currently translated at 79.6% (539 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 5cc3c08f..e063f09f 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -291,7 +291,11 @@
         "save_load_hint": "Опции \"оставить...\" позволяют сохранить текущие настройки при выборе другой темы или импорта её из файла. Так же они влияют на то какие компоненты будут сохранены при экспорте темы. Когда все галочки сняты все компоненты будут экспортированы.",
         "reset": "Сбросить",
         "clear_all": "Очистить всё",
-        "clear_opacity": "Очистить прозрачность"
+        "clear_opacity": "Очистить прозрачность",
+        "use_source": "Новая версия",
+        "use_snapshot": "Старая версия",
+        "keep_as_is": "Оставить, как есть",
+        "load_theme": "Загрузить тему"
       },
       "common": {
         "color": "Цвет",
@@ -446,7 +450,8 @@
     "notifications": "Уведомления",
     "virtual_scrolling": "Оптимизировать рендеринг ленты",
     "hide_wallpaper": "Скрыть обои узла",
-    "accent": "Акцент"
+    "accent": "Акцент",
+    "upload_a_photo": "Загрузить фото"
   },
   "timeline": {
     "collapse": "Свернуть",

From 83db5f0916bf58b5837ec560824be959dfbc8f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= <me@mkljczk.pl>
Date: Fri, 1 Jan 2021 22:07:53 +0000
Subject: [PATCH 251/389] Translated using Weblate (Polish)

Currently translated at 99.8% (676 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pl/
---
 src/i18n/pl.json | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 67cf38a5..7cf06796 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -50,7 +50,8 @@
     "text_limit": "Limit tekstu",
     "title": "Funkcje",
     "who_to_follow": "Propozycje obserwacji",
-    "pleroma_chat_messages": "Czat Pleromy"
+    "pleroma_chat_messages": "Czat Pleromy",
+    "upload_limit": "Limit wysyłania"
   },
   "finder": {
     "error_fetching_user": "Błąd przy pobieraniu profilu",
@@ -140,7 +141,8 @@
     "no_more_notifications": "Nie masz więcej powiadomień",
     "migrated_to": "wyemigrował do",
     "reacted_with": "zareagował z {0}",
-    "follow_request": "chce ciebie obserwować"
+    "follow_request": "chce ciebie obserwować",
+    "error": "Błąd pobierania powiadomień: {0}"
   },
   "polls": {
     "add_poll": "Dodaj ankietę",
@@ -501,7 +503,8 @@
           "outgoing": "Wiadomości wychodzące",
           "incoming": "Wiadomości przychodzące",
           "border": "Granica"
-        }
+        },
+        "wallpaper": "Tło"
       },
       "radii": {
         "_tab_label": "Zaokrąglenie"
@@ -596,7 +599,8 @@
     "mute_import_error": "Wystąpił błąd podczas importowania wyciszeń",
     "mute_import": "Import wyciszeń",
     "mute_export_button": "Wyeksportuj swoje wyciszenia do pliku .csv",
-    "mute_export": "Eksport wyciszeń"
+    "mute_export": "Eksport wyciszeń",
+    "hide_wallpaper": "Ukryj tło instancji"
   },
   "time": {
     "day": "{0} dzień",
@@ -643,7 +647,8 @@
     "up_to_date": "Na bieżąco",
     "no_more_statuses": "Brak kolejnych statusów",
     "no_statuses": "Brak statusów",
-    "reload": "Odśwież"
+    "reload": "Odśwież",
+    "error": "Błąd pobierania osi czasu: {0}"
   },
   "status": {
     "favorites": "Ulubione",
@@ -667,7 +672,10 @@
     "show_full_subject": "Pokaż cały temat",
     "thread_muted_and_words": ", ma słowa:",
     "thread_muted": "Wątek wyciszony",
-    "status_deleted": "Ten wpis został usunięty"
+    "status_deleted": "Ten wpis został usunięty",
+    "expand": "Rozwiń",
+    "nsfw": "NSFW",
+    "external_source": "Zewnętrzne źródło"
   },
   "user_card": {
     "approve": "Przyjmij",
@@ -758,7 +766,8 @@
     "error": {
       "base": "Wysyłanie nie powiodło się.",
       "file_too_big": "Zbyt duży plik [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Spróbuj ponownie później"
+      "default": "Spróbuj ponownie później",
+      "message": "Błąd wysyłania: {0}"
     },
     "file_size_units": {
       "B": "B",

From 1a89ec5d8a94deeb729639cbe856b8bd66ce249b Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Sat, 2 Jan 2021 06:52:53 +0000
Subject: [PATCH 252/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index e3d6dcd1..b4185b30 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -309,7 +309,7 @@
     "panelRadius": "面板",
     "pause_on_unfocused": "在离开页面时暂停时间线推送",
     "presets": "预置",
-    "profile_background": "个人资料背景图",
+    "profile_background": "个人背景图",
     "profile_banner": "横幅图片",
     "profile_tab": "个人资料",
     "radii_help": "设置界面边缘的圆角 (单位：像素)",
@@ -434,7 +434,8 @@
         "alert_warning": "警告",
         "tabs": "标签页",
         "underlay": "底衬",
-        "toggled": "按下的"
+        "toggled": "按下的",
+        "wallpaper": "壁纸"
       },
       "radii": {
         "_tab_label": "圆角"
@@ -522,11 +523,11 @@
     "type_domains_to_mute": "搜索需要隐藏的域名",
     "useStreamingApi": "实时接收帖子和通知",
     "user_mutes": "用户",
-    "reset_background_confirm": "您确定要重置个人资料背景图吗？",
+    "reset_background_confirm": "您确定要重置背景图吗？",
     "reset_banner_confirm": "您确定要重置横幅图片吗？",
     "reset_avatar_confirm": "您确定要重置头像吗？",
     "reset_profile_banner": "重置横幅图片",
-    "reset_profile_background": "重置个人资料背景图",
+    "reset_profile_background": "重置个人背景图",
     "reset_avatar": "重置头像",
     "hide_followers_count_description": "不显示关注者数量",
     "profile_fields": {
@@ -550,7 +551,8 @@
     "mute_import_error": "导入隐藏名单出错",
     "mute_import": "隐藏名单导入",
     "mute_export_button": "导出你的隐藏名单到一个 csv 文件",
-    "mute_export": "隐藏名单导出"
+    "mute_export": "隐藏名单导出",
+    "hide_wallpaper": "隐藏实例壁纸"
   },
   "time": {
     "day": "{0} 天",

From 5ab96ae0d235b6a30648d2d493be3fd3c4301e5b Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 11 Jan 2021 19:40:35 +0200
Subject: [PATCH 253/389] don't filter own posts

---
 src/components/status/status.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index f9c710ab..2bf93a9e 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -157,6 +157,7 @@ const Status = {
       return muteWordHits(this.status, this.muteWords)
     },
     muted () {
+      if (this.statusoid.user.id === this.currentUser.id) return false
       const { status } = this
       const { reblog } = status
       const relationship = this.$store.getters.relationship(status.user.id)

From cdb9b4aea287bb5437d31cf574cc66503c981ea9 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 11 Jan 2021 19:41:42 +0200
Subject: [PATCH 254/389] changelog update

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f270bfe..d4dd484b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Follows/Followers tabs on user profiles now display the content properly.
 - Handle punycode in screen names
 
+### Changed
+- Don't filter own posts when they hit your wordfilter
+
 ## [2.2.2] - 2020-12-22
 ### Added
 - Mouseover titles for emojis in reaction picker

From 65dbf7b85d680f0855e9f6706a4437d2f4a52227 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 12 Jan 2021 14:43:21 +0200
Subject: [PATCH 255/389] Add report button to status ellipsis menu

---
 CHANGELOG.md                                     |  3 +++
 .../account_actions/account_actions.js           |  2 +-
 src/components/extra_buttons/extra_buttons.js    |  9 +++++++--
 src/components/extra_buttons/extra_buttons.vue   | 10 ++++++++++
 .../user_reporting_modal/user_reporting_modal.js |  2 +-
 src/modules/reports.js                           | 16 ++++++++++++----
 .../entity_normalizer.service.js                 |  1 -
 7 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f270bfe..7164eb26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
 ## [Unreleased]
+### Added
+- Added Report button to status ellipsis menu for easier reporting
+
 ### Fixed
 - Follows/Followers tabs on user profiles now display the content properly.
 - Handle punycode in screen names
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index 395d6685..e53c4f77 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -35,7 +35,7 @@ const AccountActions = {
       this.$store.dispatch('unblockUser', this.user.id)
     },
     reportUser () {
-      this.$store.dispatch('openUserReportingModal', this.user.id)
+      this.$store.dispatch('openUserReportingModal', { userId: this.user.id })
     },
     openChat () {
       this.$router.push({
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index b5b29e8a..dd45b6b9 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -9,7 +9,8 @@ import {
   faExternalLinkAlt
 } from '@fortawesome/free-solid-svg-icons'
 import {
-  faBookmark as faBookmarkReg
+  faBookmark as faBookmarkReg,
+  faFlag
 } from '@fortawesome/free-regular-svg-icons'
 
 library.add(
@@ -19,7 +20,8 @@ library.add(
   faEyeSlash,
   faThumbtack,
   faShareAlt,
-  faExternalLinkAlt
+  faExternalLinkAlt,
+  faFlag
 )
 
 const ExtraButtons = {
@@ -66,6 +68,9 @@ const ExtraButtons = {
       this.$store.dispatch('unbookmark', { id: this.status.id })
         .then(() => this.$emit('onSuccess'))
         .catch(err => this.$emit('onError', err.error.error))
+    },
+    reportStatus () {
+      this.$store.dispatch('openUserReportingModal', { userId: this.status.user.id, statusIds: [this.status.id] })
     }
   },
   computed: {
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index dc790cad..e845d8fc 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -109,6 +109,16 @@
             icon="external-link-alt"
           /><span>{{ $t("status.external_source") }}</span>
         </a>
+        <button
+          class="button-default dropdown-item dropdown-item-icon"
+          @click.prevent="reportStatus"
+          @click="close"
+        >
+          <FAIcon
+            fixed-width
+            :icon="['far', 'flag']"
+          /><span>{{ $t("user_card.report") }}</span>
+        </button>
       </div>
     </div>
     <span
diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 38cf117b..5ec4a5df 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -48,7 +48,7 @@ const UserReportingModal = {
       // Reset state
       this.comment = ''
       this.forward = false
-      this.statusIdsToReport = []
+      this.statusIdsToReport = this.$store.state.reports.preTickedIds
       this.processing = false
       this.error = false
     },
diff --git a/src/modules/reports.js b/src/modules/reports.js
index 904022f1..c6026f38 100644
--- a/src/modules/reports.js
+++ b/src/modules/reports.js
@@ -4,12 +4,14 @@ const reports = {
   state: {
     userId: null,
     statuses: [],
+    preTicked: [],
     modalActivated: false
   },
   mutations: {
-    openUserReportingModal (state, { userId, statuses }) {
+    openUserReportingModal (state, { userId, statuses, preTickedIds }) {
       state.userId = userId
       state.statuses = statuses
+      state.preTickedIds = preTickedIds
       state.modalActivated = true
     },
     closeUserReportingModal (state) {
@@ -17,9 +19,15 @@ const reports = {
     }
   },
   actions: {
-    openUserReportingModal ({ rootState, commit }, userId) {
-      const statuses = filter(rootState.statuses.allStatuses, status => status.user.id === userId)
-      commit('openUserReportingModal', { userId, statuses })
+    openUserReportingModal ({ rootState, commit }, { userId, statusIds = [] }) {
+      const preTickedStatuses = statusIds.map(id => rootState.statuses.allStatusesObject[id])
+      const preTickedIds = statusIds
+      const statuses = preTickedStatuses.concat(
+        filter(rootState.statuses.allStatuses,
+          status => status.user.id === userId && !preTickedIds.includes(status.id)
+        )
+      )
+      commit('openUserReportingModal', { userId, statuses, preTickedIds })
     },
     closeUserReportingModal ({ commit }) {
       commit('closeUserReportingModal')
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 206e6281..625f593e 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -201,7 +201,6 @@ export const parseUser = (data) => {
   // Convert punycode to unicode
   if (output.screen_name.includes('@')) {
     const parts = output.screen_name.split('@')
-    console.log(parts)
     let unicodeDomain = punycode.toUnicode(parts[1])
     if (unicodeDomain !== parts[1]) {
       // Add some identifier so users can potentially spot spoofing attempts:

From 0ee0551a471266066050e059876ee24a4637c1ad Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 12 Jan 2021 14:55:31 +0200
Subject: [PATCH 256/389] fix changing reported status on same user

---
 .../user_reporting_modal/user_reporting_modal.js       | 10 ++++++++--
 src/modules/reports.js                                 |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 5ec4a5df..8d171b2d 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -38,17 +38,23 @@ const UserReportingModal = {
     },
     statuses () {
       return this.$store.state.reports.statuses
+    },
+    preTickedIds () {
+      return this.$store.state.reports.preTickedIds
     }
   },
   watch: {
-    userId: 'resetState'
+    userId: 'resetState',
+    preTickedIds (newValue) {
+      this.statusIdsToReport = newValue
+    }
   },
   methods: {
     resetState () {
       // Reset state
       this.comment = ''
       this.forward = false
-      this.statusIdsToReport = this.$store.state.reports.preTickedIds
+      this.statusIdsToReport = this.preTickedIds
       this.processing = false
       this.error = false
     },
diff --git a/src/modules/reports.js b/src/modules/reports.js
index c6026f38..fea83e5f 100644
--- a/src/modules/reports.js
+++ b/src/modules/reports.js
@@ -4,7 +4,7 @@ const reports = {
   state: {
     userId: null,
     statuses: [],
-    preTicked: [],
+    preTickedIds: [],
     modalActivated: false
   },
   mutations: {

From 38e5eec12213e01aa37ae61387e3e70ad3467747 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Tue, 12 Jan 2021 13:13:07 +0000
Subject: [PATCH 257/389] Translated using Weblate (Italian)

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 2301a4c0..ea8f1760 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -495,7 +495,7 @@
   "features_panel": {
     "chat": "Chat",
     "gopher": "Gopher",
-    "media_proxy": "Proxy multimedia",
+    "media_proxy": "Proxy allegati",
     "scope_options": "Opzioni visibilità",
     "text_limit": "Lunghezza massima",
     "title": "Caratteristiche",
@@ -505,7 +505,7 @@
   },
   "finder": {
     "error_fetching_user": "Errore nel recupero dell'utente",
-    "find_user": "Trova utente"
+    "find_user": "Cerca utente"
   },
   "login": {
     "login": "Accedi",
@@ -611,13 +611,13 @@
         "ftl_removal_desc": "Questa stanza rimuove le seguenti dalla sequenza globale:",
         "media_removal": "Rimozione multimedia",
         "media_removal_desc": "Questa istanza rimuove gli allegati dalle seguenti stanze:",
-        "media_nsfw": "Allegati oscurati forzatamente",
+        "media_nsfw": "Allegati oscurati d'ufficio",
         "media_nsfw_desc": "Questa stanza oscura gli allegati dei messaggi provenienti da queste stanze:"
       },
       "mrf_policies": "Regole RM abilitate",
       "mrf_policies_desc": "Le regole RM cambiano il comportamento federativo della stanza. Vigono le seguenti regole:"
     },
-    "staff": "Equipaggio"
+    "staff": "Responsabili"
   },
   "domain_mute_card": {
     "mute": "Zittisci",

From 835eaf33b194b25c41ed24815e6e5cd5eb4570cd Mon Sep 17 00:00:00 2001
From: Henry Jameson <spam@hjkos.com>
Date: Wed, 13 Jan 2021 21:28:34 +0200
Subject: [PATCH 258/389] fix local dev websockets

---
 CHANGELOG.md    | 1 +
 config/index.js | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7164eb26..0c8d4c19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Follows/Followers tabs on user profiles now display the content properly.
 - Handle punycode in screen names
+- Fixed local dev mode having non-functional websockets in some cases
 
 ## [2.2.2] - 2020-12-22
 ### Added
diff --git a/config/index.js b/config/index.js
index ccec4196..7cb87c3b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -3,6 +3,11 @@ const path = require('path')
 let settings = {}
 try {
   settings = require('./local.json')
+  if (settings.target && settings.target.endsWith('/')) {
+    // replacing trailing slash since it can conflict with some apis
+    // and that's how actual BE reports its url
+    settings.target = settings.target.replace(/\/$/, '')
+  }
   console.log('Using local dev server settings (/config/local.json):')
   console.log(JSON.stringify(settings, null, 2))
 } catch (e) {

From adc3b17fe0ba149386d83ee85f908578609bd676 Mon Sep 17 00:00:00 2001
From: Henry Jameson <spam@hjkos.com>
Date: Wed, 13 Jan 2021 21:29:12 +0200
Subject: [PATCH 259/389] add success global notice style/level

---
 src/App.scss                                  |  9 ++++++
 .../global_notice_list/global_notice_list.vue |  8 ++++++
 src/services/theme_data/pleromafe.js          | 28 +++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/src/App.scss b/src/App.scss
index 2a1d7b1b..a3b1c87a 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -698,6 +698,15 @@ nav {
       color: var(--alertWarningPanelText, $fallback--text);
     }
   }
+
+  &.success {
+    background-color: var(--alertSuccess, $fallback--alertWarning);
+    color: var(--alertSuccessText, $fallback--text);
+
+    .panel-heading & {
+      color: var(--alertSuccessPanelText, $fallback--text);
+    }
+  }
 }
 
 .faint {
diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
index 049e23db..a45f4586 100644
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -71,6 +71,14 @@
     }
   }
 
+  .global-success {
+    background-color: var(--alertPopupSuccess, $fallback--cGreen);
+    color: var(--alertPopupSuccessText, $fallback--text);
+    .svg-inline--fa {
+      color: var(--alertPopupSuccessText, $fallback--text);
+    }
+  }
+
   .global-info {
     background-color: var(--alertPopupNeutral, $fallback--fg);
     color: var(--alertPopupNeutralText, $fallback--text);
diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js
index bec1eebd..14aac975 100644
--- a/src/services/theme_data/pleromafe.js
+++ b/src/services/theme_data/pleromafe.js
@@ -616,6 +616,23 @@ export const SLOT_INHERITANCE = {
     textColor: true
   },
 
+  alertSuccess: {
+    depends: ['cGreen'],
+    opacity: 'alert'
+  },
+  alertSuccessText: {
+    depends: ['text'],
+    layer: 'alert',
+    variant: 'alertSuccess',
+    textColor: true
+  },
+  alertSuccessPanelText: {
+    depends: ['panelText'],
+    layer: 'alertPanel',
+    variant: 'alertSuccess',
+    textColor: true
+  },
+
   alertNeutral: {
     depends: ['text'],
     opacity: 'alert'
@@ -656,6 +673,17 @@ export const SLOT_INHERITANCE = {
     textColor: true
   },
 
+  alertPopupSuccess: {
+    depends: ['alertSuccess'],
+    opacity: 'alertPopup'
+  },
+  alertPopupSuccessText: {
+    depends: ['alertSuccessText'],
+    layer: 'popover',
+    variant: 'alertPopupSuccess',
+    textColor: true
+  },
+
   alertPopupNeutral: {
     depends: ['alertNeutral'],
     opacity: 'alertPopup'

From 64fa662644dd385dd746f2b309eef6287f5eae04 Mon Sep 17 00:00:00 2001
From: Henry Jameson <spam@hjkos.com>
Date: Wed, 13 Jan 2021 21:31:57 +0200
Subject: [PATCH 260/389] added notices for ws events

---
 CHANGELOG.md       |  1 +
 src/i18n/en.json   |  5 ++++-
 src/modules/api.js | 23 +++++++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c8d4c19..6160c5f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Follows/Followers tabs on user profiles now display the content properly.
 - Handle punycode in screen names
 - Fixed local dev mode having non-functional websockets in some cases
+- Show notices for websocket events (errors, abnormal closures, reconnections)
 
 ## [2.2.2] - 2020-12-22
 ### Added
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 26dd6144..5d613ea9 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -646,7 +646,10 @@
     "reload": "Reload",
     "up_to_date": "Up-to-date",
     "no_more_statuses": "No more statuses",
-    "no_statuses": "No statuses"
+    "no_statuses": "No statuses",
+    "socket_reconnected": "Realtime connection established",
+    "socket_broke": "Realtime connection lost: CloseEvent code {0}",
+    "socket_closed": "No realtime connection, updates can arrive with a delaye until connection is re-established"
   },
   "status": {
     "favorites": "Favorites",
diff --git a/src/modules/api.js b/src/modules/api.js
index 08485a30..01c65e49 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -91,12 +91,29 @@ const api = {
             }
           )
           state.mastoUserSocket.addEventListener('open', () => {
+            // Do not show notification when we just opened up the page
+            if (state.mastoUserSocketStatus !== null) {
+              dispatch('pushGlobalNotice', {
+                level: 'success',
+                messageKey: 'timeline.socket_reconnected',
+                timeout: 5000
+              })
+            }
             commit('setMastoUserSocketStatus', WSConnectionStatus.JOINED)
           })
           state.mastoUserSocket.addEventListener('error', ({ detail: error }) => {
             console.error('Error in MastoAPI websocket:', error)
             commit('setMastoUserSocketStatus', WSConnectionStatus.ERROR)
             dispatch('clearOpenedChats')
+            /* Since data in WS event for error is useless it's better to show
+             * generic warning instead of in "close" which actually has some
+             * useful data
+             */
+            dispatch('pushGlobalNotice', {
+              level: 'error',
+              messageKey: 'timeline.socket_closed',
+              timeout: 5000
+            })
           })
           state.mastoUserSocket.addEventListener('close', ({ detail: closeEvent }) => {
             const ignoreCodes = new Set([
@@ -112,6 +129,12 @@ const api = {
               dispatch('startFetchingNotifications')
               dispatch('startFetchingChats')
               dispatch('restartMastoUserSocket')
+              dispatch('pushGlobalNotice', {
+                level: 'error',
+                messageKey: 'timeline.socket_broke',
+                messageArgs: [code],
+                timeout: 5000
+              })
             }
             commit('setMastoUserSocketStatus', WSConnectionStatus.CLOSED)
             dispatch('clearOpenedChats')

From 48bef143d86b02d7feeeac3e1faa0e5e00e09ea6 Mon Sep 17 00:00:00 2001
From: Henry Jameson <spam@hjkos.com>
Date: Wed, 13 Jan 2021 21:33:20 +0200
Subject: [PATCH 261/389] fix not being able to re-enable sockets until page
 refresh

---
 CHANGELOG.md                    |  1 +
 src/modules/api.js              | 11 ++++++++++-
 src/services/api/api.service.js |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6160c5f4..0b9c7f68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Handle punycode in screen names
 - Fixed local dev mode having non-functional websockets in some cases
 - Show notices for websocket events (errors, abnormal closures, reconnections)
+- Fix not being able to re-enable websocket until page refresh
 
 ## [2.2.2] - 2020-12-22
 ### Added
diff --git a/src/modules/api.js b/src/modules/api.js
index 01c65e49..2be0f236 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -40,7 +40,16 @@ const api = {
     // Global MastoAPI socket control, in future should disable ALL sockets/(re)start relevant sockets
     enableMastoSockets (store) {
       const { state, dispatch } = store
-      if (state.mastoUserSocket) return
+      // Do not initialize unless nonexistent or closed
+      if (
+        state.mastoUserSocket &&
+          ![
+            WebSocket.CLOSED,
+            WebSocket.CLOSING
+          ].includes(state.mastoUserSocket.getState())
+      ) {
+        return
+      }
       return dispatch('startMastoUserSocket')
     },
     disableMastoSockets (store) {
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index f4483149..d3d5c68d 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1152,6 +1152,7 @@ export const ProcessedWS = ({
 
   // 1000 = Normal Closure
   eventTarget.close = () => { socket.close(1000, 'Shutting down socket') }
+  eventTarget.getState = () => socket.readyState
 
   return eventTarget
 }

From 9a8bc245a6f76f1a41da9d05408dadc36625ffe9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <spam@hjkos.com>
Date: Wed, 13 Jan 2021 22:17:10 +0200
Subject: [PATCH 262/389] fixed few-posts TLs when streaming is enabled

---
 CHANGELOG.md                                        |  1 +
 src/components/notifications/notifications.js       |  5 -----
 src/modules/api.js                                  | 13 +++++++++++++
 src/modules/users.js                                |  2 ++
 .../backend_interactor_service.js                   | 12 ++++++++++--
 .../notifications_fetcher.service.js                |  6 ++++--
 .../timeline_fetcher/timeline_fetcher.service.js    |  9 +++++++--
 7 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b9c7f68..4d0ca7d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed local dev mode having non-functional websockets in some cases
 - Show notices for websocket events (errors, abnormal closures, reconnections)
 - Fix not being able to re-enable websocket until page refresh
+- Fix annoying issue where timeline might have few posts when streaming is enabled
 
 ## [2.2.2] - 2020-12-22
 ### Added
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 49258563..d6bd6375 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -35,11 +35,6 @@ const Notifications = {
       seenToDisplayCount: DEFAULT_SEEN_TO_DISPLAY_COUNT
     }
   },
-  created () {
-    const store = this.$store
-    const credentials = store.state.users.currentUser.credentials
-    notificationsFetcher.fetchAndUpdate({ store, credentials })
-  },
   computed: {
     mainClass () {
       return this.minimalMode ? '' : 'panel panel-default'
diff --git a/src/modules/api.js b/src/modules/api.js
index 2be0f236..b482637d 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -188,6 +188,13 @@ const api = {
       if (!fetcher) return
       store.commit('removeFetcher', { fetcherName: timeline, fetcher })
     },
+    fetchTimeline (store, timeline, { ...rest }) {
+      store.state.backendInteractor.fetchTimeline({
+        store,
+        timeline,
+        ...rest
+      })
+    },
 
     // Notifications
     startFetchingNotifications (store) {
@@ -200,6 +207,12 @@ const api = {
       if (!fetcher) return
       store.commit('removeFetcher', { fetcherName: 'notifications', fetcher })
     },
+    fetchNotifications (store, { ...rest }) {
+      store.state.backendInteractor.fetchNotifications({
+        store,
+        ...rest
+      })
+    },
 
     // Follow requests
     startFetchingFollowRequests (store) {
diff --git a/src/modules/users.js b/src/modules/users.js
index 655db4c7..ac52be1f 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -547,6 +547,8 @@ const users = {
               }
 
               if (store.getters.mergedConfig.useStreamingApi) {
+                store.dispatch('fetchTimeline', 'friends', { since: null })
+                store.dispatch('fetchNotifications', { since: null })
                 store.dispatch('enableMastoSockets').catch((error) => {
                   console.error('Failed initializing MastoAPI Streaming socket', error)
                   startPolling()
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index 45e6bd0e..4a40f5b5 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -1,17 +1,25 @@
 import apiService, { getMastodonSocketURI, ProcessedWS } from '../api/api.service.js'
-import timelineFetcherService from '../timeline_fetcher/timeline_fetcher.service.js'
+import timelineFetcher from '../timeline_fetcher/timeline_fetcher.service.js'
 import notificationsFetcher from '../notifications_fetcher/notifications_fetcher.service.js'
 import followRequestFetcher from '../../services/follow_request_fetcher/follow_request_fetcher.service'
 
 const backendInteractorService = credentials => ({
   startFetchingTimeline ({ timeline, store, userId = false, tag }) {
-    return timelineFetcherService.startFetching({ timeline, store, credentials, userId, tag })
+    return timelineFetcher.startFetching({ timeline, store, credentials, userId, tag })
+  },
+
+  fetchTimeline (args) {
+    return timelineFetcher.fetchAndUpdate({ ...args, credentials })
   },
 
   startFetchingNotifications ({ store }) {
     return notificationsFetcher.startFetching({ store, credentials })
   },
 
+  fetchNotifications (args) {
+    return notificationsFetcher.fetchAndUpdate({ ...args, credentials })
+  },
+
   startFetchingFollowRequests ({ store }) {
     return followRequestFetcher.startFetching({ store, credentials })
   },
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index beeb167c..f83f871e 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -5,7 +5,7 @@ const update = ({ store, notifications, older }) => {
   store.dispatch('addNewNotifications', { notifications, older })
 }
 
-const fetchAndUpdate = ({ store, credentials, older = false }) => {
+const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
   const args = { credentials }
   const { getters } = store
   const rootState = store.rootState || store.state
@@ -22,8 +22,10 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
     return fetchNotifications({ store, args, older })
   } else {
     // fetch new notifications
-    if (timelineData.maxId !== Number.POSITIVE_INFINITY) {
+    if (since === undefined && timelineData.maxId !== Number.POSITIVE_INFINITY) {
       args['since'] = timelineData.maxId
+    } else if (since !== null) {
+      args['since'] = since
     }
     const result = fetchNotifications({ store, args, older })
 
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 921df3ed..46bba41a 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -23,7 +23,8 @@ const fetchAndUpdate = ({
   showImmediately = false,
   userId = false,
   tag = false,
-  until
+  until,
+  since
 }) => {
   const args = { timeline, credentials }
   const rootState = store.rootState || store.state
@@ -35,7 +36,11 @@ const fetchAndUpdate = ({
   if (older) {
     args['until'] = until || timelineData.minId
   } else {
-    args['since'] = timelineData.maxId
+    if (since === undefined) {
+      args['since'] = timelineData.maxId
+    } else if (since !== null) {
+      args['since'] = since
+    }
   }
 
   args['userId'] = userId

From 9656c9b96919f17647adda80ba187a4f5b2299e1 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 18 Jan 2021 15:54:12 -0600
Subject: [PATCH 263/389] Support old user.deactivated and new user.is_active
 fields

---
 src/services/entity_normalizer/entity_normalizer.service.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 625f593e..a199ebd0 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -188,7 +188,9 @@ export const parseUser = (data) => {
     output.follow_request_count = data.pleroma.follow_request_count
 
     output.tags = data.pleroma.tags
-    output.deactivated = data.pleroma.deactivated
+    // deactivated was changed to is_active in Pleroma 2.3.0
+    // backwards compatability kept for now
+    output.deactivated = data.pleroma.deactivated ? !data.pleroma.is_active : data.pleroma.deactivated
 
     output.notification_settings = data.pleroma.notification_settings
     output.unread_chat_count = data.pleroma.unread_chat_count

From 36e56354e448b3c2106668f353dedcab5fde794d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 19 Jan 2021 10:01:55 -0600
Subject: [PATCH 264/389] More robust backwards compatibility

---
 .../entity_normalizer/entity_normalizer.service.js         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index a199ebd0..d6d84d9a 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -188,9 +188,12 @@ export const parseUser = (data) => {
     output.follow_request_count = data.pleroma.follow_request_count
 
     output.tags = data.pleroma.tags
+
     // deactivated was changed to is_active in Pleroma 2.3.0
-    // backwards compatability kept for now
-    output.deactivated = data.pleroma.deactivated ? !data.pleroma.is_active : data.pleroma.deactivated
+    // so check if is_active is present
+    output.deactivated = typeof data.pleroma.is_active !== undefined
+      ? !data.pleroma.is_active // new backend
+      : data.pleroma.deactivated // old backend
 
     output.notification_settings = data.pleroma.notification_settings
     output.unread_chat_count = data.pleroma.unread_chat_count

From b76a68e622b2db6474acdd206bbdfb2e66fefd8f Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Jan 2021 14:03:26 +0300
Subject: [PATCH 265/389] UserCard: Make user roles translateable

I did not add a translation for my native language in this patch because
I am not sure how weblate would react, but I did add it locally and it
seems to work.
---
 src/components/user_card/user_card.vue | 3 +--
 src/i18n/en.json                       | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 16dd5249..773f764a 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -83,7 +83,7 @@
                   v-if="!!visibleRole"
                   class="alert user-role"
                 >
-                  {{ visibleRole }}
+                  {{ $t(`user_card.roles.${visibleRole}`) }}
                 </span>
                 <span
                   v-if="user.bot"
@@ -507,7 +507,6 @@
 
     .user-role {
       flex: none;
-      text-transform: capitalize;
       color: $fallback--text;
       color: var(--alertNeutralText, $fallback--text);
       background-color: $fallback--fg;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 26dd6144..16a368b1 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -729,6 +729,10 @@
       "quarantine": "Disallow user posts from federating",
       "delete_user": "Delete user",
       "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+    },
+    "roles": {
+      "admin": "Admin",
+      "moderator": "Moderator"
     }
   },
   "user_profile": {

From dcba920f92db596aea3a097bd7fca3753532cc6f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 20 Jan 2021 17:01:57 +0200
Subject: [PATCH 266/389] fix profile field buttons, remove attachment button

---
 .../post_status_form/post_status_form.vue     | 26 +++++--------------
 .../settings_modal/tabs/profile_tab.scss      |  9 ++++---
 .../settings_modal/tabs/profile_tab.vue       | 14 +++++-----
 3 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index ed830f57..73f6a4f1 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -302,11 +302,12 @@
           :key="file.url"
           class="media-upload-wrapper"
         >
-          <FAIcon
-            class="fa-scale-110 fa-old-padding"
-            icon="times"
+          <button
+            class="button-unstyled hider"
             @click="removeMediaFile(file)"
-          />
+          >
+            <FAIcon icon="times" />
+          </button>
           <attachment
             :attachment="file"
             :set-media="() => $store.dispatch('setMedia', newStatus.files)"
@@ -516,26 +517,11 @@
   }
 
    .attachments .media-upload-wrapper {
-    padding: 0 0.5em;
+    position: relative;
 
     .attachment {
       margin: 0;
       padding: 0;
-      position: relative;
-    }
-
-    .fa-scale-110 fa-old-padding {
-      position: absolute;
-      margin: 10px;
-      margin: .75em;
-      padding: .5em;
-      background: rgba(230,230,230,0.6);
-      z-index: 2;
-      color: black;
-      border-radius: $fallback--attachmentRadius;
-      border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
-      font-weight: bold;
-      cursor: pointer;
     }
   }
 
diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index e821f952..1a19b50d 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -111,16 +111,17 @@
   .profile-fields {
     display: flex;
 
-    &>.emoji-input {
+    & > .emoji-input {
       flex: 1 1 auto;
-      margin: 0 .2em .5em;
+      margin: 0 0.2em 0.5em;
       min-width: 0;
     }
 
-    &>.icon-container {
+    & > .button-unstyled {
       width: 20px;
       align-self: center;
-      margin: 0 .2em .5em;
+      margin: 0 0.2em 0.5em;
+      padding: 0 0.5em;
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index b7ef21d7..abb16db2 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -124,24 +124,24 @@
               :placeholder="$t('settings.profile_fields.value')"
             >
           </EmojiInput>
-          <div
-            class="icon-container"
+          <button
+            class="button-unstyled"
+            @click="deleteField(i)"
           >
             <FAIcon
               v-show="newFields.length > 1"
               icon="times"
-              @click="deleteField(i)"
             />
-          </div>
+          </button>
         </div>
-        <a
+        <button
           v-if="newFields.length < maxFields"
-          class="add-field faint"
+          class="add-field faint button-unstyled"
           @click="addField"
         >
           <FAIcon icon="plus" />
           {{ $t("settings.profile_fields.add_field") }}
-        </a>
+        </button>
       </div>
       <p>
         <Checkbox v-model="bot">

From 8011556c289f5167a0294c47e849d88e53f0d0ed Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 20 Jan 2021 17:03:51 +0200
Subject: [PATCH 267/389] backport 2.2.3 to changelog

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40c1d982..12a38a03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-
 ## [Unreleased]
+
+
+## [2.2.3] - 2021-01-18
 ### Added
 - Added Report button to status ellipsis menu for easier reporting
 
@@ -15,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Don't filter own posts when they hit your wordfilter
 
+
 ## [2.2.2] - 2020-12-22
 ### Added
 - Mouseover titles for emojis in reaction picker

From 02ab803725e42a749c6c8f564e8093df70e97fc7 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 20 Jan 2021 17:36:40 +0200
Subject: [PATCH 268/389] change a few more buttons to real buttons

---
 CHANGELOG.md                                  |  2 ++
 src/App.scss                                  |  7 +++++
 src/components/poll/poll_form.vue             | 30 ++++++-------------
 .../settings_modal/tabs/profile_tab.vue       |  4 +--
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12a38a03..1107491e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Fixed
+- Button to remove uploaded media in post status form is now properly placed and sized.
 
 
 ## [2.2.3] - 2021-01-18
diff --git a/src/App.scss b/src/App.scss
index 2a1d7b1b..8b91f3de 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -178,6 +178,13 @@ a {
   &.-fullwidth {
     width: 100%;
   }
+
+  &.-hover-highlight {
+    &:hover svg {
+      color: $fallback--lightText;
+      color: var(--lightText, $fallback--lightText);
+    }
+  }
 }
 
 input, textarea, .select, .input {
diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index 31f204a0..09496105 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -21,20 +21,17 @@
           @keydown.enter.stop.prevent="nextOption(index)"
         >
       </div>
-      <div
+      <button
         v-if="options.length > 2"
-        class="icon-container"
+        class="delete-option button-unstyled -hover-highlight"
+        @click="deleteOption(index)"
       >
-        <FAIcon
-          icon="times"
-          class="delete"
-          @click="deleteOption(index)"
-        />
-      </div>
+        <FAIcon icon="times" />
+      </button>
     </div>
-    <a
+    <button
       v-if="options.length < maxOptions"
-      class="add-option faint"
+      class="add-option faint button-unstyled -hover-highlight"
       @click="addOption"
     >
       <FAIcon
@@ -43,7 +40,7 @@
       />
 
       {{ $t("polls.add_option") }}
-    </a>
+    </button>
     <div class="poll-type-expiry">
       <div
         class="poll-type"
@@ -116,7 +113,6 @@
     align-self: flex-start;
     padding-top: 0.25em;
     padding-left: 0.1em;
-    cursor: pointer;
   }
 
   .poll-option {
@@ -135,19 +131,11 @@
     }
   }
 
-  .icon-container {
+  .delete-option {
     // Hack: Move the icon over the input box
     width: 1.5em;
     margin-left: -1.5em;
     z-index: 1;
-
-    .delete {
-      cursor: pointer;
-
-      &:hover {
-        color: inherit;
-      }
-    }
   }
 
   .poll-type-expiry {
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index abb16db2..cfbd94fc 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -125,7 +125,7 @@
             >
           </EmojiInput>
           <button
-            class="button-unstyled"
+            class="button-unstyled -hover-highlight"
             @click="deleteField(i)"
           >
             <FAIcon
@@ -136,7 +136,7 @@
         </div>
         <button
           v-if="newFields.length < maxFields"
-          class="add-field faint button-unstyled"
+          class="add-field faint button-unstyled -hover-highlight"
           @click="addField"
         >
           <FAIcon icon="plus" />

From 831cf9eafb193acb3cce1c3b5f705819ea41912b Mon Sep 17 00:00:00 2001
From: feld <feld@feld.me>
Date: Wed, 20 Jan 2021 16:04:49 +0000
Subject: [PATCH 269/389] Apply 1 suggestion(s) to 1 file(s)

---
 src/services/entity_normalizer/entity_normalizer.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index d6d84d9a..6ed663e1 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -191,7 +191,7 @@ export const parseUser = (data) => {
 
     // deactivated was changed to is_active in Pleroma 2.3.0
     // so check if is_active is present
-    output.deactivated = typeof data.pleroma.is_active !== undefined
+    output.deactivated = typeof data.pleroma.is_active !== 'undefined'
       ? !data.pleroma.is_active // new backend
       : data.pleroma.deactivated // old backend
 

From 11c7355749b6e0180841dd02604a06dd924dd217 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Jan 2021 23:49:34 +0300
Subject: [PATCH 270/389] Use native language names in the language picker

This seems more intuitive to me and is what I've seen in most other
language pickers.
---
 CHANGELOG.md                                  |  1 +
 .../interface_language_switcher.vue           | 28 +++++++++----------
 src/services/locale/locale.service.js         | 12 ++++++++
 3 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 src/services/locale/locale.service.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40c1d982..2d751bf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Don't filter own posts when they hit your wordfilter
+- Language picker now uses native language names
 
 ## [2.2.2] - 2020-12-22
 ### Added
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index 524ec5e9..dc3bd408 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -12,11 +12,11 @@
         v-model="language"
       >
         <option
-          v-for="(langCode, i) in languageCodes"
-          :key="langCode"
-          :value="langCode"
+          v-for="lang in languages"
+          :key="lang.code"
+          :value="lang.code"
         >
-          {{ languageNames[i] }}
+          {{ lang.name }}
         </option>
       </select>
       <FAIcon
@@ -29,6 +29,7 @@
 
 <script>
 import languagesObject from '../../i18n/messages'
+import localeService from '../../services/locale/locale.service.js'
 import ISO6391 from 'iso-639-1'
 import _ from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -42,12 +43,8 @@ library.add(
 
 export default {
   computed: {
-    languageCodes () {
-      return languagesObject.languages
-    },
-
-    languageNames () {
-      return _.map(this.languageCodes, this.getLanguageName)
+    languages () {
+      return _.map(languagesObject.languages, (code) => ({ code: code, name: this.getLanguageName(code) })).sort((a, b) => a.name.localeCompare(b.name))
     },
 
     language: {
@@ -61,12 +58,13 @@ export default {
   methods: {
     getLanguageName (code) {
       const specialLanguageNames = {
-        'ja': 'Japanese (日本語)',
-        'ja_easy': 'Japanese (やさしいにほんご)',
-        'zh': 'Simplified Chinese (简体中文)',
-        'zh_Hant': 'Traditional Chinese (繁體中文)'
+        'ja_easy': 'やさしいにほんご',
+        'zh': '简体中文',
+        'zh_Hant': '繁體中文'
       }
-      return specialLanguageNames[code] || ISO6391.getName(code)
+      const languageName = specialLanguageNames[code] || ISO6391.getNativeName(code)
+      const browserLocale = localeService.internalToBrowserLocale(code)
+      return languageName.charAt(0).toLocaleUpperCase(browserLocale) + languageName.slice(1)
     }
   }
 }
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
new file mode 100644
index 00000000..5be99d81
--- /dev/null
+++ b/src/services/locale/locale.service.js
@@ -0,0 +1,12 @@
+const specialLanguageCodes = {
+  'ja_easy': 'ja',
+  'zh_Hant': 'zh-HANT'
+}
+
+const internalToBrowserLocale = code => specialLanguageCodes[code] || code
+
+const localeService = {
+  internalToBrowserLocale
+}
+
+export default localeService

From 60a8a89f5b7526af44c9682e151dd92c979b1412 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Thu, 3 Dec 2020 00:17:55 +0300
Subject: [PATCH 271/389] Use app locale with toLocaleString/toLocaleDateString

Fixes inconsistent date formatting when browser language is different
from PleromaFE language.
---
 src/components/chat_message_date/chat_message_date.vue      | 4 +++-
 .../settings_modal/tabs/security_tab/security_tab.js        | 3 ++-
 src/components/timeago/timeago.vue                          | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/chat_message_date/chat_message_date.vue b/src/components/chat_message_date/chat_message_date.vue
index 79c346b6..98349b75 100644
--- a/src/components/chat_message_date/chat_message_date.vue
+++ b/src/components/chat_message_date/chat_message_date.vue
@@ -5,6 +5,8 @@
 </template>
 
 <script>
+import localeService from 'src/services/locale/locale.service.js'
+
 export default {
   name: 'Timeago',
   props: ['date'],
@@ -16,7 +18,7 @@ export default {
       if (this.date.getTime() === today.getTime()) {
         return this.$t('display_date.today')
       } else {
-        return this.date.toLocaleDateString('en', { day: 'numeric', month: 'long' })
+        return this.date.toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale), { day: 'numeric', month: 'long' })
       }
     }
   }
diff --git a/src/components/settings_modal/tabs/security_tab/security_tab.js b/src/components/settings_modal/tabs/security_tab/security_tab.js
index 811161a5..65d20fc0 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.js
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.js
@@ -1,6 +1,7 @@
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Mfa from './mfa.vue'
+import localeService from 'src/services/locale/locale.service.js'
 
 const SecurityTab = {
   data () {
@@ -37,7 +38,7 @@ const SecurityTab = {
         return {
           id: oauthToken.id,
           appName: oauthToken.app_name,
-          validUntil: new Date(oauthToken.valid_until).toLocaleDateString()
+          validUntil: new Date(oauthToken.valid_until).toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale))
         }
       })
     }
diff --git a/src/components/timeago/timeago.vue b/src/components/timeago/timeago.vue
index 6df0524d..55a2dd94 100644
--- a/src/components/timeago/timeago.vue
+++ b/src/components/timeago/timeago.vue
@@ -9,6 +9,7 @@
 
 <script>
 import * as DateUtils from 'src/services/date_utils/date_utils.js'
+import localeService from 'src/services/locale/locale.service.js'
 
 export default {
   name: 'Timeago',
@@ -21,9 +22,10 @@ export default {
   },
   computed: {
     localeDateString () {
+      const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale)
       return typeof this.time === 'string'
-        ? new Date(Date.parse(this.time)).toLocaleString()
-        : this.time.toLocaleString()
+        ? new Date(Date.parse(this.time)).toLocaleString(browserLocale)
+        : this.time.toLocaleString(browserLocale)
     }
   },
   created () {

From 27a537d307964101a574a2616d4c90d3cd26431f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 22 Jan 2021 12:06:39 +0200
Subject: [PATCH 272/389] give delete field its own class

---
 src/components/settings_modal/tabs/profile_tab.scss | 2 +-
 src/components/settings_modal/tabs/profile_tab.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index 1a19b50d..111eaed3 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -117,7 +117,7 @@
       min-width: 0;
     }
 
-    & > .button-unstyled {
+    .delete-field {
       width: 20px;
       align-self: center;
       margin: 0 0.2em 0.5em;
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index cfbd94fc..175a0219 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -125,7 +125,7 @@
             >
           </EmojiInput>
           <button
-            class="button-unstyled -hover-highlight"
+            class="delete-field button-unstyled -hover-highlight"
             @click="deleteField(i)"
           >
             <FAIcon

From 272ba8f7a926a4852dc01d05f2904cc57da3c8fd Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 23 Jan 2021 13:58:40 +0200
Subject: [PATCH 273/389] Fix p's weird corrupt theme data crashing theme
 engine

---
 src/services/style_setter/style_setter.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 07425abd..0fb8f92a 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -242,9 +242,18 @@ export const generateShadows = (input, colors) => {
     panelHeader: 'panel',
     input: 'input'
   }
-  const inputShadows = input.shadows && !input.themeEngineVersion
-    ? shadows2to3(input.shadows, input.opacity)
-    : input.shadows || {}
+
+  const cleanInputShadows = Object.fromEntries(
+    Object.entries(input.shadows)
+      .map(([name, shadowSlot]) => [
+        name,
+        // defaulting color to black to avoid potential problems
+        shadowSlot.map(shadowDef => ({ color: '#000000', ...shadowDef }))
+      ])
+  )
+  const inputShadows = cleanInputShadows && !input.themeEngineVersion
+    ? shadows2to3(cleanInputShadows, input.opacity)
+    : cleanInputShadows || {}
   const shadows = Object.entries({
     ...DEFAULT_SHADOWS,
     ...inputShadows

From 9cf487497e8df5e9cb5872452a67a655d15d49e3 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 25 Jan 2021 18:49:03 +0200
Subject: [PATCH 274/389] fix wrong route in side drawer shoutbox link

---
 CHANGELOG.md                               | 1 +
 src/components/side_drawer/side_drawer.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91908abe..588348a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.
+- Fixed shoutbox not working in mobile layout
 
 
 ## [2.2.3] - 2021-01-18
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 695ae03b..223b1632 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -109,7 +109,7 @@
           v-if="chat"
           @click="toggleDrawer"
         >
-          <router-link :to="{ name: 'chat' }">
+          <router-link :to="{ name: 'chat-panel' }">
             <FAIcon
               fixed-width
               class="fa-scale-110 fa-old-padding"

From a02b769c8f3fb3a5c433b692bd6b8f1f978bd0b3 Mon Sep 17 00:00:00 2001
From: yasnost <yasnost@disroot.org>
Date: Fri, 15 Jan 2021 13:50:42 +0000
Subject: [PATCH 275/389] Translated using Weblate (Russian)

Currently translated at 83.1% (563 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index e063f09f..7add6475 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -190,7 +190,7 @@
     "current_profile_banner": "Текущий баннер профиля",
     "data_import_export_tab": "Импорт / Экспорт данных",
     "delete_account": "Удалить аккаунт",
-    "delete_account_description": "Удалить ваш аккаунт и все ваши сообщения.",
+    "delete_account_description": "Удалить вашу учётную запись и все ваши сообщения.",
     "delete_account_error": "Возникла ошибка в процессе удаления вашего аккаунта. Если это повторяется, свяжитесь с администратором вашего сервера.",
     "delete_account_instructions": "Введите ваш пароль в поле ниже для подтверждения удаления.",
     "export_theme": "Сохранить Тему",
@@ -238,7 +238,7 @@
     "hide_followers_count_description": "Не показывать число моих подписчиков",
     "show_admin_badge": "Показывать значок администратора в моем профиле",
     "show_moderator_badge": "Показывать значок модератора в моем профиле",
-    "nsfw_clickthrough": "Включить скрытие NSFW вложений и не показывать изображения в предпросмотре ссылок для NSFW статусов",
+    "nsfw_clickthrough": "Включить скрытие вложений и предпросмотра ссылок для NSFW статусов",
     "oauth_tokens": "OAuth токены",
     "token": "Токен",
     "refresh_token": "Рефреш токен",
@@ -330,7 +330,8 @@
         "borders": "Границы",
         "buttons": "Кнопки",
         "inputs": "Поля ввода",
-        "faint_text": "Маловажный текст"
+        "faint_text": "Маловажный текст",
+        "post": "Сообщения и описание пользователя"
       },
       "radii": {
         "_tab_label": "Скругление"
@@ -451,7 +452,16 @@
     "virtual_scrolling": "Оптимизировать рендеринг ленты",
     "hide_wallpaper": "Скрыть обои узла",
     "accent": "Акцент",
-    "upload_a_photo": "Загрузить фото"
+    "upload_a_photo": "Загрузить фото",
+    "notification_mutes": "Чтобы не получать уведомления от определённого пользователя, заглушите его.",
+    "reset_avatar_confirm": "Вы действительно хотите сбросить личный образ?",
+    "reset_profile_banner": "Сбросить личный баннер",
+    "reset_profile_background": "Сбросить личные обои",
+    "reset_avatar": "Сбросить личный образ",
+    "search_user_to_mute": "Искать, кого вы хотите заглушить",
+    "search_user_to_block": "Искать, кого вы хотите заблокировать",
+    "pad_emoji": "Выделять эмодзи пробелами при добавлении из панели",
+    "avatar_size_instruction": "Желательный наименьший размер личного образа 150 на 150 пикселей."
   },
   "timeline": {
     "collapse": "Свернуть",
@@ -584,7 +594,8 @@
     "title": "Особенности",
     "gopher": "Gopher",
     "who_to_follow": "Предложения кого читать",
-    "pleroma_chat_messages": "Pleroma Чат"
+    "pleroma_chat_messages": "Pleroma Чат",
+    "upload_limit": "Наибольший размер загружаемого файла"
   },
   "tool_tip": {
     "accept_follow_request": "Принять запрос на чтение",
@@ -673,6 +684,7 @@
     "you": "Вы:"
   },
   "remote_user_resolver": {
-    "error": "Не найдено."
+    "error": "Не найдено.",
+    "searching_for": "Ищем"
   }
 }

From 7c295e1e0f4f2f254ec10b6884f8517de0b73dd4 Mon Sep 17 00:00:00 2001
From: Dmitriy Nelovchenko <defleppard4002@gmail.com>
Date: Fri, 15 Jan 2021 13:57:12 +0000
Subject: [PATCH 276/389] Translated using Weblate (Russian)

Currently translated at 83.1% (563 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 7add6475..582a34e6 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -295,7 +295,14 @@
         "use_source": "Новая версия",
         "use_snapshot": "Старая версия",
         "keep_as_is": "Оставить, как есть",
-        "load_theme": "Загрузить тему"
+        "load_theme": "Загрузить тему",
+        "help": {
+          "fe_upgraded": "Движок тем для фронт-энда Pleroma был изменен после обновления.",
+          "older_version_imported": "Файл, который вы импортировали, был сделан в старой версии фронт-энда.",
+          "future_version_imported": "Файл, который вы импортировали, был сделан в новой версии фронт-энда.",
+          "v2_imported": "Файл, который вы импортировали, был сделан под старый фронт-энд. Мы стараемся улучшить совместимость, но все еще возможны несостыковки.",
+          "upgraded_from_v2": "Фронт-энд Pleroma был изменен. Выбранная тема может выглядеть слегка по-другому."
+        }
       },
       "common": {
         "color": "Цвет",
@@ -331,7 +338,8 @@
         "buttons": "Кнопки",
         "inputs": "Поля ввода",
         "faint_text": "Маловажный текст",
-        "post": "Сообщения и описание пользователя"
+        "post": "Сообщения и описание пользователя",
+        "alert_neutral": "Нейтральный"
       },
       "radii": {
         "_tab_label": "Скругление"
@@ -461,7 +469,10 @@
     "search_user_to_mute": "Искать, кого вы хотите заглушить",
     "search_user_to_block": "Искать, кого вы хотите заблокировать",
     "pad_emoji": "Выделять эмодзи пробелами при добавлении из панели",
-    "avatar_size_instruction": "Желательный наименьший размер личного образа 150 на 150 пикселей."
+    "avatar_size_instruction": "Желательный наименьший размер личного образа 150 на 150 пикселей.",
+    "enable_web_push_notifications": "Включить web push-уведомления",
+    "notification_blocks": "Блокировка пользователя выключает все уведомления от него, а также отписывает вас от него.",
+    "notification_setting_hide_notification_contents": "Скрыть отправителя и содержимое push-уведомлений"
   },
   "timeline": {
     "collapse": "Свернуть",

From 67a0d835683e8ec4121cb7dabfb9b990d513cc6d Mon Sep 17 00:00:00 2001
From: Artur Mancha <joker@nadaradical.com>
Date: Fri, 15 Jan 2021 23:51:26 +0000
Subject: [PATCH 277/389] Translated using Weblate (Portuguese)

Currently translated at 48.7% (330 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 1b8694d9..f2e66599 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -406,7 +406,7 @@
     "favorite": "Favoritar",
     "user_settings": "Configurações do usuário"
   },
-  "upload":{
+  "upload": {
     "error": {
       "base": "Falha no envio.",
       "file_too_big": "Arquivo grande demais [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
@@ -419,5 +419,19 @@
       "GiB": "GiB",
       "TiB": "TiB"
     }
+  },
+  "about": {
+    "mrf": {
+      "simple": {
+        "quarantine": "Quarentena",
+        "reject": "Rejeitar",
+        "accept": "Aceitar"
+      },
+      "keyword": {
+        "replace": "Repor",
+        "reject": "Rejeitar"
+      },
+      "federation": "Federação"
+    }
   }
 }

From e8fb0f313e89978346d45bf9f105cfe84894c5ee Mon Sep 17 00:00:00 2001
From: Artur Mancha <joker@nadaradical.com>
Date: Sat, 16 Jan 2021 17:47:01 +0000
Subject: [PATCH 278/389] Translated using Weblate (Portuguese)

Currently translated at 49.0% (332 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index f2e66599..b68c8cc2 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -429,7 +429,9 @@
       },
       "keyword": {
         "replace": "Repor",
-        "reject": "Rejeitar"
+        "reject": "Rejeitar",
+        "is_replaced_by": "→",
+        "keyword_policies": "Políticas de palavras-chave"
       },
       "federation": "Federação"
     }

From 9a074fbdfa74e321afe61bcc10e02b873abe8190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20In=C3=A1cio?= <gamer101portugal@gmail.com>
Date: Sun, 17 Jan 2021 19:56:29 +0000
Subject: [PATCH 279/389] Translated using Weblate (Portuguese)

Currently translated at 56.8% (385 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 114 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 101 insertions(+), 13 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index b68c8cc2..bda76998 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -9,7 +9,8 @@
     "scope_options": "Opções de privacidade",
     "text_limit": "Limite de caracteres",
     "title": "Funções",
-    "who_to_follow": "Quem seguir"
+    "who_to_follow": "Quem seguir",
+    "upload_limit": "Limite de carregamento"
   },
   "finder": {
     "error_fetching_user": "Erro ao procurar usuário",
@@ -20,7 +21,19 @@
     "submit": "Enviar",
     "more": "Mais",
     "generic_error": "Houve um erro",
-    "optional": "opcional"
+    "optional": "opcional",
+    "peek": "Espreitar",
+    "close": "Fechar",
+    "verify": "Verificar",
+    "confirm": "Confirmar",
+    "enable": "Ativar",
+    "disable": "Desativar",
+    "cancel": "Cancelar",
+    "show_less": "Mostrar menos",
+    "show_more": "Mostrar mais",
+    "retry": "Tenta novamente",
+    "error_retry": "Por favor tente novamente",
+    "loading": "Carregando…"
   },
   "image_cropper": {
     "crop_picture": "Cortar imagem",
@@ -35,7 +48,12 @@
     "placeholder": "p.e. lain",
     "register": "Registrar",
     "username": "Usuário",
-    "hint": "Entre para participar da discussão"
+    "hint": "Entre para participar da discussão",
+    "heading": {
+      "totp": "Autenticação de dois fatores"
+    },
+    "recovery_code": "Código de recuperação",
+    "authentication_code": "Código de autenticação"
   },
   "media_modal": {
     "previous": "Anterior",
@@ -50,10 +68,13 @@
     "dms": "Mensagens diretas",
     "public_tl": "Linha do tempo pública",
     "timeline": "Linha do tempo",
-    "twkn": "Toda a rede conhecida",
+    "twkn": "Rede conhecida",
     "user_search": "Buscar usuários",
     "who_to_follow": "Quem seguir",
-    "preferences": "Preferências"
+    "preferences": "Preferências",
+    "search": "Pesquisar",
+    "interactions": "Interações",
+    "administration": "Administração"
   },
   "notifications": {
     "broken_favorite": "Status desconhecido, buscando...",
@@ -63,7 +84,10 @@
     "notifications": "Notificações",
     "read": "Lido!",
     "repeated_you": "repetiu sua postagem",
-    "no_more_notifications": "Mais nenhuma notificação"
+    "no_more_notifications": "Mais nenhuma notificação",
+    "reacted_with": "reagiu com {0}",
+    "migrated_to": "migrou para",
+    "follow_request": "quer te seguir"
   },
   "post_status": {
     "new_status": "Postar novo status",
@@ -71,7 +95,9 @@
     "account_not_locked_warning_link": "restrita",
     "attachments_sensitive": "Marcar anexos como sensíveis",
     "content_type": {
-      "text/plain": "Texto puro"
+      "text/plain": "Texto puro",
+      "text/bbcode": "BBCode",
+      "text/html": "HTML"
     },
     "content_warning": "Assunto (opcional)",
     "default": "Acabei de chegar no Rio!",
@@ -82,7 +108,16 @@
       "private": "Apenas para seguidores - Enviar apenas para seguidores",
       "public": "Público - Enviar a linhas do tempo públicas",
       "unlisted": "Não listado - Não enviar a linhas do tempo públicas"
-    }
+    },
+    "scope_notice": {
+      "unlisted": "Esta publicação não será visível na Public Timeline e na Rede conhecida por todos",
+      "private": "Esta publicação será visível apenas para os teus seguidores",
+      "public": "Esta publicação será visível para todos"
+    },
+    "empty_status_error": "Não consegues publicar um estado vazio sem ficheiros",
+    "preview_empty": "Vazio",
+    "preview": "Pre-visualização",
+    "media_description": "Descrição da mídia"
   },
   "registration": {
     "bio": "Biografia",
@@ -343,7 +378,19 @@
         "checkbox": "Li os termos e condições",
         "link": "um belo link"
       }
-    }
+    },
+    "mfa": {
+      "scan": {
+        "secret_code": "Chave",
+        "title": "Scan"
+      },
+      "authentication_methods": "Métodos de autenticação",
+      "recovery_codes": "Códigos de recuperação.",
+      "generate_new_recovery_codes": "Gerar novos códigos de recuperação",
+      "confirm_and_enable": "Confirmar e ativar a senha de uso único",
+      "otp": "Senha de uso único"
+    },
+    "security": "Segurança"
   },
   "timeline": {
     "collapse": "Esconder",
@@ -425,15 +472,56 @@
       "simple": {
         "quarantine": "Quarentena",
         "reject": "Rejeitar",
-        "accept": "Aceitar"
+        "accept": "Aceitar",
+        "media_removal_desc": "Este domínio remove mídia das publicações dos seguintes domínios:",
+        "media_removal": "Remoção de mídia",
+        "ftl_removal_desc": "Este domínio remove os seguintes domínios da cronologia \"Rede conhecida por todos\":",
+        "quarantine_desc": "Este domínio apenas irá publicar nos seguintes domínios:",
+        "reject_desc": "Este domínio não aceitara mensagens dos seguintes domínios:",
+        "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
+        "simple_policies": "Política especifica ao domínio"
       },
       "keyword": {
         "replace": "Repor",
         "reject": "Rejeitar",
         "is_replaced_by": "→",
-        "keyword_policies": "Políticas de palavras-chave"
+        "keyword_policies": "Políticas Chave",
+        "ftl_removal": "Remoção da cronologia \"Rede conhecida por todos\""
       },
-      "federation": "Federação"
-    }
+      "federation": "Federação",
+      "mrf_policies": "Políticas MRF ativadas",
+      "mrf_policies_desc": "Políticas MRF manipulam o comportamento da federação na domínios.  As seguintes políticas estão ativadas:"
+    },
+    "staff": "Staff"
+  },
+  "remote_user_resolver": {
+    "searching_for": "Pesquisando por"
+  },
+  "emoji": {
+    "unicode": "Emoji Unicode",
+    "custom": "Emoji customizado",
+    "add_emoji": "Inserir emoji",
+    "search_emoji": "Pesquisar por um emoji",
+    "emoji": "Emoji"
+  },
+  "polls": {
+    "single_choice": "Única escolha",
+    "vote": "Vota",
+    "votes": "votos",
+    "option": "Opção",
+    "add_option": "Adicionar opção"
+  },
+  "importer": {
+    "error": "Um erro ocorreu enquanto importavas este ficheiro.",
+    "success": "Importado com sucesso",
+    "submit": "Enviar"
+  },
+  "exporter": {
+    "processing": "Processando, breviamente será pedido para tu descarregar o teu ficheiro",
+    "export": "Exportar"
+  },
+  "domain_mute_card": {
+    "mute_progress": "Silenciando…",
+    "mute": "Silenciar"
   }
 }

From 58528605c885cef96acbc0077d4ca0af19f5032e Mon Sep 17 00:00:00 2001
From: Artur Mancha <joker@nadaradical.com>
Date: Sun, 17 Jan 2021 19:58:20 +0000
Subject: [PATCH 280/389] Translated using Weblate (Portuguese)

Currently translated at 56.8% (385 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index bda76998..20ad8700 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -77,7 +77,7 @@
     "administration": "Administração"
   },
   "notifications": {
-    "broken_favorite": "Status desconhecido, buscando...",
+    "broken_favorite": "Estado desconhecido, a procurar…",
     "favorited_you": "favoritou sua postagem",
     "followed_you": "seguiu você",
     "load_older": "Carregar notificações antigas",
@@ -431,7 +431,7 @@
     "remote_follow": "Seguir remotamente",
     "statuses": "Postagens",
     "unblock": "Desbloquear",
-    "unblock_progress": "Desbloqueando...",
+    "unblock_progress": "Desbloqueando…",
     "block_progress": "Bloqueando...",
     "unmute": "Retirar silêncio",
     "unmute_progress": "Retirando silêncio...",

From 1036395dfc5d2f7a9e467eb81bead85eb81db640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Mon, 18 Jan 2021 00:49:15 +0000
Subject: [PATCH 281/389] Translated using Weblate (Portuguese)

Currently translated at 69.4% (470 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 183 +++++++++++++++++++++++++++++++----------------
 1 file changed, 121 insertions(+), 62 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 20ad8700..e4639b31 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -8,19 +8,20 @@
     "media_proxy": "Proxy de mídia",
     "scope_options": "Opções de privacidade",
     "text_limit": "Limite de caracteres",
-    "title": "Funções",
+    "title": "Características",
     "who_to_follow": "Quem seguir",
-    "upload_limit": "Limite de carregamento"
+    "upload_limit": "Limite de carregamento",
+    "pleroma_chat_messages": "Chat do Pleroma"
   },
   "finder": {
-    "error_fetching_user": "Erro ao procurar usuário",
-    "find_user": "Buscar usuário"
+    "error_fetching_user": "Erro ao procurar utilizador",
+    "find_user": "Procurar utilizador"
   },
   "general": {
     "apply": "Aplicar",
     "submit": "Enviar",
     "more": "Mais",
-    "generic_error": "Houve um erro",
+    "generic_error": "Ocorreu um erro",
     "optional": "opcional",
     "peek": "Espreitar",
     "close": "Fechar",
@@ -32,28 +33,32 @@
     "show_less": "Mostrar menos",
     "show_more": "Mostrar mais",
     "retry": "Tenta novamente",
-    "error_retry": "Por favor tente novamente",
-    "loading": "Carregando…"
+    "error_retry": "Por favor, tente novamente",
+    "loading": "A carregar…"
   },
   "image_cropper": {
     "crop_picture": "Cortar imagem",
-    "save": "Salvar",
-    "cancel": "Cancelar"
+    "save": "Guardar",
+    "cancel": "Cancelar",
+    "save_without_cropping": "Guardar sem recortar"
   },
   "login": {
-    "login": "Entrar",
-    "description": "Entrar com OAuth",
-    "logout": "Sair",
+    "login": "Iniciar Sessão",
+    "description": "Iniciar sessão com OAuth",
+    "logout": "Terminar sessão",
     "password": "Senha",
     "placeholder": "p.e. lain",
     "register": "Registrar",
-    "username": "Usuário",
-    "hint": "Entre para participar da discussão",
+    "username": "Nome de Utilizador",
+    "hint": "Entre para participar na discussão",
     "heading": {
-      "totp": "Autenticação de dois fatores"
+      "totp": "Autenticação de dois fatores",
+      "recovery": "Recuperação de dois fatores"
     },
     "recovery_code": "Código de recuperação",
-    "authentication_code": "Código de autenticação"
+    "authentication_code": "Código de autenticação",
+    "enter_two_factor_code": "Introduza o código de dois fatores",
+    "enter_recovery_code": "Introduza um código de recuperação"
   },
   "media_modal": {
     "previous": "Anterior",
@@ -63,18 +68,19 @@
     "about": "Sobre",
     "back": "Voltar",
     "chat": "Chat local",
-    "friend_requests": "Solicitações de seguidores",
+    "friend_requests": "Pedidos de seguidores",
     "mentions": "Menções",
-    "dms": "Mensagens diretas",
-    "public_tl": "Linha do tempo pública",
-    "timeline": "Linha do tempo",
+    "dms": "Mensagens Diretas",
+    "public_tl": "Cronologia pública",
+    "timeline": "Cronologia",
     "twkn": "Rede conhecida",
     "user_search": "Buscar usuários",
     "who_to_follow": "Quem seguir",
     "preferences": "Preferências",
     "search": "Pesquisar",
     "interactions": "Interações",
-    "administration": "Administração"
+    "administration": "Administração",
+    "chats": "Salas de Chat"
   },
   "notifications": {
     "broken_favorite": "Estado desconhecido, a procurar…",
@@ -87,7 +93,8 @@
     "no_more_notifications": "Mais nenhuma notificação",
     "reacted_with": "reagiu com {0}",
     "migrated_to": "migrou para",
-    "follow_request": "quer te seguir"
+    "follow_request": "quer seguir-te",
+    "error": "Erro ao obter notificações: {0}"
   },
   "post_status": {
     "new_status": "Postar novo status",
@@ -97,27 +104,31 @@
     "content_type": {
       "text/plain": "Texto puro",
       "text/bbcode": "BBCode",
-      "text/html": "HTML"
+      "text/html": "HTML",
+      "text/markdown": "Markdown"
     },
     "content_warning": "Assunto (opcional)",
-    "default": "Acabei de chegar no Rio!",
+    "default": "Acabei de chegar a Lisboa.",
     "direct_warning": "Este post será visível apenas para os usuários mencionados.",
     "posting": "Publicando",
     "scope": {
       "direct": "Direto - Enviar somente aos usuários mencionados",
       "private": "Apenas para seguidores - Enviar apenas para seguidores",
-      "public": "Público - Enviar a linhas do tempo públicas",
-      "unlisted": "Não listado - Não enviar a linhas do tempo públicas"
+      "public": "Público - Publicar publicamente na cronologia",
+      "unlisted": "Não listado - Não exibir publicamente na cronologia"
     },
     "scope_notice": {
-      "unlisted": "Esta publicação não será visível na Public Timeline e na Rede conhecida por todos",
-      "private": "Esta publicação será visível apenas para os teus seguidores",
+      "unlisted": "Esta publicação não será visível na Cronologia pública e na Rede conhecida por todos",
+      "private": "Esta publicação será apenas visível para os teus seguidores",
       "public": "Esta publicação será visível para todos"
     },
-    "empty_status_error": "Não consegues publicar um estado vazio sem ficheiros",
+    "empty_status_error": "Não consegues publicar um estado vazio e sem ficheiros",
     "preview_empty": "Vazio",
-    "preview": "Pre-visualização",
-    "media_description": "Descrição da mídia"
+    "preview": "Pré-visualização",
+    "media_description": "Descrição da mídia",
+    "media_description_error": "Falha ao atualizar ficheiro, tente novamente",
+    "direct_warning_to_first_only": "Esta publicação só será visível para os utilizadores mencionados no início da mensagem.",
+    "direct_warning_to_all": "Esta publicação será visível para todos os utilizadores mencionados."
   },
   "registration": {
     "bio": "Biografia",
@@ -167,13 +178,13 @@
     "data_import_export_tab": "Importação/exportação de dados",
     "default_vis": "Opção de privacidade padrão",
     "delete_account": "Deletar conta",
-    "delete_account_description": "Deletar sua conta e mensagens permanentemente.",
+    "delete_account_description": "Apagar os seus dados permanentemente e desativar a sua conta.",
     "delete_account_error": "Houve um problema ao deletar sua conta. Se ele persistir, por favor entre em contato com o/a administrador/a da instância.",
     "delete_account_instructions": "Digite sua senha no campo abaixo para confirmar a exclusão da conta.",
     "avatar_size_instruction": "O tamanho mínimo recomendado para imagens de avatar é 150x150 pixels.",
     "export_theme": "Salvar predefinições",
     "filtering": "Filtragem",
-    "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas; uma palavra por linha.",
+    "filtering_explanation": "Todas as publicações que contenham estas palavras serão silenciadas; uma palavra por linha",
     "follow_export": "Exportar quem você segue",
     "follow_export_button": "Exportar quem você segue para um arquivo CSV",
     "follow_export_processing": "Processando. Em breve você receberá a solicitação de download do arquivo",
@@ -183,7 +194,7 @@
     "foreground": "Primeiro Plano",
     "general": "Geral",
     "hide_attachments_in_convo": "Ocultar anexos em conversas",
-    "hide_attachments_in_tl": "Ocultar anexos na linha do tempo.",
+    "hide_attachments_in_tl": "Ocultar anexos na cronologia",
     "max_thumbnails": "Número máximo de miniaturas por post",
     "hide_isp": "Esconder painel específico da instância",
     "preload_images": "Pré-carregar imagens",
@@ -194,7 +205,7 @@
     "import_followers_from_a_csv_file": "Importe seguidores a partir de um arquivo CSV",
     "import_theme": "Carregar pré-definição",
     "inputRadius": "Campos de entrada",
-    "checkboxRadius": "Checkboxes",
+    "checkboxRadius": "Caixas de seleção",
     "instance_default": "(padrão: {value})",
     "instance_default_simple": "(padrão)",
     "interface": "Interface",
@@ -236,7 +247,7 @@
     "profile_banner": "Capa de perfil",
     "profile_tab": "Perfil",
     "radii_help": "Arredondar arestas da interface (em pixel)",
-    "replies_in_timeline": "Respostas na linha do tempo",
+    "replies_in_timeline": "Respostas na cronologia",
     "reply_visibility_all": "Mostrar todas as respostas",
     "reply_visibility_following": "Só mostrar respostas direcionadas a mim ou a usuários que sigo",
     "reply_visibility_self": "Só mostrar respostas direcionadas a mim",
@@ -260,7 +271,7 @@
     "theme": "Tema",
     "theme_help": "Use cores em código hexadecimal (#rrggbb) para personalizar seu esquema de cores.",
     "theme_help_v2_1": "Você também pode sobrescrever as cores e opacidade de alguns componentes ao modificar o checkbox, use \"Limpar todos\" para limpar todas as modificações.",
-    "theme_help_v2_2": "Alguns ícones sob registros são indicadores de fundo/contraste de textos, passe por cima para informações detalhadas.  Tenha ciência de que os indicadores de contraste não funcionam muito bem com transparência.",
+    "theme_help_v2_2": "Alguns ícones em registo são indicadores de fundo/contraste de textos, passe por cima para obter informações detalhadas. Tenha em atenção que os indicadores de contraste não funcionam muito bem com transparência.",
     "tooltipRadius": "Dicas/alertas",
     "upload_a_photo": "Enviar uma foto",
     "user_settings": "Configurações de Usuário",
@@ -333,7 +344,7 @@
           "always_drop_shadow": "Atenção, esta sombra sempre utiliza {0} quando compatível com o navegador.",
           "drop_shadow_syntax": "{0} não é compatível com o parâmetro {1} e a palavra-chave {2}.",
           "avatar_inset": "Tenha em mente que combinar as sombras de inserção e a não-inserção em avatares pode causar resultados inesperados em avatares transparentes.",
-          "spread_zero": "Sombras com uma difusão > 0 aparecerão como se fossem definidas como 0.",
+          "spread_zero": "Sombras com difusão > 0 aparecerão como se fossem definidas como zero",
           "inset_classic": "Sombras de inserção utilizarão {0}"
         },
         "components": {
@@ -371,10 +382,10 @@
         "button": "Botão",
         "text": "Vários {0} e {1}",
         "mono": "conteúdo",
-        "input": "Acabei de chegar no Rio!",
+        "input": "Acabei de chegar a Lisboa.",
         "faint_link": "manual útil",
         "fine_print": "Leia nosso {0} para não aprender nada!",
-        "header_faint": "Está ok!",
+        "header_faint": "Isto está bem",
         "checkbox": "Li os termos e condições",
         "link": "um belo link"
       }
@@ -382,15 +393,35 @@
     "mfa": {
       "scan": {
         "secret_code": "Chave",
-        "title": "Scan"
+        "title": "Scan",
+        "desc": "Utilizando a sua aplicação de dois fatores, faça scan deste código QR ou insira a chave de texto:"
       },
       "authentication_methods": "Métodos de autenticação",
       "recovery_codes": "Códigos de recuperação.",
       "generate_new_recovery_codes": "Gerar novos códigos de recuperação",
-      "confirm_and_enable": "Confirmar e ativar a senha de uso único",
-      "otp": "Senha de uso único"
+      "confirm_and_enable": "Confirmar e ativar a senha de utilização única",
+      "otp": "Senha de uso único",
+      "verify": {
+        "desc": "Para ativar a autenticação de dois fatores, introduza o código da sua aplicação de dois fatores:"
+      },
+      "recovery_codes_warning": "Anote os códigos ou armazene-os num lugar seguro, caso contrário, não os voltará a ver. Se perder acesso à sua aplicação de dois fatores e aos códigos de recuperação, a sua conta ficará bloqueado.",
+      "waiting_a_recovery_codes": "A receber códigos de recuperação…",
+      "warning_of_generate_new_codes": "Quando gera novos códigos de recuperação, os antigos deixam de funcionar.",
+      "title": "Autenticação de Dois Fatores",
+      "wait_pre_setup_otp": "pré-configuração de senha de utilização única",
+      "setup_otp": "Configurar senha de utilização única"
     },
-    "security": "Segurança"
+    "security": "Segurança",
+    "mute_import_error": "Erro ao importar os silenciados",
+    "mute_import": "Importar silenciados",
+    "mute_export_button": "Exporta os silenciados para um ficheiro csv",
+    "mute_export": "Exportar silenciados",
+    "blocks_imported": "Lista de utilizadores bloqueados importada! O processo pode demorar alguns instantes.",
+    "block_import_error": "Erro ao importar a lista de utilizadores bloqueados",
+    "block_import": "Importar utilizadores bloqueados",
+    "block_export_button": "Exporta a tua lista de utilizadores bloqueados para um ficheiro csv",
+    "block_export": "Exportar utilizadores bloqueados",
+    "enter_current_password_to_confirm": "Introduza a sua palavra-passe atual para confirmar a sua identidade"
   },
   "timeline": {
     "collapse": "Esconder",
@@ -431,14 +462,14 @@
     "remote_follow": "Seguir remotamente",
     "statuses": "Postagens",
     "unblock": "Desbloquear",
-    "unblock_progress": "Desbloqueando…",
-    "block_progress": "Bloqueando...",
+    "unblock_progress": "A desbloquear…",
+    "block_progress": "A bloquear…",
     "unmute": "Retirar silêncio",
-    "unmute_progress": "Retirando silêncio...",
-    "mute_progress": "Silenciando..."
+    "unmute_progress": "A retirar silêncio…",
+    "mute_progress": "A silenciar…"
   },
   "user_profile": {
-    "timeline_title": "Linha do tempo do usuário",
+    "timeline_title": "Cronologia do Utilizador",
     "profile_does_not_exist": "Desculpe, este perfil não existe.",
     "profile_loading_error": "Desculpe, houve um erro ao carregar este perfil."
   },
@@ -479,49 +510,77 @@
         "quarantine_desc": "Este domínio apenas irá publicar nos seguintes domínios:",
         "reject_desc": "Este domínio não aceitara mensagens dos seguintes domínios:",
         "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
-        "simple_policies": "Política especifica ao domínio"
+        "simple_policies": "Política especifica ao domínio",
+        "media_nsfw": "Forçar definição de Mídia como Sensível",
+        "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\""
       },
       "keyword": {
-        "replace": "Repor",
+        "replace": "Substituir",
         "reject": "Rejeitar",
         "is_replaced_by": "→",
-        "keyword_policies": "Políticas Chave",
-        "ftl_removal": "Remoção da cronologia \"Rede conhecida por todos\""
+        "keyword_policies": "Política de Palavras-Chave",
+        "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\""
       },
       "federation": "Federação",
-      "mrf_policies": "Políticas MRF ativadas",
+      "mrf_policies": "Ativar Políticas MRF",
       "mrf_policies_desc": "Políticas MRF manipulam o comportamento da federação na domínios.  As seguintes políticas estão ativadas:"
     },
     "staff": "Staff"
   },
   "remote_user_resolver": {
-    "searching_for": "Pesquisando por"
+    "searching_for": "Pesquisando por",
+    "error": "Não encontrado.",
+    "remote_user_resolver": "Resolução de utilizador remoto"
   },
   "emoji": {
     "unicode": "Emoji Unicode",
     "custom": "Emoji customizado",
     "add_emoji": "Inserir emoji",
     "search_emoji": "Pesquisar por um emoji",
-    "emoji": "Emoji"
+    "emoji": "Emoji",
+    "load_all": "A carregar todos os {emojiAmount} emojis",
+    "load_all_hint": "Carregado o primeiro emoji {saneAmount}, carregar todos os emojis pode causar problemas de desempenho.",
+    "keep_open": "Manter o seletor aberto",
+    "stickers": "Autocolantes"
   },
   "polls": {
-    "single_choice": "Única escolha",
+    "single_choice": "Escolha única",
     "vote": "Vota",
     "votes": "votos",
     "option": "Opção",
-    "add_option": "Adicionar opção"
+    "add_option": "Adicionar Opção",
+    "not_enough_options": "Existem poucas opções únicas na votação",
+    "expired": "A votação terminou há {0}",
+    "expires_in": "A votação termina em {0}",
+    "expiry": "Tempo para finalizar votação"
   },
   "importer": {
-    "error": "Um erro ocorreu enquanto importavas este ficheiro.",
-    "success": "Importado com sucesso",
+    "error": "Ocorreu um erro ao importar este ficheiro.",
+    "success": "Importado com sucesso.",
     "submit": "Enviar"
   },
   "exporter": {
-    "processing": "Processando, breviamente será pedido para tu descarregar o teu ficheiro",
+    "processing": "A processar, brevemente será pedido que descarregue o ficheiro",
     "export": "Exportar"
   },
   "domain_mute_card": {
     "mute_progress": "Silenciando…",
-    "mute": "Silenciar"
+    "mute": "Silenciar",
+    "unmute": "Remover silêncio",
+    "unmute_progress": "A retirar o silêncio…"
+  },
+  "selectable_list": {
+    "select_all": "Seleccionar tudo"
+  },
+  "interactions": {
+    "load_older": "Carregar interações mais antigas",
+    "follows": "Novos seguidores",
+    "favs_repeats": "Favoritos e Repetidos"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma não conseguiu aceder ao armazenamento do navegador. A sua sessão ou definições locais não serão armazenadas e poderá encontrar problemas inesperados. Tente ativar as cookies."
+  },
+  "shoutbox": {
+    "title": "Chat Geral"
   }
 }

From 916d4e04964e4d840bc81331cc74c42abcb5503c Mon Sep 17 00:00:00 2001
From: Afonso Pereira <afonso.pereira@protonmail.com>
Date: Mon, 18 Jan 2021 11:19:57 +0000
Subject: [PATCH 282/389] Translated using Weblate (Portuguese)

Currently translated at 69.4% (470 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index e4639b31..3d592fff 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -34,7 +34,8 @@
     "show_more": "Mostrar mais",
     "retry": "Tenta novamente",
     "error_retry": "Por favor, tente novamente",
-    "loading": "A carregar…"
+    "loading": "A carregar…",
+    "dismiss": "Ignorar"
   },
   "image_cropper": {
     "crop_picture": "Cortar imagem",
@@ -80,7 +81,9 @@
     "search": "Pesquisar",
     "interactions": "Interações",
     "administration": "Administração",
-    "chats": "Salas de Chat"
+    "chats": "Salas de Chat",
+    "timelines": "Cronologias",
+    "bookmarks": "Favoritos"
   },
   "notifications": {
     "broken_favorite": "Estado desconhecido, a procurar…",
@@ -421,7 +424,16 @@
     "block_import": "Importar utilizadores bloqueados",
     "block_export_button": "Exporta a tua lista de utilizadores bloqueados para um ficheiro csv",
     "block_export": "Exportar utilizadores bloqueados",
-    "enter_current_password_to_confirm": "Introduza a sua palavra-passe atual para confirmar a sua identidade"
+    "enter_current_password_to_confirm": "Introduza a sua palavra-passe atual para confirmar a sua identidade",
+    "mutes_and_blocks": "Silenciados e bloqueados",
+    "chatMessageRadius": "Mensagem de texto",
+    "changed_email": "Email modificado com sucesso!",
+    "change_email_error": "Houve um erro ao modificar o seu email.",
+    "change_email": "Mudar Email",
+    "bot": "Esta uma conta bot",
+    "import_mutes_from_a_csv_file": "Importar silenciados de um ficheiro csv",
+    "mutes_imported": "Silenciados importados! Processá-los pode demorar alguns instantes.",
+    "allow_following_move": "Permitir auto-follow quando a conta migrar"
   },
   "timeline": {
     "collapse": "Esconder",
@@ -512,7 +524,8 @@
         "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
         "simple_policies": "Política especifica ao domínio",
         "media_nsfw": "Forçar definição de Mídia como Sensível",
-        "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\""
+        "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\"",
+        "media_nsfw_desc": "Este domínio força a midia a ser marcada como Sensível nos seguintes domínios:"
       },
       "keyword": {
         "replace": "Substituir",
@@ -552,7 +565,10 @@
     "not_enough_options": "Existem poucas opções únicas na votação",
     "expired": "A votação terminou há {0}",
     "expires_in": "A votação termina em {0}",
-    "expiry": "Tempo para finalizar votação"
+    "expiry": "Tempo para finalizar votação",
+    "multiple_choices": "Escolha Múltipla",
+    "type": "Tipo de questionário",
+    "add_poll": "Adicionar Questionário"
   },
   "importer": {
     "error": "Ocorreu um erro ao importar este ficheiro.",

From 24f7cbf3c9fc159a523b36795a41e4d3bbbfd5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dr=2E=20Ant=C3=B3nio?= <cariosecus@gmail.com>
Date: Mon, 18 Jan 2021 11:26:45 +0000
Subject: [PATCH 283/389] Translated using Weblate (Portuguese)

Currently translated at 69.7% (472 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 3d592fff..74190b39 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -425,7 +425,7 @@
     "block_export_button": "Exporta a tua lista de utilizadores bloqueados para um ficheiro csv",
     "block_export": "Exportar utilizadores bloqueados",
     "enter_current_password_to_confirm": "Introduza a sua palavra-passe atual para confirmar a sua identidade",
-    "mutes_and_blocks": "Silenciados e bloqueados",
+    "mutes_and_blocks": "Silenciados e Bloqueados",
     "chatMessageRadius": "Mensagem de texto",
     "changed_email": "Email modificado com sucesso!",
     "change_email_error": "Houve um erro ao modificar o seu email.",

From a5def5cf56704c763e17a4f68bcd122f82cf27dd Mon Sep 17 00:00:00 2001
From: Afonso Pereira <afonso.pereira@protonmail.com>
Date: Mon, 18 Jan 2021 11:27:02 +0000
Subject: [PATCH 284/389] Translated using Weblate (Portuguese)

Currently translated at 69.7% (472 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 74190b39..15ac8def 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -433,7 +433,9 @@
     "bot": "Esta uma conta bot",
     "import_mutes_from_a_csv_file": "Importar silenciados de um ficheiro csv",
     "mutes_imported": "Silenciados importados! Processá-los pode demorar alguns instantes.",
-    "allow_following_move": "Permitir auto-follow quando a conta migrar"
+    "allow_following_move": "Permitir auto-follow quando a conta migrar",
+    "domain_mutes": "Domínios",
+    "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços"
   },
   "timeline": {
     "collapse": "Esconder",

From 600ff9a67b0ec997a25e632b47c5f0df21df5925 Mon Sep 17 00:00:00 2001
From: Afonso Pereira <afonso.pereira@protonmail.com>
Date: Mon, 18 Jan 2021 11:27:45 +0000
Subject: [PATCH 285/389] Translated using Weblate (Portuguese)

Currently translated at 69.8% (473 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 15ac8def..476f4c19 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -435,7 +435,8 @@
     "mutes_imported": "Silenciados importados! Processá-los pode demorar alguns instantes.",
     "allow_following_move": "Permitir auto-follow quando a conta migrar",
     "domain_mutes": "Domínios",
-    "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços"
+    "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços",
+    "emoji_reactions_on_timeline": "Mostrar reações com emoji na cronografia"
   },
   "timeline": {
     "collapse": "Esconder",

From 21eac51029775a283d5693090d60579655baccd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dr=2E=20Ant=C3=B3nio?= <cariosecus@gmail.com>
Date: Mon, 18 Jan 2021 11:28:13 +0000
Subject: [PATCH 286/389] Translated using Weblate (Portuguese)

Currently translated at 70.0% (474 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 476f4c19..0a509edd 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -436,7 +436,7 @@
     "allow_following_move": "Permitir auto-follow quando a conta migrar",
     "domain_mutes": "Domínios",
     "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços",
-    "emoji_reactions_on_timeline": "Mostrar reações com emoji na cronografia"
+    "emoji_reactions_on_timeline": "Mostrar reações de emoji na timeline"
   },
   "timeline": {
     "collapse": "Esconder",

From ac43a8145b484c857b48459b91a9c5bdc217a0ad Mon Sep 17 00:00:00 2001
From: Afonso Pereira <afonso.pereira@protonmail.com>
Date: Mon, 18 Jan 2021 11:28:49 +0000
Subject: [PATCH 287/389] Translated using Weblate (Portuguese)

Currently translated at 70.0% (474 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 0a509edd..21695232 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -436,7 +436,8 @@
     "allow_following_move": "Permitir auto-follow quando a conta migrar",
     "domain_mutes": "Domínios",
     "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços",
-    "emoji_reactions_on_timeline": "Mostrar reações de emoji na timeline"
+    "emoji_reactions_on_timeline": "Mostrar reações de emoji na timeline",
+    "hide_muted_posts": "Esconder posts de utilizadores silenciados"
   },
   "timeline": {
     "collapse": "Esconder",

From a9cbf3eafee2cac261039cd80f63aacfa800349c Mon Sep 17 00:00:00 2001
From: Afonso Pereira <afonso.pereira@protonmail.com>
Date: Mon, 18 Jan 2021 11:30:11 +0000
Subject: [PATCH 288/389] Translated using Weblate (Portuguese)

Currently translated at 71.9% (487 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 21695232..5489c8b4 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -437,7 +437,18 @@
     "domain_mutes": "Domínios",
     "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços",
     "emoji_reactions_on_timeline": "Mostrar reações de emoji na timeline",
-    "hide_muted_posts": "Esconder posts de utilizadores silenciados"
+    "hide_muted_posts": "Esconder posts de utilizadores silenciados",
+    "hide_follows_count_description": "Não mostrar o número de contas seguidas",
+    "hide_followers_count_description": "Não mostrar o número de seguidores",
+    "notification_visibility_emoji_reactions": "Reações",
+    "new_email": "Novo email",
+    "profile_fields": {
+      "value": "Conteúdo",
+      "add_field": "Adicionar campo",
+      "label": "Metadados do perfil"
+    },
+    "import_blocks_from_a_csv_file": "Importar bloqueados a partir de um arquivo CSV",
+    "hide_wallpaper": "Esconder papel de parede da instância"
   },
   "timeline": {
     "collapse": "Esconder",

From e9c5e06f50b09486335bb27c7cb73664662b7467 Mon Sep 17 00:00:00 2001
From: Miguel Carreiro <miguel.carreiro97@gmail.com>
Date: Mon, 18 Jan 2021 12:49:13 +0000
Subject: [PATCH 289/389] Translated using Weblate (Portuguese)

Currently translated at 71.9% (487 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 5489c8b4..13f31780 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -448,7 +448,11 @@
       "label": "Metadados do perfil"
     },
     "import_blocks_from_a_csv_file": "Importar bloqueados a partir de um arquivo CSV",
-    "hide_wallpaper": "Esconder papel de parede da instância"
+    "hide_wallpaper": "Esconder papel de parede da instância",
+    "notification_setting_privacy": "Privacidade",
+    "notification_setting_filters": "Filtros",
+    "fun": "Divertido",
+    "user_mutes": "Utilizadores"
   },
   "timeline": {
     "collapse": "Esconder",

From cdd632f04cbef88676a26131167952e82730793d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Mon, 18 Jan 2021 15:30:49 +0000
Subject: [PATCH 290/389] Translated using Weblate (Portuguese)

Currently translated at 74.0% (501 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 13f31780..c68d4f6b 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -47,11 +47,11 @@
     "login": "Iniciar Sessão",
     "description": "Iniciar sessão com OAuth",
     "logout": "Terminar sessão",
-    "password": "Senha",
+    "password": "Palavra-passe",
     "placeholder": "p.e. lain",
     "register": "Registrar",
     "username": "Nome de Utilizador",
-    "hint": "Entre para participar na discussão",
+    "hint": "Entra para participar na discussão",
     "heading": {
       "totp": "Autenticação de dois fatores",
       "recovery": "Recuperação de dois fatores"
@@ -72,7 +72,7 @@
     "friend_requests": "Pedidos de seguidores",
     "mentions": "Menções",
     "dms": "Mensagens Diretas",
-    "public_tl": "Cronologia pública",
+    "public_tl": "Cronologia Pública",
     "timeline": "Cronologia",
     "twkn": "Rede conhecida",
     "user_search": "Buscar usuários",
@@ -83,7 +83,7 @@
     "administration": "Administração",
     "chats": "Salas de Chat",
     "timelines": "Cronologias",
-    "bookmarks": "Favoritos"
+    "bookmarks": "Items Guardados"
   },
   "notifications": {
     "broken_favorite": "Estado desconhecido, a procurar…",
@@ -452,7 +452,13 @@
     "notification_setting_privacy": "Privacidade",
     "notification_setting_filters": "Filtros",
     "fun": "Divertido",
-    "user_mutes": "Utilizadores"
+    "user_mutes": "Utilizadores",
+    "type_domains_to_mute": "Pesquisar domínios para silenciar",
+    "useStreamingApiWarning": "(não recomendado, experimental, pode omitir publicações)",
+    "useStreamingApi": "Receber publicações e notificações em tempo real",
+    "minimal_scopes_mode": "Minimizar as opções de publicação",
+    "search_user_to_mute": "Pesquisa quais os utilizadores deseja silenciar",
+    "search_user_to_block": "Pesquisa quais utilizadores deseja bloquear"
   },
   "timeline": {
     "collapse": "Esconder",
@@ -544,7 +550,7 @@
         "simple_policies": "Política especifica ao domínio",
         "media_nsfw": "Forçar definição de Mídia como Sensível",
         "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\"",
-        "media_nsfw_desc": "Este domínio força a midia a ser marcada como Sensível nos seguintes domínios:"
+        "media_nsfw_desc": "Esta instância força a multimédia a ser marcada como sensível nas seguintes instâncias:"
       },
       "keyword": {
         "replace": "Substituir",
@@ -585,9 +591,9 @@
     "expired": "A votação terminou há {0}",
     "expires_in": "A votação termina em {0}",
     "expiry": "Tempo para finalizar votação",
-    "multiple_choices": "Escolha Múltipla",
-    "type": "Tipo de questionário",
-    "add_poll": "Adicionar Questionário"
+    "multiple_choices": "Escolha múltipla",
+    "type": "Tipo de votação",
+    "add_poll": "Adicionar Votação"
   },
   "importer": {
     "error": "Ocorreu um erro ao importar este ficheiro.",
@@ -610,7 +616,8 @@
   "interactions": {
     "load_older": "Carregar interações mais antigas",
     "follows": "Novos seguidores",
-    "favs_repeats": "Favoritos e Repetidos"
+    "favs_repeats": "Favoritos e Repetidos",
+    "moves": "Utilizador migrado"
   },
   "errors": {
     "storage_unavailable": "Pleroma não conseguiu aceder ao armazenamento do navegador. A sua sessão ou definições locais não serão armazenadas e poderá encontrar problemas inesperados. Tente ativar as cookies."

From c5477e489b23350699f005d6d00b2c92c10fd67e Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Mon, 18 Jan 2021 15:40:26 +0000
Subject: [PATCH 291/389] Translated using Weblate (Portuguese)

Currently translated at 74.0% (501 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index c68d4f6b..50370492 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -445,7 +445,8 @@
     "profile_fields": {
       "value": "Conteúdo",
       "add_field": "Adicionar campo",
-      "label": "Metadados do perfil"
+      "label": "Metadados do perfil",
+      "name": "Etiqueta"
     },
     "import_blocks_from_a_csv_file": "Importar bloqueados a partir de um arquivo CSV",
     "hide_wallpaper": "Esconder papel de parede da instância",

From 6df5459ec9324d789f18964ee477927e52016589 Mon Sep 17 00:00:00 2001
From: Miguel Carreiro <miguel.carreiro97@gmail.com>
Date: Mon, 18 Jan 2021 15:42:06 +0000
Subject: [PATCH 292/389] Translated using Weblate (Portuguese)

Currently translated at 74.0% (501 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 50370492..124a99ff 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -294,7 +294,14 @@
         "save_load_hint": "Manter as opções preserva as opções atuais ao selecionar ou carregar temas; também salva as opções ao exportar um tempo. Quanto todos os campos estiverem desmarcados, tudo será salvo ao exportar o tema.",
         "reset": "Restaurar o padrão",
         "clear_all": "Limpar tudo",
-        "clear_opacity": "Limpar opacidade"
+        "clear_opacity": "Limpar opacidade",
+        "help": {
+          "upgraded_from_v2": "O PleromaFE foi atualizado, a aparência do tema poderá ser um pouco diferente."
+        },
+        "use_source": "Nova versão",
+        "use_snapshot": "Versão antiga",
+        "keep_as_is": "Manter como está",
+        "load_theme": "Carregar tema"
       },
       "common": {
         "color": "Cor",
@@ -459,7 +466,8 @@
     "useStreamingApi": "Receber publicações e notificações em tempo real",
     "minimal_scopes_mode": "Minimizar as opções de publicação",
     "search_user_to_mute": "Pesquisa quais os utilizadores deseja silenciar",
-    "search_user_to_block": "Pesquisa quais utilizadores deseja bloquear"
+    "search_user_to_block": "Pesquisa quais utilizadores deseja bloquear",
+    "notification_setting_hide_notification_contents": "Ocultar o remetente e o conteúdo das notificações push"
   },
   "timeline": {
     "collapse": "Esconder",

From ffd673d4a5ad42e09ed12013b486b8fb23092989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20In=C3=A1cio?= <gamer101portugal@gmail.com>
Date: Mon, 18 Jan 2021 15:31:03 +0000
Subject: [PATCH 293/389] Translated using Weblate (Portuguese)

Currently translated at 74.0% (501 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 124a99ff..0ba070d4 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -48,7 +48,7 @@
     "description": "Iniciar sessão com OAuth",
     "logout": "Terminar sessão",
     "password": "Palavra-passe",
-    "placeholder": "p.e. lain",
+    "placeholder": "p.ex. lain",
     "register": "Registrar",
     "username": "Nome de Utilizador",
     "hint": "Entra para participar na discussão",

From 0c2b425682ff1666298da4a5c990282134936d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Mon, 18 Jan 2021 15:44:35 +0000
Subject: [PATCH 294/389] Translated using Weblate (Portuguese)

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 342 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 267 insertions(+), 75 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 0ba070d4..51a6f6f6 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -5,7 +5,7 @@
   "features_panel": {
     "chat": "Chat",
     "gopher": "Gopher",
-    "media_proxy": "Proxy de mídia",
+    "media_proxy": "Proxy de multimédia",
     "scope_options": "Opções de privacidade",
     "text_limit": "Limite de caracteres",
     "title": "Características",
@@ -14,8 +14,8 @@
     "pleroma_chat_messages": "Chat do Pleroma"
   },
   "finder": {
-    "error_fetching_user": "Erro ao procurar utilizador",
-    "find_user": "Procurar utilizador"
+    "error_fetching_user": "Erro ao pesquisar utilizador",
+    "find_user": "Pesquisar utilizador"
   },
   "general": {
     "apply": "Aplicar",
@@ -33,7 +33,7 @@
     "show_less": "Mostrar menos",
     "show_more": "Mostrar mais",
     "retry": "Tenta novamente",
-    "error_retry": "Por favor, tente novamente",
+    "error_retry": "Por favor, tenta novamente",
     "loading": "A carregar…",
     "dismiss": "Ignorar"
   },
@@ -49,7 +49,7 @@
     "logout": "Terminar sessão",
     "password": "Palavra-passe",
     "placeholder": "p.ex. lain",
-    "register": "Registrar",
+    "register": "Registar",
     "username": "Nome de Utilizador",
     "hint": "Entra para participar na discussão",
     "heading": {
@@ -75,7 +75,7 @@
     "public_tl": "Cronologia Pública",
     "timeline": "Cronologia",
     "twkn": "Rede conhecida",
-    "user_search": "Buscar usuários",
+    "user_search": "Pesquisa por Utilizadores",
     "who_to_follow": "Quem seguir",
     "preferences": "Preferências",
     "search": "Pesquisar",
@@ -87,21 +87,21 @@
   },
   "notifications": {
     "broken_favorite": "Estado desconhecido, a procurar…",
-    "favorited_you": "favoritou sua postagem",
-    "followed_you": "seguiu você",
+    "favorited_you": "favoritou o teu post",
+    "followed_you": "seguiu-te",
     "load_older": "Carregar notificações antigas",
     "notifications": "Notificações",
     "read": "Lido!",
     "repeated_you": "repetiu sua postagem",
-    "no_more_notifications": "Mais nenhuma notificação",
+    "no_more_notifications": "Sem mais notificações",
     "reacted_with": "reagiu com {0}",
     "migrated_to": "migrou para",
     "follow_request": "quer seguir-te",
     "error": "Erro ao obter notificações: {0}"
   },
   "post_status": {
-    "new_status": "Postar novo status",
-    "account_not_locked_warning": "Sua conta não é {0}. Qualquer pessoa pode te seguir e ver seus posts privados (só para seguidores).",
+    "new_status": "Publicar novo estado",
+    "account_not_locked_warning": "A sua conta não é {0}. Qualquer pessoa pode te seguir e ver os seus posts privados (só para seguidores).",
     "account_not_locked_warning_link": "restrita",
     "attachments_sensitive": "Marcar anexos como sensíveis",
     "content_type": {
@@ -113,7 +113,7 @@
     "content_warning": "Assunto (opcional)",
     "default": "Acabei de chegar a Lisboa.",
     "direct_warning": "Este post será visível apenas para os usuários mencionados.",
-    "posting": "Publicando",
+    "posting": "A publicar",
     "scope": {
       "direct": "Direto - Enviar somente aos usuários mencionados",
       "private": "Apenas para seguidores - Enviar apenas para seguidores",
@@ -128,34 +128,34 @@
     "empty_status_error": "Não consegues publicar um estado vazio e sem ficheiros",
     "preview_empty": "Vazio",
     "preview": "Pré-visualização",
-    "media_description": "Descrição da mídia",
+    "media_description": "Descrição da multimédia",
     "media_description_error": "Falha ao atualizar ficheiro, tente novamente",
     "direct_warning_to_first_only": "Esta publicação só será visível para os utilizadores mencionados no início da mensagem.",
     "direct_warning_to_all": "Esta publicação será visível para todos os utilizadores mencionados."
   },
   "registration": {
     "bio": "Biografia",
-    "email": "Correio eletrônico",
+    "email": "Endereço de e-mail",
     "fullname": "Nome para exibição",
-    "password_confirm": "Confirmação de senha",
-    "registration": "Registro",
+    "password_confirm": "Confirmação de palavra-passe",
+    "registration": "Registo",
     "token": "Código do convite",
     "captcha": "CAPTCHA",
     "new_captcha": "Clique na imagem para carregar um novo captcha",
     "username_placeholder": "p. ex. lain",
     "fullname_placeholder": "p. ex. Lain Iwakura",
-    "bio_placeholder": "e.g.\nOi, sou Lain\nSou uma garota que vive no subúrbio do Japão. Você deve me conhecer da Rede.",
+    "bio_placeholder": "p. ex.\nOlá, sou um exemplo\nAqui podes colocar algo representativo da tua parte... ou não.",
     "validations": {
       "username_required": "não pode ser deixado em branco",
       "fullname_required": "não pode ser deixado em branco",
       "email_required": "não pode ser deixado em branco",
       "password_required": "não pode ser deixado em branco",
       "password_confirmation_required": "não pode ser deixado em branco",
-      "password_confirmation_match": "deve ser idêntica à senha"
+      "password_confirmation_match": "deve corresponder à palavra-passe"
     }
   },
   "settings": {
-    "app_name": "Nome do aplicativo",
+    "app_name": "Nome da aplicação",
     "attachmentRadius": "Anexos",
     "attachments": "Anexos",
     "avatar": "Avatar",
@@ -169,23 +169,23 @@
     "cGreen": "Verde (Repetir)",
     "cOrange": "Laranja (Favoritar)",
     "cRed": "Vermelho (Cancelar)",
-    "change_password": "Mudar senha",
-    "change_password_error": "Houve um erro ao modificar sua senha.",
-    "changed_password": "Senha modificada com sucesso!",
+    "change_password": "Mudar palavra-passe",
+    "change_password_error": "Ocorreu um erro ao modificar a sua palavra-passe.",
+    "changed_password": "Palavra-passe modificada com sucesso!",
     "collapse_subject": "Esconder posts com assunto",
     "composing": "Escrita",
-    "confirm_new_password": "Confirmar nova senha",
+    "confirm_new_password": "Confirmar nova palavra-passe",
     "current_avatar": "Seu avatar atual",
-    "current_password": "Sua senha atual",
+    "current_password": "Palavra-passe atual",
     "current_profile_banner": "Sua capa de perfil atual",
     "data_import_export_tab": "Importação/exportação de dados",
     "default_vis": "Opção de privacidade padrão",
-    "delete_account": "Deletar conta",
+    "delete_account": "Eliminar conta",
     "delete_account_description": "Apagar os seus dados permanentemente e desativar a sua conta.",
-    "delete_account_error": "Houve um problema ao deletar sua conta. Se ele persistir, por favor entre em contato com o/a administrador/a da instância.",
-    "delete_account_instructions": "Digite sua senha no campo abaixo para confirmar a exclusão da conta.",
+    "delete_account_error": "Ocorreu um erro ao remover a sua conta. Se este persistir, por favor entre em contato com o/a administrador/a da instância.",
+    "delete_account_instructions": "Escreva a sua palavra-passe no campo abaixo para confirmar a remoção da conta.",
     "avatar_size_instruction": "O tamanho mínimo recomendado para imagens de avatar é 150x150 pixels.",
-    "export_theme": "Salvar predefinições",
+    "export_theme": "Guardar predefinições",
     "filtering": "Filtragem",
     "filtering_explanation": "Todas as publicações que contenham estas palavras serão silenciadas; uma palavra por linha",
     "follow_export": "Exportar quem você segue",
@@ -220,11 +220,11 @@
     "loop_video": "Repetir vídeos",
     "loop_video_silent_only": "Repetir apenas vídeos sem som (como os \"gifs\" do Mastodon)",
     "mutes_tab": "Silenciados",
-    "play_videos_in_modal": "Tocar vídeos diretamente no visualizador de mídia",
+    "play_videos_in_modal": "Reproduzir vídeos diretamente no visualizador de multimédia",
     "use_contain_fit": "Não cortar o anexo na miniatura",
     "name": "Nome",
     "name_bio": "Nome & Biografia",
-    "new_password": "Nova senha",
+    "new_password": "Nova palavra-passe",
     "notification_visibility": "Tipos de notificação para mostrar",
     "notification_visibility_follows": "Seguidas",
     "notification_visibility_likes": "Favoritos",
@@ -237,7 +237,7 @@
     "hide_followers_description": "Não mostrar quem me segue",
     "show_admin_badge": "Mostrar título de Administrador em meu perfil",
     "show_moderator_badge": "Mostrar título de Moderador em meu perfil",
-    "nsfw_clickthrough": "Habilitar clique para ocultar anexos sensíveis",
+    "nsfw_clickthrough": "Ativar clique em anexos e pré-visualizações de links para ocultar anexos NSFW",
     "oauth_tokens": "Token OAuth",
     "token": "Token",
     "refresh_token": "Atualizar Token",
@@ -264,7 +264,7 @@
     "settings": "Configurações",
     "subject_input_always_show": "Sempre mostrar campo de assunto",
     "subject_line_behavior": "Copiar assunto ao responder",
-    "subject_line_email": "Como em email: \"re: assunto\"",
+    "subject_line_email": "Como num e-mail: \"re: assunto\"",
     "subject_line_mastodon": "Como o Mastodon: copiar como está",
     "subject_line_noop": "Não copiar",
     "post_status_content_type": "Tipo de conteúdo do status",
@@ -296,7 +296,17 @@
         "clear_all": "Limpar tudo",
         "clear_opacity": "Limpar opacidade",
         "help": {
-          "upgraded_from_v2": "O PleromaFE foi atualizado, a aparência do tema poderá ser um pouco diferente."
+          "upgraded_from_v2": "O PleromaFE foi atualizado, a aparência do tema poderá ser um pouco diferente.",
+          "snapshot_source_mismatch": "Conflito de versões: o mais provável é que o FE tenha revertido e voltado a atualizar, foi alterado o tema numa versão anterior do FE, o mais provável é desejar utilizar a versão anterior; caso contrário, utilize a nova versão.",
+          "migration_napshot_gone": "Por algum motivo, a pré-visualização estava em falta, algumas coisas poderão parecer diferentes do que se lembra.",
+          "migration_snapshot_ok": "Para estar seguro, foi carregada uma versão de pré-visualização do tema. Pode tentar carregar dados do tema.",
+          "fe_downgraded": "Versão do PleromaFE revertida.",
+          "fe_upgraded": "O criador de temas do PleromaFE foi atualizado depois da atualização da versão.",
+          "snapshot_missing": "Não existia nenhuma pré-visualização do tema no ficheiro, então pode parecer diferente do previsto originalmente.",
+          "snapshot_present": "Foi carregada uma pré-visualização do tema, todos os valores são substituídos. Caso contrário, pode carregar o tema completo.",
+          "older_version_imported": "O ficheiro que importaste foi criado numa versão antiga do FE.",
+          "future_version_imported": "O ficheiro que importaste foi criado para uma versão mais recente do FE.",
+          "v2_imported": "O ficheiro que importaste foi feito para uma versão antiga do FE. Tentamos maximizar a compatibilidade, porém, poderão existir incongruências."
         },
         "use_source": "Nova versão",
         "use_snapshot": "Versão antiga",
@@ -336,7 +346,27 @@
         "borders": "Bordas",
         "buttons": "Botões",
         "inputs": "Caixas de entrada",
-        "faint_text": "Texto esmaecido"
+        "faint_text": "Texto esmaecido",
+        "chat": {
+          "border": "Borda",
+          "outgoing": "Enviadas",
+          "incoming": "Recebidas"
+        },
+        "tabs": "Abas",
+        "toggled": "Alternado",
+        "disabled": "Desativado",
+        "selectedMenu": "Elemento do menu seleccionado",
+        "selectedPost": "Publicação seleccionada",
+        "pressed": "Pressionado",
+        "highlight": "Elementos destacados",
+        "icons": "Ícones",
+        "poll": "Gráfico da sondagem",
+        "wallpaper": "Fundo de ecrã",
+        "underlay": "Sublinhado",
+        "popover": "Sugestões, menus, etiquetas",
+        "post": "Publicações/Bios",
+        "alert_neutral": "Neutro",
+        "alert_warning": "Precaução"
       },
       "radii": {
         "_tab_label": "Arredondado"
@@ -369,7 +399,8 @@
           "buttonPressed": "Botão (pressionado)",
           "buttonPressedHover": "Botão (pressionado+em cima)",
           "input": "Campo de entrada"
-        }
+        },
+        "hintV3": "Para as sombras, também pode usar a notação {0} para usar outro espaço de cor."
       },
       "fonts": {
         "_tab_label": "Fontes",
@@ -409,17 +440,17 @@
       "authentication_methods": "Métodos de autenticação",
       "recovery_codes": "Códigos de recuperação.",
       "generate_new_recovery_codes": "Gerar novos códigos de recuperação",
-      "confirm_and_enable": "Confirmar e ativar a senha de utilização única",
-      "otp": "Senha de uso único",
+      "confirm_and_enable": "Confirmar e ativar a palavra-passe de utilização única",
+      "otp": "Palavra-passe de utilização única",
       "verify": {
         "desc": "Para ativar a autenticação de dois fatores, introduza o código da sua aplicação de dois fatores:"
       },
-      "recovery_codes_warning": "Anote os códigos ou armazene-os num lugar seguro, caso contrário, não os voltará a ver. Se perder acesso à sua aplicação de dois fatores e aos códigos de recuperação, a sua conta ficará bloqueado.",
+      "recovery_codes_warning": "Anote os códigos ou armazene-os num lugar seguro, caso contrário, não os voltará a ver. Se perder acesso à sua aplicação de dois fatores e aos códigos de recuperação, a sua conta ficará bloqueada.",
       "waiting_a_recovery_codes": "A receber códigos de recuperação…",
       "warning_of_generate_new_codes": "Quando gera novos códigos de recuperação, os antigos deixam de funcionar.",
       "title": "Autenticação de Dois Fatores",
-      "wait_pre_setup_otp": "pré-configuração de senha de utilização única",
-      "setup_otp": "Configurar senha de utilização única"
+      "wait_pre_setup_otp": "pré-configuração de palavra-passe de utilização única",
+      "setup_otp": "Configurar palavra-passe de utilização única"
     },
     "security": "Segurança",
     "mute_import_error": "Erro ao importar os silenciados",
@@ -434,13 +465,13 @@
     "enter_current_password_to_confirm": "Introduza a sua palavra-passe atual para confirmar a sua identidade",
     "mutes_and_blocks": "Silenciados e Bloqueados",
     "chatMessageRadius": "Mensagem de texto",
-    "changed_email": "Email modificado com sucesso!",
-    "change_email_error": "Houve um erro ao modificar o seu email.",
-    "change_email": "Mudar Email",
-    "bot": "Esta uma conta bot",
+    "changed_email": "Endereço de e-mail modificado com sucesso!",
+    "change_email_error": "Ocorreu um erro ao modificar o seu endereço de e-mail.",
+    "change_email": "Mudar Endereço de E-mail",
+    "bot": "Esta uma conta robô",
     "import_mutes_from_a_csv_file": "Importar silenciados de um ficheiro csv",
     "mutes_imported": "Silenciados importados! Processá-los pode demorar alguns instantes.",
-    "allow_following_move": "Permitir auto-follow quando a conta migrar",
+    "allow_following_move": "Permitir seguimento automático quando a conta for migrada para outra instância",
     "domain_mutes": "Domínios",
     "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços",
     "emoji_reactions_on_timeline": "Mostrar reações de emoji na timeline",
@@ -448,7 +479,7 @@
     "hide_follows_count_description": "Não mostrar o número de contas seguidas",
     "hide_followers_count_description": "Não mostrar o número de seguidores",
     "notification_visibility_emoji_reactions": "Reações",
-    "new_email": "Novo email",
+    "new_email": "Novo endereço de e-mail",
     "profile_fields": {
       "value": "Conteúdo",
       "add_field": "Adicionar campo",
@@ -465,9 +496,29 @@
     "useStreamingApiWarning": "(não recomendado, experimental, pode omitir publicações)",
     "useStreamingApi": "Receber publicações e notificações em tempo real",
     "minimal_scopes_mode": "Minimizar as opções de publicação",
-    "search_user_to_mute": "Pesquisa quais os utilizadores deseja silenciar",
-    "search_user_to_block": "Pesquisa quais utilizadores deseja bloquear",
-    "notification_setting_hide_notification_contents": "Ocultar o remetente e o conteúdo das notificações push"
+    "search_user_to_mute": "Pesquisar utilizadores que pretende silenciar",
+    "search_user_to_block": "Pesquisa quais utilizadores desejas bloquear",
+    "notification_setting_hide_notification_contents": "Ocultar o remetente e o conteúdo das notificações push",
+    "version": {
+      "frontend_version": "Versão do Frontend",
+      "backend_version": "Versão do Backend",
+      "title": "Versão"
+    },
+    "notification_blocks": "Bloquear um utilizador previne todas as notificações, bem como as desativa.",
+    "notification_mutes": "Para deixar de receber notificações de um utilizador específico, silencia-o.",
+    "notification_setting_block_from_strangers": "Bloqueia as notificações de utilizadores que não segues",
+    "greentext": "Texto verde (meme arrows)",
+    "virtual_scrolling": "Otimizar a apresentação da cronologia",
+    "reset_background_confirm": "Tens a certeza que desejas redefinir o fundo?",
+    "reset_banner_confirm": "Tens a certeza que desejas redefinir a imagem do cabeçalho?",
+    "reset_avatar_confirm": "Tens a certeza que desejas redefinir o avatar?",
+    "reset_profile_banner": "Redefinir imagem do cabeçalho do perfil",
+    "reset_profile_background": "Redefinir fundo de perfil",
+    "reset_avatar": "Redefinir avatar",
+    "autohide_floating_post_button": "Automaticamente ocultar o botão 'Nova Publicação' (telemóvel)",
+    "notification_visibility_moves": "Utilizador Migrado",
+    "accent": "Destaque",
+    "pad_emoji": "Preencher espaços ao adicionar emojis do seletor"
   },
   "timeline": {
     "collapse": "Esconder",
@@ -479,11 +530,36 @@
     "show_new": "Mostrar novas",
     "up_to_date": "Atualizado",
     "no_more_statuses": "Sem mais posts",
-    "no_statuses": "Sem posts"
+    "no_statuses": "Sem posts",
+    "reload": "Recarregar",
+    "error": "Erro a obter a cronologia: {0}"
   },
   "status": {
     "reply_to": "Responder a",
-    "replies_list": "Respostas:"
+    "replies_list": "Respostas:",
+    "unbookmark": "Remover post dos Items Guardados",
+    "expand": "Expandir",
+    "nsfw": "NSFW (Não apropriado para trabalho)",
+    "status_deleted": "Esta publicação foi apagada",
+    "hide_content": "Ocultar o conteúdo",
+    "show_content": "Mostrar o conteúdo",
+    "hide_full_subject": "Ocultar o assunto completo",
+    "show_full_subject": "Mostrar o assunto completo",
+    "thread_muted_and_words": ", contém:",
+    "thread_muted": "Conversação silenciada",
+    "external_source": "Fonte externa",
+    "copy_link": "Copiar o link do estado",
+    "status_unavailable": "Estado indisponível",
+    "unmute_conversation": "Mostrar a conversação",
+    "mute_conversation": "Silenciar a conversação",
+    "delete_confirm": "Tens a certeza que desejas apagar a publicação?",
+    "bookmark": "Guardar",
+    "pin": "Fixar no perfil",
+    "pinned": "Afixado",
+    "unpin": "Desafixar do perfil",
+    "delete": "Eliminar publicação",
+    "repeats": "Repetidos",
+    "favorites": "Favoritos"
   },
   "user_card": {
     "approve": "Aprovar",
@@ -501,7 +577,7 @@
     "following": "Seguindo!",
     "follows_you": "Segue você!",
     "its_you": "É você!",
-    "media": "Mídia",
+    "media": "Multimédia",
     "mute": "Silenciar",
     "muted": "Silenciado",
     "per_day": "por dia",
@@ -512,7 +588,34 @@
     "block_progress": "A bloquear…",
     "unmute": "Retirar silêncio",
     "unmute_progress": "A retirar silêncio…",
-    "mute_progress": "A silenciar…"
+    "mute_progress": "A silenciar…",
+    "admin_menu": {
+      "delete_user_confirmation": "Tens a certeza? Esta ação não pode ser revertida.",
+      "delete_user": "Eliminar utilizador",
+      "quarantine": "Não permitir publicações de utilizadores de instâncias remotas",
+      "disable_any_subscription": "Não permitir que nenhum utilizador te siga",
+      "disable_remote_subscription": "Não permitir seguidores de instâncias remotas",
+      "sandbox": "Forçar publicações apenas para seguidores",
+      "force_unlisted": "Forçar publicações como não listadas",
+      "strip_media": "Eliminar ficheiros multimédia das publicações",
+      "force_nsfw": "Marcar todas as publicações como NSFW (não apropriado para o trabalho)",
+      "delete_account": "Eliminar Conta",
+      "deactivate_account": "Desativar conta",
+      "activate_account": "Ativar conta",
+      "revoke_moderator": "Revogar permissões de Moderador",
+      "grant_moderator": "Conceder permissões de Moderador",
+      "revoke_admin": "Revogar permissões de Admin",
+      "grant_admin": "Conceder permissões de Admin",
+      "moderation": "Moderação"
+    },
+    "show_repeats": "Mostrar repetidos",
+    "hide_repeats": "Ocultar repetidos",
+    "unsubscribe": "Retirar subscrição",
+    "subscribe": "Subscrever",
+    "report": "Denunciar",
+    "message": "Mensagem",
+    "mention": "Mencionar",
+    "hidden": "Ocultar"
   },
   "user_profile": {
     "timeline_title": "Cronologia do Utilizador",
@@ -524,17 +627,22 @@
     "who_to_follow": "Quem seguir"
   },
   "tool_tip": {
-    "media_upload": "Envio de mídia",
+    "media_upload": "Envio de multimédia",
     "repeat": "Repetir",
     "reply": "Responder",
     "favorite": "Favoritar",
-    "user_settings": "Configurações do usuário"
+    "user_settings": "Configurações do usuário",
+    "bookmark": "Guardar",
+    "reject_follow_request": "Rejeitar o pedido de seguimento",
+    "accept_follow_request": "Aceitar o pedido de seguimento",
+    "add_reaction": "Adicionar Reação"
   },
   "upload": {
     "error": {
       "base": "Falha no envio.",
       "file_too_big": "Arquivo grande demais [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Tente novamente mais tarde"
+      "default": "Tente novamente mais tarde",
+      "message": "Falha ao enviar: {0}"
     },
     "file_size_units": {
       "B": "B",
@@ -550,14 +658,14 @@
         "quarantine": "Quarentena",
         "reject": "Rejeitar",
         "accept": "Aceitar",
-        "media_removal_desc": "Este domínio remove mídia das publicações dos seguintes domínios:",
-        "media_removal": "Remoção de mídia",
-        "ftl_removal_desc": "Este domínio remove os seguintes domínios da cronologia \"Rede conhecida por todos\":",
-        "quarantine_desc": "Este domínio apenas irá publicar nos seguintes domínios:",
-        "reject_desc": "Este domínio não aceitara mensagens dos seguintes domínios:",
-        "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
-        "simple_policies": "Política especifica ao domínio",
-        "media_nsfw": "Forçar definição de Mídia como Sensível",
+        "media_removal_desc": "Esta instância remove multimédia das publicações das seguintes instâncias:",
+        "media_removal": "Remoção de multimédia",
+        "ftl_removal_desc": "Esta instância remove as seguintes instâncias da cronologia \"Rede conhecida por todos\":",
+        "quarantine_desc": "Esta instância apenas irá publicar nas seguintes instâncias:",
+        "reject_desc": "Esta instância não aceitará mensagens das seguintes instâncias:",
+        "accept_desc": "Esta instância aceita apenas mensagens das seguintes instâncias:",
+        "simple_policies": "Políticas especificas da instância",
+        "media_nsfw": "Forçar definição de multimédia como Sensível",
         "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\"",
         "media_nsfw_desc": "Esta instância força a multimédia a ser marcada como sensível nas seguintes instâncias:"
       },
@@ -575,7 +683,7 @@
     "staff": "Staff"
   },
   "remote_user_resolver": {
-    "searching_for": "Pesquisando por",
+    "searching_for": "A pesquisar por",
     "error": "Não encontrado.",
     "remote_user_resolver": "Resolução de utilizador remoto"
   },
@@ -596,13 +704,13 @@
     "votes": "votos",
     "option": "Opção",
     "add_option": "Adicionar Opção",
-    "not_enough_options": "Existem poucas opções únicas na votação",
-    "expired": "A votação terminou há {0}",
-    "expires_in": "A votação termina em {0}",
-    "expiry": "Tempo para finalizar votação",
+    "not_enough_options": "Existem poucas opções únicas na sondagem",
+    "expired": "A sondagem terminou há {0}",
+    "expires_in": "A sondagem termina em {0}",
+    "expiry": "Tempo para finalizar sondagem",
     "multiple_choices": "Escolha múltipla",
-    "type": "Tipo de votação",
-    "add_poll": "Adicionar Votação"
+    "type": "Tipo de sondagem",
+    "add_poll": "Adicionar Sondagem"
   },
   "importer": {
     "error": "Ocorreu um erro ao importar este ficheiro.",
@@ -610,14 +718,14 @@
     "submit": "Enviar"
   },
   "exporter": {
-    "processing": "A processar, brevemente será pedido que descarregue o ficheiro",
+    "processing": "A processar, brevemente será pedido que descarregues o ficheiro",
     "export": "Exportar"
   },
   "domain_mute_card": {
-    "mute_progress": "Silenciando…",
+    "mute_progress": "A silenciar…",
     "mute": "Silenciar",
     "unmute": "Remover silêncio",
-    "unmute_progress": "A retirar o silêncio…"
+    "unmute_progress": "A remover o silêncio…"
   },
   "selectable_list": {
     "select_all": "Seleccionar tudo"
@@ -629,9 +737,93 @@
     "moves": "Utilizador migrado"
   },
   "errors": {
-    "storage_unavailable": "Pleroma não conseguiu aceder ao armazenamento do navegador. A sua sessão ou definições locais não serão armazenadas e poderá encontrar problemas inesperados. Tente ativar as cookies."
+    "storage_unavailable": "O Pleroma não conseguiu aceder ao armazenamento do navegador. A sua sessão ou definições locais não serão armazenadas e poderá encontrar problemas inesperados. Tente ativar as cookies."
   },
   "shoutbox": {
     "title": "Chat Geral"
+  },
+  "chats": {
+    "chats": "Chats",
+    "empty_chat_list_placeholder": "Não tens conversações ainda. Inicia uma nova conversa!",
+    "error_sending_message": "Ocorreu algo de errado ao enviar a mensagem.",
+    "error_loading_chat": "Ocorreu algo de errado ao carregar o chat.",
+    "delete_confirm": "Desejas realmente apagar esta mensagem?",
+    "more": "Mais",
+    "empty_message_error": "Não podes publicar uma mensagem vazia",
+    "new": "Nova conversação",
+    "delete": "Apagar",
+    "message_user": "Mensagem de {nickname}",
+    "you": "Tu:"
+  },
+  "search": {
+    "hashtags": "Hashtags",
+    "no_results": "Sem resultados",
+    "person_talking": "{count} pessoa a falar",
+    "people_talking": "{0} pessoas a falar",
+    "people": "Pessoas"
+  },
+  "display_date": {
+    "today": "Hoje"
+  },
+  "file_type": {
+    "file": "Ficheiro",
+    "image": "Imagem",
+    "video": "Vídeo",
+    "audio": "Áudio"
+  },
+  "password_reset": {
+    "password_reset_required_but_mailer_is_disabled": "Deves repor a tua palavra-passe, porém, a reposição de palavra-passe está desativada. Contacta o administrador da tua instância.",
+    "password_reset_required": "Deves repor a tua palavra-passe para iniciar sessão.",
+    "password_reset_disabled": "A reposição da palavra-passe foi desativada. Contacta o administrador da tua instância.",
+    "too_many_requests": "Alcançaste o limite de tentativas, tenta novamente mais tarde.",
+    "return_home": "Voltar à página principal",
+    "check_email": "Verifica o teu endereço de e-mail para obter um link para repor a tua palavra-passe.",
+    "placeholder": "O teu endereço de e-mail ou nome de utilizador",
+    "instruction": "Introduz o teu endereço de e-mail ou nome de utilizador. Enviaremos um link para repores a tua palavra-passe.",
+    "password_reset": "Repor palavra-passe",
+    "forgot_password": "Esqueceu-se da palavra-passe?"
+  },
+  "user_reporting": {
+    "generic_error": "Ocorreu um erro ao processar o teu pedido.",
+    "submit": "Enviar",
+    "forward_to": "Encaminhar para {0}",
+    "forward_description": "A conta é de outro servidor. Enviar também uma cópia da denúncia à outra instância?",
+    "additional_comments": "Comentários adicionais",
+    "add_comment_description": "Esta denúncia será enviada aos moderadores desta instância. Podes fornecer uma explicação pela qual te encontras a denunciar esta conta abaixo:",
+    "title": "Denunciar {0}"
+  },
+  "time": {
+    "years_short": "{0}a",
+    "year_short": "{0}a",
+    "years": "{0} anos",
+    "year": "{0} ano",
+    "weeks_short": "{0}sem",
+    "week_short": "{0}sem",
+    "weeks": "{0} semanas",
+    "week": "{0} semana",
+    "seconds_short": "{0}s",
+    "second_short": "{0}s",
+    "seconds": "{0} segundos",
+    "second": "{0} segundo",
+    "now": "agora mesmo",
+    "now_short": "agora",
+    "months_short": "{0}m",
+    "month_short": "{0}m",
+    "months": "{0} meses",
+    "month": "{0} mês",
+    "minutes_short": "{0}min",
+    "minute_short": "{0}min",
+    "minutes": "{0} minutos",
+    "minute": "{0} minuto",
+    "in_past": "há {0}",
+    "in_future": "em {0}",
+    "hours_short": "{0}h",
+    "hour_short": "{0}h",
+    "hours": "{0} horas",
+    "hour": "{0} hora",
+    "days_short": "{0}d",
+    "day_short": "{0}d",
+    "days": "{0} dias",
+    "day": "{0} dia"
   }
 }

From da47d9a43dd46ea187099443c5c74754be8f5611 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Mon, 18 Jan 2021 22:20:07 +0000
Subject: [PATCH 295/389] Translated using Weblate (Portuguese)

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 51a6f6f6..7679a7dd 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -678,7 +678,7 @@
       },
       "federation": "Federação",
       "mrf_policies": "Ativar Políticas MRF",
-      "mrf_policies_desc": "Políticas MRF manipulam o comportamento da federação na domínios.  As seguintes políticas estão ativadas:"
+      "mrf_policies_desc": "Políticas MRF manipulam o comportamento da federação nos domínios.  As seguintes políticas estão ativadas:"
     },
     "staff": "Staff"
   },

From d39e918cd300ece1bdb9d650bc56a6a9fd4522c5 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Mon, 18 Jan 2021 22:20:24 +0000
Subject: [PATCH 296/389] Translated using Weblate (Portuguese)

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 7679a7dd..c63d9c09 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -658,16 +658,16 @@
         "quarantine": "Quarentena",
         "reject": "Rejeitar",
         "accept": "Aceitar",
-        "media_removal_desc": "Esta instância remove multimédia das publicações das seguintes instâncias:",
+        "media_removal_desc": "Este domínio remove multimédia das publicações dos seguintes domínios:",
         "media_removal": "Remoção de multimédia",
-        "ftl_removal_desc": "Esta instância remove as seguintes instâncias da cronologia \"Rede conhecida por todos\":",
-        "quarantine_desc": "Esta instância apenas irá publicar nas seguintes instâncias:",
-        "reject_desc": "Esta instância não aceitará mensagens das seguintes instâncias:",
-        "accept_desc": "Esta instância aceita apenas mensagens das seguintes instâncias:",
-        "simple_policies": "Políticas especificas da instância",
+        "ftl_removal_desc": "Este domínio remove os seguintes domínios da cronologia \"Rede conhecida por todos\":",
+        "quarantine_desc": "Este domínio apenas irá publicar nos seguintes domínios:",
+        "reject_desc": "Este domínio não aceitará mensagens dos seguintes domínios:",
+        "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
+        "simple_policies": "Políticas especificas do domínio",
         "media_nsfw": "Forçar definição de multimédia como Sensível",
         "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\"",
-        "media_nsfw_desc": "Esta instância força a multimédia a ser marcada como sensível nas seguintes instâncias:"
+        "media_nsfw_desc": "Este domínio força a multimédia a ser marcada como sensível nos seguintes domínios:"
       },
       "keyword": {
         "replace": "Substituir",
@@ -718,7 +718,7 @@
     "submit": "Enviar"
   },
   "exporter": {
-    "processing": "A processar, brevemente será pedido que descarregues o ficheiro",
+    "processing": "A processar, brevemente ser-te-á pedido que descarregues o ficheiro",
     "export": "Exportar"
   },
   "domain_mute_card": {

From c8240a48d5a16de81ff991f9702f0a1673bd283a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ana=20Margarida=20Guimar=C3=A3es=20Ribeiro=20Cardoso?=
 <ana.anngui@gmail.com>
Date: Mon, 18 Jan 2021 22:24:12 +0000
Subject: [PATCH 297/389] Translated using Weblate (Portuguese)

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index c63d9c09..b7900c1d 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -48,7 +48,7 @@
     "description": "Iniciar sessão com OAuth",
     "logout": "Terminar sessão",
     "password": "Palavra-passe",
-    "placeholder": "p.ex. lain",
+    "placeholder": "ex. lain",
     "register": "Registar",
     "username": "Nome de Utilizador",
     "hint": "Entra para participar na discussão",
@@ -83,16 +83,16 @@
     "administration": "Administração",
     "chats": "Salas de Chat",
     "timelines": "Cronologias",
-    "bookmarks": "Items Guardados"
+    "bookmarks": "Itens Guardados"
   },
   "notifications": {
     "broken_favorite": "Estado desconhecido, a procurar…",
-    "favorited_you": "favoritou o teu post",
+    "favorited_you": "gostou do teu post",
     "followed_you": "seguiu-te",
     "load_older": "Carregar notificações antigas",
     "notifications": "Notificações",
     "read": "Lido!",
-    "repeated_you": "repetiu sua postagem",
+    "repeated_you": "repetiu o teu post",
     "no_more_notifications": "Sem mais notificações",
     "reacted_with": "reagiu com {0}",
     "migrated_to": "migrou para",
@@ -101,14 +101,14 @@
   },
   "post_status": {
     "new_status": "Publicar novo estado",
-    "account_not_locked_warning": "A sua conta não é {0}. Qualquer pessoa pode te seguir e ver os seus posts privados (só para seguidores).",
-    "account_not_locked_warning_link": "restrita",
+    "account_not_locked_warning": "A sua conta não é {0}. Qualquer pessoa pode seguir-te e ver os seus posts privados (só para seguidores).",
+    "account_not_locked_warning_link": "restrito",
     "attachments_sensitive": "Marcar anexos como sensíveis",
     "content_type": {
       "text/plain": "Texto puro",
       "text/bbcode": "BBCode",
       "text/html": "HTML",
-      "text/markdown": "Markdown"
+      "text/markdown": "Remarcação"
     },
     "content_warning": "Assunto (opcional)",
     "default": "Acabei de chegar a Lisboa.",
@@ -117,8 +117,8 @@
     "scope": {
       "direct": "Direto - Enviar somente aos usuários mencionados",
       "private": "Apenas para seguidores - Enviar apenas para seguidores",
-      "public": "Público - Publicar publicamente na cronologia",
-      "unlisted": "Não listado - Não exibir publicamente na cronologia"
+      "public": "Público - Publicar em cronologias públicas",
+      "unlisted": "Não listado - Não exibir em cronologias públicas"
     },
     "scope_notice": {
       "unlisted": "Esta publicação não será visível na Cronologia pública e na Rede conhecida por todos",
@@ -142,9 +142,9 @@
     "token": "Código do convite",
     "captcha": "CAPTCHA",
     "new_captcha": "Clique na imagem para carregar um novo captcha",
-    "username_placeholder": "p. ex. lain",
-    "fullname_placeholder": "p. ex. Lain Iwakura",
-    "bio_placeholder": "p. ex.\nOlá, sou um exemplo\nAqui podes colocar algo representativo da tua parte... ou não.",
+    "username_placeholder": "ex. lain",
+    "fullname_placeholder": "ex. Lain Iwakura",
+    "bio_placeholder": "ex.\nOlá, sou a Lain\nSou uma menina de anime que vive no Japão suburbano. Devem conhecer-me do \"the Wired\".",
     "validations": {
       "username_required": "não pode ser deixado em branco",
       "fullname_required": "não pode ser deixado em branco",
@@ -161,7 +161,7 @@
     "avatar": "Avatar",
     "avatarAltRadius": "Avatares (Notificações)",
     "avatarRadius": "Avatares",
-    "background": "Pano de Fundo",
+    "background": "Imagem de Fundo",
     "bio": "Biografia",
     "blocks_tab": "Bloqueios",
     "btnRadius": "Botões",
@@ -445,7 +445,7 @@
       "verify": {
         "desc": "Para ativar a autenticação de dois fatores, introduza o código da sua aplicação de dois fatores:"
       },
-      "recovery_codes_warning": "Anote os códigos ou armazene-os num lugar seguro, caso contrário, não os voltará a ver. Se perder acesso à sua aplicação de dois fatores e aos códigos de recuperação, a sua conta ficará bloqueada.",
+      "recovery_codes_warning": "Anote os códigos ou armazene-os num lugar seguro - caso contrário, não os voltará a ver. Se perder acesso à sua aplicação de dois fatores e aos códigos de recuperação, a sua conta ficará bloqueada.",
       "waiting_a_recovery_codes": "A receber códigos de recuperação…",
       "warning_of_generate_new_codes": "Quando gera novos códigos de recuperação, os antigos deixam de funcionar.",
       "title": "Autenticação de Dois Fatores",
@@ -704,7 +704,7 @@
     "votes": "votos",
     "option": "Opção",
     "add_option": "Adicionar Opção",
-    "not_enough_options": "Existem poucas opções únicas na sondagem",
+    "not_enough_options": "Demasiado poucas opções únicas na sondagem",
     "expired": "A sondagem terminou há {0}",
     "expires_in": "A sondagem termina em {0}",
     "expiry": "Tempo para finalizar sondagem",
@@ -733,8 +733,8 @@
   "interactions": {
     "load_older": "Carregar interações mais antigas",
     "follows": "Novos seguidores",
-    "favs_repeats": "Favoritos e Repetidos",
-    "moves": "Utilizador migrado"
+    "favs_repeats": "Gostos e Repetidos",
+    "moves": "O utilizador migra"
   },
   "errors": {
     "storage_unavailable": "O Pleroma não conseguiu aceder ao armazenamento do navegador. A sua sessão ou definições locais não serão armazenadas e poderá encontrar problemas inesperados. Tente ativar as cookies."

From 836fc4d2056c8f07ff998a45122aadd83a3565d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Tue, 19 Jan 2021 12:44:00 +0000
Subject: [PATCH 298/389] Translated using Weblate (Portuguese)

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index b7900c1d..8f8b6e0c 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -92,7 +92,7 @@
     "load_older": "Carregar notificações antigas",
     "notifications": "Notificações",
     "read": "Lido!",
-    "repeated_you": "repetiu o teu post",
+    "repeated_you": "partilhou o teu post",
     "no_more_notifications": "Sem mais notificações",
     "reacted_with": "reagiu com {0}",
     "migrated_to": "migrou para",
@@ -166,7 +166,7 @@
     "blocks_tab": "Bloqueios",
     "btnRadius": "Botões",
     "cBlue": "Azul (Responder, seguir)",
-    "cGreen": "Verde (Repetir)",
+    "cGreen": "Verde (Partilhar)",
     "cOrange": "Laranja (Favoritar)",
     "cRed": "Vermelho (Cancelar)",
     "change_password": "Mudar palavra-passe",
@@ -229,7 +229,7 @@
     "notification_visibility_follows": "Seguidas",
     "notification_visibility_likes": "Favoritos",
     "notification_visibility_mentions": "Menções",
-    "notification_visibility_repeats": "Repetições",
+    "notification_visibility_repeats": "Partilhas",
     "no_rich_text_description": "Remover formatação de todos os posts",
     "no_blocks": "Sem bloqueios",
     "no_mutes": "Sem silenciados",
@@ -525,8 +525,8 @@
     "conversation": "Conversa",
     "error_fetching": "Erro ao buscar atualizações",
     "load_older": "Carregar postagens antigas",
-    "no_retweet_hint": "Posts apenas para seguidores ou diretos não podem ser repetidos",
-    "repeated": "Repetido",
+    "no_retweet_hint": "Posts apenas para seguidores ou diretos não podem ser partilhados",
+    "repeated": "partilhado",
     "show_new": "Mostrar novas",
     "up_to_date": "Atualizado",
     "no_more_statuses": "Sem mais posts",
@@ -558,7 +558,7 @@
     "pinned": "Afixado",
     "unpin": "Desafixar do perfil",
     "delete": "Eliminar publicação",
-    "repeats": "Repetidos",
+    "repeats": "Partilhados",
     "favorites": "Favoritos"
   },
   "user_card": {
@@ -608,8 +608,8 @@
       "grant_admin": "Conceder permissões de Admin",
       "moderation": "Moderação"
     },
-    "show_repeats": "Mostrar repetidos",
-    "hide_repeats": "Ocultar repetidos",
+    "show_repeats": "Mostrar partilhas",
+    "hide_repeats": "Ocultar partilhas",
     "unsubscribe": "Retirar subscrição",
     "subscribe": "Subscrever",
     "report": "Denunciar",
@@ -628,7 +628,7 @@
   },
   "tool_tip": {
     "media_upload": "Envio de multimédia",
-    "repeat": "Repetir",
+    "repeat": "Partilhar",
     "reply": "Responder",
     "favorite": "Favoritar",
     "user_settings": "Configurações do usuário",
@@ -733,7 +733,7 @@
   "interactions": {
     "load_older": "Carregar interações mais antigas",
     "follows": "Novos seguidores",
-    "favs_repeats": "Gostos e Repetidos",
+    "favs_repeats": "Gostos e Partilhas",
     "moves": "O utilizador migra"
   },
   "errors": {

From 05e5bb640423b8b117256b52f39d48bd75f78daf Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Jan 2021 10:43:17 +0000
Subject: [PATCH 299/389] Translated using Weblate (Russian)

Currently translated at 83.8% (568 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 582a34e6..6a3d7271 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -183,7 +183,7 @@
     "change_password": "Сменить пароль",
     "change_password_error": "Произошла ошибка при попытке изменить пароль.",
     "changed_password": "Пароль изменён успешно!",
-    "collapse_subject": "Сворачивать посты с темой",
+    "collapse_subject": "Сворачивать статусы с темой",
     "confirm_new_password": "Подтверждение нового пароля",
     "current_avatar": "Текущий аватар",
     "current_password": "Текущий пароль",
@@ -486,7 +486,7 @@
     "error": "Ошибка при обновлении ленты: {0}"
   },
   "status": {
-    "bookmark": "В закладки",
+    "bookmark": "Добавить в закладки",
     "unbookmark": "Удалить из закладок",
     "status_deleted": "Пост удален",
     "reply_to": "Ответ",
@@ -494,7 +494,11 @@
     "favorites": "Понравилось",
     "unmute_conversation": "Прекратить игнорировать разговор",
     "mute_conversation": "Игнорировать разговор",
-    "thread_muted": "Разговор игнорируется"
+    "thread_muted": "Разговор игнорируется",
+    "external_source": "Перейти к источнику",
+    "delete_confirm": "Вы действительно хотите удалить данный статус?",
+    "delete": "Удалить",
+    "copy_link": "Скопировать ссылку"
   },
   "user_card": {
     "block": "Заблокировать",
@@ -536,7 +540,8 @@
     "media": "С вложениями",
     "mention": "Упомянуть",
     "show_repeats": "Показывать повторы",
-    "hide_repeats": "Скрыть повторы"
+    "hide_repeats": "Скрыть повторы",
+    "report": "Пожаловаться"
   },
   "user_profile": {
     "timeline_title": "Лента пользователя"

From c3e5fd5fa12f289e5e8a5c69528ffb824fb8d596 Mon Sep 17 00:00:00 2001
From: Artur Mancha <joker@nadaradical.com>
Date: Wed, 20 Jan 2021 19:34:47 +0000
Subject: [PATCH 300/389] Translated using Weblate (Portuguese)

Currently translated at 100.0% (679 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 8f8b6e0c..9d3a5d94 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -615,7 +615,11 @@
     "report": "Denunciar",
     "message": "Mensagem",
     "mention": "Mencionar",
-    "hidden": "Ocultar"
+    "hidden": "Ocultar",
+    "roles": {
+      "moderator": "Moderador",
+      "admin": "Admin"
+    }
   },
   "user_profile": {
     "timeline_title": "Cronologia do Utilizador",

From 238e9dcd351a4d2d23c09e22f713925f6c1cc3b6 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Jan 2021 20:44:42 +0000
Subject: [PATCH 301/389] Translated using Weblate (Russian)

Currently translated at 83.9% (570 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 6a3d7271..30a65741 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -541,7 +541,11 @@
     "mention": "Упомянуть",
     "show_repeats": "Показывать повторы",
     "hide_repeats": "Скрыть повторы",
-    "report": "Пожаловаться"
+    "report": "Пожаловаться",
+    "roles": {
+      "moderator": "Модератор",
+      "admin": "Администратор"
+    }
   },
   "user_profile": {
     "timeline_title": "Лента пользователя"

From 3b6a30ec9f96906ba9040c64ceeaeed6f8736efb Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Fri, 22 Jan 2021 13:16:11 +0000
Subject: [PATCH 302/389] Translated using Weblate (Italian)

Currently translated at 100.0% (679 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index ea8f1760..0939df28 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -487,7 +487,11 @@
     "follow_progress": "Richiedo…",
     "follow_sent": "Richiesta inviata!",
     "favorites": "Preferiti",
-    "message": "Contatta"
+    "message": "Contatta",
+    "roles": {
+      "moderator": "Moderatore",
+      "admin": "Amministratore"
+    }
   },
   "chat": {
     "title": "Chat"

From c4fb123d079a5978d35c18d0c067784036519b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Thu, 21 Jan 2021 18:21:29 +0000
Subject: [PATCH 303/389] Translated using Weblate (Portuguese)

Currently translated at 100.0% (679 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 9d3a5d94..b79985e8 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -86,7 +86,7 @@
     "bookmarks": "Itens Guardados"
   },
   "notifications": {
-    "broken_favorite": "Estado desconhecido, a procurar…",
+    "broken_favorite": "Publicação desconhecida, a procurar…",
     "favorited_you": "gostou do teu post",
     "followed_you": "seguiu-te",
     "load_older": "Carregar notificações antigas",
@@ -100,7 +100,7 @@
     "error": "Erro ao obter notificações: {0}"
   },
   "post_status": {
-    "new_status": "Publicar novo estado",
+    "new_status": "Publicar nova publicação",
     "account_not_locked_warning": "A sua conta não é {0}. Qualquer pessoa pode seguir-te e ver os seus posts privados (só para seguidores).",
     "account_not_locked_warning_link": "restrito",
     "attachments_sensitive": "Marcar anexos como sensíveis",
@@ -125,7 +125,7 @@
       "private": "Esta publicação será apenas visível para os teus seguidores",
       "public": "Esta publicação será visível para todos"
     },
-    "empty_status_error": "Não consegues publicar um estado vazio e sem ficheiros",
+    "empty_status_error": "Não consegues publicar um post vazio e sem ficheiros",
     "preview_empty": "Vazio",
     "preview": "Pré-visualização",
     "media_description": "Descrição da multimédia",
@@ -548,8 +548,8 @@
     "thread_muted_and_words": ", contém:",
     "thread_muted": "Conversação silenciada",
     "external_source": "Fonte externa",
-    "copy_link": "Copiar o link do estado",
-    "status_unavailable": "Estado indisponível",
+    "copy_link": "Copiar o link do post",
+    "status_unavailable": "Publicação indisponível",
     "unmute_conversation": "Mostrar a conversação",
     "mute_conversation": "Silenciar a conversação",
     "delete_confirm": "Tens a certeza que desejas apagar a publicação?",

From bc9cd4170d3a16ee19b628b8674248f98cf5570d Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Fri, 22 Jan 2021 08:25:29 +0000
Subject: [PATCH 304/389] Translated using Weblate (Ukrainian)

Currently translated at 99.4% (675 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 4ead8790..c3665d28 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -25,7 +25,7 @@
   },
   "features_panel": {
     "gopher": "Gopher",
-    "pleroma_chat_messages": "Локальні балачки",
+    "pleroma_chat_messages": "Чати",
     "chat": "Міні-чат",
     "who_to_follow": "Кого відстежувати",
     "title": "Особливості",
@@ -135,7 +135,7 @@
     "error": "Помилка при оновленні сповіщень: {0}"
   },
   "nav": {
-    "chats": "Локальні балачки",
+    "chats": "Чати",
     "timelines": "Стрічки",
     "twkn": "Уся відома мережа",
     "about": "Інформація",

From 286527b489427ea4c1d1bf44cc67ea69a82ae88f Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Fri, 22 Jan 2021 13:22:47 +0000
Subject: [PATCH 305/389] Translated using Weblate (Italian)

Currently translated at 100.0% (679 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 0939df28..b7d21e7e 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -30,7 +30,7 @@
     "administration": "Amministrazione",
     "back": "Indietro",
     "interactions": "Interazioni",
-    "dms": "Messaggi diretti",
+    "dms": "Messaggi privati",
     "user_search": "Ricerca utenti",
     "search": "Ricerca",
     "who_to_follow": "Chi seguire",
@@ -44,7 +44,7 @@
     "notifications": "Notifiche",
     "read": "Letto!",
     "broken_favorite": "Stato sconosciuto, lo sto cercando…",
-    "favorited_you": "ha gradito il tuo messaggio",
+    "favorited_you": "gradisce il tuo messaggio",
     "load_older": "Carica notifiche precedenti",
     "repeated_you": "ha condiviso il tuo messaggio",
     "follow_request": "vuole seguirti",
@@ -519,18 +519,18 @@
     "register": "Registrati",
     "username": "Nome utente",
     "description": "Accedi con OAuth",
-    "hint": "Accedi per partecipare alla discussione",
+    "hint": "Accedi per conversare",
     "authentication_code": "Codice di autenticazione",
     "enter_recovery_code": "Inserisci un codice di recupero",
-    "enter_two_factor_code": "Inserisci un codice two-factor",
+    "enter_two_factor_code": "Inserisci un codice 2FA",
     "recovery_code": "Codice di recupero",
     "heading": {
-      "totp": "Autenticazione two-factor",
-      "recovery": "Recupero two-factor"
+      "totp": "Autenticazione 2FA",
+      "recovery": "Recupero 2FA"
     }
   },
   "post_status": {
-    "account_not_locked_warning": "Il tuo profilo non è {0}. Chiunque può seguirti e vedere i tuoi messaggi riservati ai tuoi seguaci.",
+    "account_not_locked_warning": "Il tuo profilo non è {0}. Chiunque può seguirti e vedere i tuoi messaggi per seguaci.",
     "account_not_locked_warning_link": "protetto",
     "attachments_sensitive": "Nascondi gli allegati",
     "content_type": {
@@ -540,7 +540,7 @@
       "text/html": "HTML"
     },
     "content_warning": "Oggetto (facoltativo)",
-    "default": "Sono appena atterrato a Fiumicino.",
+    "default": "Sono appena atterrato a Città Laggiù.",
     "direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.",
     "posting": "Sto pubblicando",
     "scope": {
@@ -650,20 +650,20 @@
   },
   "polls": {
     "add_poll": "Sondaggio",
-    "add_option": "Alternativa",
+    "add_option": "Aggiungi opzione",
     "option": "Opzione",
     "votes": "voti",
     "vote": "Vota",
     "type": "Tipo di sondaggio",
     "single_choice": "Scelta singola",
     "multiple_choices": "Scelta multipla",
-    "expiry": "Scadenza",
-    "expires_in": "Scade fra {0}",
-    "expired": "Scaduto {0} fa",
+    "expiry": "Età",
+    "expires_in": "Chiude fra {0}",
+    "expired": "Chiuso {0} fa",
     "not_enough_options": "Aggiungi altre risposte"
   },
   "interactions": {
-    "favs_repeats": "Condivisi e preferiti",
+    "favs_repeats": "Condivisi e Graditi",
     "load_older": "Carica vecchie interazioni",
     "moves": "Utenti migrati",
     "follows": "Nuovi seguìti"
@@ -672,8 +672,8 @@
     "load_all": "Carico tutti i {emojiAmount} emoji",
     "load_all_hint": "Primi {saneAmount} emoji caricati, caricarli tutti potrebbe causare rallentamenti.",
     "unicode": "Emoji Unicode",
-    "custom": "Emoji personale",
-    "add_emoji": "Inserisci Emoji",
+    "custom": "Emoji della stanza",
+    "add_emoji": "Inserisci emoji",
     "search_emoji": "Cerca un emoji",
     "keep_open": "Tieni aperto il menù",
     "emoji": "Emoji",
@@ -688,7 +688,7 @@
     "remote_user_resolver": "Cerca utenti remoti"
   },
   "errors": {
-    "storage_unavailable": "Pleroma non ha potuto accedere ai dati del tuo browser. Le tue credenziali o le tue impostazioni locali non potranno essere salvate e potresti incontrare strani errori. Prova ad abilitare i cookie."
+    "storage_unavailable": "Pleroma non può accedere ai dati del tuo browser. Il tuo accesso o le tue impostazioni non saranno salvate e potresti incontrare strani errori. Prova ad abilitare i cookie."
   },
   "status": {
     "pinned": "Intestato",

From 58a92c1b7dec1f2e3584571fcbcb9c757db408c3 Mon Sep 17 00:00:00 2001
From: Pavlo Bilous <pavlo.bilous@gmail.com>
Date: Fri, 22 Jan 2021 19:19:03 +0000
Subject: [PATCH 306/389] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (679 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index c3665d28..040d6f4f 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -29,7 +29,7 @@
     "chat": "Міні-чат",
     "who_to_follow": "Кого відстежувати",
     "title": "Особливості",
-    "scope_options": "Параметри осягу",
+    "scope_options": "Параметри обсягу",
     "media_proxy": "Посередник медіа-даних",
     "text_limit": "Ліміт символів",
     "upload_limit": "Обмеження завантажень"
@@ -39,9 +39,9 @@
     "export": "Експорт"
   },
   "domain_mute_card": {
-    "unmute_progress": "Вимикаю…",
+    "unmute_progress": "Вмикаю…",
     "unmute": "Вимкнути заглушення",
-    "mute_progress": "Вмикаю…",
+    "mute_progress": "Вимикаю…",
     "mute": "Ігнорувати"
   },
   "shoutbox": {
@@ -51,13 +51,13 @@
     "staff": "Адміністрація",
     "mrf": {
       "simple": {
-        "media_nsfw_desc": "Даний інстанс примусово позначає медіа в наступних інстансах як NSFW:",
+        "media_nsfw_desc": "Даний інстанс примусово позначає медіа в наступних інстансах як дратівливий:",
         "media_nsfw": "Примусове визначення медіа як дратівливого",
         "media_removal_desc": "Поточний інстанс видаляє медіа з дописів на перелічених інстансах:",
         "media_removal": "Видалення медіа",
-        "ftl_removal_desc": "Цей інстанс видаляє перелічені інстанси з \"Усієї відомої мережі\":",
-        "ftl_removal": "Видалення з \"Усієї відомої мережі\"",
-        "quarantine_desc": "Поточний інстанс буде надсилати тільки публічні дописи наступним інстансам:",
+        "ftl_removal_desc": "Цей інстанс видаляє перелічені інстанси з Федеративної стрічки:",
+        "ftl_removal": "Видалення зі стрічки Федеративної мережі",
+        "quarantine_desc": "Поточний інстанс надсилатиме тільки публічні дописи наступним інстансам:",
         "quarantine": "Карантин",
         "reject_desc": "Поточний інстанс не прийматиме повідомлення з перелічених інстансів:",
         "accept": "Прийняти",
@@ -66,7 +66,7 @@
         "simple_policies": "Правила поточного інстансу"
       },
       "mrf_policies_desc": "Правила MRF розповсюджуються на даний  інстанс. Наступні правила активні:",
-      "mrf_policies": "Активні правила MRF (модуль переписування повідомлень)",
+      "mrf_policies": "Активувати правила MRF (модуль переписування повідомлень)",
       "keyword": {
         "is_replaced_by": "→",
         "replace": "Замінити",
@@ -546,7 +546,8 @@
         "disabled": "Вимкнено",
         "selectedMenu": "Вибраний пункт меню",
         "tabs": "Вкладки",
-        "pressed": "Натиснуто"
+        "pressed": "Натиснуто",
+        "wallpaper": "Шпалери"
       },
       "common_colors": {
         "rgbo": "Піктограми, акценти, значки",
@@ -602,7 +603,8 @@
       "frontend_version": "Версія фронтенду",
       "backend_version": "Версія бекенду",
       "title": "Версія"
-    }
+    },
+    "hide_wallpaper": "Сховати шпалери екземпляру"
   },
   "selectable_list": {
     "select_all": "Вибрати все"
@@ -758,7 +760,11 @@
     "unblock": "Розблокувати",
     "remote_follow": "Підписатись",
     "muted": "Заглушений",
-    "mute": "Заглушити"
+    "mute": "Заглушити",
+    "roles": {
+      "moderator": "Модератор",
+      "admin": "Адміністратор"
+    }
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From 79e4df99dccd32dc243e7a21e61b69e10cb363b4 Mon Sep 17 00:00:00 2001
From: Snow <build-a-website@protonmail.com>
Date: Sun, 24 Jan 2021 10:23:17 +0000
Subject: [PATCH 307/389] Translated using Weblate (Chinese (Traditional))

Currently translated at 98.5% (669 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index f63acab8..a8d0dc3c 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -526,7 +526,8 @@
     "mute_import": "靜音導入",
     "mute_import_error": "導入靜音時出錯",
     "mute_export_button": "將靜音導出到csv文件",
-    "mute_export": "靜音導出"
+    "mute_export": "靜音導出",
+    "hide_wallpaper": "隱藏實例桌布"
   },
   "chats": {
     "more": "更多",

From 2576b750594ac78097fab83a101c21b2fd1925fc Mon Sep 17 00:00:00 2001
From: Henry Jameson <spam@hjkos.com>
Date: Thu, 28 Jan 2021 14:05:32 +0200
Subject: [PATCH 308/389] fallback if shadows aren't defined

---
 src/services/style_setter/style_setter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 0fb8f92a..a2bba67b 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -244,7 +244,7 @@ export const generateShadows = (input, colors) => {
   }
 
   const cleanInputShadows = Object.fromEntries(
-    Object.entries(input.shadows)
+    Object.entries(input.shadows || {})
       .map(([name, shadowSlot]) => [
         name,
         // defaulting color to black to avoid potential problems

From 66f3e72b545a7f92d2569baa0fd52275a29d629a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 1 Feb 2021 20:08:36 +0200
Subject: [PATCH 309/389] update branch with recent develop changes (FA, added
 settings)

---
 .../helpers/boolean_setting.vue               |  6 ++---
 ...dified_icon.vue => modified_indicator.vue} | 25 +++++++++++--------
 .../helpers/shared_computed_object.js         |  1 -
 .../settings_modal/tabs/general_tab.vue       |  8 +++---
 src/modules/config.js                         |  2 --
 5 files changed, 22 insertions(+), 20 deletions(-)
 rename src/components/settings_modal/helpers/{modified_icon.vue => modified_indicator.vue} (64%)

diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index f7c392cd..b600b63b 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -13,7 +13,7 @@
         >
         <slot />
       </span>
-      <ModifiedIcon :changed="isChanged" />
+      <ModifiedIndicator :changed="isChanged" />
     </Checkbox>
   </label>
 </template>
@@ -21,7 +21,7 @@
 <script>
 import { get, set } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
-import ModifiedIcon from './modified_icon.vue'
+import ModifiedIndicator from './modified_indicator.vue'
 export default {
   props: [
     'path',
@@ -29,7 +29,7 @@ export default {
   ],
   components: {
     Checkbox,
-    ModifiedIcon
+    ModifiedIndicator
   },
   computed: {
     pathDefault () {
diff --git a/src/components/settings_modal/helpers/modified_icon.vue b/src/components/settings_modal/helpers/modified_indicator.vue
similarity index 64%
rename from src/components/settings_modal/helpers/modified_icon.vue
rename to src/components/settings_modal/helpers/modified_indicator.vue
index 27e0a9c5..b75a2811 100644
--- a/src/components/settings_modal/helpers/modified_icon.vue
+++ b/src/components/settings_modal/helpers/modified_indicator.vue
@@ -1,15 +1,17 @@
 <template>
   <span
     v-if="changed"
-    class="ModifiedIcon"
+    class="ModifiedIndicator"
     >
     <Popover
       trigger="hover"
       >
-      <i
-        slot="trigger"
-        class="icon icon-wrench"
-        />
+      <span slot="trigger">
+        &nbsp;
+          <FAIcon
+            icon="wrench"
+          />
+      </span>
       <div
         class="modified-tooltip"
         slot="content"
@@ -22,6 +24,13 @@
 
 <script>
 import Popover from 'src/components/popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faWrench } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faWrench
+)
+
 export default {
   props: ['changed'],
   components: { Popover }
@@ -29,14 +38,10 @@ export default {
 </script>
 
 <style lang="scss">
-.ModifiedIcon {
+.ModifiedIndicator {
   display: inline-block;
   position: relative;
 
-  .icon {
-    display: inline-block;
-  }
-
   .modified-tooltip {
     margin: 0.5em 1em;
     min-width: 10em;
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index 3cbcd288..2c833c0c 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -9,7 +9,6 @@ const SharedComputedObject = () => ({
     .map(key => [
       key + 'DefaultValue',
       function () {
-        console.log(this.$store.getters.defaultConfig)
         return this.$store.getters.defaultConfig[key]
       }
     ])
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 92cd2069..f93f4ea0 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -12,9 +12,9 @@
           </BooleanSetting>
         </li>
         <li v-if="instanceWallpaperUsed">
-          <Checkbox v-model="hideInstanceWallpaper">
+          <BooleanSetting path="hideInstanceWallpaper">
             {{ $t('settings.hide_wallpaper') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -64,9 +64,9 @@
           </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="virtualScrolling">
+          <BooleanSetting path="virtualScrolling">
             {{ $t('settings.virtual_scrolling') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
diff --git a/src/modules/config.js b/src/modules/config.js
index 444808cf..f992519e 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -80,7 +80,6 @@ const config = {
   getters: {
     defaultConfig (state, getters, rootState, rootGetters) {
       const { instance } = rootState
-      console.log('DC', instance.minimalScopesMode)
       return {
         ...defaultState,
         ...Object.fromEntries(
@@ -90,7 +89,6 @@ const config = {
     },
     mergedConfig (state, getters, rootState, rootGetters) {
       const { defaultConfig } = rootGetters
-      console.log('DC2', defaultConfig.hideISP)
       return {
         ...defaultConfig,
         ...state

From 982c799b6fde804018656212aea6128a6f0df928 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 1 Feb 2021 21:07:09 +0200
Subject: [PATCH 310/389] fix a bunch of <button>s acting as submit buttons
 breaking enter key

---
 src/components/emoji_input/emoji_input.vue       | 1 +
 src/components/mfa_form/recovery_form.vue        | 2 ++
 src/components/mfa_form/totp_form.vue            | 2 ++
 src/components/scope_selector/scope_selector.vue | 4 ++++
 src/components/search/search.vue                 | 1 +
 src/components/search_bar/search_bar.vue         | 3 +++
 src/components/tab_switcher/tab_switcher.js      | 4 +++-
 7 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 4becdc41..1d6c760e 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -10,6 +10,7 @@
         v-if="!hideEmojiButton"
         class="button-unstyled emoji-picker-icon"
         @click.prevent="togglePicker"
+        type="button"
       >
         <FAIcon :icon="['far', 'smile-beam']" />
       </button>
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index 0bf68e27..8457ec5d 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -26,6 +26,7 @@
               <button
                 class="button-unstyled -link"
                 @click.prevent="requireTOTP"
+                type="button"
               >
                 {{ $t('login.enter_two_factor_code') }}
               </button>
@@ -33,6 +34,7 @@
               <button
                 class="button-unstyled -link"
                 @click.prevent="abortMFA"
+                type="button"
               >
                 {{ $t('general.cancel') }}
               </button>
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index 79230148..5d80e185 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -28,6 +28,7 @@
               <button
                 class="button-unstyled -link"
                 @click.prevent="requireRecovery"
+                type="button"
               >
                 {{ $t('login.enter_recovery_code') }}
               </button>
@@ -35,6 +36,7 @@
               <button
                 class="button-unstyled -link"
                 @click.prevent="abortMFA"
+                type="button"
               >
                 {{ $t('general.cancel') }}
               </button>
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index 66ac612e..60e8c3ba 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -9,6 +9,7 @@
       :class="css.direct"
       :title="$t('post_status.scope.direct')"
       @click="changeVis('direct')"
+      type="button"
     >
       <FAIcon
         icon="envelope"
@@ -21,6 +22,7 @@
       :class="css.private"
       :title="$t('post_status.scope.private')"
       @click="changeVis('private')"
+      type="button"
     >
       <FAIcon
         icon="lock"
@@ -33,6 +35,7 @@
       :class="css.unlisted"
       :title="$t('post_status.scope.unlisted')"
       @click="changeVis('unlisted')"
+      type="button"
     >
       <FAIcon
         icon="lock-open"
@@ -45,6 +48,7 @@
       :class="css.public"
       :title="$t('post_status.scope.public')"
       @click="changeVis('public')"
+      type="button"
     >
       <FAIcon
         icon="globe"
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index a6503c9f..fa648365 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -16,6 +16,7 @@
       <button
         class="btn button-default search-button"
         @click="newQuery(searchTerm)"
+        type="submit"
       >
         <FAIcon icon="search" />
       </button>
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 6cf9179e..a7432dcb 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -8,6 +8,7 @@
       class="button-unstyled nav-icon"
       :title="$t('nav.search')"
       @click.prevent.stop="toggleHidden"
+      type="button"
     >
       <FAIcon
         fixed-width
@@ -28,6 +29,7 @@
       <button
         class="button-default search-button"
         @click="find(searchTerm)"
+        type="submit"
       >
         <FAIcon
           fixed-width
@@ -37,6 +39,7 @@
       <button
         class="button-unstyled cancel-search"
         @click.prevent.stop="toggleHidden"
+        type="button"
       >
         <FAIcon
           fixed-width
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 76e7ef03..12aac8e6 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -93,7 +93,9 @@ export default Vue.component('tab-switcher', {
               <button
                 disabled={slot.data.attrs.disabled}
                 onClick={this.clickTab(index)}
-                class={classesTab.join(' ')}>
+                class={classesTab.join(' ')}
+                type="button"
+              >
                 <img src={slot.data.attrs.image} title={slot.data.attrs['image-tooltip']}/>
                 {slot.data.attrs.label ? '' : slot.data.attrs.label}
               </button>

From 78f8147aa610af9ae79886ad7805f9b905976758 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 1 Feb 2021 21:07:40 +0200
Subject: [PATCH 311/389] change react button classnames for consistency

---
 src/components/react_button/react_button.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index ac940b98..99523407 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -1,6 +1,7 @@
 <template>
   <Popover
     trigger="click"
+    class="ReactButton"
     placement="top"
     :offset="{ y: 5 }"
     :bound-to="{ x: 'container' }"
@@ -42,7 +43,7 @@
     </div>
     <span
       slot="trigger"
-      class="ReactButton"
+      class="popover-trigger"
       :title="$t('tool_tip.add_reaction')"
     >
       <FAIcon

From 213c5637d4bbebcd3508f0b91da8e6bfae528c1d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 3 Feb 2021 09:18:44 +0200
Subject: [PATCH 312/389] Cleanup ReactButton's CSS, fix hitboxes of
 reactbutton and extrabuttons

---
 .../extra_buttons/extra_buttons.vue           |   5 +
 src/components/popover/popover.vue            |   1 +
 src/components/react_button/react_button.vue  | 105 ++++++++++--------
 3 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index e845d8fc..c6cb9fbe 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -139,6 +139,11 @@
 @import '../../_variables.scss';
 
 .ExtraButtons {
+  /* override of popover internal stuff */
+  .popover-trigger-button {
+    width: auto;
+  }
+
   .popover-trigger {
     position: static;
     padding: 10px;
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 2252c68f..876dd61d 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -7,6 +7,7 @@
       ref="trigger"
       class="button-unstyled -fullwidth popover-trigger-button"
       @click="onClick"
+      type="button"
     >
       <slot name="trigger" />
     </button>
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 99523407..04734674 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -59,63 +59,72 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.reaction-picker-filter {
-  padding: 0.5em;
-  display: flex;
-  input {
-    flex: 1;
+.ReactButton {
+  .reaction-picker-filter {
+    padding: 0.5em;
+    display: flex;
+
+    input {
+      flex: 1;
+    }
   }
-}
 
-.reaction-picker-divider {
-  height: 1px;
-  width: 100%;
-  margin: 0.5em;
-  background-color: var(--border, $fallback--border);
-}
+  .reaction-picker-divider {
+    height: 1px;
+    width: 100%;
+    margin: 0.5em;
+    background-color: var(--border, $fallback--border);
+  }
 
-.reaction-picker {
-  width: 10em;
-  height: 9em;
-  font-size: 1.5em;
-  overflow-y: scroll;
-  display: flex;
-  flex-wrap: wrap;
-  padding: 0.5em;
-  text-align: center;
-  align-content: flex-start;
-  user-select: none;
+  .reaction-picker {
+    width: 10em;
+    height: 9em;
+    font-size: 1.5em;
+    overflow-y: scroll;
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0.5em;
+    text-align: center;
+    align-content: flex-start;
+    user-select: none;
 
-  mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
-    linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
-    linear-gradient(to top, white, white);
-  transition: mask-size 150ms;
-  mask-size: 100% 20px, 100% 20px, auto;
-  // Autoprefixed seem to ignore this one, and also syntax is different
-  -webkit-mask-composite: xor;
-  mask-composite: exclude;
+    mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
+          linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
+          linear-gradient(to top, white, white);
+    transition: mask-size 150ms;
+    mask-size: 100% 20px, 100% 20px, auto;
 
-  .emoji-button {
-    cursor: pointer;
+    /* Autoprefixed seem to ignore this one, and also syntax is different */
+    -webkit-mask-composite: xor;
+    mask-composite: exclude;
 
-    flex-basis: 20%;
-    line-height: 1.5em;
-    align-content: center;
+    .emoji-button {
+      cursor: pointer;
 
-    &:hover {
-      transform: scale(1.25);
+      flex-basis: 20%;
+      line-height: 1.5em;
+      align-content: center;
+
+      &:hover {
+        transform: scale(1.25);
+      }
+    }
+  }
+
+  /* override of popover internal stuff */
+  .popover-trigger-button {
+    width: auto;
+  }
+
+  .popover-trigger {
+    padding: 10px;
+    margin: -10px;
+
+    &:hover .svg-inline--fa {
+      color: $fallback--text;
+      color: var(--text, $fallback--text);
     }
   }
 }
 
-.ReactButton {
-  padding: 10px;
-  margin: -10px;
-
-  &:hover .svg-inline--fa {
-    color: $fallback--text;
-    color: var(--text, $fallback--text);
-  }
-}
-
 </style>

From 1506b97e35c63f9f6ca685ee1a2b61e4580ac134 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Tue, 9 Feb 2021 16:32:33 +0300
Subject: [PATCH 313/389] Display 'people voted' instead of 'votes' for
 multi-choice polls

---
 CHANGELOG.md                 | 2 ++
 src/components/poll/poll.vue | 7 ++++++-
 src/i18n/en.json             | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 588348a0..965b538b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Button to remove uploaded media in post status form is now properly placed and sized.
 - Fixed shoutbox not working in mobile layout
 
+### Changed
+- Display 'people voted' instead of 'votes' for multi-choice polls
 
 ## [2.2.3] - 2021-01-18
 ### Added
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 42819c19..f1ae8f9c 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -58,7 +58,12 @@
         {{ $t('polls.vote') }}
       </button>
       <div class="total">
-        {{ totalVotesCount }} {{ $t("polls.votes") }}&nbsp;·&nbsp;
+        <template v-if="poll.multiple">
+          {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}&nbsp;·&nbsp;
+        </template>
+        <template v-else>
+          {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;·&nbsp;
+        </template>
       </div>
       <i18n :path="expired ? 'polls.expired' : 'polls.expires_in'">
         <Timeago
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1d087bbd..f366445f 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -147,7 +147,8 @@
     "add_poll": "Add Poll",
     "add_option": "Add Option",
     "option": "Option",
-    "votes": "votes",
+    "people_voted_count": "{count} person voted | {count} people voted",
+    "votes_count": "{count} vote | {count} votes",
     "vote": "Vote",
     "type": "Poll type",
     "single_choice": "Single choice",

From 13ff99881b3eff6f69b94d838845a63100a5c234 Mon Sep 17 00:00:00 2001
From: Eugenij <eugenijm@protonmail.com>
Date: Wed, 10 Feb 2021 12:28:39 +0000
Subject: [PATCH 314/389] Apply 1 suggestion(s) to 1 file(s)

---
 src/components/poll/poll.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index f1ae8f9c..5adcb9c2 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -58,7 +58,7 @@
         {{ $t('polls.vote') }}
       </button>
       <div class="total">
-        <template v-if="poll.multiple">
+        <template v-if="poll.voters_count">
           {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}&nbsp;·&nbsp;
         </template>
         <template v-else>

From da807a12fb2b1862205b2c1163326806cca6bd26 Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Fri, 12 Feb 2021 12:01:16 +0300
Subject: [PATCH 315/389] Make bot label localizable

---
 src/components/user_card/user_card.vue | 2 +-
 src/i18n/en.json                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 773f764a..c6c4dfee 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -89,7 +89,7 @@
                   v-if="user.bot"
                   class="alert user-role"
                 >
-                  bot
+                  {{ $t('user_card.bot') }}
                 </span>
               </template>
               <span v-if="user.locked">
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1025a8e1..3946f3cd 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -716,6 +716,7 @@
     "mute_progress": "Muting…",
     "hide_repeats": "Hide repeats",
     "show_repeats": "Show repeats",
+    "bot": "Bot",
     "admin_menu": {
       "moderation": "Moderation",
       "grant_admin": "Grant Admin",

From 4859e63a89e641d5eb9b3afb2d328fd6adb4a9b3 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 12 Feb 2021 18:14:54 +0200
Subject: [PATCH 316/389] Remove body scrollbar in chat layout, keep nav bar
 still on scroll lock, add tiny fade for media modal

---
 src/App.scss                               |  6 ++++++
 src/components/media_modal/media_modal.vue | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/App.scss b/src/App.scss
index 8b91f3de..90d083bb 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -586,6 +586,7 @@ nav {
   color: var(--faint, $fallback--faint);
   box-shadow: 0px 0px 4px rgba(0,0,0,.6);
   box-shadow: var(--topBarShadow);
+  box-sizing: border-box;
 }
 
 .fade-enter-active, .fade-leave-active {
@@ -878,6 +879,11 @@ nav {
   overflow: hidden;
   height: 100%;
 
+  // Get rid of scrollbar on body as scrolling happens on different element
+  body {
+    overflow: hidden;
+  }
+
   // Ensures the fixed position of the mobile browser bars on scroll up / down events.
   // Prevents the mobile browser bars from overlapping or hiding the message posting form.
   @media all and (max-width: 800px) {
diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index ea7f7a7f..34394e7e 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -73,11 +73,22 @@
   }
 }
 
+@keyframes media-fadein {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
 .modal-image {
   max-width: 90%;
   max-height: 90%;
   box-shadow: 0px 5px 15px 0 rgba(0, 0, 0, 0.5);
   image-orientation: from-image; // NOTE: only FF supports this
+  opacity: 1;
+  animation: 0.1s cubic-bezier(0.7, 0, 1, 0.6) media-fadein;
 }
 
 .modal-view-button-arrow {

From 01275fbac0e28d183e761e656a8e7b1c3b9612e9 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Wed, 10 Feb 2021 15:55:58 +0300
Subject: [PATCH 317/389] Ensure poll.voters_count doesn't fallback to
 poll.votes when it's 0

---
 src/components/poll/poll.vue | 2 +-
 src/i18n/en.json             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 5adcb9c2..187d1829 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -58,7 +58,7 @@
         {{ $t('polls.vote') }}
       </button>
       <div class="total">
-        <template v-if="poll.voters_count">
+        <template v-if="typeof poll.voters_count === 'number'">
           {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}&nbsp;·&nbsp;
         </template>
         <template v-else>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index f366445f..78ce0919 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -147,6 +147,7 @@
     "add_poll": "Add Poll",
     "add_option": "Add Option",
     "option": "Option",
+    "votes": "votes",
     "people_voted_count": "{count} person voted | {count} people voted",
     "votes_count": "{count} vote | {count} votes",
     "vote": "Vote",

From 398aac65585cf7f743f323aa75d05646470da1d5 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 12 Feb 2021 18:47:10 +0200
Subject: [PATCH 318/389] remove redundant opacity2

---
 src/components/media_modal/media_modal.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index 34394e7e..54bc5335 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -87,7 +87,6 @@
   max-height: 90%;
   box-shadow: 0px 5px 15px 0 rgba(0, 0, 0, 0.5);
   image-orientation: from-image; // NOTE: only FF supports this
-  opacity: 1;
   animation: 0.1s cubic-bezier(0.7, 0, 1, 0.6) media-fadein;
 }
 

From c7018057f1df52edd2f02c4cf101e5dccf8d633c Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 12 Feb 2021 18:49:57 +0200
Subject: [PATCH 319/389] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66072979..94b45a82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.
 - Fixed shoutbox not working in mobile layout
+- Fixed some UI jumpiness when opening images particularly in chat view
 
 
 ## [2.2.3] - 2021-01-18

From 1a836c85274f64cefeca0999336e3c5c9d10e5ad Mon Sep 17 00:00:00 2001
From: fiftyffs <fiftyffs@pm.me>
Date: Tue, 26 Jan 2021 06:45:21 +0000
Subject: [PATCH 320/389] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 70.1% (476 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nb_NO/
---
 src/i18n/nb.json | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/i18n/nb.json b/src/i18n/nb.json
index b9669a35..8bd745f0 100644
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@@ -57,9 +57,9 @@
     "enter_recovery_code": "Skriv inn en gjenopprettingskode",
     "enter_two_factor_code": "Skriv inn en to-faktors kode",
     "recovery_code": "Gjenopprettingskode",
-    "heading" : {
-      "totp" : "To-faktors autentisering",
-      "recovery" : "To-faktors gjenoppretting"
+    "heading": {
+      "totp": "To-faktors autentisering",
+      "recovery": "To-faktors gjenoppretting"
     }
   },
   "media_modal": {
@@ -72,7 +72,7 @@
     "chat": "Lokal nettprat",
     "friend_requests": "Følgeforespørsler",
     "mentions": "Nevnt",
-    "interactions": "Interaksjooner",
+    "interactions": "Interaksjoner",
     "dms": "Direktemeldinger",
     "public_tl": "Offentlig Tidslinje",
     "timeline": "Tidslinje",
@@ -80,7 +80,9 @@
     "user_search": "Søk etter brukere",
     "search": "Søk",
     "who_to_follow": "Kontoer å følge",
-    "preferences": "Innstillinger"
+    "preferences": "Innstillinger",
+    "timelines": "Tidslinjer",
+    "bookmarks": "Bokmerker"
   },
   "notifications": {
     "broken_favorite": "Ukjent status, leter etter den...",
@@ -90,7 +92,8 @@
     "notifications": "Varslinger",
     "read": "Les!",
     "repeated_you": "Gjentok din status",
-    "no_more_notifications": "Ingen gjenstående varsler"
+    "no_more_notifications": "Ingen gjenstående varsler",
+    "follow_request": "ønsker å følge deg"
   },
   "polls": {
     "add_poll": "Legg til undersøkelse",
@@ -134,7 +137,7 @@
       "public": "Denne statusen vil være synlig for alle",
       "private": "Denne statusen vil være synlig for dine følgere",
       "unlisted": "Denne statusen vil ikke være synlig i Offentlig Tidslinje eller Det Hele Kjente Nettverket"
-      },
+    },
     "scope": {
       "direct": "Direkte, publiser bare til nevnte brukere",
       "private": "Bare følgere, publiser bare til brukere som følger deg",
@@ -171,17 +174,17 @@
     "security": "Sikkerhet",
     "enter_current_password_to_confirm": "Skriv inn ditt nåverende passord for å bekrefte din identitet",
     "mfa": {
-      "otp" : "OTP",
-      "setup_otp" : "Set opp OTP",
-      "wait_pre_setup_otp" : "forhåndsstiller OTP",
-      "confirm_and_enable" : "Bekreft og slå på OTP",
+      "otp": "OTP",
+      "setup_otp": "Set opp OTP",
+      "wait_pre_setup_otp": "forhåndsstiller OTP",
+      "confirm_and_enable": "Bekreft og slå på OTP",
       "title": "To-faktors autentisering",
-      "generate_new_recovery_codes" : "Generer nye gjenopprettingskoder",
-      "warning_of_generate_new_codes" : "Når du genererer nye gjenopprettingskoder, vil de gamle slutte å fungere.",
-      "recovery_codes" : "Gjenopprettingskoder.",
+      "generate_new_recovery_codes": "Generer nye gjenopprettingskoder",
+      "warning_of_generate_new_codes": "Når du genererer nye gjenopprettingskoder, vil de gamle slutte å fungere.",
+      "recovery_codes": "Gjenopprettingskoder.",
       "waiting_a_recovery_codes": "Mottar gjenopprettingskoder...",
-      "recovery_codes_warning" : "Skriv disse kodene ned eller plasser dem ett sikkert sted - ellers så vil du ikke se dem igjen. Dersom du mister tilgang til din to-faktors app og dine gjenopprettingskoder, vil du bli stengt ute av kontoen din.",
-      "authentication_methods" : "Autentiseringsmetoder",
+      "recovery_codes_warning": "Skriv disse kodene ned eller plasser dem ett sikkert sted - ellers så vil du ikke se dem igjen. Dersom du mister tilgang til din to-faktors app og dine gjenopprettingskoder, vil du bli stengt ute av kontoen din.",
+      "authentication_methods": "Autentiseringsmetoder",
       "scan": {
         "title": "Skann",
         "desc": "Ved hjelp av din to-faktors applikasjon, skann denne QR-koden eller skriv inn tekstnøkkelen",
@@ -579,7 +582,7 @@
     "favorite": "Lik",
     "user_settings": "Brukerinnstillinger"
   },
-  "upload":{
+  "upload": {
     "error": {
       "base": "Det oppsto en feil under opplastning.",
       "file_too_big": "Fil for stor [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",

From 0ffb7b67edadc6ab28b66067dc54a79e2712fa2c Mon Sep 17 00:00:00 2001
From: LibertAdmin <libertadmin@liberta.vip>
Date: Thu, 28 Jan 2021 19:41:23 +0000
Subject: [PATCH 321/389] Translated using Weblate (French)

Currently translated at 98.2% (667 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
---
 src/i18n/fr.json | 81 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 72 insertions(+), 9 deletions(-)

diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 63ad46d2..c2eff808 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -280,7 +280,7 @@
     "hide_followers_description": "Ne pas afficher qui est abonné à moi",
     "show_admin_badge": "Afficher le badge d'Administrateur⋅ice sur mon profil",
     "show_moderator_badge": "Afficher le badge de Modérateur⋅ice sur mon profil",
-    "nsfw_clickthrough": "Masquer les images marquées comme contenu adulte ou sensible",
+    "nsfw_clickthrough": "Activer le clic pour dévoiler les pièces jointes et cacher l'aperçu des liens pour les statuts marqués comme sensibles",
     "oauth_tokens": "Jetons OAuth",
     "token": "Jeton",
     "refresh_token": "Rafraichir le jeton",
@@ -409,7 +409,13 @@
         "tabs": "Onglets",
         "toggled": "(Dés)activé",
         "highlight": "Éléments mis en valeur",
-        "popover": "Infobulles, menus"
+        "popover": "Infobulles, menus",
+        "chat": {
+          "border": "Bordure",
+          "outgoing": "Sortant(s)",
+          "incoming": "Entrant(s)"
+        },
+        "wallpaper": "Fond d'écran"
       },
       "radii": {
         "_tab_label": "Rondeur"
@@ -485,7 +491,7 @@
     "notification_visibility_emoji_reactions": "Réactions",
     "hide_follows_count_description": "Masquer le nombre de suivis",
     "useStreamingApiWarning": "(Non recommandé, expérimental, connu pour rater des messages)",
-    "type_domains_to_mute": "Écrire les domaines à masquer",
+    "type_domains_to_mute": "Chercher les domaines à masquer",
     "fun": "Rigolo",
     "greentext": "greentexting",
     "allow_following_move": "Suivre automatiquement quand ce compte migre",
@@ -509,7 +515,21 @@
     "mute_import_error": "Erreur à l'import des masquages",
     "mute_import": "Import des masquages",
     "mute_export_button": "Exporter vos masquages dans un fichier CSV",
-    "mute_export": "Export des masquages"
+    "mute_export": "Export des masquages",
+    "notification_setting_hide_notification_contents": "Cacher l'expéditeur et le contenu des notifications push",
+    "notification_setting_block_from_strangers": "Bloquer les notifications des utilisateur⋅ice⋅s que vous ne suivez pas",
+    "virtual_scrolling": "Optimiser le rendu du fil d'actualité",
+    "reset_background_confirm": "Voulez-vraiment réinitialiser l'arrière-plan ?",
+    "reset_banner_confirm": "Voulez-vraiment réinitialiser la bannière ?",
+    "reset_avatar_confirm": "Voulez-vraiment réinitialiser l'avatar ?",
+    "reset_profile_banner": "Réinitialiser la bannière du profil",
+    "reset_profile_background": "Réinitialiser l'arrière-plan du profil",
+    "reset_avatar": "Réinitialiser l'avatar",
+    "profile_fields": {
+      "value": "Contenu",
+      "name": "Étiquette",
+      "add_field": "Ajouter un champ"
+    }
   },
   "timeline": {
     "collapse": "Fermer",
@@ -521,7 +541,9 @@
     "show_new": "Afficher plus",
     "up_to_date": "À jour",
     "no_more_statuses": "Pas plus de statuts",
-    "no_statuses": "Aucun statuts"
+    "no_statuses": "Aucun statuts",
+    "reload": "Recharger",
+    "error": "Erreur lors de l'affichage du fil d'actualité : {0}"
   },
   "status": {
     "favorites": "Favoris",
@@ -536,7 +558,19 @@
     "mute_conversation": "Masquer la conversation",
     "unmute_conversation": "Démasquer la conversation",
     "status_unavailable": "Status indisponible",
-    "copy_link": "Copier le lien au status"
+    "copy_link": "Copier le lien au status",
+    "expand": "Développer",
+    "nsfw": "Contenu sensible",
+    "status_deleted": "Ce post a été effacé",
+    "hide_content": "Cacher le contenu",
+    "show_content": "Montrer le contenu",
+    "hide_full_subject": "Cacher le sujet",
+    "show_full_subject": "Montrer le sujet en entier",
+    "thread_muted_and_words": ", contient les mots :",
+    "thread_muted": "Fil de discussion masqué",
+    "external_source": "Source externe",
+    "unbookmark": "Supprimer des favoris",
+    "bookmark": "Ajouter aux favoris"
   },
   "user_card": {
     "approve": "Accepter",
@@ -591,7 +625,12 @@
     "subscribe": "Abonner",
     "unsubscribe": "Désabonner",
     "hide_repeats": "Cacher les partages",
-    "show_repeats": "Montrer les partages"
+    "show_repeats": "Montrer les partages",
+    "roles": {
+      "moderator": "Modérateur⋅ice",
+      "admin": "Administrateur⋅ice"
+    },
+    "message": "Message"
   },
   "user_profile": {
     "timeline_title": "Journal de l'utilisateur⋅ice",
@@ -619,13 +658,15 @@
     "user_settings": "Paramètres utilisateur",
     "add_reaction": "Ajouter une réaction",
     "accept_follow_request": "Accepter la demande de suivit",
-    "reject_follow_request": "Rejeter la demande de suivit"
+    "reject_follow_request": "Rejeter la demande de suivit",
+    "bookmark": "Favori"
   },
   "upload": {
     "error": {
       "base": "L'envoi a échoué.",
       "file_too_big": "Fichier trop gros [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Réessayez plus tard"
+      "default": "Réessayez plus tard",
+      "message": "Envoi échoué : {0}"
     },
     "file_size_units": {
       "B": "O",
@@ -759,5 +800,27 @@
   },
   "shoutbox": {
     "title": "Shoutbox"
+  },
+  "display_date": {
+    "today": "Aujourd'hui"
+  },
+  "file_type": {
+    "file": "Fichier",
+    "image": "Image",
+    "video": "Vidéo",
+    "audio": "Audio"
+  },
+  "chats": {
+    "empty_chat_list_placeholder": "Vous n'avez pas encore de discussions. Démarrez-en une nouvelle !",
+    "error_sending_message": "Quelque chose s'est mal passé pendant l'envoi du message.",
+    "error_loading_chat": "Quelque chose s'est mal passé au chargement de la discussion.",
+    "delete_confirm": "Voulez-vous vraiment effacer ce message ?",
+    "more": "Plus",
+    "empty_message_error": "Impossible d'envoyer un message vide",
+    "new": "Nouvelle discussion",
+    "chats": "Discussions",
+    "delete": "Effacer",
+    "message_user": "Message à {nickname}",
+    "you": "Vous :"
   }
 }

From 63317a2fdfc8e7a68ffcf58c8d2a55dcba3c6b27 Mon Sep 17 00:00:00 2001
From: Snow <build-a-website@protonmail.com>
Date: Thu, 28 Jan 2021 13:16:50 +0000
Subject: [PATCH 322/389] Translated using Weblate (Chinese (Traditional))

Currently translated at 99.2% (674 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index a8d0dc3c..aba0cbb7 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -216,7 +216,8 @@
           "incoming": "收到",
           "outgoing": "發出",
           "border": "邊框"
-        }
+        },
+        "wallpaper": "桌布"
       },
       "preview": {
         "header_faint": "這很正常",
@@ -572,16 +573,19 @@
     "thread_muted_and_words": ",有这些字:",
     "hide_full_subject": "隱藏完整標題",
     "show_content": "顯示內容",
-    "hide_content": "隱藏內容"
+    "hide_content": "隱藏內容",
+    "status_deleted": "",
+    "expand": "展开",
+    "external_source": "外部來源"
   },
   "time": {
-    "hours": "{0} 小時",
+    "hours": "{0} 時",
     "days_short": "{0}天",
     "day_short": "{0}天",
     "days": "{0} 天",
-    "hour": "{0} 小时",
-    "hour_short": "{0}h",
-    "hours_short": "{0}h",
+    "hour": "{0} 時",
+    "hour_short": "{0}時",
+    "hours_short": "{0}時",
     "years_short": "{0} y",
     "now": "剛剛",
     "day": "{0} 天",
@@ -655,7 +659,8 @@
     "reload": "重新載入",
     "up_to_date": "已是最新",
     "no_more_statuses": "没有更多發文",
-    "no_statuses": "没有發文"
+    "no_statuses": "没有發文",
+    "error": "取得時間線時發生錯誤：{0}"
   },
   "interactions": {
     "load_older": "載入更早的互動",
@@ -788,7 +793,8 @@
     "error": {
       "base": "上傳失敗。",
       "file_too_big": "文件太大[{filesize} {filesizeunit} / {allowedsize} {allowedsizeunit}]",
-      "default": "稍後再試"
+      "default": "稍後再試",
+      "message": "上傳錯誤：{0}"
     }
   },
   "search": {

From 0a3f40eebb5338a2159ced8a017388660db77244 Mon Sep 17 00:00:00 2001
From: Snow <build-a-website@protonmail.com>
Date: Sat, 30 Jan 2021 03:10:11 +0000
Subject: [PATCH 323/389] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (679 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index aba0cbb7..e8be628f 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -54,7 +54,7 @@
     "mentions": "提及",
     "friend_requests": "關注請求",
     "back": "後退",
-    "administration": "管理",
+    "administration": "管理員",
     "about": "關於"
   },
   "media_modal": {
@@ -413,7 +413,7 @@
     "hide_follows_description": "不要顯示我所關注的人",
     "hide_followers_description": "不要顯示關注我的人",
     "hide_follows_count_description": "不顯示關注數",
-    "nsfw_clickthrough": "將敏感附件隱藏，點擊才能打開",
+    "nsfw_clickthrough": "將敏感附件和鏈接隱藏，點擊才能打開",
     "valid_until": "有效期至",
     "panelRadius": "面板",
     "pause_on_unfocused": "在離開頁面時暫停時間線推送",
@@ -574,9 +574,10 @@
     "hide_full_subject": "隱藏完整標題",
     "show_content": "顯示內容",
     "hide_content": "隱藏內容",
-    "status_deleted": "",
+    "status_deleted": "該帖已被刪除",
     "expand": "展开",
-    "external_source": "外部來源"
+    "external_source": "外部來源",
+    "nsfw": "工作不安全"
   },
   "time": {
     "hours": "{0} 時",
@@ -751,7 +752,11 @@
     "unmute": "取消靜音",
     "unmute_progress": "取消靜音中…",
     "hide_repeats": "隱藏轉發",
-    "show_repeats": "顯示轉發"
+    "show_repeats": "顯示轉發",
+    "roles": {
+      "moderator": "主持人",
+      "admin": "管理員"
+    }
   },
   "user_profile": {
     "timeline_title": "用戶時間線",

From 4c845a1a994a5affc17f45650dd78af92b00ca9a Mon Sep 17 00:00:00 2001
From: Snow <build-a-website@protonmail.com>
Date: Sun, 31 Jan 2021 07:01:23 +0000
Subject: [PATCH 324/389] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (679 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index e8be628f..b7b6d7ac 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -25,7 +25,7 @@
     "add_poll": "增加投票"
   },
   "notifications": {
-    "reacted_with": "和 {0} 互動過",
+    "reacted_with": "作出了 {0} 的反應",
     "migrated_to": "遷移到",
     "no_more_notifications": "沒有更多的通知",
     "repeated_you": "轉發了你的發文",

From 11081c287023abb1161530548fa35d66a6063c06 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Wed, 3 Feb 2021 08:25:41 +0000
Subject: [PATCH 325/389] Translated using Weblate (Italian)

Currently translated at 100.0% (680 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index b7d21e7e..a5986777 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -417,7 +417,8 @@
     "mute_import": "Importa silenziati",
     "mute_export_button": "Esporta la tua lista di silenziati in un file CSV",
     "mute_export": "Esporta silenziati",
-    "hide_wallpaper": "Nascondi sfondo della stanza"
+    "hide_wallpaper": "Nascondi sfondo della stanza",
+    "setting_changed": "Valore personalizzato"
   },
   "timeline": {
     "error_fetching": "Errore nell'aggiornamento",

From 21e2b3ce0e006845904c484a8d2810bb5cdd5510 Mon Sep 17 00:00:00 2001
From: tarteka <info@tarteka.net>
Date: Sat, 6 Feb 2021 23:52:33 +0000
Subject: [PATCH 326/389] Translated using Weblate (Spanish)

Currently translated at 100.0% (680 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
---
 src/i18n/es.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index f4d87eb3..0ee67ed4 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -562,7 +562,8 @@
     "mute_import": "Importar silenciados",
     "mute_export_button": "Exportar los silenciados a un archivo csv",
     "mute_export": "Exportar silenciados",
-    "hide_wallpaper": "Ocultar el fondo de pantalla de la instancia"
+    "hide_wallpaper": "Ocultar el fondo de pantalla de la instancia",
+    "setting_changed": "La configuración es diferente a la predeterminada"
   },
   "time": {
     "day": "{0} día",
@@ -693,7 +694,11 @@
     "show_repeats": "Mostrar repetidos",
     "hide_repeats": "Ocultar repetidos",
     "message": "Mensaje",
-    "hidden": "Oculto"
+    "hidden": "Oculto",
+    "roles": {
+      "moderator": "Moderador",
+      "admin": "Administrador"
+    }
   },
   "user_profile": {
     "timeline_title": "Linea Temporal del Usuario",

From 586c538aa09c140b706c6a33cfc4b8bc1f67bed7 Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Tue, 9 Feb 2021 01:36:08 +0000
Subject: [PATCH 327/389] Translated using Weblate (Japanese)

Currently translated at 98.0% (667 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 259 ++++++++++++++++++++++++++++++++------
 1 file changed, 223 insertions(+), 36 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index e2de1066..f3683bfa 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -13,7 +13,9 @@
     "scope_options": "公開範囲選択",
     "text_limit": "文字の数",
     "title": "有効な機能",
-    "who_to_follow": "おすすめユーザー"
+    "who_to_follow": "おすすめユーザー",
+    "upload_limit": "ファイルサイズの上限",
+    "pleroma_chat_messages": "Pleroma チャット"
   },
   "finder": {
     "error_fetching_user": "ユーザー検索がエラーになりました。",
@@ -31,7 +33,13 @@
     "disable": "無効",
     "enable": "有効",
     "confirm": "確認",
-    "verify": "検査"
+    "verify": "検査",
+    "peek": "隠す",
+    "close": "閉じる",
+    "dismiss": "無視",
+    "retry": "もう一度お試し下さい",
+    "error_retry": "もう一度お試し下さい",
+    "loading": "読み込み中…"
   },
   "image_cropper": {
     "crop_picture": "画像を切り抜く",
@@ -57,9 +65,9 @@
     "enter_recovery_code": "リカバリーコードを入力してください",
     "enter_two_factor_code": "2段階認証コードを入力してください",
     "recovery_code": "リカバリーコード",
-    "heading" : {
-      "totp" : "2段階認証",
-      "recovery" : "2段階リカバリー"
+    "heading": {
+      "totp": "2段階認証",
+      "recovery": "2段階リカバリー"
     }
   },
   "media_modal": {
@@ -76,11 +84,14 @@
     "dms": "ダイレクトメッセージ",
     "public_tl": "パブリックタイムライン",
     "timeline": "タイムライン",
-    "twkn": "接続しているすべてのネットワーク",
+    "twkn": "すべてのネットワーク",
     "user_search": "ユーザーを探す",
     "search": "検索",
     "who_to_follow": "おすすめユーザー",
-    "preferences": "設定"
+    "preferences": "設定",
+    "administration": "管理",
+    "bookmarks": "ブックマーク",
+    "timelines": "タイムライン"
   },
   "notifications": {
     "broken_favorite": "ステータスが見つかりません。探しています...",
@@ -90,7 +101,11 @@
     "notifications": "通知",
     "read": "読んだ！",
     "repeated_you": "あなたのステータスがリピートされました",
-    "no_more_notifications": "通知はありません"
+    "no_more_notifications": "通知はありません",
+    "reacted_with": "{0} でリアクションしました",
+    "migrated_to": "インスタンスを引っ越しました",
+    "follow_request": "フォローを申請しました",
+    "error": "通知の取得に失敗しました: {0}"
   },
   "polls": {
     "add_poll": "投票を追加",
@@ -113,7 +128,9 @@
     "search_emoji": "絵文字を検索",
     "add_emoji": "絵文字を挿入",
     "custom": "カスタム絵文字",
-    "unicode": "Unicode絵文字"
+    "unicode": "Unicode絵文字",
+    "load_all": "全 {emojiAmount} 絵文字を読み込む",
+    "load_all_hint": "最初の {saneAmount} 絵文字を読み込みました、全て読み込むと重くなる可能性があります。"
   },
   "stickers": {
     "add_sticker": "ステッカーを追加"
@@ -121,7 +138,8 @@
   "interactions": {
     "favs_repeats": "リピートとお気に入り",
     "follows": "新しいフォロワー",
-    "load_older": "古いインタラクションを見る"
+    "load_older": "古いインタラクションを見る",
+    "moves": "ユーザーの引っ越し"
   },
   "post_status": {
     "new_status": "投稿する",
@@ -147,10 +165,15 @@
     },
     "scope": {
       "direct": "ダイレクト: メンションされたユーザーのみに届きます。",
-      "private": "フォロワーげんてい: フォロワーのみに届きます。",
+      "private": "フォロワー限定: フォロワーのみに届きます。",
       "public": "パブリック: パブリックタイムラインに届きます。",
       "unlisted": "アンリステッド: パブリックタイムラインに届きません。"
-    }
+    },
+    "media_description_error": "メディアのアップロードに失敗しました。もう一度お試しください",
+    "empty_status_error": "投稿内容を入力してください",
+    "preview_empty": "何もありません",
+    "preview": "プレビュー",
+    "media_description": "メディアの説明"
   },
   "registration": {
     "bio": "プロフィール",
@@ -181,17 +204,17 @@
     "security": "セキュリティ",
     "enter_current_password_to_confirm": "あなたのアイデンティティを証明するため、現在のパスワードを入力してください",
     "mfa": {
-      "otp" : "OTP",
-      "setup_otp" : "OTPのセットアップ",
-      "wait_pre_setup_otp" : "OTPのプリセット",
-      "confirm_and_enable" : "OTPの確認と有効化",
+      "otp": "OTP",
+      "setup_otp": "OTPのセットアップ",
+      "wait_pre_setup_otp": "OTPのプリセット",
+      "confirm_and_enable": "OTPの確認と有効化",
       "title": "2段階認証",
-      "generate_new_recovery_codes" : "新しいリカバリーコードを生成",
-      "warning_of_generate_new_codes" : "新しいリカバリーコードを生成すると、古いコードは使用できなくなります。",
-      "recovery_codes" : "リカバリーコード。",
-      "waiting_a_recovery_codes": "バックアップコードを受信しています...",
-      "recovery_codes_warning" : "コードを紙に書くか、安全な場所に保存してください。そうでなければ、あなたはコードを再び見ることはできません。もし2段階認証アプリのアクセスを喪失し、なおかつ、リカバリーコードもないならば、あなたは自分のアカウントから閉め出されます。",
-      "authentication_methods" : "認証方法",
+      "generate_new_recovery_codes": "新しいリカバリーコードを生成",
+      "warning_of_generate_new_codes": "新しいリカバリーコードを生成すると、古いコードは使用できなくなります。",
+      "recovery_codes": "リカバリーコード。",
+      "waiting_a_recovery_codes": "バックアップコードを受信しています…",
+      "recovery_codes_warning": "コードを紙に書くか、安全な場所に保存してください。そうでなければ、あなたはコードを再び見ることはできません。もし2段階認証アプリのアクセスを喪失し、なおかつ、リカバリーコードもないならば、あなたは自分のアカウントから閉め出されます。",
+      "authentication_methods": "認証方法",
       "scan": {
         "title": "スキャン",
         "desc": "あなたの2段階認証アプリを使って、このQRコードをスキャンするか、テキストキーを入力してください:",
@@ -231,7 +254,7 @@
     "data_import_export_tab": "インポートとエクスポート",
     "default_vis": "デフォルトの公開範囲",
     "delete_account": "アカウントを消す",
-    "delete_account_description": "あなたのアカウントとメッセージが、消えます。",
+    "delete_account_description": "あなたのデータが消えて、アカウントが使えなくなります。",
     "delete_account_error": "アカウントを消すことが、できなかったかもしれません。インスタンスの管理者に、連絡してください。",
     "delete_account_instructions": "本当にアカウントを消してもいいなら、パスワードを入力してください。",
     "discoverable": "検索などのサービスでこのアカウントを見つけることを許可する",
@@ -305,7 +328,7 @@
     "profile_background": "プロフィールのバックグラウンド",
     "profile_banner": "プロフィールバナー",
     "profile_tab": "プロフィール",
-    "radii_help": "インターフェースの丸さを設定する。",
+    "radii_help": "インターフェースの丸さを設定する",
     "replies_in_timeline": "タイムラインのリプライ",
     "reply_visibility_all": "すべてのリプライを見る",
     "reply_visibility_following": "私に宛てられたリプライと、フォローしている人からのリプライを見る",
@@ -356,7 +379,20 @@
         "save_load_hint": "「残す」オプションをONにすると、テーマを選んだときとロードしたとき、現在の設定を残します。また、テーマをエクスポートするとき、これらのオプションを維持します。すべてのチェックボックスをOFFにすると、テーマをエクスポートしたとき、すべての設定を保存します。",
         "reset": "リセット",
         "clear_all": "すべてクリア",
-        "clear_opacity": "透明度をクリア"
+        "clear_opacity": "透明度をクリア",
+        "help": {
+          "snapshot_missing": "テーマのスナップショットがありません。思っていた見た目と違うかもしれません。",
+          "migration_snapshot_ok": "念のために、テーマのスナップショットが読み込まれました。テーマのデータを読み込むことができます。",
+          "fe_downgraded": "フロントエンドが前のバージョンに戻りました。",
+          "fe_upgraded": "フロントエンドと一緒に、テーマエンジンが新しくなりました。",
+          "older_version_imported": "古いフロントエンドで作られたファイルをインポートしました。",
+          "future_version_imported": "新しいフロントエンドで作られたファイルをインポートしました。",
+          "v2_imported": "古いフロントエンドのためのファイルをインポートしました。設定した通りにならないかもしれません。",
+          "upgraded_from_v2": "フロントエンドが新しくなったので、今までの見た目と少し違うかもしれません。"
+        },
+        "use_source": "新しいバージョン",
+        "use_snapshot": "古いバージョン",
+        "load_theme": "テーマの読み込み"
       },
       "common": {
         "color": "色",
@@ -391,7 +427,27 @@
         "borders": "境界",
         "buttons": "ボタン",
         "inputs": "インプットフィールド",
-        "faint_text": "薄いテキスト"
+        "faint_text": "薄いテキスト",
+        "alert_neutral": "それ以外",
+        "chat": {
+          "border": "境界線",
+          "outgoing": "送信",
+          "incoming": "受信"
+        },
+        "tabs": "タブ",
+        "toggled": "切り替えたとき",
+        "disabled": "無効なとき",
+        "selectedMenu": "選択されたメニューアイテム",
+        "selectedPost": "選択された投稿",
+        "pressed": "押したとき",
+        "highlight": "強調された要素",
+        "icons": "アイコン",
+        "poll": "投票グラフ",
+        "wallpaper": "壁紙",
+        "underlay": "アンダーレイ",
+        "popover": "ツールチップ、メニュー、ポップオーバー",
+        "post": "投稿／プロフィール",
+        "alert_warning": "警告"
       },
       "radii": {
         "_tab_label": "丸さ"
@@ -459,7 +515,50 @@
       "title": "バージョン",
       "backend_version": "バックエンドのバージョン",
       "frontend_version": "フロントエンドのバージョン"
-    }
+    },
+    "notification_setting_hide_notification_contents": "送った人と内容を、プッシュ通知に表示しない",
+    "notification_setting_privacy": "プライバシー",
+    "notification_setting_block_from_strangers": "フォローしていないユーザーからの通知を拒否する",
+    "notification_setting_filters": "フィルター",
+    "fun": "お楽しみ",
+    "virtual_scrolling": "タイムラインの描画を最適化する",
+    "type_domains_to_mute": "ミュートしたいドメインを検索",
+    "useStreamingApiWarning": "（実験中で、投稿を取りこぼすかもしれないので、おすすめしません）",
+    "useStreamingApi": "投稿と通知を、すぐに受け取る",
+    "user_mutes": "ユーザー",
+    "reset_background_confirm": "本当にバックグラウンドを初期化しますか？",
+    "reset_banner_confirm": "本当にバナーを初期化しますか？",
+    "reset_avatar_confirm": "本当にアバターを初期化しますか？",
+    "hide_wallpaper": "インスタンスのバックグラウンドを隠す",
+    "reset_profile_background": "プロフィールのバックグラウンドを初期化",
+    "reset_profile_banner": "プロフィールのバナーを初期化",
+    "reset_avatar": "アバターを初期化",
+    "notification_visibility_emoji_reactions": "リアクション",
+    "notification_visibility_moves": "ユーザーの引っ越し",
+    "new_email": "新しいメールアドレス",
+    "profile_fields": {
+      "value": "内容",
+      "name": "ラベル",
+      "add_field": "枠を追加",
+      "label": "プロフィール補足情報"
+    },
+    "accent": "アクセント",
+    "mutes_imported": "ミュートをインポートしました！少し時間がかかるかもしれません。",
+    "emoji_reactions_on_timeline": "絵文字リアクションをタイムラインに表示",
+    "domain_mutes": "ドメイン",
+    "mutes_and_blocks": "ミュートとブロック",
+    "chatMessageRadius": "チャットメッセージ",
+    "change_email_error": "メールアドレスを変えることが、できなかったかもしれません。",
+    "changed_email": "メールアドレスが、変わりました！",
+    "change_email": "メールアドレスを変える",
+    "bot": "これは bot アカウントです",
+    "mute_export_button": "ミュートをCSVファイルにエクスポートする",
+    "import_mutes_from_a_csv_file": "CSVファイルからミュートをインポートする",
+    "mute_import_error": "ミュートのインポートに失敗しました",
+    "mute_import": "ミュートのインポート",
+    "mute_export": "ミュートのエクスポート",
+    "allow_following_move": "フォロー中のアカウントが引っ越したとき、自動フォローを許可する",
+    "setting_changed": "規定の設定と異なっています"
   },
   "time": {
     "day": "{0}日",
@@ -505,7 +604,9 @@
     "show_new": "読み込み",
     "up_to_date": "最新",
     "no_more_statuses": "これで終わりです",
-    "no_statuses": "ステータスはありません"
+    "no_statuses": "ステータスはありません",
+    "reload": "再読み込み",
+    "error": "タイムラインの読み込みに失敗しました: {0}"
   },
   "status": {
     "favorites": "お気に入り",
@@ -518,7 +619,21 @@
     "reply_to": "返信",
     "replies_list": "返信:",
     "mute_conversation": "スレッドをミュート",
-    "unmute_conversation": "スレッドのミュートを解除"
+    "unmute_conversation": "スレッドのミュートを解除",
+    "nsfw": "閲覧注意",
+    "expand": "広げる",
+    "status_deleted": "この投稿は削除されました",
+    "hide_content": "隠す",
+    "show_content": "見る",
+    "hide_full_subject": "隠す",
+    "show_full_subject": "全部見る",
+    "thread_muted_and_words": "以下の単語を含むため:",
+    "thread_muted": "ミュートされたスレッド",
+    "external_source": "外部ソース",
+    "copy_link": "リンクをコピー",
+    "status_unavailable": "利用できません",
+    "unbookmark": "ブックマーク解除",
+    "bookmark": "ブックマーク"
   },
   "user_card": {
     "approve": "受け入れ",
@@ -570,7 +685,15 @@
       "quarantine": "他のインスタンスからの投稿を止める",
       "delete_user": "ユーザーを削除",
       "delete_user_confirmation": "あなたの精神状態に何か問題はございませんか？ この操作を取り消すことはできません。"
-    }
+    },
+    "roles": {
+      "moderator": "モデレーター",
+      "admin": "管理者"
+    },
+    "show_repeats": "リピートを見る",
+    "hide_repeats": "リピートを隠す",
+    "message": "メッセージ",
+    "hidden": "隠す"
   },
   "user_profile": {
     "timeline_title": "ユーザータイムライン",
@@ -595,13 +718,18 @@
     "repeat": "リピート",
     "reply": "返信",
     "favorite": "お気に入り",
-    "user_settings": "ユーザー設定"
+    "user_settings": "ユーザー設定",
+    "bookmark": "ブックマーク",
+    "reject_follow_request": "フォローリクエストを拒否",
+    "accept_follow_request": "フォローリクエストを許可",
+    "add_reaction": "リアクションを追加"
   },
-  "upload":{
+  "upload": {
     "error": {
-    "base": "アップロードに失敗しました。",
-    "file_too_big": "ファイルが大きすぎます [{filesize} {filesizeunit} / {allowedsize} {allowedsizeunit}]",
-    "default": "しばらくしてから試してください"
+      "base": "アップロードに失敗しました。",
+      "file_too_big": "ファイルが大きすぎます [{filesize} {filesizeunit} / {allowedsize} {allowedsizeunit}]",
+      "default": "しばらくしてから試してください",
+      "message": "アップロードに失敗: {0}"
     },
     "file_size_units": {
       "B": "B",
@@ -626,6 +754,65 @@
     "check_email": "パスワードをリセットするためのリンクが記載されたメールが届いているか確認してください。",
     "return_home": "ホームページに戻る",
     "too_many_requests": "試行回数の制限に達しました。しばらく時間を置いてから再試行してください。",
-    "password_reset_disabled": "このインスタンスではパスワードリセットは無効になっています。インスタンスの管理者に連絡してください。"
+    "password_reset_disabled": "このインスタンスではパスワードリセットは無効になっています。インスタンスの管理者に連絡してください。",
+    "password_reset_required_but_mailer_is_disabled": "パスワードの初期化が必要ですが、初期化は使えません。インスタンスの管理者に連絡してください。",
+    "password_reset_required": "ログインするためにパスワードを初期化してください。"
+  },
+  "about": {
+    "mrf": {
+      "mrf_policies_desc": "MRFポリシーは、インスタンスの振る舞いを操作します。以下のポリシーが有効になっています:",
+      "federation": "連合",
+      "simple": {
+        "media_nsfw_desc": "このインスタンスでは、以下のインスタンスからの投稿に対して、メディアを閲覧注意に設定します:",
+        "media_nsfw": "メディアを閲覧注意に設定",
+        "media_removal_desc": "このインスタンスでは、以下のインスタンスからの投稿に対して、メディアを除去します:",
+        "media_removal": "メディア除去",
+        "ftl_removal": "「接続しているすべてのネットワーク」タイムラインから除外",
+        "ftl_removal_desc": "このインスタンスでは、以下のインスタンスを「接続しているすべてのネットワーク」タイムラインから除外します:",
+        "quarantine_desc": "このインスタンスでは、以下のインスタンスに対して公開投稿のみを送信します:",
+        "quarantine": "検疫",
+        "reject_desc": "このインスタンスでは、以下のインスタンスからのメッセージを受け付けません:",
+        "accept_desc": "このインスタンスでは、以下のインスタンスからのメッセージのみを受け付けます:",
+        "accept": "許可",
+        "simple_policies": "インスタンス固有のポリシー"
+      },
+      "mrf_policies": "有効なMRFポリシー",
+      "keyword": {
+        "replace": "置き換え",
+        "ftl_removal": "「接続しているすべてのネットワーク」タイムラインから除外",
+        "keyword_policies": "キーワードポリシー"
+      }
+    }
+  },
+  "display_date": {
+    "today": "今日"
+  },
+  "file_type": {
+    "file": "ファイル",
+    "image": "画像",
+    "video": "ビデオ",
+    "audio": "オーディオ"
+  },
+  "remote_user_resolver": {
+    "error": "見つかりませんでした。"
+  },
+  "errors": {
+    "storage_unavailable": "ブラウザのストレージに接続できなかったため、ログインや設定情報は保存されません。Cookieを有効にしてください。"
+  },
+  "shoutbox": {
+    "title": "Shoutbox"
+  },
+  "chats": {
+    "empty_chat_list_placeholder": "チャットはありません。新規チャットのボタンを押して始めましょう！",
+    "error_sending_message": "メッセージの送信に失敗しました。",
+    "error_loading_chat": "チャットの読み込みに失敗しました。",
+    "delete_confirm": "このメッセージを本当に消してもいいですか？",
+    "more": "もっと見る",
+    "empty_message_error": "メッセージを入力して下さい",
+    "new": "新規チャット",
+    "chats": "チャット一覧",
+    "delete": "削除",
+    "message_user": "{nickname} にメッセージ",
+    "you": "あなた:"
   }
 }

From e85fa160c7812adfeb9c6c9110ea88c2434b36d0 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Tue, 9 Feb 2021 01:53:24 +0000
Subject: [PATCH 328/389] Translated using Weblate (Japanese)

Currently translated at 98.0% (667 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index f3683bfa..fb0277bf 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -91,7 +91,8 @@
     "preferences": "設定",
     "administration": "管理",
     "bookmarks": "ブックマーク",
-    "timelines": "タイムライン"
+    "timelines": "タイムライン",
+    "chats": "チャット"
   },
   "notifications": {
     "broken_favorite": "ステータスが見つかりません。探しています...",
@@ -774,15 +775,19 @@
         "reject_desc": "このインスタンスでは、以下のインスタンスからのメッセージを受け付けません:",
         "accept_desc": "このインスタンスでは、以下のインスタンスからのメッセージのみを受け付けます:",
         "accept": "許可",
-        "simple_policies": "インスタンス固有のポリシー"
+        "simple_policies": "インスタンス固有のポリシー",
+        "reject": "拒否"
       },
       "mrf_policies": "有効なMRFポリシー",
       "keyword": {
         "replace": "置き換え",
         "ftl_removal": "「接続しているすべてのネットワーク」タイムラインから除外",
-        "keyword_policies": "キーワードポリシー"
+        "keyword_policies": "キーワードポリシー",
+        "is_replaced_by": "→",
+        "reject": "拒否"
       }
-    }
+    },
+    "staff": "スタッフ"
   },
   "display_date": {
     "today": "今日"
@@ -814,5 +819,11 @@
     "delete": "削除",
     "message_user": "{nickname} にメッセージ",
     "you": "あなた:"
+  },
+  "domain_mute_card": {
+    "unmute_progress": "ミュート解除中…",
+    "unmute": "ミュート解除",
+    "mute_progress": "ミュート中…",
+    "mute": "ミュート"
   }
 }

From cccdda3a7bca60222212f6e5e0665c80b7b27fb4 Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Tue, 9 Feb 2021 04:15:08 +0000
Subject: [PATCH 329/389] Translated using Weblate (Japanese)

Currently translated at 98.8% (672 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index fb0277bf..c28c9c92 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -18,7 +18,7 @@
     "pleroma_chat_messages": "Pleroma チャット"
   },
   "finder": {
-    "error_fetching_user": "ユーザー検索がエラーになりました。",
+    "error_fetching_user": "ユーザー検索がエラーになりました",
     "find_user": "ユーザーを探す"
   },
   "general": {
@@ -95,7 +95,7 @@
     "chats": "チャット"
   },
   "notifications": {
-    "broken_favorite": "ステータスが見つかりません。探しています...",
+    "broken_favorite": "ステータスが見つかりません。探しています…",
     "favorited_you": "あなたのステータスがお気に入りされました",
     "followed_you": "フォローされました",
     "load_older": "古い通知をみる",
@@ -268,7 +268,7 @@
     "follow_export_button": "エクスポート",
     "follow_export_processing": "お待ちください。まもなくファイルをダウンロードできます。",
     "follow_import": "フォローのインポート",
-    "follow_import_error": "フォローのインポートがエラーになりました。",
+    "follow_import_error": "フォローのインポートがエラーになりました",
     "follows_imported": "フォローがインポートされました！ 少し時間がかかるかもしれません。",
     "foreground": "フォアグラウンド",
     "general": "全般",
@@ -356,7 +356,7 @@
     "streaming": "上までスクロールしたとき、自動的にストリーミングする",
     "text": "文字",
     "theme": "テーマ",
-    "theme_help": "カラーテーマをカスタマイズできます",
+    "theme_help": "カラーテーマをカスタマイズできます。",
     "theme_help_v2_1": "チェックボックスをONにすると、コンポーネントごとに、色と透明度をオーバーライドできます。「すべてクリア」ボタンを押すと、すべてのオーバーライドをやめます。",
     "theme_help_v2_2": "バックグラウンドとテキストのコントラストを表すアイコンがあります。マウスをホバーすると、詳しい説明が出ます。透明な色を使っているときは、最悪の場合のコントラストが示されます。",
     "tooltipRadius": "ツールチップとアラート",
@@ -402,8 +402,8 @@
           "hint": "コントラストは {ratio} です。{level}。({context})",
           "level": {
             "aa": "AAレベルガイドライン (ミニマル) を満たします",
-            "aaa": "AAAレベルガイドライン (レコメンデッド) を満たします。",
-            "bad": "ガイドラインを満たしません。"
+            "aaa": "AAAレベルガイドライン (レコメンデッド) を満たします",
+            "bad": "ガイドラインを満たしません"
           },
           "context": {
             "18pt": "大きい (18ポイント以上) テキスト",
@@ -467,7 +467,7 @@
           "drop_shadow_syntax": "{0} は、{1} パラメーターと {2} キーワードをサポートしていません。",
           "avatar_inset": "内側の影と外側の影を同時に使うと、透明なアバターの表示が乱れます。",
           "spread_zero": "広がりが 0 よりも大きな影は、0 と同じです。",
-          "inset_classic": "内側の影は {0} を使います。"
+          "inset_classic": "内側の影は {0} を使います"
         },
         "components": {
           "panel": "パネル",
@@ -502,7 +502,7 @@
         "content": "本文",
         "error": "エラーの例",
         "button": "ボタン",
-        "text": "これは{0}と{1}の例です。",
+        "text": "これは{0}と{1}の例です",
         "mono": "monospace",
         "input": "羽田空港に着きました。",
         "faint_link": "とても助けになるマニュアル",
@@ -655,7 +655,7 @@
     "media": "メディア",
     "mention": "メンション",
     "mute": "ミュート",
-    "muted": "ミュートしています！",
+    "muted": "ミュートしています",
     "per_day": "/日",
     "remote_follow": "リモートフォロー",
     "report": "通報",
@@ -663,11 +663,11 @@
     "subscribe": "購読",
     "unsubscribe": "購読を解除",
     "unblock": "ブロック解除",
-    "unblock_progress": "ブロックを解除しています...",
-    "block_progress": "ブロックしています...",
+    "unblock_progress": "ブロックを解除しています…",
+    "block_progress": "ブロックしています…",
     "unmute": "ミュート解除",
-    "unmute_progress": "ミュートを解除しています...",
-    "mute_progress": "ミュートしています...",
+    "unmute_progress": "ミュートを解除しています…",
+    "mute_progress": "ミュートしています…",
     "admin_menu": {
       "moderation": "モデレーション",
       "grant_admin": "管理者権限を付与",

From a848462f1970410eda223561cb1059d78686d697 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Tue, 9 Feb 2021 04:19:33 +0000
Subject: [PATCH 330/389] Translated using Weblate (Japanese)

Currently translated at 98.8% (672 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index c28c9c92..936ce7da 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -105,7 +105,7 @@
     "no_more_notifications": "通知はありません",
     "reacted_with": "{0} でリアクションしました",
     "migrated_to": "インスタンスを引っ越しました",
-    "follow_request": "フォローを申請しました",
+    "follow_request": "あなたをフォローしたいです",
     "error": "通知の取得に失敗しました: {0}"
   },
   "polls": {

From 0dc6937bf8b00447e07b1381527f62d7b9c96e7e Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Wed, 10 Feb 2021 02:29:27 +0000
Subject: [PATCH 331/389] Translated using Weblate (Korean)

Currently translated at 57.3% (390 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
---
 src/i18n/ko.json | 170 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 150 insertions(+), 20 deletions(-)

diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 0968949b..101ef487 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -9,7 +9,9 @@
     "scope_options": "범위 옵션",
     "text_limit": "텍스트 제한",
     "title": "기능",
-    "who_to_follow": "팔로우 추천"
+    "who_to_follow": "팔로우 추천",
+    "upload_limit": "최대 파일용량",
+    "pleroma_chat_messages": "Pleroma 채트"
   },
   "finder": {
     "error_fetching_user": "사용자 정보 불러오기 실패",
@@ -17,7 +19,23 @@
   },
   "general": {
     "apply": "적용",
-    "submit": "보내기"
+    "submit": "보내기",
+    "loading": "로딩중…",
+    "peek": "숨기기",
+    "close": "닫기",
+    "verify": "검사",
+    "confirm": "확인",
+    "enable": "유효",
+    "disable": "무효",
+    "cancel": "취소",
+    "dismiss": "무시",
+    "show_less": "접기",
+    "show_more": "더 보기",
+    "optional": "필수 아님",
+    "retry": "다시 시도하십시오",
+    "error_retry": "다시 시도하십시오",
+    "generic_error": "잘못되었습니다",
+    "more": "더 보기"
   },
   "login": {
     "login": "로그인",
@@ -26,10 +44,19 @@
     "password": "암호",
     "placeholder": "예시: lain",
     "register": "가입",
-    "username": "사용자 이름"
+    "username": "사용자 이름",
+    "heading": {
+      "recovery": "2단계 복구",
+      "totp": "2단계인증"
+    },
+    "recovery_code": "복구 코드",
+    "enter_two_factor_code": "2단계인증 코드를 입력하십시오",
+    "enter_recovery_code": "복구 코드를 입력하십시오",
+    "authentication_code": "인증 코드",
+    "hint": "로그인하여 대화에 참가합시다"
   },
   "nav": {
-    "about": "About",
+    "about": "인스턴스 소개",
     "back": "뒤로",
     "chat": "로컬 챗",
     "friend_requests": "팔로우 요청",
@@ -37,18 +64,28 @@
     "dms": "다이렉트 메시지",
     "public_tl": "공개 타임라인",
     "timeline": "타임라인",
-    "twkn": "모든 알려진 네트워크",
+    "twkn": "알려진 네트워크",
     "user_search": "사용자 검색",
-    "preferences": "환경설정"
+    "preferences": "환경설정",
+    "chats": "채트",
+    "timelines": "타임라인",
+    "who_to_follow": "추천된 사용자",
+    "search": "검색",
+    "bookmarks": "북마크",
+    "interactions": "대화",
+    "administration": "관리"
   },
   "notifications": {
-    "broken_favorite": "알 수 없는 게시물입니다, 검색 합니다...",
+    "broken_favorite": "알 수 없는 게시물입니다, 검색합니다…",
     "favorited_you": "당신의 게시물을 즐겨찾기",
     "followed_you": "당신을 팔로우",
     "load_older": "오래 된 알림 불러오기",
     "notifications": "알림",
     "read": "읽음!",
-    "repeated_you": "당신의 게시물을 리핏"
+    "repeated_you": "당신의 게시물을 리핏",
+    "no_more_notifications": "알림이 없습니다",
+    "migrated_to": "이사했습니다",
+    "reacted_with": "{0} 로 반응했습니다"
   },
   "post_status": {
     "new_status": "새 게시물 게시",
@@ -59,7 +96,7 @@
       "text/plain": "평문"
     },
     "content_warning": "주제 (필수 아님)",
-    "default": "LA에 도착!",
+    "default": "인천공항에 도착했습니다.",
     "direct_warning": "이 게시물을 멘션 된 사용자들에게만 보여집니다",
     "posting": "게시",
     "scope": {
@@ -67,7 +104,9 @@
       "private": "팔로워 전용 - 팔로워들에게만",
       "public": "공개 - 공개 타임라인으로",
       "unlisted": "비공개 - 공개 타임라인에 게시 안 함"
-    }
+    },
+    "preview_empty": "아무것도 없습니다",
+    "preview": "미리보기"
   },
   "registration": {
     "bio": "소개",
@@ -85,7 +124,9 @@
       "password_required": "공백으로 둘 수 없습니다",
       "password_confirmation_required": "공백으로 둘 수 없습니다",
       "password_confirmation_match": "패스워드와 일치해야 합니다"
-    }
+    },
+    "fullname_placeholder": "예: 김례인",
+    "username_placeholder": "예: lain"
   },
   "settings": {
     "attachmentRadius": "첨부물",
@@ -112,7 +153,7 @@
     "data_import_export_tab": "데이터 불러오기 / 내보내기",
     "default_vis": "기본 공개 범위",
     "delete_account": "계정 삭제",
-    "delete_account_description": "계정과 메시지를 영구히 삭제.",
+    "delete_account_description": "데이터가 영구히 삭제되고 계정이 불활성화됩니다.",
     "delete_account_error": "계정을 삭제하는데 문제가 있습니다. 계속 발생한다면 인스턴스 관리자에게 문의하세요.",
     "delete_account_instructions": "계정 삭제를 확인하기 위해 아래에 패스워드 입력.",
     "export_theme": "프리셋 저장",
@@ -156,7 +197,7 @@
     "notification_visibility_repeats": "반복",
     "no_rich_text_description": "모든 게시물의 서식을 지우기",
     "hide_follows_description": "내가 팔로우하는 사람을 표시하지 않음",
-    "hide_followers_description": "나를 따르는 사람을 보여주지 마라.",
+    "hide_followers_description": "나를 따르는 사람을 숨기기",
     "nsfw_clickthrough": "NSFW 이미지 \"클릭해서 보이기\"를 활성화",
     "oauth_tokens": "OAuth 토큰",
     "token": "토큰",
@@ -303,14 +344,29 @@
         "button": "버튼",
         "text": "더 많은 {0} 그리고 {1}",
         "mono": "내용",
-        "input": "LA에 막 도착!",
+        "input": "인천공항에 도착했습니다.",
         "faint_link": "도움 되는 설명서",
         "fine_print": "우리의 {0} 를 읽고 도움 되지 않는 것들을 배우자!",
         "header_faint": "이건 괜찮아",
         "checkbox": "나는 약관을 대충 훑어보았습니다",
         "link": "작고 귀여운 링크"
       }
-    }
+    },
+    "block_export": "차단 목록 내보내기",
+    "mfa": {
+      "scan": {
+        "secret_code": "키",
+        "title": "스캔"
+      },
+      "authentication_methods": "인증 방법",
+      "waiting_a_recovery_codes": "예비 코드를 수신하고 있습니다…",
+      "recovery_codes": "복구 코드.",
+      "generate_new_recovery_codes": "새로운 복구 코드를 작성",
+      "title": "2단계인증",
+      "confirm_and_enable": "OTP 확인과 활성화",
+      "setup_otp": "OTP 설치"
+    },
+    "security": "보안"
   },
   "timeline": {
     "collapse": "접기",
@@ -339,7 +395,7 @@
     "its_you": "당신입니다!",
     "mute": "침묵",
     "muted": "침묵 됨",
-    "per_day": " / 하루",
+    "per_day": "/ 하루",
     "remote_follow": "원격 팔로우",
     "statuses": "게시물"
   },
@@ -357,11 +413,11 @@
     "favorite": "즐겨찾기",
     "user_settings": "사용자 설정"
   },
-  "upload":{
+  "upload": {
     "error": {
-    "base": "업로드 실패.",
-    "file_too_big": "파일이 너무 커요 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-    "default": "잠시 후에 다시 시도해 보세요"
+      "base": "업로드 실패.",
+      "file_too_big": "파일이 너무 커요 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "잠시 후에 다시 시도해 보세요"
     },
     "file_size_units": {
       "B": "바이트",
@@ -370,5 +426,79 @@
       "GiB": "기비바이트",
       "TiB": "테비바이트"
     }
+  },
+  "interactions": {
+    "follows": "새 팔로워",
+    "favs_repeats": "반복과 즐겨찾기"
+  },
+  "emoji": {
+    "load_all": "전체 {emojiAmount} 이모지 불러오기",
+    "unicode": "Unicode 이모지",
+    "custom": "전용 이모지",
+    "add_emoji": "이모지 넣기",
+    "search_emoji": "이모지 검색",
+    "emoji": "이모지",
+    "stickers": "스티커"
+  },
+  "polls": {
+    "add_poll": "투표를 추가",
+    "votes": "표",
+    "vote": "투표",
+    "type": "투표 형식",
+    "expiry": "투표 기간"
+  },
+  "media_modal": {
+    "next": "다음",
+    "previous": "이전"
+  },
+  "importer": {
+    "error": "이 파일을 가져올 때 오류가 발생하였습니다.",
+    "success": "정상히 불러왔습니다.",
+    "submit": "보내기"
+  },
+  "image_cropper": {
+    "cancel": "취소",
+    "save_without_cropping": "그대로 저장",
+    "save": "저장",
+    "crop_picture": "사진 자르기"
+  },
+  "exporter": {
+    "processing": "처리중입니다, 처리가 끝나면 파일을 다운로드하라는 지시가 있겠습니다",
+    "export": "내보내기"
+  },
+  "domain_mute_card": {
+    "unmute_progress": "침묵을 해제중…",
+    "unmute": "침묵 해제",
+    "mute_progress": "침묵으로 설정중…",
+    "mute": "침묵"
+  },
+  "about": {
+    "staff": "운영자",
+    "mrf": {
+      "simple": {
+        "media_nsfw_desc": "이 인스턴스에서는 아래의 인스턴스로부터 보내온 투고에 붙혀 있는 매체는 민감함으로 설정됩니다:",
+        "media_nsfw": "매체를 민감함으로 설정",
+        "media_removal_desc": "이 인스턴스에서는 아래의 인스턴스로부터 보내온 투고에 붙혀 있는 매체는 제거됩니다:",
+        "media_removal": "매체 제거",
+        "ftl_removal_desc": "이 인스턴스에서 아래의 인스턴스들은 \"알려진 모든 네트워크\" 타임라인에서 제외됩니다:",
+        "ftl_removal": "\"알려진 모든 네트워크\" 타임라인에서 제외",
+        "quarantine_desc": "이 인스턴스는 아래의 인스턴스에게 공개투고만을 보냅니다:",
+        "quarantine": "검역",
+        "reject_desc": "이 인스턴스에서는 아래의 인스턴스로부터 보내온 투고를 받아들이지 않습니다:",
+        "accept_desc": "이 인스턴스에서는 아래의 인스턴스로부터 보내온 투고만이 접수됩니다:",
+        "reject": "거부",
+        "accept": "허가",
+        "simple_policies": "인스턴스 특유의 폴리시"
+      },
+      "mrf_policies": "사용되는 MRF 폴리시",
+      "keyword": {
+        "is_replaced_by": "→",
+        "replace": "바꾸기",
+        "reject": "거부",
+        "ftl_removal": "\"알려진 모든 네트워크\" 타임라인에서 제외",
+        "keyword_policies": "단어 폴리시"
+      },
+      "federation": "연합"
+    }
   }
 }

From 376d4316817331c8ebc10a19ab460fcaa6b83e54 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Fri, 12 Feb 2021 08:23:47 +0000
Subject: [PATCH 332/389] Translated using Weblate (Italian)

Currently translated at 100.0% (682 of 682 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index a5986777..927856b0 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -17,7 +17,11 @@
     "close": "Chiudi",
     "retry": "Riprova",
     "error_retry": "Per favore, riprova",
-    "loading": "Carico…"
+    "loading": "Carico…",
+    "role": {
+      "moderator": "Moderatore",
+      "admin": "Amministratore"
+    }
   },
   "nav": {
     "mentions": "Menzioni",

From 6acf812101f79b450dc4efd2da051c634dd18621 Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Sat, 13 Feb 2021 16:34:43 +0300
Subject: [PATCH 333/389] User card: use general.role instead of card-specific
 roles

Also removes admin_menu.roles from some localizations since it is not
used anywhere
---
 src/components/user_card/user_card.vue |  2 +-
 src/i18n/en.json                       |  4 ----
 src/i18n/it.json                       | 12 ++++++------
 src/i18n/pt.json                       | 13 +++++++------
 src/i18n/ru.json                       | 12 ++++++------
 src/i18n/uk.json                       | 12 ++++++------
 6 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index c6c4dfee..572943b5 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -83,7 +83,7 @@
                   v-if="!!visibleRole"
                   class="alert user-role"
                 >
-                  {{ $t(`user_card.roles.${visibleRole}`) }}
+                  {{ $t(`general.role.${visibleRole}`) }}
                 </span>
                 <span
                   v-if="user.bot"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 46614ef1..4cc2af0e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -737,10 +737,6 @@
       "quarantine": "Disallow user posts from federating",
       "delete_user": "Delete user",
       "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
-    },
-    "roles": {
-      "admin": "Admin",
-      "moderator": "Moderator"
     }
   },
   "user_profile": {
diff --git a/src/i18n/it.json b/src/i18n/it.json
index b7d21e7e..ece1f33a 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -17,7 +17,11 @@
     "close": "Chiudi",
     "retry": "Riprova",
     "error_retry": "Per favore, riprova",
-    "loading": "Carico…"
+    "loading": "Carico…",
+    "role": {
+      "moderator": "Moderatore",
+      "admin": "Amministratore"
+    }
   },
   "nav": {
     "mentions": "Menzioni",
@@ -487,11 +491,7 @@
     "follow_progress": "Richiedo…",
     "follow_sent": "Richiesta inviata!",
     "favorites": "Preferiti",
-    "message": "Contatta",
-    "roles": {
-      "moderator": "Moderatore",
-      "admin": "Amministratore"
-    }
+    "message": "Contatta"
   },
   "chat": {
     "title": "Chat"
diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index b79985e8..841516c0 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -35,7 +35,12 @@
     "retry": "Tenta novamente",
     "error_retry": "Por favor, tenta novamente",
     "loading": "A carregar…",
-    "dismiss": "Ignorar"
+    "dismiss": "Ignorar",
+    "role":
+    {
+      "moderator": "Moderador",
+      "admin": "Admin"
+    }
   },
   "image_cropper": {
     "crop_picture": "Cortar imagem",
@@ -615,11 +620,7 @@
     "report": "Denunciar",
     "message": "Mensagem",
     "mention": "Mencionar",
-    "hidden": "Ocultar",
-    "roles": {
-      "moderator": "Moderador",
-      "admin": "Admin"
-    }
+    "hidden": "Ocultar"
   },
   "user_profile": {
     "timeline_title": "Cronologia do Utilizador",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 30a65741..15ebda95 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -24,7 +24,11 @@
     "retry": "Попробуйте еще раз",
     "error_retry": "Пожалуйста попробуйте еще раз",
     "close": "Закрыть",
-    "loading": "Загрузка…"
+    "loading": "Загрузка…",
+    "role": {
+      "moderator": "Модератор",
+      "admin": "Администратор"
+    }
   },
   "login": {
     "login": "Войти",
@@ -541,11 +545,7 @@
     "mention": "Упомянуть",
     "show_repeats": "Показывать повторы",
     "hide_repeats": "Скрыть повторы",
-    "report": "Пожаловаться",
-    "roles": {
-      "moderator": "Модератор",
-      "admin": "Администратор"
-    }
+    "report": "Пожаловаться"
   },
   "user_profile": {
     "timeline_title": "Лента пользователя"
diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 040d6f4f..98f65a0e 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -17,7 +17,11 @@
     "more": "Більше",
     "submit": "Відправити",
     "apply": "Застосувати",
-    "peek": "Глянути"
+    "peek": "Глянути",
+    "role": {
+      "moderator": "Модератор",
+      "admin": "Адміністратор"
+    }
   },
   "finder": {
     "error_fetching_user": "Користувача не знайдено",
@@ -760,11 +764,7 @@
     "unblock": "Розблокувати",
     "remote_follow": "Підписатись",
     "muted": "Заглушений",
-    "mute": "Заглушити",
-    "roles": {
-      "moderator": "Модератор",
-      "admin": "Адміністратор"
-    }
+    "mute": "Заглушити"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From 033b7eaeb94fc552e6bf04671153d3afae089f87 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sat, 13 Feb 2021 12:35:35 +0000
Subject: [PATCH 334/389] Translated using Weblate (Russian)

Currently translated at 83.6% (573 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 30a65741..caba8ec9 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -24,7 +24,11 @@
     "retry": "Попробуйте еще раз",
     "error_retry": "Пожалуйста попробуйте еще раз",
     "close": "Закрыть",
-    "loading": "Загрузка…"
+    "loading": "Загрузка…",
+    "role": {
+      "moderator": "Модератор",
+      "admin": "Администратор"
+    }
   },
   "login": {
     "login": "Войти",
@@ -615,7 +619,8 @@
     "gopher": "Gopher",
     "who_to_follow": "Предложения кого читать",
     "pleroma_chat_messages": "Pleroma Чат",
-    "upload_limit": "Наибольший размер загружаемого файла"
+    "upload_limit": "Наибольший размер загружаемого файла",
+    "scope_options": "Настраиваемая видимость статусов"
   },
   "tool_tip": {
     "accept_follow_request": "Принять запрос на чтение",

From cba48476ad4ade6253bd7fa64fbc4f180960ad75 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Sat, 13 Feb 2021 22:46:59 +0000
Subject: [PATCH 335/389] Translated using Weblate (Italian)

Currently translated at 100.0% (685 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 927856b0..31e3d968 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -496,7 +496,8 @@
     "roles": {
       "moderator": "Moderatore",
       "admin": "Amministratore"
-    }
+    },
+    "bot": "Bot"
   },
   "chat": {
     "title": "Chat"
@@ -665,7 +666,9 @@
     "expiry": "Età",
     "expires_in": "Chiude fra {0}",
     "expired": "Chiuso {0} fa",
-    "not_enough_options": "Aggiungi altre risposte"
+    "not_enough_options": "Aggiungi altre risposte",
+    "votes_count": "{count} voto | {count} voti",
+    "people_voted_count": "{count} votante | {count} votanti"
   },
   "interactions": {
     "favs_repeats": "Condivisi e Graditi",

From 7e11093fcde8815f37c2c4d15eeb96ef43533d7a Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Sat, 13 Feb 2021 22:33:33 +0000
Subject: [PATCH 336/389] Translated using Weblate (Japanese)

Currently translated at 100.0% (685 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 49 +++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 936ce7da..f54add7b 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -4,7 +4,7 @@
   },
   "exporter": {
     "export": "エクスポート",
-    "processing": "処理中です。処理が完了すると、ファイルをダウンロードするよう指示があります。"
+    "processing": "処理中です。処理が完了すると、ファイルをダウンロードするよう指示があります"
   },
   "features_panel": {
     "chat": "チャット",
@@ -39,7 +39,11 @@
     "dismiss": "無視",
     "retry": "もう一度お試し下さい",
     "error_retry": "もう一度お試し下さい",
-    "loading": "読み込み中…"
+    "loading": "読み込み中…",
+    "role": {
+      "moderator": "モデレーター",
+      "admin": "管理者"
+    }
   },
   "image_cropper": {
     "crop_picture": "画像を切り抜く",
@@ -120,7 +124,9 @@
     "expiry": "投票期間",
     "expires_in": "投票は {0} で終了します",
     "expired": "投票は {0} 前に終了しました",
-    "not_enough_options": "相異なる選択肢が不足しています"
+    "not_enough_options": "相異なる選択肢が不足しています",
+    "votes_count": "{count} 票 | {count} 票",
+    "people_voted_count": "{count} 人投票 | {count} 人投票"
   },
   "emoji": {
     "stickers": "ステッカー",
@@ -161,14 +167,14 @@
     "posting": "投稿",
     "scope_notice": {
       "public": "この投稿は、誰でも見ることができます",
-      "private": "この投稿は、あなたのフォロワーだけが、見ることができます。",
-      "unlisted": "この投稿は、パブリックタイムラインと、接続しているすべてのネットワークには、表示されません。"
+      "private": "この投稿は、あなたのフォロワーだけが、見ることができます",
+      "unlisted": "この投稿は、パブリックタイムラインと、接続しているすべてのネットワークには、表示されません"
     },
     "scope": {
-      "direct": "ダイレクト: メンションされたユーザーのみに届きます。",
-      "private": "フォロワー限定: フォロワーのみに届きます。",
-      "public": "パブリック: パブリックタイムラインに届きます。",
-      "unlisted": "アンリステッド: パブリックタイムラインに届きません。"
+      "direct": "ダイレクト: メンションされたユーザーのみに届きます",
+      "private": "フォロワー限定: フォロワーのみに届きます",
+      "public": "パブリック: パブリックタイムラインに届きます",
+      "unlisted": "アンリステッド: パブリックタイムラインに届きません"
     },
     "media_description_error": "メディアのアップロードに失敗しました。もう一度お試しください",
     "empty_status_error": "投稿内容を入力してください",
@@ -263,7 +269,7 @@
     "pad_emoji": "ピッカーから絵文字を挿入するとき、絵文字の両側にスペースを入れる",
     "export_theme": "保存",
     "filtering": "フィルタリング",
-    "filtering_explanation": "これらの言葉を含むすべてのものがミュートされます。1行に1つの言葉を書いてください。",
+    "filtering_explanation": "これらの言葉を含むすべてのものがミュートされます。1行に1つの言葉を書いてください",
     "follow_export": "フォローのエクスポート",
     "follow_export_button": "エクスポート",
     "follow_export_processing": "お待ちください。まもなくファイルをダウンロードできます。",
@@ -389,11 +395,15 @@
           "older_version_imported": "古いフロントエンドで作られたファイルをインポートしました。",
           "future_version_imported": "新しいフロントエンドで作られたファイルをインポートしました。",
           "v2_imported": "古いフロントエンドのためのファイルをインポートしました。設定した通りにならないかもしれません。",
-          "upgraded_from_v2": "フロントエンドが新しくなったので、今までの見た目と少し違うかもしれません。"
+          "upgraded_from_v2": "フロントエンドが新しくなったので、今までの見た目と少し違うかもしれません。",
+          "snapshot_source_mismatch": "フロントエンドがロールバックと更新を繰り返したため、バージョンが競合しています。",
+          "migration_napshot_gone": "スナップショットがありません、覚えているものと見た目が違うかもしれません。",
+          "snapshot_present": "テーマのスナップショットが読み込まれました。設定は上書きされました。代わりとして実データを読み込むことができます。"
         },
         "use_source": "新しいバージョン",
         "use_snapshot": "古いバージョン",
-        "load_theme": "テーマの読み込み"
+        "load_theme": "テーマの読み込み",
+        "keep_as_is": "変更しない"
       },
       "common": {
         "color": "色",
@@ -466,7 +476,7 @@
           "always_drop_shadow": "ブラウザーがサポートしていれば、常に {0} が使われます。",
           "drop_shadow_syntax": "{0} は、{1} パラメーターと {2} キーワードをサポートしていません。",
           "avatar_inset": "内側の影と外側の影を同時に使うと、透明なアバターの表示が乱れます。",
-          "spread_zero": "広がりが 0 よりも大きな影は、0 と同じです。",
+          "spread_zero": "広がりが 0 よりも大きな影は、0 と同じです",
           "inset_classic": "内側の影は {0} を使います"
         },
         "components": {
@@ -481,7 +491,8 @@
           "buttonPressed": "ボタン (押されているとき)",
           "buttonPressedHover": "ボタン (ホバー、かつ、押されているとき)",
           "input": "インプットフィールド"
-        }
+        },
+        "hintV3": "影の場合は、 {0} 表記を使って他の色スロットを使うこともできます。"
       },
       "fonts": {
         "_tab_label": "フォント",
@@ -559,7 +570,8 @@
     "mute_import": "ミュートのインポート",
     "mute_export": "ミュートのエクスポート",
     "allow_following_move": "フォロー中のアカウントが引っ越したとき、自動フォローを許可する",
-    "setting_changed": "規定の設定と異なっています"
+    "setting_changed": "規定の設定と異なっています",
+    "greentext": "引用を緑色で表示"
   },
   "time": {
     "day": "{0}日",
@@ -694,7 +706,8 @@
     "show_repeats": "リピートを見る",
     "hide_repeats": "リピートを隠す",
     "message": "メッセージ",
-    "hidden": "隠す"
+    "hidden": "隠す",
+    "bot": "bot"
   },
   "user_profile": {
     "timeline_title": "ユーザータイムライン",
@@ -799,7 +812,9 @@
     "audio": "オーディオ"
   },
   "remote_user_resolver": {
-    "error": "見つかりませんでした。"
+    "error": "見つかりませんでした。",
+    "searching_for": "検索中",
+    "remote_user_resolver": "リモートユーザーリゾルバ"
   },
   "errors": {
     "storage_unavailable": "ブラウザのストレージに接続できなかったため、ログインや設定情報は保存されません。Cookieを有効にしてください。"

From c3b267f2b9f6e36bc727708198de2bae705f85e0 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 15 Feb 2021 08:30:41 +0200
Subject: [PATCH 337/389] add padding to poll type to not have arrow icon
 overlap text

---
 src/components/poll/poll_form.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index 09496105..c4403210 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -151,6 +151,7 @@
       border: none;
       box-shadow: none;
       background-color: transparent;
+      padding-right: 0.75em;
     }
   }
 

From a636e5340426f8c9b40811bd01c8710f438a2cf2 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 15 Feb 2021 11:10:09 +0200
Subject: [PATCH 338/389] add reason field when approval is required

---
 src/boot/after_store.js                      |  1 +
 src/components/registration/registration.js  | 17 +++++++++++++----
 src/components/registration/registration.vue | 17 +++++++++++++++++
 src/i18n/en.json                             |  2 ++
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index b472fcf6..45090e5d 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -51,6 +51,7 @@ const getInstanceConfig = async ({ store }) => {
       const vapidPublicKey = data.pleroma.vapid_public_key
 
       store.dispatch('setInstanceOption', { name: 'textlimit', value: textlimit })
+      store.dispatch('setInstanceOption', { name: 'accountApprovalRequired', value: data.approval_required })
 
       if (vapidPublicKey) {
         store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index dab06e1e..1ac8e8be 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -10,7 +10,8 @@ const registration = {
       fullname: '',
       username: '',
       password: '',
-      confirm: ''
+      confirm: '',
+      reason: ''
     },
     captcha: {}
   }),
@@ -24,7 +25,8 @@ const registration = {
         confirm: {
           required,
           sameAsPassword: sameAs('password')
-        }
+        },
+        reason: { required: requiredIf(() => this.accountApprovalRequired) }
       }
     }
   },
@@ -38,7 +40,10 @@ const registration = {
   computed: {
     token () { return this.$route.params.token },
     bioPlaceholder () {
-      return this.$t('registration.bio_placeholder').replace(/\s*\n\s*/g, ' \n')
+      return this.replaceNewlines(this.$t('registration.bio_placeholder'))
+    },
+    reasonPlaceholder () {
+      return this.replaceNewlines(this.$t('registration.reason_placeholder'))
     },
     ...mapState({
       registrationOpen: (state) => state.instance.registrationOpen,
@@ -46,7 +51,8 @@ const registration = {
       isPending: (state) => state.users.signUpPending,
       serverValidationErrors: (state) => state.users.signUpErrors,
       termsOfService: (state) => state.instance.tos,
-      accountActivationRequired: (state) => state.instance.accountActivationRequired
+      accountActivationRequired: (state) => state.instance.accountActivationRequired,
+      accountApprovalRequired: (state) => state.instance.accountApprovalRequired
     })
   },
   methods: {
@@ -73,6 +79,9 @@ const registration = {
     },
     setCaptcha () {
       this.getCaptcha().then(cpt => { this.captcha = cpt })
+    },
+    replaceNewlines (str) {
+      return str.replace(/\s*\n\s*/g, ' \n')
     }
   }
 }
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 100df0d6..062d4121 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -162,6 +162,23 @@
               </ul>
             </div>
 
+            <div
+              v-if="accountApprovalRequired"
+              class="form-group"
+            >
+              <label
+                class="form--label"
+                for="reason"
+              >{{ $t('registration.reason') }}</label>
+              <textarea
+                id="reason"
+                v-model="user.reason"
+                :disabled="isPending"
+                class="form-control"
+                :placeholder="reasonPlaceholder"
+              />
+            </div>
+
             <div
               v-if="captcha.type != 'none'"
               id="captcha-group"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 4cc2af0e..0e069785 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -228,6 +228,8 @@
     "username_placeholder": "e.g. lain",
     "fullname_placeholder": "e.g. Lain Iwakura",
     "bio_placeholder": "e.g.\nHi, I'm Lain.\nI’m an anime girl living in suburban Japan. You may know me from the Wired.",
+    "reason": "Reason to register",
+    "reason_placeholder": "This instance approves registrations manually.\nLet the administration know why you want to register.",
     "validations": {
       "username_required": "cannot be left blank",
       "fullname_required": "cannot be left blank",

From 23a5c601a74d65e2f7368f6e918fdd07ffc85174 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 15 Feb 2021 11:35:14 +0200
Subject: [PATCH 339/389] changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4be7da..c11c3162 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
 
+### Added
+- Added reason field for registration when approval is required
+
 ## [2.2.3] - 2021-01-18
 ### Added
 - Added Report button to status ellipsis menu for easier reporting

From 265bb2cd411a15faabfdc08f20b9355d379091fe Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Mon, 15 Feb 2021 13:17:52 +0300
Subject: [PATCH 340/389] Add myself to .mailmap

I changed my email to rin@patch.cx
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..0b198a47
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+rinpatch <rin@patch.cx> <rinpatch@sdf.org>
\ No newline at end of file

From e720d4dd8ab2ee8470719cc55974dcccf998815a Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Mon, 15 Feb 2021 08:57:25 +0000
Subject: [PATCH 341/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (682 of 683 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index b4185b30..3b377b85 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -39,7 +39,11 @@
     "close": "关闭",
     "retry": "重试",
     "error_retry": "请重试",
-    "loading": "载入中…"
+    "loading": "载入中…",
+    "role": {
+      "moderator": "监察员",
+      "admin": "管理员"
+    }
   },
   "image_cropper": {
     "crop_picture": "裁剪图片",
@@ -120,7 +124,9 @@
     "expiry": "投票期限",
     "expires_in": "投票于 {0} 后结束",
     "expired": "投票 {0} 前已结束",
-    "not_enough_options": "投票的选项太少"
+    "not_enough_options": "投票的选项太少",
+    "votes_count": "{count} 票 | {count} 票",
+    "people_voted_count": "{count} 人已投票 | {count} 人已投票"
   },
   "stickers": {
     "add_sticker": "添加贴纸"
@@ -552,7 +558,8 @@
     "mute_import": "隐藏名单导入",
     "mute_export_button": "导出你的隐藏名单到一个 csv 文件",
     "mute_export": "隐藏名单导出",
-    "hide_wallpaper": "隐藏实例壁纸"
+    "hide_wallpaper": "隐藏实例壁纸",
+    "setting_changed": "与默认设置不同"
   },
   "time": {
     "day": "{0} 天",
@@ -683,7 +690,8 @@
     "show_repeats": "显示转发",
     "hide_repeats": "隐藏转发",
     "message": "消息",
-    "mention": "提及"
+    "mention": "提及",
+    "bot": "机器人"
   },
   "user_profile": {
     "timeline_title": "用户时间线",

From 47770ed7151ad0ba1cd8b77eb52590edd9ce9737 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 17 Feb 2021 10:16:58 +0200
Subject: [PATCH 342/389] get rid of older messages when scrolling down in chat
 to keep it from bloating dom

---
 src/components/chat/chat.js               |  1 +
 src/modules/chats.js                      |  6 ++++++
 src/services/chat_service/chat_service.js | 17 +++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index e57fcb91..f446f25b 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -241,6 +241,7 @@ const Chat = {
         this.fetchChat({ maxId: this.currentChatMessageService.minId })
       } else if (this.bottomedOut(JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET)) {
         this.jumpToBottomButtonVisible = false
+        this.$store.dispatch('cullOlderMessages', this.currentChatMessageService.chatId)
         if (this.newMessageCount > 0) {
           // Use a delay before marking as read to prevent situation where new messages
           // arrive just as you're leaving the view and messages that you didn't actually
diff --git a/src/modules/chats.js b/src/modules/chats.js
index 0a373d88..69d683bd 100644
--- a/src/modules/chats.js
+++ b/src/modules/chats.js
@@ -115,6 +115,9 @@ const chats = {
     },
     handleMessageError ({ commit }, value) {
       commit('handleMessageError', { commit, ...value })
+    },
+    cullOlderMessages ({ commit }, chatId) {
+      commit('cullOlderMessages', chatId)
     }
   },
   mutations: {
@@ -227,6 +230,9 @@ const chats = {
     handleMessageError (state, { chatId, fakeId, isRetry }) {
       const chatMessageService = state.openedChatMessageServices[chatId]
       chatService.handleMessageError(chatMessageService, fakeId, isRetry)
+    },
+    cullOlderMessages (state, chatId) {
+      chatService.cullOlderMessages(state.openedChatMessageServices[chatId])
     }
   }
 }
diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js
index e653ebc1..92ff689d 100644
--- a/src/services/chat_service/chat_service.js
+++ b/src/services/chat_service/chat_service.js
@@ -48,6 +48,22 @@ const deleteMessage = (storage, messageId) => {
   }
 }
 
+const cullOlderMessages = (storage) => {
+  const maxIndex = storage.messages.length
+  const minIndex = maxIndex - 50
+  if (maxIndex <= 50) return
+
+  storage.messages = _.sortBy(storage.messages, ['id'])
+  storage.minId = storage.messages[minIndex].id
+  for (const message of storage.messages) {
+    if (message.id < storage.minId) {
+      delete storage.idIndex[message.id]
+      delete storage.idempotencyKeyIndex[message.idempotency_key]
+    }
+  }
+  storage.messages = storage.messages.slice(minIndex, maxIndex)
+}
+
 const handleMessageError = (storage, fakeId, isRetry) => {
   if (!storage) { return }
   const fakeMessage = storage.idIndex[fakeId]
@@ -201,6 +217,7 @@ const ChatService = {
   empty,
   getView,
   deleteMessage,
+  cullOlderMessages,
   resetNewMessageCount,
   clear,
   handleMessageError

From 7834ff52b1df539f27fd4f30efc0181fcc3d9995 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 17 Feb 2021 10:53:38 +0200
Subject: [PATCH 343/389] add test

---
 .../services/chat_service/chat_service.spec.js  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/unit/specs/services/chat_service/chat_service.spec.js b/test/unit/specs/services/chat_service/chat_service.spec.js
index 0251cae7..fbbca436 100644
--- a/test/unit/specs/services/chat_service/chat_service.spec.js
+++ b/test/unit/specs/services/chat_service/chat_service.spec.js
@@ -88,4 +88,21 @@ describe('chatService', () => {
       expect(view.map(i => i.type)).to.eql(['date', 'message', 'message', 'date', 'message'])
     })
   })
+
+  describe('.cullOlderMessages', () => {
+    it('keeps 50 newest messages and idIndex matches', () => {
+      const chat = chatService.empty()
+
+      for (let i = 100; i > 0; i--) {
+        // Use decimal values with toFixed to hack together constant length predictable strings
+        chatService.add(chat, { messages: [{ ...message1, id: 'a' + (i / 1000).toFixed(3), idempotency_key: i }] })
+      }
+      chatService.cullOlderMessages(chat)
+      expect(chat.messages.length).to.eql(50)
+      expect(chat.messages[0].id).to.eql('a0.051')
+      expect(chat.minId).to.eql('a0.051')
+      expect(chat.messages[49].id).to.eql('a0.100')
+      expect(Object.keys(chat.idIndex).length).to.eql(50)
+    })
+  })
 })

From ee1cf36d523126630c20b0de0498207bafa14b3d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 17 Feb 2021 10:54:14 +0200
Subject: [PATCH 344/389] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4be7da..7b286f40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
+- Optimized chat to not get horrible performance after keeping the same chat open for a long time
 
 ## [2.2.3] - 2021-01-18
 ### Added

From 67f3532ac95b2a8740ccbde581e74ac65eb20a9a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Feb 2021 10:14:45 +0200
Subject: [PATCH 345/389] add additional check with timeout

---
 src/components/chat/chat.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index f446f25b..2780be75 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -234,6 +234,13 @@ const Chat = {
       const scrollable = this.$refs.scrollable
       return scrollable && scrollable.scrollTop <= 0
     },
+    cullOlderCheck () {
+      window.setTimeout(() => {
+        if (this.bottomedOut(JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET)) {
+          this.$store.dispatch('cullOlderMessages', this.currentChatMessageService.chatId)
+        }
+      }, 5000)
+    },
     handleScroll: _.throttle(function () {
       if (!this.currentChat) { return }
 
@@ -241,7 +248,7 @@ const Chat = {
         this.fetchChat({ maxId: this.currentChatMessageService.minId })
       } else if (this.bottomedOut(JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET)) {
         this.jumpToBottomButtonVisible = false
-        this.$store.dispatch('cullOlderMessages', this.currentChatMessageService.chatId)
+        this.cullOlderCheck()
         if (this.newMessageCount > 0) {
           // Use a delay before marking as read to prevent situation where new messages
           // arrive just as you're leaving the view and messages that you didn't actually

From d0b1a68f8625fdb217533d6599bc5ce0c23d0699 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 20 Feb 2021 16:01:20 +0000
Subject: [PATCH 346/389] Translated using Weblate (Esperanto)

Currently translated at 100.0% (683 of 683 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 58f8e125..9f0491fb 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -35,7 +35,11 @@
     "retry": "Reprovi",
     "error_retry": "Bonvolu reprovi",
     "loading": "Enlegante…",
-    "peek": "Antaŭmontri"
+    "peek": "Antaŭmontri",
+    "role": {
+      "moderator": "Reguligisto",
+      "admin": "Administranto"
+    }
   },
   "image_cropper": {
     "crop_picture": "Tondi bildon",
@@ -365,7 +369,8 @@
         "post": "Afiŝoj/Priskriboj de uzantoj",
         "alert_neutral": "Neŭtrala",
         "alert_warning": "Averto",
-        "toggled": "Ŝaltita"
+        "toggled": "Ŝaltita",
+        "wallpaper": "Fonbildo"
       },
       "radii": {
         "_tab_label": "Rondeco"
@@ -516,7 +521,9 @@
     "mute_import_error": "Eraris enporto de silentigoj",
     "mute_import": "Enporto de silentigoj",
     "mute_export_button": "Elportu viajn silentigojn al CSV-dosiero",
-    "mute_export": "Elporto de silentigoj"
+    "mute_export": "Elporto de silentigoj",
+    "hide_wallpaper": "Kaŝi fonbildon de nodo",
+    "setting_changed": "Agordo malsamas de la implicita"
   },
   "timeline": {
     "collapse": "Maletendi",
@@ -586,7 +593,8 @@
     "show_repeats": "Montri ripetojn",
     "hide_repeats": "Kaŝi ripetojn",
     "unsubscribe": "Ne ricevi sciigojn",
-    "subscribe": "Ricevi sciigojn"
+    "subscribe": "Ricevi sciigojn",
+    "bot": "Roboto"
   },
   "user_profile": {
     "timeline_title": "Historio de uzanto",
@@ -612,7 +620,8 @@
     "error": {
       "base": "Alŝuto malsukcesis.",
       "file_too_big": "Dosiero estas tro granda [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Reprovu pli poste"
+      "default": "Reprovu pli poste",
+      "message": "Malsukcesis alŝuto: {0}"
     },
     "file_size_units": {
       "B": "B",
@@ -645,7 +654,9 @@
     "votes": "voĉoj",
     "option": "Elekteblo",
     "add_option": "Aldoni elekteblon",
-    "add_poll": "Aldoni enketon"
+    "add_poll": "Aldoni enketon",
+    "votes_count": "{count} voĉdono | {count} voĉdonoj",
+    "people_voted_count": "{count} persono voĉdonis | {count} personoj voĉdonis"
   },
   "importer": {
     "error": "Eraris enporto de ĉi tiu dosiero.",
@@ -732,7 +743,9 @@
     "repeats": "Ripetoj",
     "favorites": "Ŝatoj",
     "status_deleted": "Ĉi tiu afiŝo foriĝis",
-    "nsfw": "Konsterna"
+    "nsfw": "Konsterna",
+    "expand": "Etendi",
+    "external_source": "Ekstera fonto"
   },
   "time": {
     "years_short": "{0}j",

From d5f191db389c10918f99e138b567ebc3b35ee977 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Sat, 20 Feb 2021 22:47:05 +0000
Subject: [PATCH 347/389] Translated using Weblate (Italian)

Currently translated at 100.0% (685 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 0a3d0ce2..32028262 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -584,7 +584,9 @@
     "fullname_placeholder": "es. Lupo Lucio",
     "username_placeholder": "es. mister_wolf",
     "new_captcha": "Clicca l'immagine per avere un altro captcha",
-    "captcha": "CAPTCHA"
+    "captcha": "CAPTCHA",
+    "reason_placeholder": "L'amministratore esamina ciascuna richiesta.\nFornisci il motivo della tua iscrizione.",
+    "reason": "Motivo dell'iscrizione"
   },
   "user_profile": {
     "timeline_title": "Sequenza dell'Utente",

From 20997d6cfc954d35a15cbed6668e7236ff4ee948 Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Sat, 20 Feb 2021 23:26:19 +0000
Subject: [PATCH 348/389] Translated using Weblate (Japanese)

Currently translated at 100.0% (685 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index f54add7b..267a89ae 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -201,7 +201,9 @@
       "password_required": "必須",
       "password_confirmation_required": "必須",
       "password_confirmation_match": "パスワードが違います"
-    }
+    },
+    "reason_placeholder": "このインスタンスは、新規登録を手動で受け付けています。\n登録したい理由を、インスタンスの管理者に教えてください。",
+    "reason": "登録するための目的"
   },
   "selectable_list": {
     "select_all": "すべて選択"

From 3983ea79cd76decc0ca0ffbf43444ccd7d70651b Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Sat, 20 Feb 2021 23:29:55 +0000
Subject: [PATCH 349/389] Translated using Weblate (Korean)

Currently translated at 66.7% (457 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
---
 src/i18n/ko.json | 97 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 89 insertions(+), 8 deletions(-)

diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 101ef487..73e50f3f 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -35,7 +35,11 @@
     "retry": "다시 시도하십시오",
     "error_retry": "다시 시도하십시오",
     "generic_error": "잘못되었습니다",
-    "more": "더 보기"
+    "more": "더 보기",
+    "role": {
+      "moderator": "중재자",
+      "admin": "관리자"
+    }
   },
   "login": {
     "login": "로그인",
@@ -85,7 +89,8 @@
     "repeated_you": "당신의 게시물을 리핏",
     "no_more_notifications": "알림이 없습니다",
     "migrated_to": "이사했습니다",
-    "reacted_with": "{0} 로 반응했습니다"
+    "reacted_with": "{0} 로 반응했습니다",
+    "error": "알림 불러오기 실패: {0}"
   },
   "post_status": {
     "new_status": "새 게시물 게시",
@@ -93,7 +98,10 @@
     "account_not_locked_warning_link": "잠김",
     "attachments_sensitive": "첨부물을 민감함으로 설정",
     "content_type": {
-      "text/plain": "평문"
+      "text/plain": "평문",
+      "text/bbcode": "BBCode",
+      "text/markdown": "Markdown",
+      "text/html": "HTML"
     },
     "content_warning": "주제 (필수 아님)",
     "default": "인천공항에 도착했습니다.",
@@ -106,7 +114,13 @@
       "unlisted": "비공개 - 공개 타임라인에 게시 안 함"
     },
     "preview_empty": "아무것도 없습니다",
-    "preview": "미리보기"
+    "preview": "미리보기",
+    "scope_notice": {
+      "public": "이 글은 누구나 볼 수 있습니다"
+    },
+    "media_description_error": "파일을 올리지 못하였습니다. 다시한번 시도하여 주십시오",
+    "empty_status_error": "글을 입력하십시오",
+    "media_description": "첨부파일 설명"
   },
   "registration": {
     "bio": "소개",
@@ -288,7 +302,16 @@
         "borders": "테두리",
         "buttons": "버튼",
         "inputs": "입력칸",
-        "faint_text": "흐려진 텍스트"
+        "faint_text": "흐려진 텍스트",
+        "chat": {
+          "border": "경계선",
+          "outgoing": "송신",
+          "incoming": "수신"
+        },
+        "selectedMenu": "선택된 메뉴 요소",
+        "selectedPost": "선택된 글",
+        "icons": "아이콘",
+        "alert_warning": "경고"
       },
       "radii": {
         "_tab_label": "둥글기"
@@ -364,9 +387,24 @@
       "generate_new_recovery_codes": "새로운 복구 코드를 작성",
       "title": "2단계인증",
       "confirm_and_enable": "OTP 확인과 활성화",
-      "setup_otp": "OTP 설치"
+      "setup_otp": "OTP 설치",
+      "otp": "OTP"
     },
-    "security": "보안"
+    "security": "보안",
+    "emoji_reactions_on_timeline": "이모지 반응을 타임라인으로 표시",
+    "avatar_size_instruction": "크기를 150x150 이상으로 설정할 것을 추장합니다.",
+    "blocks_tab": "차단",
+    "notification_setting_privacy": "보안",
+    "user_mutes": "사용자",
+    "notification_visibility_emoji_reactions": "반응",
+    "profile_fields": {
+      "value": "내용"
+    },
+    "mutes_and_blocks": "침묵과 차단",
+    "chatMessageRadius": "챗 메시지",
+    "change_email": "전자메일 주소 바꾸기",
+    "changed_email": "메일주소가 갱신되었습니다!",
+    "bot": "이 계정은 bot입니다"
   },
   "timeline": {
     "collapse": "접기",
@@ -445,7 +483,11 @@
     "votes": "표",
     "vote": "투표",
     "type": "투표 형식",
-    "expiry": "투표 기간"
+    "expiry": "투표 기간",
+    "votes_count": "{count} 표 | {count} 표",
+    "people_voted_count": "{count} 명 투표 | {count} 명 투표",
+    "option": "선택지",
+    "add_option": "선택지 추가"
   },
   "media_modal": {
     "next": "다음",
@@ -500,5 +542,44 @@
       },
       "federation": "연합"
     }
+  },
+  "shoutbox": {
+    "title": "Shoutbox"
+  },
+  "time": {
+    "years_short": "{0} 년",
+    "year_short": "{0} 년",
+    "years": "{0} 년",
+    "year": "{0} 년",
+    "weeks_short": "{0} 주일",
+    "week_short": "{0} 주일",
+    "weeks": "{0} 주일",
+    "week": "{0} 주일",
+    "seconds_short": "{0} 초",
+    "second_short": "{0} 초",
+    "seconds": "{0} 초",
+    "second": "{0} 초",
+    "now_short": "방금",
+    "now": "방끔",
+    "months_short": "{0} 달 전",
+    "month_short": "{0} 달 전",
+    "months": "{0} 달 전",
+    "month": "{0} 달 전",
+    "minutes_short": "{0} 분",
+    "minute_short": "{0} 분",
+    "minutes": "{0} 분",
+    "minute": "{0} 분",
+    "in_past": "{0} 전",
+    "hours_short": "{0} 시간",
+    "hour_short": "{0} 시간",
+    "hours": "{0} 시간",
+    "hour": "{0} 시간",
+    "days_short": "{0} 일",
+    "day_short": "{0} 일",
+    "days": "{0} 일",
+    "day": "{0} 일"
+  },
+  "remote_user_resolver": {
+    "error": "찾을 수 없습니다."
   }
 }

From 226ec1c5bea8aa3a77f95fcc4581e5e01efa7c54 Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Sun, 21 Feb 2021 02:54:02 +0000
Subject: [PATCH 350/389] Translated using Weblate (Korean)

Currently translated at 66.8% (458 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
---
 src/i18n/ko.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 73e50f3f..c8d213f3 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -404,7 +404,8 @@
     "chatMessageRadius": "챗 메시지",
     "change_email": "전자메일 주소 바꾸기",
     "changed_email": "메일주소가 갱신되었습니다!",
-    "bot": "이 계정은 bot입니다"
+    "bot": "이 계정은 bot입니다",
+    "mutes_tab": "침묵"
   },
   "timeline": {
     "collapse": "접기",

From 5ddfc787ed78313952b34e63f4f3156387b50098 Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Sun, 21 Feb 2021 03:44:53 +0000
Subject: [PATCH 351/389] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (684 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 3b377b85..5e377f7c 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -189,7 +189,9 @@
       "password_required": "不能留空",
       "password_confirmation_required": "不能留空",
       "password_confirmation_match": "密码不一致"
-    }
+    },
+    "reason_placeholder": "此实例的注册需要手动批准。\n请让管理员知道您为什么想要注册。",
+    "reason": "注册理由"
   },
   "selectable_list": {
     "select_all": "选择全部"

From 98cb9abac773e8fbce94eafea1025919b6f26360 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 22 Feb 2021 16:24:04 +0200
Subject: [PATCH 352/389] Add timeline menu toggle to nav panel

---
 CHANGELOG.md                                  |  2 +
 src/components/nav_panel/nav_panel.js         | 36 ++++++----
 src/components/nav_panel/nav_panel.vue        | 70 +++++++++++++++----
 src/components/timeline_menu/timeline_menu.js | 31 ++------
 .../timeline_menu/timeline_menu.vue           | 48 +------------
 .../timeline_menu/timeline_menu_content.js    | 29 ++++++++
 .../timeline_menu/timeline_menu_content.vue   | 66 +++++++++++++++++
 src/i18n/en.json                              |  1 +
 8 files changed, 183 insertions(+), 100 deletions(-)
 create mode 100644 src/components/timeline_menu/timeline_menu_content.js
 create mode 100644 src/components/timeline_menu/timeline_menu_content.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4be7da..15e63d00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
+- Changed the "Timelines" link in side panel to toggle show all timeline options inside the panel
+- Renamed "Timeline" to "Home Timeline" to be more clear
 
 ## [2.2.3] - 2021-01-18
 ### Added
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 81d49cc2..37bcb409 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -1,4 +1,4 @@
-import { timelineNames } from '../timeline_menu/timeline_menu.js'
+import TimelineMenuContent from '../timeline_menu/timeline_menu_content.vue'
 import { mapState, mapGetters } from 'vuex'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -7,10 +7,12 @@ import {
   faGlobe,
   faBookmark,
   faEnvelope,
-  faHome,
+  faChevronDown,
+  faChevronUp,
   faComments,
   faBell,
-  faInfoCircle
+  faInfoCircle,
+  faStream
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -18,10 +20,12 @@ library.add(
   faGlobe,
   faBookmark,
   faEnvelope,
-  faHome,
+  faChevronDown,
+  faChevronUp,
   faComments,
   faBell,
-  faInfoCircle
+  faInfoCircle,
+  faStream
 )
 
 const NavPanel = {
@@ -30,16 +34,20 @@ const NavPanel = {
       this.$store.dispatch('startFetchingFollowRequests')
     }
   },
+  components: {
+    TimelineMenuContent
+  },
+  data () {
+    return {
+      showTimelines: false
+    }
+  },
+  methods: {
+    toggleTimelines () {
+      this.showTimelines = !this.showTimelines
+    }
+  },
   computed: {
-    onTimelineRoute () {
-      return !!timelineNames()[this.$route.name]
-    },
-    timelinesRoute () {
-      if (this.$store.state.interface.lastTimeline) {
-        return this.$store.state.interface.lastTimeline
-      }
-      return this.currentUser ? 'friends' : 'public-timeline'
-    },
     ...mapState({
       currentUser: state => state.users.currentUser,
       followRequestCount: state => state.api.followRequests.length,
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 0c83d0fe..7ae7b1d6 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -3,19 +3,33 @@
     <div class="panel panel-default">
       <ul>
         <li v-if="currentUser || !privateMode">
-          <router-link
-            :to="{ name: timelinesRoute }"
-            :class="onTimelineRoute && 'router-link-active'"
+          <button
+            class="button-unstyled menu-item"
+            @click="toggleTimelines"
           >
             <FAIcon
               fixed-width
               class="fa-scale-110"
-              icon="home"
+              icon="stream"
             />{{ $t("nav.timelines") }}
-          </router-link>
+            <FAIcon
+              class="timelines-chevron"
+              fixed-width
+              :icon="showTimelines ? 'chevron-up' : 'chevron-down'"
+            />
+          </button>
+          <div
+            v-show="showTimelines"
+            class="timelines-background"
+          >
+            <TimelineMenuContent class="timelines" />
+          </div>
         </li>
         <li v-if="currentUser">
-          <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
+          <router-link
+            class="menu-item"
+            :to="{ name: 'interactions', params: { username: currentUser.screen_name } }"
+          >
             <FAIcon
               fixed-width
               class="fa-scale-110"
@@ -24,7 +38,10 @@
           </router-link>
         </li>
         <li v-if="currentUser && pleromaChatMessagesAvailable">
-          <router-link :to="{ name: 'chats', params: { username: currentUser.screen_name } }">
+          <router-link
+            class="menu-item"
+            :to="{ name: 'chats', params: { username: currentUser.screen_name } }"
+          >
             <div
               v-if="unreadChatCount"
               class="badge badge-notification"
@@ -39,7 +56,10 @@
           </router-link>
         </li>
         <li v-if="currentUser && currentUser.locked">
-          <router-link :to="{ name: 'friend-requests' }">
+          <router-link
+            class="menu-item"
+            :to="{ name: 'friend-requests' }"
+          >
             <FAIcon
               fixed-width
               class="fa-scale-110"
@@ -54,7 +74,10 @@
           </router-link>
         </li>
         <li>
-          <router-link :to="{ name: 'about' }">
+          <router-link
+            class="menu-item"
+            :to="{ name: 'about' }"
+          >
             <FAIcon
               fixed-width
               class="fa-scale-110"
@@ -91,14 +114,14 @@
     border-color: var(--border, $fallback--border);
     padding: 0;
 
-    &:first-child a {
+    &:first-child .menu-item {
       border-top-right-radius: $fallback--panelRadius;
       border-top-right-radius: var(--panelRadius, $fallback--panelRadius);
       border-top-left-radius: $fallback--panelRadius;
       border-top-left-radius: var(--panelRadius, $fallback--panelRadius);
     }
 
-    &:last-child a {
+    &:last-child .menu-item {
       border-bottom-right-radius: $fallback--panelRadius;
       border-bottom-right-radius: var(--panelRadius, $fallback--panelRadius);
       border-bottom-left-radius: $fallback--panelRadius;
@@ -110,13 +133,15 @@
     border: none;
   }
 
-  a {
+  .menu-item {
     display: block;
     box-sizing: border-box;
-    align-items: stretch;
     height: 3.5em;
     line-height: 3.5em;
     padding: 0 1em;
+    width: 100%;
+    color: $fallback--link;
+    color: var(--link, $fallback--link);
 
     &:hover {
       background-color: $fallback--lightBg;
@@ -146,6 +171,25 @@
     }
   }
 
+  .timelines-chevron {
+    margin-left: 0.8em;
+    font-size: 1.1em;
+  }
+
+  .timelines-background {
+    padding: 0 0 0 0.6em;
+    background-color: $fallback--lightBg;
+    background-color: var(--selectedMenu, $fallback--lightBg);
+    border-top: 1px solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
+  }
+
+  .timelines {
+    background-color: $fallback--bg;
+    background-color: var(--bg, $fallback--bg);
+  }
+
   .fa-scale-110 {
     margin-right: 0.8em;
   }
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index 8d6a58b1..bab51e75 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -1,29 +1,17 @@
 import Popover from '../popover/popover.vue'
-import { mapState } from 'vuex'
+import TimelineMenuContent from './timeline_menu_content.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faUsers,
-  faGlobe,
-  faBookmark,
-  faEnvelope,
-  faHome,
   faChevronDown
 } from '@fortawesome/free-solid-svg-icons'
 
-library.add(
-  faUsers,
-  faGlobe,
-  faBookmark,
-  faEnvelope,
-  faHome,
-  faChevronDown
-)
+library.add(faChevronDown)
 
 // Route -> i18n key mapping, exported and not in the computed
 // because nav panel benefits from the same information.
 export const timelineNames = () => {
   return {
-    'friends': 'nav.timeline',
+    'friends': 'nav.home_timeline',
     'bookmarks': 'nav.bookmarks',
     'dms': 'nav.dms',
     'public-timeline': 'nav.public_tl',
@@ -33,7 +21,8 @@ export const timelineNames = () => {
 
 const TimelineMenu = {
   components: {
-    Popover
+    Popover,
+    TimelineMenuContent
   },
   data () {
     return {
@@ -41,9 +30,6 @@ const TimelineMenu = {
     }
   },
   created () {
-    if (this.currentUser && this.currentUser.locked) {
-      this.$store.dispatch('startFetchingFollowRequests')
-    }
     if (timelineNames()[this.$route.name]) {
       this.$store.dispatch('setLastTimeline', this.$route.name)
     }
@@ -75,13 +61,6 @@ const TimelineMenu = {
       const i18nkey = timelineNames()[this.$route.name]
       return i18nkey ? this.$t(i18nkey) : route
     }
-  },
-  computed: {
-    ...mapState({
-      currentUser: state => state.users.currentUser,
-      privateMode: state => state.instance.private,
-      federating: state => state.instance.federating
-    })
   }
 }
 
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index 3c86842b..22dc3432 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -13,53 +13,7 @@
       slot="content"
       class="timeline-menu-popover panel panel-default"
     >
-      <ul>
-        <li v-if="currentUser">
-          <router-link :to="{ name: 'friends' }">
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding "
-              icon="home"
-            />{{ $t("nav.timeline") }}
-          </router-link>
-        </li>
-        <li v-if="currentUser">
-          <router-link :to="{ name: 'bookmarks'}">
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding "
-              icon="bookmark"
-            />{{ $t("nav.bookmarks") }}
-          </router-link>
-        </li>
-        <li v-if="currentUser">
-          <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding "
-              icon="envelope"
-            />{{ $t("nav.dms") }}
-          </router-link>
-        </li>
-        <li v-if="currentUser || !privateMode">
-          <router-link :to="{ name: 'public-timeline' }">
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding "
-              icon="users"
-            />{{ $t("nav.public_tl") }}
-          </router-link>
-        </li>
-        <li v-if="federating && (currentUser || !privateMode)">
-          <router-link :to="{ name: 'public-external-timeline' }">
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding "
-              icon="globe"
-            />{{ $t("nav.twkn") }}
-          </router-link>
-        </li>
-      </ul>
+      <TimelineMenuContent />
     </div>
     <div
       slot="trigger"
diff --git a/src/components/timeline_menu/timeline_menu_content.js b/src/components/timeline_menu/timeline_menu_content.js
new file mode 100644
index 00000000..671570dd
--- /dev/null
+++ b/src/components/timeline_menu/timeline_menu_content.js
@@ -0,0 +1,29 @@
+import { mapState } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faUsers,
+  faGlobe,
+  faBookmark,
+  faEnvelope,
+  faHome
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faUsers,
+  faGlobe,
+  faBookmark,
+  faEnvelope,
+  faHome
+)
+
+const TimelineMenuContent = {
+  computed: {
+    ...mapState({
+      currentUser: state => state.users.currentUser,
+      privateMode: state => state.instance.private,
+      federating: state => state.instance.federating
+    })
+  }
+}
+
+export default TimelineMenuContent
diff --git a/src/components/timeline_menu/timeline_menu_content.vue b/src/components/timeline_menu/timeline_menu_content.vue
new file mode 100644
index 00000000..bed1b679
--- /dev/null
+++ b/src/components/timeline_menu/timeline_menu_content.vue
@@ -0,0 +1,66 @@
+<template>
+  <ul>
+    <li v-if="currentUser">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'friends' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="home"
+        />{{ $t("nav.home_timeline") }}
+      </router-link>
+    </li>
+    <li v-if="currentUser || !privateMode">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'public-timeline' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="users"
+        />{{ $t("nav.public_tl") }}
+      </router-link>
+    </li>
+    <li v-if="federating && (currentUser || !privateMode)">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'public-external-timeline' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="globe"
+        />{{ $t("nav.twkn") }}
+      </router-link>
+    </li>
+    <li v-if="currentUser">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'bookmarks'}"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="bookmark"
+        />{{ $t("nav.bookmarks") }}
+      </router-link>
+    </li>
+    <li v-if="currentUser">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'dms', params: { username: currentUser.screen_name } }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="envelope"
+        />{{ $t("nav.dms") }}
+      </router-link>
+    </li>
+  </ul>
+</template>
+
+<script src="./timeline_menu_content.js" ></script>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 4cc2af0e..45280eff 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -124,6 +124,7 @@
     "dms": "Direct Messages",
     "public_tl": "Public Timeline",
     "timeline": "Timeline",
+    "home_timeline": "Home Timeline",
     "twkn": "Known Network",
     "bookmarks": "Bookmarks",
     "user_search": "User Search",

From 2f60c6a821bd574fa352e45ac5bcc67097af7e11 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 22 Feb 2021 16:44:12 +0200
Subject: [PATCH 353/389] fix redline again

---
 CHANGELOG.md                                 | 1 +
 src/components/conversation/conversation.vue | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4be7da..9f1ff903 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.
 - Fixed shoutbox not working in mobile layout
+- Fixed missing highlighted border in expanded conversations again
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 353859b8..3fb26d92 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -50,7 +50,6 @@
 
 .Conversation {
   .conversation-status {
-    border-left: none;
     border-bottom-width: 1px;
     border-bottom-style: solid;
     border-bottom-color: var(--border, $fallback--border);

From 3f23aecd10e570f78b4142687a9a3fa349c13018 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 23 Feb 2021 10:00:23 +0200
Subject: [PATCH 354/389] add sensitive by default option

---
 src/components/post_status_form/post_status_form.js | 4 ++--
 src/components/settings_modal/tabs/general_tab.vue  | 7 ++++++-
 src/i18n/en.json                                    | 1 +
 src/modules/config.js                               | 3 ++-
 src/modules/instance.js                             | 1 +
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 4148381c..e540654b 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -115,7 +115,7 @@ const PostStatusForm = {
       ? this.copyMessageScope
       : this.$store.state.users.currentUser.default_scope
 
-    const { postContentType: contentType } = this.$store.getters.mergedConfig
+    const { postContentType: contentType, sensitiveByDefault } = this.$store.getters.mergedConfig
 
     return {
       dropFiles: [],
@@ -126,7 +126,7 @@ const PostStatusForm = {
       newStatus: {
         spoilerText: this.subject || '',
         status: statusText,
-        nsfw: false,
+        nsfw: !!sensitiveByDefault,
         files: [],
         poll: {},
         mediaDescriptions: {},
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index f93f4ea0..9228c78e 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -144,7 +144,12 @@
         </li>
         <li>
           <BooleanSetting path="minimalScopesMode">
-            {{ $t('settings.minimal_scopes_mode') }} {{ minimalScopesModeDefaultValue }}
+            {{ $t('settings.minimal_scopes_mode') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="sensitiveByDefault">
+            {{ $t('settings.sensitive_by_default') }}
           </BooleanSetting>
         </li>
         <li>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 0e069785..e6acda9c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -429,6 +429,7 @@
     "subject_line_mastodon": "Like mastodon: copy as is",
     "subject_line_noop": "Do not copy",
     "post_status_content_type": "Post status content type",
+    "sensitive_by_default": "Mark posts as sensitive by default",
     "stop_gifs": "Play-on-hover GIFs",
     "streaming": "Enable automatic streaming of new posts when scrolled to the top",
     "user_mutes": "Users",
diff --git a/src/modules/config.js b/src/modules/config.js
index f992519e..b08903d1 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -67,7 +67,8 @@ export const defaultState = {
   greentext: undefined, // instance default
   hidePostStats: undefined, // instance default
   hideUserStats: undefined, // instance default
-  virtualScrolling: undefined // instance default
+  virtualScrolling: undefined, // instance default
+  sensitiveByDefault: undefined
 }
 
 // caching the instance default properties
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 411b1caa..96de73ca 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -43,6 +43,7 @@ const defaultState = {
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',
   virtualScrolling: true,
+  sensitiveByDefault: false,
 
   // Nasty stuff
   customEmoji: [],

From 29dae3c12e9533f9d9b8ce058686f9a6a47719ad Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 23 Feb 2021 10:03:29 +0200
Subject: [PATCH 355/389] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbb3575..0abc3929 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 - Added reason field for registration when approval is required
+- Added option to mark posts as sensitive by default
 
 ## [2.2.3] - 2021-01-18
 ### Added

From ecb211606cddeeec809c8a6bc39f9c96a0af95f5 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 23 Feb 2021 10:06:45 +0200
Subject: [PATCH 356/389] change config comment to be consistent

---
 src/modules/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/config.js b/src/modules/config.js
index b08903d1..eca58c12 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -68,7 +68,7 @@ export const defaultState = {
   hidePostStats: undefined, // instance default
   hideUserStats: undefined, // instance default
   virtualScrolling: undefined, // instance default
-  sensitiveByDefault: undefined
+  sensitiveByDefault: undefined // instance default
 }
 
 // caching the instance default properties

From 51a78e8b8a89065062d5b4c1b72d5bdd457d9663 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 10:56:16 +0200
Subject: [PATCH 357/389] add a quick settings menu for timeline headers

---
 CHANGELOG.md                                  |   1 +
 .../moderation_tools/moderation_tools.vue     |  33 ++----
 src/components/popover/popover.js             |   7 ++
 src/components/popover/popover.vue            |  37 +++++-
 .../helpers/boolean_setting.vue               |  12 +-
 src/components/timeline/timeline.js           |   9 +-
 src/components/timeline/timeline.vue          |   4 +
 .../timeline/timeline_quick_settings.js       |  60 ++++++++++
 .../timeline/timeline_quick_settings.vue      | 105 ++++++++++++++++++
 src/i18n/en.json                              |   6 +
 10 files changed, 233 insertions(+), 41 deletions(-)
 create mode 100644 src/components/timeline/timeline_quick_settings.js
 create mode 100644 src/components/timeline/timeline_quick_settings.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbb3575..ba0ad7c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 - Added reason field for registration when approval is required
+- Added a quick settings to timeline header for easier access
 
 ## [2.2.3] - 2021-01-18
 ### Added
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index 5c7b82ec..bf25adc5 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -50,74 +50,74 @@
               class="button-default dropdown-item"
               @click="toggleTag(tags.FORCE_NSFW)"
             >
-              {{ $t('user_card.admin_menu.force_nsfw') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.FORCE_NSFW) }"
               />
+              {{ $t('user_card.admin_menu.force_nsfw') }}
             </button>
             <button
               class="button-default dropdown-item"
               @click="toggleTag(tags.STRIP_MEDIA)"
             >
-              {{ $t('user_card.admin_menu.strip_media') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.STRIP_MEDIA) }"
               />
+              {{ $t('user_card.admin_menu.strip_media') }}
             </button>
             <button
               class="button-default dropdown-item"
               @click="toggleTag(tags.FORCE_UNLISTED)"
             >
-              {{ $t('user_card.admin_menu.force_unlisted') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.FORCE_UNLISTED) }"
               />
+              {{ $t('user_card.admin_menu.force_unlisted') }}
             </button>
             <button
               class="button-default dropdown-item"
               @click="toggleTag(tags.SANDBOX)"
             >
-              {{ $t('user_card.admin_menu.sandbox') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.SANDBOX) }"
               />
+              {{ $t('user_card.admin_menu.sandbox') }}
             </button>
             <button
               v-if="user.is_local"
               class="button-default dropdown-item"
               @click="toggleTag(tags.DISABLE_REMOTE_SUBSCRIPTION)"
             >
-              {{ $t('user_card.admin_menu.disable_remote_subscription') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.DISABLE_REMOTE_SUBSCRIPTION) }"
               />
+              {{ $t('user_card.admin_menu.disable_remote_subscription') }}
             </button>
             <button
               v-if="user.is_local"
               class="button-default dropdown-item"
               @click="toggleTag(tags.DISABLE_ANY_SUBSCRIPTION)"
             >
-              {{ $t('user_card.admin_menu.disable_any_subscription') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.DISABLE_ANY_SUBSCRIPTION) }"
               />
+              {{ $t('user_card.admin_menu.disable_any_subscription') }}
             </button>
             <button
               v-if="user.is_local"
               class="button-default dropdown-item"
               @click="toggleTag(tags.QUARANTINE)"
             >
-              {{ $t('user_card.admin_menu.quarantine') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.QUARANTINE) }"
               />
+              {{ $t('user_card.admin_menu.quarantine') }}
             </button>
           </span>
         </div>
@@ -163,25 +163,6 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.menu-checkbox {
-  float: right;
-  min-width: 22px;
-  max-width: 22px;
-  min-height: 22px;
-  max-height: 22px;
-  line-height: 22px;
-  text-align: center;
-  border-radius: 0px;
-  background-color: $fallback--fg;
-  background-color: var(--input, $fallback--fg);
-  box-shadow: 0px 0px 2px black inset;
-  box-shadow: var(--inputShadow);
-
-  &.menu-checkbox-checked::after {
-    content: '✓';
-  }
-}
-
 .moderation-tools-popover {
   height: 100%;
   .trigger {
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 5e417fa0..61cc728d 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -3,25 +3,32 @@ const Popover = {
   props: {
     // Action to trigger popover: either 'hover' or 'click'
     trigger: String,
+
     // Either 'top' or 'bottom'
     placement: String,
+
     // Takes object with properties 'x' and 'y', values of these can be
     // 'container' for using offsetParent as boundaries for either axis
     // or 'viewport'
     boundTo: Object,
+
     // Takes a selector to use as a replacement for the parent container
     // for getting boundaries for x an y axis
     boundToSelector: String,
+
     // Takes a top/bottom/left/right object, how much space to leave
     // between boundary and popover element
     margin: Object,
+
     // Takes a x/y object and tells how many pixels to offset from
     // anchor point on either axis
     offset: Object,
+
     // Replaces the classes you may want for the popover container.
     // Use 'popover-default' in addition to get the default popover
     // styles with your custom class.
     popoverClass: String,
+
     // If true, subtract padding when calculating position for the popover,
     // use it when popover offset looks to be different on top vs bottom.
     removePadding: Boolean
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 876dd61d..2e78a09e 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -6,8 +6,8 @@
     <button
       ref="trigger"
       class="button-unstyled -fullwidth popover-trigger-button"
-      @click="onClick"
       type="button"
+      @click="onClick"
     >
       <slot name="trigger" />
     </button>
@@ -82,10 +82,9 @@
 
   .dropdown-item {
     line-height: 21px;
-    margin-right: 5px;
     overflow: auto;
     display: block;
-    padding: .25rem 1.0rem .25rem 1.5rem;
+    padding: .5em 0.75em;
     clear: both;
     font-weight: 400;
     text-align: inherit;
@@ -101,10 +100,9 @@
     --btnText: var(--popoverText, $fallback--text);
 
     &-icon {
-      padding-left: 0.5rem;
-
       svg {
-        margin-right: 0.25rem;
+        width: 22px;
+        margin-right: 0.75rem;
         color: var(--menuPopoverIcon, $fallback--icon)
       }
     }
@@ -123,6 +121,33 @@
       }
     }
 
+    .menu-checkbox {
+      display: inline-block;
+      vertical-align: middle;
+      min-width: 22px;
+      max-width: 22px;
+      min-height: 22px;
+      max-height: 22px;
+      line-height: 22px;
+      text-align: center;
+      border-radius: 0px;
+      background-color: $fallback--fg;
+      background-color: var(--input, $fallback--fg);
+      box-shadow: 0px 0px 2px black inset;
+      box-shadow: var(--inputShadow);
+      margin-right: 0.75em;
+
+      &.menu-checkbox-checked::after {
+        font-size: 1.25em;
+        content: '✓';
+      }
+
+      &.menu-checkbox-radio::after {
+        font-size: 2em;
+        content: '•';
+      }
+    }
+
   }
 }
 </style>
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index b600b63b..146ad6c1 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -4,13 +4,13 @@
   >
     <Checkbox
       :checked="state"
-      @change="update"
       :disabled="disabled"
+      @change="update"
     >
       <span
         v-if="!!$slots.default"
         class="label"
-        >
+      >
         <slot />
       </span>
       <ModifiedIndicator :changed="isChanged" />
@@ -23,14 +23,14 @@ import { get, set } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ModifiedIndicator from './modified_indicator.vue'
 export default {
-  props: [
-    'path',
-    'disabled'
-  ],
   components: {
     Checkbox,
     ModifiedIndicator
   },
+  props: [
+    'path',
+    'disabled'
+  ],
   computed: {
     pathDefault () {
       const [firstSegment, ...rest] = this.path.split('.')
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 665d195e..44f749c3 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -2,12 +2,14 @@ import Status from '../status/status.vue'
 import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js'
 import Conversation from '../conversation/conversation.vue'
 import TimelineMenu from '../timeline_menu/timeline_menu.vue'
+import TimelineQuickSettings from './timeline_quick_settings.vue'
 import { debounce, throttle, keyBy } from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+import { faCircleNotch, faCog } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faCircleNotch
+  faCircleNotch,
+  faCog
 )
 
 export const getExcludedStatusIdsByPinning = (statuses, pinnedStatusIds) => {
@@ -47,7 +49,8 @@ const Timeline = {
   components: {
     Status,
     Conversation,
-    TimelineMenu
+    TimelineMenu,
+    TimelineQuickSettings
   },
   computed: {
     newStatusCount () {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 4c43fe5c..286477c2 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -16,6 +16,7 @@
       >
         {{ $t('timeline.up_to_date') }}
       </div>
+      <TimelineQuickSettings v-if="!embedded" />
     </div>
     <div :class="classes.body">
       <div
@@ -103,9 +104,12 @@
   max-width: 100%;
   flex-wrap: nowrap;
   align-items: center;
+  position: relative;
+
   .loadmore-button {
     flex-shrink: 0;
   }
+
   .loadmore-text {
     flex-shrink: 0;
     line-height: 1em;
diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
new file mode 100644
index 00000000..eb1eb8fb
--- /dev/null
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -0,0 +1,60 @@
+import Popover from '../popover/popover.vue'
+import BooleanSetting from '../settings_modal/helpers/boolean_setting.vue'
+import { mapGetters } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faFilter, faWrench } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faFilter,
+  faWrench
+)
+
+const TimelineQuickSettings = {
+  components: {
+    Popover,
+    BooleanSetting
+  },
+  methods: {
+    setReplyVisibility (visibility) {
+      console.log('set reply visibility', visibility)
+      this.$store.dispatch('setOption', { name: 'replyVisibility', value: visibility })
+      this.$store.dispatch('queueFlushAll')
+    },
+    openTab (tab) {
+      this.$store.dispatch('openSettingsModalTab', tab)
+    }
+  },
+  computed: {
+    ...mapGetters(['mergedConfig']),
+    replyVisibilitySelf: {
+      get () { return this.mergedConfig.replyVisibility === 'self' },
+      set () { this.setReplyVisibility('self') }
+    },
+    replyVisibilityFollowing: {
+      get () { return this.mergedConfig.replyVisibility === 'following' },
+      set () { this.setReplyVisibility('following') }
+    },
+    replyVisibilityAll: {
+      get () { return this.mergedConfig.replyVisibility === 'all' },
+      set () { this.setReplyVisibility('all') }
+    },
+    hideMedia: {
+      get () { return this.mergedConfig.hideAttachments || this.mergedConfig.hideAttachmentsInConv },
+      set () {
+        const value = !this.hideMedia
+        this.$store.dispatch('setOption', { name: 'hideAttachments', value })
+        this.$store.dispatch('setOption', { name: 'hideAttachmentsInConv', value })
+      }
+    },
+    hideMutedPosts: {
+      get () { return this.mergedConfig.hideMutedPosts || this.mergedConfig.hideFilteredStatuses },
+      set () {
+        const value = !this.hideMutedPosts
+        this.$store.dispatch('setOption', { name: 'hideMutedPosts', value })
+        this.$store.dispatch('setOption', { name: 'hideFilteredStatuses', value })
+      }
+    }
+  }
+}
+
+export default TimelineQuickSettings
diff --git a/src/components/timeline/timeline_quick_settings.vue b/src/components/timeline/timeline_quick_settings.vue
new file mode 100644
index 00000000..51edff71
--- /dev/null
+++ b/src/components/timeline/timeline_quick_settings.vue
@@ -0,0 +1,105 @@
+<template>
+  <Popover
+    trigger="click"
+    class="TimelineQuickSettings"
+    :bound-to="{ x: 'container' }"
+  >
+    <div
+      slot="content"
+      class="timeline-settings-menu dropdown-menu"
+    >
+      <button
+        class="button-default dropdown-item"
+        @click="replyVisibilityAll = true"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-radio': replyVisibilityAll }"
+        />{{ $t('settings.reply_visibility_all') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="replyVisibilityFollowing = true"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-radio': replyVisibilityFollowing }"
+        />{{ $t('settings.reply_visibility_following_short') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="replyVisibilitySelf = true"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-radio': replyVisibilitySelf }"
+        />{{ $t('settings.reply_visibility_self_short') }}
+      </button>
+      <div
+        role="separator"
+        class="dropdown-divider"
+      />
+      <button
+        class="button-default dropdown-item"
+        @click="hideMedia = !hideMedia"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': hideMedia }"
+        />{{ $t('settings.hide_media_previews') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="hideMutedPosts = !hideMutedPosts"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': hideMutedPosts }"
+        />{{ $t('settings.hide_all_muted_posts') }}
+      </button>
+      <button
+        class="button-default dropdown-item dropdown-item-icon"
+        @click="openTab('filtering')"
+      >
+        <FAIcon icon="filter" />{{ $t('settings.word_filter') }}
+      </button>
+      <button
+        class="button-default dropdown-item dropdown-item-icon"
+        @click="openTab('general')"
+      >
+        <FAIcon icon="wrench" />{{ $t('settings.more_settings') }}
+      </button>
+    </div>
+    <div slot="trigger">
+      <FAIcon icon="cog" />
+    </div>
+  </Popover>
+</template>
+
+<script src="./timeline_quick_settings.js"></script>
+
+<style lang="scss">
+
+.TimelineQuickSettings {
+  align-self: stretch;
+
+  > button {
+    font-size: 1.2em;
+    padding-left: 0.7em;
+    padding-right: 0.2em;
+    line-height: 100%;
+    height: 100%;
+  }
+
+  .dropdown-item {
+    margin: 0;
+  }
+
+  .timeline-settings-menu {
+    display: flex;
+    min-width: 12em;
+    flex-direction: column;
+  }
+}
+
+</style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 0e069785..ec16f044 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -325,6 +325,7 @@
     "export_theme": "Save preset",
     "filtering": "Filtering",
     "filtering_explanation": "All statuses containing these words will be muted, one per line",
+    "word_filter": "Word filter",
     "follow_export": "Follow export",
     "follow_export_button": "Export your follows to a csv file",
     "follow_import": "Follow import",
@@ -335,7 +336,9 @@
     "general": "General",
     "hide_attachments_in_convo": "Hide attachments in conversations",
     "hide_attachments_in_tl": "Hide attachments in timeline",
+    "hide_media_previews": "Hide media previews",
     "hide_muted_posts": "Hide posts of muted users",
+    "hide_all_muted_posts": "Hide muted posts",
     "max_thumbnails": "Maximum amount of thumbnails per post",
     "hide_isp": "Hide instance-specific panel",
     "hide_wallpaper": "Hide instance wallpaper",
@@ -405,6 +408,8 @@
     "reply_visibility_all": "Show all replies",
     "reply_visibility_following": "Only show replies directed at me or users I'm following",
     "reply_visibility_self": "Only show replies directed at me",
+    "reply_visibility_following_short": "Show replies to my follows",
+    "reply_visibility_self_short": "Show replies to self",
     "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
     "saving_err": "Error saving settings",
     "saving_ok": "Settings saved",
@@ -458,6 +463,7 @@
     "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
     "notification_blocks": "Blocking a user stops all notifications as well as unsubscribes them.",
     "enable_web_push_notifications": "Enable web push notifications",
+    "more_settings": "More settings",
     "style": {
       "switcher": {
         "keep_color": "Keep colors",

From 93785634a72420338911d8a8a7fc7eef3eb478e4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 11:01:11 +0200
Subject: [PATCH 358/389] basic loggedin check for reply filtering

---
 .../timeline/timeline_quick_settings.js       |  3 +
 .../timeline/timeline_quick_settings.vue      | 64 ++++++++++---------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
index eb1eb8fb..ecac06e9 100644
--- a/src/components/timeline/timeline_quick_settings.js
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -26,6 +26,9 @@ const TimelineQuickSettings = {
   },
   computed: {
     ...mapGetters(['mergedConfig']),
+    loggedIn () {
+      return !!this.$store.state.users.currentUser
+    },
     replyVisibilitySelf: {
       get () { return this.mergedConfig.replyVisibility === 'self' },
       set () { this.setReplyVisibility('self') }
diff --git a/src/components/timeline/timeline_quick_settings.vue b/src/components/timeline/timeline_quick_settings.vue
index 51edff71..67f6be53 100644
--- a/src/components/timeline/timeline_quick_settings.vue
+++ b/src/components/timeline/timeline_quick_settings.vue
@@ -8,37 +8,39 @@
       slot="content"
       class="timeline-settings-menu dropdown-menu"
     >
-      <button
-        class="button-default dropdown-item"
-        @click="replyVisibilityAll = true"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-radio': replyVisibilityAll }"
-        />{{ $t('settings.reply_visibility_all') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="replyVisibilityFollowing = true"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-radio': replyVisibilityFollowing }"
-        />{{ $t('settings.reply_visibility_following_short') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="replyVisibilitySelf = true"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-radio': replyVisibilitySelf }"
-        />{{ $t('settings.reply_visibility_self_short') }}
-      </button>
-      <div
-        role="separator"
-        class="dropdown-divider"
-      />
+      <div v-if="loggedIn">
+        <button
+          class="button-default dropdown-item"
+          @click="replyVisibilityAll = true"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-radio': replyVisibilityAll }"
+          />{{ $t('settings.reply_visibility_all') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="replyVisibilityFollowing = true"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-radio': replyVisibilityFollowing }"
+          />{{ $t('settings.reply_visibility_following_short') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="replyVisibilitySelf = true"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-radio': replyVisibilitySelf }"
+          />{{ $t('settings.reply_visibility_self_short') }}
+        </button>
+        <div
+          role="separator"
+          class="dropdown-divider"
+        />
+      </div>
       <button
         class="button-default dropdown-item"
         @click="hideMedia = !hideMedia"

From 096747a5dc7df8bad63ef462bd9b920a6e64aafb Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 11:12:51 +0200
Subject: [PATCH 359/389] add only to wording

---
 src/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index ec16f044..fa338652 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -409,7 +409,7 @@
     "reply_visibility_following": "Only show replies directed at me or users I'm following",
     "reply_visibility_self": "Only show replies directed at me",
     "reply_visibility_following_short": "Show replies to my follows",
-    "reply_visibility_self_short": "Show replies to self",
+    "reply_visibility_self_short": "Show replies to self only",
     "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
     "saving_err": "Error saving settings",
     "saving_ok": "Settings saved",

From 59aaade7fc796ce43f5fd035fa5f1375d5e3dc75 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 14:32:21 +0200
Subject: [PATCH 360/389] fix vue warnings

---
 src/components/emoji_input/emoji_input.vue    |  2 +-
 src/components/mfa_form/recovery_form.vue     |  4 ++--
 src/components/mfa_form/totp_form.vue         |  4 ++--
 src/components/popover/popover.vue            |  2 +-
 .../scope_selector/scope_selector.vue         |  8 ++++----
 src/components/search/search.vue              |  2 +-
 src/components/search_bar/search_bar.vue      |  6 +++---
 .../helpers/boolean_setting.vue               | 12 +++++------
 .../helpers/modified_indicator.vue            | 20 +++++++++----------
 .../settings_modal/tabs/filtering_tab.vue     |  2 +-
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 1d6c760e..ad62484d 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -9,8 +9,8 @@
       <button
         v-if="!hideEmojiButton"
         class="button-unstyled emoji-picker-icon"
-        @click.prevent="togglePicker"
         type="button"
+        @click.prevent="togglePicker"
       >
         <FAIcon :icon="['far', 'smile-beam']" />
       </button>
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index 8457ec5d..7c594228 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -25,16 +25,16 @@
             <div>
               <button
                 class="button-unstyled -link"
-                @click.prevent="requireTOTP"
                 type="button"
+                @click.prevent="requireTOTP"
               >
                 {{ $t('login.enter_two_factor_code') }}
               </button>
               <br>
               <button
                 class="button-unstyled -link"
-                @click.prevent="abortMFA"
                 type="button"
+                @click.prevent="abortMFA"
               >
                 {{ $t('general.cancel') }}
               </button>
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index 5d80e185..4ee13992 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -27,16 +27,16 @@
             <div>
               <button
                 class="button-unstyled -link"
-                @click.prevent="requireRecovery"
                 type="button"
+                @click.prevent="requireRecovery"
               >
                 {{ $t('login.enter_recovery_code') }}
               </button>
               <br>
               <button
                 class="button-unstyled -link"
-                @click.prevent="abortMFA"
                 type="button"
+                @click.prevent="abortMFA"
               >
                 {{ $t('general.cancel') }}
               </button>
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 876dd61d..bacbc590 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -6,8 +6,8 @@
     <button
       ref="trigger"
       class="button-unstyled -fullwidth popover-trigger-button"
-      @click="onClick"
       type="button"
+      @click="onClick"
     >
       <slot name="trigger" />
     </button>
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index 60e8c3ba..a01242fc 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -8,8 +8,8 @@
       class="button-unstyled scope"
       :class="css.direct"
       :title="$t('post_status.scope.direct')"
-      @click="changeVis('direct')"
       type="button"
+      @click="changeVis('direct')"
     >
       <FAIcon
         icon="envelope"
@@ -21,8 +21,8 @@
       class="button-unstyled scope"
       :class="css.private"
       :title="$t('post_status.scope.private')"
-      @click="changeVis('private')"
       type="button"
+      @click="changeVis('private')"
     >
       <FAIcon
         icon="lock"
@@ -34,8 +34,8 @@
       class="button-unstyled scope"
       :class="css.unlisted"
       :title="$t('post_status.scope.unlisted')"
-      @click="changeVis('unlisted')"
       type="button"
+      @click="changeVis('unlisted')"
     >
       <FAIcon
         icon="lock-open"
@@ -47,8 +47,8 @@
       class="button-unstyled scope"
       :class="css.public"
       :title="$t('post_status.scope.public')"
-      @click="changeVis('public')"
       type="button"
+      @click="changeVis('public')"
     >
       <FAIcon
         icon="globe"
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index fa648365..b7bfc1f3 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -15,8 +15,8 @@
       >
       <button
         class="btn button-default search-button"
-        @click="newQuery(searchTerm)"
         type="submit"
+        @click="newQuery(searchTerm)"
       >
         <FAIcon icon="search" />
       </button>
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index a7432dcb..222f57ba 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -7,8 +7,8 @@
       v-if="hidden"
       class="button-unstyled nav-icon"
       :title="$t('nav.search')"
-      @click.prevent.stop="toggleHidden"
       type="button"
+      @click.prevent.stop="toggleHidden"
     >
       <FAIcon
         fixed-width
@@ -28,8 +28,8 @@
       >
       <button
         class="button-default search-button"
-        @click="find(searchTerm)"
         type="submit"
+        @click="find(searchTerm)"
       >
         <FAIcon
           fixed-width
@@ -38,8 +38,8 @@
       </button>
       <button
         class="button-unstyled cancel-search"
-        @click.prevent.stop="toggleHidden"
         type="button"
+        @click.prevent.stop="toggleHidden"
       >
         <FAIcon
           fixed-width
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index b600b63b..146ad6c1 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -4,13 +4,13 @@
   >
     <Checkbox
       :checked="state"
-      @change="update"
       :disabled="disabled"
+      @change="update"
     >
       <span
         v-if="!!$slots.default"
         class="label"
-        >
+      >
         <slot />
       </span>
       <ModifiedIndicator :changed="isChanged" />
@@ -23,14 +23,14 @@ import { get, set } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ModifiedIndicator from './modified_indicator.vue'
 export default {
-  props: [
-    'path',
-    'disabled'
-  ],
   components: {
     Checkbox,
     ModifiedIndicator
   },
+  props: [
+    'path',
+    'disabled'
+  ],
   computed: {
     pathDefault () {
       const [firstSegment, ...rest] = this.path.split('.')
diff --git a/src/components/settings_modal/helpers/modified_indicator.vue b/src/components/settings_modal/helpers/modified_indicator.vue
index b75a2811..9f4e81fe 100644
--- a/src/components/settings_modal/helpers/modified_indicator.vue
+++ b/src/components/settings_modal/helpers/modified_indicator.vue
@@ -2,21 +2,21 @@
   <span
     v-if="changed"
     class="ModifiedIndicator"
-    >
+  >
     <Popover
       trigger="hover"
-      >
+    >
       <span slot="trigger">
         &nbsp;
-          <FAIcon
-            icon="wrench"
-          />
+        <FAIcon
+          icon="wrench"
+        />
       </span>
       <div
-        class="modified-tooltip"
         slot="content"
-        >
-      {{ $t('settings.setting_changed') }}
+        class="modified-tooltip"
+      >
+        {{ $t('settings.setting_changed') }}
       </div>
     </Popover>
   </span>
@@ -32,8 +32,8 @@ library.add(
 )
 
 export default {
-  props: ['changed'],
-  components: { Popover }
+  components: { Popover },
+  props: ['changed']
 }
 </script>
 
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 18dd4be9..402c2a4a 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -75,8 +75,8 @@
         <p>{{ $t('settings.filtering_explanation') }}</p>
         <textarea
           id="muteWords"
-          class="resize-height"
           v-model="muteWordsString"
+          class="resize-height"
         />
       </div>
       <div>

From 34d18ac0c4e1903cb174df8957b855a048ec6b7e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 17:27:29 +0200
Subject: [PATCH 361/389] focus input in emoji picker and react picker

---
 CHANGELOG.md                                 | 1 +
 src/components/emoji_input/emoji_input.js    | 8 ++++++++
 src/components/popover/popover.js            | 7 +++++--
 src/components/react_button/react_button.js  | 6 ++++++
 src/components/react_button/react_button.vue | 1 +
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbb3575..ae7e0daf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
 - Optimized chat to not get horrible performance after keeping the same chat open for a long time
+- When opening emoji picker or react picker, it automatically focuses the search field
 
 ### Added
 - Added reason field for registration when approval is required
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 2068a598..cda2382e 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -194,11 +194,18 @@ const EmojiInput = {
     }
   },
   methods: {
+    focusPickerInput () {
+      const pickerEl = this.$refs.picker.$el
+      if (!pickerEl) return
+      const pickerInput = pickerEl.querySelector('input')
+      if (pickerInput) pickerInput.focus()
+    },
     triggerShowPicker () {
       this.showPicker = true
       this.$refs.picker.startEmojiLoad()
       this.$nextTick(() => {
         this.scrollIntoView()
+        this.focusPickerInput()
       })
       // This temporarily disables "click outside" handler
       // since external trigger also means click originates
@@ -214,6 +221,7 @@ const EmojiInput = {
       if (this.showPicker) {
         this.scrollIntoView()
         this.$refs.picker.startEmojiLoad()
+        this.$nextTick(() => this.focusPickerInput())
       }
     },
     replace (replacement) {
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 5e417fa0..bfe39212 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -121,9 +121,12 @@ const Popover = {
       }
     },
     showPopover () {
-      if (this.hidden) this.$emit('show')
+      const wasHidden = this.hidden
       this.hidden = false
-      this.$nextTick(this.updateStyles)
+      this.$nextTick(() => {
+        if (wasHidden) this.$emit('show')
+        this.updateStyles()
+      })
     },
     hidePopover () {
       if (!this.hidden) this.$emit('close')
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 5e7b7580..ce82c90d 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -23,6 +23,12 @@ const ReactButton = {
         this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
       }
       close()
+    },
+    focusInput () {
+      this.$nextTick(() => {
+        const input = this.$el.querySelector('input')
+        if (input) input.focus()
+      })
     }
   },
   computed: {
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 04734674..4839024c 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -6,6 +6,7 @@
     :offset="{ y: 5 }"
     :bound-to="{ x: 'container' }"
     remove-padding
+    @show="focusInput"
   >
     <div
       slot="content"

From acc08932cdc704fd875fbd66180c08c13c243c5e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 17:32:54 +0200
Subject: [PATCH 362/389] save a few characters

---
 src/components/emoji_input/emoji_input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index cda2382e..dc03bc9f 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -221,7 +221,7 @@ const EmojiInput = {
       if (this.showPicker) {
         this.scrollIntoView()
         this.$refs.picker.startEmojiLoad()
-        this.$nextTick(() => this.focusPickerInput())
+        this.$nextTick(this.focusPickerInput)
       }
     },
     replace (replacement) {

From cef6ecb916e7decc93e7b41bba6f1bb44e02cf21 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 10:30:30 +0200
Subject: [PATCH 363/389] update shelljs to get rid of warnings on build

---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index e11396bf..372155df 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "selenium-server": "2.53.1",
     "semver": "^5.3.0",
     "serviceworker-webpack-plugin": "^1.0.0",
-    "shelljs": "^0.7.4",
+    "shelljs": "^0.8.4",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "stylelint": "^13.6.1",
diff --git a/yarn.lock b/yarn.lock
index 6682841b..6d0095db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7842,9 +7842,10 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shelljs@^0.7.4:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+shelljs@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
+  integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"

From 6fefa5a9c5f95e5a72486c0bebbec0c198e412b6 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 11:00:21 +0200
Subject: [PATCH 364/389] fix chat unread badge

---
 src/components/chat/chat.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index aef58495..3a26686c 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -98,10 +98,10 @@
     .unread-message-count {
       font-size: 0.8em;
       left: 50%;
-      transform: translate(-50%, 0);
-      border-radius: 100%;
       margin-top: -1rem;
-      padding: 0;
+      padding: 0.1em;
+      border-radius: 50px;
+      position: absolute;
     }
 
     .chat-loading-error {

From 2e7529cf50d43f7746bb630a525cf9982411c74e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 11:03:26 +0200
Subject: [PATCH 365/389] changelog mention

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbb3575..dbba715c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed shoutbox not working in mobile layout
 - Fixed missing highlighted border in expanded conversations again
 - Fixed some UI jumpiness when opening images particularly in chat view
+- Fixed chat unread badge looking weird
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls

From cd2f5ced31a3598eb8a1fcdeef47d70dabf8bb00 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 14:27:25 +0200
Subject: [PATCH 366/389] add basic validation for statusless status
 notifications

---
 CHANGELOG.md                                  |  1 +
 src/modules/statuses.js                       | 29 ++++++++++++++-----
 .../notification_utils/notification_utils.js  |  7 +++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2685fd32..929292f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed missing highlighted border in expanded conversations again
 - Fixed some UI jumpiness when opening images particularly in chat view
 - Fixed chat unread badge looking weird
+- Fixed notifications crashing on an invalid notificaiton
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 33c68c57..ac5d25c4 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -13,7 +13,11 @@ import {
   omitBy
 } from 'lodash'
 import { set } from 'vue'
-import { isStatusNotification, maybeShowNotification } from '../services/notification_utils/notification_utils.js'
+import {
+  isStatusNotification,
+  isValidNotification,
+  maybeShowNotification
+} from '../services/notification_utils/notification_utils.js'
 import apiService from '../services/api/api.service.js'
 
 const emptyTl = (userId = 0) => ({
@@ -310,8 +314,24 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   }
 }
 
+const updateNotificationsMinMaxId = (state, notification) => {
+  state.notifications.maxId = notification.id > state.notifications.maxId
+    ? notification.id
+    : state.notifications.maxId
+  state.notifications.minId = notification.id < state.notifications.minId
+    ? notification.id
+    : state.notifications.minId
+}
+
 const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes, rootGetters, newNotificationSideEffects }) => {
   each(notifications, (notification) => {
+    // If invalid notification, update ids but don't add it to store
+    if (!isValidNotification(notification)) {
+      console.error('Invalid notification:', notification)
+      updateNotificationsMinMaxId(state, notification)
+      return
+    }
+
     if (isStatusNotification(notification.type)) {
       notification.action = addStatusToGlobalStorage(state, notification.action).item
       notification.status = notification.status && addStatusToGlobalStorage(state, notification.status).item
@@ -323,12 +343,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
 
     // Only add a new notification if we don't have one for the same action
     if (!state.notifications.idStore.hasOwnProperty(notification.id)) {
-      state.notifications.maxId = notification.id > state.notifications.maxId
-        ? notification.id
-        : state.notifications.maxId
-      state.notifications.minId = notification.id < state.notifications.minId
-        ? notification.id
-        : state.notifications.minId
+      updateNotificationsMinMaxId(state, notification)
 
       state.notifications.data.push(notification)
       state.notifications.idStore[notification.id] = notification
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index d912d19f..6fef1022 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -22,6 +22,13 @@ const statusNotifications = ['like', 'mention', 'repeat', 'pleroma:emoji_reactio
 
 export const isStatusNotification = (type) => includes(statusNotifications, type)
 
+export const isValidNotification = (notification) => {
+  if (isStatusNotification(notification.type) && !notification.status) {
+    return false
+  }
+  return true
+}
+
 const sortById = (a, b) => {
   const seqA = Number(a.id)
   const seqB = Number(b.id)

From 7c37f495f649f5ad1fd7c536279fb09f26dd9a98 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Fri, 26 Feb 2021 12:36:58 +0000
Subject: [PATCH 367/389] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 929292f5..270e957d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed missing highlighted border in expanded conversations again
 - Fixed some UI jumpiness when opening images particularly in chat view
 - Fixed chat unread badge looking weird
-- Fixed notifications crashing on an invalid notificaiton
+- Fixed notifications crashing on an invalid notification
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls

From 09fe160e8b9fad7a8c70e44ae894d67211b993e1 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 16:23:11 +0200
Subject: [PATCH 368/389] separate screen_name and screen_name_ui with decoded
 punycode

---
 CHANGELOG.md                                           |  1 +
 src/components/basic_user_card/basic_user_card.vue     |  2 +-
 src/components/chat/chat.js                            |  2 +-
 src/components/chat_title/chat_title.js                |  2 +-
 src/components/emoji_input/suggestor.js                |  4 ++--
 src/components/notification/notification.vue           | 10 +++++-----
 src/components/status/status.js                        |  4 ++--
 src/components/status/status.vue                       |  6 +++---
 src/components/user_avatar/user_avatar.vue             |  4 ++--
 src/components/user_card/user_card.vue                 |  4 ++--
 src/components/user_list_popover/user_list_popover.vue |  2 +-
 .../user_reporting_modal/user_reporting_modal.vue      |  2 +-
 .../entity_normalizer/entity_normalizer.service.js     |  5 +++--
 .../entity_normalizer/entity_normalizer.spec.js        |  2 +-
 14 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2685fd32..20d96f98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed missing highlighted border in expanded conversations again
 - Fixed some UI jumpiness when opening images particularly in chat view
 - Fixed chat unread badge looking weird
+- Fixed punycode names not working properly
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 9e410610..c53f6a9c 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -42,7 +42,7 @@
           class="basic-user-card-screen-name"
           :to="userProfileLink(user)"
         >
-          @{{ user.screen_name }}
+          @{{ user.screen_name_ui }}
         </router-link>
       </div>
       <slot />
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 2780be75..b54f5fb2 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -73,7 +73,7 @@ const Chat = {
     },
     formPlaceholder () {
       if (this.recipient) {
-        return this.$t('chats.message_user', { nickname: this.recipient.screen_name })
+        return this.$t('chats.message_user', { nickname: this.recipient.screen_name_ui })
       } else {
         return ''
       }
diff --git a/src/components/chat_title/chat_title.js b/src/components/chat_title/chat_title.js
index e424bb1f..edfbe7a4 100644
--- a/src/components/chat_title/chat_title.js
+++ b/src/components/chat_title/chat_title.js
@@ -12,7 +12,7 @@ export default Vue.component('chat-title', {
   ],
   computed: {
     title () {
-      return this.user ? this.user.screen_name : ''
+      return this.user ? this.user.screen_name_ui : ''
     },
     htmlTitle () {
       return this.user ? this.user.name_html : ''
diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 14a2b41e..e8efbd1e 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -116,8 +116,8 @@ export const suggestUsers = ({ dispatch, state }) => {
 
       return diff + nameAlphabetically + screenNameAlphabetically
       /* eslint-disable camelcase */
-    }).map(({ screen_name, name, profile_image_url_original }) => ({
-      displayText: screen_name,
+    }).map(({ screen_name, screen_name_ui, name, profile_image_url_original }) => ({
+      displayText: screen_name_ui,
       detailText: name,
       imageUrl: profile_image_url_original,
       replacement: '@' + screen_name + ' '
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index f56aa977..0081dee4 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -11,7 +11,7 @@
     >
       <small>
         <router-link :to="userProfileLink">
-          {{ notification.from_profile.screen_name }}
+          {{ notification.from_profile.screen_name_ui }}
         </router-link>
       </small>
       <button
@@ -54,14 +54,14 @@
             <bdi
               v-if="!!notification.from_profile.name_html"
               class="username"
-              :title="'@'+notification.from_profile.screen_name"
+              :title="'@'+notification.from_profile.screen_name_ui"
               v-html="notification.from_profile.name_html"
             />
             <!-- eslint-enable vue/no-v-html -->
             <span
               v-else
               class="username"
-              :title="'@'+notification.from_profile.screen_name"
+              :title="'@'+notification.from_profile.screen_name_ui"
             >{{ notification.from_profile.name }}</span>
             <span v-if="notification.type === 'like'">
               <FAIcon
@@ -152,7 +152,7 @@
             :to="userProfileLink"
             class="follow-name"
           >
-            @{{ notification.from_profile.screen_name }}
+            @{{ notification.from_profile.screen_name_ui }}
           </router-link>
           <div
             v-if="notification.type === 'follow_request'"
@@ -177,7 +177,7 @@
           class="move-text"
         >
           <router-link :to="targetUserProfileLink">
-            @{{ notification.target.screen_name }}
+            @{{ notification.target.screen_name_ui }}
           </router-link>
         </div>
         <template v-else>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 2bf93a9e..470c01f1 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -136,7 +136,7 @@ const Status = {
       }
     },
     retweet () { return !!this.statusoid.retweeted_status },
-    retweeter () { return this.statusoid.user.name || this.statusoid.user.screen_name },
+    retweeter () { return this.statusoid.user.name || this.statusoid.user.screen_name_ui },
     retweeterHtml () { return this.statusoid.user.name_html },
     retweeterProfileLink () { return this.generateUserProfileLink(this.statusoid.user.id, this.statusoid.user.screen_name) },
     status () {
@@ -216,7 +216,7 @@ const Status = {
         return this.status.in_reply_to_screen_name
       } else {
         const user = this.$store.getters.findUser(this.status.in_reply_to_user_id)
-        return user && user.screen_name
+        return user && user.screen_name_ui
       }
     },
     replySubject () {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 6ee8117f..00e962f3 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -26,7 +26,7 @@
             icon="retweet"
           />
           <router-link :to="userProfileLink">
-            {{ status.user.screen_name }}
+            {{ status.user.screen_name_ui }}
           </router-link>
         </small>
         <small
@@ -156,10 +156,10 @@
                 </h4>
                 <router-link
                   class="account-name"
-                  :title="status.user.screen_name"
+                  :title="status.user.screen_name_ui"
                   :to="userProfileLink"
                 >
-                  {{ status.user.screen_name }}
+                  {{ status.user.screen_name_ui }}
                 </router-link>
                 <img
                   v-if="!!(status.user && status.user.favicon)"
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index 0f7c584b..4040e263 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -2,8 +2,8 @@
   <StillImage
     v-if="user"
     class="Avatar"
-    :alt="user.screen_name"
-    :title="user.screen_name"
+    :alt="user.screen_name_ui"
+    :title="user.screen_name_ui"
     :src="imgSrc(user.profile_image_url_original)"
     :class="{ 'avatar-compact': compact, 'better-shadow': betterShadow }"
     :image-load-error="imageLoadError"
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 572943b5..60776ebb 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -73,10 +73,10 @@
             <div class="bottom-line">
               <router-link
                 class="user-screen-name"
-                :title="user.screen_name"
+                :title="user.screen_name_ui"
                 :to="userProfileLink(user)"
               >
-                @{{ user.screen_name }}
+                @{{ user.screen_name_ui }}
               </router-link>
               <template v-if="!hideBio">
                 <span
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index 95673733..d0aa315e 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -26,7 +26,7 @@
             <!-- eslint-disable vue/no-v-html -->
             <span v-html="user.name_html" />
             <!-- eslint-enable vue/no-v-html -->
-            <span class="user-list-screen-name">{{ user.screen_name }}</span>
+            <span class="user-list-screen-name">{{ user.screen_name_ui }}</span>
           </div>
         </div>
       </div>
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index fb43094f..a71c02c1 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -6,7 +6,7 @@
     <div class="user-reporting-panel panel">
       <div class="panel-heading">
         <div class="title">
-          {{ $t('user_reporting.title', [user.screen_name]) }}
+          {{ $t('user_reporting.title', [user.screen_name_ui]) }}
         </div>
       </div>
       <div class="panel-body">
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 6ed663e1..9b2b30e6 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -203,7 +203,8 @@ export const parseUser = (data) => {
   output.rights = output.rights || {}
   output.notification_settings = output.notification_settings || {}
 
-  // Convert punycode to unicode
+  // Convert punycode to unicode for UI
+  output.screen_name_ui = output.screen_name
   if (output.screen_name.includes('@')) {
     const parts = output.screen_name.split('@')
     let unicodeDomain = punycode.toUnicode(parts[1])
@@ -211,7 +212,7 @@ export const parseUser = (data) => {
       // Add some identifier so users can potentially spot spoofing attempts:
       // lain.com and xn--lin-6cd.com would appear identical otherwise.
       unicodeDomain = '🌏' + unicodeDomain
-      output.screen_name = [parts[0], unicodeDomain].join('@')
+      output.screen_name_ui = [parts[0], unicodeDomain].join('@')
     }
   }
 
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index a3f49b2c..759539e0 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -315,7 +315,7 @@ describe('API Entities normalizer', () => {
     it('converts IDN to unicode and marks it as internatonal', () => {
       const user = makeMockUserMasto({ acct: 'lain@xn--lin-6cd.com' })
 
-      expect(parseUser(user)).to.have.property('screen_name').that.equal('lain@🌏lаin.com')
+      expect(parseUser(user)).to.have.property('screen_name_ui').that.equal('lain@🌏lаin.com')
     })
   })
 

From 49aa10e1c0e279d692fb92695f92e4b8548f6b12 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 16:37:46 +0200
Subject: [PATCH 369/389] add screen_name_ui to tests

---
 test/unit/specs/components/user_profile.spec.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
index 80092b41..142db73c 100644
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -31,13 +31,15 @@ const testGetters = {
 const localUser = {
   id: 100,
   is_local: true,
-  screen_name: 'testUser'
+  screen_name: 'testUser',
+  screen_name_ui: 'testUser'
 }
 
 const extUser = {
   id: 100,
   is_local: false,
-  screen_name: 'testUser@test.instance'
+  screen_name: 'testUser@test.instance',
+  screen_name_ui: 'testUser@test.instance'
 }
 
 const externalProfileStore = new Vuex.Store({

From 92a9ce67c595bf54a95cca917ba07772bec0f041 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Sat, 27 Feb 2021 18:23:11 +0000
Subject: [PATCH 370/389] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a599ddb..a294c106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 - Added reason field for registration when approval is required
->>>>>>> develop
 
 ## [2.2.3] - 2021-01-18
 ### Added

From 670abd633f97e75cf35981ee0f617d0be1b43816 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Sun, 28 Feb 2021 15:36:51 +0000
Subject: [PATCH 371/389] Update timeline_quick_settings.js

---
 src/components/timeline/timeline_quick_settings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
index ecac06e9..2c1a3df8 100644
--- a/src/components/timeline/timeline_quick_settings.js
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -16,7 +16,6 @@ const TimelineQuickSettings = {
   },
   methods: {
     setReplyVisibility (visibility) {
-      console.log('set reply visibility', visibility)
       this.$store.dispatch('setOption', { name: 'replyVisibility', value: visibility })
       this.$store.dispatch('queueFlushAll')
     },

From 846e58c3d2cf07442c7cb819b4c6d1b4dbf4ec7d Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Sat, 27 Feb 2021 23:07:22 +0000
Subject: [PATCH 372/389] Translated using Weblate (Japanese)

Currently translated at 100.0% (686 of 686 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 267a89ae..846c793a 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -413,8 +413,8 @@
         "contrast": {
           "hint": "コントラストは {ratio} です。{level}。({context})",
           "level": {
-            "aa": "AAレベルガイドライン (ミニマル) を満たします",
-            "aaa": "AAAレベルガイドライン (レコメンデッド) を満たします",
+            "aa": "AAレベルガイドライン (最低限) を満たします",
+            "aaa": "AAAレベルガイドライン (推奨) を満たします",
             "bad": "ガイドラインを満たしません"
           },
           "context": {
@@ -573,7 +573,8 @@
     "mute_export": "ミュートのエクスポート",
     "allow_following_move": "フォロー中のアカウントが引っ越したとき、自動フォローを許可する",
     "setting_changed": "規定の設定と異なっています",
-    "greentext": "引用を緑色で表示"
+    "greentext": "引用を緑色で表示",
+    "sensitive_by_default": "はじめから投稿をセンシティブとして設定"
   },
   "time": {
     "day": "{0}日",

From fc5483f7641f3aa6866fbbd9beaca0139083ee86 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 1 Mar 2021 10:14:17 +0200
Subject: [PATCH 373/389] change icons around

---
 src/components/timeline/timeline_quick_settings.js  | 3 ++-
 src/components/timeline/timeline_quick_settings.vue | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
index 2c1a3df8..9ec1a007 100644
--- a/src/components/timeline/timeline_quick_settings.js
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -2,10 +2,11 @@ import Popover from '../popover/popover.vue'
 import BooleanSetting from '../settings_modal/helpers/boolean_setting.vue'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faFilter, faWrench } from '@fortawesome/free-solid-svg-icons'
+import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
   faFilter,
+  faFont,
   faWrench
 )
 
diff --git a/src/components/timeline/timeline_quick_settings.vue b/src/components/timeline/timeline_quick_settings.vue
index 67f6be53..4ad2842b 100644
--- a/src/components/timeline/timeline_quick_settings.vue
+++ b/src/components/timeline/timeline_quick_settings.vue
@@ -63,7 +63,7 @@
         class="button-default dropdown-item dropdown-item-icon"
         @click="openTab('filtering')"
       >
-        <FAIcon icon="filter" />{{ $t('settings.word_filter') }}
+        <FAIcon icon="font" />{{ $t('settings.word_filter') }}
       </button>
       <button
         class="button-default dropdown-item dropdown-item-icon"
@@ -73,7 +73,7 @@
       </button>
     </div>
     <div slot="trigger">
-      <FAIcon icon="cog" />
+      <FAIcon icon="filter" />
     </div>
   </Popover>
 </template>

From f6af4c43f656d1990da00bc773c15ebbbc57e71d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 1 Mar 2021 16:21:35 +0200
Subject: [PATCH 374/389] add quick filters for notifications2

---
 .../notifications/notification_filters.vue    | 121 ++++++++++++++++++
 src/components/notifications/notifications.js |   8 +-
 .../notifications/notifications.vue           |   1 +
 .../timeline/timeline_quick_settings.js       |   4 +-
 .../timeline/timeline_quick_settings.vue      |   8 +-
 src/modules/config.js                         |   2 +-
 6 files changed, 130 insertions(+), 14 deletions(-)
 create mode 100644 src/components/notifications/notification_filters.vue

diff --git a/src/components/notifications/notification_filters.vue b/src/components/notifications/notification_filters.vue
new file mode 100644
index 00000000..95b2513b
--- /dev/null
+++ b/src/components/notifications/notification_filters.vue
@@ -0,0 +1,121 @@
+<template>
+  <Popover
+    trigger="click"
+    class="NotificationFilters"
+    placement="bottom"
+    :bound-to="{ x: 'container' }"
+  >
+    <div
+      slot="content"
+      class="dropdown-menu"
+    >
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('likes')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.likes }"
+        />{{ $t('settings.notification_visibility_likes') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('repeats')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.repeats }"
+        />{{ $t('settings.notification_visibility_repeats') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('follows')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.follows }"
+        />{{ $t('settings.notification_visibility_follows') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('mentions')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.mentions }"
+        />{{ $t('settings.notification_visibility_mentions') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('emojiReactions')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.emojiReactions }"
+        />{{ $t('settings.notification_visibility_emoji_reactions') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('moves')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.moves }"
+        />{{ $t('settings.notification_visibility_moves') }}
+      </button>
+    </div>
+    <div slot="trigger">
+      <FAIcon icon="filter" />
+    </div>
+  </Popover>
+</template>
+
+<script>
+import Popover from '../popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faFilter } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faFilter
+)
+
+export default {
+  components: { Popover },
+  computed: {
+    filters () {
+      return this.$store.getters.mergedConfig.notificationVisibility
+    }
+  },
+  methods: {
+    toggleNotificationFilter (type) {
+      this.$store.dispatch('setOption', {
+        name: 'notificationVisibility',
+        value: {
+          ...this.filters,
+          [type]: !this.filters[type]
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+
+.NotificationFilters {
+  align-self: stretch;
+
+  > button {
+    font-size: 1.2em;
+    padding-left: 0.7em;
+    padding-right: 0.2em;
+    line-height: 100%;
+    height: 100%;
+  }
+
+  .dropdown-item {
+    margin: 0;
+  }
+}
+
+</style>
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 49258563..a9bf2931 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -1,5 +1,6 @@
 import { mapGetters } from 'vuex'
 import Notification from '../notification/notification.vue'
+import NotificationFilters from './notification_filters.vue'
 import notificationsFetcher from '../../services/notifications_fetcher/notifications_fetcher.service.js'
 import {
   notificationsFromStore,
@@ -17,6 +18,10 @@ library.add(
 const DEFAULT_SEEN_TO_DISPLAY_COUNT = 30
 
 const Notifications = {
+  components: {
+    Notification,
+    NotificationFilters
+  },
   props: {
     // Disables display of panel header
     noHeading: Boolean,
@@ -70,9 +75,6 @@ const Notifications = {
     },
     ...mapGetters(['unreadChatCount'])
   },
-  components: {
-    Notification
-  },
   watch: {
     unseenCountTitle (count) {
       if (count > 0) {
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 725d1ad4..12097b85 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -22,6 +22,7 @@
         >
           {{ $t('notifications.read') }}
         </button>
+        <NotificationFilters />
       </div>
       <div class="panel-body">
         <div
diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
index 9ec1a007..eae65a55 100644
--- a/src/components/timeline/timeline_quick_settings.js
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -1,5 +1,4 @@
 import Popover from '../popover/popover.vue'
-import BooleanSetting from '../settings_modal/helpers/boolean_setting.vue'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons'
@@ -12,8 +11,7 @@ library.add(
 
 const TimelineQuickSettings = {
   components: {
-    Popover,
-    BooleanSetting
+    Popover
   },
   methods: {
     setReplyVisibility (visibility) {
diff --git a/src/components/timeline/timeline_quick_settings.vue b/src/components/timeline/timeline_quick_settings.vue
index 4ad2842b..94997c0d 100644
--- a/src/components/timeline/timeline_quick_settings.vue
+++ b/src/components/timeline/timeline_quick_settings.vue
@@ -6,7 +6,7 @@
   >
     <div
       slot="content"
-      class="timeline-settings-menu dropdown-menu"
+      class="dropdown-menu"
     >
       <div v-if="loggedIn">
         <button
@@ -96,12 +96,6 @@
   .dropdown-item {
     margin: 0;
   }
-
-  .timeline-settings-menu {
-    display: flex;
-    min-width: 12em;
-    flex-direction: column;
-  }
 }
 
 </style>
diff --git a/src/modules/config.js b/src/modules/config.js
index eca58c12..f98e6649 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -44,7 +44,7 @@ export const defaultState = {
     likes: true,
     repeats: true,
     moves: true,
-    emojiReactions: false,
+    emojiReactions: true,
     followRequest: true,
     chatMention: true
   },

From 11a036d6d6c695eb8cff64d2c6cb85db23a0ed0e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 1 Mar 2021 16:27:24 +0200
Subject: [PATCH 375/389] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2b48b9..d8514561 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added reason field for registration when approval is required
 - Added a quick settings to timeline header for easier access
 - Added option to mark posts as sensitive by default
+- Added quick filters for notifications
 
 ## [2.2.3] - 2021-01-18
 ### Added

From ae159f6ad8d23ce0e3d2d765bf694f1a614c6df4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 1 Mar 2021 16:30:10 +0200
Subject: [PATCH 376/389] ui never refers to them as likes

---
 src/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index bf775363..a6e892d6 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -377,7 +377,7 @@
     "new_password": "New password",
     "notification_visibility": "Types of notifications to show",
     "notification_visibility_follows": "Follows",
-    "notification_visibility_likes": "Likes",
+    "notification_visibility_likes": "Favorites",
     "notification_visibility_mentions": "Mentions",
     "notification_visibility_repeats": "Repeats",
     "notification_visibility_moves": "User Migrates",

From d1ab424ebcd0a41fca9b848de02d03a2015ed9c7 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 2 Mar 2021 09:53:17 +0200
Subject: [PATCH 377/389] update changelog with 2.3.0

---
 CHANGELOG.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2b48b9..eb6a4599 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Added
+- Added a quick settings to timeline header for easier access
+- Added option to mark posts as sensitive by default
+
+## [2.3.0] - 2021-03-01
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.
 - Fixed shoutbox not working in mobile layout
@@ -17,11 +22,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Display 'people voted' instead of 'votes' for multi-choice polls
 - Optimized chat to not get horrible performance after keeping the same chat open for a long time
 - When opening emoji picker or react picker, it automatically focuses the search field
+- Language picker now uses native language names
 
 ### Added
 - Added reason field for registration when approval is required
-- Added a quick settings to timeline header for easier access
-- Added option to mark posts as sensitive by default
+- Group staff members by role in the About page
 
 ## [2.2.3] - 2021-01-18
 ### Added
@@ -33,7 +38,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Don't filter own posts when they hit your wordfilter
-- Language picker now uses native language names
 
 
 ## [2.2.2] - 2020-12-22
@@ -43,7 +47,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added some missing unicode emoji
 - Added the upload limit to the Features panel in the About page
 - Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore
-- Group staff members by role in the About page
 
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form

From 0673511fc246d67356dd656ad81ba401e3179108 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 3 Mar 2021 16:46:53 +0200
Subject: [PATCH 378/389] fix shoutbox header, use custom scroll-to-bottom
 system, remove vue-chat-scroll, temporarily add chat test hack

---
 package.json                             |  1 -
 src/App.vue                              |  2 +-
 src/components/chat_panel/chat_panel.js  | 12 ++++++++++++
 src/components/chat_panel/chat_panel.vue | 15 ++++++++++-----
 src/main.js                              |  2 --
 src/modules/chat.js                      | 19 +++++++++++++++++++
 yarn.lock                                |  4 ----
 7 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 372155df..8dbf2503 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "punycode.js": "^2.1.0",
     "v-click-outside": "^2.1.1",
     "vue": "^2.6.11",
-    "vue-chat-scroll": "^1.2.1",
     "vue-i18n": "^7.3.2",
     "vue-router": "^3.0.1",
     "vue-template-compiler": "^2.6.11",
diff --git a/src/App.vue b/src/App.vue
index 1a166778..e09ce4c8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -50,7 +50,7 @@
       <media-modal />
     </div>
     <chat-panel
-      v-if="currentUser && chat"
+      v-if="currentUser"
       :floating="true"
       class="floating-chat mobile-hidden"
     />
diff --git a/src/components/chat_panel/chat_panel.js b/src/components/chat_panel/chat_panel.js
index c3887098..556694ae 100644
--- a/src/components/chat_panel/chat_panel.js
+++ b/src/components/chat_panel/chat_panel.js
@@ -35,6 +35,18 @@ const chatPanel = {
     userProfileLink (user) {
       return generateProfileLink(user.id, user.username, this.$store.state.instance.restrictedNicknames)
     }
+  },
+  watch: {
+    messages (newVal) {
+      const scrollEl = this.$el.querySelector('.chat-window')
+      if (!scrollEl) return
+      if (scrollEl.scrollTop + scrollEl.offsetHeight + 20 > scrollEl.scrollHeight) {
+        this.$nextTick(() => {
+          if (!scrollEl) return
+          scrollEl.scrollTop = scrollEl.scrollHeight - scrollEl.offsetHeight
+        })
+      }
+    }
   }
 }
 
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index 7993c94d..8a829115 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -10,17 +10,15 @@
         @click.stop.prevent="togglePanel"
       >
         <div class="title">
-          <span>{{ $t('shoutbox.title') }}</span>
+          {{ $t('shoutbox.title') }}
           <FAIcon
             v-if="floating"
             icon="times"
+            class="close-icon"
           />
         </div>
       </div>
-      <div
-        v-chat-scroll
-        class="chat-window"
-      >
+      <div class="chat-window">
         <div
           v-for="message in messages"
           :key="message.id"
@@ -94,6 +92,13 @@
     .icon {
       color: $fallback--text;
       color: var(--text, $fallback--text);
+      margin-right: 0.5em;
+    }
+
+    .title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
     }
   }
 
diff --git a/src/main.js b/src/main.js
index 90ee2887..e1cac748 100644
--- a/src/main.js
+++ b/src/main.js
@@ -28,7 +28,6 @@ import pushNotifications from './lib/push_notifications_plugin.js'
 
 import messages from './i18n/messages.js'
 
-import VueChatScroll from 'vue-chat-scroll'
 import VueClickOutside from 'v-click-outside'
 import PortalVue from 'portal-vue'
 import VBodyScrollLock from './directives/body_scroll_lock'
@@ -42,7 +41,6 @@ const currentLocale = (window.navigator.language || 'en').split('-')[0]
 Vue.use(Vuex)
 Vue.use(VueRouter)
 Vue.use(VueI18n)
-Vue.use(VueChatScroll)
 Vue.use(VueClickOutside)
 Vue.use(PortalVue)
 Vue.use(VBodyScrollLock)
diff --git a/src/modules/chat.js b/src/modules/chat.js
index c798549d..264ba00b 100644
--- a/src/modules/chat.js
+++ b/src/modules/chat.js
@@ -18,6 +18,25 @@ const chat = {
   actions: {
     initializeChat (store, socket) {
       const channel = socket.channel('chat:public')
+      let id = 0
+      const createmsg = () => {
+        id += 1
+        return {
+          text: 'test' + id,
+          author: {
+            username: 'test',
+            avatar: '',
+            id
+          }
+        }
+      }
+
+      const loop = () => {
+        store.commit('addMessage', createmsg())
+        setTimeout(loop, 3000)
+      }
+      loop()
+
       channel.on('new_msg', (msg) => {
         store.commit('addMessage', msg)
       })
diff --git a/yarn.lock b/yarn.lock
index 6d0095db..80c09312 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8923,10 +8923,6 @@ void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
-vue-chat-scroll@^1.2.1:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/vue-chat-scroll/-/vue-chat-scroll-1.3.5.tgz#a5ee5bae5058f614818a96eac5ee3be4394a2f68"
-
 vue-eslint-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1"

From becacf064303f0fceca8def3f1c49248b9d3e5f8 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 3 Mar 2021 16:47:59 +0200
Subject: [PATCH 379/389] remove shoutbox test hacks

---
 src/App.vue         |  2 +-
 src/modules/chat.js | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e09ce4c8..1a166778 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -50,7 +50,7 @@
       <media-modal />
     </div>
     <chat-panel
-      v-if="currentUser"
+      v-if="currentUser && chat"
       :floating="true"
       class="floating-chat mobile-hidden"
     />
diff --git a/src/modules/chat.js b/src/modules/chat.js
index 264ba00b..ffeb272b 100644
--- a/src/modules/chat.js
+++ b/src/modules/chat.js
@@ -18,24 +18,6 @@ const chat = {
   actions: {
     initializeChat (store, socket) {
       const channel = socket.channel('chat:public')
-      let id = 0
-      const createmsg = () => {
-        id += 1
-        return {
-          text: 'test' + id,
-          author: {
-            username: 'test',
-            avatar: '',
-            id
-          }
-        }
-      }
-
-      const loop = () => {
-        store.commit('addMessage', createmsg())
-        setTimeout(loop, 3000)
-      }
-      loop()
 
       channel.on('new_msg', (msg) => {
         store.commit('addMessage', msg)

From b4f5df9ce502efbf35eccf5c62066200b04428f8 Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Thu, 4 Mar 2021 22:24:17 +0300
Subject: [PATCH 380/389] Make it possible to localize user highlight options

---
 src/components/user_card/user_card.vue | 8 ++++----
 src/i18n/en.json                       | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 60776ebb..c59faaa6 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -141,10 +141,10 @@
                 v-model="userHighlightType"
                 class="userHighlightSel"
               >
-                <option value="disabled">No highlight</option>
-                <option value="solid">Solid bg</option>
-                <option value="striped">Striped bg</option>
-                <option value="side">Side stripe</option>
+                <option value="disabled">{{$t('user_card.highlight.disabled')}}</option>
+                <option value="solid">{{$t('user_card.highlight.solid')}}</option>
+                <option value="striped">{{$t('user_card.highlight.striped')}}</option>
+                <option value="side">{{$t('user_card.highlight.side')}}</option>
               </select>
               <FAIcon
                 class="select-down-icon"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index bf775363..2aefebc9 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -746,6 +746,12 @@
       "quarantine": "Disallow user posts from federating",
       "delete_user": "Delete user",
       "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+    },
+    "highlight": {
+      "disabled": "No highlight",
+      "solid": "Solid bg",
+      "striped": "Striped bg",
+      "side": "Side stripe"
     }
   },
   "user_profile": {

From c14c144cc8774fe03bb6dc981fad0470ac1bcebb Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Thu, 4 Mar 2021 19:46:03 +0000
Subject: [PATCH 381/389] Apply 1 suggestion(s) to 1 file(s)

---
 src/components/user_card/user_card.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index c59faaa6..4b7ee7d5 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -141,10 +141,10 @@
                 v-model="userHighlightType"
                 class="userHighlightSel"
               >
-                <option value="disabled">{{$t('user_card.highlight.disabled')}}</option>
-                <option value="solid">{{$t('user_card.highlight.solid')}}</option>
-                <option value="striped">{{$t('user_card.highlight.striped')}}</option>
-                <option value="side">{{$t('user_card.highlight.side')}}</option>
+                <option value="disabled">{{ $t('user_card.highlight.disabled') }}</option>
+                <option value="solid">{{ $t('user_card.highlight.solid') }}</option>
+                <option value="striped">{{ $t('user_card.highlight.striped') }}</option>
+                <option value="side">{{ $t('user_card.highlight.side') }}</option>
               </select>
               <FAIcon
                 class="select-down-icon"

From 90afcd3420a911856bde794f2b4dc1380a1a0751 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 Mar 2021 22:24:39 +0200
Subject: [PATCH 382/389] WIP some work on making errors less spammy

---
 src/i18n/en.json                              |  3 +-
 src/modules/api.js                            | 44 +++++++++++--------
 .../notifications_fetcher.service.js          | 14 +++---
 .../timeline_fetcher.service.js               | 14 +++---
 4 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 217ac7c8..635bfd56 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -664,8 +664,7 @@
     "no_more_statuses": "No more statuses",
     "no_statuses": "No statuses",
     "socket_reconnected": "Realtime connection established",
-    "socket_broke": "Realtime connection lost: CloseEvent code {0}",
-    "socket_closed": "No realtime connection, updates can arrive with a delaye until connection is re-established"
+    "socket_broke": "Realtime connection lost: CloseEvent code {0}"
   },
   "status": {
     "favorites": "Favorites",
diff --git a/src/modules/api.js b/src/modules/api.js
index b482637d..e392d5b0 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -5,6 +5,8 @@ import { Socket } from 'phoenix'
 
 const api = {
   state: {
+    connectionBroken: false,
+    retryMultiplier: 1,
     backendInteractor: backendInteractorService(),
     fetchers: {},
     socket: null,
@@ -34,12 +36,18 @@ const api = {
     },
     setMastoUserSocketStatus (state, value) {
       state.mastoUserSocketStatus = value
+    },
+    recoverConnection (state) {
+      state.connectionBroken = false
+    },
+    breakConnection (state) {
+      state.connectionBroken = true
     }
   },
   actions: {
     // Global MastoAPI socket control, in future should disable ALL sockets/(re)start relevant sockets
     enableMastoSockets (store) {
-      const { state, dispatch } = store
+      const { state, dispatch, commit } = store
       // Do not initialize unless nonexistent or closed
       if (
         state.mastoUserSocket &&
@@ -50,11 +58,13 @@ const api = {
       ) {
         return
       }
+      commit('recoverConnection')
       return dispatch('startMastoUserSocket')
     },
     disableMastoSockets (store) {
-      const { state, dispatch } = store
+      const { state, dispatch, commit } = store
       if (!state.mastoUserSocket) return
+      commit('recoverConnection')
       return dispatch('stopMastoUserSocket')
     },
 
@@ -102,6 +112,7 @@ const api = {
           state.mastoUserSocket.addEventListener('open', () => {
             // Do not show notification when we just opened up the page
             if (state.mastoUserSocketStatus !== null) {
+              commit('recoverConnection')
               dispatch('pushGlobalNotice', {
                 level: 'success',
                 messageKey: 'timeline.socket_reconnected',
@@ -114,15 +125,6 @@ const api = {
             console.error('Error in MastoAPI websocket:', error)
             commit('setMastoUserSocketStatus', WSConnectionStatus.ERROR)
             dispatch('clearOpenedChats')
-            /* Since data in WS event for error is useless it's better to show
-             * generic warning instead of in "close" which actually has some
-             * useful data
-             */
-            dispatch('pushGlobalNotice', {
-              level: 'error',
-              messageKey: 'timeline.socket_closed',
-              timeout: 5000
-            })
           })
           state.mastoUserSocket.addEventListener('close', ({ detail: closeEvent }) => {
             const ignoreCodes = new Set([
@@ -137,13 +139,19 @@ const api = {
               dispatch('startFetchingTimeline', { timeline: 'friends' })
               dispatch('startFetchingNotifications')
               dispatch('startFetchingChats')
-              dispatch('restartMastoUserSocket')
-              dispatch('pushGlobalNotice', {
-                level: 'error',
-                messageKey: 'timeline.socket_broke',
-                messageArgs: [code],
-                timeout: 5000
-              })
+              setTimeout(() => {
+                console.log('TEST')
+                dispatch('restartMastoUserSocket')
+              }, 1000)
+              if (!state.connectionBroken) {
+                dispatch('pushGlobalNotice', {
+                  level: 'error',
+                  messageKey: 'timeline.socket_broke',
+                  messageArgs: [code],
+                  timeout: 5000
+                })
+              }
+              commit('breakConnection')
             }
             commit('setMastoUserSocketStatus', WSConnectionStatus.CLOSED)
             dispatch('clearOpenedChats')
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index f83f871e..fc5e76ba 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -57,12 +57,14 @@ const fetchNotifications = ({ store, args, older }) => {
       return notifications
     })
     .catch((error) => {
-      store.dispatch('pushGlobalNotice', {
-        level: 'error',
-        messageKey: 'notifications.error',
-        messageArgs: [error.message],
-        timeout: 5000
-      })
+      if (!store.rootState.api.connectionBroken) {
+        store.dispatch('pushGlobalNotice', {
+          level: 'error',
+          messageKey: 'notifications.error',
+          messageArgs: [error.message],
+          timeout: 5000
+        })
+      }
     })
 }
 
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 46bba41a..eb4a3e0d 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -66,12 +66,14 @@ const fetchAndUpdate = ({
       return { statuses, pagination }
     })
     .catch((error) => {
-      store.dispatch('pushGlobalNotice', {
-        level: 'error',
-        messageKey: 'timeline.error',
-        messageArgs: [error.message],
-        timeout: 5000
-      })
+      if (!store.rootState.api.connectionBroken) {
+        store.dispatch('pushGlobalNotice', {
+          level: 'error',
+          messageKey: 'timeline.error',
+          messageArgs: [error.message],
+          timeout: 5000
+        })
+      }
     })
 }
 

From a8967d85bd7ae1541f1d4e41e95fc8fa111f2360 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 9 Mar 2021 02:38:10 +0200
Subject: [PATCH 383/389] streamlined WS flow, reduced spam amount related to
 WS reconnections

---
 src/modules/api.js                            | 69 +++++++++++--------
 src/modules/users.js                          |  3 +-
 src/services/api/api.service.js               |  5 +-
 .../notifications_fetcher.service.js          | 14 ++--
 .../timeline_fetcher.service.js               | 14 ++--
 5 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/src/modules/api.js b/src/modules/api.js
index e392d5b0..8654b90a 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -3,9 +3,10 @@ import { WSConnectionStatus } from '../services/api/api.service.js'
 import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
 import { Socket } from 'phoenix'
 
+const retryTimeout = (multiplier) => 1000 * multiplier
+
 const api = {
   state: {
-    connectionBroken: false,
     retryMultiplier: 1,
     backendInteractor: backendInteractorService(),
     fetchers: {},
@@ -37,16 +38,20 @@ const api = {
     setMastoUserSocketStatus (state, value) {
       state.mastoUserSocketStatus = value
     },
-    recoverConnection (state) {
-      state.connectionBroken = false
+    incrementRetryMultiplier (state) {
+      state.retryMultiplier = Math.max(++state.retryMultiplier, 3)
     },
-    breakConnection (state) {
-      state.connectionBroken = true
+    resetRetryMultiplier (state) {
+      state.retryMultiplier = 1
     }
   },
   actions: {
-    // Global MastoAPI socket control, in future should disable ALL sockets/(re)start relevant sockets
-    enableMastoSockets (store) {
+    /**
+     * Global MastoAPI socket control, in future should disable ALL sockets/(re)start relevant sockets
+     *
+     * @param {Boolean} [initial] - whether this enabling happened at boot time or not
+     */
+    enableMastoSockets (store, initial) {
       const { state, dispatch, commit } = store
       // Do not initialize unless nonexistent or closed
       if (
@@ -58,13 +63,17 @@ const api = {
       ) {
         return
       }
-      commit('recoverConnection')
+      if (initial) {
+        commit('setMastoUserSocketStatus', WSConnectionStatus.STARTING_INITIAL)
+      } else {
+        commit('setMastoUserSocketStatus', WSConnectionStatus.STARTING)
+      }
       return dispatch('startMastoUserSocket')
     },
     disableMastoSockets (store) {
       const { state, dispatch, commit } = store
       if (!state.mastoUserSocket) return
-      commit('recoverConnection')
+      commit('setMastoUserSocketStatus', WSConnectionStatus.DISABLED)
       return dispatch('stopMastoUserSocket')
     },
 
@@ -111,19 +120,28 @@ const api = {
           )
           state.mastoUserSocket.addEventListener('open', () => {
             // Do not show notification when we just opened up the page
-            if (state.mastoUserSocketStatus !== null) {
-              commit('recoverConnection')
+            if (state.mastoUserSocketStatus !== WSConnectionStatus.STARTING_INITIAL) {
               dispatch('pushGlobalNotice', {
                 level: 'success',
                 messageKey: 'timeline.socket_reconnected',
                 timeout: 5000
               })
             }
+            // Stop polling if we were errored or disabled
+            if (new Set([
+              WSConnectionStatus.ERROR,
+              WSConnectionStatus.DISABLED
+            ]).has(state.mastoUserSocketStatus)) {
+              dispatch('stopFetchingTimeline', { timeline: 'friends' })
+              dispatch('stopFetchingNotifications')
+              dispatch('stopFetchingChats')
+            }
+            commit('resetRetryMultiplier')
             commit('setMastoUserSocketStatus', WSConnectionStatus.JOINED)
           })
           state.mastoUserSocket.addEventListener('error', ({ detail: error }) => {
             console.error('Error in MastoAPI websocket:', error)
-            commit('setMastoUserSocketStatus', WSConnectionStatus.ERROR)
+            // TODO is this needed?
             dispatch('clearOpenedChats')
           })
           state.mastoUserSocket.addEventListener('close', ({ detail: closeEvent }) => {
@@ -134,16 +152,17 @@ const api = {
             const { code } = closeEvent
             if (ignoreCodes.has(code)) {
               console.debug(`Not restarting socket becasue of closure code ${code} is in ignore list`)
+              commit('setMastoUserSocketStatus', WSConnectionStatus.CLOSED)
             } else {
               console.warn(`MastoAPI websocket disconnected, restarting. CloseEvent code: ${code}`)
-              dispatch('startFetchingTimeline', { timeline: 'friends' })
-              dispatch('startFetchingNotifications')
-              dispatch('startFetchingChats')
               setTimeout(() => {
-                console.log('TEST')
-                dispatch('restartMastoUserSocket')
-              }, 1000)
-              if (!state.connectionBroken) {
+                dispatch('startMastoUserSocket')
+              }, retryTimeout(state.retryMultiplier))
+              commit('incrementRetryMultiplier')
+              if (state.mastoUserSocketStatus !== WSConnectionStatus.ERROR) {
+                dispatch('startFetchingTimeline', { timeline: 'friends' })
+                dispatch('startFetchingNotifications')
+                dispatch('startFetchingChats')
                 dispatch('pushGlobalNotice', {
                   level: 'error',
                   messageKey: 'timeline.socket_broke',
@@ -151,9 +170,8 @@ const api = {
                   timeout: 5000
                 })
               }
-              commit('breakConnection')
+              commit('setMastoUserSocketStatus', WSConnectionStatus.ERROR)
             }
-            commit('setMastoUserSocketStatus', WSConnectionStatus.CLOSED)
             dispatch('clearOpenedChats')
           })
           resolve()
@@ -162,15 +180,6 @@ const api = {
         }
       })
     },
-    restartMastoUserSocket ({ dispatch }) {
-      // This basically starts MastoAPI user socket and stops conventional
-      // fetchers when connection reestablished
-      return dispatch('startMastoUserSocket').then(() => {
-        dispatch('stopFetchingTimeline', { timeline: 'friends' })
-        dispatch('stopFetchingNotifications')
-        dispatch('stopFetchingChats')
-      })
-    },
     stopMastoUserSocket ({ state, dispatch }) {
       dispatch('startFetchingTimeline', { timeline: 'friends' })
       dispatch('startFetchingNotifications')
diff --git a/src/modules/users.js b/src/modules/users.js
index ac52be1f..8a764a16 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -549,9 +549,8 @@ const users = {
               if (store.getters.mergedConfig.useStreamingApi) {
                 store.dispatch('fetchTimeline', 'friends', { since: null })
                 store.dispatch('fetchNotifications', { since: null })
-                store.dispatch('enableMastoSockets').catch((error) => {
+                store.dispatch('enableMastoSockets', true).catch((error) => {
                   console.error('Failed initializing MastoAPI Streaming socket', error)
-                  startPolling()
                 }).then(() => {
                   store.dispatch('fetchChats', { latest: true })
                   setTimeout(() => store.dispatch('setNotificationsSilence', false), 10000)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index d3d5c68d..436b8b0a 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1184,7 +1184,10 @@ export const handleMastoWS = (wsEvent) => {
 export const WSConnectionStatus = Object.freeze({
   'JOINED': 1,
   'CLOSED': 2,
-  'ERROR': 3
+  'ERROR': 3,
+  'DISABLED': 4,
+  'STARTING': 5,
+  'STARTING_INITIAL': 6
 })
 
 const chats = ({ credentials }) => {
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index fc5e76ba..f83f871e 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -57,14 +57,12 @@ const fetchNotifications = ({ store, args, older }) => {
       return notifications
     })
     .catch((error) => {
-      if (!store.rootState.api.connectionBroken) {
-        store.dispatch('pushGlobalNotice', {
-          level: 'error',
-          messageKey: 'notifications.error',
-          messageArgs: [error.message],
-          timeout: 5000
-        })
-      }
+      store.dispatch('pushGlobalNotice', {
+        level: 'error',
+        messageKey: 'notifications.error',
+        messageArgs: [error.message],
+        timeout: 5000
+      })
     })
 }
 
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index eb4a3e0d..46bba41a 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -66,14 +66,12 @@ const fetchAndUpdate = ({
       return { statuses, pagination }
     })
     .catch((error) => {
-      if (!store.rootState.api.connectionBroken) {
-        store.dispatch('pushGlobalNotice', {
-          level: 'error',
-          messageKey: 'timeline.error',
-          messageArgs: [error.message],
-          timeout: 5000
-        })
-      }
+      store.dispatch('pushGlobalNotice', {
+        level: 'error',
+        messageKey: 'timeline.error',
+        messageArgs: [error.message],
+        timeout: 5000
+      })
     })
 }
 

From 088683538d86d5230c333e9e01913a51ea1f95fe Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Tue, 9 Mar 2021 09:45:14 +0000
Subject: [PATCH 384/389] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3176181..1d2fab67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Added a quick settings to timeline header for easier access
 - Added option to mark posts as sensitive by default
-- Added a quick settings to timeline header for easier access
 - Added option to mark posts as sensitive by default
 - Added quick filters for notifications
 

From 0475e1c61cba0862e8ed8976920dad895e8a5828 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Tue, 9 Mar 2021 09:45:28 +0000
Subject: [PATCH 385/389] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2fab67..629e1290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Added a quick settings to timeline header for easier access
 - Added option to mark posts as sensitive by default
-- Added option to mark posts as sensitive by default
 - Added quick filters for notifications
 
 ## [2.3.0] - 2021-03-01

From 47719571e454e3432e9d8fd34b5ce1ac513a187f Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Mon, 15 Mar 2021 13:28:33 +0300
Subject: [PATCH 386/389] Use more specific button titles instead of
 general.submit

- "Post" for post submission (we already had the button title be "Posting"
when the post was being sent, so there was a weird inconsistency)
- "Register" for registration submission
- "Save changes" for usages in settings
---
 src/components/password_reset/password_reset.vue            | 2 +-
 src/components/post_status_form/post_status_form.vue        | 4 ++--
 src/components/registration/registration.vue                | 2 +-
 src/components/settings_modal/tabs/notifications_tab.vue    | 2 +-
 src/components/settings_modal/tabs/profile_tab.vue          | 6 +++---
 .../settings_modal/tabs/security_tab/security_tab.vue       | 6 +++---
 src/i18n/en.json                                            | 3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue
index a931cb5a..3ffa5425 100644
--- a/src/components/password_reset/password_reset.vue
+++ b/src/components/password_reset/password_reset.vue
@@ -53,7 +53,7 @@
                 type="submit"
                 class="btn button-default btn-block"
               >
-                {{ $t('general.submit') }}
+                {{ $t('settings.save') }}
               </button>
             </div>
           </div>
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 73f6a4f1..6b490aee 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -272,7 +272,7 @@
           disabled
           class="btn button-default"
         >
-          {{ $t('general.submit') }}
+          {{ $t('post_status.post') }}
         </button>
         <!-- touchstart is used to keep the OSK at the same position after a message send -->
         <button
@@ -282,7 +282,7 @@
           @touchstart.stop.prevent="postStatus($event, newStatus)"
           @click.stop.prevent="postStatus($event, newStatus)"
         >
-          {{ $t('general.submit') }}
+          {{ $t('post_status.post') }}
         </button>
       </div>
       <div
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 062d4121..65b4bb33 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -230,7 +230,7 @@
                 type="submit"
                 class="btn button-default"
               >
-                {{ $t('general.submit') }}
+                {{ $t('registration.register') }}
               </button>
             </div>
           </div>
diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index 8f8fe48e..7e0568ea 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -24,7 +24,7 @@
         class="btn button-default"
         @click="updateNotificationSettings"
       >
-        {{ $t('general.submit') }}
+        {{ $t('settings.save') }}
       </button>
     </div>
   </div>
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 175a0219..bb3c301d 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -153,7 +153,7 @@
         class="btn button-default"
         @click="updateProfile"
       >
-        {{ $t('general.submit') }}
+        {{ $t('settings.save') }}
       </button>
     </div>
     <div class="setting-item">
@@ -227,7 +227,7 @@
         class="btn button-default"
         @click="submitBanner(banner)"
       >
-        {{ $t('general.submit') }}
+        {{ $t('settings.save') }}
       </button>
     </div>
     <div class="setting-item">
@@ -266,7 +266,7 @@
         class="btn button-default"
         @click="submitBackground(background)"
       >
-        {{ $t('general.submit') }}
+        {{ $t('settings.save') }}
       </button>
     </div>
   </div>
diff --git a/src/components/settings_modal/tabs/security_tab/security_tab.vue b/src/components/settings_modal/tabs/security_tab/security_tab.vue
index 56bea1f4..275d4616 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.vue
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.vue
@@ -22,7 +22,7 @@
         class="btn button-default"
         @click="changeEmail"
       >
-        {{ $t('general.submit') }}
+        {{ $t('settings.save') }}
       </button>
       <p v-if="changedEmail">
         {{ $t('settings.changed_email') }}
@@ -60,7 +60,7 @@
         class="btn button-default"
         @click="changePassword"
       >
-        {{ $t('general.submit') }}
+        {{ $t('settings.save') }}
       </button>
       <p v-if="changedPassword">
         {{ $t('settings.changed_password') }}
@@ -133,7 +133,7 @@
         class="btn button-default"
         @click="confirmDelete"
       >
-        {{ $t('general.submit') }}
+        {{ $t('settings.save') }}
       </button>
     </div>
   </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b3d8cd49..1ea27e26 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -201,6 +201,7 @@
     "direct_warning_to_all": "This post will be visible to all the mentioned users.",
     "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
     "posting": "Posting",
+    "post": "Post",
     "preview": "Preview",
     "preview_empty": "Empty",
     "empty_status_error": "Can't post an empty status with no files",
@@ -231,6 +232,7 @@
     "bio_placeholder": "e.g.\nHi, I'm Lain.\nI’m an anime girl living in suburban Japan. You may know me from the Wired.",
     "reason": "Reason to register",
     "reason_placeholder": "This instance approves registrations manually.\nLet the administration know why you want to register.",
+    "register": "Register",
     "validations": {
       "username_required": "cannot be left blank",
       "fullname_required": "cannot be left blank",
@@ -250,6 +252,7 @@
   },
   "settings": {
     "app_name": "App name",
+    "save": "Save changes",
     "security": "Security",
     "setting_changed": "Setting is different from default",
     "enter_current_password_to_confirm": "Enter your current password to confirm your identity",

From feb40ec5ffdbddd7becf7554df861bc2fc90ecf7 Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Mon, 15 Mar 2021 13:49:03 +0300
Subject: [PATCH 387/389] Do not capitalize every word in random strings

Capitalization like that is only ever used in article/book titles, I
have not seen another website use it in interface elements.
---
 src/i18n/en.json | 70 ++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index b3d8cd49..517a0c61 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -3,27 +3,27 @@
     "mrf": {
       "federation": "Federation",
       "keyword": {
-        "keyword_policies": "Keyword Policies",
+        "keyword_policies": "Keyword policies",
         "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
         "reject": "Reject",
         "replace": "Replace",
         "is_replaced_by": "→"
       },
-      "mrf_policies": "Enabled MRF Policies",
+      "mrf_policies": "Enabled MRF policies",
       "mrf_policies_desc": "MRF policies manipulate the federation behaviour of the instance.  The following policies are enabled:",
       "simple": {
-        "simple_policies": "Instance-specific Policies",
+        "simple_policies": "Instance-specific policies",
         "accept": "Accept",
         "accept_desc": "This instance only accepts messages from the following instances:",
         "reject": "Reject",
         "reject_desc": "This instance will not accept messages from the following instances:",
         "quarantine": "Quarantine",
         "quarantine_desc": "This instance will send only public posts to the following instances:",
-        "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
-        "ftl_removal_desc": "This instance removes these instances from \"The Whole Known Network\" timeline:",
+        "ftl_removal": "Removal from \"Known Network\" Timeline",
+        "ftl_removal_desc": "This instance removes these instances from \"Known Network\" timeline:",
         "media_removal": "Media Removal",
         "media_removal_desc": "This instance removes media from posts on the following instances:",
-        "media_nsfw": "Media Force-set As Sensitive",
+        "media_nsfw": "Media force-set as sensitive",
         "media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:"
       }
     },
@@ -118,13 +118,13 @@
     "about": "About",
     "administration": "Administration",
     "back": "Back",
-    "friend_requests": "Follow Requests",
+    "friend_requests": "Follow requests",
     "mentions": "Mentions",
     "interactions": "Interactions",
-    "dms": "Direct Messages",
-    "public_tl": "Public Timeline",
+    "dms": "Direct messages",
+    "public_tl": "Public timeline",
     "timeline": "Timeline",
-    "home_timeline": "Home Timeline",
+    "home_timeline": "Home timeline",
     "twkn": "Known Network",
     "bookmarks": "Bookmarks",
     "user_search": "User Search",
@@ -149,8 +149,8 @@
     "reacted_with": "reacted with {0}"
   },
   "polls": {
-    "add_poll": "Add Poll",
-    "add_option": "Add Option",
+    "add_poll": "Add poll",
+    "add_option": "Add option",
     "option": "Option",
     "votes": "votes",
     "people_voted_count": "{count} person voted | {count} people voted",
@@ -179,7 +179,7 @@
     "storage_unavailable": "Pleroma could not access browser storage. Your login or your local settings won't be saved and you might encounter unexpected issues. Try enabling cookies."
   },
   "interactions": {
-    "favs_repeats": "Repeats and Favorites",
+    "favs_repeats": "Repeats and favorites",
     "follows": "New follows",
     "moves": "User migrates",
     "load_older": "Load older interactions"
@@ -211,10 +211,10 @@
       "unlisted": "This post will not be visible in Public Timeline and The Whole Known Network"
     },
     "scope": {
-      "direct": "Direct - Post to mentioned users only",
-      "private": "Followers-only - Post to followers only",
-      "public": "Public - Post to public timelines",
-      "unlisted": "Unlisted - Do not post to public timelines"
+      "direct": "Direct - post to mentioned users only",
+      "private": "Followers-only - post to followers only",
+      "public": "Public - post to public timelines",
+      "unlisted": "Unlisted - do not post to public timelines"
     }
   },
   "registration": {
@@ -278,7 +278,7 @@
     "attachmentRadius": "Attachments",
     "attachments": "Attachments",
     "avatar": "Avatar",
-    "avatarAltRadius": "Avatars (Notifications)",
+    "avatarAltRadius": "Avatars (notifications)",
     "avatarRadius": "Avatars",
     "background": "Background",
     "bio": "Bio",
@@ -300,10 +300,10 @@
     "cGreen": "Green (Retweet)",
     "cOrange": "Orange (Favorite)",
     "cRed": "Red (Cancel)",
-    "change_email": "Change Email",
+    "change_email": "Change email",
     "change_email_error": "There was an issue changing your email.",
     "changed_email": "Email changed successfully!",
-    "change_password": "Change Password",
+    "change_password": "Change password",
     "change_password_error": "There was an issue changing your password.",
     "changed_password": "Password changed successfully!",
     "chatMessageRadius": "Chat message",
@@ -312,9 +312,9 @@
     "confirm_new_password": "Confirm new password",
     "current_password": "Current password",
     "mutes_and_blocks": "Mutes and Blocks",
-    "data_import_export_tab": "Data Import / Export",
+    "data_import_export_tab": "Data import / export",
     "default_vis": "Default visibility scope",
-    "delete_account": "Delete Account",
+    "delete_account": "Delete account",
     "delete_account_description": "Permanently delete your data and deactivate your account.",
     "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
     "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
@@ -367,14 +367,14 @@
     "play_videos_in_modal": "Play videos in a popup frame",
     "profile_fields": {
       "label": "Profile metadata",
-      "add_field": "Add Field",
+      "add_field": "Add field",
       "name": "Label",
       "value": "Content"
     },
     "use_contain_fit": "Don't crop the attachment in thumbnails",
     "name": "Name",
-    "name_bio": "Name & Bio",
-    "new_email": "New Email",
+    "name_bio": "Name & bio",
+    "new_email": "New email",
     "new_password": "New password",
     "notification_visibility": "Types of notifications to show",
     "notification_visibility_follows": "Follows",
@@ -390,19 +390,19 @@
     "hide_followers_description": "Don't show who's following me",
     "hide_follows_count_description": "Don't show follow count",
     "hide_followers_count_description": "Don't show follower count",
-    "show_admin_badge": "Show Admin badge in my profile",
-    "show_moderator_badge": "Show Moderator badge in my profile",
+    "show_admin_badge": "Show \"Admin\" badge in my profile",
+    "show_moderator_badge": "Show \"Moderator\" badge in my profile",
     "nsfw_clickthrough": "Enable clickthrough attachment and link preview image hiding for NSFW statuses",
     "oauth_tokens": "OAuth tokens",
     "token": "Token",
-    "refresh_token": "Refresh Token",
-    "valid_until": "Valid Until",
+    "refresh_token": "Refresh token",
+    "valid_until": "Valid until",
     "revoke_token": "Revoke",
     "panelRadius": "Panels",
     "pause_on_unfocused": "Pause streaming when tab is not focused",
     "presets": "Presets",
-    "profile_background": "Profile Background",
-    "profile_banner": "Profile Banner",
+    "profile_background": "Profile background",
+    "profile_banner": "Profile banner",
     "profile_tab": "Profile",
     "radii_help": "Set up interface edge rounding (in pixels)",
     "replies_in_timeline": "Replies in timeline",
@@ -614,8 +614,8 @@
     },
     "version": {
       "title": "Version",
-      "backend_version": "Backend Version",
-      "frontend_version": "Frontend Version"
+      "backend_version": "Backend version",
+      "frontend_version": "Frontend version"
     }
   },
   "time": {
@@ -758,7 +758,7 @@
     }
   },
   "user_profile": {
-    "timeline_title": "User Timeline",
+    "timeline_title": "User timeline",
     "profile_does_not_exist": "Sorry, this profile does not exist.",
     "profile_loading_error": "Sorry, there was an error loading this profile."
   },
@@ -776,7 +776,7 @@
     "who_to_follow": "Who to follow"
   },
   "tool_tip": {
-    "media_upload": "Upload Media",
+    "media_upload": "Upload media",
     "repeat": "Repeat",
     "reply": "Reply",
     "favorite": "Favorite",

From 4c36ac12b67541e25cd09ee25674bdc94f5db236 Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Mon, 15 Mar 2021 17:41:34 +0300
Subject: [PATCH 388/389] Add a chevron to moderation tools button to indicate
 it opens a menu

Closes #1069
---
 src/components/moderation_tools/moderation_tools.js  | 5 +++++
 src/components/moderation_tools/moderation_tools.vue | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/moderation_tools/moderation_tools.js b/src/components/moderation_tools/moderation_tools.js
index d4fdc53e..2469327a 100644
--- a/src/components/moderation_tools/moderation_tools.js
+++ b/src/components/moderation_tools/moderation_tools.js
@@ -1,6 +1,11 @@
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faChevronDown } from '@fortawesome/free-solid-svg-icons'
+
 import DialogModal from '../dialog_modal/dialog_modal.vue'
 import Popover from '../popover/popover.vue'
 
+library.add(faChevronDown)
+
 const FORCE_NSFW = 'mrf_tag:media-force-nsfw'
 const STRIP_MEDIA = 'mrf_tag:media-strip'
 const FORCE_UNLISTED = 'mrf_tag:force-unlisted'
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index bf25adc5..c4c6ee46 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -124,10 +124,11 @@
       </div>
       <button
         slot="trigger"
-        class="btn button-default btn-block"
+        class="btn button-default btn-block moderation-tools-button"
         :class="{ toggled }"
       >
         {{ $t('user_card.admin_menu.moderation') }}
+        <FAIcon icon="chevron-down" />
       </button>
     </Popover>
     <portal to="modal">
@@ -170,4 +171,10 @@
     height: 100%;
   }
 }
+
+.moderation-tools-button {
+  svg,i {
+    font-size: 0.8em;
+  }
+}
 </style>

From 8163c7b55bbc66a2455777025c29e7f9015497e0 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 16 Mar 2021 08:35:29 +0200
Subject: [PATCH 389/389] v-slot

---
 .../notifications/notification_filters.vue    | 117 +++++++++---------
 1 file changed, 59 insertions(+), 58 deletions(-)

diff --git a/src/components/notifications/notification_filters.vue b/src/components/notifications/notification_filters.vue
index b3489430..e86a0fcc 100644
--- a/src/components/notifications/notification_filters.vue
+++ b/src/components/notifications/notification_filters.vue
@@ -5,65 +5,66 @@
     placement="bottom"
     :bound-to="{ x: 'container' }"
   >
-    <div
-      slot="content"
-      class="dropdown-menu"
+    <template
+      v-slot:content
     >
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('likes')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.likes }"
-        />{{ $t('settings.notification_visibility_likes') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('repeats')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.repeats }"
-        />{{ $t('settings.notification_visibility_repeats') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('follows')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.follows }"
-        />{{ $t('settings.notification_visibility_follows') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('mentions')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.mentions }"
-        />{{ $t('settings.notification_visibility_mentions') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('emojiReactions')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.emojiReactions }"
-        />{{ $t('settings.notification_visibility_emoji_reactions') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('moves')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.moves }"
-        />{{ $t('settings.notification_visibility_moves') }}
-      </button>
-    </div>
+      <div class="dropdown-menu">
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('likes')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.likes }"
+          />{{ $t('settings.notification_visibility_likes') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('repeats')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.repeats }"
+          />{{ $t('settings.notification_visibility_repeats') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('follows')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.follows }"
+          />{{ $t('settings.notification_visibility_follows') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('mentions')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.mentions }"
+          />{{ $t('settings.notification_visibility_mentions') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('emojiReactions')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.emojiReactions }"
+          />{{ $t('settings.notification_visibility_emoji_reactions') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('moves')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.moves }"
+          />{{ $t('settings.notification_visibility_moves') }}
+        </button>
+      </div>
+    </template>
     <template v-slot:trigger>
       <FAIcon icon="filter" />
     </template>